270 files changed, 109805 insertions, 109887 deletions

diff --git a/ChangeLog b/ChangeLog
index bee37e4..4b739a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,903 @@
+commit 9984f365ab9407791f58792a71b71d15d974b64e
+Author: Jens Georg <mail@jensge.org>
+Date:   Mon Nov 21 20:30:37 2016 +0100
+
+    Prepare 0.25.1
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	NEWS
+M	configure.ac
+M	debian/changelog
+
+commit 25ee2b5cdabc7632e5bd4c41dc04e8f06f533275
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Mon Nov 21 17:41:14 2016 +0000
+
+    Update Spanish translation
+
+M	help/es/es.po
+
+commit 1eec412e97c255c9ca235e039dcdc59ee4c3c140
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 20 23:54:09 2016 +0100
+
+    Fix crash when clicking on tool window in wayland
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/editing_tools/EditingTools.vala
+
+commit a409642472f9609e470ed9216b944c0c87f47637
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 20 23:48:22 2016 +0100
+
+    Fix resource dependency generation
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	publish.am
+M	shotwell.am
+
+commit 916804df42f54092365d74378f6fca3266453721
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 20 23:48:12 2016 +0100
+
+    Dist resource file
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	shotwell.am
+
+commit f0de94576ba0463f829acf05423fac6d95c83bb3
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 20 23:18:31 2016 +0100
+
+    Remove another useless context menu title
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	ui/savedsearch.ui
+
+commit a2a4e194f831e1533676878300a41fcdac9c4ca6
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 20 23:13:08 2016 +0100
+
+    Work-around issue with photo context menu
+
+    Since we are not using separate action groups anymore, so leaving
+    collection page is disabling the actions we just enabled in PhotoPage.
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/CollectionPage.vala
+
+commit 9ae5339a193c8a14cc81d77867e9bd02dde038b0
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 20 21:11:29 2016 +0100
+
+    Do not show menubar on fullscreen
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/AppWindow.vala
+
+commit d557aa766770eee4f11635e3a017b1d053f0574f
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 20 20:35:30 2016 +0100
+
+    Remove unnecessary context menu label
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	ui/direct_context.ui
+
+commit 3760e9eb404ef14e8e8bdc30e614ecb9f7c94be2
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 20 19:55:33 2016 +0100
+
+    Remove deprecations from shotwell.ui
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=767181
+
+M	src/Dialogs.vala
+M	ui/shotwell.ui
+
+commit dbd298480651d80be3651e594b2efc1b20580cf5
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 20 16:06:14 2016 +0100
+
+    Replace from_stock in EventsDirectoryPage
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/events/EventsDirectoryPage.vala
+
+commit 1e39fb34441615555cb25da2786ae2d85412aeb0
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Nov 20 15:44:32 2016 +0100
+
+    Remove deprecated calls from properties
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Properties.vala
+
+commit e3ed5ceb07be8581000272b6fe8fd250a4975f9d
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun Nov 20 18:31:29 2016 +0100
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit ab05955e1b0c8dbe3c86b0c829af49c18813d1a2
+Author: Rafael Fontenelle <rafaelff@gnome.org>
+Date:	Sat Nov 19 01:52:24 2016 +0000
+
+    Update Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit cae15e6ea12990a477c62c8fc06849618f102ffb
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Fri Nov 18 12:35:18 2016 +0000
+
+    Update Spanish translation
+
+M	help/es/es.po
+
+commit 482249a12230612aab927458c892432b45d8e1c9
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Fri Nov 18 08:18:03 2016 +0000
+
+    Update Spanish translation
+
+M	help/es/es.po
+
+commit 94e107e021a24df2a99f0eb6b84449111908f744
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 17 22:59:53 2016 +0100
+
+    More ngettext for plurals
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Dialogs.vala
+
+commit 3a67c97a5aa7779c106401c62914c53c800967d9
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 17 22:59:44 2016 +0100
+
+    Remove deprecated code from Dialogs
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Dialogs.vala
+M	ui/shotwell.ui
+
+commit bb5a1ac6776e6e8348266a77f6798e31c6160ea6
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 17 22:26:54 2016 +0100
+
+    Remove deprecated calls from PhotoPage
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/PhotoPage.vala
+
+commit 96b325abdfec494294f3bc6233d999a4968de8ab
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 17 21:51:13 2016 +0100
+
+    Remove deprecations from AppWindow
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/AppWindow.vala
+
+commit 875b0f8fa30ddb30eb3ba81ff4db7307c9c7603e
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 17 21:43:21 2016 +0100
+
+    Fix warning about pointer cast
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/PixbufCache.vala
+M	src/threads/BackgroundJob.vala
+
+commit 7135d7a4687dbbc61d1d9babe29060f23da1fbbc
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 17 18:15:45 2016 +0100
+
+    Publishing: Use ngettext for plurals
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/publishing/PublishingUI.vala
+
+commit fa430d09a1b407dae551dcfd0302486b0cdfdd1f
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 17 18:15:28 2016 +0100
+
+    Fix deprecations in Imports UI
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/data_imports/DataImportsUI.vala
+
+commit eb9f7826392aa96306dfd102f0ee7d5e2dd40d02
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 17 18:00:51 2016 +0100
+
+    publishing: Fix criticals when switching to Facebook
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/publishing/PublishingUI.vala
+
+commit 8bdbd6bdbe729915fcb3bb3c8e7acdac7c172924
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 17 16:53:39 2016 +0100
+
+    Remove deprecated function from Tree
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/sidebar/Tree.vala
+
+commit 2d3bcae244075abedb5853b380bac539dde87da1
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Nov 17 16:52:29 2016 +0100
+
+    Remove dead code
+
+    Not used anymore after putting stars as unicode
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/SearchFilter.vala
+
+commit 30abef1ac4778f0cd7a08fd23171e76011c84d9a
+Author: Marek Černocký <marek@manet.cz>
+Date:	Thu Nov 17 11:21:56 2016 +0100
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit 80fd4d15591e6cca50072e530e4fd9cd6ff9c6af
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:	Thu Nov 17 08:17:13 2016 +0000
+
+    Update Spanish translation
+
+M	help/es/es.po
+
+commit db76214268f16829125bc3b89e8381c8230ecb49
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Nov 16 23:09:32 2016 +0100
+
+    SearchBar: Remove star icons
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=771788
+
+M	src/SearchFilter.vala
+
+commit 5901f0282e6ce6b0b3a27248552c5cf8d492706a
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Nov 16 22:21:10 2016 +0100
+
+    Make Find toolbar button a toggle button
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	ui/collection.ui
+
+commit 9be90a6bd45ca410f273b722b2726e0868640498
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Nov 16 22:11:34 2016 +0100
+
+    Gdk.Seat exists only since 3.20
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Page.vala
+M	src/library/LibraryWindow.vala
+
+commit aef3f23f92c4df33f932ee5d1af3a4e9a33d266d
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Nov 16 21:52:57 2016 +0100
+
+    Use change_state instead of set_state
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/library/LibraryWindow.vala
+
+commit 6ae8259658aa63e03bc1cfdd73403f2e9ef75cf4
+Author: Marek Cernocky <marek_cernocky@conel.cz>
+Date:	Wed Nov 16 11:41:07 2016 +0100
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit ef8d4068d58d09b81af688f98f4a855fe444b930
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Nov 16 00:52:17 2016 +0100
+
+    Remove deprecated calls from LibraryWindow
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/library/LibraryWindow.vala
+
+commit 0410d948509def958eda90a91d8bfc28b03a7670
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Nov 16 00:40:15 2016 +0100
+
+    Remove deprecations from PublishingUI
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/publishing/PublishingUI.vala
+
+commit b6acc7475fe707f75fab55eaa160881118f46b9d
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Nov 15 23:55:09 2016 +0100
+
+    Remove deprecated calls from ManifestWidget
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/plugins/ManifestWidget.vala
+
+commit ebfb5620ef054276b84eb0a5aaf87bc2c26dd9fd
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Nov 15 23:47:55 2016 +0100
+
+    Dedeprecate Adjust Tool
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/editing_tools/EditingTools.vala
+
+commit bbccb6eded1d1e65d0c1ef65b22cfc4f06fc8b4a
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Nov 15 23:47:02 2016 +0100
+
+    Dedeprecate RedEye Tool
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/editing_tools/EditingTools.vala
+
+commit 21559b2ba0696a0db9c050a5872ca7c7c8b98f1d
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Nov 15 23:46:43 2016 +0100
+
+    Dedeprecate EditingTools base class
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/editing_tools/EditingTools.vala
+
+commit 36410aa0942d029e0cb2e199ed70bffaf3e15d52
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Tue Nov 15 12:30:24 2016 +0100
+
+    i18n: Remove files with no translations from POTFILES.in and
+    POTFILES.skip
+
+M	po/POTFILES.in
+M	po/POTFILES.skip
+
+commit 3d4319a28d800e9e1f3ffb032f78d7b531ff1178
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Tue Nov 15 12:20:14 2016 +0100
+
+    i18n: Add intermediate C files to POTFILES.skip
+
+M	po/POTFILES.skip
+
+commit 46ceedff9eb3fa29a4b76b6c93b185c08ccc09b1
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Tue Nov 15 12:17:59 2016 +0100
+
+    i18n: Add missing files to POTFILES.in
+
+M	po/POTFILES.in
+
+commit aadd627f44499cc0a830249f31b306ef30ba2596
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Nov 14 23:59:01 2016 +0100
+
+    Dedeprecate Page
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Page.vala
+
+commit f8f42e7a7dee8cedbb115309671468a7fd1e81e0
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Nov 14 23:27:25 2016 +0100
+
+    Use GtkApplication menubar, get accels for free
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/AppWindow.vala
+M	src/Application.vala
+M	src/Page.vala
+M	src/direct/DirectWindow.vala
+M	src/library/LibraryWindow.vala
+
+commit 17c8587e485cc8fad18abdecc2d6fa603416c973
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Oct 19 21:56:15 2016 +0200
+
+    Remove GtkUIManager and Gtk*Action*
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=768271
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	shotwell.am
+M	src/AppWindow.vala
+M	src/Application.vala
+M	src/CollectionPage.vala
+M	src/MediaPage.vala
+M	src/Page.vala
+M	src/PhotoPage.vala
+M	src/Resources.vala
+M	src/SearchFilter.vala
+M	src/camera/ImportPage.vala
+M	src/direct/DirectPhotoPage.vala
+M	src/events/EventPage.vala
+M	src/events/EventsDirectoryPage.vala
+M	src/library/ImportQueuePage.vala
+M	src/library/LibraryWindow.vala
+M	src/library/OfflinePage.vala
+M	src/library/TrashPage.vala
+M	src/org.gnome.Shotwell.gresource.xml
+M	src/searches/Branch.vala
+M	src/searches/SavedSearchPage.vala
+M	src/sidebar/Tree.vala
+M	src/tags/Branch.vala
+M	src/tags/TagPage.vala
+M	src/util/ui.vala
+M	ui/collection.ui
+M	ui/direct.ui
+M	ui/direct_context.ui
+M	ui/event.ui
+M	ui/events_directory.ui
+M	ui/import.ui
+M	ui/import_queue.ui
+M	ui/media.ui
+M	ui/offline.ui
+M	ui/photo.ui
+M	ui/photo_context.ui
+M	ui/savedsearch.ui
+M	ui/search_bar.ui
+M	ui/search_sidebar_context.ui
+M	ui/set_background_dialog.ui
+M	ui/sidebar_default_context.ui
+M	ui/tag_sidebar_context.ui
+M	ui/tags.ui
+M	ui/top.ui
+M	ui/trash.ui
+
+commit 1206252faec829f23857ceb1e6e5150459e289a8
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 29 09:53:13 2016 +0200
+
+    piwigo: Port Option pane to BuilderPane
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/PiwigoPublishing.vala
+
+commit e8755595eee86d8fc417815f176ebc79da06e523
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 29 03:16:27 2016 +0200
+
+    common,piwigo: Add "default" widget to BuilderPane
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/common/BuilderPane.vala
+M	plugins/shotwell-publishing/PiwigoPublishing.vala
+
+commit 816b12dcd20cdba94f98d317bed67f5738fd6a3b
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 29 03:11:24 2016 +0200
+
+    piwigo: Port SSL pane to BuilderPane
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/PiwigoPublishing.vala
+
+commit 941eeecc49cb0131abecce9a163513a3d3d1b135
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 29 02:47:30 2016 +0200
+
+    piwigo: Simplify category name parsing a bit
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/PiwigoPublishing.vala
+
+commit a9a507bf91f5244bef8fb00cc13793723bec5c47
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 29 02:28:49 2016 +0200
+
+    piwigo: Port authentication dialog to builder pane
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/PiwigoPublishing.vala
+
+commit beb3005c4cc8085856ed7f06178434ab45a8784a
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 29 02:28:30 2016 +0200
+
+    common: Add BuilderPane
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	Makefile.am
+A	plugins/common/BuilderPane.vala
+
+commit bb8acd09cb6107ab3b97ac05dadefb00d83bcb92
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Oct 21 17:49:10 2016 +0200
+
+    Remove GtkMisc from SeachFilter
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/SearchFilter.vala
+
+commit ed928a0f498dd1004105094245b8170107fd7e2c
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Oct 21 17:43:39 2016 +0200
+
+    De-deprecate SavedSearchDialog
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/searches/SavedSearchDialog.vala
+
+commit 2dd03b3ea8a50fc031c91f79df65b9d2a4d25b13
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Oct 21 17:39:09 2016 +0200
+
+    build: Disable misleading warnings caused by valac
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	common.am
+
+commit 8a93cf67b561815fa1f5cec88fcc65f392a4496c
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Oct 19 21:55:14 2016 +0200
+
+    De-deprecate crop tool
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	configure.ac
+M	shotwell.am
+M	src/editing_tools/EditingTools.vala
+A	src/org.gnome.Shotwell.gresource.xml
+
+commit 2c91f2cf6017cd841c621fd10b6a5976623843b9
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 1 17:27:34 2016 +0200
+
+    De-deprecate StraightenTool
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/editing_tools/StraightenTool.vala
+
+commit e1c1bafe21b84457b1c7242ee29c59071e4faad2
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 1 17:18:44 2016 +0200
+
+    publishin-extra: Remove deprecations from Yandex
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing-extras/YandexPublishing.vala
+M	plugins/shotwell-publishing-extras/yandex_publish_model.ui
+
+commit 7cd7dc282e5f4affac450257a779bdf90b47623d
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 1 17:11:31 2016 +0200
+
+    publishing-extra: Remove deprecations from Tumblr
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing-extras/TumblrPublishing.vala
+M	plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+
+commit 2b13b39e6ed1e7da5e5eb19d4c28917c8bdca7b7
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 1 17:07:17 2016 +0200
+
+    publishing-extra: Remove deprecations from Rajce
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing-extras/RajcePublishing.vala
+M	plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
+
+commit ef0f0e77056ddf95cb2b239b1a5c1a6189b72a91
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 1 16:49:23 2016 +0200
+
+    pubishing: Revamp Piwigo dialogs
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/PiwigoPublishing.vala
+M	plugins/shotwell-publishing/piwigo_authentication_pane.ui
+M	plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
+
+commit c3352e8dbee06d582c2b22f40fd629e0ff22f1c0
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Mon Nov 14 08:48:57 2016 +0000
+
+    Update Spanish translation
+
+M	po/es.po
+
+commit 7e1415a56094159709643685d7bb2e47108c9145
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun Nov 13 14:33:10 2016 +0100
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit f01c6a9ca870fd4c1f5150e1c53cb47c817503e1
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Fri Nov 11 12:44:40 2016 +0000
+
+    Update Spanish translation
+
+M	po/es.po
+
+commit c8cacef72095daef28bc71945b7bd42ab40662ce
+Author: Jens Georg <mail@jensge.org>
+Date:	Fri Nov 11 00:32:04 2016 +0100
+
+    Prevent dropping the index on evey start
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/db/PhotoTable.vala
+
+commit e969f1839544e7555f8f52d68f3279bffec33be7
+Author: Marek Cernocky <marek_cernocky@conel.cz>
+Date:	Thu Nov 10 12:50:12 2016 +0100
+
+    Updated Czeach translation
+
+M	po/cs.po
+
+commit b836f7f8f90c4a8ebf0365464306742f17f614ad
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Thu Nov 10 10:16:00 2016 +0000
+
+    Update Spanish translation
+
+M	po/es.po
+
+commit e09cc440be5545515814e244fba1fa6aa5555cde
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Nov 9 22:21:57 2016 +0100
+
+    Use ngettext for some plural forms
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Resources.vala
+
+commit 55a29cabf8e46a0db6a66672a062e666d981a9be
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Nov 9 21:48:26 2016 +0100
+
+    Remove uniqueness of PhotoTableMD5Format index
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=772223
+
+M	src/db/PhotoTable.vala
+
+commit a35867695dff4478a3c60087611cb90e5b7d8692
+Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+Date:	Wed Nov 9 09:20:17 2016 +0000
+
+    Update Kazakh translation
+
+M	po/kk.po
+
+commit 098e84788934f41d216c49d58740af5c212b5697
+Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
+Date:	Tue Nov 8 23:33:53 2016 +0200
+
+    Update Latvian translation
+
+M	help/lv/lv.po
+
+commit ea3d4296160051b1c980cc5df131da6f6c80b1e1
+Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
+Date:	Tue Nov 8 23:30:18 2016 +0200
+
+    Update Latvian translation
+
+M	help/lv/lv.po
+M	po/lv.po
+
+commit 7a4d6d810dd54fce9cee905a10b60615494a922c
+Author: Marek Černocký <marek@manet.cz>
+Date:	Tue Nov 8 08:15:11 2016 +0100
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit d135612c2cc079253021b5c757ca386d7c706d31
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Nov 7 23:59:11 2016 +0100
+
+    Dist misc.vapi
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	Makefile.am
+
+commit d5c9ffb6e430ce641c657e390107311e105671f5
+Author: Damian Pietras <bug1@daper.net>
+Date:	Mon Nov 7 13:29:00 2016 +0000
+
+    thumbnailer: fix double close()
+
+    A file descriptor used to communicate with the video thumbnailer
+    process is
+    closed twice. In case another thread allocates the same descriptor
+    number in
+    the meantime, the second close() actually closes a descriptor not
+    owned by the
+    thread. This causes crashes in most cases or unexpected behaviour.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=774057
+
+M	src/VideoSupport.vala
+
+commit 22908394f043723c78f90a9143b04338108fca09
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Mon Nov 7 10:29:36 2016 +0000
+
+    Update Spanish translation
+
+M	po/es.po
+
+commit 4a325a09618a6f4f02067207a525fd54d3e04b99
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Fri Nov 4 11:59:02 2016 +0000
+
+    Update Spanish translation
+
+M	po/es.po
+
+commit bcdc5e49bc065e2e60449d6b4d50c15a04b85b57
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Fri Nov 4 07:53:51 2016 +0000
+
+    Update Spanish translation
+
+M	po/es.po
+
+commit c852ecce570cf5c261808539f8825cd0f72f27e4
+Author: Marina Prado <mapraro93@hotmail.com>
+Date:	Thu Nov 3 09:08:39 2016 +0000
+
+    Update Spanish translation
+
+M	po/es.po
+
+commit bca67bfe286a1d67e19f82391f1bf4650a43e2bf
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Nov 1 21:11:55 2016 +0100
+
+    Fix missing parameters in Tumblr publisher
+
+    Fix by Jürg Billeter
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing-extras/TumblrPublishing.vala
+
+commit 2f4504d78d29ccb80145b596a25e6fefe5f9c656
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 29 12:23:17 2016 +0200
+
+    common: Remove extra box around webview
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/common/WebAuthenticationPane.vala
+
+commit c941492caa504aae3c8a695f45d49c9a8c502b46
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 29 02:09:36 2016 +0200
+
+    publishing: Fix resource dependencies
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	publish.am
+
+commit 8999db51f67aeab1507d182742adc689dfbd9bb1
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Oct 29 01:01:54 2016 +0200
+
+    Remove deprecated Soup API
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/common/RESTSupport.vala
+M	plugins/shotwell-publishing-extras/YandexPublishing.vala
+M	plugins/shotwell-publishing/FacebookPublishing.vala
+M	plugins/shotwell-publishing/PicasaPublishing.vala
+M	plugins/shotwell-publishing/YouTubePublishing.vala
+
+commit 6efc613556a6128c2e2a91bc5f528d183ad8710c
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Oct 26 13:23:06 2016 +0200
+
+    Update debian
+
+    - Add dependency to gcr3
+    - Fix typo in rules file
+    - Bump gexiv2 requirements
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	debian/control
+M	debian/rules
+
+commit 65628886da590e2c290869d39b678fd6abe81673
+Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
+Date:	Sun Oct 30 23:21:11 2016 +0200
+
+    Update Latvian translation
+
+M	help/Makefile.am
+A	help/lv/figures/trash_process.png
+A	help/lv/lv.po
+
+commit a82f9cfc23aad68f953a5e3414349a3e12a124e2
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Sun Oct 30 18:10:17 2016 +0000
+
+    Update German translation
+
+M	po/de.po
+
 commit 8cc28654affe568f156bc74a20fb4959160ac872
 Author: Jens Georg <mail@jensge.org>
-Date:   Mon Oct 24 20:09:08 2016 +0200
+Date:	Mon Oct 24 20:09:08 2016 +0200
 
     Prepare 0.25.0 release
 
diff --git a/Makefile.am b/Makefile.am
index 4c7d9d2..4568e29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,6 +55,7 @@ plugins_common_libshotwell_plugin_common_la_SOURCES = \
 	plugins/common/RESTSupport.vala \
 	plugins/common/Resources.vala \
 	plugins/common/WebAuthenticationPane.vala \
+	plugins/common/BuilderPane.vala \
 	plugins/shotwell-plugin-dev-1.0.vapi
 
 $(top_srcdir)/plugins/shotwell-plugin-common.vapi plugins/shotwell-plugin-common.h: \
diff --git a/Makefile.in b/Makefile.in
index ee358be..c1db35d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -176,7 +176,8 @@ plugins_common_libshotwell_plugin_common_la_DEPENDENCIES =  \
 am__dirstamp = $(am__leading_dot)dirstamp
 am_plugins_common_libshotwell_plugin_common_la_OBJECTS = plugins/common/plugins_common_libshotwell_plugin_common_la-RESTSupport.lo \
 	plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo \
-	plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo
+	plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo \
+	plugins/common/plugins_common_libshotwell_plugin_common_la-BuilderPane.lo
 plugins_common_libshotwell_plugin_common_la_OBJECTS =  \
 	$(am_plugins_common_libshotwell_plugin_common_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -484,7 +485,8 @@ am_shotwell_OBJECTS = src/unit/shotwell-Unit.$(OBJEXT) \
 	src/.unitize/shotwell-_FoldersInternals.$(OBJEXT) \
 	src/.unitize/shotwell-_Library_unitize_entry.$(OBJEXT) \
 	src/.unitize/shotwell-_Direct_unitize_entry.$(OBJEXT)
-shotwell_OBJECTS = $(am_shotwell_OBJECTS)
+nodist_shotwell_OBJECTS = src/shotwell-resource.$(OBJEXT)
+shotwell_OBJECTS = $(am_shotwell_OBJECTS) $(nodist_shotwell_OBJECTS)
 shotwell_DEPENDENCIES = src/plugins/libplugin.la $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 shotwell_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -552,6 +554,7 @@ SOURCES = $(plugins_common_libshotwell_plugin_common_la_SOURCES) \
 	$(plugins_shotwell_transitions_shotwell_transitions_la_SOURCES) \
 	$(nodist_plugins_shotwell_transitions_shotwell_transitions_la_SOURCES) \
 	$(src_plugins_libplugin_la_SOURCES) $(shotwell_SOURCES) \
+	$(nodist_shotwell_SOURCES) \
 	$(thumbnailer_shotwell_video_thumbnailer_SOURCES)
 DIST_SOURCES = $(plugins_common_libshotwell_plugin_common_la_SOURCES) \
 	$(plugins_shotwell_data_imports_shotwell_data_imports_la_SOURCES) \
@@ -573,7 +576,8 @@ am__can_run_installinfo = \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__dist_noinst_DATA_DIST = plugins/shotwell-publishing/facebook.png \
+am__dist_noinst_DATA_DIST = src/org.gnome.Shotwell.gresource.xml \
+	plugins/shotwell-publishing/facebook.png \
 	plugins/shotwell-publishing/flickr.png \
 	plugins/shotwell-publishing/picasa.png \
 	plugins/shotwell-publishing/piwigo.png \
@@ -661,7 +665,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	build-aux/compile build-aux/config.guess \
 	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
 	build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
-	plugins/common/RESTSupport.c plugins/common/Resources.c \
+	plugins/common/BuilderPane.c plugins/common/RESTSupport.c \
+	plugins/common/Resources.c \
 	plugins/common/WebAuthenticationPane.c \
 	plugins/shotwell-data-imports/FSpotDatabase.c \
 	plugins/shotwell-data-imports/FSpotDatabaseBehavior.c \
@@ -1055,6 +1060,7 @@ plugins_common_libshotwell_plugin_common_la_SOURCES = \
 	plugins/common/RESTSupport.vala \
 	plugins/common/Resources.vala \
 	plugins/common/WebAuthenticationPane.vala \
+	plugins/common/BuilderPane.vala \
 	plugins/shotwell-plugin-dev-1.0.vapi
 
 plugins_common_libshotwell_plugin_common_la_VALAFLAGS = \
@@ -1117,7 +1123,8 @@ plugin_LTLIBRARIES =  \
 	plugins/shotwell-data-imports/shotwell-data-imports.la
 dist_plugin_DATA = 
 dist_pkglibexec_SCRIPTS = $(top_srcdir)/settings-migrator/shotwell-settings-migrator
-dist_noinst_DATA = $(NULL) plugins/shotwell-publishing/facebook.png \
+dist_noinst_DATA = $(NULL) src/org.gnome.Shotwell.gresource.xml \
+	plugins/shotwell-publishing/facebook.png \
 	plugins/shotwell-publishing/flickr.png \
 	plugins/shotwell-publishing/picasa.png \
 	plugins/shotwell-publishing/piwigo.png \
@@ -1140,8 +1147,9 @@ dist_noinst_DATA = $(NULL) plugins/shotwell-publishing/facebook.png \
 	plugins/shotwell-plugin-common.h vapi/gphoto.h \
 	vapi/libexif.vapi vapi/libgphoto2.vapi vapi/libraw.vapi \
 	vapi/unity.deps vapi/unity.vapi vapi/misc.vapi
-MOSTLYCLEANFILES = $(NULL) plugins/shotwell-publishing/resource.c \
-	$(am__append_5) plugins/shotwell-transitions/resource.c \
+MOSTLYCLEANFILES = $(NULL) src/resource.c \
+	plugins/shotwell-publishing/resource.c $(am__append_5) \
+	plugins/shotwell-transitions/resource.c \
 	plugins/shotwell-data-imports/resource.c
 
 # --enable-checking needs to come first to not trigger
@@ -1155,6 +1163,7 @@ COMMON_CFLAGS = -I$(top_srcdir)/vapi -D_PREFIX='"$(prefix)"' \
 	-DGETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \
 	-D_LANG_SUPPORT_DIR='"$(prefix)/share/locale"' \
 	-D_LIBEXECDIR='"$(libexecdir)"' -D_LIB='"$(libdir)"' \
+	-Wno-incompatible-pointer-types -Wno-discarded-qualifiers \
 	$(am__append_1)
 shotwell_CFLAGS = \
 	$(SHOTWELL_CFLAGS) \
@@ -1178,6 +1187,14 @@ shotwell_VALAFLAGS = $(COMMON_VALAFLAGS) \
 	$(UNITY_VALAFLAGS) \
 	$(COMMON_VALAFLAGS_POST)
 
+nodist_shotwell_SOURCES = \
+	src/resource.c
+
+shotwell_resource_deps = $(shell $(GLIB_COMPILE_RESOURCES) \
+		--sourcedir=$(abs_top_srcdir)/icons \
+		--sourcedir=$(abs_top_srcdir)/ui \
+		--generate-dependencies $(abs_top_srcdir)/src/org.gnome.Shotwell.gresource.xml)
+
 shotwell_SOURCES = \
 	src/unit/Unit.vala \
 	src/util/Util.vala \
@@ -1392,6 +1409,11 @@ plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
 nodist_plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
 	plugins/shotwell-publishing/resource.c
 
+PUBLISHING_RESOURCE_FILE := $(abs_top_srcdir)/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
+PUBLISHING_RESOURCE_DEPS = $(shell $(GLIB_COMPILE_RESOURCES) \
+		--sourcedir=$(abs_top_srcdir)/plugins/shotwell-publishing \
+		--generate-dependencies $(PUBLISHING_RESOURCE_FILE))
+
 plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS = \
 	$(COMMON_VALAFLAGS) \
 	--pkg gtk+-3.0 \
@@ -1700,6 +1722,9 @@ plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo:  \
 plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo:  \
 	plugins/common/$(am__dirstamp) \
 	plugins/common/$(DEPDIR)/$(am__dirstamp)
+plugins/common/plugins_common_libshotwell_plugin_common_la-BuilderPane.lo:  \
+	plugins/common/$(am__dirstamp) \
+	plugins/common/$(DEPDIR)/$(am__dirstamp)
 
 plugins/common/libshotwell-plugin-common.la: $(plugins_common_libshotwell_plugin_common_la_OBJECTS) $(plugins_common_libshotwell_plugin_common_la_DEPENDENCIES) $(EXTRA_plugins_common_libshotwell_plugin_common_la_DEPENDENCIES) plugins/common/$(am__dirstamp)
 	$(AM_V_CCLD)$(plugins_common_libshotwell_plugin_common_la_LINK) -rpath $(libdir) $(plugins_common_libshotwell_plugin_common_la_OBJECTS) $(plugins_common_libshotwell_plugin_common_la_LIBADD) $(LIBS)
@@ -2548,6 +2573,8 @@ src/.unitize/shotwell-_Library_unitize_entry.$(OBJEXT):  \
 src/.unitize/shotwell-_Direct_unitize_entry.$(OBJEXT):  \
 	src/.unitize/$(am__dirstamp) \
 	src/.unitize/$(DEPDIR)/$(am__dirstamp)
+src/shotwell-resource.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 
 shotwell$(EXEEXT): $(shotwell_OBJECTS) $(shotwell_DEPENDENCIES) $(EXTRA_shotwell_DEPENDENCIES) 
 	@rm -f shotwell$(EXEEXT)
@@ -2641,6 +2668,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-BuilderPane.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-RESTSupport.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-Resources.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.Plo@am__quote@
@@ -2737,6 +2765,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-VideoMonitor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-VideoSupport.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/shotwell-resource.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/.unitize/$(DEPDIR)/shotwell-_CameraInternals.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/.unitize/$(DEPDIR)/shotwell-_ConfigInternals.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/.unitize/$(DEPDIR)/shotwell-_CoreInternals.Po@am__quote@
@@ -2926,6 +2955,13 @@ plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_common_libshotwell_plugin_common_la_CFLAGS) $(CFLAGS) -c -o plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo `test -f 'plugins/common/WebAuthenticationPane.c' || echo '$(srcdir)/'`plugins/common/WebAuthenticationPane.c
 
+plugins/common/plugins_common_libshotwell_plugin_common_la-BuilderPane.lo: plugins/common/BuilderPane.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_common_libshotwell_plugin_common_la_CFLAGS) $(CFLAGS) -MT plugins/common/plugins_common_libshotwell_plugin_common_la-BuilderPane.lo -MD -MP -MF plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-BuilderPane.Tpo -c -o plugins/common/plugins_common_libshotwell_plugin_common_la-BuilderPane.lo `test -f 'plugins/common/BuilderPane.c' || echo '$(srcdir)/'`plugins/common/BuilderPane.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-BuilderPane.Tpo plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-BuilderPane.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/common/BuilderPane.c' object='plugins/common/plugins_common_libshotwell_plugin_common_la-BuilderPane.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_common_libshotwell_plugin_common_la_CFLAGS) $(CFLAGS) -c -o plugins/common/plugins_common_libshotwell_plugin_common_la-BuilderPane.lo `test -f 'plugins/common/BuilderPane.c' || echo '$(srcdir)/'`plugins/common/BuilderPane.c
+
 plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo: plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo `test -f 'plugins/shotwell-data-imports/FSpotDatabaseBehavior.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.Plo
@@ -5908,6 +5944,20 @@ src/.unitize/shotwell-_Direct_unitize_entry.obj: src/.unitize/_Direct_unitize_en
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/.unitize/shotwell-_Direct_unitize_entry.obj `if test -f 'src/.unitize/_Direct_unitize_entry.c'; then $(CYGPATH_W) 'src/.unitize/_Direct_unitize_entry.c'; else $(CYGPATH_W) '$(srcdir)/src/.unitize/_Direct_unitize_entry.c'; fi`
 
+src/shotwell-resource.o: src/resource.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/shotwell-resource.o -MD -MP -MF src/$(DEPDIR)/shotwell-resource.Tpo -c -o src/shotwell-resource.o `test -f 'src/resource.c' || echo '$(srcdir)/'`src/resource.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/shotwell-resource.Tpo src/$(DEPDIR)/shotwell-resource.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/resource.c' object='src/shotwell-resource.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/shotwell-resource.o `test -f 'src/resource.c' || echo '$(srcdir)/'`src/resource.c
+
+src/shotwell-resource.obj: src/resource.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -MT src/shotwell-resource.obj -MD -MP -MF src/$(DEPDIR)/shotwell-resource.Tpo -c -o src/shotwell-resource.obj `if test -f 'src/resource.c'; then $(CYGPATH_W) 'src/resource.c'; else $(CYGPATH_W) '$(srcdir)/src/resource.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) src/$(DEPDIR)/shotwell-resource.Tpo src/$(DEPDIR)/shotwell-resource.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='src/resource.c' object='src/shotwell-resource.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shotwell_CFLAGS) $(CFLAGS) -c -o src/shotwell-resource.obj `if test -f 'src/resource.c'; then $(CYGPATH_W) 'src/resource.c'; else $(CYGPATH_W) '$(srcdir)/src/resource.c'; fi`
+
 thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.o: thumbnailer/shotwell-video-thumbnailer.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thumbnailer_shotwell_video_thumbnailer_CFLAGS) $(CFLAGS) -MT thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.o -MD -MP -MF thumbnailer/$(DEPDIR)/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.Tpo -c -o thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.o `test -f 'thumbnailer/shotwell-video-thumbnailer.c' || echo '$(srcdir)/'`thumbnailer/shotwell-video-thumbnailer.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) thumbnailer/$(DEPDIR)/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.Tpo thumbnailer/$(DEPDIR)/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.Po
@@ -5921,15 +5971,6 @@ thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.ob
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='thumbnailer/shotwell-video-thumbnailer.c' object='thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(thumbnailer_shotwell_video_thumbnailer_CFLAGS) $(CFLAGS) -c -o thumbnailer/thumbnailer_shotwell_video_thumbnailer-shotwell-video-thumbnailer.obj `if test -f 'thumbnailer/shotwell-video-thumbnailer.c'; then $(CYGPATH_W) 'thumbnailer/shotwell-video-thumbnailer.c'; else $(CYGPATH_W) '$(srcdir)/thumbnailer/shotwell-video-thumbnailer.c'; fi`
-$(srcdir)/thumbnailer/shotwell-video-thumbnailer.c: $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; \
-	fi
-$(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp: thumbnailer/shotwell-video-thumbnailer.vala
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(thumbnailer_shotwell_video_thumbnailer_VALAFLAGS) $(VALAFLAGS) -C thumbnailer/shotwell-video-thumbnailer.vala
-	$(AM_V_at)mv -f $@-t $@
 $(srcdir)/src/unit/Unit.c: $(srcdir)/shotwell_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/shotwell_vala.stamp; fi
 	@if test -f $@; then :; else \
@@ -6889,64 +6930,38 @@ $(srcdir)/shotwell_vala.stamp: src/unit/Unit.vala src/util/Util.vala src/util/fi
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
 	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(shotwell_VALAFLAGS) $(VALAFLAGS) -C src/unit/Unit.vala src/util/Util.vala src/util/file.vala src/util/image.vala src/util/misc.vala src/util/string.vala src/util/system.vala src/util/KeyValueMap.vala src/util/ui.vala src/threads/Threads.vala src/threads/Workers.vala src/threads/BackgroundJob.vala src/threads/Semaphore.vala src/db/Db.vala src/db/DatabaseTable.vala src/db/PhotoTable.vala src/db/EventTable.vala src/db/TagTable.vala src/db/TombstoneTable.vala src/db/VideoTable.vala src/db/VersionTable.vala src/db/SavedSearchDBTable.vala src/editing_tools/EditingTools.vala src/editing_tools/StraightenTool.vala src/slideshow/Slideshow.vala src/slideshow/TransitionEffects.vala src/photos/Photos.vala src/photos/PhotoFileAdapter.vala src/photos/PhotoFileFormat.vala src/photos/PhotoFileSniffer.vala src/photos/PhotoMetadata.vala src/photos/GRaw.vala src/photos/GdkSupport.vala src/photos/JfifSupport.vala src/photos/BmpSupport.vala src/photos/RawSupport.vala src/photos/PngSupport.vala src/photos/TiffSupport.vala src/plugins/Plugins.vala src/plugins/StandardHostInterface.vala src/plugins/ManifestWidget.vala src/publishing/Publishing.vala src/publishing/PublishingUI.vala src/publishing/PublishingPluginHost.vala src/publishing/APIGlue.vala src/library/Library.vala src/library/LibraryWindow.vala src/library/Branch.vala src/library/TrashSidebarEntry.vala src/library/OfflineSidebarEntry.vala src/library/FlaggedSidebarEntry.vala src/library/LastImportSidebarEntry.vala src/library/ImportQueueSidebarEntry.vala src/library/FlaggedPage.vala src/library/ImportQueuePage.vala src/library/LastImportPage.vala src/library/OfflinePage.vala src/library/TrashPage.vala src/direct/Direct.vala src/direct/DirectWindow.vala src/direct/DirectPhoto.vala src/direct/DirectPhotoPage.vala src/direct/DirectView.vala src/core/Core.vala src/core/DataCollection.vala src/core/DataSet.vala src/core/util.vala src/core/SourceCollection.vala src/core/SourceHoldingTank.vala src/core/DatabaseSourceCollection.vala src/core/ContainerSourceCollection.vala src/core/ViewCollection.vala src/core/DataObject.vala src/core/Alteration.vala src/core/DataSource.vala src/core/DataSourceTypes.vala src/core/DataView.vala src/core/DataViewTypes.vala src/core/Tracker.vala src/core/SourceInterfaces.vala src/sidebar/Sidebar.vala src/sidebar/Branch.vala src/sidebar/Entry.vala src/sidebar/Tree.vala src/sidebar/common.vala src/events/Events.vala src/events/Branch.vala src/events/EventsDirectoryPage.vala src/events/EventPage.vala src/events/EventDirectoryItem.vala src/tags/Tags.vala src/tags/Branch.vala src/tags/TagPage.vala src/tags/HierarchicalTagIndex.vala src/tags/HierarchicalTagUtilities.vala src/camera/Camera.vala src/camera/Branch.vala src/camera/CameraTable.vala src/camera/GPhoto.vala src/camera/ImportPage.vala src/searches/Searches.vala src/searches/Branch.vala src/searches/SearchBoolean.vala src/searches/SavedSearchPage.vala src/searches/SavedSearchDialog.vala src/config/Config.vala src/config/ConfigurationInterfaces.vala src/config/GSettingsEngine.vala src/data_imports/DataImports.vala src/data_imports/DataImportsPluginHost.vala src/data_imports/DataImportsUI.vala src/data_imports/DataImportJob.vala src/data_imports/DataImportSource.vala src/folders/Folders.vala src/folders/Branch.vala src/folders/Page.vala src/main.vala src/AppWindow.vala src/CollectionPage.vala src/NaturalCollate.vala src/Thumbnail.vala src/ThumbnailCache.vala src/CheckerboardLayout.vala src/PhotoPage.vala src/Page.vala src/SortedList.vala src/Dimensions.vala src/Box.vala src/Photo.vala src/Orientation.vala src/BatchImport.vala src/Dialogs.vala src/Resources.vala src/Debug.vala src/ColorTransformation.vala src/Properties.vala src/CustomComponents.vala src/Event.vala src/International.vala src/AppDirs.vala src/PixbufCache.vala src/CommandManager.vala src/Commands.vala src/SlideshowPage.vala src/LibraryFiles.vala src/Printing.vala src/Tag.vala src/Screensaver.vala src/Exporter.vala src/DirectoryMonitor.vala src/LibraryMonitor.vala src/VideoSupport.vala src/Tombstone.vala src/MetadataWriter.vala src/Application.vala src/TimedQueue.vala src/MediaPage.vala src/MediaDataRepresentation.vala src/DesktopIntegration.vala src/MediaInterfaces.vala src/MediaMetadata.vala src/VideoMetadata.vala src/MediaMonitor.vala src/PhotoMonitor.vala src/VideoMonitor.vala src/SearchFilter.vala src/MediaViewTracker.vala src/UnityProgressBar.vala src/Upgrades.vala src/.unitize/_UnitInternals.vala src/.unitize/_UtilInternals.vala src/.unitize/_ThreadsInternals.vala src/.unitize/_DbInternals.vala src/.unitize/_EditingToolsInternals.vala src/.unitize/_PluginsInternals.vala src/.unitize/_SlideshowInternals.vala src/.unitize/_PhotosInternals.vala src/.unitize/_PublishingInternals.vala src/.unitize/_LibraryInternals.vala src/.unitize/_DirectInternals.vala src/.unitize/_CoreInternals.vala src/.unitize/_SidebarInternals.vala src/.unitize/_EventsInternals.vala src/.unitize/_TagsInternals.vala src/.unitize/_CameraInternals.vala src/.unitize/_SearchesInternals.vala src/.unitize/_ConfigInternals.vala src/.unitize/_DataImportsInternals.vala src/.unitize/_FoldersInternals.vala src/.unitize/_Library_unitize_entry.vala src/.unitize/_Direct_unitize_entry.vala plugins/shotwell-plugin-dev-1.0.vapi
 	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/plugins/shotwell-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/ChessEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/CircleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/CirclesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/ClockEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/CrumbleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/FadeEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/thumbnailer/shotwell-video-thumbnailer.c: $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp: thumbnailer/shotwell-video-thumbnailer.vala
+	$(AM_V_at)rm -f $@ && echo stamp > $@-t
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(thumbnailer_shotwell_video_thumbnailer_VALAFLAGS) $(VALAFLAGS) -C thumbnailer/shotwell-video-thumbnailer.vala
+	$(AM_V_at)mv -f $@-t $@
+$(srcdir)/plugins/common/RESTSupport.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-transitions/SlideEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/common/Resources.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-transitions/SquaresEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/common/WebAuthenticationPane.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-transitions/StripesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/common/BuilderPane.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
 	fi
-$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
+$(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp: plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/common/BuilderPane.vala plugins/shotwell-plugin-dev-1.0.vapi
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_common_libshotwell_plugin_common_la_VALAFLAGS) $(VALAFLAGS) -C plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/common/BuilderPane.vala plugins/shotwell-plugin-dev-1.0.vapi
 	$(AM_V_at)mv -f $@-t $@
 $(srcdir)/plugins/shotwell-publishing-extras/GalleryConnector.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi
@@ -7109,24 +7124,64 @@ $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp: plu
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
 	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_data_imports_shotwell_data_imports_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala plugins/shotwell-data-imports/FSpotDatabaseTable.vala plugins/shotwell-data-imports/FSpotDatabase.vala plugins/shotwell-data-imports/FSpotImporter.vala plugins/shotwell-data-imports/FSpotMetaTable.vala plugins/shotwell-data-imports/FSpotPhotosTable.vala plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala plugins/shotwell-data-imports/FSpotRollsTable.vala plugins/shotwell-data-imports/FSpotTableBehavior.vala plugins/shotwell-data-imports/FSpotTagsTable.vala plugins/shotwell-data-imports/shotwell-data-imports.vala plugins/shotwell-data-imports/SqliteSupport.vala plugins/shotwell-data-imports/VersionNumber.vala plugins/shotwell-plugin-common.vapi
 	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/plugins/common/RESTSupport.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/common/Resources.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/ChessEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/common/WebAuthenticationPane.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/CircleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
 	fi
-$(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp: plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/shotwell-plugin-dev-1.0.vapi
+$(srcdir)/plugins/shotwell-transitions/CirclesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/ClockEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/CrumbleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/FadeEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/SlideEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/SquaresEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/StripesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_common_libshotwell_plugin_common_la_VALAFLAGS) $(VALAFLAGS) -C plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/shotwell-plugin-dev-1.0.vapi
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
 	$(AM_V_at)mv -f $@-t $@
 
 mostlyclean-libtool:
@@ -7560,6 +7615,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f $(srcdir)/plugins/common/BuilderPane.c
 	-rm -f $(srcdir)/plugins/common/RESTSupport.c
 	-rm -f $(srcdir)/plugins/common/Resources.c
 	-rm -f $(srcdir)/plugins/common/WebAuthenticationPane.c
@@ -7803,6 +7859,7 @@ maintainer-clean-generic:
 	-rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp
 	-rm -f $(srcdir)/thumbnailer/shotwell-video-thumbnailer.c
 	-rm -f $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp
+	-rm -f plugins/common/BuilderPane.c
 	-rm -f plugins/common/RESTSupport.c
 	-rm -f plugins/common/Resources.c
 	-rm -f plugins/common/WebAuthenticationPane.c
@@ -8173,8 +8230,17 @@ plugins/shotwell-plugin-dev-1.0.vapi plugins/shotwell-plugin-dev-1.0.h: src_plug
 
 -include $(top_srcdir)/git.mk
 
-plugins/shotwell-publishing/resource.c: plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(abs_top_srcdir)/plugins/shotwell-publishing --generate $<
+src/resource.c: src/org.gnome.Shotwell.gresource.xml $(shotwell_resource_deps)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
+		--sourcedir=$(abs_top_srcdir)/icons \
+		--sourcedir=$(abs_top_srcdir)/ui \
+		--generate $<
+
+plugins/shotwell-publishing/resource.c: $(PUBLISHING_RESOURCE_DEPS) $(PUBLISHING_RESOURCE_FILE)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \
+		--target=$@ \
+		--sourcedir=$(abs_top_srcdir)/plugins/shotwell-publishing \
+		--generate $(PUBLISHING_RESOURCE_FILE)
 
 @HAVE_EXTRA_PLUGINS_TRUE@plugins/shotwell-publishing-extras/resource.c: plugins/shotwell-publishing-extras/org.gnome.Shotwell.Publishing.Extras.gresource.xml
 @HAVE_EXTRA_PLUGINS_TRUE@	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(abs_top_srcdir)/plugins/shotwell-publishing-extras --generate $<
diff --git a/NEWS b/NEWS
index 1cb5b35..cc83831 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,49 @@
+Shotwell 0.25.1 - 21 Nov 2016
+  * Remove deprecated libsoup API
+  * Remove extra box around WebKit authenticator view
+  * Tumblr: Fix compile error with recent vala compiler
+  * Thumbnailer: Fix an issue with accidental closing of file descriptors
+  * Distribute misc.vapi
+  * Use proper ngettext for plurals instead of hard-coded >1
+  * Fix issue with unique index on MD5 and Format
+  * Update Piwigo dialogs
+  * Remove most of the deprecated API calls for GTK+ <= 3.14
+  * Remove some useless warnings generated by Vala
+  * Refactor Plugins to use a common aproach to load panes from glade
+  * Piwigo: Simplify category parsing
+  * Remove GtkUIManager and Gtk*Action* from code
+  * Fix a crash when clicking on tool window under Wayland
+  * Translation updates
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=767181
+ - https://bugzilla.gnome.org/show_bug.cgi?id=768271
+ - https://bugzilla.gnome.org/show_bug.cgi?id=771788
+ - https://bugzilla.gnome.org/show_bug.cgi?id=772223
+ - https://bugzilla.gnome.org/show_bug.cgi?id=774057
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+ - Marina Prado <mapraro93@hotmail.com>
+ - Piotr Drąg <piotrdrag@gmail.com>
+ - Rūdolfs Mazurs <rudolfsm@src.gnome.org>
+ - Marek Černocký <marek@manet.cz>
+ - Marek Cernocky <marek_cernocky@conel.cz>
+ - Rafael Fontenelle <rafaelff@gnome.org>
+ - Mario Blättermann <mario.blaettermann@gmail.com>
+ - Daniel Mustieles <daniel.mustieles@gmail.com>
+ - Damian Pietras <bug1@daper.net>
+ - Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+
+Added/updated translations
+ - cs, courtesy of Marek Černocký
+ - de, courtesy of Mario Blättermann
+ - es, courtesy of Daniel Mustieles
+ - kk, courtesy of Baurzhan Muftakhidinov
+ - lv, courtesy of Rūdolfs Mazurs
+ - pl, courtesy of Piotr Drąg
+ - pt_BR, courtesy of Rafael Fontenelle
+  
 Shotwell 0.25.0 - 24 Oct 2016
   * Add contrast to improvements
   * Add a log when shifting events
diff --git a/common.am b/common.am
index 20a66c6..da05cba 100644
--- a/common.am
+++ b/common.am
@@ -12,7 +12,9 @@ COMMON_CFLAGS = \
 	-DGETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \
 	-D_LANG_SUPPORT_DIR='"$(prefix)/share/locale"' \
 	-D_LIBEXECDIR='"$(libexecdir)"' \
-	-D_LIB='"$(libdir)"'
+	-D_LIB='"$(libdir)"' \
+	-Wno-incompatible-pointer-types \
+	-Wno-discarded-qualifiers
 
 if IS_GITVERSION
 COMMON_CFLAGS += -D_GIT_VERSION='"@GITVER@"'
diff --git a/configure b/configure
index 36cb06c..8656614 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for shotwell 0.25.0.1.
+# Generated by GNU Autoconf 2.69 for shotwell 0.25.1.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell>.
 #
@@ -650,8 +650,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='shotwell'
 PACKAGE_TARNAME='shotwell'
-PACKAGE_VERSION='0.25.0.1'
-PACKAGE_STRING='shotwell 0.25.0.1'
+PACKAGE_VERSION='0.25.1'
+PACKAGE_STRING='shotwell 0.25.1'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell'
 PACKAGE_URL=''
 
@@ -1486,7 +1486,7 @@ if test "$ac_init_help" = "long"; then
   # 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 shotwell 0.25.0.1 to adapt to many kinds of systems.
+\`configure' configures shotwell 0.25.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1557,7 +1557,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shotwell 0.25.0.1:";;
+     short | recursive ) echo "Configuration of shotwell 0.25.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1720,7 +1720,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shotwell configure 0.25.0.1
+shotwell configure 0.25.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1998,7 +1998,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by shotwell $as_me 0.25.0.1, which was
+It was created by shotwell $as_me 0.25.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2459,12 +2459,12 @@ MAJOR_VERSION=0
 
 MINOR_VERSION=25
 
-MICRO_VERSION=0
+MICRO_VERSION=1
 
 API_VERSION=0
 
 
-GITVER=8cc28654affe568f156bc74a20fb4959160ac872
+GITVER=9984f365ab9407791f58792a71b71d15d974b64e
 
 
  if test "x$GITVER" != "x"; then
@@ -2962,7 +2962,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shotwell'
- VERSION='0.25.0.1'
+ VERSION='0.25.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8032,7 +8032,7 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.12.2
+                             gtk+-3.0 >= 3.14.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8052,7 +8052,7 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.12.2
+                             gtk+-3.0 >= 3.14.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8075,7 +8075,7 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.12.2
+                             gtk+-3.0 >= 3.14.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8106,7 +8106,7 @@ if test -n "$SHOTWELL_LIBS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.12.2
+                             gtk+-3.0 >= 3.14.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8126,7 +8126,7 @@ if test -n "$SHOTWELL_LIBS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.12.2
+                             gtk+-3.0 >= 3.14.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8149,7 +8149,7 @@ if test -n "$SHOTWELL_LIBS"; then
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.12.2
+                             gtk+-3.0 >= 3.14.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8189,7 +8189,7 @@ fi
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.12.2
+                             gtk+-3.0 >= 3.14.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8210,7 +8210,7 @@ fi
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.12.2
+                             gtk+-3.0 >= 3.14.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8234,7 +8234,7 @@ fi
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.12.2
+                             gtk+-3.0 >= 3.14.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -8284,14 +8284,14 @@ if test -n "$THUMBNAILER_CFLAGS"; then
     pkg_cv_THUMBNAILER_CFLAGS="$THUMBNAILER_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.12.2
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
                                 gstreamer-base-1.0 >= 1.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.12.2
+  ($PKG_CONFIG --exists --print-errors "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
                                 gstreamer-base-1.0 >= 1.0.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_THUMBNAILER_CFLAGS=`$PKG_CONFIG --cflags "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.12.2
+  pkg_cv_THUMBNAILER_CFLAGS=`$PKG_CONFIG --cflags "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
                                 gstreamer-base-1.0 >= 1.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -8304,14 +8304,14 @@ if test -n "$THUMBNAILER_LIBS"; then
     pkg_cv_THUMBNAILER_LIBS="$THUMBNAILER_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.12.2
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
                                 gstreamer-base-1.0 >= 1.0.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.12.2
+  ($PKG_CONFIG --exists --print-errors "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
                                 gstreamer-base-1.0 >= 1.0.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_THUMBNAILER_LIBS=`$PKG_CONFIG --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.12.2
+  pkg_cv_THUMBNAILER_LIBS=`$PKG_CONFIG --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
                                 gstreamer-base-1.0 >= 1.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -8333,16 +8333,16 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.12.2
+	        THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
                                 gstreamer-base-1.0 >= 1.0.0" 2>&1`
         else
-	        THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.12.2
+	        THUMBNAILER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
                                 gstreamer-base-1.0 >= 1.0.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$THUMBNAILER_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.12.2
+	as_fn_error $? "Package requirements (gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
                                 gstreamer-base-1.0 >= 1.0.0) were not met:
 
 $THUMBNAILER_PKG_ERRORS
@@ -17615,7 +17615,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by shotwell $as_me 0.25.0.1, which was
+This file was extended by shotwell $as_me 0.25.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17681,7 +17681,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-shotwell config.status 0.25.0.1
+shotwell config.status 0.25.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 65198eb..a62e957 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,8 @@ dnl Define Versioning Information
 dnl ***********************************************************************
 m4_define([major_version],[0])
 m4_define([minor_version],[25])
-m4_define([micro_version],[0])
-m4_define([package_version],[major_version.minor_version.micro_version.1])
+m4_define([micro_version],[1])
+m4_define([package_version],[major_version.minor_version.micro_version])
 m4_define([bug_report_url],[https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell])
 m4_define([api_version],[major_version])
 
@@ -93,7 +93,7 @@ PKG_CHECK_MODULES(SHOTWELL, [
                              gstreamer-base-1.0 >= 1.0.0
                              gstreamer-plugins-base-1.0 >= 1.0.0
                              gstreamer-pbutils-1.0 >= 1.0.0
-                             gtk+-3.0 >= 3.12.2
+                             gtk+-3.0 >= 3.14.0
                              gudev-1.0 >= 145
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
@@ -103,7 +103,7 @@ PKG_CHECK_MODULES(SHOTWELL, [
                              sqlite3 >= 3.5.9
                              webkit2gtk-4.0
                             ])
-PKG_CHECK_MODULES(THUMBNAILER, [gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.12.2
+PKG_CHECK_MODULES(THUMBNAILER, [gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
                                 gstreamer-base-1.0 >= 1.0.0])
 
 PKG_CHECK_MODULES(PLUGIN, [gobject-2.0 glib-2.0 json-glib-1.0 libxml-2.0
diff --git a/help/Makefile.am b/help/Makefile.am
index 53c1448..30fa388 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -54,6 +54,6 @@ HELP_FILES = \
 	view-information.page \
 	view-sidebar.page
 
-HELP_LINGUAS = cs de el es hu pt_BR sv
+HELP_LINGUAS = cs de el es hu lv pt_BR sv
 
 -include $(top_srcdir)/git.mk
diff --git a/help/Makefile.in b/help/Makefile.in
index e7b526c..76c7a8a 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -390,7 +390,7 @@ HELP_FILES = \
 	view-information.page \
 	view-sidebar.page
 
-HELP_LINGUAS = cs de el es hu pt_BR sv
+HELP_LINGUAS = cs de el es hu lv pt_BR sv
 all: all-am
 
 .SUFFIXES:
diff --git a/help/es/edit-adjustments.page b/help/es/edit-adjustments.page
index 2ee4887..9600468 100644
--- a/help/es/edit-adjustments.page
+++ b/help/es/edit-adjustments.page
@@ -8,6 +8,12 @@
         <link type="next" xref="edit-crop"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
@@ -22,38 +28,38 @@
 
    <title>Ajustes del color</title>
 
-<p>The <gui>Adjust</gui> button opens a floating window with a histogram and sliders to adjust a photo's exposure, saturation, tint, temperature, and shadows. The histogram also has sliders to reduce the upper and lower intensity thresholds of the photograph, expanding the contrast of the middle range.</p>
+<p>El botón <gui>Ajustes</gui> abre una ventana flotante con un histograma y el control deslizante para ajustar la exposición, la saturación, el matiz, la calidez y las sombras de una fotografía. El histograma también tiene control deslizante para reducir los umbrales de intensidad superior e inferior de la fotografía, ampliando el contraste de la gama media.</p>
 
-<p>The <gui>Enhance</gui> button adjusts the histogram and shadows sliders to improve the quality of a photo.</p>
+<p>El botón <gui>Mejorar</gui> ajusta el histograma y el control deslizante de las sombras para mejorar la calidad de una foto.</p>
 
-<p>When the photo's colors and contrast are to your liking, press <gui>OK</gui> to save the changes. <gui>Reset</gui> will return the image to its original state. <gui>Cancel</gui> discards all changes you've made.</p>
+<p>Si los colores y el contraste de la foto son adecuados, pulse <gui>Aceptar</gui> para guardar los cambios. El botón <gui>Restablecer</gui> devolverá la imagen a su estado original. El botón <gui>Cancelar</gui> deshace todos los cambios realizados.</p>
 
 <section>
  <title>¿Qué hacen los ajustes del color?</title>
  <terms>
   <item>
    <title>Exposición</title>
-   <p>Changes the brightness to make it look like the photo was exposed for a longer or shorter time. Use this to correct under- or over-exposed photos.</p>
+   <p>Cambia el brillo para que parezca que la foto se ha expuesto por un tiempo más o menos largo. Utilice esta opción para corregir las fotografías sobreexpuestas o excesivamente subexpuestas.</p>
   </item>
   <item>
    <title>Saturación</title>
-   <p>Changes how vivid colors look. If your photo looks gray and washed out, try increasing the saturation. If colors look too bold, try decreasing it.</p>
+   <p>Cambia la intensidad de los colores. Si su foto parece gris y pálida, pruebe a aumentar la saturación. Si los colores se ven demasiado intensos, intente disminuirlos.</p>
   </item>
   <item>
    <title>Matiz</title>
-   <p>This tints the photo with a color. It's useful for correcting photos taken with the wrong white balance setting, which typically have an unnatural color cast. For example, photos taken outdoors with the white balance set to "Tungsten" may have a blue cast.</p>
+   <p>Esto matiza la foto con un color. Es útil para corregir fotos que se han tomado con el ajuste del balance de blancos erróneo, que normalmente tiene unas tonalidades de color poco naturales. Por ejemplo, las fotos tomadas en el exterior con el ajuste del balance de blancos en «Tungsten» pueden tener una tonalidad azulada.</p>
   </item>
   <item>
    <title>Temperatura</title>
-   <p>Changes how "warm" or "cool" the picture looks. Use this to make cold, depressing scenes look more lively, for example.</p>
+   <p>Cambia el aspecto «cálido» o «frío» de la imagen. Utilice esto, por ejemplo, para hacer que las escenas frías y tristes parezcan más alegres.</p>
   </item>
   <item>
    <title>Sombras</title>
-   <p>This makes shadowy areas appear lighter. Use this to make detail more visible if it's obscured by the darkness of a shadow.</p>
+   <p>Esto hace que las áreas oscuras aparezcan más claras. Si los detalles se han oscurecido por las sombras, utilice esto para hacerlos más visibles.</p>
   </item>
   <item>
    <title>Umbral de intensidad (control deslizante en el histograma)</title>
-   <p>These sliders change how light the brightest white is and how dark the darkest black is. Use them to change the contrast of the photo. Photos which look washed out should particularly benefit from changing these settings.</p>
+   <p>Estos controles deslizantes cambian cómo de claro es el blanco más brillante y cómo de oscuro es el negro más oscuro. Utilícelos para cambiar el contraste de la foto, sobre todo en las fotos que son pálidas.</p>
   </item>
  </terms>
 </section>
diff --git a/help/es/edit-crop.page b/help/es/edit-crop.page
index 5187d86..d834984 100644
--- a/help/es/edit-crop.page
+++ b/help/es/edit-crop.page
@@ -3,11 +3,17 @@
 
     <info>
         <link type="guide" xref="index#edit"/>
-        <desc>Improve the composition of a photo by cutting out parts of it.</desc>
+        <desc>Mejore la composición de una foto cortando partes de la misma.</desc>
         
         <link type="next" xref="edit-external"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
@@ -22,36 +28,35 @@
 
    <title>Recortar</title>
 
-    <p>To reduce the area of a photo and concentrate the viewer's attention on a smaller portion of it, use the Crop tool.
-    The crop tool is only available in full-window or fullscreen mode.</p>
+    <p>Para reducir el área de una foto y concentrar la atención del espectador en una parte más pequeña de ella, utilice la herramienta Recortar. La herramienta Recortar sólo está disponible en el modo a pantalla completa.</p>
 
 <steps>
  <item>
-  <p>Double-click on a photo to enter full-window mode, then press the <gui>Crop</gui> button on the toolbar.</p>
+  <p>Para entrar en el modo a pantalla completa, pulse dos veces en la foto y luego pulse el botón <gui>Recortar</gui> en la barra de herramientas.</p>
  </item>
  <item>
-  <p>A white box, the crop rectangle, will appear over the photo. The lighter portion of the photo within the crop rectangle represents what the photo will look like when you crop it.</p>
+  <p>Unas líneas blancas, que representan el rectángulo de recorte, aparecerán sobre la foto. La parte más clara de la foto dentro del rectángulo de recorte representa cómo se verá la foto cuando la recorte.</p>
  </item>
  <item>
-  <p>If you place your cursor in the middle of the box, you can move the box around. If you drag the edges of the box, you can adjust its size. As you move and adjust the crop box, you'll see four lines appear inside it, like a tic-tac-toe grid. These are <em>rule of thirds</em> lines.</p>
-  <p>You can also constrain the crop box to one of many common sizes. Choose a size from the drop-down list that suits your needs. If you press the flip button next to it, the orientation of the constraint will switch (from landscape to portrait).</p>
+  <p>Si coloca el cursor en el centro del recuadro, podrá moverlo. Si arrastra los bordes del recuadro, puede ajustar su tamaño. Al mover y ajustar la caja de recorte, verá aparecer cuatro líneas en su interior, como las cuadrículas para el tres en raya. Estas son las líneas de la <em>regla de los tercios</em>.</p>
+  <p>También puede limitar el recuadro a uno de los tamaños más comunes. Elija un tamaño de la lista desplegable que se adapte a sus necesidades. Si pulsa el botón voltear situado junto a esta, la orientación de la restricción cambiará (de horizontal a vertical).</p>
  </item>
  <item>
   <p>When you're happy with your crop outline, apply it by pressing the <gui>Crop</gui> button. Shotwell will display the cropped photo.</p>
  </item>
  <item>
-  <p>If you change your mind, press the <gui>Crop</gui> button again and fine-tune the crop.</p>
-  <p>If you press <gui>Cancel</gui> rather than <gui>Apply</gui>, Shotwell will return to the photo's previous crop dimensions.</p>
+  <p>Si cambia de opinión, pulse el botón <gui>Recortar</gui> de nuevo y ajuste el recorte.</p>
+  <p>Si pulsa el botón <gui>Cancelar</gui> en vez del botón <gui>Aplicar</gui>, Shotwell devolverá a la foto las dimensiones anteriores del recorte.</p>
  </item>
 </steps>
 
 <section>
  <title>¿Qué es la regla de los tercios?</title>
- <p>The <em>rule of thirds</em> helps you to choose a pleasing composition for a photo.</p>
- <p>Imagine that the scene is divided up into a 3x3 grid by two equally-spaced vertical lines and two equally-spaced horizontal lines. According to the rule, you're more likely to get a pleasing composition if you align major features (like the horizon, or a person's body) with one of the lines. Paying attention to the way features flow from one part of the grid to another can also help.</p>
- <p>Cropping a photo so that it conforms to the rule of thirds often results in a more visually appealing image.</p>
+ <p>La <em>regla de los tercios </em> le ayuda a elegir una composición satisfactoria para una foto.</p>
+ <p>Imagine que la escena se divide en una cuadrícula de 3x3 por dos líneas verticales espaciadas y por dos líneas horizontales igualmente espaciadas. De acuerdo con la regla, es más probable que obtenga una composición satisfactoria si alinea las características principales (como el horizonte o una persona) con una de estas líneas. Prestar atención a la forma en que las características van de una parte de la cuadrícula a la otra también puede ser de ayuda.</p>
+ <p>Recortar una foto siguiendo la regla de los tercios suele dar como resultado una imagen visualmente más satisfactoria.</p>
  <media type="image" src="figures/crop_thirds.jpg">
-  <p>Cropping a photo, using the "rule of thirds" lines to improve the composition.</p>
+  <p>Recorte una foto siguiendo las líneas de la «regla de los tercios» para mejorar la composición.</p>
  </media>
 </section>
 </page>
diff --git a/help/es/edit-date-time.page b/help/es/edit-date-time.page
index fe00e2f..3917b77 100644
--- a/help/es/edit-date-time.page
+++ b/help/es/edit-date-time.page
@@ -8,6 +8,12 @@
         <link type="next" xref="edit-enhance"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/edit-enhance.page b/help/es/edit-enhance.page
index 458a275..3e6a417 100644
--- a/help/es/edit-enhance.page
+++ b/help/es/edit-enhance.page
@@ -3,13 +3,19 @@
 
     <info>
         <link type="guide" xref="index#edit"/>
-        <desc>Let Shotwell improve the brightness and contrast of a photo automatically.</desc>
+        <desc>Permita que Shotwell mejore el brillo y el contraste de una foto automáticamente.</desc>
         
         <link type="seealso" xref="edit-adjustments"/>
         
         <link type="next" xref="edit-adjustments"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
@@ -24,5 +30,5 @@
 
    <title>Mejora automática</title>
 
-    <p>Clicking on the <gui>Enhance</gui> button is a quick way to automatically adjust the brightness and contrast of your photo. It will often give you a photo that is correctly exposed. You can also use it as a starting point and then improve the adjustments by clicking on the <gui>Adjust</gui> button.</p>
+    <p>Pulsar en el botón <gui>Mejorar</gui> es una forma rápida de ajustar automáticamente el brillo y el contraste de la foto. Normalmente le ofrecerá una foto que esté correctamente expuesta. También puede utilizarlo como punto de partida y luego mejorar los ajustes pulsando en el botón <gui>Ajustar</gui>.</p>
 </page>
diff --git a/help/es/edit-external.page b/help/es/edit-external.page
index f2c4c80..e9e9e1b 100644
--- a/help/es/edit-external.page
+++ b/help/es/edit-external.page
@@ -8,6 +8,12 @@
         <link type="next" xref="edit-redeye"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
@@ -30,12 +36,7 @@
         editors from drop-down menus of installed applications.
     </p>
 
-    <p>
-        Once your editors have been set, select a photo and choose <guiseq><gui>Photos</gui>
-        <gui>Open With External Editor</gui></guiseq> to open the photo with the external editor.
-        Likewise, if the original photo is a RAW file, select <guiseq><gui>Photos</gui><gui>Open 
-        With RAW Editor</gui></guiseq> to edit the RAW file directly with the set RAW editor.
-    </p>
+    <p>Una vez que los editores se han establecido, seleccione una foto y elija <guiseq><gui>Fotos</gui> <gui>Abrir con un editor externo</gui></guiseq> para abrir la foto con un editor externo. De la misma manera, si la foto original es un archivo RAW, seleccione <guiseq><gui>Fotos</gui><gui>Abrir con un editor RAW</gui></guiseq> para editar el archivo RAW directamente con un editor RAW establecido.</p>
 
     <p>
         When you complete your edits and save the file, Shotwell will detect the changes and 
diff --git a/help/es/edit-nondestructive.page b/help/es/edit-nondestructive.page
index 27302fa..06363a6 100644
--- a/help/es/edit-nondestructive.page
+++ b/help/es/edit-nondestructive.page
@@ -8,6 +8,12 @@
         <link type="next" xref="edit-date-time"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/edit-redeye.page b/help/es/edit-redeye.page
index 6df0a8e..f8300b4 100644
--- a/help/es/edit-redeye.page
+++ b/help/es/edit-redeye.page
@@ -8,6 +8,12 @@
         <link type="next" xref="edit-rotate"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/edit-rotate.page b/help/es/edit-rotate.page
index e4adf64..ec2d730 100644
--- a/help/es/edit-rotate.page
+++ b/help/es/edit-rotate.page
@@ -8,6 +8,12 @@
         <link type="next" xref="edit-straighten"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/edit-straighten.page b/help/es/edit-straighten.page
index b78ca77..0906223 100644
--- a/help/es/edit-straighten.page
+++ b/help/es/edit-straighten.page
@@ -8,6 +8,12 @@
    	<link type="next" xref="edit-undo"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/edit-undo.page b/help/es/edit-undo.page
index d93a55b..51ec098 100644
--- a/help/es/edit-undo.page
+++ b/help/es/edit-undo.page
@@ -10,6 +10,12 @@
         <link type="next" xref="edit-nondestructive"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/es.po b/help/es/es.po
index 1e7189f..b2c3d30 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -1,2960 +1,3048 @@
-# Spanish translation for shotwell.
-# Copyright (C) 2014 shotwell's COPYRIGHT HOLDER
-# This file is distributed under the same license as the shotwell package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# Dámaris Letelier <dam.letelier@gmail.com>, 2014.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: shotwell master\n"
-"POT-Creation-Date: 2016-07-04 07:20+0000\n"
-"PO-Revision-Date: 2016-07-04 14:35+0200\n"
-"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
-"Language: es\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: Gtranslator 2.91.6\n"
-
-#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
-msgctxt "_"
-msgid "translator-credits"
-msgstr ""
-"Daniel Mustieles <daniel.mustieles@gmail.com>, 2014 - 2016\n"
-"Dámaris Letelier <dam.letelier@gmail.com>, 2014"
-
-#. (itstool) path: info/desc
-#: C/edit-adjustments.page:7
-msgid "Change the exposure, saturation, tint, and shadows of a photo."
-msgstr "Cambiar la exposición, saturación, matiz y sombras de una foto."
-
-#. (itstool) path: page/title
-#: C/edit-adjustments.page:12
-msgid "Color adjustments"
-msgstr "Ajustes del color"
-
-#. (itstool) path: page/p
-#: C/edit-adjustments.page:14
-msgid ""
-"The <gui>Adjust</gui> button opens a floating window with a histogram and "
-"sliders to adjust a photo's exposure, saturation, tint, temperature, and "
-"shadows. The histogram also has sliders to reduce the upper and lower "
-"intensity thresholds of the photograph, expanding the contrast of the middle "
-"range."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/edit-adjustments.page:16
-msgid ""
-"The <gui>Enhance</gui> button adjusts the histogram and shadows sliders to "
-"improve the quality of a photo."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/edit-adjustments.page:18
-msgid ""
-"When the photo's colors and contrast are to your liking, press <gui>OK</gui> "
-"to save the changes. <gui>Reset</gui> will return the image to its original "
-"state. <gui>Cancel</gui> discards all changes you've made."
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/edit-adjustments.page:21
-msgid "What do the color adjustments do?"
-msgstr "¿Qué hacen los ajustes del color?"
-
-#. (itstool) path: item/title
-#: C/edit-adjustments.page:24
-msgid "Exposure"
-msgstr "Exposición"
-
-#. (itstool) path: item/p
-#: C/edit-adjustments.page:25
-msgid ""
-"Changes the brightness to make it look like the photo was exposed for a "
-"longer or shorter time. Use this to correct under- or over-exposed photos."
-msgstr ""
-
-#. (itstool) path: item/title
-#: C/edit-adjustments.page:28
-msgid "Saturation"
-msgstr "Saturación"
-
-#. (itstool) path: item/p
-#: C/edit-adjustments.page:29
-msgid ""
-"Changes how vivid colors look. If your photo looks gray and washed out, try "
-"increasing the saturation. If colors look too bold, try decreasing it."
-msgstr ""
-
-#. (itstool) path: item/title
-#: C/edit-adjustments.page:32
-msgid "Tint"
-msgstr "Matiz"
-
-#. (itstool) path: item/p
-#: C/edit-adjustments.page:33
-msgid ""
-"This tints the photo with a color. It's useful for correcting photos taken "
-"with the wrong white balance setting, which typically have an unnatural "
-"color cast. For example, photos taken outdoors with the white balance set to "
-"\"Tungsten\" may have a blue cast."
-msgstr ""
-
-#. (itstool) path: item/title
-#: C/edit-adjustments.page:36
-msgid "Temperature"
-msgstr "Temperatura"
-
-#. (itstool) path: item/p
-#: C/edit-adjustments.page:37
-msgid ""
-"Changes how \"warm\" or \"cool\" the picture looks. Use this to make cold, "
-"depressing scenes look more lively, for example."
-msgstr ""
-
-#. (itstool) path: item/title
-#: C/edit-adjustments.page:40
-msgid "Shadows"
-msgstr "Sombras"
-
-#. (itstool) path: item/p
-#: C/edit-adjustments.page:41
-msgid ""
-"This makes shadowy areas appear lighter. Use this to make detail more "
-"visible if it's obscured by the darkness of a shadow."
-msgstr ""
-
-#. (itstool) path: item/title
-#: C/edit-adjustments.page:44
-msgid "Intensity Threshold (sliders on the histogram)"
-msgstr "Umbral de intensidad (control deslizante en el histograma)"
-
-#. (itstool) path: item/p
-#: C/edit-adjustments.page:45
-msgid ""
-"These sliders change how light the brightest white is and how dark the "
-"darkest black is. Use them to change the contrast of the photo. Photos which "
-"look washed out should particularly benefit from changing these settings."
-msgstr ""
-
-#. (itstool) path: media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/edit-crop.page:42
-msgctxt "_"
-msgid ""
-"external ref='figures/crop_thirds.jpg' md5='4cf0a026bb812c7eab0c9db8210a9524'"
-msgstr ""
-"external ref='figures/crop_thirds.jpg' md5='4cf0a026bb812c7eab0c9db8210a9524'"
-
-#. (itstool) path: info/desc
-#: C/edit-crop.page:7
-msgid "Improve the composition of a photo by cutting out parts of it."
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/edit-crop.page:12
-msgid "Cropping"
-msgstr "Recortar"
-
-#. (itstool) path: page/p
-#: C/edit-crop.page:14
-msgid ""
-"To reduce the area of a photo and concentrate the viewer's attention on a "
-"smaller portion of it, use the Crop tool. The crop tool is only available in "
-"full-window or fullscreen mode."
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/edit-crop.page:19
-msgid ""
-"Double-click on a photo to enter full-window mode, then press the <gui>Crop</"
-"gui> button on the toolbar."
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/edit-crop.page:22
-msgid ""
-"A white box, the crop rectangle, will appear over the photo. The lighter "
-"portion of the photo within the crop rectangle represents what the photo "
-"will look like when you crop it."
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/edit-crop.page:25
-msgid ""
-"If you place your cursor in the middle of the box, you can move the box "
-"around. If you drag the edges of the box, you can adjust its size. As you "
-"move and adjust the crop box, you'll see four lines appear inside it, like a "
-"tic-tac-toe grid. These are <em>rule of thirds</em> lines."
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/edit-crop.page:26
-msgid ""
-"You can also constrain the crop box to one of many common sizes. Choose a "
-"size from the drop-down list that suits your needs. If you press the flip "
-"button next to it, the orientation of the constraint will switch (from "
-"landscape to portrait)."
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/edit-crop.page:29
-msgid ""
-"When you're happy with your crop outline, apply it by pressing the "
-"<gui>Crop</gui> button. Shotwell will display the cropped photo."
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/edit-crop.page:32
-msgid ""
-"If you change your mind, press the <gui>Crop</gui> button again and fine-"
-"tune the crop."
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/edit-crop.page:33
-msgid ""
-"If you press <gui>Cancel</gui> rather than <gui>Apply</gui>, Shotwell will "
-"return to the photo's previous crop dimensions."
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/edit-crop.page:38
-msgid "What is the rule of thirds?"
-msgstr "¿Qué es la regla de los tercios?"
-
-#. (itstool) path: section/p
-#: C/edit-crop.page:39
-msgid ""
-"The <em>rule of thirds</em> helps you to choose a pleasing composition for a "
-"photo."
-msgstr ""
-
-#. (itstool) path: section/p
-#: C/edit-crop.page:40
-msgid ""
-"Imagine that the scene is divided up into a 3x3 grid by two equally-spaced "
-"vertical lines and two equally-spaced horizontal lines. According to the "
-"rule, you're more likely to get a pleasing composition if you align major "
-"features (like the horizon, or a person's body) with one of the lines. "
-"Paying attention to the way features flow from one part of the grid to "
-"another can also help."
-msgstr ""
-
-#. (itstool) path: section/p
-#: C/edit-crop.page:41
-msgid ""
-"Cropping a photo so that it conforms to the rule of thirds often results in "
-"a more visually appealing image."
-msgstr ""
-
-#. (itstool) path: media/p
-#: C/edit-crop.page:43
-msgid ""
-"Cropping a photo, using the \"rule of thirds\" lines to improve the "
-"composition."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/edit-enhance.page:7
-msgid ""
-"Let Shotwell improve the brightness and contrast of a photo automatically."
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/edit-enhance.page:14
-msgid "Auto-enhance"
-msgstr "Mejora automática"
-
-#. (itstool) path: page/p
-#: C/edit-enhance.page:16
-msgid ""
-"Clicking on the <gui>Enhance</gui> button is a quick way to automatically "
-"adjust the brightness and contrast of your photo. It will often give you a "
-"photo that is correctly exposed. You can also use it as a starting point and "
-"then improve the adjustments by clicking on the <gui>Adjust</gui> button."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/edit-external.page:7
-msgid "Use a different program to edit a photo."
-msgstr "Usar un programa diferente para editar una foto."
-
-#. (itstool) path: page/title
-#: C/edit-external.page:12
-msgid "Edit photos with an external program"
-msgstr "Editar las fotos con un programa externo"
-
-#. (itstool) path: page/p
-#: C/edit-external.page:16
-msgid ""
-"You might want to use an external editor to do additional work on a photo. "
-"If installed, GIMP and UFRaw are the default external editors for photo and "
-"RAW editing, respectively. If these programs are not installed, you must "
-"select your preferred editors by choosing <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui></guiseq> and selecting editors from drop-down "
-"menus of installed applications."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/edit-external.page:24
-msgid ""
-"Once your editors have been set, select a photo and choose "
-"<guiseq><gui>Photos</gui> <gui>Open With External Editor</gui></guiseq> to "
-"open the photo with the external editor. Likewise, if the original photo is "
-"a RAW file, select <guiseq><gui>Photos</gui><gui>Open With RAW Editor</gui></"
-"guiseq> to edit the RAW file directly with the set RAW editor."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/edit-external.page:31
-msgid ""
-"When you complete your edits and save the file, Shotwell will detect the "
-"changes and update the photo. When external edits have been made, press and "
-"hold the <key>Shift</key> key in full-window view to show the original photo "
-"rather than the externally-edited one."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/edit-external.page:38
-msgid "Reverting to original will erase any external edits."
-msgstr "Revertir al original borrará cualquier cambio externo."
-
-#. (itstool) path: note/p
-#: C/edit-external.page:43
-msgid ""
-"If you externally edit a RAW photo and save the result to another image, "
-"such as a JPEG or PNG, Shotwell cannot automatically determine that the "
-"original RAW and the new image should be paired."
-msgstr ""
-
-#. (itstool) path: note/p
-#: C/edit-external.page:49
-msgid ""
-"If you want to work within the resulting image within Shotwell, you'll need "
-"to import it yourself."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/edit-nondestructive.page:7
-msgid ""
-"Shotwell is a non-destructive photo editor - it does not modify your "
-"original photos."
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/edit-nondestructive.page:12
-msgid "What happens to the original when I edit a photo?"
-msgstr "¿Qué sucede con el original cuando edito una foto?"
-
-#. (itstool) path: page/p
-#: C/edit-nondestructive.page:14
-msgid ""
-"Shotwell is a non-destructive photo editor. It does not modify your original "
-"photographs. That is to say, if you crop a photo or adjust its colors, the "
-"photo file on disc remains untouched. Shotwell stores your edits in a "
-"database and applies them on the fly as necessary. This means you can undo "
-"any alterations you make to a photograph."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/edit-nondestructive.page:16 C/edit-undo.page:18
-msgid ""
-"If you want to see what a photo looked like before your modifications, press "
-"the <key>Shift</key> key. The original photo will be displayed as long as "
-"you hold the key down."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/edit-nondestructive.page:18
-msgid ""
-"Note that Shotwell can optionally write metadata (such as tags and titles) "
-"to photo files. For more information, see the section <link xref=\"other-"
-"files\">Photo files</link>."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/edit-redeye.page:7
-msgid ""
-"Correct photos where people have red eyes because of the camera's flash."
-msgstr ""
-"Corrige las fotos donde las personas tienen ojos rojos por el flash de la "
-"cámara."
-
-#. (itstool) path: page/title
-#: C/edit-redeye.page:12
-msgid "Removing red-eye"
-msgstr "Quitar los ojos rojos"
-
-#. (itstool) path: page/p
-#: C/edit-redeye.page:14
-msgid ""
-"Red-eye occurs when the camera's flash reflects off the pupil of someone's "
-"eye. To eliminate this in a photo, use the Red-eye tool."
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/edit-redeye.page:17
-msgid "Click <gui>Red-eye</gui>. A circle will appear on the photo."
-msgstr "Pulse en <gui>Ojos Rojos</gui>. Un círculo aparecerá en la foto."
-
-#. (itstool) path: item/p
-#: C/edit-redeye.page:20
-msgid ""
-"Drag the circle over the affected pupil, adjust its size with the slider "
-"control, and press <gui>Apply</gui>. The redness will be removed."
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/edit-redeye.page:23
-msgid ""
-"Repeat this process for all red pupils in your photo. Press <gui>Close</gui> "
-"when finished."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/edit-rotate.page:7
-msgid ""
-"Click the <gui>Rotate</gui> button, or choose one of the commands in the "
-"<gui>Photo</gui> menu."
-msgstr ""
-"Pulse el botón <gui>Girar</gui>, o elija uno de los comandos en el menú "
-"<gui>Foto</gui>."
-
-#. (itstool) path: page/title
-#: C/edit-rotate.page:12
-msgid "Rotate or flip a photo"
-msgstr "Girar o voltear una foto"
-
-#. (itstool) path: page/p
-#: C/edit-rotate.page:14
-msgid ""
-"You can rotate your photos left and right (clockwise and counterclockwise) "
-"with the <gui>Rotate</gui> button on the toolbar of most views. You can also "
-"make a mirror image of any photo."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/edit-rotate.page:16
-msgid ""
-"To rotate right, click on the <gui>Rotate</gui> button. To rotate left, "
-"press and hold the <key>Ctrl</key> key and then click the button. Both "
-"commands are available in the <gui>Photos</gui> menu too. Alternatively, use "
-"the following keyboard shortcuts:"
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/edit-rotate.page:18
-msgid ""
-"rotate left: <keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq> or "
-"<key>[</key>"
-msgstr ""
-"rotar a la izquierda: <keyseq><key>Mayús</key><key>Ctrl</key><key>R</key></"
-"keyseq> o <key>[</key>"
-
-#. (itstool) path: item/p
-#: C/edit-rotate.page:19
-msgid ""
-"rotate right: <keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>]</key>"
-msgstr ""
-"rotar a la derecha: <keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>]</"
-"key>"
-
-#. (itstool) path: page/p
-#: C/edit-rotate.page:21
-msgid ""
-"To create a mirror image of a photo, use the <gui>Flip Horizontally</gui> "
-"command in the <gui>Photos</gui> menu. To flip an image vertically, use the "
-"<gui>Flip Vertically</gui> command in the same menu."
-msgstr ""
-
-#. (itstool) path: note/p
-#: C/edit-rotate.page:24
-msgid ""
-"If you select more than one image, you can rotate all of them at the same "
-"time."
-msgstr ""
-"Si selecciona más de una imagen, puede girar todas ellas al mismo tiempo."
-
-#. (itstool) path: info/desc
-#: C/edit-straighten.page:7
-msgid "Straighten a photo so that its horizon appears level."
-msgstr "Enderezar una foto tal que su horizonte aparezca nivelado."
-
-#. (itstool) path: page/title
-#: C/edit-straighten.page:12
-msgid "Straighten photos"
-msgstr "Enderezar fotos"
-
-#. (itstool) path: page/p
-#: C/edit-straighten.page:14
-msgid ""
-"The straighten tools allows photos to be leveled and straightened. The "
-"straighten tool is only available in full-window or fullscreen mode."
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/edit-straighten.page:18
-msgid ""
-"Click <gui>Straighten</gui>. The straighten slider will appear. "
-"Alternatively, use the keyboard shortcut <keyseq><key>Ctrl</key><key>A</"
-"key></keyseq>."
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/edit-straighten.page:21
-msgid "Drag the slider to achieve the desired degree of straightening."
-msgstr ""
-"Arrastre el control deslizante para conseguir el grado que quiera de "
-"enderezamiento."
-
-#. (itstool) path: item/p
-#: C/edit-straighten.page:24
-#, fuzzy
-#| msgid "Press <gui>OK</gui> when finished."
-msgid "Press <gui>Straighten</gui> when finished."
-msgstr "Pulse <gui>Aceptar</gui> cuando haya acabado."
-
-#. (itstool) path: info/desc
-#: C/edit-date-time.page:7
-#, fuzzy
-#| msgid "Change the time and date of photos if those details are incorrect."
-msgid "Change the date and time of photos if those details are incorrect."
-msgstr "Cambiar la hora y la fecha de las fotos si son incorrectas."
-
-#. (itstool) path: page/title
-#: C/edit-date-time.page:12
-#, fuzzy
-#| msgid "Adjust the time and date of photos"
-msgid "Adjust the date and time of photos"
-msgstr "Ajustar la hora y fecha de las fotos"
-
-#. (itstool) path: page/p
-#: C/edit-date-time.page:14
-#, fuzzy
-#| msgid ""
-#| "To create a new event, select the photos you would like in the new event "
-#| "and click <guiseq><gui>Events</gui><gui>New Event</gui></guiseq>."
-msgid ""
-"To adjust the date and time of photos, select the photos you would like to "
-"adjust, choose <guiseq><gui>Photos</gui><gui>Adjust Date and Time...</gui></"
-"guiseq> and select a new date and time."
-msgstr ""
-"Para crear un evento nuevo, seleccione las fotos que quiere tener en el "
-"evento y pulse <guiseq><gui>Eventos</gui><gui>Nuevo evento</gui></guiseq>."
-
-#. (itstool) path: page/p
-#: C/edit-date-time.page:16
-msgid ""
-"If you are changing the date and time of multiple photos at once, you can "
-"choose to shift all the photos by the same amount of time or to set all the "
-"photos to the same time."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/edit-date-time.page:18
-msgid ""
-"By default, the date and time are only changed inside Shotwell. You can also "
-"choose to modify the date and time in the original file, but this cannot be "
-"undone once you exit Shotwell."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/edit-undo.page:7
-msgid "Return a photo to its original, unedited form."
-msgstr "Restaurar una foto a su estado original, sin edición."
-
-#. (itstool) path: page/title
-#: C/edit-undo.page:14
-msgid "Undoing changes"
-msgstr "Deshacer cambios"
-
-#. (itstool) path: page/p
-#: C/edit-undo.page:16
-msgid ""
-"Because Shotwell is a non-destructive photo editor, you can undo any "
-"alterations you make to a photograph."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/edit-undo.page:20
-msgid ""
-"To completely undo all the changes you've made to a photo, click "
-"<guiseq><gui>Photos</gui><gui>Revert to Original</gui></guiseq>. The only "
-"exception is that time and date adjustments will not be reverted."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/formats.page:7
-msgid ""
-"Shotwell supports JPEG, PNG, TIFF, BMP and RAW photo files as well as video "
-"files."
-msgstr ""
-
-#. (itstool) path: page/title
-#: C/formats.page:12
-msgid "Supported photo and video formats"
-msgstr "Formatos de foto y vídeo soportados"
-
-#. (itstool) path: page/p
-#: C/formats.page:14
-msgid ""
-"Shotwell supports JPEG, PNG, TIFF, BMP and <link type=\"guide\" xref=\"other-"
-"raw\">RAW</link> photo files. Shotwell does not yet support other graphics "
-"format such as GIF."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/formats.page:16
-msgid ""
-"Shotwell's RAW format support is currently limited. When you view a RAW "
-"photo, you are actually viewing a JPEG derived from the RAW photo, not the "
-"RAW image itself. Additionally, the RAW editing pipeline is not fully 16-bit "
-"- you can only export edited photos as 8-bit files. All supported formats "
-"can be used for export (JPEG, PNG, TIFF, BMP)."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/formats.page:18
-msgid ""
-"For more information about RAW-format photos in Shotwell, please see the "
-"<link type=\"guide\" xref=\"other-raw\">RAW</link> section."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/formats.page:22
-msgid ""
-"Shotwell also supports video files in any format supported by the GStreamer "
-"media library on the system where Shotwell is running. This typically "
-"includes the following formats among others:"
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/formats.page:25
-msgid "Container formats: Ogg, QuickTime, MP4, AVI."
-msgstr "Formatos de contenedor: Ogg, QuickTime, MP4, AVI."
-
-#. (itstool) path: item/p
-#: C/formats.page:26
-msgid ""
-"Codecs: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Note that some operating "
-"systems may not include all codecs listed here due to legal or licensing "
-"restrictions.</em>"
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/formats.page:30
-msgid ""
-"Shotwell supports both photos and videos, but for simplicity, this "
-"documentation uses just the term \"photos\" in most places. Many operations "
-"in Shotwell apply to both photos and videos, however. In particular, events, "
-"flagging, rating, tagging, and publishing work both for photos and for "
-"videos."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/import-camera.page:7
-msgid "Copy photos from a digital camera."
-msgstr "Copiar fotos desde una cámara digital."
-
-#. (itstool) path: page/title
-#: C/import-camera.page:12
-msgid "Importing from a camera"
-msgstr "Importar desde una cámara"
-
-#. (itstool) path: page/p
-#: C/import-camera.page:14
-msgid "To import photos from a digital camera:"
-msgstr "Para importar fotos desde una cámara digital:"
-
-#. (itstool) path: item/p
-#: C/import-camera.page:18
-msgid ""
-"Connect the camera to your computer and switch it on. Shotwell will detect "
-"it and list it in the sidebar."
-msgstr ""
-"Conecte la cámara al equipo y enciéndala. Shotwell la detectará y la "
-"mostrará en la barra lateral."
-
-#. (itstool) path: item/p
-#: C/import-camera.page:22
-msgid ""
-"Select the camera in the sidebar. Previews of each photo on the camera will "
-"be displayed."
-msgstr ""
-"Seleccione la cámara en la barra lateral. Se mostrará la vista previa de "
-"cada una de las fotos de la cámara."
-
-#. (itstool) path: item/p
-#: C/import-camera.page:25
-msgid ""
-"If you like, you can choose a set of specific photos to import. To do this, "
-"hold down the <key>Ctrl</key> key and click to select individual photos. You "
-"can hold down <key>Shift</key> and click to select a range of photos too."
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/import-camera.page:28
-msgid ""
-"Click either <gui>Import Selected</gui> or <gui>Import All</gui>. The photos "
-"will be copied from the camera and saved on your computer."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/import-camera.page:32
-msgid ""
-"Once the import is complete, you can open the <gui>Last Import</gui> view "
-"(in the sidebar) to see all photos that were imported. The Events list (also "
-"in the sidebar) will also show the new photos, organized by date."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/import-file.page:7
-msgid "Import photos that are already saved on your computer."
-msgstr "Importar fotos que ya están en el equipo."
-
-#. (itstool) path: page/title
-#: C/import-file.page:12
-msgid "Importing from your hard disk"
-msgstr "Importar desde su disco duro"
-
-#. (itstool) path: page/p
-#: C/import-file.page:14
-msgid ""
-"To import photo files from your hard disk into Shotwell, just drag them from "
-"your file browser into the Shotwell window."
-msgstr ""
-"Para importar fotos desde su disco duro a Shotwell, solo debe arrastrarlas "
-"desde su explorador a la ventana de Shotwell."
-
-#. (itstool) path: page/p
-#: C/import-file.page:16
-msgid ""
-"Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</"
-"gui></guiseq> and select the folder containing the photos you want to import."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/import-file.page:18
-msgid ""
-"Shotwell will ask whether you want to copy the photo files to your library "
-"folder (usually this is the <file>Pictures</file> folder in your home "
-"directory) or to import them in place without copying the files."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/import-file.page:20
-msgid ""
-"If you hold down <key>Ctrl</key> while dragging photos in, Shotwell will "
-"copy the photos into your library folder without prompting. Similarly, if "
-"you hold down <keyseq><key>Ctrl</key><key>Shift</key></keyseq> while "
-"dragging photos in, Shotwell will import the photos without copying them."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/import-file.page:22
-msgid ""
-"Once the import is complete, you can select <gui>Last Import</gui> in the "
-"sidebar to see all photos successfully imported. The Events list will also "
-"show new entries for the dates corresponding to the imported photos."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/import-f-spot.page:7
-msgid ""
-"Shotwell can import all your photos and tags from the F-Spot photo manager."
-msgstr ""
-"Shotwell puede importar todas sus fotos y etiquetas desde el gestor de fotos "
-"F-Spot."
-
-#. (itstool) path: page/title
-#: C/import-f-spot.page:12
-msgid "Importing from F-Spot"
-msgstr "Importar desde F-Spot"
-
-#. (itstool) path: page/p
-#: C/import-f-spot.page:14
-msgid "To import an existing photo collection from F-Spot:"
-msgstr "Para importar una colección de fotos existente desde F-Spot:"
-
-#. (itstool) path: item/p
-#: C/import-f-spot.page:16
-msgid "Select <guiseq><gui>File</gui><gui>Import From F-Spot</gui></guiseq>."
-msgstr ""
-"Seleccione <guiseq><gui>Archivo</gui><gui>Importar desde F-Spot</gui></"
-"guiseq>."
-
-#. (itstool) path: item/p
-#: C/import-f-spot.page:17
-msgid ""
-"Now choose either the default F-Spot library or another F-Spot database. If "
-"importing from another F-Spot database, select a directory and file from the "
-"chooser dialog box."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/import-f-spot.page:20
-msgid ""
-"Shotwell will import your photos, together with their tags and other "
-"information. Once the import is complete, you can select <gui>Last Import</"
-"gui> in the sidebar to see all photos successfully imported. The Events list "
-"will also show new entries for the dates corresponding to the imported "
-"photos."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/import-memorycard.page:7
-msgid "Import photos from a digital camera's memory card."
-msgstr "Importar fotos desde una tarjeta de memoria de una cámara digital."
-
-#. (itstool) path: page/title
-#: C/import-memorycard.page:12
-msgid "Importing from a memory card"
-msgstr "Importar desde una tarjeta de memoria"
-
-#. (itstool) path: page/p
-#: C/import-memorycard.page:14
-msgid "To import photos from a camera memory card:"
-msgstr "Para importar fotos desde una tarjeta de memoria de una cámara:"
-
-#. (itstool) path: item/p
-#: C/import-memorycard.page:18
-msgid ""
-"Put the card into your card reader. Make sure the card reader is plugged in "
-"to the computer and switched on."
-msgstr ""
-"Coloque la tarjeta en el lector de tarjetas. Asegúrese de que el lector está "
-"conectado al equipo y encendido."
-
-#. (itstool) path: item/p
-#: C/import-memorycard.page:21
-msgid "The card reader and card should be detected automatically."
-msgstr ""
-"El lector de tarjetas y la tarjeta se deberían detectar automáticamente."
-
-#. (itstool) path: item/p
-#: C/import-memorycard.page:24
-msgid ""
-"Follow the instructions for <link xref=\"import-file\">importing photos from "
-"your hard disk</link>. If you click <guiseq><gui>File</gui><gui>Import From "
-"Folder...</gui></guiseq>, the memory card should be visible as a folder in "
-"the side bar of the file selection window."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/import-memorycard.page:28
-msgid ""
-"Shotwell can import photos from any memory card that is compatible with your "
-"card reader."
-msgstr ""
-"Shotwell puede importar fotos de una tarjeta de memoria que sea compatible "
-"con su lector de tarjetas."
-
-#. (itstool) path: page/p
-#: C/import-memorycard.page:30
-msgid ""
-"If the card is not detected automatically, your card reader may not have "
-"been recognized. Try unplugging it and then plugging it in again. If that "
-"doesn't work, you should still be able to import photos by <link xref="
-"\"import-camera\">connecting your camera directly to the computer</link>, "
-"though."
-msgstr ""
-
-#. (itstool) path: media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/index.page:23
-msgctxt "_"
-msgid ""
-"external ref='figures/shotwell_logo.png' "
-"md5='4b333499555b4e496b1a38f7899067f3'"
-msgstr ""
-"external ref='figures/shotwell_logo.png' "
-"md5='4b333499555b4e496b1a38f7899067f3'"
-
-#. (itstool) path: info/title
-#: C/index.page:6
-msgctxt "link"
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#. (itstool) path: info/title
-#: C/index.page:7
-msgctxt "text"
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#. (itstool) path: credit/name
-#: C/index.page:9
-msgid "Jim Nelson"
-msgstr "Jim Nelson"
-
-#. (itstool) path: credit/name
-#: C/index.page:11
-msgid "Allison Barlow"
-msgstr "Allison Barlow"
-
-#. (itstool) path: credit/name
-#: C/index.page:13
-msgid "Robert Ancell"
-msgstr "Robert Ancell"
-
-#. (itstool) path: credit/name
-#: C/index.page:15
-msgid "Peter Smith"
-msgstr "Peter Smith"
-
-#. (itstool) path: credit/name
-#: C/index.page:17
-msgid "Phil Bull"
-msgstr "Phil Bull"
-
-#. (itstool) path: page/title
-#: C/index.page:23
-msgid ""
-"<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Shotwell Photo "
-"Manager"
-msgstr ""
-"<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Gestor de fotos "
-"Shotwell"
-
-#. (itstool) path: section/title
-#: C/index.page:26
-msgid "Importing Photos"
-msgstr "Importar fotos"
-
-#. (itstool) path: section/title
-#: C/index.page:30
-msgid "Viewing Photos"
-msgstr "Ver fotos"
-
-#. (itstool) path: section/title
-#: C/index.page:34
-msgid "Organizing Photos"
-msgstr "Organizar fotos"
-
-#. (itstool) path: section/title
-#: C/index.page:38
-msgid "Editing Photos"
-msgstr "Editar fotos"
-
-#. (itstool) path: section/title
-#: C/index.page:42
-msgid "Sharing Photos"
-msgstr "Compartir fotos"
-
-#. (itstool) path: section/title
-#: C/index.page:46
-msgid "Other Features"
-msgstr "Otras características"
-
-#. (itstool) path: info/desc
-#: C/organize-event.page:7
-msgid ""
-"Group photos together that were taken at the same time. Learn how to rename, "
-"merge, and sort events."
-msgstr ""
-"Agrupar fotos que se tomadron al mismo tiempo. Aprenda como renombrar, unir "
-"y ordenar eventos."
-
-#. (itstool) path: page/title
-#: C/organize-event.page:12
-msgid "Events"
-msgstr "Eventos"
-
-#. (itstool) path: page/p
-#: C/organize-event.page:14
-msgid ""
-"An event is a group of photos that were taken at approximately the same "
-"time. When you import photos, Shotwell checks when each photo was taken. It "
-"then groups the photos into events."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/organize-event.page:16
-msgid ""
-"Choose <gui>Events</gui> from the sidebar to see your photos organized by "
-"date. If you select a month or year from the sidebar, a list of events will "
-"be displayed in the main window. Double-click an event to see all the photos "
-"that were taken around that time."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/organize-event.page:18
-msgid ""
-"If a photo has no embedded date/time information, then Shotwell can't "
-"automatically place it in any event. In this case the photo will appear in "
-"the <gui>No Event</gui> view accessible from the sidebar. You can still move "
-"the photo to any event you like as described below."
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/organize-event.page:25
-msgid "Renaming events"
-msgstr "Renombrar eventos"
-
-#. (itstool) path: section/p
-#: C/organize-event.page:27
-msgid ""
-"To give an event a name rather than referring to it by its date, select the "
-"event, click <guiseq><gui>Events</gui><gui>Rename Event...</gui></guiseq> "
-"and enter a new name. Another way of renaming an event is to double-click "
-"its name in the sidebar; type a new name and then press <key>Enter</key>."
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/organize-event.page:31
-msgid "Moving photos between events"
-msgstr "Mover fotos entre eventos"
-
-#. (itstool) path: section/p
-#: C/organize-event.page:33
-msgid ""
-"Even though photos are initially grouped into events by their date, you can "
-"move photos between events. To do this, drag any photo to the sidebar and "
-"drop it on an event."
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/organize-event.page:37
-msgid "Creating and merging events"
-msgstr "Crear y combinar eventos"
-
-#. (itstool) path: section/p
-#: C/organize-event.page:38
-msgid ""
-"To create a new event, select the photos you would like in the new event and "
-"click <guiseq><gui>Events</gui><gui>New Event</gui></guiseq>."
-msgstr ""
-"Para crear un evento nuevo, seleccione las fotos que quiere tener en el "
-"evento y pulse <guiseq><gui>Eventos</gui><gui>Nuevo evento</gui></guiseq>."
-
-#. (itstool) path: section/p
-#: C/organize-event.page:39
-msgid ""
-"To merge events, select <guiseq><gui>Events</gui></guiseq> from the sidebar, "
-"then, while holding down <key>Ctrl</key> click on the events you want to "
-"merge in the main window area. Finally, click <guiseq><gui>Events</"
-"gui><gui>Merge Events</gui></guiseq>."
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/organize-event.page:43
-msgid "Sorting events"
-msgstr "Ordenar eventos"
-
-#. (itstool) path: section/p
-#: C/organize-event.page:45
-msgid ""
-"Events are displayed in a tree in the sidebar, organized by the year and "
-"month of the earliest photo in the event. To change the event sort order, "
-"click <guiseq><gui>View</gui><gui>Sort Events</gui></guiseq> and select "
-"either ascending or descending."
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/organize-event.page:51
-msgid "Change the photo used to represent each event"
-msgstr "Cambiar la foto usada para representar cada evento"
-
-#. (itstool) path: section/p
-#: C/organize-event.page:53
-#, fuzzy
-#| msgid ""
-#| "If you select the Events item in the sidebar, you'll see a single photo "
-#| "which represents each event. This is called the key photo."
-msgid ""
-"If you select the <gui>Events</gui> item in the sidebar, you'll see a single "
-"photo which represents each event. This is called the key photo."
-msgstr ""
-"Si selecciona el elemento Eventos en la barra lateral, verá una única foto "
-"que representa cada evento. Esto se denomina «foto clave»."
-
-#. (itstool) path: section/p
-#: C/organize-event.page:55
-msgid ""
-"By default, Shotwell uses the first photo in each event as its key photo. To "
-"use a different key photo, select the photo and choose <guiseq><gui>Photos</"
-"gui><gui>Make Key Photo for Event</gui></guiseq>."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/organize-flag.page:7
-msgid "Flag photos to mark them as special or to work with them as a set."
-msgstr ""
-"Marcar fotos para identificarlas como especiales o para trabajar con ellas "
-"como conjunto."
-
-#. (itstool) path: page/title
-#: C/organize-flag.page:12
-msgid "Flagging photos"
-msgstr "Marcar fotos"
-
-#. (itstool) path: page/p
-#: C/organize-flag.page:14
-msgid ""
-"Shotwell lets you <em>flag</em> photos. When a photo is flagged, a small "
-"flag icon appears in its upper right corner. You can select the "
-"<gui>Flagged</gui> item in the sidebar to see all photos which have been "
-"flagged."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/organize-flag.page:18
-msgid ""
-"Flagging a photo marks it as special. You can interpret this in any way you "
-"like. For example, you might flag all photos which need visual adjustment, "
-"or all photos which you want to share with a friend."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/organize-flag.page:22
-msgid ""
-"Flagging is also useful because you can operate on all flagged photos as a "
-"set. For example, you can select the <gui>Flagged</gui> view and then upload "
-"all flagged photos to a publishing service."
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/organize-flag.page:27
-msgid "To flag or unflag a photo"
-msgstr "Para marcar o desmarcar una foto"
-
-#. (itstool) path: section/p
-#: C/organize-flag.page:28
-msgid ""
-"To flag or unflag a photo, right-click the photo and choose <gui>Flag</gui> "
-"or <gui>Unflag</gui> from the context menu. Or use the <keyseq><key>Ctrl</"
-"key><key>G</key></keyseq> or <key>/</key> shortcut keys."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/organize-rating.page:7
-msgid ""
-"Give photos a rating between 1 and 5 stars. You can reject bad photos, "
-"hiding them from view."
-msgstr ""
-"Asigne a las fotos una puntuación entre 1 y 5. Puede rechazar las fotos "
-"malas, ocultándolas en la vista."
-
-#. (itstool) path: page/title
-#: C/organize-rating.page:12
-msgid "Ratings"
-msgstr "Valoraciones"
-
-#. (itstool) path: page/p
-#: C/organize-rating.page:13
-msgid ""
-"You can assign each photo a rating from 1-5 stars, or may alternatively rate "
-"it as Rejected, in which case Shotwell will hide the photo by default."
-msgstr ""
-"Puede asignar a cada foto una puntuación entre 1 y 5, o marcarla como "
-"rechazada, en cuyo caso Shotwell la ocultará de manera predeterminada."
-
-#. (itstool) path: page/p
-#: C/organize-rating.page:15
-msgid "You can rate a photo or a set of photos in any of these ways:"
-msgstr ""
-"Puede valorar una foto o un conjunto de fotos de cualquiera de estas maneras:"
-
-#. (itstool) path: item/p
-#: C/organize-rating.page:18
-msgid ""
-"Select the photo(s), then choose a rating from the top-level "
-"<guiseq><gui>Photos</gui><gui>Set Rating</gui></guiseq> menu."
-msgstr ""
-"Seleccione las fotos y luego escoja una puntuación en el menú "
-"<guiseq><gui>Foto</gui><gui>Establecer puntuación</gui></guiseq> del nivel "
-"superior."
-
-#. (itstool) path: item/p
-#: C/organize-rating.page:19
-msgid ""
-"Right-click on the photo(s), then choose a rating from the Set Rating "
-"context menu."
-msgstr ""
-"Pulse con el botón derecho en las fotos y luego escoja su puntuación en el "
-"menú contextual «Establecer puntuación»."
-
-#. (itstool) path: item/p
-#: C/organize-rating.page:20
-msgid ""
-"Select the photo(s), then press any of the shortcut keys <key>1</key>, "
-"<key>2</key>, <key>3</key>, <key>4</key> or <key>5</key> to assign a rating. "
-"Or press <key>9</key> to mark the photo(s) as rejected or <key>0</key> to "
-"clear the rating(s)."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/organize-rating.page:23
-msgid ""
-"Normally Shotwell displays all photos except rejected photos. You can set a "
-"different rating filter using the <guiseq><gui>View</gui><gui>Filter Photos</"
-"gui></guiseq> menu - for example, you can display only photos rated with 3 "
-"stars or higher, or you can display all photos including those marked "
-"rejected. The Shotwell icon on the toolbar displays the current rating "
-"filter and can also be used to set the filter."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/organize-rating.page:26
-msgid ""
-"Shotwell normally displays each photo's rating in its lower left-hand "
-"corner. You can turn off the display of ratings using the <guiseq><gui>View</"
-"gui><gui>Ratings</gui></guiseq> menu item."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/organize-rating.page:28
-msgid ""
-"You can increase or decrease a photo's rating using the <guiseq><gui>Set "
-"Rating</gui><gui>Increase</gui></guiseq> and <guiseq><gui>Set Rating</"
-"gui><gui>Decrease</gui></guiseq> commands, or the keyboard shortcuts "
-"<key>&lt;</key> and <key>&gt;</key>."
-msgstr ""
-
-#. (itstool) path: media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/organize-remove.page:15
-msgctxt "_"
-msgid ""
-"external ref='figures/trash_process.png' "
-"md5='ed596bda34c2f4a79a310fbc8bb51fd2'"
-msgstr ""
-"external ref='figures/trash_process.png' "
-"md5='ed596bda34c2f4a79a310fbc8bb51fd2'"
-
-#. (itstool) path: info/desc
-#: C/organize-remove.page:7
-msgid ""
-"Remove photos from the library, or delete them from your computer entirely."
-msgstr "Quitar fotos de la biblioteca, o eliminarlas por completo del equipo."
-
-#. (itstool) path: page/title
-#: C/organize-remove.page:12
-msgid "Removing and deleting photos"
-msgstr "Quitar y eliminar fotos"
-
-#. (itstool) path: page/p
-#: C/organize-remove.page:14
-msgid ""
-"You may remove photos from your library and you may additionally delete them "
-"entirely from your hard disk."
-msgstr ""
-"Puede eliminar las fotos de su biblioteca y también puede eliminarlas de su "
-"disco duro."
-
-#. (itstool) path: page/media
-#: C/organize-remove.page:15
-msgid "Delete process"
-msgstr "Proceso de eliminado"
-
-#. (itstool) path: page/p
-#: C/organize-remove.page:16
-msgid ""
-"This diagram shows how a photo, when deleted, is first put into Shotwell's "
-"trash. If you delete it from Shotwell's trash, it is put into your "
-"computer's trash. If you delete it from your computer's trash the photo is "
-"finally and irretrievably deleted from your computer."
-msgstr ""
-"Este diagrama muestra cómo, cuando se elimina una foto, se pone primero en "
-"la papelera de Shotwell. Si la elimina de la papelera de Shotwell, se mueve "
-"a la papelera de su equipo. Si la elimina de la papelera del equipo, se "
-"eliminará permanentemente."
-
-#. (itstool) path: section/title
-#: C/organize-remove.page:18
-msgid "Removing photos from the library"
-msgstr "Quitar fotos de la biblioteca"
-
-#. (itstool) path: section/p
-#: C/organize-remove.page:19
-msgid ""
-"Select the photos to remove and choose <guiseq><gui>Edit</gui><gui>Move to "
-"Trash</gui></guiseq>. (You can also press the <key>Delete</key> key.) The "
-"photos will be moved from your library to Shotwell's Trash."
-msgstr ""
-"Seleccione las fotos que quiere quitar y elija <guiseq><gui>Editar</"
-"gui><gui>Mover a la papelera</gui></guiseq>. (También puede pulsar la tecla "
-"<key>Supr</key>.) Las fotos se moverán de su biblioteca a la papelera de "
-"Shotwell."
-
-#. (itstool) path: section/p
-#: C/organize-remove.page:22
-msgid ""
-"If you want to remove photos from Shotwell without having them pass through "
-"the trash, simply select the photos to be removed and choose "
-"<guiseq><gui>Edit</gui><gui>Remove From Library</gui></guiseq>. The photo "
-"files will be left in place on disk."
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/organize-remove.page:26
-msgid "Emptying or restoring the trash folder"
-msgstr "Vaciar o restaurar la carpeta de la papelera"
-
-#. (itstool) path: section/p
-#: C/organize-remove.page:27
-msgid ""
-"Select the Trash entry in the Sidebar and Shotwell will display all photos "
-"that have been marked for removal or deletion. In the Trash view, the "
-"following commands are available:"
-msgstr ""
-"Seleccione la entrada de la papelera en la barra lateral y Shotwell mostrará "
-"todas las fotos que se han marcado para quitar o eliminar. En la vista de la "
-"papelera están disponibles los siguientes comandos:"
-
-#. (itstool) path: item/title
-#: C/organize-remove.page:29
-msgid "Delete"
-msgstr "Eliminar"
-
-#. (itstool) path: item/p
-#: C/organize-remove.page:29
-msgid "Delete the selected photos from the trash folder."
-msgstr "Eliminar las fotos seleccionadas de la carpeta de la papelera"
-
-#. (itstool) path: item/title
-#: C/organize-remove.page:30
-msgid "Restore"
-msgstr "Restaurar"
-
-#. (itstool) path: item/p
-#: C/organize-remove.page:30
-msgid "Restore the selected photos into Shotwell."
-msgstr "Restaurar las fotos seleccionadas en Shotwell."
-
-#. (itstool) path: item/title
-#: C/organize-remove.page:31
-msgid "Empty trash"
-msgstr "Vaciar la papelera"
-
-#. (itstool) path: item/p
-#: C/organize-remove.page:31
-msgid "Delete all photos from the trash folder."
-msgstr "Eliminar todas las fotos de la papelera."
-
-#. (itstool) path: section/title
-#: C/organize-remove.page:36
-msgid "Deleting or emptying Trash"
-msgstr "Eliminar o vaciar la papelera"
-
-#. (itstool) path: section/p
-#: C/organize-remove.page:37
-msgid ""
-"When you delete files from the Trash folder or empty the Trash folder, you "
-"will be given the following choices:"
-msgstr ""
-"Cuando elimine archivos de la carpeta Papelera, o cuando la vacíe, se le "
-"ofrecerán las siguientes opciones:"
-
-#. (itstool) path: item/title
-#: C/organize-remove.page:39
-msgid "Only Remove"
-msgstr "Solo eliminar"
-
-#. (itstool) path: item/p
-#: C/organize-remove.page:39
-msgid ""
-"Remove photos from the library but leave the photos in their location on the "
-"computer."
-msgstr ""
-"Quitar fotos de la biblioteca pero mantener las fotos en su ubicación dentro "
-"del equipo."
-
-#. (itstool) path: item/title
-#: C/organize-remove.page:40
-msgid "Trash file"
-msgstr "Archivo de Papelera"
-
-#. (itstool) path: item/p
-#: C/organize-remove.page:40
-msgid "Remove photos from the library and delete them from the computer."
-msgstr "Quitar fotos de la biblioteca y eliminarlas del equipo."
-
-#. (itstool) path: item/title
-#: C/organize-remove.page:41
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. (itstool) path: item/p
-#: C/organize-remove.page:41
-msgid "Do nothing."
-msgstr "No hacer nada."
-
-#. (itstool) path: info/desc
-#: C/organize-search.page:7
-msgid "Find photos and videos in your collection by a variety of criteria."
-msgstr "Buscar fotos y vídeos en su colección siguiendo varios criterios."
-
-#. (itstool) path: page/title
-#: C/organize-search.page:12
-msgid "Searching"
-msgstr "Búsqueda"
-
-#. (itstool) path: page/p
-#: C/organize-search.page:14
-msgid ""
-"There are two ways to search in Shotwell: the filter toolbar, and with a "
-"saved search. The search bar allows you to quickly search the current view "
-"for certain criteria. Saved Searches feature more complex search criteria "
-"and persist in the sidebar between sessions."
-msgstr ""
-
-#. (itstool) path: section/title
-#: C/organize-search.page:21
-msgid "Search bar"
-msgstr "Barra de búsqueda"
-
-#. (itstool) path: section/p
-#: C/organize-search.page:22
-msgid ""
-"The <guiseq><gui>View</gui><gui>Search Bar</gui></guiseq> checkbox toggles "
-"the display of the search bar. You can also hit <keyseq><key>Ctrl</"
-"key><key>F</key></keyseq> or <key>F8</key> to bring up the search bar. From "
-"this bar, you can find, show and hide photos and videos based on title, tag, "
-"rating or other options."
-msgstr ""
-
-#. (itstool) path: section/p
-#: C/organize-search.page:29
-msgid ""
-"To begin searching, simply enter a search keyword in the text box, or click "
-"on <gui>Flagged</gui>, <gui>Rating</gui> or <gui>Type</gui>. The text search "
-"matches your keywords across tag names, photo or video titles and photos' "
-"original filenames. The <gui>Flagged</gui>, <gui>Rating</gui> and <gui>Type</"
-"gui> buttons allow you to filter your collection by whether photos are "
-"flagged, their current number of stars, and whether the items shown are "
-"images, videos, or raw camera files, respectively."
-msgstr ""
-
-#. (itstool) path: section/p
-#: C/organize-search.page:38
-msgid ""
-"Disabling the search bar or exiting Shotwell automatically resets the search "
-"bar."
-msgstr ""
-"Desactivar la barra de búsqueda o salir de Shotwell reinicia automáticamente "
-"la barra de búsqueda."
-
-#. (itstool) path: section/title
-#: C/organize-search.page:44
-msgid "Saved search"
-msgstr "Búsqueda guardada"
-
-#. (itstool) path: section/p
-#: C/organize-search.page:45
-msgid ""
-"A saved search persists across Shotwell sessions, and is updated as photos "
-"and videos are added and removed from your Shotwell library."
-msgstr ""
-"Una búsqueda guardada se mantiene entre sesiones de Shotwell, y se actualiza "
-"con las fotos y vídeos que se añaden o quitan de su biblioteca de Shotwell."
-
-#. (itstool) path: section/p
-#: C/organize-search.page:50
-msgid ""
-"Create a new saved search with <guiseq><gui>Edit</gui><gui>New Saved "
-"Search...</gui></guiseq> or by hitting <keyseq><key>Ctrl</key><key>S</key></"
-"keyseq>. The dialog box allows you to enter a name for the search and select "
-"whether you want to meet Any, All, or None of the criteria in the following "
-"rows."
-msgstr ""
-
-#. (itstool) path: section/p
-#: C/organize-search.page:56
-msgid ""
-"Each row represents a search criterion. Use the <gui>+</gui> button to add "
-"more rows, and the <gui>-</gui> button to remove a specific row. The combo "
-"box on the left of each row selects the type of criteria. Criteria must be "
-"entered correctly before the <gui>OK</gui> button becomes available."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/organize-tag.page:7
-msgid "Organize photos by labelling them."
-msgstr "Organizar las fotos etiquetándolas."
-
-#. (itstool) path: page/title
-#: C/organize-tag.page:14
-msgid "Tagging photos"
-msgstr "Etiquetar fotos"
-
-#. (itstool) path: page/p
-#: C/organize-tag.page:16
-msgid ""
-"You can assign one or more tags to selected photos. A tag can be one or more "
-"words that you want to associate with those photos."
-msgstr ""
-"Puede asignar una o más etiquetas a las fotos seleccionadas. Una etiqueta "
-"puede constar de una o más palabras que quiera asociar a esas fotos."
-
-#. (itstool) path: page/p
-#: C/organize-tag.page:22
-msgid ""
-"To add new tags to photos, select the photos you would like to tag, then do "
-"any of the following:"
-msgstr ""
-"Para añadir etiquetas nuevas a las fotos, seleccione las fotos que quiere "
-"etiquetar y siga estos pasos:"
-
-#. (itstool) path: item/p
-#: C/organize-tag.page:28
-msgid "Choose <guiseq><gui>Tags</gui><gui>Add Tags...</gui></guiseq>."
-msgstr ""
-"Elija <guiseq><gui>Etiquetas</gui><gui>Añadir etiquetas...</gui></guiseq>."
-
-#. (itstool) path: item/p
-#: C/organize-tag.page:29
-msgid "Type <keyseq><key>Ctrl</key><key>T</key></keyseq>."
-msgstr "Pulse <keyseq><key>Ctrl</key><key>T</key></keyseq>."
-
-#. (itstool) path: item/p
-#: C/organize-tag.page:30
-msgid "Drag the selected photos and drop them on the desired tag."
-msgstr "Arrastre las fotos y suéltelas en la etiqueta que quiera."
-
-#. (itstool) path: page/p
-#: C/organize-tag.page:33
-msgid ""
-"When you use <keyseq><key>Ctrl</key><key>T</key></keyseq> or "
-"<guiseq><gui>Tags</gui><gui>Add Tags...</gui></guiseq> you can type in the "
-"names of one or more tags, separated by commas. Once you have created a tag, "
-"you can rename it by selecting that tag in the sidebar and choosing "
-"<guiseq><gui>Tags</gui><gui>Rename Tag \"[name]\"...</gui></guiseq>, by "
-"rightclicking on it and choose <gui>Rename...</gui> or double-click on the "
-"tag in the sidebar."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/organize-tag.page:44
-msgid ""
-"To change which tags are associated with a particular photo, select that "
-"photo, choose <guiseq><gui>Tags</gui><gui>Modify Tags...</gui></guiseq> or "
-"right-click on a photo and select <gui>Modify Tags...</gui> and edit the "
-"comma separated list. To remove a tag from one or more photos, first select "
-"that tag in the sidebar, then select the photos you would like to remove, "
-"and choose <guiseq><gui>Tags</gui><gui>Remove Tag \"[name]\" from Photos</"
-"gui></guiseq> or right-click on the photos an select <gui>Remove Tag "
-"\"[name]\" from Photos</gui>."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/organize-tag.page:58
-msgid ""
-"To delete a tag entirely, select that tag in the sidebar and choose "
-"<guiseq><gui>Tags</gui><gui>Delete Tag \"[name]\"</gui></guiseq> or by right-"
-"click and select <gui>Delete Tag \"[name]\"</gui>."
-msgstr ""
-"Para eliminar por completo una etiqueta, selecciónela en la barra latera y "
-"elija <guiseq><gui>Etiquetas</gui><gui>Eliminar etiqueta «nombre»</gui></"
-"guiseq> o púlsela con el botón derecho y elija <gui>Eliminar etiqueta "
-"«nombre»</gui>."
-
-#. (itstool) path: page/p
-#: C/organize-tag.page:64
-#, fuzzy
-#| msgid ""
-#| "The <gui>Tags</gui> folder lists all tags you've assigned to photos. "
-#| "Photos can have multiple tags attached to them. When you click on the "
-#| "name of a tag in the sidebar, you will see all the photos associated with "
-#| "that tag."
-msgid ""
-"When you create a tag, it will appear in the sidebar under the <gui>Tags</"
-"gui> item, which is hidden if there are no tags. Photos can have multiple "
-"tags attached to them, and when you click on the name of a given tag in the "
-"sidebar, you will see all the photos associated with that tag."
-msgstr ""
-"La carpeta <gui>Etiquetas</gui> lista todas las etiquetas que ha asignado a "
-"sus fotos. Las fotos pueden tener múltiples etiquetas relacionadas con las "
-"mismas. Cuando posiciona el cursor sobre el nombre de una etiqueta en la "
-"barra lateral, podrá ver todas las fotos asociadas a esa etiqueta."
-
-#. (itstool) path: section/title
-#: C/organize-tag.page:73
-msgid "Hierarchical Tags"
-msgstr "Etiquetas jerárquicas"
-
-#. (itstool) path: section/p
-#: C/organize-tag.page:74
-msgid ""
-"Shotwell supports also hierarchial tags. You can rearrange your tags by drag "
-"and drop a tag onto another. To create a new subtag right-click on a tag and "
-"select <gui>New</gui>."
-msgstr ""
-"Shotwell también soporta etiquetas jerárquicas. Puede reordenar sus "
-"etiquetas arrastrando y soltando una etiqueta sobre otra. Para crear una "
-"etiqueta hija nueva, pulse con el botón derecho sobre una etiqueta y elija "
-"<gui>Nuevo</gui>."
-
-#. (itstool) path: section/p
-#: C/organize-tag.page:81
-msgid ""
-"Hierarchial tags can help you to sort your tag list in ways that better "
-"match how you work or think; for example, you can store location tags like "
-"\"Mountains\" or \"Beach\" under a parent tag \"Places\", which itself can "
-"be placed under the tag \"Summer Holidays\"."
-msgstr ""
-"Las etiquetas jerárquicas le pueden ayudar a ordenar su lista de etiquetas "
-"de manera que se ajuste a mejor a lo que necesita; por ejemplo, puede tener "
-"las etiquetas «Montañas» o «Playa» dentro de la etiqueta «Lugares», que a su "
-"vez puede estar dentro de la etiqueta «Vacaciones de verano»."
-
-#. (itstool) path: section/p
-#: C/organize-tag.page:89
-msgid "Note that deleting a parent tag will also delete its child tags."
-msgstr ""
-"Tenga en cuenta que al eliminar una etiqueta padre también se eliminarán las "
-"etiquetas hijas."
-
-#. (itstool) path: info/desc
-#: C/organize-title.page:7
-msgid "Give titles to your photos."
-msgstr "Asignar títulos a las fotos."
-
-#. (itstool) path: page/title
-#: C/organize-title.page:12
-msgid "Titles"
-msgstr "Títulos"
-
-#. (itstool) path: page/p
-#: C/organize-title.page:14
-msgid ""
-"The <guiseq><gui>View</gui><gui>Titles</gui></guiseq> checkbox toggles the "
-"display of titles beneath each photo. By default, a photo's title is its "
-"filename."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/organize-title.page:17
-#, fuzzy
-#| msgid ""
-#| "To change a photo's title, select the photo and click "
-#| "<guiseq><gui>Photos</gui><gui>Edit Title</gui></guiseq>, or press "
-#| "<key>F2</key>."
-msgid ""
-"To change a photo's title, select the photo and click <guiseq><gui>Photos</"
-"gui><gui>Edit Title...</gui></guiseq>, or press <key>F2</key>."
-msgstr ""
-"Para cambiar el título de una foto, selecciónela y pulse <guiseq><gui>Fotos</"
-"gui><gui>Editar título</gui></guiseq>, o pulse <key>F2</key>."
-
-#. (itstool) path: info/desc
-#: C/other-files.page:7
-msgid "Keep the Shotwell library in sync with photo files on disk."
-msgstr ""
-"Mantener la biblioteca de Shotwell sincronizada con los archivos de fotos "
-"del disco."
-
-#. (itstool) path: page/title
-#: C/other-files.page:12
-msgid "Photo files"
-msgstr "Archivos de fotos"
-
-#. (itstool) path: page/p
-#: C/other-files.page:14
-msgid ""
-"Every photo in the Shotwell library corresponds to a file stored on your "
-"hard disk. Shotwell has several features which help you keep the Shotwell "
-"library and files on disk in sync."
-msgstr ""
-"Cada foto de la biblioteca de Shotwell se corresponde con un archivo "
-"almacenado en su disco duro. Shotwell tienen varias características que le "
-"ayudan a mantener su biblioteca y los archivos del disco sincronizados."
-
-#. (itstool) path: section/title
-#: C/other-files.page:21
-msgid "Using a custom directory pattern"
-msgstr "Usar un patrón de carpeta predeterminado"
-
-#. (itstool) path: section/p
-#: C/other-files.page:22
-msgid ""
-"Shotwell allows you to specify how it names directories in your library. You "
-"can do this by changing the <gui>Directory Structure</gui> and <gui>Pattern</"
-"gui> settings in the <gui>Preferences</gui> dialog. You may use a "
-"preselected pattern, or choose <gui>Custom</gui> and type in your own."
-msgstr ""
-"Shotwell le permite especificar como llamar a sus carpetas en una "
-"biblioteca. Puede hacer esto cambiando las configuraciones de "
-"<gui>Estructura del directorio</gui> y <gui>Patrón</gui> en el cuadro de "
-"diálogo <gui>Preferencias</gui>. Puede utilizar un patrón preseleccionado, o "
-"escoger <gui>Personalizado</gui> y escribir el suyo."
-
-#. (itstool) path: section/p
-#: C/other-files.page:29
-msgid ""
-"The available symbols for the directory pattern begin with a % (percent "
-"sign). The values these symbols produce are locale-dependent, so what you "
-"see on your computer may vary from the examples below."
-msgstr ""
-"Los símbolos disponibles para los patrones de carpetas empiezan por "
-"«%» (signo de porcentaje). Los valores que estos símbolos producen dependen "
-"de la configuración regional, por lo que lo que vea en su equipo puede ser "
-"diferente a estos ejemplos."
-
-#. (itstool) path: td/p
-#: C/other-files.page:38
-msgid "<em>Symbol</em>"
-msgstr "<em>Símbolo</em>"
-
-#. (itstool) path: td/p
-#: C/other-files.page:38
-msgid "<em>Meaning</em>"
-msgstr "<em>Significado</em>"
-
-#. (itstool) path: td/p
-#: C/other-files.page:38
-msgid "<em>Example</em>"
-msgstr "<em>Ejemplo</em>"
-
-#. (itstool) path: td/p
-#: C/other-files.page:43
-msgid "%Y"
-msgstr "%Y"
-
-#. (itstool) path: td/p
-#: C/other-files.page:43
-msgid "Year: full"
-msgstr "Año: completo"
-
-#. (itstool) path: td/p
-#: C/other-files.page:43
-msgid "2011"
-msgstr "2011"
-
-#. (itstool) path: td/p
-#: C/other-files.page:46
-msgid "%y"
-msgstr "%y"
-
-#. (itstool) path: td/p
-#: C/other-files.page:46
-msgid "Year: two digit"
-msgstr "Año: dos dígitos"
-
-#. (itstool) path: td/p
-#: C/other-files.page:46
-msgid "11"
-msgstr "11"
-
-#. (itstool) path: td/p
-#: C/other-files.page:49
-msgid "%d"
-msgstr "%d"
-
-#. (itstool) path: td/p
-#: C/other-files.page:49
-msgid "Day of the month with leading zero"
-msgstr "Día del mes, empezando por cero"
-
-#. (itstool) path: td/p
-#: C/other-files.page:49
-msgid "03"
-msgstr "03"
-
-#. (itstool) path: td/p
-#: C/other-files.page:52
-msgid "%A"
-msgstr "%A"
-
-#. (itstool) path: td/p
-#: C/other-files.page:52
-msgid "Day name: full"
-msgstr "Nombre del día: completo"
-
-#. (itstool) path: td/p
-#: C/other-files.page:52
-msgid "Wednesday"
-msgstr "Miércoles"
-
-#. (itstool) path: td/p
-#: C/other-files.page:55
-msgid "%a"
-msgstr "%a"
-
-#. (itstool) path: td/p
-#: C/other-files.page:55
-msgid "Day name: abbreviated"
-msgstr "Nombre del día: abreviado"
-
-#. (itstool) path: td/p
-#: C/other-files.page:55
-msgid "Wed"
-msgstr "Mié"
-
-#. (itstool) path: td/p
-#: C/other-files.page:58
-msgid "%m"
-msgstr "%m"
-
-#. (itstool) path: td/p
-#: C/other-files.page:58
-msgid "Month number with leading zero"
-msgstr "Número de mes, empezando por cero"
-
-#. (itstool) path: td/p
-#: C/other-files.page:58
-msgid "02"
-msgstr "02"
-
-#. (itstool) path: td/p
-#: C/other-files.page:60
-msgid "%b"
-msgstr "%b"
-
-#. (itstool) path: td/p
-#: C/other-files.page:60
-msgid "Month name: abbreviated"
-msgstr "Nombre del mes: abreviado"
-
-#. (itstool) path: td/p
-#: C/other-files.page:60
-msgid "Feb"
-msgstr "Feb"
-
-#. (itstool) path: td/p
-#: C/other-files.page:62
-msgid "%B"
-msgstr "%B"
-
-#. (itstool) path: td/p
-#: C/other-files.page:62
-msgid "Month name: full"
-msgstr "Nombre del mes: completo"
-
-#. (itstool) path: td/p
-#: C/other-files.page:62
-msgid "February"
-msgstr "Febrero"
-
-#. (itstool) path: td/p
-#: C/other-files.page:63
-msgid "%I"
-msgstr "%I"
-
-#. (itstool) path: td/p
-#: C/other-files.page:63
-msgid "Hour: 12 hour format"
-msgstr "Hora: formato de 12 horas"
-
-#. (itstool) path: td/p
-#: C/other-files.page:63
-msgid "05"
-msgstr "05"
-
-#. (itstool) path: td/p
-#: C/other-files.page:64
-msgid "%H"
-msgstr "%H"
-
-#. (itstool) path: td/p
-#: C/other-files.page:64
-msgid "Hour: 24 hour format"
-msgstr "Hora: formato de 24 horas"
-
-#. (itstool) path: td/p
-#: C/other-files.page:64
-msgid "17"
-msgstr "17"
-
-#. (itstool) path: td/p
-#: C/other-files.page:66
-msgid "%M"
-msgstr "%M"
-
-#. (itstool) path: td/p
-#: C/other-files.page:66
-msgid "Minute"
-msgstr "Minuto"
-
-#. (itstool) path: td/p
-#: C/other-files.page:66
-msgid "16"
-msgstr "16"
-
-#. (itstool) path: td/p
-#: C/other-files.page:67
-msgid "%S"
-msgstr "%S"
-
-#. (itstool) path: td/p
-#: C/other-files.page:67
-msgid "Second"
-msgstr "Segundo"
-
-#. (itstool) path: td/p
-#: C/other-files.page:67
-msgid "30"
-msgstr "30"
-
-#. (itstool) path: td/p
-#: C/other-files.page:68
-msgid "%p"
-msgstr "%p"
-
-#. (itstool) path: td/p
-#: C/other-files.page:68
-msgid "AM or PM"
-msgstr "AM o PM"
-
-#. (itstool) path: td/p
-#: C/other-files.page:68
-msgid "PM"
-msgstr "PM"
-
-#. (itstool) path: section/p
-#: C/other-files.page:72
-msgid ""
-"There are other symbols available; please check the manual for strftime by "
-"running the command <cmd>man strftime</cmd> if you need one that isn't "
-"listed here."
-msgstr ""
-"Existen otros símbolos disponibles, revise el manual de strftime ejecutando "
-"el comando <cmd>man strftime</cmd> si necesita alguno que no esté listado "
-"aquí."
-
-#. (itstool) path: section/title
-#: C/other-files.page:79
-msgid "Automatically importing photos"
-msgstr "Importar fotos automáticamente"
-
-#. (itstool) path: section/p
-#: C/other-files.page:81
-msgid ""
-"Shotwell can automatically import new photos which appear in the library "
-"directory. (The library directory is usually the <file>Pictures</file> "
-"directory in your home directory; you can change its location in in the "
-"<gui>Preferences</gui> window.)"
-msgstr ""
-"Shotwell puede automáticamente importar nuevas fotos que aparezcan en la "
-"carpeta de la biblioteca. (La carpeta de la biblioteca está usualmente en la "
-"carpeta <file>Imágenes</file> en su carpeta local; puede cambiar esta "
-"ubicación en la ventana <gui>Preferencias</gui>.)"
-
-#. (itstool) path: section/p
-#: C/other-files.page:86
-msgid ""
-"To enable auto-import, check the box <gui>Watch library directory for new "
-"files</gui> in the <gui>Preferences</gui> window."
-msgstr ""
-"Para activar la importación automática, marca la opción <gui>Vigilar mi "
-"colección en búsqueda de archivos nuevos</gui> en la ventana "
-"<gui>Preferencias</gui>."
-
-#. (itstool) path: note/p
-#: C/other-files.page:90
-msgid ""
-"Shotwell can also follow symbolic links inside automatically-imported "
-"directories."
-msgstr ""
-"Shotwell también puede seguir los enlaces simbólicos en carpetas importadas "
-"automáticamente."
-
-#. (itstool) path: section/title
-#: C/other-files.page:95
-msgid "Automatically renaming imported photos to lowercase"
-msgstr "Renombrar a minúsculas automáticamente las fotos importadas"
-
-#. (itstool) path: section/p
-#: C/other-files.page:97
-msgid ""
-"Shotwell can automatically change the filenames of imported photos to "
-"lowercase. To enable this, choose <guiseq><gui>Edit</gui><gui>Preferences</"
-"gui></guiseq>, and in the <gui>Preferences</gui> window, check the "
-"<gui>Rename imported files to lowercase</gui> box."
-msgstr ""
-"Shotwell puede cambiar automáticamente los nombres de las fotos importadas a "
-"minúsculas. Para activar esto, escoja <guiseq><gui>Editar</"
-"gui><gui>Preferencias</gui></guiseq>, y en la ventana de <gui>Preferencias</"
-"gui>, marque la casilla <gui>Renombrar los archivos importados a minúsculas</"
-"gui>."
-
-#. (itstool) path: section/title
-#: C/other-files.page:107
-msgid "Writing metadata on the fly"
-msgstr "Escribir metadatos al vuelo"
-
-#. (itstool) path: section/p
-#: C/other-files.page:109
-msgid ""
-"By default, Shotwell does not modify photo files, even when you edit photos "
-"or change their tags or titles. Shotwell records these changes in its own "
-"database only."
-msgstr ""
-"De manera predeterminada, Shotwell no modifica los archivos de fotos, aunque "
-"las edite o cambie sus etiquetas o títulos. Shotwell guardará estos cambios "
-"únicamente en su propia base de datos."
-
-#. (itstool) path: section/p
-#: C/other-files.page:112
-msgid ""
-"To change this behavior, you can enable the checkbox <gui>Write tags, titles "
-"and other metadata to photo files</gui> in the <gui>Preferences</gui> "
-"dialog. When this option is enabled, Shotwell will write the following "
-"metadata to most photo files whenever you change it in Shotwell:"
-msgstr ""
-"Para cambiar este comportamiento, puede activar la casilla <gui>Escribir "
-"etiquetas, títulos y otros metadatos a los archivos</gui> en el cuadro de "
-"diálogo <gui>Preferencias</gui>. Cuando esta opción se activa, Shotwell "
-"escribirá los siguientes metadatos a la mayoría de los archivos cada vez que "
-"los modifique en Shotwell."
-
-#. (itstool) path: item/p
-#: C/other-files.page:118
-msgid "titles"
-msgstr "títulos"
-
-#. (itstool) path: item/p
-#: C/other-files.page:119
-msgid "tags"
-msgstr "etiquetas"
-
-#. (itstool) path: item/p
-#: C/other-files.page:120
-msgid "ratings"
-msgstr "valoraciones"
-
-#. (itstool) path: item/p
-#: C/other-files.page:121
-msgid "rotation information"
-msgstr "información de rotación"
-
-#. (itstool) path: item/p
-#: C/other-files.page:122
-msgid "time/date"
-msgstr "fecha/hora"
-
-#. (itstool) path: section/p
-#: C/other-files.page:125
-msgid ""
-"Shotwell stores this information in photo files in EXIF, IPTC and/or XMP "
-"format. Note that Shotwell can write only to photo files in JPEG, PNG and "
-"TIFF format, not to BMP photos, RAW photos or to video files."
-msgstr ""
-"Shotwell almacena esta información en archivos de fotos en formato EXIF, "
-"IPTC y/o XMP. Tenga en cuenta que Shotwell sólo puede escribir en archivos "
-"de fotos en formato JPEG, PNG y TIFF, no en fotos en BMP, RAW o en archivos "
-"de vídeo."
-
-#. (itstool) path: section/title
-#: C/other-files.page:133
-msgid "Runtime monitoring"
-msgstr "Monitorizazión en tiempo de ejecución"
-
-#. (itstool) path: section/p
-#: C/other-files.page:135
-msgid ""
-"While Shotwell is running, it notices changes made to any photo file "
-"externally. When a photo file changes, Shotwell rereads the file and updates "
-"your view of the photo and metadata."
-msgstr ""
-"Mientras Shotwell está en ejecución, tiene en cuenta los cambios realizados "
-"en un archivo de una foto externamente. Cuando el archivo cambia, Shotwell "
-"vuelve a leer el archivo y actualiza la vista de la foto y sus metadatos."
-
-#. (itstool) path: section/p
-#: C/other-files.page:139
-msgid ""
-"Note that Shotwell checks all photo files for changes at startup, but only "
-"photo files contained in the library directory are monitored in real time "
-"after startup. We hope to remove this limitation in a further release."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/other-missing.page:7
-msgid "If Shotwell can't find a photo in your library, it marks it as missing."
-msgstr ""
-"Si Shotwell no puede encontrar una foto en su biblioteca, la marca como "
-"ausente."
-
-#. (itstool) path: page/title
-#: C/other-missing.page:12
-msgid "Missing photos"
-msgstr "Fotos ausentes"
-
-#. (itstool) path: page/p
-#: C/other-missing.page:14
-msgid ""
-"Each time Shotwell starts up, it scans your photo library to verify that all "
-"photo files still exist on your hard drive. If Shotwell finds that any photo "
-"files are missing, it will not display them in the normal Photos, Events and "
-"Tags views, but will instead show them in a separate Missing Files view "
-"which will appear in the sidebar."
-msgstr ""
-"Cada vez que Shotwell se inicia, analiza su biblioteca de fotos para "
-"verificar que todos los archivos de fotos siguen existiendo en el disco "
-"duro. Si Shotwell encuentra que falta alguna foto, no la mostrará en las "
-"vistas normales de Fotos, Eventos o Etiquetas, sino que la mostrará en una "
-"vista de Fotos ausentes separada que aparecerá en la barra lateral."
-
-#. (itstool) path: page/p
-#: C/other-missing.page:16
-msgid ""
-"If you no longer want the missing files to be part of your Shotwell "
-"collection (perhaps because you deleted them), go to the Missing Files view, "
-"select the photos and then click <gui>Remove From Library</gui>."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/other-missing.page:18
-msgid ""
-"If you have photos on a removable disk, such as a CD or USB flash drive, and "
-"<link xref=\"index#import\">import</link> them into Shotwell <em>without</"
-"em> copying the photos to your computer, they will show up as missing files "
-"if you then disconnect the removable disk. See <link xref=\"import-file\"/> "
-"to learn how to copy files from removable disks onto your computer."
-msgstr ""
-"Si tiene fotos en un disco externo, como un CD o un pendrive USB y las <link "
-"xref=\"index#import\">importa</link> en Shotwell <em>sin</em> copiarlas al "
-"equipo, se mostrarán como archivos ausentes cuando desconecte el disco "
-"extraíble. Consulte la <link xref=\"import-file\"/> para aprender cómo "
-"copiar archivos desde discos extraíbles a su equipo."
-
-#. (itstool) path: page/p
-#: C/other-missing.page:20
-msgid ""
-"If any missing photo files become available again, Shotwell will notice this "
-"the next time it starts. The photos will once again appear in the Photos, "
-"Events and Tags views."
-msgstr ""
-"Si una foto ausente vuelve a estar disponible, Shotwell lo tendrá en cuenta "
-"la próxima vez que se inicie. Las fotos volverán a aparecer en las vistas de "
-"Fotos, Eventos y Etiquetas."
-
-#. (itstool) path: info/desc
-#: C/other-multiple.page:7
-msgid ""
-"You can open Shotwell with a different photo library by using the command "
-"line."
-msgstr ""
-"Puede abrir Shotwell con una biblioteca de fotos diferente usando la línea "
-"de comandos."
-
-#. (itstool) path: page/title
-#: C/other-multiple.page:12
-msgid "Multiple libraries"
-msgstr "Varias bibliotecas"
-
-#. (itstool) path: page/p
-#: C/other-multiple.page:14
-msgid ""
-"Shotwell normally stores its database and photo thumbnails in the directory "
-"<file>~/.shotwell</file> . This directory does not hold photos, but the "
-"database in this directory contains a list of all the photos in the Shotwell "
-"library."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/other-multiple.page:16
-msgid ""
-"As an advanced feature, it's possible for you to have multiple Shotwell "
-"libraries, each of which has its own set of photos. Each library needs its "
-"own database directory. To launch Shotwell with an alternate library, "
-"specify an alternate database directory on the command line as follows:"
-msgstr ""
-"Como característica avanzada, es posible tener varias bibliotecas de "
-"Shotwell, cada una de ellas con su propio conjunto de fotos. Cada biblioteca "
-"necesita su propia carpeta de base de datos. Para ejecutar Shotwell con una "
-"biblioteca diferente, especifique una base de datos alternativa en la línea "
-"de comandos como sigue:"
-
-#. (itstool) path: page/screen
-#: C/other-multiple.page:18
-#, no-wrap
-msgid ""
-"\n"
-"shotwell -d [library-directory]\n"
-msgstr ""
-"\n"
-"shotwell -d [carpeta-biblioteca]\n"
-
-#. (itstool) path: info/desc
-#: C/other-plugins.page:7
-msgid "Extend Shotwell's functionality dynamically."
-msgstr "Ampliar la funcionalidad de Shotwell dinámicamente."
-
-#. (itstool) path: page/title
-#: C/other-plugins.page:12
-msgid "Plugins"
-msgstr "Complementos"
-
-#. (itstool) path: page/p
-#: C/other-plugins.page:13
-msgid ""
-"Shotwell can be used with <em>plugins</em>, which are companion shared "
-"libraries that can add support for new publishing destinations or new "
-"slideshow transitions."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/other-plugins.page:18
-msgid ""
-"To see a list of installed plugins, choose <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui></guiseq>, and in the <gui>Preferences</gui> "
-"window, click on the <gui>Plugins</gui> tab. You'll see a list of currently-"
-"installed plugins, each with a checkbox by it, and you may enable or disable "
-"each by selecting or deselecting the checkbox by its name."
-msgstr ""
-"Para ver una lista de los complementos instalados, elija "
-"<guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>, y en la ventana "
-"de <gui>Preferencias</gui> pulse en la pestaña <gui>Complementos</gui>. Verá "
-"una lista de los complementos actualmente instalados, cada uno con una "
-"casilla mediante la que puede activarlos o desactivarlos por su nombre."
-
-#. (itstool) path: note/p
-#: C/other-plugins.page:25
-msgid ""
-"Full documentation on how to develop new plugins is available at <link href="
-"\"http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins"
-"\">http://redmine.yorba.org/projects/shotwell/wiki/"
-"ShotwellArchWritingPlugins</link>"
-msgstr ""
-"La documentación completa sobre cómo desarrollar nuevos complementos está "
-"disponible en <link href=\"http://redmine.yorba.org/projects/shotwell/wiki/"
-"ShotwellArchWritingPlugins\">http://redmine.yorba.org/projects/shotwell/wiki/"
-"ShotwellArchWritingPlugins</link>"
-
-#. (itstool) path: info/desc
-#: C/raw.page:7
-msgid "More about RAW support in Shotwell."
-msgstr "Más sobre el soporte RAW en Shotwell."
-
-#. (itstool) path: page/title
-#: C/raw.page:12
-msgid "RAW support in Shotwell"
-msgstr "Soporte de RAW en Shotwell"
-
-#. (itstool) path: page/p
-#: C/raw.page:13
-msgid ""
-"Some cameras have the ability to store data directly off the sensor and into "
-"a file that contains extra color information; this is commonly referred to "
-"as 'RAW' or 'camera RAW', and Shotwell supports these files as well."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/raw.page:18
-msgid ""
-"Since RAW photographs normally cannot be displayed directly, but must be "
-"first developed - that is, have their extra information interpreted and "
-"readied for displaying - most cameras will either embed a JPEG inside a RAW-"
-"format file, or produce a JPEG alongside the RAW file at the time the "
-"snapshot is taken. The latter is referred to throughout this document as RAW"
-"+JPEG. If you import a RAW+JPEG pair, Shotwell will keep them paired and "
-"treat them as one item in your library."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/raw.page:27
-msgid ""
-"When you import a RAW file, you can choose to either use the camera's "
-"internally-developed JPEG or Shotwell's by selecting <guiseq><gui>Photos</"
-"gui><gui>Developer</gui></guiseq> in the menus."
-msgstr ""
-
-#. (itstool) path: note/p
-#: C/raw.page:33
-msgid ""
-"Changing between developers will cause all edits made to a photograph to be "
-"discarded."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/raw.page:39
-msgid ""
-"In order to publish or use a RAW photograph in most other software, it has "
-"to be exported first. Shotwell can export your RAW photos in JPEG, PNG, TIFF "
-"or BMP format, and, when publishing, will internally export a JPEG version "
-"for you and publish that."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/running.page:7
-msgid ""
-"Find Shotwell in the Applications menu, or have it start automatically when "
-"you plug in a camera."
-msgstr ""
-"Busque Shotwell en el menú Aplicaciones o haga que se inicie automáticamente "
-"cuando conecta una cámara."
-
-#. (itstool) path: page/title
-#: C/running.page:14
-msgid "Running Shotwell"
-msgstr "Ejecutar Shotwell"
-
-#. (itstool) path: page/p
-#: C/running.page:16
-msgid ""
-"Once installed, Shotwell is available in your <gui>Applications</gui> menu "
-"under <gui>Graphics</gui> or <gui>Photography</gui>."
-msgstr ""
-"Una vez instalado, Shotwell estará disponible en su menú <gui>Aplicaciones</"
-"gui>, en <gui>Gráficos</gui> o en <gui>Fotografía</gui>."
-
-#. (itstool) path: page/p
-#: C/running.page:18
-msgid ""
-"Shotwell may also be executed automatically when a camera is plugged in to "
-"your computer. To check that your system is set up to run Shotwell when a "
-"camera is detected, go to <guiseq><gui>Edit</gui><gui>Preferences</gui></"
-"guiseq> in any Nautilus (file browser) window and choose the <gui>Media</"
-"gui> tab.  You'll see a dropdown box entitled <gui>Photos:</gui> which lets "
-"you choose Shotwell as your photo handling application."
-msgstr ""
-
-#. (itstool) path: note/p
-#: C/running.page:25
-msgid ""
-"Shotwell may also be executed directly from its build directory, although "
-"this is only recommended for testing out Shotwell or for developers."
-msgstr ""
-"También puede ejecutar Shotwell directamente desde la carpeta en la que se "
-"construyó, pero esto sólo se recomienda para probar Shotwell o para "
-"desarrolladores."
-
-#. (itstool) path: info/desc
-#: C/share-background.page:7
-msgid ""
-"Set your desktop background to a single photo or to a slideshow of photos."
-msgstr ""
-"Configure su fondo de escritorio como una única foto o como una presentación "
-"de fotos."
-
-#. (itstool) path: page/title
-#: C/share-background.page:12
-msgid "Set a desktop background or slideshow"
-msgstr "Configurar un fondo de escritorio o presentación"
-
-#. (itstool) path: page/p
-#: C/share-background.page:14
-msgid ""
-"To set a single photo as your desktop background, select the photo and "
-"choose <guiseq><gui>File</gui><gui>Set as Desktop Background</gui></guiseq>."
-msgstr ""
-"Para establecer una única foto como fondo del escritorio, seleccione la foto "
-"y escriba <guiseq><gui>Archivo</gui><gui>Establecer como fondo del "
-"escritorio</gui></guiseq>."
-
-#. (itstool) path: page/p
-#: C/share-background.page:16
-msgid ""
-"You can also set your background to a slideshow of photos. To do this, "
-"select the photos for the slideshow and choose <guiseq><gui>File</"
-"gui><gui>Set as Desktop Slideshow...</gui></guiseq>. Shotwell will prompt "
-"you for a slideshow delay, which can be any interval up to one day in "
-"length. The background slideshow will proceed even when Shotwell is not "
-"running."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/share-export.page:7
-msgid "Copy photos out of Shotwell so you can put them somewhere else."
-msgstr ""
-"Copiar fotos fuera Shotwell, para poder ponerlas en cualquier otro lugar."
-
-#. (itstool) path: page/title
-#: C/share-export.page:12
-msgid "Exporting photos"
-msgstr "Exportar fotos"
-
-#. (itstool) path: page/p
-#: C/share-export.page:14
-msgid ""
-"To export photos from Shotwell via drag and drop, drag the photos from "
-"Shotwell onto a file manager window or your desktop. The new files will be "
-"full-sized copies of the photos in your library."
-msgstr ""
-"Para exportar fotos desde Shotwell usando arrastrar y soltar, arrastre desde "
-"Shotwell hacia una ventana de manejador de archivos o su escritorio. Los "
-"archivos nuevos serán copias de tamaño completo de las fotos de su "
-"biblioteca."
-
-#. (itstool) path: page/p
-#: C/share-export.page:18
-msgid ""
-"Alternatively, select a set of photos and choose the <guiseq><gui>File</"
-"gui><gui>Export...</gui></guiseq> command or press <keyseq><key>Shift</"
-"key><key>Ctrl</key><key>E</key></keyseq>, which exports photos while letting "
-"you fine-tune the size and dimensions of your photo files. A window will "
-"appear allowing you to make several choices:"
-msgstr ""
-
-#. (itstool) path: item/p
-#: C/share-export.page:24
-msgid "A format for export."
-msgstr "Un formato al que exportar."
-
-#. (itstool) path: item/p
-#: C/share-export.page:27
-msgid ""
-"Choose <gui>Unmodified</gui> to export photos in their original format "
-"without any edits made in Shotwell. RAW photos will be exported in their "
-"original RAW format."
-msgstr ""
-"Selecione <gui>Sin modificar</gui> para exportar las fotos en su formato "
-"original, sin ninguna modificación hecha en Shotwell. Las fotos en bruto se "
-"exportarán en su formato original."
-
-#. (itstool) path: item/p
-#: C/share-export.page:29
-msgid ""
-"Choose <gui>Current</gui> to export photos including edits made in Shotwell. "
-"RAW photos will be exported in JPEG format if you have edited them in "
-"Shotwell, and otherwise in their original RAW format."
-msgstr ""
-"Escoja <gui>Actual</gui> para exportar las fotos, incluyendo las editadas en "
-"Shotwell. Las fotos en bruto se exportarán en formato JPEG si las editó en "
-"Shotwell, y si no en su formato en bruto original."
-
-#. (itstool) path: item/p
-#: C/share-export.page:31
-msgid ""
-"Or you can choose a particular image format (JPEG, PNG, TIFF, BMP) to be "
-"used for exporting. Any edits made in Shotwell will be included, and "
-"Shotwell will convert photos to the destination format."
-msgstr ""
-"O puede seleccionar un formato de imagen específico (JPEG, PNG,TIFF, BMP) "
-"para usar en la exportación. Cualquier edición hecha en Shotwell se "
-"incluirá, y Shotwel convertirá las fotos al formato de destino."
-
-#. (itstool) path: item/p
-#: C/share-export.page:37
-msgid "The image quality for exporting (Low, Medium, High, or Maximum)."
-msgstr "La calidad de la imagen al exportarla (baja, media, alta o máxima)."
-
-#. (itstool) path: item/p
-#: C/share-export.page:38
-msgid ""
-"A scaling constraint (which means how Shotwell will decide to scale the "
-"photos down), and the desired pixel size."
-msgstr ""
-"Una restricción de la escala (que significa cómo Shotwell va a decidir "
-"reducir la escala proporcionalmente), y el tamaño de píxel requerido."
-
-#. (itstool) path: item/p
-#: C/share-export.page:39
-msgid ""
-"The option whether you like to export metadatas such as tags or ratings. "
-"This can help to save your privacy if you have geolocation tags or tags "
-"which shouldn't be seen by anyone."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/share-export.page:42
-msgid ""
-"If selected, Shotwell will write tags, titles, and other metadata to the new "
-"files."
-msgstr ""
-"Si está seleccionada, Shotwell escribirá etiquetas, títulos y otros "
-"metadatos a los nuevos archivos."
-
-#. (itstool) path: info/desc
-#: C/share-print.page:7
-msgid ""
-"Click <guiseq><gui>File</gui><gui>Print...</gui></guiseq>. For more printing "
-"options, select the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog."
-msgstr ""
-"Pulse <guiseq><gui>Archivo</gui><gui>Imprimir...</gui></guiseq>. Para más "
-"opciones de impresión, seleccione la pestaña <gui>Configuración de página</"
-"gui> en el diálogo <gui>Imprimir</gui>."
-
-#. (itstool) path: page/title
-#: C/share-print.page:12
-msgid "Printing"
-msgstr "Imprimir"
-
-#. (itstool) path: page/p
-#: C/share-print.page:14
-#, fuzzy
-#| msgid ""
-#| "To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print</"
-#| "gui></guiseq>."
-msgid ""
-"To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print...</"
-"gui></guiseq>."
-msgstr ""
-"Para imprimir una foto, selecciónela y elija <guiseq><gui>Archivo</"
-"gui><gui>Imprimir</gui></guiseq>."
-
-#. (itstool) path: page/p
-#: C/share-print.page:16
-#, fuzzy
-#| msgid ""
-#| "Shotwell can also print multiple images in one page; to do this, select "
-#| "multiple images, choose <guiseq><gui>File</gui><gui>Print</gui></guiseq>, "
-#| "and in the <gui>Print</gui> dialog, choose the <gui>Image Settings</gui> "
-#| "tab. In <gui>Image Settings</gui>, choose one of the multiple-image-per-"
-#| "page options under <gui>Autosize</gui>."
-msgid ""
-"Shotwell can also print multiple images in one page; to do this, select "
-"multiple images, choose <guiseq><gui>File</gui><gui>Print...</gui></guiseq>, "
-"and in the <gui>Print</gui> dialog, choose the <gui>Image Settings</gui> "
-"tab. In <gui>Image Settings</gui>, choose one of the multiple-image-per-page "
-"options under <gui>Autosize</gui>."
-msgstr ""
-"Shotwell puede también imprimir varias imágenes en una página; para hacer "
-"esto, seleccione las imágenes, escoja <guiseq><gui>Archivo</"
-"gui><gui>Imprimir</gui></guiseq> y en el cuadro de diálogo <gui>Imprimir</"
-"gui>, seleccione la pestaña <gui>Configuraciones de la imagen</gui>. "
-"En<gui>Configuración de la imagen</gui>, escoja una de las opciones "
-"múltiples imágenes por página en <gui>Tamaño automático</gui>."
-
-#. (itstool) path: page/p
-#: C/share-print.page:23
-msgid ""
-"If you would like to set formatting, paper size, and orientation options, "
-"choose the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog prior to "
-"printing."
-msgstr ""
-"Si quiere establecer el formato, el tamaño del papel, y la orientación, "
-"seleccione la pestaña <gui>Configuración de la página</gui>en el cuadro de "
-"diálogo <gui>Imprimir</gui> antes de imprimir."
-
-#. (itstool) path: info/desc
-#: C/share-send.page:7
-msgid "Send photos via email, instant messaging or in other ways."
-msgstr "Enviar fotos por correo-e, mensajería instantánea u otras maneras."
-
-#. (itstool) path: page/title
-#: C/share-send.page:12
-msgid "Sending photos"
-msgstr "Enviar fotos"
-
-#. (itstool) path: page/p
-#: C/share-send.page:14
-msgid ""
-"Shotwell can send photos using the GNOME desktop's Send To mechanism, which "
-"lets you send photos via email, instant messaging or in other ways."
-msgstr ""
-"Shotwell puede enviar fotos usando el mecanismo de «Enviar a» de GNOME, lo "
-"que le permite enviar fotos por correo-e, mensajería instantánea u otras "
-"maneras."
-
-#. (itstool) path: page/p
-#: C/share-send.page:16
-msgid ""
-"To send photos, select them in Shotwell and choose <guiseq><gui>File</"
-"gui><gui>Send To...</gui></guiseq>, or right-click the photos and choose "
-"<gui>Send To...</gui> from the context menu. A <gui>Send To</gui> dialog box "
-"will appear which lets you choose a mechanism for sending the files (such as "
-"email or instant messaging) and a destination. You can optionally choose to "
-"send the files in a compressed format."
-msgstr ""
-"Para enviar fotos, selecciónelas en Shotwell y después "
-"escoja<guiseq><gui>Archivo</gui><gui>Enviar a...</gui></guiseq>, o pulse con "
-"el botón derecho en las fotos y escoja <gui>Enviar a ...</gui> del menú "
-"contextual. Aparecerá una caja de diálogo en donde puede escoger la forma "
-"para enviar los archivos (como correo electrónico o mensaje instantáneo) y "
-"el destino. Puede, opcionalmente, enviar los archivos en un formato "
-"comprimido."
-
-#. (itstool) path: info/desc
-#: C/share-slideshow.page:7
-msgid "Watch a slideshow of your photos."
-msgstr "Ver sus fotos como diapositivas."
-
-#. (itstool) path: page/title
-#: C/share-slideshow.page:12
-msgid "Slideshows"
-msgstr "Diapositivas"
-
-#. (itstool) path: page/p
-#: C/share-slideshow.page:14
-msgid ""
-"To see a sideshow of any collection in Shotwell, navigate to that collection "
-"and select <guiseq><gui>View</gui><gui>Slideshow</gui></guiseq> or press "
-"<key>F5</key>."
-msgstr ""
-"Para ver una presentación de diapositivas en Shotwell, navegue hasta la "
-"colección y elija <guiseq><gui>Ver</gui><gui>Presentación</gui></guiseq> o "
-"pulse <key>F5</key>."
-
-#. (itstool) path: page/p
-#: C/share-slideshow.page:16
-msgid "You can change some settings in a running slideshow:"
-msgstr ""
-"Puede cambiar algunas configuraciones de una presentación de diapositivas en "
-"ejecución:"
-
-#. (itstool) path: item/p
-#: C/share-slideshow.page:19
-msgid "The duration how long an image should be shown: 1 - 30 seconds"
-msgstr ""
-"La duración de cuánto tiempo se debe mostrar una imagen: 1 - 30 segundos"
-
-#. (itstool) path: item/p
-#: C/share-slideshow.page:20
-msgid "You can select different transition effects."
-msgstr "Puede seleccionar diferentes efectos de transición."
-
-#. (itstool) path: item/p
-#: C/share-slideshow.page:21
-msgid "The time for each transition effect: 0.1 - 1.0 seconds"
-msgstr "El tiempo para cada efecto de transición: 0.1 - 1.0 segundos"
-
-#. (itstool) path: info/desc
-#: C/share-upload.page:7
-msgid "Publish photos to Facebook, Flickr, Picasa Web Albums, or other sites."
-msgstr ""
-"Publica fotos en Facebook, Flickr, álbumes web de Picasa o en otros sitios."
-
-#. (itstool) path: page/title
-#: C/share-upload.page:12
-msgid "Publishing to the Web"
-msgstr "Publicar en la web"
-
-#. (itstool) path: page/p
-#: C/share-upload.page:14
-msgid ""
-"Through the use of <link xref=\"other-plugins\">plugins</link>, Shotwell can "
-"publish photos and videos to the following services, each of which requires "
-"an account:"
-msgstr ""
-"Gracias al uso de <link xref=\"other-plugins\">complementos</link>, Shotwell "
-"puede publicar fotos y vídeos en los siguientes servicios, para los que se "
-"requiere una cuenta."
-
-#. (itstool) path: item/p
-#: C/share-upload.page:18
-msgid "<link href=\"http://facebook.com\">Facebook</link>"
-msgstr "<link href=\"http://facebook.com\">Facebook</link>"
-
-#. (itstool) path: item/p
-#: C/share-upload.page:19
-msgid "<link href=\"http://flickr.com\">Flickr</link>"
-msgstr "<link href=\"http://flickr.com\">Flickr</link>"
-
-#. (itstool) path: item/p
-#: C/share-upload.page:20
-msgid ""
-"<link href=\"http://picasaweb.google.com\">Picasa Web Albums</link> and "
-"<link href=\"http://plus.google.com\">Google+</link>"
-msgstr ""
-"<link href=\"http://picasaweb.google.com\">Álbumes de Picasa Web</link> y "
-"<link href=\"http://plus.google.com\">Google+</link>"
-
-#. (itstool) path: item/p
-#: C/share-upload.page:21
-msgid "<link href=\"http://youtube.com\">YouTube</link> (videos only)"
-msgstr "<link href=\"http://youtube.com\">YouTube</link> (sólo vídeos)"
-
-#. (itstool) path: item/p
-#: C/share-upload.page:22
-msgid ""
-"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, a photo site "
-"popular in Russia (photos only)"
-msgstr ""
-"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, una página de "
-"fotos popular en Rusia (sólo fotos)"
-
-#. (itstool) path: item/p
-#: C/share-upload.page:23
-msgid ""
-"Any site running the <link href=\"http://piwigo.org\">Piwigo</link> photo "
-"gallery software (photos only)"
-msgstr ""
-"Cualquier sitio que ejecute el software de galería de fotos <link href="
-"\"http://piwigo.org\">Piwigo</link> (sólo fotos)"
-
-#. (itstool) path: page/p
-#: C/share-upload.page:26
-msgid ""
-"To publish selected photos in a collection, choose <guiseq><gui>Edit</"
-"gui><gui>Preferences</gui></guiseq> and click on the <gui>Plugins</gui> tab "
-"to enable the plugin for the service you want to publish to. Next, choose, "
-"<guiseq><gui>File</gui><gui>Publish</gui></guiseq>, press the <gui>Publish</"
-"gui> toolbar button or use <keyseq><key>Ctrl</key><key>P</key></keyseq>. You "
-"will see a dialog that lets you select a publishing service. You will then "
-"need to log in or create an account."
-msgstr ""
-"Para publicar las fotos seleccionadas en una colección, elija "
-"<guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq> y pulse en la "
-"pestaña <gui>Complementos</gui> para activar el complemento del servicio en "
-"el que quiere publicar. A continuación, elija <guiseq><gui>Archivo</"
-"gui><gui>Publicar</gui></guiseq>, pulse el botón <gui>Publicar</gui> en la "
-"barra de herramientas o pulse <keyseq><key>Ctrl</key><key>P</key></keyseq>. "
-"Verá un diálogo que le permite elegir el servicio de publicación. Necesitará "
-"iniciar sesión o crear una cuenta."
-
-#. (itstool) path: page/p
-#: C/share-upload.page:31
-#, fuzzy
-#| msgid ""
-#| "Publishing to Facebook requires you to grant certain permissions to the "
-#| "Shotwell Connect Facebook application. You only need to grant these "
-#| "permissions once, when you first associate Shotwell Connect with your "
-#| "Facebook account."
-msgid ""
-"Publishing to Facebook requires you to grant certain permissions to the "
-"Shotwell Facebook application. You only need to grant these permissions "
-"once, when you first associate Shotwell with your Facebook account."
-msgstr ""
-"Publicar en Facebook requiere que conceda ciertos permisos a la aplicación "
-"Conectar Shotwell con Facebook. Solo necesita conceder los permisos una vez, "
-"la primera vez que asocie Shotwell con su cuenta de Facebook."
-
-#. (itstool) path: note/p
-#: C/share-upload.page:34
-msgid ""
-"You will be only able to publish images with at most the permission you "
-"granted to the Shotwell Facebook application"
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/share-upload.page:36
-msgid ""
-"Similarly, publishing to Flickr requires you to log in and permit Shotwell "
-"Connect to access your account."
-msgstr ""
-"Del mismo modo, publicar en Flickr requiere que inicie sesión y permita que "
-"Shotwell Connect acceda a su cuenta."
-
-#. (itstool) path: page/p
-#: C/share-upload.page:38
-msgid ""
-"If you have a Google account, but have not yet used Picasa Web Albums, you "
-"will need to log in to Picasa using a browser once before you can publish to "
-"this service."
-msgstr ""
-"Si tiene una cuenta de Google, pero nunca ha usado los álbumes web de "
-"Picasa, necesitará iniciar sesión en Picasa usando un navegador antes de "
-"poder publicar algo en este servicio."
-
-#. (itstool) path: info/desc
-#: C/view-displaying.page:7
-msgid ""
-"Learn about different ways of viewing your photos: in a grid, filling the "
-"main window, or filling the whole screen."
-msgstr ""
-"Aprenda sobre diferentes formas de ver sus fotos: en una cuadrícula, "
-"llenando la ventana principal o a pantalla completa."
-
-#. (itstool) path: page/title
-#: C/view-displaying.page:12
-msgid "Photo views"
-msgstr "Vistas de fotos"
-
-#. (itstool) path: page/p
-#: C/view-displaying.page:14
-msgid ""
-"When you select any collection in the sidebar, Shotwell displays all photos "
-"in the collection in the main window area. At the bottom right is a slider "
-"which adjusts the viewing size of the thumbnails. You may also adjust the "
-"thumbnail size using the plus and minus keys (<key>+</key> and <key>-</key>) "
-"or by pressing <key>Ctrl</key> while moving your mouse scroll wheel."
-msgstr ""
-"Cuando selecciona cualquier colección en la barra lateral, Shotwell muestra "
-"todas las fotos en esa colección en la ventana principal. En la esquina "
-"inferior derecha hay un control deslizante que puede ajustar el tamaño de "
-"las vistas miniatura. Puede ajustar el tamaño de las miniaturas usando las "
-"teclas más y menos (<key>+</key> y <key>-</key>) o presionando <key>Ctrl</"
-"key> mientras mueve la rueda central del ratón."
-
-#. (itstool) path: page/p
-#: C/view-displaying.page:16
-msgid ""
-"You can view a photo full-window by double-clicking on it. From there you "
-"may move to other photos in the collection with the Back and Forward "
-"buttons. To return to the collection, double-click on the photo or press "
-"<key>Esc</key>."
-msgstr ""
-"Puede ver la vista de la foto en pantalla completa pulsando dos veces. Desde "
-"ahí puede moverse a otras fotos en la colección con los botones de retroceso "
-"y avance. Puede regresar a la colección, pulsando dos veces en la foto o "
-"presionando <key>Esc</key>."
-
-#. (itstool) path: page/p
-#: C/view-displaying.page:18
-msgid ""
-"When viewing a photo in full-window mode, the slider on the toolbar controls "
-"zoom. You can pan around by grabbing and dragging anywhere on the photo. You "
-"can also zoom using your scroll wheel or by pressing the following keyboard "
-"shortcuts: <keyseq><key>Ctrl</key>0</keyseq> for the full image, "
-"<keyseq><key>Ctrl</key>1</keyseq> for 100% (1 photo pixel = 1 screen pixel), "
-"and <keyseq><key>Ctrl</key>2</keyseq> for 200% (1 photo pixel = 2x2 screen "
-"pixels)."
-msgstr ""
-
-#. (itstool) path: page/p
-#: C/view-displaying.page:20
-msgid ""
-"Shotwell offers a fullscreen mode to display photos. Choose "
-"<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> or press <key>F11</"
-"key>. To see the fullscreen toolbar, move your mouse to the bottom of the "
-"screen. The toolbar offers buttons to move through the collection, to pin "
-"the toolbar down (so it isn't hidden when you move the mouse away), and to "
-"leave fullscreen view."
-msgstr ""
-"Shotwell ofrece un modo de pantalla completa para mostrar las fotos. Escoja "
-"<guiseq><gui>Ver</gui><gui>Pantalla completa</gui></guiseq> o presione "
-"<key>F11</key>. Para ver la barra de herramientas de pantalla completa, "
-"mueva su ratón a la parte inferior de la pantalla. La barra de herramientas "
-"le ofrece botones para moverse a través de la colección, para fijar la barra "
-"de herramientas (así esta no se ocultará cuando mueva el ratón), y dejar la "
-"vista de pantalla completa."
-
-#. (itstool) path: section/title
-#: C/view-displaying.page:23
-msgid "Viewing videos"
-msgstr "Ver vídeos"
-
-#. (itstool) path: section/p
-#: C/view-displaying.page:24
-msgid ""
-"When you double-click a video, Shotwell will launch an external video player "
-"to play the video. It's not currently possible to display a video in full-"
-"window mode in Shotwell or to play the video within Shotwell itself."
-msgstr ""
-"Cuando pulse dos veces sobre un vídeo, Shotwell lanzará un reproductor de "
-"vídeo externo para reproducir el vídeo. Actualmente no es posible mostrar un "
-"vídeo en modo a pantalla completa o reproducirlo dentro del propio Shotwell"
-
-#. (itstool) path: info/desc
-#: C/view-information.page:7
-msgid ""
-"View more detailed information about photos, like the exposure mode used by "
-"the camera."
-msgstr ""
-"Ver información más detallada sobre las fotos, como el modo de exposición "
-"usado por la cámara."
-
-#. (itstool) path: page/title
-#: C/view-information.page:12
-msgid "Basic and extended information"
-msgstr "Información básica y extendida"
-
-#. (itstool) path: page/p
-#: C/view-information.page:14
-msgid ""
-"The Basic Information pane appears at the bottom of the sidebar, and "
-"displays a brief summary of the photos you've selected. If no photos are "
-"selected, it displays a summary of the entire collection. You can toggle the "
-"display of this pane using the <guiseq><gui>View</gui><gui>Basic "
-"Information</gui></guiseq> command."
-msgstr ""
-"El panel de información básica aparece en la parte inferior de la barra "
-"lateral, y muestra un breve resumen de las fotos que ha seleccionado. Si no "
-"se ha seleccionado ninguna foto, muestra un resumen de la colección "
-"completa. Puede cambiar la visibilidad de este panel usando el comando "
-"<guiseq><gui>Ver</gui><gui>Información básica</gui></guiseq>."
-
-#. (itstool) path: page/p
-#: C/view-information.page:16
-msgid ""
-"The floating Extended Information window displays more information about the "
-"selected photo. The <guiseq><gui>View</gui><gui>Extended Information</gui></"
-"guiseq> command or <keyseq><key>Ctrl</key><key>Shift</key><key>X</key></"
-"keyseq> toggles the display of this window."
-msgstr ""
-
-#. (itstool) path: info/desc
-#: C/view-sidebar.page:7
-msgid ""
-"The sidebar on the left of the window lists various views of your library."
-msgstr ""
-"La barra lateral de la izquierda de la ventana lista varios tipos de vistas "
-"de su biblioteca."
-
-#. (itstool) path: page/title
-#: C/view-sidebar.page:21
-msgid "The sidebar"
-msgstr "La barra lateral"
-
-#. (itstool) path: page/p
-#: C/view-sidebar.page:23
-msgid ""
-"The sidebar on the left side of the Shotwell window lists various views of "
-"your library. Although you may see the same photo in multiple views, it's "
-"only stored once on your hard drive."
-msgstr ""
-"La barra lateral a la izquierda de la ventana de Shotwell lista varias "
-"vistas de su biblioteca. Aunque puede ver muchas vistas de la misma foto, "
-"solo se almacena una en su disco duro"
-
-#. (itstool) path: page/p
-#: C/view-sidebar.page:25
-msgid ""
-"The <gui>Last Import</gui> view lists your last imported photos no matter if "
-"they are imported from F-Spot, your camera, a memory card or the hard disk."
-msgstr ""
-"La vista <gui>Última importación</gui> lista sus últimas fotos importadas no "
-"importa si estas se importaron de F-Spot, su cámara, una tarjeta de memoria "
-"o su disco duro."
-
-#. (itstool) path: page/p
-#: C/view-sidebar.page:27
-msgid "The <gui>Flagged</gui> lists all photos you had previous flagged."
-msgstr ""
-"La opción <gui>Marcada</gui> lista todas las fotos que ha marcado "
-"anteriormente."
-
-#. (itstool) path: page/p
-#: C/view-sidebar.page:29
-msgid ""
-"The <gui>Saved Search</gui> allows you to sort your library by many criteria."
-msgstr ""
-"La <gui>Búsqueda guardada</gui> le permite ordenar su biblioteca bajo "
-"diferentes criterios."
-
-#. (itstool) path: page/p
-#: C/view-sidebar.page:31
-msgid ""
-"The <gui>Events</gui> folder lists all events in your library. An event is a "
-"group of photos that were taken at approximately the same time."
-msgstr ""
-"La carpeta de <gui>Eventos</gui> lista todos los eventos en su biblioteca.Un "
-"evento es un grupo de fotos que se tomaron aproximadamente al mismo tiempo."
-
-#. (itstool) path: page/p
-#: C/view-sidebar.page:33
-msgid ""
-"The <gui>Tags</gui> folder lists all tags you've assigned to photos. Photos "
-"can have multiple tags attached to them. When you click on the name of a tag "
-"in the sidebar, you will see all the photos associated with that tag."
-msgstr ""
-"La carpeta <gui>Etiquetas</gui> lista todas las etiquetas que ha asignado a "
-"sus fotos. Las fotos pueden tener múltiples etiquetas relacionadas con las "
-"mismas. Cuando posiciona el cursor sobre el nombre de una etiqueta en la "
-"barra lateral, podrá ver todas las fotos asociadas a esa etiqueta."
-
-#~ msgid "Facebook"
-#~ msgstr "Facebook"
-
-#~ msgid "Flickr"
-#~ msgstr "Flickr"
-
-#~ msgid "Symbol"
-#~ msgstr "Símbolo"
-
-#~ msgid ""
-#~ "@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"
-#~ msgstr ""
-#~ "@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"
-
-#~ msgid "jim@yorba.org"
-#~ msgstr "jim@yorba.org"
-
-#~ msgid "allison@yorba.org"
-#~ msgstr "allison@yorba.org"
-
-#~ msgid "robert.ancell@canonical.com"
-#~ msgstr "robert.ancell@canonical.com"
-
-#~ msgid "pdo.smith@gmail.com"
-#~ msgstr "pdo.smith@gmail.com"
-
-#~ msgid "philbull@gmail.com"
-#~ msgstr "philbull@gmail.com"
+# Spanish translation for shotwell.

+# Copyright (C) 2014 shotwell's COPYRIGHT HOLDER

+# This file is distributed under the same license as the shotwell package.

+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

+# Dámaris Letelier <dam.letelier@gmail.com>, 2014.

+#

+#

+#

+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2016.
, 2016.

+#

+msgid ""

+msgstr ""

+"Project-Id-Version: shotwell master\n"

+"POT-Creation-Date: 2016-11-19 01:52+0000\n"

+"PO-Revision-Date: 2016-11-21 \n"

+"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"

+"Language-Team: es <gnome-es-list@gnome.org>\n"

+"Language: es\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: Gtranslator 2.91.6\n"

+

+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2

+msgctxt "_"

+msgid "translator-credits"

+msgstr ""

+"Marina Prado <mapraro93@hotmail.com>, 2016\n"

+"Daniel Mustieles <daniel.mustieles@gmail.com>, 2014 - 2016\n"

+"Dámaris Letelier <dam.letelier@gmail.com>, 2014"

+

+#. (itstool) path: info/desc

+#: C/edit-adjustments.page:7

+msgid "Change the exposure, saturation, tint, and shadows of a photo."

+msgstr "Cambiar la exposición, saturación, matiz y sombras de una foto."

+

+#. (itstool) path: page/title

+#: C/edit-adjustments.page:12

+msgid "Color adjustments"

+msgstr "Ajustes del color"

+

+#. (itstool) path: page/p

+#: C/edit-adjustments.page:14

+msgid ""

+"The <gui>Adjust</gui> button opens a floating window with a histogram and "

+"sliders to adjust a photo's exposure, saturation, tint, temperature, and "

+"shadows. The histogram also has sliders to reduce the upper and lower "

+"intensity thresholds of the photograph, expanding the contrast of the middle "

+"range."

+msgstr ""

+"El botón <gui>Ajustes</gui> abre una ventana flotante con un histograma y el "

+"control deslizante para ajustar la exposición, la saturación, el matiz, la "

+"calidez y las sombras de una fotografía. El histograma también tiene control "

+"deslizante para reducir los umbrales de intensidad superior e inferior de la "

+"fotografía, ampliando el contraste de la gama media."

+

+#. (itstool) path: page/p

+#: C/edit-adjustments.page:16

+msgid ""

+"The <gui>Enhance</gui> button adjusts the histogram and shadows sliders to "

+"improve the quality of a photo."

+msgstr ""

+"El botón <gui>Mejorar</gui> ajusta el histograma y el control deslizante de "

+"las sombras para mejorar la calidad de una foto."

+

+#. (itstool) path: page/p

+#: C/edit-adjustments.page:18

+msgid ""

+"When the photo's colors and contrast are to your liking, press <gui>OK</gui> "

+"to save the changes. <gui>Reset</gui> will return the image to its original "

+"state. <gui>Cancel</gui> discards all changes you've made."

+msgstr ""

+"Si los colores y el contraste de la foto son adecuados, pulse <gui>Aceptar</"

+"gui> para guardar los cambios. El botón <gui>Restablecer</gui> devolverá la "

+"imagen a su estado original. El botón <gui>Cancelar</gui> deshace todos los "

+"cambios realizados."

+

+#. (itstool) path: section/title

+#: C/edit-adjustments.page:21

+msgid "What do the color adjustments do?"

+msgstr "¿Qué hacen los ajustes del color?"

+

+#. (itstool) path: item/title

+#: C/edit-adjustments.page:24

+msgid "Exposure"

+msgstr "Exposición"

+

+#. (itstool) path: item/p

+#: C/edit-adjustments.page:25

+msgid ""

+"Changes the brightness to make it look like the photo was exposed for a "

+"longer or shorter time. Use this to correct under- or over-exposed photos."

+msgstr ""

+"Cambia el brillo para que parezca que la foto se ha expuesto por un tiempo "

+"más o menos largo. Utilice esta opción para corregir las fotografías "

+"sobreexpuestas o excesivamente subexpuestas."

+

+#. (itstool) path: item/title

+#: C/edit-adjustments.page:28

+msgid "Saturation"

+msgstr "Saturación"

+

+#. (itstool) path: item/p

+#: C/edit-adjustments.page:29

+msgid ""

+"Changes how vivid colors look. If your photo looks gray and washed out, try "

+"increasing the saturation. If colors look too bold, try decreasing it."

+msgstr ""

+"Cambia la intensidad de los colores. Si su foto parece gris y pálida, pruebe "

+"a aumentar la saturación. Si los colores se ven demasiado intensos, intente "

+"disminuirlos."

+

+#. (itstool) path: item/title

+#: C/edit-adjustments.page:32

+msgid "Tint"

+msgstr "Matiz"

+

+#. (itstool) path: item/p

+#: C/edit-adjustments.page:33

+msgid ""

+"This tints the photo with a color. It's useful for correcting photos taken "

+"with the wrong white balance setting, which typically have an unnatural "

+"color cast. For example, photos taken outdoors with the white balance set to "

+"\"Tungsten\" may have a blue cast."

+msgstr ""

+"Esto matiza la foto con un color. Es útil para corregir fotos que se han "

+"tomado con el ajuste del balance de blancos erróneo, que normalmente tiene "

+"unas tonalidades de color poco naturales. Por ejemplo, las fotos tomadas en "

+"el exterior con el ajuste del balance de blancos en «Tungsten» pueden tener "

+"una tonalidad azulada."

+

+#. (itstool) path: item/title

+#: C/edit-adjustments.page:36

+msgid "Temperature"

+msgstr "Temperatura"

+

+#. (itstool) path: item/p

+#: C/edit-adjustments.page:37

+msgid ""

+"Changes how \"warm\" or \"cool\" the picture looks. Use this to make cold, "

+"depressing scenes look more lively, for example."

+msgstr ""

+"Cambia el aspecto «cálido» o «frío» de la imagen. Utilice esto, por ejemplo, "

+"para hacer que las escenas frías y tristes parezcan más alegres."

+

+#. (itstool) path: item/title

+#: C/edit-adjustments.page:40

+msgid "Shadows"

+msgstr "Sombras"

+

+#. (itstool) path: item/p

+#: C/edit-adjustments.page:41

+msgid ""

+"This makes shadowy areas appear lighter. Use this to make detail more "

+"visible if it's obscured by the darkness of a shadow."

+msgstr ""

+"Esto hace que las áreas oscuras aparezcan más claras. Si los detalles se han "

+"oscurecido por las sombras, utilice esto para hacerlos más visibles."

+

+#. (itstool) path: item/title

+#: C/edit-adjustments.page:44

+msgid "Intensity Threshold (sliders on the histogram)"

+msgstr "Umbral de intensidad (control deslizante en el histograma)"

+

+#. (itstool) path: item/p

+#: C/edit-adjustments.page:45

+msgid ""

+"These sliders change how light the brightest white is and how dark the "

+"darkest black is. Use them to change the contrast of the photo. Photos which "

+"look washed out should particularly benefit from changing these settings."

+msgstr ""

+"Estos controles deslizantes cambian cómo de claro es el blanco más brillante "

+"y cómo de oscuro es el negro más oscuro. Utilícelos para cambiar el "

+"contraste de la foto, sobre todo en las fotos que son pálidas."

+

+#. (itstool) path: media

+#. This is a reference to an external file such as an image or video. When

+#. the file changes, the md5 hash will change to let you know you need to

+#. update your localized copy. The msgstr is not used at all. Set it to

+#. whatever you like once you have updated your copy of the file.

+#: C/edit-crop.page:42

+msgctxt "_"

+msgid ""

+"external ref='figures/crop_thirds.jpg' md5='4cf0a026bb812c7eab0c9db8210a9524'"

+msgstr ""

+"external ref='figures/crop_thirds.jpg' md5='4cf0a026bb812c7eab0c9db8210a9524'"

+

+#. (itstool) path: info/desc

+#: C/edit-crop.page:7

+msgid "Improve the composition of a photo by cutting out parts of it."

+msgstr "Mejore la composición de una foto cortando partes de la misma."

+

+#. (itstool) path: page/title

+#: C/edit-crop.page:12

+msgid "Cropping"

+msgstr "Recortar"

+

+#. (itstool) path: page/p

+#: C/edit-crop.page:14

+msgid ""

+"To reduce the area of a photo and concentrate the viewer's attention on a "

+"smaller portion of it, use the Crop tool. The crop tool is only available in "

+"full-window or fullscreen mode."

+msgstr ""

+"Para reducir el área de una foto y concentrar la atención del espectador en "

+"una parte más pequeña de ella, utilice la herramienta Recortar. La "

+"herramienta Recortar sólo está disponible en el modo a pantalla completa."

+

+#. (itstool) path: item/p

+#: C/edit-crop.page:19

+msgid ""

+"Double-click on a photo to enter full-window mode, then press the <gui>Crop</"

+"gui> button on the toolbar."

+msgstr ""

+"Para entrar en el modo a pantalla completa, pulse dos veces en la foto y "

+"luego pulse el botón <gui>Recortar</gui> en la barra de herramientas."

+

+#. (itstool) path: item/p

+#: C/edit-crop.page:22

+msgid ""

+"A white box, the crop rectangle, will appear over the photo. The lighter "

+"portion of the photo within the crop rectangle represents what the photo "

+"will look like when you crop it."

+msgstr ""

+"Unas líneas blancas, que representan el rectángulo de recorte, aparecerán "

+"sobre la foto. La parte más clara de la foto dentro del rectángulo de "

+"recorte representa cómo se verá la foto cuando la recorte."

+

+#. (itstool) path: item/p

+#: C/edit-crop.page:25

+msgid ""

+"If you place your cursor in the middle of the box, you can move the box "

+"around. If you drag the edges of the box, you can adjust its size. As you "

+"move and adjust the crop box, you'll see four lines appear inside it, like a "

+"tic-tac-toe grid. These are <em>rule of thirds</em> lines."

+msgstr ""

+"Si coloca el cursor en el centro del recuadro, podrá moverlo. Si arrastra "

+"los bordes del recuadro, puede ajustar su tamaño. Al mover y ajustar la caja "

+"de recorte, verá aparecer cuatro líneas en su interior, como las cuadrículas "

+"para el tres en raya. Estas son las líneas de la <em>regla de los tercios</"

+"em>."

+

+#. (itstool) path: item/p

+#: C/edit-crop.page:26

+msgid ""

+"You can also constrain the crop box to one of many common sizes. Choose a "

+"size from the drop-down list that suits your needs. If you press the flip "

+"button next to it, the orientation of the constraint will switch (from "

+"landscape to portrait)."

+msgstr ""

+"También puede limitar el recuadro a uno de los tamaños más comunes. Elija un "

+"tamaño de la lista desplegable que se adapte a sus necesidades. Si pulsa el "

+"botón voltear situado junto a esta, la orientación de la restricción "

+"cambiará (de horizontal a vertical)."

+

+#. (itstool) path: item/p

+#: C/edit-crop.page:29

+msgid ""

+"When you're happy with your crop outline, apply it by pressing the "

+"<gui>Crop</gui> button. Shotwell will display the cropped photo."

+msgstr ""

+"Cuando esté satisfecho con su recorte, aplíquelo pulsando el botón "

+"<gui>Recortar<gui>. Shotwell mostrará la foto recortada."

+

+#. (itstool) path: item/p

+#: C/edit-crop.page:32

+msgid ""

+"If you change your mind, press the <gui>Crop</gui> button again and fine-"

+"tune the crop."

+msgstr ""

+"Si cambia de opinión, pulse el botón <gui>Recortar</gui> de nuevo y ajuste "

+"el recorte."

+

+#. (itstool) path: item/p

+#: C/edit-crop.page:33

+msgid ""

+"If you press <gui>Cancel</gui> rather than <gui>Apply</gui>, Shotwell will "

+"return to the photo's previous crop dimensions."

+msgstr ""

+"Si pulsa el botón <gui>Cancelar</gui> en vez del botón <gui>Aplicar</gui>, "

+"Shotwell devolverá a la foto las dimensiones anteriores del recorte."

+

+#. (itstool) path: section/title

+#: C/edit-crop.page:38

+msgid "What is the rule of thirds?"

+msgstr "¿Qué es la regla de los tercios?"

+

+#. (itstool) path: section/p

+#: C/edit-crop.page:39

+msgid ""

+"The <em>rule of thirds</em> helps you to choose a pleasing composition for a "

+"photo."

+msgstr ""

+"La <em>regla de los tercios </em> le ayuda a elegir una composición "

+"satisfactoria para una foto."

+

+#. (itstool) path: section/p

+#: C/edit-crop.page:40

+msgid ""

+"Imagine that the scene is divided up into a 3x3 grid by two equally-spaced "

+"vertical lines and two equally-spaced horizontal lines. According to the "

+"rule, you're more likely to get a pleasing composition if you align major "

+"features (like the horizon, or a person's body) with one of the lines. "

+"Paying attention to the way features flow from one part of the grid to "

+"another can also help."

+msgstr ""

+"Imagine que la escena se divide en una cuadrícula de 3x3 por dos líneas "

+"verticales espaciadas y por dos líneas horizontales igualmente espaciadas. "

+"De acuerdo con la regla, es más probable que obtenga una composición "

+"satisfactoria si alinea las características principales (como el horizonte o "

+"una persona) con una de estas líneas. Prestar atención a la forma en que las "

+"características van de una parte de la cuadrícula a la otra también puede "

+"ser de ayuda."

+

+#. (itstool) path: section/p

+#: C/edit-crop.page:41

+msgid ""

+"Cropping a photo so that it conforms to the rule of thirds often results in "

+"a more visually appealing image."

+msgstr ""

+"Recortar una foto siguiendo la regla de los tercios suele dar como resultado "

+"una imagen visualmente más satisfactoria."

+

+#. (itstool) path: media/p

+#: C/edit-crop.page:43

+msgid ""

+"Cropping a photo, using the \"rule of thirds\" lines to improve the "

+"composition."

+msgstr ""

+"Recorte una foto siguiendo las líneas de la «regla de los tercios» para "

+"mejorar la composición."

+

+#. (itstool) path: info/desc

+#: C/edit-enhance.page:7

+msgid ""

+"Let Shotwell improve the brightness and contrast of a photo automatically."

+msgstr ""

+"Permita que Shotwell mejore el brillo y el contraste de una foto "

+"automáticamente."

+

+#. (itstool) path: page/title

+#: C/edit-enhance.page:14

+msgid "Auto-enhance"

+msgstr "Mejora automática"

+

+#. (itstool) path: page/p

+#: C/edit-enhance.page:16

+msgid ""

+"Clicking on the <gui>Enhance</gui> button is a quick way to automatically "

+"adjust the brightness and contrast of your photo. It will often give you a "

+"photo that is correctly exposed. You can also use it as a starting point and "

+"then improve the adjustments by clicking on the <gui>Adjust</gui> button."

+msgstr ""

+"Pulsar en el botón <gui>Mejorar</gui> es una forma rápida de ajustar "

+"automáticamente el brillo y el contraste de la foto. Normalmente le ofrecerá "

+"una foto que esté correctamente expuesta. También puede utilizarlo como "

+"punto de partida y luego mejorar los ajustes pulsando en el botón "

+"<gui>Ajustar</gui>."

+

+#. (itstool) path: info/desc

+#: C/edit-external.page:7

+msgid "Use a different program to edit a photo."

+msgstr "Usar un programa diferente para editar una foto."

+

+#. (itstool) path: page/title

+#: C/edit-external.page:12

+msgid "Edit photos with an external program"

+msgstr "Editar las fotos con un programa externo"

+

+#. (itstool) path: page/p

+#: C/edit-external.page:16

+msgid ""

+"You might want to use an external editor to do additional work on a photo. "

+"If installed, GIMP and UFRaw are the default external editors for photo and "

+"RAW editing, respectively. If these programs are not installed, you must "

+"select your preferred editors by choosing <guiseq><gui>Edit</"

+"gui><gui>Preferences</gui></guiseq> and selecting editors from drop-down "

+"menus of installed applications."

+msgstr ""

+"Quizás quiera utilizar un editor externo para trabajar adicionalmente en una "

+"foto. Si están instalados, GIMP y UFRaw son los editores externos "

+"predeterminados para editar una foto o RAW, respectivamente. Si estos "

+"programas no están instalados, tiene que seleccionar sus editores preferidos "

+"eligiendo <guiseq><gui>Editar<gui><gui>Preferencias</gui></guiseq> y "

+"seleccionar los editores del menú desplegable de las aplicaciones instaladas."

+

+#. (itstool) path: page/p

+#: C/edit-external.page:24

+msgid ""

+"Once your editors have been set, select a photo and choose "

+"<guiseq><gui>Photos</gui> <gui>Open With External Editor</gui></guiseq> to "

+"open the photo with the external editor. Likewise, if the original photo is "

+"a RAW file, select <guiseq><gui>Photos</gui><gui>Open With RAW Editor</gui></"

+"guiseq> to edit the RAW file directly with the set RAW editor."

+msgstr ""

+"Una vez que los editores se han establecido, seleccione una foto y elija "

+"<guiseq><gui>Fotos</gui> <gui>Abrir con un editor externo</gui></guiseq> "

+"para abrir la foto con un editor externo. De la misma manera, si la foto "

+"original es un archivo RAW, seleccione <guiseq><gui>Fotos</gui><gui>Abrir "

+"con un editor RAW</gui></guiseq> para editar el archivo RAW directamente con "

+"un editor RAW establecido."

+

+#. (itstool) path: page/p

+#: C/edit-external.page:31

+msgid ""

+"When you complete your edits and save the file, Shotwell will detect the "

+"changes and update the photo. When external edits have been made, press and "

+"hold the <key>Shift</key> key in full-window view to show the original photo "

+"rather than the externally-edited one."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/edit-external.page:38

+msgid "Reverting to original will erase any external edits."

+msgstr "Revertir al original borrará cualquier cambio externo."

+

+#. (itstool) path: note/p

+#: C/edit-external.page:43

+msgid ""

+"If you externally edit a RAW photo and save the result to another image, "

+"such as a JPEG or PNG, Shotwell cannot automatically determine that the "

+"original RAW and the new image should be paired."

+msgstr ""

+

+#. (itstool) path: note/p

+#: C/edit-external.page:49

+msgid ""

+"If you want to work within the resulting image within Shotwell, you'll need "

+"to import it yourself."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/edit-nondestructive.page:7

+msgid ""

+"Shotwell is a non-destructive photo editor - it does not modify your "

+"original photos."

+msgstr ""

+

+#. (itstool) path: page/title

+#: C/edit-nondestructive.page:12

+msgid "What happens to the original when I edit a photo?"

+msgstr "¿Qué sucede con el original cuando edito una foto?"

+

+#. (itstool) path: page/p

+#: C/edit-nondestructive.page:14

+msgid ""

+"Shotwell is a non-destructive photo editor. It does not modify your original "

+"photographs. That is to say, if you crop a photo or adjust its colors, the "

+"photo file on disc remains untouched. Shotwell stores your edits in a "

+"database and applies them on the fly as necessary. This means you can undo "

+"any alterations you make to a photograph."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/edit-nondestructive.page:16 C/edit-undo.page:18

+msgid ""

+"If you want to see what a photo looked like before your modifications, press "

+"the <key>Shift</key> key. The original photo will be displayed as long as "

+"you hold the key down."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/edit-nondestructive.page:18

+msgid ""

+"Note that Shotwell can optionally write metadata (such as tags and titles) "

+"to photo files. For more information, see the section <link xref=\"other-"

+"files\">Photo files</link>."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/edit-redeye.page:7

+msgid ""

+"Correct photos where people have red eyes because of the camera's flash."

+msgstr ""

+"Corrige las fotos donde las personas tienen ojos rojos por el flash de la "

+"cámara."

+

+#. (itstool) path: page/title

+#: C/edit-redeye.page:12

+msgid "Removing red-eye"

+msgstr "Quitar los ojos rojos"

+

+#. (itstool) path: page/p

+#: C/edit-redeye.page:14

+msgid ""

+"Red-eye occurs when the camera's flash reflects off the pupil of someone's "

+"eye. To eliminate this in a photo, use the Red-eye tool."

+msgstr ""

+

+#. (itstool) path: item/p

+#: C/edit-redeye.page:17

+msgid "Click <gui>Red-eye</gui>. A circle will appear on the photo."

+msgstr "Pulse en <gui>Ojos Rojos</gui>. Un círculo aparecerá en la foto."

+

+#. (itstool) path: item/p

+#: C/edit-redeye.page:20

+msgid ""

+"Drag the circle over the affected pupil, adjust its size with the slider "

+"control, and press <gui>Apply</gui>. The redness will be removed."

+msgstr ""

+

+#. (itstool) path: item/p

+#: C/edit-redeye.page:23

+msgid ""

+"Repeat this process for all red pupils in your photo. Press <gui>Close</gui> "

+"when finished."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/edit-rotate.page:7

+msgid ""

+"Click the <gui>Rotate</gui> button, or choose one of the commands in the "

+"<gui>Photo</gui> menu."

+msgstr ""

+"Pulse el botón <gui>Girar</gui>, o elija uno de los comandos en el menú "

+"<gui>Foto</gui>."

+

+#. (itstool) path: page/title

+#: C/edit-rotate.page:12

+msgid "Rotate or flip a photo"

+msgstr "Girar o voltear una foto"

+

+#. (itstool) path: page/p

+#: C/edit-rotate.page:14

+msgid ""

+"You can rotate your photos left and right (clockwise and counterclockwise) "

+"with the <gui>Rotate</gui> button on the toolbar of most views. You can also "

+"make a mirror image of any photo."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/edit-rotate.page:16

+msgid ""

+"To rotate right, click on the <gui>Rotate</gui> button. To rotate left, "

+"press and hold the <key>Ctrl</key> key and then click the button. Both "

+"commands are available in the <gui>Photos</gui> menu too. Alternatively, use "

+"the following keyboard shortcuts:"

+msgstr ""

+

+#. (itstool) path: item/p

+#: C/edit-rotate.page:18

+msgid ""

+"rotate left: <keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq> or "

+"<key>[</key>"

+msgstr ""

+"rotar a la izquierda: <keyseq><key>Mayús</key><key>Ctrl</key><key>R</key></"

+"keyseq> o <key>[</key>"

+

+#. (itstool) path: item/p

+#: C/edit-rotate.page:19

+msgid ""

+"rotate right: <keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>]</key>"

+msgstr ""

+"rotar a la derecha: <keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>]</"

+"key>"

+

+#. (itstool) path: page/p

+#: C/edit-rotate.page:21

+msgid ""

+"To create a mirror image of a photo, use the <gui>Flip Horizontally</gui> "

+"command in the <gui>Photos</gui> menu. To flip an image vertically, use the "

+"<gui>Flip Vertically</gui> command in the same menu."

+msgstr ""

+

+#. (itstool) path: note/p

+#: C/edit-rotate.page:24

+msgid ""

+"If you select more than one image, you can rotate all of them at the same "

+"time."

+msgstr ""

+"Si selecciona más de una imagen, puede girar todas ellas al mismo tiempo."

+

+#. (itstool) path: info/desc

+#: C/edit-straighten.page:7

+msgid "Straighten a photo so that its horizon appears level."

+msgstr "Enderezar una foto tal que su horizonte aparezca nivelado."

+

+#. (itstool) path: page/title

+#: C/edit-straighten.page:12

+msgid "Straighten photos"

+msgstr "Enderezar fotos"

+

+#. (itstool) path: page/p

+#: C/edit-straighten.page:14

+msgid ""

+"The straighten tools allows photos to be leveled and straightened. The "

+"straighten tool is only available in full-window or fullscreen mode."

+msgstr ""

+

+#. (itstool) path: item/p

+#: C/edit-straighten.page:18

+msgid ""

+"Click <gui>Straighten</gui>. The straighten slider will appear. "

+"Alternatively, use the keyboard shortcut <keyseq><key>Ctrl</key><key>A</"

+"key></keyseq>."

+msgstr ""

+

+#. (itstool) path: item/p

+#: C/edit-straighten.page:21

+msgid "Drag the slider to achieve the desired degree of straightening."

+msgstr ""

+"Arrastre el control deslizante para conseguir el grado que quiera de "

+"enderezamiento."

+

+#. (itstool) path: item/p

+#: C/edit-straighten.page:24

+#, fuzzy

+#| msgid "Press <gui>OK</gui> when finished."

+msgid "Press <gui>Straighten</gui> when finished."

+msgstr "Pulse <gui>Aceptar</gui> cuando haya acabado."

+

+#. (itstool) path: info/desc

+#: C/edit-date-time.page:7

+#, fuzzy

+#| msgid "Change the time and date of photos if those details are incorrect."

+msgid "Change the date and time of photos if those details are incorrect."

+msgstr "Cambiar la hora y la fecha de las fotos si son incorrectas."

+

+#. (itstool) path: page/title

+#: C/edit-date-time.page:12

+#, fuzzy

+#| msgid "Adjust the time and date of photos"

+msgid "Adjust the date and time of photos"

+msgstr "Ajustar la hora y fecha de las fotos"

+

+#. (itstool) path: page/p

+#: C/edit-date-time.page:14

+#, fuzzy

+#| msgid ""

+#| "To create a new event, select the photos you would like in the new event "

+#| "and click <guiseq><gui>Events</gui><gui>New Event</gui></guiseq>."

+msgid ""

+"To adjust the date and time of photos, select the photos you would like to "

+"adjust, choose <guiseq><gui>Photos</gui><gui>Adjust Date and Time...</gui></"

+"guiseq> and select a new date and time."

+msgstr ""

+"Para crear un evento nuevo, seleccione las fotos que quiere tener en el "

+"evento y pulse <guiseq><gui>Eventos</gui><gui>Nuevo evento</gui></guiseq>."

+

+#. (itstool) path: page/p

+#: C/edit-date-time.page:16

+msgid ""

+"If you are changing the date and time of multiple photos at once, you can "

+"choose to shift all the photos by the same amount of time or to set all the "

+"photos to the same time."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/edit-date-time.page:18

+msgid ""

+"By default, the date and time are only changed inside Shotwell. You can also "

+"choose to modify the date and time in the original file, but this cannot be "

+"undone once you exit Shotwell."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/edit-undo.page:7

+msgid "Return a photo to its original, unedited form."

+msgstr "Restaurar una foto a su estado original, sin edición."

+

+#. (itstool) path: page/title

+#: C/edit-undo.page:14

+msgid "Undoing changes"

+msgstr "Deshacer cambios"

+

+#. (itstool) path: page/p

+#: C/edit-undo.page:16

+msgid ""

+"Because Shotwell is a non-destructive photo editor, you can undo any "

+"alterations you make to a photograph."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/edit-undo.page:20

+msgid ""

+"To completely undo all the changes you've made to a photo, click "

+"<guiseq><gui>Photos</gui><gui>Revert to Original</gui></guiseq>. The only "

+"exception is that time and date adjustments will not be reverted."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/formats.page:7

+msgid ""

+"Shotwell supports JPEG, PNG, TIFF, BMP and RAW photo files as well as video "

+"files."

+msgstr ""

+

+#. (itstool) path: page/title

+#: C/formats.page:12

+msgid "Supported photo and video formats"

+msgstr "Formatos de foto y vídeo soportados"

+

+#. (itstool) path: page/p

+#: C/formats.page:14

+msgid ""

+"Shotwell supports JPEG, PNG, TIFF, BMP and <link type=\"guide\" xref=\"other-"

+"raw\">RAW</link> photo files. Shotwell does not yet support other graphics "

+"format such as GIF."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/formats.page:16

+msgid ""

+"Shotwell's RAW format support is currently limited. When you view a RAW "

+"photo, you are actually viewing a JPEG derived from the RAW photo, not the "

+"RAW image itself. Additionally, the RAW editing pipeline is not fully 16-bit "

+"- you can only export edited photos as 8-bit files. All supported formats "

+"can be used for export (JPEG, PNG, TIFF, BMP)."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/formats.page:18

+msgid ""

+"For more information about RAW-format photos in Shotwell, please see the "

+"<link type=\"guide\" xref=\"other-raw\">RAW</link> section."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/formats.page:22

+msgid ""

+"Shotwell also supports video files in any format supported by the GStreamer "

+"media library on the system where Shotwell is running. This typically "

+"includes the following formats among others:"

+msgstr ""

+

+#. (itstool) path: item/p

+#: C/formats.page:25

+msgid "Container formats: Ogg, QuickTime, MP4, AVI."

+msgstr "Formatos de contenedor: Ogg, QuickTime, MP4, AVI."

+

+#. (itstool) path: item/p

+#: C/formats.page:26

+msgid ""

+"Codecs: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Note that some operating "

+"systems may not include all codecs listed here due to legal or licensing "

+"restrictions.</em>"

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/formats.page:30

+msgid ""

+"Shotwell supports both photos and videos, but for simplicity, this "

+"documentation uses just the term \"photos\" in most places. Many operations "

+"in Shotwell apply to both photos and videos, however. In particular, events, "

+"flagging, rating, tagging, and publishing work both for photos and for "

+"videos."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/import-camera.page:7

+msgid "Copy photos from a digital camera."

+msgstr "Copiar fotos desde una cámara digital."

+

+#. (itstool) path: page/title

+#: C/import-camera.page:12

+msgid "Importing from a camera"

+msgstr "Importar desde una cámara"

+

+#. (itstool) path: page/p

+#: C/import-camera.page:14

+msgid "To import photos from a digital camera:"

+msgstr "Para importar fotos desde una cámara digital:"

+

+#. (itstool) path: item/p

+#: C/import-camera.page:18

+msgid ""

+"Connect the camera to your computer and switch it on. Shotwell will detect "

+"it and list it in the sidebar."

+msgstr ""

+"Conecte la cámara al equipo y enciéndala. Shotwell la detectará y la "

+"mostrará en la barra lateral."

+

+#. (itstool) path: item/p

+#: C/import-camera.page:22

+msgid ""

+"Select the camera in the sidebar. Previews of each photo on the camera will "

+"be displayed."

+msgstr ""

+"Seleccione la cámara en la barra lateral. Se mostrará la vista previa de "

+"cada una de las fotos de la cámara."

+

+#. (itstool) path: item/p

+#: C/import-camera.page:25

+msgid ""

+"If you like, you can choose a set of specific photos to import. To do this, "

+"hold down the <key>Ctrl</key> key and click to select individual photos. You "

+"can hold down <key>Shift</key> and click to select a range of photos too."

+msgstr ""

+

+#. (itstool) path: item/p

+#: C/import-camera.page:28

+msgid ""

+"Click either <gui>Import Selected</gui> or <gui>Import All</gui>. The photos "

+"will be copied from the camera and saved on your computer."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/import-camera.page:32

+msgid ""

+"Once the import is complete, you can open the <gui>Last Import</gui> view "

+"(in the sidebar) to see all photos that were imported. The Events list (also "

+"in the sidebar) will also show the new photos, organized by date."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/import-file.page:7

+msgid "Import photos that are already saved on your computer."

+msgstr "Importar fotos que ya están en el equipo."

+

+#. (itstool) path: page/title

+#: C/import-file.page:12

+msgid "Importing from your hard disk"

+msgstr "Importar desde su disco duro"

+

+#. (itstool) path: page/p

+#: C/import-file.page:14

+msgid ""

+"To import photo files from your hard disk into Shotwell, just drag them from "

+"your file browser into the Shotwell window."

+msgstr ""

+"Para importar fotos desde su disco duro a Shotwell, solo debe arrastrarlas "

+"desde su explorador a la ventana de Shotwell."

+

+#. (itstool) path: page/p

+#: C/import-file.page:16

+msgid ""

+"Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</"

+"gui></guiseq> and select the folder containing the photos you want to import."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/import-file.page:18

+msgid ""

+"Shotwell will ask whether you want to copy the photo files to your library "

+"folder (usually this is the <file>Pictures</file> folder in your home "

+"directory) or to import them in place without copying the files."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/import-file.page:20

+msgid ""

+"If you hold down <key>Ctrl</key> while dragging photos in, Shotwell will "

+"copy the photos into your library folder without prompting. Similarly, if "

+"you hold down <keyseq><key>Ctrl</key><key>Shift</key></keyseq> while "

+"dragging photos in, Shotwell will import the photos without copying them."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/import-file.page:22

+msgid ""

+"Once the import is complete, you can select <gui>Last Import</gui> in the "

+"sidebar to see all photos successfully imported. The Events list will also "

+"show new entries for the dates corresponding to the imported photos."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/import-f-spot.page:7

+msgid ""

+"Shotwell can import all your photos and tags from the F-Spot photo manager."

+msgstr ""

+"Shotwell puede importar todas sus fotos y etiquetas desde el gestor de fotos "

+"F-Spot."

+

+#. (itstool) path: page/title

+#: C/import-f-spot.page:12

+msgid "Importing from F-Spot"

+msgstr "Importar desde F-Spot"

+

+#. (itstool) path: page/p

+#: C/import-f-spot.page:14

+msgid "To import an existing photo collection from F-Spot:"

+msgstr "Para importar una colección de fotos existente desde F-Spot:"

+

+#. (itstool) path: item/p

+#: C/import-f-spot.page:16

+msgid "Select <guiseq><gui>File</gui><gui>Import From F-Spot</gui></guiseq>."

+msgstr ""

+"Seleccione <guiseq><gui>Archivo</gui><gui>Importar desde F-Spot</gui></"

+"guiseq>."

+

+#. (itstool) path: item/p

+#: C/import-f-spot.page:17

+msgid ""

+"Now choose either the default F-Spot library or another F-Spot database. If "

+"importing from another F-Spot database, select a directory and file from the "

+"chooser dialog box."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/import-f-spot.page:20

+msgid ""

+"Shotwell will import your photos, together with their tags and other "

+"information. Once the import is complete, you can select <gui>Last Import</"

+"gui> in the sidebar to see all photos successfully imported. The Events list "

+"will also show new entries for the dates corresponding to the imported "

+"photos."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/import-memorycard.page:7

+msgid "Import photos from a digital camera's memory card."

+msgstr "Importar fotos desde una tarjeta de memoria de una cámara digital."

+

+#. (itstool) path: page/title

+#: C/import-memorycard.page:12

+msgid "Importing from a memory card"

+msgstr "Importar desde una tarjeta de memoria"

+

+#. (itstool) path: page/p

+#: C/import-memorycard.page:14

+msgid "To import photos from a camera memory card:"

+msgstr "Para importar fotos desde una tarjeta de memoria de una cámara:"

+

+#. (itstool) path: item/p

+#: C/import-memorycard.page:18

+msgid ""

+"Put the card into your card reader. Make sure the card reader is plugged in "

+"to the computer and switched on."

+msgstr ""

+"Coloque la tarjeta en el lector de tarjetas. Asegúrese de que el lector está "

+"conectado al equipo y encendido."

+

+#. (itstool) path: item/p

+#: C/import-memorycard.page:21

+msgid "The card reader and card should be detected automatically."

+msgstr ""

+"El lector de tarjetas y la tarjeta se deberían detectar automáticamente."

+

+#. (itstool) path: item/p

+#: C/import-memorycard.page:24

+msgid ""

+"Follow the instructions for <link xref=\"import-file\">importing photos from "

+"your hard disk</link>. If you click <guiseq><gui>File</gui><gui>Import From "

+"Folder...</gui></guiseq>, the memory card should be visible as a folder in "

+"the side bar of the file selection window."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/import-memorycard.page:28

+msgid ""

+"Shotwell can import photos from any memory card that is compatible with your "

+"card reader."

+msgstr ""

+"Shotwell puede importar fotos de una tarjeta de memoria que sea compatible "

+"con su lector de tarjetas."

+

+#. (itstool) path: page/p

+#: C/import-memorycard.page:30

+msgid ""

+"If the card is not detected automatically, your card reader may not have "

+"been recognized. Try unplugging it and then plugging it in again. If that "

+"doesn't work, you should still be able to import photos by <link xref="

+"\"import-camera\">connecting your camera directly to the computer</link>, "

+"though."

+msgstr ""

+

+#. (itstool) path: media

+#. This is a reference to an external file such as an image or video. When

+#. the file changes, the md5 hash will change to let you know you need to

+#. update your localized copy. The msgstr is not used at all. Set it to

+#. whatever you like once you have updated your copy of the file.

+#: C/index.page:23

+msgctxt "_"

+msgid ""

+"external ref='figures/shotwell_logo.png' "

+"md5='4b333499555b4e496b1a38f7899067f3'"

+msgstr ""

+"external ref='figures/shotwell_logo.png' "

+"md5='4b333499555b4e496b1a38f7899067f3'"

+

+#. (itstool) path: info/title

+#: C/index.page:6

+msgctxt "link"

+msgid "Shotwell"

+msgstr "Shotwell"

+

+#. (itstool) path: info/title

+#: C/index.page:7

+msgctxt "text"

+msgid "Shotwell"

+msgstr "Shotwell"

+

+#. (itstool) path: credit/name

+#: C/index.page:9

+msgid "Jim Nelson"

+msgstr "Jim Nelson"

+

+#. (itstool) path: credit/name

+#: C/index.page:11

+msgid "Allison Barlow"

+msgstr "Allison Barlow"

+

+#. (itstool) path: credit/name

+#: C/index.page:13

+msgid "Robert Ancell"

+msgstr "Robert Ancell"

+

+#. (itstool) path: credit/name

+#: C/index.page:15

+msgid "Peter Smith"

+msgstr "Peter Smith"

+

+#. (itstool) path: credit/name

+#: C/index.page:17

+msgid "Phil Bull"

+msgstr "Phil Bull"

+

+#. (itstool) path: page/title

+#: C/index.page:23

+msgid ""

+"<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Shotwell Photo "

+"Manager"

+msgstr ""

+"<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Gestor de fotos "

+"Shotwell"

+

+#. (itstool) path: section/title

+#: C/index.page:26

+msgid "Importing Photos"

+msgstr "Importar fotos"

+

+#. (itstool) path: section/title

+#: C/index.page:30

+msgid "Viewing Photos"

+msgstr "Ver fotos"

+

+#. (itstool) path: section/title

+#: C/index.page:34

+msgid "Organizing Photos"

+msgstr "Organizar fotos"

+

+#. (itstool) path: section/title

+#: C/index.page:38

+msgid "Editing Photos"

+msgstr "Editar fotos"

+

+#. (itstool) path: section/title

+#: C/index.page:42

+msgid "Sharing Photos"

+msgstr "Compartir fotos"

+

+#. (itstool) path: section/title

+#: C/index.page:46

+msgid "Other Features"

+msgstr "Otras características"

+

+#. (itstool) path: info/desc

+#: C/organize-event.page:7

+msgid ""

+"Group photos together that were taken at the same time. Learn how to rename, "

+"merge, and sort events."

+msgstr ""

+"Agrupar fotos que se tomadron al mismo tiempo. Aprenda como renombrar, unir "

+"y ordenar eventos."

+

+#. (itstool) path: page/title

+#: C/organize-event.page:12

+msgid "Events"

+msgstr "Eventos"

+

+#. (itstool) path: page/p

+#: C/organize-event.page:14

+msgid ""

+"An event is a group of photos that were taken at approximately the same "

+"time. When you import photos, Shotwell checks when each photo was taken. It "

+"then groups the photos into events."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/organize-event.page:16

+msgid ""

+"Choose <gui>Events</gui> from the sidebar to see your photos organized by "

+"date. If you select a month or year from the sidebar, a list of events will "

+"be displayed in the main window. Double-click an event to see all the photos "

+"that were taken around that time."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/organize-event.page:18

+msgid ""

+"If a photo has no embedded date/time information, then Shotwell can't "

+"automatically place it in any event. In this case the photo will appear in "

+"the <gui>No Event</gui> view accessible from the sidebar. You can still move "

+"the photo to any event you like as described below."

+msgstr ""

+

+#. (itstool) path: section/title

+#: C/organize-event.page:25

+msgid "Renaming events"

+msgstr "Renombrar eventos"

+

+#. (itstool) path: section/p

+#: C/organize-event.page:27

+msgid ""

+"To give an event a name rather than referring to it by its date, select the "

+"event, click <guiseq><gui>Events</gui><gui>Rename Event...</gui></guiseq> "

+"and enter a new name. Another way of renaming an event is to double-click "

+"its name in the sidebar; type a new name and then press <key>Enter</key>."

+msgstr ""

+

+#. (itstool) path: section/title

+#: C/organize-event.page:31

+msgid "Moving photos between events"

+msgstr "Mover fotos entre eventos"

+

+#. (itstool) path: section/p

+#: C/organize-event.page:33

+msgid ""

+"Even though photos are initially grouped into events by their date, you can "

+"move photos between events. To do this, drag any photo to the sidebar and "

+"drop it on an event."

+msgstr ""

+

+#. (itstool) path: section/title

+#: C/organize-event.page:37

+msgid "Creating and merging events"

+msgstr "Crear y combinar eventos"

+

+#. (itstool) path: section/p

+#: C/organize-event.page:38

+msgid ""

+"To create a new event, select the photos you would like in the new event and "

+"click <guiseq><gui>Events</gui><gui>New Event</gui></guiseq>."

+msgstr ""

+"Para crear un evento nuevo, seleccione las fotos que quiere tener en el "

+"evento y pulse <guiseq><gui>Eventos</gui><gui>Nuevo evento</gui></guiseq>."

+

+#. (itstool) path: section/p

+#: C/organize-event.page:39

+msgid ""

+"To merge events, select <guiseq><gui>Events</gui></guiseq> from the sidebar, "

+"then, while holding down <key>Ctrl</key> click on the events you want to "

+"merge in the main window area. Finally, click <guiseq><gui>Events</"

+"gui><gui>Merge Events</gui></guiseq>."

+msgstr ""

+

+#. (itstool) path: section/title

+#: C/organize-event.page:43

+msgid "Sorting events"

+msgstr "Ordenar eventos"

+

+#. (itstool) path: section/p

+#: C/organize-event.page:45

+msgid ""

+"Events are displayed in a tree in the sidebar, organized by the year and "

+"month of the earliest photo in the event. To change the event sort order, "

+"click <guiseq><gui>View</gui><gui>Sort Events</gui></guiseq> and select "

+"either ascending or descending."

+msgstr ""

+

+#. (itstool) path: section/title

+#: C/organize-event.page:51

+msgid "Change the photo used to represent each event"

+msgstr "Cambiar la foto usada para representar cada evento"

+

+#. (itstool) path: section/p

+#: C/organize-event.page:53

+#, fuzzy

+#| msgid ""

+#| "If you select the Events item in the sidebar, you'll see a single photo "

+#| "which represents each event. This is called the key photo."

+msgid ""

+"If you select the <gui>Events</gui> item in the sidebar, you'll see a single "

+"photo which represents each event. This is called the key photo."

+msgstr ""

+"Si selecciona el elemento Eventos en la barra lateral, verá una única foto "

+"que representa cada evento. Esto se denomina «foto clave»."

+

+#. (itstool) path: section/p

+#: C/organize-event.page:55

+msgid ""

+"By default, Shotwell uses the first photo in each event as its key photo. To "

+"use a different key photo, select the photo and choose <guiseq><gui>Photos</"

+"gui><gui>Make Key Photo for Event</gui></guiseq>."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/organize-flag.page:7

+msgid "Flag photos to mark them as special or to work with them as a set."

+msgstr ""

+"Marcar fotos para identificarlas como especiales o para trabajar con ellas "

+"como conjunto."

+

+#. (itstool) path: page/title

+#: C/organize-flag.page:12

+msgid "Flagging photos"

+msgstr "Marcar fotos"

+

+#. (itstool) path: page/p

+#: C/organize-flag.page:14

+msgid ""

+"Shotwell lets you <em>flag</em> photos. When a photo is flagged, a small "

+"flag icon appears in its upper right corner. You can select the "

+"<gui>Flagged</gui> item in the sidebar to see all photos which have been "

+"flagged."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/organize-flag.page:18

+msgid ""

+"Flagging a photo marks it as special. You can interpret this in any way you "

+"like. For example, you might flag all photos which need visual adjustment, "

+"or all photos which you want to share with a friend."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/organize-flag.page:22

+msgid ""

+"Flagging is also useful because you can operate on all flagged photos as a "

+"set. For example, you can select the <gui>Flagged</gui> view and then upload "

+"all flagged photos to a publishing service."

+msgstr ""

+

+#. (itstool) path: section/title

+#: C/organize-flag.page:27

+msgid "To flag or unflag a photo"

+msgstr "Para marcar o desmarcar una foto"

+

+#. (itstool) path: section/p

+#: C/organize-flag.page:28

+msgid ""

+"To flag or unflag a photo, right-click the photo and choose <gui>Flag</gui> "

+"or <gui>Unflag</gui> from the context menu. Or use the <keyseq><key>Ctrl</"

+"key><key>G</key></keyseq> or <key>/</key> shortcut keys."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/organize-rating.page:7

+msgid ""

+"Give photos a rating between 1 and 5 stars. You can reject bad photos, "

+"hiding them from view."

+msgstr ""

+"Asigne a las fotos una puntuación entre 1 y 5. Puede rechazar las fotos "

+"malas, ocultándolas en la vista."

+

+#. (itstool) path: page/title

+#: C/organize-rating.page:12

+msgid "Ratings"

+msgstr "Valoraciones"

+

+#. (itstool) path: page/p

+#: C/organize-rating.page:13

+msgid ""

+"You can assign each photo a rating from 1-5 stars, or may alternatively rate "

+"it as Rejected, in which case Shotwell will hide the photo by default."

+msgstr ""

+"Puede asignar a cada foto una puntuación entre 1 y 5, o marcarla como "

+"rechazada, en cuyo caso Shotwell la ocultará de manera predeterminada."

+

+#. (itstool) path: page/p

+#: C/organize-rating.page:15

+msgid "You can rate a photo or a set of photos in any of these ways:"

+msgstr ""

+"Puede valorar una foto o un conjunto de fotos de cualquiera de estas maneras:"

+

+#. (itstool) path: item/p

+#: C/organize-rating.page:18

+msgid ""

+"Select the photo(s), then choose a rating from the top-level "

+"<guiseq><gui>Photos</gui><gui>Set Rating</gui></guiseq> menu."

+msgstr ""

+"Seleccione las fotos y luego escoja una puntuación en el menú "

+"<guiseq><gui>Foto</gui><gui>Establecer puntuación</gui></guiseq> del nivel "

+"superior."

+

+#. (itstool) path: item/p

+#: C/organize-rating.page:19

+msgid ""

+"Right-click on the photo(s), then choose a rating from the Set Rating "

+"context menu."

+msgstr ""

+"Pulse con el botón derecho en las fotos y luego escoja su puntuación en el "

+"menú contextual «Establecer puntuación»."

+

+#. (itstool) path: item/p

+#: C/organize-rating.page:20

+msgid ""

+"Select the photo(s), then press any of the shortcut keys <key>1</key>, "

+"<key>2</key>, <key>3</key>, <key>4</key> or <key>5</key> to assign a rating. "

+"Or press <key>9</key> to mark the photo(s) as rejected or <key>0</key> to "

+"clear the rating(s)."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/organize-rating.page:23

+msgid ""

+"Normally Shotwell displays all photos except rejected photos. You can set a "

+"different rating filter using the <guiseq><gui>View</gui><gui>Filter Photos</"

+"gui></guiseq> menu - for example, you can display only photos rated with 3 "

+"stars or higher, or you can display all photos including those marked "

+"rejected. The Shotwell icon on the toolbar displays the current rating "

+"filter and can also be used to set the filter."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/organize-rating.page:26

+msgid ""

+"Shotwell normally displays each photo's rating in its lower left-hand "

+"corner. You can turn off the display of ratings using the <guiseq><gui>View</"

+"gui><gui>Ratings</gui></guiseq> menu item."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/organize-rating.page:28

+msgid ""

+"You can increase or decrease a photo's rating using the <guiseq><gui>Set "

+"Rating</gui><gui>Increase</gui></guiseq> and <guiseq><gui>Set Rating</"

+"gui><gui>Decrease</gui></guiseq> commands, or the keyboard shortcuts "

+"<key>&lt;</key> and <key>&gt;</key>."

+msgstr ""

+

+#. (itstool) path: media

+#. This is a reference to an external file such as an image or video. When

+#. the file changes, the md5 hash will change to let you know you need to

+#. update your localized copy. The msgstr is not used at all. Set it to

+#. whatever you like once you have updated your copy of the file.

+#: C/organize-remove.page:15

+msgctxt "_"

+msgid ""

+"external ref='figures/trash_process.png' "

+"md5='ed596bda34c2f4a79a310fbc8bb51fd2'"

+msgstr ""

+"external ref='figures/trash_process.png' "

+"md5='ed596bda34c2f4a79a310fbc8bb51fd2'"

+

+#. (itstool) path: info/desc

+#: C/organize-remove.page:7

+msgid ""

+"Remove photos from the library, or delete them from your computer entirely."

+msgstr "Quitar fotos de la biblioteca, o eliminarlas por completo del equipo."

+

+#. (itstool) path: page/title

+#: C/organize-remove.page:12

+msgid "Removing and deleting photos"

+msgstr "Quitar y eliminar fotos"

+

+#. (itstool) path: page/p

+#: C/organize-remove.page:14

+msgid ""

+"You may remove photos from your library and you may additionally delete them "

+"entirely from your hard disk."

+msgstr ""

+"Puede eliminar las fotos de su biblioteca y también puede eliminarlas de su "

+"disco duro."

+

+#. (itstool) path: page/media

+#: C/organize-remove.page:15

+msgid "Delete process"

+msgstr "Proceso de eliminado"

+

+#. (itstool) path: page/p

+#: C/organize-remove.page:16

+msgid ""

+"This diagram shows how a photo, when deleted, is first put into Shotwell's "

+"trash. If you delete it from Shotwell's trash, it is put into your "

+"computer's trash. If you delete it from your computer's trash the photo is "

+"finally and irretrievably deleted from your computer."

+msgstr ""

+"Este diagrama muestra cómo, cuando se elimina una foto, se pone primero en "

+"la papelera de Shotwell. Si la elimina de la papelera de Shotwell, se mueve "

+"a la papelera de su equipo. Si la elimina de la papelera del equipo, se "

+"eliminará permanentemente."

+

+#. (itstool) path: section/title

+#: C/organize-remove.page:18

+msgid "Removing photos from the library"

+msgstr "Quitar fotos de la biblioteca"

+

+#. (itstool) path: section/p

+#: C/organize-remove.page:19

+msgid ""

+"Select the photos to remove and choose <guiseq><gui>Edit</gui><gui>Move to "

+"Trash</gui></guiseq>. (You can also press the <key>Delete</key> key.) The "

+"photos will be moved from your library to Shotwell's Trash."

+msgstr ""

+"Seleccione las fotos que quiere quitar y elija <guiseq><gui>Editar</"

+"gui><gui>Mover a la papelera</gui></guiseq>. (También puede pulsar la tecla "

+"<key>Supr</key>.) Las fotos se moverán de su biblioteca a la papelera de "

+"Shotwell."

+

+#. (itstool) path: section/p

+#: C/organize-remove.page:22

+msgid ""

+"If you want to remove photos from Shotwell without having them pass through "

+"the trash, simply select the photos to be removed and choose "

+"<guiseq><gui>Edit</gui><gui>Remove From Library</gui></guiseq>. The photo "

+"files will be left in place on disk."

+msgstr ""

+

+#. (itstool) path: section/title

+#: C/organize-remove.page:26

+msgid "Emptying or restoring the trash folder"

+msgstr "Vaciar o restaurar la carpeta de la papelera"

+

+#. (itstool) path: section/p

+#: C/organize-remove.page:27

+msgid ""

+"Select the Trash entry in the Sidebar and Shotwell will display all photos "

+"that have been marked for removal or deletion. In the Trash view, the "

+"following commands are available:"

+msgstr ""

+"Seleccione la entrada de la papelera en la barra lateral y Shotwell mostrará "

+"todas las fotos que se han marcado para quitar o eliminar. En la vista de la "

+"papelera están disponibles los siguientes comandos:"

+

+#. (itstool) path: item/title

+#: C/organize-remove.page:29

+msgid "Delete"

+msgstr "Eliminar"

+

+#. (itstool) path: item/p

+#: C/organize-remove.page:29

+msgid "Delete the selected photos from the trash folder."

+msgstr "Eliminar las fotos seleccionadas de la carpeta de la papelera"

+

+#. (itstool) path: item/title

+#: C/organize-remove.page:30

+msgid "Restore"

+msgstr "Restaurar"

+

+#. (itstool) path: item/p

+#: C/organize-remove.page:30

+msgid "Restore the selected photos into Shotwell."

+msgstr "Restaurar las fotos seleccionadas en Shotwell."

+

+#. (itstool) path: item/title

+#: C/organize-remove.page:31

+msgid "Empty trash"

+msgstr "Vaciar la papelera"

+

+#. (itstool) path: item/p

+#: C/organize-remove.page:31

+msgid "Delete all photos from the trash folder."

+msgstr "Eliminar todas las fotos de la papelera."

+

+#. (itstool) path: section/title

+#: C/organize-remove.page:36

+msgid "Deleting or emptying Trash"

+msgstr "Eliminar o vaciar la papelera"

+

+#. (itstool) path: section/p

+#: C/organize-remove.page:37

+msgid ""

+"When you delete files from the Trash folder or empty the Trash folder, you "

+"will be given the following choices:"

+msgstr ""

+"Cuando elimine archivos de la carpeta Papelera, o cuando la vacíe, se le "

+"ofrecerán las siguientes opciones:"

+

+#. (itstool) path: item/title

+#: C/organize-remove.page:39

+msgid "Only Remove"

+msgstr "Solo eliminar"

+

+#. (itstool) path: item/p

+#: C/organize-remove.page:39

+msgid ""

+"Remove photos from the library but leave the photos in their location on the "

+"computer."

+msgstr ""

+"Quitar fotos de la biblioteca pero mantener las fotos en su ubicación dentro "

+"del equipo."

+

+#. (itstool) path: item/title

+#: C/organize-remove.page:40

+msgid "Trash file"

+msgstr "Archivo de Papelera"

+

+#. (itstool) path: item/p

+#: C/organize-remove.page:40

+msgid "Remove photos from the library and delete them from the computer."

+msgstr "Quitar fotos de la biblioteca y eliminarlas del equipo."

+

+#. (itstool) path: item/title

+#: C/organize-remove.page:41

+msgid "Cancel"

+msgstr "Cancelar"

+

+#. (itstool) path: item/p

+#: C/organize-remove.page:41

+msgid "Do nothing."

+msgstr "No hacer nada."

+

+#. (itstool) path: info/desc

+#: C/organize-search.page:7

+msgid "Find photos and videos in your collection by a variety of criteria."

+msgstr "Buscar fotos y vídeos en su colección siguiendo varios criterios."

+

+#. (itstool) path: page/title

+#: C/organize-search.page:12

+msgid "Searching"

+msgstr "Búsqueda"

+

+#. (itstool) path: page/p

+#: C/organize-search.page:14

+msgid ""

+"There are two ways to search in Shotwell: the filter toolbar, and with a "

+"saved search. The search bar allows you to quickly search the current view "

+"for certain criteria. Saved Searches feature more complex search criteria "

+"and persist in the sidebar between sessions."

+msgstr ""

+

+#. (itstool) path: section/title

+#: C/organize-search.page:21

+msgid "Search bar"

+msgstr "Barra de búsqueda"

+

+#. (itstool) path: section/p

+#: C/organize-search.page:22

+msgid ""

+"The <guiseq><gui>View</gui><gui>Search Bar</gui></guiseq> checkbox toggles "

+"the display of the search bar. You can also hit <keyseq><key>Ctrl</"

+"key><key>F</key></keyseq> or <key>F8</key> to bring up the search bar. From "

+"this bar, you can find, show and hide photos and videos based on title, tag, "

+"rating or other options."

+msgstr ""

+

+#. (itstool) path: section/p

+#: C/organize-search.page:29

+msgid ""

+"To begin searching, simply enter a search keyword in the text box, or click "

+"on <gui>Flagged</gui>, <gui>Rating</gui> or <gui>Type</gui>. The text search "

+"matches your keywords across tag names, photo or video titles and photos' "

+"original filenames. The <gui>Flagged</gui>, <gui>Rating</gui> and <gui>Type</"

+"gui> buttons allow you to filter your collection by whether photos are "

+"flagged, their current number of stars, and whether the items shown are "

+"images, videos, or raw camera files, respectively."

+msgstr ""

+

+#. (itstool) path: section/p

+#: C/organize-search.page:38

+msgid ""

+"Disabling the search bar or exiting Shotwell automatically resets the search "

+"bar."

+msgstr ""

+"Desactivar la barra de búsqueda o salir de Shotwell reinicia automáticamente "

+"la barra de búsqueda."

+

+#. (itstool) path: section/title

+#: C/organize-search.page:44

+msgid "Saved search"

+msgstr "Búsqueda guardada"

+

+#. (itstool) path: section/p

+#: C/organize-search.page:45

+msgid ""

+"A saved search persists across Shotwell sessions, and is updated as photos "

+"and videos are added and removed from your Shotwell library."

+msgstr ""

+"Una búsqueda guardada se mantiene entre sesiones de Shotwell, y se actualiza "

+"con las fotos y vídeos que se añaden o quitan de su biblioteca de Shotwell."

+

+#. (itstool) path: section/p

+#: C/organize-search.page:50

+msgid ""

+"Create a new saved search with <guiseq><gui>Edit</gui><gui>New Saved "

+"Search...</gui></guiseq> or by hitting <keyseq><key>Ctrl</key><key>S</key></"

+"keyseq>. The dialog box allows you to enter a name for the search and select "

+"whether you want to meet Any, All, or None of the criteria in the following "

+"rows."

+msgstr ""

+

+#. (itstool) path: section/p

+#: C/organize-search.page:56

+msgid ""

+"Each row represents a search criterion. Use the <gui>+</gui> button to add "

+"more rows, and the <gui>-</gui> button to remove a specific row. The combo "

+"box on the left of each row selects the type of criteria. Criteria must be "

+"entered correctly before the <gui>OK</gui> button becomes available."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/organize-tag.page:7

+msgid "Organize photos by labelling them."

+msgstr "Organizar las fotos etiquetándolas."

+

+#. (itstool) path: page/title

+#: C/organize-tag.page:14

+msgid "Tagging photos"

+msgstr "Etiquetar fotos"

+

+#. (itstool) path: page/p

+#: C/organize-tag.page:16

+msgid ""

+"You can assign one or more tags to selected photos. A tag can be one or more "

+"words that you want to associate with those photos."

+msgstr ""

+"Puede asignar una o más etiquetas a las fotos seleccionadas. Una etiqueta "

+"puede constar de una o más palabras que quiera asociar a esas fotos."

+

+#. (itstool) path: page/p

+#: C/organize-tag.page:22

+msgid ""

+"To add new tags to photos, select the photos you would like to tag, then do "

+"any of the following:"

+msgstr ""

+"Para añadir etiquetas nuevas a las fotos, seleccione las fotos que quiere "

+"etiquetar y siga estos pasos:"

+

+#. (itstool) path: item/p

+#: C/organize-tag.page:28

+msgid "Choose <guiseq><gui>Tags</gui><gui>Add Tags...</gui></guiseq>."

+msgstr ""

+"Elija <guiseq><gui>Etiquetas</gui><gui>Añadir etiquetas...</gui></guiseq>."

+

+#. (itstool) path: item/p

+#: C/organize-tag.page:29

+msgid "Type <keyseq><key>Ctrl</key><key>T</key></keyseq>."

+msgstr "Pulse <keyseq><key>Ctrl</key><key>T</key></keyseq>."

+

+#. (itstool) path: item/p

+#: C/organize-tag.page:30

+msgid "Drag the selected photos and drop them on the desired tag."

+msgstr "Arrastre las fotos y suéltelas en la etiqueta que quiera."

+

+#. (itstool) path: page/p

+#: C/organize-tag.page:33

+msgid ""

+"When you use <keyseq><key>Ctrl</key><key>T</key></keyseq> or "

+"<guiseq><gui>Tags</gui><gui>Add Tags...</gui></guiseq> you can type in the "

+"names of one or more tags, separated by commas. Once you have created a tag, "

+"you can rename it by selecting that tag in the sidebar and choosing "

+"<guiseq><gui>Tags</gui><gui>Rename Tag \"[name]\"...</gui></guiseq>, by "

+"rightclicking on it and choose <gui>Rename...</gui> or double-click on the "

+"tag in the sidebar."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/organize-tag.page:44

+msgid ""

+"To change which tags are associated with a particular photo, select that "

+"photo, choose <guiseq><gui>Tags</gui><gui>Modify Tags...</gui></guiseq> or "

+"right-click on a photo and select <gui>Modify Tags...</gui> and edit the "

+"comma separated list. To remove a tag from one or more photos, first select "

+"that tag in the sidebar, then select the photos you would like to remove, "

+"and choose <guiseq><gui>Tags</gui><gui>Remove Tag \"[name]\" from Photos</"

+"gui></guiseq> or right-click on the photos an select <gui>Remove Tag \"[name]"

+"\" from Photos</gui>."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/organize-tag.page:58

+msgid ""

+"To delete a tag entirely, select that tag in the sidebar and choose "

+"<guiseq><gui>Tags</gui><gui>Delete Tag \"[name]\"</gui></guiseq> or by right-"

+"click and select <gui>Delete Tag \"[name]\"</gui>."

+msgstr ""

+"Para eliminar por completo una etiqueta, selecciónela en la barra latera y "

+"elija <guiseq><gui>Etiquetas</gui><gui>Eliminar etiqueta «nombre»</gui></"

+"guiseq> o púlsela con el botón derecho y elija <gui>Eliminar etiqueta "

+"«nombre»</gui>."

+

+#. (itstool) path: page/p

+#: C/organize-tag.page:64

+#, fuzzy

+#| msgid ""

+#| "The <gui>Tags</gui> folder lists all tags you've assigned to photos. "

+#| "Photos can have multiple tags attached to them. When you click on the "

+#| "name of a tag in the sidebar, you will see all the photos associated with "

+#| "that tag."

+msgid ""

+"When you create a tag, it will appear in the sidebar under the <gui>Tags</"

+"gui> item, which is hidden if there are no tags. Photos can have multiple "

+"tags attached to them, and when you click on the name of a given tag in the "

+"sidebar, you will see all the photos associated with that tag."

+msgstr ""

+"La carpeta <gui>Etiquetas</gui> lista todas las etiquetas que ha asignado a "

+"sus fotos. Las fotos pueden tener múltiples etiquetas relacionadas con las "

+"mismas. Cuando posiciona el cursor sobre el nombre de una etiqueta en la "

+"barra lateral, podrá ver todas las fotos asociadas a esa etiqueta."

+

+#. (itstool) path: section/title

+#: C/organize-tag.page:73

+msgid "Hierarchical Tags"

+msgstr "Etiquetas jerárquicas"

+

+#. (itstool) path: section/p

+#: C/organize-tag.page:74

+msgid ""

+"Shotwell supports also hierarchial tags. You can rearrange your tags by drag "

+"and drop a tag onto another. To create a new subtag right-click on a tag and "

+"select <gui>New</gui>."

+msgstr ""

+"Shotwell también soporta etiquetas jerárquicas. Puede reordenar sus "

+"etiquetas arrastrando y soltando una etiqueta sobre otra. Para crear una "

+"etiqueta hija nueva, pulse con el botón derecho sobre una etiqueta y elija "

+"<gui>Nuevo</gui>."

+

+#. (itstool) path: section/p

+#: C/organize-tag.page:81

+msgid ""

+"Hierarchial tags can help you to sort your tag list in ways that better "

+"match how you work or think; for example, you can store location tags like "

+"\"Mountains\" or \"Beach\" under a parent tag \"Places\", which itself can "

+"be placed under the tag \"Summer Holidays\"."

+msgstr ""

+"Las etiquetas jerárquicas le pueden ayudar a ordenar su lista de etiquetas "

+"de manera que se ajuste a mejor a lo que necesita; por ejemplo, puede tener "

+"las etiquetas «Montañas» o «Playa» dentro de la etiqueta «Lugares», que a su "

+"vez puede estar dentro de la etiqueta «Vacaciones de verano»."

+

+#. (itstool) path: section/p

+#: C/organize-tag.page:89

+msgid "Note that deleting a parent tag will also delete its child tags."

+msgstr ""

+"Tenga en cuenta que al eliminar una etiqueta padre también se eliminarán las "

+"etiquetas hijas."

+

+#. (itstool) path: info/desc

+#: C/organize-title.page:7

+msgid "Give titles to your photos."

+msgstr "Asignar títulos a las fotos."

+

+#. (itstool) path: page/title

+#: C/organize-title.page:12

+msgid "Titles"

+msgstr "Títulos"

+

+#. (itstool) path: page/p

+#: C/organize-title.page:14

+msgid ""

+"The <guiseq><gui>View</gui><gui>Titles</gui></guiseq> checkbox toggles the "

+"display of titles beneath each photo. By default, a photo's title is its "

+"filename."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/organize-title.page:17

+#, fuzzy

+#| msgid ""

+#| "To change a photo's title, select the photo and click "

+#| "<guiseq><gui>Photos</gui><gui>Edit Title</gui></guiseq>, or press "

+#| "<key>F2</key>."

+msgid ""

+"To change a photo's title, select the photo and click <guiseq><gui>Photos</"

+"gui><gui>Edit Title...</gui></guiseq>, or press <key>F2</key>."

+msgstr ""

+"Para cambiar el título de una foto, selecciónela y pulse <guiseq><gui>Fotos</"

+"gui><gui>Editar título</gui></guiseq>, o pulse <key>F2</key>."

+

+#. (itstool) path: info/desc

+#: C/other-files.page:7

+msgid "Keep the Shotwell library in sync with photo files on disk."

+msgstr ""

+"Mantener la biblioteca de Shotwell sincronizada con los archivos de fotos "

+"del disco."

+

+#. (itstool) path: page/title

+#: C/other-files.page:12

+msgid "Photo files"

+msgstr "Archivos de fotos"

+

+#. (itstool) path: page/p

+#: C/other-files.page:14

+msgid ""

+"Every photo in the Shotwell library corresponds to a file stored on your "

+"hard disk. Shotwell has several features which help you keep the Shotwell "

+"library and files on disk in sync."

+msgstr ""

+"Cada foto de la biblioteca de Shotwell se corresponde con un archivo "

+"almacenado en su disco duro. Shotwell tienen varias características que le "

+"ayudan a mantener su biblioteca y los archivos del disco sincronizados."

+

+#. (itstool) path: section/title

+#: C/other-files.page:21

+msgid "Using a custom directory pattern"

+msgstr "Usar un patrón de carpeta predeterminado"

+

+#. (itstool) path: section/p

+#: C/other-files.page:22

+msgid ""

+"Shotwell allows you to specify how it names directories in your library. You "

+"can do this by changing the <gui>Directory Structure</gui> and <gui>Pattern</"

+"gui> settings in the <gui>Preferences</gui> dialog. You may use a "

+"preselected pattern, or choose <gui>Custom</gui> and type in your own."

+msgstr ""

+"Shotwell le permite especificar como llamar a sus carpetas en una "

+"biblioteca. Puede hacer esto cambiando las configuraciones de "

+"<gui>Estructura del directorio</gui> y <gui>Patrón</gui> en el cuadro de "

+"diálogo <gui>Preferencias</gui>. Puede utilizar un patrón preseleccionado, o "

+"escoger <gui>Personalizado</gui> y escribir el suyo."

+

+#. (itstool) path: section/p

+#: C/other-files.page:29

+msgid ""

+"The available symbols for the directory pattern begin with a % (percent "

+"sign). The values these symbols produce are locale-dependent, so what you "

+"see on your computer may vary from the examples below."

+msgstr ""

+"Los símbolos disponibles para los patrones de carpetas empiezan por "

+"«%» (signo de porcentaje). Los valores que estos símbolos producen dependen "

+"de la configuración regional, por lo que lo que vea en su equipo puede ser "

+"diferente a estos ejemplos."

+

+#. (itstool) path: td/p

+#: C/other-files.page:38

+msgid "<em>Symbol</em>"

+msgstr "<em>Símbolo</em>"

+

+#. (itstool) path: td/p

+#: C/other-files.page:38

+msgid "<em>Meaning</em>"

+msgstr "<em>Significado</em>"

+

+#. (itstool) path: td/p

+#: C/other-files.page:38

+msgid "<em>Example</em>"

+msgstr "<em>Ejemplo</em>"

+

+#. (itstool) path: td/p

+#: C/other-files.page:43

+msgid "%Y"

+msgstr "%Y"

+

+#. (itstool) path: td/p

+#: C/other-files.page:43

+msgid "Year: full"

+msgstr "Año: completo"

+

+#. (itstool) path: td/p

+#: C/other-files.page:43

+msgid "2011"

+msgstr "2011"

+

+#. (itstool) path: td/p

+#: C/other-files.page:46

+msgid "%y"

+msgstr "%y"

+

+#. (itstool) path: td/p

+#: C/other-files.page:46

+msgid "Year: two digit"

+msgstr "Año: dos dígitos"

+

+#. (itstool) path: td/p

+#: C/other-files.page:46

+msgid "11"

+msgstr "11"

+

+#. (itstool) path: td/p

+#: C/other-files.page:49

+msgid "%d"

+msgstr "%d"

+

+#. (itstool) path: td/p

+#: C/other-files.page:49

+msgid "Day of the month with leading zero"

+msgstr "Día del mes, empezando por cero"

+

+#. (itstool) path: td/p

+#: C/other-files.page:49

+msgid "03"

+msgstr "03"

+

+#. (itstool) path: td/p

+#: C/other-files.page:52

+msgid "%A"

+msgstr "%A"

+

+#. (itstool) path: td/p

+#: C/other-files.page:52

+msgid "Day name: full"

+msgstr "Nombre del día: completo"

+

+#. (itstool) path: td/p

+#: C/other-files.page:52

+msgid "Wednesday"

+msgstr "Miércoles"

+

+#. (itstool) path: td/p

+#: C/other-files.page:55

+msgid "%a"

+msgstr "%a"

+

+#. (itstool) path: td/p

+#: C/other-files.page:55

+msgid "Day name: abbreviated"

+msgstr "Nombre del día: abreviado"

+

+#. (itstool) path: td/p

+#: C/other-files.page:55

+msgid "Wed"

+msgstr "Mié"

+

+#. (itstool) path: td/p

+#: C/other-files.page:58

+msgid "%m"

+msgstr "%m"

+

+#. (itstool) path: td/p

+#: C/other-files.page:58

+msgid "Month number with leading zero"

+msgstr "Número de mes, empezando por cero"

+

+#. (itstool) path: td/p

+#: C/other-files.page:58

+msgid "02"

+msgstr "02"

+

+#. (itstool) path: td/p

+#: C/other-files.page:60

+msgid "%b"

+msgstr "%b"

+

+#. (itstool) path: td/p

+#: C/other-files.page:60

+msgid "Month name: abbreviated"

+msgstr "Nombre del mes: abreviado"

+

+#. (itstool) path: td/p

+#: C/other-files.page:60

+msgid "Feb"

+msgstr "Feb"

+

+#. (itstool) path: td/p

+#: C/other-files.page:62

+msgid "%B"

+msgstr "%B"

+

+#. (itstool) path: td/p

+#: C/other-files.page:62

+msgid "Month name: full"

+msgstr "Nombre del mes: completo"

+

+#. (itstool) path: td/p

+#: C/other-files.page:62

+msgid "February"

+msgstr "Febrero"

+

+#. (itstool) path: td/p

+#: C/other-files.page:63

+msgid "%I"

+msgstr "%I"

+

+#. (itstool) path: td/p

+#: C/other-files.page:63

+msgid "Hour: 12 hour format"

+msgstr "Hora: formato de 12 horas"

+

+#. (itstool) path: td/p

+#: C/other-files.page:63

+msgid "05"

+msgstr "05"

+

+#. (itstool) path: td/p

+#: C/other-files.page:64

+msgid "%H"

+msgstr "%H"

+

+#. (itstool) path: td/p

+#: C/other-files.page:64

+msgid "Hour: 24 hour format"

+msgstr "Hora: formato de 24 horas"

+

+#. (itstool) path: td/p

+#: C/other-files.page:64

+msgid "17"

+msgstr "17"

+

+#. (itstool) path: td/p

+#: C/other-files.page:66

+msgid "%M"

+msgstr "%M"

+

+#. (itstool) path: td/p

+#: C/other-files.page:66

+msgid "Minute"

+msgstr "Minuto"

+

+#. (itstool) path: td/p

+#: C/other-files.page:66

+msgid "16"

+msgstr "16"

+

+#. (itstool) path: td/p

+#: C/other-files.page:67

+msgid "%S"

+msgstr "%S"

+

+#. (itstool) path: td/p

+#: C/other-files.page:67

+msgid "Second"

+msgstr "Segundo"

+

+#. (itstool) path: td/p

+#: C/other-files.page:67

+msgid "30"

+msgstr "30"

+

+#. (itstool) path: td/p

+#: C/other-files.page:68

+msgid "%p"

+msgstr "%p"

+

+#. (itstool) path: td/p

+#: C/other-files.page:68

+msgid "AM or PM"

+msgstr "AM o PM"

+

+#. (itstool) path: td/p

+#: C/other-files.page:68

+msgid "PM"

+msgstr "PM"

+

+#. (itstool) path: section/p

+#: C/other-files.page:72

+msgid ""

+"There are other symbols available; please check the manual for strftime by "

+"running the command <cmd>man strftime</cmd> if you need one that isn't "

+"listed here."

+msgstr ""

+"Existen otros símbolos disponibles, revise el manual de strftime ejecutando "

+"el comando <cmd>man strftime</cmd> si necesita alguno que no esté listado "

+"aquí."

+

+#. (itstool) path: section/title

+#: C/other-files.page:79

+msgid "Automatically importing photos"

+msgstr "Importar fotos automáticamente"

+

+#. (itstool) path: section/p

+#: C/other-files.page:81

+msgid ""

+"Shotwell can automatically import new photos which appear in the library "

+"directory. (The library directory is usually the <file>Pictures</file> "

+"directory in your home directory; you can change its location in in the "

+"<gui>Preferences</gui> window.)"

+msgstr ""

+"Shotwell puede automáticamente importar nuevas fotos que aparezcan en la "

+"carpeta de la biblioteca. (La carpeta de la biblioteca está usualmente en la "

+"carpeta <file>Imágenes</file> en su carpeta local; puede cambiar esta "

+"ubicación en la ventana <gui>Preferencias</gui>.)"

+

+#. (itstool) path: section/p

+#: C/other-files.page:86

+msgid ""

+"To enable auto-import, check the box <gui>Watch library directory for new "

+"files</gui> in the <gui>Preferences</gui> window."

+msgstr ""

+"Para activar la importación automática, marca la opción <gui>Vigilar mi "

+"colección en búsqueda de archivos nuevos</gui> en la ventana "

+"<gui>Preferencias</gui>."

+

+#. (itstool) path: note/p

+#: C/other-files.page:90

+msgid ""

+"Shotwell can also follow symbolic links inside automatically-imported "

+"directories."

+msgstr ""

+"Shotwell también puede seguir los enlaces simbólicos en carpetas importadas "

+"automáticamente."

+

+#. (itstool) path: section/title

+#: C/other-files.page:95

+msgid "Automatically renaming imported photos to lowercase"

+msgstr "Renombrar a minúsculas automáticamente las fotos importadas"

+

+#. (itstool) path: section/p

+#: C/other-files.page:97

+msgid ""

+"Shotwell can automatically change the filenames of imported photos to "

+"lowercase. To enable this, choose <guiseq><gui>Edit</gui><gui>Preferences</"

+"gui></guiseq>, and in the <gui>Preferences</gui> window, check the "

+"<gui>Rename imported files to lowercase</gui> box."

+msgstr ""

+"Shotwell puede cambiar automáticamente los nombres de las fotos importadas a "

+"minúsculas. Para activar esto, escoja <guiseq><gui>Editar</"

+"gui><gui>Preferencias</gui></guiseq>, y en la ventana de <gui>Preferencias</"

+"gui>, marque la casilla <gui>Renombrar los archivos importados a minúsculas</"

+"gui>."

+

+#. (itstool) path: section/title

+#: C/other-files.page:107

+msgid "Writing metadata on the fly"

+msgstr "Escribir metadatos al vuelo"

+

+#. (itstool) path: section/p

+#: C/other-files.page:109

+msgid ""

+"By default, Shotwell does not modify photo files, even when you edit photos "

+"or change their tags or titles. Shotwell records these changes in its own "

+"database only."

+msgstr ""

+"De manera predeterminada, Shotwell no modifica los archivos de fotos, aunque "

+"las edite o cambie sus etiquetas o títulos. Shotwell guardará estos cambios "

+"únicamente en su propia base de datos."

+

+#. (itstool) path: section/p

+#: C/other-files.page:112

+msgid ""

+"To change this behavior, you can enable the checkbox <gui>Write tags, titles "

+"and other metadata to photo files</gui> in the <gui>Preferences</gui> "

+"dialog. When this option is enabled, Shotwell will write the following "

+"metadata to most photo files whenever you change it in Shotwell:"

+msgstr ""

+"Para cambiar este comportamiento, puede activar la casilla <gui>Escribir "

+"etiquetas, títulos y otros metadatos a los archivos</gui> en el cuadro de "

+"diálogo <gui>Preferencias</gui>. Cuando esta opción se activa, Shotwell "

+"escribirá los siguientes metadatos a la mayoría de los archivos cada vez que "

+"los modifique en Shotwell."

+

+#. (itstool) path: item/p

+#: C/other-files.page:118

+msgid "titles"

+msgstr "títulos"

+

+#. (itstool) path: item/p

+#: C/other-files.page:119

+msgid "tags"

+msgstr "etiquetas"

+

+#. (itstool) path: item/p

+#: C/other-files.page:120

+msgid "ratings"

+msgstr "valoraciones"

+

+#. (itstool) path: item/p

+#: C/other-files.page:121

+msgid "rotation information"

+msgstr "información de rotación"

+

+#. (itstool) path: item/p

+#: C/other-files.page:122

+msgid "time/date"

+msgstr "fecha/hora"

+

+#. (itstool) path: section/p

+#: C/other-files.page:125

+msgid ""

+"Shotwell stores this information in photo files in EXIF, IPTC and/or XMP "

+"format. Note that Shotwell can write only to photo files in JPEG, PNG and "

+"TIFF format, not to BMP photos, RAW photos or to video files."

+msgstr ""

+"Shotwell almacena esta información en archivos de fotos en formato EXIF, "

+"IPTC y/o XMP. Tenga en cuenta que Shotwell sólo puede escribir en archivos "

+"de fotos en formato JPEG, PNG y TIFF, no en fotos en BMP, RAW o en archivos "

+"de vídeo."

+

+#. (itstool) path: section/title

+#: C/other-files.page:133

+msgid "Runtime monitoring"

+msgstr "Monitorizazión en tiempo de ejecución"

+

+#. (itstool) path: section/p

+#: C/other-files.page:135

+msgid ""

+"While Shotwell is running, it notices changes made to any photo file "

+"externally. When a photo file changes, Shotwell rereads the file and updates "

+"your view of the photo and metadata."

+msgstr ""

+"Mientras Shotwell está en ejecución, tiene en cuenta los cambios realizados "

+"en un archivo de una foto externamente. Cuando el archivo cambia, Shotwell "

+"vuelve a leer el archivo y actualiza la vista de la foto y sus metadatos."

+

+#. (itstool) path: section/p

+#: C/other-files.page:139

+msgid ""

+"Note that Shotwell checks all photo files for changes at startup, but only "

+"photo files contained in the library directory are monitored in real time "

+"after startup. We hope to remove this limitation in a further release."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/other-missing.page:7

+msgid "If Shotwell can't find a photo in your library, it marks it as missing."

+msgstr ""

+"Si Shotwell no puede encontrar una foto en su biblioteca, la marca como "

+"ausente."

+

+#. (itstool) path: page/title

+#: C/other-missing.page:12

+msgid "Missing photos"

+msgstr "Fotos ausentes"

+

+#. (itstool) path: page/p

+#: C/other-missing.page:14

+msgid ""

+"Each time Shotwell starts up, it scans your photo library to verify that all "

+"photo files still exist on your hard drive. If Shotwell finds that any photo "

+"files are missing, it will not display them in the normal Photos, Events and "

+"Tags views, but will instead show them in a separate Missing Files view "

+"which will appear in the sidebar."

+msgstr ""

+"Cada vez que Shotwell se inicia, analiza su biblioteca de fotos para "

+"verificar que todos los archivos de fotos siguen existiendo en el disco "

+"duro. Si Shotwell encuentra que falta alguna foto, no la mostrará en las "

+"vistas normales de Fotos, Eventos o Etiquetas, sino que la mostrará en una "

+"vista de Fotos ausentes separada que aparecerá en la barra lateral."

+

+#. (itstool) path: page/p

+#: C/other-missing.page:16

+msgid ""

+"If you no longer want the missing files to be part of your Shotwell "

+"collection (perhaps because you deleted them), go to the Missing Files view, "

+"select the photos and then click <gui>Remove From Library</gui>."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/other-missing.page:18

+msgid ""

+"If you have photos on a removable disk, such as a CD or USB flash drive, and "

+"<link xref=\"index#import\">import</link> them into Shotwell <em>without</"

+"em> copying the photos to your computer, they will show up as missing files "

+"if you then disconnect the removable disk. See <link xref=\"import-file\"/> "

+"to learn how to copy files from removable disks onto your computer."

+msgstr ""

+"Si tiene fotos en un disco externo, como un CD o un pendrive USB y las <link "

+"xref=\"index#import\">importa</link> en Shotwell <em>sin</em> copiarlas al "

+"equipo, se mostrarán como archivos ausentes cuando desconecte el disco "

+"extraíble. Consulte la <link xref=\"import-file\"/> para aprender cómo "

+"copiar archivos desde discos extraíbles a su equipo."

+

+#. (itstool) path: page/p

+#: C/other-missing.page:20

+msgid ""

+"If any missing photo files become available again, Shotwell will notice this "

+"the next time it starts. The photos will once again appear in the Photos, "

+"Events and Tags views."

+msgstr ""

+"Si una foto ausente vuelve a estar disponible, Shotwell lo tendrá en cuenta "

+"la próxima vez que se inicie. Las fotos volverán a aparecer en las vistas de "

+"Fotos, Eventos y Etiquetas."

+

+#. (itstool) path: info/desc

+#: C/other-multiple.page:7

+msgid ""

+"You can open Shotwell with a different photo library by using the command "

+"line."

+msgstr ""

+"Puede abrir Shotwell con una biblioteca de fotos diferente usando la línea "

+"de comandos."

+

+#. (itstool) path: page/title

+#: C/other-multiple.page:12

+msgid "Multiple libraries"

+msgstr "Varias bibliotecas"

+

+#. (itstool) path: page/p

+#: C/other-multiple.page:14

+msgid ""

+"Shotwell normally stores its database and photo thumbnails in the directory "

+"<file>~/.shotwell</file> . This directory does not hold photos, but the "

+"database in this directory contains a list of all the photos in the Shotwell "

+"library."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/other-multiple.page:16

+msgid ""

+"As an advanced feature, it's possible for you to have multiple Shotwell "

+"libraries, each of which has its own set of photos. Each library needs its "

+"own database directory. To launch Shotwell with an alternate library, "

+"specify an alternate database directory on the command line as follows:"

+msgstr ""

+"Como característica avanzada, es posible tener varias bibliotecas de "

+"Shotwell, cada una de ellas con su propio conjunto de fotos. Cada biblioteca "

+"necesita su propia carpeta de base de datos. Para ejecutar Shotwell con una "

+"biblioteca diferente, especifique una base de datos alternativa en la línea "

+"de comandos como sigue:"

+

+#. (itstool) path: page/screen

+#: C/other-multiple.page:18

+#, no-wrap

+msgid ""

+"\n"

+"shotwell -d [library-directory]\n"

+msgstr ""

+"\n"

+"shotwell -d [carpeta-biblioteca]\n"

+

+#. (itstool) path: info/desc

+#: C/other-plugins.page:7

+msgid "Extend Shotwell's functionality dynamically."

+msgstr "Ampliar la funcionalidad de Shotwell dinámicamente."

+

+#. (itstool) path: page/title

+#: C/other-plugins.page:12

+msgid "Plugins"

+msgstr "Complementos"

+

+#. (itstool) path: page/p

+#: C/other-plugins.page:13

+msgid ""

+"Shotwell can be used with <em>plugins</em>, which are companion shared "

+"libraries that can add support for new publishing destinations or new "

+"slideshow transitions."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/other-plugins.page:18

+msgid ""

+"To see a list of installed plugins, choose <guiseq><gui>Edit</"

+"gui><gui>Preferences</gui></guiseq>, and in the <gui>Preferences</gui> "

+"window, click on the <gui>Plugins</gui> tab. You'll see a list of currently-"

+"installed plugins, each with a checkbox by it, and you may enable or disable "

+"each by selecting or deselecting the checkbox by its name."

+msgstr ""

+"Para ver una lista de los complementos instalados, elija "

+"<guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>, y en la ventana "

+"de <gui>Preferencias</gui> pulse en la pestaña <gui>Complementos</gui>. Verá "

+"una lista de los complementos actualmente instalados, cada uno con una "

+"casilla mediante la que puede activarlos o desactivarlos por su nombre."

+

+#. (itstool) path: note/p

+#: C/other-plugins.page:25

+msgid ""

+"Full documentation on how to develop new plugins is available at <link href="

+"\"http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins"

+"\">http://redmine.yorba.org/projects/shotwell/wiki/"

+"ShotwellArchWritingPlugins</link>"

+msgstr ""

+"La documentación completa sobre cómo desarrollar nuevos complementos está "

+"disponible en <link href=\"http://redmine.yorba.org/projects/shotwell/wiki/"

+"ShotwellArchWritingPlugins\">http://redmine.yorba.org/projects/shotwell/wiki/"

+"ShotwellArchWritingPlugins</link>"

+

+#. (itstool) path: info/desc

+#: C/raw.page:7

+msgid "More about RAW support in Shotwell."

+msgstr "Más sobre el soporte RAW en Shotwell."

+

+#. (itstool) path: page/title

+#: C/raw.page:12

+msgid "RAW support in Shotwell"

+msgstr "Soporte de RAW en Shotwell"

+

+#. (itstool) path: page/p

+#: C/raw.page:13

+msgid ""

+"Some cameras have the ability to store data directly off the sensor and into "

+"a file that contains extra color information; this is commonly referred to "

+"as 'RAW' or 'camera RAW', and Shotwell supports these files as well."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/raw.page:18

+msgid ""

+"Since RAW photographs normally cannot be displayed directly, but must be "

+"first developed - that is, have their extra information interpreted and "

+"readied for displaying - most cameras will either embed a JPEG inside a RAW-"

+"format file, or produce a JPEG alongside the RAW file at the time the "

+"snapshot is taken. The latter is referred to throughout this document as RAW"

+"+JPEG. If you import a RAW+JPEG pair, Shotwell will keep them paired and "

+"treat them as one item in your library."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/raw.page:27

+msgid ""

+"When you import a RAW file, you can choose to either use the camera's "

+"internally-developed JPEG or Shotwell's by selecting <guiseq><gui>Photos</"

+"gui><gui>Developer</gui></guiseq> in the menus."

+msgstr ""

+

+#. (itstool) path: note/p

+#: C/raw.page:33

+msgid ""

+"Changing between developers will cause all edits made to a photograph to be "

+"discarded."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/raw.page:39

+msgid ""

+"In order to publish or use a RAW photograph in most other software, it has "

+"to be exported first. Shotwell can export your RAW photos in JPEG, PNG, TIFF "

+"or BMP format, and, when publishing, will internally export a JPEG version "

+"for you and publish that."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/running.page:7

+msgid ""

+"Find Shotwell in the Applications menu, or have it start automatically when "

+"you plug in a camera."

+msgstr ""

+"Busque Shotwell en el menú Aplicaciones o haga que se inicie automáticamente "

+"cuando conecta una cámara."

+

+#. (itstool) path: page/title

+#: C/running.page:14

+msgid "Running Shotwell"

+msgstr "Ejecutar Shotwell"

+

+#. (itstool) path: page/p

+#: C/running.page:16

+msgid ""

+"Once installed, Shotwell is available in your <gui>Applications</gui> menu "

+"under <gui>Graphics</gui> or <gui>Photography</gui>."

+msgstr ""

+"Una vez instalado, Shotwell estará disponible en su menú <gui>Aplicaciones</"

+"gui>, en <gui>Gráficos</gui> o en <gui>Fotografía</gui>."

+

+#. (itstool) path: page/p

+#: C/running.page:18

+msgid ""

+"Shotwell may also be executed automatically when a camera is plugged in to "

+"your computer. To check that your system is set up to run Shotwell when a "

+"camera is detected, go to <guiseq><gui>Edit</gui><gui>Preferences</gui></"

+"guiseq> in any Nautilus (file browser) window and choose the <gui>Media</"

+"gui> tab.  You'll see a dropdown box entitled <gui>Photos:</gui> which lets "

+"you choose Shotwell as your photo handling application."

+msgstr ""

+

+#. (itstool) path: note/p

+#: C/running.page:25

+msgid ""

+"Shotwell may also be executed directly from its build directory, although "

+"this is only recommended for testing out Shotwell or for developers."

+msgstr ""

+"También puede ejecutar Shotwell directamente desde la carpeta en la que se "

+"construyó, pero esto sólo se recomienda para probar Shotwell o para "

+"desarrolladores."

+

+#. (itstool) path: info/desc

+#: C/share-background.page:7

+msgid ""

+"Set your desktop background to a single photo or to a slideshow of photos."

+msgstr ""

+"Configure su fondo de escritorio como una única foto o como una presentación "

+"de fotos."

+

+#. (itstool) path: page/title

+#: C/share-background.page:12

+msgid "Set a desktop background or slideshow"

+msgstr "Configurar un fondo de escritorio o presentación"

+

+#. (itstool) path: page/p

+#: C/share-background.page:14

+msgid ""

+"To set a single photo as your desktop background, select the photo and "

+"choose <guiseq><gui>File</gui><gui>Set as Desktop Background</gui></guiseq>."

+msgstr ""

+"Para establecer una única foto como fondo del escritorio, seleccione la foto "

+"y escriba <guiseq><gui>Archivo</gui><gui>Establecer como fondo del "

+"escritorio</gui></guiseq>."

+

+#. (itstool) path: page/p

+#: C/share-background.page:16

+msgid ""

+"You can also set your background to a slideshow of photos. To do this, "

+"select the photos for the slideshow and choose <guiseq><gui>File</"

+"gui><gui>Set as Desktop Slideshow...</gui></guiseq>. Shotwell will prompt "

+"you for a slideshow delay, which can be any interval up to one day in "

+"length. The background slideshow will proceed even when Shotwell is not "

+"running."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/share-export.page:7

+msgid "Copy photos out of Shotwell so you can put them somewhere else."

+msgstr ""

+"Copiar fotos fuera Shotwell, para poder ponerlas en cualquier otro lugar."

+

+#. (itstool) path: page/title

+#: C/share-export.page:12

+msgid "Exporting photos"

+msgstr "Exportar fotos"

+

+#. (itstool) path: page/p

+#: C/share-export.page:14

+msgid ""

+"To export photos from Shotwell via drag and drop, drag the photos from "

+"Shotwell onto a file manager window or your desktop. The new files will be "

+"full-sized copies of the photos in your library."

+msgstr ""

+"Para exportar fotos desde Shotwell usando arrastrar y soltar, arrastre desde "

+"Shotwell hacia una ventana de manejador de archivos o su escritorio. Los "

+"archivos nuevos serán copias de tamaño completo de las fotos de su "

+"biblioteca."

+

+#. (itstool) path: page/p

+#: C/share-export.page:18

+msgid ""

+"Alternatively, select a set of photos and choose the <guiseq><gui>File</"

+"gui><gui>Export...</gui></guiseq> command or press <keyseq><key>Shift</"

+"key><key>Ctrl</key><key>E</key></keyseq>, which exports photos while letting "

+"you fine-tune the size and dimensions of your photo files. A window will "

+"appear allowing you to make several choices:"

+msgstr ""

+

+#. (itstool) path: item/p

+#: C/share-export.page:24

+msgid "A format for export."

+msgstr "Un formato al que exportar."

+

+#. (itstool) path: item/p

+#: C/share-export.page:27

+msgid ""

+"Choose <gui>Unmodified</gui> to export photos in their original format "

+"without any edits made in Shotwell. RAW photos will be exported in their "

+"original RAW format."

+msgstr ""

+"Selecione <gui>Sin modificar</gui> para exportar las fotos en su formato "

+"original, sin ninguna modificación hecha en Shotwell. Las fotos en bruto se "

+"exportarán en su formato original."

+

+#. (itstool) path: item/p

+#: C/share-export.page:29

+msgid ""

+"Choose <gui>Current</gui> to export photos including edits made in Shotwell. "

+"RAW photos will be exported in JPEG format if you have edited them in "

+"Shotwell, and otherwise in their original RAW format."

+msgstr ""

+"Escoja <gui>Actual</gui> para exportar las fotos, incluyendo las editadas en "

+"Shotwell. Las fotos en bruto se exportarán en formato JPEG si las editó en "

+"Shotwell, y si no en su formato en bruto original."

+

+#. (itstool) path: item/p

+#: C/share-export.page:31

+msgid ""

+"Or you can choose a particular image format (JPEG, PNG, TIFF, BMP) to be "

+"used for exporting. Any edits made in Shotwell will be included, and "

+"Shotwell will convert photos to the destination format."

+msgstr ""

+"O puede seleccionar un formato de imagen específico (JPEG, PNG,TIFF, BMP) "

+"para usar en la exportación. Cualquier edición hecha en Shotwell se "

+"incluirá, y Shotwel convertirá las fotos al formato de destino."

+

+#. (itstool) path: item/p

+#: C/share-export.page:37

+msgid "The image quality for exporting (Low, Medium, High, or Maximum)."

+msgstr "La calidad de la imagen al exportarla (baja, media, alta o máxima)."

+

+#. (itstool) path: item/p

+#: C/share-export.page:38

+msgid ""

+"A scaling constraint (which means how Shotwell will decide to scale the "

+"photos down), and the desired pixel size."

+msgstr ""

+"Una restricción de la escala (que significa cómo Shotwell va a decidir "

+"reducir la escala proporcionalmente), y el tamaño de píxel requerido."

+

+#. (itstool) path: item/p

+#: C/share-export.page:39

+msgid ""

+"The option whether you like to export metadatas such as tags or ratings. "

+"This can help to save your privacy if you have geolocation tags or tags "

+"which shouldn't be seen by anyone."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/share-export.page:42

+msgid ""

+"If selected, Shotwell will write tags, titles, and other metadata to the new "

+"files."

+msgstr ""

+"Si está seleccionada, Shotwell escribirá etiquetas, títulos y otros "

+"metadatos a los nuevos archivos."

+

+#. (itstool) path: info/desc

+#: C/share-print.page:7

+msgid ""

+"Click <guiseq><gui>File</gui><gui>Print...</gui></guiseq>. For more printing "

+"options, select the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog."

+msgstr ""

+"Pulse <guiseq><gui>Archivo</gui><gui>Imprimir...</gui></guiseq>. Para más "

+"opciones de impresión, seleccione la pestaña <gui>Configuración de página</"

+"gui> en el diálogo <gui>Imprimir</gui>."

+

+#. (itstool) path: page/title

+#: C/share-print.page:12

+msgid "Printing"

+msgstr "Imprimir"

+

+#. (itstool) path: page/p

+#: C/share-print.page:14

+#, fuzzy

+#| msgid ""

+#| "To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print</"

+#| "gui></guiseq>."

+msgid ""

+"To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print...</"

+"gui></guiseq>."

+msgstr ""

+"Para imprimir una foto, selecciónela y elija <guiseq><gui>Archivo</"

+"gui><gui>Imprimir</gui></guiseq>."

+

+#. (itstool) path: page/p

+#: C/share-print.page:16

+#, fuzzy

+#| msgid ""

+#| "Shotwell can also print multiple images in one page; to do this, select "

+#| "multiple images, choose <guiseq><gui>File</gui><gui>Print</gui></guiseq>, "

+#| "and in the <gui>Print</gui> dialog, choose the <gui>Image Settings</gui> "

+#| "tab. In <gui>Image Settings</gui>, choose one of the multiple-image-per-"

+#| "page options under <gui>Autosize</gui>."

+msgid ""

+"Shotwell can also print multiple images in one page; to do this, select "

+"multiple images, choose <guiseq><gui>File</gui><gui>Print...</gui></guiseq>, "

+"and in the <gui>Print</gui> dialog, choose the <gui>Image Settings</gui> "

+"tab. In <gui>Image Settings</gui>, choose one of the multiple-image-per-page "

+"options under <gui>Autosize</gui>."

+msgstr ""

+"Shotwell puede también imprimir varias imágenes en una página; para hacer "

+"esto, seleccione las imágenes, escoja <guiseq><gui>Archivo</"

+"gui><gui>Imprimir</gui></guiseq> y en el cuadro de diálogo <gui>Imprimir</"

+"gui>, seleccione la pestaña <gui>Configuraciones de la imagen</gui>. "

+"En<gui>Configuración de la imagen</gui>, escoja una de las opciones "

+"múltiples imágenes por página en <gui>Tamaño automático</gui>."

+

+#. (itstool) path: page/p

+#: C/share-print.page:23

+msgid ""

+"If you would like to set formatting, paper size, and orientation options, "

+"choose the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog prior to "

+"printing."

+msgstr ""

+"Si quiere establecer el formato, el tamaño del papel, y la orientación, "

+"seleccione la pestaña <gui>Configuración de la página</gui>en el cuadro de "

+"diálogo <gui>Imprimir</gui> antes de imprimir."

+

+#. (itstool) path: info/desc

+#: C/share-send.page:7

+msgid "Send photos via email, instant messaging or in other ways."

+msgstr "Enviar fotos por correo-e, mensajería instantánea u otras maneras."

+

+#. (itstool) path: page/title

+#: C/share-send.page:12

+msgid "Sending photos"

+msgstr "Enviar fotos"

+

+#. (itstool) path: page/p

+#: C/share-send.page:14

+msgid ""

+"Shotwell can send photos using the GNOME desktop's Send To mechanism, which "

+"lets you send photos via email, instant messaging or in other ways."

+msgstr ""

+"Shotwell puede enviar fotos usando el mecanismo de «Enviar a» de GNOME, lo "

+"que le permite enviar fotos por correo-e, mensajería instantánea u otras "

+"maneras."

+

+#. (itstool) path: page/p

+#: C/share-send.page:16

+msgid ""

+"To send photos, select them in Shotwell and choose <guiseq><gui>File</"

+"gui><gui>Send To...</gui></guiseq>, or right-click the photos and choose "

+"<gui>Send To...</gui> from the context menu. A <gui>Send To</gui> dialog box "

+"will appear which lets you choose a mechanism for sending the files (such as "

+"email or instant messaging) and a destination. You can optionally choose to "

+"send the files in a compressed format."

+msgstr ""

+"Para enviar fotos, selecciónelas en Shotwell y después "

+"escoja<guiseq><gui>Archivo</gui><gui>Enviar a...</gui></guiseq>, o pulse con "

+"el botón derecho en las fotos y escoja <gui>Enviar a ...</gui> del menú "

+"contextual. Aparecerá una caja de diálogo en donde puede escoger la forma "

+"para enviar los archivos (como correo electrónico o mensaje instantáneo) y "

+"el destino. Puede, opcionalmente, enviar los archivos en un formato "

+"comprimido."

+

+#. (itstool) path: info/desc

+#: C/share-slideshow.page:7

+msgid "Watch a slideshow of your photos."

+msgstr "Ver sus fotos como diapositivas."

+

+#. (itstool) path: page/title

+#: C/share-slideshow.page:12

+msgid "Slideshows"

+msgstr "Diapositivas"

+

+#. (itstool) path: page/p

+#: C/share-slideshow.page:14

+msgid ""

+"To see a sideshow of any collection in Shotwell, navigate to that collection "

+"and select <guiseq><gui>View</gui><gui>Slideshow</gui></guiseq> or press "

+"<key>F5</key>."

+msgstr ""

+"Para ver una presentación de diapositivas en Shotwell, navegue hasta la "

+"colección y elija <guiseq><gui>Ver</gui><gui>Presentación</gui></guiseq> o "

+"pulse <key>F5</key>."

+

+#. (itstool) path: page/p

+#: C/share-slideshow.page:16

+msgid "You can change some settings in a running slideshow:"

+msgstr ""

+"Puede cambiar algunas configuraciones de una presentación de diapositivas en "

+"ejecución:"

+

+#. (itstool) path: item/p

+#: C/share-slideshow.page:19

+msgid "The duration how long an image should be shown: 1 - 30 seconds"

+msgstr ""

+"La duración de cuánto tiempo se debe mostrar una imagen: 1 - 30 segundos"

+

+#. (itstool) path: item/p

+#: C/share-slideshow.page:20

+msgid "You can select different transition effects."

+msgstr "Puede seleccionar diferentes efectos de transición."

+

+#. (itstool) path: item/p

+#: C/share-slideshow.page:21

+msgid "The time for each transition effect: 0.1 - 1.0 seconds"

+msgstr "El tiempo para cada efecto de transición: 0.1 - 1.0 segundos"

+

+#. (itstool) path: info/desc

+#: C/share-upload.page:7

+msgid "Publish photos to Facebook, Flickr, Picasa Web Albums, or other sites."

+msgstr ""

+"Publica fotos en Facebook, Flickr, álbumes web de Picasa o en otros sitios."

+

+#. (itstool) path: page/title

+#: C/share-upload.page:12

+msgid "Publishing to the Web"

+msgstr "Publicar en la web"

+

+#. (itstool) path: page/p

+#: C/share-upload.page:14

+msgid ""

+"Through the use of <link xref=\"other-plugins\">plugins</link>, Shotwell can "

+"publish photos and videos to the following services, each of which requires "

+"an account:"

+msgstr ""

+"Gracias al uso de <link xref=\"other-plugins\">complementos</link>, Shotwell "

+"puede publicar fotos y vídeos en los siguientes servicios, para los que se "

+"requiere una cuenta."

+

+#. (itstool) path: item/p

+#: C/share-upload.page:18

+msgid "<link href=\"http://facebook.com\">Facebook</link>"

+msgstr "<link href=\"http://facebook.com\">Facebook</link>"

+

+#. (itstool) path: item/p

+#: C/share-upload.page:19

+msgid "<link href=\"http://flickr.com\">Flickr</link>"

+msgstr "<link href=\"http://flickr.com\">Flickr</link>"

+

+#. (itstool) path: item/p

+#: C/share-upload.page:20

+msgid ""

+"<link href=\"http://picasaweb.google.com\">Picasa Web Albums</link> and "

+"<link href=\"http://plus.google.com\">Google+</link>"

+msgstr ""

+"<link href=\"http://picasaweb.google.com\">Álbumes de Picasa Web</link> y "

+"<link href=\"http://plus.google.com\">Google+</link>"

+

+#. (itstool) path: item/p

+#: C/share-upload.page:21

+msgid "<link href=\"http://youtube.com\">YouTube</link> (videos only)"

+msgstr "<link href=\"http://youtube.com\">YouTube</link> (sólo vídeos)"

+

+#. (itstool) path: item/p

+#: C/share-upload.page:22

+msgid ""

+"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, a photo site "

+"popular in Russia (photos only)"

+msgstr ""

+"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, una página de "

+"fotos popular en Rusia (sólo fotos)"

+

+#. (itstool) path: item/p

+#: C/share-upload.page:23

+msgid ""

+"Any site running the <link href=\"http://piwigo.org\">Piwigo</link> photo "

+"gallery software (photos only)"

+msgstr ""

+"Cualquier sitio que ejecute el software de galería de fotos <link href="

+"\"http://piwigo.org\">Piwigo</link> (sólo fotos)"

+

+#. (itstool) path: page/p

+#: C/share-upload.page:26

+msgid ""

+"To publish selected photos in a collection, choose <guiseq><gui>Edit</"

+"gui><gui>Preferences</gui></guiseq> and click on the <gui>Plugins</gui> tab "

+"to enable the plugin for the service you want to publish to. Next, choose, "

+"<guiseq><gui>File</gui><gui>Publish</gui></guiseq>, press the <gui>Publish</"

+"gui> toolbar button or use <keyseq><key>Ctrl</key><key>P</key></keyseq>. You "

+"will see a dialog that lets you select a publishing service. You will then "

+"need to log in or create an account."

+msgstr ""

+"Para publicar las fotos seleccionadas en una colección, elija "

+"<guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq> y pulse en la "

+"pestaña <gui>Complementos</gui> para activar el complemento del servicio en "

+"el que quiere publicar. A continuación, elija <guiseq><gui>Archivo</"

+"gui><gui>Publicar</gui></guiseq>, pulse el botón <gui>Publicar</gui> en la "

+"barra de herramientas o pulse <keyseq><key>Ctrl</key><key>P</key></keyseq>. "

+"Verá un diálogo que le permite elegir el servicio de publicación. Necesitará "

+"iniciar sesión o crear una cuenta."

+

+#. (itstool) path: page/p

+#: C/share-upload.page:31

+#, fuzzy

+#| msgid ""

+#| "Publishing to Facebook requires you to grant certain permissions to the "

+#| "Shotwell Connect Facebook application. You only need to grant these "

+#| "permissions once, when you first associate Shotwell Connect with your "

+#| "Facebook account."

+msgid ""

+"Publishing to Facebook requires you to grant certain permissions to the "

+"Shotwell Facebook application. You only need to grant these permissions "

+"once, when you first associate Shotwell with your Facebook account."

+msgstr ""

+"Publicar en Facebook requiere que conceda ciertos permisos a la aplicación "

+"Conectar Shotwell con Facebook. Solo necesita conceder los permisos una vez, "

+"la primera vez que asocie Shotwell con su cuenta de Facebook."

+

+#. (itstool) path: note/p

+#: C/share-upload.page:34

+msgid ""

+"You will be only able to publish images with at most the permission you "

+"granted to the Shotwell Facebook application"

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/share-upload.page:36

+msgid ""

+"Similarly, publishing to Flickr requires you to log in and permit Shotwell "

+"Connect to access your account."

+msgstr ""

+"Del mismo modo, publicar en Flickr requiere que inicie sesión y permita que "

+"Shotwell Connect acceda a su cuenta."

+

+#. (itstool) path: page/p

+#: C/share-upload.page:38

+msgid ""

+"If you have a Google account, but have not yet used Picasa Web Albums, you "

+"will need to log in to Picasa using a browser once before you can publish to "

+"this service."

+msgstr ""

+"Si tiene una cuenta de Google, pero nunca ha usado los álbumes web de "

+"Picasa, necesitará iniciar sesión en Picasa usando un navegador antes de "

+"poder publicar algo en este servicio."

+

+#. (itstool) path: info/desc

+#: C/view-displaying.page:7

+msgid ""

+"Learn about different ways of viewing your photos: in a grid, filling the "

+"main window, or filling the whole screen."

+msgstr ""

+"Aprenda sobre diferentes formas de ver sus fotos: en una cuadrícula, "

+"llenando la ventana principal o a pantalla completa."

+

+#. (itstool) path: page/title

+#: C/view-displaying.page:12

+msgid "Photo views"

+msgstr "Vistas de fotos"

+

+#. (itstool) path: page/p

+#: C/view-displaying.page:14

+msgid ""

+"When you select any collection in the sidebar, Shotwell displays all photos "

+"in the collection in the main window area. At the bottom right is a slider "

+"which adjusts the viewing size of the thumbnails. You may also adjust the "

+"thumbnail size using the plus and minus keys (<key>+</key> and <key>-</key>) "

+"or by pressing <key>Ctrl</key> while moving your mouse scroll wheel."

+msgstr ""

+"Cuando selecciona cualquier colección en la barra lateral, Shotwell muestra "

+"todas las fotos en esa colección en la ventana principal. En la esquina "

+"inferior derecha hay un control deslizante que puede ajustar el tamaño de "

+"las vistas miniatura. Puede ajustar el tamaño de las miniaturas usando las "

+"teclas más y menos (<key>+</key> y <key>-</key>) o presionando <key>Ctrl</"

+"key> mientras mueve la rueda central del ratón."

+

+#. (itstool) path: page/p

+#: C/view-displaying.page:16

+msgid ""

+"You can view a photo full-window by double-clicking on it. From there you "

+"may move to other photos in the collection with the Back and Forward "

+"buttons. To return to the collection, double-click on the photo or press "

+"<key>Esc</key>."

+msgstr ""

+"Puede ver la vista de la foto en pantalla completa pulsando dos veces. Desde "

+"ahí puede moverse a otras fotos en la colección con los botones de retroceso "

+"y avance. Puede regresar a la colección, pulsando dos veces en la foto o "

+"presionando <key>Esc</key>."

+

+#. (itstool) path: page/p

+#: C/view-displaying.page:18

+msgid ""

+"When viewing a photo in full-window mode, the slider on the toolbar controls "

+"zoom. You can pan around by grabbing and dragging anywhere on the photo. You "

+"can also zoom using your scroll wheel or by pressing the following keyboard "

+"shortcuts: <keyseq><key>Ctrl</key>0</keyseq> for the full image, "

+"<keyseq><key>Ctrl</key>1</keyseq> for 100% (1 photo pixel = 1 screen pixel), "

+"and <keyseq><key>Ctrl</key>2</keyseq> for 200% (1 photo pixel = 2x2 screen "

+"pixels)."

+msgstr ""

+

+#. (itstool) path: page/p

+#: C/view-displaying.page:20

+msgid ""

+"Shotwell offers a fullscreen mode to display photos. Choose "

+"<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> or press <key>F11</"

+"key>. To see the fullscreen toolbar, move your mouse to the bottom of the "

+"screen. The toolbar offers buttons to move through the collection, to pin "

+"the toolbar down (so it isn't hidden when you move the mouse away), and to "

+"leave fullscreen view."

+msgstr ""

+"Shotwell ofrece un modo de pantalla completa para mostrar las fotos. Escoja "

+"<guiseq><gui>Ver</gui><gui>Pantalla completa</gui></guiseq> o presione "

+"<key>F11</key>. Para ver la barra de herramientas de pantalla completa, "

+"mueva su ratón a la parte inferior de la pantalla. La barra de herramientas "

+"le ofrece botones para moverse a través de la colección, para fijar la barra "

+"de herramientas (así esta no se ocultará cuando mueva el ratón), y dejar la "

+"vista de pantalla completa."

+

+#. (itstool) path: section/title

+#: C/view-displaying.page:23

+msgid "Viewing videos"

+msgstr "Ver vídeos"

+

+#. (itstool) path: section/p

+#: C/view-displaying.page:24

+msgid ""

+"When you double-click a video, Shotwell will launch an external video player "

+"to play the video. It's not currently possible to display a video in full-"

+"window mode in Shotwell or to play the video within Shotwell itself."

+msgstr ""

+"Cuando pulse dos veces sobre un vídeo, Shotwell lanzará un reproductor de "

+"vídeo externo para reproducir el vídeo. Actualmente no es posible mostrar un "

+"vídeo en modo a pantalla completa o reproducirlo dentro del propio Shotwell"

+

+#. (itstool) path: info/desc

+#: C/view-information.page:7

+msgid ""

+"View more detailed information about photos, like the exposure mode used by "

+"the camera."

+msgstr ""

+"Ver información más detallada sobre las fotos, como el modo de exposición "

+"usado por la cámara."

+

+#. (itstool) path: page/title

+#: C/view-information.page:12

+msgid "Basic and extended information"

+msgstr "Información básica y extendida"

+

+#. (itstool) path: page/p

+#: C/view-information.page:14

+msgid ""

+"The Basic Information pane appears at the bottom of the sidebar, and "

+"displays a brief summary of the photos you've selected. If no photos are "

+"selected, it displays a summary of the entire collection. You can toggle the "

+"display of this pane using the <guiseq><gui>View</gui><gui>Basic "

+"Information</gui></guiseq> command."

+msgstr ""

+"El panel de información básica aparece en la parte inferior de la barra "

+"lateral, y muestra un breve resumen de las fotos que ha seleccionado. Si no "

+"se ha seleccionado ninguna foto, muestra un resumen de la colección "

+"completa. Puede cambiar la visibilidad de este panel usando el comando "

+"<guiseq><gui>Ver</gui><gui>Información básica</gui></guiseq>."

+

+#. (itstool) path: page/p

+#: C/view-information.page:16

+msgid ""

+"The floating Extended Information window displays more information about the "

+"selected photo. The <guiseq><gui>View</gui><gui>Extended Information</gui></"

+"guiseq> command or <keyseq><key>Ctrl</key><key>Shift</key><key>X</key></"

+"keyseq> toggles the display of this window."

+msgstr ""

+

+#. (itstool) path: info/desc

+#: C/view-sidebar.page:7

+msgid ""

+"The sidebar on the left of the window lists various views of your library."

+msgstr ""

+"La barra lateral de la izquierda de la ventana lista varios tipos de vistas "

+"de su biblioteca."

+

+#. (itstool) path: page/title

+#: C/view-sidebar.page:21

+msgid "The sidebar"

+msgstr "La barra lateral"

+

+#. (itstool) path: page/p

+#: C/view-sidebar.page:23

+msgid ""

+"The sidebar on the left side of the Shotwell window lists various views of "

+"your library. Although you may see the same photo in multiple views, it's "

+"only stored once on your hard drive."

+msgstr ""

+"La barra lateral a la izquierda de la ventana de Shotwell lista varias "

+"vistas de su biblioteca. Aunque puede ver muchas vistas de la misma foto, "

+"solo se almacena una en su disco duro"

+

+#. (itstool) path: page/p

+#: C/view-sidebar.page:25

+msgid ""

+"The <gui>Last Import</gui> view lists your last imported photos no matter if "

+"they are imported from F-Spot, your camera, a memory card or the hard disk."

+msgstr ""

+"La vista <gui>Última importación</gui> lista sus últimas fotos importadas no "

+"importa si estas se importaron de F-Spot, su cámara, una tarjeta de memoria "

+"o su disco duro."

+

+#. (itstool) path: page/p

+#: C/view-sidebar.page:27

+msgid "The <gui>Flagged</gui> lists all photos you had previous flagged."

+msgstr ""

+"La opción <gui>Marcada</gui> lista todas las fotos que ha marcado "

+"anteriormente."

+

+#. (itstool) path: page/p

+#: C/view-sidebar.page:29

+msgid ""

+"The <gui>Saved Search</gui> allows you to sort your library by many criteria."

+msgstr ""

+"La <gui>Búsqueda guardada</gui> le permite ordenar su biblioteca bajo "

+"diferentes criterios."

+

+#. (itstool) path: page/p

+#: C/view-sidebar.page:31

+msgid ""

+"The <gui>Events</gui> folder lists all events in your library. An event is a "

+"group of photos that were taken at approximately the same time."

+msgstr ""

+"La carpeta de <gui>Eventos</gui> lista todos los eventos en su biblioteca.Un "

+"evento es un grupo de fotos que se tomaron aproximadamente al mismo tiempo."

+

+#. (itstool) path: page/p

+#: C/view-sidebar.page:33

+msgid ""

+"The <gui>Tags</gui> folder lists all tags you've assigned to photos. Photos "

+"can have multiple tags attached to them. When you click on the name of a tag "

+"in the sidebar, you will see all the photos associated with that tag."

+msgstr ""

+"La carpeta <gui>Etiquetas</gui> lista todas las etiquetas que ha asignado a "

+"sus fotos. Las fotos pueden tener múltiples etiquetas relacionadas con las "

+"mismas. Cuando posiciona el cursor sobre el nombre de una etiqueta en la "

+"barra lateral, podrá ver todas las fotos asociadas a esa etiqueta."

+

+#~ msgid "Facebook"

+#~ msgstr "Facebook"

+

+#~ msgid "Flickr"

+#~ msgstr "Flickr"

+

+#~ msgid "Symbol"

+#~ msgstr "Símbolo"

+

+#~ msgid ""

+#~ "@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"

+#~ msgstr ""

+#~ "@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"

+

+#~ msgid "jim@yorba.org"

+#~ msgstr "jim@yorba.org"

+

+#~ msgid "allison@yorba.org"

+#~ msgstr "allison@yorba.org"

+

+#~ msgid "robert.ancell@canonical.com"

+#~ msgstr "robert.ancell@canonical.com"

+

+#~ msgid "pdo.smith@gmail.com"

+#~ msgstr "pdo.smith@gmail.com"

+

+#~ msgid "philbull@gmail.com"

+#~ msgstr "philbull@gmail.com"

diff --git a/help/es/formats.page b/help/es/formats.page
index 051dd3e..21a2e27 100644
--- a/help/es/formats.page
+++ b/help/es/formats.page
@@ -8,6 +8,12 @@
         <link type="next" xref="running"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/import-camera.page b/help/es/import-camera.page
index 21a5265..be706ec 100644
--- a/help/es/import-camera.page
+++ b/help/es/import-camera.page
@@ -8,6 +8,12 @@
         <link type="next" xref="import-memorycard"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/import-f-spot.page b/help/es/import-f-spot.page
index a546323..7c6a257 100644
--- a/help/es/import-f-spot.page
+++ b/help/es/import-f-spot.page
@@ -8,6 +8,12 @@
         <link type="next" xref="import-camera"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/import-file.page b/help/es/import-file.page
index cb1426b..9dc05c2 100644
--- a/help/es/import-file.page
+++ b/help/es/import-file.page
@@ -8,6 +8,12 @@
         <link type="next" xref="import-f-spot"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/import-memorycard.page b/help/es/import-memorycard.page
index fa2adf5..ac82fe6 100644
--- a/help/es/import-memorycard.page
+++ b/help/es/import-memorycard.page
@@ -8,6 +8,12 @@
         <link type="next" xref="import-file"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/index.page b/help/es/index.page
index c19a76b..ad593aa 100644
--- a/help/es/index.page
+++ b/help/es/index.page
@@ -18,6 +18,12 @@
 		</credit>
 	
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/organize-event.page b/help/es/organize-event.page
index a4769c0..95ec14a 100644
--- a/help/es/organize-event.page
+++ b/help/es/organize-event.page
@@ -8,6 +8,12 @@
         <link type="next" xref="flag"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/organize-flag.page b/help/es/organize-flag.page
index 5e9b810..1d5ca99 100644
--- a/help/es/organize-flag.page
+++ b/help/es/organize-flag.page
@@ -8,6 +8,12 @@
         <link type="next" xref="rating"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/organize-rating.page b/help/es/organize-rating.page
index 3f8c84b..19fee4d 100644
--- a/help/es/organize-rating.page
+++ b/help/es/organize-rating.page
@@ -8,6 +8,12 @@
         <link type="next" xref="delete"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/organize-remove.page b/help/es/organize-remove.page
index 43055a1..f8d1ff2 100644
--- a/help/es/organize-remove.page
+++ b/help/es/organize-remove.page
@@ -8,6 +8,12 @@
         <link type="next" xref="search"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/organize-search.page b/help/es/organize-search.page
index aba75ba..73ecfca 100644
--- a/help/es/organize-search.page
+++ b/help/es/organize-search.page
@@ -8,6 +8,12 @@
         <link type="next" xref="tag"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/organize-tag.page b/help/es/organize-tag.page
index 6987758..2a10d24 100644
--- a/help/es/organize-tag.page
+++ b/help/es/organize-tag.page
@@ -10,6 +10,12 @@
         <link type="next" xref="title"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/organize-title.page b/help/es/organize-title.page
index 76c3ba3..ede92ca 100644
--- a/help/es/organize-title.page
+++ b/help/es/organize-title.page
@@ -8,6 +8,12 @@
         <link type="next" xref="event"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/other-files.page b/help/es/other-files.page
index 66676ea..d13599e 100644
--- a/help/es/other-files.page
+++ b/help/es/other-files.page
@@ -8,6 +8,12 @@
         <link type="next" xref="other-plugins"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/other-missing.page b/help/es/other-missing.page
index 605c668..fb163c0 100644
--- a/help/es/other-missing.page
+++ b/help/es/other-missing.page
@@ -8,6 +8,12 @@
         <link type="next" xref="other-multiple"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/other-multiple.page b/help/es/other-multiple.page
index 6df4204..cdca09b 100644
--- a/help/es/other-multiple.page
+++ b/help/es/other-multiple.page
@@ -8,6 +8,12 @@
         <link type="next" xref="other-files"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/other-plugins.page b/help/es/other-plugins.page
index fb971ea..ce29547 100644
--- a/help/es/other-plugins.page
+++ b/help/es/other-plugins.page
@@ -8,6 +8,12 @@
         <link type="next" xref="other-missing"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/raw.page b/help/es/raw.page
index 7432916..4de6678 100644
--- a/help/es/raw.page
+++ b/help/es/raw.page
@@ -8,6 +8,12 @@
         <link type="next" xref="running"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/running.page b/help/es/running.page
index cba0fde..61bc890 100644
--- a/help/es/running.page
+++ b/help/es/running.page
@@ -10,6 +10,12 @@
         <link type="next" xref="formats"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/share-background.page b/help/es/share-background.page
index 82e3c41..84bacd4 100644
--- a/help/es/share-background.page
+++ b/help/es/share-background.page
@@ -8,6 +8,12 @@
         <link type="next" xref="share-slideshow"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/share-export.page b/help/es/share-export.page
index 8110de6..da280ca 100644
--- a/help/es/share-export.page
+++ b/help/es/share-export.page
@@ -8,6 +8,12 @@
         <link type="next" xref="share-print"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/share-print.page b/help/es/share-print.page
index bf86838..cb1fcf3 100644
--- a/help/es/share-print.page
+++ b/help/es/share-print.page
@@ -8,6 +8,12 @@
         <link type="next" xref="share-upload"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/share-send.page b/help/es/share-send.page
index ab62f1c..dac2afa 100644
--- a/help/es/share-send.page
+++ b/help/es/share-send.page
@@ -8,6 +8,12 @@
         <link type="next" xref="share-background"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/share-slideshow.page b/help/es/share-slideshow.page
index 7d5241c..5118a26 100644
--- a/help/es/share-slideshow.page
+++ b/help/es/share-slideshow.page
@@ -8,6 +8,12 @@
         <link type="next" xref="share-export"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/share-upload.page b/help/es/share-upload.page
index ec06cd1..076336f 100644
--- a/help/es/share-upload.page
+++ b/help/es/share-upload.page
@@ -8,6 +8,12 @@
         <link type="next" xref="share-send"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/view-displaying.page b/help/es/view-displaying.page
index 621df7a..02d457b 100644
--- a/help/es/view-displaying.page
+++ b/help/es/view-displaying.page
@@ -8,6 +8,12 @@
         <link type="next" xref="view-sidebar"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/view-information.page b/help/es/view-information.page
index 36966d6..4bae654 100644
--- a/help/es/view-information.page
+++ b/help/es/view-information.page
@@ -8,6 +8,12 @@
         <link type="next" xref="view-view"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/es/view-sidebar.page b/help/es/view-sidebar.page
index 1cd3a9e..c0d5b6f 100644
--- a/help/es/view-sidebar.page
+++ b/help/es/view-sidebar.page
@@ -17,6 +17,12 @@
         <link type="next" xref="view-information"/>
     
     <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
+      <mal:name>Marina Prado</mal:name>
+      <mal:email>mapraro93@hotmail.com</mal:email>
+      <mal:years>2016</mal:years>
+    </mal:credit>
+  
+    <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright">
       <mal:name>Daniel Mustieles</mal:name>
       <mal:email>daniel.mustieles@gmail.com</mal:email>
       <mal:years>2014 - 2016</mal:years>
diff --git a/help/lv/edit-adjustments.page b/help/lv/edit-adjustments.page
new file mode 100644
index 0000000..1a1a7d1
--- /dev/null
+++ b/help/lv/edit-adjustments.page
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="edit-adjustments" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#edit"/>
+        <desc>Mainīt fotogrāfijas ekspozīciju, piesātinājumu, toni un ēnas.</desc>
+        
+        <link type="next" xref="edit-crop"/>
+    </info>
+
+   <title>Krāsu labojumi</title>
+
+<p>Poga <gui>Pielāgot</gui> atver peldošu lodziņu ar histogrammu un slīdņiem, ar ko pielabot fotogrāfijas ekspozīciju, piesātinājumu, toni, temperatūru un ēnas. Histogrammai ir arī slīdņi, ar ko samazināt fotogrāfijas augšējo un apakšējo sliekšņu intensitāti, palielinot vidējā apgabala kontrastu.</p>
+
+<p>Poga <gui>Uzlabot</gui> pielāgot histogrammas un ēnu slīdņus, lai uzlabotu fotogrāfijas kvalitāti.</p>
+
+<p>Kad fotogrāfijas krāsas un kontrasts atbilst jūsu vēlmēm, spiediet <gui>Labi</gui>, lai saglabātu izmaiņas. <gui>Atiestatīt</gui> atgriezīs bildi tās sākotnējā stāvoklī. <gui>Atcelt</gui> atmetīs visas veiktās izmaiņas.</p>
+
+<section>
+ <title>Ko dara krāsu pielabošana?</title>
+ <terms>
+  <item>
+   <title>Ekspozīcija</title>
+   <p>Maina gaišumu, lai izskatītos, ka fotogrāfijas ir eksponētas ilgāku vai īsāku laiku. Ar to var labot pāreksponētas vai nepietiekami eksponētas fotogrāfijas.</p>
+  </item>
+  <item>
+   <title>Piesātinājums</title>
+   <p>Maina, cik spilgtas izskatās krāsas. Ja fotogrāfija izskatās pārāk pelēka vai izbalējusi, mēģiniet palielināt piesātinājumu. Ja krāsas ir pārāk izteiktas, samaziniet to.</p>
+  </item>
+  <item>
+   <title>Tonis</title>
+   <p>Tonē fotogrāfiju ar noteiktu krāsu. Šī iespēja noder, ja fotogrāfija ir uzņemta ne nepareiziem baltās krāsas balansa iestatījumiem, kas rada nedabīgu nokrāsu. Piemēram, fotogrāfijas, kas uzņemtas ārtelpās ar “Tungsten” (volframs) baltās krāsas balansa iestatījumiem, var radīt zilu nokrāsu.</p>
+  </item>
+  <item>
+   <title>Temperatūra</title>
+   <p>Maina, cik “silta” vai “auksta” izskatās bilde. Ar to aukstu un nomācošu ainu var padarīt dzīvīgāku.</p>
+  </item>
+  <item>
+   <title>Ēnas</title>
+   <p>Tas liek tumšākām attēla daļām izskatīties gaišākām. Izmantojiet šo, lai padarītu redzamākas tās detaļas, kuras ir pārāk tumšas vai ir ēnā.</p>
+  </item>
+  <item>
+   <title>Intensitātes slieksnis (slīdņi pie histogrammas)</title>
+   <p>Šie slīdņi maina, cik gaišs ir pats gaišākais punkts un cik tumšs ir pats tumšākais punkts. Tos varat izmantot, lai mainītu attēla kontrastu. Tas īpaši noderēs fotogrāfijām, kas izskatās izbalējušas vai miglainas.</p>
+  </item>
+ </terms>
+</section>
+    
+</page>
diff --git a/help/lv/edit-crop.page b/help/lv/edit-crop.page
new file mode 100644
index 0000000..0da633c
--- /dev/null
+++ b/help/lv/edit-crop.page
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="edit-crop" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#edit"/>
+        <desc>Uzlabojiet fotogrāfijas kompozīciju, nogriežot nost tās daļas.</desc>
+        
+        <link type="next" xref="edit-external"/>
+    </info>
+
+   <title>Kadrēšana</title>
+
+    <p>Lai samazinātu fotogrāfijas laukumu un virzītu skatītāja uzmanību uz mazāku tās daļu, izmantojiet Kadrēšanas rīku. Tas ir pieejams tikai pilna loga vai pilnekrāna režīmos.</p>
+
+<steps>
+ <item>
+  <p>Dubultklikšķiniet uz fotogrāfijas, lai atvērtu to pilna loga režīmā, tad rīkjoslā spiediet pogu <gui>Kadrēt</gui>.</p>
+ </item>
+ <item>
+  <p>Virs fotogrāfijas parādīsies balta kaste — kadrēšanas taisnstūris. Gaišākā fotogrāfijas daļa attēlo to attēla daļu, kas paliks pāri pēc kadrēšanas.</p>
+ </item>
+ <item>
+  <p>Ja novietosiet kursoru kaste vidū, varēsiet to pārvietot uz citu bildes daļu. Ja vilksiet kastes malu, varēsiet pielāgot tās izmēru. Pārvietojot un pielāgojot kadrēšanas kasti, jūs tajā redzēsiet četras tievas līnijas, līdzīgi kā krustiņu-nullīšu spēles režģi. Tās ir <em>trešdaļu likuma</em> līnijas.</p>
+  <p>Jūs varat arī ierobežot kadrēšanas kasti uz kādu no daudziem biežāk izmantotajiem izmēriem. Izvēlieties izmēru no izkrītošās izvēlnes. Ja piespiedīsiet tai blakus esošo apmešanas pogu, ierobežojuma virziens mainīsies (no ainavas uz portreta orientāciju).</p>
+ </item>
+ <item>
+  <p>Kad izvēlētā kadrēšanas kontūra jūs apmierina, spiediet pogu<gui>Kadrēt</gui>. Shotwell attēlos kadrēto fotogrāfiju.</p>
+ </item>
+ <item>
+  <p>Ja pārdomāsiet, atkal spiediet pogu <gui>Kadrēt</gui>, un pielabojiet.</p>
+  <p>Ja spiedīsiet <gui>Atcelt</gui> nevis <gui>Pielietot</gui>, Shotwell atgriezīs fotogrāfiju uz tās iepriekšējo kadrējumu.</p>
+ </item>
+</steps>
+
+<section>
+ <title>Kas ir trešdaļu likums?</title>
+ <p><em>Trešdaļu likums</em> jums palīdz izvēlēties patīkamu fotogrāfijas kompozīciju.</p>
+ <p>Iedomājieties ainu, kura ir sadalīta 3×3 režģī ar divām vienādā atstatumā esošām vertikālām un horizontālām līnijām. Vadoties pēc šī likuma, kompozīcija izskatīsies labāk, ja bildes galvenie elementi (horizonts, cilvēks) būs pie kādas no šīm līnijām. Pievērsiet uzmanību tam, kā elementi pāriet no vienas režģa daļas uz citu.</p>
+ <p>Fotogrāfijas kadrēšana, lai tā atbilstu trešdaļu likumam, bieži var uzlabot tās vizuālo pievilcību.</p>
+ <media type="image" src="figures/crop_thirds.jpg">
+  <p>Fotogrāfijas kadrēšana, izmantojot “trešdaļu likumu” līnijas, lai uzlabotu kompozīciju.</p>
+ </media>
+</section>
+</page>
diff --git a/help/lv/edit-date-time.page b/help/lv/edit-date-time.page
new file mode 100644
index 0000000..48428c0
--- /dev/null
+++ b/help/lv/edit-date-time.page
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="edit-date-time" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#edit"/>
+        <desc>Mainīt fotogrāfiju datumus un laikus, ja tie ir nepareizi.</desc>
+
+        <link type="next" xref="edit-enhance"/>
+    </info>
+
+	<title>Pielāgot fotogrāfiju datumus un laikus</title>
+
+<p>Lai pielāgotu fotogrāfiju datumu un laiku, izvēlieties fotogrāfijas, izvēlieties <guiseq><gui>Fotogrāfijas</gui><gui>Pielāgot datumu un laiku...</gui></guiseq> un iestatiet jaunu datumu un laiku.</p>
+
+<p>Ja maināt datumu un laiku vairākām fotogrāfijām uzreiz, varat to mainīt visām fotogrāfijām par vienādu laika nobīdi, vai arī visām iestatīt vienu un to pašu laiku.</p>
+
+<p>Pēc noklusējuma, datums un laiks tiek mainīts tikai pašā Shotwell. Jūs varat arī mainīt datumu un laiku oriģinālajā datnē, bet to nevar atsaukt, kad iziesiet ārā no Shotwell lietotnes.</p>
+
+</page>
diff --git a/help/lv/edit-enhance.page b/help/lv/edit-enhance.page
new file mode 100644
index 0000000..8ca3e5d
--- /dev/null
+++ b/help/lv/edit-enhance.page
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="edit-enhance" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#edit"/>
+        <desc>Ļauj Shotwell automātiski uzlabot fotogrāfiju gaišumu un kontrastu.</desc>
+        
+        <link type="seealso" xref="edit-adjustments"/>
+        
+        <link type="next" xref="edit-adjustments"/>
+    </info>
+
+   <title>Automātiskā uzlabošana</title>
+
+    <p>Spiežot pogu <gui>Uzlabot</gui>, var ātri un automātiski pielabot fotogrāfijas gaišumu un kontrastu. Tas dos pareizi eksponētu fotogrāfiju. Jūs to varat arī izmantot kā sākuma punktu un pēc tam uzlabot attēlu ar pogu <gui>Pielāgot</gui>.</p>
+</page>
diff --git a/help/lv/edit-external.page b/help/lv/edit-external.page
new file mode 100644
index 0000000..66b3fc5
--- /dev/null
+++ b/help/lv/edit-external.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="edit-external" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#edit"/>
+        <desc>Izmantot citu lietotni fotogrāfijas rediģēšanai.</desc>
+        
+        <link type="next" xref="edit-redeye"/>
+    </info>
+
+    <title>Rediģēt fotogrāfijas ar ārēju programmu</title>
+
+    <p>Jūs varat izmantot ārēju redaktoru, lai veiktu papildu izmaiņās fotogrāfijā. Ja ir instalēts, GIMP un UFRaw ir noklusējuma ārējie redaktori attiecīgi fotogrāfijām un jēlajām datnēm. Ja šīs programmas nav instalētas, jums jāizvēlas vēlamie redaktori <guiseq><gui>Rediģēt</gui><gui>Iestatījumi</gui></guiseq> un jāizvēlas redaktori no instalēto lietotņu izkrītošajām izvēlnēm.</p>
+
+    <p>Kad redaktors ir iestatīs, izvēlieties fotogrāfiju un izvēlieties<guiseq><gui>Fotogrāfijas</gui> <gui>Atvērt ar ārēju redaktoru</gui></guiseq> lai atvērtu fotogrāfiju ar ārēju redaktoru. Līdzīgi, ja fotogrāfija ir jēldatne, izvēlieties <guiseq><gui>Fotogrāfijas</gui><gui>Atvērt ar RAW redaktoru</gui></guiseq>, lai rediģētu jēldatni ar iestatīto RAW redaktoru.</p>
+
+    <p>Kad beigsiet rediģēt un saglabāsiet datni, Shotwell pamanīs izmaiņas un atjauninās fotogrāfiju. Kad ārējās izmaiņas ir pabeigtas, spiediet taustiņu <key>Shift</key> pilnekrāna logā, lai rādītu sākotnējo fotogrāfiju, nevis ārēji rediģēto.</p>
+                            
+    <p>Atjaunošana uz oriģinālu dzēsīs ārpusē veiktās izmaiņas.</p>
+    
+    <note>
+        <p>Ja jūs ārēji rediģējat RAW fotogrāfiju un to saglabājat citā attēlā, piemēram, JPEG vai PNG, Shotwell nevar automātiski noteikt, ka oriģinālā RAW un jaunais attēls ir saistīti.</p>
+            
+        <p>Ja vēlaties Shotwell lietotnē strādāt ar iegūto attēlu, jums pašam tā būs jāimportē.</p>
+    </note>    
+</page>
diff --git a/help/lv/edit-nondestructive.page b/help/lv/edit-nondestructive.page
new file mode 100644
index 0000000..8a3e945
--- /dev/null
+++ b/help/lv/edit-nondestructive.page
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="edit-nondestructive" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#edit"/>
+        <desc>Shotwell ir nedestruktīvs fotogrāfiju redaktors — tas nemaina jūsu sākotnējās fotogrāfijas.</desc>
+        
+        <link type="next" xref="edit-date-time"/>
+    </info>
+
+	<title>Kas notiek ar oriģinālu, kad es rediģēju fotogrāfiju?</title>
+
+<p>Shotwell in neiznīcinošs fotogrāfiju redaktors. Tas nemaina jūsu sākotnējās fotogrāfijas. Tas nozīmē, ka, ka kadrējat attēlu vai maināt tā krāsas, fotogrāfijas datne uz diska netiek mainīta. Shotwell Saglabā jūsu veiktās izmaiņas datubāzē un tās vēlāk tiek pielietotas, kad tas ir vajadzīgs. Tas nozīmē,ka varat atsaukt jebkuras izmaiņas, ko veicāt ar fotogrāfiju.</p>
+
+<p>Ja vēlaties redzēt, kā attēls izskatījās pirs izmaiņu veikšanas, spiediet <key>Shift</key> taustiņu. Sākotnējā bilde būs redzama, kamēr vien būs piespiests taustiņš.</p>
+
+<p>Ņemiet vērā, ka Shotwell var ierakstīt metadatus (piemēram, tagus un nosaukumus) fotogrāfiju datnēs. Lai uzzinātu vairāk, skatiet nodaļu <link xref="other-files">Fotogrāfiju datnes</link>.</p>
+
+</page>
diff --git a/help/lv/edit-redeye.page b/help/lv/edit-redeye.page
new file mode 100644
index 0000000..523be5a
--- /dev/null
+++ b/help/lv/edit-redeye.page
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="edit-redeye" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#edit"/>
+        <desc>Labojiet fotogrāfijas, kur cilvēkiem ir sarkanas acis dēļ kameras zibspuldzes.</desc>
+        
+        <link type="next" xref="edit-rotate"/>
+    </info>
+
+	<title>Sarkano acu noņemšana</title>
+
+    <p>Sarkano acu efekts notiek, kad kameras zibspuldze atspīd no acu zīlītes. Lai šo efektu novērstu fotogrāfijā, izmantojiet sarkano acu rīku.</p>
+    <steps>
+     <item>
+      <p>Spiediet <gui>Sarkanās acis</gui>. Fotogrāfijā parādīsies aplis.</p>
+     </item>
+     <item>
+      <p>Velciet apli virs sarkanās zīlītes, pielāgojiet tā izmēru ar slīdni un spiediet <gui>Pielietot</gui>. Sarkanums tiks noņemts.</p>
+     </item>
+     <item>
+      <p>Atkārtojiet procesu visām sarkanajām acīm fotogrāfijā. Kad pabeidzat, spiediet <gui>Aizvērt</gui>.</p>
+     </item>
+    </steps>
+</page>
diff --git a/help/lv/edit-rotate.page b/help/lv/edit-rotate.page
new file mode 100644
index 0000000..d0cedda
--- /dev/null
+++ b/help/lv/edit-rotate.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="edit-rotate" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#edit"/>
+        <desc>Spiediet pogu <gui>Pagriezt</gui>, vai izvēlieties vienu no komandām <gui>Fotogrāfiju</gui> izvēlnē.</desc>
+        
+        <link type="next" xref="edit-straighten"/>
+    </info>
+
+	<title>Pagriezt vai apmest fotogrāfiju</title>
+
+    <p>Jūs varat pagriezt fotogrāfijas pa labi vai pa kreisi (pulksteņa rādītāja virzienā vai pretēji) ar pogu <gui>Pagriezt</gui>, kas ir pieejams rīkjoslā. Jūs varat arī iegūt jebkuras fotogrāfijas spoguļattēlu.</p>
+    
+    <p>Lai pagrieztu pa labi, spiediet pogu <gui>Pagriezt</gui>. Lai pagrieztu pa kreisi, turiet piespiestu <key>Ctrl</key> taustiņu un spiediet pagriešanas pogu. Abas komandas ir pieejamas arī <gui>Fotogrāfiju</gui> izvēlnē. Varat izmantot arī tastatūras saīsnes:</p>
+    <list>
+    <item><p>pagriezt pa kreisi: <keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq> vai <key>[</key></p></item>
+    <item><p>pagriezt pa labi: <keyseq><key>Ctrl</key><key>R</key></keyseq> vai <key>]</key></p></item>
+    </list>
+    <p>Lai izveidotu fotogrāfijas spoguļattēlu, izmantojiet <gui>Apmest horizontāli</gui> komandu <gui>Fotogrāfiju</gui> izvēlnē. Lai apmestu fotogrāfiju vertikāli, izmantojiet <gui>Apmest vertikāli</gui> komandu tajā pat izvēlnē.</p>
+    
+    <note>
+     <p>Ja izvēlēsities vairāk kā vienu attēlu, varēsiet pagriezt tos visus uzreiz.</p>
+    </note>
+    
+</page>
diff --git a/help/lv/edit-straighten.page b/help/lv/edit-straighten.page
new file mode 100644
index 0000000..5d42552
--- /dev/null
+++ b/help/lv/edit-straighten.page
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="edit-straighten" xml:lang="lv">
+      
+    <info>
+        <link type="guide" xref="index#edit"/>
+        <desc>Iztaisnojiet fotogrāfijas, lai to horizonts izskatītos līdzens.</desc>
+        
+   	<link type="next" xref="edit-undo"/>
+    </info>
+    
+    	<title>Iztaisnot fotogrāfijas</title>
+    	
+<p>Iztaisnošanas rīks ļauj izlīdzināt un iztaisnot fotogrāfijas. Iztaisnošanas rīks ir pieejams tikai pilna loga un pilnekrāna režīmā.</p>
+
+ <steps>
+     <item>
+      <p>Spiediet <gui>Iztaisnot</gui>. Parādīsies iztaisnošanas slīdnis. Varat izmantot arī tastatūras saīsni <keyseq><key>Ctrl</key><key>A</key></keyseq>.</p>
+     </item>
+     <item>
+      <p>Velciet slīdni, lai iegūtu vēlamo leņķi.</p>
+     </item>
+     <item>
+      <p>Kad pabeigts, spiediet <gui>Iztaisnot</gui>.</p>
+     </item>
+ </steps>
+
+</page>
diff --git a/help/lv/edit-undo.page b/help/lv/edit-undo.page
new file mode 100644
index 0000000..8d9061d
--- /dev/null
+++ b/help/lv/edit-undo.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="edit-undo" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#edit"/>
+        <desc>Atjaunot fotogrāfiju tās sākotnējā, nerediģētā formā.</desc>
+        
+        <link type="seealso" xref="edit-nondestructive"/>
+        
+        <link type="next" xref="edit-nondestructive"/>
+    </info>
+
+	<title>Atsaukt izmaiņas</title>
+    
+    <p>Tā kā Shotwell ir nedestruktīvs fotogrāfiju redaktors, jūs varat atsaukt visas izmaiņas, kas ir veiktas ar fotogrāfiju.</p>
+    
+    <p>Ja vēlaties redzēt, kā attēls izskatījās pirs izmaiņu veikšanas, spiediet <key>Shift</key> taustiņu. Sākotnējā bilde būs redzama, kamēr vien būs piespiests taustiņš.</p>
+
+    <p>Lai pilnībā atsauktu visas fotogrāfijā veiktās izmaiņas, spiediet <guiseq><gui>Fotogrāfijas</gui><gui>Atgriezties pie oriģināla</gui></guiseq>. Vienīgais izņēmums ir laiks un datums, tie netiks atjaunoti.</p>
+
+</page>
diff --git a/help/lv/figures/trash_process.png b/help/lv/figures/trash_process.png
new file mode 100644
index 0000000..82ad150
--- /dev/null
+++ b/help/lv/figures/trash_process.png
diff --git a/help/lv/formats.page b/help/lv/formats.page
new file mode 100644
index 0000000..3931056
--- /dev/null
+++ b/help/lv/formats.page
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="formats" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index"/>
+        <desc>Shotwell atbalsta JPEG, PNG, TIFF, BMP un RAW fotogrāfiju datnes, kā arī video datnes.</desc>
+        
+        <link type="next" xref="running"/>
+    </info>
+
+	<title>Atbalstītie fotogrāfiju un video formāti</title>
+
+   <p>Shotwell atbalsta JPEG, PNG, TIFF, BMP un <link type="guide" xref="other-raw">RAW</link> fotogrāfiju datnes. Shotwell vēl neatbalsta citus grafikas formātus, piemēram, GIF.</p>
+
+<p>Pašlaik Shotwell jēlattēlu (RAW) formātu atbalsts ir ierobežots. Skatoties jēlattēlu, jūs redzat JPEG datni, kas ir izvilkta no jēlattēla, nevis pašu jēlattēlu. Bez tam, RAW rediģēšanas konveijers nav pilnībā 16 bitu — rediģētās fotogrāfijas var eksportēt tikai kā 8 bitu datnes. Eksportēšanai var izmantot visus atbalstītos formātus (JPEG, PNG, TIFF, BMP).</p>
+
+<p>Lai uzzinātu vairāk par jēlā formāta fotogrāfijām Shotwell lietotnē, skatiet nodaļu par <link type="guide" xref="other-raw">jēlattēliem</link>.</p>
+
+<p>Shotwell atbalsta arī video datnes visos formātos, ko atbalsta GStreamer multimediju bibliotēka sistēmā, uz kuras darbojas Shotwell. Tas parasti iekļauj šos formātus:</p>
+<list>
+<item><p>Konteineru formāti: Ogg, QuickTime, MP4, AVI.</p></item>
+<item><p>Kodeki: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Ņemiet vērā, ka dažas operētājsistēmas var neiekļaut visus šeit uzskaitītos kodekus dēļ juridiskiem vai licenču ierobežojumiem.</em></p></item>
+</list>
+
+<p>Shotwell atbalsta gan fotogrāfijas, gan video, bet dokumentācijā vienkāršības labad tiek izmantots termins “fotogrāfijas”. Vairums darbību Shotwell var veikt gan ar fotogrāfijām, gan video, precīzāk, notikumi, atzīmēšana ar karogu, vērtēšana, tagošana un publicēšana darbojas vienlīdz labi ar fotogrāfijām un video.</p>
+
+</page>
diff --git a/help/lv/import-camera.page b/help/lv/import-camera.page
new file mode 100644
index 0000000..86e8800
--- /dev/null
+++ b/help/lv/import-camera.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="import-camera" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#import"/>
+        <desc>Kopēt fotogrāfijas no ciparu kameras.</desc>
+        
+        <link type="next" xref="import-memorycard"/>
+    </info>
+
+	<title>Importēšana no kameras</title>
+
+    <p>Lai importētu fotogrāfijas no ciparu kameras:</p>
+
+   <steps>
+    <item>
+     <p>Pievienojiet kameru savam datoram un ieslēdziet to. Shotwell to atpazīs un parādīs sānu joslā.</p>
+    </item>
+    <item>
+     <p>Izvēlieties kameru sānu joslā. Tiks attēloti katras fotogrāfijas priekšskatījums.</p>
+    </item>
+    <item>
+     <p>Ja vēlaties, varat izvēlēties, kuras tieši fotogrāfijas importēt. Lai to izdarītu, turiet piespiestu <key>Ctrl</key> taustiņu un spiediet uz attiecīgajām fotogrāfijām. Varat arī turēt piespiestu <key>Shift</key> taustiņu un spiest uz fotogrāfijām, lai izvēlētos virkni fotogrāfiju uzreiz.</p>
+    </item>
+    <item>
+     <p>Spiediet vai nu <gui>Importēt izvēlētās</gui> vai <gui>Importēt visas</gui>. Fotogrāfijas tiks nokopētas no kameras un saglabātas datorā.</p>
+    </item>
+   </steps>
+   
+    <p>Kad importēšana ir pabeigta, varat atvērt skatu <gui>Pēdējais imports</gui> (sānu joslā) un tur būs redzamas visas importētās fotogrāfijas. Notikumu saraksts (arī sānu joslā) arī saturēs jaunās fotogrāfijas, kas ir organizētas pēc datuma.</p>
+</page>
diff --git a/help/lv/import-f-spot.page b/help/lv/import-f-spot.page
new file mode 100644
index 0000000..9145fad
--- /dev/null
+++ b/help/lv/import-f-spot.page
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="import-f-spot" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#import"/>
+        <desc>Shotwell var arī importēt visas jūsu fotogrāfijas un tagus no F-Spot fotogrāfiju pārvaldnieka.</desc>
+        
+        <link type="next" xref="import-camera"/>
+    </info>
+
+	<title>Importēšana no F-Spot</title>
+
+    <p>Lai importētu esošo fotogrāfiju kolekciju no F-Spot:</p>
+    <steps>
+    <item><p>Izvēlieties <guiseq><gui>Datne</gui><gui>Importēt no F-Spot</gui></guiseq>.</p></item>
+    <item><p>Tagad izvēlieties vai no noklusējuma F-Spot bibliotēku vai citu F-Spot datubāzi. Ja importējat no citas F-Spot datubāzes, izvēlēties direktoriju un datni ar izvēlētāja dialoglodziņu.</p></item>
+    </steps>
+    <p>Shotwell importēs jūsu fotogrāfijas ar to tagiem un citu informāciju. Kad importēšana ir pabeigta, varat izvēlēties <gui>Pēdējais imports</gui> sānu joslā, lai redzētu visas veiksmīgi importētās fotogrāfijas. Notikumu saraksts arī attēlos jaunos ierakstus datumiem, kas atbilst importētajām fotogrāfijām.</p>
+</page>
diff --git a/help/lv/import-file.page b/help/lv/import-file.page
new file mode 100644
index 0000000..460eb63
--- /dev/null
+++ b/help/lv/import-file.page
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="import-file" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#import"/>
+        <desc>Importēt fotogrāfijas, kas jau ir saglabātas datorā.</desc>
+        
+        <link type="next" xref="import-f-spot"/>
+    </info>
+
+	<title>Importēt no cietā diska</title>
+
+    <p>Lai importētu datnes no cietā diska uz Shotwell, velciet tās no datņu pārlūka Shotwell logā.</p>
+    
+    <p>Varat arī spiest <guiseq><gui>Datne</gui><gui>Importēt no mapes...</gui></guiseq> un izvēlieties mapi, kura satur fotogrāfijas, kuras vēlaties importēt.</p>
+    
+    <p>Shotwell jums prasīs, vai vēlaties kopēt fotogrāfiju datnes uz jūsu bibliotēkas mapi (parasti tā ir mape <file>Attēli</file>, kas atrodas jūsu mājas direktorijā), vai importējiet tās, nekopējot datnes.</p>
+    
+    <p>Ja turat piespiestu <key>Ctrl</key> taustiņu,  kamēr velkat fotogrāfijas, Shotwell kopēs jūsu fotogrāfijas bez nejautājot. Līdzīgi, ja velkot turēsiet piespiestus taustiņus <keyseq><key>Ctrl</key><key>Shift</key></keyseq>, Shotwell importēs fotogrāfijas tās nekopējot.</p>
+
+    <p>Kad importēšana ir pabeigta, varat izvēlēties <gui>Pēdējais imports</gui> sānu joslā, lai redzētu visas veiksmīgi importētās fotogrāfijas. Notikumu saraksts arī attēlos jaunos ierakstus datumiem, kas atbilst importētajām fotogrāfijām.</p>
+
+</page>
diff --git a/help/lv/import-memorycard.page b/help/lv/import-memorycard.page
new file mode 100644
index 0000000..b8cb84c
--- /dev/null
+++ b/help/lv/import-memorycard.page
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="import-memorycard" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#import"/>
+        <desc>Importēt fotogrāfijas no ciparu kameras atmiņas kartes.</desc>
+        
+        <link type="next" xref="import-file"/>
+    </info>
+
+	<title>Importēšana no atmiņas kartes</title>
+
+<p>Lai importētu fotogrāfijas no kameras atmiņas kartes:</p>
+
+<steps>
+ <item>
+  <p>Ievietojiet atmiņas karti savā karšu lasītājā. Pārliecinieties, ka lasītājs ir pievienots datoram un ieslēdziet to.</p>
+ </item>
+ <item>
+  <p>Karšu lasītāju un pašu karti datoram vajadzētu atpazīt automātiski.</p>
+ </item>
+ <item>
+  <p>Sekojiet instrukcijām, kā <link xref="import-file">importēt fotogrāfijas no cietā diska</link>. Ja spiedīsiet <guiseq><gui>Datne</gui><gui>Importēt no mapes...</gui></guiseq>, atmiņas karte būs redzama kā mape izvēlēs loga sānu joslā.</p>
+ </item>
+</steps>
+
+<p>Shotwell var importēt fotogrāfijas no jebkuras atmiņas kartes, kas ir savietojama ar jūsu karšu lasītāju.</p>
+
+<p>Ja karte nav automātiski atpazīta, iespējams, ka karšu lasītājs nav atpazīts. Mēģiniet to atvienot un atkal pievienot datoram. Ja tas nepalīdz jums vajadzētu varēt importēt fotogrāfijas, <link xref="import-camera">pievienojot datoram pašu kameru</link>.</p>
+
+</page>
diff --git a/help/lv/index.page b/help/lv/index.page
new file mode 100644
index 0000000..70b7d62
--- /dev/null
+++ b/help/lv/index.page
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="index" xml:lang="lv">
+
+	<info>
+		<title type="link">Shotwell</title>
+     	<title type="text">Shotwell</title>
+		<credit type="author">
+		    <name>Jim Nelson</name>
+		    <email>jim@yorba.org</email>
+		    <name>Allison Barlow</name>
+		    <email>allison@yorba.org</email>
+			<name>Robert Ancell</name>
+			<email>robert.ancell@canonical.com</email>
+			<name>Peter Smith</name>
+			<email>pdo.smith@gmail.com</email>
+			<name>Phil Bull</name>
+			<email>philbull@gmail.com</email>
+		</credit>
+	</info>
+
+
+	<title><media type="image" src="figures/shotwell_logo.png"/>Shotwell fotogrāfiju pārvaldnieks</title>
+
+    <section id="import" style="2column">
+        <title>Fotogrāfiju importēšana</title>
+    </section>
+
+    <section id="view" style="2column">
+        <title>Fotogrāfiju skatīšana</title>
+    </section>
+
+    <section id="organize" style="2column">
+        <title>Fotogrāfiju organizēšana</title>
+    </section>
+
+    <section id="edit" style="2column">
+        <title>Fotogrāfiju rediģēšana</title>
+    </section>
+
+    <section id="share" style="2column">
+        <title>Dalīšanās ar fotogrāfijām</title>
+    </section>
+
+    <section id="other" style="2column">
+        <title>Citas iespējas</title>
+    </section>
+</page>
diff --git a/help/lv/lv.po b/help/lv/lv.po
new file mode 100644
index 0000000..cc8a1e5
--- /dev/null
+++ b/help/lv/lv.po
@@ -0,0 +1,3226 @@
+# Latvian translation for shotwell.
+# Copyright (C) 2016 shotwell's COPYRIGHT HOLDER
+# This file is distributed under the same license as the shotwell package.
+#
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: shotwell master\n"
+"POT-Creation-Date: 2016-11-08 07:15+0000\n"
+"PO-Revision-Date: 2016-11-08 23:25+0200\n"
+"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+"Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
+"Language: lv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 :"
+" 2);\n"
+"X-Generator: Lokalize 2.0\n"
+
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr "Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>"
+
+#. (itstool) path: info/desc
+#: C/edit-adjustments.page:7
+msgid "Change the exposure, saturation, tint, and shadows of a photo."
+msgstr "Mainīt fotogrāfijas ekspozīciju, piesātinājumu, toni un ēnas."
+
+#. (itstool) path: page/title
+#: C/edit-adjustments.page:12
+msgid "Color adjustments"
+msgstr "Krāsu labojumi"
+
+#. (itstool) path: page/p
+#: C/edit-adjustments.page:14
+msgid ""
+"The <gui>Adjust</gui> button opens a floating window with a histogram and "
+"sliders to adjust a photo's exposure, saturation, tint, temperature, and "
+"shadows. The histogram also has sliders to reduce the upper and lower "
+"intensity thresholds of the photograph, expanding the contrast of the middle "
+"range."
+msgstr ""
+"Poga <gui>Pielāgot</gui> atver peldošu lodziņu ar histogrammu un slīdņiem, "
+"ar ko pielabot fotogrāfijas ekspozīciju, piesātinājumu, toni, temperatūru un "
+"ēnas. Histogrammai ir arī slīdņi, ar ko samazināt fotogrāfijas augšējo un "
+"apakšējo sliekšņu intensitāti, palielinot vidējā apgabala kontrastu."
+
+#. (itstool) path: page/p
+#: C/edit-adjustments.page:16
+msgid ""
+"The <gui>Enhance</gui> button adjusts the histogram and shadows sliders to "
+"improve the quality of a photo."
+msgstr ""
+"Poga <gui>Uzlabot</gui> pielāgot histogrammas un ēnu slīdņus, lai uzlabotu "
+"fotogrāfijas kvalitāti."
+
+#. (itstool) path: page/p
+#: C/edit-adjustments.page:18
+msgid ""
+"When the photo's colors and contrast are to your liking, press <gui>OK</gui> "
+"to save the changes. <gui>Reset</gui> will return the image to its original "
+"state. <gui>Cancel</gui> discards all changes you've made."
+msgstr ""
+"Kad fotogrāfijas krāsas un kontrasts atbilst jūsu vēlmēm, spiediet "
+"<gui>Labi</gui>, lai saglabātu izmaiņas. <gui>Atiestatīt</gui> atgriezīs "
+"bildi tās sākotnējā stāvoklī. <gui>Atcelt</gui> atmetīs visas veiktās "
+"izmaiņas."
+
+#. (itstool) path: section/title
+#: C/edit-adjustments.page:21
+msgid "What do the color adjustments do?"
+msgstr "Ko dara krāsu pielabošana?"
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:24
+msgid "Exposure"
+msgstr "Ekspozīcija"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:25
+msgid ""
+"Changes the brightness to make it look like the photo was exposed for a "
+"longer or shorter time. Use this to correct under- or over-exposed photos."
+msgstr ""
+"Maina gaišumu, lai izskatītos, ka fotogrāfijas ir eksponētas ilgāku vai "
+"īsāku laiku. Ar to var labot pāreksponētas vai nepietiekami eksponētas "
+"fotogrāfijas."
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:28
+msgid "Saturation"
+msgstr "Piesātinājums"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:29
+msgid ""
+"Changes how vivid colors look. If your photo looks gray and washed out, try "
+"increasing the saturation. If colors look too bold, try decreasing it."
+msgstr ""
+"Maina, cik spilgtas izskatās krāsas. Ja fotogrāfija izskatās pārāk pelēka "
+"vai izbalējusi, mēģiniet palielināt piesātinājumu. Ja krāsas ir pārāk "
+"izteiktas, samaziniet to."
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:32
+msgid "Tint"
+msgstr "Tonis"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:33
+msgid ""
+"This tints the photo with a color. It's useful for correcting photos taken "
+"with the wrong white balance setting, which typically have an unnatural "
+"color cast. For example, photos taken outdoors with the white balance set to "
+"\"Tungsten\" may have a blue cast."
+msgstr ""
+"Tonē fotogrāfiju ar noteiktu krāsu. Šī iespēja noder, ja fotogrāfija ir "
+"uzņemta ne nepareiziem baltās krāsas balansa iestatījumiem, kas rada "
+"nedabīgu nokrāsu. Piemēram, fotogrāfijas, kas uzņemtas ārtelpās ar "
+"“Tungsten” (volframs) baltās krāsas balansa iestatījumiem, var radīt zilu "
+"nokrāsu."
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:36
+msgid "Temperature"
+msgstr "Temperatūra"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:37
+msgid ""
+"Changes how \"warm\" or \"cool\" the picture looks. Use this to make cold, "
+"depressing scenes look more lively, for example."
+msgstr ""
+"Maina, cik “silta” vai “auksta” izskatās bilde. Ar to aukstu un nomācošu "
+"ainu var padarīt dzīvīgāku."
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:40
+msgid "Shadows"
+msgstr "Ēnas"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:41
+msgid ""
+"This makes shadowy areas appear lighter. Use this to make detail more "
+"visible if it's obscured by the darkness of a shadow."
+msgstr ""
+"Tas liek tumšākām attēla daļām izskatīties gaišākām. Izmantojiet šo, lai "
+"padarītu redzamākas tās detaļas, kuras ir pārāk tumšas vai ir ēnā."
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:44
+msgid "Intensity Threshold (sliders on the histogram)"
+msgstr "Intensitātes slieksnis (slīdņi pie histogrammas)"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:45
+msgid ""
+"These sliders change how light the brightest white is and how dark the "
+"darkest black is. Use them to change the contrast of the photo. Photos which "
+"look washed out should particularly benefit from changing these settings."
+msgstr ""
+"Šie slīdņi maina, cik gaišs ir pats gaišākais punkts un cik tumšs ir pats "
+"tumšākais punkts. Tos varat izmantot, lai mainītu attēla kontrastu. Tas "
+"īpaši noderēs fotogrāfijām, kas izskatās izbalējušas vai miglainas."
+
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/edit-crop.page:42
+msgctxt "_"
+msgid ""
+"external ref='figures/crop_thirds.jpg' md5='4cf0a026bb812c7eab0c9db8210a9524'"
+msgstr ""
+"external ref='figures/crop_thirds.jpg' md5='4cf0a026bb812c7eab0c9db8210a9524'"
+
+#. (itstool) path: info/desc
+#: C/edit-crop.page:7
+msgid "Improve the composition of a photo by cutting out parts of it."
+msgstr "Uzlabojiet fotogrāfijas kompozīciju, nogriežot nost tās daļas."
+
+#. (itstool) path: page/title
+#: C/edit-crop.page:12
+msgid "Cropping"
+msgstr "Kadrēšana"
+
+#. (itstool) path: page/p
+#: C/edit-crop.page:14
+msgid ""
+"To reduce the area of a photo and concentrate the viewer's attention on a "
+"smaller portion of it, use the Crop tool. The crop tool is only available in "
+"full-window or fullscreen mode."
+msgstr ""
+"Lai samazinātu fotogrāfijas laukumu un virzītu skatītāja uzmanību uz mazāku "
+"tās daļu, izmantojiet Kadrēšanas rīku. Tas ir pieejams tikai pilna loga vai "
+"pilnekrāna režīmos."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:19
+msgid ""
+"Double-click on a photo to enter full-window mode, then press the <gui>Crop</"
+"gui> button on the toolbar."
+msgstr ""
+"Dubultklikšķiniet uz fotogrāfijas, lai atvērtu to pilna loga režīmā, tad "
+"rīkjoslā spiediet pogu <gui>Kadrēt</gui>."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:22
+msgid ""
+"A white box, the crop rectangle, will appear over the photo. The lighter "
+"portion of the photo within the crop rectangle represents what the photo "
+"will look like when you crop it."
+msgstr ""
+"Virs fotogrāfijas parādīsies balta kaste — kadrēšanas taisnstūris. Gaišākā "
+"fotogrāfijas daļa attēlo to attēla daļu, kas paliks pāri pēc kadrēšanas."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:25
+msgid ""
+"If you place your cursor in the middle of the box, you can move the box "
+"around. If you drag the edges of the box, you can adjust its size. As you "
+"move and adjust the crop box, you'll see four lines appear inside it, like a "
+"tic-tac-toe grid. These are <em>rule of thirds</em> lines."
+msgstr ""
+"Ja novietosiet kursoru kaste vidū, varēsiet to pārvietot uz citu bildes "
+"daļu. Ja vilksiet kastes malu, varēsiet pielāgot tās izmēru. Pārvietojot un "
+"pielāgojot kadrēšanas kasti, jūs tajā redzēsiet četras tievas līnijas, "
+"līdzīgi kā krustiņu-nullīšu spēles režģi. Tās ir <em>trešdaļu likuma</em> "
+"līnijas."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:26
+msgid ""
+"You can also constrain the crop box to one of many common sizes. Choose a "
+"size from the drop-down list that suits your needs. If you press the flip "
+"button next to it, the orientation of the constraint will switch (from "
+"landscape to portrait)."
+msgstr ""
+"Jūs varat arī ierobežot kadrēšanas kasti uz kādu no daudziem biežāk "
+"izmantotajiem izmēriem. Izvēlieties izmēru no izkrītošās izvēlnes. Ja "
+"piespiedīsiet tai blakus esošo apmešanas pogu, ierobežojuma virziens "
+"mainīsies (no ainavas uz portreta orientāciju)."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:29
+msgid ""
+"When you're happy with your crop outline, apply it by pressing the "
+"<gui>Crop</gui> button. Shotwell will display the cropped photo."
+msgstr ""
+"Kad izvēlētā kadrēšanas kontūra jūs apmierina, spiediet pogu<gui>Kadrēt</"
+"gui>. Shotwell attēlos kadrēto fotogrāfiju."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:32
+msgid ""
+"If you change your mind, press the <gui>Crop</gui> button again and fine-"
+"tune the crop."
+msgstr "Ja pārdomāsiet, atkal spiediet pogu <gui>Kadrēt</gui>, un pielabojiet."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:33
+msgid ""
+"If you press <gui>Cancel</gui> rather than <gui>Apply</gui>, Shotwell will "
+"return to the photo's previous crop dimensions."
+msgstr ""
+"Ja spiedīsiet <gui>Atcelt</gui> nevis <gui>Pielietot</gui>, Shotwell "
+"atgriezīs fotogrāfiju uz tās iepriekšējo kadrējumu."
+
+#. (itstool) path: section/title
+#: C/edit-crop.page:38
+msgid "What is the rule of thirds?"
+msgstr "Kas ir trešdaļu likums?"
+
+#. (itstool) path: section/p
+#: C/edit-crop.page:39
+msgid ""
+"The <em>rule of thirds</em> helps you to choose a pleasing composition for a "
+"photo."
+msgstr ""
+"<em>Trešdaļu likums</em> jums palīdz izvēlēties patīkamu fotogrāfijas "
+"kompozīciju."
+
+#. (itstool) path: section/p
+#: C/edit-crop.page:40
+msgid ""
+"Imagine that the scene is divided up into a 3x3 grid by two equally-spaced "
+"vertical lines and two equally-spaced horizontal lines. According to the "
+"rule, you're more likely to get a pleasing composition if you align major "
+"features (like the horizon, or a person's body) with one of the lines. "
+"Paying attention to the way features flow from one part of the grid to "
+"another can also help."
+msgstr ""
+"Iedomājieties ainu, kura ir sadalīta 3×3 režģī ar divām vienādā atstatumā "
+"esošām vertikālām un horizontālām līnijām. Vadoties pēc šī likuma, "
+"kompozīcija izskatīsies labāk, ja bildes galvenie elementi (horizonts, "
+"cilvēks) būs pie kādas no šīm līnijām. Pievērsiet uzmanību tam, kā elementi "
+"pāriet no vienas režģa daļas uz citu."
+
+#. (itstool) path: section/p
+#: C/edit-crop.page:41
+msgid ""
+"Cropping a photo so that it conforms to the rule of thirds often results in "
+"a more visually appealing image."
+msgstr ""
+"Fotogrāfijas kadrēšana, lai tā atbilstu trešdaļu likumam, bieži var uzlabot "
+"tās vizuālo pievilcību."
+
+#. (itstool) path: media/p
+#: C/edit-crop.page:43
+msgid ""
+"Cropping a photo, using the \"rule of thirds\" lines to improve the "
+"composition."
+msgstr ""
+"Fotogrāfijas kadrēšana, izmantojot “trešdaļu likumu” līnijas, lai uzlabotu "
+"kompozīciju."
+
+#. (itstool) path: info/desc
+#: C/edit-enhance.page:7
+msgid ""
+"Let Shotwell improve the brightness and contrast of a photo automatically."
+msgstr "Ļauj Shotwell automātiski uzlabot fotogrāfiju gaišumu un kontrastu."
+
+#. (itstool) path: page/title
+#: C/edit-enhance.page:14
+msgid "Auto-enhance"
+msgstr "Automātiskā uzlabošana"
+
+#. (itstool) path: page/p
+#: C/edit-enhance.page:16
+msgid ""
+"Clicking on the <gui>Enhance</gui> button is a quick way to automatically "
+"adjust the brightness and contrast of your photo. It will often give you a "
+"photo that is correctly exposed. You can also use it as a starting point and "
+"then improve the adjustments by clicking on the <gui>Adjust</gui> button."
+msgstr ""
+"Spiežot pogu <gui>Uzlabot</gui>, var ātri un automātiski pielabot "
+"fotogrāfijas gaišumu un kontrastu. Tas dos pareizi eksponētu fotogrāfiju. "
+"Jūs to varat arī izmantot kā sākuma punktu un pēc tam uzlabot attēlu ar pogu "
+"<gui>Pielāgot</gui>."
+
+#. (itstool) path: info/desc
+#: C/edit-external.page:7
+msgid "Use a different program to edit a photo."
+msgstr "Izmantot citu lietotni fotogrāfijas rediģēšanai."
+
+#. (itstool) path: page/title
+#: C/edit-external.page:12
+msgid "Edit photos with an external program"
+msgstr "Rediģēt fotogrāfijas ar ārēju programmu"
+
+#. (itstool) path: page/p
+#: C/edit-external.page:16
+msgid ""
+"You might want to use an external editor to do additional work on a photo. "
+"If installed, GIMP and UFRaw are the default external editors for photo and "
+"RAW editing, respectively. If these programs are not installed, you must "
+"select your preferred editors by choosing <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq> and selecting editors from drop-down "
+"menus of installed applications."
+msgstr ""
+"Jūs varat izmantot ārēju redaktoru, lai veiktu papildu izmaiņās fotogrāfijā. "
+"Ja ir instalēts, GIMP un UFRaw ir noklusējuma ārējie redaktori attiecīgi "
+"fotogrāfijām un jēlajām datnēm. Ja šīs programmas nav instalētas, jums "
+"jāizvēlas vēlamie redaktori <guiseq><gui>Rediģēt</gui><gui>Iestatījumi</"
+"gui></guiseq> un jāizvēlas redaktori no instalēto lietotņu izkrītošajām "
+"izvēlnēm."
+
+#. (itstool) path: page/p
+#: C/edit-external.page:24
+msgid ""
+"Once your editors have been set, select a photo and choose "
+"<guiseq><gui>Photos</gui> <gui>Open With External Editor</gui></guiseq> to "
+"open the photo with the external editor. Likewise, if the original photo is "
+"a RAW file, select <guiseq><gui>Photos</gui><gui>Open With RAW Editor</gui></"
+"guiseq> to edit the RAW file directly with the set RAW editor."
+msgstr ""
+"Kad redaktors ir iestatīs, izvēlieties fotogrāfiju un "
+"izvēlieties<guiseq><gui>Fotogrāfijas</gui> <gui>Atvērt ar ārēju redaktoru</"
+"gui></guiseq> lai atvērtu fotogrāfiju ar ārēju redaktoru. Līdzīgi, ja "
+"fotogrāfija ir jēldatne, izvēlieties <guiseq><gui>Fotogrāfijas</"
+"gui><gui>Atvērt ar RAW redaktoru</gui></guiseq>, lai rediģētu jēldatni ar "
+"iestatīto RAW redaktoru."
+
+#. (itstool) path: page/p
+#: C/edit-external.page:31
+msgid ""
+"When you complete your edits and save the file, Shotwell will detect the "
+"changes and update the photo. When external edits have been made, press and "
+"hold the <key>Shift</key> key in full-window view to show the original photo "
+"rather than the externally-edited one."
+msgstr ""
+"Kad beigsiet rediģēt un saglabāsiet datni, Shotwell pamanīs izmaiņas un "
+"atjauninās fotogrāfiju. Kad ārējās izmaiņas ir pabeigtas, spiediet taustiņu "
+"<key>Shift</key> pilnekrāna logā, lai rādītu sākotnējo fotogrāfiju, nevis "
+"ārēji rediģēto."
+
+#. (itstool) path: page/p
+#: C/edit-external.page:38
+msgid "Reverting to original will erase any external edits."
+msgstr "Atjaunošana uz oriģinālu dzēsīs ārpusē veiktās izmaiņas."
+
+#. (itstool) path: note/p
+#: C/edit-external.page:43
+msgid ""
+"If you externally edit a RAW photo and save the result to another image, "
+"such as a JPEG or PNG, Shotwell cannot automatically determine that the "
+"original RAW and the new image should be paired."
+msgstr ""
+"Ja jūs ārēji rediģējat RAW fotogrāfiju un to saglabājat citā attēlā, "
+"piemēram, JPEG vai PNG, Shotwell nevar automātiski noteikt, ka oriģinālā RAW "
+"un jaunais attēls ir saistīti."
+
+#. (itstool) path: note/p
+#: C/edit-external.page:49
+msgid ""
+"If you want to work within the resulting image within Shotwell, you'll need "
+"to import it yourself."
+msgstr ""
+"Ja vēlaties Shotwell lietotnē strādāt ar iegūto attēlu, jums pašam tā būs "
+"jāimportē."
+
+#. (itstool) path: info/desc
+#: C/edit-nondestructive.page:7
+msgid ""
+"Shotwell is a non-destructive photo editor - it does not modify your "
+"original photos."
+msgstr ""
+"Shotwell ir nedestruktīvs fotogrāfiju redaktors — tas nemaina jūsu "
+"sākotnējās fotogrāfijas."
+
+#. (itstool) path: page/title
+#: C/edit-nondestructive.page:12
+msgid "What happens to the original when I edit a photo?"
+msgstr "Kas notiek ar oriģinālu, kad es rediģēju fotogrāfiju?"
+
+#. (itstool) path: page/p
+#: C/edit-nondestructive.page:14
+msgid ""
+"Shotwell is a non-destructive photo editor. It does not modify your original "
+"photographs. That is to say, if you crop a photo or adjust its colors, the "
+"photo file on disc remains untouched. Shotwell stores your edits in a "
+"database and applies them on the fly as necessary. This means you can undo "
+"any alterations you make to a photograph."
+msgstr ""
+"Shotwell in neiznīcinošs fotogrāfiju redaktors. Tas nemaina jūsu sākotnējās "
+"fotogrāfijas. Tas nozīmē, ka, ka kadrējat attēlu vai maināt tā krāsas, "
+"fotogrāfijas datne uz diska netiek mainīta. Shotwell Saglabā jūsu veiktās "
+"izmaiņas datubāzē un tās vēlāk tiek pielietotas, kad tas ir vajadzīgs. Tas "
+"nozīmē,ka varat atsaukt jebkuras izmaiņas, ko veicāt ar fotogrāfiju."
+
+#. (itstool) path: page/p
+#: C/edit-nondestructive.page:16 C/edit-undo.page:18
+msgid ""
+"If you want to see what a photo looked like before your modifications, press "
+"the <key>Shift</key> key. The original photo will be displayed as long as "
+"you hold the key down."
+msgstr ""
+"Ja vēlaties redzēt, kā attēls izskatījās pirs izmaiņu veikšanas, spiediet "
+"<key>Shift</key> taustiņu. Sākotnējā bilde būs redzama, kamēr vien būs "
+"piespiests taustiņš."
+
+#. (itstool) path: page/p
+#: C/edit-nondestructive.page:18
+msgid ""
+"Note that Shotwell can optionally write metadata (such as tags and titles) "
+"to photo files. For more information, see the section <link xref=\"other-"
+"files\">Photo files</link>."
+msgstr ""
+"Ņemiet vērā, ka Shotwell var ierakstīt metadatus (piemēram, tagus un "
+"nosaukumus) fotogrāfiju datnēs. Lai uzzinātu vairāk, skatiet nodaļu <link "
+"xref=\"other-files\">Fotogrāfiju datnes</link>."
+
+#. (itstool) path: info/desc
+#: C/edit-redeye.page:7
+msgid ""
+"Correct photos where people have red eyes because of the camera's flash."
+msgstr ""
+"Labojiet fotogrāfijas, kur cilvēkiem ir sarkanas acis dēļ kameras "
+"zibspuldzes."
+
+#. (itstool) path: page/title
+#: C/edit-redeye.page:12
+msgid "Removing red-eye"
+msgstr "Sarkano acu noņemšana"
+
+#. (itstool) path: page/p
+#: C/edit-redeye.page:14
+msgid ""
+"Red-eye occurs when the camera's flash reflects off the pupil of someone's "
+"eye. To eliminate this in a photo, use the Red-eye tool."
+msgstr ""
+"Sarkano acu efekts notiek, kad kameras zibspuldze atspīd no acu zīlītes. Lai "
+"šo efektu novērstu fotogrāfijā, izmantojiet sarkano acu rīku."
+
+#. (itstool) path: item/p
+#: C/edit-redeye.page:17
+msgid "Click <gui>Red-eye</gui>. A circle will appear on the photo."
+msgstr "Spiediet <gui>Sarkanās acis</gui>. Fotogrāfijā parādīsies aplis."
+
+#. (itstool) path: item/p
+#: C/edit-redeye.page:20
+msgid ""
+"Drag the circle over the affected pupil, adjust its size with the slider "
+"control, and press <gui>Apply</gui>. The redness will be removed."
+msgstr ""
+"Velciet apli virs sarkanās zīlītes, pielāgojiet tā izmēru ar slīdni un "
+"spiediet <gui>Pielietot</gui>. Sarkanums tiks noņemts."
+
+#. (itstool) path: item/p
+#: C/edit-redeye.page:23
+msgid ""
+"Repeat this process for all red pupils in your photo. Press <gui>Close</gui> "
+"when finished."
+msgstr ""
+"Atkārtojiet procesu visām sarkanajām acīm fotogrāfijā. Kad pabeidzat, "
+"spiediet <gui>Aizvērt</gui>."
+
+#. (itstool) path: info/desc
+#: C/edit-rotate.page:7
+msgid ""
+"Click the <gui>Rotate</gui> button, or choose one of the commands in the "
+"<gui>Photo</gui> menu."
+msgstr ""
+"Spiediet pogu <gui>Pagriezt</gui>, vai izvēlieties vienu no komandām "
+"<gui>Fotogrāfiju</gui> izvēlnē."
+
+#. (itstool) path: page/title
+#: C/edit-rotate.page:12
+msgid "Rotate or flip a photo"
+msgstr "Pagriezt vai apmest fotogrāfiju"
+
+#. (itstool) path: page/p
+#: C/edit-rotate.page:14
+msgid ""
+"You can rotate your photos left and right (clockwise and counterclockwise) "
+"with the <gui>Rotate</gui> button on the toolbar of most views. You can also "
+"make a mirror image of any photo."
+msgstr ""
+"Jūs varat pagriezt fotogrāfijas pa labi vai pa kreisi (pulksteņa rādītāja "
+"virzienā vai pretēji) ar pogu <gui>Pagriezt</gui>, kas ir pieejams rīkjoslā. "
+"Jūs varat arī iegūt jebkuras fotogrāfijas spoguļattēlu."
+
+#. (itstool) path: page/p
+#: C/edit-rotate.page:16
+msgid ""
+"To rotate right, click on the <gui>Rotate</gui> button. To rotate left, "
+"press and hold the <key>Ctrl</key> key and then click the button. Both "
+"commands are available in the <gui>Photos</gui> menu too. Alternatively, use "
+"the following keyboard shortcuts:"
+msgstr ""
+"Lai pagrieztu pa labi, spiediet pogu <gui>Pagriezt</gui>. Lai pagrieztu pa "
+"kreisi, turiet piespiestu <key>Ctrl</key> taustiņu un spiediet pagriešanas "
+"pogu. Abas komandas ir pieejamas arī <gui>Fotogrāfiju</gui> izvēlnē. Varat "
+"izmantot arī tastatūras saīsnes:"
+
+#. (itstool) path: item/p
+#: C/edit-rotate.page:18
+msgid ""
+"rotate left: <keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq> or "
+"<key>[</key>"
+msgstr ""
+"pagriezt pa kreisi: <keyseq><key>Shift</key><key>Ctrl</key><key>R</key></"
+"keyseq> vai <key>[</key>"
+
+#. (itstool) path: item/p
+#: C/edit-rotate.page:19
+msgid ""
+"rotate right: <keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>]</key>"
+msgstr ""
+"pagriezt pa labi: <keyseq><key>Ctrl</key><key>R</key></keyseq> vai <key>]</"
+"key>"
+
+#. (itstool) path: page/p
+#: C/edit-rotate.page:21
+msgid ""
+"To create a mirror image of a photo, use the <gui>Flip Horizontally</gui> "
+"command in the <gui>Photos</gui> menu. To flip an image vertically, use the "
+"<gui>Flip Vertically</gui> command in the same menu."
+msgstr ""
+"Lai izveidotu fotogrāfijas spoguļattēlu, izmantojiet <gui>Apmest "
+"horizontāli</gui> komandu <gui>Fotogrāfiju</gui> izvēlnē. Lai apmestu "
+"fotogrāfiju vertikāli, izmantojiet <gui>Apmest vertikāli</gui> komandu tajā "
+"pat izvēlnē."
+
+#. (itstool) path: note/p
+#: C/edit-rotate.page:24
+msgid ""
+"If you select more than one image, you can rotate all of them at the same "
+"time."
+msgstr ""
+"Ja izvēlēsities vairāk kā vienu attēlu, varēsiet pagriezt tos visus uzreiz."
+
+#. (itstool) path: info/desc
+#: C/edit-straighten.page:7
+msgid "Straighten a photo so that its horizon appears level."
+msgstr "Iztaisnojiet fotogrāfijas, lai to horizonts izskatītos līdzens."
+
+#. (itstool) path: page/title
+#: C/edit-straighten.page:12
+msgid "Straighten photos"
+msgstr "Iztaisnot fotogrāfijas"
+
+#. (itstool) path: page/p
+#: C/edit-straighten.page:14
+msgid ""
+"The straighten tools allows photos to be leveled and straightened. The "
+"straighten tool is only available in full-window or fullscreen mode."
+msgstr ""
+"Iztaisnošanas rīks ļauj izlīdzināt un iztaisnot fotogrāfijas. Iztaisnošanas "
+"rīks ir pieejams tikai pilna loga un pilnekrāna režīmā."
+
+#. (itstool) path: item/p
+#: C/edit-straighten.page:18
+msgid ""
+"Click <gui>Straighten</gui>. The straighten slider will appear. "
+"Alternatively, use the keyboard shortcut <keyseq><key>Ctrl</key><key>A</"
+"key></keyseq>."
+msgstr ""
+"Spiediet <gui>Iztaisnot</gui>. Parādīsies iztaisnošanas slīdnis. Varat "
+"izmantot arī tastatūras saīsni <keyseq><key>Ctrl</key><key>A</key></keyseq>."
+
+#. (itstool) path: item/p
+#: C/edit-straighten.page:21
+msgid "Drag the slider to achieve the desired degree of straightening."
+msgstr "Velciet slīdni, lai iegūtu vēlamo leņķi."
+
+#. (itstool) path: item/p
+#: C/edit-straighten.page:24
+msgid "Press <gui>Straighten</gui> when finished."
+msgstr "Kad pabeigts, spiediet <gui>Iztaisnot</gui>."
+
+#. (itstool) path: info/desc
+#: C/edit-date-time.page:7
+msgid "Change the date and time of photos if those details are incorrect."
+msgstr "Mainīt fotogrāfiju datumus un laikus, ja tie ir nepareizi."
+
+#. (itstool) path: page/title
+#: C/edit-date-time.page:12
+msgid "Adjust the date and time of photos"
+msgstr "Pielāgot fotogrāfiju datumus un laikus"
+
+#. (itstool) path: page/p
+#: C/edit-date-time.page:14
+msgid ""
+"To adjust the date and time of photos, select the photos you would like to "
+"adjust, choose <guiseq><gui>Photos</gui><gui>Adjust Date and Time...</gui></"
+"guiseq> and select a new date and time."
+msgstr ""
+"Lai pielāgotu fotogrāfiju datumu un laiku, izvēlieties fotogrāfijas, "
+"izvēlieties <guiseq><gui>Fotogrāfijas</gui><gui>Pielāgot datumu un laiku...</"
+"gui></guiseq> un iestatiet jaunu datumu un laiku."
+
+#. (itstool) path: page/p
+#: C/edit-date-time.page:16
+msgid ""
+"If you are changing the date and time of multiple photos at once, you can "
+"choose to shift all the photos by the same amount of time or to set all the "
+"photos to the same time."
+msgstr ""
+"Ja maināt datumu un laiku vairākām fotogrāfijām uzreiz, varat to mainīt "
+"visām fotogrāfijām par vienādu laika nobīdi, vai arī visām iestatīt vienu un "
+"to pašu laiku."
+
+#. (itstool) path: page/p
+#: C/edit-date-time.page:18
+msgid ""
+"By default, the date and time are only changed inside Shotwell. You can also "
+"choose to modify the date and time in the original file, but this cannot be "
+"undone once you exit Shotwell."
+msgstr ""
+"Pēc noklusējuma, datums un laiks tiek mainīts tikai pašā Shotwell. Jūs varat "
+"arī mainīt datumu un laiku oriģinālajā datnē, bet to nevar atsaukt, kad "
+"iziesiet ārā no Shotwell lietotnes."
+
+#. (itstool) path: info/desc
+#: C/edit-undo.page:7
+msgid "Return a photo to its original, unedited form."
+msgstr "Atjaunot fotogrāfiju tās sākotnējā, nerediģētā formā."
+
+#. (itstool) path: page/title
+#: C/edit-undo.page:14
+msgid "Undoing changes"
+msgstr "Atsaukt izmaiņas"
+
+#. (itstool) path: page/p
+#: C/edit-undo.page:16
+msgid ""
+"Because Shotwell is a non-destructive photo editor, you can undo any "
+"alterations you make to a photograph."
+msgstr ""
+"Tā kā Shotwell ir nedestruktīvs fotogrāfiju redaktors, jūs varat atsaukt "
+"visas izmaiņas, kas ir veiktas ar fotogrāfiju."
+
+#. (itstool) path: page/p
+#: C/edit-undo.page:20
+msgid ""
+"To completely undo all the changes you've made to a photo, click "
+"<guiseq><gui>Photos</gui><gui>Revert to Original</gui></guiseq>. The only "
+"exception is that time and date adjustments will not be reverted."
+msgstr ""
+"Lai pilnībā atsauktu visas fotogrāfijā veiktās izmaiņas, spiediet "
+"<guiseq><gui>Fotogrāfijas</gui><gui>Atgriezties pie oriģināla</gui></"
+"guiseq>. Vienīgais izņēmums ir laiks un datums, tie netiks atjaunoti."
+
+#. (itstool) path: info/desc
+#: C/formats.page:7
+msgid ""
+"Shotwell supports JPEG, PNG, TIFF, BMP and RAW photo files as well as video "
+"files."
+msgstr ""
+"Shotwell atbalsta JPEG, PNG, TIFF, BMP un RAW fotogrāfiju datnes, kā arī "
+"video datnes."
+
+#. (itstool) path: page/title
+#: C/formats.page:12
+msgid "Supported photo and video formats"
+msgstr "Atbalstītie fotogrāfiju un video formāti"
+
+#. (itstool) path: page/p
+#: C/formats.page:14
+msgid ""
+"Shotwell supports JPEG, PNG, TIFF, BMP and <link type=\"guide\" xref=\"other-"
+"raw\">RAW</link> photo files. Shotwell does not yet support other graphics "
+"format such as GIF."
+msgstr ""
+"Shotwell atbalsta JPEG, PNG, TIFF, BMP un <link type=\"guide\" xref=\"other-"
+"raw\">RAW</link> fotogrāfiju datnes. Shotwell vēl neatbalsta citus grafikas "
+"formātus, piemēram, GIF."
+
+#. (itstool) path: page/p
+#: C/formats.page:16
+msgid ""
+"Shotwell's RAW format support is currently limited. When you view a RAW "
+"photo, you are actually viewing a JPEG derived from the RAW photo, not the "
+"RAW image itself. Additionally, the RAW editing pipeline is not fully 16-bit "
+"- you can only export edited photos as 8-bit files. All supported formats "
+"can be used for export (JPEG, PNG, TIFF, BMP)."
+msgstr ""
+"Pašlaik Shotwell jēlattēlu (RAW) formātu atbalsts ir ierobežots. Skatoties "
+"jēlattēlu, jūs redzat JPEG datni, kas ir izvilkta no jēlattēla, nevis pašu "
+"jēlattēlu. Bez tam, RAW rediģēšanas konveijers nav pilnībā 16 bitu — "
+"rediģētās fotogrāfijas var eksportēt tikai kā 8 bitu datnes. Eksportēšanai "
+"var izmantot visus atbalstītos formātus (JPEG, PNG, TIFF, BMP)."
+
+#. (itstool) path: page/p
+#: C/formats.page:18
+msgid ""
+"For more information about RAW-format photos in Shotwell, please see the "
+"<link type=\"guide\" xref=\"other-raw\">RAW</link> section."
+msgstr ""
+"Lai uzzinātu vairāk par jēlā formāta fotogrāfijām Shotwell lietotnē, skatiet "
+"nodaļu par <link type=\"guide\" xref=\"other-raw\">jēlattēliem</link>."
+
+#. (itstool) path: page/p
+#: C/formats.page:22
+msgid ""
+"Shotwell also supports video files in any format supported by the GStreamer "
+"media library on the system where Shotwell is running. This typically "
+"includes the following formats among others:"
+msgstr ""
+"Shotwell atbalsta arī video datnes visos formātos, ko atbalsta GStreamer "
+"multimediju bibliotēka sistēmā, uz kuras darbojas Shotwell. Tas parasti "
+"iekļauj šos formātus:"
+
+#. (itstool) path: item/p
+#: C/formats.page:25
+msgid "Container formats: Ogg, QuickTime, MP4, AVI."
+msgstr "Konteineru formāti: Ogg, QuickTime, MP4, AVI."
+
+#. (itstool) path: item/p
+#: C/formats.page:26
+msgid ""
+"Codecs: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Note that some operating "
+"systems may not include all codecs listed here due to legal or licensing "
+"restrictions.</em>"
+msgstr ""
+"Kodeki: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Ņemiet vērā, ka dažas "
+"operētājsistēmas var neiekļaut visus šeit uzskaitītos kodekus dēļ "
+"juridiskiem vai licenču ierobežojumiem.</em>"
+
+#. (itstool) path: page/p
+#: C/formats.page:30
+msgid ""
+"Shotwell supports both photos and videos, but for simplicity, this "
+"documentation uses just the term \"photos\" in most places. Many operations "
+"in Shotwell apply to both photos and videos, however. In particular, events, "
+"flagging, rating, tagging, and publishing work both for photos and for "
+"videos."
+msgstr ""
+"Shotwell atbalsta gan fotogrāfijas, gan video, bet dokumentācijā "
+"vienkāršības labad tiek izmantots termins “fotogrāfijas”. Vairums darbību "
+"Shotwell var veikt gan ar fotogrāfijām, gan video, precīzāk, notikumi, "
+"atzīmēšana ar karogu, vērtēšana, tagošana un publicēšana darbojas vienlīdz "
+"labi ar fotogrāfijām un video."
+
+#. (itstool) path: info/desc
+#: C/import-camera.page:7
+msgid "Copy photos from a digital camera."
+msgstr "Kopēt fotogrāfijas no ciparu kameras."
+
+#. (itstool) path: page/title
+#: C/import-camera.page:12
+msgid "Importing from a camera"
+msgstr "Importēšana no kameras"
+
+#. (itstool) path: page/p
+#: C/import-camera.page:14
+msgid "To import photos from a digital camera:"
+msgstr "Lai importētu fotogrāfijas no ciparu kameras:"
+
+#. (itstool) path: item/p
+#: C/import-camera.page:18
+msgid ""
+"Connect the camera to your computer and switch it on. Shotwell will detect "
+"it and list it in the sidebar."
+msgstr ""
+"Pievienojiet kameru savam datoram un ieslēdziet to. Shotwell to atpazīs un "
+"parādīs sānu joslā."
+
+#. (itstool) path: item/p
+#: C/import-camera.page:22
+msgid ""
+"Select the camera in the sidebar. Previews of each photo on the camera will "
+"be displayed."
+msgstr ""
+"Izvēlieties kameru sānu joslā. Tiks attēloti katras fotogrāfijas "
+"priekšskatījums."
+
+#. (itstool) path: item/p
+#: C/import-camera.page:25
+msgid ""
+"If you like, you can choose a set of specific photos to import. To do this, "
+"hold down the <key>Ctrl</key> key and click to select individual photos. You "
+"can hold down <key>Shift</key> and click to select a range of photos too."
+msgstr ""
+"Ja vēlaties, varat izvēlēties, kuras tieši fotogrāfijas importēt. Lai to "
+"izdarītu, turiet piespiestu <key>Ctrl</key> taustiņu un spiediet uz "
+"attiecīgajām fotogrāfijām. Varat arī turēt piespiestu <key>Shift</key> "
+"taustiņu un spiest uz fotogrāfijām, lai izvēlētos virkni fotogrāfiju uzreiz."
+
+#. (itstool) path: item/p
+#: C/import-camera.page:28
+msgid ""
+"Click either <gui>Import Selected</gui> or <gui>Import All</gui>. The photos "
+"will be copied from the camera and saved on your computer."
+msgstr ""
+"Spiediet vai nu <gui>Importēt izvēlētās</gui> vai <gui>Importēt visas</gui>. "
+"Fotogrāfijas tiks nokopētas no kameras un saglabātas datorā."
+
+#. (itstool) path: page/p
+#: C/import-camera.page:32
+msgid ""
+"Once the import is complete, you can open the <gui>Last Import</gui> view "
+"(in the sidebar) to see all photos that were imported. The Events list (also "
+"in the sidebar) will also show the new photos, organized by date."
+msgstr ""
+"Kad importēšana ir pabeigta, varat atvērt skatu <gui>Pēdējais imports</gui> "
+"(sānu joslā) un tur būs redzamas visas importētās fotogrāfijas. Notikumu "
+"saraksts (arī sānu joslā) arī saturēs jaunās fotogrāfijas, kas ir "
+"organizētas pēc datuma."
+
+#. (itstool) path: info/desc
+#: C/import-file.page:7
+msgid "Import photos that are already saved on your computer."
+msgstr "Importēt fotogrāfijas, kas jau ir saglabātas datorā."
+
+#. (itstool) path: page/title
+#: C/import-file.page:12
+msgid "Importing from your hard disk"
+msgstr "Importēt no cietā diska"
+
+#. (itstool) path: page/p
+#: C/import-file.page:14
+msgid ""
+"To import photo files from your hard disk into Shotwell, just drag them from "
+"your file browser into the Shotwell window."
+msgstr ""
+"Lai importētu datnes no cietā diska uz Shotwell, velciet tās no datņu "
+"pārlūka Shotwell logā."
+
+#. (itstool) path: page/p
+#: C/import-file.page:16
+msgid ""
+"Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</"
+"gui></guiseq> and select the folder containing the photos you want to import."
+msgstr ""
+"Varat arī spiest <guiseq><gui>Datne</gui><gui>Importēt no mapes...</gui></"
+"guiseq> un izvēlieties mapi, kura satur fotogrāfijas, kuras vēlaties "
+"importēt."
+
+#. (itstool) path: page/p
+#: C/import-file.page:18
+msgid ""
+"Shotwell will ask whether you want to copy the photo files to your library "
+"folder (usually this is the <file>Pictures</file> folder in your home "
+"directory) or to import them in place without copying the files."
+msgstr ""
+"Shotwell jums prasīs, vai vēlaties kopēt fotogrāfiju datnes uz jūsu "
+"bibliotēkas mapi (parasti tā ir mape <file>Attēli</file>, kas atrodas jūsu "
+"mājas direktorijā), vai importējiet tās, nekopējot datnes."
+
+#. (itstool) path: page/p
+#: C/import-file.page:20
+msgid ""
+"If you hold down <key>Ctrl</key> while dragging photos in, Shotwell will "
+"copy the photos into your library folder without prompting. Similarly, if "
+"you hold down <keyseq><key>Ctrl</key><key>Shift</key></keyseq> while "
+"dragging photos in, Shotwell will import the photos without copying them."
+msgstr ""
+"Ja turat piespiestu <key>Ctrl</key> taustiņu,  kamēr velkat fotogrāfijas, "
+"Shotwell kopēs jūsu fotogrāfijas bez nejautājot. Līdzīgi, ja velkot turēsiet "
+"piespiestus taustiņus <keyseq><key>Ctrl</key><key>Shift</key></keyseq>, "
+"Shotwell importēs fotogrāfijas tās nekopējot."
+
+#. (itstool) path: page/p
+#: C/import-file.page:22
+msgid ""
+"Once the import is complete, you can select <gui>Last Import</gui> in the "
+"sidebar to see all photos successfully imported. The Events list will also "
+"show new entries for the dates corresponding to the imported photos."
+msgstr ""
+"Kad importēšana ir pabeigta, varat izvēlēties <gui>Pēdējais imports</gui> "
+"sānu joslā, lai redzētu visas veiksmīgi importētās fotogrāfijas. Notikumu "
+"saraksts arī attēlos jaunos ierakstus datumiem, kas atbilst importētajām "
+"fotogrāfijām."
+
+#. (itstool) path: info/desc
+#: C/import-f-spot.page:7
+msgid ""
+"Shotwell can import all your photos and tags from the F-Spot photo manager."
+msgstr ""
+"Shotwell var arī importēt visas jūsu fotogrāfijas un tagus no F-Spot "
+"fotogrāfiju pārvaldnieka."
+
+#. (itstool) path: page/title
+#: C/import-f-spot.page:12
+msgid "Importing from F-Spot"
+msgstr "Importēšana no F-Spot"
+
+#. (itstool) path: page/p
+#: C/import-f-spot.page:14
+msgid "To import an existing photo collection from F-Spot:"
+msgstr "Lai importētu esošo fotogrāfiju kolekciju no F-Spot:"
+
+#. (itstool) path: item/p
+#: C/import-f-spot.page:16
+msgid "Select <guiseq><gui>File</gui><gui>Import From F-Spot</gui></guiseq>."
+msgstr ""
+"Izvēlieties <guiseq><gui>Datne</gui><gui>Importēt no F-Spot</gui></guiseq>."
+
+#. (itstool) path: item/p
+#: C/import-f-spot.page:17
+msgid ""
+"Now choose either the default F-Spot library or another F-Spot database. If "
+"importing from another F-Spot database, select a directory and file from the "
+"chooser dialog box."
+msgstr ""
+"Tagad izvēlieties vai no noklusējuma F-Spot bibliotēku vai citu F-Spot "
+"datubāzi. Ja importējat no citas F-Spot datubāzes, izvēlēties direktoriju un "
+"datni ar izvēlētāja dialoglodziņu."
+
+#. (itstool) path: page/p
+#: C/import-f-spot.page:20
+msgid ""
+"Shotwell will import your photos, together with their tags and other "
+"information. Once the import is complete, you can select <gui>Last Import</"
+"gui> in the sidebar to see all photos successfully imported. The Events list "
+"will also show new entries for the dates corresponding to the imported "
+"photos."
+msgstr ""
+"Shotwell importēs jūsu fotogrāfijas ar to tagiem un citu informāciju. Kad "
+"importēšana ir pabeigta, varat izvēlēties <gui>Pēdējais imports</gui> sānu "
+"joslā, lai redzētu visas veiksmīgi importētās fotogrāfijas. Notikumu "
+"saraksts arī attēlos jaunos ierakstus datumiem, kas atbilst importētajām "
+"fotogrāfijām."
+
+#. (itstool) path: info/desc
+#: C/import-memorycard.page:7
+msgid "Import photos from a digital camera's memory card."
+msgstr "Importēt fotogrāfijas no ciparu kameras atmiņas kartes."
+
+#. (itstool) path: page/title
+#: C/import-memorycard.page:12
+msgid "Importing from a memory card"
+msgstr "Importēšana no atmiņas kartes"
+
+#. (itstool) path: page/p
+#: C/import-memorycard.page:14
+msgid "To import photos from a camera memory card:"
+msgstr "Lai importētu fotogrāfijas no kameras atmiņas kartes:"
+
+#. (itstool) path: item/p
+#: C/import-memorycard.page:18
+msgid ""
+"Put the card into your card reader. Make sure the card reader is plugged in "
+"to the computer and switched on."
+msgstr ""
+"Ievietojiet atmiņas karti savā karšu lasītājā. Pārliecinieties, ka lasītājs "
+"ir pievienots datoram un ieslēdziet to."
+
+#. (itstool) path: item/p
+#: C/import-memorycard.page:21
+msgid "The card reader and card should be detected automatically."
+msgstr "Karšu lasītāju un pašu karti datoram vajadzētu atpazīt automātiski."
+
+#. (itstool) path: item/p
+#: C/import-memorycard.page:24
+msgid ""
+"Follow the instructions for <link xref=\"import-file\">importing photos from "
+"your hard disk</link>. If you click <guiseq><gui>File</gui><gui>Import From "
+"Folder...</gui></guiseq>, the memory card should be visible as a folder in "
+"the side bar of the file selection window."
+msgstr ""
+"Sekojiet instrukcijām, kā <link xref=\"import-file\">importēt fotogrāfijas "
+"no cietā diska</link>. Ja spiedīsiet <guiseq><gui>Datne</gui><gui>Importēt "
+"no mapes...</gui></guiseq>, atmiņas karte būs redzama kā mape izvēlēs loga "
+"sānu joslā."
+
+#. (itstool) path: page/p
+#: C/import-memorycard.page:28
+msgid ""
+"Shotwell can import photos from any memory card that is compatible with your "
+"card reader."
+msgstr ""
+"Shotwell var importēt fotogrāfijas no jebkuras atmiņas kartes, kas ir "
+"savietojama ar jūsu karšu lasītāju."
+
+#. (itstool) path: page/p
+#: C/import-memorycard.page:30
+msgid ""
+"If the card is not detected automatically, your card reader may not have "
+"been recognized. Try unplugging it and then plugging it in again. If that "
+"doesn't work, you should still be able to import photos by <link xref="
+"\"import-camera\">connecting your camera directly to the computer</link>, "
+"though."
+msgstr ""
+"Ja karte nav automātiski atpazīta, iespējams, ka karšu lasītājs nav "
+"atpazīts. Mēģiniet to atvienot un atkal pievienot datoram. Ja tas nepalīdz "
+"jums vajadzētu varēt importēt fotogrāfijas, <link xref=\"import-camera"
+"\">pievienojot datoram pašu kameru</link>."
+
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/index.page:23
+msgctxt "_"
+msgid ""
+"external ref='figures/shotwell_logo.png' "
+"md5='4b333499555b4e496b1a38f7899067f3'"
+msgstr ""
+"external ref='figures/shotwell_logo.png' "
+"md5='4b333499555b4e496b1a38f7899067f3'"
+
+#. (itstool) path: info/title
+#: C/index.page:6
+msgctxt "link"
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#. (itstool) path: info/title
+#: C/index.page:7
+msgctxt "text"
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#. (itstool) path: credit/name
+#: C/index.page:9
+msgid "Jim Nelson"
+msgstr "Jim Nelson"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Allison Barlow"
+msgstr "Allison Barlow"
+
+#. (itstool) path: credit/name
+#: C/index.page:13
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:15
+msgid "Peter Smith"
+msgstr "Peter Smith"
+
+#. (itstool) path: credit/name
+#: C/index.page:17
+msgid "Phil Bull"
+msgstr "Phil Bull"
+
+#. (itstool) path: page/title
+#: C/index.page:23
+msgid ""
+"<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Shotwell Photo "
+"Manager"
+msgstr ""
+"<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Shotwell "
+"fotogrāfiju pārvaldnieks"
+
+#. (itstool) path: section/title
+#: C/index.page:26
+msgid "Importing Photos"
+msgstr "Fotogrāfiju importēšana"
+
+#. (itstool) path: section/title
+#: C/index.page:30
+msgid "Viewing Photos"
+msgstr "Fotogrāfiju skatīšana"
+
+#. (itstool) path: section/title
+#: C/index.page:34
+msgid "Organizing Photos"
+msgstr "Fotogrāfiju organizēšana"
+
+#. (itstool) path: section/title
+#: C/index.page:38
+msgid "Editing Photos"
+msgstr "Fotogrāfiju rediģēšana"
+
+#. (itstool) path: section/title
+#: C/index.page:42
+msgid "Sharing Photos"
+msgstr "Dalīšanās ar fotogrāfijām"
+
+#. (itstool) path: section/title
+#: C/index.page:46
+msgid "Other Features"
+msgstr "Citas iespējas"
+
+#. (itstool) path: info/desc
+#: C/organize-event.page:7
+msgid ""
+"Group photos together that were taken at the same time. Learn how to rename, "
+"merge, and sort events."
+msgstr ""
+"Grupēt kopā fotogrāfijas, kas ir uzņemtas tajā pašā laikā. Uzziniet, kā "
+"pārdēvēt, apvienot un kārtot notikumus."
+
+#. (itstool) path: page/title
+#: C/organize-event.page:12
+msgid "Events"
+msgstr "Notikumi"
+
+#. (itstool) path: page/p
+#: C/organize-event.page:14
+msgid ""
+"An event is a group of photos that were taken at approximately the same "
+"time. When you import photos, Shotwell checks when each photo was taken. It "
+"then groups the photos into events."
+msgstr ""
+"Notikums ir virkne ar fotogrāfijām, kas ir uzņemtas aptuveni vienā laikā. "
+"Importējot fotogrāfijas, Shotwell pārbauda, kad katra fotogrāfija ir "
+"uzņemta. Tad tas sagrupē fotogrāfijas notikumos."
+
+#. (itstool) path: page/p
+#: C/organize-event.page:16
+msgid ""
+"Choose <gui>Events</gui> from the sidebar to see your photos organized by "
+"date. If you select a month or year from the sidebar, a list of events will "
+"be displayed in the main window. Double-click an event to see all the photos "
+"that were taken around that time."
+msgstr ""
+"Izvēlieties <gui>Notikumi</gui> sānu joslā, lai redzētu fotogrāfijas, kas ir "
+"organizētas pēc datumiem. Ja sānu joslā izvēlēsities mēnesi vai gadu, "
+"galvenajā logā parādīsies saraksts ar notikumiem. Dubultklikšķiniet uz "
+"notikuma, lai redzētu visas fotogrāfijas, kas tika uzņemtas ap to laiku."
+
+#. (itstool) path: page/p
+#: C/organize-event.page:18
+msgid ""
+"If a photo has no embedded date/time information, then Shotwell can't "
+"automatically place it in any event. In this case the photo will appear in "
+"the <gui>No Event</gui> view accessible from the sidebar. You can still move "
+"the photo to any event you like as described below."
+msgstr ""
+"Ja fotogrāfijā nav iekļauta informācija par datumu un laiku, Shotwell nevar "
+"automātiski to novietot kādā notikumā. Šādā gadījumā fotogrāfija parādīsies "
+"<gui>Nav notikuma</gui> sadaļā sānu joslā. Jūs vēl aizvien varat pārvietot "
+"šādu fotogrāfiju uz jebkuru notikumu tāpat kā pārējās fotogrāfijas."
+
+#. (itstool) path: section/title
+#: C/organize-event.page:25
+msgid "Renaming events"
+msgstr "Notikumu pārdēvēšana"
+
+#. (itstool) path: section/p
+#: C/organize-event.page:27
+msgid ""
+"To give an event a name rather than referring to it by its date, select the "
+"event, click <guiseq><gui>Events</gui><gui>Rename Event...</gui></guiseq> "
+"and enter a new name. Another way of renaming an event is to double-click "
+"its name in the sidebar; type a new name and then press <key>Enter</key>."
+msgstr ""
+"Lai notikumam piešķirtu nosaukumu, nevis norādīt uz to pēc datuma, "
+"izvēlieties notikumu, spiediet <guiseq><gui>Notikumi</gui><gui>Pārdēvēt "
+"notikumu...</gui></guiseq> un ievadiet jauno nosaukumu. Vēl notikumus var "
+"pārdēvēt, dubultklikšķinot uz to nosaukuma sānu joslā, ievadot jauno "
+"nosaukumu un spiežot <key>Enter</key>."
+
+#. (itstool) path: section/title
+#: C/organize-event.page:31
+msgid "Moving photos between events"
+msgstr "Fotogrāfiju pārvietošana starp notikumiem"
+
+#. (itstool) path: section/p
+#: C/organize-event.page:33
+msgid ""
+"Even though photos are initially grouped into events by their date, you can "
+"move photos between events. To do this, drag any photo to the sidebar and "
+"drop it on an event."
+msgstr ""
+"Lai gan fotogrāfijas sākumā tiek grupētas notikumos pēc to datumiem, jūs "
+"varat pārvietot fotogrāfijas starp notikumiem. Lai to izdarītu, velciet "
+"jebkuru fotogrāfiju uz sānu joslu un nometiet to notikumā."
+
+#. (itstool) path: section/title
+#: C/organize-event.page:37
+msgid "Creating and merging events"
+msgstr "Notikumu izveidošana un apvienošana"
+
+#. (itstool) path: section/p
+#: C/organize-event.page:38
+msgid ""
+"To create a new event, select the photos you would like in the new event and "
+"click <guiseq><gui>Events</gui><gui>New Event</gui></guiseq>."
+msgstr ""
+"Lai izveidotu jaunu notikumu, izvēlieties fotogrāfijas, ko redzēt jaunajā "
+"notikumā un spiediet <guiseq><gui>Notikumi</gui><gui>Jauni notikumi</gui></"
+"guiseq>."
+
+#. (itstool) path: section/p
+#: C/organize-event.page:39
+msgid ""
+"To merge events, select <guiseq><gui>Events</gui></guiseq> from the sidebar, "
+"then, while holding down <key>Ctrl</key> click on the events you want to "
+"merge in the main window area. Finally, click <guiseq><gui>Events</"
+"gui><gui>Merge Events</gui></guiseq>."
+msgstr ""
+"Lai apvienotu notikumus, izvēlieties <guiseq><gui>Notikumi</gui></guiseq> "
+"sānu joslā, tad, turot piespiestu <key>Ctrl</key>, spiediet uz notikumiem, "
+"kurus vēlaties apvienot galvenā loga laukumā. Visbeidzot, spiediet "
+"<guiseq><gui>Notikumi</gui><gui>Apvienot notikumus</gui></guiseq>."
+
+#. (itstool) path: section/title
+#: C/organize-event.page:43
+msgid "Sorting events"
+msgstr "Notikumu kārtošana"
+
+#. (itstool) path: section/p
+#: C/organize-event.page:45
+msgid ""
+"Events are displayed in a tree in the sidebar, organized by the year and "
+"month of the earliest photo in the event. To change the event sort order, "
+"click <guiseq><gui>View</gui><gui>Sort Events</gui></guiseq> and select "
+"either ascending or descending."
+msgstr ""
+"Notikumi tiek attēloti sānu joslas kokā, organizēti pa notikumiem, pēc "
+"vecākās fotogrāfijas datuma un mēneša. Lai mainītu notikumu kārtošanas "
+"secību, spiediet <guiseq><gui>Skats</gui><gui>Kārtot notikumus</gui></"
+"guiseq> un izvēlieties kārtot vai nu augoši, vai dilstoši."
+
+#. (itstool) path: section/title
+#: C/organize-event.page:51
+msgid "Change the photo used to represent each event"
+msgstr "Mainīt fotogrāfiju, kas reprezentē katru notikumu"
+
+#. (itstool) path: section/p
+#: C/organize-event.page:53
+msgid ""
+"If you select the <gui>Events</gui> item in the sidebar, you'll see a single "
+"photo which represents each event. This is called the key photo."
+msgstr ""
+"Ja sānu joslā izvēlieties vienumu <gui>notikumi</gui>, redzēsiet vienu "
+"fotogrāfiju, kas reprezentē katru notikumu. To dēvē par atslēgas fotogrāfiju."
+
+#. (itstool) path: section/p
+#: C/organize-event.page:55
+msgid ""
+"By default, Shotwell uses the first photo in each event as its key photo. To "
+"use a different key photo, select the photo and choose <guiseq><gui>Photos</"
+"gui><gui>Make Key Photo for Event</gui></guiseq>."
+msgstr ""
+"Pēc noklusējuma, Shotwell izmanto pirmo fotogrāfiju kā atslēgas fotogrāfiju. "
+"Lai izmantotu citu atslēgas fotogrāfiju, izvēlieties vēlamo fotogrāfiju uz "
+"spiediet <guiseq><gui>Fotogrāfijas</gui><gui>Izvēlēties kā atslēgas "
+"fotogrāfiju notikumam</gui></guiseq>."
+
+#. (itstool) path: info/desc
+#: C/organize-flag.page:7
+msgid "Flag photos to mark them as special or to work with them as a set."
+msgstr ""
+"Atzīmēt fotogrāfijas, lai marķētu tās kā īpašas vai darbotos ar tām kā ar "
+"kopu."
+
+#. (itstool) path: page/title
+#: C/organize-flag.page:12
+msgid "Flagging photos"
+msgstr "Fotogrāfiju marķēšana"
+
+#. (itstool) path: page/p
+#: C/organize-flag.page:14
+msgid ""
+"Shotwell lets you <em>flag</em> photos. When a photo is flagged, a small "
+"flag icon appears in its upper right corner. You can select the "
+"<gui>Flagged</gui> item in the sidebar to see all photos which have been "
+"flagged."
+msgstr ""
+"Shotwell jums ļauj <em>marķēt</em> fotogrāfijas. Kad fotogrāfija ir marķēta, "
+"tas augšējā labajā stūrī parādās maza karodziņa ikona. Jūs varat izvēlēties "
+"vienumu <gui>Ar karodziņu</gui> sānu joslā, lai redzētu visus marķētos "
+"vienumus."
+
+#. (itstool) path: page/p
+#: C/organize-flag.page:18
+msgid ""
+"Flagging a photo marks it as special. You can interpret this in any way you "
+"like. For example, you might flag all photos which need visual adjustment, "
+"or all photos which you want to share with a friend."
+msgstr ""
+"Fotogrāfiju marķēšana atzīmē tās kā īpašas. Jūs to varat interpretēt kā vien "
+"vēlaties. Piemēram, varat ar karodziņu atzīmēt visas fotogrāfijas, kurām "
+"jāveic vizuāla pielabošanas, vai visas fotogrāfijas, ar kurām vēlaties "
+"dalīties ar draugu."
+
+#. (itstool) path: page/p
+#: C/organize-flag.page:22
+msgid ""
+"Flagging is also useful because you can operate on all flagged photos as a "
+"set. For example, you can select the <gui>Flagged</gui> view and then upload "
+"all flagged photos to a publishing service."
+msgstr ""
+"Marķēšana ir arī noderīga, jo varat darboties ar visām marķētajām "
+"fotogrāfijām kā ar vienu kopumu. Piemēram, varat izvēlēties <gui>Ar "
+"karodziņu</gui> skatu un augšupielādēt visas marķētās fotogrāfijas uz "
+"publicēšanas pakalpojumu."
+
+#. (itstool) path: section/title
+#: C/organize-flag.page:27
+msgid "To flag or unflag a photo"
+msgstr "Lai marķētu vai noņemtu marķējumu no fotogrāfijas"
+
+#. (itstool) path: section/p
+#: C/organize-flag.page:28
+msgid ""
+"To flag or unflag a photo, right-click the photo and choose <gui>Flag</gui> "
+"or <gui>Unflag</gui> from the context menu. Or use the <keyseq><key>Ctrl</"
+"key><key>G</key></keyseq> or <key>/</key> shortcut keys."
+msgstr ""
+"Lai marķētu vai noņemtu marķējumu no fotogrāfijas, spiediet peles labo pogu "
+"uz fotogrāfijas, izvēlieties <gui>Marķēt</gui> vai <gui>Noņemt marķējumu</"
+"gui> konteksta izvēlnē. Vai lietojat tastatūras saīsnes <keyseq><key>Ctrl</"
+"key><key>G</key></keyseq> vai <key>/</key>."
+
+#. (itstool) path: info/desc
+#: C/organize-rating.page:7
+msgid ""
+"Give photos a rating between 1 and 5 stars. You can reject bad photos, "
+"hiding them from view."
+msgstr ""
+"Vērtējiet fotogrāfijas skalā no 1 līdz 5 zvaigznes. Jūs varat noraidīt "
+"sliktās fotogrāfijas, slēpjot tās no skata."
+
+#. (itstool) path: page/title
+#: C/organize-rating.page:12
+msgid "Ratings"
+msgstr "Vērtējumi"
+
+#. (itstool) path: page/p
+#: C/organize-rating.page:13
+msgid ""
+"You can assign each photo a rating from 1-5 stars, or may alternatively rate "
+"it as Rejected, in which case Shotwell will hide the photo by default."
+msgstr ""
+"Jūs varat katrai fotogrāfijai piešķirt vērtējumu no 1 līdz 5 zvaigznēm, vai "
+"arī tās noraidīt, kas pēc noklusējuma šīs bildes paslēps."
+
+#. (itstool) path: page/p
+#: C/organize-rating.page:15
+msgid "You can rate a photo or a set of photos in any of these ways:"
+msgstr "Jūs varat novērtēt fotogrāfiju vai to kopumu šādos veidos:"
+
+#. (itstool) path: item/p
+#: C/organize-rating.page:18
+msgid ""
+"Select the photo(s), then choose a rating from the top-level "
+"<guiseq><gui>Photos</gui><gui>Set Rating</gui></guiseq> menu."
+msgstr ""
+"Izvēlieties fotogrāfiju(-as), tad izvēlieties vērtējumu no "
+"izvēlnes<guiseq><gui>Fotogrāfijas</gui><gui>Iestatīt vērtējumu</gui></"
+"guiseq>."
+
+#. (itstool) path: item/p
+#: C/organize-rating.page:19
+msgid ""
+"Right-click on the photo(s), then choose a rating from the Set Rating "
+"context menu."
+msgstr ""
+"Spiediet labo peles pogu uz fotogrāfijas(-ām) un izvēlieties vērtējumu no "
+"“Iestatīt vērtējumu” konteksta izvēlnes."
+
+#. (itstool) path: item/p
+#: C/organize-rating.page:20
+msgid ""
+"Select the photo(s), then press any of the shortcut keys <key>1</key>, "
+"<key>2</key>, <key>3</key>, <key>4</key> or <key>5</key> to assign a rating. "
+"Or press <key>9</key> to mark the photo(s) as rejected or <key>0</key> to "
+"clear the rating(s)."
+msgstr ""
+"Izvēlieties fotogrāfiju(-as), tad spiediet kādu no saīsnes taustiņiem "
+"<key>1</key>, <key>2</key>, <key>3</key>, <key>4</key> vai <key>5</key>, lai "
+"piešķirtu vērtējumu. Vai spiediet <key>9</key>, lai atzīmētu fotogrāfiju kā "
+"noraidītu, vai <key>0</key>, lai noņemtu vērtējumu."
+
+#. (itstool) path: page/p
+#: C/organize-rating.page:23
+msgid ""
+"Normally Shotwell displays all photos except rejected photos. You can set a "
+"different rating filter using the <guiseq><gui>View</gui><gui>Filter Photos</"
+"gui></guiseq> menu - for example, you can display only photos rated with 3 "
+"stars or higher, or you can display all photos including those marked "
+"rejected. The Shotwell icon on the toolbar displays the current rating "
+"filter and can also be used to set the filter."
+msgstr ""
+"Parasti Shotwell attēlo visas fotogrāfijas, izņemot noraidītās. Jūs varat "
+"iestatīt citu vērtējumu filtru, piemēram, izmantojot <guiseq><gui>Skats</"
+"gui><gui>Filtrēt attēlus</gui></guiseq> izvēlni, jūs varat rādīt tikai "
+"attēlus ar vismaz 3 zvaigznēm vērtējumā, vai rādīt visas noraidītās "
+"fotogrāfijas. Shotwell ikona rīkjoslā attēlo aktuālo filtru un to var "
+"izmantot filtru iestatīšanai."
+
+#. (itstool) path: page/p
+#: C/organize-rating.page:26
+msgid ""
+"Shotwell normally displays each photo's rating in its lower left-hand "
+"corner. You can turn off the display of ratings using the <guiseq><gui>View</"
+"gui><gui>Ratings</gui></guiseq> menu item."
+msgstr ""
+"Shotwell parasti attēlo katras fotogrāfijas vērtējumu tās apakšējā kreisajā "
+"stūrī. Jūs varat izslēgt vērtējumu attēlošanu, izmantojot "
+"<guiseq><gui>Skats</gui><gui>Vērtējumi</gui></guiseq> izvēlni."
+
+#. (itstool) path: page/p
+#: C/organize-rating.page:28
+msgid ""
+"You can increase or decrease a photo's rating using the <guiseq><gui>Set "
+"Rating</gui><gui>Increase</gui></guiseq> and <guiseq><gui>Set Rating</"
+"gui><gui>Decrease</gui></guiseq> commands, or the keyboard shortcuts "
+"<key>&lt;</key> and <key>&gt;</key>."
+msgstr ""
+"Jūs varat palielināt vai samazināt fotogrāfijas vērtējumu, izmantojot "
+"komandas <guiseq><gui>Iestatīt vērtējumu</gui><gui>Palielināt</gui></guiseq> "
+"un <guiseq><gui>Iestatīt vērtējumu</gui><gui>samazināt</gui></guiseq>, vai "
+"ar tastatūras saīsnēm <key>&lt;</key> un <key>&gt;</key>."
+
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/organize-remove.page:15
+msgctxt "_"
+msgid ""
+"external ref='figures/trash_process.png' "
+"md5='ed596bda34c2f4a79a310fbc8bb51fd2'"
+msgstr "> Tulkots"
+
+#. (itstool) path: info/desc
+#: C/organize-remove.page:7
+msgid ""
+"Remove photos from the library, or delete them from your computer entirely."
+msgstr "Izņemt fotogrāfijas no bibliotēkas vai pavisam izdzēst tās no datora."
+
+#. (itstool) path: page/title
+#: C/organize-remove.page:12
+msgid "Removing and deleting photos"
+msgstr "Fotogrāfiju izņemšana un dzēšana"
+
+#. (itstool) path: page/p
+#: C/organize-remove.page:14
+msgid ""
+"You may remove photos from your library and you may additionally delete them "
+"entirely from your hard disk."
+msgstr ""
+"Jūs varat izņemt fotogrāfijas ārā no savas bibliotēkas un jūs varat tās "
+"pavisam izdzēst ārā no cietā diska."
+
+#. (itstool) path: page/media
+#: C/organize-remove.page:15
+msgid "Delete process"
+msgstr "Dzēšanas process"
+
+#. (itstool) path: page/p
+#: C/organize-remove.page:16
+msgid ""
+"This diagram shows how a photo, when deleted, is first put into Shotwell's "
+"trash. If you delete it from Shotwell's trash, it is put into your "
+"computer's trash. If you delete it from your computer's trash the photo is "
+"finally and irretrievably deleted from your computer."
+msgstr ""
+"Šī diagramma rāda, kā dzēstā fotogrāfija vispirms tiek ievietota Shotwell "
+"miskastē. Ja izdzēsīsiet to ārā no Shotwell miskastes, tā tiks ievietota "
+"datora miskastē. Ja izdzēsīsiet to ārā no tās, fotogrāfija tiks "
+"neatgriezeniski izdzēsta no datora."
+
+#. (itstool) path: section/title
+#: C/organize-remove.page:18
+msgid "Removing photos from the library"
+msgstr "Fotogrāfiju izņemšana no bibliotēkas"
+
+#. (itstool) path: section/p
+#: C/organize-remove.page:19
+msgid ""
+"Select the photos to remove and choose <guiseq><gui>Edit</gui><gui>Move to "
+"Trash</gui></guiseq>. (You can also press the <key>Delete</key> key.) The "
+"photos will be moved from your library to Shotwell's Trash."
+msgstr ""
+"Izvēlieties fotogrāfijas, kuras izņemt, izvēlieties <guiseq><gui>Rediģēt</"
+"gui><gui>Pārvietot uz miskasti</gui></guiseq>. (Jūs varat arī spiest "
+"taustiņu <key>Dzēst</key>.) Fotogrāfijas tiks pārvietotas no jūsu "
+"bibliotēkas uz Shotwell's miskasti."
+
+#. (itstool) path: section/p
+#: C/organize-remove.page:22
+msgid ""
+"If you want to remove photos from Shotwell without having them pass through "
+"the trash, simply select the photos to be removed and choose "
+"<guiseq><gui>Edit</gui><gui>Remove From Library</gui></guiseq>. The photo "
+"files will be left in place on disk."
+msgstr ""
+"Ja vēlaties izņemt fotogrāfijas no Shotwell, neizmetot tās miskastē, "
+"izvēlieties izņemamās fotogrāfijas un izvēlieties <guiseq><gui>Rediģēt</"
+"gui><gui>Izņemt no bibliotēkas</gui></guiseq>. Fotogrāfiju datnes paliks uz "
+"diska."
+
+#. (itstool) path: section/title
+#: C/organize-remove.page:26
+msgid "Emptying or restoring the trash folder"
+msgstr "Miskastes mapes iztukšošana vai atjaunošana"
+
+#. (itstool) path: section/p
+#: C/organize-remove.page:27
+msgid ""
+"Select the Trash entry in the Sidebar and Shotwell will display all photos "
+"that have been marked for removal or deletion. In the Trash view, the "
+"following commands are available:"
+msgstr ""
+"Izvēlieties miskastes ierakstu sānu joslā un Shotwell parādīs visas "
+"fotogrāfijas, kas ir atzīmētas kā izņemamas vai dzēšamas. Miskastes skatā ir "
+"pieejamas šādas komandas:"
+
+#. (itstool) path: item/title
+#: C/organize-remove.page:29
+msgid "Delete"
+msgstr "Dzēst"
+
+#. (itstool) path: item/p
+#: C/organize-remove.page:29
+msgid "Delete the selected photos from the trash folder."
+msgstr "Dzēst izvēlētās fotogrāfijas no miskastes mapes."
+
+#. (itstool) path: item/title
+#: C/organize-remove.page:30
+msgid "Restore"
+msgstr "Atjaunot"
+
+#. (itstool) path: item/p
+#: C/organize-remove.page:30
+msgid "Restore the selected photos into Shotwell."
+msgstr "Atjaunot izvēlētās fotogrāfijas uz Shotwell."
+
+#. (itstool) path: item/title
+#: C/organize-remove.page:31
+msgid "Empty trash"
+msgstr "Iztukšot miskasti"
+
+#. (itstool) path: item/p
+#: C/organize-remove.page:31
+msgid "Delete all photos from the trash folder."
+msgstr "Dzēst visas fotogrāfijas no miskastes mapes."
+
+#. (itstool) path: section/title
+#: C/organize-remove.page:36
+msgid "Deleting or emptying Trash"
+msgstr "Dzēšana vai miskastes iztukšošana"
+
+#. (itstool) path: section/p
+#: C/organize-remove.page:37
+msgid ""
+"When you delete files from the Trash folder or empty the Trash folder, you "
+"will be given the following choices:"
+msgstr ""
+"Kad dzēšat datnes no miskastes mapes, vai arī iztīrāt miskastes mapi, jums "
+"tiks dotas šādas izvēles:"
+
+#. (itstool) path: item/title
+#: C/organize-remove.page:39
+msgid "Only Remove"
+msgstr "Tikai izņemt"
+
+#. (itstool) path: item/p
+#: C/organize-remove.page:39
+msgid ""
+"Remove photos from the library but leave the photos in their location on the "
+"computer."
+msgstr ""
+"Fotogrāfiju izņemšana no bibliotēkas, bet uz datora atstāt fotogrāfijas "
+"turpat, kur tās bija."
+
+#. (itstool) path: item/title
+#: C/organize-remove.page:40
+msgid "Trash file"
+msgstr "Izmest datni"
+
+#. (itstool) path: item/p
+#: C/organize-remove.page:40
+msgid "Remove photos from the library and delete them from the computer."
+msgstr "Izņemt fotogrāfijas no bibliotēkas un izdzēst tās no datora."
+
+#. (itstool) path: item/title
+#: C/organize-remove.page:41
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. (itstool) path: item/p
+#: C/organize-remove.page:41
+msgid "Do nothing."
+msgstr "Nedarīt neko."
+
+#. (itstool) path: info/desc
+#: C/organize-search.page:7
+msgid "Find photos and videos in your collection by a variety of criteria."
+msgstr "Savā kolekcijā meklēt fotogrāfijas un video pēc dažādiem kritērijiem."
+
+#. (itstool) path: page/title
+#: C/organize-search.page:12
+msgid "Searching"
+msgstr "Meklēšana"
+
+#. (itstool) path: page/p
+#: C/organize-search.page:14
+msgid ""
+"There are two ways to search in Shotwell: the filter toolbar, and with a "
+"saved search. The search bar allows you to quickly search the current view "
+"for certain criteria. Saved Searches feature more complex search criteria "
+"and persist in the sidebar between sessions."
+msgstr ""
+"Shotwell var veikt divu veidu meklēšanu: ar filtru rīkjoslā un ar saglabātu "
+"meklēšanu. Meklēšanas josla jums ļauj ātri meklēt dotajā skatā pēc "
+"noteiktiem kritērijiem. Saglabātās meklēšanas sniedz kompleksākus meklēšanas "
+"kritērijus un paliek sānu joslā starp sesijām."
+
+#. (itstool) path: section/title
+#: C/organize-search.page:21
+msgid "Search bar"
+msgstr "Meklēšanas josla"
+
+#. (itstool) path: section/p
+#: C/organize-search.page:22
+msgid ""
+"The <guiseq><gui>View</gui><gui>Search Bar</gui></guiseq> checkbox toggles "
+"the display of the search bar. You can also hit <keyseq><key>Ctrl</"
+"key><key>F</key></keyseq> or <key>F8</key> to bring up the search bar. From "
+"this bar, you can find, show and hide photos and videos based on title, tag, "
+"rating or other options."
+msgstr ""
+"<guiseq><gui>Skats</gui><gui>Meklēšanas josla</gui></guiseq> izvēles rūtiņa "
+"pārslēdz meklēšanas joslas attēlošanu. Jūs varat arī spiest "
+"<keyseq><key>Ctrl</key><key>F</key></keyseq> vai <key>F8</key>, lai parādītu "
+"meklēšanas joslu. Šajā joslā jūs varat meklēt, attēlot un slēpt fotogrāfijas "
+"un video pēc to nosaukumiem, tagiem, vērtējumiem un citām opcijām."
+
+#. (itstool) path: section/p
+#: C/organize-search.page:29
+msgid ""
+"To begin searching, simply enter a search keyword in the text box, or click "
+"on <gui>Flagged</gui>, <gui>Rating</gui> or <gui>Type</gui>. The text search "
+"matches your keywords across tag names, photo or video titles and photos' "
+"original filenames. The <gui>Flagged</gui>, <gui>Rating</gui> and <gui>Type</"
+"gui> buttons allow you to filter your collection by whether photos are "
+"flagged, their current number of stars, and whether the items shown are "
+"images, videos, or raw camera files, respectively."
+msgstr ""
+"Lai sāktu meklēšanu, ievadiet meklēšanas atslēgvārdus teksta laukā, vai "
+"spiediet <gui>Ar karodziņu</gui>, <gui>Vērtējums</gui> vai <gui>Tips</gui>. "
+"Teksta meklēšana salīdzinās jūsu atslēgvārdus ar tagu nosaukumiem, "
+"fotogrāfiju vai video nosaukumiem un fotogrāfiju datņu nosaukumiem. Pogas "
+"<gui>Ar karodziņu</gui>, <gui>Vērtējums</gui> and <gui>Tips</gui> jums "
+"attiecīgi ļauj filtrēt savu kolekciju pēc to marķējuma, zvaigznēm vērtējumā "
+"un pēc tā, vai vienumā ir attēli, video vai kameras jēlās datnes."
+
+#. (itstool) path: section/p
+#: C/organize-search.page:38
+msgid ""
+"Disabling the search bar or exiting Shotwell automatically resets the search "
+"bar."
+msgstr ""
+"Meklēšanas joslas izslēgšana un Shotwell aizvēršana automātiski atstata "
+"meklēšanas joslu."
+
+#. (itstool) path: section/title
+#: C/organize-search.page:44
+msgid "Saved search"
+msgstr "Saglabātie meklējumi"
+
+#. (itstool) path: section/p
+#: C/organize-search.page:45
+msgid ""
+"A saved search persists across Shotwell sessions, and is updated as photos "
+"and videos are added and removed from your Shotwell library."
+msgstr ""
+"Paplašinātā meklēšana saglabājas starp Shotwell sesijām un tiek atjaunināta, "
+"kad fotogrāfijas un video tiek pievienotas vai izņemtas no Shotwell "
+"bibliotēkas."
+
+#. (itstool) path: section/p
+#: C/organize-search.page:50
+msgid ""
+"Create a new saved search with <guiseq><gui>Edit</gui><gui>New Saved "
+"Search...</gui></guiseq> or by hitting <keyseq><key>Ctrl</key><key>S</key></"
+"keyseq>. The dialog box allows you to enter a name for the search and select "
+"whether you want to meet Any, All, or None of the criteria in the following "
+"rows."
+msgstr ""
+"Izveido saglabāto meklēšanu ar <guiseq><gui>Rediģēt</gui><gui>Jauna "
+"saglabātā meklēšana...</gui></guiseq> vai spiežot <keyseq><key>Ctrl</"
+"key><key>S</key></keyseq>. Dialoglodziņš jums ļauj ievadīt meklējuma "
+"nosaukuu un izvēlēties, vai sekojošajās rindās jāizpildās Kādam, Visiem vai "
+"Nevienam kritērijam."
+
+#. (itstool) path: section/p
+#: C/organize-search.page:56
+msgid ""
+"Each row represents a search criterion. Use the <gui>+</gui> button to add "
+"more rows, and the <gui>-</gui> button to remove a specific row. The combo "
+"box on the left of each row selects the type of criteria. Criteria must be "
+"entered correctly before the <gui>OK</gui> button becomes available."
+msgstr ""
+"Katra rinda apzīmē meklēšanas kritēriju. Izmantojiet pogu <gui>+</gui>, lai "
+"pievienotu vairāk rindu, un pogu <gui>-</gui>, lai izņemtu attiecīgo rindu. "
+"Kombinētais lodziņš katras rindas kreisajā pusē izvēlas kritērija veidu. "
+"Kritērijam ir jābūt pareizi ievadītām, pirms kļūst pieejama poga <gui>Labi</"
+"gui>."
+
+#. (itstool) path: info/desc
+#: C/organize-tag.page:7
+msgid "Organize photos by labelling them."
+msgstr "Organizēt fotogrāfijas, piešķirot tām etiķetes."
+
+#. (itstool) path: page/title
+#: C/organize-tag.page:14
+msgid "Tagging photos"
+msgstr "Fotogrāfiju tagošana"
+
+#. (itstool) path: page/p
+#: C/organize-tag.page:16
+msgid ""
+"You can assign one or more tags to selected photos. A tag can be one or more "
+"words that you want to associate with those photos."
+msgstr ""
+"Jūs varat izvēlētajām fotogrāfijām piešķirt vienu vai vairākus tagus. Tags "
+"var būt viens vai vairāki vārdi, kurus varat saistīt ar šīm fotogrāfijām."
+
+#. (itstool) path: page/p
+#: C/organize-tag.page:22
+msgid ""
+"To add new tags to photos, select the photos you would like to tag, then do "
+"any of the following:"
+msgstr ""
+"Lai pievienotu jaunu tagu fotogrāfijām, izvēlieties attiecīgās fotogrāfijas "
+"un veiciet vienu no šīm darbībām:"
+
+#. (itstool) path: item/p
+#: C/organize-tag.page:28
+msgid "Choose <guiseq><gui>Tags</gui><gui>Add Tags...</gui></guiseq>."
+msgstr ""
+"Izvēlieties <guiseq><gui>Tagi</gui><gui>Pievienot tagus...</gui></guiseq>."
+
+#. (itstool) path: item/p
+#: C/organize-tag.page:29
+msgid "Type <keyseq><key>Ctrl</key><key>T</key></keyseq>."
+msgstr "Spiediet <keyseq><key>Ctrl</key><key>T</key></keyseq>."
+
+#. (itstool) path: item/p
+#: C/organize-tag.page:30
+msgid "Drag the selected photos and drop them on the desired tag."
+msgstr "Velciet un nometiet izvēlētās fotogrāfijas uz vēlamā taga."
+
+#. (itstool) path: page/p
+#: C/organize-tag.page:33
+msgid ""
+"When you use <keyseq><key>Ctrl</key><key>T</key></keyseq> or "
+"<guiseq><gui>Tags</gui><gui>Add Tags...</gui></guiseq> you can type in the "
+"names of one or more tags, separated by commas. Once you have created a tag, "
+"you can rename it by selecting that tag in the sidebar and choosing "
+"<guiseq><gui>Tags</gui><gui>Rename Tag \"[name]\"...</gui></guiseq>, by "
+"rightclicking on it and choose <gui>Rename...</gui> or double-click on the "
+"tag in the sidebar."
+msgstr ""
+"Ja izmantojat <keyseq><key>Ctrl</key><key>T</key></keyseq> vai "
+"<guiseq><gui>Tagi</gui><gui>Pievienot tagus...</gui></guiseq>, varat "
+"ierakstīt vienu vai vairāku tagu nosaukumus, atdalot tos ar komatiem. Kad "
+"tags ir izveidots, varat to pārdēvēt, izvēloties to tagu sānu joslā un "
+"izvēloties <guiseq><gui>Tagi</ui><gui>Pārdēvēt tagu \"[nosaukums]\"...</"
+"gui></guiseq>, veicot labo klikšķi un izvēloties <gui>Pārdēvēt...</gui> vai "
+"dubultklikšķinot tagu sānu joslā."
+
+#. (itstool) path: page/p
+#: C/organize-tag.page:44
+msgid ""
+"To change which tags are associated with a particular photo, select that "
+"photo, choose <guiseq><gui>Tags</gui><gui>Modify Tags...</gui></guiseq> or "
+"right-click on a photo and select <gui>Modify Tags...</gui> and edit the "
+"comma separated list. To remove a tag from one or more photos, first select "
+"that tag in the sidebar, then select the photos you would like to remove, "
+"and choose <guiseq><gui>Tags</gui><gui>Remove Tag \"[name]\" from Photos</"
+"gui></guiseq> or right-click on the photos an select <gui>Remove Tag "
+"\"[name]\" from Photos</gui>."
+msgstr ""
+"Lai mainītu, kuri tagi ir saistīti ar kurām fotogrāfijām, izvēlieties "
+"attiecīgo fotogrāfiju , izvēlieties <guiseq><gui>Tagi</gui><gui>Modificēt "
+"tagus...</gui></guiseq> vai spiediet labo peles pogu uz fotogrāfijas un "
+"izvēlieties <gui>Modificēt tagus...</gui> un rediģējiet ar komatiem atdalīto "
+"sarakstu. Lai izņemtu tagu no vienas vai vairākām fotogrāfijām, vispirms "
+"izvēlieties attiecīgo tagu sānu joslā, tad izvēlieties fotogrāfijas, ko "
+"vēlaties izņemt un izvēlieties <guiseq><gui>Tagi</gui><gui>Izņemt tagu "
+"\"[nosaukums]\" no fotogrāfijām</gui></guiseq> vai spiediet labo peles pogu "
+"uz fotogrāfijām un izvēlieties <gui>Izņemt tagu \"[nosaukums]\" no "
+"fotogrāfijām</gui>."
+
+#. (itstool) path: page/p
+#: C/organize-tag.page:58
+msgid ""
+"To delete a tag entirely, select that tag in the sidebar and choose "
+"<guiseq><gui>Tags</gui><gui>Delete Tag \"[name]\"</gui></guiseq> or by right-"
+"click and select <gui>Delete Tag \"[name]\"</gui>."
+msgstr ""
+"Lai pavisam izdzēstu tagu, izvēlieties to tagu sānu joslā un izvēlieties "
+"<guiseq><gui>Tagi</gui><gui>Dzēst tagu \"[nosaukums]\"</gui></guiseq> vai "
+"spiediet labo peles pogu un izvēlieties <gui>Dzēst tagu \"[nosaukums]\"</"
+"gui>."
+
+#. (itstool) path: page/p
+#: C/organize-tag.page:64
+msgid ""
+"When you create a tag, it will appear in the sidebar under the <gui>Tags</"
+"gui> item, which is hidden if there are no tags. Photos can have multiple "
+"tags attached to them, and when you click on the name of a given tag in the "
+"sidebar, you will see all the photos associated with that tag."
+msgstr ""
+"Izveidojot tagu, tas parādīsies sānu joslā sadaļā <gui>Tagi</gui>, kas ir "
+"slēpts, ja nav neviena taga. Fotogrāfijām var būt piesaistīti vairāki tagi. "
+"Sānu joslā, uzspiežot uz taga, redzēsiet visas fotogrāfijas, kurām ir šis "
+"tags."
+
+#. (itstool) path: section/title
+#: C/organize-tag.page:73
+msgid "Hierarchical Tags"
+msgstr "Hierarhiskie tagi"
+
+#. (itstool) path: section/p
+#: C/organize-tag.page:74
+msgid ""
+"Shotwell supports also hierarchial tags. You can rearrange your tags by drag "
+"and drop a tag onto another. To create a new subtag right-click on a tag and "
+"select <gui>New</gui>."
+msgstr ""
+"Shotwell atbalsta hierarhiskos tagus. Jūs varat pārkārtot tagus, velkot un "
+"nometot tos vienu otrā. Lai izveidotu jaunu apakštagu, spiediet labo peles "
+"pogu uz taga un izvēlieties <gui>Jauns</gui>."
+
+#. (itstool) path: section/p
+#: C/organize-tag.page:81
+msgid ""
+"Hierarchial tags can help you to sort your tag list in ways that better "
+"match how you work or think; for example, you can store location tags like "
+"\"Mountains\" or \"Beach\" under a parent tag \"Places\", which itself can "
+"be placed under the tag \"Summer Holidays\"."
+msgstr ""
+"Hierarhiskie tagi jums palīdz kārtot tagu sarakstu tuvāk jūsu domāšanas "
+"veidam; piemēram, jūs varat saglabāt vietu tagus “Kalni” vai “Pludmale” zem "
+"taga “Vietas”, kas var būt zem taga “Vasaras brīvdienas”."
+
+#. (itstool) path: section/p
+#: C/organize-tag.page:89
+msgid "Note that deleting a parent tag will also delete its child tags."
+msgstr "Ņemiet vērā, ka virstaga dzēšana dzēsīs arī tā apakštagus."
+
+#. (itstool) path: info/desc
+#: C/organize-title.page:7
+msgid "Give titles to your photos."
+msgstr "Dodiet nosaukumus savām fotogrāfijām."
+
+#. (itstool) path: page/title
+#: C/organize-title.page:12
+msgid "Titles"
+msgstr "Nosaukumi"
+
+#. (itstool) path: page/p
+#: C/organize-title.page:14
+msgid ""
+"The <guiseq><gui>View</gui><gui>Titles</gui></guiseq> checkbox toggles the "
+"display of titles beneath each photo. By default, a photo's title is its "
+"filename."
+msgstr ""
+"<guiseq><gui>Skats</gui><gui>Nosaukumi</gui></guiseq> izvēles rūtiņa "
+"pārslēdz nosaukumu rādīšanu zem katras fotogrāfijas. Pēc noklusējuma, "
+"fotogrāfijas nosaukums ir tās datnes nosaukums."
+
+#. (itstool) path: page/p
+#: C/organize-title.page:17
+msgid ""
+"To change a photo's title, select the photo and click <guiseq><gui>Photos</"
+"gui><gui>Edit Title...</gui></guiseq>, or press <key>F2</key>."
+msgstr ""
+"Lai mainītu fotogrāfijas nosaukumu, izvēlieties fotogrāfiju un spiediet "
+"<guiseq><gui>Fotogrāfijas</gui><gui>Rediģēt nosaukumu...</gui></guiseq>, vai "
+"spiediet <key>F2</key>."
+
+#. (itstool) path: info/desc
+#: C/other-files.page:7
+msgid "Keep the Shotwell library in sync with photo files on disk."
+msgstr "Saglabāt Shotwell bibliotēku sinhronu ar datnēm diskā."
+
+#. (itstool) path: page/title
+#: C/other-files.page:12
+msgid "Photo files"
+msgstr "Fotogrāfiju datnes"
+
+#. (itstool) path: page/p
+#: C/other-files.page:14
+msgid ""
+"Every photo in the Shotwell library corresponds to a file stored on your "
+"hard disk. Shotwell has several features which help you keep the Shotwell "
+"library and files on disk in sync."
+msgstr ""
+"Katra fotogrāfija Shotwell bibliotēkā atbilst datnei jūsu cietajā diskā. "
+"Shotwell ir vairākas iespējas, kas palīdz saglabāt sinhroni Shotwell "
+"bibliotēku un datnes diskā."
+
+#. (itstool) path: section/title
+#: C/other-files.page:21
+msgid "Using a custom directory pattern"
+msgstr "Pielāgota direktoriju šablona izmantošana"
+
+#. (itstool) path: section/p
+#: C/other-files.page:22
+msgid ""
+"Shotwell allows you to specify how it names directories in your library. You "
+"can do this by changing the <gui>Directory Structure</gui> and <gui>Pattern</"
+"gui> settings in the <gui>Preferences</gui> dialog. You may use a "
+"preselected pattern, or choose <gui>Custom</gui> and type in your own."
+msgstr ""
+"Shotwell jums ļauj norādīt, kā saglabāt direktorijas jūsu bibliotēkā. Jūs to "
+"varat izdarīt, mainot iestatījumus <gui>Direktoriju struktūra</gui> un "
+"<gui>Šablons</gui> dialoglodziņā <gui>Iestatījumi</gui>. Jūs varat izmantot "
+"iepriekš izveidotus šablonus vai izvēlēties <gui>Pielāgots</gui> un ievadīt "
+"paši savu."
+
+#. (itstool) path: section/p
+#: C/other-files.page:29
+msgid ""
+"The available symbols for the directory pattern begin with a % (percent "
+"sign). The values these symbols produce are locale-dependent, so what you "
+"see on your computer may vary from the examples below."
+msgstr ""
+"Pieejamie simboli direktoriju šablonam sākas ar % (procentu zīme). Vērtības, "
+"ko šie simboli veido, ir atkarīgi no lokalizācijas, tāpēc iegūtie rezultāti "
+"uz jūsu datoriem var atšķirties no piemēriem zemāk."
+
+#. (itstool) path: td/p
+#: C/other-files.page:38
+msgid "<em>Symbol</em>"
+msgstr "<em>Simbols</em>"
+
+#. (itstool) path: td/p
+#: C/other-files.page:38
+msgid "<em>Meaning</em>"
+msgstr "<em>Nozīme</em>"
+
+#. (itstool) path: td/p
+#: C/other-files.page:38
+msgid "<em>Example</em>"
+msgstr "<em>Piemērs</em>"
+
+#. (itstool) path: td/p
+#: C/other-files.page:43
+msgid "%Y"
+msgstr "%Y"
+
+#. (itstool) path: td/p
+#: C/other-files.page:43
+msgid "Year: full"
+msgstr "Gads: pilns"
+
+#. (itstool) path: td/p
+#: C/other-files.page:43
+msgid "2011"
+msgstr "2011"
+
+#. (itstool) path: td/p
+#: C/other-files.page:46
+msgid "%y"
+msgstr "%y"
+
+#. (itstool) path: td/p
+#: C/other-files.page:46
+msgid "Year: two digit"
+msgstr "Gads: divi cipari"
+
+#. (itstool) path: td/p
+#: C/other-files.page:46
+msgid "11"
+msgstr "11"
+
+#. (itstool) path: td/p
+#: C/other-files.page:49
+msgid "%d"
+msgstr "%d"
+
+#. (itstool) path: td/p
+#: C/other-files.page:49
+msgid "Day of the month with leading zero"
+msgstr "Mēneša diena, vienmēr divi cipari"
+
+#. (itstool) path: td/p
+#: C/other-files.page:49
+msgid "03"
+msgstr "03"
+
+#. (itstool) path: td/p
+#: C/other-files.page:52
+msgid "%A"
+msgstr "%A"
+
+#. (itstool) path: td/p
+#: C/other-files.page:52
+msgid "Day name: full"
+msgstr "Dienas nosaukums: pilns"
+
+#. (itstool) path: td/p
+#: C/other-files.page:52
+msgid "Wednesday"
+msgstr "Trešdiena"
+
+#. (itstool) path: td/p
+#: C/other-files.page:55
+msgid "%a"
+msgstr "%a"
+
+#. (itstool) path: td/p
+#: C/other-files.page:55
+msgid "Day name: abbreviated"
+msgstr "Dienas nosaukums: saīsināts"
+
+#. (itstool) path: td/p
+#: C/other-files.page:55
+msgid "Wed"
+msgstr "Tr"
+
+#. (itstool) path: td/p
+#: C/other-files.page:58
+msgid "%m"
+msgstr "%m"
+
+#. (itstool) path: td/p
+#: C/other-files.page:58
+msgid "Month number with leading zero"
+msgstr "Mēneša numurs, vienmēr divi cipari"
+
+#. (itstool) path: td/p
+#: C/other-files.page:58
+msgid "02"
+msgstr "02"
+
+#. (itstool) path: td/p
+#: C/other-files.page:60
+msgid "%b"
+msgstr "%b"
+
+#. (itstool) path: td/p
+#: C/other-files.page:60
+msgid "Month name: abbreviated"
+msgstr "Mēneša nosaukums: saīsināts"
+
+#. (itstool) path: td/p
+#: C/other-files.page:60
+msgid "Feb"
+msgstr "Feb"
+
+#. (itstool) path: td/p
+#: C/other-files.page:62
+msgid "%B"
+msgstr "%B"
+
+#. (itstool) path: td/p
+#: C/other-files.page:62
+msgid "Month name: full"
+msgstr "Mēneša nosaukums: pilns"
+
+#. (itstool) path: td/p
+#: C/other-files.page:62
+msgid "February"
+msgstr "Februāris"
+
+#. (itstool) path: td/p
+#: C/other-files.page:63
+msgid "%I"
+msgstr "%I"
+
+#. (itstool) path: td/p
+#: C/other-files.page:63
+msgid "Hour: 12 hour format"
+msgstr "Stunda: 12 stundu formāts"
+
+#. (itstool) path: td/p
+#: C/other-files.page:63
+msgid "05"
+msgstr "05"
+
+#. (itstool) path: td/p
+#: C/other-files.page:64
+msgid "%H"
+msgstr "%H"
+
+#. (itstool) path: td/p
+#: C/other-files.page:64
+msgid "Hour: 24 hour format"
+msgstr "Stunda: 24 stundu formāts"
+
+#. (itstool) path: td/p
+#: C/other-files.page:64
+msgid "17"
+msgstr "17"
+
+#. (itstool) path: td/p
+#: C/other-files.page:66
+msgid "%M"
+msgstr "%M"
+
+#. (itstool) path: td/p
+#: C/other-files.page:66
+msgid "Minute"
+msgstr "Minūte"
+
+#. (itstool) path: td/p
+#: C/other-files.page:66
+msgid "16"
+msgstr "16"
+
+#. (itstool) path: td/p
+#: C/other-files.page:67
+msgid "%S"
+msgstr "%S"
+
+#. (itstool) path: td/p
+#: C/other-files.page:67
+msgid "Second"
+msgstr "Sekunde"
+
+#. (itstool) path: td/p
+#: C/other-files.page:67
+msgid "30"
+msgstr "30"
+
+#. (itstool) path: td/p
+#: C/other-files.page:68
+msgid "%p"
+msgstr "%p"
+
+#. (itstool) path: td/p
+#: C/other-files.page:68
+msgid "AM or PM"
+msgstr "AM vai PM"
+
+#. (itstool) path: td/p
+#: C/other-files.page:68
+msgid "PM"
+msgstr "PM"
+
+#. (itstool) path: section/p
+#: C/other-files.page:72
+msgid ""
+"There are other symbols available; please check the manual for strftime by "
+"running the command <cmd>man strftime</cmd> if you need one that isn't "
+"listed here."
+msgstr ""
+"Ir pieejami vēl vairāki simboli; skatiet strftime rokasgrāmatu, izpildot "
+"komandu <cmd>man strftime</cmd>, ja ir vajadzīgs simbols, kas nav šeit "
+"sarakstā."
+
+#. (itstool) path: section/title
+#: C/other-files.page:79
+msgid "Automatically importing photos"
+msgstr "Automātiskā fotogrāfiju importēšana"
+
+#. (itstool) path: section/p
+#: C/other-files.page:81
+msgid ""
+"Shotwell can automatically import new photos which appear in the library "
+"directory. (The library directory is usually the <file>Pictures</file> "
+"directory in your home directory; you can change its location in in the "
+"<gui>Preferences</gui> window.)"
+msgstr ""
+"Shotwell var automātiski importēt jaunās fotogrāfijas, kas parādās "
+"bibliotēkas direktorijā. Bibliotēkas direktorija parasti ir <file>Attēli</"
+"file> direktorija mājas mapē; jūs varat mainīt tās atrašanās vietu logā "
+"<gui>Iestatījumi</gui>."
+
+#. (itstool) path: section/p
+#: C/other-files.page:86
+msgid ""
+"To enable auto-import, check the box <gui>Watch library directory for new "
+"files</gui> in the <gui>Preferences</gui> window."
+msgstr ""
+"Lai ieslēgtu automātisko importēšanu, ieķeksējiet lodziņu <gui>Sekot līdzi "
+"jaunām datnēm manā bibliotēkā</gui> logā <gui>Iestatījumi</gui>."
+
+#. (itstool) path: note/p
+#: C/other-files.page:90
+msgid ""
+"Shotwell can also follow symbolic links inside automatically-imported "
+"directories."
+msgstr ""
+"Shotwell var arī sekot simboliskajām saitēm automātiski importētajās "
+"direktorijās."
+
+#. (itstool) path: section/title
+#: C/other-files.page:95
+msgid "Automatically renaming imported photos to lowercase"
+msgstr "Automātiskā importēto fotogrāfiju pārdēvēšana uz mazo burtu reģistru"
+
+#. (itstool) path: section/p
+#: C/other-files.page:97
+msgid ""
+"Shotwell can automatically change the filenames of imported photos to "
+"lowercase. To enable this, choose <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui></guiseq>, and in the <gui>Preferences</gui> window, check the "
+"<gui>Rename imported files to lowercase</gui> box."
+msgstr ""
+"Shotwell var automātiski mainīt importēto fotogrāfiju datņu nosaukumus uz "
+"mazo burtu reģistru. Lai to ieslēgtu, izvēlieties <guiseq><gui>Rediģēt</"
+"gui><gui>Iestatījumi</gui></guiseq>, logā <gui>Iestatījumi</gui> izvēlieties "
+"kasti <gui>Pārdēvēt importētās datnes uz mazajiem burtiem</gui>."
+
+#. (itstool) path: section/title
+#: C/other-files.page:107
+msgid "Writing metadata on the fly"
+msgstr "Metadatu tūlītēja rakstīšana"
+
+#. (itstool) path: section/p
+#: C/other-files.page:109
+msgid ""
+"By default, Shotwell does not modify photo files, even when you edit photos "
+"or change their tags or titles. Shotwell records these changes in its own "
+"database only."
+msgstr ""
+"Pēc noklusējuma Shotwell nemaina fotogrāfiju datnes, pat rediģējot "
+"fotogrāfijas vai mainot to tagus vai nosaukumus. Shotwell ieraksta šīs "
+"izmaiņas tikai savā datubāzē."
+
+#. (itstool) path: section/p
+#: C/other-files.page:112
+msgid ""
+"To change this behavior, you can enable the checkbox <gui>Write tags, titles "
+"and other metadata to photo files</gui> in the <gui>Preferences</gui> "
+"dialog. When this option is enabled, Shotwell will write the following "
+"metadata to most photo files whenever you change it in Shotwell:"
+msgstr ""
+"Lai mainītu šo uzvedību, varat ieslēgt izvēles rūtiņu <gui>Rakstīt tagus, "
+"nosaukumus un citus metadatus fotogrāfiju datnēs</gui> dialoglodziņā "
+"<gui>Iestatījumi</gui>. Kad šī opcija ir ieslēgta, veicot izmaiņas "
+"fotogrāfijā, Shotwell ierakstīs sekojošos metadatus vairumā fotogrāfiju "
+"datēs:"
+
+#. (itstool) path: item/p
+#: C/other-files.page:118
+msgid "titles"
+msgstr "nosaukumi"
+
+#. (itstool) path: item/p
+#: C/other-files.page:119
+msgid "tags"
+msgstr "tagi"
+
+#. (itstool) path: item/p
+#: C/other-files.page:120
+msgid "ratings"
+msgstr "vērtējumi"
+
+#. (itstool) path: item/p
+#: C/other-files.page:121
+msgid "rotation information"
+msgstr "rotācijas informācija"
+
+#. (itstool) path: item/p
+#: C/other-files.page:122
+msgid "time/date"
+msgstr "laiks/datums"
+
+#. (itstool) path: section/p
+#: C/other-files.page:125
+msgid ""
+"Shotwell stores this information in photo files in EXIF, IPTC and/or XMP "
+"format. Note that Shotwell can write only to photo files in JPEG, PNG and "
+"TIFF format, not to BMP photos, RAW photos or to video files."
+msgstr ""
+"Shotwell saglabā šo informāciju fotogrāfiju datnēs EXIF, IPTC un / vai XMP "
+"formātos. Ņemiet vērā, ka Shotwell fotogrāfiju datnēs var rakstīt tikai "
+"JPEG, PNG un TIFF formātos, bet ne BMP, RAW vai video datnēs."
+
+#. (itstool) path: section/title
+#: C/other-files.page:133
+msgid "Runtime monitoring"
+msgstr "Izpildlaika pārraudzīšana"
+
+#. (itstool) path: section/p
+#: C/other-files.page:135
+msgid ""
+"While Shotwell is running, it notices changes made to any photo file "
+"externally. When a photo file changes, Shotwell rereads the file and updates "
+"your view of the photo and metadata."
+msgstr ""
+"Kamēr Shotwell ir palaists, tas pamana izmaiņas, kas no ārpuses notiek ar "
+"fotogrāfijām. Kad fotogrāfijas datnes mainās, Shotwell pārlasa datni un "
+"atjaunina jūsu fotogrāfijas skatu un metadatus."
+
+#. (itstool) path: section/p
+#: C/other-files.page:139
+msgid ""
+"Note that Shotwell checks all photo files for changes at startup, but only "
+"photo files contained in the library directory are monitored in real time "
+"after startup. We hope to remove this limitation in a further release."
+msgstr ""
+"Ņemiet vērā, ka palaižoties Shotwell visās fotogrāfiju datnēs pārbauda, vai "
+"ir izmaiņas, bet pēc palaišanās tikai bibliotēkas direktorijas mape tiek "
+"uzraudzīta reālā laikā. Mēs ceram nākošajos laidienos šo ierobežojumu noņemt."
+
+#. (itstool) path: info/desc
+#: C/other-missing.page:7
+msgid "If Shotwell can't find a photo in your library, it marks it as missing."
+msgstr ""
+"Ja Shotwell nevar atrast fotogrāfiju bibliotēkā, tā tiek atzīmēta kā "
+"trūkstoša."
+
+#. (itstool) path: page/title
+#: C/other-missing.page:12
+msgid "Missing photos"
+msgstr "Trūkstošās fotogrāfijas"
+
+#. (itstool) path: page/p
+#: C/other-missing.page:14
+msgid ""
+"Each time Shotwell starts up, it scans your photo library to verify that all "
+"photo files still exist on your hard drive. If Shotwell finds that any photo "
+"files are missing, it will not display them in the normal Photos, Events and "
+"Tags views, but will instead show them in a separate Missing Files view "
+"which will appear in the sidebar."
+msgstr ""
+"Katru reizi, kad Shotwell tiek palaists, tas skenē jūsu fotogrāfiju "
+"bibliotēku, lai pārliecinātos, ka fotogrāfijas vēl aizvien atrodas uz cietā "
+"diska. Ja Shotwell konstatē, ka kāda fotogrāfija trūkst, tā nebūs redzama "
+"parasto fotogrāfiju, notikumu un tagu skatos, bet tiks parādīta atsevišķā "
+"“Iztrūkstošās datnes” skatā, kas parādīsies sānu joslā."
+
+#. (itstool) path: page/p
+#: C/other-missing.page:16
+msgid ""
+"If you no longer want the missing files to be part of your Shotwell "
+"collection (perhaps because you deleted them), go to the Missing Files view, "
+"select the photos and then click <gui>Remove From Library</gui>."
+msgstr ""
+"Ja vairs nevēlaties redzēt trūkstošās fotogrāfijas savā Shotwell kolekcijā "
+"(iespējams, tāpēc, ka esat tās izdzēsis), ejiet uz skatu “Iztrūkstošās "
+"datnes”, izvēlieties fotogrāfijas un spiediet <gui>Izņemt no bibliotēkas</"
+"gui>."
+
+#. (itstool) path: page/p
+#: C/other-missing.page:18
+msgid ""
+"If you have photos on a removable disk, such as a CD or USB flash drive, and "
+"<link xref=\"index#import\">import</link> them into Shotwell <em>without</"
+"em> copying the photos to your computer, they will show up as missing files "
+"if you then disconnect the removable disk. See <link xref=\"import-file\"/> "
+"to learn how to copy files from removable disks onto your computer."
+msgstr ""
+"Ja jūsu fotogrāfijas ir uz noņemamiem datu nesējiem, piemēram, CD vai USB "
+"zibatmiņām, un esat tās <link xref=\"index#import\">importējis</link> "
+"Shotwell tās <em>nekopējot</em> uz savu datoru, tās parādīsies kā trūkstošas "
+"datnes, ja atvienojāt noņemamo disku. Skatiet <link xref=\"import-file\"/>, "
+"lai uzzinātu, kā kopēt datnes no noņemamiem diskiem uz savu datoru."
+
+#. (itstool) path: page/p
+#: C/other-missing.page:20
+msgid ""
+"If any missing photo files become available again, Shotwell will notice this "
+"the next time it starts. The photos will once again appear in the Photos, "
+"Events and Tags views."
+msgstr ""
+"Ja kāda no trūkstošajām fotogrāfijām atkal kļūs pieejama, Shotwell to "
+"pamanīs nākamajā startēšanās reizē. Šīs fotogrāfijas atkal parādīsies "
+"fotogrāfiju, notikumu un tagu skatos."
+
+#. (itstool) path: info/desc
+#: C/other-multiple.page:7
+msgid ""
+"You can open Shotwell with a different photo library by using the command "
+"line."
+msgstr ""
+"Jūs varat atvērt Shotwell ar citu fotogrāfiju bibliotēku, izmantojot "
+"komandrindu."
+
+#. (itstool) path: page/title
+#: C/other-multiple.page:12
+msgid "Multiple libraries"
+msgstr "Vairākas bibliotēkas"
+
+#. (itstool) path: page/p
+#: C/other-multiple.page:14
+msgid ""
+"Shotwell normally stores its database and photo thumbnails in the directory "
+"<file>~/.shotwell</file> . This directory does not hold photos, but the "
+"database in this directory contains a list of all the photos in the Shotwell "
+"library."
+msgstr ""
+"Shotwell parasti saglabā savu datubāzi un fotogrāfiju sīktēlus direktorijā "
+"<file>~/.shotwell</file> . Šajā direktorijā nav fotogrāfiju, bet tajā esošā "
+"datubāze satur sarakstu ar visām fotogrāfijām Shotwell bibliotēkā."
+
+#. (itstool) path: page/p
+#: C/other-multiple.page:16
+msgid ""
+"As an advanced feature, it's possible for you to have multiple Shotwell "
+"libraries, each of which has its own set of photos. Each library needs its "
+"own database directory. To launch Shotwell with an alternate library, "
+"specify an alternate database directory on the command line as follows:"
+msgstr ""
+"Šī iespēja ir domāta lietpratējiem — ir iespējams uzturēt vairākas Shotwell "
+"bibliotēkas, kur katrai no tām ir sava fotogrāfiju kopa. Katrai bibliotēkai "
+"ir vajadzīga sava datubāzes direktorija. Lai palaistu Shotwell ar citu "
+"bibliotēku, norādiet tās datubāzes direktoriju komandrindā šādi:"
+
+#. (itstool) path: page/screen
+#: C/other-multiple.page:18
+#, no-wrap
+msgid ""
+"\n"
+"shotwell -d [library-directory]\n"
+msgstr ""
+"\n"
+"shotwell -d [bibliotēkas-direktorija]\n"
+
+#. (itstool) path: info/desc
+#: C/other-plugins.page:7
+msgid "Extend Shotwell's functionality dynamically."
+msgstr "Dinamiski izvērst Shotwell funkcionalitāti."
+
+#. (itstool) path: page/title
+#: C/other-plugins.page:12
+msgid "Plugins"
+msgstr "Spraudņi"
+
+#. (itstool) path: page/p
+#: C/other-plugins.page:13
+msgid ""
+"Shotwell can be used with <em>plugins</em>, which are companion shared "
+"libraries that can add support for new publishing destinations or new "
+"slideshow transitions."
+msgstr ""
+"Shotwell var lietot ar <em>spraudņiem</em>, kas ir koplietotās bibliotēkas, "
+"kas var pievienot atbalstu jauniem publicēšanas mērķiem vai jaunām "
+"slaidrādes pārejām."
+
+#. (itstool) path: page/p
+#: C/other-plugins.page:18
+msgid ""
+"To see a list of installed plugins, choose <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq>, and in the <gui>Preferences</gui> "
+"window, click on the <gui>Plugins</gui> tab. You'll see a list of currently-"
+"installed plugins, each with a checkbox by it, and you may enable or disable "
+"each by selecting or deselecting the checkbox by its name."
+msgstr ""
+"Lai redzētu instalēto spraudņu sarakstu, izvēlieties <guiseq><gui>Rediģēt</"
+"gui><gui>Iestatījumi</gui></guiseq>, un logā <gui>Iestatījumi</gui> spiediet "
+"uz cilni <gui>Spraudņi</gui>. Tur būs redzami pašlaik instalētie spraudņi un "
+"tiem blakus izvēles rūtiņu. Jūs varat ieslēgt vai izslēgt katru no tiem, "
+"ieķeksējot vai noņemot ķeksi no attiecīgās izvēles rūtiņas."
+
+#. (itstool) path: note/p
+#: C/other-plugins.page:25
+msgid ""
+"Full documentation on how to develop new plugins is available at <link href="
+"\"http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins"
+"\">http://redmine.yorba.org/projects/shotwell/wiki/"
+"ShotwellArchWritingPlugins</link>"
+msgstr ""
+"Pilna informācija par to, kā izstrādāt spraudņus, ir pieejama <link href="
+"\"http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins"
+"\">http://redmine.yorba.org/projects/shotwell/wiki/"
+"ShotwellArchWritingPlugins</link>"
+
+#. (itstool) path: info/desc
+#: C/raw.page:7
+msgid "More about RAW support in Shotwell."
+msgstr "Vairāk par RAW atbalstu Shotwell lietotnē."
+
+#. (itstool) path: page/title
+#: C/raw.page:12
+msgid "RAW support in Shotwell"
+msgstr "RAW atbalsts Shotwell lietotnē"
+
+#. (itstool) path: page/p
+#: C/raw.page:13
+msgid ""
+"Some cameras have the ability to store data directly off the sensor and into "
+"a file that contains extra color information; this is commonly referred to "
+"as 'RAW' or 'camera RAW', and Shotwell supports these files as well."
+msgstr ""
+"Dažas kameras var datus no sensora saglabāt pa tiešo datnē, kas satur "
+"papildu krāsu informāciju; tos parasti dēvē par “RAW” (jēlie) vai “kameras "
+"RAW”, un Shotwell atbalsta arī šīs datnes."
+
+#. (itstool) path: page/p
+#: C/raw.page:18
+msgid ""
+"Since RAW photographs normally cannot be displayed directly, but must be "
+"first developed - that is, have their extra information interpreted and "
+"readied for displaying - most cameras will either embed a JPEG inside a RAW-"
+"format file, or produce a JPEG alongside the RAW file at the time the "
+"snapshot is taken. The latter is referred to throughout this document as RAW"
+"+JPEG. If you import a RAW+JPEG pair, Shotwell will keep them paired and "
+"treat them as one item in your library."
+msgstr ""
+"Tā kā RAW fotogrāfijas nevar attēlot tiešā veidā, tās vispirms ir jāattīsta "
+"— tas ir, tās papildu informācija ir jālasa un jāinterpretē attēlošanai. "
+"Vairums kameru vai nu ieguls JPEG iekšā RAW datnē, vai izveidos gan RAW, gan "
+"JPEG datnes vienam un tam pašam kadram. Otrais risinājums šajā dokumentā "
+"tiks apzīmēts kā RAW+ JPEG. Ja importēsiet RAW+JPEG pāri, Shotwell tos "
+"paturēs sapārotus un bibliotēkā tie parādīsies kā viens vienums."
+
+#. (itstool) path: page/p
+#: C/raw.page:27
+msgid ""
+"When you import a RAW file, you can choose to either use the camera's "
+"internally-developed JPEG or Shotwell's by selecting <guiseq><gui>Photos</"
+"gui><gui>Developer</gui></guiseq> in the menus."
+msgstr ""
+"Importējot RAW datni, jūs varat izvēlēties vai nu izmantot kameras iekšēji "
+"attīstīto JPEG vai Shotwell attīstīto, izvēlnēs izvēloties "
+"<guiseq><gui>Fotogrāfijas</gui><gui>Attīstītājs</gui></guiseq>."
+
+#. (itstool) path: note/p
+#: C/raw.page:33
+msgid ""
+"Changing between developers will cause all edits made to a photograph to be "
+"discarded."
+msgstr "Attīstītāju mainīšana var atcelt visas fotogrāfijās veiktās izmaiņas."
+
+#. (itstool) path: page/p
+#: C/raw.page:39
+msgid ""
+"In order to publish or use a RAW photograph in most other software, it has "
+"to be exported first. Shotwell can export your RAW photos in JPEG, PNG, TIFF "
+"or BMP format, and, when publishing, will internally export a JPEG version "
+"for you and publish that."
+msgstr ""
+"Lai publicētu vai lietotu RAW fotogrāfijas vairumā lietotņu, tās vispirms ir "
+"jāeksportē. Shotwell var eksportēt RAW fotogrāfijas JPEG, PNG, TIFF un BMP "
+"formātos. Publicējot tās tiks eksportētas JPEG formātā."
+
+#. (itstool) path: info/desc
+#: C/running.page:7
+msgid ""
+"Find Shotwell in the Applications menu, or have it start automatically when "
+"you plug in a camera."
+msgstr ""
+"Atrodiet Shotwell lietotņu izvēlnē, vai arī palaidiet to, pievienojot kameru."
+
+#. (itstool) path: page/title
+#: C/running.page:14
+msgid "Running Shotwell"
+msgstr "Shotwell darbināšana"
+
+#. (itstool) path: page/p
+#: C/running.page:16
+msgid ""
+"Once installed, Shotwell is available in your <gui>Applications</gui> menu "
+"under <gui>Graphics</gui> or <gui>Photography</gui>."
+msgstr ""
+"Kad Shotwell ir uzinstalēts, tas ir pieejams izvēlnē <gui>Lietotnes</gui> "
+"zem <gui>Grafika</gui> vai <gui>Fotogrāfija</gui>."
+
+#. (itstool) path: page/p
+#: C/running.page:18
+msgid ""
+"Shotwell may also be executed automatically when a camera is plugged in to "
+"your computer. To check that your system is set up to run Shotwell when a "
+"camera is detected, go to <guiseq><gui>Edit</gui><gui>Preferences</gui></"
+"guiseq> in any Nautilus (file browser) window and choose the <gui>Media</"
+"gui> tab.  You'll see a dropdown box entitled <gui>Photos:</gui> which lets "
+"you choose Shotwell as your photo handling application."
+msgstr ""
+"Shotwell var tikt palaist automātiski, kad kamera ir pievienota datoram. Lai "
+"pārbaudītu, vai sistēma palaidīs Shotwell, kad ir atklāta kamera, ejiet uz "
+"<guiseq><gui>Rediģēt</gui><gui>Iestatījumi</gui></guiseq> jebkurā Nautilus "
+"(datņu pārlūka) logā un izvēlieties cilni <gui>Datu nesēji</gui>. Tur būs "
+"redzams izkrītošais saraksts ar nosaukumu <gui>Fotogrāfijas:</gui>, kas ļauj "
+"izvēlēties Shotwell kā lietotni, kas apstrādā fotogrāfijas."
+
+#. (itstool) path: note/p
+#: C/running.page:25
+msgid ""
+"Shotwell may also be executed directly from its build directory, although "
+"this is only recommended for testing out Shotwell or for developers."
+msgstr ""
+"Shotwell var arī palaist no tās būvēšanas direktorijas, lai gan to iesaka "
+"darīt tikai Shotwell testēšanai vai izstrādāšanai."
+
+#. (itstool) path: info/desc
+#: C/share-background.page:7
+msgid ""
+"Set your desktop background to a single photo or to a slideshow of photos."
+msgstr "Iestatīt darbvirsmas fonā fotogrāfiju vai fotogrāfiju slaidrādi."
+
+#. (itstool) path: page/title
+#: C/share-background.page:12
+msgid "Set a desktop background or slideshow"
+msgstr "Iestatīt darbvirsmas fonu vai slaidrādi"
+
+#. (itstool) path: page/p
+#: C/share-background.page:14
+msgid ""
+"To set a single photo as your desktop background, select the photo and "
+"choose <guiseq><gui>File</gui><gui>Set as Desktop Background</gui></guiseq>."
+msgstr ""
+"Lai iestatītu vienu fotogrāfiju kā fona attēlu, izvēlieties fotogrāfiju un "
+"izvēlieties <guiseq><gui>Datne</gui><gui>Iestatīt kā darbvirsmas fonu</gui></"
+"guiseq>."
+
+#. (itstool) path: page/p
+#: C/share-background.page:16
+msgid ""
+"You can also set your background to a slideshow of photos. To do this, "
+"select the photos for the slideshow and choose <guiseq><gui>File</"
+"gui><gui>Set as Desktop Slideshow...</gui></guiseq>. Shotwell will prompt "
+"you for a slideshow delay, which can be any interval up to one day in "
+"length. The background slideshow will proceed even when Shotwell is not "
+"running."
+msgstr ""
+"Jūs varat arī iestatīt fonu kā fotogrāfiju slaidrādi. Lai to izdarītu, "
+"izvēlieties fotogrāfijas slaidrādei un izvēlieties <guiseq><gui>Datne</"
+"gui><gui>Iestatīt kā darbvirsmas slaidrādi...</gui></guiseq>. Shotwell "
+"vaicās, cik ilgai ir jābūt slaidrādes aizturei, kas var būt līdz vienai "
+"dienai. Fona slaidrāde strādās arī tad, kad Shotwell nav palaists."
+
+#. (itstool) path: info/desc
+#: C/share-export.page:7
+msgid "Copy photos out of Shotwell so you can put them somewhere else."
+msgstr "Kopēt fotogrāfijas ārā no Shotwell, lai tās varētu novietot kur citur."
+
+#. (itstool) path: page/title
+#: C/share-export.page:12
+msgid "Exporting photos"
+msgstr "Fotogrāfiju eksportēšana"
+
+#. (itstool) path: page/p
+#: C/share-export.page:14
+msgid ""
+"To export photos from Shotwell via drag and drop, drag the photos from "
+"Shotwell onto a file manager window or your desktop. The new files will be "
+"full-sized copies of the photos in your library."
+msgstr ""
+"Lai eksportētu fotogrāfijas no Shotwell ar vilkšanas-nomešanas metodi, "
+"velciet fotogrāfijas no Shotwell uz datņu pārvaldnieka logu savā darbvirsmā. "
+"Jaunās datnes būs pilna izmēra kopijas fotogrāfijām bibliotēkā."
+
+#. (itstool) path: page/p
+#: C/share-export.page:18
+msgid ""
+"Alternatively, select a set of photos and choose the <guiseq><gui>File</"
+"gui><gui>Export...</gui></guiseq> command or press <keyseq><key>Shift</"
+"key><key>Ctrl</key><key>E</key></keyseq>, which exports photos while letting "
+"you fine-tune the size and dimensions of your photo files. A window will "
+"appear allowing you to make several choices:"
+msgstr ""
+"Varat arī izvēlēties noteiktas fotogrāfijas un izvēlēties "
+"<guiseq><gui>Datne</gui><gui>Eksportēt...</gui></guiseq> komandu vai spiest "
+"<keyseq><key>Shift</key><key>Ctrl</key><key>E</key></keyseq>,  kas eksportē "
+"fotogrāfijas, ļaujot precizēt foto datņu izmērus un dimensijas. Parādīsies "
+"logs, kas ļauj veikt vairākas izvēles:"
+
+#. (itstool) path: item/p
+#: C/share-export.page:24
+msgid "A format for export."
+msgstr "Formāts, uz kuru eksportēt."
+
+#. (itstool) path: item/p
+#: C/share-export.page:27
+msgid ""
+"Choose <gui>Unmodified</gui> to export photos in their original format "
+"without any edits made in Shotwell. RAW photos will be exported in their "
+"original RAW format."
+msgstr ""
+"Izvēlieties <gui>Nemainīts</gui>, lai eksportētu fotogrāfijas to sākotnējā "
+"formātā, bez izmaiņām, kas veiktas ar Shotwell. RAW fotogrāfijas tiks "
+"eksportētas RAW formātā."
+
+#. (itstool) path: item/p
+#: C/share-export.page:29
+msgid ""
+"Choose <gui>Current</gui> to export photos including edits made in Shotwell. "
+"RAW photos will be exported in JPEG format if you have edited them in "
+"Shotwell, and otherwise in their original RAW format."
+msgstr ""
+"Izvēlieties <gui>Pašreizējais</gui> lai eksportētu fotogrāfijas ar izmaiņām, "
+"kas veiktas Shotwell. RAW fotogrāfijas tiks eksportētas JPEG formātā, ja "
+"esat tās rediģējuši ar Shotwell, citādi tās paliks sākotnējā RAW formātā."
+
+#. (itstool) path: item/p
+#: C/share-export.page:31
+msgid ""
+"Or you can choose a particular image format (JPEG, PNG, TIFF, BMP) to be "
+"used for exporting. Any edits made in Shotwell will be included, and "
+"Shotwell will convert photos to the destination format."
+msgstr ""
+"Jūs varat izvēlēties noteiktu attēlu formātu (JPEG, PNG, TIFF, BMP), ko "
+"izmantot eksportēšanā. Tiks iekļautas visas izmaiņas, kas ir veiktas ar "
+"Shotwell un fotogrāfijas tiks konvertētas uz mērķa formātu."
+
+#. (itstool) path: item/p
+#: C/share-export.page:37
+msgid "The image quality for exporting (Low, Medium, High, or Maximum)."
+msgstr "Attēlu kvalitāte eksportējot (zema, vidēja, augsta vai maksimāla)."
+
+#. (itstool) path: item/p
+#: C/share-export.page:38
+msgid ""
+"A scaling constraint (which means how Shotwell will decide to scale the "
+"photos down), and the desired pixel size."
+msgstr ""
+"Mēroga ierobežojums (kas norāda, kā Shotwell izlems samazināt fotogrāfijas) "
+"un vēlamais pikseļu izmērs."
+
+#. (itstool) path: item/p
+#: C/share-export.page:39
+msgid ""
+"The option whether you like to export metadatas such as tags or ratings. "
+"This can help to save your privacy if you have geolocation tags or tags "
+"which shouldn't be seen by anyone."
+msgstr ""
+"Opcija, vai vēlaties eksportēt metadatus, piemēram, tagus un vērtējumus. Tas "
+"var palīdzēt saglabāt privātumu, ja jums ir ģeolokācijas tagi vai tādi tagi, "
+"ko citiem nevajadzētu redzēt."
+
+#. (itstool) path: page/p
+#: C/share-export.page:42
+msgid ""
+"If selected, Shotwell will write tags, titles, and other metadata to the new "
+"files."
+msgstr ""
+"Ja ir izvēlēts, Shotwell ierakstīs tagus, nosaukumus un citus metadatus "
+"jaunajās datnēs."
+
+#. (itstool) path: info/desc
+#: C/share-print.page:7
+msgid ""
+"Click <guiseq><gui>File</gui><gui>Print...</gui></guiseq>. For more printing "
+"options, select the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog."
+msgstr ""
+"Spiediet <guiseq><gui>Datne</gui><gui>Drukāt...</gui></guiseq>. Lai piekļūtu "
+"papildu drukāšanas opcijām, dialoglodziņā <gui>Drukāt</gui> izvēlieties "
+"cilni <gui>Lappuses iestatīšana</gui>."
+
+#. (itstool) path: page/title
+#: C/share-print.page:12
+msgid "Printing"
+msgstr "Drukāšana"
+
+#. (itstool) path: page/p
+#: C/share-print.page:14
+msgid ""
+"To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print...</"
+"gui></guiseq>."
+msgstr ""
+"Lai izdrukātu fotogrāfiju, atlasiet to un izvēlieties <guiseq><gui>Datne</"
+"gui><gui>Drukāt...</gui></guiseq>."
+
+#. (itstool) path: page/p
+#: C/share-print.page:16
+msgid ""
+"Shotwell can also print multiple images in one page; to do this, select "
+"multiple images, choose <guiseq><gui>File</gui><gui>Print...</gui></guiseq>, "
+"and in the <gui>Print</gui> dialog, choose the <gui>Image Settings</gui> "
+"tab. In <gui>Image Settings</gui>, choose one of the multiple-image-per-page "
+"options under <gui>Autosize</gui>."
+msgstr ""
+"Shotwell var arī izdrukāt vairākus attēlus vienā lappusē. Lai to izdarītu, "
+"izvēlieties vairākus attēlus, izvēlieties <guiseq><gui>Datne</"
+"gui><gui>Drukāt...</gui></guiseq>, un dialoglodziņā <gui>Drukāt</gui> "
+"izvēlieties <gui>Attēla iestatījumi</gui> cilni. Šajā cilnē sadaļā "
+"<gui>Automātiskais izmērs</gui> izvēlieties kādu no vairāku attēlu "
+"izkārtošanas opcijām."
+
+#. (itstool) path: page/p
+#: C/share-print.page:23
+msgid ""
+"If you would like to set formatting, paper size, and orientation options, "
+"choose the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog prior to "
+"printing."
+msgstr ""
+"Ja vēlaties iestatīt formatējumu, papīra izmēru un orientācijas opcijas, "
+"pirms drukāšanas dialoglodziņā <gui>Drukāt</gui> izvēlieties "
+"cilni<gui>Lappuses iestatīšana</gui>."
+
+#. (itstool) path: info/desc
+#: C/share-send.page:7
+msgid "Send photos via email, instant messaging or in other ways."
+msgstr ""
+"Sūtīt fotogrāfijas pa e-pastu, tūlītējo ziņojumapmaiņu vai citos veidos."
+
+#. (itstool) path: page/title
+#: C/share-send.page:12
+msgid "Sending photos"
+msgstr "Fotogrāfiju sūtīšana"
+
+#. (itstool) path: page/p
+#: C/share-send.page:14
+msgid ""
+"Shotwell can send photos using the GNOME desktop's Send To mechanism, which "
+"lets you send photos via email, instant messaging or in other ways."
+msgstr ""
+"Shotwell var sūtīt fotogrāfijas, izmantojot GNOME darbvirsmas “Sūtīt uz” "
+"mehānismu, kas jums ļauj sūtīt fotogrāfijas caur e-pastu, tūlītējo "
+"ziņojumapmaiņu un citos veidos."
+
+#. (itstool) path: page/p
+#: C/share-send.page:16
+msgid ""
+"To send photos, select them in Shotwell and choose <guiseq><gui>File</"
+"gui><gui>Send To...</gui></guiseq>, or right-click the photos and choose "
+"<gui>Send To...</gui> from the context menu. A <gui>Send To</gui> dialog box "
+"will appear which lets you choose a mechanism for sending the files (such as "
+"email or instant messaging) and a destination. You can optionally choose to "
+"send the files in a compressed format."
+msgstr ""
+"Lai sūtītu fotogrāfijas, atlasiet tās Shotwell lietotnē un izvēlieties "
+"<guiseq><gui>Datne</gui><gui>Sūtīt uz...</gui></guiseq>, vai spiediet labo "
+"peles klikšķi uz fotogrāfijām un izvēlieties <gui>Sūtīt uz...</gui> "
+"konteksta izvēlnē. Parādīsies dialoglodziņš <gui>Sūtīt uz</gui>, kas ļauj "
+"izvēlēties datņu sūtīšanas mehānismu (piemēram, e-pasts vai tūlītējā "
+"ziņojumapmaiņa) un gala mērķi. Jūs varat arī izvēlēties sūtīt datnes "
+"saspiestā formātā."
+
+#. (itstool) path: info/desc
+#: C/share-slideshow.page:7
+msgid "Watch a slideshow of your photos."
+msgstr "Skatieties savu fotogrāfiju slaidrādi."
+
+#. (itstool) path: page/title
+#: C/share-slideshow.page:12
+msgid "Slideshows"
+msgstr "Slaidrādes"
+
+#. (itstool) path: page/p
+#: C/share-slideshow.page:14
+msgid ""
+"To see a sideshow of any collection in Shotwell, navigate to that collection "
+"and select <guiseq><gui>View</gui><gui>Slideshow</gui></guiseq> or press "
+"<key>F5</key>."
+msgstr ""
+"Lai Shotwell lietotnē redzētu kādas kolekcijas slaidrādi, ejiet uz kolekciju "
+"un izvēlieties <guiseq><gui>Skats</gui><gui>Slaidrāde</gui></guiseq> vai "
+"spiediet <key>F5</key>."
+
+#. (itstool) path: page/p
+#: C/share-slideshow.page:16
+msgid "You can change some settings in a running slideshow:"
+msgstr "Aktīvā slaidrādē varat mainīt dažus iestatījumus:"
+
+#. (itstool) path: item/p
+#: C/share-slideshow.page:19
+msgid "The duration how long an image should be shown: 1 - 30 seconds"
+msgstr "Laiku, cik ilgi būs redzams attēls: 1–30 sekundes"
+
+#. (itstool) path: item/p
+#: C/share-slideshow.page:20
+msgid "You can select different transition effects."
+msgstr "Varat izvēlēties dažādus pārejas efektus."
+
+#. (itstool) path: item/p
+#: C/share-slideshow.page:21
+msgid "The time for each transition effect: 0.1 - 1.0 seconds"
+msgstr "Laiks katram pārejas efektam: 0,1–1,0 sekundes"
+
+#. (itstool) path: info/desc
+#: C/share-upload.page:7
+msgid "Publish photos to Facebook, Flickr, Picasa Web Albums, or other sites."
+msgstr ""
+"Publicēt fotogrāfijas Facebook, Flickr, Picasa Web Albums un citās vietnēs."
+
+#. (itstool) path: page/title
+#: C/share-upload.page:12
+msgid "Publishing to the Web"
+msgstr "Publicēšana tīmeklī"
+
+#. (itstool) path: page/p
+#: C/share-upload.page:14
+msgid ""
+"Through the use of <link xref=\"other-plugins\">plugins</link>, Shotwell can "
+"publish photos and videos to the following services, each of which requires "
+"an account:"
+msgstr ""
+"Izmantojot <link xref=\"other-plugins\">spraudņus</link>, Shotwell var "
+"publicēt fotogrāfijas un video uz sekojošajiem pakalpojumiem, kur katram ir "
+"nepieciešams konts:"
+
+#. (itstool) path: item/p
+#: C/share-upload.page:18
+msgid "<link href=\"http://facebook.com\">Facebook</link>"
+msgstr "<link href=\"http://facebook.com\">Facebook</link>"
+
+#. (itstool) path: item/p
+#: C/share-upload.page:19
+msgid "<link href=\"http://flickr.com\">Flickr</link>"
+msgstr "<link href=\"http://flickr.com\">Flickr</link>"
+
+#. (itstool) path: item/p
+#: C/share-upload.page:20
+msgid ""
+"<link href=\"http://picasaweb.google.com\">Picasa Web Albums</link> and "
+"<link href=\"http://plus.google.com\">Google+</link>"
+msgstr ""
+"<link href=\"http://picasaweb.google.com\">Picasa Web Albums</link> un <link "
+"href=\"http://plus.google.com\">Google+</link>"
+
+#. (itstool) path: item/p
+#: C/share-upload.page:21
+msgid "<link href=\"http://youtube.com\">YouTube</link> (videos only)"
+msgstr "<link href=\"http://youtube.com\">YouTube</link> (tikai video)"
+
+#. (itstool) path: item/p
+#: C/share-upload.page:22
+msgid ""
+"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, a photo site "
+"popular in Russia (photos only)"
+msgstr ""
+"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, Krievijā populāra "
+"fotogrāfiju vietne (tikai fotogrāfijas)"
+
+#. (itstool) path: item/p
+#: C/share-upload.page:23
+msgid ""
+"Any site running the <link href=\"http://piwigo.org\">Piwigo</link> photo "
+"gallery software (photos only)"
+msgstr ""
+"Jebkura vietne, kas izmanto <link href=\"http://piwigo.org\">Piwigo</link> "
+"fotogrāfiju galerijas programmatūru (tikai fotogrāfijas)"
+
+#. (itstool) path: page/p
+#: C/share-upload.page:26
+msgid ""
+"To publish selected photos in a collection, choose <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq> and click on the <gui>Plugins</gui> tab "
+"to enable the plugin for the service you want to publish to. Next, choose, "
+"<guiseq><gui>File</gui><gui>Publish</gui></guiseq>, press the <gui>Publish</"
+"gui> toolbar button or use <keyseq><key>Ctrl</key><key>P</key></keyseq>. You "
+"will see a dialog that lets you select a publishing service. You will then "
+"need to log in or create an account."
+msgstr ""
+"Lai publicētu kolekcijā izvēlētās fotogrāfijas, izvēlieties "
+"<guiseq><gui>Rediģēt</gui><gui>Iestatījumi</gui></guiseq> un spiediet cilni "
+"<gui>Spraudņi</gui>, lai ieslēgtu tā pakalpojuma spraudni, kurā publicēt. "
+"Pēc tam izvēlieties <guiseq><gui>Datne</gui><gui>Publicēt</gui></guiseq>, "
+"spiediet rīkjoslas pogu <gui>Publicēt</gui> vai izmantojiet "
+"<keyseq><key>Ctrl</key><key>P</key></keyseq>. Parādīsies dialoglodziņš, kas "
+"ļauj izvēlēties publicēšanas pakalpojumu. Pēc tam jums vajadzēs ierakstīties "
+"vai izveidot kontu."
+
+#. (itstool) path: page/p
+#: C/share-upload.page:31
+msgid ""
+"Publishing to Facebook requires you to grant certain permissions to the "
+"Shotwell Facebook application. You only need to grant these permissions "
+"once, when you first associate Shotwell with your Facebook account."
+msgstr ""
+"Lai publicētu Facebook vietnē Shotwell Facebook lietotnei vajag īpašas "
+"atļaujas. Šīs atļaujas ir jādod tikai vienreiz, kad asociējat Shotwell ar "
+"savu Facebook kontu."
+
+#. (itstool) path: note/p
+#: C/share-upload.page:34
+msgid ""
+"You will be only able to publish images with at most the permission you "
+"granted to the Shotwell Facebook application"
+msgstr ""
+"Jūs varēsiet publicēt attēlus ar tām tiesībām, kādas sniedzāt Shotwell "
+"Facebook lietotnei"
+
+#. (itstool) path: page/p
+#: C/share-upload.page:36
+msgid ""
+"Similarly, publishing to Flickr requires you to log in and permit Shotwell "
+"Connect to access your account."
+msgstr ""
+"Līdzīgi, publicēšanai Flickr vietnē vajag ierakstīties un ļaut Shotwell "
+"savienojumiem piekļūt jūsu kontam."
+
+#. (itstool) path: page/p
+#: C/share-upload.page:38
+msgid ""
+"If you have a Google account, but have not yet used Picasa Web Albums, you "
+"will need to log in to Picasa using a browser once before you can publish to "
+"this service."
+msgstr ""
+"Ja jums ir Google konts, bet vēl neesat izmantojis Picasa Web Albums, jums "
+"vienreiz jāierakstās Picasa, izmantojot pārlūku, pirms varēsiet publicēt "
+"šajā pakalpojumā."
+
+#. (itstool) path: info/desc
+#: C/view-displaying.page:7
+msgid ""
+"Learn about different ways of viewing your photos: in a grid, filling the "
+"main window, or filling the whole screen."
+msgstr ""
+"Uzziniet par dažādiem veidiem, kā skatīt fotogrāfijas — režģī, aizpildot "
+"galveno logu vai aizpildot visu ekrānu."
+
+#. (itstool) path: page/title
+#: C/view-displaying.page:12
+msgid "Photo views"
+msgstr "Fotogrāfiju skati"
+
+#. (itstool) path: page/p
+#: C/view-displaying.page:14
+msgid ""
+"When you select any collection in the sidebar, Shotwell displays all photos "
+"in the collection in the main window area. At the bottom right is a slider "
+"which adjusts the viewing size of the thumbnails. You may also adjust the "
+"thumbnail size using the plus and minus keys (<key>+</key> and <key>-</key>) "
+"or by pressing <key>Ctrl</key> while moving your mouse scroll wheel."
+msgstr ""
+"Izvēloties kādu kolekciju sānu joslā, Shotwell attēlos visas šīs kolekcijas "
+"fotogrāfijas galvenajā loga daļā. Loga apakšējā labajā pusē ri slīdnis, ar "
+"ko var pielāgot sīktēlu izmēru. Varat sīktēlu izmēru pielāgot arī ar pluss "
+"un mīnuss taustiņiem (<key>+</key> un <key>-</key>) vai spiežot <key>Ctrl</"
+"key> un kustinot peles riteni."
+
+#. (itstool) path: page/p
+#: C/view-displaying.page:16
+msgid ""
+"You can view a photo full-window by double-clicking on it. From there you "
+"may move to other photos in the collection with the Back and Forward "
+"buttons. To return to the collection, double-click on the photo or press "
+"<key>Esc</key>."
+msgstr ""
+"Jūs varat arī skatīt fotogrāfijas pilnekrāna režīmā, uz tām "
+"dubultklikšķinot. Šajā režīmā jūs varat pāriet starp fotogrāfijām, "
+"izmantojot bultiņu pogas. Lai atgrieztos kolekcijā, dubultklikšķiniet uz "
+"fotogrāfijas vai spiediet <key>Esc</key>."
+
+#. (itstool) path: page/p
+#: C/view-displaying.page:18
+msgid ""
+"When viewing a photo in full-window mode, the slider on the toolbar controls "
+"zoom. You can pan around by grabbing and dragging anywhere on the photo. You "
+"can also zoom using your scroll wheel or by pressing the following keyboard "
+"shortcuts: <keyseq><key>Ctrl</key>0</keyseq> for the full image, "
+"<keyseq><key>Ctrl</key>1</keyseq> for 100% (1 photo pixel = 1 screen pixel), "
+"and <keyseq><key>Ctrl</key>2</keyseq> for 200% (1 photo pixel = 2x2 screen "
+"pixels)."
+msgstr ""
+"Kad attēls tiek skatīts pilnekrāna režīmā, rīkjoslā esošais slīdnis nosaka"
+" tuvinājumu. Jūs varat panoramēt, sagrābjot un velkot jebkuru vietu"
+" fotogrāfijā. Jūs varat arī mainīt mērogu, izmantojot peles riteni vai"
+" spiežot šīs saīsnes: <keyseq><key>Ctrl</key>0</keyseq> lai redzētu"
+" pilnekrānā, <keyseq><key>Ctrl</key>1</keyseq> 100% tuvinājumam (1"
+" fotogrāfijas pikselis = 1 ekrāna pikseli), un <keyseq><key>Ctrl</key>2<"
+"/keyseq> 200% tuvinājumam (1 fotogrāfijas pikselis = 2x2 ekrāna pikseļiem)."
+
+#. (itstool) path: page/p
+#: C/view-displaying.page:20
+msgid ""
+"Shotwell offers a fullscreen mode to display photos. Choose "
+"<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> or press <key>F11</"
+"key>. To see the fullscreen toolbar, move your mouse to the bottom of the "
+"screen. The toolbar offers buttons to move through the collection, to pin "
+"the toolbar down (so it isn't hidden when you move the mouse away), and to "
+"leave fullscreen view."
+msgstr ""
+"Shotwell piedāvā iespēju attēlot fotogrāfijas pilnekrāna režīmā. Izvēlieties"
+" <guiseq><gui>Skats</gui><gui>Pilnekrāns</gui></guiseq> vai spiediet <key"
+">F11</key>. Lai redzētu pilnekrāna rīkjoslu, novietojiet peli ekrāna"
+" apakšpusē. Rīkjosla piedāvā pogas, ar kurām var pārvietoties pa kolekciju,"
+" nofiksēt rīkjoslu (lai tā nepazūd, kad pārvietojat peli kur citur), un"
+" pamest pilnekrāna skatu."
+
+#. (itstool) path: section/title
+#: C/view-displaying.page:23
+msgid "Viewing videos"
+msgstr "Video atskaņošana"
+
+#. (itstool) path: section/p
+#: C/view-displaying.page:24
+msgid ""
+"When you double-click a video, Shotwell will launch an external video player "
+"to play the video. It's not currently possible to display a video in full-"
+"window mode in Shotwell or to play the video within Shotwell itself."
+msgstr ""
+"Dubultklikšķinot uz video, Shotwell palaidīs ārējo video atskaņotāju, lai"
+" atskaņotu video. Pašlaik nevar attēlot video Shotwell pilnekrāna režīmā, vai"
+" atskaņot video pašā Shotwell."
+
+#. (itstool) path: info/desc
+#: C/view-information.page:7
+msgid ""
+"View more detailed information about photos, like the exposure mode used by "
+"the camera."
+msgstr ""
+"Skatīt sīkāku informāciju par fotogrāfijām, piemēram, kameras ekspozīcijas"
+" režīmu."
+
+#. (itstool) path: page/title
+#: C/view-information.page:12
+msgid "Basic and extended information"
+msgstr "Pamata un paplašinātā informācija"
+
+#. (itstool) path: page/p
+#: C/view-information.page:14
+msgid ""
+"The Basic Information pane appears at the bottom of the sidebar, and "
+"displays a brief summary of the photos you've selected. If no photos are "
+"selected, it displays a summary of the entire collection. You can toggle the "
+"display of this pane using the <guiseq><gui>View</gui><gui>Basic "
+"Information</gui></guiseq> command."
+msgstr ""
+"Pamatinformācijas rūts parādās sānu joslas apakšpusē un attēlo īsu"
+" kopsavilkumu par izvēlētajām fotogrāfijām. Ja nav izvēlētu fotogrāfiju, tas"
+" attēlo visas kolekcijas kopsavilkumu. Jūs varat pārslēgt šīs rūts"
+" attēlošanu, izmantojot komandu <guiseq><gui>Skats</gui><gui"
+">Pamatinformācija</gui></guiseq>"
+
+#. (itstool) path: page/p
+#: C/view-information.page:16
+msgid ""
+"The floating Extended Information window displays more information about the "
+"selected photo. The <guiseq><gui>View</gui><gui>Extended Information</gui></"
+"guiseq> command or <keyseq><key>Ctrl</key><key>Shift</key><key>X</key></"
+"keyseq> toggles the display of this window."
+msgstr ""
+"Peldošais paplašinātās informācijas logs attēlo vairāk informācijas par"
+" izvēlēto fotogrāfiju. <guiseq><gui>Skats</gui><gui>Paplašināta informācija<"
+"/gui></guiseq> komanda vai <keyseq><key>Ctrl</key><key>Shift</key><key>X</key"
+"></keyseq> pārslēdz šī loga attēlošanu."
+
+#. (itstool) path: info/desc
+#: C/view-sidebar.page:7
+msgid ""
+"The sidebar on the left of the window lists various views of your library."
+msgstr "Sānjosla loga kreisajā pusē parāda dažādus jūsu bibliotēkas skatus."
+
+#. (itstool) path: page/title
+#: C/view-sidebar.page:21
+msgid "The sidebar"
+msgstr "Sānjosla"
+
+#. (itstool) path: page/p
+#: C/view-sidebar.page:23
+msgid ""
+"The sidebar on the left side of the Shotwell window lists various views of "
+"your library. Although you may see the same photo in multiple views, it's "
+"only stored once on your hard drive."
+msgstr ""
+"Sānjosla kreisajā Shotwell loga pusē uzskaita vairākus jūsu bibliotēkas"
+" skatus. Lai gan varat redzēt vienu un to pašu fotogrāfiju dažādos skatos,"
+" cietajā diskā tā tiek saglabāta tikai vienā vietā."
+
+#. (itstool) path: page/p
+#: C/view-sidebar.page:25
+msgid ""
+"The <gui>Last Import</gui> view lists your last imported photos no matter if "
+"they are imported from F-Spot, your camera, a memory card or the hard disk."
+msgstr ""
+"Skatā <gui>Pēdējais imports</gui> ir redzamas fotogrāfijas, kas ir importētas"
+" neatkarīgi no tā, vai tās ir importētas no F-Spot, kameras, atmiņas kartes"
+" vai cietā diska."
+
+#. (itstool) path: page/p
+#: C/view-sidebar.page:27
+msgid "The <gui>Flagged</gui> lists all photos you had previous flagged."
+msgstr ""
+"<gui>Ar karodziņu</gui> uzrāda visas fotogrāfijas, kas ir iepriekš atzīmētas"
+" ar karodziņu."
+
+#. (itstool) path: page/p
+#: C/view-sidebar.page:29
+msgid ""
+"The <gui>Saved Search</gui> allows you to sort your library by many criteria."
+msgstr ""
+"<gui>Saglabātie meklējumi</gui> jums ļauj kārtot bibliotēku pēc vairākiem"
+" kritērijiem."
+
+#. (itstool) path: page/p
+#: C/view-sidebar.page:31
+msgid ""
+"The <gui>Events</gui> folder lists all events in your library. An event is a "
+"group of photos that were taken at approximately the same time."
+msgstr ""
+"Mapē <gui>Notikumi</gui> ir atrodami visi notikumi jūsu bibliotēkā. Notikums"
+" ir fotogrāfiju kopums, kas ir uzņemts aptuveni vienā laikā."
+
+#. (itstool) path: page/p
+#: C/view-sidebar.page:33
+msgid ""
+"The <gui>Tags</gui> folder lists all tags you've assigned to photos. Photos "
+"can have multiple tags attached to them. When you click on the name of a tag "
+"in the sidebar, you will see all the photos associated with that tag."
+msgstr ""
+"Mapē <gui>Tagi</gui> ir visi tagi, kas ir piešķirti fotogrāfijām."
+" Fotogrāfijām var būt piešķirti vairāki tagi. Sānu joslā spiežot uz taga"
+" nosaukuma, redzēsiet visas fotogrāfijas, kurām ir šie tagi."
+
diff --git a/help/lv/lv.stamp b/help/lv/lv.stamp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/help/lv/lv.stamp
diff --git a/help/lv/organize-event.page b/help/lv/organize-event.page
new file mode 100644
index 0000000..56b9dcd
--- /dev/null
+++ b/help/lv/organize-event.page
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="event" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#organize"/>
+        <desc>Grupēt kopā fotogrāfijas, kas ir uzņemtas tajā pašā laikā. Uzziniet, kā pārdēvēt, apvienot un kārtot notikumus.</desc>
+        
+        <link type="next" xref="flag"/>
+    </info>
+
+	<title>Notikumi</title>
+
+    <p>Notikums ir virkne ar fotogrāfijām, kas ir uzņemtas aptuveni vienā laikā. Importējot fotogrāfijas, Shotwell pārbauda, kad katra fotogrāfija ir uzņemta. Tad tas sagrupē fotogrāfijas notikumos.</p>
+    
+    <p>Izvēlieties <gui>Notikumi</gui> sānu joslā, lai redzētu fotogrāfijas, kas ir organizētas pēc datumiem. Ja sānu joslā izvēlēsities mēnesi vai gadu, galvenajā logā parādīsies saraksts ar notikumiem. Dubultklikšķiniet uz notikuma, lai redzētu visas fotogrāfijas, kas tika uzņemtas ap to laiku.</p>
+    
+    <p>Ja fotogrāfijā nav iekļauta informācija par datumu un laiku, Shotwell nevar automātiski to novietot kādā notikumā. Šādā gadījumā fotogrāfija parādīsies <gui>Nav notikuma</gui> sadaļā sānu joslā. Jūs vēl aizvien varat pārvietot šādu fotogrāfiju uz jebkuru notikumu tāpat kā pārējās fotogrāfijas.</p>
+    
+    <section>
+    <title>Notikumu pārdēvēšana</title>
+
+    <p>Lai notikumam piešķirtu nosaukumu, nevis norādīt uz to pēc datuma, izvēlieties notikumu, spiediet <guiseq><gui>Notikumi</gui><gui>Pārdēvēt notikumu...</gui></guiseq> un ievadiet jauno nosaukumu. Vēl notikumus var pārdēvēt, dubultklikšķinot uz to nosaukuma sānu joslā, ievadot jauno nosaukumu un spiežot <key>Enter</key>.</p>
+    </section>
+
+    <section>
+    <title>Fotogrāfiju pārvietošana starp notikumiem</title>
+
+    <p>Lai gan fotogrāfijas sākumā tiek grupētas notikumos pēc to datumiem, jūs varat pārvietot fotogrāfijas starp notikumiem. Lai to izdarītu, velciet jebkuru fotogrāfiju uz sānu joslu un nometiet to notikumā.</p>
+    </section>
+
+    <section>
+    <title>Notikumu izveidošana un apvienošana</title>
+    <p>Lai izveidotu jaunu notikumu, izvēlieties fotogrāfijas, ko redzēt jaunajā notikumā un spiediet <guiseq><gui>Notikumi</gui><gui>Jauni notikumi</gui></guiseq>.</p>
+    <p>Lai apvienotu notikumus, izvēlieties <guiseq><gui>Notikumi</gui></guiseq> sānu joslā, tad, turot piespiestu <key>Ctrl</key>, spiediet uz notikumiem, kurus vēlaties apvienot galvenā loga laukumā. Visbeidzot, spiediet <guiseq><gui>Notikumi</gui><gui>Apvienot notikumus</gui></guiseq>.</p>
+    </section>
+
+    <section>
+    <title>Notikumu kārtošana</title>
+
+    <p>Notikumi tiek attēloti sānu joslas kokā, organizēti pa notikumiem, pēc vecākās fotogrāfijas datuma un mēneša. Lai mainītu notikumu kārtošanas secību, spiediet <guiseq><gui>Skats</gui><gui>Kārtot notikumus</gui></guiseq> un izvēlieties kārtot vai nu augoši, vai dilstoši.</p>
+    
+    </section>
+    
+    <section>
+    <title>Mainīt fotogrāfiju, kas reprezentē katru notikumu</title>
+
+    <p>Ja sānu joslā izvēlieties vienumu <gui>notikumi</gui>, redzēsiet vienu fotogrāfiju, kas reprezentē katru notikumu. To dēvē par atslēgas fotogrāfiju.</p>
+
+    <p>Pēc noklusējuma, Shotwell izmanto pirmo fotogrāfiju kā atslēgas fotogrāfiju. Lai izmantotu citu atslēgas fotogrāfiju, izvēlieties vēlamo fotogrāfiju uz spiediet <guiseq><gui>Fotogrāfijas</gui><gui>Izvēlēties kā atslēgas fotogrāfiju notikumam</gui></guiseq>.</p>
+    
+    </section>
+    
+</page>
diff --git a/help/lv/organize-flag.page b/help/lv/organize-flag.page
new file mode 100644
index 0000000..29ef2fb
--- /dev/null
+++ b/help/lv/organize-flag.page
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="flag" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#organize"/>
+        <desc>Atzīmēt fotogrāfijas, lai marķētu tās kā īpašas vai darbotos ar tām kā ar kopu.</desc>
+        
+        <link type="next" xref="rating"/>
+    </info>
+
+	<title>Fotogrāfiju marķēšana</title>
+
+    <p>Shotwell jums ļauj <em>marķēt</em> fotogrāfijas. Kad fotogrāfija ir marķēta, tas augšējā labajā stūrī parādās maza karodziņa ikona. Jūs varat izvēlēties vienumu <gui>Ar karodziņu</gui> sānu joslā, lai redzētu visus marķētos vienumus.</p>
+    
+    <p>Fotogrāfiju marķēšana atzīmē tās kā īpašas. Jūs to varat interpretēt kā vien vēlaties. Piemēram, varat ar karodziņu atzīmēt visas fotogrāfijas, kurām jāveic vizuāla pielabošanas, vai visas fotogrāfijas, ar kurām vēlaties dalīties ar draugu.</p>
+    
+    <p>Marķēšana ir arī noderīga, jo varat darboties ar visām marķētajām fotogrāfijām kā ar vienu kopumu. Piemēram, varat izvēlēties <gui>Ar karodziņu</gui> skatu un augšupielādēt visas marķētās fotogrāfijas uz publicēšanas pakalpojumu.</p>
+    
+    <section>
+    <title>Lai marķētu vai noņemtu marķējumu no fotogrāfijas</title>
+    <p>Lai marķētu vai noņemtu marķējumu no fotogrāfijas, spiediet peles labo pogu uz fotogrāfijas, izvēlieties <gui>Marķēt</gui> vai <gui>Noņemt marķējumu</gui> konteksta izvēlnē. Vai lietojat tastatūras saīsnes <keyseq><key>Ctrl</key><key>G</key></keyseq> vai <key>/</key>.</p>
+    </section>
+    
+</page>
diff --git a/help/lv/organize-rating.page b/help/lv/organize-rating.page
new file mode 100644
index 0000000..9b989f9
--- /dev/null
+++ b/help/lv/organize-rating.page
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="rating" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#organize"/>
+        <desc>Vērtējiet fotogrāfijas skalā no 1 līdz 5 zvaigznes. Jūs varat noraidīt sliktās fotogrāfijas, slēpjot tās no skata.</desc>
+        
+        <link type="next" xref="delete"/>
+    </info>
+
+	<title>Vērtējumi</title>
+<p>Jūs varat katrai fotogrāfijai piešķirt vērtējumu no 1 līdz 5 zvaigznēm, vai arī tās noraidīt, kas pēc noklusējuma šīs bildes paslēps.</p>
+
+<p>Jūs varat novērtēt fotogrāfiju vai to kopumu šādos veidos:</p>
+
+<list>
+<item><p>Izvēlieties fotogrāfiju(-as), tad izvēlieties vērtējumu no izvēlnes<guiseq><gui>Fotogrāfijas</gui><gui>Iestatīt vērtējumu</gui></guiseq>.</p></item>
+<item><p>Spiediet labo peles pogu uz fotogrāfijas(-ām) un izvēlieties vērtējumu no “Iestatīt vērtējumu” konteksta izvēlnes.</p></item>
+<item><p>Izvēlieties fotogrāfiju(-as), tad spiediet kādu no saīsnes taustiņiem <key>1</key>, <key>2</key>, <key>3</key>, <key>4</key> vai <key>5</key>, lai piešķirtu vērtējumu. Vai spiediet <key>9</key>, lai atzīmētu fotogrāfiju kā noraidītu, vai <key>0</key>, lai noņemtu vērtējumu.</p></item>
+</list>
+
+<p>Parasti Shotwell attēlo visas fotogrāfijas, izņemot noraidītās. Jūs varat iestatīt citu vērtējumu filtru, piemēram, izmantojot <guiseq><gui>Skats</gui><gui>Filtrēt attēlus</gui></guiseq> izvēlni, jūs varat rādīt tikai attēlus ar vismaz 3 zvaigznēm vērtējumā, vai rādīt visas noraidītās fotogrāfijas. Shotwell ikona rīkjoslā attēlo aktuālo filtru un to var izmantot filtru iestatīšanai.</p>
+
+<p>Shotwell parasti attēlo katras fotogrāfijas vērtējumu tās apakšējā kreisajā stūrī. Jūs varat izslēgt vērtējumu attēlošanu, izmantojot <guiseq><gui>Skats</gui><gui>Vērtējumi</gui></guiseq> izvēlni.</p>
+
+<p>Jūs varat palielināt vai samazināt fotogrāfijas vērtējumu, izmantojot komandas <guiseq><gui>Iestatīt vērtējumu</gui><gui>Palielināt</gui></guiseq> un <guiseq><gui>Iestatīt vērtējumu</gui><gui>samazināt</gui></guiseq>, vai ar tastatūras saīsnēm <key>&lt;</key> un <key>&gt;</key>.</p>
+</page>
diff --git a/help/lv/organize-remove.page b/help/lv/organize-remove.page
new file mode 100644
index 0000000..cba20d5
--- /dev/null
+++ b/help/lv/organize-remove.page
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="delete" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#organize"/>
+        <desc>Izņemt fotogrāfijas no bibliotēkas vai pavisam izdzēst tās no datora.</desc>
+        
+        <link type="next" xref="search"/>
+    </info>
+
+	<title>Fotogrāfiju izņemšana un dzēšana</title>
+
+    <p>Jūs varat izņemt fotogrāfijas ārā no savas bibliotēkas un jūs varat tās pavisam izdzēst ārā no cietā diska.</p>
+<media type="image" src="figures/trash_process.png">Dzēšanas process</media>
+<p>Šī diagramma rāda, kā dzēstā fotogrāfija vispirms tiek ievietota Shotwell miskastē. Ja izdzēsīsiet to ārā no Shotwell miskastes, tā tiks ievietota datora miskastē. Ja izdzēsīsiet to ārā no tās, fotogrāfija tiks neatgriezeniski izdzēsta no datora.</p>
+<section id="delete-remove">
+	<title>Fotogrāfiju izņemšana no bibliotēkas</title>
+    <p>Izvēlieties fotogrāfijas, kuras izņemt, izvēlieties <guiseq><gui>Rediģēt</gui><gui>Pārvietot uz miskasti</gui></guiseq>. (Jūs varat arī spiest taustiņu <key>Dzēst</key>.) Fotogrāfijas tiks pārvietotas no jūsu bibliotēkas uz Shotwell's miskasti.</p>
+    <p>Ja vēlaties izņemt fotogrāfijas no Shotwell, neizmetot tās miskastē, izvēlieties izņemamās fotogrāfijas un izvēlieties <guiseq><gui>Rediģēt</gui><gui>Izņemt no bibliotēkas</gui></guiseq>. Fotogrāfiju datnes paliks uz diska.</p>
+</section>
+
+<section id="delete-empty">
+	<title>Miskastes mapes iztukšošana vai atjaunošana</title>
+    <p>Izvēlieties miskastes ierakstu sānu joslā un Shotwell parādīs visas fotogrāfijas, kas ir atzīmētas kā izņemamas vai dzēšamas. Miskastes skatā ir pieejamas šādas komandas:</p>
+    <terms>
+    <item><title>Dzēst</title><p>Dzēst izvēlētās fotogrāfijas no miskastes mapes.</p></item>
+    <item><title>Atjaunot</title><p>Atjaunot izvēlētās fotogrāfijas uz Shotwell.</p></item>
+    <item><title>Iztukšot miskasti</title><p>Dzēst visas fotogrāfijas no miskastes mapes.</p></item>
+    </terms>
+</section>    
+    
+<section id="delete-trash">
+	<title>Dzēšana vai miskastes iztukšošana</title>
+    <p>Kad dzēšat datnes no miskastes mapes, vai arī iztīrāt miskastes mapi, jums tiks dotas šādas izvēles:</p>
+    <terms>
+    <item><title>Tikai izņemt</title><p>Fotogrāfiju izņemšana no bibliotēkas, bet uz datora atstāt fotogrāfijas turpat, kur tās bija.</p></item>
+    <item><title>Izmest datni</title><p>Izņemt fotogrāfijas no bibliotēkas un izdzēst tās no datora.</p></item>
+    <item><title>Atcelt</title><p>Nedarīt neko.</p></item>
+    </terms>    
+</section>
+    
+</page>
diff --git a/help/lv/organize-search.page b/help/lv/organize-search.page
new file mode 100644
index 0000000..df525cf
--- /dev/null
+++ b/help/lv/organize-search.page
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="search" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#organize"/>
+        <desc>Savā kolekcijā meklēt fotogrāfijas un video pēc dažādiem kritērijiem.</desc>
+        
+        <link type="next" xref="tag"/>
+    </info>
+
+    <title>Meklēšana</title>
+    
+    <p>Shotwell var veikt divu veidu meklēšanu: ar filtru rīkjoslā un ar saglabātu meklēšanu. Meklēšanas josla jums ļauj ātri meklēt dotajā skatā pēc noteiktiem kritērijiem. Saglabātās meklēšanas sniedz kompleksākus meklēšanas kritērijus un paliek sānu joslā starp sesijām.</p>
+    
+    <section id="searchbar">
+        <title>Meklēšanas josla</title>
+            <p><guiseq><gui>Skats</gui><gui>Meklēšanas josla</gui></guiseq> izvēles rūtiņa pārslēdz meklēšanas joslas attēlošanu. Jūs varat arī spiest <keyseq><key>Ctrl</key><key>F</key></keyseq> vai <key>F8</key>, lai parādītu meklēšanas joslu. Šajā joslā jūs varat meklēt, attēlot un slēpt fotogrāfijas un video pēc to nosaukumiem, tagiem, vērtējumiem un citām opcijām.</p>
+            
+            <p>Lai sāktu meklēšanu, ievadiet meklēšanas atslēgvārdus teksta laukā, vai spiediet <gui>Ar karodziņu</gui>, <gui>Vērtējums</gui> vai <gui>Tips</gui>. Teksta meklēšana salīdzinās jūsu atslēgvārdus ar tagu nosaukumiem, fotogrāfiju vai video nosaukumiem un fotogrāfiju datņu nosaukumiem. Pogas <gui>Ar karodziņu</gui>, <gui>Vērtējums</gui> and <gui>Tips</gui> jums attiecīgi ļauj filtrēt savu kolekciju pēc to marķējuma, zvaigznēm vērtējumā un pēc tā, vai vienumā ir attēli, video vai kameras jēlās datnes.</p>
+            
+            <p>Meklēšanas joslas izslēgšana un Shotwell aizvēršana automātiski atstata meklēšanas joslu.</p>
+    </section>
+    
+    <section id="savedsearch">
+        <title>Saglabātie meklējumi</title>
+            <p>Paplašinātā meklēšana saglabājas starp Shotwell sesijām un tiek atjaunināta, kad fotogrāfijas un video tiek pievienotas vai izņemtas no Shotwell bibliotēkas.</p>
+            
+            <p>Izveido saglabāto meklēšanu ar <guiseq><gui>Rediģēt</gui><gui>Jauna saglabātā meklēšana...</gui></guiseq> vai spiežot <keyseq><key>Ctrl</key><key>S</key></keyseq>. Dialoglodziņš jums ļauj ievadīt meklējuma nosaukuu un izvēlēties, vai sekojošajās rindās jāizpildās Kādam, Visiem vai Nevienam kritērijam.</p>
+            
+            <p>Katra rinda apzīmē meklēšanas kritēriju. Izmantojiet pogu <gui>+</gui>, lai pievienotu vairāk rindu, un pogu <gui>-</gui>, lai izņemtu attiecīgo rindu. Kombinētais lodziņš katras rindas kreisajā pusē izvēlas kritērija veidu. Kritērijam ir jābūt pareizi ievadītām, pirms kļūst pieejama poga <gui>Labi</gui>.</p>
+    </section>
+
+</page>
diff --git a/help/lv/organize-tag.page b/help/lv/organize-tag.page
new file mode 100644
index 0000000..6efee62
--- /dev/null
+++ b/help/lv/organize-tag.page
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="tag" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#organize"/>
+        <desc>Organizēt fotogrāfijas, piešķirot tām etiķetes.</desc>
+        
+        <link type="seealso" xref="event"/>
+        
+        <link type="next" xref="title"/>
+    </info>
+
+	<title>Fotogrāfiju tagošana</title>
+
+    <p>Jūs varat izvēlētajām fotogrāfijām piešķirt vienu vai vairākus tagus. Tags var būt viens vai vairāki vārdi, kurus varat saistīt ar šīm fotogrāfijām.</p>
+    
+    <p>Lai pievienotu jaunu tagu fotogrāfijām, izvēlieties attiecīgās fotogrāfijas un veiciet vienu no šīm darbībām:</p>
+    
+    <list>
+		<item><p>Izvēlieties <guiseq><gui>Tagi</gui><gui>Pievienot tagus...</gui></guiseq>.</p></item>
+		<item><p>Spiediet <keyseq><key>Ctrl</key><key>T</key></keyseq>.</p></item>
+		<item><p>Velciet un nometiet izvēlētās fotogrāfijas uz vēlamā taga.</p></item>
+    </list>
+     
+    <p>
+		When you use <keyseq><key>Ctrl</key><key>T</key></keyseq> or 
+		<guiseq><gui>Tags</gui><gui>Add Tags...</gui></guiseq> you can type
+		in the names of one or more tags, separated by commas.
+		Once you have created a tag, you can rename it by selecting that 
+		tag in the sidebar and choosing 
+		<guiseq><gui>Tags</gui><gui>Rename Tag "[name]"...</gui></guiseq>,
+		by rightclicking on it and choose <gui>Rename...</gui> or
+		double-click on the tag in the sidebar.
+	</p>
+    
+    <p>Lai mainītu, kuri tagi ir saistīti ar kurām fotogrāfijām, izvēlieties attiecīgo fotogrāfiju , izvēlieties <guiseq><gui>Tagi</gui><gui>Modificēt tagus...</gui></guiseq> vai spiediet labo peles pogu uz fotogrāfijas un izvēlieties <gui>Modificēt tagus...</gui> un rediģējiet ar komatiem atdalīto sarakstu. Lai izņemtu tagu no vienas vai vairākām fotogrāfijām, vispirms izvēlieties attiecīgo tagu sānu joslā, tad izvēlieties fotogrāfijas, ko vēlaties izņemt un izvēlieties <guiseq><gui>Tagi</gui><gui>Izņemt tagu "[nosaukums]" no fotogrāfijām</gui></guiseq> vai spiediet labo peles pogu uz fotogrāfijām un izvēlieties <gui>Izņemt tagu "[nosaukums]" no fotogrāfijām</gui>.</p>
+    
+    <p>Lai pavisam izdzēstu tagu, izvēlieties to tagu sānu joslā un izvēlieties <guiseq><gui>Tagi</gui><gui>Dzēst tagu "[nosaukums]"</gui></guiseq> vai spiediet labo peles pogu un izvēlieties <gui>Dzēst tagu "[nosaukums]"</gui>.</p>
+
+    <p>Izveidojot tagu, tas parādīsies sānu joslā sadaļā <gui>Tagi</gui>, kas ir slēpts, ja nav neviena taga. Fotogrāfijām var būt piesaistīti vairāki tagi. Sānu joslā, uzspiežot uz taga, redzēsiet visas fotogrāfijas, kurām ir šis tags.</p>
+    
+    <section id="hierarchaicaltags">
+        <title>Hierarhiskie tagi</title>
+            <p>Shotwell atbalsta hierarhiskos tagus. Jūs varat pārkārtot tagus, velkot un nometot tos vienu otrā. Lai izveidotu jaunu apakštagu, spiediet labo peles pogu uz taga un izvēlieties <gui>Jauns</gui>.</p>
+            
+            <p>Hierarhiskie tagi jums palīdz kārtot tagu sarakstu tuvāk jūsu domāšanas veidam; piemēram, jūs varat saglabāt vietu tagus “Kalni” vai “Pludmale” zem taga “Vietas”, kas var būt zem taga “Vasaras brīvdienas”.</p>
+			
+			<p>Ņemiet vērā, ka virstaga dzēšana dzēsīs arī tā apakštagus.</p>
+    </section>
+</page>
diff --git a/help/lv/organize-title.page b/help/lv/organize-title.page
new file mode 100644
index 0000000..42aa752
--- /dev/null
+++ b/help/lv/organize-title.page
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="title" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#organize"/>
+        <desc>Dodiet nosaukumus savām fotogrāfijām.</desc>
+        
+        <link type="next" xref="event"/>
+    </info>
+
+	<title>Nosaukumi</title>
+
+<p><guiseq><gui>Skats</gui><gui>Nosaukumi</gui></guiseq> izvēles rūtiņa pārslēdz nosaukumu rādīšanu zem katras fotogrāfijas. Pēc noklusējuma, fotogrāfijas nosaukums ir tās datnes nosaukums.</p>
+
+<p>Lai mainītu fotogrāfijas nosaukumu, izvēlieties fotogrāfiju un spiediet <guiseq><gui>Fotogrāfijas</gui><gui>Rediģēt nosaukumu...</gui></guiseq>, vai spiediet <key>F2</key>.</p>
+
+</page>
diff --git a/help/lv/other-files.page b/help/lv/other-files.page
new file mode 100644
index 0000000..f3d4383
--- /dev/null
+++ b/help/lv/other-files.page
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="other-files" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#other"/>
+        <desc>Saglabāt Shotwell bibliotēku sinhronu ar datnēm diskā.</desc>
+        
+        <link type="next" xref="other-plugins"/>
+    </info>
+
+   <title>Fotogrāfiju datnes</title>
+
+    <p>Katra fotogrāfija Shotwell bibliotēkā atbilst datnei jūsu cietajā diskā. Shotwell ir vairākas iespējas, kas palīdz saglabāt sinhroni Shotwell bibliotēku un datnes diskā.</p>
+    <links type="section"/>
+    
+    <section id="dirpattern">
+        <title>Pielāgota direktoriju šablona izmantošana</title>
+        <p>Shotwell jums ļauj norādīt, kā saglabāt direktorijas jūsu bibliotēkā. Jūs to varat izdarīt, mainot iestatījumus <gui>Direktoriju struktūra</gui> un <gui>Šablons</gui> dialoglodziņā <gui>Iestatījumi</gui>. Jūs varat izmantot iepriekš izveidotus šablonus vai izvēlēties <gui>Pielāgots</gui> un ievadīt paši savu.</p>
+
+        <p>Pieejamie simboli direktoriju šablonam sākas ar % (procentu zīme). Vērtības, ko šie simboli veido, ir atkarīgi no lokalizācijas, tāpēc iegūtie rezultāti uz jūsu datoriem var atšķirties no piemēriem zemāk.</p>
+
+        <table frame="all" rules="rowgroups">
+            <tbody>
+                <tr>
+                    <td><p> </p></td> <td><p><em>Simbols</em></p></td> <td><p><em>Nozīme</em></p></td> <td><p><em>Piemērs</em></p></td>
+                </tr>
+            </tbody>
+            <tbody>
+            <tr>
+                <td><p> </p></td><td><p>%Y</p></td><td><p>Gads: pilns</p></td><td><p>2011</p></td>
+            </tr>
+            <tr>
+                <td><p> </p></td><td><p>%y</p></td><td><p>Gads: divi cipari</p></td><td><p>11</p></td>
+            </tr>
+            <tr>
+                <td><p> </p></td><td><p>%d</p></td><td><p>Mēneša diena, vienmēr divi cipari</p></td><td><p>03</p></td>
+            </tr>
+            <tr>
+                <td><p> </p></td><td><p>%A</p></td><td><p>Dienas nosaukums: pilns</p></td><td><p>Trešdiena</p></td>
+            </tr>
+            <tr>
+                <td><p> </p></td><td><p>%a</p></td><td><p>Dienas nosaukums: saīsināts</p></td><td><p>Tr</p></td>
+            </tr>
+            <tr>
+                <td><p> </p></td><td><p>%m</p></td><td><p>Mēneša numurs, vienmēr divi cipari</p></td><td><p>02</p></td>
+            </tr>
+            <tr><td><p> </p></td><td><p>%b</p></td><td><p>Mēneša nosaukums: saīsināts</p></td><td><p>Feb</p></td></tr><tr><td><p> </p></td><td><p>%B</p></td><td><p>Mēneša nosaukums: pilns</p></td><td><p>Februāris</p></td></tr><tr><td><p> </p></td><td><p>%I</p></td><td><p>Stunda: 12 stundu formāts</p></td><td><p>05</p></td></tr><tr><td><p> </p></td><td><p>%H</p></td><td><p>Stunda: 24 stundu formāts</p></td><td><p>17</p></td></tr><tr><td><p> </p></td><td><p>%M</p></td><td><p>Minūte</p></td><td><p>16</p></td></tr><tr><td><p> </p></td><td><p>%S</p></td><td><p>Sekunde</p></td><td><p>30</p></td></tr><tr><td><p> </p></td><td><p>%p</p></td><td><p>AM vai PM</p></td><td><p>PM</p></td></tr>
+            </tbody>
+        </table>
+
+        <p>Ir pieejami vēl vairāki simboli; skatiet strftime rokasgrāmatu, izpildot komandu <cmd>man strftime</cmd>, ja ir vajadzīgs simbols, kas nav šeit sarakstā.</p>
+    </section>
+
+    <section id="automatic-import">
+       <title>Automātiskā fotogrāfiju importēšana</title>
+       
+       <p>Shotwell var automātiski importēt jaunās fotogrāfijas, kas parādās bibliotēkas direktorijā. Bibliotēkas direktorija parasti ir <file>Attēli</file> direktorija mājas mapē; jūs varat mainīt tās atrašanās vietu logā <gui>Iestatījumi</gui>.</p>
+       
+       <p>Lai ieslēgtu automātisko importēšanu, ieķeksējiet lodziņu <gui>Sekot līdzi jaunām datnēm manā bibliotēkā</gui> logā <gui>Iestatījumi</gui>.</p>
+       
+       <note style="advanced"><p>Shotwell var arī sekot simboliskajām saitēm automātiski importētajās direktorijās.</p></note>
+
+    </section>
+
+    <section id="automatic-rename">
+       <title>Automātiskā importēto fotogrāfiju pārdēvēšana uz mazo burtu reģistru</title>
+       
+       <p>Shotwell var automātiski mainīt importēto fotogrāfiju datņu nosaukumus uz mazo burtu reģistru. Lai to ieslēgtu, izvēlieties <guiseq><gui>Rediģēt</gui><gui>Iestatījumi</gui></guiseq>, logā <gui>Iestatījumi</gui> izvēlieties kasti <gui>Pārdēvēt importētās datnes uz mazajiem burtiem</gui>.</p>
+    
+    </section>
+    
+    <section id="writing-metadata">
+       <title>Metadatu tūlītēja rakstīšana</title>
+       
+       <p>Pēc noklusējuma Shotwell nemaina fotogrāfiju datnes, pat rediģējot fotogrāfijas vai mainot to tagus vai nosaukumus. Shotwell ieraksta šīs izmaiņas tikai savā datubāzē.</p>
+       
+       <p>Lai mainītu šo uzvedību, varat ieslēgt izvēles rūtiņu <gui>Rakstīt tagus, nosaukumus un citus metadatus fotogrāfiju datnēs</gui> dialoglodziņā <gui>Iestatījumi</gui>. Kad šī opcija ir ieslēgta, veicot izmaiņas fotogrāfijā, Shotwell ierakstīs sekojošos metadatus vairumā fotogrāfiju datēs:</p>
+       
+       <list>
+       <item><p>nosaukumi</p></item>
+       <item><p>tagi</p></item>
+       <item><p>vērtējumi</p></item>
+       <item><p>rotācijas informācija</p></item>
+       <item><p>laiks/datums</p></item>
+       </list>
+       
+       <p>Shotwell saglabā šo informāciju fotogrāfiju datnēs EXIF, IPTC un / vai XMP formātos. Ņemiet vērā, ka Shotwell fotogrāfiju datnēs var rakstīt tikai JPEG, PNG un TIFF formātos, bet ne BMP, RAW vai video datnēs.</p>
+    
+    </section>
+    
+    <section id="runtime-monitoring">
+    <title>Izpildlaika pārraudzīšana</title>
+    
+    <p>Kamēr Shotwell ir palaists, tas pamana izmaiņas, kas no ārpuses notiek ar fotogrāfijām. Kad fotogrāfijas datnes mainās, Shotwell pārlasa datni un atjaunina jūsu fotogrāfijas skatu un metadatus.</p>
+    
+    <p>Ņemiet vērā, ka palaižoties Shotwell visās fotogrāfiju datnēs pārbauda, vai ir izmaiņas, bet pēc palaišanās tikai bibliotēkas direktorijas mape tiek uzraudzīta reālā laikā. Mēs ceram nākošajos laidienos šo ierobežojumu noņemt.</p>
+
+    </section>
+    
+</page>
diff --git a/help/lv/other-missing.page b/help/lv/other-missing.page
new file mode 100644
index 0000000..1a78703
--- /dev/null
+++ b/help/lv/other-missing.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="other-missing" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#other"/>
+        <desc>Ja Shotwell nevar atrast fotogrāfiju bibliotēkā, tā tiek atzīmēta kā trūkstoša.</desc>
+        
+        <link type="next" xref="other-multiple"/>
+    </info>
+
+	<title>Trūkstošās fotogrāfijas</title>
+
+<p>Katru reizi, kad Shotwell tiek palaists, tas skenē jūsu fotogrāfiju bibliotēku, lai pārliecinātos, ka fotogrāfijas vēl aizvien atrodas uz cietā diska. Ja Shotwell konstatē, ka kāda fotogrāfija trūkst, tā nebūs redzama parasto fotogrāfiju, notikumu un tagu skatos, bet tiks parādīta atsevišķā “Iztrūkstošās datnes” skatā, kas parādīsies sānu joslā.</p>
+
+<p>Ja vairs nevēlaties redzēt trūkstošās fotogrāfijas savā Shotwell kolekcijā (iespējams, tāpēc, ka esat tās izdzēsis), ejiet uz skatu “Iztrūkstošās datnes”, izvēlieties fotogrāfijas un spiediet <gui>Izņemt no bibliotēkas</gui>.</p>
+
+<p>Ja jūsu fotogrāfijas ir uz noņemamiem datu nesējiem, piemēram, CD vai USB zibatmiņām, un esat tās <link xref="index#import">importējis</link> Shotwell tās <em>nekopējot</em> uz savu datoru, tās parādīsies kā trūkstošas datnes, ja atvienojāt noņemamo disku. Skatiet <link xref="import-file"/>, lai uzzinātu, kā kopēt datnes no noņemamiem diskiem uz savu datoru.</p>
+
+<p>Ja kāda no trūkstošajām fotogrāfijām atkal kļūs pieejama, Shotwell to pamanīs nākamajā startēšanās reizē. Šīs fotogrāfijas atkal parādīsies fotogrāfiju, notikumu un tagu skatos.</p>
+
+</page>
diff --git a/help/lv/other-multiple.page b/help/lv/other-multiple.page
new file mode 100644
index 0000000..57ac5a1
--- /dev/null
+++ b/help/lv/other-multiple.page
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="other-multiple" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#other"/>
+        <desc>Jūs varat atvērt Shotwell ar citu fotogrāfiju bibliotēku, izmantojot komandrindu.</desc>
+        
+        <link type="next" xref="other-files"/>
+    </info>
+
+	<title>Vairākas bibliotēkas</title>
+
+<p>Shotwell parasti saglabā savu datubāzi un fotogrāfiju sīktēlus direktorijā <file>~/.shotwell</file> . Šajā direktorijā nav fotogrāfiju, bet tajā esošā datubāze satur sarakstu ar visām fotogrāfijām Shotwell bibliotēkā.</p>
+
+<p>Šī iespēja ir domāta lietpratējiem — ir iespējams uzturēt vairākas Shotwell bibliotēkas, kur katrai no tām ir sava fotogrāfiju kopa. Katrai bibliotēkai ir vajadzīga sava datubāzes direktorija. Lai palaistu Shotwell ar citu bibliotēku, norādiet tās datubāzes direktoriju komandrindā šādi:</p>
+
+<screen>
+shotwell -d [bibliotēkas-direktorija]
+</screen>
+
+</page>
diff --git a/help/lv/other-plugins.page b/help/lv/other-plugins.page
new file mode 100644
index 0000000..0f10ab3
--- /dev/null
+++ b/help/lv/other-plugins.page
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="other-plugins" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#other"/>
+        <desc>Dinamiski izvērst Shotwell funkcionalitāti.</desc>
+        
+        <link type="next" xref="other-missing"/>
+    </info>
+
+	<title>Spraudņi</title>
+        <p>Shotwell var lietot ar <em>spraudņiem</em>, kas ir koplietotās bibliotēkas, kas var pievienot atbalstu jauniem publicēšanas mērķiem vai jaunām slaidrādes pārejām.</p>
+        
+        <p>Lai redzētu instalēto spraudņu sarakstu, izvēlieties <guiseq><gui>Rediģēt</gui><gui>Iestatījumi</gui></guiseq>, un logā <gui>Iestatījumi</gui> spiediet uz cilni <gui>Spraudņi</gui>. Tur būs redzami pašlaik instalētie spraudņi un tiem blakus izvēles rūtiņu. Jūs varat ieslēgt vai izslēgt katru no tiem, ieķeksējot vai noņemot ķeksi no attiecīgās izvēles rūtiņas.</p>
+        
+        <note style="advanced"><p>Pilna informācija par to, kā izstrādāt spraudņus, ir pieejama <link href="http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins">http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins</link></p></note>
+    
+</page>
diff --git a/help/lv/raw.page b/help/lv/raw.page
new file mode 100644
index 0000000..fc434a8
--- /dev/null
+++ b/help/lv/raw.page
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="other-raw" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#other"/>
+        <desc>Vairāk par RAW atbalstu Shotwell lietotnē.</desc>
+        
+        <link type="next" xref="running"/>
+    </info>
+   
+    <title>RAW atbalsts Shotwell lietotnē</title> 
+    <p>Dažas kameras var datus no sensora saglabāt pa tiešo datnē, kas satur papildu krāsu informāciju; tos parasti dēvē par “RAW” (jēlie) vai “kameras RAW”, un Shotwell atbalsta arī šīs datnes.</p>
+    
+    <p>Tā kā RAW fotogrāfijas nevar attēlot tiešā veidā, tās vispirms ir jāattīsta — tas ir, tās papildu informācija ir jālasa un jāinterpretē attēlošanai. Vairums kameru vai nu ieguls JPEG iekšā RAW datnē, vai izveidos gan RAW, gan JPEG datnes vienam un tam pašam kadram. Otrais risinājums šajā dokumentā tiks apzīmēts kā RAW+ JPEG. Ja importēsiet RAW+JPEG pāri, Shotwell tos paturēs sapārotus un bibliotēkā tie parādīsies kā viens vienums.</p>
+    
+    <p>Importējot RAW datni, jūs varat izvēlēties vai nu izmantot kameras iekšēji attīstīto JPEG vai Shotwell attīstīto, izvēlnēs izvēloties <guiseq><gui>Fotogrāfijas</gui><gui>Attīstītājs</gui></guiseq>.</p>
+
+    <note>
+        <p>Attīstītāju mainīšana var atcelt visas fotogrāfijās veiktās izmaiņas.</p>
+    </note>
+    
+    <p>Lai publicētu vai lietotu RAW fotogrāfijas vairumā lietotņu, tās vispirms ir jāeksportē. Shotwell var eksportēt RAW fotogrāfijas JPEG, PNG, TIFF un BMP formātos. Publicējot tās tiks eksportētas JPEG formātā.</p>  
+    
+</page>
diff --git a/help/lv/running.page b/help/lv/running.page
new file mode 100644
index 0000000..3f52af3
--- /dev/null
+++ b/help/lv/running.page
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="running" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index"/>
+        <desc>Atrodiet Shotwell lietotņu izvēlnē, vai arī palaidiet to, pievienojot kameru.</desc>
+        
+        <link type="seealso" xref="other-multiple"/>
+        
+        <link type="next" xref="formats"/>
+    </info>
+
+	<title>Shotwell darbināšana</title>
+
+<p>Kad Shotwell ir uzinstalēts, tas ir pieejams izvēlnē <gui>Lietotnes</gui> zem <gui>Grafika</gui> vai <gui>Fotogrāfija</gui>.</p>
+
+<p>Shotwell var tikt palaist automātiski, kad kamera ir pievienota datoram. Lai pārbaudītu, vai sistēma palaidīs Shotwell, kad ir atklāta kamera, ejiet uz <guiseq><gui>Rediģēt</gui><gui>Iestatījumi</gui></guiseq> jebkurā Nautilus (datņu pārlūka) logā un izvēlieties cilni <gui>Datu nesēji</gui>. Tur būs redzams izkrītošais saraksts ar nosaukumu <gui>Fotogrāfijas:</gui>, kas ļauj izvēlēties Shotwell kā lietotni, kas apstrādā fotogrāfijas.</p>
+
+<note style="advanced">
+ <p>Shotwell var arī palaist no tās būvēšanas direktorijas, lai gan to iesaka darīt tikai Shotwell testēšanai vai izstrādāšanai.</p>
+</note>
+   
+</page>
diff --git a/help/lv/share-background.page b/help/lv/share-background.page
new file mode 100644
index 0000000..c5ac640
--- /dev/null
+++ b/help/lv/share-background.page
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="share-background" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#share"/>
+        <desc>Iestatīt darbvirsmas fonā fotogrāfiju vai fotogrāfiju slaidrādi.</desc>
+        
+        <link type="next" xref="share-slideshow"/>
+    </info>
+
+	<title>Iestatīt darbvirsmas fonu vai slaidrādi</title>
+
+    <p>Lai iestatītu vienu fotogrāfiju kā fona attēlu, izvēlieties fotogrāfiju un izvēlieties <guiseq><gui>Datne</gui><gui>Iestatīt kā darbvirsmas fonu</gui></guiseq>.</p>
+    
+    <p>Jūs varat arī iestatīt fonu kā fotogrāfiju slaidrādi. Lai to izdarītu, izvēlieties fotogrāfijas slaidrādei un izvēlieties <guiseq><gui>Datne</gui><gui>Iestatīt kā darbvirsmas slaidrādi...</gui></guiseq>. Shotwell vaicās, cik ilgai ir jābūt slaidrādes aizturei, kas var būt līdz vienai dienai. Fona slaidrāde strādās arī tad, kad Shotwell nav palaists.</p>
+    
+</page>
diff --git a/help/lv/share-export.page b/help/lv/share-export.page
new file mode 100644
index 0000000..139a0a7
--- /dev/null
+++ b/help/lv/share-export.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="share-export" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#share"/>
+        <desc>Kopēt fotogrāfijas ārā no Shotwell, lai tās varētu novietot kur citur.</desc>
+        
+        <link type="next" xref="share-print"/>
+    </info>
+
+	<title>Fotogrāfiju eksportēšana</title>
+
+<p>Lai eksportētu fotogrāfijas no Shotwell ar vilkšanas-nomešanas metodi, velciet fotogrāfijas no Shotwell uz datņu pārvaldnieka logu savā darbvirsmā. Jaunās datnes būs pilna izmēra kopijas fotogrāfijām bibliotēkā.</p>
+
+<p>Varat arī izvēlēties noteiktas fotogrāfijas un izvēlēties <guiseq><gui>Datne</gui><gui>Eksportēt...</gui></guiseq> komandu vai spiest <keyseq><key>Shift</key><key>Ctrl</key><key>E</key></keyseq>,  kas eksportē fotogrāfijas, ļaujot precizēt foto datņu izmērus un dimensijas. Parādīsies logs, kas ļauj veikt vairākas izvēles:</p>
+
+<list>
+<item><p>Formāts, uz kuru eksportēt.</p>
+<list>
+<item><p>Izvēlieties <gui>Nemainīts</gui>, lai eksportētu fotogrāfijas to sākotnējā formātā, bez izmaiņām, kas veiktas ar Shotwell. RAW fotogrāfijas tiks eksportētas RAW formātā.</p></item>
+<item><p>Izvēlieties <gui>Pašreizējais</gui> lai eksportētu fotogrāfijas ar izmaiņām, kas veiktas Shotwell. RAW fotogrāfijas tiks eksportētas JPEG formātā, ja esat tās rediģējuši ar Shotwell, citādi tās paliks sākotnējā RAW formātā.</p></item>
+<item><p>Jūs varat izvēlēties noteiktu attēlu formātu (JPEG, PNG, TIFF, BMP), ko izmantot eksportēšanā. Tiks iekļautas visas izmaiņas, kas ir veiktas ar Shotwell un fotogrāfijas tiks konvertētas uz mērķa formātu.</p></item>
+</list>
+</item>
+<item><p>Attēlu kvalitāte eksportējot (zema, vidēja, augsta vai maksimāla).</p></item>
+<item><p>Mēroga ierobežojums (kas norāda, kā Shotwell izlems samazināt fotogrāfijas) un vēlamais pikseļu izmērs.</p></item>
+<item><p>Opcija, vai vēlaties eksportēt metadatus, piemēram, tagus un vērtējumus. Tas var palīdzēt saglabāt privātumu, ja jums ir ģeolokācijas tagi vai tādi tagi, ko citiem nevajadzētu redzēt.</p></item>
+</list>
+
+<p>Ja ir izvēlēts, Shotwell ierakstīs tagus, nosaukumus un citus metadatus jaunajās datnēs.</p>
+
+</page>
diff --git a/help/lv/share-print.page b/help/lv/share-print.page
new file mode 100644
index 0000000..bae8538
--- /dev/null
+++ b/help/lv/share-print.page
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="share-print" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#share"/>
+        <desc>Spiediet <guiseq><gui>Datne</gui><gui>Drukāt...</gui></guiseq>. Lai piekļūtu papildu drukāšanas opcijām, dialoglodziņā <gui>Drukāt</gui> izvēlieties cilni <gui>Lappuses iestatīšana</gui>.</desc>
+        
+        <link type="next" xref="share-upload"/>
+    </info>
+
+	<title>Drukāšana</title>
+
+    <p>Lai izdrukātu fotogrāfiju, atlasiet to un izvēlieties <guiseq><gui>Datne</gui><gui>Drukāt...</gui></guiseq>.</p>
+     
+    <p>Shotwell var arī izdrukāt vairākus attēlus vienā lappusē. Lai to izdarītu, izvēlieties vairākus attēlus, izvēlieties <guiseq><gui>Datne</gui><gui>Drukāt...</gui></guiseq>, un dialoglodziņā <gui>Drukāt</gui> izvēlieties <gui>Attēla iestatījumi</gui> cilni. Šajā cilnē sadaļā <gui>Automātiskais izmērs</gui> izvēlieties kādu no vairāku attēlu izkārtošanas opcijām.</p>
+
+    <p>Ja vēlaties iestatīt formatējumu, papīra izmēru un orientācijas opcijas, pirms drukāšanas dialoglodziņā <gui>Drukāt</gui> izvēlieties cilni<gui>Lappuses iestatīšana</gui>.</p>
+</page>
diff --git a/help/lv/share-send.page b/help/lv/share-send.page
new file mode 100644
index 0000000..828e41e
--- /dev/null
+++ b/help/lv/share-send.page
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="share-send" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#share"/>
+        <desc>Sūtīt fotogrāfijas pa e-pastu, tūlītējo ziņojumapmaiņu vai citos veidos.</desc>
+        
+        <link type="next" xref="share-background"/>
+    </info>
+
+	<title>Fotogrāfiju sūtīšana</title>
+
+    <p>Shotwell var sūtīt fotogrāfijas, izmantojot GNOME darbvirsmas “Sūtīt uz” mehānismu, kas jums ļauj sūtīt fotogrāfijas caur e-pastu, tūlītējo ziņojumapmaiņu un citos veidos.</p>
+    <p>Lai sūtītu fotogrāfijas, atlasiet tās Shotwell lietotnē un izvēlieties <guiseq><gui>Datne</gui><gui>Sūtīt uz...</gui></guiseq>, vai spiediet labo peles klikšķi uz fotogrāfijām un izvēlieties <gui>Sūtīt uz...</gui> konteksta izvēlnē. Parādīsies dialoglodziņš <gui>Sūtīt uz</gui>, kas ļauj izvēlēties datņu sūtīšanas mehānismu (piemēram, e-pasts vai tūlītējā ziņojumapmaiņa) un gala mērķi. Jūs varat arī izvēlēties sūtīt datnes saspiestā formātā.</p>
+    
+</page>
diff --git a/help/lv/share-slideshow.page b/help/lv/share-slideshow.page
new file mode 100644
index 0000000..ba3a4ce
--- /dev/null
+++ b/help/lv/share-slideshow.page
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="share-slideshow" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#share"/>
+        <desc>Skatieties savu fotogrāfiju slaidrādi.</desc>
+        
+        <link type="next" xref="share-export"/>
+    </info>
+
+	<title>Slaidrādes</title>
+
+    <p>Lai Shotwell lietotnē redzētu kādas kolekcijas slaidrādi, ejiet uz kolekciju un izvēlieties <guiseq><gui>Skats</gui><gui>Slaidrāde</gui></guiseq> vai spiediet <key>F5</key>.</p>
+    
+    <p>Aktīvā slaidrādē varat mainīt dažus iestatījumus:</p>
+    
+    <list>
+    <item><p>Laiku, cik ilgi būs redzams attēls: 1–30 sekundes</p></item>
+    <item><p>Varat izvēlēties dažādus pārejas efektus.</p></item>
+    <item><p>Laiks katram pārejas efektam: 0,1–1,0 sekundes</p></item>
+    </list>
+</page>
diff --git a/help/lv/share-upload.page b/help/lv/share-upload.page
new file mode 100644
index 0000000..d3977ad
--- /dev/null
+++ b/help/lv/share-upload.page
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="share-upload" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#share"/>
+        <desc>Publicēt fotogrāfijas Facebook, Flickr, Picasa Web Albums un citās vietnēs.</desc>
+        
+        <link type="next" xref="share-send"/>
+    </info>
+
+	<title>Publicēšana tīmeklī</title>
+
+    <p>Izmantojot <link xref="other-plugins">spraudņus</link>, Shotwell var publicēt fotogrāfijas un video uz sekojošajiem pakalpojumiem, kur katram ir nepieciešams konts:</p>
+    
+    <list>
+    <item><p><link href="http://facebook.com">Facebook</link></p></item>
+    <item><p><link href="http://flickr.com">Flickr</link></p></item>
+    <item><p><link href="http://picasaweb.google.com">Picasa Web Albums</link> un <link href="http://plus.google.com">Google+</link></p></item>
+    <item><p><link href="http://youtube.com">YouTube</link> (tikai video)</p></item>
+    <item><p><link href="http://fotki.yandex.ru">Yandex.Fotki</link>, Krievijā populāra fotogrāfiju vietne (tikai fotogrāfijas)</p></item>
+    <item><p>Jebkura vietne, kas izmanto <link href="http://piwigo.org">Piwigo</link> fotogrāfiju galerijas programmatūru (tikai fotogrāfijas)</p></item>
+    </list>
+    
+    <p>Lai publicētu kolekcijā izvēlētās fotogrāfijas, izvēlieties <guiseq><gui>Rediģēt</gui><gui>Iestatījumi</gui></guiseq> un spiediet cilni <gui>Spraudņi</gui>, lai ieslēgtu tā pakalpojuma spraudni, kurā publicēt. Pēc tam izvēlieties <guiseq><gui>Datne</gui><gui>Publicēt</gui></guiseq>, spiediet rīkjoslas pogu <gui>Publicēt</gui> vai izmantojiet <keyseq><key>Ctrl</key><key>P</key></keyseq>. Parādīsies dialoglodziņš, kas ļauj izvēlēties publicēšanas pakalpojumu. Pēc tam jums vajadzēs ierakstīties vai izveidot kontu.</p>
+    
+    <p>Lai publicētu Facebook vietnē Shotwell Facebook lietotnei vajag īpašas atļaujas. Šīs atļaujas ir jādod tikai vienreiz, kad asociējat Shotwell ar savu Facebook kontu.</p>
+    <note style="advanced"><p>Jūs varēsiet publicēt attēlus ar tām tiesībām, kādas sniedzāt Shotwell Facebook lietotnei</p></note>
+    
+    <p>Līdzīgi, publicēšanai Flickr vietnē vajag ierakstīties un ļaut Shotwell savienojumiem piekļūt jūsu kontam.</p>
+    
+    <p>Ja jums ir Google konts, bet vēl neesat izmantojis Picasa Web Albums, jums vienreiz jāierakstās Picasa, izmantojot pārlūku, pirms varēsiet publicēt šajā pakalpojumā.</p>
+</page>
diff --git a/help/lv/view-displaying.page b/help/lv/view-displaying.page
new file mode 100644
index 0000000..b64f52b
--- /dev/null
+++ b/help/lv/view-displaying.page
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="view-view" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#view"/>
+        <desc>Uzziniet par dažādiem veidiem, kā skatīt fotogrāfijas — režģī, aizpildot galveno logu vai aizpildot visu ekrānu.</desc>
+        
+        <link type="next" xref="view-sidebar"/>
+    </info>
+
+	<title>Fotogrāfiju skati</title>
+
+<p>Izvēloties kādu kolekciju sānu joslā, Shotwell attēlos visas šīs kolekcijas fotogrāfijas galvenajā loga daļā. Loga apakšējā labajā pusē ri slīdnis, ar ko var pielāgot sīktēlu izmēru. Varat sīktēlu izmēru pielāgot arī ar pluss un mīnuss taustiņiem (<key>+</key> un <key>-</key>) vai spiežot <key>Ctrl</key> un kustinot peles riteni.</p>
+
+<p>Jūs varat arī skatīt fotogrāfijas pilnekrāna režīmā, uz tām dubultklikšķinot. Šajā režīmā jūs varat pāriet starp fotogrāfijām, izmantojot bultiņu pogas. Lai atgrieztos kolekcijā, dubultklikšķiniet uz fotogrāfijas vai spiediet <key>Esc</key>.</p>
+
+<p>Kad attēls tiek skatīts pilnekrāna režīmā, rīkjoslā esošais slīdnis nosaka tuvinājumu. Jūs varat panoramēt, sagrābjot un velkot jebkuru vietu fotogrāfijā. Jūs varat arī mainīt mērogu, izmantojot peles riteni vai spiežot šīs saīsnes: <keyseq><key>Ctrl</key>0</keyseq> lai redzētu pilnekrānā, <keyseq><key>Ctrl</key>1</keyseq> 100% tuvinājumam (1 fotogrāfijas pikselis = 1 ekrāna pikseli), un <keyseq><key>Ctrl</key>2</keyseq> 200% tuvinājumam (1 fotogrāfijas pikselis = 2x2 ekrāna pikseļiem).</p>
+
+<p>Shotwell piedāvā iespēju attēlot fotogrāfijas pilnekrāna režīmā. Izvēlieties <guiseq><gui>Skats</gui><gui>Pilnekrāns</gui></guiseq> vai spiediet <key>F11</key>. Lai redzētu pilnekrāna rīkjoslu, novietojiet peli ekrāna apakšpusē. Rīkjosla piedāvā pogas, ar kurām var pārvietoties pa kolekciju, nofiksēt rīkjoslu (lai tā nepazūd, kad pārvietojat peli kur citur), un pamest pilnekrāna skatu.</p>
+
+<section>
+<title>Video atskaņošana</title>
+<p>Dubultklikšķinot uz video, Shotwell palaidīs ārējo video atskaņotāju, lai atskaņotu video. Pašlaik nevar attēlot video Shotwell pilnekrāna režīmā, vai atskaņot video pašā Shotwell.</p>
+</section>
+    
+</page>
diff --git a/help/lv/view-information.page b/help/lv/view-information.page
new file mode 100644
index 0000000..ff77208
--- /dev/null
+++ b/help/lv/view-information.page
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="view-information" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#view"/>
+        <desc>Skatīt sīkāku informāciju par fotogrāfijām, piemēram, kameras ekspozīcijas režīmu.</desc>
+        
+        <link type="next" xref="view-view"/>
+    </info>
+
+	<title>Pamata un paplašinātā informācija</title>
+
+<p>Pamatinformācijas rūts parādās sānu joslas apakšpusē un attēlo īsu kopsavilkumu par izvēlētajām fotogrāfijām. Ja nav izvēlētu fotogrāfiju, tas attēlo visas kolekcijas kopsavilkumu. Jūs varat pārslēgt šīs rūts attēlošanu, izmantojot komandu <guiseq><gui>Skats</gui><gui>Pamatinformācija</gui></guiseq></p>
+
+<p>Peldošais paplašinātās informācijas logs attēlo vairāk informācijas par izvēlēto fotogrāfiju. <guiseq><gui>Skats</gui><gui>Paplašināta informācija</gui></guiseq> komanda vai <keyseq><key>Ctrl</key><key>Shift</key><key>X</key></keyseq> pārslēdz šī loga attēlošanu.</p>
+
+</page>
diff --git a/help/lv/view-sidebar.page b/help/lv/view-sidebar.page
new file mode 100644
index 0000000..53dbdc5
--- /dev/null
+++ b/help/lv/view-sidebar.page
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page xmlns="http://projectmallard.org/1.0/" type="guide" id="view-sidebar" xml:lang="lv">
+
+    <info>
+        <link type="guide" xref="index#view"/>
+        <desc>Sānjosla loga kreisajā pusē parāda dažādus jūsu bibliotēkas skatus.</desc>
+        
+        <link type="seealso" xref="event"/>
+        <link type="seealso" xref="tag"/>
+        <link type="seealso" xref="flag"/>
+        <link type="seealso" xref="search#savedsearch"/>
+        <link type="seealso" xref="import-file"/>
+        <link type="seealso" xref="import-f-spot"/>
+        <link type="seealso" xref="import-memorycard"/>
+        <link type="seealso" xref="import-camera"/>
+        
+        <link type="next" xref="view-information"/>
+    </info>
+
+	<title>Sānjosla</title>
+
+<p>Sānjosla kreisajā Shotwell loga pusē uzskaita vairākus jūsu bibliotēkas skatus. Lai gan varat redzēt vienu un to pašu fotogrāfiju dažādos skatos, cietajā diskā tā tiek saglabāta tikai vienā vietā.</p>
+
+<p>Skatā <gui>Pēdējais imports</gui> ir redzamas fotogrāfijas, kas ir importētas neatkarīgi no tā, vai tās ir importētas no F-Spot, kameras, atmiņas kartes vai cietā diska.</p>
+
+<p><gui>Ar karodziņu</gui> uzrāda visas fotogrāfijas, kas ir iepriekš atzīmētas ar karodziņu.</p>
+
+<p><gui>Saglabātie meklējumi</gui> jums ļauj kārtot bibliotēku pēc vairākiem kritērijiem.</p>
+
+<p>Mapē <gui>Notikumi</gui> ir atrodami visi notikumi jūsu bibliotēkā. Notikums ir fotogrāfiju kopums, kas ir uzņemts aptuveni vienā laikā.</p>
+
+<p>Mapē <gui>Tagi</gui> ir visi tagi, kas ir piešķirti fotogrāfijām. Fotogrāfijām var būt piešķirti vairāki tagi. Sānu joslā spiežot uz taga nosaukuma, redzēsiet visas fotogrāfijas, kurām ir šie tagi.</p>
+
+</page>
diff --git a/plugins/common/BuilderPane.c b/plugins/common/BuilderPane.c
new file mode 100644
index 0000000..a278bed
--- /dev/null
+++ b/plugins/common/BuilderPane.c
@@ -0,0 +1,632 @@
+/* BuilderPane.c generated by valac 0.34.2, the Vala compiler
+ * generated from BuilderPane.vala, do not modify */
+
+/* Copyright 2016 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include "shotwell-plugin-dev-1.0.h"
+#include <gtk/gtk.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+#define SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE (shotwell_plugins_common_builder_pane_get_type ())
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane))
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPaneClass))
+#define SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE))
+#define SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE))
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPaneClass))
+
+typedef struct _ShotwellPluginsCommonBuilderPane ShotwellPluginsCommonBuilderPane;
+typedef struct _ShotwellPluginsCommonBuilderPaneClass ShotwellPluginsCommonBuilderPaneClass;
+typedef struct _ShotwellPluginsCommonBuilderPanePrivate ShotwellPluginsCommonBuilderPanePrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+struct _ShotwellPluginsCommonBuilderPane {
+	GObject parent_instance;
+	ShotwellPluginsCommonBuilderPanePrivate * priv;
+};
+
+struct _ShotwellPluginsCommonBuilderPaneClass {
+	GObjectClass parent_class;
+	GtkWidget* (*get_default_widget) (ShotwellPluginsCommonBuilderPane* self);
+	void (*on_pane_installed) (ShotwellPluginsCommonBuilderPane* self);
+	void (*on_pane_uninstalled) (ShotwellPluginsCommonBuilderPane* self);
+};
+
+struct _ShotwellPluginsCommonBuilderPanePrivate {
+	SpitPublishingDialogPaneGeometryOptions _preferred_geometry;
+	gchar* _resource_path;
+	gboolean _connect_signals;
+	gchar* _default_id;
+	GtkBuilder* builder;
+	GtkWidget* content;
+};
+
+
+static gpointer shotwell_plugins_common_builder_pane_parent_class = NULL;
+static SpitPublishingDialogPaneIface* shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+
+GType shotwell_plugins_common_builder_pane_get_type (void) G_GNUC_CONST;
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPanePrivate))
+enum  {
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DUMMY_PROPERTY,
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY,
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH,
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS,
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID
+};
+static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base);
+gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self);
+gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self);
+static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
+SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self);
+static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPublishingDialogPane* base);
+GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self);
+GtkWidget* shotwell_plugins_common_builder_pane_get_default_widget (ShotwellPluginsCommonBuilderPane* self);
+static GtkWidget* shotwell_plugins_common_builder_pane_real_get_default_widget (ShotwellPluginsCommonBuilderPane* self);
+gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self);
+void shotwell_plugins_common_builder_pane_on_pane_installed (ShotwellPluginsCommonBuilderPane* self);
+static void shotwell_plugins_common_builder_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* self);
+void shotwell_plugins_common_builder_pane_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self);
+static void shotwell_plugins_common_builder_pane_real_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self);
+ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct (GType object_type);
+static void shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self, SpitPublishingDialogPaneGeometryOptions value);
+static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self, const gchar* value);
+static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self, gboolean value);
+static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self, const gchar* value);
+static void shotwell_plugins_common_builder_pane_finalize (GObject* obj);
+static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 93 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_real_constructed (GObject* base) {
+	ShotwellPluginsCommonBuilderPane * self;
+	gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	GtkBuilder* _tmp6_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	GtkBuilder* _tmp9_ = NULL;
+	GObject* _tmp10_ = NULL;
+	GtkWidget* _tmp11_ = NULL;
+	GtkWidget* _tmp12_ = NULL;
+	GtkContainer* _tmp13_ = NULL;
+	GtkContainer* _tmp14_ = NULL;
+#line 22 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
+#line 23 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	G_OBJECT_CLASS (shotwell_plugins_common_builder_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject));
+#line 25 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = shotwell_plugins_common_builder_pane_get_resource_path (self);
+#line 25 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp1_ = _tmp0_;
+#line 25 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp2_ = _tmp1_;
+#line 25 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_debug ("BuilderPane.vala:25: Adding new builder from path %s", _tmp2_);
+#line 25 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_g_free0 (_tmp2_);
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp3_ = shotwell_plugins_common_builder_pane_get_resource_path (self);
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp4_ = _tmp3_;
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp5_ = _tmp4_;
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp6_ = gtk_builder_new_from_resource (_tmp5_);
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_g_object_unref0 (self->priv->builder);
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self->priv->builder = _tmp6_;
+#line 27 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_g_free0 (_tmp5_);
+#line 28 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp7_ = self->priv->_connect_signals;
+#line 28 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	if (_tmp7_) {
+#line 145 "BuilderPane.c"
+		GtkBuilder* _tmp8_ = NULL;
+#line 29 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		_tmp8_ = self->priv->builder;
+#line 29 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		gtk_builder_connect_signals (_tmp8_, NULL);
+#line 151 "BuilderPane.c"
+	}
+#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp9_ = self->priv->builder;
+#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp10_ = gtk_builder_get_object (_tmp9_, "content");
+#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp10_) : NULL);
+#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_g_object_unref0 (self->priv->content);
+#line 32 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self->priv->content = _tmp11_;
+#line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp12_ = self->priv->content;
+#line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp13_ = gtk_widget_get_parent (_tmp12_);
+#line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp14_ = _tmp13_;
+#line 35 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	if (_tmp14_ != NULL) {
+#line 171 "BuilderPane.c"
+		GtkWidget* _tmp15_ = NULL;
+		GtkContainer* _tmp16_ = NULL;
+		GtkContainer* _tmp17_ = NULL;
+		GtkWidget* _tmp18_ = NULL;
+#line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		_tmp15_ = self->priv->content;
+#line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		_tmp16_ = gtk_widget_get_parent (_tmp15_);
+#line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		_tmp17_ = _tmp16_;
+#line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		_tmp18_ = self->priv->content;
+#line 36 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		gtk_container_remove (_tmp17_, _tmp18_);
+#line 186 "BuilderPane.c"
+	}
+}
+
+
+static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+	ShotwellPluginsCommonBuilderPane * self;
+	SpitPublishingDialogPaneGeometryOptions result = 0;
+	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+#line 40 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
+#line 41 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = self->priv->_preferred_geometry;
+#line 41 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	result = _tmp0_;
+#line 41 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	return result;
+#line 203 "BuilderPane.c"
+}
+
+
+static GtkWidget* shotwell_plugins_common_builder_pane_real_get_widget (SpitPublishingDialogPane* base) {
+	ShotwellPluginsCommonBuilderPane * self;
+	GtkWidget* result = NULL;
+	GtkWidget* _tmp0_ = NULL;
+	GtkWidget* _tmp1_ = NULL;
+#line 44 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
+#line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = self->priv->content;
+#line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	result = _tmp1_;
+#line 45 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	return result;
+#line 222 "BuilderPane.c"
+}
+
+
+GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self) {
+	GtkBuilder* result = NULL;
+	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp1_ = NULL;
+#line 48 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
+#line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = self->priv->builder;
+#line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	result = _tmp1_;
+#line 49 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	return result;
+#line 240 "BuilderPane.c"
+}
+
+
+static GtkWidget* shotwell_plugins_common_builder_pane_real_get_default_widget (ShotwellPluginsCommonBuilderPane* self) {
+	GtkWidget* result = NULL;
+	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	GObject* _tmp5_ = NULL;
+	GtkWidget* _tmp6_ = NULL;
+	GtkWidget* _tmp7_ = NULL;
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = shotwell_plugins_common_builder_pane_get_builder (self);
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp1_ = _tmp0_;
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp2_ = shotwell_plugins_common_builder_pane_get_default_id (self);
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp3_ = _tmp2_;
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp4_ = _tmp3_;
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp5_ = gtk_builder_get_object (_tmp1_, _tmp4_);
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp5_) : NULL);
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp7_ = _tmp6_;
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_g_free0 (_tmp4_);
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_g_object_unref0 (_tmp1_);
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	result = _tmp7_;
+#line 53 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	return result;
+#line 278 "BuilderPane.c"
+}
+
+
+GtkWidget* shotwell_plugins_common_builder_pane_get_default_widget (ShotwellPluginsCommonBuilderPane* self) {
+#line 52 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
+#line 52 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	return SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS (self)->get_default_widget (self);
+#line 287 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* self) {
+}
+
+
+void shotwell_plugins_common_builder_pane_on_pane_installed (ShotwellPluginsCommonBuilderPane* self) {
+#line 56 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
+#line 56 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS (self)->on_pane_installed (self);
+#line 300 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_real_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self) {
+}
+
+
+void shotwell_plugins_common_builder_pane_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self) {
+#line 58 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
+#line 58 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS (self)->on_pane_uninstalled (self);
+#line 313 "BuilderPane.c"
+}
+
+
+ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct (GType object_type) {
+	ShotwellPluginsCommonBuilderPane * self = NULL;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self = (ShotwellPluginsCommonBuilderPane*) g_object_new (object_type, NULL);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	return self;
+#line 323 "BuilderPane.c"
+}
+
+
+SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self) {
+	SpitPublishingDialogPaneGeometryOptions result;
+	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), 0);
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = self->priv->_preferred_geometry;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	result = _tmp0_;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	return result;
+#line 338 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_set_preferred_geometry (ShotwellPluginsCommonBuilderPane* self, SpitPublishingDialogPaneGeometryOptions value) {
+	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = value;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self->priv->_preferred_geometry = _tmp0_;
+#line 11 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_object_notify ((GObject *) self, "preferred-geometry");
+#line 352 "BuilderPane.c"
+}
+
+
+gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self) {
+	gchar* result;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = self->priv->_resource_path;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	result = _tmp1_;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	return result;
+#line 370 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_set_resource_path (ShotwellPluginsCommonBuilderPane* self, const gchar* value) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = value;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_g_free0 (self->priv->_resource_path);
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self->priv->_resource_path = _tmp1_;
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_object_notify ((GObject *) self, "resource-path");
+#line 389 "BuilderPane.c"
+}
+
+
+gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self) {
+	gboolean result;
+	gboolean _tmp0_ = FALSE;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), FALSE);
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = self->priv->_connect_signals;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	result = _tmp0_;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	return result;
+#line 404 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_set_connect_signals (ShotwellPluginsCommonBuilderPane* self, gboolean value) {
+	gboolean _tmp0_ = FALSE;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = value;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self->priv->_connect_signals = _tmp0_;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_object_notify ((GObject *) self, "connect-signals");
+#line 418 "BuilderPane.c"
+}
+
+
+gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self) {
+	gchar* result;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self), NULL);
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = self->priv->_default_id;
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	result = _tmp1_;
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	return result;
+#line 436 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_set_default_id (ShotwellPluginsCommonBuilderPane* self, const gchar* value) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE (self));
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = value;
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_g_free0 (self->priv->_default_id);
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self->priv->_default_id = _tmp1_;
+#line 16 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_object_notify ((GObject *) self, "default-id");
+#line 455 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_class_init (ShotwellPluginsCommonBuilderPaneClass * klass) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	shotwell_plugins_common_builder_pane_parent_class = g_type_class_peek_parent (klass);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_type_class_add_private (klass, sizeof (ShotwellPluginsCommonBuilderPanePrivate));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	((GObjectClass *) klass)->constructed = shotwell_plugins_common_builder_pane_real_constructed;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	((ShotwellPluginsCommonBuilderPaneClass *) klass)->get_default_widget = shotwell_plugins_common_builder_pane_real_get_default_widget;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = shotwell_plugins_common_builder_pane_real_on_pane_installed;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_uninstalled = shotwell_plugins_common_builder_pane_real_on_pane_uninstalled;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	G_OBJECT_CLASS (klass)->get_property = _vala_shotwell_plugins_common_builder_pane_get_property;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	G_OBJECT_CLASS (klass)->set_property = _vala_shotwell_plugins_common_builder_pane_set_property;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	G_OBJECT_CLASS (klass)->finalize = shotwell_plugins_common_builder_pane_finalize;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH, g_param_spec_string ("resource-path", "resource-path", "resource-path", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS, g_param_spec_boolean ("connect-signals", "connect-signals", "connect-signals", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID, g_param_spec_string ("default-id", "default-id", "default-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 486 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_real_get_preferred_geometry;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_real_get_widget;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_on_pane_installed;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_builder_pane_on_pane_uninstalled;
+#line 501 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_instance_init (ShotwellPluginsCommonBuilderPane * self) {
+	gchar* _tmp0_ = NULL;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self->priv = SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_PRIVATE (self);
+#line 10 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self->priv->_preferred_geometry = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
+#line 14 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self->priv->_connect_signals = FALSE;
+#line 15 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_tmp0_ = g_strdup ("default");
+#line 15 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self->priv->_default_id = _tmp0_;
+#line 517 "BuilderPane.c"
+}
+
+
+static void shotwell_plugins_common_builder_pane_finalize (GObject* obj) {
+	ShotwellPluginsCommonBuilderPane * self;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
+#line 13 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_g_free0 (self->priv->_resource_path);
+#line 15 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_g_free0 (self->priv->_default_id);
+#line 19 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_g_object_unref0 (self->priv->builder);
+#line 20 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	_g_object_unref0 (self->priv->content);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	G_OBJECT_CLASS (shotwell_plugins_common_builder_pane_parent_class)->finalize (obj);
+#line 535 "BuilderPane.c"
+}
+
+
+GType shotwell_plugins_common_builder_pane_get_type (void) {
+	static volatile gsize shotwell_plugins_common_builder_pane_type_id__volatile = 0;
+	if (g_once_init_enter (&shotwell_plugins_common_builder_pane_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (ShotwellPluginsCommonBuilderPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_plugins_common_builder_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPluginsCommonBuilderPane), 0, (GInstanceInitFunc) shotwell_plugins_common_builder_pane_instance_init, NULL };
+		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) shotwell_plugins_common_builder_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType shotwell_plugins_common_builder_pane_type_id;
+		shotwell_plugins_common_builder_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "ShotwellPluginsCommonBuilderPane", &g_define_type_info, G_TYPE_FLAG_ABSTRACT);
+		g_type_add_interface_static (shotwell_plugins_common_builder_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+		g_once_init_leave (&shotwell_plugins_common_builder_pane_type_id__volatile, shotwell_plugins_common_builder_pane_type_id);
+	}
+	return shotwell_plugins_common_builder_pane_type_id__volatile;
+}
+
+
+static void _vala_shotwell_plugins_common_builder_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+	ShotwellPluginsCommonBuilderPane * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	switch (property_id) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		g_value_set_enum (value, shotwell_plugins_common_builder_pane_get_preferred_geometry (self));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		g_value_take_string (value, shotwell_plugins_common_builder_pane_get_resource_path (self));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		g_value_set_boolean (value, shotwell_plugins_common_builder_pane_get_connect_signals (self));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		g_value_take_string (value, shotwell_plugins_common_builder_pane_get_default_id (self));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		break;
+#line 582 "BuilderPane.c"
+		default:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		break;
+#line 588 "BuilderPane.c"
+	}
+}
+
+
+static void _vala_shotwell_plugins_common_builder_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+	ShotwellPluginsCommonBuilderPane * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+	switch (property_id) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_PREFERRED_GEOMETRY:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		shotwell_plugins_common_builder_pane_set_preferred_geometry (self, g_value_get_enum (value));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_RESOURCE_PATH:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		shotwell_plugins_common_builder_pane_set_resource_path (self, g_value_get_string (value));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CONNECT_SIGNALS:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		shotwell_plugins_common_builder_pane_set_connect_signals (self, g_value_get_boolean (value));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		case SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_DEFAULT_ID:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		shotwell_plugins_common_builder_pane_set_default_id (self, g_value_get_string (value));
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		break;
+#line 622 "BuilderPane.c"
+		default:
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 9 "/home/jens/Source/shotwell/plugins/common/BuilderPane.vala"
+		break;
+#line 628 "BuilderPane.c"
+	}
+}
+
+
+
diff --git a/plugins/common/BuilderPane.vala b/plugins/common/BuilderPane.vala
new file mode 100644
index 0000000..72b4b6f
--- /dev/null
+++ b/plugins/common/BuilderPane.vala
@@ -0,0 +1,60 @@
+/* Copyright 2016 Jens Georg <mail@jensge.org>
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+using Spit.Publishing;
+
+namespace Shotwell.Plugins.Common {
+    public abstract class BuilderPane : Spit.Publishing.DialogPane, Object {
+        public DialogPane.GeometryOptions preferred_geometry {
+            get; construct; default = DialogPane.GeometryOptions.NONE;
+        }
+        public string resource_path { owned get; construct; }
+        public bool connect_signals { get; construct; default = false; }
+        public string default_id {
+            owned get; construct; default = "default";
+        }
+
+        private Gtk.Builder builder;
+        private Gtk.Widget content;
+
+        public override void constructed () {
+            base.constructed ();
+
+            debug ("Adding new builder from path %s", resource_path);
+
+            this.builder = new Gtk.Builder.from_resource (resource_path);
+            if (this.connect_signals) {
+                this.builder.connect_signals (null);
+            }
+
+            this.content = this.builder.get_object ("content") as Gtk.Widget;
+
+            // Just to be sure, if we still use old-style Builder files
+            if (this.content.parent != null) {
+                this.content.parent.remove (this.content);
+            }
+        }
+
+        public DialogPane.GeometryOptions get_preferred_geometry () {
+            return this.preferred_geometry;
+        }
+
+        public Gtk.Widget get_widget () {
+            return this.content;
+        }
+
+        public Gtk.Builder get_builder () {
+            return this.builder;
+        }
+
+        public virtual Gtk.Widget get_default_widget () {
+            return this.get_builder ().get_object (this.default_id) as Gtk.Widget;
+        }
+
+        public virtual void on_pane_installed () {}
+
+        public virtual void on_pane_uninstalled () {}
+    }
+}
diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c
index 81fbf20..719d0a4 100644
--- a/plugins/common/RESTSupport.c
+++ b/plugins/common/RESTSupport.c
@@ -578,6 +578,7 @@ static void _g_free0_ (gpointer var);
 void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table);
 static void publishing_rest_support_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
 static void _vala_SoupMultipart_free (SoupMultipart* self);
+static guint8* _vala_array_dup2 (guint8* self, int length);
 static void _vala_SoupBuffer_free (SoupBuffer* self);
 static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
 gpointer publishing_rest_support_xml_document_ref (gpointer instance);
@@ -611,7 +612,7 @@ enum  {
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_DUMMY_PROPERTY
 };
 PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_construct (GType object_type, PublishingRESTSupportSession* session, SpitPublishingPublishable** publishables, int publishables_length1);
-static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** self, int length);
+static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length);
 static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSupportBatchUploader* self);
 PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable);
 static void publishing_rest_support_batch_uploader_on_chunk_transmitted (PublishingRESTSupportBatchUploader* self, gint bytes_written_so_far, gint total_bytes);
@@ -777,13 +778,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 780 "RESTSupport.c"
+#line 781 "RESTSupport.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 786 "RESTSupport.c"
+#line 787 "RESTSupport.c"
 }
 
 
@@ -845,7 +846,7 @@ gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message
 	_g_hmac_unref0 (mac);
 #line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 848 "RESTSupport.c"
+#line 849 "RESTSupport.c"
 }
 
 
@@ -877,7 +878,7 @@ PublishingRESTSupportSession* publishing_rest_support_session_construct (GType o
 	g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
 #line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 880 "RESTSupport.c"
+#line 881 "RESTSupport.c"
 }
 
 
@@ -891,7 +892,7 @@ void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRES
 	_tmp0_ = message;
 #line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit_by_name (self, "wire-message-unqueued", _tmp0_);
-#line 894 "RESTSupport.c"
+#line 895 "RESTSupport.c"
 }
 
 
@@ -900,7 +901,7 @@ void publishing_rest_support_session_notify_authenticated (PublishingRESTSupport
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
 #line 45 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit_by_name (self, "authenticated");
-#line 903 "RESTSupport.c"
+#line 904 "RESTSupport.c"
 }
 
 
@@ -912,7 +913,7 @@ void publishing_rest_support_session_notify_authentication_failed (PublishingRES
 	_tmp0_ = err;
 #line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit_by_name (self, "authentication-failed", _tmp0_);
-#line 915 "RESTSupport.c"
+#line 916 "RESTSupport.c"
 }
 
 
@@ -921,7 +922,7 @@ static gboolean publishing_rest_support_session_real_is_authenticated (Publishin
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_session_is_authenticated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return FALSE;
-#line 924 "RESTSupport.c"
+#line 925 "RESTSupport.c"
 }
 
 
@@ -930,7 +931,7 @@ gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupport
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), FALSE);
 #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->is_authenticated (self);
-#line 933 "RESTSupport.c"
+#line 934 "RESTSupport.c"
 }
 
 
@@ -948,7 +949,7 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe
 	result = _tmp1_;
 #line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 951 "RESTSupport.c"
+#line 952 "RESTSupport.c"
 }
 
 
@@ -962,7 +963,7 @@ void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSes
 	_tmp0_ = self->priv->soup_session;
 #line 60 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_session_abort (_tmp0_);
-#line 965 "RESTSupport.c"
+#line 966 "RESTSupport.c"
 }
 
 
@@ -977,14 +978,14 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES
 	result = _tmp0_;
 #line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 980 "RESTSupport.c"
+#line 981 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
 #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_session_notify_wire_message_unqueued ((PublishingRESTSupportSession*) self, msg);
-#line 987 "RESTSupport.c"
+#line 988 "RESTSupport.c"
 }
 
 
@@ -1005,7 +1006,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
 	if (_tmp0_) {
 #line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 1008 "RESTSupport.c"
+#line 1009 "RESTSupport.c"
 	}
 #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->soup_session;
@@ -1023,7 +1024,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
 	g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp5_, NULL, FALSE);
 #line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
-#line 1026 "RESTSupport.c"
+#line 1027 "RESTSupport.c"
 }
 
 
@@ -1040,14 +1041,14 @@ void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession*
 	_tmp1_ = self->priv->soup_session;
 #line 79 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_object_set (_tmp1_, "ssl-strict", FALSE, NULL);
-#line 1043 "RESTSupport.c"
+#line 1044 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_session_init (GValue* value) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 1050 "RESTSupport.c"
+#line 1051 "RESTSupport.c"
 }
 
 
@@ -1056,7 +1057,7 @@ static void publishing_rest_support_value_session_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_unref (value->data[0].v_pointer);
-#line 1059 "RESTSupport.c"
+#line 1060 "RESTSupport.c"
 	}
 }
 
@@ -1066,11 +1067,11 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
 	if (src_value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_session_ref (src_value->data[0].v_pointer);
-#line 1069 "RESTSupport.c"
+#line 1070 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1073 "RESTSupport.c"
+#line 1074 "RESTSupport.c"
 	}
 }
 
@@ -1078,37 +1079,37 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
 static gpointer publishing_rest_support_value_session_peek_pointer (const GValue* value) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1081 "RESTSupport.c"
+#line 1082 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 1088 "RESTSupport.c"
+#line 1089 "RESTSupport.c"
 		PublishingRESTSupportSession* object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1095 "RESTSupport.c"
+#line 1096 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1099 "RESTSupport.c"
+#line 1100 "RESTSupport.c"
 		}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_session_ref (object);
-#line 1103 "RESTSupport.c"
+#line 1104 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1107 "RESTSupport.c"
+#line 1108 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1111 "RESTSupport.c"
+#line 1112 "RESTSupport.c"
 }
 
 
@@ -1119,25 +1120,25 @@ static gchar* publishing_rest_support_value_session_lcopy_value (const GValue* v
 	if (!object_p) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1122 "RESTSupport.c"
+#line 1123 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 1128 "RESTSupport.c"
+#line 1129 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1132 "RESTSupport.c"
+#line 1133 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1136 "RESTSupport.c"
+#line 1137 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1140 "RESTSupport.c"
+#line 1141 "RESTSupport.c"
 }
 
 
@@ -1151,7 +1152,7 @@ GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 1154 "RESTSupport.c"
+#line 1155 "RESTSupport.c"
 }
 
 
@@ -1160,7 +1161,7 @@ gpointer publishing_rest_support_value_get_session (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION), NULL);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1163 "RESTSupport.c"
+#line 1164 "RESTSupport.c"
 }
 
 
@@ -1180,17 +1181,17 @@ void publishing_rest_support_value_set_session (GValue* value, gpointer v_object
 		value->data[0].v_pointer = v_object;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1183 "RESTSupport.c"
+#line 1184 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1187 "RESTSupport.c"
+#line 1188 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_unref (old);
-#line 1193 "RESTSupport.c"
+#line 1194 "RESTSupport.c"
 	}
 }
 
@@ -1209,17 +1210,17 @@ void publishing_rest_support_value_take_session (GValue* value, gpointer v_objec
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1212 "RESTSupport.c"
+#line 1213 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1216 "RESTSupport.c"
+#line 1217 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_unref (old);
-#line 1222 "RESTSupport.c"
+#line 1223 "RESTSupport.c"
 	}
 }
 
@@ -1239,7 +1240,7 @@ static void publishing_rest_support_session_class_init (PublishingRESTSupportSes
 	g_signal_new ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("authentication_failed", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 1242 "RESTSupport.c"
+#line 1243 "RESTSupport.c"
 }
 
 
@@ -1254,7 +1255,7 @@ static void publishing_rest_support_session_instance_init (PublishingRESTSupport
 	self->priv->transactions_stopped = FALSE;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 1257 "RESTSupport.c"
+#line 1258 "RESTSupport.c"
 }
 
 
@@ -1268,7 +1269,7 @@ static void publishing_rest_support_session_finalize (PublishingRESTSupportSessi
 	_g_free0 (self->priv->endpoint_url);
 #line 27 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->soup_session);
-#line 1271 "RESTSupport.c"
+#line 1272 "RESTSupport.c"
 }
 
 
@@ -1293,7 +1294,7 @@ gpointer publishing_rest_support_session_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 1296 "RESTSupport.c"
+#line 1297 "RESTSupport.c"
 }
 
 
@@ -1306,7 +1307,7 @@ void publishing_rest_support_session_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->finalize (self);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1309 "RESTSupport.c"
+#line 1310 "RESTSupport.c"
 	}
 }
 
@@ -1317,7 +1318,7 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
 	switch (self) {
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET:
-#line 1320 "RESTSupport.c"
+#line 1321 "RESTSupport.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1326,11 +1327,11 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
 			result = _tmp0_;
 #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1329 "RESTSupport.c"
+#line 1330 "RESTSupport.c"
 		}
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT:
-#line 1333 "RESTSupport.c"
+#line 1334 "RESTSupport.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1339,11 +1340,11 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
 			result = _tmp1_;
 #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1342 "RESTSupport.c"
+#line 1343 "RESTSupport.c"
 		}
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST:
-#line 1346 "RESTSupport.c"
+#line 1347 "RESTSupport.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1352,13 +1353,13 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
 			result = _tmp2_;
 #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1355 "RESTSupport.c"
+#line 1356 "RESTSupport.c"
 		}
 		default:
 		{
 #line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value");
-#line 1361 "RESTSupport.c"
+#line 1362 "RESTSupport.c"
 		}
 	}
 }
@@ -1377,7 +1378,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
 		result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET;
 #line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return result;
-#line 1380 "RESTSupport.c"
+#line 1381 "RESTSupport.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 #line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1388,7 +1389,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
 			result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT;
 #line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1391 "RESTSupport.c"
+#line 1392 "RESTSupport.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
 #line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1399,14 +1400,14 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
 				result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST;
 #line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return result;
-#line 1402 "RESTSupport.c"
+#line 1403 "RESTSupport.c"
 			} else {
 				const gchar* _tmp3_ = NULL;
 #line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp3_ = str;
 #line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_error ("RESTSupport.vala:112: unrecognized HTTP method name: %s", _tmp3_);
-#line 1409 "RESTSupport.c"
+#line 1410 "RESTSupport.c"
 			}
 		}
 	}
@@ -1455,14 +1456,14 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType
 	self->value = _tmp3_;
 #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1458 "RESTSupport.c"
+#line 1459 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value) {
 #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_argument_construct (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, key, value);
-#line 1465 "RESTSupport.c"
+#line 1466 "RESTSupport.c"
 }
 
 
@@ -1494,7 +1495,7 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar
 	result = _tmp5_;
 #line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1497 "RESTSupport.c"
+#line 1498 "RESTSupport.c"
 }
 
 
@@ -1503,14 +1504,14 @@ static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconst
 	result = publishing_rest_support_argument_compare ((PublishingRESTSupportArgument*) a, (PublishingRESTSupportArgument*) b);
 #line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1506 "RESTSupport.c"
+#line 1507 "RESTSupport.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 1513 "RESTSupport.c"
+#line 1514 "RESTSupport.c"
 }
 
 
@@ -1533,7 +1534,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 	_tmp1_ = inputArray;
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1__length1 = inputArray_length1;
-#line 1536 "RESTSupport.c"
+#line 1537 "RESTSupport.c"
 	{
 		PublishingRESTSupportArgument** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
@@ -1545,14 +1546,14 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 		arg_collection_length1 = _tmp1__length1;
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
-#line 1548 "RESTSupport.c"
+#line 1549 "RESTSupport.c"
 			PublishingRESTSupportArgument* _tmp2_ = NULL;
 			PublishingRESTSupportArgument* arg = NULL;
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			arg = _tmp2_;
-#line 1555 "RESTSupport.c"
+#line 1556 "RESTSupport.c"
 			{
 				GeeTreeSet* _tmp3_ = NULL;
 				PublishingRESTSupportArgument* _tmp4_ = NULL;
@@ -1564,7 +1565,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_publishing_rest_support_argument_unref0 (arg);
-#line 1567 "RESTSupport.c"
+#line 1568 "RESTSupport.c"
 			}
 		}
 	}
@@ -1580,7 +1581,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 	if (result_length1) {
 #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp8__length1;
-#line 1583 "RESTSupport.c"
+#line 1584 "RESTSupport.c"
 	}
 #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp8_;
@@ -1588,7 +1589,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 	_g_object_unref0 (sorted_args);
 #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1591 "RESTSupport.c"
+#line 1592 "RESTSupport.c"
 }
 
 
@@ -1609,14 +1610,14 @@ gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument
 	result = _tmp2_;
 #line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1612 "RESTSupport.c"
+#line 1613 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_argument_init (GValue* value) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 1619 "RESTSupport.c"
+#line 1620 "RESTSupport.c"
 }
 
 
@@ -1625,7 +1626,7 @@ static void publishing_rest_support_value_argument_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_unref (value->data[0].v_pointer);
-#line 1628 "RESTSupport.c"
+#line 1629 "RESTSupport.c"
 	}
 }
 
@@ -1635,11 +1636,11 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src
 	if (src_value->data[0].v_pointer) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_argument_ref (src_value->data[0].v_pointer);
-#line 1638 "RESTSupport.c"
+#line 1639 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1642 "RESTSupport.c"
+#line 1643 "RESTSupport.c"
 	}
 }
 
@@ -1647,37 +1648,37 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src
 static gpointer publishing_rest_support_value_argument_peek_pointer (const GValue* value) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1650 "RESTSupport.c"
+#line 1651 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_argument_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 1657 "RESTSupport.c"
+#line 1658 "RESTSupport.c"
 		PublishingRESTSupportArgument* object;
 		object = collect_values[0].v_pointer;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1664 "RESTSupport.c"
+#line 1665 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1668 "RESTSupport.c"
+#line 1669 "RESTSupport.c"
 		}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_argument_ref (object);
-#line 1672 "RESTSupport.c"
+#line 1673 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1676 "RESTSupport.c"
+#line 1677 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1680 "RESTSupport.c"
+#line 1681 "RESTSupport.c"
 }
 
 
@@ -1688,25 +1689,25 @@ static gchar* publishing_rest_support_value_argument_lcopy_value (const GValue*
 	if (!object_p) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1691 "RESTSupport.c"
+#line 1692 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 1697 "RESTSupport.c"
+#line 1698 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1701 "RESTSupport.c"
+#line 1702 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1705 "RESTSupport.c"
+#line 1706 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1709 "RESTSupport.c"
+#line 1710 "RESTSupport.c"
 }
 
 
@@ -1720,7 +1721,7 @@ GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 1723 "RESTSupport.c"
+#line 1724 "RESTSupport.c"
 }
 
 
@@ -1729,7 +1730,7 @@ gpointer publishing_rest_support_value_get_argument (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL);
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1732 "RESTSupport.c"
+#line 1733 "RESTSupport.c"
 }
 
 
@@ -1749,17 +1750,17 @@ void publishing_rest_support_value_set_argument (GValue* value, gpointer v_objec
 		value->data[0].v_pointer = v_object;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1752 "RESTSupport.c"
+#line 1753 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1756 "RESTSupport.c"
+#line 1757 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_unref (old);
-#line 1762 "RESTSupport.c"
+#line 1763 "RESTSupport.c"
 	}
 }
 
@@ -1778,17 +1779,17 @@ void publishing_rest_support_value_take_argument (GValue* value, gpointer v_obje
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1781 "RESTSupport.c"
+#line 1782 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1785 "RESTSupport.c"
+#line 1786 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_unref (old);
-#line 1791 "RESTSupport.c"
+#line 1792 "RESTSupport.c"
 	}
 }
 
@@ -1798,14 +1799,14 @@ static void publishing_rest_support_argument_class_init (PublishingRESTSupportAr
 	publishing_rest_support_argument_parent_class = g_type_class_peek_parent (klass);
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportArgumentClass *) klass)->finalize = publishing_rest_support_argument_finalize;
-#line 1801 "RESTSupport.c"
+#line 1802 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_argument_instance_init (PublishingRESTSupportArgument * self) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 1808 "RESTSupport.c"
+#line 1809 "RESTSupport.c"
 }
 
 
@@ -1819,7 +1820,7 @@ static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgu
 	_g_free0 (self->key);
 #line 119 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->value);
-#line 1822 "RESTSupport.c"
+#line 1823 "RESTSupport.c"
 }
 
 
@@ -1844,7 +1845,7 @@ gpointer publishing_rest_support_argument_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 1847 "RESTSupport.c"
+#line 1848 "RESTSupport.c"
 }
 
 
@@ -1857,7 +1858,7 @@ void publishing_rest_support_argument_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_ARGUMENT_GET_CLASS (self)->finalize (self);
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1860 "RESTSupport.c"
+#line 1861 "RESTSupport.c"
 	}
 }
 
@@ -1865,7 +1866,7 @@ void publishing_rest_support_argument_unref (gpointer instance) {
 static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) {
 #line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_on_wrote_body_data ((PublishingRESTSupportTransaction*) self, chunk);
-#line 1868 "RESTSupport.c"
+#line 1869 "RESTSupport.c"
 }
 
 
@@ -1929,14 +1930,14 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct
 	g_signal_connect (_tmp11_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
 #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1932 "RESTSupport.c"
+#line 1933 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
 #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, method);
-#line 1939 "RESTSupport.c"
+#line 1940 "RESTSupport.c"
 }
 
 
@@ -1986,14 +1987,14 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
 	_g_free0 (_tmp5_);
 #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1989 "RESTSupport.c"
+#line 1990 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
 #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, endpoint_url, method);
-#line 1996 "RESTSupport.c"
+#line 1997 "RESTSupport.c"
 }
 
 
@@ -2027,14 +2028,14 @@ static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRE
 	_tmp6_ = _tmp5_->length;
 #line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit_by_name (self, "chunk-transmitted", _tmp3_, (gint) _tmp6_);
-#line 2030 "RESTSupport.c"
+#line 2031 "RESTSupport.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 2037 "RESTSupport.c"
+#line 2038 "RESTSupport.c"
 }
 
 
@@ -2054,7 +2055,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 	if (_tmp0_ != _tmp1_) {
 #line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 2057 "RESTSupport.c"
+#line 2058 "RESTSupport.c"
 	}
 	{
 		SoupMessage* _tmp2_ = NULL;
@@ -2066,7 +2067,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2069 "RESTSupport.c"
+#line 2070 "RESTSupport.c"
 				goto __catch0_spit_publishing_publishing_error;
 			}
 #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2075,7 +2076,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 			g_clear_error (&_inner_error_);
 #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2078 "RESTSupport.c"
+#line 2079 "RESTSupport.c"
 		}
 	}
 	goto __finally0;
@@ -2116,7 +2117,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 		self->priv->err = _tmp8_;
 #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 2119 "RESTSupport.c"
+#line 2120 "RESTSupport.c"
 	}
 	__finally0:
 #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2127,7 +2128,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 		g_clear_error (&_inner_error_);
 #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 2130 "RESTSupport.c"
+#line 2131 "RESTSupport.c"
 	}
 }
 
@@ -2135,7 +2136,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 static gpointer _g_object_ref0 (gpointer self) {
 #line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2138 "RESTSupport.c"
+#line 2139 "RESTSupport.c"
 }
 
 
@@ -2186,7 +2187,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 	_tmp5_ = tls_errors;
 #line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) {
-#line 2189 "RESTSupport.c"
+#line 2190 "RESTSupport.c"
 		GeeArrayList* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
 #line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2196,13 +2197,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 "bsite.");
 #line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
-#line 2198 "RESTSupport.c"
+#line 2199 "RESTSupport.c"
 	}
 #line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = tls_errors;
 #line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp8_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) {
-#line 2204 "RESTSupport.c"
+#line 2205 "RESTSupport.c"
 		GeeArrayList* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 #line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2212,13 +2213,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 " your computer’s calendar.");
 #line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
-#line 2213 "RESTSupport.c"
+#line 2214 "RESTSupport.c"
 	}
 #line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = tls_errors;
 #line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp11_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) {
-#line 2219 "RESTSupport.c"
+#line 2220 "RESTSupport.c"
 		GeeArrayList* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 #line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2228,13 +2229,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 "on.");
 #line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 2228 "RESTSupport.c"
+#line 2229 "RESTSupport.c"
 	}
 #line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp14_ = tls_errors;
 #line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp14_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) {
-#line 2234 "RESTSupport.c"
+#line 2235 "RESTSupport.c"
 		GeeArrayList* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 #line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2244,13 +2245,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 "upted.");
 #line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
-#line 2243 "RESTSupport.c"
+#line 2244 "RESTSupport.c"
 	}
 #line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp17_ = tls_errors;
 #line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp17_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) {
-#line 2249 "RESTSupport.c"
+#line 2250 "RESTSupport.c"
 		GeeArrayList* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
 #line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2260,13 +2261,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 "zation that issued it.");
 #line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
-#line 2258 "RESTSupport.c"
+#line 2259 "RESTSupport.c"
 	}
 #line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp20_ = tls_errors;
 #line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp20_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) {
-#line 2264 "RESTSupport.c"
+#line 2265 "RESTSupport.c"
 		GeeArrayList* _tmp21_ = NULL;
 		const gchar* _tmp22_ = NULL;
 #line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2276,13 +2277,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 " weak encryption.");
 #line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 2273 "RESTSupport.c"
+#line 2274 "RESTSupport.c"
 	}
 #line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = tls_errors;
 #line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp23_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) {
-#line 2279 "RESTSupport.c"
+#line 2280 "RESTSupport.c"
 		GeeArrayList* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
 #line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2292,7 +2293,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 "the date on your computer’s calendar.");
 #line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_);
-#line 2288 "RESTSupport.c"
+#line 2289 "RESTSupport.c"
 	}
 #line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp26_ = g_string_new ("");
@@ -2306,7 +2307,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 	_tmp29_ = _tmp28_;
 #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp29_ == 1) {
-#line 2302 "RESTSupport.c"
+#line 2303 "RESTSupport.c"
 		GString* _tmp30_ = NULL;
 		GeeArrayList* _tmp31_ = NULL;
 		gpointer _tmp32_ = NULL;
@@ -2323,7 +2324,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 		g_string_append (_tmp30_, _tmp33_);
 #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp33_);
-#line 2319 "RESTSupport.c"
+#line 2320 "RESTSupport.c"
 	} else {
 		{
 			GeeArrayList* _entry_list = NULL;
@@ -2352,7 +2353,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 			_entry_index = -1;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 2348 "RESTSupport.c"
+#line 2349 "RESTSupport.c"
 				gint _tmp39_ = 0;
 				gint _tmp40_ = 0;
 				gint _tmp41_ = 0;
@@ -2374,7 +2375,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 				if (!(_tmp40_ < _tmp41_)) {
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 2370 "RESTSupport.c"
+#line 2371 "RESTSupport.c"
 				}
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp42_ = _entry_list;
@@ -2392,11 +2393,11 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 				g_string_append_printf (_tmp45_, "%s\n", _tmp46_);
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (entry);
-#line 2388 "RESTSupport.c"
+#line 2389 "RESTSupport.c"
 			}
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (_entry_list);
-#line 2392 "RESTSupport.c"
+#line 2393 "RESTSupport.c"
 		}
 	}
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2415,15 +2416,15 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 	if (cert) {
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*cert = _vala_cert;
-#line 2411 "RESTSupport.c"
+#line 2412 "RESTSupport.c"
 	} else {
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_object_unref0 (_vala_cert);
-#line 2415 "RESTSupport.c"
+#line 2416 "RESTSupport.c"
 	}
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2419 "RESTSupport.c"
+#line 2420 "RESTSupport.c"
 }
 
 
@@ -2453,17 +2454,17 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 		case SOUP_STATUS_OK:
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CREATED:
-#line 2449 "RESTSupport.c"
+#line 2450 "RESTSupport.c"
 		{
 #line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 2453 "RESTSupport.c"
+#line 2454 "RESTSupport.c"
 		}
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_RESOLVE:
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 2459 "RESTSupport.c"
+#line 2460 "RESTSupport.c"
 		{
 			gchar* _tmp3_ = NULL;
 			gchar* _tmp4_ = NULL;
@@ -2496,7 +2497,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_propagate_error (error, _inner_error_);
 #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2492 "RESTSupport.c"
+#line 2493 "RESTSupport.c"
 			} else {
 #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2504,14 +2505,14 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_clear_error (&_inner_error_);
 #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2500 "RESTSupport.c"
+#line 2501 "RESTSupport.c"
 			}
 		}
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_CONNECT:
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 2507 "RESTSupport.c"
+#line 2508 "RESTSupport.c"
 		{
 			gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
@@ -2544,7 +2545,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_propagate_error (error, _inner_error_);
 #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2540 "RESTSupport.c"
+#line 2541 "RESTSupport.c"
 			} else {
 #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2552,12 +2553,12 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_clear_error (&_inner_error_);
 #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2548 "RESTSupport.c"
+#line 2549 "RESTSupport.c"
 			}
 		}
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_SSL_FAILED:
-#line 2553 "RESTSupport.c"
+#line 2554 "RESTSupport.c"
 		{
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
@@ -2581,7 +2582,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_propagate_error (error, _inner_error_);
 #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2577 "RESTSupport.c"
+#line 2578 "RESTSupport.c"
 			} else {
 #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2589,7 +2590,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_clear_error (&_inner_error_);
 #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2585 "RESTSupport.c"
+#line 2586 "RESTSupport.c"
 			}
 		}
 		default:
@@ -2605,7 +2606,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			_tmp23_ = _tmp22_;
 #line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_tmp23_ >= ((guint) 100)) {
-#line 2601 "RESTSupport.c"
+#line 2602 "RESTSupport.c"
 				gchar* _tmp24_ = NULL;
 				gchar* _tmp25_ = NULL;
 				SoupMessage* _tmp26_ = NULL;
@@ -2651,7 +2652,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 					g_propagate_error (error, _inner_error_);
 #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2647 "RESTSupport.c"
+#line 2648 "RESTSupport.c"
 				} else {
 #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2659,7 +2660,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 					g_clear_error (&_inner_error_);
 #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2655 "RESTSupport.c"
+#line 2656 "RESTSupport.c"
 				}
 			} else {
 				gchar* _tmp35_ = NULL;
@@ -2693,7 +2694,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 					g_propagate_error (error, _inner_error_);
 #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2689 "RESTSupport.c"
+#line 2690 "RESTSupport.c"
 				} else {
 #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2701,7 +2702,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 					g_clear_error (&_inner_error_);
 #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2697 "RESTSupport.c"
+#line 2698 "RESTSupport.c"
 				}
 			}
 		}
@@ -2718,7 +2719,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 	if (_tmp45_ == NULL) {
 #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp42_ = TRUE;
-#line 2714 "RESTSupport.c"
+#line 2715 "RESTSupport.c"
 	} else {
 		SoupMessage* _tmp46_ = NULL;
 		SoupMessageBody* _tmp47_ = NULL;
@@ -2734,11 +2735,11 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 		_tmp48__length1 = (gint) _tmp47_->length;
 #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp42_ = _tmp48__length1 == 0;
-#line 2730 "RESTSupport.c"
+#line 2731 "RESTSupport.c"
 	}
 #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp42_) {
-#line 2734 "RESTSupport.c"
+#line 2735 "RESTSupport.c"
 		gchar* _tmp49_ = NULL;
 		gchar* _tmp50_ = NULL;
 		GError* _tmp51_ = NULL;
@@ -2761,7 +2762,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			g_propagate_error (error, _inner_error_);
 #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2757 "RESTSupport.c"
+#line 2758 "RESTSupport.c"
 		} else {
 #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2769,7 +2770,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			g_clear_error (&_inner_error_);
 #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2765 "RESTSupport.c"
+#line 2766 "RESTSupport.c"
 		}
 	}
 }
@@ -2782,17 +2783,17 @@ static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportAr
 	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 2778 "RESTSupport.c"
+#line 2779 "RESTSupport.c"
 		PublishingRESTSupportArgument* _tmp0_ = NULL;
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result[i] = _tmp0_;
-#line 2784 "RESTSupport.c"
+#line 2785 "RESTSupport.c"
 	}
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2788 "RESTSupport.c"
+#line 2789 "RESTSupport.c"
 }
 
 
@@ -2822,13 +2823,13 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument
 	if (result_length1) {
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 2818 "RESTSupport.c"
+#line 2819 "RESTSupport.c"
 	}
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2824 "RESTSupport.c"
+#line 2825 "RESTSupport.c"
 }
 
 
@@ -2868,13 +2869,13 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a
 	if (result_length1) {
 #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp6__length1;
-#line 2864 "RESTSupport.c"
+#line 2865 "RESTSupport.c"
 	}
 #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp6_;
 #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2870 "RESTSupport.c"
+#line 2871 "RESTSupport.c"
 }
 
 
@@ -2886,14 +2887,14 @@ void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportT
 	_tmp0_ = is_executed;
 #line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = _tmp0_;
-#line 2882 "RESTSupport.c"
+#line 2883 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender, SoupMessage* message, gpointer self) {
 #line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_on_message_unqueued ((PublishingRESTSupportTransaction*) self, message);
-#line 2889 "RESTSupport.c"
+#line 2890 "RESTSupport.c"
 }
 
 
@@ -2941,23 +2942,23 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
 	_tmp8_ = self->priv->err;
 #line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp8_ != NULL) {
-#line 2937 "RESTSupport.c"
+#line 2938 "RESTSupport.c"
 		GError* _tmp9_ = NULL;
 #line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = self->priv->err;
 #line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit_by_name (self, "network-error", _tmp9_);
-#line 2943 "RESTSupport.c"
+#line 2944 "RESTSupport.c"
 	} else {
 #line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit_by_name (self, "completed");
-#line 2947 "RESTSupport.c"
+#line 2948 "RESTSupport.c"
 	}
 #line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = self->priv->err;
 #line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp10_ != NULL) {
-#line 2953 "RESTSupport.c"
+#line 2954 "RESTSupport.c"
 		GError* _tmp11_ = NULL;
 		GError* _tmp12_ = NULL;
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2972,7 +2973,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
 			g_propagate_error (error, _inner_error_);
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2968 "RESTSupport.c"
+#line 2969 "RESTSupport.c"
 		} else {
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2980,7 +2981,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
 			g_clear_error (&_inner_error_);
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2976 "RESTSupport.c"
+#line 2977 "RESTSupport.c"
 		}
 	}
 }
@@ -3014,7 +3015,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (
 	result = _tmp5_;
 #line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3010 "RESTSupport.c"
+#line 3011 "RESTSupport.c"
 }
 
 
@@ -3037,7 +3038,7 @@ static void publishing_rest_support_transaction_real_add_header (PublishingRESTS
 	_tmp3_ = value;
 #line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_);
-#line 3033 "RESTSupport.c"
+#line 3034 "RESTSupport.c"
 }
 
 
@@ -3046,7 +3047,7 @@ void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransa
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
 #line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value);
-#line 3042 "RESTSupport.c"
+#line 3043 "RESTSupport.c"
 }
 
 
@@ -3080,19 +3081,19 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
 		self->priv->use_custom_payload = FALSE;
 #line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 3076 "RESTSupport.c"
+#line 3077 "RESTSupport.c"
 	}
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = payload_length;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp3_ > ((gulong) 0)) {
-#line 3082 "RESTSupport.c"
+#line 3083 "RESTSupport.c"
 		gulong _tmp4_ = 0UL;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = payload_length;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = _tmp4_;
-#line 3088 "RESTSupport.c"
+#line 3089 "RESTSupport.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -3105,7 +3106,7 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
 		_tmp7_ = _tmp6_;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = (gulong) _tmp7_;
-#line 3101 "RESTSupport.c"
+#line 3102 "RESTSupport.c"
 	}
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	length = _tmp2_;
@@ -3127,7 +3128,7 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
 	soup_message_set_request (_tmp8_, _tmp9_, SOUP_MEMORY_COPY, _tmp12_ + 0, (gsize) (((gint) _tmp13_) - 0));
 #line 341 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->use_custom_payload = TRUE;
-#line 3123 "RESTSupport.c"
+#line 3124 "RESTSupport.c"
 }
 
 
@@ -3146,7 +3147,7 @@ void publishing_rest_support_transaction_set_message (PublishingRESTSupportTrans
 	_g_object_unref0 (self->priv->message);
 #line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->message = _tmp1_;
-#line 3142 "RESTSupport.c"
+#line 3143 "RESTSupport.c"
 }
 
 
@@ -3161,7 +3162,7 @@ gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupp
 	result = _tmp0_;
 #line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3157 "RESTSupport.c"
+#line 3158 "RESTSupport.c"
 }
 
 
@@ -3187,14 +3188,14 @@ guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupport
 	result = _tmp3_;
 #line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3183 "RESTSupport.c"
+#line 3184 "RESTSupport.c"
 }
 
 
 static void _vala_SoupURI_free (SoupURI* self) {
 #line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 3190 "RESTSupport.c"
+#line 3191 "RESTSupport.c"
 }
 
 
@@ -3224,7 +3225,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				g_propagate_error (error, _inner_error_);
 #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 3220 "RESTSupport.c"
+#line 3221 "RESTSupport.c"
 			} else {
 #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3232,18 +3233,18 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				g_clear_error (&_inner_error_);
 #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 3228 "RESTSupport.c"
+#line 3229 "RESTSupport.c"
 			}
 		}
 #line 370 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 3233 "RESTSupport.c"
+#line 3234 "RESTSupport.c"
 	}
 #line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_method (self);
 #line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) {
-#line 3239 "RESTSupport.c"
+#line 3240 "RESTSupport.c"
 		PublishingRESTSupportArgument** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
 #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3252,25 +3253,25 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		_tmp2__length1 = self->priv->arguments_length1;
 #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_vala_assert (_tmp2__length1 > 0, "arguments.length > 0");
-#line 3248 "RESTSupport.c"
+#line 3249 "RESTSupport.c"
 	}
 #line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = g_strdup ("");
 #line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	formdata_string = _tmp3_;
-#line 3254 "RESTSupport.c"
+#line 3255 "RESTSupport.c"
 	{
 		gint i = 0;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		i = 0;
-#line 3259 "RESTSupport.c"
+#line 3260 "RESTSupport.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = TRUE;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 3266 "RESTSupport.c"
+#line 3267 "RESTSupport.c"
 				gint _tmp6_ = 0;
 				PublishingRESTSupportArgument** _tmp7_ = NULL;
 				gint _tmp7__length1 = 0;
@@ -3287,13 +3288,13 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				gint _tmp16__length1 = 0;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!_tmp4_) {
-#line 3283 "RESTSupport.c"
+#line 3284 "RESTSupport.c"
 					gint _tmp5_ = 0;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = i;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					i = _tmp5_ + 1;
-#line 3289 "RESTSupport.c"
+#line 3290 "RESTSupport.c"
 				}
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = FALSE;
@@ -3307,7 +3308,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				if (!(_tmp6_ < _tmp7__length1)) {
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 3303 "RESTSupport.c"
+#line 3304 "RESTSupport.c"
 				}
 #line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8_ = formdata_string;
@@ -3339,7 +3340,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				_tmp16__length1 = self->priv->arguments_length1;
 #line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp15_ < (_tmp16__length1 - 1)) {
-#line 3335 "RESTSupport.c"
+#line 3336 "RESTSupport.c"
 					const gchar* _tmp17_ = NULL;
 					gchar* _tmp18_ = NULL;
 #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3350,7 +3351,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 					_g_free0 (formdata_string);
 #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					formdata_string = _tmp18_;
-#line 3346 "RESTSupport.c"
+#line 3347 "RESTSupport.c"
 				}
 			}
 		}
@@ -3363,7 +3364,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 	_tmp20_ = publishing_rest_support_transaction_get_method (self);
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp20_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) {
-#line 3359 "RESTSupport.c"
+#line 3360 "RESTSupport.c"
 		PublishingRESTSupportArgument** _tmp21_ = NULL;
 		gint _tmp21__length1 = 0;
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3372,15 +3373,15 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		_tmp21__length1 = self->priv->arguments_length1;
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = _tmp21__length1 > 0;
-#line 3368 "RESTSupport.c"
+#line 3369 "RESTSupport.c"
 	} else {
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = FALSE;
-#line 3372 "RESTSupport.c"
+#line 3373 "RESTSupport.c"
 	}
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp19_) {
-#line 3376 "RESTSupport.c"
+#line 3377 "RESTSupport.c"
 		SoupMessage* _tmp22_ = NULL;
 		SoupURI* _tmp23_ = NULL;
 		gchar* _tmp24_ = NULL;
@@ -3436,7 +3437,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		soup_message_set_uri (_tmp31_, _tmp34_);
 #line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		__vala_SoupURI_free0 (_tmp34_);
-#line 3432 "RESTSupport.c"
+#line 3433 "RESTSupport.c"
 	} else {
 		SoupMessage* _tmp35_ = NULL;
 		const gchar* _tmp36_ = NULL;
@@ -3456,11 +3457,11 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		_tmp38__length1 = _tmp37__length1;
 #line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		soup_message_set_request (_tmp35_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp38_, (gsize) _tmp38__length1);
-#line 3452 "RESTSupport.c"
+#line 3453 "RESTSupport.c"
 	}
 #line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = TRUE;
-#line 3456 "RESTSupport.c"
+#line 3457 "RESTSupport.c"
 	{
 		SoupMessage* _tmp39_ = NULL;
 		SoupURI* _tmp40_ = NULL;
@@ -3482,7 +3483,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		publishing_rest_support_transaction_send (self, &_inner_error_);
 #line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3478 "RESTSupport.c"
+#line 3479 "RESTSupport.c"
 			goto __finally1;
 		}
 	}
@@ -3493,7 +3494,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		_tmp43_ = old_url;
 #line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp43_ != NULL) {
-#line 3489 "RESTSupport.c"
+#line 3490 "RESTSupport.c"
 			SoupMessage* _tmp44_ = NULL;
 			const gchar* _tmp45_ = NULL;
 			SoupURI* _tmp46_ = NULL;
@@ -3510,7 +3511,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 			soup_message_set_uri (_tmp44_, _tmp47_);
 #line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupURI_free0 (_tmp47_);
-#line 3506 "RESTSupport.c"
+#line 3507 "RESTSupport.c"
 		}
 	}
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3527,7 +3528,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 			_g_free0 (formdata_string);
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 3523 "RESTSupport.c"
+#line 3524 "RESTSupport.c"
 		} else {
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (url_with_query);
@@ -3541,7 +3542,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 			g_clear_error (&_inner_error_);
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 3537 "RESTSupport.c"
+#line 3538 "RESTSupport.c"
 		}
 	}
 #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3550,7 +3551,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 	_g_free0 (old_url);
 #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (formdata_string);
-#line 3546 "RESTSupport.c"
+#line 3547 "RESTSupport.c"
 }
 
 
@@ -3559,7 +3560,7 @@ void publishing_rest_support_transaction_execute (PublishingRESTSupportTransacti
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
 #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error);
-#line 3555 "RESTSupport.c"
+#line 3556 "RESTSupport.c"
 }
 
 
@@ -3591,7 +3592,7 @@ gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTr
 	result = _tmp4_;
 #line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3587 "RESTSupport.c"
+#line 3588 "RESTSupport.c"
 }
 
 
@@ -3614,7 +3615,7 @@ SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (Pu
 	result = _tmp2_;
 #line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3610 "RESTSupport.c"
+#line 3611 "RESTSupport.c"
 }
 
 
@@ -3637,7 +3638,7 @@ SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupp
 	result = _tmp2_;
 #line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3633 "RESTSupport.c"
+#line 3634 "RESTSupport.c"
 }
 
 
@@ -3648,13 +3649,13 @@ static void _vala_array_add1 (PublishingRESTSupportArgument*** array, int* lengt
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 3644 "RESTSupport.c"
+#line 3645 "RESTSupport.c"
 	}
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	(*array)[(*length)++] = value;
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	(*array)[*length] = NULL;
-#line 3650 "RESTSupport.c"
+#line 3651 "RESTSupport.c"
 }
 
 
@@ -3682,7 +3683,7 @@ void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTran
 	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp3_);
-#line 3678 "RESTSupport.c"
+#line 3679 "RESTSupport.c"
 }
 
 
@@ -3696,7 +3697,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
 	_tmp1_ = self->priv->endpoint_url;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 3692 "RESTSupport.c"
+#line 3693 "RESTSupport.c"
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3707,7 +3708,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
 		_g_free0 (_tmp0_);
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp3_;
-#line 3703 "RESTSupport.c"
+#line 3704 "RESTSupport.c"
 	} else {
 		PublishingRESTSupportSession* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -3719,20 +3720,20 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
 		_g_free0 (_tmp0_);
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp5_;
-#line 3715 "RESTSupport.c"
+#line 3716 "RESTSupport.c"
 	}
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3721 "RESTSupport.c"
+#line 3722 "RESTSupport.c"
 }
 
 
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
 #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3728 "RESTSupport.c"
+#line 3729 "RESTSupport.c"
 }
 
 
@@ -3750,7 +3751,7 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses
 	result = _tmp1_;
 #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3746 "RESTSupport.c"
+#line 3747 "RESTSupport.c"
 }
 
 
@@ -3769,26 +3770,26 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
 		data1 = closure->data;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 3765 "RESTSupport.c"
+#line 3766 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data2 = closure->data;
-#line 3771 "RESTSupport.c"
+#line 3772 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 3777 "RESTSupport.c"
+#line 3778 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_transaction_init (GValue* value) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3784 "RESTSupport.c"
+#line 3785 "RESTSupport.c"
 }
 
 
@@ -3797,7 +3798,7 @@ static void publishing_rest_support_value_transaction_free_value (GValue* value)
 	if (value->data[0].v_pointer) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (value->data[0].v_pointer);
-#line 3793 "RESTSupport.c"
+#line 3794 "RESTSupport.c"
 	}
 }
 
@@ -3807,11 +3808,11 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue*
 	if (src_value->data[0].v_pointer) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_transaction_ref (src_value->data[0].v_pointer);
-#line 3803 "RESTSupport.c"
+#line 3804 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3807 "RESTSupport.c"
+#line 3808 "RESTSupport.c"
 	}
 }
 
@@ -3819,37 +3820,37 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue*
 static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 3815 "RESTSupport.c"
+#line 3816 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_transaction_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3822 "RESTSupport.c"
+#line 3823 "RESTSupport.c"
 		PublishingRESTSupportTransaction* object;
 		object = collect_values[0].v_pointer;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3829 "RESTSupport.c"
+#line 3830 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3833 "RESTSupport.c"
+#line 3834 "RESTSupport.c"
 		}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_transaction_ref (object);
-#line 3837 "RESTSupport.c"
+#line 3838 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3841 "RESTSupport.c"
+#line 3842 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 3845 "RESTSupport.c"
+#line 3846 "RESTSupport.c"
 }
 
 
@@ -3860,25 +3861,25 @@ static gchar* publishing_rest_support_value_transaction_lcopy_value (const GValu
 	if (!object_p) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3856 "RESTSupport.c"
+#line 3857 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 3862 "RESTSupport.c"
+#line 3863 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3866 "RESTSupport.c"
+#line 3867 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3870 "RESTSupport.c"
+#line 3871 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 3874 "RESTSupport.c"
+#line 3875 "RESTSupport.c"
 }
 
 
@@ -3892,7 +3893,7 @@ GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3888 "RESTSupport.c"
+#line 3889 "RESTSupport.c"
 }
 
 
@@ -3901,7 +3902,7 @@ gpointer publishing_rest_support_value_get_transaction (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 3897 "RESTSupport.c"
+#line 3898 "RESTSupport.c"
 }
 
 
@@ -3921,17 +3922,17 @@ void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_ob
 		value->data[0].v_pointer = v_object;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3917 "RESTSupport.c"
+#line 3918 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3921 "RESTSupport.c"
+#line 3922 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (old);
-#line 3927 "RESTSupport.c"
+#line 3928 "RESTSupport.c"
 	}
 }
 
@@ -3950,17 +3951,17 @@ void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_o
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 3946 "RESTSupport.c"
+#line 3947 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3950 "RESTSupport.c"
+#line 3951 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (old);
-#line 3956 "RESTSupport.c"
+#line 3957 "RESTSupport.c"
 	}
 }
 
@@ -3982,7 +3983,7 @@ static void publishing_rest_support_transaction_class_init (PublishingRESTSuppor
 	g_signal_new ("network_error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3978 "RESTSupport.c"
+#line 3979 "RESTSupport.c"
 }
 
 
@@ -4003,7 +4004,7 @@ static void publishing_rest_support_transaction_instance_init (PublishingRESTSup
 	self->priv->endpoint_url = NULL;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 3999 "RESTSupport.c"
+#line 4000 "RESTSupport.c"
 }
 
 
@@ -4021,7 +4022,7 @@ static void publishing_rest_support_transaction_finalize (PublishingRESTSupportT
 	_g_error_free0 (self->priv->err);
 #line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->endpoint_url);
-#line 4017 "RESTSupport.c"
+#line 4018 "RESTSupport.c"
 }
 
 
@@ -4046,7 +4047,7 @@ gpointer publishing_rest_support_transaction_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 4042 "RESTSupport.c"
+#line 4043 "RESTSupport.c"
 }
 
 
@@ -4059,7 +4060,7 @@ void publishing_rest_support_transaction_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4055 "RESTSupport.c"
+#line 4056 "RESTSupport.c"
 	}
 }
 
@@ -4114,14 +4115,14 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
 	self->message_headers = _tmp7_;
 #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4110 "RESTSupport.c"
+#line 4111 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
 #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_upload_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable);
-#line 4117 "RESTSupport.c"
+#line 4118 "RESTSupport.c"
 }
 
 
@@ -4180,14 +4181,14 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
 	self->message_headers = _tmp8_;
 #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4176 "RESTSupport.c"
+#line 4177 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) {
 #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_upload_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_url);
-#line 4183 "RESTSupport.c"
+#line 4184 "RESTSupport.c"
 }
 
 
@@ -4210,7 +4211,7 @@ static void publishing_rest_support_upload_transaction_real_add_header (Publishi
 	_tmp2_ = value;
 #line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp2_);
-#line 4206 "RESTSupport.c"
+#line 4207 "RESTSupport.c"
 }
 
 
@@ -4221,7 +4222,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
 	_tmp0_ = media_type;
 #line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 4217 "RESTSupport.c"
+#line 4218 "RESTSupport.c"
 		gchar* _tmp1_ = NULL;
 #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp1_ = g_strdup ("image/jpeg");
@@ -4229,14 +4230,14 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
 		result = _tmp1_;
 #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return result;
-#line 4225 "RESTSupport.c"
+#line 4226 "RESTSupport.c"
 	} else {
 		SpitPublishingPublisherMediaType _tmp2_ = 0;
 #line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = media_type;
 #line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4232 "RESTSupport.c"
+#line 4233 "RESTSupport.c"
 			gchar* _tmp3_ = NULL;
 #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp3_ = g_strdup ("video/mpeg");
@@ -4244,7 +4245,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
 			result = _tmp3_;
 #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 4240 "RESTSupport.c"
+#line 4241 "RESTSupport.c"
 		} else {
 			SpitPublishingPublisherMediaType _tmp4_ = 0;
 			GEnumValue* _tmp5_;
@@ -4254,7 +4255,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
 			_tmp5_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), _tmp4_);
 #line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_error ("RESTSupport.vala:476: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL);
-#line 4250 "RESTSupport.c"
+#line 4251 "RESTSupport.c"
 		}
 	}
 }
@@ -4263,7 +4264,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
 static void _g_free0_ (gpointer var) {
 #line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	var = (g_free (var), NULL);
-#line 4259 "RESTSupport.c"
+#line 4260 "RESTSupport.c"
 }
 
 
@@ -4314,14 +4315,14 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin
 	result = _result_;
 #line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4310 "RESTSupport.c"
+#line 4311 "RESTSupport.c"
 }
 
 
 static gpointer _g_hash_table_ref0 (gpointer self) {
 #line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_hash_table_ref (self) : NULL;
-#line 4317 "RESTSupport.c"
+#line 4318 "RESTSupport.c"
 }
 
 
@@ -4340,21 +4341,28 @@ void publishing_rest_support_upload_transaction_set_binary_disposition_table (Pu
 	_g_hash_table_unref0 (self->binary_disposition_table);
 #line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->binary_disposition_table = _tmp1_;
-#line 4336 "RESTSupport.c"
+#line 4337 "RESTSupport.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 4343 "RESTSupport.c"
+#line 4344 "RESTSupport.c"
+}
+
+
+static guint8* _vala_array_dup2 (guint8* self, int length) {
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	return g_memdup (self, length * sizeof (guint8));
+#line 4351 "RESTSupport.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 4350 "RESTSupport.c"
+#line 4358 "RESTSupport.c"
 }
 
 
@@ -4382,7 +4390,8 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	gint _tmp23__length1 = 0;
 	guint8* _tmp24_ = NULL;
 	gint _tmp24__length1 = 0;
-	gsize _tmp25_ = 0UL;
+	guint8* _tmp25_ = NULL;
+	gint _tmp25__length1 = 0;
 	SoupBuffer* _tmp26_ = NULL;
 	SoupMultipart* _tmp27_ = NULL;
 	SpitPublishingPublishable* _tmp28_ = NULL;
@@ -4438,7 +4447,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	_tmp4_ = request_arguments;
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4__length1 = request_arguments_length1;
-#line 4434 "RESTSupport.c"
+#line 4443 "RESTSupport.c"
 	{
 		PublishingRESTSupportArgument** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
@@ -4450,14 +4459,14 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		arg_collection_length1 = _tmp4__length1;
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) {
-#line 4446 "RESTSupport.c"
+#line 4455 "RESTSupport.c"
 			PublishingRESTSupportArgument* _tmp5_ = NULL;
 			PublishingRESTSupportArgument* arg = NULL;
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp5_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			arg = _tmp5_;
-#line 4453 "RESTSupport.c"
+#line 4462 "RESTSupport.c"
 			{
 				SoupMultipart* _tmp6_ = NULL;
 				PublishingRESTSupportArgument* _tmp7_ = NULL;
@@ -4478,7 +4487,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 				soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_);
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_publishing_rest_support_argument_unref0 (arg);
-#line 4474 "RESTSupport.c"
+#line 4483 "RESTSupport.c"
 			}
 		}
 	}
@@ -4516,7 +4525,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4512 "RESTSupport.c"
+#line 4521 "RESTSupport.c"
 				goto __catch2_g_file_error;
 			}
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4531,7 +4540,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			g_clear_error (&_inner_error_);
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4527 "RESTSupport.c"
+#line 4536 "RESTSupport.c"
 		}
 	}
 	goto __finally2;
@@ -4552,7 +4561,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		_inner_error_ = _tmp19_;
 #line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (e);
-#line 4548 "RESTSupport.c"
+#line 4557 "RESTSupport.c"
 		goto __finally2;
 	}
 	__finally2:
@@ -4570,7 +4579,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
 #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4566 "RESTSupport.c"
+#line 4575 "RESTSupport.c"
 		} else {
 #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
@@ -4584,7 +4593,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			g_clear_error (&_inner_error_);
 #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4580 "RESTSupport.c"
+#line 4589 "RESTSupport.c"
 		}
 	}
 #line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4602,9 +4611,11 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp24__length1 = _tmp23__length1;
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp25_ = payload_length;
+	_tmp25_ = (_tmp24_ != NULL) ? _vala_array_dup2 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_);
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp26_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp24_ + 0, ((gint) _tmp25_) - 0);
+	_tmp25__length1 = _tmp24__length1;
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp26_ = soup_buffer_new_take (_tmp25_, _tmp25__length1);
 #line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	bindable_data = _tmp26_;
 #line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4673,7 +4684,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	cont = _tmp49_;
 #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	while (TRUE) {
-#line 4669 "RESTSupport.c"
+#line 4680 "RESTSupport.c"
 		gboolean _tmp50_ = FALSE;
 		SoupMessage* _tmp51_ = NULL;
 		SoupMessageHeaders* _tmp52_ = NULL;
@@ -4691,7 +4702,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		if (!_tmp50_) {
 #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 4687 "RESTSupport.c"
+#line 4698 "RESTSupport.c"
 		}
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp51_ = outbound_message;
@@ -4721,7 +4732,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		_tmp60_ = gee_map_iterator_next (_tmp59_);
 #line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		cont = _tmp60_;
-#line 4717 "RESTSupport.c"
+#line 4728 "RESTSupport.c"
 	}
 #line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp61_ = outbound_message;
@@ -4751,7 +4762,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4747 "RESTSupport.c"
+#line 4758 "RESTSupport.c"
 		} else {
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (i);
@@ -4771,7 +4782,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			g_clear_error (&_inner_error_);
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4767 "RESTSupport.c"
+#line 4778 "RESTSupport.c"
 		}
 	}
 #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4786,7 +4797,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	__vala_SoupMultipart_free0 (message_parts);
 #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 4782 "RESTSupport.c"
+#line 4793 "RESTSupport.c"
 }
 
 
@@ -4799,7 +4810,7 @@ static void publishing_rest_support_upload_transaction_class_init (PublishingRES
 	((PublishingRESTSupportTransactionClass *) klass)->add_header = publishing_rest_support_upload_transaction_real_add_header;
 #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_rest_support_upload_transaction_real_execute;
-#line 4795 "RESTSupport.c"
+#line 4806 "RESTSupport.c"
 }
 
 
@@ -4810,7 +4821,7 @@ static void publishing_rest_support_upload_transaction_instance_init (Publishing
 	self->publishable = NULL;
 #line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->message_headers = NULL;
-#line 4806 "RESTSupport.c"
+#line 4817 "RESTSupport.c"
 }
 
 
@@ -4828,7 +4839,7 @@ static void publishing_rest_support_upload_transaction_finalize (PublishingRESTS
 	_g_object_unref0 (self->message_headers);
 #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_upload_transaction_parent_class)->finalize (obj);
-#line 4824 "RESTSupport.c"
+#line 4835 "RESTSupport.c"
 }
 
 
@@ -4855,14 +4866,14 @@ static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_co
 	self->priv->document = _tmp0_;
 #line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4851 "RESTSupport.c"
+#line 4862 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) {
 #line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_xml_document_construct (PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, doc);
-#line 4858 "RESTSupport.c"
+#line 4869 "RESTSupport.c"
 }
 
 
@@ -4880,7 +4891,7 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo
 	result = _tmp1_;
 #line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4876 "RESTSupport.c"
+#line 4887 "RESTSupport.c"
 }
 
 
@@ -4902,21 +4913,21 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 	_tmp1_ = _tmp0_->children;
 #line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	doc_node_iter = _tmp1_;
-#line 4898 "RESTSupport.c"
+#line 4909 "RESTSupport.c"
 	{
 		gboolean _tmp2_ = FALSE;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = TRUE;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		while (TRUE) {
-#line 4905 "RESTSupport.c"
+#line 4916 "RESTSupport.c"
 			xmlNode* _tmp5_ = NULL;
 			xmlNode* _tmp6_ = NULL;
 			const gchar* _tmp7_ = NULL;
 			const gchar* _tmp8_ = NULL;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (!_tmp2_) {
-#line 4912 "RESTSupport.c"
+#line 4923 "RESTSupport.c"
 				xmlNode* _tmp3_ = NULL;
 				xmlNode* _tmp4_ = NULL;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4925,7 +4936,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 				_tmp4_ = _tmp3_->next;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				doc_node_iter = _tmp4_;
-#line 4921 "RESTSupport.c"
+#line 4932 "RESTSupport.c"
 			}
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = FALSE;
@@ -4935,7 +4946,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 			if (!(_tmp5_ != NULL)) {
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				break;
-#line 4931 "RESTSupport.c"
+#line 4942 "RESTSupport.c"
 			}
 #line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = doc_node_iter;
@@ -4945,7 +4956,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 			_tmp8_ = child_name;
 #line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 4941 "RESTSupport.c"
+#line 4952 "RESTSupport.c"
 				xmlNode* _tmp9_ = NULL;
 #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = doc_node_iter;
@@ -4953,7 +4964,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 				result = _tmp9_;
 #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return result;
-#line 4949 "RESTSupport.c"
+#line 4960 "RESTSupport.c"
 			}
 		}
 	}
@@ -4969,7 +4980,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 		g_propagate_error (error, _inner_error_);
 #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return NULL;
-#line 4965 "RESTSupport.c"
+#line 4976 "RESTSupport.c"
 	} else {
 #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4977,7 +4988,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 		g_clear_error (&_inner_error_);
 #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return NULL;
-#line 4973 "RESTSupport.c"
+#line 4984 "RESTSupport.c"
 	}
 }
 
@@ -5006,7 +5017,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
 	_tmp3_ = value_string;
 #line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp3_ == NULL) {
-#line 5002 "RESTSupport.c"
+#line 5013 "RESTSupport.c"
 		const gchar* _tmp4_ = NULL;
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -5029,7 +5040,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
 			_g_free0 (value_string);
 #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5025 "RESTSupport.c"
+#line 5036 "RESTSupport.c"
 		} else {
 #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (value_string);
@@ -5039,14 +5050,14 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
 			g_clear_error (&_inner_error_);
 #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5035 "RESTSupport.c"
+#line 5046 "RESTSupport.c"
 		}
 	}
 #line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = value_string;
 #line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5042 "RESTSupport.c"
+#line 5053 "RESTSupport.c"
 }
 
 
@@ -5069,7 +5080,7 @@ static gchar* string_chug (const gchar* self) {
 	result = _result_;
 #line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5065 "RESTSupport.c"
+#line 5076 "RESTSupport.c"
 }
 
 
@@ -5092,7 +5103,7 @@ static gchar* string_chomp (const gchar* self) {
 	result = _result_;
 #line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5088 "RESTSupport.c"
+#line 5099 "RESTSupport.c"
 }
 
 
@@ -5133,7 +5144,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	if (_tmp1_ == NULL) {
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = TRUE;
-#line 5129 "RESTSupport.c"
+#line 5140 "RESTSupport.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
@@ -5146,11 +5157,11 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 		_tmp4_ = _tmp3_;
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 5142 "RESTSupport.c"
+#line 5153 "RESTSupport.c"
 	}
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_) {
-#line 5146 "RESTSupport.c"
+#line 5157 "RESTSupport.c"
 		GError* _tmp5_ = NULL;
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Empty XML string");
@@ -5162,7 +5173,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_propagate_error (error, _inner_error_);
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5158 "RESTSupport.c"
+#line 5169 "RESTSupport.c"
 		} else {
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5170,7 +5181,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5166 "RESTSupport.c"
+#line 5177 "RESTSupport.c"
 		}
 	}
 #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5195,7 +5206,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	if (_tmp13_) {
 #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = TRUE;
-#line 5191 "RESTSupport.c"
+#line 5202 "RESTSupport.c"
 	} else {
 		const gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
@@ -5221,11 +5232,11 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 		_g_free0 (_tmp18_);
 #line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp16_);
-#line 5217 "RESTSupport.c"
+#line 5228 "RESTSupport.c"
 	}
 #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp6_) {
-#line 5221 "RESTSupport.c"
+#line 5232 "RESTSupport.c"
 		GError* _tmp20_ = NULL;
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
@@ -5237,7 +5248,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_propagate_error (error, _inner_error_);
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5233 "RESTSupport.c"
+#line 5244 "RESTSupport.c"
 		} else {
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5245,7 +5256,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5241 "RESTSupport.c"
+#line 5252 "RESTSupport.c"
 		}
 	}
 #line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5264,7 +5275,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	_tmp26_ = doc;
 #line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp26_ == NULL) {
-#line 5260 "RESTSupport.c"
+#line 5271 "RESTSupport.c"
 		GError* _tmp27_ = NULL;
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp27_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
@@ -5276,7 +5287,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_propagate_error (error, _inner_error_);
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5272 "RESTSupport.c"
+#line 5283 "RESTSupport.c"
 		} else {
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5284,7 +5295,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5280 "RESTSupport.c"
+#line 5291 "RESTSupport.c"
 		}
 	}
 #line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5293,7 +5304,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	_tmp29_ = _tmp28_->children;
 #line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp29_ == NULL) {
-#line 5289 "RESTSupport.c"
+#line 5300 "RESTSupport.c"
 		GError* _tmp30_ = NULL;
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp30_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
@@ -5305,7 +5316,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_propagate_error (error, _inner_error_);
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5301 "RESTSupport.c"
+#line 5312 "RESTSupport.c"
 		} else {
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5313,7 +5324,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5309 "RESTSupport.c"
+#line 5320 "RESTSupport.c"
 		}
 	}
 #line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5336,7 +5347,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	_tmp36_ = _result_;
 #line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp36_ != NULL) {
-#line 5332 "RESTSupport.c"
+#line 5343 "RESTSupport.c"
 		const gchar* _tmp37_ = NULL;
 		GError* _tmp38_ = NULL;
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5355,7 +5366,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			_publishing_rest_support_xml_document_unref0 (rest_doc);
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5351 "RESTSupport.c"
+#line 5362 "RESTSupport.c"
 		} else {
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_result_);
@@ -5367,7 +5378,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5363 "RESTSupport.c"
+#line 5374 "RESTSupport.c"
 		}
 	}
 #line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5376,14 +5387,14 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	_g_free0 (_result_);
 #line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5372 "RESTSupport.c"
+#line 5383 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_xml_document_init (GValue* value) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 5379 "RESTSupport.c"
+#line 5390 "RESTSupport.c"
 }
 
 
@@ -5392,7 +5403,7 @@ static void publishing_rest_support_value_xml_document_free_value (GValue* value
 	if (value->data[0].v_pointer) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (value->data[0].v_pointer);
-#line 5388 "RESTSupport.c"
+#line 5399 "RESTSupport.c"
 	}
 }
 
@@ -5402,11 +5413,11 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue*
 	if (src_value->data[0].v_pointer) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_xml_document_ref (src_value->data[0].v_pointer);
-#line 5398 "RESTSupport.c"
+#line 5409 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5402 "RESTSupport.c"
+#line 5413 "RESTSupport.c"
 	}
 }
 
@@ -5414,37 +5425,37 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue*
 static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 5410 "RESTSupport.c"
+#line 5421 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_xml_document_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 5417 "RESTSupport.c"
+#line 5428 "RESTSupport.c"
 		PublishingRESTSupportXmlDocument* object;
 		object = collect_values[0].v_pointer;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5424 "RESTSupport.c"
+#line 5435 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5428 "RESTSupport.c"
+#line 5439 "RESTSupport.c"
 		}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object);
-#line 5432 "RESTSupport.c"
+#line 5443 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5436 "RESTSupport.c"
+#line 5447 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5440 "RESTSupport.c"
+#line 5451 "RESTSupport.c"
 }
 
 
@@ -5455,25 +5466,25 @@ static gchar* publishing_rest_support_value_xml_document_lcopy_value (const GVal
 	if (!object_p) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5451 "RESTSupport.c"
+#line 5462 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 5457 "RESTSupport.c"
+#line 5468 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5461 "RESTSupport.c"
+#line 5472 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5465 "RESTSupport.c"
+#line 5476 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5469 "RESTSupport.c"
+#line 5480 "RESTSupport.c"
 }
 
 
@@ -5487,7 +5498,7 @@ GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 5483 "RESTSupport.c"
+#line 5494 "RESTSupport.c"
 }
 
 
@@ -5496,7 +5507,7 @@ gpointer publishing_rest_support_value_get_xml_document (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 5492 "RESTSupport.c"
+#line 5503 "RESTSupport.c"
 }
 
 
@@ -5516,17 +5527,17 @@ void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_o
 		value->data[0].v_pointer = v_object;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5512 "RESTSupport.c"
+#line 5523 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5516 "RESTSupport.c"
+#line 5527 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (old);
-#line 5522 "RESTSupport.c"
+#line 5533 "RESTSupport.c"
 	}
 }
 
@@ -5545,17 +5556,17 @@ void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 5541 "RESTSupport.c"
+#line 5552 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5545 "RESTSupport.c"
+#line 5556 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (old);
-#line 5551 "RESTSupport.c"
+#line 5562 "RESTSupport.c"
 	}
 }
 
@@ -5567,7 +5578,7 @@ static void publishing_rest_support_xml_document_class_init (PublishingRESTSuppo
 	((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate));
-#line 5563 "RESTSupport.c"
+#line 5574 "RESTSupport.c"
 }
 
 
@@ -5576,7 +5587,7 @@ static void publishing_rest_support_xml_document_instance_init (PublishingRESTSu
 	self->priv = PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE (self);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 5572 "RESTSupport.c"
+#line 5583 "RESTSupport.c"
 }
 
 
@@ -5591,7 +5602,7 @@ static void publishing_rest_support_xml_document_finalize (PublishingRESTSupport
 	_tmp0_ = self->priv->document;
 #line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	xmlFreeDoc (_tmp0_);
-#line 5587 "RESTSupport.c"
+#line 5598 "RESTSupport.c"
 }
 
 
@@ -5616,7 +5627,7 @@ gpointer publishing_rest_support_xml_document_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 5612 "RESTSupport.c"
+#line 5623 "RESTSupport.c"
 }
 
 
@@ -5629,7 +5640,7 @@ void publishing_rest_support_xml_document_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5625 "RESTSupport.c"
+#line 5636 "RESTSupport.c"
 	}
 }
 
@@ -5658,7 +5669,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 	current_char = _tmp2_;
 #line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	while (TRUE) {
-#line 5654 "RESTSupport.c"
+#line 5665 "RESTSupport.c"
 		gint current_char_value = 0;
 		const gchar* _tmp3_ = NULL;
 		gunichar _tmp4_ = 0U;
@@ -5682,55 +5693,55 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 		if (_tmp5_ < 1) {
 #line 633 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 5678 "RESTSupport.c"
+#line 5689 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = current_char_value;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp9_ < 128) {
-#line 5684 "RESTSupport.c"
+#line 5695 "RESTSupport.c"
 			gint _tmp10_ = 0;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp10_ = current_char_value;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = _tmp10_ != ((gint) '&');
-#line 5690 "RESTSupport.c"
+#line 5701 "RESTSupport.c"
 		} else {
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = FALSE;
-#line 5694 "RESTSupport.c"
+#line 5705 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp8_) {
-#line 5698 "RESTSupport.c"
+#line 5709 "RESTSupport.c"
 			gint _tmp11_ = 0;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp11_ = current_char_value;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = _tmp11_ != ((gint) '<');
-#line 5704 "RESTSupport.c"
+#line 5715 "RESTSupport.c"
 		} else {
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = FALSE;
-#line 5708 "RESTSupport.c"
+#line 5719 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp7_) {
-#line 5712 "RESTSupport.c"
+#line 5723 "RESTSupport.c"
 			gint _tmp12_ = 0;
 #line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp12_ = current_char_value;
 #line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = _tmp12_ != ((gint) '>');
-#line 5718 "RESTSupport.c"
+#line 5729 "RESTSupport.c"
 		} else {
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = FALSE;
-#line 5722 "RESTSupport.c"
+#line 5733 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp6_) {
-#line 5726 "RESTSupport.c"
+#line 5737 "RESTSupport.c"
 			GString* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
 			gunichar _tmp15_ = 0U;
@@ -5742,7 +5753,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 			_tmp15_ = g_utf8_get_char_validated (_tmp14_, (gssize) -1);
 #line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_string_append_unichar (_tmp13_, _tmp15_);
-#line 5738 "RESTSupport.c"
+#line 5749 "RESTSupport.c"
 		} else {
 			GString* _tmp16_ = NULL;
 			gint _tmp17_ = 0;
@@ -5760,7 +5771,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 			g_string_append (_tmp16_, _tmp19_);
 #line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp19_);
-#line 5756 "RESTSupport.c"
+#line 5767 "RESTSupport.c"
 		}
 #line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp20_ = current_char;
@@ -5772,7 +5783,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 		_g_free0 (current_char);
 #line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		current_char = _tmp22_;
-#line 5768 "RESTSupport.c"
+#line 5779 "RESTSupport.c"
 	}
 #line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = encoded_str_builder;
@@ -5788,28 +5799,28 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 	_g_string_free0 (encoded_str_builder);
 #line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5784 "RESTSupport.c"
+#line 5795 "RESTSupport.c"
 }
 
 
-static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** self, int length) {
+static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length) {
 	SpitPublishingPublishable** result;
 	int i;
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = g_new0 (SpitPublishingPublishable*, length + 1);
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 5795 "RESTSupport.c"
+#line 5806 "RESTSupport.c"
 		SpitPublishingPublishable* _tmp0_ = NULL;
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result[i] = _tmp0_;
-#line 5801 "RESTSupport.c"
+#line 5812 "RESTSupport.c"
 	}
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5805 "RESTSupport.c"
+#line 5816 "RESTSupport.c"
 }
 
 
@@ -5830,7 +5841,7 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = publishables_length1;
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5851,14 +5862,14 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const
 	self->priv->session = _tmp3_;
 #line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 5847 "RESTSupport.c"
+#line 5858 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender, gint bytes_written_so_far, gint total_bytes, gpointer self) {
 #line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_batch_uploader_on_chunk_transmitted ((PublishingRESTSupportBatchUploader*) self, bytes_written_so_far, total_bytes);
-#line 5854 "RESTSupport.c"
+#line 5865 "RESTSupport.c"
 }
 
 
@@ -5878,7 +5889,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 	_tmp0_ = self->priv->publishables;
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 5874 "RESTSupport.c"
+#line 5885 "RESTSupport.c"
 	{
 		SpitPublishingPublishable** publishable_collection = NULL;
 		gint publishable_collection_length1 = 0;
@@ -5890,14 +5901,14 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 		publishable_collection_length1 = _tmp0__length1;
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
-#line 5886 "RESTSupport.c"
+#line 5897 "RESTSupport.c"
 			SpitPublishingPublishable* _tmp1_ = NULL;
 			SpitPublishingPublishable* publishable = NULL;
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			publishable = _tmp1_;
-#line 5893 "RESTSupport.c"
+#line 5904 "RESTSupport.c"
 			{
 				GFile* file = NULL;
 				SpitPublishingPublishable* _tmp2_ = NULL;
@@ -5930,7 +5941,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				_tmp4_ = file;
 #line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp4_ == NULL) {
-#line 5926 "RESTSupport.c"
+#line 5937 "RESTSupport.c"
 					gint _tmp5_ = 0;
 #line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = self->priv->current_file;
@@ -5942,7 +5953,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					_g_object_unref0 (publishable);
 #line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					continue;
-#line 5938 "RESTSupport.c"
+#line 5949 "RESTSupport.c"
 				}
 #line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp6_ = self->priv->current_file;
@@ -5958,7 +5969,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				_tmp8__target = self->priv->status_updated_target;
 #line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp8_ != NULL) {
-#line 5954 "RESTSupport.c"
+#line 5965 "RESTSupport.c"
 					SpitPublishingProgressCallback _tmp9_ = NULL;
 					void* _tmp9__target = NULL;
 					gint _tmp10_ = 0;
@@ -5973,7 +5984,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					_tmp11_ = fraction_complete;
 #line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target);
-#line 5969 "RESTSupport.c"
+#line 5980 "RESTSupport.c"
 				}
 #line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp12_ = self->priv->publishables;
@@ -5991,7 +6002,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				_tmp16_ = txn;
 #line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_signal_connect (_tmp16_, "chunk-transmitted", (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self);
-#line 5987 "RESTSupport.c"
+#line 5998 "RESTSupport.c"
 				{
 					PublishingRESTSupportTransaction* _tmp17_ = NULL;
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6002,7 +6013,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5998 "RESTSupport.c"
+#line 6009 "RESTSupport.c"
 							goto __catch3_spit_publishing_publishing_error;
 						}
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6017,7 +6028,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 						g_clear_error (&_inner_error_);
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						return;
-#line 6013 "RESTSupport.c"
+#line 6024 "RESTSupport.c"
 					}
 				}
 				goto __finally3;
@@ -6037,7 +6048,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					stop = TRUE;
 #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_error_free0 (err);
-#line 6033 "RESTSupport.c"
+#line 6044 "RESTSupport.c"
 				}
 				__finally3:
 #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6054,7 +6065,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					g_clear_error (&_inner_error_);
 #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 6050 "RESTSupport.c"
+#line 6061 "RESTSupport.c"
 				}
 #line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp19_ = txn;
@@ -6074,7 +6085,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					_g_object_unref0 (publishable);
 #line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 6070 "RESTSupport.c"
+#line 6081 "RESTSupport.c"
 				}
 #line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp22_ = self->priv->current_file;
@@ -6086,7 +6097,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				_g_object_unref0 (file);
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_object_unref0 (publishable);
-#line 6082 "RESTSupport.c"
+#line 6093 "RESTSupport.c"
 			}
 		}
 	}
@@ -6094,13 +6105,13 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 	_tmp23_ = stop;
 #line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp23_) {
-#line 6090 "RESTSupport.c"
+#line 6101 "RESTSupport.c"
 		gint _tmp24_ = 0;
 #line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp24_ = self->priv->current_file;
 #line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit_by_name (self, "upload-complete", _tmp24_);
-#line 6096 "RESTSupport.c"
+#line 6107 "RESTSupport.c"
 	}
 }
 
@@ -6149,7 +6160,7 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
 	_tmp7__target = self->priv->status_updated_target;
 #line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 6145 "RESTSupport.c"
+#line 6156 "RESTSupport.c"
 		SpitPublishingProgressCallback _tmp8_ = NULL;
 		void* _tmp8__target = NULL;
 		gint _tmp9_ = 0;
@@ -6164,7 +6175,7 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
 		_tmp10_ = fraction_complete;
 #line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 6160 "RESTSupport.c"
+#line 6171 "RESTSupport.c"
 	}
 }
 
@@ -6183,7 +6194,7 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session
 	result = _tmp1_;
 #line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6179 "RESTSupport.c"
+#line 6190 "RESTSupport.c"
 }
 
 
@@ -6210,7 +6221,7 @@ SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_pu
 	result = _tmp3_;
 #line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6206 "RESTSupport.c"
+#line 6217 "RESTSupport.c"
 }
 
 
@@ -6219,7 +6230,7 @@ static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_batch_uploader_create_transaction'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6215 "RESTSupport.c"
+#line 6226 "RESTSupport.c"
 }
 
 
@@ -6228,7 +6239,7 @@ PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
 #line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable);
-#line 6224 "RESTSupport.c"
+#line 6235 "RESTSupport.c"
 }
 
 
@@ -6255,7 +6266,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
 	if (_tmp1__length1 > 0) {
 #line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_send_files (self);
-#line 6251 "RESTSupport.c"
+#line 6262 "RESTSupport.c"
 	}
 }
 
@@ -6263,7 +6274,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
 static void publishing_rest_support_value_batch_uploader_init (GValue* value) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 6259 "RESTSupport.c"
+#line 6270 "RESTSupport.c"
 }
 
 
@@ -6272,7 +6283,7 @@ static void publishing_rest_support_value_batch_uploader_free_value (GValue* val
 	if (value->data[0].v_pointer) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer);
-#line 6268 "RESTSupport.c"
+#line 6279 "RESTSupport.c"
 	}
 }
 
@@ -6282,11 +6293,11 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu
 	if (src_value->data[0].v_pointer) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (src_value->data[0].v_pointer);
-#line 6278 "RESTSupport.c"
+#line 6289 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6282 "RESTSupport.c"
+#line 6293 "RESTSupport.c"
 	}
 }
 
@@ -6294,37 +6305,37 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu
 static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 6290 "RESTSupport.c"
+#line 6301 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_batch_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 6297 "RESTSupport.c"
+#line 6308 "RESTSupport.c"
 		PublishingRESTSupportBatchUploader* object;
 		object = collect_values[0].v_pointer;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6304 "RESTSupport.c"
+#line 6315 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6308 "RESTSupport.c"
+#line 6319 "RESTSupport.c"
 		}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object);
-#line 6312 "RESTSupport.c"
+#line 6323 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6316 "RESTSupport.c"
+#line 6327 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6320 "RESTSupport.c"
+#line 6331 "RESTSupport.c"
 }
 
 
@@ -6335,25 +6346,25 @@ static gchar* publishing_rest_support_value_batch_uploader_lcopy_value (const GV
 	if (!object_p) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6331 "RESTSupport.c"
+#line 6342 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 6337 "RESTSupport.c"
+#line 6348 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6341 "RESTSupport.c"
+#line 6352 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6345 "RESTSupport.c"
+#line 6356 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6349 "RESTSupport.c"
+#line 6360 "RESTSupport.c"
 }
 
 
@@ -6367,7 +6378,7 @@ GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 6363 "RESTSupport.c"
+#line 6374 "RESTSupport.c"
 }
 
 
@@ -6376,7 +6387,7 @@ gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value)
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 6372 "RESTSupport.c"
+#line 6383 "RESTSupport.c"
 }
 
 
@@ -6396,17 +6407,17 @@ void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v
 		value->data[0].v_pointer = v_object;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6392 "RESTSupport.c"
+#line 6403 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6396 "RESTSupport.c"
+#line 6407 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (old);
-#line 6402 "RESTSupport.c"
+#line 6413 "RESTSupport.c"
 	}
 }
 
@@ -6425,17 +6436,17 @@ void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 6421 "RESTSupport.c"
+#line 6432 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6425 "RESTSupport.c"
+#line 6436 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (old);
-#line 6431 "RESTSupport.c"
+#line 6442 "RESTSupport.c"
 	}
 }
 
@@ -6453,7 +6464,7 @@ static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSup
 	g_signal_new ("upload_complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("upload_error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 6449 "RESTSupport.c"
+#line 6460 "RESTSupport.c"
 }
 
 
@@ -6474,7 +6485,7 @@ static void publishing_rest_support_batch_uploader_instance_init (PublishingREST
 	self->priv->status_updated = NULL;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 6470 "RESTSupport.c"
+#line 6481 "RESTSupport.c"
 }
 
 
@@ -6488,7 +6499,7 @@ static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSuppo
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 6484 "RESTSupport.c"
+#line 6495 "RESTSupport.c"
 }
 
 
@@ -6513,7 +6524,7 @@ gpointer publishing_rest_support_batch_uploader_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 6509 "RESTSupport.c"
+#line 6520 "RESTSupport.c"
 }
 
 
@@ -6526,7 +6537,7 @@ void publishing_rest_support_batch_uploader_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self);
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6522 "RESTSupport.c"
+#line 6533 "RESTSupport.c"
 	}
 }
 
@@ -6545,7 +6556,7 @@ static gunichar string_get_char (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 6541 "RESTSupport.c"
+#line 6552 "RESTSupport.c"
 }
 
 
@@ -6571,7 +6582,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 	_tmp2_ = g_string_new ("");
 #line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	b = _tmp2_;
-#line 6567 "RESTSupport.c"
+#line 6578 "RESTSupport.c"
 	{
 		const gchar* u = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -6579,14 +6590,14 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 		_tmp3_ = t;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		u = _tmp3_;
-#line 6575 "RESTSupport.c"
+#line 6586 "RESTSupport.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = TRUE;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 6582 "RESTSupport.c"
+#line 6593 "RESTSupport.c"
 				const gchar* _tmp7_ = NULL;
 				gunichar _tmp8_ = 0U;
 				gunichar c = 0U;
@@ -6595,7 +6606,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 				gunichar _tmp11_ = 0U;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!_tmp4_) {
-#line 6591 "RESTSupport.c"
+#line 6602 "RESTSupport.c"
 					const gchar* _tmp5_ = NULL;
 					const gchar* _tmp6_ = NULL;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6604,7 +6615,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 					_tmp6_ = g_utf8_next_char (_tmp5_);
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					u = _tmp6_;
-#line 6600 "RESTSupport.c"
+#line 6611 "RESTSupport.c"
 				}
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = FALSE;
@@ -6616,7 +6627,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 				if (!(_tmp8_ != ((gunichar) 0))) {
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 6612 "RESTSupport.c"
+#line 6623 "RESTSupport.c"
 				}
 #line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = u;
@@ -6628,7 +6639,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 				_tmp11_ = c;
 #line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (((gint) _tmp11_) < 128) {
-#line 6624 "RESTSupport.c"
+#line 6635 "RESTSupport.c"
 					GString* _tmp12_ = NULL;
 					gunichar _tmp13_ = 0U;
 #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6637,7 +6648,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 					_tmp13_ = c;
 #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_string_append_unichar (_tmp12_, _tmp13_);
-#line 6633 "RESTSupport.c"
+#line 6644 "RESTSupport.c"
 				}
 			}
 		}
@@ -6656,7 +6667,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 	_g_free0 (t);
 #line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6652 "RESTSupport.c"
+#line 6663 "RESTSupport.c"
 }
 
 
@@ -6665,7 +6676,7 @@ static gchar* publishing_rest_support_google_session_real_get_user_name (Publish
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_user_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6661 "RESTSupport.c"
+#line 6672 "RESTSupport.c"
 }
 
 
@@ -6674,7 +6685,7 @@ gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSuppo
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
 #line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self);
-#line 6670 "RESTSupport.c"
+#line 6681 "RESTSupport.c"
 }
 
 
@@ -6683,7 +6694,7 @@ static gchar* publishing_rest_support_google_session_real_get_access_token (Publ
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_access_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6679 "RESTSupport.c"
+#line 6690 "RESTSupport.c"
 }
 
 
@@ -6692,7 +6703,7 @@ gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSu
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
 #line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self);
-#line 6688 "RESTSupport.c"
+#line 6699 "RESTSupport.c"
 }
 
 
@@ -6701,7 +6712,7 @@ static gchar* publishing_rest_support_google_session_real_get_refresh_token (Pub
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_refresh_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6697 "RESTSupport.c"
+#line 6708 "RESTSupport.c"
 }
 
 
@@ -6710,7 +6721,7 @@ gchar* publishing_rest_support_google_session_get_refresh_token (PublishingRESTS
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
 #line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_refresh_token (self);
-#line 6706 "RESTSupport.c"
+#line 6717 "RESTSupport.c"
 }
 
 
@@ -6719,7 +6730,7 @@ static void publishing_rest_support_google_session_real_deauthenticate (Publishi
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_deauthenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6715 "RESTSupport.c"
+#line 6726 "RESTSupport.c"
 }
 
 
@@ -6728,7 +6739,7 @@ void publishing_rest_support_google_session_deauthenticate (PublishingRESTSuppor
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self));
 #line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self);
-#line 6724 "RESTSupport.c"
+#line 6735 "RESTSupport.c"
 }
 
 
@@ -6738,7 +6749,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_const
 	self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
 #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 6734 "RESTSupport.c"
+#line 6745 "RESTSupport.c"
 }
 
 
@@ -6753,7 +6764,7 @@ static void publishing_rest_support_google_session_class_init (PublishingRESTSup
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_refresh_token = publishing_rest_support_google_session_real_get_refresh_token;
 #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_session_real_deauthenticate;
-#line 6749 "RESTSupport.c"
+#line 6760 "RESTSupport.c"
 }
 
 
@@ -6816,14 +6827,14 @@ PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_c
 	self->priv->web_auth_pane = NULL;
 #line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 6812 "RESTSupport.c"
+#line 6823 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized (PublishingRESTSupportGooglePublisherWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
 #line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_web_auth_pane_authorized ((PublishingRESTSupportGooglePublisher*) self, auth_code);
-#line 6819 "RESTSupport.c"
+#line 6830 "RESTSupport.c"
 }
 
 
@@ -6857,27 +6868,27 @@ static void publishing_rest_support_google_publisher_on_web_auth_pane_authorized
 	if (!_tmp4_) {
 #line 895 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6852 "RESTSupport.c"
+#line 6863 "RESTSupport.c"
 	}
 #line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = auth_code;
 #line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_do_get_access_tokens (self, _tmp5_);
-#line 6858 "RESTSupport.c"
+#line 6869 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_get_access_tokens_complete ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6865 "RESTSupport.c"
+#line 6876 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_get_access_tokens_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6872 "RESTSupport.c"
+#line 6883 "RESTSupport.c"
 }
 
 
@@ -6915,7 +6926,7 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_comple
 	if (!_tmp4_) {
 #line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6909 "RESTSupport.c"
+#line 6920 "RESTSupport.c"
 	}
 #line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = txn;
@@ -6927,7 +6938,7 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_comple
 	publishing_rest_support_google_publisher_do_extract_tokens (self, _tmp7_);
 #line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp7_);
-#line 6921 "RESTSupport.c"
+#line 6932 "RESTSupport.c"
 }
 
 
@@ -6975,7 +6986,7 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_error
 	if (!_tmp7_) {
 #line 922 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 6968 "RESTSupport.c"
+#line 6979 "RESTSupport.c"
 	}
 #line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = self->priv->host;
@@ -6983,21 +6994,21 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_error
 	_tmp9_ = err;
 #line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 6976 "RESTSupport.c"
+#line 6987 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6983 "RESTSupport.c"
+#line 6994 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6990 "RESTSupport.c"
+#line 7001 "RESTSupport.c"
 }
 
 
@@ -7037,7 +7048,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
 	if (!_tmp4_) {
 #line 935 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7029 "RESTSupport.c"
+#line 7040 "RESTSupport.c"
 	}
 #line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = self->priv->session;
@@ -7047,7 +7058,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
 	if (_tmp6_) {
 #line 938 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7039 "RESTSupport.c"
+#line 7050 "RESTSupport.c"
 	}
 #line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = txn;
@@ -7059,7 +7070,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
 	publishing_rest_support_google_publisher_do_extract_tokens (self, _tmp9_);
 #line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp9_);
-#line 7051 "RESTSupport.c"
+#line 7062 "RESTSupport.c"
 }
 
 
@@ -7100,7 +7111,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
 	if (!_tmp4_) {
 #line 951 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7091 "RESTSupport.c"
+#line 7102 "RESTSupport.c"
 	}
 #line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = self->priv->session;
@@ -7110,7 +7121,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
 	if (_tmp6_) {
 #line 954 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7101 "RESTSupport.c"
+#line 7112 "RESTSupport.c"
 	}
 #line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = txn;
@@ -7122,7 +7133,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
 		publishing_rest_support_google_publisher_do_logout (self);
 #line 960 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7113 "RESTSupport.c"
+#line 7124 "RESTSupport.c"
 	}
 #line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = self->priv->host;
@@ -7130,7 +7141,7 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
 	_tmp10_ = err;
 #line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spit_publishing_plugin_host_post_error (_tmp9_, _tmp10_);
-#line 7121 "RESTSupport.c"
+#line 7132 "RESTSupport.c"
 }
 
 
@@ -7155,7 +7166,7 @@ static void publishing_rest_support_google_publisher_on_refresh_token_available
 	if (!_tmp1_) {
 #line 970 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7145 "RESTSupport.c"
+#line 7156 "RESTSupport.c"
 	}
 #line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = self->priv->session;
@@ -7167,7 +7178,7 @@ static void publishing_rest_support_google_publisher_on_refresh_token_available
 	_g_free0 (_tmp2_->refresh_token);
 #line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_->refresh_token = _tmp4_;
-#line 7157 "RESTSupport.c"
+#line 7168 "RESTSupport.c"
 }
 
 
@@ -7192,7 +7203,7 @@ static void publishing_rest_support_google_publisher_on_access_token_available (
 	if (!_tmp1_) {
 #line 979 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7181 "RESTSupport.c"
+#line 7192 "RESTSupport.c"
 	}
 #line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = self->priv->session;
@@ -7206,21 +7217,21 @@ static void publishing_rest_support_google_publisher_on_access_token_available (
 	_tmp2_->access_token = _tmp4_;
 #line 983 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_do_fetch_username (self);
-#line 7195 "RESTSupport.c"
+#line 7206 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_fetch_username_transaction_completed ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 7202 "RESTSupport.c"
+#line 7213 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_on_fetch_username_transaction_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 7209 "RESTSupport.c"
+#line 7220 "RESTSupport.c"
 }
 
 
@@ -7258,7 +7269,7 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
 	if (!_tmp4_) {
 #line 993 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7246 "RESTSupport.c"
+#line 7257 "RESTSupport.c"
 	}
 #line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = txn;
@@ -7270,7 +7281,7 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
 	publishing_rest_support_google_publisher_do_extract_username (self, _tmp7_);
 #line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp7_);
-#line 7258 "RESTSupport.c"
+#line 7269 "RESTSupport.c"
 }
 
 
@@ -7307,7 +7318,7 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
 	if (!_tmp4_) {
 #line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7294 "RESTSupport.c"
+#line 7305 "RESTSupport.c"
 	}
 #line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = self->priv->host;
@@ -7315,7 +7326,7 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
 	_tmp6_ = err;
 #line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 7302 "RESTSupport.c"
+#line 7313 "RESTSupport.c"
 }
 
 
@@ -7349,7 +7360,7 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self, 0);
 #line 1018 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7335 "RESTSupport.c"
+#line 7346 "RESTSupport.c"
 	{
 #line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7357,7 +7368,7 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7343 "RESTSupport.c"
+#line 7354 "RESTSupport.c"
 				goto __catch4_spit_publishing_publishing_error;
 			}
 #line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7368,7 +7379,7 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
 			g_clear_error (&_inner_error_);
 #line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 7354 "RESTSupport.c"
+#line 7365 "RESTSupport.c"
 		}
 	}
 	goto __finally4;
@@ -7389,7 +7400,7 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 7375 "RESTSupport.c"
+#line 7386 "RESTSupport.c"
 	}
 	__finally4:
 #line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7402,11 +7413,11 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
 		g_clear_error (&_inner_error_);
 #line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7388 "RESTSupport.c"
+#line 7399 "RESTSupport.c"
 	}
 #line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 7392 "RESTSupport.c"
+#line 7403 "RESTSupport.c"
 }
 
 
@@ -7546,7 +7557,7 @@ static void publishing_rest_support_google_publisher_do_hosted_web_authenticatio
 	spit_publishing_plugin_host_install_dialog_pane (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 1027 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (user_authorization_url);
-#line 7531 "RESTSupport.c"
+#line 7542 "RESTSupport.c"
 }
 
 
@@ -7575,7 +7586,7 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
 #line 1055 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7559 "RESTSupport.c"
+#line 7570 "RESTSupport.c"
 	{
 #line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -7583,7 +7594,7 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7567 "RESTSupport.c"
+#line 7578 "RESTSupport.c"
 				goto __catch5_spit_publishing_publishing_error;
 			}
 #line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7594,7 +7605,7 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
 			g_clear_error (&_inner_error_);
 #line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 7578 "RESTSupport.c"
+#line 7589 "RESTSupport.c"
 		}
 	}
 	goto __finally5;
@@ -7615,7 +7626,7 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
 		spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
 #line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 7599 "RESTSupport.c"
+#line 7610 "RESTSupport.c"
 	}
 	__finally5:
 #line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7628,18 +7639,18 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
 		g_clear_error (&_inner_error_);
 #line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7612 "RESTSupport.c"
+#line 7623 "RESTSupport.c"
 	}
 #line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 7616 "RESTSupport.c"
+#line 7627 "RESTSupport.c"
 }
 
 
 static gpointer _json_object_ref0 (gpointer self) {
 #line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? json_object_ref (self) : NULL;
-#line 7623 "RESTSupport.c"
+#line 7634 "RESTSupport.c"
 }
 
 
@@ -7670,7 +7681,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 	_tmp0_ = json_parser_new ();
 #line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	parser = _tmp0_;
-#line 7653 "RESTSupport.c"
+#line 7664 "RESTSupport.c"
 	{
 		JsonParser* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -7682,7 +7693,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
 #line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7665 "RESTSupport.c"
+#line 7676 "RESTSupport.c"
 			goto __catch6_g_error;
 		}
 	}
@@ -7727,7 +7738,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 		_g_object_unref0 (parser);
 #line 1074 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7710 "RESTSupport.c"
+#line 7721 "RESTSupport.c"
 	}
 	__finally6:
 #line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7740,7 +7751,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 		g_clear_error (&_inner_error_);
 #line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7723 "RESTSupport.c"
+#line 7734 "RESTSupport.c"
 	}
 #line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = parser;
@@ -7758,7 +7769,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 	_tmp16_ = json_object_has_member (_tmp15_, "access_token");
 #line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp16_) {
-#line 7741 "RESTSupport.c"
+#line 7752 "RESTSupport.c"
 		JsonObject* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
 #line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7767,15 +7778,15 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 		_tmp18_ = json_object_has_member (_tmp17_, "refresh_token");
 #line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp14_ = !_tmp18_;
-#line 7750 "RESTSupport.c"
+#line 7761 "RESTSupport.c"
 	} else {
 #line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp14_ = FALSE;
-#line 7754 "RESTSupport.c"
+#line 7765 "RESTSupport.c"
 	}
 #line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp14_) {
-#line 7758 "RESTSupport.c"
+#line 7769 "RESTSupport.c"
 		SpitPublishingPluginHost* _tmp19_ = NULL;
 		GError* _tmp20_ = NULL;
 		GError* _tmp21_ = NULL;
@@ -7795,7 +7806,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 		_g_object_unref0 (parser);
 #line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7778 "RESTSupport.c"
+#line 7789 "RESTSupport.c"
 	}
 #line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp22_ = response_obj;
@@ -7803,7 +7814,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 	_tmp23_ = json_object_has_member (_tmp22_, "refresh_token");
 #line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp23_) {
-#line 7786 "RESTSupport.c"
+#line 7797 "RESTSupport.c"
 		gchar* refresh_token = NULL;
 		JsonObject* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
@@ -7821,17 +7832,17 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 		_tmp27_ = refresh_token;
 #line 1088 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (g_strcmp0 (_tmp27_, "") != 0) {
-#line 7804 "RESTSupport.c"
+#line 7815 "RESTSupport.c"
 			const gchar* _tmp28_ = NULL;
 #line 1089 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp28_ = refresh_token;
 #line 1089 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			publishing_rest_support_google_publisher_on_refresh_token_available (self, _tmp28_);
-#line 7810 "RESTSupport.c"
+#line 7821 "RESTSupport.c"
 		}
 #line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (refresh_token);
-#line 7814 "RESTSupport.c"
+#line 7825 "RESTSupport.c"
 	}
 #line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp29_ = response_obj;
@@ -7839,7 +7850,7 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 	_tmp30_ = json_object_has_member (_tmp29_, "access_token");
 #line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp30_) {
-#line 7822 "RESTSupport.c"
+#line 7833 "RESTSupport.c"
 		gchar* access_token = NULL;
 		JsonObject* _tmp31_ = NULL;
 		const gchar* _tmp32_ = NULL;
@@ -7857,23 +7868,23 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
 		_tmp34_ = access_token;
 #line 1095 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (g_strcmp0 (_tmp34_, "") != 0) {
-#line 7840 "RESTSupport.c"
+#line 7851 "RESTSupport.c"
 			const gchar* _tmp35_ = NULL;
 #line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp35_ = access_token;
 #line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			publishing_rest_support_google_publisher_on_access_token_available (self, _tmp35_);
-#line 7846 "RESTSupport.c"
+#line 7857 "RESTSupport.c"
 		}
 #line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (access_token);
-#line 7850 "RESTSupport.c"
+#line 7861 "RESTSupport.c"
 	}
 #line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_json_object_unref0 (response_obj);
 #line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (parser);
-#line 7856 "RESTSupport.c"
+#line 7867 "RESTSupport.c"
 }
 
 
@@ -7907,13 +7918,13 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
 #line 1108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7889 "RESTSupport.c"
+#line 7900 "RESTSupport.c"
 	{
 #line 1111 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
 #line 1111 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7895 "RESTSupport.c"
+#line 7906 "RESTSupport.c"
 			goto __catch7_g_error;
 		}
 	}
@@ -7935,7 +7946,7 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 7917 "RESTSupport.c"
+#line 7928 "RESTSupport.c"
 	}
 	__finally7:
 #line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -7948,11 +7959,11 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
 		g_clear_error (&_inner_error_);
 #line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 7930 "RESTSupport.c"
+#line 7941 "RESTSupport.c"
 	}
 #line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 7934 "RESTSupport.c"
+#line 7945 "RESTSupport.c"
 }
 
 
@@ -7982,7 +7993,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 	_tmp0_ = json_parser_new ();
 #line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	parser = _tmp0_;
-#line 7963 "RESTSupport.c"
+#line 7974 "RESTSupport.c"
 	{
 		JsonParser* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -7994,7 +8005,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
 #line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7975 "RESTSupport.c"
+#line 7986 "RESTSupport.c"
 			goto __catch8_g_error;
 		}
 	}
@@ -8039,7 +8050,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 		_g_object_unref0 (parser);
 #line 1127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 8020 "RESTSupport.c"
+#line 8031 "RESTSupport.c"
 	}
 	__finally8:
 #line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -8052,7 +8063,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 		g_clear_error (&_inner_error_);
 #line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 8033 "RESTSupport.c"
+#line 8044 "RESTSupport.c"
 	}
 #line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = parser;
@@ -8070,7 +8081,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 	_tmp15_ = json_object_has_member (_tmp14_, "name");
 #line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp15_) {
-#line 8051 "RESTSupport.c"
+#line 8062 "RESTSupport.c"
 		gchar* username = NULL;
 		JsonObject* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -8088,7 +8099,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 		_tmp19_ = username;
 #line 1135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (g_strcmp0 (_tmp19_, "") != 0) {
-#line 8069 "RESTSupport.c"
+#line 8080 "RESTSupport.c"
 			PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp20_ = NULL;
 			const gchar* _tmp21_ = NULL;
 			gchar* _tmp22_ = NULL;
@@ -8102,11 +8113,11 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 			_g_free0 (_tmp20_->user_name);
 #line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp20_->user_name = _tmp22_;
-#line 8083 "RESTSupport.c"
+#line 8094 "RESTSupport.c"
 		}
 #line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (username);
-#line 8087 "RESTSupport.c"
+#line 8098 "RESTSupport.c"
 	}
 #line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = response_obj;
@@ -8114,7 +8125,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 	_tmp24_ = json_object_has_member (_tmp23_, "access_token");
 #line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp24_) {
-#line 8095 "RESTSupport.c"
+#line 8106 "RESTSupport.c"
 		gchar* access_token = NULL;
 		JsonObject* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
@@ -8132,7 +8143,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 		_tmp28_ = access_token;
 #line 1142 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (g_strcmp0 (_tmp28_, "") != 0) {
-#line 8113 "RESTSupport.c"
+#line 8124 "RESTSupport.c"
 			PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp29_ = NULL;
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
@@ -8146,11 +8157,11 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 			_g_free0 (_tmp29_->access_token);
 #line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp29_->access_token = _tmp31_;
-#line 8127 "RESTSupport.c"
+#line 8138 "RESTSupport.c"
 		}
 #line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (access_token);
-#line 8131 "RESTSupport.c"
+#line 8142 "RESTSupport.c"
 	}
 #line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp32_ = self->priv->session;
@@ -8164,7 +8175,7 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
 	_json_object_unref0 (response_obj);
 #line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (parser);
-#line 8145 "RESTSupport.c"
+#line 8156 "RESTSupport.c"
 }
 
 
@@ -8179,7 +8190,7 @@ SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (Pub
 	result = _tmp0_;
 #line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8160 "RESTSupport.c"
+#line 8171 "RESTSupport.c"
 }
 
 
@@ -8197,7 +8208,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get
 	result = _tmp1_;
 #line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8178 "RESTSupport.c"
+#line 8189 "RESTSupport.c"
 }
 
 
@@ -8210,21 +8221,21 @@ void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSu
 	_tmp1_ = refresh_token;
 #line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 8191 "RESTSupport.c"
+#line 8202 "RESTSupport.c"
 		const gchar* _tmp2_ = NULL;
 #line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = refresh_token;
 #line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = g_strcmp0 (_tmp2_, "") != 0;
-#line 8197 "RESTSupport.c"
+#line 8208 "RESTSupport.c"
 	} else {
 #line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = FALSE;
-#line 8201 "RESTSupport.c"
+#line 8212 "RESTSupport.c"
 	}
 #line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_) {
-#line 8205 "RESTSupport.c"
+#line 8216 "RESTSupport.c"
 		PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -8240,14 +8251,14 @@ void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSu
 		_tmp3_->refresh_token = _tmp5_;
 #line 1164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_google_publisher_do_exchange_refresh_token_for_access_token (self);
-#line 8221 "RESTSupport.c"
+#line 8232 "RESTSupport.c"
 	} else {
 		gboolean _tmp6_ = FALSE;
 #line 1166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = publishing_rest_support_google_publisher_web_authentication_pane_is_cache_dirty ();
 #line 1166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp6_) {
-#line 8228 "RESTSupport.c"
+#line 8239 "RESTSupport.c"
 			SpitPublishingPluginHost* _tmp7_ = NULL;
 			const gchar* _tmp8_ = NULL;
 #line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -8262,11 +8273,11 @@ void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSu
 			spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp8_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 1168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 8239 "RESTSupport.c"
+#line 8250 "RESTSupport.c"
 		}
 #line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_google_publisher_do_hosted_web_authentication (self);
-#line 8243 "RESTSupport.c"
+#line 8254 "RESTSupport.c"
 	}
 }
 
@@ -8276,7 +8287,7 @@ static void publishing_rest_support_google_publisher_real_on_login_flow_complete
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_on_login_flow_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 8253 "RESTSupport.c"
+#line 8264 "RESTSupport.c"
 }
 
 
@@ -8285,7 +8296,7 @@ void publishing_rest_support_google_publisher_on_login_flow_complete (Publishing
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
 #line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self);
-#line 8262 "RESTSupport.c"
+#line 8273 "RESTSupport.c"
 }
 
 
@@ -8294,7 +8305,7 @@ static void publishing_rest_support_google_publisher_real_do_logout (PublishingR
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_do_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 8271 "RESTSupport.c"
+#line 8282 "RESTSupport.c"
 }
 
 
@@ -8303,7 +8314,7 @@ void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGo
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
 #line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self);
-#line 8280 "RESTSupport.c"
+#line 8291 "RESTSupport.c"
 }
 
 
@@ -8312,7 +8323,7 @@ static gboolean publishing_rest_support_google_publisher_real_is_running (Publis
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_is_running'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return FALSE;
-#line 8289 "RESTSupport.c"
+#line 8300 "RESTSupport.c"
 }
 
 
@@ -8321,7 +8332,7 @@ gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupp
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), FALSE);
 #line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self);
-#line 8298 "RESTSupport.c"
+#line 8309 "RESTSupport.c"
 }
 
 
@@ -8330,7 +8341,7 @@ static void publishing_rest_support_google_publisher_real_start (PublishingRESTS
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_start'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 8307 "RESTSupport.c"
+#line 8318 "RESTSupport.c"
 }
 
 
@@ -8339,7 +8350,7 @@ void publishing_rest_support_google_publisher_start (PublishingRESTSupportGoogle
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
 #line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self);
-#line 8316 "RESTSupport.c"
+#line 8327 "RESTSupport.c"
 }
 
 
@@ -8348,7 +8359,7 @@ static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSu
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_stop'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 8325 "RESTSupport.c"
+#line 8336 "RESTSupport.c"
 }
 
 
@@ -8357,7 +8368,7 @@ void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGoogleP
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
 #line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self);
-#line 8334 "RESTSupport.c"
+#line 8345 "RESTSupport.c"
 }
 
 
@@ -8376,7 +8387,7 @@ static SpitPublishingService* publishing_rest_support_google_publisher_real_get_
 	result = _tmp1_;
 #line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8353 "RESTSupport.c"
+#line 8364 "RESTSupport.c"
 }
 
 
@@ -8398,14 +8409,14 @@ static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_su
 	self->refresh_token = NULL;
 #line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 8375 "RESTSupport.c"
+#line 8386 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) {
 #line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_google_session_impl_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL);
-#line 8382 "RESTSupport.c"
+#line 8393 "RESTSupport.c"
 }
 
 
@@ -8421,7 +8432,7 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea
 	result = _tmp0_ != NULL;
 #line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8398 "RESTSupport.c"
+#line 8409 "RESTSupport.c"
 }
 
 
@@ -8445,7 +8456,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 	result = _tmp2_;
 #line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8422 "RESTSupport.c"
+#line 8433 "RESTSupport.c"
 }
 
 
@@ -8469,7 +8480,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 	result = _tmp2_;
 #line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8446 "RESTSupport.c"
+#line 8457 "RESTSupport.c"
 }
 
 
@@ -8493,7 +8504,7 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 	result = _tmp2_;
 #line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8470 "RESTSupport.c"
+#line 8481 "RESTSupport.c"
 }
 
 
@@ -8513,7 +8524,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_real_de
 	_g_free0 (self->refresh_token);
 #line 790 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->refresh_token = NULL;
-#line 8490 "RESTSupport.c"
+#line 8501 "RESTSupport.c"
 }
 
 
@@ -8532,7 +8543,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_class_i
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_refresh_token = publishing_rest_support_google_publisher_google_session_impl_real_get_refresh_token;
 #line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate;
-#line 8509 "RESTSupport.c"
+#line 8520 "RESTSupport.c"
 }
 
 
@@ -8552,7 +8563,7 @@ static void publishing_rest_support_google_publisher_google_session_impl_finaliz
 	_g_free0 (self->refresh_token);
 #line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_google_publisher_google_session_impl_parent_class)->finalize (obj);
-#line 8529 "RESTSupport.c"
+#line 8540 "RESTSupport.c"
 }
 
 
@@ -8579,14 +8590,14 @@ static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_res
 	self = (PublishingRESTSupportGooglePublisherWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp0_, NULL);
 #line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 8556 "RESTSupport.c"
+#line 8567 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_rest_support_google_publisher_web_authentication_pane_new (const gchar* auth_sequence_start_url) {
 #line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_web_authentication_pane_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, auth_sequence_start_url);
-#line 8563 "RESTSupport.c"
+#line 8574 "RESTSupport.c"
 }
 
 
@@ -8599,7 +8610,7 @@ static gboolean publishing_rest_support_google_publisher_web_authentication_pane
 	result = _tmp0_;
 #line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8576 "RESTSupport.c"
+#line 8587 "RESTSupport.c"
 }
 
 
@@ -8626,7 +8637,7 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 	_tmp3_ = _result_;
 #line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 8603 "RESTSupport.c"
+#line 8614 "RESTSupport.c"
 		gchar* _tmp4_ = NULL;
 #line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
@@ -8634,13 +8645,13 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
 		result = (gint) (_tmp4_ - ((gchar*) self));
 #line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8611 "RESTSupport.c"
+#line 8622 "RESTSupport.c"
 	} else {
 #line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
 #line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8617 "RESTSupport.c"
+#line 8628 "RESTSupport.c"
 	}
 }
 
@@ -8664,7 +8675,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 8641 "RESTSupport.c"
+#line 8652 "RESTSupport.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -8672,7 +8683,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8649 "RESTSupport.c"
+#line 8660 "RESTSupport.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -8684,7 +8695,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8661 "RESTSupport.c"
+#line 8672 "RESTSupport.c"
 	}
 }
 
@@ -8708,21 +8719,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 8685 "RESTSupport.c"
+#line 8696 "RESTSupport.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 8691 "RESTSupport.c"
+#line 8702 "RESTSupport.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 8695 "RESTSupport.c"
+#line 8706 "RESTSupport.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 8699 "RESTSupport.c"
+#line 8710 "RESTSupport.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -8734,7 +8745,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 8711 "RESTSupport.c"
+#line 8722 "RESTSupport.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -8744,13 +8755,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 8721 "RESTSupport.c"
+#line 8732 "RESTSupport.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 8727 "RESTSupport.c"
+#line 8738 "RESTSupport.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -8764,7 +8775,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 8741 "RESTSupport.c"
+#line 8752 "RESTSupport.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -8774,13 +8785,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 8751 "RESTSupport.c"
+#line 8762 "RESTSupport.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 8757 "RESTSupport.c"
+#line 8768 "RESTSupport.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8789,7 +8800,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 8766 "RESTSupport.c"
+#line 8777 "RESTSupport.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -8809,7 +8820,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 8786 "RESTSupport.c"
+#line 8797 "RESTSupport.c"
 }
 
 
@@ -8845,7 +8856,7 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_rea
 	_tmp6_ = string_index_of (_tmp5_, "state=connect", 0);
 #line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp6_ > 0) {
-#line 8822 "RESTSupport.c"
+#line 8833 "RESTSupport.c"
 		gint auth_code_field_start = 0;
 		const gchar* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
@@ -8869,7 +8880,7 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_rea
 			_g_free0 (page_title);
 #line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 8846 "RESTSupport.c"
+#line 8857 "RESTSupport.c"
 		}
 #line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp10_ = page_title;
@@ -8887,11 +8898,11 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_rea
 		g_signal_emit_by_name (self, "authorized", _tmp13_);
 #line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (auth_code);
-#line 8864 "RESTSupport.c"
+#line 8875 "RESTSupport.c"
 	}
 #line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (page_title);
-#line 8868 "RESTSupport.c"
+#line 8879 "RESTSupport.c"
 }
 
 
@@ -8904,7 +8915,7 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_cla
 	G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_web_authentication_pane_finalize;
 #line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("authorized", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 8881 "RESTSupport.c"
+#line 8892 "RESTSupport.c"
 }
 
 
@@ -8918,7 +8929,7 @@ static void publishing_rest_support_google_publisher_web_authentication_pane_fin
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
 #line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (publishing_rest_support_google_publisher_web_authentication_pane_parent_class)->finalize (obj);
-#line 8895 "RESTSupport.c"
+#line 8906 "RESTSupport.c"
 }
 
 
@@ -8960,21 +8971,21 @@ static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishin
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "authorization_code");
 #line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 8937 "RESTSupport.c"
+#line 8948 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishing_rest_support_google_publisher_get_access_tokens_transaction_new (PublishingRESTSupportSession* session, const gchar* auth_code) {
 #line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_get_access_tokens_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GET_ACCESS_TOKENS_TRANSACTION, session, auth_code);
-#line 8944 "RESTSupport.c"
+#line 8955 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_get_access_tokens_transaction_class_init (PublishingRESTSupportGooglePublisherGetAccessTokensTransactionClass * klass) {
 #line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_get_access_tokens_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 8951 "RESTSupport.c"
+#line 8962 "RESTSupport.c"
 }
 
 
@@ -9024,21 +9035,21 @@ static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publis
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "refresh_token");
 #line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 9001 "RESTSupport.c"
+#line 9012 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publishing_rest_support_google_publisher_refresh_access_token_transaction_new (PublishingRESTSupportSession* session) {
 #line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_refresh_access_token_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, session);
-#line 9008 "RESTSupport.c"
+#line 9019 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_refresh_access_token_transaction_class_init (PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionClass * klass) {
 #line 838 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_refresh_access_token_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9015 "RESTSupport.c"
+#line 9026 "RESTSupport.c"
 }
 
 
@@ -9077,14 +9088,14 @@ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_
 	self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
 #line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 9054 "RESTSupport.c"
+#line 9065 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
 #line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 9061 "RESTSupport.c"
+#line 9072 "RESTSupport.c"
 }
 
 
@@ -9136,21 +9147,21 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su
 	_g_free0 (_tmp7_);
 #line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 9113 "RESTSupport.c"
+#line 9124 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
 #line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_authenticated_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 9120 "RESTSupport.c"
+#line 9131 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) {
 #line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_authenticated_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9127 "RESTSupport.c"
+#line 9138 "RESTSupport.c"
 }
 
 
@@ -9181,21 +9192,21 @@ static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_
 	self = (PublishingRESTSupportGooglePublisherUsernameFetchTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 9158 "RESTSupport.c"
+#line 9169 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_rest_support_google_publisher_username_fetch_transaction_new (PublishingRESTSupportGoogleSession* session) {
 #line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_username_fetch_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_USERNAME_FETCH_TRANSACTION, session);
-#line 9165 "RESTSupport.c"
+#line 9176 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_username_fetch_transaction_class_init (PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass * klass) {
 #line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_username_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9172 "RESTSupport.c"
+#line 9183 "RESTSupport.c"
 }
 
 
@@ -9232,7 +9243,7 @@ static void publishing_rest_support_google_publisher_class_init (PublishingRESTS
 	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_rest_support_google_publisher_real_stop;
 #line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize;
-#line 9209 "RESTSupport.c"
+#line 9220 "RESTSupport.c"
 }
 
 
@@ -9247,14 +9258,14 @@ static void publishing_rest_support_google_publisher_spit_publishing_publisher_i
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_stop;
 #line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_real_get_service;
-#line 9224 "RESTSupport.c"
+#line 9235 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) {
 #line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE (self);
-#line 9231 "RESTSupport.c"
+#line 9242 "RESTSupport.c"
 }
 
 
@@ -9270,7 +9281,7 @@ static void publishing_rest_support_google_publisher_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->web_auth_pane);
 #line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj);
-#line 9247 "RESTSupport.c"
+#line 9258 "RESTSupport.c"
 }
 
 
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index 1a9052b..b76bead 100644
--- a/plugins/common/RESTSupport.vala
+++ b/plugins/common/RESTSupport.vala
@@ -246,21 +246,21 @@ public class Transaction {
 
     protected void check_response(Soup.Message message) throws Spit.Publishing.PublishingError {
         switch (message.status_code) {
-            case Soup.KnownStatusCode.OK:
-            case Soup.KnownStatusCode.CREATED: // HTTP code 201 (CREATED) signals that a new
-                                               // resource was created in response to a PUT or POST
+            case Soup.Status.OK:
+            case Soup.Status.CREATED: // HTTP code 201 (CREATED) signals that a new
+                                      // resource was created in response to a PUT or POST
             break;
             
-            case Soup.KnownStatusCode.CANT_RESOLVE:
-            case Soup.KnownStatusCode.CANT_RESOLVE_PROXY:
+            case Soup.Status.CANT_RESOLVE:
+            case Soup.Status.CANT_RESOLVE_PROXY:
                 throw new Spit.Publishing.PublishingError.NO_ANSWER("Unable to resolve %s (error code %u)",
                     get_endpoint_url(), message.status_code);
             
-            case Soup.KnownStatusCode.CANT_CONNECT:
-            case Soup.KnownStatusCode.CANT_CONNECT_PROXY:
+            case Soup.Status.CANT_CONNECT:
+            case Soup.Status.CANT_CONNECT_PROXY:
                 throw new Spit.Publishing.PublishingError.NO_ANSWER("Unable to connect to %s (error code %u)",
                     get_endpoint_url(), message.status_code);
-            case Soup.KnownStatusCode.SSL_FAILED:
+            case Soup.Status.SSL_FAILED:
                 throw new Spit.Publishing.PublishingError.SSL_FAILED ("Unable to connect to %s: Secure connection failed",
                     get_endpoint_url ());
             
@@ -511,7 +511,7 @@ public class UploadTransaction : Transaction {
 
         int payload_part_num = message_parts.get_length();
 
-        Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY, payload.data[0:payload_length]);
+        Soup.Buffer bindable_data = new Soup.Buffer.take (payload.data);
         message_parts.append_form_file("", publishable.get_serialized_file().get_path(), mime_type,
             bindable_data);
 
diff --git a/plugins/common/WebAuthenticationPane.c b/plugins/common/WebAuthenticationPane.c
index 27f4f44..372350f 100644
--- a/plugins/common/WebAuthenticationPane.c
+++ b/plugins/common/WebAuthenticationPane.c
@@ -13,8 +13,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <webkit2/webkit2.h>
-#include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 
 #define SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE (shotwell_plugins_common_web_authentication_pane_get_type ())
@@ -44,7 +44,6 @@ struct _ShotwellPluginsCommonWebAuthenticationPanePrivate {
 	SpitPublishingDialogPaneGeometryOptions _preferred_geometry;
 	gchar* _login_uri;
 	WebKitWebView* webview;
-	GtkBox* pane_widget;
 };
 
 
@@ -82,28 +81,28 @@ static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (
 
 
 static void _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self) {
-#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 24 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	shotwell_plugins_common_web_authentication_pane_on_page_load_changed ((ShotwellPluginsCommonWebAuthenticationPane*) self, load_event);
-#line 88 "WebAuthenticationPane.c"
+#line 87 "WebAuthenticationPane.c"
 }
 
 
 static gboolean __lambda4_ (ShotwellPluginsCommonWebAuthenticationPane* self) {
 	gboolean result = FALSE;
-#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	result = FALSE;
-#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	return result;
-#line 98 "WebAuthenticationPane.c"
+#line 97 "WebAuthenticationPane.c"
 }
 
 
 static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self) {
 	gboolean result;
 	result = __lambda4_ ((ShotwellPluginsCommonWebAuthenticationPane*) self);
-#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	return result;
-#line 107 "WebAuthenticationPane.c"
+#line 106 "WebAuthenticationPane.c"
 }
 
 
@@ -114,81 +113,64 @@ static void shotwell_plugins_common_web_authentication_pane_real_constructed (GO
 	WebKitSettings* _tmp2_ = NULL;
 	WebKitWebView* _tmp3_ = NULL;
 	WebKitWebView* _tmp4_ = NULL;
-	GtkBox* _tmp5_ = NULL;
-	GtkBox* _tmp6_ = NULL;
-	WebKitWebView* _tmp7_ = NULL;
-#line 19 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 18 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
-#line 20 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 19 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	G_OBJECT_CLASS (shotwell_plugins_common_web_authentication_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject));
-#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 21 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp0_ = (WebKitWebView*) webkit_web_view_new ();
-#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 21 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_object_ref_sink (_tmp0_);
-#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 21 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_g_object_unref0 (self->priv->webview);
-#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 21 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self->priv->webview = _tmp0_;
-#line 23 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp1_ = self->priv->webview;
-#line 23 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp2_ = webkit_web_view_get_settings (_tmp1_);
-#line 23 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	webkit_settings_set_enable_plugins (_tmp2_, FALSE);
-#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 24 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp3_ = self->priv->webview;
-#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 24 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_signal_connect_object (_tmp3_, "load-changed", (GCallback) _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed, self, 0);
-#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp4_ = self->priv->webview;
-#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_signal_connect_object (_tmp4_, "context-menu", (GCallback) ___lambda4__webkit_web_view_context_menu, self, 0);
-#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	_tmp5_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	g_object_ref_sink (_tmp5_);
-#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	self->priv->pane_widget = _tmp5_;
-#line 29 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	_tmp6_ = self->priv->pane_widget;
-#line 29 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	_tmp7_ = self->priv->webview;
-#line 29 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	gtk_box_pack_start (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 161 "WebAuthenticationPane.c"
+#line 143 "WebAuthenticationPane.c"
 }
 
 
 static void shotwell_plugins_common_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self) {
-#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_critical ("Type `%s' does not implement abstract method `shotwell_plugins_common_web_authentication_pane_on_page_load'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	return;
-#line 170 "WebAuthenticationPane.c"
+#line 152 "WebAuthenticationPane.c"
 }
 
 
 void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self) {
-#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
-#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS (self)->on_page_load (self);
-#line 179 "WebAuthenticationPane.c"
+#line 161 "WebAuthenticationPane.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 186 "WebAuthenticationPane.c"
+#line 168 "WebAuthenticationPane.c"
 }
 
 
 void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type) {
 	GdkWindow* window = NULL;
-	GtkBox* _tmp0_ = NULL;
+	WebKitWebView* _tmp0_ = NULL;
 	GdkWindow* _tmp1_ = NULL;
 	GdkWindow* _tmp2_ = NULL;
 	GdkDisplay* display = NULL;
@@ -197,77 +179,77 @@ void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPlugins
 	GdkCursor* cursor = NULL;
 	GdkCursorType _tmp5_ = 0;
 	GdkCursor* _tmp6_ = NULL;
-#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
-#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = self->priv->webview;
+#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 31 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	window = _tmp2_;
-#line 36 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp3_ = gdk_window_get_display (window);
-#line 36 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 36 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	display = _tmp4_;
-#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp5_ = type;
-#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp6_ = gdk_cursor_new_for_display (display, _tmp5_);
-#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	cursor = _tmp6_;
-#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	gdk_window_set_cursor (window, cursor);
 #line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	gdk_window_set_cursor (window, cursor);
+#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_g_object_unref0 (cursor);
-#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_g_object_unref0 (display);
-#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 30 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_g_object_unref0 (window);
-#line 231 "WebAuthenticationPane.c"
+#line 213 "WebAuthenticationPane.c"
 }
 
 
 static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event) {
 	WebKitLoadEvent _tmp0_ = 0;
-#line 41 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
-#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp0_ = load_event;
-#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	switch (_tmp0_) {
-#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		case WEBKIT_LOAD_STARTED:
-#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		case WEBKIT_LOAD_REDIRECTED:
-#line 247 "WebAuthenticationPane.c"
+#line 229 "WebAuthenticationPane.c"
 		{
-#line 45 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 41 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 			shotwell_plugins_common_web_authentication_pane_set_cursor (self, GDK_WATCH);
-#line 46 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 			break;
-#line 253 "WebAuthenticationPane.c"
+#line 235 "WebAuthenticationPane.c"
 		}
-#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		case WEBKIT_LOAD_FINISHED:
-#line 257 "WebAuthenticationPane.c"
+#line 239 "WebAuthenticationPane.c"
 		{
-#line 48 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 44 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 			shotwell_plugins_common_web_authentication_pane_set_cursor (self, GDK_LEFT_PTR);
-#line 49 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 			shotwell_plugins_common_web_authentication_pane_on_page_load (self);
-#line 50 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 46 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 			break;
-#line 265 "WebAuthenticationPane.c"
+#line 247 "WebAuthenticationPane.c"
 		}
 		default:
 		{
-#line 52 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 48 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 			break;
-#line 271 "WebAuthenticationPane.c"
+#line 253 "WebAuthenticationPane.c"
 		}
 	}
 }
@@ -277,17 +259,17 @@ WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (Shotwel
 	WebKitWebView* result = NULL;
 	WebKitWebView* _tmp0_ = NULL;
 	WebKitWebView* _tmp1_ = NULL;
-#line 56 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 52 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), NULL);
-#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp0_ = self->priv->webview;
-#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	result = _tmp1_;
-#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	return result;
-#line 291 "WebAuthenticationPane.c"
+#line 273 "WebAuthenticationPane.c"
 }
 
 
@@ -295,34 +277,34 @@ static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authe
 	ShotwellPluginsCommonWebAuthenticationPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
 	SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
-#line 60 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 56 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
-#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp0_ = self->priv->_preferred_geometry;
-#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	result = _tmp0_;
-#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	return result;
-#line 307 "WebAuthenticationPane.c"
+#line 289 "WebAuthenticationPane.c"
 }
 
 
 static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
 	ShotwellPluginsCommonWebAuthenticationPane * self;
 	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
+	WebKitWebView* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 64 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
-#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+	_tmp0_ = self->priv->webview;
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	result = _tmp1_;
-#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	return result;
-#line 326 "WebAuthenticationPane.c"
+#line 308 "WebAuthenticationPane.c"
 }
 
 
@@ -333,33 +315,33 @@ static void shotwell_plugins_common_web_authentication_pane_real_on_pane_install
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 68 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp0_ = shotwell_plugins_common_web_authentication_pane_get_view (self);
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp1_ = _tmp0_;
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp2_ = shotwell_plugins_common_web_authentication_pane_get_login_uri (self);
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp3_ = _tmp2_;
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_tmp4_ = _tmp3_;
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	webkit_web_view_load_uri (_tmp1_, _tmp4_);
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_g_free0 (_tmp4_);
-#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_g_object_unref0 (_tmp1_);
-#line 355 "WebAuthenticationPane.c"
+#line 337 "WebAuthenticationPane.c"
 }
 
 
 static void shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	ShotwellPluginsCommonWebAuthenticationPane * self;
-#line 72 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
-#line 363 "WebAuthenticationPane.c"
+#line 345 "WebAuthenticationPane.c"
 }
 
 
@@ -369,7 +351,7 @@ ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authenti
 	self = (ShotwellPluginsCommonWebAuthenticationPane*) g_object_new (object_type, NULL);
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	return self;
-#line 373 "WebAuthenticationPane.c"
+#line 355 "WebAuthenticationPane.c"
 }
 
 
@@ -384,7 +366,7 @@ SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authenticati
 	result = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	return result;
-#line 388 "WebAuthenticationPane.c"
+#line 370 "WebAuthenticationPane.c"
 }
 
 
@@ -398,7 +380,7 @@ static void shotwell_plugins_common_web_authentication_pane_set_preferred_geomet
 	self->priv->_preferred_geometry = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_object_notify ((GObject *) self, "preferred-geometry");
-#line 402 "WebAuthenticationPane.c"
+#line 384 "WebAuthenticationPane.c"
 }
 
 
@@ -416,7 +398,7 @@ gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPl
 	result = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	return result;
-#line 420 "WebAuthenticationPane.c"
+#line 402 "WebAuthenticationPane.c"
 }
 
 
@@ -435,7 +417,7 @@ static void shotwell_plugins_common_web_authentication_pane_set_login_uri (Shotw
 	self->priv->_login_uri = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_object_notify ((GObject *) self, "login-uri");
-#line 439 "WebAuthenticationPane.c"
+#line 421 "WebAuthenticationPane.c"
 }
 
 
@@ -458,7 +440,7 @@ static void shotwell_plugins_common_web_authentication_pane_class_init (Shotwell
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI, g_param_spec_string ("login-uri", "login-uri", "login-uri", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-#line 462 "WebAuthenticationPane.c"
+#line 444 "WebAuthenticationPane.c"
 }
 
 
@@ -473,7 +455,7 @@ static void shotwell_plugins_common_web_authentication_pane_spit_publishing_dial
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_on_pane_installed;
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled;
-#line 477 "WebAuthenticationPane.c"
+#line 459 "WebAuthenticationPane.c"
 }
 
 
@@ -482,7 +464,7 @@ static void shotwell_plugins_common_web_authentication_pane_instance_init (Shotw
 	self->priv = SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
 #line 10 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	self->priv->_preferred_geometry = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 486 "WebAuthenticationPane.c"
+#line 468 "WebAuthenticationPane.c"
 }
 
 
@@ -494,11 +476,9 @@ static void shotwell_plugins_common_web_authentication_pane_finalize (GObject* o
 	_g_free0 (self->priv->_login_uri);
 #line 16 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	_g_object_unref0 (self->priv->webview);
-#line 17 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
-	_g_object_unref0 (self->priv->pane_widget);
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 	G_OBJECT_CLASS (shotwell_plugins_common_web_authentication_pane_parent_class)->finalize (obj);
-#line 502 "WebAuthenticationPane.c"
+#line 482 "WebAuthenticationPane.c"
 }
 
 
@@ -533,13 +513,13 @@ static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (
 		g_value_take_string (value, shotwell_plugins_common_web_authentication_pane_get_login_uri (self));
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		break;
-#line 537 "WebAuthenticationPane.c"
+#line 517 "WebAuthenticationPane.c"
 		default:
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		break;
-#line 543 "WebAuthenticationPane.c"
+#line 523 "WebAuthenticationPane.c"
 	}
 }
 
@@ -561,13 +541,13 @@ static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (
 		shotwell_plugins_common_web_authentication_pane_set_login_uri (self, g_value_get_string (value));
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		break;
-#line 565 "WebAuthenticationPane.c"
+#line 545 "WebAuthenticationPane.c"
 		default:
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
 		break;
-#line 571 "WebAuthenticationPane.c"
+#line 551 "WebAuthenticationPane.c"
 	}
 }
 
diff --git a/plugins/common/WebAuthenticationPane.vala b/plugins/common/WebAuthenticationPane.vala
index 0a77cf6..c537748 100644
--- a/plugins/common/WebAuthenticationPane.vala
+++ b/plugins/common/WebAuthenticationPane.vala
@@ -14,7 +14,6 @@ namespace Shotwell.Plugins.Common {
         public string login_uri { owned get; construct; }
 
         private WebKit.WebView webview;
-        private Gtk.Box pane_widget;
 
         public override void constructed () {
             base.constructed ();
@@ -24,15 +23,12 @@ namespace Shotwell.Plugins.Common {
 
             this.webview.load_changed.connect (this.on_page_load_changed);
             this.webview.context_menu.connect ( () => { return false; });
-
-            this.pane_widget = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-            this.pane_widget.pack_start (this.webview, true, true, 0);
         }
 
         public abstract void on_page_load ();
 
         protected void set_cursor (Gdk.CursorType type) {
-            var window = pane_widget.get_window ();
+            var window = webview.get_window ();
             var display = window.get_display ();
             var cursor = new Gdk.Cursor.for_display (display, type);
             window.set_cursor (cursor);
@@ -62,7 +58,7 @@ namespace Shotwell.Plugins.Common {
         }
 
         public Gtk.Widget get_widget() {
-            return pane_widget;
+            return this.webview;
         }
 
         public void on_pane_installed () {
diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h
index a9d1ed8..a5285c0 100644
--- a/plugins/shotwell-plugin-common.h
+++ b/plugins/shotwell-plugin-common.h
@@ -16,6 +16,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdk.h>
 #include <webkit2/webkit2.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -132,6 +133,17 @@ typedef struct _ShotwellPluginsCommonWebAuthenticationPane ShotwellPluginsCommon
 typedef struct _ShotwellPluginsCommonWebAuthenticationPaneClass ShotwellPluginsCommonWebAuthenticationPaneClass;
 typedef struct _ShotwellPluginsCommonWebAuthenticationPanePrivate ShotwellPluginsCommonWebAuthenticationPanePrivate;
 
+#define SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE (shotwell_plugins_common_builder_pane_get_type ())
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane))
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPaneClass))
+#define SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE))
+#define SHOTWELL_PLUGINS_COMMON_IS_BUILDER_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE))
+#define SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPaneClass))
+
+typedef struct _ShotwellPluginsCommonBuilderPane ShotwellPluginsCommonBuilderPane;
+typedef struct _ShotwellPluginsCommonBuilderPaneClass ShotwellPluginsCommonBuilderPaneClass;
+typedef struct _ShotwellPluginsCommonBuilderPanePrivate ShotwellPluginsCommonBuilderPanePrivate;
+
 struct _PublishingRESTSupportSession {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
@@ -259,6 +271,18 @@ struct _ShotwellPluginsCommonWebAuthenticationPaneClass {
 	void (*on_page_load) (ShotwellPluginsCommonWebAuthenticationPane* self);
 };
 
+struct _ShotwellPluginsCommonBuilderPane {
+	GObject parent_instance;
+	ShotwellPluginsCommonBuilderPanePrivate * priv;
+};
+
+struct _ShotwellPluginsCommonBuilderPaneClass {
+	GObjectClass parent_class;
+	GtkWidget* (*get_default_widget) (ShotwellPluginsCommonBuilderPane* self);
+	void (*on_pane_installed) (ShotwellPluginsCommonBuilderPane* self);
+	void (*on_pane_uninstalled) (ShotwellPluginsCommonBuilderPane* self);
+};
+
 
 gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message);
 gpointer publishing_rest_support_session_ref (gpointer instance);
@@ -407,6 +431,16 @@ WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (Shotwel
 ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type);
 SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self);
 gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self);
+GType shotwell_plugins_common_builder_pane_get_type (void) G_GNUC_CONST;
+GtkBuilder* shotwell_plugins_common_builder_pane_get_builder (ShotwellPluginsCommonBuilderPane* self);
+GtkWidget* shotwell_plugins_common_builder_pane_get_default_widget (ShotwellPluginsCommonBuilderPane* self);
+void shotwell_plugins_common_builder_pane_on_pane_installed (ShotwellPluginsCommonBuilderPane* self);
+void shotwell_plugins_common_builder_pane_on_pane_uninstalled (ShotwellPluginsCommonBuilderPane* self);
+ShotwellPluginsCommonBuilderPane* shotwell_plugins_common_builder_pane_construct (GType object_type);
+SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_builder_pane_get_preferred_geometry (ShotwellPluginsCommonBuilderPane* self);
+gchar* shotwell_plugins_common_builder_pane_get_resource_path (ShotwellPluginsCommonBuilderPane* self);
+gboolean shotwell_plugins_common_builder_pane_get_connect_signals (ShotwellPluginsCommonBuilderPane* self);
+gchar* shotwell_plugins_common_builder_pane_get_default_id (ShotwellPluginsCommonBuilderPane* self);
 
 
 G_END_DECLS
diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi
index 0aed09c..b5367a4 100644
--- a/plugins/shotwell-plugin-common.vapi
+++ b/plugins/shotwell-plugin-common.vapi
@@ -143,6 +143,19 @@ namespace Shotwell {
 	namespace Plugins {
 		namespace Common {
 			[CCode (cheader_filename = "shotwell-plugin-common.h")]
+			public abstract class BuilderPane : Spit.Publishing.DialogPane, GLib.Object {
+				public BuilderPane ();
+				public override void constructed ();
+				public Gtk.Builder get_builder ();
+				public virtual Gtk.Widget get_default_widget ();
+				public virtual void on_pane_installed ();
+				public virtual void on_pane_uninstalled ();
+				public bool connect_signals { get; construct; }
+				public string default_id { owned get; construct; }
+				public Spit.Publishing.DialogPane.GeometryOptions preferred_geometry { get; construct; }
+				public string resource_path { owned get; construct; }
+			}
+			[CCode (cheader_filename = "shotwell-plugin-common.h")]
 			public abstract class WebAuthenticationPane : Spit.Publishing.DialogPane, GLib.Object {
 				public WebAuthenticationPane ();
 				public override void constructed ();
diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c
index c9311da..f7a1674 100644
--- a/plugins/shotwell-publishing-extras/RajcePublishing.c
+++ b/plugins/shotwell-publishing-extras/RajcePublishing.c
@@ -6387,10 +6387,10 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 		GtkBuilder* _tmp1_ = NULL;
 		GtkBuilder* _tmp2_ = NULL;
 		GtkBuilder* _tmp3_ = NULL;
-		GtkAlignment* align = NULL;
+		GtkBox* content = NULL;
 		GtkBuilder* _tmp4_ = NULL;
 		GObject* _tmp5_ = NULL;
-		GtkAlignment* _tmp6_ = NULL;
+		GtkBox* _tmp6_ = NULL;
 		GtkLabel* message_label = NULL;
 		GtkBuilder* _tmp7_ = NULL;
 		GObject* _tmp8_ = NULL;
@@ -6438,12 +6438,16 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 		GtkEntry* _tmp57_ = NULL;
 		GtkEntry* _tmp58_ = NULL;
 		GtkButton* _tmp59_ = NULL;
-		GtkAlignment* _tmp60_ = NULL;
-		GtkBox* _tmp61_ = NULL;
-		PublishingRajceRajcePublisher* _tmp62_ = NULL;
-		SpitPublishingPluginHost* _tmp63_ = NULL;
-		SpitPublishingPluginHost* _tmp64_ = NULL;
-		GtkButton* _tmp65_ = NULL;
+		GtkBox* _tmp60_ = NULL;
+		GtkContainer* _tmp61_ = NULL;
+		GtkContainer* _tmp62_ = NULL;
+		GtkBox* _tmp63_ = NULL;
+		GtkBox* _tmp64_ = NULL;
+		GtkBox* _tmp65_ = NULL;
+		PublishingRajceRajcePublisher* _tmp66_ = NULL;
+		SpitPublishingPluginHost* _tmp67_ = NULL;
+		SpitPublishingPluginHost* _tmp68_ = NULL;
+		GtkButton* _tmp69_ = NULL;
 #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp1_ = gtk_builder_new ();
 #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6456,7 +6460,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/rajce_authentication_pane.ui", &_inner_error_);
 #line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6456 "RajcePublishing.c"
+#line 6460 "RajcePublishing.c"
 			goto __catch29_g_error;
 		}
 #line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6466,11 +6470,11 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp4_ = self->priv->builder;
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp5_ = gtk_builder_get_object (_tmp4_, "alignment");
+		_tmp5_ = gtk_builder_get_object (_tmp4_, "content");
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp5_) : NULL);
+		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_box_get_type ()) ? ((GtkBox*) _tmp5_) : NULL);
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		align = _tmp6_;
+		content = _tmp6_;
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp7_ = self->priv->builder;
 #line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6485,7 +6489,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 		switch (_tmp10_) {
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			case PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_INTRO:
-#line 6485 "RajcePublishing.c"
+#line 6489 "RajcePublishing.c"
 			{
 				GtkLabel* _tmp11_ = NULL;
 				const gchar* _tmp12_ = NULL;
@@ -6497,11 +6501,11 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 				gtk_label_set_text (_tmp11_, _tmp12_);
 #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				break;
-#line 6497 "RajcePublishing.c"
+#line 6501 "RajcePublishing.c"
 			}
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			case PUBLISHING_RAJCE_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 6501 "RajcePublishing.c"
+#line 6505 "RajcePublishing.c"
 			{
 				GtkLabel* _tmp13_ = NULL;
 				const gchar* _tmp14_ = NULL;
@@ -6524,12 +6528,12 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 				_g_free0 (_tmp17_);
 #line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				break;
-#line 6524 "RajcePublishing.c"
+#line 6528 "RajcePublishing.c"
 			}
 			default:
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			break;
-#line 6529 "RajcePublishing.c"
+#line 6533 "RajcePublishing.c"
 		}
 #line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp18_ = self->priv->builder;
@@ -6551,7 +6555,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 		_tmp23_ = persistent_username;
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (_tmp23_ != NULL) {
-#line 6551 "RajcePublishing.c"
+#line 6555 "RajcePublishing.c"
 			GtkEntry* _tmp24_ = NULL;
 			const gchar* _tmp25_ = NULL;
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6560,7 +6564,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 			_tmp25_ = persistent_username;
 #line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			gtk_entry_set_text (_tmp24_, _tmp25_);
-#line 6560 "RajcePublishing.c"
+#line 6564 "RajcePublishing.c"
 		}
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp26_ = self->priv->builder;
@@ -6582,7 +6586,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 		_tmp31_ = persistent_token;
 #line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (_tmp31_ != NULL) {
-#line 6582 "RajcePublishing.c"
+#line 6586 "RajcePublishing.c"
 			GtkEntry* _tmp32_ = NULL;
 			const gchar* _tmp33_ = NULL;
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6593,11 +6597,11 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 			gtk_entry_set_text (_tmp32_, _tmp33_);
 #line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			self->priv->crypt = FALSE;
-#line 6593 "RajcePublishing.c"
+#line 6597 "RajcePublishing.c"
 		} else {
 #line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			self->priv->crypt = TRUE;
-#line 6597 "RajcePublishing.c"
+#line 6601 "RajcePublishing.c"
 		}
 #line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp34_ = self->priv->builder;
@@ -6680,23 +6684,33 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_signal_connect_object (_tmp59_, "clicked", (GCallback) _publishing_rajce_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp60_ = align;
+		_tmp60_ = content;
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp61_ = self->priv->pane_widget;
+		_tmp61_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget));
 #line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp62_ = publisher;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp63_ = publishing_rajce_rajce_publisher_get_host (_tmp62_);
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp64_ = _tmp63_;
+		_tmp62_ = _tmp61_;
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		_tmp63_ = content;
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		gtk_container_remove (_tmp62_, G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget));
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp65_ = self->priv->login_button;
+		_tmp64_ = self->priv->pane_widget;
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		spit_publishing_plugin_host_set_dialog_default_widget (_tmp64_, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget));
+		_tmp65_ = content;
 #line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_object_unref0 (_tmp64_);
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget));
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		_tmp66_ = publisher;
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		_tmp67_ = publishing_rajce_rajce_publisher_get_host (_tmp66_);
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		_tmp68_ = _tmp67_;
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		_tmp69_ = self->priv->login_button;
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		spit_publishing_plugin_host_set_dialog_default_widget (_tmp68_, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget));
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		_g_object_unref0 (_tmp68_);
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (label3);
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6708,28 +6722,28 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (message_label);
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_object_unref0 (align);
-#line 6709 "RajcePublishing.c"
+		_g_object_unref0 (content);
+#line 6723 "RajcePublishing.c"
 	}
 	goto __finally29;
 	__catch29_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp66_ = NULL;
-		const gchar* _tmp67_ = NULL;
+		GError* _tmp70_ = NULL;
+		const gchar* _tmp71_ = NULL;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		e = _inner_error_;
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_inner_error_ = NULL;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp66_ = e;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_tmp67_ = _tmp66_->message;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_warning ("RajcePublishing.vala:905: Could not load UI: %s", _tmp67_);
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		_tmp70_ = e;
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		_tmp71_ = _tmp70_->message;
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		g_warning ("RajcePublishing.vala:906: Could not load UI: %s", _tmp71_);
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (e);
-#line 6729 "RajcePublishing.c"
+#line 6743 "RajcePublishing.c"
 	}
 	__finally29:
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6740,18 +6754,18 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
 		g_clear_error (&_inner_error_);
 #line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return NULL;
-#line 6740 "RajcePublishing.c"
+#line 6754 "RajcePublishing.c"
 	}
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 6744 "RajcePublishing.c"
+#line 6758 "RajcePublishing.c"
 }
 
 
 PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_new (PublishingRajceRajcePublisher* publisher, PublishingRajceAuthenticationPaneMode mode) {
 #line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_authentication_pane_construct (PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 6751 "RajcePublishing.c"
+#line 6765 "RajcePublishing.c"
 }
 
 
@@ -6759,17 +6773,17 @@ GtkWidget* publishing_rajce_authentication_pane_get_default_widget (PublishingRa
 	GtkWidget* result = NULL;
 	GtkButton* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self), NULL);
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->login_button;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = _tmp1_;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 6769 "RajcePublishing.c"
+#line 6783 "RajcePublishing.c"
 }
 
 
@@ -6784,68 +6798,68 @@ static void publishing_rajce_authentication_pane_on_login_button_clicked (Publis
 	const gchar* _tmp8_ = NULL;
 	GtkCheckButton* _tmp9_ = NULL;
 	gboolean _tmp10_ = FALSE;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self));
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->password_entry;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	token = _tmp2_;
 #line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	token = _tmp2_;
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = self->priv->crypt;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp3_) {
-#line 6798 "RajcePublishing.c"
+#line 6812 "RajcePublishing.c"
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp4_ = token;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp5_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp4_, (gsize) -1);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (token);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		token = _tmp5_;
-#line 6809 "RajcePublishing.c"
+#line 6823 "RajcePublishing.c"
 	}
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = self->priv->username_entry;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = gtk_entry_get_text (_tmp6_);
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp8_ = token;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp9_ = self->priv->remember_checkbutton;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_emit_by_name (self, "login", _tmp7_, _tmp8_, _tmp10_);
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (token);
-#line 6825 "RajcePublishing.c"
+#line 6839 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_authentication_pane_on_user_changed (PublishingRajceAuthenticationPane* self) {
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self));
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_update_login_button_sensitivity (self);
-#line 6834 "RajcePublishing.c"
+#line 6848 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_authentication_pane_on_password_changed (PublishingRajceAuthenticationPane* self) {
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self));
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->crypt = TRUE;
 #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->crypt = TRUE;
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_update_login_button_sensitivity (self);
-#line 6845 "RajcePublishing.c"
+#line 6859 "RajcePublishing.c"
 }
 
 
@@ -6855,39 +6869,39 @@ static void publishing_rajce_authentication_pane_update_login_button_sensitivity
 	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
 	GtkButton* _tmp7_ = NULL;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_AUTHENTICATION_PANE (self));
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = self->priv->username_entry;
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp3_ > ((guint) 0)) {
-#line 6865 "RajcePublishing.c"
+#line 6879 "RajcePublishing.c"
 		GtkEntry* _tmp4_ = NULL;
 		guint _tmp5_ = 0U;
 		guint _tmp6_ = 0U;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp4_ = self->priv->password_entry;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp5_ = gtk_entry_get_text_length (_tmp4_);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp6_ = _tmp5_;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = _tmp6_ > ((guint) 0);
-#line 6877 "RajcePublishing.c"
+#line 6891 "RajcePublishing.c"
 	} else {
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = FALSE;
-#line 6881 "RajcePublishing.c"
+#line 6895 "RajcePublishing.c"
 	}
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = self->priv->login_button;
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 6887 "RajcePublishing.c"
+#line 6901 "RajcePublishing.c"
 }
 
 
@@ -6896,30 +6910,30 @@ static GtkWidget* publishing_rajce_authentication_pane_real_get_widget (SpitPubl
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane);
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = _tmp1_;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 6906 "RajcePublishing.c"
+#line 6920 "RajcePublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_rajce_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingRajceAuthenticationPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 6919 "RajcePublishing.c"
+#line 6933 "RajcePublishing.c"
 }
 
 
@@ -6928,31 +6942,31 @@ static void publishing_rajce_authentication_pane_real_on_pane_installed (SpitPub
 	GtkEntry* _tmp0_ = NULL;
 	GtkEntry* _tmp1_ = NULL;
 	GtkButton* _tmp2_ = NULL;
-#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->username_entry;
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
 #line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = self->priv->password_entry;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	gtk_entry_set_activates_default (_tmp1_, TRUE);
 #line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	gtk_entry_set_activates_default (_tmp1_, TRUE);
+#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = self->priv->login_button;
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_update_login_button_sensitivity (self);
-#line 6944 "RajcePublishing.c"
+#line 6958 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingRajceAuthenticationPane * self;
-#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_AUTHENTICATION_PANE, PublishingRajceAuthenticationPane);
-#line 6952 "RajcePublishing.c"
+#line 6966 "RajcePublishing.c"
 }
 
 
@@ -6971,19 +6985,19 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_BOOLEAN (GClosure * clos
 		data1 = closure->data;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 6971 "RajcePublishing.c"
+#line 6985 "RajcePublishing.c"
 	} else {
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data2 = closure->data;
-#line 6977 "RajcePublishing.c"
+#line 6991 "RajcePublishing.c"
 	}
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_boolean (param_values + 3), data2);
-#line 6983 "RajcePublishing.c"
+#line 6997 "RajcePublishing.c"
 }
 
 
@@ -7012,7 +7026,7 @@ static void publishing_rajce_authentication_pane_class_init (PublishingRajceAuth
 	_tmp3_ = g_strdup (_tmp2_);
 #line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp3_;
-#line 7012 "RajcePublishing.c"
+#line 7026 "RajcePublishing.c"
 }
 
 
@@ -7027,7 +7041,7 @@ static void publishing_rajce_authentication_pane_spit_publishing_dialog_pane_int
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_authentication_pane_real_on_pane_installed;
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_authentication_pane_real_on_pane_uninstalled;
-#line 7027 "RajcePublishing.c"
+#line 7041 "RajcePublishing.c"
 }
 
 
@@ -7038,7 +7052,7 @@ static void publishing_rajce_authentication_pane_instance_init (PublishingRajceA
 	self->priv->pane_widget = NULL;
 #line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->crypt = TRUE;
-#line 7038 "RajcePublishing.c"
+#line 7052 "RajcePublishing.c"
 }
 
 
@@ -7060,7 +7074,7 @@ static void publishing_rajce_authentication_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->login_button);
 #line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_OBJECT_CLASS (publishing_rajce_authentication_pane_parent_class)->finalize (obj);
-#line 7060 "RajcePublishing.c"
+#line 7074 "RajcePublishing.c"
 }
 
 
@@ -7083,65 +7097,65 @@ GType publishing_rajce_authentication_pane_get_type (void) {
 
 
 static gpointer _publishing_rajce_album_ref0 (gpointer self) {
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self ? publishing_rajce_album_ref (self) : NULL;
-#line 7085 "RajcePublishing.c"
+#line 7099 "RajcePublishing.c"
 }
 
 
 static PublishingRajceAlbum** _vala_array_dup5 (PublishingRajceAlbum** self, int length) {
 	PublishingRajceAlbum** result;
 	int i;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = g_new0 (PublishingRajceAlbum*, length + 1);
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 7096 "RajcePublishing.c"
+#line 7110 "RajcePublishing.c"
 		PublishingRajceAlbum* _tmp0_ = NULL;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = _publishing_rajce_album_ref0 (self[i]);
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		result[i] = _tmp0_;
-#line 7102 "RajcePublishing.c"
+#line 7116 "RajcePublishing.c"
 	}
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 7106 "RajcePublishing.c"
+#line 7120 "RajcePublishing.c"
 }
 
 
 static void _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked ((PublishingRajcePublishingOptionsPane*) self);
-#line 7113 "RajcePublishing.c"
+#line 7127 "RajcePublishing.c"
 }
 
 
 static void _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_on_create_new_radio_clicked ((PublishingRajcePublishingOptionsPane*) self);
-#line 7120 "RajcePublishing.c"
+#line 7134 "RajcePublishing.c"
 }
 
 
 static void _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_on_new_album_entry_changed ((PublishingRajcePublishingOptionsPane*) self);
-#line 7127 "RajcePublishing.c"
+#line 7141 "RajcePublishing.c"
 }
 
 
 static void _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_on_logout_clicked ((PublishingRajcePublishingOptionsPane*) self);
-#line 7134 "RajcePublishing.c"
+#line 7148 "RajcePublishing.c"
 }
 
 
 static void _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_on_publish_clicked ((PublishingRajcePublishingOptionsPane*) self);
-#line 7141 "RajcePublishing.c"
+#line 7155 "RajcePublishing.c"
 }
 
 
@@ -7157,53 +7171,53 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c
 	PublishingRajceRajcePublisher* _tmp5_ = NULL;
 	GtkBox* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_RAJCE_PUBLISHER (publisher), NULL);
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (username != NULL, NULL);
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajcePublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = username;
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->username);
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->username = _tmp1_;
 #line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->username = _tmp1_;
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = albums;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2__length1 = albums_length1;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup5 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_);
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3__length1 = _tmp2__length1;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_rajce_album_unref), NULL);
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->albums = _tmp3_;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->albums_length1 = _tmp3__length1;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->_albums_size_ = self->priv->albums_length1;
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->_albums_size_ = self->priv->albums_length1;
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = publisher;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->publisher = _tmp5_;
 #line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->publisher = _tmp5_;
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_object_ref_sink (_tmp6_);
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->pane_widget = _tmp6_;
-#line 7203 "RajcePublishing.c"
+#line 7217 "RajcePublishing.c"
 	{
 		GtkBuilder* _tmp7_ = NULL;
 		GtkBuilder* _tmp8_ = NULL;
@@ -7271,228 +7285,228 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c
 		GtkEntry* _tmp70_ = NULL;
 		GtkButton* _tmp71_ = NULL;
 		GtkButton* _tmp72_ = NULL;
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp7_ = gtk_builder_new ();
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->builder);
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->builder = _tmp7_;
 #line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		self->priv->builder = _tmp7_;
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp8_ = self->priv->builder;
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		gtk_builder_add_from_resource (_tmp8_, PLUGIN_RESOURCE_PATH "/rajce_publishing_options_pane.ui", &_inner_error_);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7283 "RajcePublishing.c"
+#line 7297 "RajcePublishing.c"
 			goto __catch30_g_error;
 		}
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp9_ = self->priv->builder;
-#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		gtk_builder_connect_signals (_tmp9_, NULL);
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp10_ = self->priv->builder;
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp11_ = gtk_builder_get_object (_tmp10_, "rajce_pane_widget");
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_box_get_type (), GtkBox));
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->pane_widget);
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->pane_widget = _tmp12_;
 #line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		self->priv->pane_widget = _tmp12_;
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp13_ = self->priv->builder;
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp14_ = gtk_builder_get_object (_tmp13_, "login_identity_label");
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_label_get_type (), GtkLabel));
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->login_identity_label);
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->login_identity_label = _tmp15_;
 #line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		self->priv->login_identity_label = _tmp15_;
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp16_ = self->priv->builder;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp17_ = gtk_builder_get_object (_tmp16_, "publish_to_label");
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_label_get_type (), GtkLabel));
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->publish_to_label);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->publish_to_label = _tmp18_;
 #line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		self->priv->publish_to_label = _tmp18_;
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp19_ = self->priv->builder;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp20_ = gtk_builder_get_object (_tmp19_, "use_existing_radio");
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_radio_button_get_type (), GtkRadioButton));
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->use_existing_radio);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->use_existing_radio = _tmp21_;
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		self->priv->use_existing_radio = _tmp21_;
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp22_ = self->priv->builder;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp23_ = gtk_builder_get_object (_tmp22_, "existing_albums_combo");
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->existing_albums_combo);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->existing_albums_combo = _tmp24_;
 #line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		self->priv->existing_albums_combo = _tmp24_;
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp25_ = self->priv->builder;
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp26_ = gtk_builder_get_object (_tmp25_, "create_new_radio");
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_radio_button_get_type (), GtkRadioButton));
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->create_new_radio);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->create_new_radio = _tmp27_;
 #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		self->priv->create_new_radio = _tmp27_;
+#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp28_ = self->priv->builder;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp29_ = gtk_builder_get_object (_tmp28_, "new_album_entry");
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_entry_get_type (), GtkEntry));
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->new_album_entry);
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->new_album_entry = _tmp30_;
 #line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		self->priv->new_album_entry = _tmp30_;
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp31_ = self->priv->builder;
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp32_ = gtk_builder_get_object (_tmp31_, "hide_check");
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_check_button_get_type (), GtkCheckButton));
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->hide_check);
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->hide_check = _tmp33_;
 #line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		self->priv->hide_check = _tmp33_;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp34_ = self->priv->hide_check;
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp35_ = _ ("_Hide album");
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), _tmp35_);
 #line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), _tmp35_);
+#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp36_ = self->priv->builder;
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp37_ = gtk_builder_get_object (_tmp36_, "show_check");
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_check_button_get_type (), GtkCheckButton));
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->show_check);
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->show_check = _tmp38_;
 #line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		self->priv->show_check = _tmp38_;
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp39_ = self->priv->builder;
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp40_ = gtk_builder_get_object (_tmp39_, "publish_button");
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_button_get_type (), GtkButton));
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->publish_button);
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		self->priv->publish_button = _tmp41_;
 #line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		self->priv->publish_button = _tmp41_;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp42_ = self->priv->builder;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp43_ = gtk_builder_get_object (_tmp42_, "logout_button");
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_button_get_type (), GtkButton));
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_object_unref0 (self->priv->logout_button);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		self->priv->logout_button = _tmp44_;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp45_ = self->priv->hide_check;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp46_ = publisher;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp47_ = publishing_rajce_rajce_publisher_get_hide_album (_tmp46_);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp47_);
 #line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp47_);
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp48_ = self->priv->show_check;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp49_ = publisher;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp50_ = publishing_rajce_rajce_publisher_get_show_album (_tmp49_);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp50_);
 #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp50_);
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp51_ = self->priv->login_identity_label;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp52_ = _ ("You are logged into Rajce as %s.");
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp53_ = username;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp54_ = g_strdup_printf (_tmp52_, _tmp53_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp55_ = _tmp54_;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		gtk_label_set_label (_tmp51_, _tmp55_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		_g_free0 (_tmp55_);
 #line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		_g_free0 (_tmp55_);
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp56_ = self->priv->publish_to_label;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp57_ = _ ("Photos will appear in:");
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_label_set_label (_tmp56_, _tmp57_);
 #line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		gtk_label_set_label (_tmp56_, _tmp57_);
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp58_ = self->priv->use_existing_radio;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp59_ = _ ("An _existing album:");
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_button_get_type (), GtkButton), _tmp59_);
 #line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_button_get_type (), GtkButton), _tmp59_);
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp60_ = self->priv->create_new_radio;
-#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp61_ = _ ("A _new album named:");
-#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_button_get_type (), GtkButton), _tmp61_);
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_button_get_type (), GtkButton), _tmp61_);
+#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp62_ = self->priv->show_check;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp63_ = _ ("Open target _album in browser");
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_button_get_type (), GtkButton), _tmp63_);
 #line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_button_get_type (), GtkButton), _tmp63_);
+#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp64_ = self->priv->publish_button;
-#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp65_ = _ ("_Publish");
-#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_button_set_label (_tmp64_, _tmp65_);
 #line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		gtk_button_set_label (_tmp64_, _tmp65_);
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp66_ = self->priv->logout_button;
-#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp67_ = _ ("_Logout");
-#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		gtk_button_set_label (_tmp66_, _tmp67_);
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp68_ = self->priv->use_existing_radio;
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
 #line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp69_ = self->priv->create_new_radio;
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
+#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp70_ = self->priv->new_album_entry;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0);
 #line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_rajce_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0);
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp71_ = self->priv->logout_button;
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_signal_connect_object (_tmp71_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
 #line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		g_signal_connect_object (_tmp71_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp72_ = self->priv->publish_button;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_signal_connect_object (_tmp72_, "clicked", (GCallback) _publishing_rajce_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 7492 "RajcePublishing.c"
+#line 7506 "RajcePublishing.c"
 	}
 	goto __finally30;
 	__catch30_g_error:
@@ -7500,41 +7514,41 @@ PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_c
 		GError* e = NULL;
 		GError* _tmp73_ = NULL;
 		const gchar* _tmp74_ = NULL;
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		e = _inner_error_;
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_inner_error_ = NULL;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp73_ = e;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp74_ = _tmp73_->message;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		g_warning ("RajcePublishing.vala:1028: Could not load UI: %s", _tmp74_);
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		g_warning ("RajcePublishing.vala:1029: Could not load UI: %s", _tmp74_);
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (e);
-#line 7512 "RajcePublishing.c"
+#line 7526 "RajcePublishing.c"
 	}
 	__finally30:
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return NULL;
-#line 7523 "RajcePublishing.c"
+#line 7537 "RajcePublishing.c"
 	}
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 7527 "RajcePublishing.c"
+#line 7541 "RajcePublishing.c"
 }
 
 
 PublishingRajcePublishingOptionsPane* publishing_rajce_publishing_options_pane_new (PublishingRajceRajcePublisher* publisher, const gchar* username, PublishingRajceAlbum** albums, int albums_length1) {
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_publishing_options_pane_construct (PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, publisher, username, albums, albums_length1);
-#line 7534 "RajcePublishing.c"
+#line 7548 "RajcePublishing.c"
 }
 
 
@@ -7546,27 +7560,27 @@ static void publishing_rajce_publishing_options_pane_on_publish_clicked (Publish
 	gboolean _tmp3_ = FALSE;
 	GtkRadioButton* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->show_check;
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	show_album = _tmp1_;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	show_album = _tmp1_;
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = self->priv->publisher;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = show_album;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_rajce_publisher_set_show_album (_tmp2_, _tmp3_);
 #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_rajce_publisher_set_show_album (_tmp2_, _tmp3_);
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = self->priv->create_new_radio;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp5_) {
-#line 7566 "RajcePublishing.c"
+#line 7580 "RajcePublishing.c"
 		gchar* album_name = NULL;
 		GtkEntry* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
@@ -7580,41 +7594,41 @@ static void publishing_rajce_publishing_options_pane_on_publish_clicked (Publish
 		gboolean _tmp14_ = FALSE;
 		PublishingRajcePublishingParameters* _tmp15_ = NULL;
 		PublishingRajcePublishingParameters* _tmp16_ = NULL;
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp6_ = self->priv->new_album_entry;
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp7_ = gtk_entry_get_text (_tmp6_);
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp8_ = g_strdup (_tmp7_);
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		album_name = _tmp8_;
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		album_name = _tmp8_;
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp9_ = self->priv->hide_check;
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		hide_album = _tmp10_;
 #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		hide_album = _tmp10_;
+#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp11_ = self->priv->publisher;
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12_ = hide_album;
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		publishing_rajce_rajce_publisher_set_hide_album (_tmp11_, _tmp12_);
 #line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		publishing_rajce_rajce_publisher_set_hide_album (_tmp11_, _tmp12_);
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp13_ = album_name;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp14_ = hide_album;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp15_ = publishing_rajce_publishing_parameters_new_to_new_album (_tmp13_, _tmp14_);
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp16_ = _tmp15_;
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_signal_emit_by_name (self, "publish", _tmp16_);
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rajce_publishing_parameters_unref0 (_tmp16_);
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (album_name);
-#line 7614 "RajcePublishing.c"
+#line 7628 "RajcePublishing.c"
 	} else {
 		gint id = 0;
 		PublishingRajceAlbum** _tmp17_ = NULL;
@@ -7635,51 +7649,51 @@ static void publishing_rajce_publishing_options_pane_on_publish_clicked (Publish
 		gint _tmp29_ = 0;
 		PublishingRajcePublishingParameters* _tmp30_ = NULL;
 		PublishingRajcePublishingParameters* _tmp31_ = NULL;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp17_ = self->priv->albums;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp17__length1 = self->priv->albums_length1;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp18_ = self->priv->existing_albums_combo;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp19_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp20_ = _tmp17_[_tmp19_];
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp21_ = _tmp20_->id;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		id = _tmp21_;
 #line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		id = _tmp21_;
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp22_ = self->priv->albums;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp22__length1 = self->priv->albums_length1;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp23_ = self->priv->existing_albums_combo;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp24_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp25_ = _tmp22_[_tmp24_];
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp26_ = _tmp25_->albumName;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp27_ = g_strdup (_tmp26_);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		album_name = _tmp27_;
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		album_name = _tmp27_;
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp28_ = album_name;
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp29_ = id;
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp30_ = publishing_rajce_publishing_parameters_new_to_existing_album (_tmp28_, _tmp29_);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp31_ = _tmp30_;
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_signal_emit_by_name (self, "publish", _tmp31_);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_publishing_rajce_publishing_parameters_unref0 (_tmp31_);
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (album_name);
-#line 7679 "RajcePublishing.c"
+#line 7693 "RajcePublishing.c"
 	}
 }
 
@@ -7689,27 +7703,27 @@ static void publishing_rajce_publishing_options_pane_on_use_existing_radio_click
 	GtkEntry* _tmp1_ = NULL;
 	GtkComboBoxText* _tmp2_ = NULL;
 	GtkCheckButton* _tmp3_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->existing_albums_combo;
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = self->priv->new_album_entry;
-#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = self->priv->existing_albums_combo;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self);
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self);
+#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = self->priv->hide_check;
-#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7709 "RajcePublishing.c"
+#line 7723 "RajcePublishing.c"
 }
 
 
@@ -7718,36 +7732,36 @@ static void publishing_rajce_publishing_options_pane_on_create_new_radio_clicked
 	GtkComboBoxText* _tmp1_ = NULL;
 	GtkEntry* _tmp2_ = NULL;
 	GtkCheckButton* _tmp3_ = NULL;
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->new_album_entry;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = self->priv->existing_albums_combo;
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = self->priv->new_album_entry;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self);
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self);
+#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = self->priv->hide_check;
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 7738 "RajcePublishing.c"
+#line 7752 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_options_pane_on_logout_clicked (PublishingRajcePublishingOptionsPane* self) {
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 7747 "RajcePublishing.c"
+#line 7761 "RajcePublishing.c"
 }
 
 
@@ -7770,7 +7784,7 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 7770 "RajcePublishing.c"
+#line 7784 "RajcePublishing.c"
 }
 
 
@@ -7785,58 +7799,58 @@ static void publishing_rajce_publishing_options_pane_update_publish_button_sensi
 	gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	GtkButton* _tmp10_ = NULL;
-#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->new_album_entry;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	album_name = _tmp2_;
 #line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	album_name = _tmp2_;
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = album_name;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = string_strip (_tmp4_);
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = g_strcmp0 (_tmp6_, "") != 0;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (_tmp6_);
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp7_) {
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp3_ = TRUE;
-#line 7809 "RajcePublishing.c"
+#line 7823 "RajcePublishing.c"
 	} else {
 		GtkRadioButton* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp8_ = self->priv->create_new_radio;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp3_ = !_tmp9_;
-#line 7819 "RajcePublishing.c"
+#line 7833 "RajcePublishing.c"
 	}
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp10_ = self->priv->publish_button;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 1074 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (album_name);
-#line 7827 "RajcePublishing.c"
+#line 7841 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_options_pane_on_new_album_entry_changed (PublishingRajcePublishingOptionsPane* self) {
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 7836 "RajcePublishing.c"
+#line 7850 "RajcePublishing.c"
 }
 
 
@@ -7844,21 +7858,21 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
 	PublishingRajceAlbum** _tmp9_ = NULL;
 	gint _tmp9__length1 = 0;
 	GtkRadioButton* _tmp15_ = NULL;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 7846 "RajcePublishing.c"
+#line 7860 "RajcePublishing.c"
 	{
 		gint i = 0;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		i = 0;
-#line 7851 "RajcePublishing.c"
+#line 7865 "RajcePublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp0_ = TRUE;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			while (TRUE) {
-#line 7858 "RajcePublishing.c"
+#line 7872 "RajcePublishing.c"
 				gint _tmp2_ = 0;
 				PublishingRajceAlbum** _tmp3_ = NULL;
 				gint _tmp3__length1 = 0;
@@ -7868,114 +7882,114 @@ void publishing_rajce_publishing_options_pane_installed (PublishingRajcePublishi
 				gint _tmp6_ = 0;
 				PublishingRajceAlbum* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				if (!_tmp0_) {
-#line 7870 "RajcePublishing.c"
+#line 7884 "RajcePublishing.c"
 					gint _tmp1_ = 0;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp1_ = i;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					i = _tmp1_ + 1;
-#line 7876 "RajcePublishing.c"
+#line 7890 "RajcePublishing.c"
 				}
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp0_ = FALSE;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp2_ = i;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp3_ = self->priv->albums;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp3__length1 = self->priv->albums_length1;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				if (!(_tmp2_ < _tmp3__length1)) {
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					break;
-#line 7890 "RajcePublishing.c"
+#line 7904 "RajcePublishing.c"
 				}
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp4_ = self->priv->existing_albums_combo;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp5_ = self->priv->albums;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp5__length1 = self->priv->albums_length1;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp6_ = i;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp7_ = _tmp5_[_tmp6_];
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp8_ = _tmp7_->albumName;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				gtk_combo_box_text_append_text (_tmp4_, _tmp8_);
-#line 7906 "RajcePublishing.c"
+#line 7920 "RajcePublishing.c"
 			}
 		}
 	}
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp9_ = self->priv->albums;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp9__length1 = self->priv->albums_length1;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp9__length1 == 0) {
-#line 7916 "RajcePublishing.c"
+#line 7930 "RajcePublishing.c"
 		GtkComboBoxText* _tmp10_ = NULL;
 		GtkRadioButton* _tmp11_ = NULL;
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp10_ = self->priv->existing_albums_combo;
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp11_ = self->priv->use_existing_radio;
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7927 "RajcePublishing.c"
+#line 7941 "RajcePublishing.c"
 	} else {
 		GtkComboBoxText* _tmp12_ = NULL;
 		GtkComboBoxText* _tmp13_ = NULL;
 		GtkRadioButton* _tmp14_ = NULL;
-#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12_ = self->priv->existing_albums_combo;
-#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp13_ = self->priv->existing_albums_combo;
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp14_ = self->priv->use_existing_radio;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 7944 "RajcePublishing.c"
+#line 7958 "RajcePublishing.c"
 	}
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp15_ = self->priv->create_new_radio;
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_on_create_new_radio_clicked (self);
-#line 7952 "RajcePublishing.c"
+#line 7966 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_publishing_options_pane_notify_publish (PublishingRajcePublishingOptionsPane* self, PublishingRajcePublishingParameters* parameters) {
 	PublishingRajcePublishingParameters* _tmp0_ = NULL;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_PARAMETERS (parameters));
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = parameters;
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp0_);
-#line 7966 "RajcePublishing.c"
+#line 7980 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_publishing_options_pane_notify_logout (PublishingRajcePublishingOptionsPane* self) {
-#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 7975 "RajcePublishing.c"
+#line 7989 "RajcePublishing.c"
 }
 
 
@@ -7983,17 +7997,17 @@ GtkWidget* publishing_rajce_publishing_options_pane_get_default_widget (Publishi
 	GtkWidget* result = NULL;
 	GtkButton* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->logout_button;
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = _tmp1_;
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 7993 "RajcePublishing.c"
+#line 8007 "RajcePublishing.c"
 }
 
 
@@ -8002,58 +8016,58 @@ static GtkWidget* publishing_rajce_publishing_options_pane_real_get_widget (Spit
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane);
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = _tmp1_;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8012 "RajcePublishing.c"
+#line 8026 "RajcePublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_rajce_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingRajcePublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane);
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8025 "RajcePublishing.c"
+#line 8039 "RajcePublishing.c"
 }
 
 
 static void _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish (PublishingRajcePublishingOptionsPane* _sender, PublishingRajcePublishingParameters* parameters, gpointer self) {
-#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_notify_publish ((PublishingRajcePublishingOptionsPane*) self, parameters);
-#line 8032 "RajcePublishing.c"
+#line 8046 "RajcePublishing.c"
 }
 
 
 static void _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout (PublishingRajcePublishingOptionsPane* _sender, gpointer self) {
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_notify_logout ((PublishingRajcePublishingOptionsPane*) self);
-#line 8039 "RajcePublishing.c"
+#line 8053 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingRajcePublishingOptionsPane * self;
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_publishing_options_pane_installed (self);
 #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_connect_object (self, "publish", (GCallback) _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish, self, 0);
+	publishing_rajce_publishing_options_pane_installed (self);
 #line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	g_signal_connect_object (self, "publish", (GCallback) _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish, self, 0);
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_connect_object (self, "logout", (GCallback) _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout, self, 0);
-#line 8053 "RajcePublishing.c"
+#line 8067 "RajcePublishing.c"
 }
 
 
@@ -8061,17 +8075,17 @@ static void publishing_rajce_publishing_options_pane_real_on_pane_uninstalled (S
 	PublishingRajcePublishingOptionsPane * self;
 	guint _tmp0_ = 0U;
 	guint _tmp1_ = 0U;
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish, self);
 #line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_rajce_publishing_options_pane_notify_publish_publishing_rajce_publishing_options_pane_publish, self);
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rajce_publishing_options_pane_notify_logout_publishing_rajce_publishing_options_pane_logout, self);
-#line 8071 "RajcePublishing.c"
+#line 8085 "RajcePublishing.c"
 }
 
 
@@ -8082,128 +8096,128 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (n_param_values == 2);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data1 = closure->data;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 8090 "RajcePublishing.c"
+#line 8104 "RajcePublishing.c"
 	} else {
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		data2 = closure->data;
-#line 8096 "RajcePublishing.c"
+#line 8110 "RajcePublishing.c"
 	}
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	callback = (GMarshalFunc_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS) (marshal_data ? marshal_data : cc->callback);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	callback (data1, publishing_rajce_value_get_publishing_parameters (param_values + 1), data2);
-#line 8102 "RajcePublishing.c"
+#line 8116 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_options_pane_class_init (PublishingRajcePublishingOptionsPaneClass * klass) {
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRajcePublishingOptionsPanePrivate));
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_rajce_publishing_options_pane_finalize;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_new ("publish", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_RAJCE_PUBLISHING_PARAMETERS, G_TYPE_NONE, 1, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_new ("logout", PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 8117 "RajcePublishing.c"
+#line 8131 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_get_widget;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_get_preferred_geometry;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_on_pane_installed;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_rajce_publishing_options_pane_real_on_pane_uninstalled;
-#line 8132 "RajcePublishing.c"
+#line 8146 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_options_pane_instance_init (PublishingRajcePublishingOptionsPane * self) {
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv = PUBLISHING_RAJCE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->builder = NULL;
 #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->pane_widget = NULL;
+	self->priv->builder = NULL;
 #line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->login_identity_label = NULL;
+	self->priv->pane_widget = NULL;
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->publish_to_label = NULL;
+	self->priv->login_identity_label = NULL;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->use_existing_radio = NULL;
+	self->priv->publish_to_label = NULL;
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->existing_albums_combo = NULL;
+	self->priv->use_existing_radio = NULL;
 #line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->create_new_radio = NULL;
+	self->priv->existing_albums_combo = NULL;
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->new_album_entry = NULL;
+	self->priv->create_new_radio = NULL;
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->hide_check = NULL;
+	self->priv->new_album_entry = NULL;
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->show_check = NULL;
+	self->priv->hide_check = NULL;
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->publish_button = NULL;
+	self->priv->show_check = NULL;
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->publish_button = NULL;
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->logout_button = NULL;
-#line 8163 "RajcePublishing.c"
+#line 8177 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_options_pane_finalize (GObject* obj) {
 	PublishingRajcePublishingOptionsPane * self;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingRajcePublishingOptionsPane);
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (self->priv->publisher);
 #line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_rajce_album_unref), NULL);
+	_g_object_unref0 (self->priv->publisher);
 #line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_rajce_album_unref), NULL);
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->username);
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (self->priv->builder);
 #line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
+	_g_object_unref0 (self->priv->builder);
 #line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (self->priv->login_identity_label);
+	_g_object_unref0 (self->priv->pane_widget);
 #line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (self->priv->publish_to_label);
+	_g_object_unref0 (self->priv->login_identity_label);
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (self->priv->use_existing_radio);
+	_g_object_unref0 (self->priv->publish_to_label);
 #line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (self->priv->existing_albums_combo);
+	_g_object_unref0 (self->priv->use_existing_radio);
 #line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (self->priv->create_new_radio);
+	_g_object_unref0 (self->priv->existing_albums_combo);
 #line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (self->priv->new_album_entry);
+	_g_object_unref0 (self->priv->create_new_radio);
 #line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (self->priv->hide_check);
+	_g_object_unref0 (self->priv->new_album_entry);
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (self->priv->show_check);
+	_g_object_unref0 (self->priv->hide_check);
 #line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_object_unref0 (self->priv->publish_button);
+	_g_object_unref0 (self->priv->show_check);
 #line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_object_unref0 (self->priv->publish_button);
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_OBJECT_CLASS (publishing_rajce_publishing_options_pane_parent_class)->finalize (obj);
-#line 8203 "RajcePublishing.c"
+#line 8217 "RajcePublishing.c"
 }
 
 
@@ -8223,18 +8237,18 @@ GType publishing_rajce_publishing_options_pane_get_type (void) {
 
 static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_construct (GType object_type) {
 	PublishingRajcePublishingParameters* self = NULL;
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type);
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8227 "RajcePublishing.c"
+#line 8241 "RajcePublishing.c"
 }
 
 
 static PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new (void) {
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_publishing_parameters_construct (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS);
-#line 8234 "RajcePublishing.c"
+#line 8248 "RajcePublishing.c"
 }
 
 
@@ -8246,44 +8260,44 @@ PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_cons
 	gboolean* _tmp3_ = NULL;
 	gint _tmp4_ = 0;
 	gint* _tmp5_ = NULL;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (album_name != NULL, NULL);
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type);
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = album_name;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_name);
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->album_name = _tmp1_;
 #line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->album_name = _tmp1_;
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = album_hidden;
-#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = __bool_dup0 (&_tmp2_);
-#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_hidden);
-#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->album_hidden = _tmp3_;
 #line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->album_hidden = _tmp3_;
+#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = 0;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = __int_dup0 (&_tmp4_);
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_id);
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->album_id = _tmp5_;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8276 "RajcePublishing.c"
+#line 8290 "RajcePublishing.c"
 }
 
 
 PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_new_album (const gchar* album_name, gboolean album_hidden) {
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_publishing_parameters_construct_to_new_album (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, album_name, album_hidden);
-#line 8283 "RajcePublishing.c"
+#line 8297 "RajcePublishing.c"
 }
 
 
@@ -8293,252 +8307,252 @@ PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_cons
 	gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gint* _tmp3_ = NULL;
-#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (album_name != NULL, NULL);
-#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajcePublishingParameters*) g_type_create_instance (object_type);
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = album_name;
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_name);
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->album_name = _tmp1_;
 #line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->album_name = _tmp1_;
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_hidden);
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->album_hidden = NULL;
 #line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->album_hidden = NULL;
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = album_id;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = __int_dup0 (&_tmp2_);
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_id);
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->album_id = _tmp3_;
-#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8319 "RajcePublishing.c"
+#line 8333 "RajcePublishing.c"
 }
 
 
 PublishingRajcePublishingParameters* publishing_rajce_publishing_parameters_new_to_existing_album (const gchar* album_name, gint album_id) {
-#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_publishing_parameters_construct_to_existing_album (PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, album_name, album_id);
-#line 8326 "RajcePublishing.c"
+#line 8340 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_value_publishing_parameters_init (GValue* value) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8333 "RajcePublishing.c"
+#line 8347 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_value_publishing_parameters_free_value (GValue* value) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_publishing_parameters_unref (value->data[0].v_pointer);
-#line 8342 "RajcePublishing.c"
+#line 8356 "RajcePublishing.c"
 	}
 }
 
 
 static void publishing_rajce_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_rajce_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 8352 "RajcePublishing.c"
+#line 8366 "RajcePublishing.c"
 	} else {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8356 "RajcePublishing.c"
+#line 8370 "RajcePublishing.c"
 	}
 }
 
 
 static gpointer publishing_rajce_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 8364 "RajcePublishing.c"
+#line 8378 "RajcePublishing.c"
 }
 
 
 static gchar* publishing_rajce_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8371 "RajcePublishing.c"
+#line 8385 "RajcePublishing.c"
 		PublishingRajcePublishingParameters* object;
 		object = collect_values[0].v_pointer;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8378 "RajcePublishing.c"
+#line 8392 "RajcePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8382 "RajcePublishing.c"
+#line 8396 "RajcePublishing.c"
 		}
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = publishing_rajce_publishing_parameters_ref (object);
-#line 8386 "RajcePublishing.c"
+#line 8400 "RajcePublishing.c"
 	} else {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8390 "RajcePublishing.c"
+#line 8404 "RajcePublishing.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 8394 "RajcePublishing.c"
+#line 8408 "RajcePublishing.c"
 }
 
 
 static gchar* publishing_rajce_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingRajcePublishingParameters** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!object_p) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8405 "RajcePublishing.c"
+#line 8419 "RajcePublishing.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = NULL;
-#line 8411 "RajcePublishing.c"
+#line 8425 "RajcePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8415 "RajcePublishing.c"
+#line 8429 "RajcePublishing.c"
 	} else {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = publishing_rajce_publishing_parameters_ref (value->data[0].v_pointer);
-#line 8419 "RajcePublishing.c"
+#line 8433 "RajcePublishing.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 8423 "RajcePublishing.c"
+#line 8437 "RajcePublishing.c"
 }
 
 
 GParamSpec* publishing_rajce_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingRajceParamSpecPublishingParameters* spec;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8437 "RajcePublishing.c"
+#line 8451 "RajcePublishing.c"
 }
 
 
 gpointer publishing_rajce_value_get_publishing_parameters (const GValue* value) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 8446 "RajcePublishing.c"
+#line 8460 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_value_set_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingRajcePublishingParameters* old;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS));
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (v_object) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS));
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_publishing_parameters_ref (value->data[0].v_pointer);
-#line 8466 "RajcePublishing.c"
+#line 8480 "RajcePublishing.c"
 	} else {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8470 "RajcePublishing.c"
+#line 8484 "RajcePublishing.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_publishing_parameters_unref (old);
-#line 8476 "RajcePublishing.c"
+#line 8490 "RajcePublishing.c"
 	}
 }
 
 
 void publishing_rajce_value_take_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingRajcePublishingParameters* old;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS));
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (v_object) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS));
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8495 "RajcePublishing.c"
+#line 8509 "RajcePublishing.c"
 	} else {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8499 "RajcePublishing.c"
+#line 8513 "RajcePublishing.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_publishing_parameters_unref (old);
-#line 8505 "RajcePublishing.c"
+#line 8519 "RajcePublishing.c"
 	}
 }
 
 
 static void publishing_rajce_publishing_parameters_class_init (PublishingRajcePublishingParametersClass * klass) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRajcePublishingParametersClass *) klass)->finalize = publishing_rajce_publishing_parameters_finalize;
-#line 8515 "RajcePublishing.c"
+#line 8529 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_parameters_instance_init (PublishingRajcePublishingParameters * self) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->ref_count = 1;
-#line 8522 "RajcePublishing.c"
+#line 8536 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_publishing_parameters_finalize (PublishingRajcePublishingParameters* obj) {
 	PublishingRajcePublishingParameters * self;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_PUBLISHING_PARAMETERS, PublishingRajcePublishingParameters);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (self->album_name);
 #line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (self->album_hidden);
+	_g_free0 (self->album_name);
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (self->album_hidden);
+#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->album_id);
-#line 8538 "RajcePublishing.c"
+#line 8552 "RajcePublishing.c"
 }
 
 
@@ -8559,42 +8573,42 @@ GType publishing_rajce_publishing_parameters_get_type (void) {
 gpointer publishing_rajce_publishing_parameters_ref (gpointer instance) {
 	PublishingRajcePublishingParameters* self;
 	self = instance;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return instance;
-#line 8563 "RajcePublishing.c"
+#line 8577 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_publishing_parameters_unref (gpointer instance) {
 	PublishingRajcePublishingParameters* self;
 	self = instance;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		PUBLISHING_RAJCE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8576 "RajcePublishing.c"
+#line 8590 "RajcePublishing.c"
 	}
 }
 
 
 PublishingRajceSession* publishing_rajce_session_construct (GType object_type) {
 	PublishingRajceSession* self = NULL;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajceSession*) publishing_rest_support_session_construct (object_type, "");
-#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8587 "RajcePublishing.c"
+#line 8601 "RajcePublishing.c"
 }
 
 
 PublishingRajceSession* publishing_rajce_session_new (void) {
-#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_session_construct (PUBLISHING_RAJCE_TYPE_SESSION);
-#line 8594 "RajcePublishing.c"
+#line 8608 "RajcePublishing.c"
 }
 
 
@@ -8604,43 +8618,43 @@ static gboolean publishing_rajce_session_real_is_authenticated (PublishingRESTSu
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gint* _tmp2_ = NULL;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSession);
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = self->priv->userid;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp2_ != NULL) {
-#line 8610 "RajcePublishing.c"
+#line 8624 "RajcePublishing.c"
 		const gchar* _tmp3_ = NULL;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp3_ = self->priv->usertoken;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 8616 "RajcePublishing.c"
+#line 8630 "RajcePublishing.c"
 	} else {
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp1_ = FALSE;
-#line 8620 "RajcePublishing.c"
+#line 8634 "RajcePublishing.c"
 	}
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp1_) {
-#line 8624 "RajcePublishing.c"
+#line 8638 "RajcePublishing.c"
 		const gchar* _tmp4_ = NULL;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp4_ = self->priv->username;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 8630 "RajcePublishing.c"
+#line 8644 "RajcePublishing.c"
 	} else {
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = FALSE;
-#line 8634 "RajcePublishing.c"
+#line 8648 "RajcePublishing.c"
 	}
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = _tmp0_;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8640 "RajcePublishing.c"
+#line 8654 "RajcePublishing.c"
 }
 
 
@@ -8655,139 +8669,139 @@ void publishing_rajce_session_authenticate (PublishingRajceSession* self, const
 	gint* _tmp7_ = NULL;
 	gint _tmp8_ = 0;
 	gint* _tmp9_ = NULL;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (token != NULL);
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (name != NULL);
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = token;
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->usertoken);
-#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->usertoken = _tmp1_;
 #line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->usertoken = _tmp1_;
+#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = name;
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->username);
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->username = _tmp3_;
 #line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->username = _tmp3_;
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = id;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = __int_dup0 (&_tmp4_);
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->userid);
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->userid = _tmp5_;
 #line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->userid = _tmp5_;
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = maxsize;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = __int_dup0 (&_tmp6_);
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->maxsize);
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->maxsize = _tmp7_;
 #line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->maxsize = _tmp7_;
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp8_ = quality;
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp9_ = __int_dup0 (&_tmp8_);
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->quality);
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->quality = _tmp9_;
-#line 8701 "RajcePublishing.c"
+#line 8715 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_session_deauthenticate (PublishingRajceSession* self) {
-#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->usertoken);
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->usertoken = NULL;
 #line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->usertoken = NULL;
+#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->albumtoken);
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->albumtoken = NULL;
 #line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->albumtoken = NULL;
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->albumticket);
-#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->albumticket = NULL;
 #line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->albumticket = NULL;
+#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->username);
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->username = NULL;
 #line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->username = NULL;
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->userid);
-#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->userid = NULL;
 #line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->userid = NULL;
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->maxsize);
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->maxsize = NULL;
 #line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->maxsize = NULL;
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->quality);
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->quality = NULL;
-#line 8736 "RajcePublishing.c"
+#line 8750 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_session_set_usertoken (PublishingRajceSession* self, const gchar* usertoken) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = usertoken;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->usertoken);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->usertoken = _tmp1_;
-#line 8753 "RajcePublishing.c"
+#line 8767 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_session_set_albumtoken (PublishingRajceSession* self, const gchar* albumtoken) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = albumtoken;
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->albumtoken);
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->albumtoken = _tmp1_;
-#line 8770 "RajcePublishing.c"
+#line 8784 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_session_set_albumticket (PublishingRajceSession* self, const gchar* albumticket) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_SESSION (self));
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = albumticket;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->albumticket);
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->albumticket = _tmp1_;
-#line 8787 "RajcePublishing.c"
+#line 8801 "RajcePublishing.c"
 }
 
 
@@ -8795,17 +8809,17 @@ gchar* publishing_rajce_session_get_usertoken (PublishingRajceSession* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL);
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->usertoken;
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = _tmp1_;
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8805 "RajcePublishing.c"
+#line 8819 "RajcePublishing.c"
 }
 
 
@@ -8813,17 +8827,17 @@ gchar* publishing_rajce_session_get_albumtoken (PublishingRajceSession* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL);
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->albumtoken;
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = _tmp1_;
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8823 "RajcePublishing.c"
+#line 8837 "RajcePublishing.c"
 }
 
 
@@ -8831,17 +8845,17 @@ gchar* publishing_rajce_session_get_albumticket (PublishingRajceSession* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL);
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->albumticket;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = _tmp1_;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8841 "RajcePublishing.c"
+#line 8855 "RajcePublishing.c"
 }
 
 
@@ -8849,90 +8863,90 @@ gchar* publishing_rajce_session_get_username (PublishingRajceSession* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), NULL);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->username;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = _tmp1_;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8859 "RajcePublishing.c"
+#line 8873 "RajcePublishing.c"
 }
 
 
 gint publishing_rajce_session_get_maxsize (PublishingRajceSession* self) {
 	gint result = 0;
 	gint* _tmp0_ = NULL;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (self), 0);
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->maxsize;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = *_tmp0_;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 8874 "RajcePublishing.c"
+#line 8888 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_session_class_init (PublishingRajceSessionClass * klass) {
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_session_parent_class = g_type_class_peek_parent (klass);
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_rajce_session_finalize;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRajceSessionPrivate));
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_rajce_session_real_is_authenticated;
-#line 8887 "RajcePublishing.c"
+#line 8901 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_session_instance_init (PublishingRajceSession * self) {
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv = PUBLISHING_RAJCE_SESSION_GET_PRIVATE (self);
 #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->usertoken = NULL;
+	self->priv = PUBLISHING_RAJCE_SESSION_GET_PRIVATE (self);
 #line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->albumtoken = NULL;
+	self->priv->usertoken = NULL;
 #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->albumticket = NULL;
+	self->priv->albumtoken = NULL;
 #line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->username = NULL;
+	self->priv->albumticket = NULL;
 #line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->userid = NULL;
+	self->priv->username = NULL;
 #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->maxsize = NULL;
+	self->priv->userid = NULL;
 #line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->maxsize = NULL;
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->quality = NULL;
-#line 8908 "RajcePublishing.c"
+#line 8922 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_session_finalize (PublishingRESTSupportSession* obj) {
 	PublishingRajceSession * self;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSession);
 #line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (self->priv->usertoken);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_SESSION, PublishingRajceSession);
 #line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (self->priv->albumtoken);
+	_g_free0 (self->priv->usertoken);
 #line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (self->priv->albumticket);
+	_g_free0 (self->priv->albumtoken);
 #line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (self->priv->username);
+	_g_free0 (self->priv->albumticket);
 #line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (self->priv->userid);
+	_g_free0 (self->priv->username);
 #line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (self->priv->maxsize);
+	_g_free0 (self->priv->userid);
 #line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (self->priv->maxsize);
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->quality);
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rajce_session_parent_class)->finalize (obj);
-#line 8932 "RajcePublishing.c"
+#line 8946 "RajcePublishing.c"
 }
 
 
@@ -8952,9 +8966,9 @@ GType publishing_rajce_session_get_type (void) {
 
 
 static gpointer _publishing_rajce_arg_item_ref0 (gpointer self) {
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self ? publishing_rajce_arg_item_ref (self) : NULL;
-#line 8954 "RajcePublishing.c"
+#line 8968 "RajcePublishing.c"
 }
 
 
@@ -8965,61 +8979,61 @@ PublishingRajceArgItem* publishing_rajce_arg_item_construct (GType object_type,
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	PublishingRajceArgItem** _tmp4_ = NULL;
-#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajceArgItem*) g_type_create_instance (object_type);
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = k;
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->key);
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->key = _tmp1_;
 #line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->key = _tmp1_;
+#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = v;
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->val);
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->val = _tmp3_;
 #line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->val = _tmp3_;
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = g_new0 (PublishingRajceArgItem*, 0 + 1);
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->children = (_vala_array_free (self->children, self->children_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL);
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->children = _tmp4_;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->children_length1 = 0;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->_children_size_ = self->children_length1;
-#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 8995 "RajcePublishing.c"
+#line 9009 "RajcePublishing.c"
 }
 
 
 PublishingRajceArgItem* publishing_rajce_arg_item_new (const gchar* k, const gchar* v) {
-#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_arg_item_construct (PUBLISHING_RAJCE_TYPE_ARG_ITEM, k, v);
-#line 9002 "RajcePublishing.c"
+#line 9016 "RajcePublishing.c"
 }
 
 
 static void _vala_array_add6 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) {
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 9013 "RajcePublishing.c"
+#line 9027 "RajcePublishing.c"
 	}
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 9019 "RajcePublishing.c"
+#line 9033 "RajcePublishing.c"
 }
 
 
@@ -9028,62 +9042,62 @@ void publishing_rajce_arg_item_AddChild (PublishingRajceArgItem* self, Publishin
 	gint _tmp0__length1 = 0;
 	PublishingRajceArgItem* _tmp1_ = NULL;
 	PublishingRajceArgItem* _tmp2_ = NULL;
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (self));
-#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (child));
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->children;
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0__length1 = self->children_length1;
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = child;
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = _publishing_rajce_arg_item_ref0 (_tmp1_);
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_vala_array_add6 (&self->children, &self->children_length1, &self->_children_size_, _tmp2_);
-#line 9042 "RajcePublishing.c"
+#line 9056 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, PublishingRajceArgItem** newchildren, int newchildren_length1) {
 	PublishingRajceArgItem** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (self));
-#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = newchildren;
-#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0__length1 = newchildren_length1;
-#line 9055 "RajcePublishing.c"
+#line 9069 "RajcePublishing.c"
 	{
 		PublishingRajceArgItem** child_collection = NULL;
 		gint child_collection_length1 = 0;
 		gint _child_collection_size_ = 0;
 		gint child_it = 0;
-#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		child_collection = _tmp0_;
-#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		child_collection_length1 = _tmp0__length1;
-#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		for (child_it = 0; child_it < _tmp0__length1; child_it = child_it + 1) {
-#line 9067 "RajcePublishing.c"
+#line 9081 "RajcePublishing.c"
 			PublishingRajceArgItem* _tmp1_ = NULL;
 			PublishingRajceArgItem* child = NULL;
-#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp1_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
-#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			child = _tmp1_;
-#line 9074 "RajcePublishing.c"
+#line 9088 "RajcePublishing.c"
 			{
 				PublishingRajceArgItem* _tmp2_ = NULL;
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp2_ = child;
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				publishing_rajce_arg_item_AddChild (self, _tmp2_);
-#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_publishing_rajce_arg_item_unref0 (child);
-#line 9083 "RajcePublishing.c"
+#line 9097 "RajcePublishing.c"
 			}
 		}
 	}
@@ -9091,198 +9105,198 @@ void publishing_rajce_arg_item_AddChildren (PublishingRajceArgItem* self, Publis
 
 
 static void publishing_rajce_value_arg_item_init (GValue* value) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 9093 "RajcePublishing.c"
+#line 9107 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_value_arg_item_free_value (GValue* value) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_arg_item_unref (value->data[0].v_pointer);
-#line 9102 "RajcePublishing.c"
+#line 9116 "RajcePublishing.c"
 	}
 }
 
 
 static void publishing_rajce_value_arg_item_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_rajce_arg_item_ref (src_value->data[0].v_pointer);
-#line 9112 "RajcePublishing.c"
+#line 9126 "RajcePublishing.c"
 	} else {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9116 "RajcePublishing.c"
+#line 9130 "RajcePublishing.c"
 	}
 }
 
 
 static gpointer publishing_rajce_value_arg_item_peek_pointer (const GValue* value) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 9124 "RajcePublishing.c"
+#line 9138 "RajcePublishing.c"
 }
 
 
 static gchar* publishing_rajce_value_arg_item_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 9131 "RajcePublishing.c"
+#line 9145 "RajcePublishing.c"
 		PublishingRajceArgItem* object;
 		object = collect_values[0].v_pointer;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9138 "RajcePublishing.c"
+#line 9152 "RajcePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9142 "RajcePublishing.c"
+#line 9156 "RajcePublishing.c"
 		}
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = publishing_rajce_arg_item_ref (object);
-#line 9146 "RajcePublishing.c"
+#line 9160 "RajcePublishing.c"
 	} else {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9150 "RajcePublishing.c"
+#line 9164 "RajcePublishing.c"
 	}
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 9154 "RajcePublishing.c"
+#line 9168 "RajcePublishing.c"
 }
 
 
 static gchar* publishing_rajce_value_arg_item_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingRajceArgItem** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!object_p) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9165 "RajcePublishing.c"
+#line 9179 "RajcePublishing.c"
 	}
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = NULL;
-#line 9171 "RajcePublishing.c"
+#line 9185 "RajcePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9175 "RajcePublishing.c"
+#line 9189 "RajcePublishing.c"
 	} else {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = publishing_rajce_arg_item_ref (value->data[0].v_pointer);
-#line 9179 "RajcePublishing.c"
+#line 9193 "RajcePublishing.c"
 	}
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 9183 "RajcePublishing.c"
+#line 9197 "RajcePublishing.c"
 }
 
 
 GParamSpec* publishing_rajce_param_spec_arg_item (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingRajceParamSpecArgItem* spec;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_ARG_ITEM), NULL);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 9197 "RajcePublishing.c"
+#line 9211 "RajcePublishing.c"
 }
 
 
 gpointer publishing_rajce_value_get_arg_item (const GValue* value) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM), NULL);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 9206 "RajcePublishing.c"
+#line 9220 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_value_set_arg_item (GValue* value, gpointer v_object) {
 	PublishingRajceArgItem* old;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM));
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (v_object) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_RAJCE_TYPE_ARG_ITEM));
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_arg_item_ref (value->data[0].v_pointer);
-#line 9226 "RajcePublishing.c"
+#line 9240 "RajcePublishing.c"
 	} else {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9230 "RajcePublishing.c"
+#line 9244 "RajcePublishing.c"
 	}
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_arg_item_unref (old);
-#line 9236 "RajcePublishing.c"
+#line 9250 "RajcePublishing.c"
 	}
 }
 
 
 void publishing_rajce_value_take_arg_item (GValue* value, gpointer v_object) {
 	PublishingRajceArgItem* old;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_ARG_ITEM));
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (v_object) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_RAJCE_TYPE_ARG_ITEM));
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 9255 "RajcePublishing.c"
+#line 9269 "RajcePublishing.c"
 	} else {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9259 "RajcePublishing.c"
+#line 9273 "RajcePublishing.c"
 	}
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_arg_item_unref (old);
-#line 9265 "RajcePublishing.c"
+#line 9279 "RajcePublishing.c"
 	}
 }
 
 
 static void publishing_rajce_arg_item_class_init (PublishingRajceArgItemClass * klass) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_arg_item_parent_class = g_type_class_peek_parent (klass);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRajceArgItemClass *) klass)->finalize = publishing_rajce_arg_item_finalize;
-#line 9275 "RajcePublishing.c"
+#line 9289 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_arg_item_instance_init (PublishingRajceArgItem * self) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->ref_count = 1;
-#line 9282 "RajcePublishing.c"
+#line 9296 "RajcePublishing.c"
 }
 
 
@@ -9290,52 +9304,52 @@ static void publishing_rajce_arg_item_finalize (PublishingRajceArgItem* obj) {
 	PublishingRajceArgItem * self;
 	PublishingRajceArgItem** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_ARG_ITEM, PublishingRajceArgItem);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->children;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0__length1 = self->children_length1;
-#line 9298 "RajcePublishing.c"
+#line 9312 "RajcePublishing.c"
 	{
 		PublishingRajceArgItem** child_collection = NULL;
 		gint child_collection_length1 = 0;
 		gint _child_collection_size_ = 0;
 		gint child_it = 0;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		child_collection = _tmp0_;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		child_collection_length1 = _tmp0__length1;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		for (child_it = 0; child_it < _tmp0__length1; child_it = child_it + 1) {
-#line 9310 "RajcePublishing.c"
+#line 9324 "RajcePublishing.c"
 			PublishingRajceArgItem* _tmp1_ = NULL;
 			PublishingRajceArgItem* child = NULL;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp1_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			child = _tmp1_;
-#line 9317 "RajcePublishing.c"
+#line 9331 "RajcePublishing.c"
 			{
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_publishing_rajce_arg_item_unref0 (child);
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				child = NULL;
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_publishing_rajce_arg_item_unref0 (child);
-#line 9325 "RajcePublishing.c"
+#line 9339 "RajcePublishing.c"
 			}
 		}
 	}
-#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (self->key);
 #line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (self->val);
+	_g_free0 (self->key);
 #line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (self->val);
+#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->children = (_vala_array_free (self->children, self->children_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL);
-#line 9335 "RajcePublishing.c"
+#line 9349 "RajcePublishing.c"
 }
 
 
@@ -9356,24 +9370,24 @@ GType publishing_rajce_arg_item_get_type (void) {
 gpointer publishing_rajce_arg_item_ref (gpointer instance) {
 	PublishingRajceArgItem* self;
 	self = instance;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return instance;
-#line 9360 "RajcePublishing.c"
+#line 9374 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_arg_item_unref (gpointer instance) {
 	PublishingRajceArgItem* self;
 	self = instance;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		PUBLISHING_RAJCE_ARG_ITEM_GET_CLASS (self)->finalize (self);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9373 "RajcePublishing.c"
+#line 9387 "RajcePublishing.c"
 	}
 }
 
@@ -9383,55 +9397,55 @@ PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_construct (GTyp
 	PublishingRajceArgItem** _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (cmd != NULL, NULL);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajceLiveApiRequest*) g_type_create_instance (object_type);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = g_new0 (PublishingRajceArgItem*, 0 + 1);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->_params = (_vala_array_free (self->priv->_params, self->priv->_params_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->_params = _tmp0_;
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->_params_length1 = 0;
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->__params_size_ = self->priv->_params_length1;
 #line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->__params_size_ = self->priv->_params_length1;
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = cmd;
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->_cmd);
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->_cmd = _tmp2_;
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 9407 "RajcePublishing.c"
+#line 9421 "RajcePublishing.c"
 }
 
 
 PublishingRajceLiveApiRequest* publishing_rajce_live_api_request_new (const gchar* cmd) {
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_live_api_request_construct (PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST, cmd);
-#line 9414 "RajcePublishing.c"
+#line 9428 "RajcePublishing.c"
 }
 
 
 static void _vala_array_add7 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) {
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 9425 "RajcePublishing.c"
+#line 9439 "RajcePublishing.c"
 	}
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 9431 "RajcePublishing.c"
+#line 9445 "RajcePublishing.c"
 }
 
 
@@ -9441,25 +9455,25 @@ void publishing_rajce_live_api_request_AddParam (PublishingRajceLiveApiRequest*
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	PublishingRajceArgItem* _tmp3_ = NULL;
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self));
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (name != NULL);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (val != NULL);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = self->priv->_params;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0__length1 = self->priv->_params_length1;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = name;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = val;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = publishing_rajce_arg_item_new (_tmp1_, _tmp2_);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_vala_array_add7 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp3_);
-#line 9459 "RajcePublishing.c"
+#line 9473 "RajcePublishing.c"
 }
 
 
@@ -9467,27 +9481,27 @@ void publishing_rajce_live_api_request_AddParamBool (PublishingRajceLiveApiReque
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	const gchar* _tmp2_ = NULL;
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self));
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (name != NULL);
-#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = val;
-#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp1_) {
-#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = "1";
-#line 9477 "RajcePublishing.c"
+#line 9491 "RajcePublishing.c"
 	} else {
-#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp0_ = "0";
-#line 9481 "RajcePublishing.c"
+#line 9495 "RajcePublishing.c"
 	}
-#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = name;
-#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (self, _tmp2_, _tmp0_);
-#line 9487 "RajcePublishing.c"
+#line 9501 "RajcePublishing.c"
 }
 
 
@@ -9496,40 +9510,40 @@ void publishing_rajce_live_api_request_AddParamInt (PublishingRajceLiveApiReques
 	gint _tmp1_ = 0;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self));
-#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (name != NULL);
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = name;
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = val;
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = g_strdup_printf ("%i", _tmp1_);
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (self, _tmp0_, _tmp3_);
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (_tmp3_);
-#line 9512 "RajcePublishing.c"
+#line 9526 "RajcePublishing.c"
 }
 
 
 static void _vala_array_add8 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) {
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 9523 "RajcePublishing.c"
+#line 9537 "RajcePublishing.c"
 	}
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 9529 "RajcePublishing.c"
+#line 9543 "RajcePublishing.c"
 }
 
 
@@ -9542,33 +9556,33 @@ void publishing_rajce_live_api_request_AddParamNode (PublishingRajceLiveApiReque
 	PublishingRajceArgItem** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
 	PublishingRajceArgItem* _tmp4_ = NULL;
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self));
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (name != NULL);
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = name;
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = publishing_rajce_arg_item_new (_tmp0_, NULL);
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	newItem = _tmp1_;
 #line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	newItem = _tmp1_;
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = val;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2__length1 = val_length1;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_arg_item_AddChildren (newItem, _tmp2_, _tmp2__length1);
 #line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_arg_item_AddChildren (newItem, _tmp2_, _tmp2__length1);
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = self->priv->_params;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3__length1 = self->priv->_params_length1;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = _publishing_rajce_arg_item_ref0 (newItem);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_vala_array_add8 (&self->priv->_params, &self->priv->_params_length1, &self->priv->__params_size_, _tmp4_);
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_arg_item_unref0 (newItem);
-#line 9568 "RajcePublishing.c"
+#line 9582 "RajcePublishing.c"
 }
 
 
@@ -9592,109 +9606,109 @@ gchar* publishing_rajce_live_api_request_Params2XmlString (PublishingRajceLiveAp
 	gchar* _tmp13_ = NULL;
 	xmlDoc* _tmp14_ = NULL;
 	gboolean _tmp15_ = FALSE;
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_LIVE_API_REQUEST (self), NULL);
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = xmlNewDoc ((xmlChar*) "1.0");
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	doc = _tmp0_;
 #line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	doc = _tmp0_;
+#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = xmlNewNode (NULL, (xmlChar*) "request");
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	root = _tmp1_;
 #line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	root = _tmp1_;
+#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = doc;
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = root;
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xmlDocSetRootElement (_tmp2_, _tmp3_);
 #line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	xmlDocSetRootElement (_tmp2_, _tmp3_);
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = root;
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = self->priv->_cmd;
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xmlNewTextChild (_tmp4_, NULL, (xmlChar*) "command", (xmlChar*) _tmp5_);
 #line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	xmlNewTextChild (_tmp4_, NULL, (xmlChar*) "command", (xmlChar*) _tmp5_);
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = root;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = xmlNewTextChild (_tmp6_, NULL, (xmlChar*) "parameters", (xmlChar*) "");
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	par = _tmp7_;
 #line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	par = _tmp7_;
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp8_ = self->priv->_params;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp8__length1 = self->priv->_params_length1;
-#line 9624 "RajcePublishing.c"
+#line 9638 "RajcePublishing.c"
 	{
 		PublishingRajceArgItem** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
 		gint _arg_collection_size_ = 0;
 		gint arg_it = 0;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		arg_collection = _tmp8_;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		arg_collection_length1 = _tmp8__length1;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		for (arg_it = 0; arg_it < _tmp8__length1; arg_it = arg_it + 1) {
-#line 9636 "RajcePublishing.c"
+#line 9650 "RajcePublishing.c"
 			PublishingRajceArgItem* _tmp9_ = NULL;
 			PublishingRajceArgItem* arg = NULL;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_tmp9_ = _publishing_rajce_arg_item_ref0 (arg_collection[arg_it]);
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			arg = _tmp9_;
-#line 9643 "RajcePublishing.c"
+#line 9657 "RajcePublishing.c"
 			{
 				xmlNode* _tmp10_ = NULL;
 				PublishingRajceArgItem* _tmp11_ = NULL;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp10_ = par;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp11_ = arg;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				publishing_rajce_live_api_request_WriteParam (_tmp10_, _tmp11_);
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_publishing_rajce_arg_item_unref0 (arg);
-#line 9655 "RajcePublishing.c"
+#line 9669 "RajcePublishing.c"
 			}
 		}
 	}
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp12_ = doc;
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	xmlDocDumpMemoryEnc (_tmp12_, (xmlChar**) (&_tmp13_), NULL, "UTF-8");
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (xmlstr);
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xmlstr = _tmp13_;
 #line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	xmlstr = _tmp13_;
+#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp14_ = doc;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xmlFreeDoc (_tmp14_);
 #line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	xmlFreeDoc (_tmp14_);
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp15_ = urlencode;
-#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp15_) {
-#line 9675 "RajcePublishing.c"
+#line 9689 "RajcePublishing.c"
 		const gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp16_ = xmlstr;
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp17_ = soup_uri_encode (_tmp16_, "&;");
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		result = _tmp17_;
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (xmlstr);
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return result;
-#line 9688 "RajcePublishing.c"
+#line 9702 "RajcePublishing.c"
 	}
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = xmlstr;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 9694 "RajcePublishing.c"
+#line 9708 "RajcePublishing.c"
 }
 
 
@@ -9702,35 +9716,35 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish
 	PublishingRajceArgItem* _tmp0_ = NULL;
 	PublishingRajceArgItem** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (PUBLISHING_RAJCE_IS_ARG_ITEM (arg));
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = arg;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = _tmp0_->children;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1__length1 = _tmp0_->children_length1;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp1__length1 == 0) {
-#line 9712 "RajcePublishing.c"
+#line 9726 "RajcePublishing.c"
 		xmlNode* _tmp2_ = NULL;
 		PublishingRajceArgItem* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		PublishingRajceArgItem* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp2_ = node;
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp3_ = arg;
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp4_ = _tmp3_->key;
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp5_ = arg;
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp6_ = _tmp5_->val;
-#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		xmlNewTextChild (_tmp2_, NULL, (xmlChar*) _tmp4_, (xmlChar*) _tmp6_);
-#line 9730 "RajcePublishing.c"
+#line 9744 "RajcePublishing.c"
 	} else {
 		xmlNode* subnode = NULL;
 		xmlNode* _tmp7_ = NULL;
@@ -9740,54 +9754,54 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish
 		PublishingRajceArgItem* _tmp11_ = NULL;
 		PublishingRajceArgItem** _tmp12_ = NULL;
 		gint _tmp12__length1 = 0;
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp7_ = node;
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp8_ = arg;
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp9_ = _tmp8_->key;
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp10_ = xmlNewTextChild (_tmp7_, NULL, (xmlChar*) _tmp9_, (xmlChar*) "");
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		subnode = _tmp10_;
 #line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		subnode = _tmp10_;
+#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp11_ = arg;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12_ = _tmp11_->children;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12__length1 = _tmp11_->children_length1;
-#line 9756 "RajcePublishing.c"
+#line 9770 "RajcePublishing.c"
 		{
 			PublishingRajceArgItem** child_collection = NULL;
 			gint child_collection_length1 = 0;
 			gint _child_collection_size_ = 0;
 			gint child_it = 0;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			child_collection = _tmp12_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			child_collection_length1 = _tmp12__length1;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			for (child_it = 0; child_it < _tmp12__length1; child_it = child_it + 1) {
-#line 9768 "RajcePublishing.c"
+#line 9782 "RajcePublishing.c"
 				PublishingRajceArgItem* _tmp13_ = NULL;
 				PublishingRajceArgItem* child = NULL;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				_tmp13_ = _publishing_rajce_arg_item_ref0 (child_collection[child_it]);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 				child = _tmp13_;
-#line 9775 "RajcePublishing.c"
+#line 9789 "RajcePublishing.c"
 				{
 					xmlNode* _tmp14_ = NULL;
 					PublishingRajceArgItem* _tmp15_ = NULL;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp14_ = subnode;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_tmp15_ = child;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					publishing_rajce_live_api_request_WriteParam (_tmp14_, _tmp15_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 					_publishing_rajce_arg_item_unref0 (child);
-#line 9787 "RajcePublishing.c"
+#line 9801 "RajcePublishing.c"
 				}
 			}
 		}
@@ -9796,216 +9810,216 @@ static void publishing_rajce_live_api_request_WriteParam (xmlNode* node, Publish
 
 
 static void publishing_rajce_value_live_api_request_init (GValue* value) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 9798 "RajcePublishing.c"
+#line 9812 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_value_live_api_request_free_value (GValue* value) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_live_api_request_unref (value->data[0].v_pointer);
-#line 9807 "RajcePublishing.c"
+#line 9821 "RajcePublishing.c"
 	}
 }
 
 
 static void publishing_rajce_value_live_api_request_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_rajce_live_api_request_ref (src_value->data[0].v_pointer);
-#line 9817 "RajcePublishing.c"
+#line 9831 "RajcePublishing.c"
 	} else {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9821 "RajcePublishing.c"
+#line 9835 "RajcePublishing.c"
 	}
 }
 
 
 static gpointer publishing_rajce_value_live_api_request_peek_pointer (const GValue* value) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 9829 "RajcePublishing.c"
+#line 9843 "RajcePublishing.c"
 }
 
 
 static gchar* publishing_rajce_value_live_api_request_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 9836 "RajcePublishing.c"
+#line 9850 "RajcePublishing.c"
 		PublishingRajceLiveApiRequest* object;
 		object = collect_values[0].v_pointer;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9843 "RajcePublishing.c"
+#line 9857 "RajcePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9847 "RajcePublishing.c"
+#line 9861 "RajcePublishing.c"
 		}
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = publishing_rajce_live_api_request_ref (object);
-#line 9851 "RajcePublishing.c"
+#line 9865 "RajcePublishing.c"
 	} else {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9855 "RajcePublishing.c"
+#line 9869 "RajcePublishing.c"
 	}
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 9859 "RajcePublishing.c"
+#line 9873 "RajcePublishing.c"
 }
 
 
 static gchar* publishing_rajce_value_live_api_request_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingRajceLiveApiRequest** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!object_p) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9870 "RajcePublishing.c"
+#line 9884 "RajcePublishing.c"
 	}
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = NULL;
-#line 9876 "RajcePublishing.c"
+#line 9890 "RajcePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9880 "RajcePublishing.c"
+#line 9894 "RajcePublishing.c"
 	} else {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*object_p = publishing_rajce_live_api_request_ref (value->data[0].v_pointer);
-#line 9884 "RajcePublishing.c"
+#line 9898 "RajcePublishing.c"
 	}
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return NULL;
-#line 9888 "RajcePublishing.c"
+#line 9902 "RajcePublishing.c"
 }
 
 
 GParamSpec* publishing_rajce_param_spec_live_api_request (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingRajceParamSpecLiveApiRequest* spec;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST), NULL);
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 9902 "RajcePublishing.c"
+#line 9916 "RajcePublishing.c"
 }
 
 
 gpointer publishing_rajce_value_get_live_api_request (const GValue* value) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST), NULL);
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return value->data[0].v_pointer;
-#line 9911 "RajcePublishing.c"
+#line 9925 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_value_set_live_api_request (GValue* value, gpointer v_object) {
 	PublishingRajceLiveApiRequest* old;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST));
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (v_object) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST));
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_live_api_request_ref (value->data[0].v_pointer);
-#line 9931 "RajcePublishing.c"
+#line 9945 "RajcePublishing.c"
 	} else {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9935 "RajcePublishing.c"
+#line 9949 "RajcePublishing.c"
 	}
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_live_api_request_unref (old);
-#line 9941 "RajcePublishing.c"
+#line 9955 "RajcePublishing.c"
 	}
 }
 
 
 void publishing_rajce_value_take_live_api_request (GValue* value, gpointer v_object) {
 	PublishingRajceLiveApiRequest* old;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST));
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (v_object) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST));
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 9960 "RajcePublishing.c"
+#line 9974 "RajcePublishing.c"
 	} else {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9964 "RajcePublishing.c"
+#line 9978 "RajcePublishing.c"
 	}
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (old) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		publishing_rajce_live_api_request_unref (old);
-#line 9970 "RajcePublishing.c"
+#line 9984 "RajcePublishing.c"
 	}
 }
 
 
 static void publishing_rajce_live_api_request_class_init (PublishingRajceLiveApiRequestClass * klass) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_parent_class = g_type_class_peek_parent (klass);
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRajceLiveApiRequestClass *) klass)->finalize = publishing_rajce_live_api_request_finalize;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRajceLiveApiRequestPrivate));
-#line 9982 "RajcePublishing.c"
+#line 9996 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_live_api_request_instance_init (PublishingRajceLiveApiRequest * self) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv = PUBLISHING_RAJCE_LIVE_API_REQUEST_GET_PRIVATE (self);
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->ref_count = 1;
-#line 9991 "RajcePublishing.c"
+#line 10005 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_live_api_request_finalize (PublishingRajceLiveApiRequest* obj) {
 	PublishingRajceLiveApiRequest * self;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_LIVE_API_REQUEST, PublishingRajceLiveApiRequest);
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self->priv->_params = (_vala_array_free (self->priv->_params, self->priv->_params_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL);
 #line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self->priv->_params = (_vala_array_free (self->priv->_params, self->priv->_params_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL);
+#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (self->priv->_cmd);
-#line 10005 "RajcePublishing.c"
+#line 10019 "RajcePublishing.c"
 }
 
 
@@ -10026,24 +10040,24 @@ GType publishing_rajce_live_api_request_get_type (void) {
 gpointer publishing_rajce_live_api_request_ref (gpointer instance) {
 	PublishingRajceLiveApiRequest* self;
 	self = instance;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return instance;
-#line 10030 "RajcePublishing.c"
+#line 10044 "RajcePublishing.c"
 }
 
 
 void publishing_rajce_live_api_request_unref (gpointer instance) {
 	PublishingRajceLiveApiRequest* self;
 	self = instance;
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		PUBLISHING_RAJCE_LIVE_API_REQUEST_GET_CLASS (self)->finalize (self);
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 10043 "RajcePublishing.c"
+#line 10057 "RajcePublishing.c"
 	}
 }
 
@@ -10051,22 +10065,22 @@ void publishing_rajce_live_api_request_unref (gpointer instance) {
 PublishingRajceTransaction* publishing_rajce_transaction_construct (GType object_type, PublishingRajceSession* session) {
 	PublishingRajceTransaction* self = NULL;
 	PublishingRajceSession* _tmp0_ = NULL;
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = session;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = (PublishingRajceTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10059 "RajcePublishing.c"
+#line 10073 "RajcePublishing.c"
 }
 
 
 PublishingRajceTransaction* publishing_rajce_transaction_new (PublishingRajceSession* session) {
-#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_transaction_construct (PUBLISHING_RAJCE_TYPE_TRANSACTION, session);
-#line 10066 "RajcePublishing.c"
+#line 10080 "RajcePublishing.c"
 }
 
 
@@ -10094,64 +10108,64 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
 	gchar* _tmp26_ = NULL;
 	gchar* _tmp27_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = doc;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	root = _tmp1_;
 #line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	root = _tmp1_;
+#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = root;
-#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp2_ == NULL) {
-#line 10106 "RajcePublishing.c"
+#line 10120 "RajcePublishing.c"
 		gchar* _tmp3_ = NULL;
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp3_ = g_strdup ("No XML returned from server");
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		result = _tmp3_;
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return result;
-#line 10114 "RajcePublishing.c"
+#line 10128 "RajcePublishing.c"
 	}
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = root;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = _tmp4_->name;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	name = _tmp6_;
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp8_ = name;
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp8_ == NULL) {
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp7_ = TRUE;
-#line 10130 "RajcePublishing.c"
+#line 10144 "RajcePublishing.c"
 	} else {
 		const gchar* _tmp9_ = NULL;
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp9_ = name;
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp7_ = g_strcmp0 (_tmp9_, "response") != 0;
-#line 10137 "RajcePublishing.c"
+#line 10151 "RajcePublishing.c"
 	}
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp7_) {
-#line 10141 "RajcePublishing.c"
+#line 10155 "RajcePublishing.c"
 		gchar* _tmp10_ = NULL;
-#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp10_ = g_strdup ("No response from Rajce in XML");
-#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		result = _tmp10_;
-#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (name);
-#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return result;
-#line 10151 "RajcePublishing.c"
+#line 10165 "RajcePublishing.c"
 	}
 	{
 		xmlNode* _tmp11_ = NULL;
@@ -10162,129 +10176,129 @@ gchar* publishing_rajce_transaction_validate_xml (PublishingRESTSupportXmlDocume
 		PublishingRESTSupportXmlDocument* _tmp16_ = NULL;
 		xmlNode* _tmp17_ = NULL;
 		xmlNode* _tmp18_ = NULL;
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp12_ = doc;
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp13_ = root;
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp14_ = publishing_rest_support_xml_document_get_named_child (_tmp12_, _tmp13_, "errorCode", &_inner_error_);
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp11_ = _tmp14_;
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 10174 "RajcePublishing.c"
+#line 10188 "RajcePublishing.c"
 				goto __catch31_spit_publishing_publishing_error;
 			}
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_g_free0 (name);
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return NULL;
-#line 10185 "RajcePublishing.c"
+#line 10199 "RajcePublishing.c"
 		}
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		errcode = _tmp11_;
 #line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		errcode = _tmp11_;
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp16_ = doc;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp17_ = root;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp18_ = publishing_rest_support_xml_document_get_named_child (_tmp16_, _tmp17_, "result", &_inner_error_);
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp15_ = _tmp18_;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 10201 "RajcePublishing.c"
+#line 10215 "RajcePublishing.c"
 				goto __catch31_spit_publishing_publishing_error;
 			}
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			_g_free0 (name);
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 			return NULL;
-#line 10212 "RajcePublishing.c"
+#line 10226 "RajcePublishing.c"
 		}
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_result_ = _tmp15_;
-#line 10216 "RajcePublishing.c"
+#line 10230 "RajcePublishing.c"
 	}
 	goto __finally31;
 	__catch31_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		err = _inner_error_;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_inner_error_ = NULL;
-#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		result = NULL;
-#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_error_free0 (err);
-#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (name);
-#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return result;
-#line 10234 "RajcePublishing.c"
+#line 10248 "RajcePublishing.c"
 	}
 	__finally31:
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_g_free0 (name);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		return NULL;
-#line 10247 "RajcePublishing.c"
+#line 10261 "RajcePublishing.c"
 	}
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp19_ = errcode;
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp20_ = (gchar*) xmlNodeGetContent (_tmp19_);
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp21_ = _tmp20_;
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp22_ = atoi (_tmp21_);
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp23_ = _result_;
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp24_ = (gchar*) xmlNodeGetContent (_tmp23_);
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp25_ = _tmp24_;
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp26_ = g_strdup_printf ("999 Rajce Error [%d]: %s", _tmp22_, _tmp25_);
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp27_ = _tmp26_;
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (_tmp25_);
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (_tmp21_);
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	result = _tmp27_;
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (name);
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return result;
-#line 10277 "RajcePublishing.c"
+#line 10291 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_transaction_class_init (PublishingRajceTransactionClass * klass) {
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10284 "RajcePublishing.c"
+#line 10298 "RajcePublishing.c"
 }
 
 
@@ -10321,67 +10335,67 @@ PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transacti
 	const gchar* _tmp5_ = NULL;
 	gchar* xml = NULL;
 	gchar* _tmp6_ = NULL;
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (username != NULL, NULL);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (token != NULL, NULL);
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = url;
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_debug ("RajcePublishing.vala:1396: SessionLoginTransaction: URL: %s", _tmp0_);
 #line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	g_debug ("RajcePublishing.vala:1397: SessionLoginTransaction: URL: %s", _tmp0_);
+#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = session;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = url;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp2_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self = (PublishingRajceSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp2_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 1399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = publishing_rajce_live_api_request_new ("login");
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp3_;
 #line 1399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "clientID", "RajceShotwellPlugin");
+	req = _tmp3_;
 #line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "currentVersion", "1.1.1.1");
+	publishing_rajce_live_api_request_AddParam (req, "clientID", "RajceShotwellPlugin");
 #line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_live_api_request_AddParam (req, "currentVersion", "1.1.1.1");
+#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = username;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "login", _tmp4_);
 #line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_live_api_request_AddParam (req, "login", _tmp4_);
+#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = token;
-#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "password", _tmp5_);
 #line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_live_api_request_AddParam (req, "password", _tmp5_);
+#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
-#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp6_;
 #line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	xml = _tmp6_;
+#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (xml);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_live_api_request_unref0 (req);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10367 "RajcePublishing.c"
+#line 10381 "RajcePublishing.c"
 }
 
 
 PublishingRajceSessionLoginTransaction* publishing_rajce_session_login_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* username, const gchar* token) {
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_session_login_transaction_construct (PUBLISHING_RAJCE_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, token);
-#line 10374 "RajcePublishing.c"
+#line 10388 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_session_login_transaction_class_init (PublishingRajceSessionLoginTransactionClass * klass) {
-#line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_session_login_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10381 "RajcePublishing.c"
+#line 10395 "RajcePublishing.c"
 }
 
 
@@ -10405,87 +10419,87 @@ GType publishing_rajce_session_login_transaction_get_type (void) {
 
 
 static void _vala_array_add9 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) {
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	if ((*length) == (*size)) {
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10411 "RajcePublishing.c"
-	}
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	(*array)[(*length)++] = value;
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	(*array)[*length] = NULL;
-#line 10417 "RajcePublishing.c"
-}
-
-
-static void _vala_array_add10 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) {
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10428 "RajcePublishing.c"
+#line 10425 "RajcePublishing.c"
 	}
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 10434 "RajcePublishing.c"
+#line 10431 "RajcePublishing.c"
 }
 
 
-static void _vala_array_add11 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) {
+static void _vala_array_add10 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) {
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10445 "RajcePublishing.c"
+#line 10442 "RajcePublishing.c"
 	}
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 10451 "RajcePublishing.c"
+#line 10448 "RajcePublishing.c"
 }
 
 
-static void _vala_array_add12 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) {
+static void _vala_array_add11 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) {
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10462 "RajcePublishing.c"
+#line 10459 "RajcePublishing.c"
 	}
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 10468 "RajcePublishing.c"
+#line 10465 "RajcePublishing.c"
 }
 
 
-static void _vala_array_add13 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) {
+static void _vala_array_add12 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) {
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*length) == (*size)) {
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
-#line 10479 "RajcePublishing.c"
+#line 10476 "RajcePublishing.c"
 	}
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	(*array)[*length] = NULL;
-#line 10485 "RajcePublishing.c"
+#line 10482 "RajcePublishing.c"
+}
+
+
+static void _vala_array_add13 (PublishingRajceArgItem*** array, int* length, int* size, PublishingRajceArgItem* value) {
+#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	if ((*length) == (*size)) {
+#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+		*array = g_renew (PublishingRajceArgItem*, *array, (*size) + 1);
+#line 10493 "RajcePublishing.c"
+	}
+#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	(*array)[(*length)++] = value;
+#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	(*array)[*length] = NULL;
+#line 10499 "RajcePublishing.c"
 }
 
 
@@ -10521,113 +10535,113 @@ PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_con
 	gint _tmp17__length1 = 0;
 	gchar* xml = NULL;
 	gchar* _tmp18_ = NULL;
-#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
-#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = session;
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = url;
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceGetAlbumsTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self = (PublishingRajceGetAlbumsTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = publishing_rajce_live_api_request_new ("getAlbumList");
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp2_;
 #line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	req = _tmp2_;
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = session;
-#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
-#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
-#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp5_);
 #line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (_tmp5_);
+#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = g_new0 (PublishingRajceArgItem*, 0 + 1);
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	columns = _tmp6_;
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	columns_length1 = 0;
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_columns_size_ = columns_length1;
 #line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_columns_size_ = columns_length1;
+#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = columns;
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7__length1 = columns_length1;
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp8_ = publishing_rajce_arg_item_new ("column", "viewCount");
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add9 (&columns, &columns_length1, &_columns_size_, _tmp8_);
 #line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_vala_array_add9 (&columns, &columns_length1, &_columns_size_, _tmp8_);
+#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp9_ = columns;
-#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp9__length1 = columns_length1;
-#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp10_ = publishing_rajce_arg_item_new ("column", "isFavourite");
-#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add10 (&columns, &columns_length1, &_columns_size_, _tmp10_);
 #line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_vala_array_add10 (&columns, &columns_length1, &_columns_size_, _tmp10_);
+#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp11_ = columns;
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp11__length1 = columns_length1;
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp12_ = publishing_rajce_arg_item_new ("column", "descriptionHtml");
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add11 (&columns, &columns_length1, &_columns_size_, _tmp12_);
 #line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_vala_array_add11 (&columns, &columns_length1, &_columns_size_, _tmp12_);
+#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp13_ = columns;
-#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp13__length1 = columns_length1;
-#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp14_ = publishing_rajce_arg_item_new ("column", "coverPhotoID");
-#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add12 (&columns, &columns_length1, &_columns_size_, _tmp14_);
 #line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_vala_array_add12 (&columns, &columns_length1, &_columns_size_, _tmp14_);
+#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp15_ = columns;
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp15__length1 = columns_length1;
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp16_ = publishing_rajce_arg_item_new ("column", "localPath");
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_vala_array_add13 (&columns, &columns_length1, &_columns_size_, _tmp16_);
 #line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_vala_array_add13 (&columns, &columns_length1, &_columns_size_, _tmp16_);
+#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp17_ = columns;
-#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp17__length1 = columns_length1;
-#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParamNode (req, "columns", _tmp17_, _tmp17__length1);
 #line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_live_api_request_AddParamNode (req, "columns", _tmp17_, _tmp17__length1);
+#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp18_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
-#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp18_;
 #line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	xml = _tmp18_;
+#line 1427 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
-#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (xml);
-#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	columns = (_vala_array_free (columns, columns_length1, (GDestroyNotify) publishing_rajce_arg_item_unref), NULL);
-#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_live_api_request_unref0 (req);
-#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10613 "RajcePublishing.c"
+#line 10627 "RajcePublishing.c"
 }
 
 
 PublishingRajceGetAlbumsTransaction* publishing_rajce_get_albums_transaction_new (PublishingRajceSession* session, const gchar* url) {
-#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_get_albums_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_ALBUMS_TRANSACTION, session, url);
-#line 10620 "RajcePublishing.c"
+#line 10634 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_get_albums_transaction_class_init (PublishingRajceGetAlbumsTransactionClass * klass) {
-#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_get_albums_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10627 "RajcePublishing.c"
+#line 10641 "RajcePublishing.c"
 }
 
 
@@ -10663,69 +10677,69 @@ PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction
 	gboolean _tmp7_ = FALSE;
 	gchar* xml = NULL;
 	gchar* _tmp8_ = NULL;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (albumName != NULL, NULL);
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = session;
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = url;
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceCreateAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self = (PublishingRajceCreateAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = publishing_rajce_live_api_request_new ("createAlbum");
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp2_;
 #line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	req = _tmp2_;
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = session;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp5_);
 #line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (_tmp5_);
+#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = albumName;
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "albumName", _tmp6_);
 #line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (req, "albumDescription", "");
+	publishing_rajce_live_api_request_AddParam (req, "albumName", _tmp6_);
 #line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_live_api_request_AddParam (req, "albumDescription", "");
+#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = hidden;
-#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParamBool (req, "albumVisible", !_tmp7_);
 #line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_live_api_request_AddParamBool (req, "albumVisible", !_tmp7_);
+#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp8_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp8_;
 #line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	xml = _tmp8_;
+#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (xml);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_live_api_request_unref0 (req);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10711 "RajcePublishing.c"
+#line 10725 "RajcePublishing.c"
 }
 
 
 PublishingRajceCreateAlbumTransaction* publishing_rajce_create_album_transaction_new (PublishingRajceSession* session, const gchar* url, const gchar* albumName, gboolean hidden) {
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_create_album_transaction_construct (PUBLISHING_RAJCE_TYPE_CREATE_ALBUM_TRANSACTION, session, url, albumName, hidden);
-#line 10718 "RajcePublishing.c"
+#line 10732 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_create_album_transaction_class_init (PublishingRajceCreateAlbumTransactionClass * klass) {
-#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_create_album_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10725 "RajcePublishing.c"
+#line 10739 "RajcePublishing.c"
 }
 
 
@@ -10760,61 +10774,61 @@ PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_con
 	gint _tmp6_ = 0;
 	gchar* xml = NULL;
 	gchar* _tmp7_ = NULL;
-#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
-#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = session;
-#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = url;
-#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceOpenAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self = (PublishingRajceOpenAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = publishing_rajce_live_api_request_new ("openAlbum");
-#line 1456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp2_;
 #line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	req = _tmp2_;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = session;
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp5_);
 #line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (_tmp5_);
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = albumID;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParamInt (req, "albumID", _tmp6_);
 #line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_live_api_request_AddParamInt (req, "albumID", _tmp6_);
+#line 1460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
-#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp7_;
 #line 1460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	xml = _tmp7_;
+#line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
-#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (xml);
-#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_live_api_request_unref0 (req);
-#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10800 "RajcePublishing.c"
+#line 10814 "RajcePublishing.c"
 }
 
 
 PublishingRajceOpenAlbumTransaction* publishing_rajce_open_album_transaction_new (PublishingRajceSession* session, const gchar* url, gint albumID) {
-#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_open_album_transaction_construct (PUBLISHING_RAJCE_TYPE_OPEN_ALBUM_TRANSACTION, session, url, albumID);
-#line 10807 "RajcePublishing.c"
+#line 10821 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_open_album_transaction_class_init (PublishingRajceOpenAlbumTransactionClass * klass) {
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_open_album_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10814 "RajcePublishing.c"
+#line 10828 "RajcePublishing.c"
 }
 
 
@@ -10851,67 +10865,67 @@ PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transactio
 	gchar* _tmp8_ = NULL;
 	gchar* xml = NULL;
 	gchar* _tmp9_ = NULL;
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = session;
-#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = url;
-#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceGetAlbumUrlTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self = (PublishingRajceGetAlbumUrlTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = publishing_rajce_live_api_request_new ("getAlbumUrl");
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp2_;
 #line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	req = _tmp2_;
+#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = session;
-#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
-#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
-#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp5_);
 #line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (_tmp5_);
+#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = session;
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = publishing_rajce_session_get_albumtoken (_tmp6_);
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (req, "albumToken", _tmp8_);
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp8_);
 #line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (_tmp8_);
+#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp9_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
-#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp9_;
 #line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	xml = _tmp9_;
+#line 1477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (xml);
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_live_api_request_unref0 (req);
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10897 "RajcePublishing.c"
+#line 10911 "RajcePublishing.c"
 }
 
 
 PublishingRajceGetAlbumUrlTransaction* publishing_rajce_get_album_url_transaction_new (PublishingRajceSession* session, const gchar* url) {
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_get_album_url_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_ALBUM_URL_TRANSACTION, session, url);
-#line 10904 "RajcePublishing.c"
+#line 10918 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_get_album_url_transaction_class_init (PublishingRajceGetAlbumUrlTransactionClass * klass) {
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_get_album_url_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 10911 "RajcePublishing.c"
+#line 10925 "RajcePublishing.c"
 }
 
 
@@ -10948,67 +10962,67 @@ PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_c
 	gchar* _tmp8_ = NULL;
 	gchar* xml = NULL;
 	gchar* _tmp9_ = NULL;
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = session;
-#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = url;
-#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceCloseAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self = (PublishingRajceCloseAlbumTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = publishing_rajce_live_api_request_new ("closeAlbum");
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp2_;
 #line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	req = _tmp2_;
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = session;
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp5_);
 #line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (_tmp5_);
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = session;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = publishing_rajce_session_get_albumtoken (_tmp6_);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (req, "albumToken", _tmp8_);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp8_);
 #line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (_tmp8_);
+#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp9_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp9_;
 #line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	xml = _tmp9_;
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (xml);
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_live_api_request_unref0 (req);
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 10994 "RajcePublishing.c"
+#line 11008 "RajcePublishing.c"
 }
 
 
 PublishingRajceCloseAlbumTransaction* publishing_rajce_close_album_transaction_new (PublishingRajceSession* session, const gchar* url) {
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_close_album_transaction_construct (PUBLISHING_RAJCE_TYPE_CLOSE_ALBUM_TRANSACTION, session, url);
-#line 11001 "RajcePublishing.c"
+#line 11015 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_close_album_transaction_class_init (PublishingRajceCloseAlbumTransactionClass * klass) {
-#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_close_album_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11008 "RajcePublishing.c"
+#line 11022 "RajcePublishing.c"
 }
 
 
@@ -11042,57 +11056,57 @@ PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transac
 	gchar* _tmp5_ = NULL;
 	gchar* xml = NULL;
 	gchar* _tmp6_ = NULL;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = session;
-#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = url;
-#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceGetCategoriesTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
 #line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self = (PublishingRajceGetCategoriesTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = publishing_rajce_live_api_request_new ("getCategories");
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp2_;
 #line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	req = _tmp2_;
+#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = session;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = publishing_rajce_session_get_usertoken (_tmp3_);
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (req, "token", _tmp5_);
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp5_);
 #line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (_tmp5_);
+#line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = publishing_rajce_live_api_request_Params2XmlString (req, TRUE);
-#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp6_;
 #line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	xml = _tmp6_;
+#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (xml);
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_live_api_request_unref0 (req);
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 11078 "RajcePublishing.c"
+#line 11092 "RajcePublishing.c"
 }
 
 
 PublishingRajceGetCategoriesTransaction* publishing_rajce_get_categories_transaction_new (PublishingRajceSession* session, const gchar* url) {
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_get_categories_transaction_construct (PUBLISHING_RAJCE_TYPE_GET_CATEGORIES_TRANSACTION, session, url);
-#line 11085 "RajcePublishing.c"
+#line 11099 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_get_categories_transaction_class_init (PublishingRajceGetCategoriesTransactionClass * klass) {
-#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_get_categories_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11092 "RajcePublishing.c"
+#line 11106 "RajcePublishing.c"
 }
 
 
@@ -11116,9 +11130,9 @@ GType publishing_rajce_get_categories_transaction_get_type (void) {
 
 
 static void _g_free0_ (gpointer var) {
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	var = (g_free (var), NULL);
-#line 11118 "RajcePublishing.c"
+#line 11132 "RajcePublishing.c"
 }
 
 
@@ -11187,253 +11201,253 @@ PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_const
 	gchar* _tmp53_ = NULL;
 	const gchar* _tmp54_ = NULL;
 	gchar* _tmp55_ = NULL;
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_SESSION (session), NULL);
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_RAJCE_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp0_ = session;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp1_ = publishable;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp2_ = url;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	self = (PublishingRajceAddPhotoTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
 #line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	self = (PublishingRajceAddPhotoTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
+#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp3_ = parameters;
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp4_ = _publishing_rajce_publishing_parameters_ref0 (_tmp3_);
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_publishing_parameters_unref0 (self->priv->parameters);
-#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->parameters = _tmp4_;
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp6_ = parameters;
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp7_ = _tmp6_->album_id;
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if ((*_tmp7_) > 0) {
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp5_ = "";
-#line 11219 "RajcePublishing.c"
+#line 11233 "RajcePublishing.c"
 	} else {
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp5_ = " new";
-#line 11223 "RajcePublishing.c"
+#line 11237 "RajcePublishing.c"
 	}
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp8_ = publishable;
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp9_ = spit_publishing_publishable_get_serialized_file (_tmp8_);
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp11_ = g_file_get_basename (_tmp10_);
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp12_ = _tmp11_;
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp13_ = parameters;
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp14_ = _tmp13_->album_name;
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_debug ("RajcePublishing.vala:1523: RajcePlugin: Uploading photo %s to%s album " \
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	g_debug ("RajcePublishing.vala:1524: RajcePlugin: Uploading photo %s to%s album " \
 "%s", _tmp12_, _tmp5_, _tmp14_);
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (_tmp12_);
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_object_unref0 (_tmp10_);
-#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp15_ = publishable;
-#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp16_ = spit_publishing_publishable_get_param_string (_tmp15_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	basename = _tmp16_;
 #line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	basename = _tmp16_;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp17_ = publishable;
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp18_ = spit_publishing_publishable_get_param_string (_tmp17_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
-#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	comment = _tmp18_;
 #line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	comment = _tmp18_;
+#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp19_ = publishable;
-#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp20_ = spit_publishing_publishable_get_publishing_name (_tmp19_);
-#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	pubname = _tmp20_;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp21_ = session;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp22_ = publishing_rajce_session_get_maxsize (_tmp21_);
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	width = _tmp22_;
 #line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	width = _tmp22_;
+#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp23_ = session;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp24_ = publishing_rajce_session_get_maxsize (_tmp23_);
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	height = _tmp24_;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp25_ = publishing_rajce_live_api_request_new ("addPhoto");
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	req = _tmp25_;
 #line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	req = _tmp25_;
+#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp26_ = req;
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp27_ = session;
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp28_ = publishing_rajce_session_get_usertoken (_tmp27_);
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp29_ = _tmp28_;
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (_tmp26_, "token", _tmp29_);
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp29_);
 #line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (_tmp29_);
+#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp30_ = req;
-#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp31_ = width;
-#line 1534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParamInt (_tmp30_, "width", _tmp31_);
 #line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_live_api_request_AddParamInt (_tmp30_, "width", _tmp31_);
+#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp32_ = req;
-#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp33_ = height;
-#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParamInt (_tmp32_, "height", _tmp33_);
 #line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_live_api_request_AddParamInt (_tmp32_, "height", _tmp33_);
+#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp34_ = req;
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp35_ = session;
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp36_ = publishing_rajce_session_get_albumtoken (_tmp35_);
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp37_ = _tmp36_;
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_live_api_request_AddParam (_tmp34_, "albumToken", _tmp37_);
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	_g_free0 (_tmp37_);
 #line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	_g_free0 (_tmp37_);
+#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp38_ = req;
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp39_ = pubname;
-#line 1537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (_tmp38_, "photoName", _tmp39_);
 #line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_live_api_request_AddParam (_tmp38_, "photoName", _tmp39_);
+#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp40_ = req;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp41_ = basename;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (_tmp40_, "fullFileName", _tmp41_);
 #line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_live_api_request_AddParam (_tmp40_, "fullFileName", _tmp41_);
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp43_ = comment;
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	if (_tmp43_ != NULL) {
-#line 11331 "RajcePublishing.c"
+#line 11345 "RajcePublishing.c"
 		const gchar* _tmp44_ = NULL;
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp44_ = comment;
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp42_ = _tmp44_;
-#line 11337 "RajcePublishing.c"
+#line 11351 "RajcePublishing.c"
 	} else {
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 		_tmp42_ = "";
-#line 11341 "RajcePublishing.c"
+#line 11355 "RajcePublishing.c"
 	}
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp45_ = req;
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	publishing_rajce_live_api_request_AddParam (_tmp45_, "description", _tmp42_);
 #line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	publishing_rajce_live_api_request_AddParam (_tmp45_, "description", _tmp42_);
+#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp46_ = req;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp47_ = publishing_rajce_live_api_request_Params2XmlString (_tmp46_, FALSE);
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	xml = _tmp47_;
 #line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	xml = _tmp47_;
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data", xml);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp48_ = g_str_hash;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp49_ = g_str_equal;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp50_ = g_hash_table_new_full (_tmp48_, _tmp49_, _g_free0_, _g_free0_);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	disposition_table = _tmp50_;
 #line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	disposition_table = _tmp50_;
+#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp51_ = g_strdup ("name");
-#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp52_ = g_strdup ("photo");
-#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_hash_table_insert (disposition_table, _tmp51_, _tmp52_);
 #line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	g_hash_table_insert (disposition_table, _tmp51_, _tmp52_);
+#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp53_ = g_strdup ("filename");
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp54_ = basename;
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_tmp55_ = soup_uri_encode (_tmp54_, NULL);
-#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
-	g_hash_table_insert (disposition_table, _tmp53_, _tmp55_);
 #line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+	g_hash_table_insert (disposition_table, _tmp53_, _tmp55_);
+#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), disposition_table);
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_hash_table_unref0 (disposition_table);
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (xml);
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_live_api_request_unref0 (req);
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (pubname);
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (comment);
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_g_free0 (basename);
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return self;
-#line 11393 "RajcePublishing.c"
+#line 11407 "RajcePublishing.c"
 }
 
 
 PublishingRajceAddPhotoTransaction* publishing_rajce_add_photo_transaction_new (PublishingRajceSession* session, const gchar* url, PublishingRajcePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	return publishing_rajce_add_photo_transaction_construct (PUBLISHING_RAJCE_TYPE_ADD_PHOTO_TRANSACTION, session, url, parameters, publishable);
-#line 11400 "RajcePublishing.c"
+#line 11414 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_add_photo_transaction_class_init (PublishingRajceAddPhotoTransactionClass * klass) {
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	publishing_rajce_add_photo_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rajce_add_photo_transaction_finalize;
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRajceAddPhotoTransactionPrivate));
-#line 11411 "RajcePublishing.c"
+#line 11425 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_add_photo_transaction_instance_init (PublishingRajceAddPhotoTransaction * self) {
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv = PUBLISHING_RAJCE_ADD_PHOTO_TRANSACTION_GET_PRIVATE (self);
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self->priv->parameters = NULL;
-#line 11420 "RajcePublishing.c"
+#line 11434 "RajcePublishing.c"
 }
 
 
 static void publishing_rajce_add_photo_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingRajceAddPhotoTransaction * self;
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_RAJCE_TYPE_ADD_PHOTO_TRANSACTION, PublishingRajceAddPhotoTransaction);
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	_publishing_rajce_publishing_parameters_unref0 (self->priv->parameters);
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rajce_add_photo_transaction_parent_class)->finalize (obj);
-#line 11432 "RajcePublishing.c"
+#line 11446 "RajcePublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.vala b/plugins/shotwell-publishing-extras/RajcePublishing.vala
index b304f13..a088274 100644
--- a/plugins/shotwell-publishing-extras/RajcePublishing.vala
+++ b/plugins/shotwell-publishing-extras/RajcePublishing.vala
@@ -852,7 +852,7 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object
             builder.add_from_resource (Resources.RESOURCE_PATH +
                     "/rajce_authentication_pane.ui");
             builder.connect_signals(null);
-            Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment;
+            var content = builder.get_object ("content") as Gtk.Box;
             Gtk.Label message_label = builder.get_object("message_label") as Gtk.Label;
             switch (mode)
 			{
@@ -897,7 +897,8 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object
             username_entry.changed.connect(on_user_changed);
             password_entry.changed.connect(on_password_changed);
             login_button.clicked.connect(on_login_button_clicked);
-            align.reparent(pane_widget);
+            content.parent.remove (content);
+            pane_widget.add (content);
             publisher.get_host().set_dialog_default_widget(login_button);
         }
 		catch (Error e)
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c
index 18bf8ce..0127984 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.c
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c
@@ -2364,11 +2364,11 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
 	gint _key_value_pairs_size_ = 0;
 	gchar** _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-	gboolean _tmp24_ = FALSE;
-	const gchar* _tmp25_ = NULL;
-	PublishingTumblrTumblrPublisherSession* _tmp31_ = NULL;
-	const gchar* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
+	gboolean _tmp25_ = FALSE;
+	const gchar* _tmp26_ = NULL;
+	PublishingTumblrTumblrPublisherSession* _tmp33_ = NULL;
+	const gchar* _tmp34_ = NULL;
+	const gchar* _tmp35_ = NULL;
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (self));
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2425,9 +2425,9 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
 				gint _split_pair_size_ = 0;
 				gchar** _tmp9_ = NULL;
 				gint _tmp9__length1 = 0;
-				gchar** _tmp14_ = NULL;
-				gint _tmp14__length1 = 0;
-				const gchar* _tmp15_ = NULL;
+				gchar** _tmp15_ = NULL;
+				gint _tmp15__length1 = 0;
+				const gchar* _tmp16_ = NULL;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp6_ = pair;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2447,139 +2447,145 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
 #line 2444 "TumblrPublishing.c"
 					SpitPublishingPluginHost* _tmp10_ = NULL;
 					const gchar* _tmp11_ = NULL;
-					GError* _tmp12_ = NULL;
+					const gchar* _tmp12_ = NULL;
 					GError* _tmp13_ = NULL;
+					GError* _tmp14_ = NULL;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp10_ = self->priv->host;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp11_ = _ ("“%s” isn’t a valid response to an OAuth authentication request");
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp12_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp11_);
+					_tmp12_ = response;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp13_ = _tmp12_;
+					_tmp13_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp11_, _tmp12_);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					spit_publishing_plugin_host_post_error (_tmp10_, _tmp13_);
+					_tmp14_ = _tmp13_;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_g_error_free0 (_tmp13_);
-#line 2461 "TumblrPublishing.c"
+					spit_publishing_plugin_host_post_error (_tmp10_, _tmp14_);
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+					_g_error_free0 (_tmp14_);
+#line 2464 "TumblrPublishing.c"
 				}
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14_ = split_pair;
+				_tmp15_ = split_pair;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp14__length1 = split_pair_length1;
+				_tmp15__length1 = split_pair_length1;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_tmp15_ = _tmp14_[0];
+				_tmp16_ = _tmp15_[0];
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				if (g_strcmp0 (_tmp15_, "oauth_token") == 0) {
-#line 2471 "TumblrPublishing.c"
-					gchar** _tmp16_ = NULL;
-					gint _tmp16__length1 = 0;
-					const gchar* _tmp17_ = NULL;
-					gchar* _tmp18_ = NULL;
+				if (g_strcmp0 (_tmp16_, "oauth_token") == 0) {
+#line 2474 "TumblrPublishing.c"
+					gchar** _tmp17_ = NULL;
+					gint _tmp17__length1 = 0;
+					const gchar* _tmp18_ = NULL;
+					gchar* _tmp19_ = NULL;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp16_ = split_pair;
+					_tmp17_ = split_pair;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp16__length1 = split_pair_length1;
+					_tmp17__length1 = split_pair_length1;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp17_ = _tmp16_[1];
+					_tmp18_ = _tmp17_[1];
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp18_ = g_strdup (_tmp17_);
+					_tmp19_ = g_strdup (_tmp18_);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_g_free0 (oauth_token);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					oauth_token = _tmp18_;
-#line 2488 "TumblrPublishing.c"
+					oauth_token = _tmp19_;
+#line 2491 "TumblrPublishing.c"
 				} else {
-					gchar** _tmp19_ = NULL;
-					gint _tmp19__length1 = 0;
-					const gchar* _tmp20_ = NULL;
+					gchar** _tmp20_ = NULL;
+					gint _tmp20__length1 = 0;
+					const gchar* _tmp21_ = NULL;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp19_ = split_pair;
+					_tmp20_ = split_pair;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp19__length1 = split_pair_length1;
+					_tmp20__length1 = split_pair_length1;
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp20_ = _tmp19_[0];
+					_tmp21_ = _tmp20_[0];
 #line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					if (g_strcmp0 (_tmp20_, "oauth_token_secret") == 0) {
-#line 2501 "TumblrPublishing.c"
-						gchar** _tmp21_ = NULL;
-						gint _tmp21__length1 = 0;
-						const gchar* _tmp22_ = NULL;
-						gchar* _tmp23_ = NULL;
+					if (g_strcmp0 (_tmp21_, "oauth_token_secret") == 0) {
+#line 2504 "TumblrPublishing.c"
+						gchar** _tmp22_ = NULL;
+						gint _tmp22__length1 = 0;
+						const gchar* _tmp23_ = NULL;
+						gchar* _tmp24_ = NULL;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp21_ = split_pair;
+						_tmp22_ = split_pair;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp21__length1 = split_pair_length1;
+						_tmp22__length1 = split_pair_length1;
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp22_ = _tmp21_[1];
+						_tmp23_ = _tmp22_[1];
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						_tmp23_ = g_strdup (_tmp22_);
+						_tmp24_ = g_strdup (_tmp23_);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 						_g_free0 (oauth_token_secret);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-						oauth_token_secret = _tmp23_;
-#line 2518 "TumblrPublishing.c"
+						oauth_token_secret = _tmp24_;
+#line 2521 "TumblrPublishing.c"
 					}
 				}
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				split_pair = (_vala_array_free (split_pair, split_pair_length1, (GDestroyNotify) g_free), NULL);
 #line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_free0 (pair);
-#line 2525 "TumblrPublishing.c"
+#line 2528 "TumblrPublishing.c"
 			}
 		}
 	}
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp25_ = oauth_token;
+	_tmp26_ = oauth_token;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp25_ == NULL) {
+	if (_tmp26_ == NULL) {
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = TRUE;
-#line 2535 "TumblrPublishing.c"
+		_tmp25_ = TRUE;
+#line 2538 "TumblrPublishing.c"
 	} else {
-		const gchar* _tmp26_ = NULL;
+		const gchar* _tmp27_ = NULL;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp26_ = oauth_token_secret;
+		_tmp27_ = oauth_token_secret;
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp24_ = _tmp26_ == NULL;
-#line 2542 "TumblrPublishing.c"
+		_tmp25_ = _tmp27_ == NULL;
+#line 2545 "TumblrPublishing.c"
 	}
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	if (_tmp24_) {
-#line 2546 "TumblrPublishing.c"
-		SpitPublishingPluginHost* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		GError* _tmp29_ = NULL;
-		GError* _tmp30_ = NULL;
+	if (_tmp25_) {
+#line 2549 "TumblrPublishing.c"
+		SpitPublishingPluginHost* _tmp28_ = NULL;
+		const gchar* _tmp29_ = NULL;
+		const gchar* _tmp30_ = NULL;
+		GError* _tmp31_ = NULL;
+		GError* _tmp32_ = NULL;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp27_ = self->priv->host;
+		_tmp28_ = self->priv->host;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp28_ = _ ("“%s” isn’t a valid response to an OAuth authentication request");
+		_tmp29_ = _ ("“%s” isn’t a valid response to an OAuth authentication request");
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp29_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp28_);
+		_tmp30_ = response;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = _tmp29_;
+		_tmp31_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp29_, _tmp30_);
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp27_, _tmp30_);
+		_tmp32_ = _tmp31_;
 #line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_error_free0 (_tmp30_);
-#line 2563 "TumblrPublishing.c"
+		spit_publishing_plugin_host_post_error (_tmp28_, _tmp32_);
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		_g_error_free0 (_tmp32_);
+#line 2569 "TumblrPublishing.c"
 	}
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp31_ = self->priv->session;
+	_tmp33_ = self->priv->session;
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp32_ = oauth_token;
+	_tmp34_ = oauth_token;
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp33_ = oauth_token_secret;
+	_tmp35_ = oauth_token_secret;
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (_tmp31_, _tmp32_, _tmp33_);
+	publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (_tmp33_, _tmp34_, _tmp35_);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	key_value_pairs = (_vala_array_free (key_value_pairs, key_value_pairs_length1, (GDestroyNotify) g_free), NULL);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (oauth_token_secret);
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (oauth_token);
-#line 2579 "TumblrPublishing.c"
+#line 2585 "TumblrPublishing.c"
 }
 
 
@@ -2599,7 +2605,7 @@ static void publishing_tumblr_tumblr_publisher_on_session_authenticated (Publish
 	if (!_tmp0_) {
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2599 "TumblrPublishing.c"
+#line 2605 "TumblrPublishing.c"
 	}
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:332: EVENT: a fully authenticated session has be" \
@@ -2626,21 +2632,21 @@ static void publishing_tumblr_tumblr_publisher_on_session_authenticated (Publish
 	_g_free0 (_tmp6_);
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_do_get_blogs (self);
-#line 2625 "TumblrPublishing.c"
+#line 2631 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_info_request_txn_completed ((PublishingTumblrTumblrPublisher*) self, _sender);
-#line 2632 "TumblrPublishing.c"
+#line 2638 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_info_request_txn_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 2639 "TumblrPublishing.c"
+#line 2645 "TumblrPublishing.c"
 }
 
 
@@ -2663,7 +2669,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_tumblr_tumblr_publisher_on_info_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2662 "TumblrPublishing.c"
+#line 2668 "TumblrPublishing.c"
 	{
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2671,7 +2677,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2670 "TumblrPublishing.c"
+#line 2676 "TumblrPublishing.c"
 				goto __catch33_spit_publishing_publishing_error;
 			}
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2682,7 +2688,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 			g_clear_error (&_inner_error_);
 #line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 2681 "TumblrPublishing.c"
+#line 2687 "TumblrPublishing.c"
 		}
 	}
 	goto __finally33;
@@ -2703,7 +2709,7 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 		spit_publishing_plugin_host_post_error (_tmp2_, _tmp3_);
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_error_free0 (err);
-#line 2702 "TumblrPublishing.c"
+#line 2708 "TumblrPublishing.c"
 	}
 	__finally33:
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2716,11 +2722,11 @@ static void publishing_tumblr_tumblr_publisher_do_get_blogs (PublishingTumblrTum
 		g_clear_error (&_inner_error_);
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2715 "TumblrPublishing.c"
+#line 2721 "TumblrPublishing.c"
 	}
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 2719 "TumblrPublishing.c"
+#line 2725 "TumblrPublishing.c"
 }
 
 
@@ -2758,7 +2764,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (Pu
 	if (!_tmp4_) {
 #line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 2757 "TumblrPublishing.c"
+#line 2763 "TumblrPublishing.c"
 	}
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = txn;
@@ -2783,14 +2789,14 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_completed (Pu
 	_g_free0 (_tmp10_);
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (self);
-#line 2781 "TumblrPublishing.c"
+#line 2787 "TumblrPublishing.c"
 }
 
 
 static gpointer _json_object_ref0 (gpointer self) {
 #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? json_object_ref (self) : NULL;
-#line 2788 "TumblrPublishing.c"
+#line 2794 "TumblrPublishing.c"
 }
 
 
@@ -2803,7 +2809,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 2801 "TumblrPublishing.c"
+#line 2807 "TumblrPublishing.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -2834,7 +2840,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2832 "TumblrPublishing.c"
+#line 2838 "TumblrPublishing.c"
 				goto __catch35_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2843,7 +2849,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2841 "TumblrPublishing.c"
+#line 2847 "TumblrPublishing.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -2859,7 +2865,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2857 "TumblrPublishing.c"
+#line 2863 "TumblrPublishing.c"
 				goto __catch35_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2870,7 +2876,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2868 "TumblrPublishing.c"
+#line 2874 "TumblrPublishing.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -2884,7 +2890,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2882 "TumblrPublishing.c"
+#line 2888 "TumblrPublishing.c"
 	}
 	goto __finally35;
 	__catch35_g_regex_error:
@@ -2898,7 +2904,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 2896 "TumblrPublishing.c"
+#line 2902 "TumblrPublishing.c"
 	}
 	__finally35:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2909,7 +2915,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 2907 "TumblrPublishing.c"
+#line 2913 "TumblrPublishing.c"
 	}
 }
 
@@ -2921,13 +2927,13 @@ static void _vala_array_add21 (PublishingTumblrBlogEntry*** array, int* length,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*array = g_renew (PublishingTumblrBlogEntry*, *array, (*size) + 1);
-#line 2919 "TumblrPublishing.c"
+#line 2925 "TumblrPublishing.c"
 	}
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 2925 "TumblrPublishing.c"
+#line 2931 "TumblrPublishing.c"
 }
 
 
@@ -2943,7 +2949,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:370: ACTION: parsing info request response '%s' " \
 "into list of available blogs", _tmp0_);
-#line 2940 "TumblrPublishing.c"
+#line 2946 "TumblrPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp1_ = NULL;
@@ -2975,7 +2981,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2972 "TumblrPublishing.c"
+#line 2978 "TumblrPublishing.c"
 			goto __catch34_g_error;
 		}
 #line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3014,7 +3020,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 		_tmp15_ = json_object_get_array_member (_tmp14_, "blogs");
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp16_ = json_array_get_elements (_tmp15_);
-#line 3011 "TumblrPublishing.c"
+#line 3017 "TumblrPublishing.c"
 		{
 			GList* blognode_collection = NULL;
 			GList* blognode_it = NULL;
@@ -3022,11 +3028,11 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 			blognode_collection = _tmp16_;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			for (blognode_it = blognode_collection; blognode_it != NULL; blognode_it = blognode_it->next) {
-#line 3019 "TumblrPublishing.c"
+#line 3025 "TumblrPublishing.c"
 				JsonNode* blognode = NULL;
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				blognode = (JsonNode*) blognode_it->data;
-#line 3023 "TumblrPublishing.c"
+#line 3029 "TumblrPublishing.c"
 				{
 					JsonObject* blog = NULL;
 					JsonNode* _tmp17_ = NULL;
@@ -3106,18 +3112,18 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 					_g_free0 (name);
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_json_object_unref0 (blog);
-#line 3103 "TumblrPublishing.c"
+#line 3109 "TumblrPublishing.c"
 				}
 			}
 #line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_list_free0 (blognode_collection);
-#line 3108 "TumblrPublishing.c"
+#line 3114 "TumblrPublishing.c"
 		}
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_json_object_unref0 (root_object);
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (parser);
-#line 3114 "TumblrPublishing.c"
+#line 3120 "TumblrPublishing.c"
 	}
 	goto __finally34;
 	__catch34_g_error:
@@ -3137,7 +3143,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 		spit_publishing_plugin_host_post_error (_tmp35_, _tmp36_);
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_error_free0 (err);
-#line 3134 "TumblrPublishing.c"
+#line 3140 "TumblrPublishing.c"
 	}
 	__finally34:
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3148,7 +3154,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_user_req
 		g_clear_error (&_inner_error_);
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3145 "TumblrPublishing.c"
+#line 3151 "TumblrPublishing.c"
 	}
 }
 
@@ -3184,7 +3190,7 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis
 	if (!_tmp4_) {
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3181 "TumblrPublishing.c"
+#line 3187 "TumblrPublishing.c"
 	}
 #line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = self->priv->session;
@@ -3201,21 +3207,21 @@ static void publishing_tumblr_tumblr_publisher_on_info_request_txn_error (Publis
 	_tmp7_ = err;
 #line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp6_, _tmp7_);
-#line 3197 "TumblrPublishing.c"
+#line 3203 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publish ((PublishingTumblrTumblrPublisher*) self);
-#line 3204 "TumblrPublishing.c"
+#line 3210 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout ((PublishingTumblrTumblrPublisher*) self);
-#line 3211 "TumblrPublishing.c"
+#line 3217 "TumblrPublishing.c"
 }
 
 
@@ -3267,7 +3273,7 @@ static void publishing_tumblr_tumblr_publisher_do_show_publishing_options_pane (
 	spit_publishing_plugin_host_install_dialog_pane (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_object_unref0 (publishing_options_pane);
-#line 3263 "TumblrPublishing.c"
+#line 3269 "TumblrPublishing.c"
 }
 
 
@@ -3280,7 +3286,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis
 	_tmp0_ = self->priv->publishing_options_pane;
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 3276 "TumblrPublishing.c"
+#line 3282 "TumblrPublishing.c"
 		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_ = NULL;
@@ -3297,7 +3303,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis
 		g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
-#line 3293 "TumblrPublishing.c"
+#line 3299 "TumblrPublishing.c"
 	}
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
@@ -3305,14 +3311,14 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_publis
 	if (!_tmp5_) {
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3301 "TumblrPublishing.c"
+#line 3307 "TumblrPublishing.c"
 	}
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:424: EVENT: user clicked the 'Publish' button in" \
 " the publishing options pane");
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_do_publish (self);
-#line 3307 "TumblrPublishing.c"
+#line 3313 "TumblrPublishing.c"
 }
 
 
@@ -3325,7 +3331,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout
 	_tmp0_ = self->priv->publishing_options_pane;
 #line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 3320 "TumblrPublishing.c"
+#line 3326 "TumblrPublishing.c"
 		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		PublishingTumblrTumblrPublisherPublishingOptionsPane* _tmp3_ = NULL;
@@ -3342,7 +3348,7 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout
 		g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp4_, NULL, FALSE);
 #line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
-#line 3337 "TumblrPublishing.c"
+#line 3343 "TumblrPublishing.c"
 	}
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
@@ -3350,14 +3356,14 @@ static void publishing_tumblr_tumblr_publisher_on_publishing_options_pane_logout
 	if (!_tmp5_) {
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3345 "TumblrPublishing.c"
+#line 3351 "TumblrPublishing.c"
 	}
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:437: EVENT: user clicked the 'Logout' button in " \
 "the publishing options pane");
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_do_logout (self);
-#line 3351 "TumblrPublishing.c"
+#line 3357 "TumblrPublishing.c"
 }
 
 
@@ -3399,7 +3405,7 @@ gint publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func (SpitPubli
 	result = _tmp7_;
 #line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 3393 "TumblrPublishing.c"
+#line 3399 "TumblrPublishing.c"
 }
 
 
@@ -3408,28 +3414,28 @@ static gint _publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func_gc
 	result = publishing_tumblr_tumblr_publisher_tumblr_date_time_compare_func ((SpitPublishingPublishable*) a, (SpitPublishingPublishable*) b);
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 3402 "TumblrPublishing.c"
+#line 3408 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_upload_complete ((PublishingTumblrTumblrPublisher*) self, _sender, num_photos_published);
-#line 3409 "TumblrPublishing.c"
+#line 3415 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_upload_error ((PublishingTumblrTumblrPublisher*) self, _sender, err);
-#line 3416 "TumblrPublishing.c"
+#line 3422 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_on_upload_status_updated ((PublishingTumblrTumblrPublisher*) self, file_number, fraction_complete);
-#line 3423 "TumblrPublishing.c"
+#line 3429 "TumblrPublishing.c"
 }
 
 
@@ -3519,7 +3525,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 	if (!_tmp9_) {
 #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3512 "TumblrPublishing.c"
+#line 3518 "TumblrPublishing.c"
 	}
 #line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp10_ = self->priv->host;
@@ -3539,7 +3545,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 	_tmp14_ = publishables;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp14__length1 = publishables_length1;
-#line 3532 "TumblrPublishing.c"
+#line 3538 "TumblrPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
@@ -3551,14 +3557,14 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 		p_collection_length1 = _tmp14__length1;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) {
-#line 3544 "TumblrPublishing.c"
+#line 3550 "TumblrPublishing.c"
 			SpitPublishingPublishable* _tmp15_ = NULL;
 			SpitPublishingPublishable* p = NULL;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp15_ = _g_object_ref0 (p_collection[p_it]);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			p = _tmp15_;
-#line 3551 "TumblrPublishing.c"
+#line 3557 "TumblrPublishing.c"
 			{
 				GeeArrayList* _tmp16_ = NULL;
 				SpitPublishingPublishable* _tmp17_ = NULL;
@@ -3572,7 +3578,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_object_unref0 (p);
-#line 3565 "TumblrPublishing.c"
+#line 3571 "TumblrPublishing.c"
 			}
 		}
 	}
@@ -3634,7 +3640,7 @@ static void publishing_tumblr_tumblr_publisher_do_publish (PublishingTumblrTumbl
 	_g_object_unref0 (sorted_list);
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3627 "TumblrPublishing.c"
+#line 3633 "TumblrPublishing.c"
 }
 
 
@@ -3653,7 +3659,7 @@ static void publishing_tumblr_tumblr_publisher_do_show_success_pane (PublishingT
 	_tmp1_ = self->priv->host;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 3646 "TumblrPublishing.c"
+#line 3652 "TumblrPublishing.c"
 }
 
 
@@ -3674,7 +3680,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (Publish
 	if (!_tmp0_) {
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3667 "TumblrPublishing.c"
+#line 3673 "TumblrPublishing.c"
 	}
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = completed_fraction;
@@ -3697,7 +3703,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_status_updated (Publish
 	_tmp5_ = completed_fraction;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 3689 "TumblrPublishing.c"
+#line 3695 "TumblrPublishing.c"
 }
 
 
@@ -3718,7 +3724,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTum
 	if (!_tmp0_) {
 #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3710 "TumblrPublishing.c"
+#line 3716 "TumblrPublishing.c"
 	}
 #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = num_published;
@@ -3739,7 +3745,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_complete (PublishingTum
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_do_show_success_pane (self);
-#line 3730 "TumblrPublishing.c"
+#line 3736 "TumblrPublishing.c"
 }
 
 
@@ -3763,7 +3769,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblr
 	if (!_tmp0_) {
 #line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3754 "TumblrPublishing.c"
+#line 3760 "TumblrPublishing.c"
 	}
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = err;
@@ -3790,7 +3796,7 @@ static void publishing_tumblr_tumblr_publisher_on_upload_error (PublishingTumblr
 	_tmp8_ = err;
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 3780 "TumblrPublishing.c"
+#line 3786 "TumblrPublishing.c"
 }
 
 
@@ -3811,7 +3817,7 @@ static void publishing_tumblr_tumblr_publisher_do_logout (PublishingTumblrTumblr
 	self->priv->running = FALSE;
 #line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_attempt_start (self);
-#line 3800 "TumblrPublishing.c"
+#line 3806 "TumblrPublishing.c"
 }
 
 
@@ -3826,7 +3832,7 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub
 	if (_tmp0_) {
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3815 "TumblrPublishing.c"
+#line 3821 "TumblrPublishing.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:539: TumblrPublisher: starting interaction.");
@@ -3836,7 +3842,7 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub
 	_tmp1_ = publishing_tumblr_tumblr_publisher_is_persistent_session_valid (self);
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp1_) {
-#line 3825 "TumblrPublishing.c"
+#line 3831 "TumblrPublishing.c"
 		PublishingTumblrTumblrPublisherSession* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -3861,14 +3867,14 @@ void publishing_tumblr_tumblr_publisher_attempt_start (PublishingTumblrTumblrPub
 		_g_free0 (_tmp6_);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (_tmp4_);
-#line 3849 "TumblrPublishing.c"
+#line 3855 "TumblrPublishing.c"
 	} else {
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_debug ("TumblrPublishing.vala:548: attempt start: no persistent session availa" \
 "ble; showing login welcome pane");
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_tumblr_publisher_do_show_authentication_pane (self, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO);
-#line 3855 "TumblrPublishing.c"
+#line 3861 "TumblrPublishing.c"
 	}
 }
 
@@ -3885,26 +3891,26 @@ static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublish
 	if (_tmp0_) {
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return;
-#line 3872 "TumblrPublishing.c"
+#line 3878 "TumblrPublishing.c"
 	}
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = self->priv->was_started;
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp1_) {
-#line 3878 "TumblrPublishing.c"
+#line 3884 "TumblrPublishing.c"
 		const gchar* _tmp2_ = NULL;
 #line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp2_ = _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \
 "ble.");
 #line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_error ("TumblrPublishing.vala:559: %s", _tmp2_);
-#line 3884 "TumblrPublishing.c"
+#line 3890 "TumblrPublishing.c"
 	}
 #line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_debug ("TumblrPublishing.vala:561: TumblrPublisher: starting interaction.");
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_attempt_start (self);
-#line 3890 "TumblrPublishing.c"
+#line 3896 "TumblrPublishing.c"
 }
 
 
@@ -3916,7 +3922,7 @@ static void publishing_tumblr_tumblr_publisher_real_stop (SpitPublishingPublishe
 	g_debug ("TumblrPublishing.vala:567: TumblrPublisher: stop( ) invoked.");
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->running = FALSE;
-#line 3902 "TumblrPublishing.c"
+#line 3908 "TumblrPublishing.c"
 }
 
 
@@ -3935,21 +3941,21 @@ GType publishing_tumblr_tumblr_publisher_authentication_pane_mode_get_type (void
 static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed ((PublishingTumblrTumblrPublisherAuthenticationPane*) self);
-#line 3921 "TumblrPublishing.c"
+#line 3927 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed ((PublishingTumblrTumblrPublisherAuthenticationPane*) self);
-#line 3928 "TumblrPublishing.c"
+#line 3934 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked ((PublishingTumblrTumblrPublisherAuthenticationPane*) self);
-#line 3935 "TumblrPublishing.c"
+#line 3941 "TumblrPublishing.c"
 }
 
 
@@ -3969,15 +3975,15 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 	_g_object_unref0 (self->priv->pane_widget);
 #line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->pane_widget = _tmp0_;
-#line 3955 "TumblrPublishing.c"
+#line 3961 "TumblrPublishing.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
 		GtkBuilder* _tmp2_ = NULL;
 		GtkBuilder* _tmp3_ = NULL;
-		GtkAlignment* align = NULL;
+		GtkWidget* content = NULL;
 		GtkBuilder* _tmp4_ = NULL;
 		GObject* _tmp5_ = NULL;
-		GtkAlignment* _tmp6_ = NULL;
+		GtkWidget* _tmp6_ = NULL;
 		GtkLabel* message_label = NULL;
 		GtkBuilder* _tmp7_ = NULL;
 		GObject* _tmp8_ = NULL;
@@ -3995,12 +4001,16 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 		GtkEntry* _tmp27_ = NULL;
 		GtkEntry* _tmp28_ = NULL;
 		GtkButton* _tmp29_ = NULL;
-		GtkAlignment* _tmp30_ = NULL;
-		GtkBox* _tmp31_ = NULL;
-		PublishingTumblrTumblrPublisher* _tmp32_ = NULL;
-		SpitPublishingPluginHost* _tmp33_ = NULL;
-		SpitPublishingPluginHost* _tmp34_ = NULL;
-		GtkButton* _tmp35_ = NULL;
+		GtkWidget* _tmp30_ = NULL;
+		GtkContainer* _tmp31_ = NULL;
+		GtkContainer* _tmp32_ = NULL;
+		GtkWidget* _tmp33_ = NULL;
+		GtkBox* _tmp34_ = NULL;
+		GtkWidget* _tmp35_ = NULL;
+		PublishingTumblrTumblrPublisher* _tmp36_ = NULL;
+		SpitPublishingPluginHost* _tmp37_ = NULL;
+		SpitPublishingPluginHost* _tmp38_ = NULL;
+		GtkButton* _tmp39_ = NULL;
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1_ = gtk_builder_new ();
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4013,7 +4023,7 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/tumblr_authentication_pane.ui", &_inner_error_);
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3999 "TumblrPublishing.c"
+#line 4009 "TumblrPublishing.c"
 			goto __catch36_g_error;
 		}
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4023,11 +4033,11 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp4_ = self->priv->builder;
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp5_ = gtk_builder_get_object (_tmp4_, "alignment");
+		_tmp5_ = gtk_builder_get_object (_tmp4_, "content");
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp5_) : NULL);
+		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp5_) : NULL);
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		align = _tmp6_;
+		content = _tmp6_;
 #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp7_ = self->priv->builder;
 #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4042,7 +4052,7 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 		switch (_tmp10_) {
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_INTRO:
-#line 4028 "TumblrPublishing.c"
+#line 4038 "TumblrPublishing.c"
 			{
 				GtkLabel* _tmp11_ = NULL;
 				const gchar* _tmp12_ = NULL;
@@ -4054,11 +4064,11 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 				gtk_label_set_text (_tmp11_, _tmp12_);
 #line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				break;
-#line 4040 "TumblrPublishing.c"
+#line 4050 "TumblrPublishing.c"
 			}
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			case PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 4044 "TumblrPublishing.c"
+#line 4054 "TumblrPublishing.c"
 			{
 				GtkLabel* _tmp13_ = NULL;
 				const gchar* _tmp14_ = NULL;
@@ -4081,12 +4091,12 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 				_g_free0 (_tmp17_);
 #line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				break;
-#line 4067 "TumblrPublishing.c"
+#line 4077 "TumblrPublishing.c"
 			}
 			default:
 #line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			break;
-#line 4072 "TumblrPublishing.c"
+#line 4082 "TumblrPublishing.c"
 		}
 #line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp18_ = self->priv->builder;
@@ -4131,51 +4141,61 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_signal_connect_object (_tmp29_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp30_ = align;
+		_tmp30_ = content;
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp31_ = self->priv->pane_widget;
+		_tmp31_ = gtk_widget_get_parent (_tmp30_);
 #line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp32_ = publisher;
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp33_ = publishing_tumblr_tumblr_publisher_get_host (_tmp32_);
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp34_ = _tmp33_;
+		_tmp32_ = _tmp31_;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		_tmp33_ = content;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		gtk_container_remove (_tmp32_, _tmp33_);
 #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp35_ = self->priv->login_button;
+		_tmp34_ = self->priv->pane_widget;
 #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		spit_publishing_plugin_host_set_dialog_default_widget (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget));
+		_tmp35_ = content;
 #line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (_tmp34_);
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_container_get_type (), GtkContainer), _tmp35_);
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		_tmp36_ = publisher;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		_tmp37_ = publishing_tumblr_tumblr_publisher_get_host (_tmp36_);
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		_tmp38_ = _tmp37_;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		_tmp39_ = self->priv->login_button;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		spit_publishing_plugin_host_set_dialog_default_widget (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		_g_object_unref0 (_tmp38_);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (message_label);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_object_unref0 (align);
-#line 4138 "TumblrPublishing.c"
+		_g_object_unref0 (content);
+#line 4158 "TumblrPublishing.c"
 	}
 	goto __finally36;
 	__catch36_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp36_ = NULL;
-		GError* _tmp37_ = NULL;
-		const gchar* _tmp38_ = NULL;
+		const gchar* _tmp40_ = NULL;
+		GError* _tmp41_ = NULL;
+		const gchar* _tmp42_ = NULL;
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		e = _inner_error_;
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_inner_error_ = NULL;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp36_ = _ ("Could not load UI: %s");
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp37_ = e;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_tmp38_ = _tmp37_->message;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_warning (_tmp36_, _tmp38_);
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		_tmp40_ = _ ("Could not load UI: %s");
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		_tmp41_ = e;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		_tmp42_ = _tmp41_->message;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		g_warning (_tmp40_, _tmp42_);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_error_free0 (e);
-#line 4161 "TumblrPublishing.c"
+#line 4181 "TumblrPublishing.c"
 	}
 	__finally36:
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -4186,18 +4206,18 @@ PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publ
 		g_clear_error (&_inner_error_);
 #line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return NULL;
-#line 4172 "TumblrPublishing.c"
+#line 4192 "TumblrPublishing.c"
 	}
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 4176 "TumblrPublishing.c"
+#line 4196 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherAuthenticationPane* publishing_tumblr_tumblr_publisher_authentication_pane_new (PublishingTumblrTumblrPublisher* publisher, PublishingTumblrTumblrPublisherAuthenticationPaneMode mode) {
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_authentication_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 4183 "TumblrPublishing.c"
+#line 4203 "TumblrPublishing.c"
 }
 
 
@@ -4205,17 +4225,17 @@ GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_get_default_wi
 	GtkWidget* result = NULL;
 	GtkButton* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self), NULL);
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self), NULL);
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->login_button;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp1_;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4201 "TumblrPublishing.c"
+#line 4221 "TumblrPublishing.c"
 }
 
 
@@ -4224,37 +4244,37 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_on_login_butt
 	const gchar* _tmp1_ = NULL;
 	GtkEntry* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
 #line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->username_entry;
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = self->priv->password_entry;
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = gtk_entry_get_text (_tmp2_);
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_emit_by_name (self, "login", _tmp1_, _tmp3_);
-#line 4222 "TumblrPublishing.c"
+#line 4242 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_authentication_pane_on_user_changed (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
 #line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self);
-#line 4231 "TumblrPublishing.c"
+#line 4251 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_authentication_pane_on_password_changed (PublishingTumblrTumblrPublisherAuthenticationPane* self) {
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
 #line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self);
-#line 4240 "TumblrPublishing.c"
+#line 4260 "TumblrPublishing.c"
 }
 
 
@@ -4264,39 +4284,39 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_update_login_
 	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
 	GtkButton* _tmp7_ = NULL;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
 #line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_AUTHENTICATION_PANE (self));
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = self->priv->username_entry;
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp3_ > ((guint) 0)) {
-#line 4260 "TumblrPublishing.c"
+#line 4280 "TumblrPublishing.c"
 		GtkEntry* _tmp4_ = NULL;
 		guint _tmp5_ = 0U;
 		guint _tmp6_ = 0U;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp4_ = self->priv->password_entry;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp5_ = gtk_entry_get_text_length (_tmp4_);
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp6_ = _tmp5_;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = _tmp6_ > ((guint) 0);
-#line 4272 "TumblrPublishing.c"
+#line 4292 "TumblrPublishing.c"
 	} else {
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = FALSE;
-#line 4276 "TumblrPublishing.c"
+#line 4296 "TumblrPublishing.c"
 	}
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp7_ = self->priv->login_button;
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 4282 "TumblrPublishing.c"
+#line 4302 "TumblrPublishing.c"
 }
 
 
@@ -4305,30 +4325,30 @@ static GtkWidget* publishing_tumblr_tumblr_publisher_authentication_pane_real_ge
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
 #line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp1_;
-#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4301 "TumblrPublishing.c"
+#line 4321 "TumblrPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingTumblrTumblrPublisherAuthenticationPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
 #line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4314 "TumblrPublishing.c"
+#line 4334 "TumblrPublishing.c"
 }
 
 
@@ -4337,31 +4357,31 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_
 	GtkEntry* _tmp0_ = NULL;
 	GtkEntry* _tmp1_ = NULL;
 	GtkButton* _tmp2_ = NULL;
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
 #line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->username_entry;
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
 #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = self->priv->password_entry;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gtk_entry_set_activates_default (_tmp1_, TRUE);
 #line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	gtk_entry_set_activates_default (_tmp1_, TRUE);
+#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = self->priv->login_button;
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_update_login_button_sensitivity (self);
-#line 4339 "TumblrPublishing.c"
+#line 4359 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingTumblrTumblrPublisherAuthenticationPane * self;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_AUTHENTICATION_PANE, PublishingTumblrTumblrPublisherAuthenticationPane);
-#line 4347 "TumblrPublishing.c"
+#line 4367 "TumblrPublishing.c"
 }
 
 
@@ -4380,19 +4400,19 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING (GClosure * closure, GVa
 		data1 = closure->data;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4366 "TumblrPublishing.c"
+#line 4386 "TumblrPublishing.c"
 	} else {
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		data2 = closure->data;
-#line 4372 "TumblrPublishing.c"
+#line 4392 "TumblrPublishing.c"
 	}
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 4378 "TumblrPublishing.c"
+#line 4398 "TumblrPublishing.c"
 }
 
 
@@ -4421,7 +4441,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_class_init (P
 	_tmp3_ = g_strdup (_tmp2_);
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp3_;
-#line 4407 "TumblrPublishing.c"
+#line 4427 "TumblrPublishing.c"
 }
 
 
@@ -4436,7 +4456,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_spit_publishi
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_installed;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_authentication_pane_real_on_pane_uninstalled;
-#line 4422 "TumblrPublishing.c"
+#line 4442 "TumblrPublishing.c"
 }
 
 
@@ -4445,7 +4465,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_instance_init
 	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_AUTHENTICATION_PANE_GET_PRIVATE (self);
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 4431 "TumblrPublishing.c"
+#line 4451 "TumblrPublishing.c"
 }
 
 
@@ -4465,7 +4485,7 @@ static void publishing_tumblr_tumblr_publisher_authentication_pane_finalize (GOb
 	_g_object_unref0 (self->priv->login_button);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_authentication_pane_parent_class)->finalize (obj);
-#line 4451 "TumblrPublishing.c"
+#line 4471 "TumblrPublishing.c"
 }
 
 
@@ -4488,86 +4508,86 @@ GType publishing_tumblr_tumblr_publisher_authentication_pane_get_type (void) {
 
 
 static gpointer _publishing_tumblr_size_entry_ref0 (gpointer self) {
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? publishing_tumblr_size_entry_ref (self) : NULL;
-#line 4476 "TumblrPublishing.c"
+#line 4496 "TumblrPublishing.c"
 }
 
 
 static PublishingTumblrSizeEntry** _vala_array_dup7 (PublishingTumblrSizeEntry** self, int length) {
 	PublishingTumblrSizeEntry** result;
 	int i;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = g_new0 (PublishingTumblrSizeEntry*, length + 1);
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 4487 "TumblrPublishing.c"
+#line 4507 "TumblrPublishing.c"
 		PublishingTumblrSizeEntry* _tmp0_ = NULL;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = _publishing_tumblr_size_entry_ref0 (self[i]);
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		result[i] = _tmp0_;
-#line 4493 "TumblrPublishing.c"
+#line 4513 "TumblrPublishing.c"
 	}
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4497 "TumblrPublishing.c"
+#line 4517 "TumblrPublishing.c"
 }
 
 
 static gpointer _publishing_tumblr_blog_entry_ref0 (gpointer self) {
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? publishing_tumblr_blog_entry_ref (self) : NULL;
-#line 4504 "TumblrPublishing.c"
+#line 4524 "TumblrPublishing.c"
 }
 
 
 static PublishingTumblrBlogEntry** _vala_array_dup8 (PublishingTumblrBlogEntry** self, int length) {
 	PublishingTumblrBlogEntry** result;
 	int i;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = g_new0 (PublishingTumblrBlogEntry*, length + 1);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 4515 "TumblrPublishing.c"
+#line 4535 "TumblrPublishing.c"
 		PublishingTumblrBlogEntry* _tmp0_ = NULL;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = _publishing_tumblr_blog_entry_ref0 (self[i]);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		result[i] = _tmp0_;
-#line 4521 "TumblrPublishing.c"
+#line 4541 "TumblrPublishing.c"
 	}
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 4525 "TumblrPublishing.c"
+#line 4545 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4532 "TumblrPublishing.c"
+#line 4552 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4539 "TumblrPublishing.c"
+#line 4559 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4546 "TumblrPublishing.c"
+#line 4566 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 4553 "TumblrPublishing.c"
+#line 4573 "TumblrPublishing.c"
 }
 
 
@@ -4588,73 +4608,73 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
 	PublishingTumblrBlogEntry** _tmp9_ = NULL;
 	gint _tmp9__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_IS_TUMBLR_PUBLISHER (publisher), NULL);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (username != NULL, NULL);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = (PublishingTumblrTumblrPublisherPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_object_ref_sink (_tmp0_);
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->pane_widget = _tmp0_;
 #line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->pane_widget = _tmp0_;
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = username;
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->username = _tmp2_;
 #line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->username = _tmp2_;
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = publisher;
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->publisher = _tmp4_;
 #line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->publisher = _tmp4_;
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = media_type;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->media_type = _tmp5_;
 #line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->media_type = _tmp5_;
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp6_ = sizes;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp6__length1 = sizes_length1;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup7 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp7__length1 = _tmp6__length1;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->sizes = _tmp7_;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->sizes_length1 = _tmp7__length1;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_sizes_size_ = self->priv->sizes_length1;
 #line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->_sizes_size_ = self->priv->sizes_length1;
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp8_ = blogs;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp8__length1 = blogs_length1;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup8 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp9__length1 = _tmp8__length1;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->blogs = _tmp9_;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->blogs_length1 = _tmp9__length1;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->_blogs_size_ = self->priv->blogs_length1;
-#line 4640 "TumblrPublishing.c"
+#line 4660 "TumblrPublishing.c"
 	{
 		GtkBuilder* _tmp10_ = NULL;
 		GtkBuilder* _tmp11_ = NULL;
@@ -4693,162 +4713,162 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
 		SpitPublishingPublisherMediaType _tmp43_ = 0;
 		GtkButton* _tmp47_ = NULL;
 		GtkButton* _tmp48_ = NULL;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp10_ = gtk_builder_new ();
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (self->priv->builder);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->builder = _tmp10_;
 #line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		self->priv->builder = _tmp10_;
+#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp11_ = self->priv->builder;
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		gtk_builder_add_from_resource (_tmp11_, PLUGIN_RESOURCE_PATH "/tumblr_publishing_options_pane.ui", &_inner_error_);
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4691 "TumblrPublishing.c"
+#line 4711 "TumblrPublishing.c"
 			goto __catch37_g_error;
 		}
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp12_ = self->priv->builder;
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		gtk_builder_connect_signals (_tmp12_, NULL);
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp13_ = self->priv->builder;
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp14_ = gtk_builder_get_object (_tmp13_, "tumblr_pane");
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox));
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (self->priv->pane_widget);
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->pane_widget = _tmp15_;
 #line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		self->priv->pane_widget = _tmp15_;
+#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp16_ = self->priv->builder;
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp17_ = gtk_builder_get_object (_tmp16_, "upload_info_label");
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_label_get_type (), GtkLabel));
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (self->priv->upload_info_label);
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->upload_info_label = _tmp18_;
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		self->priv->upload_info_label = _tmp18_;
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp19_ = self->priv->builder;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp20_ = gtk_builder_get_object (_tmp19_, "logout_button");
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_button_get_type (), GtkButton));
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (self->priv->logout_button);
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->logout_button = _tmp21_;
 #line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		self->priv->logout_button = _tmp21_;
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp22_ = self->priv->builder;
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp23_ = gtk_builder_get_object (_tmp22_, "publish_button");
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (self->priv->publish_button);
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->publish_button = _tmp24_;
 #line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		self->priv->publish_button = _tmp24_;
+#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp25_ = self->priv->builder;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo");
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (self->priv->size_combo);
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->size_combo = _tmp27_;
 #line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		self->priv->size_combo = _tmp27_;
+#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp28_ = self->priv->builder;
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp29_ = gtk_builder_get_object (_tmp28_, "size_label");
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_label_get_type (), GtkLabel));
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (self->priv->size_label);
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->size_label = _tmp30_;
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		self->priv->size_label = _tmp30_;
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp31_ = self->priv->builder;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp32_ = gtk_builder_get_object (_tmp31_, "blog_combo");
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (self->priv->blog_combo);
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		self->priv->blog_combo = _tmp33_;
 #line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		self->priv->blog_combo = _tmp33_;
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp34_ = self->priv->builder;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp35_ = gtk_builder_get_object (_tmp34_, "blog_label");
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_label_get_type (), GtkLabel));
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (self->priv->blog_label);
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		self->priv->blog_label = _tmp36_;
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp37_ = _ ("You are logged into Tumblr as %s.\n\n");
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp38_ = self->priv->username;
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp39_ = g_strdup_printf (_tmp37_, _tmp38_);
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		upload_label_text = _tmp39_;
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		upload_label_text = _tmp39_;
+#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp40_ = self->priv->upload_info_label;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp41_ = upload_label_text;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		gtk_label_set_label (_tmp40_, _tmp41_);
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (self);
 #line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (self);
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp42_ = self->priv->blog_combo;
-#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_changed_gtk_combo_box_changed, self, 0);
-#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp43_ = media_type;
-#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (_tmp43_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4802 "TumblrPublishing.c"
+#line 4822 "TumblrPublishing.c"
 			GtkComboBoxText* _tmp44_ = NULL;
-#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (self);
 #line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+			publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (self);
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp44_ = self->priv->size_combo;
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 4810 "TumblrPublishing.c"
+#line 4830 "TumblrPublishing.c"
 		} else {
 			GtkComboBoxText* _tmp45_ = NULL;
 			GtkLabel* _tmp46_ = NULL;
-#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp45_ = self->priv->size_combo;
-#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp46_ = self->priv->size_label;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 4822 "TumblrPublishing.c"
+#line 4842 "TumblrPublishing.c"
 		}
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp47_ = self->priv->logout_button;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
 #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		g_signal_connect_object (_tmp47_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp48_ = self->priv->publish_button;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_signal_connect_object (_tmp48_, "clicked", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (upload_label_text);
-#line 4834 "TumblrPublishing.c"
+#line 4854 "TumblrPublishing.c"
 	}
 	goto __finally37;
 	__catch37_g_error:
@@ -4857,132 +4877,132 @@ PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_p
 		const gchar* _tmp49_ = NULL;
 		GError* _tmp50_ = NULL;
 		const gchar* _tmp51_ = NULL;
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		e = _inner_error_;
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_inner_error_ = NULL;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp49_ = _ ("Could not load UI: %s");
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp50_ = e;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp51_ = _tmp50_->message;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_warning (_tmp49_, _tmp51_);
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_error_free0 (e);
-#line 4857 "TumblrPublishing.c"
+#line 4877 "TumblrPublishing.c"
 	}
 	__finally37:
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		return NULL;
-#line 4868 "TumblrPublishing.c"
+#line 4888 "TumblrPublishing.c"
 	}
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 4872 "TumblrPublishing.c"
+#line 4892 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherPublishingOptionsPane* publishing_tumblr_tumblr_publisher_publishing_options_pane_new (PublishingTumblrTumblrPublisher* publisher, SpitPublishingPublisherMediaType media_type, PublishingTumblrSizeEntry** sizes, int sizes_length1, PublishingTumblrBlogEntry** blogs, int blogs_length1, const gchar* username) {
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_publishing_options_pane_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, publisher, media_type, sizes, sizes_length1, blogs, blogs_length1, username);
-#line 4879 "TumblrPublishing.c"
+#line 4899 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_logout_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 4888 "TumblrPublishing.c"
+#line 4908 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_publish_clicked (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_emit_by_name (self, "publish");
-#line 4897 "TumblrPublishing.c"
+#line 4917 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_blog_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
 	PublishingTumblrBlogEntry** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->blogs;
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0__length1 = self->priv->blogs_length1;
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 4912 "TumblrPublishing.c"
+#line 4932 "TumblrPublishing.c"
 		PublishingTumblrBlogEntry** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		GtkComboBoxText* _tmp6_ = NULL;
 		PublishingTumblrTumblrPublisher* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1_ = self->priv->blogs;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1__length1 = self->priv->blogs_length1;
-#line 4922 "TumblrPublishing.c"
+#line 4942 "TumblrPublishing.c"
 		{
 			PublishingTumblrBlogEntry** b_collection = NULL;
 			gint b_collection_length1 = 0;
 			gint _b_collection_size_ = 0;
 			gint b_it = 0;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			b_collection = _tmp1_;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			b_collection_length1 = _tmp1__length1;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			for (b_it = 0; b_it < _tmp1__length1; b_it = b_it + 1) {
-#line 4934 "TumblrPublishing.c"
+#line 4954 "TumblrPublishing.c"
 				PublishingTumblrBlogEntry* _tmp2_ = NULL;
 				PublishingTumblrBlogEntry* b = NULL;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp2_ = _publishing_tumblr_blog_entry_ref0 (b_collection[b_it]);
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				b = _tmp2_;
-#line 4941 "TumblrPublishing.c"
+#line 4961 "TumblrPublishing.c"
 				{
 					GtkComboBoxText* _tmp3_ = NULL;
 					PublishingTumblrBlogEntry* _tmp4_ = NULL;
 					const gchar* _tmp5_ = NULL;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp3_ = self->priv->blog_combo;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp4_ = b;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp5_ = _tmp4_->blog;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_publishing_tumblr_blog_entry_unref0 (b);
-#line 4956 "TumblrPublishing.c"
+#line 4976 "TumblrPublishing.c"
 				}
 			}
 		}
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp6_ = self->priv->blog_combo;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp7_ = self->priv->publisher;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_blog (_tmp7_);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_);
-#line 4968 "TumblrPublishing.c"
+#line 4988 "TumblrPublishing.c"
 	}
 }
 
@@ -4991,88 +5011,88 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_blog_c
 	PublishingTumblrTumblrPublisher* _tmp0_ = NULL;
 	GtkComboBoxText* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = self->priv->blog_combo;
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_set_persistent_default_blog (_tmp0_, _tmp2_);
-#line 4987 "TumblrPublishing.c"
+#line 5007 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_populate_size_combo (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
 	PublishingTumblrSizeEntry** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->sizes;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0__length1 = self->priv->sizes_length1;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 5002 "TumblrPublishing.c"
+#line 5022 "TumblrPublishing.c"
 		PublishingTumblrSizeEntry** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		GtkComboBoxText* _tmp6_ = NULL;
 		PublishingTumblrTumblrPublisher* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1_ = self->priv->sizes;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp1__length1 = self->priv->sizes_length1;
-#line 5012 "TumblrPublishing.c"
+#line 5032 "TumblrPublishing.c"
 		{
 			PublishingTumblrSizeEntry** e_collection = NULL;
 			gint e_collection_length1 = 0;
 			gint _e_collection_size_ = 0;
 			gint e_it = 0;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			e_collection = _tmp1_;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			e_collection_length1 = _tmp1__length1;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			for (e_it = 0; e_it < _tmp1__length1; e_it = e_it + 1) {
-#line 5024 "TumblrPublishing.c"
+#line 5044 "TumblrPublishing.c"
 				PublishingTumblrSizeEntry* _tmp2_ = NULL;
 				PublishingTumblrSizeEntry* e = NULL;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp2_ = _publishing_tumblr_size_entry_ref0 (e_collection[e_it]);
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				e = _tmp2_;
-#line 5031 "TumblrPublishing.c"
+#line 5051 "TumblrPublishing.c"
 				{
 					GtkComboBoxText* _tmp3_ = NULL;
 					PublishingTumblrSizeEntry* _tmp4_ = NULL;
 					const gchar* _tmp5_ = NULL;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp3_ = self->priv->size_combo;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp4_ = e;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp5_ = _tmp4_->title;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_publishing_tumblr_size_entry_unref0 (e);
-#line 5046 "TumblrPublishing.c"
+#line 5066 "TumblrPublishing.c"
 				}
 			}
 		}
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp6_ = self->priv->size_combo;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp7_ = self->priv->publisher;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp8_ = publishing_tumblr_tumblr_publisher_get_persistent_default_size (_tmp7_);
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_combo_box_get_type (), GtkComboBox), _tmp8_);
-#line 5058 "TumblrPublishing.c"
+#line 5078 "TumblrPublishing.c"
 	}
 }
 
@@ -5081,35 +5101,35 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_on_size_c
 	PublishingTumblrTumblrPublisher* _tmp0_ = NULL;
 	GtkComboBoxText* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = self->priv->size_combo;
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 5077 "TumblrPublishing.c"
+#line 5097 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_emit_by_name (self, "publish");
-#line 5086 "TumblrPublishing.c"
+#line 5106 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* self) {
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 5095 "TumblrPublishing.c"
+#line 5115 "TumblrPublishing.c"
 }
 
 
@@ -5118,56 +5138,56 @@ static GtkWidget* publishing_tumblr_tumblr_publisher_publishing_options_pane_rea
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
 #line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp1_;
-#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5114 "TumblrPublishing.c"
+#line 5134 "TumblrPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
 #line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5127 "TumblrPublishing.c"
+#line 5147 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 5134 "TumblrPublishing.c"
+#line 5154 "TumblrPublishing.c"
 }
 
 
 static void _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout (PublishingTumblrTumblrPublisherPublishingOptionsPane* _sender, gpointer self) {
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout ((PublishingTumblrTumblrPublisherPublishingOptionsPane*) self);
-#line 5141 "TumblrPublishing.c"
+#line 5161 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
 #line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_connect_object (self, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0);
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
 #line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_signal_connect_object (self, "publish", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self, 0);
+#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_connect_object (self, "logout", (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self, 0);
-#line 5153 "TumblrPublishing.c"
+#line 5173 "TumblrPublishing.c"
 }
 
 
@@ -5175,125 +5195,125 @@ static void publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_p
 	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
 	guint _tmp0_ = 0U;
 	guint _tmp1_ = 0U;
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
 #line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
-#line 818 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self);
 #line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_publish_publishing_tumblr_tumblr_publisher_publishing_options_pane_publish, self);
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_tumblr_tumblr_publisher_publishing_options_pane_notify_logout_publishing_tumblr_tumblr_publisher_publishing_options_pane_logout, self);
-#line 5171 "TumblrPublishing.c"
+#line 5191 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_class_init (PublishingTumblrTumblrPublisherPublishingOptionsPaneClass * klass) {
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPublishingOptionsPanePrivate));
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize;
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_new ("publish", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 5186 "TumblrPublishing.c"
+#line 5206 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_widget;
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_get_preferred_geometry;
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_installed;
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_tumblr_tumblr_publisher_publishing_options_pane_real_on_pane_uninstalled;
-#line 5201 "TumblrPublishing.c"
+#line 5221 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_instance_init (PublishingTumblrTumblrPublisherPublishingOptionsPane * self) {
 	gchar* _tmp0_ = NULL;
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->pane_widget = NULL;
 #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->upload_info_label = NULL;
+	self->priv->pane_widget = NULL;
 #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->size_label = NULL;
+	self->priv->upload_info_label = NULL;
 #line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blog_label = NULL;
+	self->priv->size_label = NULL;
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->logout_button = NULL;
+	self->priv->blog_label = NULL;
 #line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->publish_button = NULL;
+	self->priv->logout_button = NULL;
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->size_combo = NULL;
+	self->priv->publish_button = NULL;
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blog_combo = NULL;
+	self->priv->size_combo = NULL;
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->blog_combo = NULL;
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->sizes = NULL;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->sizes_length1 = 0;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_sizes_size_ = self->priv->sizes_length1;
 #line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->_sizes_size_ = self->priv->sizes_length1;
+#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->blogs = NULL;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->blogs_length1 = 0;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->_blogs_size_ = self->priv->blogs_length1;
 #line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->_blogs_size_ = self->priv->blogs_length1;
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = g_strdup ("");
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->username = _tmp0_;
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->username = _tmp0_;
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->publisher = NULL;
-#line 5243 "TumblrPublishing.c"
+#line 5263 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_publishing_options_pane_finalize (GObject* obj) {
 	PublishingTumblrTumblrPublisherPublishingOptionsPane * self;
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_PUBLISHING_OPTIONS_PANE, PublishingTumblrTumblrPublisherPublishingOptionsPane);
-#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->builder);
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
+	_g_object_unref0 (self->priv->builder);
 #line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->upload_info_label);
+	_g_object_unref0 (self->priv->pane_widget);
 #line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->size_label);
+	_g_object_unref0 (self->priv->upload_info_label);
 #line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->blog_label);
+	_g_object_unref0 (self->priv->size_label);
 #line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->logout_button);
+	_g_object_unref0 (self->priv->blog_label);
 #line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->publish_button);
+	_g_object_unref0 (self->priv->logout_button);
 #line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->size_combo);
+	_g_object_unref0 (self->priv->publish_button);
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_object_unref0 (self->priv->blog_combo);
+	_g_object_unref0 (self->priv->size_combo);
 #line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
+	_g_object_unref0 (self->priv->blog_combo);
 #line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
+	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_tumblr_size_entry_unref), NULL);
 #line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->username);
+	self->priv->blogs = (_vala_array_free (self->priv->blogs, self->priv->blogs_length1, (GDestroyNotify) publishing_tumblr_blog_entry_unref), NULL);
 #line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	_g_free0 (self->priv->username);
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_publishing_options_pane_parent_class)->finalize (obj);
-#line 5279 "TumblrPublishing.c"
+#line 5299 "TumblrPublishing.c"
 }
 
 
@@ -5318,24 +5338,24 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t
 	PublishingTumblrTumblrPublisherTransaction* self = NULL;
 	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
 	PublishingRESTSupportHttpMethod _tmp1_ = 0;
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = session;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = method;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = (PublishingTumblrTumblrPublisherTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_);
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 5314 "TumblrPublishing.c"
+#line 5334 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new (PublishingTumblrTumblrPublisherSession* session, PublishingRESTSupportHttpMethod method) {
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, session, method);
-#line 5321 "TumblrPublishing.c"
+#line 5341 "TumblrPublishing.c"
 }
 
 
@@ -5354,82 +5374,82 @@ PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_t
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (uri != NULL, NULL);
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = session;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = uri;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = method;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = (PublishingTumblrTumblrPublisherTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = session;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4_ = publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (_tmp3_);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_nonce", _tmp5_);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp5_);
 #line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature_method", "HMAC-SHA1");
+	_g_free0 (_tmp5_);
 #line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0");
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_signature_method", "HMAC-SHA1");
 #line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_version", "1.0");
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp6_ = session;
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp7_ = publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (_tmp6_);
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_timestamp", _tmp8_);
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp8_);
 #line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_TUMBLR_API_KEY);
+	_g_free0 (_tmp8_);
 #line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_TUMBLR_API_KEY);
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp9_ = session;
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp10_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp9_);
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp11_ = _tmp10_;
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp12_ = _tmp11_ != NULL;
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp11_);
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp12_) {
-#line 5390 "TumblrPublishing.c"
+#line 5410 "TumblrPublishing.c"
 		PublishingTumblrTumblrPublisherSession* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp13_ = session;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp14_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp13_);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp15_ = _tmp14_;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp15_);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (_tmp15_);
-#line 5404 "TumblrPublishing.c"
+#line 5424 "TumblrPublishing.c"
 	}
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 5408 "TumblrPublishing.c"
+#line 5428 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherTransaction* publishing_tumblr_tumblr_publisher_transaction_new_with_uri (PublishingTumblrTumblrPublisherSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, session, uri, method);
-#line 5415 "TumblrPublishing.c"
+#line 5435 "TumblrPublishing.c"
 }
 
 
@@ -5438,46 +5458,46 @@ static void publishing_tumblr_tumblr_publisher_transaction_real_execute (Publish
 	PublishingRESTSupportSession* _tmp0_ = NULL;
 	PublishingTumblrTumblrPublisherSession* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransaction);
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_TRANSACTION, PublishingTumblrTumblrPublisherTransaction);
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = publishing_rest_support_transaction_get_parent_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_tumblr_tumblr_publisher_transaction_parent_class)->execute (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 5444 "TumblrPublishing.c"
+#line 5464 "TumblrPublishing.c"
 		} else {
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 5452 "TumblrPublishing.c"
+#line 5472 "TumblrPublishing.c"
 		}
 	}
 }
 
 
 static void publishing_tumblr_tumblr_publisher_transaction_class_init (PublishingTumblrTumblrPublisherTransactionClass * klass) {
-#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_tumblr_tumblr_publisher_transaction_real_execute;
-#line 5463 "TumblrPublishing.c"
+#line 5483 "TumblrPublishing.c"
 }
 
 
@@ -5504,49 +5524,49 @@ PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tu
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (username != NULL, NULL);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (password != NULL, NULL);
 #line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_val_if_fail (password != NULL, NULL);
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = session;
-#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = (PublishingTumblrTumblrPublisherAccessTokenFetchTransaction*) publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (object_type, _tmp0_, "https://www.tumblr.com/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = username;
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = soup_uri_encode (_tmp1_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_username", _tmp3_);
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp3_);
 #line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	_g_free0 (_tmp3_);
+#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4_ = password;
-#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_password", _tmp4_);
 #line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_password", _tmp4_);
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "x_auth_mode", "client_auth");
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 5518 "TumblrPublishing.c"
+#line 5538 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherAccessTokenFetchTransaction* publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session, const gchar* username, const gchar* password) {
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, username, password);
-#line 5525 "TumblrPublishing.c"
+#line 5545 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_class_init (PublishingTumblrTumblrPublisherAccessTokenFetchTransactionClass * klass) {
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5532 "TumblrPublishing.c"
+#line 5552 "TumblrPublishing.c"
 }
 
 
@@ -5569,29 +5589,29 @@ GType publishing_tumblr_tumblr_publisher_access_token_fetch_transaction_get_type
 PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (GType object_type, PublishingTumblrTumblrPublisherSession* session) {
 	PublishingTumblrTumblrPublisherUserInfoFetchTransaction* self = NULL;
 	PublishingTumblrTumblrPublisherSession* _tmp0_ = NULL;
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
 #line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = session;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = (PublishingTumblrTumblrPublisherUserInfoFetchTransaction*) publishing_tumblr_tumblr_publisher_transaction_construct_with_uri (object_type, _tmp0_, "http://api.tumblr.com/v2/user/info", PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 5563 "TumblrPublishing.c"
+#line 5583 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherUserInfoFetchTransaction* publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_new (PublishingTumblrTumblrPublisherSession* session) {
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_USER_INFO_FETCH_TRANSACTION, session);
-#line 5570 "TumblrPublishing.c"
+#line 5590 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_class_init (PublishingTumblrTumblrPublisherUserInfoFetchTransactionClass * klass) {
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_user_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5577 "TumblrPublishing.c"
+#line 5597 "TumblrPublishing.c"
 }
 
 
@@ -5627,62 +5647,62 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
 	GString* _tmp14_ = NULL;
 	const gchar* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
-#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
 #line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = g_string_new ("");
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	s = _tmp0_;
 #line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	s = _tmp0_;
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = g_new0 (gchar, 2);
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	bytes = _tmp1_;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	bytes_length1 = 2;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_bytes_size_ = bytes_length1;
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	_bytes_size_ = bytes_length1;
+#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = bytes;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2__length1 = bytes_length1;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_[1] = (gchar) 0;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_tmp3_ = _tmp2_[1];
 #line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	_tmp3_ = _tmp2_[1];
+#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4_ = data;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4__length1 = data_length1;
-#line 5639 "TumblrPublishing.c"
+#line 5659 "TumblrPublishing.c"
 	{
 		guint8* byte_collection = NULL;
 		gint byte_collection_length1 = 0;
 		gint _byte_collection_size_ = 0;
 		gint byte_it = 0;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		byte_collection = _tmp4_;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		byte_collection_length1 = _tmp4__length1;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		for (byte_it = 0; byte_it < _tmp4__length1; byte_it = byte_it + 1) {
-#line 5651 "TumblrPublishing.c"
+#line 5671 "TumblrPublishing.c"
 			guint8 byte = 0U;
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			byte = byte_collection[byte_it];
-#line 5655 "TumblrPublishing.c"
+#line 5675 "TumblrPublishing.c"
 			{
 				guint8 _tmp5_ = 0U;
-#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp5_ = byte;
-#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (((gint) _tmp5_) == 0) {
-#line 5662 "TumblrPublishing.c"
+#line 5682 "TumblrPublishing.c"
 					GString* _tmp6_ = NULL;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp6_ = s;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					g_string_append (_tmp6_, "%00");
-#line 5668 "TumblrPublishing.c"
+#line 5688 "TumblrPublishing.c"
 				} else {
 					gchar* _tmp7_ = NULL;
 					gint _tmp7__length1 = 0;
@@ -5693,57 +5713,57 @@ static gchar* publishing_tumblr_tumblr_publisher_upload_transaction_encode (Publ
 					gint _tmp11__length1 = 0;
 					gchar* _tmp12_ = NULL;
 					gchar* _tmp13_ = NULL;
-#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp7_ = bytes;
-#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp7__length1 = bytes_length1;
-#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp8_ = byte;
-#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp7_[0] = (gchar) _tmp8_;
-#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-					_tmp9_ = _tmp7_[0];
 #line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+					_tmp9_ = _tmp7_[0];
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp10_ = s;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp11_ = bytes;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp11__length1 = bytes_length1;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp12_ = soup_uri_encode ((const gchar*) _tmp11_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp13_ = _tmp12_;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					g_string_append (_tmp10_, _tmp13_);
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_g_free0 (_tmp13_);
-#line 5703 "TumblrPublishing.c"
+#line 5723 "TumblrPublishing.c"
 				}
 			}
 		}
 	}
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp14_ = s;
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp15_ = _tmp14_->str;
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp16_ = g_strdup (_tmp15_);
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp16_;
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	bytes = (g_free (bytes), NULL);
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_string_free0 (s);
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5722 "TumblrPublishing.c"
+#line 5742 "TumblrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 5729 "TumblrPublishing.c"
+#line 5749 "TumblrPublishing.c"
 }
 
 
@@ -5756,63 +5776,63 @@ PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publi
 	gchar* _tmp4_ = NULL;
 	PublishingTumblrTumblrPublisherSession* _tmp5_ = NULL;
 	PublishingTumblrTumblrPublisherSession* _tmp6_ = NULL;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (blog_url != NULL, NULL);
 #line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:897: Init upload transaction");
+	g_return_val_if_fail (blog_url != NULL, NULL);
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:898: Init upload transaction");
+#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = session;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = publishable;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = blog_url;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = g_strdup_printf ("http://api.tumblr.com/v2/blog/%s/post", _tmp2_);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = (PublishingTumblrTumblrPublisherUploadTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp4_);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp4_);
 #line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	_g_free0 (_tmp4_);
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = session;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp6_ = _publishing_rest_support_session_ref0 (_tmp5_);
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->session = _tmp6_;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 5774 "TumblrPublishing.c"
+#line 5794 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherUploadTransaction* publishing_tumblr_tumblr_publisher_upload_transaction_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable* publishable, const gchar* blog_url) {
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_upload_transaction_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, session, publishable, blog_url);
-#line 5781 "TumblrPublishing.c"
+#line 5801 "TumblrPublishing.c"
 }
 
 
 static void _vala_array_add22 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 5792 "TumblrPublishing.c"
+#line 5812 "TumblrPublishing.c"
 	}
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5798 "TumblrPublishing.c"
+#line 5818 "TumblrPublishing.c"
 }
 
 
@@ -5822,53 +5842,53 @@ void publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_hea
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	PublishingRESTSupportArgument* _tmp3_ = NULL;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self));
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (key != NULL);
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (value != NULL);
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (value != NULL);
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->auth_header_fields;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = key;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = value;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_vala_array_add22 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_);
-#line 5826 "TumblrPublishing.c"
+#line 5846 "TumblrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 5833 "TumblrPublishing.c"
+#line 5853 "TumblrPublishing.c"
 }
 
 
 static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length) {
 	PublishingRESTSupportArgument** result;
 	int i;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 5844 "TumblrPublishing.c"
+#line 5864 "TumblrPublishing.c"
 		PublishingRESTSupportArgument* _tmp0_ = NULL;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		result[i] = _tmp0_;
-#line 5850 "TumblrPublishing.c"
+#line 5870 "TumblrPublishing.c"
 	}
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5854 "TumblrPublishing.c"
+#line 5874 "TumblrPublishing.c"
 }
 
 
@@ -5880,31 +5900,31 @@ PublishingRESTSupportArgument** publishing_tumblr_tumblr_publisher_upload_transa
 	gint _tmp1__length1 = 0;
 	PublishingRESTSupportArgument** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
 #line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->auth_header_fields;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2__length1 = _tmp1__length1;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (result_length1) {
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*result_length1 = _tmp2__length1;
-#line 5884 "TumblrPublishing.c"
+#line 5904 "TumblrPublishing.c"
 	}
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp2_;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 5890 "TumblrPublishing.c"
+#line 5910 "TumblrPublishing.c"
 }
 
 
@@ -5912,25 +5932,25 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
-#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_UPLOAD_TRANSACTION (self), NULL);
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = g_strdup ("OAuth ");
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_result_ = _tmp0_;
-#line 5904 "TumblrPublishing.c"
+#line 5924 "TumblrPublishing.c"
 	{
 		gint i = 0;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		i = 0;
-#line 5909 "TumblrPublishing.c"
+#line 5929 "TumblrPublishing.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp1_ = TRUE;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			while (TRUE) {
-#line 5916 "TumblrPublishing.c"
+#line 5936 "TumblrPublishing.c"
 				gint _tmp3_ = 0;
 				PublishingRESTSupportArgument** _tmp4_ = NULL;
 				gint _tmp4__length1 = 0;
@@ -5957,115 +5977,115 @@ gchar* publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_h
 				gint _tmp23_ = 0;
 				PublishingRESTSupportArgument** _tmp24_ = NULL;
 				gint _tmp24__length1 = 0;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (!_tmp1_) {
-#line 5945 "TumblrPublishing.c"
+#line 5965 "TumblrPublishing.c"
 					gint _tmp2_ = 0;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp2_ = i;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					i = _tmp2_ + 1;
-#line 5951 "TumblrPublishing.c"
+#line 5971 "TumblrPublishing.c"
 				}
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp1_ = FALSE;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp3_ = i;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp4_ = self->priv->auth_header_fields;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp4__length1 = self->priv->auth_header_fields_length1;
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (!(_tmp3_ < _tmp4__length1)) {
-#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					break;
-#line 5965 "TumblrPublishing.c"
+#line 5985 "TumblrPublishing.c"
 				}
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp5_ = _result_;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp6_ = self->priv->auth_header_fields;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp6__length1 = self->priv->auth_header_fields_length1;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp7_ = i;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp8_ = _tmp6_[_tmp7_];
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp9_ = _tmp8_->key;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp10_ = g_strconcat (_tmp5_, _tmp9_, NULL);
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_free0 (_result_);
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_result_ = _tmp10_;
 #line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+				_result_ = _tmp10_;
+#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp11_ = _result_;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp12_ = g_strconcat (_tmp11_, "=", NULL);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_free0 (_result_);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_result_ = _tmp12_;
 #line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+				_result_ = _tmp12_;
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp13_ = _result_;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp14_ = self->priv->auth_header_fields;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp14__length1 = self->priv->auth_header_fields_length1;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp15_ = i;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp16_ = _tmp14_[_tmp15_];
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp17_ = _tmp16_->value;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp18_ = g_strconcat ("\"", _tmp17_, NULL);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp19_ = _tmp18_;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp20_ = g_strconcat (_tmp19_, "\"", NULL);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp21_ = _tmp20_;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp22_ = g_strconcat (_tmp13_, _tmp21_, NULL);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_free0 (_result_);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_result_ = _tmp22_;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_free0 (_tmp21_);
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_free0 (_tmp19_);
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp23_ = i;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp24_ = self->priv->auth_header_fields;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp24__length1 = self->priv->auth_header_fields_length1;
-#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (_tmp23_ < (_tmp24__length1 - 1)) {
-#line 6031 "TumblrPublishing.c"
+#line 6051 "TumblrPublishing.c"
 					const gchar* _tmp25_ = NULL;
 					gchar* _tmp26_ = NULL;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp25_ = _result_;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp26_ = g_strconcat (_tmp25_, ", ", NULL);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_g_free0 (_result_);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_result_ = _tmp26_;
-#line 6042 "TumblrPublishing.c"
+#line 6062 "TumblrPublishing.c"
 				}
 			}
 		}
 	}
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _result_;
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 6051 "TumblrPublishing.c"
+#line 6071 "TumblrPublishing.c"
 }
 
 
@@ -6109,13 +6129,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 6095 "TumblrPublishing.c"
+#line 6115 "TumblrPublishing.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 6101 "TumblrPublishing.c"
+#line 6121 "TumblrPublishing.c"
 }
 
 
@@ -6132,7 +6152,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	if (_tmp0_ == NULL) {
 #line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
-#line 6118 "TumblrPublishing.c"
+#line 6138 "TumblrPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
@@ -6142,7 +6162,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	if (_tmp3_ != NULL) {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 6128 "TumblrPublishing.c"
+#line 6148 "TumblrPublishing.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
@@ -6152,13 +6172,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp4__length1 = str_array_length1;
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 6138 "TumblrPublishing.c"
+#line 6158 "TumblrPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 6144 "TumblrPublishing.c"
+#line 6164 "TumblrPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
@@ -6169,7 +6189,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp6__length1 = str_array_length1;
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 6155 "TumblrPublishing.c"
+#line 6175 "TumblrPublishing.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
@@ -6181,19 +6201,19 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp8_ = _tmp7_[0];
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 6167 "TumblrPublishing.c"
+#line 6187 "TumblrPublishing.c"
 		} else {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 6171 "TumblrPublishing.c"
+#line 6191 "TumblrPublishing.c"
 		}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 6175 "TumblrPublishing.c"
+#line 6195 "TumblrPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 6179 "TumblrPublishing.c"
+#line 6199 "TumblrPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
 		gint _tmp31_ = 0;
@@ -6216,7 +6236,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp62_ = NULL;
 #line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 6202 "TumblrPublishing.c"
+#line 6222 "TumblrPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -6225,7 +6245,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp9_ = TRUE;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 6211 "TumblrPublishing.c"
+#line 6231 "TumblrPublishing.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
 				gchar** _tmp13_ = NULL;
@@ -6238,13 +6258,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gsize _tmp30_ = 0UL;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
-#line 6224 "TumblrPublishing.c"
+#line 6244 "TumblrPublishing.c"
 					gint _tmp10_ = 0;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 6230 "TumblrPublishing.c"
+#line 6250 "TumblrPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
@@ -6254,7 +6274,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp13__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 6240 "TumblrPublishing.c"
+#line 6260 "TumblrPublishing.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
@@ -6266,17 +6286,17 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp15__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 6252 "TumblrPublishing.c"
+#line 6272 "TumblrPublishing.c"
 				} else {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 6256 "TumblrPublishing.c"
+#line 6276 "TumblrPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 6262 "TumblrPublishing.c"
+#line 6282 "TumblrPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
@@ -6287,7 +6307,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp17__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 6273 "TumblrPublishing.c"
+#line 6293 "TumblrPublishing.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
@@ -6302,21 +6322,21 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 						_tmp20_ = _tmp18_[_tmp19_];
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 6288 "TumblrPublishing.c"
+#line 6308 "TumblrPublishing.c"
 					} else {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 6292 "TumblrPublishing.c"
+#line 6312 "TumblrPublishing.c"
 					}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 6296 "TumblrPublishing.c"
+#line 6316 "TumblrPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
-#line 6302 "TumblrPublishing.c"
+#line 6322 "TumblrPublishing.c"
 				}
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
@@ -6328,7 +6348,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp24_ = _tmp22_[_tmp23_];
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 6314 "TumblrPublishing.c"
+#line 6334 "TumblrPublishing.c"
 					gchar** _tmp25_ = NULL;
 					gint _tmp25__length1 = 0;
 					gint _tmp26_ = 0;
@@ -6349,24 +6369,24 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp29_ = _tmp28_;
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 6335 "TumblrPublishing.c"
+#line 6355 "TumblrPublishing.c"
 				} else {
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 6339 "TumblrPublishing.c"
+#line 6359 "TumblrPublishing.c"
 				}
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 6345 "TumblrPublishing.c"
+#line 6365 "TumblrPublishing.c"
 			}
 		}
 #line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
 #line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 6352 "TumblrPublishing.c"
+#line 6372 "TumblrPublishing.c"
 			gchar* _tmp32_ = NULL;
 #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
@@ -6374,7 +6394,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			result = _tmp32_;
 #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
-#line 6360 "TumblrPublishing.c"
+#line 6380 "TumblrPublishing.c"
 		}
 #line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
@@ -6412,7 +6432,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
 #line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 6398 "TumblrPublishing.c"
+#line 6418 "TumblrPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -6421,7 +6441,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp46_ = TRUE;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 6407 "TumblrPublishing.c"
+#line 6427 "TumblrPublishing.c"
 				gint _tmp48_ = 0;
 				gchar** _tmp49_ = NULL;
 				gint _tmp49__length1 = 0;
@@ -6437,13 +6457,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				void* _tmp61_ = NULL;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
-#line 6423 "TumblrPublishing.c"
+#line 6443 "TumblrPublishing.c"
 					gint _tmp47_ = 0;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 6429 "TumblrPublishing.c"
+#line 6449 "TumblrPublishing.c"
 				}
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
@@ -6457,7 +6477,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				if (!(_tmp48_ < _tmp49__length1)) {
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
-#line 6443 "TumblrPublishing.c"
+#line 6463 "TumblrPublishing.c"
 				}
 #line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
@@ -6477,7 +6497,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp56_ = _tmp54_[_tmp55_];
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 6463 "TumblrPublishing.c"
+#line 6483 "TumblrPublishing.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
@@ -6492,11 +6512,11 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp59_ = _tmp57_[_tmp58_];
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 6478 "TumblrPublishing.c"
+#line 6498 "TumblrPublishing.c"
 				} else {
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 6482 "TumblrPublishing.c"
+#line 6502 "TumblrPublishing.c"
 				}
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
@@ -6504,7 +6524,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 6490 "TumblrPublishing.c"
+#line 6510 "TumblrPublishing.c"
 			}
 		}
 #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -6515,7 +6535,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		result = (gchar*) _tmp62_;
 #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 6501 "TumblrPublishing.c"
+#line 6521 "TumblrPublishing.c"
 	} else {
 		gchar* _tmp63_ = NULL;
 #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -6524,7 +6544,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		result = _tmp63_;
 #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 6510 "TumblrPublishing.c"
+#line 6530 "TumblrPublishing.c"
 	}
 }
 
@@ -6575,45 +6595,45 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 	gboolean _tmp75_ = FALSE;
 	SoupMessage* _tmp87_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
 #line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->session;
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (_tmp0_);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp2_);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp2_);
 #line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1");
+	_g_free0 (_tmp2_);
 #line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0");
+	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_signature_method", "HMAC-SHA1");
 #line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_version", "1.0");
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = self->priv->session;
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4_ = publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (_tmp3_);
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp5_);
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp5_);
 #line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", PUBLISHING_TUMBLR_API_KEY);
+	_g_free0 (_tmp5_);
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", PUBLISHING_TUMBLR_API_KEY);
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp6_ = self->priv->session;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp7_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token (_tmp6_);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp8_);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 6599 "TumblrPublishing.c"
+#line 6619 "TumblrPublishing.c"
 	{
 		SpitPublishingPublishable* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
@@ -6644,118 +6664,118 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 		const gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp10_ = spit_publishing_publishable_get_serialized_file (_tmp9_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp11_ = _tmp10_;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		g_file_get_contents (_tmp13_, &_tmp14_, &_tmp15_, &_inner_error_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (payload);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		payload = _tmp14_;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		payload_length = _tmp15_;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (_tmp13_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_object_unref0 (_tmp11_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 6656 "TumblrPublishing.c"
+#line 6676 "TumblrPublishing.c"
 				goto __catch38_g_file_error;
 			}
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_free0 (payload);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 6667 "TumblrPublishing.c"
+#line 6687 "TumblrPublishing.c"
 		}
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp16_ = payload;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp17_ = string_get_data (_tmp16_, &_tmp17__length1);
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp18_ = _tmp17_;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp18__length1 = _tmp17__length1;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp19_ = payload_length;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp20_ = publishing_tumblr_tumblr_publisher_upload_transaction_encode (self, _tmp18_ + 0, ((gint) _tmp19_) - 0);
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		reqdata = _tmp20_;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp21_ = reqdata;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data[0]", _tmp21_);
 #line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "type", "photo");
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "data[0]", _tmp21_);
 #line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "type", "photo");
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->publishable;
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp24_ = spit_publishing_publishable_get_publishing_keywords (_tmp22_, &_tmp23_);
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		keywords = _tmp24_;
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		keywords_length1 = _tmp23_;
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_keywords_size_ = keywords_length1;
 #line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		_keywords_size_ = keywords_length1;
+#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp25_ = g_strdup ("");
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		tags = _tmp25_;
 #line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		tags = _tmp25_;
+#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp26_ = keywords;
-#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp26__length1 = keywords_length1;
-#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (_tmp26_ != NULL) {
-#line 6709 "TumblrPublishing.c"
+#line 6729 "TumblrPublishing.c"
 			gchar** _tmp27_ = NULL;
 			gint _tmp27__length1 = 0;
 			gchar* _tmp28_ = NULL;
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp27_ = keywords;
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp27__length1 = keywords_length1;
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp28_ = _vala_g_strjoinv (",", _tmp27_, _tmp27__length1);
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_free0 (tags);
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			tags = _tmp28_;
-#line 6723 "TumblrPublishing.c"
+#line 6743 "TumblrPublishing.c"
 		}
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp29_ = tags;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp30_ = soup_uri_encode (_tmp29_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp31_ = _tmp30_;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp31_);
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (_tmp31_);
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (tags);
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (reqdata);
-#line 6741 "TumblrPublishing.c"
+#line 6761 "TumblrPublishing.c"
 	}
 	goto __finally38;
 	__catch38_g_file_error:
@@ -6763,93 +6783,93 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 		GError* e = NULL;
 		const gchar* _tmp32_ = NULL;
 		GError* _tmp33_ = NULL;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		e = _inner_error_;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_inner_error_ = NULL;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp32_ = _ ("A temporary file needed for publishing is unavailable");
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp33_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp32_);
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_inner_error_ = _tmp33_;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_error_free0 (e);
-#line 6761 "TumblrPublishing.c"
+#line 6781 "TumblrPublishing.c"
 		goto __finally38;
 	}
 	__finally38:
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_free0 (payload);
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 6775 "TumblrPublishing.c"
+#line 6795 "TumblrPublishing.c"
 		} else {
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_free0 (payload);
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 6785 "TumblrPublishing.c"
+#line 6805 "TumblrPublishing.c"
 		}
 	}
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp34_ = self->priv->session;
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_session_sign_transaction (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp35_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_string (self);
-#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	authorization_header = _tmp35_;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp36_ = authorization_header;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:967: executing upload transaction: authorization" \
+#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:968: executing upload transaction: authorization" \
 " header string = '%s'", _tmp36_);
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp37_ = authorization_header;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp37_);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp39_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp38_);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	request_arguments = _tmp39_;
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	request_arguments_length1 = _tmp38_;
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_request_arguments_size_ = request_arguments_length1;
 #line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	_request_arguments_size_ = request_arguments_length1;
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp40_ = request_arguments;
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp40__length1 = request_arguments_length1;
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_vala_assert (_tmp40__length1 > 0, "request_arguments.length > 0");
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp41_ = g_strdup ("");
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	request_data = _tmp41_;
-#line 6822 "TumblrPublishing.c"
+#line 6842 "TumblrPublishing.c"
 	{
 		gint i = 0;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		i = 0;
-#line 6827 "TumblrPublishing.c"
+#line 6847 "TumblrPublishing.c"
 		{
 			gboolean _tmp42_ = FALSE;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp42_ = TRUE;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			while (TRUE) {
-#line 6834 "TumblrPublishing.c"
+#line 6854 "TumblrPublishing.c"
 				gint _tmp44_ = 0;
 				PublishingRESTSupportArgument** _tmp45_ = NULL;
 				gint _tmp45__length1 = 0;
@@ -6872,133 +6892,133 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 				gint _tmp60_ = 0;
 				PublishingRESTSupportArgument** _tmp61_ = NULL;
 				gint _tmp61__length1 = 0;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (!_tmp42_) {
-#line 6859 "TumblrPublishing.c"
+#line 6879 "TumblrPublishing.c"
 					gint _tmp43_ = 0;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp43_ = i;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					i = _tmp43_ + 1;
-#line 6865 "TumblrPublishing.c"
+#line 6885 "TumblrPublishing.c"
 				}
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp42_ = FALSE;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp44_ = i;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp45_ = request_arguments;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp45__length1 = request_arguments_length1;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (!(_tmp44_ < _tmp45__length1)) {
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					break;
-#line 6879 "TumblrPublishing.c"
+#line 6899 "TumblrPublishing.c"
 				}
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp46_ = request_data;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp47_ = request_arguments;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp47__length1 = request_arguments_length1;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp48_ = i;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp49_ = _tmp47_[_tmp48_];
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp50_ = _tmp49_->key;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp51_ = g_strconcat (_tmp50_, "=", NULL);
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp52_ = _tmp51_;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp53_ = request_arguments;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp53__length1 = request_arguments_length1;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp54_ = i;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp55_ = _tmp53_[_tmp54_];
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp56_ = _tmp55_->value;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp57_ = g_strconcat (_tmp52_, _tmp56_, NULL);
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp58_ = _tmp57_;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp59_ = g_strconcat (_tmp46_, _tmp58_, NULL);
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_free0 (request_data);
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				request_data = _tmp59_;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_free0 (_tmp58_);
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp52_);
 #line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+				_g_free0 (_tmp52_);
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp60_ = i;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp61_ = request_arguments;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp61__length1 = request_arguments_length1;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (_tmp60_ < (_tmp61__length1 - 1)) {
-#line 6929 "TumblrPublishing.c"
+#line 6949 "TumblrPublishing.c"
 					const gchar* _tmp62_ = NULL;
 					gchar* _tmp63_ = NULL;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp62_ = request_data;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp63_ = g_strconcat (_tmp62_, "&", NULL);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_g_free0 (request_data);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					request_data = _tmp63_;
-#line 6940 "TumblrPublishing.c"
+#line 6960 "TumblrPublishing.c"
 				}
 			}
 		}
 	}
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp64_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp65_ = _tmp64_;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp66_ = soup_message_new ("POST", _tmp65_);
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp67_ = _tmp66_;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp65_);
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	outbound_message = _tmp67_;
 #line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	outbound_message = _tmp67_;
+#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp68_ = outbound_message;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp69_ = request_data;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp70_ = string_get_data (_tmp69_, &_tmp70__length1);
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp71_ = _tmp70_;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp71__length1 = _tmp70__length1;
-#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	soup_message_set_request (_tmp68_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp71_, (gsize) _tmp71__length1);
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp72_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction)->message_headers;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp73_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	i = _tmp73_;
 #line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	i = _tmp73_;
+#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp74_ = i;
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp75_ = gee_map_iterator_next (_tmp74_);
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	cont = _tmp75_;
 #line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	cont = _tmp75_;
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	while (TRUE) {
-#line 6983 "TumblrPublishing.c"
+#line 7003 "TumblrPublishing.c"
 		gboolean _tmp76_ = FALSE;
 		SoupMessage* _tmp77_ = NULL;
 		SoupMessageHeaders* _tmp78_ = NULL;
@@ -7010,142 +7030,142 @@ static void publishing_tumblr_tumblr_publisher_upload_transaction_real_execute (
 		gchar* _tmp84_ = NULL;
 		GeeMapIterator* _tmp85_ = NULL;
 		gboolean _tmp86_ = FALSE;
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp76_ = cont;
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (!_tmp76_) {
-#line 986 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			break;
-#line 7001 "TumblrPublishing.c"
+#line 7021 "TumblrPublishing.c"
 		}
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp77_ = outbound_message;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp78_ = _tmp77_->request_headers;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp79_ = i;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp80_ = gee_map_iterator_get_key (_tmp79_);
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp81_ = (gchar*) _tmp80_;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp82_ = i;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp83_ = gee_map_iterator_get_value (_tmp82_);
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp84_ = (gchar*) _tmp83_;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		soup_message_headers_append (_tmp78_, _tmp81_, _tmp84_);
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (_tmp84_);
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		_g_free0 (_tmp81_);
 #line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		_g_free0 (_tmp81_);
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp85_ = i;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp86_ = gee_map_iterator_next (_tmp85_);
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		cont = _tmp86_;
-#line 7031 "TumblrPublishing.c"
+#line 7051 "TumblrPublishing.c"
 	}
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp87_ = outbound_message;
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp87_);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_object_unref0 (i);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_object_unref0 (outbound_message);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_free0 (request_data);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_free0 (authorization_header);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_free0 (payload);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 7061 "TumblrPublishing.c"
+#line 7081 "TumblrPublishing.c"
 		} else {
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_object_unref0 (i);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_object_unref0 (outbound_message);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_free0 (request_data);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_free0 (authorization_header);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_g_free0 (payload);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			return;
-#line 7081 "TumblrPublishing.c"
+#line 7101 "TumblrPublishing.c"
 		}
 	}
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_object_unref0 (i);
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_object_unref0 (outbound_message);
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (request_data);
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (authorization_header);
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (payload);
-#line 7096 "TumblrPublishing.c"
+#line 7116 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_upload_transaction_class_init (PublishingTumblrTumblrPublisherUploadTransactionClass * klass) {
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_upload_transaction_finalize;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploadTransactionPrivate));
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_tumblr_tumblr_publisher_upload_transaction_real_execute;
-#line 7109 "TumblrPublishing.c"
+#line 7129 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_upload_transaction_instance_init (PublishingTumblrTumblrPublisherUploadTransaction * self) {
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 7116 "TumblrPublishing.c"
+#line 7136 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingTumblrTumblrPublisherUploadTransaction * self;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_publishing_rest_support_session_unref0 (self->priv->session);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION, PublishingTumblrTumblrPublisherUploadTransaction);
 #line 875 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	_publishing_rest_support_session_unref0 (self->priv->session);
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->auth_header_fields = (_vala_array_free (self->priv->auth_header_fields, self->priv->auth_header_fields_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_tumblr_tumblr_publisher_upload_transaction_parent_class)->finalize (obj);
-#line 7130 "TumblrPublishing.c"
+#line 7150 "TumblrPublishing.c"
 }
 
 
@@ -7168,36 +7188,36 @@ PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uplo
 	gint _tmp1__length1 = 0;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (session), NULL);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (blog_url != NULL, NULL);
 #line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_val_if_fail (blog_url != NULL, NULL);
+#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = session;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = publishables;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = (PublishingTumblrTumblrPublisherUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
 #line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self = (PublishingTumblrTumblrPublisherUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = blog_url;
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->priv->blog_url);
-#line 1004 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->blog_url = _tmp3_;
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 7175 "TumblrPublishing.c"
+#line 7195 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherUploader* publishing_tumblr_tumblr_publisher_uploader_new (PublishingTumblrTumblrPublisherSession* session, SpitPublishingPublishable** publishables, int publishables_length1, const gchar* blog_url) {
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_uploader_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, session, publishables, publishables_length1, blog_url);
-#line 7182 "TumblrPublishing.c"
+#line 7202 "TumblrPublishing.c"
 }
 
 
@@ -7211,72 +7231,72 @@ static PublishingRESTSupportTransaction* publishing_tumblr_tumblr_publisher_uplo
 	const gchar* _tmp4_ = NULL;
 	PublishingTumblrTumblrPublisherUploadTransaction* _tmp5_ = NULL;
 	PublishingRESTSupportTransaction* _tmp6_ = NULL;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1011: Create upload transaction");
 #line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:1012: Create upload transaction");
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4_ = self->priv->blog_url;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = publishing_tumblr_tumblr_publisher_upload_transaction_new (_tmp1_, _tmp3_, _tmp4_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp6_;
-#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 7224 "TumblrPublishing.c"
+#line 7244 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_uploader_class_init (PublishingTumblrTumblrPublisherUploaderClass * klass) {
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_uploader_finalize;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherUploaderPrivate));
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_tumblr_tumblr_publisher_uploader_real_create_transaction;
-#line 7237 "TumblrPublishing.c"
+#line 7257 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_uploader_instance_init (PublishingTumblrTumblrPublisherUploader * self) {
 	gchar* _tmp0_ = NULL;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE (self);
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_UPLOADER_GET_PRIVATE (self);
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = g_strdup ("");
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->blog_url = _tmp0_;
-#line 7249 "TumblrPublishing.c"
+#line 7269 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingTumblrTumblrPublisherUploader * self;
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
 #line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOADER, PublishingTumblrTumblrPublisherUploader);
+#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->priv->blog_url);
-#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_tumblr_tumblr_publisher_uploader_parent_class)->finalize (obj);
-#line 7261 "TumblrPublishing.c"
+#line 7281 "TumblrPublishing.c"
 }
 
 
@@ -7294,18 +7314,18 @@ GType publishing_tumblr_tumblr_publisher_uploader_get_type (void) {
 
 PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_construct (GType object_type) {
 	PublishingTumblrTumblrPublisherSession* self = NULL;
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self = (PublishingTumblrTumblrPublisherSession*) publishing_rest_support_session_construct (object_type, PUBLISHING_TUMBLR_ENDPOINT_URL);
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self;
-#line 7283 "TumblrPublishing.c"
+#line 7303 "TumblrPublishing.c"
 }
 
 
 PublishingTumblrTumblrPublisherSession* publishing_tumblr_tumblr_publisher_session_new (void) {
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return publishing_tumblr_tumblr_publisher_session_construct (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION);
-#line 7290 "TumblrPublishing.c"
+#line 7310 "TumblrPublishing.c"
 }
 
 
@@ -7314,29 +7334,29 @@ static gboolean publishing_tumblr_tumblr_publisher_session_real_is_authenticated
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
 #line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = self->priv->access_phase_token;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp1_ != NULL) {
-#line 7305 "TumblrPublishing.c"
+#line 7325 "TumblrPublishing.c"
 		const gchar* _tmp2_ = NULL;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp2_ = self->priv->access_phase_token_secret;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 7311 "TumblrPublishing.c"
+#line 7331 "TumblrPublishing.c"
 	} else {
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp0_ = FALSE;
-#line 7315 "TumblrPublishing.c"
+#line 7335 "TumblrPublishing.c"
 	}
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp0_;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 7321 "TumblrPublishing.c"
+#line 7341 "TumblrPublishing.c"
 }
 
 
@@ -7345,70 +7365,70 @@ void publishing_tumblr_tumblr_publisher_session_authenticate_from_persistent_cre
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (token != NULL);
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (secret != NULL);
 #line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (secret != NULL);
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = token;
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token);
-#line 1035 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token = _tmp1_;
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->access_phase_token = _tmp1_;
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = secret;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token_secret);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->access_phase_token_secret = _tmp3_;
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 7354 "TumblrPublishing.c"
+#line 7374 "TumblrPublishing.c"
 }
 
 
 void publishing_tumblr_tumblr_publisher_session_deauthenticate (PublishingTumblrTumblrPublisherSession* self) {
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
+#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token);
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token = NULL;
 #line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->access_phase_token = NULL;
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token_secret);
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->access_phase_token_secret = NULL;
-#line 7369 "TumblrPublishing.c"
+#line 7389 "TumblrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 7376 "TumblrPublishing.c"
+#line 7396 "TumblrPublishing.c"
 }
 
 
 static void _vala_array_add23 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 7387 "TumblrPublishing.c"
+#line 7407 "TumblrPublishing.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7393 "TumblrPublishing.c"
+#line 7413 "TumblrPublishing.c"
 }
 
 
@@ -7470,89 +7490,89 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 	gchar* _tmp75_ = NULL;
 	const gchar* _tmp76_ = NULL;
 	PublishingTumblrTumblrPublisherUploadTransaction* _tmp77_ = NULL;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
 #line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = txn;
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	http_method = _tmp2_;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1050: signing transaction with parameters:");
 #line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:1051: signing transaction with parameters:");
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = http_method;
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL);
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1051: %s", _tmp5_);
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (_tmp5_);
 #line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	signing_key = NULL;
+	g_debug ("TumblrPublishing.vala:1052: %s", _tmp5_);
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	_g_free0 (_tmp5_);
 #line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	signing_key = NULL;
+#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp6_ = self->priv->access_phase_token_secret;
-#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp6_ != NULL) {
-#line 7485 "TumblrPublishing.c"
+#line 7505 "TumblrPublishing.c"
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:1054: access phase token secret available; using" \
+#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		g_debug ("TumblrPublishing.vala:1055: access phase token secret available; using" \
 " it as signing key");
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp7_ = publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret (self);
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp9_ = g_strconcat (PUBLISHING_TUMBLR_API_SECRET "&", _tmp8_, NULL);
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (signing_key);
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		signing_key = _tmp9_;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 7503 "TumblrPublishing.c"
+#line 7523 "TumblrPublishing.c"
 	} else {
 		gchar* _tmp10_ = NULL;
-#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:1058: %s", "Access phase token secret not available; using API " "key as signing key");
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		g_debug ("TumblrPublishing.vala:1059: %s", "Access phase token secret not available; using API " "key as signing key");
+#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp10_ = g_strdup (PUBLISHING_TUMBLR_API_SECRET "&");
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_g_free0 (signing_key);
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		signing_key = _tmp10_;
-#line 7514 "TumblrPublishing.c"
+#line 7534 "TumblrPublishing.c"
 	}
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp11_ = txn;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp13_ = publishing_rest_support_transaction_get_arguments (_tmp11_, &_tmp12_);
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	base_string_arguments = _tmp13_;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	base_string_arguments_length1 = _tmp12_;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_base_string_arguments_size_ = base_string_arguments_length1;
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp14_ = txn;
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp15_ = _publishing_rest_support_transaction_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_UPLOAD_TRANSACTION) ? ((PublishingTumblrTumblrPublisherUploadTransaction*) _tmp14_) : NULL);
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	upload_txn = _tmp15_;
 #line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	upload_txn = _tmp15_;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp16_ = upload_txn;
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp16_ != NULL) {
-#line 7536 "TumblrPublishing.c"
+#line 7556 "TumblrPublishing.c"
 		PublishingRESTSupportArgument** auth_header_args = NULL;
 		PublishingTumblrTumblrPublisherUploadTransaction* _tmp17_ = NULL;
 		gint _tmp18_ = 0;
@@ -7561,97 +7581,97 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 		gint _auth_header_args_size_ = 0;
 		PublishingRESTSupportArgument** _tmp20_ = NULL;
 		gint _tmp20__length1 = 0;
-#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-		g_debug ("TumblrPublishing.vala:1069: %s", "this transaction is an UploadTransaction; including Authorization head" \
+#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+		g_debug ("TumblrPublishing.vala:1070: %s", "this transaction is an UploadTransaction; including Authorization head" \
 "er " "fields in signature base string");
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp17_ = upload_txn;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp19_ = publishing_tumblr_tumblr_publisher_upload_transaction_get_authorization_header_fields (_tmp17_, &_tmp18_);
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		auth_header_args = _tmp19_;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		auth_header_args_length1 = _tmp18_;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1073 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_auth_header_args_size_ = auth_header_args_length1;
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp20_ = auth_header_args;
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp20__length1 = auth_header_args_length1;
-#line 7561 "TumblrPublishing.c"
+#line 7581 "TumblrPublishing.c"
 		{
 			PublishingRESTSupportArgument** arg_collection = NULL;
 			gint arg_collection_length1 = 0;
 			gint _arg_collection_size_ = 0;
 			gint arg_it = 0;
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			arg_collection = _tmp20_;
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			arg_collection_length1 = _tmp20__length1;
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			for (arg_it = 0; arg_it < _tmp20__length1; arg_it = arg_it + 1) {
-#line 7573 "TumblrPublishing.c"
+#line 7593 "TumblrPublishing.c"
 				PublishingRESTSupportArgument* _tmp21_ = NULL;
 				PublishingRESTSupportArgument* arg = NULL;
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp21_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				arg = _tmp21_;
-#line 7580 "TumblrPublishing.c"
+#line 7600 "TumblrPublishing.c"
 				{
 					PublishingRESTSupportArgument** _tmp22_ = NULL;
 					gint _tmp22__length1 = 0;
 					PublishingRESTSupportArgument* _tmp23_ = NULL;
 					PublishingRESTSupportArgument* _tmp24_ = NULL;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp22_ = base_string_arguments;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp22__length1 = base_string_arguments_length1;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp23_ = arg;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp24_ = _publishing_rest_support_argument_ref0 (_tmp23_);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_vala_array_add23 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp24_);
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_publishing_rest_support_argument_unref0 (arg);
-#line 7598 "TumblrPublishing.c"
+#line 7618 "TumblrPublishing.c"
 				}
 			}
 		}
-#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		auth_header_args = (_vala_array_free (auth_header_args, auth_header_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 7604 "TumblrPublishing.c"
+#line 7624 "TumblrPublishing.c"
 	}
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp25_ = base_string_arguments;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp25__length1 = base_string_arguments_length1;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp27_ = publishing_rest_support_argument_sort (_tmp25_, _tmp25__length1, &_tmp26_);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	sorted_args = _tmp27_;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	sorted_args_length1 = _tmp26_;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_sorted_args_size_ = sorted_args_length1;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp28_ = g_strdup ("");
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	arguments_string = _tmp28_;
-#line 7622 "TumblrPublishing.c"
+#line 7642 "TumblrPublishing.c"
 	{
 		gint i = 0;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		i = 0;
-#line 7627 "TumblrPublishing.c"
+#line 7647 "TumblrPublishing.c"
 		{
 			gboolean _tmp29_ = FALSE;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			_tmp29_ = TRUE;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 			while (TRUE) {
-#line 7634 "TumblrPublishing.c"
+#line 7654 "TumblrPublishing.c"
 				gint _tmp31_ = 0;
 				PublishingRESTSupportArgument** _tmp32_ = NULL;
 				gint _tmp32__length1 = 0;
@@ -7674,216 +7694,216 @@ void publishing_tumblr_tumblr_publisher_session_sign_transaction (PublishingTumb
 				gint _tmp47_ = 0;
 				PublishingRESTSupportArgument** _tmp48_ = NULL;
 				gint _tmp48__length1 = 0;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (!_tmp29_) {
-#line 7659 "TumblrPublishing.c"
+#line 7679 "TumblrPublishing.c"
 					gint _tmp30_ = 0;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp30_ = i;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					i = _tmp30_ + 1;
-#line 7665 "TumblrPublishing.c"
+#line 7685 "TumblrPublishing.c"
 				}
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp29_ = FALSE;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp31_ = i;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp32_ = sorted_args;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp32__length1 = sorted_args_length1;
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (!(_tmp31_ < _tmp32__length1)) {
-#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					break;
-#line 7679 "TumblrPublishing.c"
+#line 7699 "TumblrPublishing.c"
 				}
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp33_ = arguments_string;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp34_ = sorted_args;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp34__length1 = sorted_args_length1;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp35_ = i;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp36_ = _tmp34_[_tmp35_];
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp37_ = _tmp36_->key;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp38_ = g_strconcat (_tmp37_, "=", NULL);
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp39_ = _tmp38_;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp40_ = sorted_args;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp40__length1 = sorted_args_length1;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp41_ = i;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp42_ = _tmp40_[_tmp41_];
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp43_ = _tmp42_->value;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp44_ = g_strconcat (_tmp39_, _tmp43_, NULL);
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp45_ = _tmp44_;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp46_ = g_strconcat (_tmp33_, _tmp45_, NULL);
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_free0 (arguments_string);
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				arguments_string = _tmp46_;
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_g_free0 (_tmp45_);
-#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-				_g_free0 (_tmp39_);
 #line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+				_g_free0 (_tmp39_);
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp47_ = i;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp48_ = sorted_args;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				_tmp48__length1 = sorted_args_length1;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 				if (_tmp47_ < (_tmp48__length1 - 1)) {
-#line 7729 "TumblrPublishing.c"
+#line 7749 "TumblrPublishing.c"
 					const gchar* _tmp49_ = NULL;
 					gchar* _tmp50_ = NULL;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp49_ = arguments_string;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_tmp50_ = g_strconcat (_tmp49_, "&", NULL);
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					_g_free0 (arguments_string);
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 					arguments_string = _tmp50_;
-#line 7740 "TumblrPublishing.c"
+#line 7760 "TumblrPublishing.c"
 				}
 			}
 		}
 	}
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp51_ = http_method;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp52_ = g_strconcat (_tmp51_, "&", NULL);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp53_ = _tmp52_;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp54_ = txn;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp55_ = publishing_rest_support_transaction_get_endpoint_url (_tmp54_);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp56_ = _tmp55_;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp57_ = soup_uri_encode (_tmp56_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp58_ = _tmp57_;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp59_ = g_strconcat (_tmp53_, _tmp58_, NULL);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp60_ = _tmp59_;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp61_ = g_strconcat (_tmp60_, "&", NULL);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp62_ = _tmp61_;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp63_ = arguments_string;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp64_ = soup_uri_encode (_tmp63_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp65_ = _tmp64_;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp66_ = g_strconcat (_tmp62_, _tmp65_, NULL);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp67_ = _tmp66_;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp65_);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp62_);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp60_);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp58_);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp56_);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp53_);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	signature_base_string = _tmp67_;
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp68_ = signature_base_string;
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1094: signature base string = '%s'", _tmp68_);
 #line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:1095: signature base string = '%s'", _tmp68_);
+#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp69_ = signing_key;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1095: signing key = '%s'", _tmp69_);
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:1096: signing key = '%s'", _tmp69_);
+#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp70_ = signing_key;
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp71_ = signature_base_string;
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp72_ = publishing_rest_support_hmac_sha1 (_tmp70_, _tmp71_);
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	signature = _tmp72_;
 #line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	signature = _tmp72_;
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp73_ = signature;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1099: signature = '%s'", _tmp73_);
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:1100: signature = '%s'", _tmp73_);
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp74_ = signature;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp75_ = soup_uri_encode (_tmp74_, PUBLISHING_TUMBLR_ENCODE_RFC_3986_EXTRA);
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (signature);
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	signature = _tmp75_;
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp76_ = signature;
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_debug ("TumblrPublishing.vala:1102: signature after RFC encode = '%s'", _tmp76_);
-#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_debug ("TumblrPublishing.vala:1103: signature after RFC encode = '%s'", _tmp76_);
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp77_ = upload_txn;
-#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	if (_tmp77_ != NULL) {
-#line 7829 "TumblrPublishing.c"
+#line 7849 "TumblrPublishing.c"
 		PublishingTumblrTumblrPublisherUploadTransaction* _tmp78_ = NULL;
 		const gchar* _tmp79_ = NULL;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp78_ = upload_txn;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp79_ = signature;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_tumblr_tumblr_publisher_upload_transaction_add_authorization_header_field (_tmp78_, "oauth_signature", _tmp79_);
-#line 7838 "TumblrPublishing.c"
+#line 7858 "TumblrPublishing.c"
 	} else {
 		PublishingRESTSupportTransaction* _tmp80_ = NULL;
 		const gchar* _tmp81_ = NULL;
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp80_ = txn;
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		_tmp81_ = signature;
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 		publishing_rest_support_transaction_add_argument (_tmp80_, "oauth_signature", _tmp81_);
-#line 7848 "TumblrPublishing.c"
+#line 7868 "TumblrPublishing.c"
 	}
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (signature);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (signature_base_string);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (arguments_string);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	sorted_args = (_vala_array_free (sorted_args, sorted_args_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (upload_txn);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	base_string_arguments = (_vala_array_free (base_string_arguments, base_string_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (signing_key);
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (http_method);
-#line 7866 "TumblrPublishing.c"
+#line 7886 "TumblrPublishing.c"
 }
 
 
@@ -7892,31 +7912,31 @@ void publishing_tumblr_tumblr_publisher_session_set_access_phase_credentials (Pu
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self));
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_return_if_fail (token != NULL);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_if_fail (secret != NULL);
 #line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_if_fail (secret != NULL);
+#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = token;
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token);
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token = _tmp1_;
 #line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->access_phase_token = _tmp1_;
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = secret;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token_secret);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->access_phase_token_secret = _tmp3_;
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 7899 "TumblrPublishing.c"
+#line 7919 "TumblrPublishing.c"
 }
 
 
@@ -7924,17 +7944,17 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token (Publis
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
 #line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->access_phase_token;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp1_;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 7917 "TumblrPublishing.c"
+#line 7937 "TumblrPublishing.c"
 }
 
 
@@ -7942,17 +7962,17 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_access_phase_token_secret
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
 #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = self->priv->access_phase_token_secret;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp1_;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 7935 "TumblrPublishing.c"
+#line 7955 "TumblrPublishing.c"
 }
 
 
@@ -7971,47 +7991,47 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_nonce (PublishingTum
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
 #line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_get_current_time (&currtime);
+	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
 #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_get_current_time (&currtime);
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_get_current_time (&currtime);
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = currtime;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = _tmp0_.tv_sec;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = g_strdup_printf ("%li", _tmp1_);
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4_ = currtime;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp5_ = _tmp4_.tv_usec;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp6_ = g_strdup_printf ("%li", _tmp5_);
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL);
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1);
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp11_ = _tmp10_;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp11_;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 7994 "TumblrPublishing.c"
+#line 8014 "TumblrPublishing.c"
 }
 
 
@@ -8034,7 +8054,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 8017 "TumblrPublishing.c"
+#line 8037 "TumblrPublishing.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -8042,7 +8062,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8025 "TumblrPublishing.c"
+#line 8045 "TumblrPublishing.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -8054,7 +8074,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 8037 "TumblrPublishing.c"
+#line 8057 "TumblrPublishing.c"
 	}
 }
 
@@ -8078,21 +8098,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 8061 "TumblrPublishing.c"
+#line 8081 "TumblrPublishing.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 8067 "TumblrPublishing.c"
+#line 8087 "TumblrPublishing.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 8071 "TumblrPublishing.c"
+#line 8091 "TumblrPublishing.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 8075 "TumblrPublishing.c"
+#line 8095 "TumblrPublishing.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -8104,7 +8124,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 8087 "TumblrPublishing.c"
+#line 8107 "TumblrPublishing.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -8114,13 +8134,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 8097 "TumblrPublishing.c"
+#line 8117 "TumblrPublishing.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 8103 "TumblrPublishing.c"
+#line 8123 "TumblrPublishing.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -8134,7 +8154,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 8117 "TumblrPublishing.c"
+#line 8137 "TumblrPublishing.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -8144,13 +8164,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 8127 "TumblrPublishing.c"
+#line 8147 "TumblrPublishing.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 8133 "TumblrPublishing.c"
+#line 8153 "TumblrPublishing.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8159,7 +8179,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 8142 "TumblrPublishing.c"
+#line 8162 "TumblrPublishing.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -8179,7 +8199,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 8162 "TumblrPublishing.c"
+#line 8182 "TumblrPublishing.c"
 }
 
 
@@ -8190,63 +8210,63 @@ gchar* publishing_tumblr_tumblr_publisher_session_get_oauth_timestamp (Publishin
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_IS_SESSION (self), NULL);
+#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp0_ = g_get_real_time ();
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (_tmp2_);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	result = _tmp4_;
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	return result;
-#line 8191 "TumblrPublishing.c"
+#line 8211 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_session_class_init (PublishingTumblrTumblrPublisherSessionClass * klass) {
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	publishing_tumblr_tumblr_publisher_session_parent_class = g_type_class_peek_parent (klass);
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_tumblr_tumblr_publisher_session_finalize;
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherSessionPrivate));
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_tumblr_tumblr_publisher_session_real_is_authenticated;
-#line 8204 "TumblrPublishing.c"
+#line 8224 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_session_instance_init (PublishingTumblrTumblrPublisherSession * self) {
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_GET_PRIVATE (self);
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self->priv->access_phase_token = NULL;
+	self->priv = PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_SESSION_GET_PRIVATE (self);
 #line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	self->priv->access_phase_token = NULL;
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->access_phase_token_secret = NULL;
-#line 8215 "TumblrPublishing.c"
+#line 8235 "TumblrPublishing.c"
 }
 
 
 static void publishing_tumblr_tumblr_publisher_session_finalize (PublishingRESTSupportSession* obj) {
 	PublishingTumblrTumblrPublisherSession * self;
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
 #line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_TUMBLR_TUMBLR_PUBLISHER_TYPE_SESSION, PublishingTumblrTumblrPublisherSession);
 #line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+	_g_free0 (self->priv->access_phase_token);
+#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token_secret);
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_tumblr_tumblr_publisher_session_parent_class)->finalize (obj);
-#line 8229 "TumblrPublishing.c"
+#line 8249 "TumblrPublishing.c"
 }
 
 
@@ -8273,7 +8293,7 @@ static void publishing_tumblr_tumblr_publisher_class_init (PublishingTumblrTumbl
 	g_type_class_add_private (klass, sizeof (PublishingTumblrTumblrPublisherPrivate));
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_tumblr_tumblr_publisher_finalize;
-#line 8256 "TumblrPublishing.c"
+#line 8276 "TumblrPublishing.c"
 }
 
 
@@ -8288,7 +8308,7 @@ static void publishing_tumblr_tumblr_publisher_spit_publishing_publisher_interfa
 	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_tumblr_tumblr_publisher_real_start;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_tumblr_tumblr_publisher_real_stop;
-#line 8271 "TumblrPublishing.c"
+#line 8291 "TumblrPublishing.c"
 }
 
 
@@ -8322,7 +8342,7 @@ static void publishing_tumblr_tumblr_publisher_instance_init (PublishingTumblrTu
 	_tmp0_ = g_strdup ("");
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	self->priv->username = _tmp0_;
-#line 8305 "TumblrPublishing.c"
+#line 8325 "TumblrPublishing.c"
 }
 
 
@@ -8362,7 +8382,7 @@ static void publishing_tumblr_tumblr_publisher_finalize (GObject* obj) {
 	_g_free0 (self->priv->username);
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
 	G_OBJECT_CLASS (publishing_tumblr_tumblr_publisher_parent_class)->finalize (obj);
-#line 8345 "TumblrPublishing.c"
+#line 8365 "TumblrPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.vala b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
index bc6fcec..183bc31 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.vala
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
@@ -308,7 +308,7 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
             
             if (split_pair.length != 2)
                 host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                    _("“%s” isn’t a valid response to an OAuth authentication request")));
+                    _("“%s” isn’t a valid response to an OAuth authentication request"), response));
 
             if (split_pair[0] == "oauth_token")
                 oauth_token = split_pair[1];
@@ -318,7 +318,7 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
         
         if (oauth_token == null || oauth_token_secret == null)
             host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                _("“%s” isn’t a valid response to an OAuth authentication request")));
+                _("“%s” isn’t a valid response to an OAuth authentication request"), response));
         
         session.set_access_phase_credentials(oauth_token, oauth_token_secret);
     }
@@ -602,7 +602,7 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
             builder = new Gtk.Builder();
             builder.add_from_resource (Resources.RESOURCE_PATH + "/tumblr_authentication_pane.ui");
             builder.connect_signals(null);
-            Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment;
+            var content = builder.get_object ("content") as Gtk.Widget;
             
             Gtk.Label message_label = builder.get_object("message_label") as Gtk.Label;
             switch (mode) {
@@ -628,7 +628,8 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
             password_entry.changed.connect(on_password_changed);
             login_button.clicked.connect(on_login_button_clicked);
 
-            align.reparent(pane_widget);
+            content.parent.remove (content);
+            pane_widget.add (content);
             publisher.get_host().set_dialog_default_widget(login_button);
         } catch (Error e) {
             warning(_("Could not load UI: %s"), e.message);
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c
index 4e9b0a1..fb0a65b 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.c
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.c
@@ -386,6 +386,7 @@ enum  {
 	PUBLISHING_YANDEX_UPLOAD_TRANSACTION_DUMMY_PROPERTY
 };
 static void _vala_SoupMultipart_free (SoupMultipart* self);
+static guint8* _vala_array_dup10 (guint8* self, int length);
 static void _g_free0_ (gpointer var);
 static void _vala_SoupBuffer_free (SoupBuffer* self);
 #define PUBLISHING_YANDEX_YANDEX_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisherPrivate))
@@ -462,7 +463,7 @@ static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 466 "YandexPublishing.c"
+#line 467 "YandexPublishing.c"
 }
 
 
@@ -475,7 +476,7 @@ static const gchar* yandex_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.yandex-fotki";
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 479 "YandexPublishing.c"
+#line 480 "YandexPublishing.c"
 }
 
 
@@ -488,7 +489,7 @@ static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Yandex.Fotki";
 #line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 492 "YandexPublishing.c"
+#line 493 "YandexPublishing.c"
 }
 
 
@@ -555,7 +556,7 @@ static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	_g_free0 ((*info).license);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	(*info).license = _tmp8_;
-#line 559 "YandexPublishing.c"
+#line 560 "YandexPublishing.c"
 }
 
 
@@ -576,7 +577,7 @@ static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 580 "YandexPublishing.c"
+#line 581 "YandexPublishing.c"
 }
 
 
@@ -589,7 +590,7 @@ static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 593 "YandexPublishing.c"
+#line 594 "YandexPublishing.c"
 }
 
 
@@ -597,7 +598,7 @@ static void yandex_service_real_activation (SpitPluggable* base, gboolean enable
 	YandexService * self;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
-#line 601 "YandexPublishing.c"
+#line 602 "YandexPublishing.c"
 }
 
 
@@ -607,21 +608,21 @@ YandexService* yandex_service_construct (GType object_type) {
 	self = (YandexService*) g_object_new (object_type, NULL);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 611 "YandexPublishing.c"
+#line 612 "YandexPublishing.c"
 }
 
 
 YandexService* yandex_service_new (void) {
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return yandex_service_construct (TYPE_YANDEX_SERVICE);
-#line 618 "YandexPublishing.c"
+#line 619 "YandexPublishing.c"
 }
 
 
 static void yandex_service_class_init (YandexServiceClass * klass) {
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	yandex_service_parent_class = g_type_class_peek_parent (klass);
-#line 625 "YandexPublishing.c"
+#line 626 "YandexPublishing.c"
 }
 
 
@@ -638,7 +639,7 @@ static void yandex_service_spit_pluggable_interface_init (SpitPluggableIface * i
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) yandex_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) yandex_service_real_activation;
-#line 642 "YandexPublishing.c"
+#line 643 "YandexPublishing.c"
 }
 
 
@@ -649,7 +650,7 @@ static void yandex_service_spit_publishing_service_interface_init (SpitPublishin
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) yandex_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) yandex_service_real_get_supported_media;
-#line 653 "YandexPublishing.c"
+#line 654 "YandexPublishing.c"
 }
 
 
@@ -694,14 +695,14 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (G
 	publishing_yandex_transaction_add_headers (self);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 698 "YandexPublishing.c"
+#line 699 "YandexPublishing.c"
 }
 
 
 PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) {
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_transaction_construct_with_url (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, url, method);
-#line 705 "YandexPublishing.c"
+#line 706 "YandexPublishing.c"
 }
 
 
@@ -724,7 +725,7 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp3_) {
-#line 728 "YandexPublishing.c"
+#line 729 "YandexPublishing.c"
 		PublishingRESTSupportSession* _tmp4_ = NULL;
 		PublishingYandexSession* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -753,7 +754,7 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
 		_publishing_rest_support_session_unref0 (_tmp5_);
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Connection", "close");
-#line 757 "YandexPublishing.c"
+#line 758 "YandexPublishing.c"
 	}
 }
 
@@ -774,14 +775,14 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct (GType obje
 	publishing_yandex_transaction_add_headers (self);
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 778 "YandexPublishing.c"
+#line 779 "YandexPublishing.c"
 }
 
 
 PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) {
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_transaction_construct (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, method);
-#line 785 "YandexPublishing.c"
+#line 786 "YandexPublishing.c"
 }
 
 
@@ -800,14 +801,14 @@ void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self,
 	_tmp1_ = type;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp0_, _tmp1_, (gulong) 0);
-#line 804 "YandexPublishing.c"
+#line 805 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_transaction_class_init (PublishingYandexTransactionClass * klass) {
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 811 "YandexPublishing.c"
+#line 812 "YandexPublishing.c"
 }
 
 
@@ -833,14 +834,14 @@ PublishingYandexSession* publishing_yandex_session_construct (GType object_type)
 	self = (PublishingYandexSession*) publishing_rest_support_session_construct (object_type, NULL);
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 837 "YandexPublishing.c"
+#line 838 "YandexPublishing.c"
 }
 
 
 PublishingYandexSession* publishing_yandex_session_new (void) {
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_session_construct (PUBLISHING_YANDEX_TYPE_SESSION);
-#line 844 "YandexPublishing.c"
+#line 845 "YandexPublishing.c"
 }
 
 
@@ -856,7 +857,7 @@ static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTS
 	result = _tmp0_ != NULL;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 860 "YandexPublishing.c"
+#line 861 "YandexPublishing.c"
 }
 
 
@@ -867,7 +868,7 @@ void publishing_yandex_session_deauthenticate (PublishingYandexSession* self) {
 	_g_free0 (self->priv->auth_token);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = NULL;
-#line 871 "YandexPublishing.c"
+#line 872 "YandexPublishing.c"
 }
 
 
@@ -886,7 +887,7 @@ void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, co
 	_g_free0 (self->priv->auth_token);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = _tmp1_;
-#line 890 "YandexPublishing.c"
+#line 891 "YandexPublishing.c"
 }
 
 
@@ -904,7 +905,7 @@ gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self)
 	result = _tmp1_;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 908 "YandexPublishing.c"
+#line 909 "YandexPublishing.c"
 }
 
 
@@ -917,7 +918,7 @@ static void publishing_yandex_session_class_init (PublishingYandexSessionClass *
 	g_type_class_add_private (klass, sizeof (PublishingYandexSessionPrivate));
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_yandex_session_real_is_authenticated;
-#line 921 "YandexPublishing.c"
+#line 922 "YandexPublishing.c"
 }
 
 
@@ -926,7 +927,7 @@ static void publishing_yandex_session_instance_init (PublishingYandexSession * s
 	self->priv = PUBLISHING_YANDEX_SESSION_GET_PRIVATE (self);
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->auth_token = NULL;
-#line 930 "YandexPublishing.c"
+#line 931 "YandexPublishing.c"
 }
 
 
@@ -938,7 +939,7 @@ static void publishing_yandex_session_finalize (PublishingRESTSupportSession* ob
 	_g_free0 (self->priv->auth_token);
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_yandex_session_parent_class)->finalize (obj);
-#line 942 "YandexPublishing.c"
+#line 943 "YandexPublishing.c"
 }
 
 
@@ -965,14 +966,14 @@ PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType ob
 	self = (PublishingYandexWebAuthPane*) g_object_new (object_type, "login-uri", _tmp0_, "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, NULL);
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 969 "YandexPublishing.c"
+#line 970 "YandexPublishing.c"
 }
 
 
 PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url) {
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_web_auth_pane_construct (PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, login_url);
-#line 976 "YandexPublishing.c"
+#line 977 "YandexPublishing.c"
 }
 
 
@@ -981,7 +982,7 @@ static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_vie
 	result = publishing_yandex_web_auth_pane_on_decide_policy ((PublishingYandexWebAuthPane*) self, decision, type);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 985 "YandexPublishing.c"
+#line 986 "YandexPublishing.c"
 }
 
 
@@ -992,7 +993,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 	GError * _inner_error_ = NULL;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 996 "YandexPublishing.c"
+#line 997 "YandexPublishing.c"
 	{
 		GRegex* _tmp0_ = NULL;
 		GRegex* _tmp1_ = NULL;
@@ -1005,7 +1006,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1009 "YandexPublishing.c"
+#line 1010 "YandexPublishing.c"
 				goto __catch39_g_regex_error;
 			}
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1014,7 +1015,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 			g_clear_error (&_inner_error_);
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 1018 "YandexPublishing.c"
+#line 1019 "YandexPublishing.c"
 		}
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp2_ = _tmp0_;
@@ -1026,7 +1027,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		self->priv->re = _tmp2_;
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_regex_unref0 (_tmp0_);
-#line 1030 "YandexPublishing.c"
+#line 1031 "YandexPublishing.c"
 	}
 	goto __finally39;
 	__catch39_g_regex_error:
@@ -1040,7 +1041,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		g_assert_not_reached ();
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 1044 "YandexPublishing.c"
+#line 1045 "YandexPublishing.c"
 	}
 	__finally39:
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1051,7 +1052,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 		g_clear_error (&_inner_error_);
 #line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 1055 "YandexPublishing.c"
+#line 1056 "YandexPublishing.c"
 	}
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp3_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
@@ -1061,7 +1062,7 @@ static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
 	g_signal_connect_object (_tmp4_, "decide-policy", (GCallback) _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy, self, 0);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1065 "YandexPublishing.c"
+#line 1066 "YandexPublishing.c"
 }
 
 
@@ -1069,35 +1070,35 @@ static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCo
 	PublishingYandexWebAuthPane * self;
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 1073 "YandexPublishing.c"
+#line 1074 "YandexPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1080 "YandexPublishing.c"
+#line 1081 "YandexPublishing.c"
 }
 
 
 static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self) {
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return g_boxed_copy (webkit_navigation_action_get_type (), self);
-#line 1087 "YandexPublishing.c"
+#line 1088 "YandexPublishing.c"
 }
 
 
 static gpointer __vala_WebKitNavigationAction_copy0 (gpointer self) {
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self ? _vala_WebKitNavigationAction_copy (self) : NULL;
-#line 1094 "YandexPublishing.c"
+#line 1095 "YandexPublishing.c"
 }
 
 
 static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self) {
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_boxed_free (webkit_navigation_action_get_type (), self);
-#line 1101 "YandexPublishing.c"
+#line 1102 "YandexPublishing.c"
 }
 
 
@@ -1114,7 +1115,7 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 	switch (_tmp0_) {
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
-#line 1118 "YandexPublishing.c"
+#line 1119 "YandexPublishing.c"
 		{
 			WebKitNavigationPolicyDecision* n_decision = NULL;
 			WebKitPolicyDecision* _tmp1_ = NULL;
@@ -1183,7 +1184,7 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 			info = _tmp15_;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_tmp16_) {
-#line 1187 "YandexPublishing.c"
+#line 1188 "YandexPublishing.c"
 				gchar* access_token = NULL;
 				GMatchInfo* _tmp17_ = NULL;
 				gchar** _tmp18_ = NULL;
@@ -1223,7 +1224,7 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 				_tmp25_ = access_token;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp25_ != NULL) {
-#line 1227 "YandexPublishing.c"
+#line 1228 "YandexPublishing.c"
 					const gchar* _tmp26_ = NULL;
 					WebKitPolicyDecision* _tmp27_ = NULL;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1246,15 +1247,15 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 					_g_object_unref0 (n_decision);
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 1250 "YandexPublishing.c"
+#line 1251 "YandexPublishing.c"
 				} else {
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					g_signal_emit_by_name (self, "login-failed");
-#line 1254 "YandexPublishing.c"
+#line 1255 "YandexPublishing.c"
 				}
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_g_free0 (access_token);
-#line 1258 "YandexPublishing.c"
+#line 1259 "YandexPublishing.c"
 			}
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp28_ = decision;
@@ -1270,11 +1271,11 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 			_g_object_unref0 (n_decision);
 #line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			break;
-#line 1274 "YandexPublishing.c"
+#line 1275 "YandexPublishing.c"
 		}
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
-#line 1278 "YandexPublishing.c"
+#line 1279 "YandexPublishing.c"
 		{
 			WebKitPolicyDecision* _tmp29_ = NULL;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1283,7 +1284,7 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 			webkit_policy_decision_use (_tmp29_);
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			break;
-#line 1287 "YandexPublishing.c"
+#line 1288 "YandexPublishing.c"
 		}
 		default:
 		{
@@ -1291,14 +1292,14 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
 			result = FALSE;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return result;
-#line 1295 "YandexPublishing.c"
+#line 1296 "YandexPublishing.c"
 		}
 	}
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	result = TRUE;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1302 "YandexPublishing.c"
+#line 1303 "YandexPublishing.c"
 }
 
 
@@ -1317,14 +1318,14 @@ static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthP
 	g_signal_new ("login_succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_new ("login_failed", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1321 "YandexPublishing.c"
+#line 1322 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_web_auth_pane_instance_init (PublishingYandexWebAuthPane * self) {
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE (self);
-#line 1328 "YandexPublishing.c"
+#line 1329 "YandexPublishing.c"
 }
 
 
@@ -1336,7 +1337,7 @@ static void publishing_yandex_web_auth_pane_finalize (GObject* obj) {
 	_g_regex_unref0 (self->priv->re);
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (publishing_yandex_web_auth_pane_parent_class)->finalize (obj);
-#line 1340 "YandexPublishing.c"
+#line 1341 "YandexPublishing.c"
 }
 
 
@@ -1358,21 +1359,21 @@ PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GTy
 	self = (PublishingYandexPublishOptions*) g_type_create_instance (object_type);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 1362 "YandexPublishing.c"
+#line 1363 "YandexPublishing.c"
 }
 
 
 PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_publish_options_construct (PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS);
-#line 1369 "YandexPublishing.c"
+#line 1370 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_value_publish_options_init (GValue* value) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1376 "YandexPublishing.c"
+#line 1377 "YandexPublishing.c"
 }
 
 
@@ -1381,7 +1382,7 @@ static void publishing_yandex_value_publish_options_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_unref (value->data[0].v_pointer);
-#line 1385 "YandexPublishing.c"
+#line 1386 "YandexPublishing.c"
 	}
 }
 
@@ -1391,11 +1392,11 @@ static void publishing_yandex_value_publish_options_copy_value (const GValue* sr
 	if (src_value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_yandex_publish_options_ref (src_value->data[0].v_pointer);
-#line 1395 "YandexPublishing.c"
+#line 1396 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1399 "YandexPublishing.c"
+#line 1400 "YandexPublishing.c"
 	}
 }
 
@@ -1403,37 +1404,37 @@ static void publishing_yandex_value_publish_options_copy_value (const GValue* sr
 static gpointer publishing_yandex_value_publish_options_peek_pointer (const GValue* value) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1407 "YandexPublishing.c"
+#line 1408 "YandexPublishing.c"
 }
 
 
 static gchar* publishing_yandex_value_publish_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1414 "YandexPublishing.c"
+#line 1415 "YandexPublishing.c"
 		PublishingYandexPublishOptions* object;
 		object = collect_values[0].v_pointer;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1421 "YandexPublishing.c"
+#line 1422 "YandexPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1425 "YandexPublishing.c"
+#line 1426 "YandexPublishing.c"
 		}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = publishing_yandex_publish_options_ref (object);
-#line 1429 "YandexPublishing.c"
+#line 1430 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1433 "YandexPublishing.c"
+#line 1434 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return NULL;
-#line 1437 "YandexPublishing.c"
+#line 1438 "YandexPublishing.c"
 }
 
 
@@ -1444,25 +1445,25 @@ static gchar* publishing_yandex_value_publish_options_lcopy_value (const GValue*
 	if (!object_p) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1448 "YandexPublishing.c"
+#line 1449 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		*object_p = NULL;
-#line 1454 "YandexPublishing.c"
+#line 1455 "YandexPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1458 "YandexPublishing.c"
+#line 1459 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		*object_p = publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1462 "YandexPublishing.c"
+#line 1463 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return NULL;
-#line 1466 "YandexPublishing.c"
+#line 1467 "YandexPublishing.c"
 }
 
 
@@ -1476,7 +1477,7 @@ GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1480 "YandexPublishing.c"
+#line 1481 "YandexPublishing.c"
 }
 
 
@@ -1485,7 +1486,7 @@ gpointer publishing_yandex_value_get_publish_options (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1489 "YandexPublishing.c"
+#line 1490 "YandexPublishing.c"
 }
 
 
@@ -1505,17 +1506,17 @@ void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_obje
 		value->data[0].v_pointer = v_object;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1509 "YandexPublishing.c"
+#line 1510 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1513 "YandexPublishing.c"
+#line 1514 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (old) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_unref (old);
-#line 1519 "YandexPublishing.c"
+#line 1520 "YandexPublishing.c"
 	}
 }
 
@@ -1534,17 +1535,17 @@ void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_obj
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1538 "YandexPublishing.c"
+#line 1539 "YandexPublishing.c"
 	} else {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1542 "YandexPublishing.c"
+#line 1543 "YandexPublishing.c"
 	}
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (old) {
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_publish_options_unref (old);
-#line 1548 "YandexPublishing.c"
+#line 1549 "YandexPublishing.c"
 	}
 }
 
@@ -1554,7 +1555,7 @@ static void publishing_yandex_publish_options_class_init (PublishingYandexPublis
 	publishing_yandex_publish_options_parent_class = g_type_class_peek_parent (klass);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	((PublishingYandexPublishOptionsClass *) klass)->finalize = publishing_yandex_publish_options_finalize;
-#line 1558 "YandexPublishing.c"
+#line 1559 "YandexPublishing.c"
 }
 
 
@@ -1569,7 +1570,7 @@ static void publishing_yandex_publish_options_instance_init (PublishingYandexPub
 	self->destination_album_url = NULL;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->ref_count = 1;
-#line 1573 "YandexPublishing.c"
+#line 1574 "YandexPublishing.c"
 }
 
 
@@ -1585,7 +1586,7 @@ static void publishing_yandex_publish_options_finalize (PublishingYandexPublishO
 	_g_free0 (self->destination_album);
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (self->destination_album_url);
-#line 1589 "YandexPublishing.c"
+#line 1590 "YandexPublishing.c"
 }
 
 
@@ -1610,7 +1611,7 @@ gpointer publishing_yandex_publish_options_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return instance;
-#line 1614 "YandexPublishing.c"
+#line 1615 "YandexPublishing.c"
 }
 
 
@@ -1623,7 +1624,7 @@ void publishing_yandex_publish_options_unref (gpointer instance) {
 		PUBLISHING_YANDEX_PUBLISH_OPTIONS_GET_CLASS (self)->finalize (self);
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1627 "YandexPublishing.c"
+#line 1628 "YandexPublishing.c"
 	}
 }
 
@@ -1637,7 +1638,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_opti
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1641 "YandexPublishing.c"
+#line 1642 "YandexPublishing.c"
 }
 
 
@@ -1645,7 +1646,7 @@ static void publishing_yandex_publishing_options_pane_real_on_pane_installed (Sp
 	PublishingYandexPublishingOptionsPane * self;
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1649 "YandexPublishing.c"
+#line 1650 "YandexPublishing.c"
 }
 
 
@@ -1653,7 +1654,7 @@ static void publishing_yandex_publishing_options_pane_real_on_pane_uninstalled (
 	PublishingYandexPublishingOptionsPane * self;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1657 "YandexPublishing.c"
+#line 1658 "YandexPublishing.c"
 }
 
 
@@ -1672,21 +1673,21 @@ static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (Spi
 	result = _tmp1_;
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 1676 "YandexPublishing.c"
+#line 1677 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_on_publish_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1683 "YandexPublishing.c"
+#line 1684 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_publishing_options_pane_on_logout_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1690 "YandexPublishing.c"
+#line 1691 "YandexPublishing.c"
 }
 
 
@@ -1715,15 +1716,15 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 	_g_object_unref0 (self->priv->box);
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->box = _tmp1_;
-#line 1719 "YandexPublishing.c"
+#line 1720 "YandexPublishing.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
 		GtkBuilder* _tmp3_ = NULL;
 		GtkBuilder* _tmp4_ = NULL;
-		GtkAlignment* align = NULL;
+		GtkWidget* content = NULL;
 		GtkBuilder* _tmp5_ = NULL;
 		GObject* _tmp6_ = NULL;
-		GtkAlignment* _tmp7_ = NULL;
+		GtkWidget* _tmp7_ = NULL;
 		GtkBuilder* _tmp8_ = NULL;
 		GObject* _tmp9_ = NULL;
 		GtkComboBoxText* _tmp10_ = NULL;
@@ -1736,10 +1737,12 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		GtkButton* _tmp29_ = NULL;
 		GtkButton* _tmp30_ = NULL;
 		GtkButton* _tmp31_ = NULL;
-		GtkAlignment* _tmp32_ = NULL;
-		GtkBox* _tmp33_ = NULL;
-		GtkBox* _tmp34_ = NULL;
-		GtkAlignment* _tmp35_ = NULL;
+		GtkWidget* _tmp32_ = NULL;
+		GtkContainer* _tmp33_ = NULL;
+		GtkContainer* _tmp34_ = NULL;
+		GtkWidget* _tmp35_ = NULL;
+		GtkBox* _tmp36_ = NULL;
+		GtkWidget* _tmp37_ = NULL;
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp2_ = gtk_builder_new ();
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1752,7 +1755,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		gtk_builder_add_from_resource (_tmp3_, PLUGIN_RESOURCE_PATH "/yandex_publish_model.ui", &_inner_error_);
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1756 "YandexPublishing.c"
+#line 1759 "YandexPublishing.c"
 			goto __catch40_g_error;
 		}
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1762,11 +1765,11 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp5_ = self->priv->builder;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp6_ = gtk_builder_get_object (_tmp5_, "alignment");
+		_tmp6_ = gtk_builder_get_object (_tmp5_, "content");
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp6_) : NULL);
+		_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp6_) : NULL);
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		align = _tmp7_;
+		content = _tmp7_;
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp8_ = self->priv->builder;
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1777,7 +1780,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		_g_object_unref0 (self->priv->album_list);
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		self->priv->album_list = _tmp10_;
-#line 1781 "YandexPublishing.c"
+#line 1784 "YandexPublishing.c"
 		{
 			GeeIterator* _key_it = NULL;
 			GeeHashMap* _tmp11_ = NULL;
@@ -1804,7 +1807,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 			_key_it = _tmp16_;
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 1808 "YandexPublishing.c"
+#line 1811 "YandexPublishing.c"
 				GeeIterator* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
 				gchar* key = NULL;
@@ -1820,7 +1823,7 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 				if (!_tmp18_) {
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 1824 "YandexPublishing.c"
+#line 1827 "YandexPublishing.c"
 				}
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp19_ = _key_it;
@@ -1836,11 +1839,11 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 				gtk_combo_box_text_append_text (_tmp21_, _tmp22_);
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_g_free0 (key);
-#line 1840 "YandexPublishing.c"
+#line 1843 "YandexPublishing.c"
 			}
 #line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_g_object_unref0 (_key_it);
-#line 1844 "YandexPublishing.c"
+#line 1847 "YandexPublishing.c"
 		}
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp23_ = self->priv->album_list;
@@ -1875,40 +1878,44 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_signal_connect_object (_tmp31_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp32_ = align;
+		_tmp32_ = content;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp33_ = self->priv->box;
+		_tmp33_ = gtk_widget_get_parent (_tmp32_);
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
+		_tmp34_ = _tmp33_;
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+		_tmp35_ = content;
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+		gtk_container_remove (_tmp34_, _tmp35_);
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp34_ = self->priv->box;
+		_tmp36_ = self->priv->box;
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp35_ = align;
+		_tmp37_ = content;
 #line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		gtk_box_set_child_packing (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
+		gtk_box_pack_start (_tmp36_, _tmp37_, TRUE, TRUE, (guint) 0);
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_g_object_unref0 (align);
-#line 1892 "YandexPublishing.c"
+		_g_object_unref0 (content);
+#line 1899 "YandexPublishing.c"
 	}
 	goto __finally40;
 	__catch40_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp36_ = NULL;
-		const gchar* _tmp37_ = NULL;
+		GError* _tmp38_ = NULL;
+		const gchar* _tmp39_ = NULL;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		e = _inner_error_;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_inner_error_ = NULL;
 #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp36_ = e;
+		_tmp38_ = e;
 #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		_tmp37_ = _tmp36_->message;
+		_tmp39_ = _tmp38_->message;
 #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-		g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp37_);
+		g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp39_);
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 1912 "YandexPublishing.c"
+#line 1919 "YandexPublishing.c"
 	}
 	__finally40:
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -1919,18 +1926,18 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
 		g_clear_error (&_inner_error_);
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return NULL;
-#line 1923 "YandexPublishing.c"
+#line 1930 "YandexPublishing.c"
 	}
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 1927 "YandexPublishing.c"
+#line 1934 "YandexPublishing.c"
 }
 
 
 PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) {
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_publishing_options_pane_construct (PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, options, list, host);
-#line 1934 "YandexPublishing.c"
+#line 1941 "YandexPublishing.c"
 }
 
 
@@ -1939,7 +1946,7 @@ static void publishing_yandex_publishing_options_pane_on_logout_clicked (Publish
 	g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 1943 "YandexPublishing.c"
+#line 1950 "YandexPublishing.c"
 }
 
 
@@ -2040,7 +2047,7 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis
 	_g_object_unref0 (access_type);
 #line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (tmp);
-#line 2044 "YandexPublishing.c"
+#line 2051 "YandexPublishing.c"
 }
 
 
@@ -2055,7 +2062,7 @@ static void publishing_yandex_publishing_options_pane_class_init (PublishingYand
 	g_signal_new ("publish", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2059 "YandexPublishing.c"
+#line 2066 "YandexPublishing.c"
 }
 
 
@@ -2070,14 +2077,14 @@ static void publishing_yandex_publishing_options_pane_spit_publishing_dialog_pan
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_uninstalled;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_get_widget;
-#line 2074 "YandexPublishing.c"
+#line 2081 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_publishing_options_pane_instance_init (PublishingYandexPublishingOptionsPane * self) {
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 2081 "YandexPublishing.c"
+#line 2088 "YandexPublishing.c"
 }
 
 
@@ -2097,7 +2104,7 @@ static void publishing_yandex_publishing_options_pane_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->album_list);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (publishing_yandex_publishing_options_pane_parent_class)->finalize (obj);
-#line 2101 "YandexPublishing.c"
+#line 2108 "YandexPublishing.c"
 }
 
 
@@ -2139,14 +2146,14 @@ PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_typ
 	self->priv->options = _tmp2_;
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2143 "YandexPublishing.c"
+#line 2150 "YandexPublishing.c"
 }
 
 
 PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) {
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_uploader_construct (PUBLISHING_YANDEX_TYPE_UPLOADER, session, options, photos, photos_length1);
-#line 2150 "YandexPublishing.c"
+#line 2157 "YandexPublishing.c"
 }
 
 
@@ -2188,7 +2195,7 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_
 	result = _tmp6_;
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2192 "YandexPublishing.c"
+#line 2199 "YandexPublishing.c"
 }
 
 
@@ -2201,14 +2208,14 @@ static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass
 	g_type_class_add_private (klass, sizeof (PublishingYandexUploaderPrivate));
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_yandex_uploader_real_create_transaction;
-#line 2205 "YandexPublishing.c"
+#line 2212 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_uploader_instance_init (PublishingYandexUploader * self) {
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv = PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE (self);
-#line 2212 "YandexPublishing.c"
+#line 2219 "YandexPublishing.c"
 }
 
 
@@ -2218,7 +2225,7 @@ static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploa
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader);
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_yandex_uploader_parent_class)->finalize (obj);
-#line 2222 "YandexPublishing.c"
+#line 2229 "YandexPublishing.c"
 }
 
 
@@ -2238,7 +2245,7 @@ static gchar* bool_to_string (gboolean self) {
 	gchar* result = NULL;
 #line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (self) {
-#line 2242 "YandexPublishing.c"
+#line 2249 "YandexPublishing.c"
 		gchar* _tmp0_ = NULL;
 #line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = g_strdup ("true");
@@ -2246,7 +2253,7 @@ static gchar* bool_to_string (gboolean self) {
 		result = _tmp0_;
 #line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2250 "YandexPublishing.c"
+#line 2257 "YandexPublishing.c"
 	} else {
 		gchar* _tmp1_ = NULL;
 #line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2255,7 +2262,7 @@ static gchar* bool_to_string (gboolean self) {
 		result = _tmp1_;
 #line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2259 "YandexPublishing.c"
+#line 2266 "YandexPublishing.c"
 	}
 }
 
@@ -2263,7 +2270,7 @@ static gchar* bool_to_string (gboolean self) {
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 2267 "YandexPublishing.c"
+#line 2274 "YandexPublishing.c"
 }
 
 
@@ -2307,27 +2314,34 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 2311 "YandexPublishing.c"
+#line 2318 "YandexPublishing.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2317 "YandexPublishing.c"
+#line 2324 "YandexPublishing.c"
+}
+
+
+static guint8* _vala_array_dup10 (guint8* self, int length) {
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	return g_memdup (self, length * sizeof (guint8));
+#line 2331 "YandexPublishing.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	var = (g_free (var), NULL);
-#line 2324 "YandexPublishing.c"
+#line 2338 "YandexPublishing.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 2331 "YandexPublishing.c"
+#line 2345 "YandexPublishing.c"
 }
 
 
@@ -2369,36 +2383,38 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 	gint _tmp41__length1 = 0;
 	guint8* _tmp42_ = NULL;
 	gint _tmp42__length1 = 0;
-	SoupBuffer* _tmp43_ = NULL;
-	SpitPublishingPublishable* _tmp44_ = NULL;
-	GFile* _tmp45_ = NULL;
+	guint8* _tmp43_ = NULL;
+	gint _tmp43__length1 = 0;
+	SoupBuffer* _tmp44_ = NULL;
+	SpitPublishingPublishable* _tmp45_ = NULL;
 	GFile* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
+	GFile* _tmp47_ = NULL;
 	gchar* _tmp48_ = NULL;
+	gchar* _tmp49_ = NULL;
 	SoupMessageHeaders* image_part_header = NULL;
 	SoupBuffer* image_part_body = NULL;
-	SoupMessageHeaders* _tmp49_ = NULL;
-	SoupBuffer* _tmp50_ = NULL;
+	SoupMessageHeaders* _tmp50_ = NULL;
+	SoupBuffer* _tmp51_ = NULL;
 	GHashTable* _result_ = NULL;
-	GHashFunc _tmp51_ = NULL;
-	GEqualFunc _tmp52_ = NULL;
-	GHashTable* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
+	GHashFunc _tmp52_ = NULL;
+	GEqualFunc _tmp53_ = NULL;
+	GHashTable* _tmp54_ = NULL;
 	gchar* _tmp55_ = NULL;
 	gchar* _tmp56_ = NULL;
 	gchar* _tmp57_ = NULL;
-	SoupMessage* outbound_message = NULL;
 	gchar* _tmp58_ = NULL;
+	SoupMessage* outbound_message = NULL;
 	gchar* _tmp59_ = NULL;
-	SoupMessage* _tmp60_ = NULL;
+	gchar* _tmp60_ = NULL;
 	SoupMessage* _tmp61_ = NULL;
-	SoupMessageHeaders* _tmp62_ = NULL;
-	PublishingYandexSession* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
+	SoupMessage* _tmp62_ = NULL;
+	SoupMessageHeaders* _tmp63_ = NULL;
+	PublishingYandexSession* _tmp64_ = NULL;
 	gchar* _tmp65_ = NULL;
 	gchar* _tmp66_ = NULL;
 	gchar* _tmp67_ = NULL;
-	SoupMessageHeaders* _tmp68_ = NULL;
+	gchar* _tmp68_ = NULL;
+	SoupMessageHeaders* _tmp69_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
@@ -2484,7 +2500,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 	soup_multipart_append_form_string (message_parts, "access", _tmp25_);
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp25_);
-#line 2488 "YandexPublishing.c"
+#line 2504 "YandexPublishing.c"
 	{
 		SpitPublishingPublishable* _tmp26_ = NULL;
 		GFile* _tmp27_ = NULL;
@@ -2519,7 +2535,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 2523 "YandexPublishing.c"
+#line 2539 "YandexPublishing.c"
 				goto __catch41_g_file_error;
 			}
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2532,7 +2548,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 			g_clear_error (&_inner_error_);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return NULL;
-#line 2536 "YandexPublishing.c"
+#line 2552 "YandexPublishing.c"
 		}
 	}
 	goto __finally41;
@@ -2572,7 +2588,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 		_g_object_unref0 (_tmp35_);
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (e);
-#line 2576 "YandexPublishing.c"
+#line 2592 "YandexPublishing.c"
 	}
 	__finally41:
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2587,7 +2603,7 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 		g_clear_error (&_inner_error_);
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return NULL;
-#line 2591 "YandexPublishing.c"
+#line 2607 "YandexPublishing.c"
 	}
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp40_ = soup_multipart_get_length (message_parts);
@@ -2600,87 +2616,91 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp42__length1 = _tmp41__length1;
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp43_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp42_ + 0, ((gint) data_length) - 0);
+	_tmp43_ = (_tmp42_ != NULL) ? _vala_array_dup10 (_tmp42_, _tmp42__length1) : ((gpointer) _tmp42_);
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	bindable_data = _tmp43_;
+	_tmp43__length1 = _tmp42__length1;
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	_tmp44_ = soup_buffer_new_take (_tmp43_, _tmp43__length1);
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+	bindable_data = _tmp44_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp44_ = photo;
+	_tmp45_ = photo;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp45_ = spit_publishing_publishable_get_serialized_file (_tmp44_);
+	_tmp46_ = spit_publishing_publishable_get_serialized_file (_tmp45_);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp46_ = _tmp45_;
+	_tmp47_ = _tmp46_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp47_ = g_file_get_path (_tmp46_);
+	_tmp48_ = g_file_get_path (_tmp47_);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp48_ = _tmp47_;
+	_tmp49_ = _tmp48_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_multipart_append_form_file (message_parts, "", _tmp48_, "image/jpeg", bindable_data);
+	soup_multipart_append_form_file (message_parts, "", _tmp49_, "image/jpeg", bindable_data);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp48_);
+	_g_free0 (_tmp49_);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_object_unref0 (_tmp46_);
+	_g_object_unref0 (_tmp47_);
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_multipart_get_part (message_parts, image_part_num, &_tmp49_, &_tmp50_);
+	soup_multipart_get_part (message_parts, image_part_num, &_tmp50_, &_tmp51_);
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	image_part_header = _tmp49_;
+	image_part_header = _tmp50_;
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	image_part_body = _tmp50_;
+	image_part_body = _tmp51_;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp51_ = g_str_hash;
+	_tmp52_ = g_str_hash;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp52_ = g_str_equal;
+	_tmp53_ = g_str_equal;
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp53_ = g_hash_table_new_full (_tmp51_, _tmp52_, _g_free0_, _g_free0_);
+	_tmp54_ = g_hash_table_new_full (_tmp52_, _tmp53_, _g_free0_, _g_free0_);
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_result_ = _tmp53_;
+	_result_ = _tmp54_;
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp54_ = g_strdup ("name");
+	_tmp55_ = g_strdup ("name");
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp55_ = g_strdup ("image");
+	_tmp56_ = g_strdup ("image");
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_hash_table_insert (_result_, _tmp54_, _tmp55_);
+	g_hash_table_insert (_result_, _tmp55_, _tmp56_);
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp56_ = g_strdup ("filename");
+	_tmp57_ = g_strdup ("filename");
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp57_ = g_strdup ("unused");
+	_tmp58_ = g_strdup ("unused");
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	g_hash_table_insert (_result_, _tmp56_, _tmp57_);
+	g_hash_table_insert (_result_, _tmp57_, _tmp58_);
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	soup_message_headers_set_content_disposition (image_part_header, "form-data", _result_);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp58_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+	_tmp59_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp59_ = _tmp58_;
+	_tmp60_ = _tmp59_;
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp60_ = soup_form_request_new_from_multipart (_tmp59_, message_parts);
+	_tmp61_ = soup_form_request_new_from_multipart (_tmp60_, message_parts);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp61_ = _tmp60_;
+	_tmp62_ = _tmp61_;
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp59_);
+	_g_free0 (_tmp60_);
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	outbound_message = _tmp61_;
+	outbound_message = _tmp62_;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp62_ = outbound_message->request_headers;
+	_tmp63_ = outbound_message->request_headers;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp63_ = session;
+	_tmp64_ = session;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp64_ = publishing_yandex_session_get_auth_token (_tmp63_);
+	_tmp65_ = publishing_yandex_session_get_auth_token (_tmp64_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp65_ = _tmp64_;
+	_tmp66_ = _tmp65_;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp66_ = g_strdup_printf ("OAuth %s", _tmp65_);
+	_tmp67_ = g_strdup_printf ("OAuth %s", _tmp66_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp67_ = _tmp66_;
+	_tmp68_ = _tmp67_;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_message_headers_append (_tmp62_, "Authorization", _tmp67_);
+	soup_message_headers_append (_tmp63_, "Authorization", _tmp68_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp67_);
+	_g_free0 (_tmp68_);
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_g_free0 (_tmp65_);
+	_g_free0 (_tmp66_);
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	_tmp68_ = outbound_message->request_headers;
+	_tmp69_ = outbound_message->request_headers;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
-	soup_message_headers_append (_tmp68_, "Connection", "close");
+	soup_message_headers_append (_tmp69_, "Connection", "close");
 #line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2695,21 +2715,21 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
 	__vala_SoupMultipart_free0 (message_parts);
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2699 "YandexPublishing.c"
+#line 2719 "YandexPublishing.c"
 }
 
 
 PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) {
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_upload_transaction_construct (PUBLISHING_YANDEX_TYPE_UPLOAD_TRANSACTION, session, options, photo);
-#line 2706 "YandexPublishing.c"
+#line 2726 "YandexPublishing.c"
 }
 
 
 static void publishing_yandex_upload_transaction_class_init (PublishingYandexUploadTransactionClass * klass) {
 #line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2713 "YandexPublishing.c"
+#line 2733 "YandexPublishing.c"
 }
 
 
@@ -2770,14 +2790,14 @@ PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (G
 	self->priv->options = _tmp4_;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return self;
-#line 2774 "YandexPublishing.c"
+#line 2794 "YandexPublishing.c"
 }
 
 
 PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return publishing_yandex_yandex_publisher_construct (PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, service, host);
-#line 2781 "YandexPublishing.c"
+#line 2801 "YandexPublishing.c"
 }
 
 
@@ -2795,7 +2815,7 @@ gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingY
 	result = _tmp1_;
 #line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2799 "YandexPublishing.c"
+#line 2819 "YandexPublishing.c"
 }
 
 
@@ -2812,7 +2832,7 @@ void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYan
 	_tmp1_ = auth_token;
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", _tmp1_);
-#line 2816 "YandexPublishing.c"
+#line 2836 "YandexPublishing.c"
 }
 
 
@@ -2824,7 +2844,7 @@ void publishing_yandex_yandex_publisher_invalidate_persistent_session (Publishin
 	_tmp0_ = self->priv->host;
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token");
-#line 2828 "YandexPublishing.c"
+#line 2848 "YandexPublishing.c"
 }
 
 
@@ -2847,7 +2867,7 @@ gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (Pub
 	result = _tmp2_;
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2851 "YandexPublishing.c"
+#line 2871 "YandexPublishing.c"
 }
 
 
@@ -2863,7 +2883,7 @@ static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishi
 	result = _tmp0_;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2867 "YandexPublishing.c"
+#line 2887 "YandexPublishing.c"
 }
 
 
@@ -2882,7 +2902,7 @@ static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_servic
 	result = _tmp1_;
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2886 "YandexPublishing.c"
+#line 2906 "YandexPublishing.c"
 }
 
 
@@ -2896,7 +2916,7 @@ static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYande
 	result = NULL;
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 2900 "YandexPublishing.c"
+#line 2920 "YandexPublishing.c"
 }
 
 
@@ -2909,7 +2929,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 	title = NULL;
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	link = NULL;
-#line 2913 "YandexPublishing.c"
+#line 2933 "YandexPublishing.c"
 	{
 		xmlNode* c = NULL;
 		xmlNode* _tmp0_ = NULL;
@@ -2920,14 +2940,14 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 		_tmp1_ = _tmp0_->children;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		c = _tmp1_;
-#line 2924 "YandexPublishing.c"
+#line 2944 "YandexPublishing.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp2_ = TRUE;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 2931 "YandexPublishing.c"
+#line 2951 "YandexPublishing.c"
 				xmlNode* _tmp5_ = NULL;
 				xmlNode* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
@@ -2938,7 +2958,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 				const gchar* _tmp19_ = NULL;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (!_tmp2_) {
-#line 2942 "YandexPublishing.c"
+#line 2962 "YandexPublishing.c"
 					xmlNode* _tmp3_ = NULL;
 					xmlNode* _tmp4_ = NULL;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2947,7 +2967,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					_tmp4_ = _tmp3_->next;
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					c = _tmp4_;
-#line 2951 "YandexPublishing.c"
+#line 2971 "YandexPublishing.c"
 				}
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp2_ = FALSE;
@@ -2957,7 +2977,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 				if (!(_tmp5_ != NULL)) {
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 2961 "YandexPublishing.c"
+#line 2981 "YandexPublishing.c"
 				}
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp6_ = c;
@@ -2965,7 +2985,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 				_tmp7_ = _tmp6_->name;
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (g_strcmp0 (_tmp7_, "title") == 0) {
-#line 2969 "YandexPublishing.c"
+#line 2989 "YandexPublishing.c"
 					xmlNode* _tmp8_ = NULL;
 					gchar* _tmp9_ = NULL;
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -2976,7 +2996,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					_g_free0 (title);
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					title = _tmp9_;
-#line 2980 "YandexPublishing.c"
+#line 3000 "YandexPublishing.c"
 				}
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp11_ = c;
@@ -2984,7 +3004,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 				_tmp12_ = _tmp11_->name;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (g_strcmp0 (_tmp12_, "link") == 0) {
-#line 2988 "YandexPublishing.c"
+#line 3008 "YandexPublishing.c"
 					xmlNode* _tmp13_ = NULL;
 					gchar* _tmp14_ = NULL;
 					gchar* _tmp15_ = NULL;
@@ -2998,15 +3018,15 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					_tmp10_ = g_strcmp0 (_tmp15_, "photos") == 0;
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_g_free0 (_tmp15_);
-#line 3002 "YandexPublishing.c"
+#line 3022 "YandexPublishing.c"
 				} else {
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp10_ = FALSE;
-#line 3006 "YandexPublishing.c"
+#line 3026 "YandexPublishing.c"
 				}
 #line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp10_) {
-#line 3010 "YandexPublishing.c"
+#line 3030 "YandexPublishing.c"
 					xmlNode* _tmp16_ = NULL;
 					gchar* _tmp17_ = NULL;
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3017,27 +3037,27 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					_g_free0 (link);
 #line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					link = _tmp17_;
-#line 3021 "YandexPublishing.c"
+#line 3041 "YandexPublishing.c"
 				}
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp19_ = title;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp19_ != NULL) {
-#line 3027 "YandexPublishing.c"
+#line 3047 "YandexPublishing.c"
 					const gchar* _tmp20_ = NULL;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp20_ = link;
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp18_ = _tmp20_ != NULL;
-#line 3033 "YandexPublishing.c"
+#line 3053 "YandexPublishing.c"
 				} else {
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp18_ = FALSE;
-#line 3037 "YandexPublishing.c"
+#line 3057 "YandexPublishing.c"
 				}
 #line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (_tmp18_) {
-#line 3041 "YandexPublishing.c"
+#line 3061 "YandexPublishing.c"
 					const gchar* _tmp21_ = NULL;
 					const gchar* _tmp22_ = NULL;
 					GeeHashMap* _tmp23_ = NULL;
@@ -3067,7 +3087,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 					link = NULL;
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 3071 "YandexPublishing.c"
+#line 3091 "YandexPublishing.c"
 				}
 			}
 		}
@@ -3076,7 +3096,7 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
 	_g_free0 (link);
 #line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (title);
-#line 3080 "YandexPublishing.c"
+#line 3100 "YandexPublishing.c"
 }
 
 
@@ -3085,7 +3105,7 @@ static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest
 	result = publishing_yandex_yandex_publisher_check_response ((PublishingYandexYandexPublisher*) self, doc);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	return result;
-#line 3089 "YandexPublishing.c"
+#line 3109 "YandexPublishing.c"
 }
 
 
@@ -3116,7 +3136,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 			g_propagate_error (error, _inner_error_);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3120 "YandexPublishing.c"
+#line 3140 "YandexPublishing.c"
 		} else {
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3124,7 +3144,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 			g_clear_error (&_inner_error_);
 #line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3128 "YandexPublishing.c"
+#line 3148 "YandexPublishing.c"
 		}
 	}
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3147,7 +3167,7 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3151 "YandexPublishing.c"
+#line 3171 "YandexPublishing.c"
 		} else {
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
@@ -3157,12 +3177,12 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
 			g_clear_error (&_inner_error_);
 #line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3161 "YandexPublishing.c"
+#line 3181 "YandexPublishing.c"
 		}
 	}
 #line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (doc);
-#line 3166 "YandexPublishing.c"
+#line 3186 "YandexPublishing.c"
 }
 
 
@@ -3192,7 +3212,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 			g_propagate_error (error, _inner_error_);
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3196 "YandexPublishing.c"
+#line 3216 "YandexPublishing.c"
 		} else {
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3200,7 +3220,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 			g_clear_error (&_inner_error_);
 #line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3204 "YandexPublishing.c"
+#line 3224 "YandexPublishing.c"
 		}
 	}
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3209,7 +3229,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 	_tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_);
 #line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	root = _tmp3_;
-#line 3213 "YandexPublishing.c"
+#line 3233 "YandexPublishing.c"
 	{
 		xmlNode* e = NULL;
 		xmlNode* _tmp4_ = NULL;
@@ -3220,21 +3240,21 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 		_tmp5_ = _tmp4_->children;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		e = _tmp5_;
-#line 3224 "YandexPublishing.c"
+#line 3244 "YandexPublishing.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			_tmp6_ = TRUE;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			while (TRUE) {
-#line 3231 "YandexPublishing.c"
+#line 3251 "YandexPublishing.c"
 				xmlNode* _tmp9_ = NULL;
 				xmlNode* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
 				xmlNode* _tmp12_ = NULL;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				if (!_tmp6_) {
-#line 3238 "YandexPublishing.c"
+#line 3258 "YandexPublishing.c"
 					xmlNode* _tmp7_ = NULL;
 					xmlNode* _tmp8_ = NULL;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3243,7 +3263,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 					_tmp8_ = _tmp7_->next;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					e = _tmp8_;
-#line 3247 "YandexPublishing.c"
+#line 3267 "YandexPublishing.c"
 				}
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp6_ = FALSE;
@@ -3253,7 +3273,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 				if (!(_tmp9_ != NULL)) {
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					break;
-#line 3257 "YandexPublishing.c"
+#line 3277 "YandexPublishing.c"
 				}
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp10_ = e;
@@ -3263,7 +3283,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 				if (g_strcmp0 (_tmp11_, "entry") != 0) {
 #line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					continue;
-#line 3267 "YandexPublishing.c"
+#line 3287 "YandexPublishing.c"
 				}
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp12_ = e;
@@ -3279,7 +3299,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 						_publishing_rest_support_xml_document_unref0 (doc);
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						return;
-#line 3283 "YandexPublishing.c"
+#line 3303 "YandexPublishing.c"
 					} else {
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						_publishing_rest_support_xml_document_unref0 (doc);
@@ -3289,7 +3309,7 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 						g_clear_error (&_inner_error_);
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						return;
-#line 3293 "YandexPublishing.c"
+#line 3313 "YandexPublishing.c"
 					}
 				}
 			}
@@ -3297,21 +3317,21 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
 	}
 #line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (doc);
-#line 3301 "YandexPublishing.c"
+#line 3321 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_album_creation_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 3308 "YandexPublishing.c"
+#line 3328 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_album_creation_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3315 "YandexPublishing.c"
+#line 3335 "YandexPublishing.c"
 }
 
 
@@ -3344,7 +3364,7 @@ static void publishing_yandex_yandex_publisher_album_creation_error (PublishingY
 	_tmp5_ = _tmp4_->message;
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_warning ("YandexPublishing.vala:394: Album creation error: %s", _tmp5_);
-#line 3348 "YandexPublishing.c"
+#line 3368 "YandexPublishing.c"
 }
 
 
@@ -3376,7 +3396,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 3380 "YandexPublishing.c"
+#line 3400 "YandexPublishing.c"
 	{
 		PublishingRESTSupportTransaction* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -3395,7 +3415,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3399 "YandexPublishing.c"
+#line 3419 "YandexPublishing.c"
 				goto __catch42_spit_publishing_publishing_error;
 			}
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3404,7 +3424,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 			g_clear_error (&_inner_error_);
 #line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3408 "YandexPublishing.c"
+#line 3428 "YandexPublishing.c"
 		}
 	}
 	goto __finally42;
@@ -3427,7 +3447,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		_g_error_free0 (err);
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3431 "YandexPublishing.c"
+#line 3451 "YandexPublishing.c"
 	}
 	__finally42:
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3438,7 +3458,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		g_clear_error (&_inner_error_);
 #line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3442 "YandexPublishing.c"
+#line 3462 "YandexPublishing.c"
 	}
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp9_ = self->priv->album_list;
@@ -3458,7 +3478,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 	if (_tmp14_) {
 #line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_start_upload (self);
-#line 3462 "YandexPublishing.c"
+#line 3482 "YandexPublishing.c"
 	} else {
 		SpitPublishingPluginHost* _tmp15_ = NULL;
 		GError* _tmp16_ = NULL;
@@ -3473,7 +3493,7 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
 		spit_publishing_plugin_host_post_error (_tmp15_, _tmp17_);
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (_tmp17_);
-#line 3477 "YandexPublishing.c"
+#line 3497 "YandexPublishing.c"
 	}
 }
 
@@ -3519,7 +3539,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self, 0);
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3522 "YandexPublishing.c"
+#line 3542 "YandexPublishing.c"
 	{
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -3527,7 +3547,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3530 "YandexPublishing.c"
+#line 3550 "YandexPublishing.c"
 				goto __catch43_spit_publishing_publishing_error;
 			}
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3542,7 +3562,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 			g_clear_error (&_inner_error_);
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 3545 "YandexPublishing.c"
+#line 3565 "YandexPublishing.c"
 		}
 	}
 	goto __finally43;
@@ -3563,7 +3583,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 3566 "YandexPublishing.c"
+#line 3586 "YandexPublishing.c"
 	}
 	__finally43:
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -3580,7 +3600,7 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 		g_clear_error (&_inner_error_);
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3583 "YandexPublishing.c"
+#line 3603 "YandexPublishing.c"
 	}
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
@@ -3588,21 +3608,21 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
 	_g_free0 (data);
 #line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (album);
-#line 3591 "YandexPublishing.c"
+#line 3611 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_complete ((PublishingYandexYandexPublisher*) self, _sender, num_photos_published);
-#line 3598 "YandexPublishing.c"
+#line 3618 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3605 "YandexPublishing.c"
+#line 3625 "YandexPublishing.c"
 }
 
 
@@ -3634,7 +3654,7 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
 	_tmp4_ = num_published;
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp4_ == 0) {
-#line 3637 "YandexPublishing.c"
+#line 3657 "YandexPublishing.c"
 		SpitPublishingPluginHost* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
@@ -3648,7 +3668,7 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (_tmp7_);
-#line 3651 "YandexPublishing.c"
+#line 3671 "YandexPublishing.c"
 	}
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp8_ = self->priv->host;
@@ -3658,7 +3678,7 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
 	_tmp9_ = self->priv->host;
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp9_);
-#line 3661 "YandexPublishing.c"
+#line 3681 "YandexPublishing.c"
 }
 
 
@@ -3691,7 +3711,7 @@ static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandex
 	_tmp5_ = _tmp4_->message;
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_warning ("YandexPublishing.vala:448: Photo upload error: %s", _tmp5_);
-#line 3694 "YandexPublishing.c"
+#line 3714 "YandexPublishing.c"
 }
 
 
@@ -3726,14 +3746,14 @@ static void publishing_yandex_yandex_publisher_on_upload_status_updated (Publish
 	_tmp4_ = completed_fraction;
 #line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp2_ (_tmp3_, _tmp4_, _tmp2__target);
-#line 3728 "YandexPublishing.c"
+#line 3748 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_upload_status_updated ((PublishingYandexYandexPublisher*) self, file_number, fraction_complete);
-#line 3735 "YandexPublishing.c"
+#line 3755 "YandexPublishing.c"
 }
 
 
@@ -3824,7 +3844,7 @@ static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYan
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
 #line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3826 "YandexPublishing.c"
+#line 3846 "YandexPublishing.c"
 }
 
 
@@ -3839,7 +3859,7 @@ static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandex
 	if (!_tmp0_) {
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 3841 "YandexPublishing.c"
+#line 3861 "YandexPublishing.c"
 	}
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->session;
@@ -3851,7 +3871,7 @@ static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandex
 	self->priv->running = FALSE;
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 3853 "YandexPublishing.c"
+#line 3873 "YandexPublishing.c"
 }
 
 
@@ -3907,11 +3927,11 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande
 	if (_tmp12_) {
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_create_destination_album (self);
-#line 3909 "YandexPublishing.c"
+#line 3929 "YandexPublishing.c"
 	} else {
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_start_upload (self);
-#line 3913 "YandexPublishing.c"
+#line 3933 "YandexPublishing.c"
 	}
 }
 
@@ -3919,14 +3939,14 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande
 static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_service_get_album_list_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 3921 "YandexPublishing.c"
+#line 3941 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_service_get_album_list_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3928 "YandexPublishing.c"
+#line 3948 "YandexPublishing.c"
 }
 
 
@@ -3961,21 +3981,21 @@ void publishing_yandex_yandex_publisher_service_get_album_list_error (Publishing
 	_tmp5_ = _tmp4_->message;
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_warning ("YandexPublishing.vala:498: Failed to get album list: %s", _tmp5_);
-#line 3963 "YandexPublishing.c"
+#line 3983 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_publish ((PublishingYandexYandexPublisher*) self);
-#line 3970 "YandexPublishing.c"
+#line 3990 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
 #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_on_logout ((PublishingYandexYandexPublisher*) self);
-#line 3977 "YandexPublishing.c"
+#line 3997 "YandexPublishing.c"
 }
 
 
@@ -4020,7 +4040,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 	g_debug ("YandexPublishing.vala:505: service_get_album_list_complete: %s", _tmp6_);
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 4022 "YandexPublishing.c"
+#line 4042 "YandexPublishing.c"
 	{
 		PublishingRESTSupportTransaction* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
@@ -4039,7 +4059,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4041 "YandexPublishing.c"
+#line 4061 "YandexPublishing.c"
 				goto __catch44_spit_publishing_publishing_error;
 			}
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4048,7 +4068,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 			g_clear_error (&_inner_error_);
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4050 "YandexPublishing.c"
+#line 4070 "YandexPublishing.c"
 		}
 	}
 	goto __finally44;
@@ -4069,7 +4089,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 		spit_publishing_plugin_host_post_error (_tmp10_, _tmp11_);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4071 "YandexPublishing.c"
+#line 4091 "YandexPublishing.c"
 	}
 	__finally44:
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4080,7 +4100,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 		g_clear_error (&_inner_error_);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4082 "YandexPublishing.c"
+#line 4102 "YandexPublishing.c"
 	}
 #line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp12_ = self->priv->options;
@@ -4102,7 +4122,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
 	spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
 #line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_object_unref0 (publishing_options_pane);
-#line 4104 "YandexPublishing.c"
+#line 4124 "YandexPublishing.c"
 }
 
 
@@ -4138,7 +4158,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self, 0);
 #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4140 "YandexPublishing.c"
+#line 4160 "YandexPublishing.c"
 	{
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4146,7 +4166,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4148 "YandexPublishing.c"
+#line 4168 "YandexPublishing.c"
 				goto __catch45_spit_publishing_publishing_error;
 			}
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4157,7 +4177,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 			g_clear_error (&_inner_error_);
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4159 "YandexPublishing.c"
+#line 4179 "YandexPublishing.c"
 		}
 	}
 	goto __finally45;
@@ -4178,7 +4198,7 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4180 "YandexPublishing.c"
+#line 4200 "YandexPublishing.c"
 	}
 	__finally45:
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4191,25 +4211,25 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
 		g_clear_error (&_inner_error_);
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4193 "YandexPublishing.c"
+#line 4213 "YandexPublishing.c"
 	}
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 4197 "YandexPublishing.c"
+#line 4217 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_fetch_account_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 4204 "YandexPublishing.c"
+#line 4224 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_fetch_account_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 4211 "YandexPublishing.c"
+#line 4231 "YandexPublishing.c"
 }
 
 
@@ -4242,7 +4262,7 @@ void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYan
 	_tmp5_ = _tmp4_->message;
 #line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_warning ("YandexPublishing.vala:538: Failed to fetch account info: %s", _tmp5_);
-#line 4244 "YandexPublishing.c"
+#line 4264 "YandexPublishing.c"
 }
 
 
@@ -4281,7 +4301,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 	g_debug ("YandexPublishing.vala:545: account info: %s", _tmp6_);
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 4283 "YandexPublishing.c"
+#line 4303 "YandexPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
 		PublishingRESTSupportTransaction* _tmp7_ = NULL;
@@ -4310,7 +4330,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4312 "YandexPublishing.c"
+#line 4332 "YandexPublishing.c"
 				goto __catch46_spit_publishing_publishing_error;
 			}
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4319,7 +4339,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 			g_clear_error (&_inner_error_);
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4321 "YandexPublishing.c"
+#line 4341 "YandexPublishing.c"
 		}
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_tmp12_ = doc;
@@ -4327,7 +4347,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		_tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		root = _tmp13_;
-#line 4329 "YandexPublishing.c"
+#line 4349 "YandexPublishing.c"
 		{
 			xmlNode* work = NULL;
 			xmlNode* _tmp14_ = NULL;
@@ -4338,20 +4358,20 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 			_tmp15_ = _tmp14_->children;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			work = _tmp15_;
-#line 4340 "YandexPublishing.c"
+#line 4360 "YandexPublishing.c"
 			{
 				gboolean _tmp16_ = FALSE;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				_tmp16_ = TRUE;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 				while (TRUE) {
-#line 4347 "YandexPublishing.c"
+#line 4367 "YandexPublishing.c"
 					xmlNode* _tmp19_ = NULL;
 					xmlNode* _tmp20_ = NULL;
 					const gchar* _tmp21_ = NULL;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					if (!_tmp16_) {
-#line 4353 "YandexPublishing.c"
+#line 4373 "YandexPublishing.c"
 						xmlNode* _tmp17_ = NULL;
 						xmlNode* _tmp18_ = NULL;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4360,7 +4380,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 						_tmp18_ = _tmp17_->next;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						work = _tmp18_;
-#line 4362 "YandexPublishing.c"
+#line 4382 "YandexPublishing.c"
 					}
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp16_ = FALSE;
@@ -4370,7 +4390,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 					if (!(_tmp19_ != NULL)) {
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						break;
-#line 4372 "YandexPublishing.c"
+#line 4392 "YandexPublishing.c"
 					}
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 					_tmp20_ = work;
@@ -4380,7 +4400,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 					if (g_strcmp0 (_tmp21_, "workspace") != 0) {
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						continue;
-#line 4382 "YandexPublishing.c"
+#line 4402 "YandexPublishing.c"
 					}
 					{
 						xmlNode* c = NULL;
@@ -4392,14 +4412,14 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 						_tmp23_ = _tmp22_->children;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 						c = _tmp23_;
-#line 4394 "YandexPublishing.c"
+#line 4414 "YandexPublishing.c"
 						{
 							gboolean _tmp24_ = FALSE;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 							_tmp24_ = TRUE;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 							while (TRUE) {
-#line 4401 "YandexPublishing.c"
+#line 4421 "YandexPublishing.c"
 								xmlNode* _tmp27_ = NULL;
 								xmlNode* _tmp28_ = NULL;
 								const gchar* _tmp29_ = NULL;
@@ -4409,7 +4429,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 								gboolean _tmp33_ = FALSE;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								if (!_tmp24_) {
-#line 4411 "YandexPublishing.c"
+#line 4431 "YandexPublishing.c"
 									xmlNode* _tmp25_ = NULL;
 									xmlNode* _tmp26_ = NULL;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4418,7 +4438,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 									_tmp26_ = _tmp25_->next;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									c = _tmp26_;
-#line 4420 "YandexPublishing.c"
+#line 4440 "YandexPublishing.c"
 								}
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp24_ = FALSE;
@@ -4428,7 +4448,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 								if (!(_tmp27_ != NULL)) {
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									break;
-#line 4430 "YandexPublishing.c"
+#line 4450 "YandexPublishing.c"
 								}
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp28_ = c;
@@ -4438,7 +4458,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 								if (g_strcmp0 (_tmp29_, "collection") != 0) {
 #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									continue;
-#line 4440 "YandexPublishing.c"
+#line 4460 "YandexPublishing.c"
 								}
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								_tmp30_ = c;
@@ -4452,7 +4472,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 								_g_free0 (_tmp32_);
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 								if (_tmp33_) {
-#line 4454 "YandexPublishing.c"
+#line 4474 "YandexPublishing.c"
 									gchar* url = NULL;
 									xmlNode* _tmp34_ = NULL;
 									gchar* _tmp35_ = NULL;
@@ -4484,7 +4504,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 									_g_free0 (url);
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 									break;
-#line 4486 "YandexPublishing.c"
+#line 4506 "YandexPublishing.c"
 								}
 							}
 						}
@@ -4494,7 +4514,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		}
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 4496 "YandexPublishing.c"
+#line 4516 "YandexPublishing.c"
 	}
 	goto __finally46;
 	__catch46_spit_publishing_publishing_error:
@@ -4514,7 +4534,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		spit_publishing_plugin_host_post_error (_tmp40_, _tmp41_);
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4516 "YandexPublishing.c"
+#line 4536 "YandexPublishing.c"
 	}
 	__finally46:
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4525,7 +4545,7 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
 		g_clear_error (&_inner_error_);
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4527 "YandexPublishing.c"
+#line 4547 "YandexPublishing.c"
 	}
 }
 
@@ -4557,7 +4577,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self, 0);
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4559 "YandexPublishing.c"
+#line 4579 "YandexPublishing.c"
 	{
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -4565,7 +4585,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4567 "YandexPublishing.c"
+#line 4587 "YandexPublishing.c"
 				goto __catch47_spit_publishing_publishing_error;
 			}
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4576,7 +4596,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 			g_clear_error (&_inner_error_);
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 			return;
-#line 4578 "YandexPublishing.c"
+#line 4598 "YandexPublishing.c"
 		}
 	}
 	goto __finally47;
@@ -4597,7 +4617,7 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_error_free0 (err);
-#line 4599 "YandexPublishing.c"
+#line 4619 "YandexPublishing.c"
 	}
 	__finally47:
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
@@ -4610,11 +4630,11 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
 		g_clear_error (&_inner_error_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4612 "YandexPublishing.c"
+#line 4632 "YandexPublishing.c"
 	}
 #line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (t);
-#line 4616 "YandexPublishing.c"
+#line 4636 "YandexPublishing.c"
 }
 
 
@@ -4643,7 +4663,7 @@ static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (Publish
 	_tmp3_ = access_token;
 #line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp3_);
-#line 4645 "YandexPublishing.c"
+#line 4665 "YandexPublishing.c"
 }
 
 
@@ -4652,21 +4672,21 @@ static void publishing_yandex_yandex_publisher_web_auth_login_failed (Publishing
 	g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
 #line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_debug ("YandexPublishing.vala:595: login failed");
-#line 4654 "YandexPublishing.c"
+#line 4674 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender, const gchar* success_url, gpointer self) {
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_web_auth_login_succeeded ((PublishingYandexYandexPublisher*) self, success_url);
-#line 4661 "YandexPublishing.c"
+#line 4681 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender, gpointer self) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_web_auth_login_failed ((PublishingYandexYandexPublisher*) self);
-#line 4668 "YandexPublishing.c"
+#line 4688 "YandexPublishing.c"
 }
 
 
@@ -4711,14 +4731,14 @@ static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexY
 	_tmp7_ = self->priv->web_auth_pane;
 #line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 4713 "YandexPublishing.c"
+#line 4733 "YandexPublishing.c"
 }
 
 
 static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self) {
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	publishing_yandex_yandex_publisher_start_web_auth ((PublishingYandexYandexPublisher*) self);
-#line 4720 "YandexPublishing.c"
+#line 4740 "YandexPublishing.c"
 }
 
 
@@ -4733,7 +4753,7 @@ static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYand
 	_tmp1_ = _ ("You are not currently logged into Yandex.Fotki.");
 #line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _tmp1_, _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback, self);
-#line 4735 "YandexPublishing.c"
+#line 4755 "YandexPublishing.c"
 }
 
 
@@ -4750,7 +4770,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 	if (_tmp0_) {
 #line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		return;
-#line 4752 "YandexPublishing.c"
+#line 4772 "YandexPublishing.c"
 	}
 #line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	_tmp1_ = self->priv->host;
@@ -4759,7 +4779,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 #line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		g_error ("YandexPublishing.vala:618: YandexPublisher: start( ): can't start; thi" \
 "s publisher is not restartable.");
-#line 4760 "YandexPublishing.c"
+#line 4780 "YandexPublishing.c"
 	}
 #line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	g_debug ("YandexPublishing.vala:620: YandexPublisher: starting interaction.");
@@ -4769,7 +4789,7 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 	_tmp2_ = publishing_yandex_yandex_publisher_is_persistent_session_available (self);
 #line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	if (_tmp2_) {
-#line 4770 "YandexPublishing.c"
+#line 4790 "YandexPublishing.c"
 		PublishingYandexSession* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -4793,11 +4813,11 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
 		publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp7_);
 #line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 4794 "YandexPublishing.c"
+#line 4814 "YandexPublishing.c"
 	} else {
 #line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 		publishing_yandex_yandex_publisher_show_welcome_page (self);
-#line 4798 "YandexPublishing.c"
+#line 4818 "YandexPublishing.c"
 	}
 }
 
@@ -4812,7 +4832,7 @@ static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublishe
 	self->priv->host = NULL;
 #line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->running = FALSE;
-#line 4813 "YandexPublishing.c"
+#line 4833 "YandexPublishing.c"
 }
 
 
@@ -4823,7 +4843,7 @@ static void publishing_yandex_yandex_publisher_class_init (PublishingYandexYande
 	g_type_class_add_private (klass, sizeof (PublishingYandexYandexPublisherPrivate));
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_yandex_yandex_publisher_finalize;
-#line 4824 "YandexPublishing.c"
+#line 4844 "YandexPublishing.c"
 }
 
 
@@ -4838,7 +4858,7 @@ static void publishing_yandex_yandex_publisher_spit_publishing_publisher_interfa
 	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_start;
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_stop;
-#line 4839 "YandexPublishing.c"
+#line 4859 "YandexPublishing.c"
 }
 
 
@@ -4859,7 +4879,7 @@ static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYa
 	self->priv->running = FALSE;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	self->priv->web_auth_pane = NULL;
-#line 4860 "YandexPublishing.c"
+#line 4880 "YandexPublishing.c"
 }
 
 
@@ -4887,7 +4907,7 @@ static void publishing_yandex_yandex_publisher_finalize (GObject* obj) {
 	_publishing_rest_support_session_unref0 (self->priv->session);
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
 	G_OBJECT_CLASS (publishing_yandex_yandex_publisher_parent_class)->finalize (obj);
-#line 4888 "YandexPublishing.c"
+#line 4908 "YandexPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala
index 2eb78f3..dbfa3de 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.vala
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala
@@ -194,7 +194,7 @@ internal class PublishingOptionsPane: Spit.Publishing.DialogPane, GLib.Object {
             builder.add_from_resource (Resources.RESOURCE_PATH + "/yandex_publish_model.ui");
 
             builder.connect_signals(null);
-            Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment;
+            var content = builder.get_object ("content") as Gtk.Widget;
 
             album_list = builder.get_object ("album_list") as Gtk.ComboBoxText;
             foreach (string key in list.keys)
@@ -208,8 +208,8 @@ internal class PublishingOptionsPane: Spit.Publishing.DialogPane, GLib.Object {
             publish_button.clicked.connect(on_publish_clicked);
             logout_button.clicked.connect(on_logout_clicked);
 
-            align.reparent(box);
-			box.set_child_packing(align, true, true, 0, Gtk.PackType.START);
+            content.parent.remove (content);
+            box.pack_start (content, true, true, 0);
         } catch (Error e) {
             warning("Could not load UI: %s", e.message);
         }
@@ -275,7 +275,7 @@ private class UploadTransaction: Transaction {
 
         int image_part_num = message_parts.get_length();
 
-        Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY, photo_data.data[0:data_length]);
+        var bindable_data = new Soup.Buffer.take (photo_data.data);
         message_parts.append_form_file("", photo.get_serialized_file().get_path(), "image/jpeg", bindable_data);
 
         unowned Soup.MessageHeaders image_part_header;
diff --git a/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
index 496304f..439a754 100644
--- a/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
@@ -1,148 +1,138 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkWindow" id="authentication_pane">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkAlignment" id="alignment">
+      <object class="GtkVBox" id="content">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xscale">0.5</property>
-        <property name="yscale">0.5</property>
+        <property name="margin_left">30</property>
+        <property name="margin_right">30</property>
+        <property name="hexpand">True</property>
+        <property name="spacing">8</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkLabel" id="message_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">30</property>
-            <property name="margin_right">30</property>
             <property name="hexpand">True</property>
-            <property name="spacing">8</property>
+            <property name="vexpand">True</property>
+            <property name="label">label</property>
+            <property name="wrap">True</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkTable" id="field_table">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">8</property>
+            <property name="row_spacing">2</property>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Email address</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">username_entry</property>
+                <property name="xalign">0</property>
+              </object>
+            </child>
             <child>
-              <object class="GtkLabel" id="message_label">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="label" translatable="yes">_Password</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">password_entry</property>
                 <property name="xalign">0</property>
-                <property name="label">label</property>
-                <property name="wrap">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkTable" id="field_table">
+              <object class="GtkEntry" id="username_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="n_rows">2</property>
-                <property name="n_columns">2</property>
-                <property name="column_spacing">8</property>
-                <property name="row_spacing">2</property>
-                <child>
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Email address</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">username_entry</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Password</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">password_entry</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="username_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">●</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="password_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="visibility">False</property>
-                    <property name="invisible_char">●</property>
-                    <property name="invisible_char_set">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="remember_checkbutton">
-                <property name="label" translatable="yes">_Remember</property>
-                <property name="use_action_appearance">False</property>
+              <object class="GtkEntry" id="password_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
+                <property name="visibility">False</property>
+                <property name="invisible_char">●</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
               </packing>
             </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="remember_checkbutton">
+            <property name="label" translatable="yes">_Remember</property>
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
-              <object class="GtkHButtonBox" id="hbuttonbox1">
+              <object class="GtkButton" id="login_button">
+                <property name="label" translatable="yes">Log in</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkButton" id="login_button">
-                    <property name="label" translatable="yes">Log in</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
         </child>
       </object>
     </child>
diff --git a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
index 98f03b8..9752a7c 100644
--- a/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
@@ -1,130 +1,121 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="authentication_pane">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkAlignment" id="alignment">
+      <object class="GtkVBox" id="content">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xscale">0.5</property>
-        <property name="yscale">0.5</property>
+        <property name="margin_left">30</property>
+        <property name="margin_right">30</property>
+        <property name="hexpand">True</property>
+        <property name="spacing">8</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkLabel" id="message_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">30</property>
-            <property name="margin_right">30</property>
             <property name="hexpand">True</property>
-            <property name="spacing">8</property>
+            <property name="vexpand">True</property>
+            <property name="label">label</property>
+            <property name="wrap">True</property>
+            <property name="xalign">0</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkTable" id="field_table">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">2</property>
+            <property name="column_spacing">8</property>
+            <property name="row_spacing">2</property>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Email address</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">username_entry</property>
+                <property name="xalign">0</property>
+              </object>
+            </child>
             <child>
-              <object class="GtkLabel" id="message_label">
+              <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="label" translatable="yes">_Password</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">password_entry</property>
                 <property name="xalign">0</property>
-                <property name="label">label</property>
-                <property name="wrap">True</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkTable" id="field_table">
+              <object class="GtkEntry" id="username_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="n_rows">2</property>
-                <property name="n_columns">2</property>
-                <property name="column_spacing">8</property>
-                <property name="row_spacing">2</property>
-                <child>
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Email address</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">username_entry</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Password</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">password_entry</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="username_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">●</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="password_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="visibility">False</property>
-                    <property name="invisible_char">●</property>
-                    <property name="invisible_char_set">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHButtonBox" id="hbuttonbox1">
+              <object class="GtkEntry" id="password_entry">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkButton" id="login_button">
-                    <property name="label" translatable="yes">Log in</property>
-                    <property name="use_action_appearance">False</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="visibility">False</property>
+                <property name="invisible_char">●</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkButton" id="login_button">
+                <property name="label" translatable="yes">Log in</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
         </child>
       </object>
     </child>
diff --git a/plugins/shotwell-publishing-extras/yandex_publish_model.ui b/plugins/shotwell-publishing-extras/yandex_publish_model.ui
index 175bafd..1d9cc22 100644
--- a/plugins/shotwell-publishing-extras/yandex_publish_model.ui
+++ b/plugins/shotwell-publishing-extras/yandex_publish_model.ui
@@ -1,175 +1,179 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.14"/>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name text -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Public</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Friends</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Private</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststore2">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkWindow" id="publish_options_window">
+    <property name="can_focus">False</property>
     <child>
-      <object class="GtkAlignment" id="alignment">
+      <object class="GtkVBox" id="content">
         <property name="visible">True</property>
-        <property name="xalign">0.30000001192092896</property>
-        <property name="xscale">0.10000000149011612</property>
-        <property name="yscale">0.10000000149011612</property>
+        <property name="can_focus">False</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkTable" id="table1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">2</property>
             <child>
-              <object class="GtkTable" id="table1">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
-                <property name="n_rows">2</property>
-                <property name="n_columns">2</property>
-                <child>
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="xalign">0.30000001192092896</property>
-                    <property name="label" translatable="yes">_Albums (or write new):</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">album_list</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="ypad">6</property>
-                    <property name="label" translatable="yes">Access _type:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">access_type_list</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="access_type_list">
-                    <property name="visible">True</property>
-                    <property name="model">liststore1</property>
-                    <property name="active">0</property>
-                    <property name="text_column">0</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="y_padding">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="album_list">
-                    <property name="visible">True</property>
-                    <property name="model">liststore2</property>
-                    <property name="active">0</property>
-                    <property name="text_column">0</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                    <property name="y_padding">1</property>
-                  </packing>
-                </child>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">_Albums (or write new):</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">album_list</property>
+                <property name="xalign">0.30000001192092896</property>
               </object>
               <packing>
-                <property name="position">0</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
               </packing>
             </child>
             <child>
-              <placeholder/>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="ypad">6</property>
+                <property name="label" translatable="yes">Access _type:</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">access_type_list</property>
+                <property name="xalign">0</property>
+              </object>
             </child>
             <child>
-              <object class="GtkCheckButton" id="disable_comments_check">
-                <property name="label" translatable="yes">Disable _comments</property>
+              <object class="GtkComboBoxText" id="access_type_list">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0.30000001192092896</property>
-                <property name="draw_indicator">True</property>
+                <property name="can_focus">False</property>
+                <property name="active">0</property>
               </object>
               <packing>
-                <property name="padding">2</property>
-                <property name="position">2</property>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="y_padding">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="hide_original_check">
-                <property name="label" translatable="yes">_Forbid downloading original photo</property>
+              <object class="GtkComboBoxText" id="album_list">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="active">0</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="y_padding">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="disable_comments_check">
+            <property name="label" translatable="yes">Disable _comments</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0.30000001192092896</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="padding">2</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="hide_original_check">
+            <property name="label" translatable="yes">_Forbid downloading original photo</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="use_underline">True</property>
+            <property name="xalign">0.30000001192092896</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">2</property>
+            <property name="layout_style">spread</property>
+            <child>
+              <object class="GtkButton" id="logout_button">
+                <property name="label" translatable="yes">_Logout</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
+                <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0.30000001192092896</property>
-                <property name="draw_indicator">True</property>
               </object>
               <packing>
-                <property name="position">3</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHButtonBox" id="hbuttonbox1">
+              <object class="GtkButton" id="publish_button">
+                <property name="label" translatable="yes">_Publish</property>
                 <property name="visible">True</property>
-                <property name="spacing">2</property>
-                <property name="layout_style">spread</property>
-                <child>
-                  <object class="GtkButton" id="logout_button">
-                    <property name="label" translatable="yes">_Logout</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="publish_button">
-                    <property name="label" translatable="yes">_Publish</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="padding">12</property>
-                <property name="position">4</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="padding">12</property>
+            <property name="position">4</property>
+          </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name text -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Public</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Friends</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Private</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore2">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
 </interface>
diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c
index 7c88a45..da03420 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.c
+++ b/plugins/shotwell-publishing/FacebookPublishing.c
@@ -10203,7 +10203,7 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 #line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34__length1 = payload_length1;
 #line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp35_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, _tmp34_, _tmp34__length1);
+	_tmp35_ = soup_buffer_new_with_owner (_tmp34_, _tmp34__length1, self, NULL);
 #line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	image_data = _tmp35_;
 #line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala
index 3fafe37..8c5222a 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.vala
+++ b/plugins/shotwell-publishing/FacebookPublishing.vala
@@ -1347,7 +1347,7 @@ internal class GraphSession {
             unowned uint8[] payload = (uint8[]) mapped_file.get_contents();
             payload.length = (int) mapped_file.get_length();
             
-            Soup.Buffer image_data = new Soup.Buffer(Soup.MemoryUse.TEMPORARY, payload);
+            var image_data = new Soup.Buffer.with_owner (payload, this, null);
             
             Soup.Multipart mp_envelope = new Soup.Multipart("multipart/form-data");
             
@@ -1447,9 +1447,9 @@ internal class GraphSession {
         
         // these error types are always recoverable given the unique behavior of the Facebook
         // endpoint, so try again
-        if (msg.status_code == Soup.KnownStatusCode.IO_ERROR ||
-            msg.status_code == Soup.KnownStatusCode.MALFORMED ||
-            msg.status_code == Soup.KnownStatusCode.TRY_AGAIN) {
+        if (msg.status_code == Soup.Status.IO_ERROR ||
+            msg.status_code == Soup.Status.MALFORMED ||
+            msg.status_code == Soup.Status.TRY_AGAIN) {
             real_message.bytes_so_far = 0;
             soup_session.queue_message(msg, null);
             return;
@@ -1460,8 +1460,8 @@ internal class GraphSession {
         
         Spit.Publishing.PublishingError? error = null;
         switch (msg.status_code) {
-            case Soup.KnownStatusCode.OK:
-            case Soup.KnownStatusCode.CREATED: // HTTP code 201 (CREATED) signals that a new
+            case Soup.Status.OK:
+            case Soup.Status.CREATED: // HTTP code 201 (CREATED) signals that a new
                                                // resource was created in response to a PUT
                                                // or POST
             break;
@@ -1471,14 +1471,14 @@ internal class GraphSession {
                     "OAuth Access Token has Expired. Logout user.");
             break;
             
-            case Soup.KnownStatusCode.CANT_RESOLVE:
-            case Soup.KnownStatusCode.CANT_RESOLVE_PROXY:
+            case Soup.Status.CANT_RESOLVE:
+            case Soup.Status.CANT_RESOLVE_PROXY:
                 error = new Spit.Publishing.PublishingError.NO_ANSWER(
                     "Unable to resolve %s (error code %u)", real_message.get_uri(), msg.status_code);
             break;
             
-            case Soup.KnownStatusCode.CANT_CONNECT:
-            case Soup.KnownStatusCode.CANT_CONNECT_PROXY:
+            case Soup.Status.CANT_CONNECT:
+            case Soup.Status.CANT_CONNECT_PROXY:
                 error = new Spit.Publishing.PublishingError.NO_ANSWER(
                     "Unable to connect to %s (error code %u)", real_message.get_uri(), msg.status_code);
             break;
diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c
index d65f678..a6ea1f8 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.c
+++ b/plugins/shotwell-publishing/FlickrPublishing.c
@@ -495,7 +495,7 @@ static gint flickr_service_real_get_pluggable_interface (SpitPluggable* base, gi
 static const gchar* flickr_service_real_get_id (SpitPluggable* base);
 static const gchar* flickr_service_real_get_pluggable_name (SpitPluggable* base);
 static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length);
+static GdkPixbuf** _vala_array_dup8 (GdkPixbuf** self, int length);
 static void flickr_service_real_activation (SpitPluggable* base, gboolean enabled);
 static SpitPublishingPublisher* flickr_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
 PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
@@ -693,7 +693,7 @@ void publishing_flickr_upload_transaction_add_authorization_header_field (Publis
 static void _g_free0_ (gpointer var);
 static void _vala_array_add18 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
 PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authorization_header_fields (PublishingFlickrUploadTransaction* self, int* result_length1);
-static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length);
+static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length);
 gchar* publishing_flickr_upload_transaction_get_authorization_header_string (PublishingFlickrUploadTransaction* self);
 static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
 static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
@@ -875,7 +875,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static GdkPixbuf** _vala_array_dup7 (GdkPixbuf** self, int length) {
+static GdkPixbuf** _vala_array_dup8 (GdkPixbuf** self, int length) {
 	GdkPixbuf** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -965,7 +965,7 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8__length1 = flickr_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup7 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup8 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9__length1 = _tmp8__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6187,7 +6187,7 @@ static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
 }
 
 
-static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length) {
+static PublishingRESTSupportArgument** _vala_array_dup9 (PublishingRESTSupportArgument** self, int length) {
 	PublishingRESTSupportArgument** result;
 	int i;
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -6223,7 +6223,7 @@ PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authori
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->auth_header_fields_length1;
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c
index b64f426..ea3cc5f 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.c
+++ b/plugins/shotwell-publishing/PicasaPublishing.c
@@ -485,6 +485,7 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (Pub
 PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable);
 gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (PublishingPicasaPublishingParameters* self);
 static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+static guint8* _vala_array_dup5 (guint8* self, int length);
 static void _vala_SoupBuffer_free (SoupBuffer* self);
 static void _vala_SoupMultipart_free (SoupMultipart* self);
 static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
@@ -542,8 +543,8 @@ enum  {
 	PUBLISHING_PICASA_PUBLISHING_PARAMETERS_DUMMY_PROPERTY
 };
 gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (PublishingPicasaPublishingParameters* self);
-static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length);
 static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length);
+static PublishingPicasaAlbum** _vala_array_dup7 (PublishingPicasaAlbum** self, int length);
 static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters* obj);
 #define PUBLISHING_PICASA_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploaderPrivate))
 enum  {
@@ -570,7 +571,7 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = picasa_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 562 "PicasaPublishing.c"
+#line 563 "PicasaPublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -583,18 +584,18 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire
 		picasa_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_picasa_service_icon_pixbuf_set_size_ = picasa_service_icon_pixbuf_set_length1;
-#line 575 "PicasaPublishing.c"
+#line 576 "PicasaPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 579 "PicasaPublishing.c"
+#line 580 "PicasaPublishing.c"
 }
 
 
 PicasaService* picasa_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return picasa_service_construct (TYPE_PICASA_SERVICE, resource_directory);
-#line 586 "PicasaPublishing.c"
+#line 587 "PicasaPublishing.c"
 }
 
 
@@ -616,7 +617,7 @@ static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 608 "PicasaPublishing.c"
+#line 609 "PicasaPublishing.c"
 }
 
 
@@ -629,7 +630,7 @@ static const gchar* picasa_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.picasa";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 621 "PicasaPublishing.c"
+#line 622 "PicasaPublishing.c"
 }
 
 
@@ -642,14 +643,14 @@ static const gchar* picasa_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Picasa Web Albums";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 634 "PicasaPublishing.c"
+#line 635 "PicasaPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 641 "PicasaPublishing.c"
+#line 642 "PicasaPublishing.c"
 }
 
 
@@ -660,17 +661,17 @@ static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 652 "PicasaPublishing.c"
+#line 653 "PicasaPublishing.c"
 		GdkPixbuf* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 658 "PicasaPublishing.c"
+#line 659 "PicasaPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 662 "PicasaPublishing.c"
+#line 663 "PicasaPublishing.c"
 }
 
 
@@ -752,7 +753,7 @@ static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	(*info).icons = _tmp9_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*info).icons_length1 = _tmp9__length1;
-#line 744 "PicasaPublishing.c"
+#line 745 "PicasaPublishing.c"
 }
 
 
@@ -773,7 +774,7 @@ static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 765 "PicasaPublishing.c"
+#line 766 "PicasaPublishing.c"
 }
 
 
@@ -786,7 +787,7 @@ static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 778 "PicasaPublishing.c"
+#line 779 "PicasaPublishing.c"
 }
 
 
@@ -794,7 +795,7 @@ static void picasa_service_real_activation (SpitPluggable* base, gboolean enable
 	PicasaService * self;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
-#line 786 "PicasaPublishing.c"
+#line 787 "PicasaPublishing.c"
 }
 
 
@@ -803,7 +804,7 @@ static void picasa_service_class_init (PicasaServiceClass * klass) {
 	picasa_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = picasa_service_finalize;
-#line 795 "PicasaPublishing.c"
+#line 796 "PicasaPublishing.c"
 }
 
 
@@ -820,7 +821,7 @@ static void picasa_service_spit_pluggable_interface_init (SpitPluggableIface * i
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) picasa_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) picasa_service_real_activation;
-#line 812 "PicasaPublishing.c"
+#line 813 "PicasaPublishing.c"
 }
 
 
@@ -831,7 +832,7 @@ static void picasa_service_spit_publishing_service_interface_init (SpitPublishin
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) picasa_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) picasa_service_real_get_supported_media;
-#line 823 "PicasaPublishing.c"
+#line 824 "PicasaPublishing.c"
 }
 
 
@@ -845,7 +846,7 @@ static void picasa_service_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PICASA_SERVICE, PicasaService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (picasa_service_parent_class)->finalize (obj);
-#line 837 "PicasaPublishing.c"
+#line 838 "PicasaPublishing.c"
 }
 
 
@@ -905,7 +906,7 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
 	_tmp4_ = host;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = spit_publishing_plugin_host_get_publishables (_tmp4_, &_tmp5_);
-#line 897 "PicasaPublishing.c"
+#line 898 "PicasaPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
@@ -917,14 +918,14 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
 		p_collection_length1 = _tmp5_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		for (p_it = 0; p_it < _tmp5_; p_it = p_it + 1) {
-#line 909 "PicasaPublishing.c"
+#line 910 "PicasaPublishing.c"
 			SpitPublishingPublishable* _tmp7_ = NULL;
 			SpitPublishingPublishable* p = NULL;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp7_ = _g_object_ref0 (p_collection[p_it]);
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			p = _tmp7_;
-#line 916 "PicasaPublishing.c"
+#line 917 "PicasaPublishing.c"
 			{
 				SpitPublishingPublisherMediaType _tmp8_ = 0;
 				SpitPublishingPublishable* _tmp9_ = NULL;
@@ -939,12 +940,12 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
 				media_type = _tmp8_ | _tmp10_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_g_object_unref0 (p);
-#line 931 "PicasaPublishing.c"
+#line 932 "PicasaPublishing.c"
 			}
 		}
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		p_collection = (_vala_array_free (p_collection, p_collection_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 936 "PicasaPublishing.c"
+#line 937 "PicasaPublishing.c"
 	}
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = self->priv->publishing_parameters;
@@ -976,14 +977,14 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 968 "PicasaPublishing.c"
+#line 969 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_picasa_publisher_construct (PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, service, host);
-#line 975 "PicasaPublishing.c"
+#line 976 "PicasaPublishing.c"
 }
 
 
@@ -994,13 +995,13 @@ static void _vala_array_add12 (PublishingPicasaAlbum*** array, int* length, int*
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1);
-#line 986 "PicasaPublishing.c"
+#line 987 "PicasaPublishing.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 992 "PicasaPublishing.c"
+#line 993 "PicasaPublishing.c"
 }
 
 
@@ -1034,7 +1035,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 	_tmp2_ = _tmp1_->name;
 #line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_strcmp0 (_tmp2_, "feed") == 0) {
-#line 1026 "PicasaPublishing.c"
+#line 1027 "PicasaPublishing.c"
 		xmlNode* _tmp3_ = NULL;
 		xmlNode* _tmp4_ = NULL;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1043,7 +1044,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 		_tmp4_ = _tmp3_->children;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		doc_node_iter = _tmp4_;
-#line 1035 "PicasaPublishing.c"
+#line 1036 "PicasaPublishing.c"
 	} else {
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -1053,13 +1054,13 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 		_tmp6_ = _tmp5_->name;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (g_strcmp0 (_tmp6_, "entry") == 0) {
-#line 1045 "PicasaPublishing.c"
+#line 1046 "PicasaPublishing.c"
 			xmlNode* _tmp7_ = NULL;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp7_ = document_root;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			doc_node_iter = _tmp7_;
-#line 1051 "PicasaPublishing.c"
+#line 1052 "PicasaPublishing.c"
 		} else {
 			GError* _tmp8_ = NULL;
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1074,7 +1075,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 				_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				return NULL;
-#line 1066 "PicasaPublishing.c"
+#line 1067 "PicasaPublishing.c"
 			} else {
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
@@ -1084,7 +1085,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 				g_clear_error (&_inner_error_);
 #line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				return NULL;
-#line 1076 "PicasaPublishing.c"
+#line 1077 "PicasaPublishing.c"
 			}
 		}
 	}
@@ -1094,7 +1095,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 		_tmp9_ = TRUE;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		while (TRUE) {
-#line 1086 "PicasaPublishing.c"
+#line 1087 "PicasaPublishing.c"
 			xmlNode* _tmp12_ = NULL;
 			xmlNode* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
@@ -1110,7 +1111,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 			PublishingPicasaAlbum* _tmp35_ = NULL;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (!_tmp9_) {
-#line 1102 "PicasaPublishing.c"
+#line 1103 "PicasaPublishing.c"
 				xmlNode* _tmp10_ = NULL;
 				xmlNode* _tmp11_ = NULL;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1119,7 +1120,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 				_tmp11_ = _tmp10_->next;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				doc_node_iter = _tmp11_;
-#line 1111 "PicasaPublishing.c"
+#line 1112 "PicasaPublishing.c"
 			}
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp9_ = FALSE;
@@ -1129,7 +1130,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 			if (!(_tmp12_ != NULL)) {
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				break;
-#line 1121 "PicasaPublishing.c"
+#line 1122 "PicasaPublishing.c"
 			}
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp13_ = doc_node_iter;
@@ -1139,7 +1140,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 			if (g_strcmp0 (_tmp14_, "entry") != 0) {
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				continue;
-#line 1131 "PicasaPublishing.c"
+#line 1132 "PicasaPublishing.c"
 			}
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			name_val = NULL;
@@ -1151,20 +1152,20 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 			_tmp16_ = _tmp15_->children;
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			album_node_iter = _tmp16_;
-#line 1143 "PicasaPublishing.c"
+#line 1144 "PicasaPublishing.c"
 			{
 				gboolean _tmp17_ = FALSE;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp17_ = TRUE;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				while (TRUE) {
-#line 1150 "PicasaPublishing.c"
+#line 1151 "PicasaPublishing.c"
 					xmlNode* _tmp20_ = NULL;
 					xmlNode* _tmp21_ = NULL;
 					const gchar* _tmp22_ = NULL;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (!_tmp17_) {
-#line 1156 "PicasaPublishing.c"
+#line 1157 "PicasaPublishing.c"
 						xmlNode* _tmp18_ = NULL;
 						xmlNode* _tmp19_ = NULL;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1173,7 +1174,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 						_tmp19_ = _tmp18_->next;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						album_node_iter = _tmp19_;
-#line 1165 "PicasaPublishing.c"
+#line 1166 "PicasaPublishing.c"
 					}
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp17_ = FALSE;
@@ -1183,7 +1184,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 					if (!(_tmp20_ != NULL)) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						break;
-#line 1175 "PicasaPublishing.c"
+#line 1176 "PicasaPublishing.c"
 					}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp21_ = album_node_iter;
@@ -1191,7 +1192,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 					_tmp22_ = _tmp21_->name;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (g_strcmp0 (_tmp22_, "title") == 0) {
-#line 1183 "PicasaPublishing.c"
+#line 1184 "PicasaPublishing.c"
 						xmlNode* _tmp23_ = NULL;
 						gchar* _tmp24_ = NULL;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1202,7 +1203,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 						_g_free0 (name_val);
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						name_val = _tmp24_;
-#line 1194 "PicasaPublishing.c"
+#line 1195 "PicasaPublishing.c"
 					} else {
 						xmlNode* _tmp25_ = NULL;
 						const gchar* _tmp26_ = NULL;
@@ -1212,7 +1213,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 						_tmp26_ = _tmp25_->name;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						if (g_strcmp0 (_tmp26_, "id") == 0) {
-#line 1204 "PicasaPublishing.c"
+#line 1205 "PicasaPublishing.c"
 							xmlNode* _tmp27_ = NULL;
 							xmlNs* _tmp28_ = NULL;
 							const gchar* _tmp29_ = NULL;
@@ -1228,7 +1229,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 							if (_tmp29_ != NULL) {
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 								continue;
-#line 1220 "PicasaPublishing.c"
+#line 1221 "PicasaPublishing.c"
 							}
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 							_tmp30_ = album_node_iter;
@@ -1238,7 +1239,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 							_g_free0 (url_val);
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 							url_val = _tmp31_;
-#line 1230 "PicasaPublishing.c"
+#line 1231 "PicasaPublishing.c"
 						}
 					}
 				}
@@ -1259,7 +1260,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 			_g_free0 (url_val);
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (name_val);
-#line 1251 "PicasaPublishing.c"
+#line 1252 "PicasaPublishing.c"
 		}
 	}
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1270,13 +1271,13 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 	if (result_length1) {
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*result_length1 = _tmp36__length1;
-#line 1262 "PicasaPublishing.c"
+#line 1263 "PicasaPublishing.c"
 	}
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp36_;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 1268 "PicasaPublishing.c"
+#line 1269 "PicasaPublishing.c"
 }
 
 
@@ -1323,7 +1324,7 @@ static void publishing_picasa_picasa_publisher_load_parameters_from_configuratio
 	publishing_picasa_publishing_parameters_set_target_album_name (_tmp6_, _tmp9_);
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 1315 "PicasaPublishing.c"
+#line 1316 "PicasaPublishing.c"
 }
 
 
@@ -1370,7 +1371,7 @@ static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", _tmp9_);
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 1362 "PicasaPublishing.c"
+#line 1363 "PicasaPublishing.c"
 }
 
 
@@ -1388,13 +1389,13 @@ static void publishing_picasa_picasa_publisher_on_service_welcome_login (Publish
 	if (!_tmp0_) {
 #line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1379 "PicasaPublishing.c"
+#line 1380 "PicasaPublishing.c"
 	}
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = self->priv->refresh_token;
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp1_);
-#line 1385 "PicasaPublishing.c"
+#line 1386 "PicasaPublishing.c"
 }
 
 
@@ -1448,21 +1449,21 @@ static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (Publ
 	_publishing_rest_support_session_unref0 (_tmp7_);
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_fetch_account_information (self);
-#line 1439 "PicasaPublishing.c"
+#line 1440 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_initial_album_fetch_complete ((PublishingPicasaPicasaPublisher*) self, _sender);
-#line 1446 "PicasaPublishing.c"
+#line 1447 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_initial_album_fetch_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 1453 "PicasaPublishing.c"
+#line 1454 "PicasaPublishing.c"
 }
 
 
@@ -1495,7 +1496,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (
 	if (!_tmp4_) {
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1486 "PicasaPublishing.c"
+#line 1487 "PicasaPublishing.c"
 	}
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_debug ("PicasaPublishing.vala:161: EVENT: finished fetching account and album " \
@@ -1504,7 +1505,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (
 	_tmp5_ = txn;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, PublishingPicasaAlbumDirectoryTransaction));
-#line 1494 "PicasaPublishing.c"
+#line 1495 "PicasaPublishing.c"
 }
 
 
@@ -1542,7 +1543,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
 	if (!_tmp4_) {
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1532 "PicasaPublishing.c"
+#line 1533 "PicasaPublishing.c"
 	}
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = bad_txn;
@@ -1563,7 +1564,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
 	if (_tmp10_ == ((guint) 403)) {
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp8_ = TRUE;
-#line 1552 "PicasaPublishing.c"
+#line 1553 "PicasaPublishing.c"
 	} else {
 		PublishingRESTSupportTransaction* _tmp11_ = NULL;
 		guint _tmp12_ = 0U;
@@ -1573,13 +1574,13 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
 		_tmp12_ = publishing_rest_support_transaction_get_status_code (_tmp11_);
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp8_ = _tmp12_ == ((guint) 404);
-#line 1562 "PicasaPublishing.c"
+#line 1563 "PicasaPublishing.c"
 	}
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp8_) {
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1568 "PicasaPublishing.c"
+#line 1569 "PicasaPublishing.c"
 	} else {
 		SpitPublishingPluginHost* _tmp13_ = NULL;
 		GError* _tmp14_ = NULL;
@@ -1589,7 +1590,7 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
 		_tmp14_ = err;
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp13_, _tmp14_);
-#line 1578 "PicasaPublishing.c"
+#line 1579 "PicasaPublishing.c"
 	}
 }
 
@@ -1604,14 +1605,14 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_logout (Pub
 	if (!_tmp0_) {
 #line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1593 "PicasaPublishing.c"
+#line 1594 "PicasaPublishing.c"
 	}
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_debug ("PicasaPublishing.vala:189: EVENT: user clicked 'Logout' in the publish" \
 "ing options pane.");
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1599 "PicasaPublishing.c"
+#line 1600 "PicasaPublishing.c"
 }
 
 
@@ -1628,7 +1629,7 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_publish (Pu
 	if (!_tmp0_) {
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1616 "PicasaPublishing.c"
+#line 1617 "PicasaPublishing.c"
 	}
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_debug ("PicasaPublishing.vala:198: EVENT: user clicked 'Publish' in the publis" \
@@ -1645,11 +1646,11 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_publish (Pu
 	if (_tmp3_) {
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_picasa_publisher_do_create_album (self);
-#line 1632 "PicasaPublishing.c"
+#line 1633 "PicasaPublishing.c"
 	} else {
 #line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_picasa_publisher_do_upload (self);
-#line 1636 "PicasaPublishing.c"
+#line 1637 "PicasaPublishing.c"
 	}
 }
 
@@ -1657,21 +1658,21 @@ static void publishing_picasa_picasa_publisher_on_publishing_options_publish (Pu
 static void _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_album_creation_complete ((PublishingPicasaPicasaPublisher*) self, _sender);
-#line 1644 "PicasaPublishing.c"
+#line 1645 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_album_creation_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 1651 "PicasaPublishing.c"
+#line 1652 "PicasaPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
 #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 1658 "PicasaPublishing.c"
+#line 1659 "PicasaPublishing.c"
 }
 
 
@@ -1680,7 +1681,7 @@ static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publis
 	result = publishing_picasa_album_directory_transaction_validate_xml (doc);
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 1667 "PicasaPublishing.c"
+#line 1668 "PicasaPublishing.c"
 }
 
 
@@ -1727,7 +1728,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 	if (!_tmp4_) {
 #line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1714 "PicasaPublishing.c"
+#line 1715 "PicasaPublishing.c"
 	}
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_debug ("PicasaPublishing.vala:216: EVENT: finished creating album on remote se" \
@@ -1738,7 +1739,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 	_tmp6_ = _publishing_rest_support_transaction_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, PublishingPicasaAlbumCreationTransaction));
 #line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	downcast_txn = _tmp6_;
-#line 1724 "PicasaPublishing.c"
+#line 1725 "PicasaPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp7_ = NULL;
 		PublishingPicasaAlbumCreationTransaction* _tmp8_ = NULL;
@@ -1765,7 +1766,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1751 "PicasaPublishing.c"
+#line 1752 "PicasaPublishing.c"
 				goto __catch7_spit_publishing_publishing_error;
 			}
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1778,7 +1779,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 			g_clear_error (&_inner_error_);
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 1764 "PicasaPublishing.c"
+#line 1765 "PicasaPublishing.c"
 		}
 #line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp13_ = _tmp7_;
@@ -1790,7 +1791,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 		response_doc = _tmp13_;
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp7_);
-#line 1776 "PicasaPublishing.c"
+#line 1777 "PicasaPublishing.c"
 	}
 	goto __finally7;
 	__catch7_spit_publishing_publishing_error:
@@ -1816,7 +1817,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 		_publishing_rest_support_transaction_unref0 (downcast_txn);
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1802 "PicasaPublishing.c"
+#line 1803 "PicasaPublishing.c"
 	}
 	__finally7:
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1831,7 +1832,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 		g_clear_error (&_inner_error_);
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1817 "PicasaPublishing.c"
+#line 1818 "PicasaPublishing.c"
 	}
 	{
 		PublishingPicasaAlbum** _tmp16_ = NULL;
@@ -1859,7 +1860,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1845 "PicasaPublishing.c"
+#line 1846 "PicasaPublishing.c"
 				goto __catch8_spit_publishing_publishing_error;
 			}
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1874,7 +1875,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 			g_clear_error (&_inner_error_);
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 1860 "PicasaPublishing.c"
+#line 1861 "PicasaPublishing.c"
 		}
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp21_ = _tmp16_;
@@ -1894,7 +1895,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 		_response_albums_size_ = response_albums_length1;
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp16_ = (_vala_array_free (_tmp16_, _tmp16__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 1880 "PicasaPublishing.c"
+#line 1881 "PicasaPublishing.c"
 	}
 	goto __finally8;
 	__catch8_spit_publishing_publishing_error:
@@ -1922,7 +1923,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 		_publishing_rest_support_transaction_unref0 (downcast_txn);
 #line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1908 "PicasaPublishing.c"
+#line 1909 "PicasaPublishing.c"
 	}
 	__finally8:
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -1939,7 +1940,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 		g_clear_error (&_inner_error_);
 #line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1925 "PicasaPublishing.c"
+#line 1926 "PicasaPublishing.c"
 	}
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp24_ = response_albums;
@@ -1947,7 +1948,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 	_tmp24__length1 = response_albums_length1;
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp24__length1 != 1) {
-#line 1933 "PicasaPublishing.c"
+#line 1934 "PicasaPublishing.c"
 		SpitPublishingPluginHost* _tmp25_ = NULL;
 		GError* _tmp26_ = NULL;
 		GError* _tmp27_ = NULL;
@@ -1970,7 +1971,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 		_publishing_rest_support_transaction_unref0 (downcast_txn);
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1955 "PicasaPublishing.c"
+#line 1956 "PicasaPublishing.c"
 	}
 #line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp28_ = self->priv->publishing_parameters;
@@ -1992,7 +1993,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_complete (Publi
 	_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 1977 "PicasaPublishing.c"
+#line 1978 "PicasaPublishing.c"
 }
 
 
@@ -2029,7 +2030,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_error (Publishi
 	if (!_tmp4_) {
 #line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2014 "PicasaPublishing.c"
+#line 2015 "PicasaPublishing.c"
 	}
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = bad_txn;
@@ -2048,7 +2049,7 @@ static void publishing_picasa_picasa_publisher_on_album_creation_error (Publishi
 	_tmp9_ = err;
 #line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 2032 "PicasaPublishing.c"
+#line 2033 "PicasaPublishing.c"
 }
 
 
@@ -2069,7 +2070,7 @@ static void publishing_picasa_picasa_publisher_on_upload_status_updated (Publish
 	if (!_tmp0_) {
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2053 "PicasaPublishing.c"
+#line 2054 "PicasaPublishing.c"
 	}
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = completed_fraction;
@@ -2092,21 +2093,21 @@ static void publishing_picasa_picasa_publisher_on_upload_status_updated (Publish
 	_tmp5_ = completed_fraction;
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 2075 "PicasaPublishing.c"
+#line 2076 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_upload_complete ((PublishingPicasaPicasaPublisher*) self, _sender, num_photos_published);
-#line 2082 "PicasaPublishing.c"
+#line 2083 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_upload_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 2089 "PicasaPublishing.c"
+#line 2090 "PicasaPublishing.c"
 }
 
 
@@ -2127,7 +2128,7 @@ static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPic
 	if (!_tmp0_) {
 #line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2110 "PicasaPublishing.c"
+#line 2111 "PicasaPublishing.c"
 	}
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = num_published;
@@ -2148,7 +2149,7 @@ static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPic
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_show_success_pane (self);
-#line 2130 "PicasaPublishing.c"
+#line 2131 "PicasaPublishing.c"
 }
 
 
@@ -2172,7 +2173,7 @@ static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasa
 	if (!_tmp0_) {
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2154 "PicasaPublishing.c"
+#line 2155 "PicasaPublishing.c"
 	}
 #line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = err;
@@ -2199,14 +2200,14 @@ static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasa
 	_tmp8_ = err;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 2180 "PicasaPublishing.c"
+#line 2181 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
 #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_service_welcome_login ((PublishingPicasaPicasaPublisher*) self);
-#line 2187 "PicasaPublishing.c"
+#line 2188 "PicasaPublishing.c"
 }
 
 
@@ -2220,7 +2221,7 @@ static void publishing_picasa_picasa_publisher_do_show_service_welcome_pane (Pub
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_PICASA_SERVICE_WELCOME_MESSAGE, _publishing_picasa_picasa_publisher_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 2201 "PicasaPublishing.c"
+#line 2202 "PicasaPublishing.c"
 }
 
 
@@ -2262,7 +2263,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 2242 "PicasaPublishing.c"
+#line 2243 "PicasaPublishing.c"
 	{
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2270,7 +2271,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2250 "PicasaPublishing.c"
+#line 2251 "PicasaPublishing.c"
 				goto __catch9_spit_publishing_publishing_error;
 			}
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2281,7 +2282,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 			g_clear_error (&_inner_error_);
 #line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 2261 "PicasaPublishing.c"
+#line 2262 "PicasaPublishing.c"
 		}
 	}
 	goto __finally9;
@@ -2299,7 +2300,7 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 		publishing_picasa_picasa_publisher_on_initial_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (err);
-#line 2279 "PicasaPublishing.c"
+#line 2280 "PicasaPublishing.c"
 	}
 	__finally9:
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2312,11 +2313,11 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 		g_clear_error (&_inner_error_);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2292 "PicasaPublishing.c"
+#line 2293 "PicasaPublishing.c"
 	}
 #line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 2296 "PicasaPublishing.c"
+#line 2297 "PicasaPublishing.c"
 }
 
 
@@ -2330,7 +2331,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_debug ("PicasaPublishing.vala:327: ACTION: parsing account and album informati" \
 "on from server response XML");
-#line 2309 "PicasaPublishing.c"
+#line 2310 "PicasaPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
 		PublishingPicasaAlbumDirectoryTransaction* _tmp1_ = NULL;
@@ -2357,7 +2358,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2336 "PicasaPublishing.c"
+#line 2337 "PicasaPublishing.c"
 				goto __catch10_spit_publishing_publishing_error;
 			}
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2368,7 +2369,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 			g_clear_error (&_inner_error_);
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 2347 "PicasaPublishing.c"
+#line 2348 "PicasaPublishing.c"
 		}
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = _tmp0_;
@@ -2380,7 +2381,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		response_doc = _tmp6_;
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 2359 "PicasaPublishing.c"
+#line 2360 "PicasaPublishing.c"
 	}
 	goto __finally10;
 	__catch10_spit_publishing_publishing_error:
@@ -2404,7 +2405,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2383 "PicasaPublishing.c"
+#line 2384 "PicasaPublishing.c"
 	}
 	__finally10:
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2417,7 +2418,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		g_clear_error (&_inner_error_);
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2396 "PicasaPublishing.c"
+#line 2397 "PicasaPublishing.c"
 	}
 	{
 		PublishingPicasaAlbum** _tmp9_ = NULL;
@@ -2444,7 +2445,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2423 "PicasaPublishing.c"
+#line 2424 "PicasaPublishing.c"
 				goto __catch11_spit_publishing_publishing_error;
 			}
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2455,7 +2456,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 			g_clear_error (&_inner_error_);
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 2434 "PicasaPublishing.c"
+#line 2435 "PicasaPublishing.c"
 		}
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp14_ = self->priv->publishing_parameters;
@@ -2463,7 +2464,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		publishing_picasa_publishing_parameters_set_albums (_tmp14_, _tmp9_, _tmp9__length1);
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp9_ = (_vala_array_free (_tmp9_, _tmp9__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 2442 "PicasaPublishing.c"
+#line 2443 "PicasaPublishing.c"
 	}
 	goto __finally11;
 	__catch11_spit_publishing_publishing_error:
@@ -2487,7 +2488,7 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2466 "PicasaPublishing.c"
+#line 2467 "PicasaPublishing.c"
 	}
 	__finally11:
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2500,27 +2501,27 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		g_clear_error (&_inner_error_);
 #line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2479 "PicasaPublishing.c"
+#line 2480 "PicasaPublishing.c"
 	}
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_show_publishing_options_pane (self);
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2485 "PicasaPublishing.c"
+#line 2486 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) {
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_publishing_options_publish ((PublishingPicasaPicasaPublisher*) self);
-#line 2492 "PicasaPublishing.c"
+#line 2493 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) {
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_publishing_options_logout ((PublishingPicasaPicasaPublisher*) self);
-#line 2499 "PicasaPublishing.c"
+#line 2500 "PicasaPublishing.c"
 }
 
 
@@ -2545,7 +2546,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 	_tmp0_ = gtk_builder_new ();
 #line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	builder = _tmp0_;
-#line 2524 "PicasaPublishing.c"
+#line 2525 "PicasaPublishing.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2554,7 +2555,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "picasa_publishing_options_pane.ui", &_inner_error_);
 #line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2533 "PicasaPublishing.c"
+#line 2534 "PicasaPublishing.c"
 			goto __catch12_g_error;
 		}
 	}
@@ -2597,7 +2598,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 		_g_object_unref0 (builder);
 #line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2575 "PicasaPublishing.c"
+#line 2576 "PicasaPublishing.c"
 	}
 	__finally12:
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2610,7 +2611,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 		g_clear_error (&_inner_error_);
 #line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2588 "PicasaPublishing.c"
+#line 2589 "PicasaPublishing.c"
 	}
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = builder;
@@ -2642,7 +2643,7 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 	_g_object_unref0 (opts_pane);
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (builder);
-#line 2620 "PicasaPublishing.c"
+#line 2621 "PicasaPublishing.c"
 }
 
 
@@ -2709,7 +2710,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 2686 "PicasaPublishing.c"
+#line 2687 "PicasaPublishing.c"
 	{
 #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -2717,7 +2718,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2694 "PicasaPublishing.c"
+#line 2695 "PicasaPublishing.c"
 				goto __catch13_spit_publishing_publishing_error;
 			}
 #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2728,7 +2729,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa
 			g_clear_error (&_inner_error_);
 #line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 2705 "PicasaPublishing.c"
+#line 2706 "PicasaPublishing.c"
 		}
 	}
 	goto __finally13;
@@ -2749,7 +2750,7 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa
 		spit_publishing_plugin_host_post_error (_tmp13_, _tmp14_);
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (err);
-#line 2726 "PicasaPublishing.c"
+#line 2727 "PicasaPublishing.c"
 	}
 	__finally13:
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -2762,18 +2763,18 @@ static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasa
 		g_clear_error (&_inner_error_);
 #line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2739 "PicasaPublishing.c"
+#line 2740 "PicasaPublishing.c"
 	}
 #line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 2743 "PicasaPublishing.c"
+#line 2744 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_upload_status_updated ((PublishingPicasaPicasaPublisher*) self, file_number, fraction_complete);
-#line 2750 "PicasaPublishing.c"
+#line 2751 "PicasaPublishing.c"
 }
 
 
@@ -2846,7 +2847,7 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa
 	if (!_tmp9_) {
 #line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2822 "PicasaPublishing.c"
+#line 2823 "PicasaPublishing.c"
 	}
 #line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
@@ -2892,7 +2893,7 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
 #line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2868 "PicasaPublishing.c"
+#line 2869 "PicasaPublishing.c"
 }
 
 
@@ -2911,7 +2912,7 @@ static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingP
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2887 "PicasaPublishing.c"
+#line 2888 "PicasaPublishing.c"
 }
 
 
@@ -2942,7 +2943,7 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup
 	spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token");
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_show_service_welcome_pane (self);
-#line 2918 "PicasaPublishing.c"
+#line 2919 "PicasaPublishing.c"
 }
 
 
@@ -2958,7 +2959,7 @@ static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRE
 	result = _tmp0_;
 #line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 2934 "PicasaPublishing.c"
+#line 2935 "PicasaPublishing.c"
 }
 
 
@@ -2976,7 +2977,7 @@ static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupport
 	if (_tmp0_) {
 #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2952 "PicasaPublishing.c"
+#line 2953 "PicasaPublishing.c"
 	}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->running = TRUE;
@@ -2986,14 +2987,14 @@ static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupport
 	if (_tmp1_ == NULL) {
 #line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_picasa_publisher_do_show_service_welcome_pane (self);
-#line 2962 "PicasaPublishing.c"
+#line 2963 "PicasaPublishing.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = self->priv->refresh_token;
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp2_);
-#line 2969 "PicasaPublishing.c"
+#line 2970 "PicasaPublishing.c"
 	}
 }
 
@@ -3016,7 +3017,7 @@ static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportG
 	_publishing_rest_support_session_unref0 (_tmp1_);
 #line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->running = FALSE;
-#line 2992 "PicasaPublishing.c"
+#line 2993 "PicasaPublishing.c"
 }
 
 
@@ -3037,14 +3038,14 @@ static void publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicas
 	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_picasa_picasa_publisher_real_stop;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_picasa_picasa_publisher_finalize;
-#line 3013 "PicasaPublishing.c"
+#line 3014 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_instance_init (PublishingPicasaPicasaPublisher * self) {
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_PICASA_PUBLISHER_GET_PRIVATE (self);
-#line 3020 "PicasaPublishing.c"
+#line 3021 "PicasaPublishing.c"
 }
 
 
@@ -3066,7 +3067,7 @@ static void publishing_picasa_picasa_publisher_finalize (GObject* obj) {
 	_g_free0 (self->priv->refresh_token);
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (publishing_picasa_picasa_publisher_parent_class)->finalize (obj);
-#line 3042 "PicasaPublishing.c"
+#line 3043 "PicasaPublishing.c"
 }
 
 
@@ -3112,21 +3113,21 @@ PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, con
 	self->url = _tmp3_;
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 3088 "PicasaPublishing.c"
+#line 3089 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url) {
 #line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_album_construct (PUBLISHING_PICASA_TYPE_ALBUM, name, url);
-#line 3095 "PicasaPublishing.c"
+#line 3096 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_value_album_init (GValue* value) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 3102 "PicasaPublishing.c"
+#line 3103 "PicasaPublishing.c"
 }
 
 
@@ -3135,7 +3136,7 @@ static void publishing_picasa_value_album_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (value->data[0].v_pointer);
-#line 3111 "PicasaPublishing.c"
+#line 3112 "PicasaPublishing.c"
 	}
 }
 
@@ -3145,11 +3146,11 @@ static void publishing_picasa_value_album_copy_value (const GValue* src_value, G
 	if (src_value->data[0].v_pointer) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_picasa_album_ref (src_value->data[0].v_pointer);
-#line 3121 "PicasaPublishing.c"
+#line 3122 "PicasaPublishing.c"
 	} else {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3125 "PicasaPublishing.c"
+#line 3126 "PicasaPublishing.c"
 	}
 }
 
@@ -3157,37 +3158,37 @@ static void publishing_picasa_value_album_copy_value (const GValue* src_value, G
 static gpointer publishing_picasa_value_album_peek_pointer (const GValue* value) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 3133 "PicasaPublishing.c"
+#line 3134 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 3140 "PicasaPublishing.c"
+#line 3141 "PicasaPublishing.c"
 		PublishingPicasaAlbum* object;
 		object = collect_values[0].v_pointer;
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3147 "PicasaPublishing.c"
+#line 3148 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3151 "PicasaPublishing.c"
+#line 3152 "PicasaPublishing.c"
 		}
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_album_ref (object);
-#line 3155 "PicasaPublishing.c"
+#line 3156 "PicasaPublishing.c"
 	} else {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3159 "PicasaPublishing.c"
+#line 3160 "PicasaPublishing.c"
 	}
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 3163 "PicasaPublishing.c"
+#line 3164 "PicasaPublishing.c"
 }
 
 
@@ -3198,25 +3199,25 @@ static gchar* publishing_picasa_value_album_lcopy_value (const GValue* value, gu
 	if (!object_p) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3174 "PicasaPublishing.c"
+#line 3175 "PicasaPublishing.c"
 	}
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 3180 "PicasaPublishing.c"
+#line 3181 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3184 "PicasaPublishing.c"
+#line 3185 "PicasaPublishing.c"
 	} else {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 3188 "PicasaPublishing.c"
+#line 3189 "PicasaPublishing.c"
 	}
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 3192 "PicasaPublishing.c"
+#line 3193 "PicasaPublishing.c"
 }
 
 
@@ -3230,7 +3231,7 @@ GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 3206 "PicasaPublishing.c"
+#line 3207 "PicasaPublishing.c"
 }
 
 
@@ -3239,7 +3240,7 @@ gpointer publishing_picasa_value_get_album (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM), NULL);
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 3215 "PicasaPublishing.c"
+#line 3216 "PicasaPublishing.c"
 }
 
 
@@ -3259,17 +3260,17 @@ void publishing_picasa_value_set_album (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 3235 "PicasaPublishing.c"
+#line 3236 "PicasaPublishing.c"
 	} else {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3239 "PicasaPublishing.c"
+#line 3240 "PicasaPublishing.c"
 	}
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (old);
-#line 3245 "PicasaPublishing.c"
+#line 3246 "PicasaPublishing.c"
 	}
 }
 
@@ -3288,17 +3289,17 @@ void publishing_picasa_value_take_album (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 3264 "PicasaPublishing.c"
+#line 3265 "PicasaPublishing.c"
 	} else {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3268 "PicasaPublishing.c"
+#line 3269 "PicasaPublishing.c"
 	}
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (old);
-#line 3274 "PicasaPublishing.c"
+#line 3275 "PicasaPublishing.c"
 	}
 }
 
@@ -3308,14 +3309,14 @@ static void publishing_picasa_album_class_init (PublishingPicasaAlbumClass * kla
 	publishing_picasa_album_parent_class = g_type_class_peek_parent (klass);
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaAlbumClass *) klass)->finalize = publishing_picasa_album_finalize;
-#line 3284 "PicasaPublishing.c"
+#line 3285 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_album_instance_init (PublishingPicasaAlbum * self) {
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 3291 "PicasaPublishing.c"
+#line 3292 "PicasaPublishing.c"
 }
 
 
@@ -3329,7 +3330,7 @@ static void publishing_picasa_album_finalize (PublishingPicasaAlbum* obj) {
 	_g_free0 (self->name);
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->url);
-#line 3305 "PicasaPublishing.c"
+#line 3306 "PicasaPublishing.c"
 }
 
 
@@ -3354,7 +3355,7 @@ gpointer publishing_picasa_album_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 3330 "PicasaPublishing.c"
+#line 3331 "PicasaPublishing.c"
 }
 
 
@@ -3367,7 +3368,7 @@ void publishing_picasa_album_unref (gpointer instance) {
 		PUBLISHING_PICASA_ALBUM_GET_CLASS (self)->finalize (self);
 #line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3343 "PicasaPublishing.c"
+#line 3344 "PicasaPublishing.c"
 	}
 }
 
@@ -3383,14 +3384,14 @@ PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_tra
 	self = (PublishingPicasaAlbumDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 3359 "PicasaPublishing.c"
+#line 3360 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session) {
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_album_directory_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, session);
-#line 3366 "PicasaPublishing.c"
+#line 3367 "PicasaPublishing.c"
 }
 
 
@@ -3418,7 +3419,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
 	if (g_strcmp0 (_tmp4_, "feed") == 0) {
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = TRUE;
-#line 3394 "PicasaPublishing.c"
+#line 3395 "PicasaPublishing.c"
 	} else {
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -3428,7 +3429,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
 		_tmp6_ = _tmp5_->name;
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0;
-#line 3404 "PicasaPublishing.c"
+#line 3405 "PicasaPublishing.c"
 	}
 #line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp2_) {
@@ -3436,7 +3437,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
 		result = NULL;
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return result;
-#line 3412 "PicasaPublishing.c"
+#line 3413 "PicasaPublishing.c"
 	} else {
 		gchar* _tmp7_ = NULL;
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -3445,7 +3446,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
 		result = _tmp7_;
 #line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return result;
-#line 3421 "PicasaPublishing.c"
+#line 3422 "PicasaPublishing.c"
 	}
 }
 
@@ -3453,7 +3454,7 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
 static void publishing_picasa_album_directory_transaction_class_init (PublishingPicasaAlbumDirectoryTransactionClass * klass) {
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_album_directory_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3429 "PicasaPublishing.c"
+#line 3430 "PicasaPublishing.c"
 }
 
 
@@ -3503,11 +3504,11 @@ PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_trans
 	if (_tmp3_) {
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp1_ = "public";
-#line 3479 "PicasaPublishing.c"
+#line 3480 "PicasaPublishing.c"
 	} else {
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp1_ = "private";
-#line 3483 "PicasaPublishing.c"
+#line 3484 "PicasaPublishing.c"
 	}
 #line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = parameters;
@@ -3535,21 +3536,21 @@ PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_trans
 	_g_free0 (post_body);
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 3511 "PicasaPublishing.c"
+#line 3512 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters) {
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_album_creation_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, session, parameters);
-#line 3518 "PicasaPublishing.c"
+#line 3519 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_album_creation_transaction_class_init (PublishingPicasaAlbumCreationTransactionClass * klass) {
 #line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_album_creation_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3525 "PicasaPublishing.c"
+#line 3526 "PicasaPublishing.c"
 }
 
 
@@ -3572,14 +3573,14 @@ GType publishing_picasa_album_creation_transaction_get_type (void) {
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3548 "PicasaPublishing.c"
+#line 3549 "PicasaPublishing.c"
 }
 
 
 static gpointer _publishing_picasa_publishing_parameters_ref0 (gpointer self) {
 #line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_publishing_parameters_ref (self) : NULL;
-#line 3555 "PicasaPublishing.c"
+#line 3556 "PicasaPublishing.c"
 }
 
 
@@ -3657,11 +3658,11 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
 	if (_tmp14_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp12_ = "video/mpeg";
-#line 3633 "PicasaPublishing.c"
+#line 3634 "PicasaPublishing.c"
 	} else {
 #line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp12_ = "image/jpeg";
-#line 3637 "PicasaPublishing.c"
+#line 3638 "PicasaPublishing.c"
 	}
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15_ = g_strdup (_tmp12_);
@@ -3671,14 +3672,14 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
 	self->priv->mime_type = _tmp15_;
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 3647 "PicasaPublishing.c"
+#line 3648 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 #line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_upload_transaction_construct (PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 3654 "PicasaPublishing.c"
+#line 3655 "PicasaPublishing.c"
 }
 
 
@@ -3701,7 +3702,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 3677 "PicasaPublishing.c"
+#line 3678 "PicasaPublishing.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -3709,7 +3710,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3685 "PicasaPublishing.c"
+#line 3686 "PicasaPublishing.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -3721,7 +3722,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3697 "PicasaPublishing.c"
+#line 3698 "PicasaPublishing.c"
 	}
 }
 
@@ -3745,21 +3746,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 3721 "PicasaPublishing.c"
+#line 3722 "PicasaPublishing.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 3727 "PicasaPublishing.c"
+#line 3728 "PicasaPublishing.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 3731 "PicasaPublishing.c"
+#line 3732 "PicasaPublishing.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 3735 "PicasaPublishing.c"
+#line 3736 "PicasaPublishing.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -3771,7 +3772,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 3747 "PicasaPublishing.c"
+#line 3748 "PicasaPublishing.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -3781,13 +3782,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 3757 "PicasaPublishing.c"
+#line 3758 "PicasaPublishing.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 3763 "PicasaPublishing.c"
+#line 3764 "PicasaPublishing.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -3801,7 +3802,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 3777 "PicasaPublishing.c"
+#line 3778 "PicasaPublishing.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -3811,13 +3812,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 3787 "PicasaPublishing.c"
+#line 3788 "PicasaPublishing.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 3793 "PicasaPublishing.c"
+#line 3794 "PicasaPublishing.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3826,7 +3827,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 3802 "PicasaPublishing.c"
+#line 3803 "PicasaPublishing.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -3846,7 +3847,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3822 "PicasaPublishing.c"
+#line 3823 "PicasaPublishing.c"
 }
 
 
@@ -3863,7 +3864,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	if (_tmp0_ == NULL) {
 #line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
-#line 3839 "PicasaPublishing.c"
+#line 3840 "PicasaPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
@@ -3873,7 +3874,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	if (_tmp3_ != NULL) {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 3849 "PicasaPublishing.c"
+#line 3850 "PicasaPublishing.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
@@ -3883,13 +3884,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp4__length1 = str_array_length1;
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 3859 "PicasaPublishing.c"
+#line 3860 "PicasaPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 3865 "PicasaPublishing.c"
+#line 3866 "PicasaPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
@@ -3900,7 +3901,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp6__length1 = str_array_length1;
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 3876 "PicasaPublishing.c"
+#line 3877 "PicasaPublishing.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
@@ -3912,19 +3913,19 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp8_ = _tmp7_[0];
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 3888 "PicasaPublishing.c"
+#line 3889 "PicasaPublishing.c"
 		} else {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 3892 "PicasaPublishing.c"
+#line 3893 "PicasaPublishing.c"
 		}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 3896 "PicasaPublishing.c"
+#line 3897 "PicasaPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 3900 "PicasaPublishing.c"
+#line 3901 "PicasaPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
 		gint _tmp31_ = 0;
@@ -3947,7 +3948,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp62_ = NULL;
 #line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 3923 "PicasaPublishing.c"
+#line 3924 "PicasaPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3956,7 +3957,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp9_ = TRUE;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 3932 "PicasaPublishing.c"
+#line 3933 "PicasaPublishing.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
 				gchar** _tmp13_ = NULL;
@@ -3969,13 +3970,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gsize _tmp30_ = 0UL;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
-#line 3945 "PicasaPublishing.c"
+#line 3946 "PicasaPublishing.c"
 					gint _tmp10_ = 0;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 3951 "PicasaPublishing.c"
+#line 3952 "PicasaPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
@@ -3985,7 +3986,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp13__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 3961 "PicasaPublishing.c"
+#line 3962 "PicasaPublishing.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
@@ -3997,17 +3998,17 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp15__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 3973 "PicasaPublishing.c"
+#line 3974 "PicasaPublishing.c"
 				} else {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 3977 "PicasaPublishing.c"
+#line 3978 "PicasaPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 3983 "PicasaPublishing.c"
+#line 3984 "PicasaPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
@@ -4018,7 +4019,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp17__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 3994 "PicasaPublishing.c"
+#line 3995 "PicasaPublishing.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
@@ -4033,21 +4034,21 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 						_tmp20_ = _tmp18_[_tmp19_];
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 4009 "PicasaPublishing.c"
+#line 4010 "PicasaPublishing.c"
 					} else {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 4013 "PicasaPublishing.c"
+#line 4014 "PicasaPublishing.c"
 					}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 4017 "PicasaPublishing.c"
+#line 4018 "PicasaPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
-#line 4023 "PicasaPublishing.c"
+#line 4024 "PicasaPublishing.c"
 				}
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
@@ -4059,7 +4060,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp24_ = _tmp22_[_tmp23_];
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 4035 "PicasaPublishing.c"
+#line 4036 "PicasaPublishing.c"
 					gchar** _tmp25_ = NULL;
 					gint _tmp25__length1 = 0;
 					gint _tmp26_ = 0;
@@ -4080,24 +4081,24 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp29_ = _tmp28_;
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 4056 "PicasaPublishing.c"
+#line 4057 "PicasaPublishing.c"
 				} else {
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 4060 "PicasaPublishing.c"
+#line 4061 "PicasaPublishing.c"
 				}
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 4066 "PicasaPublishing.c"
+#line 4067 "PicasaPublishing.c"
 			}
 		}
 #line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
 #line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 4073 "PicasaPublishing.c"
+#line 4074 "PicasaPublishing.c"
 			gchar* _tmp32_ = NULL;
 #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
@@ -4105,7 +4106,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			result = _tmp32_;
 #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
-#line 4081 "PicasaPublishing.c"
+#line 4082 "PicasaPublishing.c"
 		}
 #line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
@@ -4143,7 +4144,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
 #line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 4119 "PicasaPublishing.c"
+#line 4120 "PicasaPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4152,7 +4153,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp46_ = TRUE;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 4128 "PicasaPublishing.c"
+#line 4129 "PicasaPublishing.c"
 				gint _tmp48_ = 0;
 				gchar** _tmp49_ = NULL;
 				gint _tmp49__length1 = 0;
@@ -4168,13 +4169,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				void* _tmp61_ = NULL;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
-#line 4144 "PicasaPublishing.c"
+#line 4145 "PicasaPublishing.c"
 					gint _tmp47_ = 0;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 4150 "PicasaPublishing.c"
+#line 4151 "PicasaPublishing.c"
 				}
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
@@ -4188,7 +4189,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				if (!(_tmp48_ < _tmp49__length1)) {
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
-#line 4164 "PicasaPublishing.c"
+#line 4165 "PicasaPublishing.c"
 				}
 #line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
@@ -4208,7 +4209,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp56_ = _tmp54_[_tmp55_];
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 4184 "PicasaPublishing.c"
+#line 4185 "PicasaPublishing.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
@@ -4223,11 +4224,11 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp59_ = _tmp57_[_tmp58_];
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 4199 "PicasaPublishing.c"
+#line 4200 "PicasaPublishing.c"
 				} else {
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 4203 "PicasaPublishing.c"
+#line 4204 "PicasaPublishing.c"
 				}
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
@@ -4235,7 +4236,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 4211 "PicasaPublishing.c"
+#line 4212 "PicasaPublishing.c"
 			}
 		}
 #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4246,7 +4247,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		result = (gchar*) _tmp62_;
 #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 4222 "PicasaPublishing.c"
+#line 4223 "PicasaPublishing.c"
 	} else {
 		gchar* _tmp63_ = NULL;
 #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4255,7 +4256,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		result = _tmp63_;
 #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 4231 "PicasaPublishing.c"
+#line 4232 "PicasaPublishing.c"
 	}
 }
 
@@ -4300,27 +4301,34 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 4276 "PicasaPublishing.c"
+#line 4277 "PicasaPublishing.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 4282 "PicasaPublishing.c"
+#line 4283 "PicasaPublishing.c"
+}
+
+
+static guint8* _vala_array_dup5 (guint8* self, int length) {
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	return g_memdup (self, length * sizeof (guint8));
+#line 4290 "PicasaPublishing.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 4289 "PicasaPublishing.c"
+#line 4297 "PicasaPublishing.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 4296 "PicasaPublishing.c"
+#line 4304 "PicasaPublishing.c"
 }
 
 
@@ -4360,38 +4368,40 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	gint _tmp61__length1 = 0;
 	guint8* _tmp62_ = NULL;
 	gint _tmp62__length1 = 0;
-	SoupBuffer* _tmp63_ = NULL;
-	SoupMultipart* _tmp64_ = NULL;
-	SoupBuffer* _tmp65_ = NULL;
+	guint8* _tmp63_ = NULL;
+	gint _tmp63__length1 = 0;
+	SoupBuffer* _tmp64_ = NULL;
+	SoupMultipart* _tmp65_ = NULL;
+	SoupBuffer* _tmp66_ = NULL;
 	guint8* photo_data = NULL;
-	GMappedFile* _tmp87_ = NULL;
-	gchar* _tmp88_ = NULL;
+	GMappedFile* _tmp88_ = NULL;
+	gchar* _tmp89_ = NULL;
 	gint photo_data_length1 = 0;
 	gint _photo_data_size_ = 0;
-	GMappedFile* _tmp89_ = NULL;
-	gsize _tmp90_ = 0UL;
-	gint _tmp91_ = 0;
+	GMappedFile* _tmp90_ = NULL;
+	gsize _tmp91_ = 0UL;
+	gint _tmp92_ = 0;
 	SoupBuffer* bindable_data = NULL;
-	SoupBuffer* _tmp92_ = NULL;
-	SoupMultipart* _tmp93_ = NULL;
-	SpitPublishingPublishable* _tmp94_ = NULL;
-	GFile* _tmp95_ = NULL;
+	SoupBuffer* _tmp93_ = NULL;
+	SoupMultipart* _tmp94_ = NULL;
+	SpitPublishingPublishable* _tmp95_ = NULL;
 	GFile* _tmp96_ = NULL;
-	gchar* _tmp97_ = NULL;
+	GFile* _tmp97_ = NULL;
 	gchar* _tmp98_ = NULL;
-	const gchar* _tmp99_ = NULL;
+	gchar* _tmp99_ = NULL;
+	const gchar* _tmp100_ = NULL;
 	SoupMessage* outbound_message = NULL;
-	gchar* _tmp100_ = NULL;
 	gchar* _tmp101_ = NULL;
-	SoupMultipart* _tmp102_ = NULL;
-	SoupMessage* _tmp103_ = NULL;
+	gchar* _tmp102_ = NULL;
+	SoupMultipart* _tmp103_ = NULL;
 	SoupMessage* _tmp104_ = NULL;
-	SoupMessageHeaders* _tmp105_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp106_ = NULL;
-	gchar* _tmp107_ = NULL;
+	SoupMessage* _tmp105_ = NULL;
+	SoupMessageHeaders* _tmp106_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp107_ = NULL;
 	gchar* _tmp108_ = NULL;
 	gchar* _tmp109_ = NULL;
 	gchar* _tmp110_ = NULL;
+	gchar* _tmp111_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction);
@@ -4415,7 +4425,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	_g_free0 (_tmp4_);
 #line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp5_) {
-#line 4391 "PicasaPublishing.c"
+#line 4401 "PicasaPublishing.c"
 		SpitPublishingPublishable* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
@@ -4442,7 +4452,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 		_g_free0 (_tmp10_);
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 4418 "PicasaPublishing.c"
+#line 4428 "PicasaPublishing.c"
 	}
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = self->priv->publishable;
@@ -4464,7 +4474,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	_tmp16__length1 = keywords_length1;
 #line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp16__length1 > 0) {
-#line 4440 "PicasaPublishing.c"
+#line 4450 "PicasaPublishing.c"
 		const gchar* _tmp47_ = NULL;
 		gchar* _tmp48_ = NULL;
 		const gchar* _tmp49_ = NULL;
@@ -4473,14 +4483,14 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			gint i = 0;
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			i = 0;
-#line 4449 "PicasaPublishing.c"
+#line 4459 "PicasaPublishing.c"
 			{
 				gboolean _tmp17_ = FALSE;
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp17_ = TRUE;
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				while (TRUE) {
-#line 4456 "PicasaPublishing.c"
+#line 4466 "PicasaPublishing.c"
 					gint _tmp19_ = 0;
 					gchar** _tmp20_ = NULL;
 					gint _tmp20__length1 = 0;
@@ -4497,13 +4507,13 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 					gint _tmp39_ = 0;
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (!_tmp17_) {
-#line 4473 "PicasaPublishing.c"
+#line 4483 "PicasaPublishing.c"
 						gint _tmp18_ = 0;
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp18_ = i;
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						i = _tmp18_ + 1;
-#line 4479 "PicasaPublishing.c"
+#line 4489 "PicasaPublishing.c"
 					}
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp17_ = FALSE;
@@ -4517,7 +4527,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 					if (!(_tmp19_ < _tmp20__length1)) {
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						break;
-#line 4493 "PicasaPublishing.c"
+#line 4503 "PicasaPublishing.c"
 					}
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp21_ = keywords;
@@ -4531,7 +4541,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 					_tmp24_ = g_str_has_prefix (_tmp23_, "/");
 #line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (_tmp24_) {
-#line 4507 "PicasaPublishing.c"
+#line 4517 "PicasaPublishing.c"
 						gchar** _tmp25_ = NULL;
 						gint _tmp25__length1 = 0;
 						gint _tmp26_ = 0;
@@ -4564,7 +4574,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 						_tmp_size_ = tmp_length1;
 #line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (_tmp29_);
-#line 4540 "PicasaPublishing.c"
+#line 4550 "PicasaPublishing.c"
 					} else {
 						gchar** _tmp32_ = NULL;
 						gint _tmp32__length1 = 0;
@@ -4590,7 +4600,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 						tmp_length1 = _vala_array_length (_tmp35_);
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp_size_ = tmp_length1;
-#line 4566 "PicasaPublishing.c"
+#line 4576 "PicasaPublishing.c"
 					}
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp37_ = keywords_string;
@@ -4600,7 +4610,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 					_tmp39_ = _tmp38_;
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (_tmp39_ > 0) {
-#line 4576 "PicasaPublishing.c"
+#line 4586 "PicasaPublishing.c"
 						const gchar* _tmp40_ = NULL;
 						gchar** _tmp41_ = NULL;
 						gint _tmp41__length1 = 0;
@@ -4625,7 +4635,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 						keywords_string = _tmp44_;
 #line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (_tmp43_);
-#line 4601 "PicasaPublishing.c"
+#line 4611 "PicasaPublishing.c"
 					} else {
 						gchar** _tmp45_ = NULL;
 						gint _tmp45__length1 = 0;
@@ -4640,11 +4650,11 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 						_g_free0 (keywords_string);
 #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						keywords_string = _tmp46_;
-#line 4616 "PicasaPublishing.c"
+#line 4626 "PicasaPublishing.c"
 					}
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
-#line 4620 "PicasaPublishing.c"
+#line 4630 "PicasaPublishing.c"
 				}
 			}
 		}
@@ -4664,7 +4674,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 		_g_free0 (keywords_string);
 #line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		keywords_string = _tmp50_;
-#line 4640 "PicasaPublishing.c"
+#line 4650 "PicasaPublishing.c"
 	}
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp51_ = self->priv->publishable;
@@ -4699,51 +4709,55 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp62__length1 = _tmp61__length1;
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp63_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp62_, _tmp62__length1);
+	_tmp63_ = (_tmp62_ != NULL) ? _vala_array_dup5 (_tmp62_, _tmp62__length1) : ((gpointer) _tmp62_);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp63__length1 = _tmp62__length1;
 #line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	metadata_buffer = _tmp63_;
+	_tmp64_ = soup_buffer_new_take (_tmp63_, _tmp63__length1);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	metadata_buffer = _tmp64_;
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp64_ = message_parts;
+	_tmp65_ = message_parts;
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp65_ = metadata_buffer;
+	_tmp66_ = metadata_buffer;
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	soup_multipart_append_form_file (_tmp64_, "", "", "application/atom+xml", _tmp65_);
-#line 4684 "PicasaPublishing.c"
+	soup_multipart_append_form_file (_tmp65_, "", "", "application/atom+xml", _tmp66_);
+#line 4698 "PicasaPublishing.c"
 	{
-		GMappedFile* _tmp66_ = NULL;
-		SpitPublishingPublishable* _tmp67_ = NULL;
-		GFile* _tmp68_ = NULL;
+		GMappedFile* _tmp67_ = NULL;
+		SpitPublishingPublishable* _tmp68_ = NULL;
 		GFile* _tmp69_ = NULL;
-		gchar* _tmp70_ = NULL;
+		GFile* _tmp70_ = NULL;
 		gchar* _tmp71_ = NULL;
-		GMappedFile* _tmp72_ = NULL;
+		gchar* _tmp72_ = NULL;
 		GMappedFile* _tmp73_ = NULL;
 		GMappedFile* _tmp74_ = NULL;
+		GMappedFile* _tmp75_ = NULL;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp67_ = self->priv->publishable;
+		_tmp68_ = self->priv->publishable;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp68_ = spit_publishing_publishable_get_serialized_file (_tmp67_);
+		_tmp69_ = spit_publishing_publishable_get_serialized_file (_tmp68_);
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp69_ = _tmp68_;
+		_tmp70_ = _tmp69_;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp70_ = g_file_get_path (_tmp69_);
+		_tmp71_ = g_file_get_path (_tmp70_);
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp71_ = _tmp70_;
+		_tmp72_ = _tmp71_;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp72_ = g_mapped_file_new (_tmp71_, FALSE, &_inner_error_);
+		_tmp73_ = g_mapped_file_new (_tmp72_, FALSE, &_inner_error_);
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp73_ = _tmp72_;
+		_tmp74_ = _tmp73_;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_free0 (_tmp71_);
+		_g_free0 (_tmp72_);
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_object_unref0 (_tmp69_);
+		_g_object_unref0 (_tmp70_);
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp66_ = _tmp73_;
+		_tmp67_ = _tmp74_;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4719 "PicasaPublishing.c"
+#line 4733 "PicasaPublishing.c"
 				goto __catch14_g_file_error;
 			}
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4764,80 +4778,80 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			g_clear_error (&_inner_error_);
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4740 "PicasaPublishing.c"
+#line 4754 "PicasaPublishing.c"
 		}
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp74_ = _tmp66_;
+		_tmp75_ = _tmp67_;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp66_ = NULL;
+		_tmp67_ = NULL;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_mapped_file_unref0 (self->priv->mapped_file);
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		self->priv->mapped_file = _tmp74_;
+		self->priv->mapped_file = _tmp75_;
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_mapped_file_unref0 (_tmp66_);
-#line 4752 "PicasaPublishing.c"
+		_g_mapped_file_unref0 (_tmp67_);
+#line 4766 "PicasaPublishing.c"
 	}
 	goto __finally14;
 	__catch14_g_file_error:
 	{
 		GError* e = NULL;
 		gchar* msg = NULL;
-		SpitPublishingPublishable* _tmp75_ = NULL;
-		GFile* _tmp76_ = NULL;
+		SpitPublishingPublishable* _tmp76_ = NULL;
 		GFile* _tmp77_ = NULL;
-		gchar* _tmp78_ = NULL;
+		GFile* _tmp78_ = NULL;
 		gchar* _tmp79_ = NULL;
-		GError* _tmp80_ = NULL;
-		const gchar* _tmp81_ = NULL;
-		gchar* _tmp82_ = NULL;
+		gchar* _tmp80_ = NULL;
+		GError* _tmp81_ = NULL;
+		const gchar* _tmp82_ = NULL;
 		gchar* _tmp83_ = NULL;
-		const gchar* _tmp84_ = NULL;
+		gchar* _tmp84_ = NULL;
 		const gchar* _tmp85_ = NULL;
-		GError* _tmp86_ = NULL;
+		const gchar* _tmp86_ = NULL;
+		GError* _tmp87_ = NULL;
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		e = _inner_error_;
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp75_ = self->priv->publishable;
+		_tmp76_ = self->priv->publishable;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp76_ = spit_publishing_publishable_get_serialized_file (_tmp75_);
+		_tmp77_ = spit_publishing_publishable_get_serialized_file (_tmp76_);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp77_ = _tmp76_;
+		_tmp78_ = _tmp77_;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp78_ = g_file_get_path (_tmp77_);
+		_tmp79_ = g_file_get_path (_tmp78_);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp79_ = _tmp78_;
+		_tmp80_ = _tmp79_;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp80_ = e;
+		_tmp81_ = e;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp81_ = _tmp80_->message;
+		_tmp82_ = _tmp81_->message;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp82_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp79_, _tmp81_);
+		_tmp83_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp80_, _tmp82_);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp83_ = _tmp82_;
+		_tmp84_ = _tmp83_;
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_free0 (_tmp79_);
+		_g_free0 (_tmp80_);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_object_unref0 (_tmp77_);
+		_g_object_unref0 (_tmp78_);
 #line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		msg = _tmp83_;
+		msg = _tmp84_;
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp84_ = msg;
+		_tmp85_ = msg;
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_warning ("PicasaPublishing.vala:574: %s", _tmp84_);
+		g_warning ("PicasaPublishing.vala:574: %s", _tmp85_);
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp85_ = msg;
+		_tmp86_ = msg;
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp86_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp85_);
+		_tmp87_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp86_);
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_inner_error_ = _tmp86_;
+		_inner_error_ = _tmp87_;
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (msg);
 #line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (e);
-#line 4813 "PicasaPublishing.c"
+#line 4827 "PicasaPublishing.c"
 		goto __finally14;
 	}
 	__finally14:
@@ -4861,7 +4875,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			__vala_SoupMultipart_free0 (message_parts);
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4837 "PicasaPublishing.c"
+#line 4851 "PicasaPublishing.c"
 		} else {
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
@@ -4881,83 +4895,83 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			g_clear_error (&_inner_error_);
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4857 "PicasaPublishing.c"
+#line 4871 "PicasaPublishing.c"
 		}
 	}
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp87_ = self->priv->mapped_file;
+	_tmp88_ = self->priv->mapped_file;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp88_ = g_mapped_file_get_contents (_tmp87_);
+	_tmp89_ = g_mapped_file_get_contents (_tmp88_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	photo_data = (guint8*) _tmp88_;
+	photo_data = (guint8*) _tmp89_;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	photo_data_length1 = -1;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_photo_data_size_ = photo_data_length1;
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp89_ = self->priv->mapped_file;
+	_tmp90_ = self->priv->mapped_file;
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp90_ = g_mapped_file_get_length (_tmp89_);
+	_tmp91_ = g_mapped_file_get_length (_tmp90_);
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	photo_data_length1 = (gint) _tmp90_;
+	photo_data_length1 = (gint) _tmp91_;
 #line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp91_ = photo_data_length1;
+	_tmp92_ = photo_data_length1;
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp92_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, photo_data, photo_data_length1);
+	_tmp93_ = soup_buffer_new_with_owner (photo_data, photo_data_length1, self, NULL);
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	bindable_data = _tmp92_;
+	bindable_data = _tmp93_;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp93_ = message_parts;
+	_tmp94_ = message_parts;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp94_ = self->priv->publishable;
+	_tmp95_ = self->priv->publishable;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp95_ = spit_publishing_publishable_get_serialized_file (_tmp94_);
+	_tmp96_ = spit_publishing_publishable_get_serialized_file (_tmp95_);
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp96_ = _tmp95_;
+	_tmp97_ = _tmp96_;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp97_ = g_file_get_path (_tmp96_);
+	_tmp98_ = g_file_get_path (_tmp97_);
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp98_ = _tmp97_;
+	_tmp99_ = _tmp98_;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp99_ = self->priv->mime_type;
+	_tmp100_ = self->priv->mime_type;
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	soup_multipart_append_form_file (_tmp93_, "", _tmp98_, _tmp99_, bindable_data);
+	soup_multipart_append_form_file (_tmp94_, "", _tmp99_, _tmp100_, bindable_data);
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp98_);
+	_g_free0 (_tmp99_);
 #line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (_tmp96_);
+	_g_object_unref0 (_tmp97_);
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp100_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+	_tmp101_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp101_ = _tmp100_;
+	_tmp102_ = _tmp101_;
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp102_ = message_parts;
+	_tmp103_ = message_parts;
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp103_ = soup_form_request_new_from_multipart (_tmp101_, _tmp102_);
+	_tmp104_ = soup_form_request_new_from_multipart (_tmp102_, _tmp103_);
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp104_ = _tmp103_;
+	_tmp105_ = _tmp104_;
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp101_);
+	_g_free0 (_tmp102_);
 #line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	outbound_message = _tmp104_;
+	outbound_message = _tmp105_;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp105_ = outbound_message->request_headers;
+	_tmp106_ = outbound_message->request_headers;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp106_ = self->priv->session;
+	_tmp107_ = self->priv->session;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp107_ = publishing_rest_support_google_session_get_access_token (_tmp106_);
+	_tmp108_ = publishing_rest_support_google_session_get_access_token (_tmp107_);
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp108_ = _tmp107_;
+	_tmp109_ = _tmp108_;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp109_ = g_strconcat ("Bearer ", _tmp108_, NULL);
+	_tmp110_ = g_strconcat ("Bearer ", _tmp109_, NULL);
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp110_ = _tmp109_;
+	_tmp111_ = _tmp110_;
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	soup_message_headers_append (_tmp105_, "Authorization", _tmp110_);
+	soup_message_headers_append (_tmp106_, "Authorization", _tmp111_);
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp110_);
+	_g_free0 (_tmp111_);
 #line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp108_);
+	_g_free0 (_tmp109_);
 #line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -4988,7 +5002,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			__vala_SoupMultipart_free0 (message_parts);
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4964 "PicasaPublishing.c"
+#line 4978 "PicasaPublishing.c"
 		} else {
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_object_unref0 (outbound_message);
@@ -5012,7 +5026,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 			g_clear_error (&_inner_error_);
 #line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4988 "PicasaPublishing.c"
+#line 5002 "PicasaPublishing.c"
 		}
 	}
 #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5031,7 +5045,7 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	_g_free0 (summary);
 #line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__vala_SoupMultipart_free0 (message_parts);
-#line 5007 "PicasaPublishing.c"
+#line 5021 "PicasaPublishing.c"
 }
 
 
@@ -5044,14 +5058,14 @@ static void publishing_picasa_upload_transaction_class_init (PublishingPicasaUpl
 	g_type_class_add_private (klass, sizeof (PublishingPicasaUploadTransactionPrivate));
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_picasa_upload_transaction_real_execute;
-#line 5020 "PicasaPublishing.c"
+#line 5034 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_upload_transaction_instance_init (PublishingPicasaUploadTransaction * self) {
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 5027 "PicasaPublishing.c"
+#line 5041 "PicasaPublishing.c"
 }
 
 
@@ -5071,7 +5085,7 @@ static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupport
 	_g_mapped_file_unref0 (self->priv->mapped_file);
 #line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_picasa_upload_transaction_parent_class)->finalize (obj);
-#line 5047 "PicasaPublishing.c"
+#line 5061 "PicasaPublishing.c"
 }
 
 
@@ -5090,42 +5104,42 @@ GType publishing_picasa_upload_transaction_get_type (void) {
 static gpointer _publishing_picasa_publishing_options_pane_size_description_ref0 (gpointer self) {
 #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_publishing_options_pane_size_description_ref (self) : NULL;
-#line 5066 "PicasaPublishing.c"
+#line 5080 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5073 "PicasaPublishing.c"
+#line 5087 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_create_new_radio_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5080 "PicasaPublishing.c"
+#line 5094 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_new_album_entry_changed ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5087 "PicasaPublishing.c"
+#line 5101 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_logout_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5094 "PicasaPublishing.c"
+#line 5108 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_publish_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5101 "PicasaPublishing.c"
+#line 5115 "PicasaPublishing.c"
 }
 
 
@@ -5397,7 +5411,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
 	_tmp58_ = publishing_picasa_publishing_parameters_get_media_type (_tmp57_);
 #line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((_tmp58_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) {
-#line 5373 "PicasaPublishing.c"
+#line 5387 "PicasaPublishing.c"
 		GtkLabel* _tmp59_ = NULL;
 		const gchar* _tmp60_ = NULL;
 		GtkComboBoxText* _tmp61_ = NULL;
@@ -5416,7 +5430,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
 		_tmp62_ = self->priv->size_combo;
 #line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 5392 "PicasaPublishing.c"
+#line 5406 "PicasaPublishing.c"
 	} else {
 		GtkLabel* _tmp63_ = NULL;
 		const gchar* _tmp64_ = NULL;
@@ -5437,7 +5451,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
 		_tmp65_ = self->priv->size_descriptions;
 #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp65__length1 = self->priv->size_descriptions_length1;
-#line 5413 "PicasaPublishing.c"
+#line 5427 "PicasaPublishing.c"
 		{
 			PublishingPicasaPublishingOptionsPaneSizeDescription** desc_collection = NULL;
 			gint desc_collection_length1 = 0;
@@ -5449,14 +5463,14 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
 			desc_collection_length1 = _tmp65__length1;
 #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			for (desc_it = 0; desc_it < _tmp65__length1; desc_it = desc_it + 1) {
-#line 5425 "PicasaPublishing.c"
+#line 5439 "PicasaPublishing.c"
 				PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp66_ = NULL;
 				PublishingPicasaPublishingOptionsPaneSizeDescription* desc = NULL;
 #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp66_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]);
 #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				desc = _tmp66_;
-#line 5432 "PicasaPublishing.c"
+#line 5446 "PicasaPublishing.c"
 				{
 					GtkComboBoxText* _tmp67_ = NULL;
 					PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp68_ = NULL;
@@ -5471,7 +5485,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
 					gtk_combo_box_text_append_text (_tmp67_, _tmp69_);
 #line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_publishing_picasa_publishing_options_pane_size_description_unref0 (desc);
-#line 5447 "PicasaPublishing.c"
+#line 5461 "PicasaPublishing.c"
 				}
 			}
 		}
@@ -5491,7 +5505,7 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
 		_tmp74_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp73_);
 #line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_combo_box_get_type (), GtkComboBox), _tmp74_);
-#line 5467 "PicasaPublishing.c"
+#line 5481 "PicasaPublishing.c"
 	}
 #line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp75_ = self->priv->use_existing_radio;
@@ -5515,14 +5529,14 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
 	g_signal_connect_object (_tmp79_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 5491 "PicasaPublishing.c"
+#line 5505 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters) {
 #line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_publishing_options_pane_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, builder, parameters);
-#line 5498 "PicasaPublishing.c"
+#line 5512 "PicasaPublishing.c"
 }
 
 
@@ -5558,7 +5572,7 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp2_ >= 0) {
-#line 5534 "PicasaPublishing.c"
+#line 5548 "PicasaPublishing.c"
 		GtkComboBoxText* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5567,11 +5581,11 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
 		_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _tmp4_;
-#line 5543 "PicasaPublishing.c"
+#line 5557 "PicasaPublishing.c"
 	} else {
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = 0;
-#line 5547 "PicasaPublishing.c"
+#line 5561 "PicasaPublishing.c"
 	}
 #line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	size_combo_last_active = _tmp0_;
@@ -5619,7 +5633,7 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
 	_tmp19_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp19_) {
-#line 5595 "PicasaPublishing.c"
+#line 5609 "PicasaPublishing.c"
 		PublishingPicasaPublishingParameters* _tmp20_ = NULL;
 		GtkEntry* _tmp21_ = NULL;
 		const gchar* _tmp22_ = NULL;
@@ -5649,7 +5663,7 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
 		publishing_picasa_publishing_parameters_set_is_new_album_public (_tmp24_, _tmp26_);
 #line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_signal_emit_by_name (self, "publish");
-#line 5625 "PicasaPublishing.c"
+#line 5639 "PicasaPublishing.c"
 	} else {
 		PublishingPicasaPublishingParameters* _tmp27_ = NULL;
 		PublishingPicasaAlbum** _tmp28_ = NULL;
@@ -5704,11 +5718,11 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
 		publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp34_, _tmp39_);
 #line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_signal_emit_by_name (self, "publish");
-#line 5680 "PicasaPublishing.c"
+#line 5694 "PicasaPublishing.c"
 	}
 #line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 5684 "PicasaPublishing.c"
+#line 5698 "PicasaPublishing.c"
 }
 
 
@@ -5737,7 +5751,7 @@ static void publishing_picasa_publishing_options_pane_on_use_existing_radio_clic
 	_tmp3_ = self->priv->public_check;
 #line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 5713 "PicasaPublishing.c"
+#line 5727 "PicasaPublishing.c"
 }
 
 
@@ -5766,7 +5780,7 @@ static void publishing_picasa_publishing_options_pane_on_create_new_radio_clicke
 	_tmp3_ = self->priv->public_check;
 #line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 5742 "PicasaPublishing.c"
+#line 5756 "PicasaPublishing.c"
 }
 
 
@@ -5775,7 +5789,7 @@ static void publishing_picasa_publishing_options_pane_on_logout_clicked (Publish
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 5751 "PicasaPublishing.c"
+#line 5765 "PicasaPublishing.c"
 }
 
 
@@ -5798,7 +5812,7 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5774 "PicasaPublishing.c"
+#line 5788 "PicasaPublishing.c"
 }
 
 
@@ -5835,7 +5849,7 @@ static void publishing_picasa_publishing_options_pane_update_publish_button_sens
 	_g_free0 (_tmp6_);
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp7_) {
-#line 5811 "PicasaPublishing.c"
+#line 5825 "PicasaPublishing.c"
 		GtkRadioButton* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -5844,11 +5858,11 @@ static void publishing_picasa_publishing_options_pane_update_publish_button_sens
 		_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
 #line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = _tmp9_;
-#line 5820 "PicasaPublishing.c"
+#line 5834 "PicasaPublishing.c"
 	} else {
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = FALSE;
-#line 5824 "PicasaPublishing.c"
+#line 5838 "PicasaPublishing.c"
 	}
 #line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = self->priv->publish_button;
@@ -5856,7 +5870,7 @@ static void publishing_picasa_publishing_options_pane_update_publish_button_sens
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp3_);
 #line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (album_name);
-#line 5832 "PicasaPublishing.c"
+#line 5846 "PicasaPublishing.c"
 }
 
 
@@ -5865,7 +5879,7 @@ static void publishing_picasa_publishing_options_pane_on_new_album_entry_changed
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 5841 "PicasaPublishing.c"
+#line 5855 "PicasaPublishing.c"
 }
 
 
@@ -5876,13 +5890,13 @@ static void _vala_array_add13 (PublishingPicasaPublishingOptionsPaneSizeDescript
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5852 "PicasaPublishing.c"
+#line 5866 "PicasaPublishing.c"
 	}
 #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5858 "PicasaPublishing.c"
+#line 5872 "PicasaPublishing.c"
 }
 
 
@@ -5893,13 +5907,13 @@ static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescript
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5869 "PicasaPublishing.c"
+#line 5883 "PicasaPublishing.c"
 	}
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5875 "PicasaPublishing.c"
+#line 5889 "PicasaPublishing.c"
 }
 
 
@@ -5910,13 +5924,13 @@ static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescript
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5886 "PicasaPublishing.c"
+#line 5900 "PicasaPublishing.c"
 	}
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5892 "PicasaPublishing.c"
+#line 5906 "PicasaPublishing.c"
 }
 
 
@@ -5927,13 +5941,13 @@ static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescript
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5903 "PicasaPublishing.c"
+#line 5917 "PicasaPublishing.c"
 	}
 #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5909 "PicasaPublishing.c"
+#line 5923 "PicasaPublishing.c"
 }
 
 
@@ -5944,13 +5958,13 @@ static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescript
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5920 "PicasaPublishing.c"
+#line 5934 "PicasaPublishing.c"
 	}
 #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
 #line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5926 "PicasaPublishing.c"
+#line 5940 "PicasaPublishing.c"
 }
 
 
@@ -6050,13 +6064,13 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 	if (result_length1) {
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*result_length1 = _tmp16__length1;
-#line 6026 "PicasaPublishing.c"
+#line 6040 "PicasaPublishing.c"
 	}
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp16_;
 #line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6032 "PicasaPublishing.c"
+#line 6046 "PicasaPublishing.c"
 }
 
 
@@ -6093,19 +6107,19 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 	albums_length1 = _tmp3_;
 #line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_albums_size_ = albums_length1;
-#line 6069 "PicasaPublishing.c"
+#line 6083 "PicasaPublishing.c"
 	{
 		gint i = 0;
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		i = 0;
-#line 6074 "PicasaPublishing.c"
+#line 6088 "PicasaPublishing.c"
 		{
 			gboolean _tmp5_ = FALSE;
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp5_ = TRUE;
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			while (TRUE) {
-#line 6081 "PicasaPublishing.c"
+#line 6095 "PicasaPublishing.c"
 				gint _tmp7_ = 0;
 				PublishingPicasaAlbum** _tmp8_ = NULL;
 				gint _tmp8__length1 = 0;
@@ -6124,13 +6138,13 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 				const gchar* _tmp19_ = NULL;
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (!_tmp5_) {
-#line 6100 "PicasaPublishing.c"
+#line 6114 "PicasaPublishing.c"
 					gint _tmp6_ = 0;
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp6_ = i;
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					i = _tmp6_ + 1;
-#line 6106 "PicasaPublishing.c"
+#line 6120 "PicasaPublishing.c"
 				}
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp5_ = FALSE;
@@ -6144,7 +6158,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 				if (!(_tmp7_ < _tmp8__length1)) {
 #line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					break;
-#line 6120 "PicasaPublishing.c"
+#line 6134 "PicasaPublishing.c"
 				}
 #line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp9_ = self->priv->existing_albums_combo;
@@ -6176,7 +6190,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 				if (g_strcmp0 (_tmp18_, _tmp19_) == 0) {
 #line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp14_ = TRUE;
-#line 6152 "PicasaPublishing.c"
+#line 6166 "PicasaPublishing.c"
 				} else {
 					gboolean _tmp20_ = FALSE;
 					PublishingPicasaAlbum** _tmp21_ = NULL;
@@ -6196,31 +6210,31 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 					_tmp24_ = _tmp23_->name;
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (g_strcmp0 (_tmp24_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME) == 0) {
-#line 6172 "PicasaPublishing.c"
+#line 6186 "PicasaPublishing.c"
 						gint _tmp25_ = 0;
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp25_ = default_album_id;
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp20_ = _tmp25_ == -1;
-#line 6178 "PicasaPublishing.c"
+#line 6192 "PicasaPublishing.c"
 					} else {
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp20_ = FALSE;
-#line 6182 "PicasaPublishing.c"
+#line 6196 "PicasaPublishing.c"
 					}
 #line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp14_ = _tmp20_;
-#line 6186 "PicasaPublishing.c"
+#line 6200 "PicasaPublishing.c"
 				}
 #line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (_tmp14_) {
-#line 6190 "PicasaPublishing.c"
+#line 6204 "PicasaPublishing.c"
 					gint _tmp26_ = 0;
 #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp26_ = i;
 #line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					default_album_id = _tmp26_;
-#line 6196 "PicasaPublishing.c"
+#line 6210 "PicasaPublishing.c"
 				}
 			}
 		}
@@ -6231,7 +6245,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 	_tmp27__length1 = albums_length1;
 #line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp27__length1 == 0) {
-#line 6207 "PicasaPublishing.c"
+#line 6221 "PicasaPublishing.c"
 		GtkComboBoxText* _tmp28_ = NULL;
 		GtkRadioButton* _tmp29_ = NULL;
 		GtkRadioButton* _tmp30_ = NULL;
@@ -6257,14 +6271,14 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 		_tmp32_ = self->priv->new_album_entry;
 #line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		gtk_entry_set_text (_tmp32_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME);
-#line 6233 "PicasaPublishing.c"
+#line 6247 "PicasaPublishing.c"
 	} else {
 		gint _tmp33_ = 0;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp33_ = default_album_id;
 #line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (_tmp33_ >= 0) {
-#line 6240 "PicasaPublishing.c"
+#line 6254 "PicasaPublishing.c"
 			GtkRadioButton* _tmp34_ = NULL;
 			GtkComboBoxText* _tmp35_ = NULL;
 			gint _tmp36_ = 0;
@@ -6288,7 +6302,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 			_tmp38_ = self->priv->public_check;
 #line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 6264 "PicasaPublishing.c"
+#line 6278 "PicasaPublishing.c"
 		} else {
 			GtkRadioButton* _tmp39_ = NULL;
 			GtkComboBoxText* _tmp40_ = NULL;
@@ -6315,7 +6329,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 			_tmp43_ = self->priv->public_check;
 #line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 6291 "PicasaPublishing.c"
+#line 6305 "PicasaPublishing.c"
 		}
 	}
 #line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -6324,7 +6338,7 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 	albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
 #line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (last_album);
-#line 6300 "PicasaPublishing.c"
+#line 6314 "PicasaPublishing.c"
 }
 
 
@@ -6343,7 +6357,7 @@ static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (Spi
 	result = _tmp1_;
 #line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6319 "PicasaPublishing.c"
+#line 6333 "PicasaPublishing.c"
 }
 
 
@@ -6356,7 +6370,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_opti
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6332 "PicasaPublishing.c"
+#line 6346 "PicasaPublishing.c"
 }
 
 
@@ -6366,7 +6380,7 @@ static void publishing_picasa_publishing_options_pane_real_on_pane_installed (Sp
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
 #line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_installed (self);
-#line 6342 "PicasaPublishing.c"
+#line 6356 "PicasaPublishing.c"
 }
 
 
@@ -6374,7 +6388,7 @@ static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled (
 	PublishingPicasaPublishingOptionsPane * self;
 #line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 6350 "PicasaPublishing.c"
+#line 6364 "PicasaPublishing.c"
 }
 
 
@@ -6401,21 +6415,21 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_p
 	self->major_axis_pixels = _tmp2_;
 #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 6377 "PicasaPublishing.c"
+#line 6391 "PicasaPublishing.c"
 }
 
 
 static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels) {
 #line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_publishing_options_pane_size_description_construct (PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, name, major_axis_pixels);
-#line 6384 "PicasaPublishing.c"
+#line 6398 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_size_description_init (GValue* value) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 6391 "PicasaPublishing.c"
+#line 6405 "PicasaPublishing.c"
 }
 
 
@@ -6424,7 +6438,7 @@ static void publishing_picasa_publishing_options_pane_value_size_description_fre
 	if (value->data[0].v_pointer) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (value->data[0].v_pointer);
-#line 6400 "PicasaPublishing.c"
+#line 6414 "PicasaPublishing.c"
 	}
 }
 
@@ -6434,11 +6448,11 @@ static void publishing_picasa_publishing_options_pane_value_size_description_cop
 	if (src_value->data[0].v_pointer) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (src_value->data[0].v_pointer);
-#line 6410 "PicasaPublishing.c"
+#line 6424 "PicasaPublishing.c"
 	} else {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6414 "PicasaPublishing.c"
+#line 6428 "PicasaPublishing.c"
 	}
 }
 
@@ -6446,37 +6460,37 @@ static void publishing_picasa_publishing_options_pane_value_size_description_cop
 static gpointer publishing_picasa_publishing_options_pane_value_size_description_peek_pointer (const GValue* value) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6422 "PicasaPublishing.c"
+#line 6436 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_publishing_options_pane_value_size_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 6429 "PicasaPublishing.c"
+#line 6443 "PicasaPublishing.c"
 		PublishingPicasaPublishingOptionsPaneSizeDescription* object;
 		object = collect_values[0].v_pointer;
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6436 "PicasaPublishing.c"
+#line 6450 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6440 "PicasaPublishing.c"
+#line 6454 "PicasaPublishing.c"
 		}
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (object);
-#line 6444 "PicasaPublishing.c"
+#line 6458 "PicasaPublishing.c"
 	} else {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6448 "PicasaPublishing.c"
+#line 6462 "PicasaPublishing.c"
 	}
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 6452 "PicasaPublishing.c"
+#line 6466 "PicasaPublishing.c"
 }
 
 
@@ -6487,25 +6501,25 @@ static gchar* publishing_picasa_publishing_options_pane_value_size_description_l
 	if (!object_p) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6463 "PicasaPublishing.c"
+#line 6477 "PicasaPublishing.c"
 	}
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 6469 "PicasaPublishing.c"
+#line 6483 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6473 "PicasaPublishing.c"
+#line 6487 "PicasaPublishing.c"
 	} else {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer);
-#line 6477 "PicasaPublishing.c"
+#line 6491 "PicasaPublishing.c"
 	}
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 6481 "PicasaPublishing.c"
+#line 6495 "PicasaPublishing.c"
 }
 
 
@@ -6519,7 +6533,7 @@ static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_des
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 6495 "PicasaPublishing.c"
+#line 6509 "PicasaPublishing.c"
 }
 
 
@@ -6528,7 +6542,7 @@ static gpointer publishing_picasa_publishing_options_pane_value_get_size_descrip
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION), NULL);
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6504 "PicasaPublishing.c"
+#line 6518 "PicasaPublishing.c"
 }
 
 
@@ -6548,17 +6562,17 @@ static void publishing_picasa_publishing_options_pane_value_set_size_description
 		value->data[0].v_pointer = v_object;
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer);
-#line 6524 "PicasaPublishing.c"
+#line 6538 "PicasaPublishing.c"
 	} else {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6528 "PicasaPublishing.c"
+#line 6542 "PicasaPublishing.c"
 	}
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 6534 "PicasaPublishing.c"
+#line 6548 "PicasaPublishing.c"
 	}
 }
 
@@ -6577,17 +6591,17 @@ static void publishing_picasa_publishing_options_pane_value_take_size_descriptio
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 6553 "PicasaPublishing.c"
+#line 6567 "PicasaPublishing.c"
 	} else {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6557 "PicasaPublishing.c"
+#line 6571 "PicasaPublishing.c"
 	}
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 6563 "PicasaPublishing.c"
+#line 6577 "PicasaPublishing.c"
 	}
 }
 
@@ -6597,14 +6611,14 @@ static void publishing_picasa_publishing_options_pane_size_description_class_ini
 	publishing_picasa_publishing_options_pane_size_description_parent_class = g_type_class_peek_parent (klass);
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaPublishingOptionsPaneSizeDescriptionClass *) klass)->finalize = publishing_picasa_publishing_options_pane_size_description_finalize;
-#line 6573 "PicasaPublishing.c"
+#line 6587 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_size_description_instance_init (PublishingPicasaPublishingOptionsPaneSizeDescription * self) {
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 6580 "PicasaPublishing.c"
+#line 6594 "PicasaPublishing.c"
 }
 
 
@@ -6616,7 +6630,7 @@ static void publishing_picasa_publishing_options_pane_size_description_finalize
 	g_signal_handlers_destroy (self);
 #line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
-#line 6592 "PicasaPublishing.c"
+#line 6606 "PicasaPublishing.c"
 }
 
 
@@ -6641,7 +6655,7 @@ static gpointer publishing_picasa_publishing_options_pane_size_description_ref (
 	g_atomic_int_inc (&self->ref_count);
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 6617 "PicasaPublishing.c"
+#line 6631 "PicasaPublishing.c"
 }
 
 
@@ -6654,7 +6668,7 @@ static void publishing_picasa_publishing_options_pane_size_description_unref (gp
 		PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_GET_CLASS (self)->finalize (self);
 #line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6630 "PicasaPublishing.c"
+#line 6644 "PicasaPublishing.c"
 	}
 }
 
@@ -6670,7 +6684,7 @@ static void publishing_picasa_publishing_options_pane_class_init (PublishingPica
 	g_signal_new ("publish", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 6646 "PicasaPublishing.c"
+#line 6660 "PicasaPublishing.c"
 }
 
 
@@ -6685,7 +6699,7 @@ static void publishing_picasa_publishing_options_pane_spit_publishing_dialog_pan
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_installed;
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_uninstalled;
-#line 6661 "PicasaPublishing.c"
+#line 6675 "PicasaPublishing.c"
 }
 
 
@@ -6718,7 +6732,7 @@ static void publishing_picasa_publishing_options_pane_instance_init (PublishingP
 	self->priv->publish_button = NULL;
 #line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 6694 "PicasaPublishing.c"
+#line 6708 "PicasaPublishing.c"
 }
 
 
@@ -6758,7 +6772,7 @@ static void publishing_picasa_publishing_options_pane_finalize (GObject* obj) {
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
 #line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (publishing_picasa_publishing_options_pane_parent_class)->finalize (obj);
-#line 6734 "PicasaPublishing.c"
+#line 6748 "PicasaPublishing.c"
 }
 
 
@@ -6817,14 +6831,14 @@ PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_co
 	self->priv->to_new_album = TRUE;
 #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 6793 "PicasaPublishing.c"
+#line 6807 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_new (void) {
 #line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_publishing_parameters_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS);
-#line 6800 "PicasaPublishing.c"
+#line 6814 "PicasaPublishing.c"
 }
 
 
@@ -6839,7 +6853,7 @@ gboolean publishing_picasa_publishing_parameters_is_to_new_album (PublishingPica
 	result = _tmp0_;
 #line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6815 "PicasaPublishing.c"
+#line 6829 "PicasaPublishing.c"
 }
 
 
@@ -6851,7 +6865,7 @@ void publishing_picasa_publishing_parameters_set_is_to_new_album (PublishingPica
 	_tmp0_ = to_new_album;
 #line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->to_new_album = _tmp0_;
-#line 6827 "PicasaPublishing.c"
+#line 6841 "PicasaPublishing.c"
 }
 
 
@@ -6863,7 +6877,7 @@ void publishing_picasa_publishing_parameters_set_is_new_album_public (Publishing
 	_tmp0_ = album_public;
 #line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->album_public = _tmp0_;
-#line 6839 "PicasaPublishing.c"
+#line 6853 "PicasaPublishing.c"
 }
 
 
@@ -6878,7 +6892,7 @@ gboolean publishing_picasa_publishing_parameters_is_new_album_public (Publishing
 	result = _tmp0_;
 #line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6854 "PicasaPublishing.c"
+#line 6868 "PicasaPublishing.c"
 }
 
 
@@ -6896,7 +6910,7 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_name (Publishing
 	result = _tmp1_;
 #line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6872 "PicasaPublishing.c"
+#line 6886 "PicasaPublishing.c"
 }
 
 
@@ -6915,7 +6929,7 @@ void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPi
 	_g_free0 (self->priv->target_album_name);
 #line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->target_album_name = _tmp1_;
-#line 6891 "PicasaPublishing.c"
+#line 6905 "PicasaPublishing.c"
 }
 
 
@@ -6934,7 +6948,7 @@ void publishing_picasa_publishing_parameters_set_target_album_entry_url (Publish
 	_g_free0 (self->priv->target_album_url);
 #line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->target_album_url = _tmp1_;
-#line 6910 "PicasaPublishing.c"
+#line 6924 "PicasaPublishing.c"
 }
 
 
@@ -6952,7 +6966,7 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (Publi
 	result = _tmp1_;
 #line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6928 "PicasaPublishing.c"
+#line 6942 "PicasaPublishing.c"
 }
 
 
@@ -6965,7 +6979,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 6941 "PicasaPublishing.c"
+#line 6955 "PicasaPublishing.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -6996,7 +7010,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6972 "PicasaPublishing.c"
+#line 6986 "PicasaPublishing.c"
 				goto __catch15_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7005,7 +7019,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 6981 "PicasaPublishing.c"
+#line 6995 "PicasaPublishing.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -7021,7 +7035,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6997 "PicasaPublishing.c"
+#line 7011 "PicasaPublishing.c"
 				goto __catch15_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7032,7 +7046,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 7008 "PicasaPublishing.c"
+#line 7022 "PicasaPublishing.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -7046,7 +7060,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 7022 "PicasaPublishing.c"
+#line 7036 "PicasaPublishing.c"
 	}
 	goto __finally15;
 	__catch15_g_regex_error:
@@ -7060,7 +7074,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 7036 "PicasaPublishing.c"
+#line 7050 "PicasaPublishing.c"
 	}
 	__finally15:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7071,7 +7085,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 7047 "PicasaPublishing.c"
+#line 7061 "PicasaPublishing.c"
 	}
 }
 
@@ -7098,7 +7112,7 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (Publis
 	_g_free0 (entry_url);
 #line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7074 "PicasaPublishing.c"
+#line 7088 "PicasaPublishing.c"
 }
 
 
@@ -7116,7 +7130,7 @@ gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPu
 	result = _tmp1_;
 #line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7092 "PicasaPublishing.c"
+#line 7106 "PicasaPublishing.c"
 }
 
 
@@ -7135,35 +7149,35 @@ void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPubl
 	_g_free0 (self->priv->user_name);
 #line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->user_name = _tmp1_;
-#line 7111 "PicasaPublishing.c"
+#line 7125 "PicasaPublishing.c"
 }
 
 
 static gpointer _publishing_picasa_album_ref0 (gpointer self) {
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_album_ref (self) : NULL;
-#line 7118 "PicasaPublishing.c"
+#line 7132 "PicasaPublishing.c"
 }
 
 
-static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length) {
+static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length) {
 	PublishingPicasaAlbum** result;
 	int i;
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = g_new0 (PublishingPicasaAlbum*, length + 1);
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 7129 "PicasaPublishing.c"
+#line 7143 "PicasaPublishing.c"
 		PublishingPicasaAlbum* _tmp0_ = NULL;
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 7135 "PicasaPublishing.c"
+#line 7149 "PicasaPublishing.c"
 	}
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7139 "PicasaPublishing.c"
+#line 7153 "PicasaPublishing.c"
 }
 
 
@@ -7182,7 +7196,7 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0__length1 = self->priv->albums_length1;
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -7193,34 +7207,34 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ
 	if (result_length1) {
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*result_length1 = _tmp2__length1;
-#line 7169 "PicasaPublishing.c"
+#line 7183 "PicasaPublishing.c"
 	}
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp2_;
 #line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7175 "PicasaPublishing.c"
+#line 7189 "PicasaPublishing.c"
 }
 
 
-static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length) {
+static PublishingPicasaAlbum** _vala_array_dup7 (PublishingPicasaAlbum** self, int length) {
 	PublishingPicasaAlbum** result;
 	int i;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = g_new0 (PublishingPicasaAlbum*, length + 1);
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 7186 "PicasaPublishing.c"
+#line 7200 "PicasaPublishing.c"
 		PublishingPicasaAlbum* _tmp0_ = NULL;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 7192 "PicasaPublishing.c"
+#line 7206 "PicasaPublishing.c"
 	}
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7196 "PicasaPublishing.c"
+#line 7210 "PicasaPublishing.c"
 }
 
 
@@ -7236,7 +7250,7 @@ void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublish
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0__length1 = albums_length1;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup7 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -7247,7 +7261,7 @@ void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublish
 	self->priv->albums_length1 = _tmp1__length1;
 #line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 7223 "PicasaPublishing.c"
+#line 7237 "PicasaPublishing.c"
 }
 
 
@@ -7259,7 +7273,7 @@ void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (Publish
 	_tmp0_ = pixels;
 #line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->major_axis_size_pixels = _tmp0_;
-#line 7235 "PicasaPublishing.c"
+#line 7249 "PicasaPublishing.c"
 }
 
 
@@ -7274,7 +7288,7 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (Publish
 	result = _tmp0_;
 #line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7250 "PicasaPublishing.c"
+#line 7264 "PicasaPublishing.c"
 }
 
 
@@ -7286,7 +7300,7 @@ void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (P
 	_tmp0_ = selection_id;
 #line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->major_axis_size_selection_id = _tmp0_;
-#line 7262 "PicasaPublishing.c"
+#line 7276 "PicasaPublishing.c"
 }
 
 
@@ -7301,7 +7315,7 @@ gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (P
 	result = _tmp0_;
 #line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7277 "PicasaPublishing.c"
+#line 7291 "PicasaPublishing.c"
 }
 
 
@@ -7313,7 +7327,7 @@ void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicas
 	_tmp0_ = strip_metadata;
 #line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->strip_metadata = _tmp0_;
-#line 7289 "PicasaPublishing.c"
+#line 7303 "PicasaPublishing.c"
 }
 
 
@@ -7328,7 +7342,7 @@ gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingP
 	result = _tmp0_;
 #line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7304 "PicasaPublishing.c"
+#line 7318 "PicasaPublishing.c"
 }
 
 
@@ -7340,7 +7354,7 @@ void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPub
 	_tmp0_ = media_type;
 #line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->media_type = _tmp0_;
-#line 7316 "PicasaPublishing.c"
+#line 7330 "PicasaPublishing.c"
 }
 
 
@@ -7355,14 +7369,14 @@ SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_med
 	result = _tmp0_;
 #line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7331 "PicasaPublishing.c"
+#line 7345 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_value_publishing_parameters_init (GValue* value) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 7338 "PicasaPublishing.c"
+#line 7352 "PicasaPublishing.c"
 }
 
 
@@ -7371,7 +7385,7 @@ static void publishing_picasa_value_publishing_parameters_free_value (GValue* va
 	if (value->data[0].v_pointer) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (value->data[0].v_pointer);
-#line 7347 "PicasaPublishing.c"
+#line 7361 "PicasaPublishing.c"
 	}
 }
 
@@ -7381,11 +7395,11 @@ static void publishing_picasa_value_publishing_parameters_copy_value (const GVal
 	if (src_value->data[0].v_pointer) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 7357 "PicasaPublishing.c"
+#line 7371 "PicasaPublishing.c"
 	} else {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7361 "PicasaPublishing.c"
+#line 7375 "PicasaPublishing.c"
 	}
 }
 
@@ -7393,37 +7407,37 @@ static void publishing_picasa_value_publishing_parameters_copy_value (const GVal
 static gpointer publishing_picasa_value_publishing_parameters_peek_pointer (const GValue* value) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7369 "PicasaPublishing.c"
+#line 7383 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 7376 "PicasaPublishing.c"
+#line 7390 "PicasaPublishing.c"
 		PublishingPicasaPublishingParameters* object;
 		object = collect_values[0].v_pointer;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7383 "PicasaPublishing.c"
+#line 7397 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7387 "PicasaPublishing.c"
+#line 7401 "PicasaPublishing.c"
 		}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (object);
-#line 7391 "PicasaPublishing.c"
+#line 7405 "PicasaPublishing.c"
 	} else {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7395 "PicasaPublishing.c"
+#line 7409 "PicasaPublishing.c"
 	}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 7399 "PicasaPublishing.c"
+#line 7413 "PicasaPublishing.c"
 }
 
 
@@ -7434,25 +7448,25 @@ static gchar* publishing_picasa_value_publishing_parameters_lcopy_value (const G
 	if (!object_p) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7410 "PicasaPublishing.c"
+#line 7424 "PicasaPublishing.c"
 	}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 7416 "PicasaPublishing.c"
+#line 7430 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7420 "PicasaPublishing.c"
+#line 7434 "PicasaPublishing.c"
 	} else {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 7424 "PicasaPublishing.c"
+#line 7438 "PicasaPublishing.c"
 	}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 7428 "PicasaPublishing.c"
+#line 7442 "PicasaPublishing.c"
 }
 
 
@@ -7466,7 +7480,7 @@ GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* nam
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 7442 "PicasaPublishing.c"
+#line 7456 "PicasaPublishing.c"
 }
 
 
@@ -7475,7 +7489,7 @@ gpointer publishing_picasa_value_get_publishing_parameters (const GValue* value)
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS), NULL);
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7451 "PicasaPublishing.c"
+#line 7465 "PicasaPublishing.c"
 }
 
 
@@ -7495,17 +7509,17 @@ void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer
 		value->data[0].v_pointer = v_object;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 7471 "PicasaPublishing.c"
+#line 7485 "PicasaPublishing.c"
 	} else {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7475 "PicasaPublishing.c"
+#line 7489 "PicasaPublishing.c"
 	}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (old);
-#line 7481 "PicasaPublishing.c"
+#line 7495 "PicasaPublishing.c"
 	}
 }
 
@@ -7524,17 +7538,17 @@ void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 7500 "PicasaPublishing.c"
+#line 7514 "PicasaPublishing.c"
 	} else {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7504 "PicasaPublishing.c"
+#line 7518 "PicasaPublishing.c"
 	}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (old);
-#line 7510 "PicasaPublishing.c"
+#line 7524 "PicasaPublishing.c"
 	}
 }
 
@@ -7546,7 +7560,7 @@ static void publishing_picasa_publishing_parameters_class_init (PublishingPicasa
 	((PublishingPicasaPublishingParametersClass *) klass)->finalize = publishing_picasa_publishing_parameters_finalize;
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaPublishingParametersPrivate));
-#line 7522 "PicasaPublishing.c"
+#line 7536 "PicasaPublishing.c"
 }
 
 
@@ -7555,7 +7569,7 @@ static void publishing_picasa_publishing_parameters_instance_init (PublishingPic
 	self->priv = PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 7531 "PicasaPublishing.c"
+#line 7545 "PicasaPublishing.c"
 }
 
 
@@ -7573,7 +7587,7 @@ static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPu
 	_g_free0 (self->priv->user_name);
 #line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 7549 "PicasaPublishing.c"
+#line 7563 "PicasaPublishing.c"
 }
 
 
@@ -7598,7 +7612,7 @@ gpointer publishing_picasa_publishing_parameters_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 7574 "PicasaPublishing.c"
+#line 7588 "PicasaPublishing.c"
 }
 
 
@@ -7611,7 +7625,7 @@ void publishing_picasa_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 7587 "PicasaPublishing.c"
+#line 7601 "PicasaPublishing.c"
 	}
 }
 
@@ -7645,14 +7659,14 @@ PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_typ
 	self->priv->parameters = _tmp3_;
 #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 7621 "PicasaPublishing.c"
+#line 7635 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) {
 #line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_uploader_construct (PUBLISHING_PICASA_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 7628 "PicasaPublishing.c"
+#line 7642 "PicasaPublishing.c"
 }
 
 
@@ -7692,7 +7706,7 @@ static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_
 	result = _tmp6_;
 #line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7668 "PicasaPublishing.c"
+#line 7682 "PicasaPublishing.c"
 }
 
 
@@ -7705,14 +7719,14 @@ static void publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass
 	g_type_class_add_private (klass, sizeof (PublishingPicasaUploaderPrivate));
 #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_picasa_uploader_real_create_transaction;
-#line 7681 "PicasaPublishing.c"
+#line 7695 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_uploader_instance_init (PublishingPicasaUploader * self) {
 #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_UPLOADER_GET_PRIVATE (self);
-#line 7688 "PicasaPublishing.c"
+#line 7702 "PicasaPublishing.c"
 }
 
 
@@ -7724,7 +7738,7 @@ static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploa
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
 #line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_picasa_uploader_parent_class)->finalize (obj);
-#line 7700 "PicasaPublishing.c"
+#line 7714 "PicasaPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala b/plugins/shotwell-publishing/PicasaPublishing.vala
index 621ae12..facbd1b 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.vala
+++ b/plugins/shotwell-publishing/PicasaPublishing.vala
@@ -562,7 +562,7 @@ internal class UploadTransaction :
         string metadata = METADATA_TEMPLATE.printf(Publishing.RESTSupport.decimal_entity_encode(
             publishable.get_param_string(Spit.Publishing.Publishable.PARAM_STRING_BASENAME)),
             summary, keywords_string);
-        Soup.Buffer metadata_buffer = new Soup.Buffer(Soup.MemoryUse.COPY, metadata.data);
+        var metadata_buffer = new Soup.Buffer.take (metadata.data);
         message_parts.append_form_file("", "", "application/atom+xml", metadata_buffer);
 
         // attempt to map the binary image data from disk into memory 
@@ -581,7 +581,7 @@ internal class UploadTransaction :
         // bind the binary image data read from disk into a Soup.Buffer object so that we
         // can attach it to the multipart request, then actaully append the buffer
         // to the multipart request. Then, set the MIME type for this part.
-        Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.TEMPORARY, photo_data);
+        var bindable_data = new Soup.Buffer.with_owner (photo_data, this, null);
 
         message_parts.append_form_file("", publishable.get_serialized_file().get_path(), mime_type,
             bindable_data);
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c
index ada0062..87af607 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.c
+++ b/plugins/shotwell-publishing/PiwigoPublishing.c
@@ -16,11 +16,12 @@
 #include <gio/gio.h>
 #include "shotwell-plugin-common.h"
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
 #include <libsoup/soup.h>
 #include <libxml/tree.h>
+#include <gee.h>
 #include <float.h>
 #include <math.h>
+#include <gtk/gtk.h>
 #include <gcr/gcr-base.h>
 #include <ui/gcr-ui.h>
 #include <gobject/gvaluecollector.h>
@@ -234,7 +235,6 @@ typedef struct _PublishingPiwigoUploaderPrivate PublishingPiwigoUploaderPrivate;
 typedef struct _PublishingPiwigoImagesAddTransaction PublishingPiwigoImagesAddTransaction;
 typedef struct _PublishingPiwigoImagesAddTransactionClass PublishingPiwigoImagesAddTransactionClass;
 typedef struct _PublishingPiwigoSSLErrorPanePrivate PublishingPiwigoSSLErrorPanePrivate;
-typedef struct _Block1Data Block1Data;
 #define _g_byte_array_unref0(var) ((var == NULL) ? NULL : (var = (g_byte_array_unref (var), NULL)))
 typedef struct _PublishingPiwigoAuthenticationPanePrivate PublishingPiwigoAuthenticationPanePrivate;
 typedef struct _PublishingPiwigoPublishingOptionsPanePrivate PublishingPiwigoPublishingOptionsPanePrivate;
@@ -380,56 +380,49 @@ struct _PublishingPiwigoUploaderPrivate {
 };
 
 struct _PublishingPiwigoSSLErrorPane {
-	GObject parent_instance;
+	ShotwellPluginsCommonBuilderPane parent_instance;
 	PublishingPiwigoSSLErrorPanePrivate * priv;
 };
 
 struct _PublishingPiwigoSSLErrorPaneClass {
-	GObjectClass parent_class;
+	ShotwellPluginsCommonBuilderPaneClass parent_class;
 };
 
 struct _PublishingPiwigoSSLErrorPanePrivate {
-	GtkBuilder* builder;
-	GtkWidget* content;
-};
-
-struct _Block1Data {
-	int _ref_count_;
-	PublishingPiwigoSSLErrorPane* self;
-	GTlsCertificate* cert;
+	gchar* _host;
+	GTlsCertificate* _cert;
+	gchar* _error_text;
 };
 
 struct _PublishingPiwigoAuthenticationPane {
-	GObject parent_instance;
+	ShotwellPluginsCommonBuilderPane parent_instance;
 	PublishingPiwigoAuthenticationPanePrivate * priv;
 };
 
 struct _PublishingPiwigoAuthenticationPaneClass {
-	GObjectClass parent_class;
+	ShotwellPluginsCommonBuilderPaneClass parent_class;
 };
 
 struct _PublishingPiwigoAuthenticationPanePrivate {
-	GtkBox* pane_widget;
-	GtkBuilder* builder;
+	PublishingPiwigoAuthenticationPaneMode _mode;
+	PublishingPiwigoPiwigoPublisher* _publisher;
 	GtkEntry* url_entry;
 	GtkEntry* username_entry;
 	GtkEntry* password_entry;
-	GtkCheckButton* remember_password_checkbutton;
+	GtkSwitch* remember_password_checkbutton;
 	GtkButton* login_button;
 };
 
 struct _PublishingPiwigoPublishingOptionsPane {
-	GObject parent_instance;
+	ShotwellPluginsCommonBuilderPane parent_instance;
 	PublishingPiwigoPublishingOptionsPanePrivate * priv;
 };
 
 struct _PublishingPiwigoPublishingOptionsPaneClass {
-	GObjectClass parent_class;
+	ShotwellPluginsCommonBuilderPaneClass parent_class;
 };
 
 struct _PublishingPiwigoPublishingOptionsPanePrivate {
-	GtkBox* pane_widget;
-	GtkBuilder* builder;
 	GtkRadioButton* use_existing_radio;
 	GtkRadioButton* create_new_radio;
 	GtkComboBoxText* existing_categories_combo;
@@ -445,20 +438,20 @@ struct _PublishingPiwigoPublishingOptionsPanePrivate {
 	GtkButton* publish_button;
 	GtkTextView* album_comment;
 	GtkLabel* album_comment_label;
-	PublishingPiwigoCategory** existing_categories;
-	gint existing_categories_length1;
-	gint _existing_categories_size_;
 	PublishingPiwigoPermissionLevel** perm_levels;
 	gint perm_levels_length1;
 	gint _perm_levels_size_;
 	PublishingPiwigoSizeEntry** photo_sizes;
 	gint photo_sizes_length1;
 	gint _photo_sizes_size_;
-	gint last_category;
-	gint last_permission_level;
-	gint last_photo_size;
-	gboolean last_title_as_comment;
-	gboolean last_no_upload_tags;
+	gint _last_category;
+	gint _last_permission_level;
+	gint _last_photo_size;
+	gboolean _last_title_as_comment;
+	gboolean _last_no_upload_tags;
+	gboolean _strip_metadata_enabled;
+	GeeList* _existing_categories;
+	gchar* _default_comment;
 };
 
 struct _PublishingPiwigoSession {
@@ -560,7 +553,6 @@ static gpointer publishing_piwigo_piwigo_publisher_parent_class = NULL;
 static SpitPublishingPublisherIface* publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = NULL;
 static gpointer publishing_piwigo_uploader_parent_class = NULL;
 static gpointer publishing_piwigo_ssl_error_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_piwigo_ssl_error_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_piwigo_authentication_pane_parent_class = NULL;
 static gchar* publishing_piwigo_authentication_pane_INTRO_MESSAGE;
 static gchar* publishing_piwigo_authentication_pane_INTRO_MESSAGE = NULL;
@@ -568,11 +560,9 @@ static gchar* publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE;
 static gchar* publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE = NULL;
 static gchar* publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE;
 static gchar* publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE = NULL;
-static SpitPublishingDialogPaneIface* publishing_piwigo_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_piwigo_publishing_options_pane_parent_class = NULL;
 static gchar* publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
 static gchar* publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME = NULL;
-static SpitPublishingDialogPaneIface* publishing_piwigo_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_piwigo_session_parent_class = NULL;
 static gpointer publishing_piwigo_transaction_parent_class = NULL;
 static gpointer publishing_piwigo_session_login_transaction_parent_class = NULL;
@@ -593,7 +583,7 @@ static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gi
 static const gchar* piwigo_service_real_get_id (SpitPluggable* base);
 static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base);
 static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length);
+static GdkPixbuf** _vala_array_dup13 (GdkPixbuf** self, int length);
 static void piwigo_service_real_activation (SpitPluggable* base, gboolean enabled);
 static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
 PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
@@ -620,6 +610,7 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_typ
 PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name, gint parent_id, const gchar* comment);
 PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType object_type, const gchar* name, gint parent_id, const gchar* comment);
 gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self);
+gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, PublishingPiwigoCategory* other);
 static void publishing_piwigo_category_finalize (PublishingPiwigoCategory* obj);
 gpointer publishing_piwigo_permission_level_ref (gpointer instance);
 void publishing_piwigo_permission_level_unref (gpointer instance);
@@ -701,7 +692,6 @@ PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (P
 PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode);
 static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked (PublishingPiwigoPiwigoPublisher* self, const gchar* url, const gchar* username, const gchar* password, gboolean remember_password);
 static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender, const gchar* url, const gchar* user, const gchar* password, gboolean remember_password, gpointer self);
-GtkWidget* publishing_piwigo_authentication_pane_get_default_widget (PublishingPiwigoAuthenticationPane* self);
 GType publishing_piwigo_transaction_get_type (void) G_GNUC_CONST;
 GType publishing_piwigo_session_login_transaction_get_type (void) G_GNUC_CONST;
 static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoSessionLoginTransaction* trans, const gchar* url);
@@ -710,7 +700,6 @@ PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPi
 PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host);
 static void __lambda6_ (PublishingPiwigoPiwigoPublisher* self);
 static void ___lambda6__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self);
-GtkWidget* publishing_piwigo_ssl_error_pane_get_default_widget (PublishingPiwigoSSLErrorPane* self);
 static void _vala_SoupURI_free (SoupURI* self);
 gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url);
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password);
@@ -757,7 +746,6 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender, gpointer self);
 static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked (PublishingPiwigoPiwigoPublisher* self, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata);
 static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata, gpointer self);
-GtkWidget* publishing_piwigo_publishing_options_pane_get_default_widget (PublishingPiwigoPublishingOptionsPane* self);
 GType publishing_piwigo_session_logout_transaction_get_type (void) G_GNUC_CONST;
 PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session);
 PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type, PublishingPiwigoSession* session);
@@ -802,23 +790,34 @@ GType publishing_piwigo_images_add_transaction_get_type (void) G_GNUC_CONST;
 static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader* obj);
 #define PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPanePrivate))
 enum  {
-	PUBLISHING_PIWIGO_SSL_ERROR_PANE_DUMMY_PROPERTY
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_DUMMY_PROPERTY,
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST,
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT,
+	PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT
 };
-static Block1Data* block1_data_ref (Block1Data* _data1_);
-static void block1_data_unref (void * _userdata_);
-static void ___lambda4_ (Block1Data* _data1_);
-static void ____lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void ___lambda5_ (PublishingPiwigoSSLErrorPane* self);
-static void ____lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self);
-static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_ssl_error_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static GtkWidget* publishing_piwigo_ssl_error_pane_real_get_widget (SpitPublishingDialogPane* base);
-static void publishing_piwigo_ssl_error_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void publishing_piwigo_ssl_error_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base);
+gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self);
+gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self);
+static void __lambda4_ (PublishingPiwigoSSLErrorPane* self);
+static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self);
+static void ___lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void __lambda5_ (PublishingPiwigoSSLErrorPane* self);
+static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value);
+static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value);
+static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value);
 static void publishing_piwigo_ssl_error_pane_finalize (GObject* obj);
+static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 #define PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPanePrivate))
 enum  {
-	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_DUMMY_PROPERTY
+	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_DUMMY_PROPERTY,
+	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE,
+	PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER
 };
+static void publishing_piwigo_authentication_pane_real_constructed (GObject* base);
+PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self);
+PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publisher (PublishingPiwigoAuthenticationPane* self);
 static void publishing_piwigo_authentication_pane_on_user_changed (PublishingPiwigoAuthenticationPane* self);
 static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
 static void publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwigoAuthenticationPane* self);
@@ -828,16 +827,32 @@ static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_edita
 static void publishing_piwigo_authentication_pane_on_login_button_clicked (PublishingPiwigoAuthenticationPane* self);
 static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void publishing_piwigo_authentication_pane_update_login_button_sensitivity (PublishingPiwigoAuthenticationPane* self);
-static GtkWidget* publishing_piwigo_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_piwigo_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void publishing_piwigo_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static void publishing_piwigo_authentication_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base);
+static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoAuthenticationPaneMode value);
+static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoPiwigoPublisher* value);
 static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void publishing_piwigo_authentication_pane_finalize (GObject* obj);
+static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 #define PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPanePrivate))
 enum  {
-	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DUMMY_PROPERTY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES,
+	PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT
 };
+static PublishingPiwigoCategory** _vala_array_dup14 (PublishingPiwigoCategory** self, int length);
+static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self);
+static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher);
+static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* base);
+static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self);
+static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self);
+static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self);
 static void publishing_piwigo_publishing_options_pane_on_logout_button_clicked (PublishingPiwigoPublishingOptionsPane* self);
 static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked (PublishingPiwigoPublishingOptionsPane* self);
@@ -850,10 +865,9 @@ static void publishing_piwigo_publishing_options_pane_on_new_category_entry_chan
 static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
 static void publishing_piwigo_publishing_options_pane_on_existing_combo_changed (PublishingPiwigoPublishingOptionsPane* self);
 static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length);
 static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pane_create_perm_levels (PublishingPiwigoPublishingOptionsPane* self, int* result_length1);
 static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_create_sizes (PublishingPiwigoPublishingOptionsPane* self, int* result_length1);
-static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPublishingOptionsPane* self, PublishingPiwigoPiwigoPublisher* publisher);
+static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self);
 static void _vala_array_add35 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
@@ -864,21 +878,32 @@ static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length,
 static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
 static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
 static void _vala_array_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self);
 static void publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (PublishingPiwigoPublishingOptionsPane* self);
 static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self, const gchar* category_name);
-static GtkWidget* publishing_piwigo_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
+static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base);
 static void publishing_piwigo_publishing_options_pane_create_categories_combo (PublishingPiwigoPublishingOptionsPane* self);
 static void publishing_piwigo_publishing_options_pane_create_within_categories_combo (PublishingPiwigoPublishingOptionsPane* self);
 static void publishing_piwigo_publishing_options_pane_create_permissions_combo (PublishingPiwigoPublishingOptionsPane* self);
 static void publishing_piwigo_publishing_options_pane_create_size_combo (PublishingPiwigoPublishingOptionsPane* self);
 static gint publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self, gint category_id);
+static gint publishing_piwigo_publishing_options_pane_get_last_category (PublishingPiwigoPublishingOptionsPane* self);
 static gint publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self, gint permission_level_id);
+static gint publishing_piwigo_publishing_options_pane_get_last_permission_level (PublishingPiwigoPublishingOptionsPane* self);
 static gint publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self, gint size_id);
-static void publishing_piwigo_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (PublishingPiwigoPublishingOptionsPane* self);
+static void publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self, gint value);
+static void publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self, gint value);
+static void publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self, gint value);
+static void publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self, gboolean value);
+static void publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self, gboolean value);
+static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self, gboolean value);
+static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self, GeeList* value);
+static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self, const gchar* value);
 static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void publishing_piwigo_publishing_options_pane_finalize (GObject* obj);
+static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 #define PUBLISHING_PIWIGO_SESSION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSessionPrivate))
 enum  {
 	PUBLISHING_PIWIGO_SESSION_DUMMY_PROPERTY
@@ -934,7 +959,7 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = piwigo_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 938 "PiwigoPublishing.c"
+#line 963 "PiwigoPublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -947,18 +972,18 @@ PiwigoService* piwigo_service_construct (GType object_type, GFile* resource_dire
 		piwigo_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_piwigo_service_icon_pixbuf_set_size_ = piwigo_service_icon_pixbuf_set_length1;
-#line 951 "PiwigoPublishing.c"
+#line 976 "PiwigoPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 955 "PiwigoPublishing.c"
+#line 980 "PiwigoPublishing.c"
 }
 
 
 PiwigoService* piwigo_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return piwigo_service_construct (TYPE_PIWIGO_SERVICE, resource_directory);
-#line 962 "PiwigoPublishing.c"
+#line 987 "PiwigoPublishing.c"
 }
 
 
@@ -980,7 +1005,7 @@ static gint piwigo_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 984 "PiwigoPublishing.c"
+#line 1009 "PiwigoPublishing.c"
 }
 
 
@@ -993,7 +1018,7 @@ static const gchar* piwigo_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.piwigo";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 997 "PiwigoPublishing.c"
+#line 1022 "PiwigoPublishing.c"
 }
 
 
@@ -1006,35 +1031,35 @@ static const gchar* piwigo_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Piwigo";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1010 "PiwigoPublishing.c"
+#line 1035 "PiwigoPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1017 "PiwigoPublishing.c"
+#line 1042 "PiwigoPublishing.c"
 }
 
 
-static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) {
+static GdkPixbuf** _vala_array_dup13 (GdkPixbuf** self, int length) {
 	GdkPixbuf** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 1028 "PiwigoPublishing.c"
+#line 1053 "PiwigoPublishing.c"
 		GdkPixbuf* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result[i] = _tmp0_;
-#line 1034 "PiwigoPublishing.c"
+#line 1059 "PiwigoPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1038 "PiwigoPublishing.c"
+#line 1063 "PiwigoPublishing.c"
 }
 
 
@@ -1107,7 +1132,7 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8__length1 = piwigo_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup10 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup13 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9__length1 = _tmp8__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -1116,7 +1141,7 @@ static void piwigo_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	(*info).icons = _tmp9_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*info).icons_length1 = _tmp9__length1;
-#line 1120 "PiwigoPublishing.c"
+#line 1145 "PiwigoPublishing.c"
 }
 
 
@@ -1124,7 +1149,7 @@ static void piwigo_service_real_activation (SpitPluggable* base, gboolean enable
 	PiwigoService * self;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PIWIGO_SERVICE, PiwigoService);
-#line 1128 "PiwigoPublishing.c"
+#line 1153 "PiwigoPublishing.c"
 }
 
 
@@ -1145,7 +1170,7 @@ static SpitPublishingPublisher* piwigo_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1149 "PiwigoPublishing.c"
+#line 1174 "PiwigoPublishing.c"
 }
 
 
@@ -1158,7 +1183,7 @@ static SpitPublishingPublisherMediaType piwigo_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1162 "PiwigoPublishing.c"
+#line 1187 "PiwigoPublishing.c"
 }
 
 
@@ -1167,7 +1192,7 @@ static void piwigo_service_class_init (PiwigoServiceClass * klass) {
 	piwigo_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = piwigo_service_finalize;
-#line 1171 "PiwigoPublishing.c"
+#line 1196 "PiwigoPublishing.c"
 }
 
 
@@ -1184,7 +1209,7 @@ static void piwigo_service_spit_pluggable_interface_init (SpitPluggableIface * i
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) piwigo_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) piwigo_service_real_activation;
-#line 1188 "PiwigoPublishing.c"
+#line 1213 "PiwigoPublishing.c"
 }
 
 
@@ -1195,7 +1220,7 @@ static void piwigo_service_spit_publishing_service_interface_init (SpitPublishin
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) piwigo_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) piwigo_service_real_get_supported_media;
-#line 1199 "PiwigoPublishing.c"
+#line 1224 "PiwigoPublishing.c"
 }
 
 
@@ -1209,7 +1234,7 @@ static void piwigo_service_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIWIGO_SERVICE, PiwigoService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (piwigo_service_parent_class)->finalize (obj);
-#line 1213 "PiwigoPublishing.c"
+#line 1238 "PiwigoPublishing.c"
 }
 
 
@@ -1274,14 +1299,14 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct (GType object_typ
 	self->comment = _tmp6_;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1278 "PiwigoPublishing.c"
+#line 1303 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategory* publishing_piwigo_category_new (gint id, const gchar* name, const gchar* uppercats, const gchar* comment) {
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_category_construct (PUBLISHING_PIWIGO_TYPE_CATEGORY, id, name, uppercats, comment);
-#line 1285 "PiwigoPublishing.c"
+#line 1310 "PiwigoPublishing.c"
 }
 
 
@@ -1325,14 +1350,14 @@ PublishingPiwigoCategory* publishing_piwigo_category_construct_local (GType obje
 	self->comment = _tmp5_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1329 "PiwigoPublishing.c"
+#line 1354 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategory* publishing_piwigo_category_new_local (const gchar* name, gint parent_id, const gchar* comment) {
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_category_construct_local (PUBLISHING_PIWIGO_TYPE_CATEGORY, name, parent_id, comment);
-#line 1336 "PiwigoPublishing.c"
+#line 1361 "PiwigoPublishing.c"
 }
 
 
@@ -1347,14 +1372,40 @@ gboolean publishing_piwigo_category_is_local (PublishingPiwigoCategory* self) {
 	result = _tmp0_ == PUBLISHING_PIWIGO_CATEGORY_NO_ID;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 1351 "PiwigoPublishing.c"
+#line 1376 "PiwigoPublishing.c"
+}
+
+
+gboolean publishing_piwigo_category_equal (PublishingPiwigoCategory* _self_, PublishingPiwigoCategory* other) {
+	gboolean result = FALSE;
+	PublishingPiwigoCategory* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	PublishingPiwigoCategory* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (_self_), FALSE);
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (other), FALSE);
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = _self_;
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = _tmp0_->id;
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp2_ = other;
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp3_ = _tmp2_->id;
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp1_ == _tmp3_;
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 1402 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_category_init (GValue* value) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1358 "PiwigoPublishing.c"
+#line 1409 "PiwigoPublishing.c"
 }
 
 
@@ -1363,7 +1414,7 @@ static void publishing_piwigo_value_category_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_unref (value->data[0].v_pointer);
-#line 1367 "PiwigoPublishing.c"
+#line 1418 "PiwigoPublishing.c"
 	}
 }
 
@@ -1373,11 +1424,11 @@ static void publishing_piwigo_value_category_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_category_ref (src_value->data[0].v_pointer);
-#line 1377 "PiwigoPublishing.c"
+#line 1428 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1381 "PiwigoPublishing.c"
+#line 1432 "PiwigoPublishing.c"
 	}
 }
 
@@ -1385,37 +1436,37 @@ static void publishing_piwigo_value_category_copy_value (const GValue* src_value
 static gpointer publishing_piwigo_value_category_peek_pointer (const GValue* value) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1389 "PiwigoPublishing.c"
+#line 1440 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_category_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1396 "PiwigoPublishing.c"
+#line 1447 "PiwigoPublishing.c"
 		PublishingPiwigoCategory* object;
 		object = collect_values[0].v_pointer;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1403 "PiwigoPublishing.c"
+#line 1454 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1407 "PiwigoPublishing.c"
+#line 1458 "PiwigoPublishing.c"
 		}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_category_ref (object);
-#line 1411 "PiwigoPublishing.c"
+#line 1462 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1415 "PiwigoPublishing.c"
+#line 1466 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1419 "PiwigoPublishing.c"
+#line 1470 "PiwigoPublishing.c"
 }
 
 
@@ -1426,25 +1477,25 @@ static gchar* publishing_piwigo_value_category_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1430 "PiwigoPublishing.c"
+#line 1481 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 1436 "PiwigoPublishing.c"
+#line 1487 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1440 "PiwigoPublishing.c"
+#line 1491 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_category_ref (value->data[0].v_pointer);
-#line 1444 "PiwigoPublishing.c"
+#line 1495 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1448 "PiwigoPublishing.c"
+#line 1499 "PiwigoPublishing.c"
 }
 
 
@@ -1458,7 +1509,7 @@ GParamSpec* publishing_piwigo_param_spec_category (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1462 "PiwigoPublishing.c"
+#line 1513 "PiwigoPublishing.c"
 }
 
 
@@ -1467,7 +1518,7 @@ gpointer publishing_piwigo_value_get_category (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_CATEGORY), NULL);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1471 "PiwigoPublishing.c"
+#line 1522 "PiwigoPublishing.c"
 }
 
 
@@ -1487,17 +1538,17 @@ void publishing_piwigo_value_set_category (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_ref (value->data[0].v_pointer);
-#line 1491 "PiwigoPublishing.c"
+#line 1542 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1495 "PiwigoPublishing.c"
+#line 1546 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_unref (old);
-#line 1501 "PiwigoPublishing.c"
+#line 1552 "PiwigoPublishing.c"
 	}
 }
 
@@ -1516,17 +1567,17 @@ void publishing_piwigo_value_take_category (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1520 "PiwigoPublishing.c"
+#line 1571 "PiwigoPublishing.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1524 "PiwigoPublishing.c"
+#line 1575 "PiwigoPublishing.c"
 	}
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_category_unref (old);
-#line 1530 "PiwigoPublishing.c"
+#line 1581 "PiwigoPublishing.c"
 	}
 }
 
@@ -1536,14 +1587,14 @@ static void publishing_piwigo_category_class_init (PublishingPiwigoCategoryClass
 	publishing_piwigo_category_parent_class = g_type_class_peek_parent (klass);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoCategoryClass *) klass)->finalize = publishing_piwigo_category_finalize;
-#line 1540 "PiwigoPublishing.c"
+#line 1591 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_category_instance_init (PublishingPiwigoCategory * self) {
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 1547 "PiwigoPublishing.c"
+#line 1598 "PiwigoPublishing.c"
 }
 
 
@@ -1561,7 +1612,7 @@ static void publishing_piwigo_category_finalize (PublishingPiwigoCategory* obj)
 	_g_free0 (self->display_name);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->uppercats);
-#line 1565 "PiwigoPublishing.c"
+#line 1616 "PiwigoPublishing.c"
 }
 
 
@@ -1586,7 +1637,7 @@ gpointer publishing_piwigo_category_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 1590 "PiwigoPublishing.c"
+#line 1641 "PiwigoPublishing.c"
 }
 
 
@@ -1599,7 +1650,7 @@ void publishing_piwigo_category_unref (gpointer instance) {
 		PUBLISHING_PIWIGO_CATEGORY_GET_CLASS (self)->finalize (self);
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1603 "PiwigoPublishing.c"
+#line 1654 "PiwigoPublishing.c"
 	}
 }
 
@@ -1609,240 +1660,240 @@ PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_construct (G
 	gint _tmp0_ = 0;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoPermissionLevel*) g_type_create_instance (object_type);
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = id;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->id = _tmp0_;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = name;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->name = _tmp2_;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1631 "PiwigoPublishing.c"
+#line 1682 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoPermissionLevel* publishing_piwigo_permission_level_new (gint id, const gchar* name) {
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_permission_level_construct (PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, id, name);
-#line 1638 "PiwigoPublishing.c"
+#line 1689 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_permission_level_init (GValue* value) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1645 "PiwigoPublishing.c"
+#line 1696 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_permission_level_free_value (GValue* value) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_unref (value->data[0].v_pointer);
-#line 1654 "PiwigoPublishing.c"
+#line 1705 "PiwigoPublishing.c"
 	}
 }
 
 
 static void publishing_piwigo_value_permission_level_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_permission_level_ref (src_value->data[0].v_pointer);
-#line 1664 "PiwigoPublishing.c"
+#line 1715 "PiwigoPublishing.c"
 	} else {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1668 "PiwigoPublishing.c"
+#line 1719 "PiwigoPublishing.c"
 	}
 }
 
 
 static gpointer publishing_piwigo_value_permission_level_peek_pointer (const GValue* value) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1676 "PiwigoPublishing.c"
+#line 1727 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_permission_level_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1683 "PiwigoPublishing.c"
+#line 1734 "PiwigoPublishing.c"
 		PublishingPiwigoPermissionLevel* object;
 		object = collect_values[0].v_pointer;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1690 "PiwigoPublishing.c"
+#line 1741 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1694 "PiwigoPublishing.c"
+#line 1745 "PiwigoPublishing.c"
 		}
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_permission_level_ref (object);
-#line 1698 "PiwigoPublishing.c"
+#line 1749 "PiwigoPublishing.c"
 	} else {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1702 "PiwigoPublishing.c"
+#line 1753 "PiwigoPublishing.c"
 	}
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1706 "PiwigoPublishing.c"
+#line 1757 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_permission_level_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingPiwigoPermissionLevel** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!object_p) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1717 "PiwigoPublishing.c"
+#line 1768 "PiwigoPublishing.c"
 	}
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 1723 "PiwigoPublishing.c"
+#line 1774 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1727 "PiwigoPublishing.c"
+#line 1778 "PiwigoPublishing.c"
 	} else {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_permission_level_ref (value->data[0].v_pointer);
-#line 1731 "PiwigoPublishing.c"
+#line 1782 "PiwigoPublishing.c"
 	}
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1735 "PiwigoPublishing.c"
+#line 1786 "PiwigoPublishing.c"
 }
 
 
 GParamSpec* publishing_piwigo_param_spec_permission_level (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingPiwigoParamSpecPermissionLevel* spec;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL), NULL);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1749 "PiwigoPublishing.c"
+#line 1800 "PiwigoPublishing.c"
 }
 
 
 gpointer publishing_piwigo_value_get_permission_level (const GValue* value) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL), NULL);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1758 "PiwigoPublishing.c"
+#line 1809 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_value_set_permission_level (GValue* value, gpointer v_object) {
 	PublishingPiwigoPermissionLevel* old;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (v_object) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_ref (value->data[0].v_pointer);
-#line 1778 "PiwigoPublishing.c"
+#line 1829 "PiwigoPublishing.c"
 	} else {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1782 "PiwigoPublishing.c"
+#line 1833 "PiwigoPublishing.c"
 	}
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_unref (old);
-#line 1788 "PiwigoPublishing.c"
+#line 1839 "PiwigoPublishing.c"
 	}
 }
 
 
 void publishing_piwigo_value_take_permission_level (GValue* value, gpointer v_object) {
 	PublishingPiwigoPermissionLevel* old;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (v_object) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1807 "PiwigoPublishing.c"
+#line 1858 "PiwigoPublishing.c"
 	} else {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1811 "PiwigoPublishing.c"
+#line 1862 "PiwigoPublishing.c"
 	}
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_permission_level_unref (old);
-#line 1817 "PiwigoPublishing.c"
+#line 1868 "PiwigoPublishing.c"
 	}
 }
 
 
 static void publishing_piwigo_permission_level_class_init (PublishingPiwigoPermissionLevelClass * klass) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_permission_level_parent_class = g_type_class_peek_parent (klass);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoPermissionLevelClass *) klass)->finalize = publishing_piwigo_permission_level_finalize;
-#line 1827 "PiwigoPublishing.c"
+#line 1878 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_permission_level_instance_init (PublishingPiwigoPermissionLevel * self) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 1834 "PiwigoPublishing.c"
+#line 1885 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_permission_level_finalize (PublishingPiwigoPermissionLevel* obj) {
 	PublishingPiwigoPermissionLevel * self;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PERMISSION_LEVEL, PublishingPiwigoPermissionLevel);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
-#line 1846 "PiwigoPublishing.c"
+#line 1897 "PiwigoPublishing.c"
 }
 
 
@@ -1863,24 +1914,24 @@ GType publishing_piwigo_permission_level_get_type (void) {
 gpointer publishing_piwigo_permission_level_ref (gpointer instance) {
 	PublishingPiwigoPermissionLevel* self;
 	self = instance;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 1871 "PiwigoPublishing.c"
+#line 1922 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_permission_level_unref (gpointer instance) {
 	PublishingPiwigoPermissionLevel* self;
 	self = instance;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		PUBLISHING_PIWIGO_PERMISSION_LEVEL_GET_CLASS (self)->finalize (self);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1884 "PiwigoPublishing.c"
+#line 1935 "PiwigoPublishing.c"
 	}
 }
 
@@ -1890,240 +1941,240 @@ PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_construct (GType object_
 	gint _tmp0_ = 0;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSizeEntry*) g_type_create_instance (object_type);
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = id;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->id = _tmp0_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = name;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->name = _tmp2_;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 1912 "PiwigoPublishing.c"
+#line 1963 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSizeEntry* publishing_piwigo_size_entry_new (gint id, const gchar* name) {
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_size_entry_construct (PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, id, name);
-#line 1919 "PiwigoPublishing.c"
+#line 1970 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_size_entry_init (GValue* value) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1926 "PiwigoPublishing.c"
+#line 1977 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_size_entry_free_value (GValue* value) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_unref (value->data[0].v_pointer);
-#line 1935 "PiwigoPublishing.c"
+#line 1986 "PiwigoPublishing.c"
 	}
 }
 
 
 static void publishing_piwigo_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_size_entry_ref (src_value->data[0].v_pointer);
-#line 1945 "PiwigoPublishing.c"
+#line 1996 "PiwigoPublishing.c"
 	} else {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1949 "PiwigoPublishing.c"
+#line 2000 "PiwigoPublishing.c"
 	}
 }
 
 
 static gpointer publishing_piwigo_value_size_entry_peek_pointer (const GValue* value) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1957 "PiwigoPublishing.c"
+#line 2008 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_size_entry_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1964 "PiwigoPublishing.c"
+#line 2015 "PiwigoPublishing.c"
 		PublishingPiwigoSizeEntry* object;
 		object = collect_values[0].v_pointer;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1971 "PiwigoPublishing.c"
+#line 2022 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1975 "PiwigoPublishing.c"
+#line 2026 "PiwigoPublishing.c"
 		}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_size_entry_ref (object);
-#line 1979 "PiwigoPublishing.c"
+#line 2030 "PiwigoPublishing.c"
 	} else {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1983 "PiwigoPublishing.c"
+#line 2034 "PiwigoPublishing.c"
 	}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 1987 "PiwigoPublishing.c"
+#line 2038 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_size_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingPiwigoSizeEntry** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!object_p) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1998 "PiwigoPublishing.c"
+#line 2049 "PiwigoPublishing.c"
 	}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 2004 "PiwigoPublishing.c"
+#line 2055 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2008 "PiwigoPublishing.c"
+#line 2059 "PiwigoPublishing.c"
 	} else {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_size_entry_ref (value->data[0].v_pointer);
-#line 2012 "PiwigoPublishing.c"
+#line 2063 "PiwigoPublishing.c"
 	}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2016 "PiwigoPublishing.c"
+#line 2067 "PiwigoPublishing.c"
 }
 
 
 GParamSpec* publishing_piwigo_param_spec_size_entry (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingPiwigoParamSpecSizeEntry* spec;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY), NULL);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2030 "PiwigoPublishing.c"
+#line 2081 "PiwigoPublishing.c"
 }
 
 
 gpointer publishing_piwigo_value_get_size_entry (const GValue* value) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY), NULL);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2039 "PiwigoPublishing.c"
+#line 2090 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_value_set_size_entry (GValue* value, gpointer v_object) {
 	PublishingPiwigoSizeEntry* old;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (v_object) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_ref (value->data[0].v_pointer);
-#line 2059 "PiwigoPublishing.c"
+#line 2110 "PiwigoPublishing.c"
 	} else {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2063 "PiwigoPublishing.c"
+#line 2114 "PiwigoPublishing.c"
 	}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_unref (old);
-#line 2069 "PiwigoPublishing.c"
+#line 2120 "PiwigoPublishing.c"
 	}
 }
 
 
 void publishing_piwigo_value_take_size_entry (GValue* value, gpointer v_object) {
 	PublishingPiwigoSizeEntry* old;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (v_object) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2088 "PiwigoPublishing.c"
+#line 2139 "PiwigoPublishing.c"
 	} else {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2092 "PiwigoPublishing.c"
+#line 2143 "PiwigoPublishing.c"
 	}
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_size_entry_unref (old);
-#line 2098 "PiwigoPublishing.c"
+#line 2149 "PiwigoPublishing.c"
 	}
 }
 
 
 static void publishing_piwigo_size_entry_class_init (PublishingPiwigoSizeEntryClass * klass) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_size_entry_parent_class = g_type_class_peek_parent (klass);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoSizeEntryClass *) klass)->finalize = publishing_piwigo_size_entry_finalize;
-#line 2108 "PiwigoPublishing.c"
+#line 2159 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_size_entry_instance_init (PublishingPiwigoSizeEntry * self) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 2115 "PiwigoPublishing.c"
+#line 2166 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_size_entry_finalize (PublishingPiwigoSizeEntry* obj) {
 	PublishingPiwigoSizeEntry * self;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SIZE_ENTRY, PublishingPiwigoSizeEntry);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->name);
-#line 2127 "PiwigoPublishing.c"
+#line 2178 "PiwigoPublishing.c"
 }
 
 
@@ -2144,264 +2195,264 @@ GType publishing_piwigo_size_entry_get_type (void) {
 gpointer publishing_piwigo_size_entry_ref (gpointer instance) {
 	PublishingPiwigoSizeEntry* self;
 	self = instance;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 2152 "PiwigoPublishing.c"
+#line 2203 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_size_entry_unref (gpointer instance) {
 	PublishingPiwigoSizeEntry* self;
 	self = instance;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		PUBLISHING_PIWIGO_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2165 "PiwigoPublishing.c"
+#line 2216 "PiwigoPublishing.c"
 	}
 }
 
 
 PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_construct (GType object_type) {
 	PublishingPiwigoPublishingParameters* self = NULL;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoPublishingParameters*) g_type_create_instance (object_type);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 2176 "PiwigoPublishing.c"
+#line 2227 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoPublishingParameters* publishing_piwigo_publishing_parameters_new (void) {
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_publishing_parameters_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS);
-#line 2183 "PiwigoPublishing.c"
+#line 2234 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_publishing_parameters_init (GValue* value) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 2190 "PiwigoPublishing.c"
+#line 2241 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_value_publishing_parameters_free_value (GValue* value) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_unref (value->data[0].v_pointer);
-#line 2199 "PiwigoPublishing.c"
+#line 2250 "PiwigoPublishing.c"
 	}
 }
 
 
 static void publishing_piwigo_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 2209 "PiwigoPublishing.c"
+#line 2260 "PiwigoPublishing.c"
 	} else {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2213 "PiwigoPublishing.c"
+#line 2264 "PiwigoPublishing.c"
 	}
 }
 
 
 static gpointer publishing_piwigo_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2221 "PiwigoPublishing.c"
+#line 2272 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 2228 "PiwigoPublishing.c"
+#line 2279 "PiwigoPublishing.c"
 		PublishingPiwigoPublishingParameters* object;
 		object = collect_values[0].v_pointer;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2235 "PiwigoPublishing.c"
+#line 2286 "PiwigoPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2239 "PiwigoPublishing.c"
+#line 2290 "PiwigoPublishing.c"
 		}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = publishing_piwigo_publishing_parameters_ref (object);
-#line 2243 "PiwigoPublishing.c"
+#line 2294 "PiwigoPublishing.c"
 	} else {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2247 "PiwigoPublishing.c"
+#line 2298 "PiwigoPublishing.c"
 	}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2251 "PiwigoPublishing.c"
+#line 2302 "PiwigoPublishing.c"
 }
 
 
 static gchar* publishing_piwigo_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingPiwigoPublishingParameters** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!object_p) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2262 "PiwigoPublishing.c"
+#line 2313 "PiwigoPublishing.c"
 	}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = NULL;
-#line 2268 "PiwigoPublishing.c"
+#line 2319 "PiwigoPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2272 "PiwigoPublishing.c"
+#line 2323 "PiwigoPublishing.c"
 	} else {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*object_p = publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2276 "PiwigoPublishing.c"
+#line 2327 "PiwigoPublishing.c"
 	}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return NULL;
-#line 2280 "PiwigoPublishing.c"
+#line 2331 "PiwigoPublishing.c"
 }
 
 
 GParamSpec* publishing_piwigo_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingPiwigoParamSpecPublishingParameters* spec;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2294 "PiwigoPublishing.c"
+#line 2345 "PiwigoPublishing.c"
 }
 
 
 gpointer publishing_piwigo_value_get_publishing_parameters (const GValue* value) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2303 "PiwigoPublishing.c"
+#line 2354 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_value_set_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingPiwigoPublishingParameters* old;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (v_object) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2323 "PiwigoPublishing.c"
+#line 2374 "PiwigoPublishing.c"
 	} else {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2327 "PiwigoPublishing.c"
+#line 2378 "PiwigoPublishing.c"
 	}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_unref (old);
-#line 2333 "PiwigoPublishing.c"
+#line 2384 "PiwigoPublishing.c"
 	}
 }
 
 
 void publishing_piwigo_value_take_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingPiwigoPublishingParameters* old;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (v_object) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS));
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2352 "PiwigoPublishing.c"
+#line 2403 "PiwigoPublishing.c"
 	} else {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2356 "PiwigoPublishing.c"
+#line 2407 "PiwigoPublishing.c"
 	}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (old) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_publishing_parameters_unref (old);
-#line 2362 "PiwigoPublishing.c"
+#line 2413 "PiwigoPublishing.c"
 	}
 }
 
 
 static void publishing_piwigo_publishing_parameters_class_init (PublishingPiwigoPublishingParametersClass * klass) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingPiwigoPublishingParametersClass *) klass)->finalize = publishing_piwigo_publishing_parameters_finalize;
-#line 2372 "PiwigoPublishing.c"
+#line 2423 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_parameters_instance_init (PublishingPiwigoPublishingParameters * self) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->category = NULL;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->perm_level = NULL;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->photo_size = NULL;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->title_as_comment = FALSE;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->no_upload_tags = FALSE;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->ref_count = 1;
-#line 2389 "PiwigoPublishing.c"
+#line 2440 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_parameters_finalize (PublishingPiwigoPublishingParameters* obj) {
 	PublishingPiwigoPublishingParameters * self;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, PublishingPiwigoPublishingParameters);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_category_unref0 (self->category);
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_permission_level_unref0 (self->perm_level);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_size_entry_unref0 (self->photo_size);
-#line 2405 "PiwigoPublishing.c"
+#line 2456 "PiwigoPublishing.c"
 }
 
 
@@ -2422,24 +2473,24 @@ GType publishing_piwigo_publishing_parameters_get_type (void) {
 gpointer publishing_piwigo_publishing_parameters_ref (gpointer instance) {
 	PublishingPiwigoPublishingParameters* self;
 	self = instance;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return instance;
-#line 2430 "PiwigoPublishing.c"
+#line 2481 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_publishing_parameters_unref (gpointer instance) {
 	PublishingPiwigoPublishingParameters* self;
 	self = instance;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2443 "PiwigoPublishing.c"
+#line 2494 "PiwigoPublishing.c"
 	}
 }
 
@@ -2451,46 +2502,46 @@ PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_construct (G
 	SpitPublishingPluginHost* _tmp2_ = NULL;
 	SpitPublishingPluginHost* _tmp3_ = NULL;
 	PublishingPiwigoSession* _tmp4_ = NULL;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoPiwigoPublisher*) g_object_new (object_type, NULL);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:133: PiwigoPublisher instantiated.");
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:137: PiwigoPublisher instantiated.");
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = service;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->service);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->service = _tmp1_;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = host;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->host);
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->host = _tmp3_;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = publishing_piwigo_session_new ();
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->session = _tmp4_;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 2487 "PiwigoPublishing.c"
+#line 2538 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoPiwigoPublisher* publishing_piwigo_piwigo_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_piwigo_publisher_construct (PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, service, host);
-#line 2494 "PiwigoPublishing.c"
+#line 2545 "PiwigoPublishing.c"
 }
 
 
@@ -2499,17 +2550,17 @@ static SpitPublishingService* publishing_piwigo_piwigo_publisher_real_get_servic
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingService* _tmp1_ = NULL;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->service;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2513 "PiwigoPublishing.c"
+#line 2564 "PiwigoPublishing.c"
 }
 
 
@@ -2517,17 +2568,17 @@ SpitPublishingPluginHost* publishing_piwigo_piwigo_publisher_get_host (Publishin
 	SpitPublishingPluginHost* result = NULL;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2531 "PiwigoPublishing.c"
+#line 2582 "PiwigoPublishing.c"
 }
 
 
@@ -2535,15 +2586,15 @@ static gboolean publishing_piwigo_piwigo_publisher_real_is_running (SpitPublishi
 	PublishingPiwigoPiwigoPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp0_;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2547 "PiwigoPublishing.c"
+#line 2598 "PiwigoPublishing.c"
 }
 
 
@@ -2552,31 +2603,31 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 	gboolean _tmp0_ = FALSE;
 	PublishingPiwigoSession* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp0_) {
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 2564 "PiwigoPublishing.c"
+#line 2615 "PiwigoPublishing.c"
 	}
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:157: PiwigoPublisher: starting interaction.");
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->running = TRUE;
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:161: PiwigoPublisher: starting interaction.");
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->running = TRUE;
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->session;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp2_) {
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:162: PiwigoPublisher: session is authenticated.");
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:166: PiwigoPublisher: session is authenticated.");
+#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 2580 "PiwigoPublishing.c"
+#line 2631 "PiwigoPublishing.c"
 	} else {
 		gchar* persistent_url = NULL;
 		gchar* _tmp3_ = NULL;
@@ -2587,92 +2638,92 @@ static void publishing_piwigo_piwigo_publisher_real_start (SpitPublishingPublish
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		const gchar* _tmp8_ = NULL;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:165: PiwigoPublisher: session is not authenticat" \
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:169: PiwigoPublisher: session is not authenticat" \
 "ed.");
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = publishing_piwigo_piwigo_publisher_get_persistent_url (self);
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		persistent_url = _tmp3_;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = publishing_piwigo_piwigo_publisher_get_persistent_username (self);
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		persistent_username = _tmp4_;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = publishing_piwigo_piwigo_publisher_get_persistent_password (self);
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		persistent_password = _tmp5_;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = persistent_url;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp8_ != NULL) {
-#line 2609 "PiwigoPublishing.c"
+#line 2660 "PiwigoPublishing.c"
 			const gchar* _tmp9_ = NULL;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp9_ = persistent_username;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp7_ = _tmp9_ != NULL;
-#line 2615 "PiwigoPublishing.c"
+#line 2666 "PiwigoPublishing.c"
 		} else {
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp7_ = FALSE;
-#line 2619 "PiwigoPublishing.c"
+#line 2670 "PiwigoPublishing.c"
 		}
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp7_) {
-#line 2623 "PiwigoPublishing.c"
+#line 2674 "PiwigoPublishing.c"
 			const gchar* _tmp10_ = NULL;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp10_ = persistent_password;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp6_ = _tmp10_ != NULL;
-#line 2629 "PiwigoPublishing.c"
+#line 2680 "PiwigoPublishing.c"
 		} else {
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp6_ = FALSE;
-#line 2633 "PiwigoPublishing.c"
+#line 2684 "PiwigoPublishing.c"
 		}
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp6_) {
-#line 2637 "PiwigoPublishing.c"
+#line 2688 "PiwigoPublishing.c"
 			const gchar* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
 			const gchar* _tmp13_ = NULL;
 			gboolean _tmp14_ = FALSE;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp11_ = persistent_url;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp12_ = persistent_username;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp13_ = persistent_password;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp14_ = publishing_piwigo_piwigo_publisher_get_remember_password (self);
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
-#line 2652 "PiwigoPublishing.c"
+#line 2703 "PiwigoPublishing.c"
 		} else {
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 2656 "PiwigoPublishing.c"
+#line 2707 "PiwigoPublishing.c"
 		}
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (persistent_password);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (persistent_username);
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (persistent_url);
-#line 2664 "PiwigoPublishing.c"
+#line 2715 "PiwigoPublishing.c"
 	}
 }
 
 
 static void publishing_piwigo_piwigo_publisher_real_stop (SpitPublishingPublisher* base) {
 	PublishingPiwigoPiwigoPublisher * self;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->running = FALSE;
-#line 2675 "PiwigoPublishing.c"
+#line 2726 "PiwigoPublishing.c"
 }
 
 
@@ -2680,34 +2731,34 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_url (PublishingPiwigoPi
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", NULL);
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2693 "PiwigoPublishing.c"
+#line 2744 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_persistent_url (PublishingPiwigoPiwigoPublisher* self, const gchar* url) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (url != NULL);
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = url;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "url", _tmp1_);
-#line 2710 "PiwigoPublishing.c"
+#line 2761 "PiwigoPublishing.c"
 }
 
 
@@ -2715,34 +2766,34 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_username (PublishingPiw
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", NULL);
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2728 "PiwigoPublishing.c"
+#line 2779 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_persistent_username (PublishingPiwigoPiwigoPublisher* self, const gchar* username) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (username != NULL);
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = username;
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "username", _tmp1_);
-#line 2745 "PiwigoPublishing.c"
+#line 2796 "PiwigoPublishing.c"
 }
 
 
@@ -2750,32 +2801,32 @@ gchar* publishing_piwigo_piwigo_publisher_get_persistent_password (PublishingPiw
 	gchar* result = NULL;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "password", NULL);
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2763 "PiwigoPublishing.c"
+#line 2814 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_persistent_password (PublishingPiwigoPiwigoPublisher* self, const gchar* password) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = password;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "password", _tmp1_);
-#line 2778 "PiwigoPublishing.c"
+#line 2829 "PiwigoPublishing.c"
 }
 
 
@@ -2783,32 +2834,32 @@ gboolean publishing_piwigo_piwigo_publisher_get_remember_password (PublishingPiw
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", FALSE);
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2796 "PiwigoPublishing.c"
+#line 2847 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_remember_password (PublishingPiwigoPiwigoPublisher* self, gboolean remember_password) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = remember_password;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "remember-password", _tmp1_);
-#line 2811 "PiwigoPublishing.c"
+#line 2862 "PiwigoPublishing.c"
 }
 
 
@@ -2816,32 +2867,32 @@ gint publishing_piwigo_piwigo_publisher_get_last_category (PublishingPiwigoPiwig
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", -1);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2829 "PiwigoPublishing.c"
+#line 2880 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_last_category (PublishingPiwigoPiwigoPublisher* self, gint last_category) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = last_category;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-category", _tmp1_);
-#line 2844 "PiwigoPublishing.c"
+#line 2895 "PiwigoPublishing.c"
 }
 
 
@@ -2849,32 +2900,32 @@ gint publishing_piwigo_piwigo_publisher_get_last_permission_level (PublishingPiw
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", -1);
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2862 "PiwigoPublishing.c"
+#line 2913 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_last_permission_level (PublishingPiwigoPiwigoPublisher* self, gint last_permission_level) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = last_permission_level;
-#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-permission-level", _tmp1_);
-#line 2877 "PiwigoPublishing.c"
+#line 2928 "PiwigoPublishing.c"
 }
 
 
@@ -2882,32 +2933,32 @@ gint publishing_piwigo_piwigo_publisher_get_last_photo_size (PublishingPiwigoPiw
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), 0);
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", -1);
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2895 "PiwigoPublishing.c"
+#line 2946 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_last_photo_size (PublishingPiwigoPiwigoPublisher* self, gint last_photo_size) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = last_photo_size;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-photo-size", _tmp1_);
-#line 2910 "PiwigoPublishing.c"
+#line 2961 "PiwigoPublishing.c"
 }
 
 
@@ -2915,32 +2966,32 @@ static gboolean publishing_piwigo_piwigo_publisher_get_last_title_as_comment (Pu
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", FALSE);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2928 "PiwigoPublishing.c"
+#line 2979 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_last_title_as_comment (PublishingPiwigoPiwigoPublisher* self, gboolean title_as_comment) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = title_as_comment;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-title-as-comment", _tmp1_);
-#line 2943 "PiwigoPublishing.c"
+#line 2994 "PiwigoPublishing.c"
 }
 
 
@@ -2948,32 +2999,32 @@ static gboolean publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (Publ
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", FALSE);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2961 "PiwigoPublishing.c"
+#line 3012 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (PublishingPiwigoPiwigoPublisher* self, gboolean no_upload_tags) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = no_upload_tags;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-no-upload-tags", _tmp1_);
-#line 2976 "PiwigoPublishing.c"
+#line 3027 "PiwigoPublishing.c"
 }
 
 
@@ -2981,32 +3032,32 @@ static gboolean publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), FALSE);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 2994 "PiwigoPublishing.c"
+#line 3045 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (PublishingPiwigoPiwigoPublisher* self, gboolean strip_metadata) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = strip_metadata;
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 3009 "PiwigoPublishing.c"
+#line 3060 "PiwigoPublishing.c"
 }
 
 
@@ -3022,9 +3073,9 @@ static void publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (Publ
      * @param mode the mode for the authentication pane
      */
 static void _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login (PublishingPiwigoAuthenticationPane* _sender, const gchar* url, const gchar* user, const gchar* password, gboolean remember_password, gpointer self) {
-#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked ((PublishingPiwigoPiwigoPublisher*) self, url, user, password, remember_password);
-#line 3027 "PiwigoPublishing.c"
+#line 3078 "PiwigoPublishing.c"
 }
 
 
@@ -3037,39 +3088,39 @@ static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (Publ
 	SpitPublishingPluginHost* _tmp4_ = NULL;
 	GtkWidget* _tmp5_ = NULL;
 	GtkWidget* _tmp6_ = NULL;
-#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:277: ACTION: installing authentication pane");
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:281: ACTION: installing authentication pane");
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = mode;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_piwigo_authentication_pane_new (self, _tmp1_);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	authentication_pane = _tmp2_;
-#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (authentication_pane, "login", (GCallback) _publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clicked_publishing_piwigo_authentication_pane_login, self, 0);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->host;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->host;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = publishing_piwigo_authentication_pane_get_default_widget (authentication_pane);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp5_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (authentication_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_dialog_default_widget (_tmp4_, _tmp6_);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (_tmp6_);
-#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (authentication_pane);
-#line 3072 "PiwigoPublishing.c"
+#line 3123 "PiwigoPublishing.c"
 }
 
 
@@ -3085,105 +3136,105 @@ static void __lambda6_ (PublishingPiwigoPiwigoPublisher* self) {
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
 	const gchar* _tmp7_ = NULL;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:293: SSL: User wants us to retry with broken cer" \
+#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:297: SSL: User wants us to retry with broken cer" \
 "tificate");
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = publishing_piwigo_session_new ();
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->session = _tmp0_;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->session;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_session_set_insecure (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_piwigo_piwigo_publisher_get_persistent_url (self);
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	persistent_url = _tmp2_;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_piwigo_publisher_get_persistent_username (self);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	persistent_username = _tmp3_;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = publishing_piwigo_piwigo_publisher_get_persistent_password (self);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	persistent_password = _tmp4_;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = persistent_url;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ != NULL) {
-#line 3116 "PiwigoPublishing.c"
+#line 3167 "PiwigoPublishing.c"
 		const gchar* _tmp8_ = NULL;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = persistent_username;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = _tmp8_ != NULL;
-#line 3122 "PiwigoPublishing.c"
+#line 3173 "PiwigoPublishing.c"
 	} else {
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = FALSE;
-#line 3126 "PiwigoPublishing.c"
+#line 3177 "PiwigoPublishing.c"
 	}
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp6_) {
-#line 3130 "PiwigoPublishing.c"
+#line 3181 "PiwigoPublishing.c"
 		const gchar* _tmp9_ = NULL;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = persistent_password;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = _tmp9_ != NULL;
-#line 3136 "PiwigoPublishing.c"
+#line 3187 "PiwigoPublishing.c"
 	} else {
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = FALSE;
-#line 3140 "PiwigoPublishing.c"
+#line 3191 "PiwigoPublishing.c"
 	}
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp5_) {
-#line 3144 "PiwigoPublishing.c"
+#line 3195 "PiwigoPublishing.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = persistent_url;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = persistent_username;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp12_ = persistent_password;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = publishing_piwigo_piwigo_publisher_get_remember_password (self);
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp10_, _tmp11_, _tmp12_, _tmp13_);
-#line 3159 "PiwigoPublishing.c"
+#line 3210 "PiwigoPublishing.c"
 	} else {
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 3163 "PiwigoPublishing.c"
+#line 3214 "PiwigoPublishing.c"
 	}
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (persistent_password);
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (persistent_username);
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (persistent_url);
-#line 3171 "PiwigoPublishing.c"
+#line 3222 "PiwigoPublishing.c"
 }
 
 
 static void ___lambda6__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self) {
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	__lambda6_ ((PublishingPiwigoPiwigoPublisher*) self);
-#line 3178 "PiwigoPublishing.c"
+#line 3229 "PiwigoPublishing.c"
 }
 
 
 static void _vala_SoupURI_free (SoupURI* self) {
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 3185 "PiwigoPublishing.c"
+#line 3236 "PiwigoPublishing.c"
 }
 
 
@@ -3200,51 +3251,51 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi
 	SpitPublishingPluginHost* _tmp7_ = NULL;
 	GtkWidget* _tmp8_ = NULL;
 	GtkWidget* _tmp9_ = NULL;
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION_LOGIN_TRANSACTION (trans));
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (url != NULL);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = url;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = soup_uri_new (_tmp0_);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	uri = _tmp1_;
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->host;
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp2_, FALSE);
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = trans;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = soup_uri_get_host (uri);
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_piwigo_ssl_error_pane_new (_tmp3_, _tmp4_);
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	ssl_pane = _tmp5_;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (ssl_pane, "proceed", (GCallback) ___lambda6__publishing_piwigo_ssl_error_pane_proceed, self, 0);
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->host;
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = self->priv->host;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = publishing_piwigo_ssl_error_pane_get_default_widget (ssl_pane);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp8_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (ssl_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_dialog_default_widget (_tmp7_, _tmp9_);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (_tmp9_);
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (ssl_pane);
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	__vala_SoupURI_free0 (uri);
-#line 3246 "PiwigoPublishing.c"
+#line 3297 "PiwigoPublishing.c"
 }
 
 
@@ -3265,35 +3316,35 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (url != NULL);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (username != NULL);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_return_if_fail (password != NULL);
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:325: EVENT: on_authentication_pane_login_clicked");
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (password != NULL);
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:329: EVENT: on_authentication_pane_login_clicked");
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp0_) {
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3283 "PiwigoPublishing.c"
+#line 3334 "PiwigoPublishing.c"
 	}
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = url;
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = username;
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = password;
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = remember_password;
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_network_login (self, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 3295 "PiwigoPublishing.c"
+#line 3346 "PiwigoPublishing.c"
 }
 
 
@@ -3309,16 +3360,16 @@ static void publishing_piwigo_piwigo_publisher_on_authentication_pane_login_clic
      * @param password the password of the Piwigo user used to login
      */
 static void _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_login_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 3313 "PiwigoPublishing.c"
+#line 3364 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_login_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 3320 "PiwigoPublishing.c"
+#line 3371 "PiwigoPublishing.c"
 }
 
 
@@ -3337,88 +3388,88 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 	PublishingPiwigoSessionLoginTransaction* _tmp11_ = NULL;
 	PublishingPiwigoSessionLoginTransaction* _tmp12_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (url != NULL);
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (username != NULL);
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (password != NULL);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:344: ACTION: logging in");
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:348: ACTION: logging in");
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_login_wait_pane (_tmp1_);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = remember_password;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_remember_password (self, _tmp2_);
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = remember_password;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp3_) {
-#line 3365 "PiwigoPublishing.c"
+#line 3416 "PiwigoPublishing.c"
 		const gchar* _tmp4_ = NULL;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = password;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_set_persistent_password (self, _tmp4_);
-#line 3371 "PiwigoPublishing.c"
+#line 3422 "PiwigoPublishing.c"
 	} else {
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_set_persistent_password (self, NULL);
-#line 3375 "PiwigoPublishing.c"
+#line 3426 "PiwigoPublishing.c"
 	}
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->session;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = url;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = publishing_piwigo_piwigo_publisher_normalise_url (_tmp6_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = username;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = password;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = publishing_piwigo_session_login_transaction_new (_tmp5_, _tmp8_, _tmp9_, _tmp10_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = _tmp11_;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	login_trans = _tmp12_;
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3401 "PiwigoPublishing.c"
+#line 3452 "PiwigoPublishing.c"
 	{
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (login_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3409 "PiwigoPublishing.c"
+#line 3460 "PiwigoPublishing.c"
 				goto __catch32_spit_publishing_publishing_error;
 			}
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (login_trans);
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3420 "PiwigoPublishing.c"
+#line 3471 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally32;
@@ -3426,53 +3477,53 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = err;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (g_error_matches (_tmp13_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
-#line 3436 "PiwigoPublishing.c"
+#line 3487 "PiwigoPublishing.c"
 			const gchar* _tmp14_ = NULL;
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			g_debug ("PiwigoPublishing.vala:363: ERROR: SSL connection problems");
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			g_debug ("PiwigoPublishing.vala:367: ERROR: SSL connection problems");
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp14_ = url;
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (self, login_trans, _tmp14_);
-#line 3444 "PiwigoPublishing.c"
+#line 3495 "PiwigoPublishing.c"
 		} else {
 			GError* _tmp15_ = NULL;
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			g_debug ("PiwigoPublishing.vala:366: ERROR: do_network_login");
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			g_debug ("PiwigoPublishing.vala:370: ERROR: do_network_login");
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp15_ = err;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp15_);
-#line 3453 "PiwigoPublishing.c"
+#line 3504 "PiwigoPublishing.c"
 		}
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 3457 "PiwigoPublishing.c"
+#line 3508 "PiwigoPublishing.c"
 	}
 	__finally32:
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (login_trans);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3470 "PiwigoPublishing.c"
+#line 3521 "PiwigoPublishing.c"
 	}
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (login_trans);
-#line 3474 "PiwigoPublishing.c"
+#line 3525 "PiwigoPublishing.c"
 }
 
 
@@ -3486,95 +3537,95 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
 	gboolean _tmp10_ = FALSE;
 	const gchar* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = url;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	norm_url = _tmp1_;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = norm_url;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = g_str_has_suffix (_tmp2_, ".php");
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp3_) {
-#line 3502 "PiwigoPublishing.c"
+#line 3553 "PiwigoPublishing.c"
 		const gchar* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = norm_url;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = g_str_has_suffix (_tmp4_, "/");
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (!_tmp5_) {
-#line 3513 "PiwigoPublishing.c"
+#line 3564 "PiwigoPublishing.c"
 			const gchar* _tmp6_ = NULL;
 			gchar* _tmp7_ = NULL;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp6_ = norm_url;
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp7_ = g_strconcat (_tmp6_, "/", NULL);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (norm_url);
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			norm_url = _tmp7_;
-#line 3524 "PiwigoPublishing.c"
+#line 3575 "PiwigoPublishing.c"
 		}
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = norm_url;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = g_strconcat (_tmp8_, PUBLISHING_PIWIGO_PIWIGO_WS, NULL);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (norm_url);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		norm_url = _tmp9_;
-#line 3534 "PiwigoPublishing.c"
+#line 3585 "PiwigoPublishing.c"
 	}
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = norm_url;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = g_str_has_prefix (_tmp11_, "http://");
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp12_) {
-#line 3542 "PiwigoPublishing.c"
+#line 3593 "PiwigoPublishing.c"
 		const gchar* _tmp13_ = NULL;
 		gboolean _tmp14_ = FALSE;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = norm_url;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp14_ = g_str_has_prefix (_tmp13_, "https://");
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = !_tmp14_;
-#line 3551 "PiwigoPublishing.c"
+#line 3602 "PiwigoPublishing.c"
 	} else {
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = FALSE;
-#line 3555 "PiwigoPublishing.c"
+#line 3606 "PiwigoPublishing.c"
 	}
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp10_) {
-#line 3559 "PiwigoPublishing.c"
+#line 3610 "PiwigoPublishing.c"
 		const gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp15_ = norm_url;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp16_ = g_strconcat ("http://", _tmp15_, NULL);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (norm_url);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		norm_url = _tmp16_;
-#line 3570 "PiwigoPublishing.c"
+#line 3621 "PiwigoPublishing.c"
 	}
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = norm_url;
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3576 "PiwigoPublishing.c"
+#line 3627 "PiwigoPublishing.c"
 }
 
 
@@ -3594,18 +3645,18 @@ gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url) {
 static gchar* _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
 	gchar* result;
 	result = publishing_piwigo_transaction_validate_xml (doc);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3598 "PiwigoPublishing.c"
+#line 3649 "PiwigoPublishing.c"
 }
 
 
 static gchar* _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
 	gchar* result;
 	result = publishing_piwigo_transaction_get_error_code (doc);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 3607 "PiwigoPublishing.c"
+#line 3658 "PiwigoPublishing.c"
 }
 
 
@@ -3627,106 +3678,106 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 	const gchar* _tmp27_ = NULL;
 	const gchar* _tmp28_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:403: EVENT: on_login_network_complete");
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:407: EVENT: on_login_network_complete");
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = txn;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = txn;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
-#line 3647 "PiwigoPublishing.c"
+#line 3698 "PiwigoPublishing.c"
 	{
 		PublishingRESTSupportTransaction* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp7_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = txn;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = _tmp5_;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp8_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp6_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3672 "PiwigoPublishing.c"
+#line 3723 "PiwigoPublishing.c"
 				goto __catch33_spit_publishing_publishing_error;
 			}
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3681 "PiwigoPublishing.c"
+#line 3732 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally33;
 	__catch33_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 3692 "PiwigoPublishing.c"
+#line 3743 "PiwigoPublishing.c"
 		{
 			PublishingRESTSupportTransaction* _tmp9_ = NULL;
 			gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
 			PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
 			PublishingRESTSupportXmlDocument* _tmp13_ = NULL;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp9_ = txn;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp10_ = publishing_rest_support_transaction_get_response (_tmp9_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp11_ = _tmp10_;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp12_ = publishing_rest_support_xml_document_parse_string (_tmp11_, _publishing_piwigo_transaction_get_error_code_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp13_ = _tmp12_;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_tmp13_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (_tmp11_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3717 "PiwigoPublishing.c"
+#line 3768 "PiwigoPublishing.c"
 					goto __catch34_spit_publishing_publishing_error;
 				}
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_error_free0 (err);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 3728 "PiwigoPublishing.c"
+#line 3779 "PiwigoPublishing.c"
 			}
 		}
 		goto __finally34;
@@ -3738,110 +3789,110 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 			const gchar* _tmp15_ = NULL;
 			gint _tmp16_ = 0;
 			gint _tmp17_ = 0;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			code = _inner_error_;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_inner_error_ = NULL;
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_inner_error_ = NULL;
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp14_ = code;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp15_ = _tmp14_->message;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp16_ = atoi (_tmp15_);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			code_int = _tmp16_;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp17_ = code_int;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_tmp17_ == 999) {
-#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				g_debug ("PiwigoPublishing.vala:418: ERROR: on_login_network_complete, code 999");
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				g_debug ("PiwigoPublishing.vala:422: ERROR: on_login_network_complete, code 999");
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER);
-#line 3760 "PiwigoPublishing.c"
+#line 3811 "PiwigoPublishing.c"
 			} else {
 				GError* _tmp18_ = NULL;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				g_debug ("PiwigoPublishing.vala:421: ERROR: on_login_network_complete");
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				g_debug ("PiwigoPublishing.vala:425: ERROR: on_login_network_complete");
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp18_ = err;
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp18_);
-#line 3769 "PiwigoPublishing.c"
+#line 3820 "PiwigoPublishing.c"
 			}
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (code);
-#line 3773 "PiwigoPublishing.c"
+#line 3824 "PiwigoPublishing.c"
 		}
 		__finally34:
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 3788 "PiwigoPublishing.c"
+#line 3839 "PiwigoPublishing.c"
 		}
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3794 "PiwigoPublishing.c"
+#line 3845 "PiwigoPublishing.c"
 	}
 	__finally33:
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3805 "PiwigoPublishing.c"
+#line 3856 "PiwigoPublishing.c"
 	}
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = txn;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp20_ = publishing_rest_support_transaction_get_endpoint_url (_tmp19_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	endpoint_url = _tmp20_;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = endpoint_url;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:429: Setting endpoint URL to %s", _tmp21_);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:433: Setting endpoint URL to %s", _tmp21_);
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp22_ = txn;
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp23_ = publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (self, _tmp22_);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	pwg_id = _tmp23_;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp24_ = pwg_id;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:431: Setting session pwg_id to %s", _tmp24_);
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:435: Setting session pwg_id to %s", _tmp24_);
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp25_ = self->priv->session;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp26_ = pwg_id;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_set_pwg_id (_tmp25_, _tmp26_);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp27_ = endpoint_url;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp28_ = pwg_id;
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_fetch_session_status (self, _tmp27_, _tmp28_);
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (pwg_id);
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (endpoint_url);
-#line 3843 "PiwigoPublishing.c"
+#line 3894 "PiwigoPublishing.c"
 }
 
 
@@ -3863,37 +3914,37 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin
 	guint _tmp3_ = 0U;
 	PublishingPiwigoSession* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:452: EVENT: on_login_network_error");
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:456: EVENT: on_login_network_error");
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = bad_txn;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_complete_publishing_rest_support_transaction_completed, self);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = bad_txn;
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_login_network_error_publishing_rest_support_transaction_network_error, self);
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->session;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp5_) {
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 3891 "PiwigoPublishing.c"
+#line 3942 "PiwigoPublishing.c"
 	}
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL);
-#line 3895 "PiwigoPublishing.c"
+#line 3946 "PiwigoPublishing.c"
 }
 
 
@@ -3908,16 +3959,16 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_error (Publishin
      * identity.
      */
 static void _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_session_get_status_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 3912 "PiwigoPublishing.c"
+#line 3963 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_session_get_status_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 3919 "PiwigoPublishing.c"
+#line 3970 "PiwigoPublishing.c"
 }
 
 
@@ -3927,29 +3978,29 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 	PublishingPiwigoSession* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (url != NULL);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (pwg_id != NULL);
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:473: ACTION: fetching session status");
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:477: ACTION: fetching session status");
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->session;
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp3_) {
-#line 3951 "PiwigoPublishing.c"
+#line 4002 "PiwigoPublishing.c"
 		PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL;
 		PublishingPiwigoSession* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
@@ -3957,47 +4008,47 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 		PublishingPiwigoSessionGetStatusTransaction* _tmp7_ = NULL;
 		PublishingPiwigoSessionGetStatusTransaction* _tmp8_ = NULL;
 		PublishingPiwigoSessionGetStatusTransaction* _tmp9_ = NULL;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = self->priv->session;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = url;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = pwg_id;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = publishing_piwigo_session_get_status_transaction_new_unauthenticated (_tmp4_, _tmp5_, _tmp6_);
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		status_txn = _tmp7_;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = status_txn;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = status_txn;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 3977 "PiwigoPublishing.c"
+#line 4028 "PiwigoPublishing.c"
 		{
 			PublishingPiwigoSessionGetStatusTransaction* _tmp10_ = NULL;
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp10_ = status_txn;
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3988 "PiwigoPublishing.c"
+#line 4039 "PiwigoPublishing.c"
 					goto __catch35_spit_publishing_publishing_error;
 				}
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_transaction_unref0 (status_txn);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 3999 "PiwigoPublishing.c"
+#line 4050 "PiwigoPublishing.c"
 			}
 		}
 		goto __finally35;
@@ -4005,80 +4056,80 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 		{
 			GError* err = NULL;
 			GError* _tmp11_ = NULL;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			err = _inner_error_;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_inner_error_ = NULL;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			g_debug ("PiwigoPublishing.vala:485: ERROR: do_fetch_session_status, not authent" \
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			g_debug ("PiwigoPublishing.vala:489: ERROR: do_fetch_session_status, not authent" \
 "icated");
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp11_ = err;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp11_);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 4019 "PiwigoPublishing.c"
+#line 4070 "PiwigoPublishing.c"
 		}
 		__finally35:
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (status_txn);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4032 "PiwigoPublishing.c"
+#line 4083 "PiwigoPublishing.c"
 		}
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (status_txn);
-#line 4036 "PiwigoPublishing.c"
+#line 4087 "PiwigoPublishing.c"
 	} else {
 		PublishingPiwigoSessionGetStatusTransaction* status_txn = NULL;
 		PublishingPiwigoSession* _tmp12_ = NULL;
 		PublishingPiwigoSessionGetStatusTransaction* _tmp13_ = NULL;
 		PublishingPiwigoSessionGetStatusTransaction* _tmp14_ = NULL;
 		PublishingPiwigoSessionGetStatusTransaction* _tmp15_ = NULL;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp12_ = self->priv->session;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = publishing_piwigo_session_get_status_transaction_new (_tmp12_);
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		status_txn = _tmp13_;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp14_ = status_txn;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp15_ = status_txn;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4057 "PiwigoPublishing.c"
+#line 4108 "PiwigoPublishing.c"
 		{
 			PublishingPiwigoSessionGetStatusTransaction* _tmp16_ = NULL;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp16_ = status_txn;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4068 "PiwigoPublishing.c"
+#line 4119 "PiwigoPublishing.c"
 					goto __catch36_spit_publishing_publishing_error;
 				}
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_transaction_unref0 (status_txn);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4079 "PiwigoPublishing.c"
+#line 4130 "PiwigoPublishing.c"
 			}
 		}
 		goto __finally36;
@@ -4086,37 +4137,37 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 		{
 			GError* err = NULL;
 			GError* _tmp17_ = NULL;
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			err = _inner_error_;
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_inner_error_ = NULL;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			g_debug ("PiwigoPublishing.vala:496: ERROR: do_fetch_session_status, authenticat" \
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			g_debug ("PiwigoPublishing.vala:500: ERROR: do_fetch_session_status, authenticat" \
 "ed");
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp17_ = err;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp17_);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 4099 "PiwigoPublishing.c"
+#line 4150 "PiwigoPublishing.c"
 		}
 		__finally36:
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (status_txn);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4112 "PiwigoPublishing.c"
+#line 4163 "PiwigoPublishing.c"
 		}
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (status_txn);
-#line 4116 "PiwigoPublishing.c"
+#line 4167 "PiwigoPublishing.c"
 	}
 }
 
@@ -4136,31 +4187,31 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 	PublishingPiwigoSession* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:510: EVENT: on_session_get_status_complete");
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:514: EVENT: on_session_get_status_complete");
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = txn;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = txn;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->session;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp5_) {
-#line 4160 "PiwigoPublishing.c"
+#line 4211 "PiwigoPublishing.c"
 		gchar* endpoint_url = NULL;
 		PublishingRESTSupportTransaction* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -4168,23 +4219,23 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 		PublishingPiwigoSession* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = txn;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = publishing_rest_support_transaction_get_endpoint_url (_tmp6_);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		endpoint_url = _tmp7_;
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->session;
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = publishing_piwigo_session_get_pwg_id (_tmp8_);
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		pwg_id = _tmp9_;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = pwg_id;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:517: Fetching session status for pwg_id %s", _tmp10_);
-#line 4184 "PiwigoPublishing.c"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:521: Fetching session status for pwg_id %s", _tmp10_);
+#line 4235 "PiwigoPublishing.c"
 		{
 			PublishingRESTSupportXmlDocument* doc = NULL;
 			PublishingRESTSupportTransaction* _tmp11_ = NULL;
@@ -4196,46 +4247,46 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			PublishingRESTSupportXmlDocument* _tmp16_ = NULL;
 			xmlNode* _tmp17_ = NULL;
 			xmlNode* username_node = NULL;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp11_ = txn;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp12_ = publishing_rest_support_transaction_get_response (_tmp11_);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp13_ = _tmp12_;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp14_ = publishing_rest_support_xml_document_parse_string (_tmp13_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp15_ = _tmp14_;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (_tmp13_);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			doc = _tmp15_;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4214 "PiwigoPublishing.c"
+#line 4265 "PiwigoPublishing.c"
 					goto __catch37_spit_publishing_publishing_error;
 				}
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (pwg_id);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (endpoint_url);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4227 "PiwigoPublishing.c"
+#line 4278 "PiwigoPublishing.c"
 			}
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp16_ = doc;
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp17_ = publishing_rest_support_xml_document_get_root_node (_tmp16_);
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			root = _tmp17_;
-#line 4235 "PiwigoPublishing.c"
+#line 4286 "PiwigoPublishing.c"
 			{
 				xmlNode* _tmp18_ = NULL;
 				PublishingRESTSupportXmlDocument* _tmp19_ = NULL;
@@ -4255,189 +4306,189 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				PublishingPiwigoSession* _tmp32_ = NULL;
 				gchar* _tmp33_ = NULL;
 				gchar* _tmp34_ = NULL;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp19_ = doc;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp20_ = root;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp21_ = publishing_rest_support_xml_document_get_named_child (_tmp19_, _tmp20_, "username", &_inner_error_);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp18_ = _tmp21_;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4267 "PiwigoPublishing.c"
+#line 4318 "PiwigoPublishing.c"
 						goto __catch38_spit_publishing_publishing_error;
 					}
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (pwg_id);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (endpoint_url);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					g_clear_error (&_inner_error_);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					return;
-#line 4282 "PiwigoPublishing.c"
+#line 4333 "PiwigoPublishing.c"
 				}
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				username_node = _tmp18_;
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp22_ = username_node;
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp23_ = (gchar*) xmlNodeGetContent (_tmp22_);
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				username = _tmp23_;
-#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp24_ = username;
-#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				g_debug ("PiwigoPublishing.vala:528: Returned username is %s", _tmp24_);
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				g_debug ("PiwigoPublishing.vala:532: Returned username is %s", _tmp24_);
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp25_ = self->priv->session;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp26_ = endpoint_url;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp27_ = username;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp28_ = pwg_id;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_session_authenticate (_tmp25_, _tmp26_, _tmp27_, _tmp28_);
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp29_ = self->priv->session;
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp30_ = publishing_piwigo_session_get_pwg_url (_tmp29_);
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp31_ = _tmp30_;
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_set_persistent_url (self, _tmp31_);
-#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (_tmp31_);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp32_ = self->priv->session;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp33_ = publishing_piwigo_session_get_username (_tmp32_);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp34_ = _tmp33_;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_set_persistent_username (self, _tmp34_);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (_tmp34_);
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (username);
-#line 4330 "PiwigoPublishing.c"
+#line 4381 "PiwigoPublishing.c"
 			}
 			goto __finally38;
 			__catch38_spit_publishing_publishing_error:
 			{
 				GError* err2 = NULL;
 				GError* _tmp35_ = NULL;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				err2 = _inner_error_;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_inner_error_ = NULL;
-#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				g_debug ("PiwigoPublishing.vala:534: ERROR: on_session_get_status_complete, inne" \
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				g_debug ("PiwigoPublishing.vala:538: ERROR: on_session_get_status_complete, inne" \
 "r");
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp35_ = err2;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp35_);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_error_free0 (err2);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (doc);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (pwg_id);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (endpoint_url);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4357 "PiwigoPublishing.c"
+#line 4408 "PiwigoPublishing.c"
 			}
 			__finally38:
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (doc);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4366 "PiwigoPublishing.c"
+#line 4417 "PiwigoPublishing.c"
 					goto __catch37_spit_publishing_publishing_error;
 				}
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (doc);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (pwg_id);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (endpoint_url);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				return;
-#line 4381 "PiwigoPublishing.c"
+#line 4432 "PiwigoPublishing.c"
 			}
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
-#line 4385 "PiwigoPublishing.c"
+#line 4436 "PiwigoPublishing.c"
 		}
 		goto __finally37;
 		__catch37_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
 			GError* _tmp36_ = NULL;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			err = _inner_error_;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_inner_error_ = NULL;
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			g_debug ("PiwigoPublishing.vala:539: ERROR: on_session_get_status_complete, oute" \
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			g_debug ("PiwigoPublishing.vala:543: ERROR: on_session_get_status_complete, oute" \
 "r");
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp36_ = err;
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp36_);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_error_free0 (err);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (pwg_id);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (endpoint_url);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4410 "PiwigoPublishing.c"
+#line 4461 "PiwigoPublishing.c"
 		}
 		__finally37:
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (pwg_id);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (endpoint_url);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4425 "PiwigoPublishing.c"
+#line 4476 "PiwigoPublishing.c"
 		}
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (pwg_id);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (endpoint_url);
-#line 4431 "PiwigoPublishing.c"
+#line 4482 "PiwigoPublishing.c"
 	} else {
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_fetch_categories (self);
-#line 4435 "PiwigoPublishing.c"
+#line 4486 "PiwigoPublishing.c"
 	}
 }
 
@@ -4452,31 +4503,31 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ
 	guint _tmp3_ = 0U;
 	PublishingRESTSupportTransaction* _tmp4_ = NULL;
 	GError* _tmp5_ = NULL;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:558: EVENT: on_session_get_status_error");
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:562: EVENT: on_session_get_status_error");
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = bad_txn;
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_complete_publishing_rest_support_transaction_completed, self);
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = bad_txn;
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_session_get_status_error_publishing_rest_support_transaction_network_error, self);
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = bad_txn;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = err;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 4474 "PiwigoPublishing.c"
+#line 4525 "PiwigoPublishing.c"
 }
 
 
@@ -4487,16 +4538,16 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_error (Publ
      * to populate the publishing pane presented to the user.
      */
 static void _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_fetch_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 4487 "PiwigoPublishing.c"
+#line 4538 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_fetch_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 4494 "PiwigoPublishing.c"
+#line 4545 "PiwigoPublishing.c"
 }
 
 
@@ -4507,48 +4558,48 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 	PublishingPiwigoSession* _tmp2_ = NULL;
 	PublishingPiwigoCategoriesGetListTransaction* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:571: ACTION: fetching categories");
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:575: ACTION: fetching categories");
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->session;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_categories_get_list_transaction_new (_tmp2_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	cat_trans = _tmp3_;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 4527 "PiwigoPublishing.c"
+#line 4578 "PiwigoPublishing.c"
 	{
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (cat_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4535 "PiwigoPublishing.c"
+#line 4586 "PiwigoPublishing.c"
 				goto __catch39_spit_publishing_publishing_error;
 			}
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (cat_trans);
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4546 "PiwigoPublishing.c"
+#line 4597 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally39;
@@ -4556,36 +4607,36 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_inner_error_ = NULL;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:582: ERROR: do_fetch_categories");
 #line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_inner_error_ = NULL;
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:586: ERROR: do_fetch_categories");
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = err;
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 4566 "PiwigoPublishing.c"
+#line 4617 "PiwigoPublishing.c"
 	}
 	__finally39:
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (cat_trans);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 4579 "PiwigoPublishing.c"
+#line 4630 "PiwigoPublishing.c"
 	}
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (cat_trans);
-#line 4583 "PiwigoPublishing.c"
+#line 4634 "PiwigoPublishing.c"
 }
 
 
@@ -4597,19 +4648,19 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
      * publishing options pane.
      */
 static void _vala_array_add34 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value) {
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoCategory*, *array, (*size) + 1);
-#line 4601 "PiwigoPublishing.c"
+#line 4652 "PiwigoPublishing.c"
 	}
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 4607 "PiwigoPublishing.c"
+#line 4658 "PiwigoPublishing.c"
 }
 
 
@@ -4624,49 +4675,49 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 	PublishingPiwigoCategory** _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:595: EVENT: on_category_fetch_complete");
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:599: EVENT: on_category_fetch_complete");
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = txn;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = txn;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = txn;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:598: PiwigoConnector: list of categories: %s", _tmp6_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:602: PiwigoConnector: list of categories: %s", _tmp6_);
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = self->priv->categories;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7__length1 = self->priv->categories_length1;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ != NULL) {
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->categories = (_vala_array_free (self->priv->categories, self->priv->categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->categories = NULL;
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->categories_length1 = 0;
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		self->priv->_categories_size_ = self->priv->categories_length1;
-#line 4664 "PiwigoPublishing.c"
+#line 4715 "PiwigoPublishing.c"
 	}
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
@@ -4692,578 +4743,525 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		gchar* _tmp20_ = NULL;
 		gchar* uppercats = NULL;
 		gchar* _tmp21_ = NULL;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		GeeHashMap* id_map = NULL;
+		GeeHashMap* _tmp22_ = NULL;
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = txn;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = _tmp9_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = publishing_rest_support_xml_document_parse_string (_tmp10_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp12_ = _tmp11_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp10_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		doc = _tmp12_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4708 "PiwigoPublishing.c"
+#line 4761 "PiwigoPublishing.c"
 				goto __catch40_spit_publishing_publishing_error;
 			}
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 4717 "PiwigoPublishing.c"
+#line 4770 "PiwigoPublishing.c"
 		}
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = doc;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp14_ = publishing_rest_support_xml_document_get_root_node (_tmp13_);
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		root = _tmp14_;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp15_ = root;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp16_ = xmlFirstElementChild (_tmp15_);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		categories_node = _tmp16_;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp17_ = categories_node;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp18_ = _tmp17_->children;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		category_node_iter = _tmp18_;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp19_ = g_strdup ("");
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		name = _tmp19_;
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp20_ = g_strdup ("");
-#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		id_string = _tmp20_;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp21_ = g_strdup ("");
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		uppercats = _tmp21_;
-#line 4749 "PiwigoPublishing.c"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp22_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		id_map = _tmp22_;
+#line 4806 "PiwigoPublishing.c"
 		{
-			gboolean _tmp22_ = FALSE;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp22_ = TRUE;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			gboolean _tmp23_ = FALSE;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp23_ = TRUE;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 4756 "PiwigoPublishing.c"
-				xmlNode* _tmp25_ = NULL;
+#line 4813 "PiwigoPublishing.c"
 				xmlNode* _tmp26_ = NULL;
-				PublishingRESTSupportXmlDocument* _tmp27_ = NULL;
-				xmlNode* _tmp28_ = NULL;
+				xmlNode* _tmp27_ = NULL;
+				PublishingRESTSupportXmlDocument* _tmp28_ = NULL;
 				xmlNode* _tmp29_ = NULL;
 				xmlNode* _tmp30_ = NULL;
-				gchar* _tmp31_ = NULL;
-				xmlNode* _tmp32_ = NULL;
-				PublishingRESTSupportXmlDocument* _tmp33_ = NULL;
-				xmlNode* _tmp34_ = NULL;
+				xmlNode* _tmp31_ = NULL;
+				gchar* _tmp32_ = NULL;
+				xmlNode* _tmp33_ = NULL;
+				PublishingRESTSupportXmlDocument* _tmp34_ = NULL;
 				xmlNode* _tmp35_ = NULL;
 				xmlNode* _tmp36_ = NULL;
-				gchar* _tmp37_ = NULL;
-				xmlNode* _tmp38_ = NULL;
-				gchar* _tmp39_ = NULL;
-				PublishingPiwigoCategory** _tmp40_ = NULL;
-				gint _tmp40__length1 = 0;
-				PublishingPiwigoCategory** _tmp42_ = NULL;
-				gint _tmp42__length1 = 0;
+				xmlNode* _tmp37_ = NULL;
+				gchar* _tmp38_ = NULL;
+				xmlNode* _tmp39_ = NULL;
+				gchar* _tmp40_ = NULL;
+				GeeHashMap* _tmp41_ = NULL;
+				const gchar* _tmp42_ = NULL;
 				const gchar* _tmp43_ = NULL;
-				gint _tmp44_ = 0;
-				const gchar* _tmp45_ = NULL;
-				const gchar* _tmp46_ = NULL;
-				PublishingPiwigoCategory* _tmp47_ = NULL;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (!_tmp22_) {
-#line 4783 "PiwigoPublishing.c"
-					xmlNode* _tmp23_ = NULL;
+				PublishingPiwigoCategory** _tmp44_ = NULL;
+				gint _tmp44__length1 = 0;
+				PublishingPiwigoCategory** _tmp46_ = NULL;
+				gint _tmp46__length1 = 0;
+				const gchar* _tmp47_ = NULL;
+				gint _tmp48_ = 0;
+				const gchar* _tmp49_ = NULL;
+				const gchar* _tmp50_ = NULL;
+				PublishingPiwigoCategory* _tmp51_ = NULL;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				if (!_tmp23_) {
+#line 4843 "PiwigoPublishing.c"
 					xmlNode* _tmp24_ = NULL;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp23_ = category_node_iter;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp24_ = _tmp23_->next;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					category_node_iter = _tmp24_;
-#line 4792 "PiwigoPublishing.c"
+					xmlNode* _tmp25_ = NULL;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp24_ = category_node_iter;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp25_ = _tmp24_->next;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					category_node_iter = _tmp25_;
+#line 4852 "PiwigoPublishing.c"
 				}
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp22_ = FALSE;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp25_ = category_node_iter;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (!(_tmp25_ != NULL)) {
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp23_ = FALSE;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp26_ = category_node_iter;
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				if (!(_tmp26_ != NULL)) {
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 4802 "PiwigoPublishing.c"
+#line 4862 "PiwigoPublishing.c"
 				}
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp27_ = doc;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp28_ = category_node_iter;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp29_ = publishing_rest_support_xml_document_get_named_child (_tmp27_, _tmp28_, "name", &_inner_error_);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp26_ = _tmp29_;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp28_ = doc;
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp29_ = category_node_iter;
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp30_ = publishing_rest_support_xml_document_get_named_child (_tmp28_, _tmp29_, "name", &_inner_error_);
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp27_ = _tmp30_;
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_g_object_unref0 (id_map);
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (uppercats);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (id_string);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (name);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4824 "PiwigoPublishing.c"
+#line 4886 "PiwigoPublishing.c"
 						goto __catch40_spit_publishing_publishing_error;
 					}
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_g_object_unref0 (id_map);
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (uppercats);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (id_string);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (name);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					g_clear_error (&_inner_error_);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					return;
-#line 4841 "PiwigoPublishing.c"
+#line 4905 "PiwigoPublishing.c"
 				}
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				name_node = _tmp26_;
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp30_ = name_node;
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp31_ = (gchar*) xmlNodeGetContent (_tmp30_);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				name_node = _tmp27_;
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp31_ = name_node;
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp32_ = (gchar*) xmlNodeGetContent (_tmp31_);
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (name);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				name = _tmp31_;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp33_ = doc;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp34_ = category_node_iter;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp35_ = publishing_rest_support_xml_document_get_named_child (_tmp33_, _tmp34_, "uppercats", &_inner_error_);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp32_ = _tmp35_;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				name = _tmp32_;
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp34_ = doc;
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp35_ = category_node_iter;
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp36_ = publishing_rest_support_xml_document_get_named_child (_tmp34_, _tmp35_, "uppercats", &_inner_error_);
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp33_ = _tmp36_;
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_g_object_unref0 (id_map);
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (uppercats);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (id_string);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (name);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4873 "PiwigoPublishing.c"
+#line 4939 "PiwigoPublishing.c"
 						goto __catch40_spit_publishing_publishing_error;
 					}
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_g_object_unref0 (id_map);
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (uppercats);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (id_string);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (name);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					g_clear_error (&_inner_error_);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					return;
-#line 4890 "PiwigoPublishing.c"
+#line 4958 "PiwigoPublishing.c"
 				}
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				uppercats_node = _tmp32_;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp36_ = uppercats_node;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp37_ = (gchar*) xmlNodeGetContent (_tmp36_);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				uppercats_node = _tmp33_;
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp37_ = uppercats_node;
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp38_ = (gchar*) xmlNodeGetContent (_tmp37_);
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (uppercats);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				uppercats = (gchar*) _tmp37_;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp38_ = category_node_iter;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp39_ = (gchar*) xmlGetProp (_tmp38_, (xmlChar*) "id");
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				uppercats = (gchar*) _tmp38_;
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp39_ = category_node_iter;
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp40_ = (gchar*) xmlGetProp (_tmp39_, (xmlChar*) "id");
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (id_string);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				id_string = _tmp39_;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp40_ = self->priv->categories;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp40__length1 = self->priv->categories_length1;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (_tmp40_ == NULL) {
-#line 4916 "PiwigoPublishing.c"
-					PublishingPiwigoCategory** _tmp41_ = NULL;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp41_ = g_new0 (PublishingPiwigoCategory*, 0 + 1);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				id_string = _tmp40_;
+#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp41_ = id_map;
+#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp42_ = id_string;
+#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp43_ = name;
+#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp42_, _tmp43_);
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp44_ = self->priv->categories;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp44__length1 = self->priv->categories_length1;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				if (_tmp44_ == NULL) {
+#line 4992 "PiwigoPublishing.c"
+					PublishingPiwigoCategory** _tmp45_ = NULL;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp45_ = g_new0 (PublishingPiwigoCategory*, 0 + 1);
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					self->priv->categories = (_vala_array_free (self->priv->categories, self->priv->categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					self->priv->categories = _tmp41_;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					self->priv->categories = _tmp45_;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					self->priv->categories_length1 = 0;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					self->priv->_categories_size_ = self->priv->categories_length1;
-#line 4928 "PiwigoPublishing.c"
+#line 5004 "PiwigoPublishing.c"
 				}
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp42_ = self->priv->categories;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp42__length1 = self->priv->categories_length1;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp43_ = id_string;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp44_ = atoi (_tmp43_);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp45_ = name;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp46_ = uppercats;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp47_ = publishing_piwigo_category_new (_tmp44_, _tmp45_, _tmp46_, "");
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_vala_array_add34 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp47_);
-#line 4946 "PiwigoPublishing.c"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp46_ = self->priv->categories;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp46__length1 = self->priv->categories_length1;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp47_ = id_string;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp48_ = atoi (_tmp47_);
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp49_ = name;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp50_ = uppercats;
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp51_ = publishing_piwigo_category_new (_tmp48_, _tmp49_, _tmp50_, "");
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_vala_array_add34 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp51_);
+#line 5022 "PiwigoPublishing.c"
 			}
 		}
 		{
 			gint i = 0;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			i = 0;
-#line 4953 "PiwigoPublishing.c"
+#line 5029 "PiwigoPublishing.c"
 			{
-				gboolean _tmp48_ = FALSE;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp48_ = TRUE;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				gboolean _tmp52_ = FALSE;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp52_ = TRUE;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				while (TRUE) {
-#line 4960 "PiwigoPublishing.c"
-					gint _tmp50_ = 0;
-					PublishingPiwigoCategory** _tmp51_ = NULL;
-					gint _tmp51__length1 = 0;
+#line 5036 "PiwigoPublishing.c"
+					gint _tmp54_ = 0;
+					PublishingPiwigoCategory** _tmp55_ = NULL;
+					gint _tmp55__length1 = 0;
 					gchar** upcatids = NULL;
-					PublishingPiwigoCategory** _tmp52_ = NULL;
-					gint _tmp52__length1 = 0;
-					gint _tmp53_ = 0;
-					PublishingPiwigoCategory* _tmp54_ = NULL;
-					const gchar* _tmp55_ = NULL;
-					gchar** _tmp56_ = NULL;
-					gchar** _tmp57_ = NULL;
+					PublishingPiwigoCategory** _tmp56_ = NULL;
+					gint _tmp56__length1 = 0;
+					gint _tmp57_ = 0;
+					PublishingPiwigoCategory* _tmp58_ = NULL;
+					const gchar* _tmp59_ = NULL;
+					gchar** _tmp60_ = NULL;
+					gchar** _tmp61_ = NULL;
 					gint upcatids_length1 = 0;
 					gint _upcatids_size_ = 0;
 					GString* builder = NULL;
-					GString* _tmp58_ = NULL;
-					PublishingPiwigoCategory** _tmp84_ = NULL;
-					gint _tmp84__length1 = 0;
-					gint _tmp85_ = 0;
-					PublishingPiwigoCategory* _tmp86_ = NULL;
-					GString* _tmp87_ = NULL;
-					const gchar* _tmp88_ = NULL;
-					gchar* _tmp89_ = NULL;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					if (!_tmp48_) {
-#line 4985 "PiwigoPublishing.c"
-						gint _tmp49_ = 0;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						_tmp49_ = i;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						i = _tmp49_ + 1;
-#line 4991 "PiwigoPublishing.c"
+					GString* _tmp62_ = NULL;
+					PublishingPiwigoCategory** _tmp76_ = NULL;
+					gint _tmp76__length1 = 0;
+					gint _tmp77_ = 0;
+					PublishingPiwigoCategory* _tmp78_ = NULL;
+					GString* _tmp79_ = NULL;
+					const gchar* _tmp80_ = NULL;
+					gchar* _tmp81_ = NULL;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					if (!_tmp52_) {
+#line 5061 "PiwigoPublishing.c"
+						gint _tmp53_ = 0;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+						_tmp53_ = i;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+						i = _tmp53_ + 1;
+#line 5067 "PiwigoPublishing.c"
 					}
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp48_ = FALSE;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp50_ = i;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp51_ = self->priv->categories;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp51__length1 = self->priv->categories_length1;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					if (!(_tmp50_ < _tmp51__length1)) {
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp52_ = FALSE;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp54_ = i;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp55_ = self->priv->categories;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp55__length1 = self->priv->categories_length1;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					if (!(_tmp54_ < _tmp55__length1)) {
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						break;
-#line 5005 "PiwigoPublishing.c"
+#line 5081 "PiwigoPublishing.c"
 					}
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp52_ = self->priv->categories;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp52__length1 = self->priv->categories_length1;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp53_ = i;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp54_ = _tmp52_[_tmp53_];
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp55_ = _tmp54_->uppercats;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp57_ = _tmp56_ = g_strsplit (_tmp55_, ",", 0);
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					upcatids = _tmp57_;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					upcatids_length1 = _vala_array_length (_tmp56_);
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp56_ = self->priv->categories;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp56__length1 = self->priv->categories_length1;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp57_ = i;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp58_ = _tmp56_[_tmp57_];
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp59_ = _tmp58_->uppercats;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp61_ = _tmp60_ = g_strsplit (_tmp59_, ",", 0);
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					upcatids = _tmp61_;
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					upcatids_length1 = _vala_array_length (_tmp60_);
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_upcatids_size_ = upcatids_length1;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp58_ = g_string_new ("");
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					builder = _tmp58_;
-#line 5029 "PiwigoPublishing.c"
-					{
-						gint j = 0;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-						j = 0;
-#line 5034 "PiwigoPublishing.c"
-						{
-							gboolean _tmp59_ = FALSE;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-							_tmp59_ = TRUE;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-							while (TRUE) {
-#line 5041 "PiwigoPublishing.c"
-								gint _tmp61_ = 0;
-								gchar** _tmp62_ = NULL;
-								gint _tmp62__length1 = 0;
-								GString* _tmp63_ = NULL;
-								GString* _tmp83_ = NULL;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								if (!_tmp59_) {
-#line 5049 "PiwigoPublishing.c"
-									gint _tmp60_ = 0;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-									_tmp60_ = j;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-									j = _tmp60_ + 1;
-#line 5055 "PiwigoPublishing.c"
-								}
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp59_ = FALSE;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp61_ = j;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp62_ = upcatids;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp62__length1 = upcatids_length1;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								if (!(_tmp61_ < _tmp62__length1)) {
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-									break;
-#line 5069 "PiwigoPublishing.c"
-								}
-#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp63_ = builder;
-#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								g_string_append (_tmp63_, "/ ");
-#line 5075 "PiwigoPublishing.c"
-								{
-									gint k = 0;
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-									k = 0;
-#line 5080 "PiwigoPublishing.c"
-									{
-										gboolean _tmp64_ = FALSE;
+					_tmp62_ = g_string_new ("");
 #line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-										_tmp64_ = TRUE;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-										while (TRUE) {
-#line 5087 "PiwigoPublishing.c"
-											gint _tmp66_ = 0;
-											PublishingPiwigoCategory** _tmp67_ = NULL;
-											gint _tmp67__length1 = 0;
-											gchar** _tmp68_ = NULL;
-											gint _tmp68__length1 = 0;
-											gint _tmp69_ = 0;
-											const gchar* _tmp70_ = NULL;
-											PublishingPiwigoCategory** _tmp71_ = NULL;
-											gint _tmp71__length1 = 0;
-											gint _tmp72_ = 0;
-											PublishingPiwigoCategory* _tmp73_ = NULL;
-											gint _tmp74_ = 0;
-											gchar* _tmp75_ = NULL;
-											gchar* _tmp76_ = NULL;
-											gboolean _tmp77_ = FALSE;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											if (!_tmp64_) {
+					builder = _tmp62_;
 #line 5105 "PiwigoPublishing.c"
-												gint _tmp65_ = 0;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-												_tmp65_ = k;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-												k = _tmp65_ + 1;
-#line 5111 "PiwigoPublishing.c"
-											}
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp64_ = FALSE;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp66_ = k;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp67_ = self->priv->categories;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp67__length1 = self->priv->categories_length1;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											if (!(_tmp66_ < _tmp67__length1)) {
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-												break;
-#line 5125 "PiwigoPublishing.c"
-											}
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp68_ = upcatids;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp68__length1 = upcatids_length1;
+					{
+						gint j = 0;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp69_ = j;
+						j = 0;
+#line 5110 "PiwigoPublishing.c"
+						{
+							gboolean _tmp63_ = FALSE;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp70_ = _tmp68_[_tmp69_];
+							_tmp63_ = TRUE;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp71_ = self->priv->categories;
+							while (TRUE) {
+#line 5117 "PiwigoPublishing.c"
+								gint _tmp65_ = 0;
+								gchar** _tmp66_ = NULL;
+								gint _tmp66__length1 = 0;
+								GString* _tmp67_ = NULL;
+								GString* _tmp68_ = NULL;
+								GeeHashMap* _tmp69_ = NULL;
+								gchar** _tmp70_ = NULL;
+								gint _tmp70__length1 = 0;
+								gint _tmp71_ = 0;
+								const gchar* _tmp72_ = NULL;
+								gpointer _tmp73_ = NULL;
+								gchar* _tmp74_ = NULL;
+								GString* _tmp75_ = NULL;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp71__length1 = self->priv->categories_length1;
+								if (!_tmp63_) {
+#line 5133 "PiwigoPublishing.c"
+									gint _tmp64_ = 0;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp72_ = k;
+									_tmp64_ = j;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp73_ = _tmp71_[_tmp72_];
+									j = _tmp64_ + 1;
+#line 5139 "PiwigoPublishing.c"
+								}
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp74_ = _tmp73_->id;
+								_tmp63_ = FALSE;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp75_ = g_strdup_printf ("%i", _tmp74_);
+								_tmp65_ = j;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp76_ = _tmp75_;
+								_tmp66_ = upcatids;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_tmp77_ = g_strcmp0 (_tmp70_, _tmp76_) == 0;
+								_tmp66__length1 = upcatids_length1;
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											_g_free0 (_tmp76_);
+								if (!(_tmp65_ < _tmp66__length1)) {
 #line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-											if (_tmp77_) {
-#line 5155 "PiwigoPublishing.c"
-												GString* _tmp78_ = NULL;
-												PublishingPiwigoCategory** _tmp79_ = NULL;
-												gint _tmp79__length1 = 0;
-												gint _tmp80_ = 0;
-												PublishingPiwigoCategory* _tmp81_ = NULL;
-												const gchar* _tmp82_ = NULL;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-												_tmp78_ = builder;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-												_tmp79_ = self->priv->categories;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-												_tmp79__length1 = self->priv->categories_length1;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-												_tmp80_ = k;
-#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-												_tmp81_ = _tmp79_[_tmp80_];
+									break;
+#line 5153 "PiwigoPublishing.c"
+								}
 #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-												_tmp82_ = _tmp81_->name;
+								_tmp67_ = builder;
 #line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-												g_string_append (_tmp78_, _tmp82_);
+								g_string_append (_tmp67_, "/ ");
 #line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-												break;
-#line 5178 "PiwigoPublishing.c"
-											}
-										}
-									}
-								}
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								_tmp83_ = builder;
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-								g_string_append (_tmp83_, " ");
-#line 5187 "PiwigoPublishing.c"
+								_tmp68_ = builder;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+								_tmp69_ = id_map;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+								_tmp70_ = upcatids;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+								_tmp70__length1 = upcatids_length1;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+								_tmp71_ = j;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+								_tmp72_ = _tmp70_[_tmp71_];
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+								_tmp73_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_);
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+								_tmp74_ = (gchar*) _tmp73_;
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+								g_string_append (_tmp68_, _tmp74_);
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+								_g_free0 (_tmp74_);
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+								_tmp75_ = builder;
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+								g_string_append (_tmp75_, " ");
+#line 5183 "PiwigoPublishing.c"
 							}
 						}
 					}
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp84_ = self->priv->categories;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp84__length1 = self->priv->categories_length1;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp85_ = i;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp86_ = _tmp84_[_tmp85_];
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp87_ = builder;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp88_ = _tmp87_->str;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp89_ = g_strdup (_tmp88_);
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_g_free0 (_tmp86_->display_name);
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp86_->display_name = _tmp89_;
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp76_ = self->priv->categories;
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp76__length1 = self->priv->categories_length1;
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp77_ = i;
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp78_ = _tmp76_[_tmp77_];
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp79_ = builder;
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp80_ = _tmp79_->str;
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp81_ = g_strdup (_tmp80_);
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_g_free0 (_tmp78_->display_name);
+#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp78_->display_name = _tmp81_;
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_string_free0 (builder);
-#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					upcatids = (_vala_array_free (upcatids, upcatids_length1, (GDestroyNotify) g_free), NULL);
-#line 5213 "PiwigoPublishing.c"
+#line 5209 "PiwigoPublishing.c"
 				}
 			}
 		}
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (id_map);
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (uppercats);
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (id_string);
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (name);
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 5225 "PiwigoPublishing.c"
+#line 5223 "PiwigoPublishing.c"
 	}
 	goto __finally40;
 	__catch40_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
-		GError* _tmp90_ = NULL;
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		GError* _tmp82_ = NULL;
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:648: ERROR: on_category_fetch_complete");
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp82_ = err;
+#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp82_);
 #line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:650: ERROR: on_category_fetch_complete");
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp90_ = err;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp90_);
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5246 "PiwigoPublishing.c"
+#line 5244 "PiwigoPublishing.c"
 	}
 	__finally40:
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5257 "PiwigoPublishing.c"
+#line 5255 "PiwigoPublishing.c"
 	}
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (self);
-#line 5261 "PiwigoPublishing.c"
+#line 5259 "PiwigoPublishing.c"
 }
 
 
@@ -5278,31 +5276,31 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
 	guint _tmp3_ = 0U;
 	PublishingRESTSupportTransaction* _tmp4_ = NULL;
 	GError* _tmp5_ = NULL;
-#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:666: EVENT: on_category_fetch_error");
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:664: EVENT: on_category_fetch_error");
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = bad_txn;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = bad_txn;
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = bad_txn;
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = err;
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5300 "PiwigoPublishing.c"
+#line 5298 "PiwigoPublishing.c"
 }
 
 
@@ -5312,16 +5310,16 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_error (Publishi
      * This action method shows the publishing options pane.
      */
 static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout (PublishingPiwigoPublishingOptionsPane* _sender, gpointer self) {
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked ((PublishingPiwigoPiwigoPublisher*) self);
-#line 5312 "PiwigoPublishing.c"
+#line 5310 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish (PublishingPiwigoPublishingOptionsPane* _sender, PublishingPiwigoPublishingParameters* parameters, gboolean strip_metadata, gpointer self) {
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked ((PublishingPiwigoPiwigoPublisher*) self, parameters, strip_metadata);
-#line 5319 "PiwigoPublishing.c"
+#line 5317 "PiwigoPublishing.c"
 }
 
 
@@ -5341,55 +5339,55 @@ static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (
 	SpitPublishingPluginHost* _tmp10_ = NULL;
 	GtkWidget* _tmp11_ = NULL;
 	GtkWidget* _tmp12_ = NULL;
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:676: ACTION: installing publishing options pane");
 #line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:678: ACTION: installing publishing options pane");
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->categories;
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1__length1 = self->priv->categories_length1;
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_piwigo_piwigo_publisher_get_last_category (self);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_piwigo_publisher_get_last_permission_level (self);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = publishing_piwigo_piwigo_publisher_get_last_photo_size (self);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_piwigo_piwigo_publisher_get_last_title_as_comment (self);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_piwigo_publisher_get_last_no_upload_tags (self);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = publishing_piwigo_piwigo_publisher_get_metadata_removal_choice (self);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = publishing_piwigo_publishing_options_pane_new (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_, _tmp7_);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	opts_pane = _tmp8_;
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (opts_pane, "logout", (GCallback) _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout_clicked_publishing_piwigo_publishing_options_pane_logout, self, 0);
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (opts_pane, "publish", (GCallback) _publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publish_clicked_publishing_piwigo_publishing_options_pane_publish, self, 0);
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = self->priv->host;
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = self->priv->host;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp11_ = publishing_piwigo_publishing_options_pane_get_default_widget (opts_pane);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp11_ = shotwell_plugins_common_builder_pane_get_default_widget (G_TYPE_CHECK_INSTANCE_CAST (opts_pane, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = _tmp11_;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_dialog_default_widget (_tmp10_, _tmp12_);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (_tmp12_);
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (opts_pane);
-#line 5387 "PiwigoPublishing.c"
+#line 5385 "PiwigoPublishing.c"
 }
 
 
@@ -5397,16 +5395,16 @@ static void publishing_piwigo_piwigo_publisher_do_show_publishing_options_pane (
      * Event triggered when the user clicks logout in the publishing options pane.
      */
 static void _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_logout_network_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5397 "PiwigoPublishing.c"
+#line 5395 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_logout_network_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 5404 "PiwigoPublishing.c"
+#line 5402 "PiwigoPublishing.c"
 }
 
 
@@ -5415,41 +5413,41 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 	PublishingPiwigoSession* _tmp0_ = NULL;
 	PublishingPiwigoSessionLogoutTransaction* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:694: EVENT: on_publishing_options_pane_logout_cl" \
+#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:692: EVENT: on_publishing_options_pane_logout_cl" \
 "icked");
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->session;
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishing_piwigo_session_logout_transaction_new (_tmp0_);
-#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	logout_trans = _tmp1_;
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 695 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5427 "PiwigoPublishing.c"
+#line 5425 "PiwigoPublishing.c"
 	{
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (logout_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5435 "PiwigoPublishing.c"
+#line 5433 "PiwigoPublishing.c"
 				goto __catch41_spit_publishing_publishing_error;
 			}
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (logout_trans);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5446 "PiwigoPublishing.c"
+#line 5444 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally41;
@@ -5457,37 +5455,37 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:702: ERROR: on_publishing_options_pane_logout_cl" \
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:700: ERROR: on_publishing_options_pane_logout_cl" \
 "icked");
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp2_ = err;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp2_);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 5466 "PiwigoPublishing.c"
+#line 5464 "PiwigoPublishing.c"
 	}
 	__finally41:
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (logout_trans);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5479 "PiwigoPublishing.c"
+#line 5477 "PiwigoPublishing.c"
 	}
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (logout_trans);
-#line 5483 "PiwigoPublishing.c"
+#line 5481 "PiwigoPublishing.c"
 }
 
 
@@ -5503,31 +5501,31 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_complete (Publi
 	PublishingRESTSupportTransaction* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	PublishingPiwigoSession* _tmp4_ = NULL;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:714: EVENT: on_logout_network_complete");
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:712: EVENT: on_logout_network_complete");
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = txn;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = txn;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->session;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_deauthenticate (_tmp4_);
-#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO);
-#line 5523 "PiwigoPublishing.c"
+#line 5521 "PiwigoPublishing.c"
 }
 
 
@@ -5541,31 +5539,31 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi
 	guint _tmp3_ = 0U;
 	PublishingRESTSupportTransaction* _tmp4_ = NULL;
 	GError* _tmp5_ = NULL;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:730: EVENT: on_logout_network_error");
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:728: EVENT: on_logout_network_error");
+#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = bad_txn;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_complete_publishing_rest_support_transaction_completed, self);
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = bad_txn;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_logout_network_error_publishing_rest_support_transaction_network_error, self);
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = bad_txn;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = err;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 5561 "PiwigoPublishing.c"
+#line 5559 "PiwigoPublishing.c"
 }
 
 
@@ -5580,9 +5578,9 @@ static void publishing_piwigo_piwigo_publisher_on_logout_network_error (Publishi
      * @param parameters the publishing parameters
      */
 static gpointer _publishing_piwigo_publishing_parameters_ref0 (gpointer self) {
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_publishing_parameters_ref (self) : NULL;
-#line 5578 "PiwigoPublishing.c"
+#line 5576 "PiwigoPublishing.c"
 }
 
 
@@ -5593,50 +5591,50 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_publis
 	PublishingPiwigoPublishingParameters* _tmp3_ = NULL;
 	PublishingPiwigoCategory* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_PARAMETERS (parameters));
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:748: EVENT: on_publishing_options_pane_publish_c" \
+#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:746: EVENT: on_publishing_options_pane_publish_c" \
 "licked");
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = parameters;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp0_);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->parameters = _tmp1_;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = strip_metadata;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->strip_metadata = _tmp2_;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = parameters;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_->category;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_piwigo_category_is_local (_tmp4_);
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp5_) {
-#line 5615 "PiwigoPublishing.c"
+#line 5613 "PiwigoPublishing.c"
 		PublishingPiwigoPublishingParameters* _tmp6_ = NULL;
 		PublishingPiwigoCategory* _tmp7_ = NULL;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = parameters;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = _tmp6_->category;
-#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_create_category (self, _tmp7_);
-#line 5624 "PiwigoPublishing.c"
+#line 5622 "PiwigoPublishing.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->strip_metadata;
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_upload (self, _tmp8_);
-#line 5631 "PiwigoPublishing.c"
+#line 5629 "PiwigoPublishing.c"
 	}
 }
 
@@ -5671,21 +5669,21 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5666 "PiwigoPublishing.c"
+#line 5664 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_add_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 5673 "PiwigoPublishing.c"
+#line 5671 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_category_add_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender);
-#line 5680 "PiwigoPublishing.c"
+#line 5678 "PiwigoPublishing.c"
 }
 
 
@@ -5717,100 +5715,100 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 	PublishingPiwigoCategoriesAddTransaction* _tmp23_ = NULL;
 	PublishingPiwigoCategoriesAddTransaction* _tmp24_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_CATEGORY (category));
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = category;
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _tmp0_->name;
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = g_strdup_printf ("ACTION: creating a new category: %s", _tmp1_);
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:771: %s", _tmp3_);
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:769: %s", _tmp3_);
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = category;
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_piwigo_category_is_local (_tmp4_);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_assert (_tmp5_, "category.is_local()");
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->host;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp6_, TRUE);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = self->priv->host;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = _ ("Creating album %s…");
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = category;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = _tmp9_->name;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = g_strdup_printf (_tmp8_, _tmp10_);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = _tmp11_;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp12_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp12_);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = self->priv->session;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = category;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = _tmp14_->name;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = string_strip (_tmp15_);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp17_ = _tmp16_;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = category;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = _tmp18_->uppercats;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp20_ = atoi (_tmp19_);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = category;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp22_ = _tmp21_->comment;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp23_ = publishing_piwigo_categories_add_transaction_new (_tmp13_, _tmp17_, _tmp20_, _tmp22_);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp24_ = _tmp23_;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp17_);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	creation_trans = _tmp24_;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 5786 "PiwigoPublishing.c"
+#line 5784 "PiwigoPublishing.c"
 	{
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5794 "PiwigoPublishing.c"
+#line 5792 "PiwigoPublishing.c"
 				goto __catch42_spit_publishing_publishing_error;
 			}
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5805 "PiwigoPublishing.c"
+#line 5803 "PiwigoPublishing.c"
 		}
 	}
 	goto __finally42;
@@ -5818,36 +5816,36 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 	{
 		GError* err = NULL;
 		GError* _tmp25_ = NULL;
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:785: ERROR: do_create_category");
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:783: ERROR: do_create_category");
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp25_ = err;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp25_);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 5825 "PiwigoPublishing.c"
+#line 5823 "PiwigoPublishing.c"
 	}
 	__finally42:
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 5838 "PiwigoPublishing.c"
+#line 5836 "PiwigoPublishing.c"
 	}
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 5842 "PiwigoPublishing.c"
+#line 5840 "PiwigoPublishing.c"
 }
 
 
@@ -5864,25 +5862,25 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 	PublishingRESTSupportTransaction* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	GError * _inner_error_ = NULL;
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:798: EVENT: on_category_add_complete");
-#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:796: EVENT: on_category_add_complete");
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = txn;
-#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = txn;
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
-#line 5877 "PiwigoPublishing.c"
+#line 5875 "PiwigoPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* doc = NULL;
 		PublishingRESTSupportTransaction* _tmp4_ = NULL;
@@ -5908,129 +5906,129 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		PublishingPiwigoCategory* _tmp20_ = NULL;
 		gint _tmp21_ = 0;
 		gboolean _tmp22_ = FALSE;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = txn;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = _tmp5_;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = publishing_rest_support_xml_document_parse_string (_tmp6_, _publishing_piwigo_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp6_);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		doc = _tmp8_;
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5921 "PiwigoPublishing.c"
+#line 5919 "PiwigoPublishing.c"
 				goto __catch43_spit_publishing_publishing_error;
 			}
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5930 "PiwigoPublishing.c"
+#line 5928 "PiwigoPublishing.c"
 		}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = doc;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_get_root_node (_tmp9_);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		rsp = _tmp10_;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp12_ = doc;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp13_ = rsp;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp14_ = publishing_rest_support_xml_document_get_named_child (_tmp12_, _tmp13_, "id", &_inner_error_);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = _tmp14_;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5952 "PiwigoPublishing.c"
+#line 5950 "PiwigoPublishing.c"
 				goto __catch43_spit_publishing_publishing_error;
 			}
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return;
-#line 5963 "PiwigoPublishing.c"
+#line 5961 "PiwigoPublishing.c"
 		}
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		id_node = _tmp11_;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp15_ = id_node;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp16_ = (gchar*) xmlNodeGetContent (_tmp15_);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		id_string = _tmp16_;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp17_ = id_string;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp18_ = atoi (_tmp17_);
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		id = _tmp18_;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp19_ = self->priv->parameters;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp20_ = _tmp19_->category;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp21_ = id;
-#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp20_->id = _tmp21_;
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp22_ = self->priv->strip_metadata;
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_upload (self, _tmp22_);
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (id_string);
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (doc);
-#line 5995 "PiwigoPublishing.c"
+#line 5993 "PiwigoPublishing.c"
 	}
 	goto __finally43;
 	__catch43_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp23_ = NULL;
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_debug ("PiwigoPublishing.vala:815: ERROR: on_category_add_complete");
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_debug ("PiwigoPublishing.vala:813: ERROR: on_category_add_complete");
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp23_ = err;
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp23_);
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 6014 "PiwigoPublishing.c"
+#line 6012 "PiwigoPublishing.c"
 	}
 	__finally43:
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 6025 "PiwigoPublishing.c"
+#line 6023 "PiwigoPublishing.c"
 	}
 }
 
@@ -6045,31 +6043,31 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_error (Publishing
 	guint _tmp3_ = 0U;
 	PublishingRESTSupportTransaction* _tmp4_ = NULL;
 	GError* _tmp5_ = NULL;
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:827: EVENT: on_category_add_error");
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:825: EVENT: on_category_add_error");
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = bad_txn;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_complete_publishing_rest_support_transaction_completed, self);
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = bad_txn;
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_category_add_error_publishing_rest_support_transaction_network_error, self);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = bad_txn;
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = err;
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_network_error (self, _tmp4_, _tmp5_);
-#line 6064 "PiwigoPublishing.c"
+#line 6062 "PiwigoPublishing.c"
 }
 
 
@@ -6077,23 +6075,23 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_error (Publishing
      * Upload action: the big one, the one we've been waiting for!
      */
 static void _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_upload_complete ((PublishingPiwigoPiwigoPublisher*) self, _sender, num_photos_published);
-#line 6074 "PiwigoPublishing.c"
+#line 6072 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_upload_error ((PublishingPiwigoPiwigoPublisher*) self, _sender, err);
-#line 6081 "PiwigoPublishing.c"
+#line 6079 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_on_upload_status_updated ((PublishingPiwigoPiwigoPublisher*) self, file_number, fraction_complete);
-#line 6088 "PiwigoPublishing.c"
+#line 6086 "PiwigoPublishing.c"
 }
 
 
@@ -6132,113 +6130,113 @@ static void publishing_piwigo_piwigo_publisher_do_upload (PublishingPiwigoPiwigo
 	PublishingPiwigoSession* _tmp27_ = NULL;
 	PublishingPiwigoPublishingParameters* _tmp28_ = NULL;
 	PublishingPiwigoUploader* _tmp29_ = NULL;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = strip_metadata;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->strip_metadata = _tmp0_;
+#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:836: ACTION: uploading pictures");
 #line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:838: ACTION: uploading pictures");
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->parameters;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _tmp2_->category;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_->id;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_last_category (self, _tmp4_);
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->parameters;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = _tmp5_->perm_level;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _tmp6_->id;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_last_permission_level (self, _tmp7_);
-#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = self->priv->parameters;
-#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = _tmp8_->photo_size;
-#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = _tmp9_->id;
-#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_last_photo_size (self, _tmp10_);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = self->priv->parameters;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = _tmp11_->title_as_comment;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_last_title_as_comment (self, _tmp12_);
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = self->priv->parameters;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = _tmp13_->no_upload_tags;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_last_no_upload_tags (self, _tmp14_);
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = strip_metadata;
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_set_metadata_removal_choice (self, _tmp15_);
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = self->priv->host;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp17_ = self->priv->parameters;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = _tmp17_->photo_size;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = _tmp18_->id;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp20_ = self->priv->strip_metadata;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp23_ = spit_publishing_plugin_host_serialize_publishables (_tmp16_, _tmp19_, _tmp20_, &_tmp21_, &_tmp22_);
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter = _tmp23_;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter_target = _tmp21_;
-#line 849 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp22_;
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp24_ = self->priv->host;
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp26_ = spit_publishing_plugin_host_get_publishables (_tmp24_, &_tmp25_);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables = _tmp26_;
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables_length1 = _tmp25_;
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp27_ = self->priv->session;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp28_ = self->priv->parameters;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp29_ = publishing_piwigo_uploader_new (_tmp27_, publishables, publishables_length1, _tmp28_);
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	uploader = _tmp29_;
-#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 853 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_piwigo_piwigo_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 6233 "PiwigoPublishing.c"
+#line 6231 "PiwigoPublishing.c"
 }
 
 
@@ -6251,27 +6249,27 @@ static void publishing_piwigo_piwigo_publisher_on_upload_complete (PublishingPiw
 	guint _tmp1_ = 0U;
 	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:863: EVENT: on_upload_complete");
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:861: EVENT: on_upload_complete");
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = uploader;
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = uploader;
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_success_pane (self);
-#line 6266 "PiwigoPublishing.c"
+#line 6264 "PiwigoPublishing.c"
 }
 
 
@@ -6285,29 +6283,29 @@ static void publishing_piwigo_piwigo_publisher_on_upload_error (PublishingPiwigo
 	PublishingRESTSupportBatchUploader* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	GError* _tmp4_ = NULL;
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:880: EVENT: on_upload_error");
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:878: EVENT: on_upload_error");
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = uploader;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = uploader;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_piwigo_piwigo_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = err;
-#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp4_);
-#line 6302 "PiwigoPublishing.c"
+#line 6300 "PiwigoPublishing.c"
 }
 
 
@@ -6323,38 +6321,38 @@ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (Publish
 	void* _tmp3__target = NULL;
 	gint _tmp4_ = 0;
 	gdouble _tmp5_ = 0.0;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp0_) {
-#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 6326 "PiwigoPublishing.c"
+#line 6324 "PiwigoPublishing.c"
 	}
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = completed_fraction;
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:894: EVENT: uploader reports upload %.2f percent" \
+#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:892: EVENT: uploader reports upload %.2f percent" \
 " complete.", 100.0 * _tmp1_);
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->progress_reporter;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2__target = self->priv->progress_reporter_target;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3__target = self->priv->progress_reporter_target;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = file_number;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = completed_fraction;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 6348 "PiwigoPublishing.c"
+#line 6346 "PiwigoPublishing.c"
 }
 
 
@@ -6364,19 +6362,19 @@ static void publishing_piwigo_piwigo_publisher_on_upload_status_updated (Publish
 static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingPiwigoPiwigoPublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
+#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:903: ACTION: installing success pane");
 #line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:905: ACTION: installing success pane");
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 6370 "PiwigoPublishing.c"
+#line 6368 "PiwigoPublishing.c"
 }
 
 
@@ -6385,17 +6383,17 @@ static void publishing_piwigo_piwigo_publisher_do_show_success_pane (PublishingP
      */
 static void publishing_piwigo_piwigo_publisher_on_network_error (PublishingPiwigoPiwigoPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
 	GError* _tmp0_ = NULL;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:918: EVENT: on_network_error");
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:916: EVENT: on_network_error");
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = err;
-#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_error (self, _tmp0_);
-#line 6389 "PiwigoPublishing.c"
+#line 6387 "PiwigoPublishing.c"
 }
 
 
@@ -6412,130 +6410,130 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
 	gchar* _tmp19_ = NULL;
 	gchar* _tmp20_ = NULL;
 	const gchar* _tmp21_ = NULL;
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:926: ACTION: do_show_error");
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:924: ACTION: do_show_error");
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = g_strdup ("UNKNOWN");
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	error_type = _tmp0_;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = e;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_error_matches (_tmp1_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER)) {
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_piwigo_piwigo_publisher_do_show_authentication_pane (self, PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (error_type);
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return;
-#line 6424 "PiwigoPublishing.c"
+#line 6422 "PiwigoPublishing.c"
 	} else {
 		GError* _tmp2_ = NULL;
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp2_ = e;
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (g_error_matches (_tmp2_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_COMMUNICATION_FAILED)) {
-#line 6431 "PiwigoPublishing.c"
+#line 6429 "PiwigoPublishing.c"
 			gchar* _tmp3_ = NULL;
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp3_ = g_strdup ("COMMUNICATION_FAILED");
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (error_type);
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			error_type = _tmp3_;
-#line 6439 "PiwigoPublishing.c"
+#line 6437 "PiwigoPublishing.c"
 		} else {
 			GError* _tmp4_ = NULL;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp4_ = e;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (g_error_matches (_tmp4_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR)) {
-#line 6446 "PiwigoPublishing.c"
+#line 6444 "PiwigoPublishing.c"
 				gchar* _tmp5_ = NULL;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp5_ = g_strdup ("PROTOCOL_ERROR");
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (error_type);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				error_type = _tmp5_;
-#line 6454 "PiwigoPublishing.c"
+#line 6452 "PiwigoPublishing.c"
 			} else {
 				GError* _tmp6_ = NULL;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = e;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (g_error_matches (_tmp6_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR)) {
-#line 6461 "PiwigoPublishing.c"
+#line 6459 "PiwigoPublishing.c"
 					gchar* _tmp7_ = NULL;
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp7_ = g_strdup ("SERVICE_ERROR");
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (error_type);
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					error_type = _tmp7_;
-#line 6469 "PiwigoPublishing.c"
+#line 6467 "PiwigoPublishing.c"
 				} else {
 					GError* _tmp8_ = NULL;
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp8_ = e;
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (g_error_matches (_tmp8_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE)) {
-#line 6476 "PiwigoPublishing.c"
+#line 6474 "PiwigoPublishing.c"
 						gchar* _tmp9_ = NULL;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp9_ = g_strdup ("MALFORMED_RESPONSE");
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_free0 (error_type);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						error_type = _tmp9_;
-#line 6484 "PiwigoPublishing.c"
+#line 6482 "PiwigoPublishing.c"
 					} else {
 						GError* _tmp10_ = NULL;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp10_ = e;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						if (g_error_matches (_tmp10_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR)) {
-#line 6491 "PiwigoPublishing.c"
+#line 6489 "PiwigoPublishing.c"
 							gchar* _tmp11_ = NULL;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_tmp11_ = g_strdup ("LOCAL_FILE_ERROR");
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_free0 (error_type);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							error_type = _tmp11_;
-#line 6499 "PiwigoPublishing.c"
+#line 6497 "PiwigoPublishing.c"
 						} else {
 							GError* _tmp12_ = NULL;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_tmp12_ = e;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							if (g_error_matches (_tmp12_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
-#line 6506 "PiwigoPublishing.c"
+#line 6504 "PiwigoPublishing.c"
 								gchar* _tmp13_ = NULL;
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp13_ = g_strdup ("EXPIRED_SESSION");
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_g_free0 (error_type);
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								error_type = _tmp13_;
-#line 6514 "PiwigoPublishing.c"
+#line 6512 "PiwigoPublishing.c"
 							} else {
 								GError* _tmp14_ = NULL;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								_tmp14_ = e;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 								if (g_error_matches (_tmp14_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED)) {
-#line 6521 "PiwigoPublishing.c"
+#line 6519 "PiwigoPublishing.c"
 									gchar* _tmp15_ = NULL;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									_tmp15_ = g_strdup ("SECURE_CONNECTION_FAILED");
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									_g_free0 (error_type);
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 									error_type = _tmp15_;
-#line 6529 "PiwigoPublishing.c"
+#line 6527 "PiwigoPublishing.c"
 								}
 							}
 						}
@@ -6544,27 +6542,27 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
 			}
 		}
 	}
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = error_type;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp17_ = e;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = _tmp17_->message;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = g_strdup_printf ("Unhandled error: type=%s; message='%s'", _tmp16_, _tmp18_);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp20_ = _tmp19_;
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:947: %s", _tmp20_);
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:945: %s", _tmp20_);
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp20_);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = _ ("An error message occurred when publishing to Piwigo. Please try again.");
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_do_show_error_message (self, _tmp21_);
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (error_type);
-#line 6558 "PiwigoPublishing.c"
+#line 6556 "PiwigoPublishing.c"
 }
 
 
@@ -6574,19 +6572,19 @@ static void publishing_piwigo_piwigo_publisher_do_show_error (PublishingPiwigoPi
 static void publishing_piwigo_piwigo_publisher_do_show_error_message (PublishingPiwigoPiwigoPublisher* self, const gchar* message) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self));
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (message != NULL);
-#line 955 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:955: ACTION: do_show_error_message");
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:953: ACTION: do_show_error_message");
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = message;
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp0_, _tmp1_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CLOSE);
-#line 6580 "PiwigoPublishing.c"
+#line 6578 "PiwigoPublishing.c"
 }
 
 
@@ -6600,39 +6598,39 @@ static void publishing_piwigo_piwigo_publisher_do_show_error_message (Publishing
      * @return the value of pwg_id if present or null if not found
      */
 static SoupCookie* _vala_SoupCookie_copy (SoupCookie* self) {
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return g_boxed_copy (soup_cookie_get_type (), self);
-#line 6596 "PiwigoPublishing.c"
+#line 6594 "PiwigoPublishing.c"
 }
 
 
 static gpointer __vala_SoupCookie_copy0 (gpointer self) {
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? _vala_SoupCookie_copy (self) : NULL;
-#line 6603 "PiwigoPublishing.c"
+#line 6601 "PiwigoPublishing.c"
 }
 
 
 static void _vala_SoupCookie_free (SoupCookie* self) {
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_boxed_free (soup_cookie_get_type (), self);
-#line 6610 "PiwigoPublishing.c"
+#line 6608 "PiwigoPublishing.c"
 }
 
 
 static void __vala_SoupCookie_free0_ (gpointer var) {
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(var == NULL) ? NULL : (var = (_vala_SoupCookie_free (var), NULL));
-#line 6617 "PiwigoPublishing.c"
+#line 6615 "PiwigoPublishing.c"
 }
 
 
 static void _g_slist_free___vala_SoupCookie_free0_ (GSList* self) {
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_slist_foreach (self, (GFunc) __vala_SoupCookie_free0_, NULL);
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_slist_free (self);
-#line 6626 "PiwigoPublishing.c"
+#line 6624 "PiwigoPublishing.c"
 }
 
 
@@ -6644,159 +6642,159 @@ static gchar* publishing_piwigo_piwigo_publisher_get_pwg_id_from_transaction (Pu
 	SoupMessage* _tmp2_ = NULL;
 	GSList* _tmp3_ = NULL;
 	GSList* _tmp4_ = NULL;
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (self), NULL);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn), NULL);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	pwg_id = NULL;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = txn;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_message (_tmp0_);
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = soup_cookies_from_response (_tmp2_);
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (_tmp2_);
-#line 6656 "PiwigoPublishing.c"
+#line 6654 "PiwigoPublishing.c"
 	{
 		GSList* cookie_collection = NULL;
 		GSList* cookie_it = NULL;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		cookie_collection = _tmp4_;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (cookie_it = cookie_collection; cookie_it != NULL; cookie_it = cookie_it->next) {
-#line 6664 "PiwigoPublishing.c"
+#line 6662 "PiwigoPublishing.c"
 			SoupCookie* _tmp5_ = NULL;
 			SoupCookie* cookie = NULL;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp5_ = __vala_SoupCookie_copy0 ((SoupCookie*) cookie_it->data);
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			cookie = _tmp5_;
-#line 6671 "PiwigoPublishing.c"
+#line 6669 "PiwigoPublishing.c"
 			{
 				SoupCookie* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = cookie;
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp7_ = soup_cookie_get_name (_tmp6_);
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (g_strcmp0 (_tmp7_, "pwg_id") == 0) {
-#line 6681 "PiwigoPublishing.c"
+#line 6679 "PiwigoPublishing.c"
 					SoupCookie* _tmp8_ = NULL;
 					const gchar* _tmp9_ = NULL;
 					gchar* _tmp10_ = NULL;
 					const gchar* _tmp11_ = NULL;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp8_ = cookie;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp9_ = soup_cookie_get_value (_tmp8_);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp10_ = g_strdup (_tmp9_);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (pwg_id);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					pwg_id = _tmp10_;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp11_ = pwg_id;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					g_debug ("PiwigoPublishing.vala:979: Found pwg_id %s", _tmp11_);
-#line 6700 "PiwigoPublishing.c"
+#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					g_debug ("PiwigoPublishing.vala:977: Found pwg_id %s", _tmp11_);
+#line 6698 "PiwigoPublishing.c"
 				}
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				__vala_SoupCookie_free0 (cookie);
-#line 6704 "PiwigoPublishing.c"
+#line 6702 "PiwigoPublishing.c"
 			}
 		}
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		__g_slist_free___vala_SoupCookie_free0_0 (cookie_collection);
-#line 6709 "PiwigoPublishing.c"
+#line 6707 "PiwigoPublishing.c"
 	}
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = pwg_id;
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 6715 "PiwigoPublishing.c"
+#line 6713 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_class_init (PublishingPiwigoPiwigoPublisherClass * klass) {
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoPiwigoPublisherPrivate));
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_piwigo_publisher_finalize;
-#line 6726 "PiwigoPublishing.c"
+#line 6724 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_piwigo_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_get_service;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_is_running;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_start;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_piwigo_piwigo_publisher_real_stop;
-#line 6741 "PiwigoPublishing.c"
+#line 6739 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_instance_init (PublishingPiwigoPiwigoPublisher * self) {
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_PIWIGO_PUBLISHER_GET_PRIVATE (self);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->running = FALSE;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->strip_metadata = FALSE;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->categories = NULL;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->categories_length1 = 0;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->_categories_size_ = self->priv->categories_length1;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->parameters = NULL;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 6762 "PiwigoPublishing.c"
+#line 6760 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_piwigo_publisher_finalize (GObject* obj) {
 	PublishingPiwigoPiwigoPublisher * self;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, PublishingPiwigoPiwigoPublisher);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->service);
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->host);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->categories = (_vala_array_free (self->priv->categories, self->priv->categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_piwigo_publisher_parent_class)->finalize (obj);
-#line 6790 "PiwigoPublishing.c"
+#line 6788 "PiwigoPublishing.c"
 }
 
 
@@ -6821,36 +6819,36 @@ PublishingPiwigoUploader* publishing_piwigo_uploader_construct (GType object_typ
 	gint _tmp1__length1 = 0;
 	PublishingPiwigoPublishingParameters* _tmp2_ = NULL;
 	PublishingPiwigoPublishingParameters* _tmp3_ = NULL;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishables;
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = parameters;
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp2_);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 6837 "PiwigoPublishing.c"
+#line 6835 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoUploader* publishing_piwigo_uploader_new (PublishingPiwigoSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPiwigoPublishingParameters* parameters) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_uploader_construct (PUBLISHING_PIWIGO_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 6844 "PiwigoPublishing.c"
+#line 6842 "PiwigoPublishing.c"
 }
 
 
@@ -6863,61 +6861,61 @@ static PublishingRESTSupportTransaction* publishing_piwigo_uploader_real_create_
 	SpitPublishingPublishable* _tmp3_ = NULL;
 	PublishingPiwigoImagesAddTransaction* _tmp4_ = NULL;
 	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->parameters;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishable;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = publishing_piwigo_images_add_transaction_new (_tmp1_, _tmp2_, _tmp3_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp5_;
-#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 6879 "PiwigoPublishing.c"
+#line 6877 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_uploader_class_init (PublishingPiwigoUploaderClass * klass) {
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_piwigo_uploader_finalize;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoUploaderPrivate));
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_piwigo_uploader_real_create_transaction;
-#line 6892 "PiwigoPublishing.c"
+#line 6890 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_uploader_instance_init (PublishingPiwigoUploader * self) {
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_UPLOADER_GET_PRIVATE (self);
-#line 6899 "PiwigoPublishing.c"
+#line 6897 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingPiwigoUploader * self;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_UPLOADER, PublishingPiwigoUploader);
-#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_piwigo_uploader_parent_class)->finalize (obj);
-#line 6911 "PiwigoPublishing.c"
+#line 6909 "PiwigoPublishing.c"
 }
 
 
@@ -6933,37 +6931,50 @@ GType publishing_piwigo_uploader_get_type (void) {
 }
 
 
-static Block1Data* block1_data_ref (Block1Data* _data1_) {
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_atomic_int_inc (&_data1_->_ref_count_);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return _data1_;
-#line 6932 "PiwigoPublishing.c"
-}
-
-
-static void block1_data_unref (void * _userdata_) {
-	Block1Data* _data1_;
-	_data1_ = (Block1Data*) _userdata_;
+PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
+	PublishingPiwigoSSLErrorPane * self = NULL;
+	GTlsCertificate* cert = NULL;
+	gchar* text = NULL;
+	PublishingPiwigoSessionLoginTransaction* _tmp0_ = NULL;
+	GTlsCertificate* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION_LOGIN_TRANSACTION (transaction), NULL);
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (host != NULL, NULL);
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 6941 "PiwigoPublishing.c"
-		PublishingPiwigoSSLErrorPane* self;
+	_tmp0_ = transaction;
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self = _data1_->self;
+	_tmp2_ = publishing_rest_support_transaction_detailed_error_from_tls_flags (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp1_);
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (_data1_->cert);
+	_g_object_unref0 (cert);
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self);
+	cert = _tmp1_;
 #line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_slice_free (Block1Data, _data1_);
-#line 6951 "PiwigoPublishing.c"
-	}
+	text = _tmp2_;
+#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp3_ = host;
+#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self = (PublishingPiwigoSSLErrorPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_ssl_failure_pane.ui", "default-id", "default", "cert", cert, "error-text", text, "host", _tmp3_, NULL);
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (text);
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (cert);
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return self;
+#line 6957 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return publishing_piwigo_ssl_error_pane_construct (PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, transaction, host);
+#line 6964 "PiwigoPublishing.c"
 }
 
 
-static void ___lambda4_ (Block1Data* _data1_) {
-	PublishingPiwigoSSLErrorPane* self;
+static void __lambda4_ (PublishingPiwigoSSLErrorPane* self) {
 	GcrSimpleCertificate* simple_cert = NULL;
 	GTlsCertificate* _tmp0_ = NULL;
 	GByteArray* _tmp1_ = NULL;
@@ -6974,450 +6985,449 @@ static void ___lambda4_ (Block1Data* _data1_) {
 	GcrSimpleCertificate* _tmp5_ = NULL;
 	GcrSimpleCertificate* _tmp6_ = NULL;
 	GcrCertificateWidget* widget = NULL;
-	GcrCertificateWidget* _tmp7_ = NULL;
+	GcrSimpleCertificate* _tmp7_ = NULL;
+	GcrCertificateWidget* _tmp8_ = NULL;
+	gboolean use_header = FALSE;
+	GtkSettings* _tmp9_ = NULL;
+	GtkDialogFlags flags = 0;
+	gboolean _tmp10_ = FALSE;
 	GtkDialog* dialog = NULL;
-	GtkDialog* _tmp8_ = NULL;
-	GtkBox* _tmp9_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = _data1_->self;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = _data1_->cert;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	const gchar* _tmp12_ = NULL;
+	gchar* _tmp13_ = NULL;
+	gchar* _tmp14_ = NULL;
+	gchar* _tmp15_ = NULL;
+	gchar* _tmp16_ = NULL;
+	gchar* _tmp17_ = NULL;
+	GtkDialogFlags _tmp18_ = 0;
+	const gchar* _tmp19_ = NULL;
+	GtkDialog* _tmp20_ = NULL;
+	GtkDialog* _tmp21_ = NULL;
+	GtkBox* _tmp22_ = NULL;
+	GcrCertificateWidget* _tmp23_ = NULL;
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_cert;
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_object_get (_tmp0_, "certificate", &_tmp1_, NULL);
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_->data;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4__length1 = (gint) _tmp3_->len;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = (GcrSimpleCertificate*) gcr_simple_certificate_new (_tmp4_, _tmp4__length1);
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_byte_array_unref0 (_tmp3_);
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	simple_cert = _tmp6_;
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = gcr_certificate_widget_new (G_TYPE_CHECK_INSTANCE_CAST (simple_cert, gcr_certificate_get_type (), GcrCertificate));
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_ref_sink (_tmp7_);
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	widget = _tmp7_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = (GtkDialog*) gtk_dialog_new ();
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp7_ = simple_cert;
+#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp8_ = gcr_certificate_widget_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gcr_certificate_get_type (), GcrCertificate));
+#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_object_ref_sink (_tmp8_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	dialog = _tmp8_;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp9_ = (GtkBox*) gtk_dialog_get_content_area (dialog);
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (widget, gtk_widget_get_type (), GtkWidget));
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_dialog_add_button (dialog, "_OK", (gint) GTK_RESPONSE_OK);
 #line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_dialog_set_default_response (dialog, (gint) GTK_RESPONSE_OK);
+	widget = _tmp8_;
 #line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), 640, -1);
+	use_header = TRUE;
 #line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
+	_tmp9_ = gtk_settings_get_default ();
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
 #line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_dialog_run (dialog);
+	flags = (GtkDialogFlags) 0;
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp10_ = use_header;
 #line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp10_) {
+#line 7038 "PiwigoPublishing.c"
+		GtkDialogFlags _tmp11_ = 0;
+#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp11_ = flags;
+#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		flags = _tmp11_ | GTK_DIALOG_USE_HEADER_BAR;
+#line 7044 "PiwigoPublishing.c"
+	}
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp12_ = _ ("Certificate of %s");
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp13_ = publishing_piwigo_ssl_error_pane_get_host (self);
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp14_ = _tmp13_;
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp15_ = _tmp14_;
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp16_ = g_strdup_printf (_tmp12_, _tmp15_);
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp17_ = _tmp16_;
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp18_ = flags;
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp19_ = _ ("_OK");
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp20_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp17_, NULL, _tmp18_, _tmp19_, GTK_RESPONSE_OK, NULL);
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_ref_sink (_tmp20_);
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp21_ = _tmp20_;
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp17_);
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp15_);
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	dialog = _tmp21_;
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp22_ = (GtkBox*) gtk_dialog_get_content_area (dialog);
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp23_ = widget;
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
+#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_dialog_set_default_response (dialog, (gint) GTK_RESPONSE_OK);
+#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), 640, -1);
+#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_dialog_run (dialog);
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (dialog);
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (widget);
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (simple_cert);
-#line 7028 "PiwigoPublishing.c"
+#line 7096 "PiwigoPublishing.c"
 }
 
 
-static void ____lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	___lambda4_ (self);
-#line 7035 "PiwigoPublishing.c"
+static void ___lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	__lambda4_ ((PublishingPiwigoSSLErrorPane*) self);
+#line 7103 "PiwigoPublishing.c"
 }
 
 
-static void ___lambda5_ (PublishingPiwigoSSLErrorPane* self) {
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_emit_by_name (self, "proceed");
-#line 7042 "PiwigoPublishing.c"
+#line 7110 "PiwigoPublishing.c"
 }
 
 
-static void ____lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	___lambda5_ ((PublishingPiwigoSSLErrorPane*) self);
-#line 7049 "PiwigoPublishing.c"
+static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	__lambda5_ ((PublishingPiwigoSSLErrorPane*) self);
+#line 7117 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
-	PublishingPiwigoSSLErrorPane * self = NULL;
-	GError * _inner_error_ = NULL;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION_LOGIN_TRANSACTION (transaction), NULL);
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_return_val_if_fail (host != NULL, NULL);
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoSSLErrorPane*) g_object_new (object_type, NULL);
-#line 7062 "PiwigoPublishing.c"
-	{
-		Block1Data* _data1_;
-		GtkBuilder* _tmp0_ = NULL;
-		GtkBuilder* _tmp1_ = NULL;
-		GtkBuilder* _tmp2_ = NULL;
-		GObject* _tmp3_ = NULL;
-		GtkWidget* _tmp4_ = NULL;
-		GtkLabel* label = NULL;
-		GtkBuilder* _tmp5_ = NULL;
-		GObject* _tmp6_ = NULL;
-		GtkLabel* _tmp7_ = NULL;
-		GtkLabel* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		GtkLabel* _tmp13_ = NULL;
-		GtkBuilder* _tmp14_ = NULL;
-		GObject* _tmp15_ = NULL;
-		GtkLabel* _tmp16_ = NULL;
-		gchar* text = NULL;
-		PublishingPiwigoSessionLoginTransaction* _tmp17_ = NULL;
-		GTlsCertificate* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		GtkLabel* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		GtkButton* info = NULL;
-		GtkBuilder* _tmp22_ = NULL;
-		GObject* _tmp23_ = NULL;
-		GtkButton* _tmp24_ = NULL;
-		GtkButton* _tmp25_ = NULL;
-		GtkButton* proceed = NULL;
-		GtkBuilder* _tmp26_ = NULL;
-		GObject* _tmp27_ = NULL;
-		GtkButton* _tmp28_ = NULL;
-		GtkButton* _tmp29_ = NULL;
-		GtkWidget* _tmp30_ = NULL;
-		GtkContainer* _tmp31_ = NULL;
-		GtkContainer* _tmp32_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_data1_ = g_slice_new0 (Block1Data);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_data1_->_ref_count_ = 1;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_data1_->self = g_object_ref (self);
-#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = gtk_builder_new ();
-#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->builder);
-#line 1018 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->builder = _tmp0_;
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp1_ = self->priv->builder;
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/piwigo_ssl_failure_pane.ui", &_inner_error_);
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			block1_data_unref (_data1_);
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_data1_ = NULL;
-#line 7124 "PiwigoPublishing.c"
-			goto __catch44_g_error;
-		}
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp2_ = self->priv->builder;
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp3_ = gtk_builder_get_object (_tmp2_, "content");
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp3_) : NULL);
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->content);
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->content = _tmp4_;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp5_ = self->priv->builder;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp6_ = gtk_builder_get_object (_tmp5_, "main_text");
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp6_) : NULL);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		label = _tmp7_;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = label;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = _ ("This does not look like the real <b>%s</b>. Attackers might be trying " \
-"to steal or alter information going to or from this site (for example," \
-" private messages, credit card information, or passwords).");
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = host;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp11_ = g_strdup_printf (_tmp9_, _tmp10_);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp12_ = _tmp11_;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_label_set_text (_tmp8_, _tmp12_);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (_tmp12_);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp13_ = label;
+static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
+	PublishingPiwigoSSLErrorPane * self;
+	GtkLabel* label = NULL;
+	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp1_ = NULL;
+	GObject* _tmp2_ = NULL;
+	GtkLabel* _tmp3_ = NULL;
+	GtkLabel* _tmp4_ = NULL;
+	GtkLabel* _tmp5_ = NULL;
+	const gchar* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+	GtkLabel* _tmp12_ = NULL;
+	GtkBuilder* _tmp13_ = NULL;
+	GtkBuilder* _tmp14_ = NULL;
+	GObject* _tmp15_ = NULL;
+	GtkLabel* _tmp16_ = NULL;
+	GtkLabel* _tmp17_ = NULL;
+	gchar* _tmp18_ = NULL;
+	gchar* _tmp19_ = NULL;
+	gchar* _tmp20_ = NULL;
+	GtkButton* info = NULL;
+	GtkBuilder* _tmp21_ = NULL;
+	GtkBuilder* _tmp22_ = NULL;
+	GObject* _tmp23_ = NULL;
+	GtkButton* _tmp24_ = NULL;
+	GtkButton* _tmp25_ = NULL;
+	GtkButton* proceed = NULL;
+	GtkBuilder* _tmp26_ = NULL;
+	GtkBuilder* _tmp27_ = NULL;
+	GObject* _tmp28_ = NULL;
+	GtkButton* _tmp29_ = NULL;
+	GtkButton* _tmp30_ = NULL;
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_label_set_use_markup (_tmp13_, TRUE);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp14_ = self->priv->builder;
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp15_ = gtk_builder_get_object (_tmp14_, "ssl_errors");
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp15_) : NULL);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (label);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		label = _tmp16_;
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	G_OBJECT_CLASS (publishing_piwigo_ssl_error_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane), G_TYPE_OBJECT, GObject));
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp17_ = transaction;
+	_tmp0_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp19_ = publishing_rest_support_transaction_detailed_error_from_tls_flags (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp18_);
+	_tmp1_ = _tmp0_;
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (_data1_->cert);
+	_tmp2_ = gtk_builder_get_object (_tmp1_, "main_text");
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_data1_->cert = _tmp18_;
+	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp2_) : NULL);
 #line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		text = _tmp19_;
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp20_ = label;
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp21_ = text;
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_label_set_text (_tmp20_, _tmp21_);
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp22_ = self->priv->builder;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp23_ = gtk_builder_get_object (_tmp22_, "default");
+	_tmp4_ = _tmp3_;
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (_tmp1_);
+#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	label = _tmp4_;
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp5_ = label;
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp6_ = _ ("This does not look like the real <b>%s</b>. Attackers might be trying " \
+"to steal or alter information going to or from this site (for example," \
+" private messages, credit card information, or passwords).");
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp7_ = publishing_piwigo_ssl_error_pane_get_host (self);
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp8_ = _tmp7_;
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp9_ = _tmp8_;
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp10_ = g_strdup_printf (_tmp6_, _tmp9_);
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp11_ = _tmp10_;
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_label_set_text (_tmp5_, _tmp11_);
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp11_);
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp9_);
 #line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_button_get_type ()) ? ((GtkButton*) _tmp23_) : NULL);
+	_tmp12_ = label;
 #line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		info = _tmp24_;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp25_ = info;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_data (_tmp25_, "clicked", (GCallback) ____lambda4__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp26_ = self->priv->builder;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp27_ = gtk_builder_get_object (_tmp26_, "proceed_button");
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, gtk_button_get_type ()) ? ((GtkButton*) _tmp27_) : NULL);
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		proceed = _tmp28_;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp29_ = proceed;
-#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (_tmp29_, "clicked", (GCallback) ____lambda5__gtk_button_clicked, self, 0);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp30_ = self->priv->content;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp31_ = gtk_widget_get_parent (_tmp30_);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp32_ = _tmp31_;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp32_ != NULL) {
-#line 7221 "PiwigoPublishing.c"
-			GtkWidget* _tmp33_ = NULL;
-			GtkContainer* _tmp34_ = NULL;
-			GtkContainer* _tmp35_ = NULL;
-			GtkWidget* _tmp36_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp33_ = self->priv->content;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp34_ = gtk_widget_get_parent (_tmp33_);
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp35_ = _tmp34_;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp36_ = self->priv->content;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			gtk_container_remove (_tmp35_, _tmp36_);
-#line 7236 "PiwigoPublishing.c"
-		}
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (proceed);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (info);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (text);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (label);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		block1_data_unref (_data1_);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_data1_ = NULL;
-#line 7250 "PiwigoPublishing.c"
-	}
-	goto __finally44;
-	__catch44_g_error:
-	{
-		GError* _error_ = NULL;
-		const gchar* _tmp37_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_error_ = _inner_error_;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_inner_error_ = NULL;
-#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp37_ = _error_->message;
-#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_warning ("PiwigoPublishing.vala:1053: Failed to create ui file: %s", _tmp37_);
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_assert_not_reached ();
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_error_free0 (_error_);
-#line 7269 "PiwigoPublishing.c"
-	}
-	__finally44:
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		return NULL;
-#line 7280 "PiwigoPublishing.c"
-	}
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return self;
-#line 7284 "PiwigoPublishing.c"
+	gtk_label_set_use_markup (_tmp12_, TRUE);
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp13_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp14_ = _tmp13_;
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp15_ = gtk_builder_get_object (_tmp14_, "ssl_errors");
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp15_) : NULL);
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (label);
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	label = _tmp16_;
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (_tmp14_);
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp17_ = label;
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp18_ = publishing_piwigo_ssl_error_pane_get_error_text (self);
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp19_ = _tmp18_;
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp20_ = _tmp19_;
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_label_set_text (_tmp17_, _tmp20_);
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp20_);
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp21_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp22_ = _tmp21_;
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp23_ = gtk_builder_get_object (_tmp22_, "default");
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_button_get_type ()) ? ((GtkButton*) _tmp23_) : NULL);
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp25_ = _tmp24_;
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (_tmp22_);
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	info = _tmp25_;
+#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_signal_connect_object (info, "clicked", (GCallback) ___lambda4__gtk_button_clicked, self, 0);
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp26_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp27_ = _tmp26_;
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp28_ = gtk_builder_get_object (_tmp27_, "proceed_button");
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_button_get_type ()) ? ((GtkButton*) _tmp28_) : NULL);
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp30_ = _tmp29_;
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (_tmp27_);
+#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	proceed = _tmp30_;
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_signal_connect_object (proceed, "clicked", (GCallback) ___lambda5__gtk_button_clicked, self, 0);
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (proceed);
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (info);
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (label);
+#line 7263 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host) {
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return publishing_piwigo_ssl_error_pane_construct (PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, transaction, host);
-#line 7291 "PiwigoPublishing.c"
+gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self) {
+	gchar* result;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL);
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_host;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp1_;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 7281 "PiwigoPublishing.c"
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_ssl_error_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingPiwigoSSLErrorPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1058 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return result;
-#line 7304 "PiwigoPublishing.c"
+static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (self->priv->_host);
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_host = _tmp1_;
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "host");
+#line 7300 "PiwigoPublishing.c"
 }
 
 
-static GtkWidget* publishing_piwigo_ssl_error_pane_real_get_widget (SpitPublishingDialogPane* base) {
-	PublishingPiwigoSSLErrorPane * self;
-	GtkWidget* result = NULL;
-	GtkWidget* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = self->priv->content;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self) {
+	GTlsCertificate* result;
+	GTlsCertificate* _tmp0_ = NULL;
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL);
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_cert;
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp0_;
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 7323 "PiwigoPublishing.c"
+#line 7315 "PiwigoPublishing.c"
 }
 
 
-GtkWidget* publishing_piwigo_ssl_error_pane_get_default_widget (PublishingPiwigoSSLErrorPane* self) {
-	GtkWidget* result = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL);
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = self->priv->builder;
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = gtk_builder_get_object (_tmp0_, "default");
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp1_) : NULL);
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp2_;
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return result;
-#line 7344 "PiwigoPublishing.c"
+static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value) {
+	GTlsCertificate* _tmp0_ = NULL;
+	GTlsCertificate* _tmp1_ = NULL;
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->_cert);
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_cert = _tmp1_;
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "cert");
+#line 7334 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_ssl_error_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
-	PublishingPiwigoSSLErrorPane * self;
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self) {
+	gchar* result;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self), NULL);
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_error_text;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp1_;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
 #line 7352 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_ssl_error_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingPiwigoSSLErrorPane * self;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
-#line 7360 "PiwigoPublishing.c"
+static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_SSL_ERROR_PANE (self));
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (self->priv->_error_text);
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_error_text = _tmp1_;
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "error-text");
+#line 7371 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_ssl_error_pane_class_init (PublishingPiwigoSSLErrorPaneClass * klass) {
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_ssl_error_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoSSLErrorPanePrivate));
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	((GObjectClass *) klass)->constructed = publishing_piwigo_ssl_error_pane_real_constructed;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_ssl_error_pane_get_property;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	G_OBJECT_CLASS (klass)->set_property = _vala_publishing_piwigo_ssl_error_pane_set_property;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_ssl_error_pane_finalize;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST, g_param_spec_string ("host", "host", "host", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT, g_param_spec_object ("cert", "cert", "cert", g_tls_certificate_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT, g_param_spec_string ("error-text", "error-text", "error-text", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_new ("proceed", PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 7373 "PiwigoPublishing.c"
-}
-
-
-static void publishing_piwigo_ssl_error_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_ssl_error_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_piwigo_ssl_error_pane_real_get_preferred_geometry;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_piwigo_ssl_error_pane_real_get_widget;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_ssl_error_pane_real_on_pane_installed;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_ssl_error_pane_real_on_pane_uninstalled;
-#line 7388 "PiwigoPublishing.c"
+#line 7396 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_ssl_error_pane_instance_init (PublishingPiwigoSSLErrorPane * self) {
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_SSL_ERROR_PANE_GET_PRIVATE (self);
-#line 7395 "PiwigoPublishing.c"
+#line 7403 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_ssl_error_pane_finalize (GObject* obj) {
 	PublishingPiwigoSSLErrorPane * self;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
 #line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (self->priv->builder);
+	_g_free0 (self->priv->_host);
 #line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (self->priv->content);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->_cert);
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (self->priv->_error_text);
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_ssl_error_pane_parent_class)->finalize (obj);
-#line 7409 "PiwigoPublishing.c"
+#line 7419 "PiwigoPublishing.c"
 }
 
 
@@ -7425,16 +7435,82 @@ GType publishing_piwigo_ssl_error_pane_get_type (void) {
 	static volatile gsize publishing_piwigo_ssl_error_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_ssl_error_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoSSLErrorPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_ssl_error_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoSSLErrorPane), 0, (GInstanceInitFunc) publishing_piwigo_ssl_error_pane_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_piwigo_ssl_error_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
 		GType publishing_piwigo_ssl_error_pane_type_id;
-		publishing_piwigo_ssl_error_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingPiwigoSSLErrorPane", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_piwigo_ssl_error_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+		publishing_piwigo_ssl_error_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, "PublishingPiwigoSSLErrorPane", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_piwigo_ssl_error_pane_type_id__volatile, publishing_piwigo_ssl_error_pane_type_id);
 	}
 	return publishing_piwigo_ssl_error_pane_type_id__volatile;
 }
 
 
+static void _vala_publishing_piwigo_ssl_error_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+	PublishingPiwigoSSLErrorPane * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	switch (property_id) {
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_take_string (value, publishing_piwigo_ssl_error_pane_get_host (self));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_set_object (value, publishing_piwigo_ssl_error_pane_get_cert (self));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_take_string (value, publishing_piwigo_ssl_error_pane_get_error_text (self));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 7458 "PiwigoPublishing.c"
+		default:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 7464 "PiwigoPublishing.c"
+	}
+}
+
+
+static void _vala_publishing_piwigo_ssl_error_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+	PublishingPiwigoSSLErrorPane * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_SSL_ERROR_PANE, PublishingPiwigoSSLErrorPane);
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	switch (property_id) {
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_HOST:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_ssl_error_pane_set_host (self, g_value_get_string (value));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_CERT:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_ssl_error_pane_set_cert (self, g_value_get_object (value));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_SSL_ERROR_PANE_ERROR_TEXT:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_ssl_error_pane_set_error_text (self, g_value_get_string (value));
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 7492 "PiwigoPublishing.c"
+		default:
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 7498 "PiwigoPublishing.c"
+	}
+}
+
+
 GType publishing_piwigo_authentication_pane_mode_get_type (void) {
 	static volatile gsize publishing_piwigo_authentication_pane_mode_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_authentication_pane_mode_type_id__volatile)) {
@@ -7447,444 +7523,361 @@ GType publishing_piwigo_authentication_pane_mode_get_type (void) {
 }
 
 
+PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
+	PublishingPiwigoAuthenticationPane * self = NULL;
+	PublishingPiwigoAuthenticationPaneMode _tmp0_ = 0;
+	PublishingPiwigoPiwigoPublisher* _tmp1_ = NULL;
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = mode;
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = publisher;
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self = (PublishingPiwigoAuthenticationPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_authentication_pane.ui", "connect-signals", TRUE, "default-id", "login_button", "mode", _tmp0_, "publisher", _tmp1_, NULL);
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return self;
+#line 7529 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return publishing_piwigo_authentication_pane_construct (PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, publisher, mode);
+#line 7536 "PiwigoPublishing.c"
+}
+
+
 static void _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_user_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7442 "PiwigoPublishing.c"
+#line 7543 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_url_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7449 "PiwigoPublishing.c"
+#line 7550 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_password_changed ((PublishingPiwigoAuthenticationPane*) self);
-#line 7456 "PiwigoPublishing.c"
+#line 7557 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_on_login_button_clicked ((PublishingPiwigoAuthenticationPane*) self);
-#line 7463 "PiwigoPublishing.c"
+#line 7564 "PiwigoPublishing.c"
 }
 
 
-PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
-	PublishingPiwigoAuthenticationPane * self = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoAuthenticationPane*) g_object_new (object_type, NULL);
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_ref_sink (_tmp0_);
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
+static void publishing_piwigo_authentication_pane_real_constructed (GObject* base) {
+	PublishingPiwigoAuthenticationPane * self;
+	GtkBuilder* builder = NULL;
+	GtkBuilder* _tmp0_ = NULL;
+	GtkLabel* message_label = NULL;
+	GtkBuilder* _tmp1_ = NULL;
+	GObject* _tmp2_ = NULL;
+	GtkLabel* _tmp3_ = NULL;
+	PublishingPiwigoAuthenticationPaneMode _tmp4_ = 0;
+	GtkBuilder* _tmp17_ = NULL;
+	GObject* _tmp18_ = NULL;
+	GtkEntry* _tmp19_ = NULL;
+	gchar* persistent_url = NULL;
+	PublishingPiwigoPiwigoPublisher* _tmp20_ = NULL;
+	gchar* _tmp21_ = NULL;
+	const gchar* _tmp22_ = NULL;
+	GtkBuilder* _tmp25_ = NULL;
+	GObject* _tmp26_ = NULL;
+	GtkEntry* _tmp27_ = NULL;
+	gchar* persistent_username = NULL;
+	PublishingPiwigoPiwigoPublisher* _tmp28_ = NULL;
+	gchar* _tmp29_ = NULL;
+	const gchar* _tmp30_ = NULL;
+	GtkBuilder* _tmp33_ = NULL;
+	GObject* _tmp34_ = NULL;
+	GtkEntry* _tmp35_ = NULL;
+	gchar* persistent_password = NULL;
+	PublishingPiwigoPiwigoPublisher* _tmp36_ = NULL;
+	gchar* _tmp37_ = NULL;
+	const gchar* _tmp38_ = NULL;
+	GtkBuilder* _tmp41_ = NULL;
+	GObject* _tmp42_ = NULL;
+	GtkSwitch* _tmp43_ = NULL;
+	GtkSwitch* _tmp44_ = NULL;
+	PublishingPiwigoPiwigoPublisher* _tmp45_ = NULL;
+	gboolean _tmp46_ = FALSE;
+	GtkBuilder* _tmp47_ = NULL;
+	GObject* _tmp48_ = NULL;
+	GtkButton* _tmp49_ = NULL;
+	GtkEntry* _tmp50_ = NULL;
+	GtkEntry* _tmp51_ = NULL;
+	GtkEntry* _tmp52_ = NULL;
+	GtkButton* _tmp53_ = NULL;
+	PublishingPiwigoPiwigoPublisher* _tmp54_ = NULL;
+	SpitPublishingPluginHost* _tmp55_ = NULL;
+	SpitPublishingPluginHost* _tmp56_ = NULL;
+	GtkButton* _tmp57_ = NULL;
 #line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->pane_widget = _tmp0_;
-#line 7483 "PiwigoPublishing.c"
-	{
-		GtkBuilder* _tmp1_ = NULL;
-		GtkBuilder* _tmp2_ = NULL;
-		GtkBuilder* _tmp3_ = NULL;
-		GtkAlignment* align = NULL;
-		GtkBuilder* _tmp4_ = NULL;
-		GObject* _tmp5_ = NULL;
-		GtkAlignment* _tmp6_ = NULL;
-		GtkLabel* message_label = NULL;
-		GtkBuilder* _tmp7_ = NULL;
-		GObject* _tmp8_ = NULL;
-		GtkLabel* _tmp9_ = NULL;
-		PublishingPiwigoAuthenticationPaneMode _tmp10_ = 0;
-		GtkBuilder* _tmp23_ = NULL;
-		GObject* _tmp24_ = NULL;
-		GtkEntry* _tmp25_ = NULL;
-		gchar* persistent_url = NULL;
-		PublishingPiwigoPiwigoPublisher* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		GtkBuilder* _tmp31_ = NULL;
-		GObject* _tmp32_ = NULL;
-		GtkEntry* _tmp33_ = NULL;
-		gchar* persistent_username = NULL;
-		PublishingPiwigoPiwigoPublisher* _tmp34_ = NULL;
-		gchar* _tmp35_ = NULL;
-		const gchar* _tmp36_ = NULL;
-		GtkBuilder* _tmp39_ = NULL;
-		GObject* _tmp40_ = NULL;
-		GtkEntry* _tmp41_ = NULL;
-		gchar* persistent_password = NULL;
-		PublishingPiwigoPiwigoPublisher* _tmp42_ = NULL;
-		gchar* _tmp43_ = NULL;
-		const gchar* _tmp44_ = NULL;
-		GtkBuilder* _tmp47_ = NULL;
-		GObject* _tmp48_ = NULL;
-		GtkCheckButton* _tmp49_ = NULL;
-		GtkCheckButton* _tmp50_ = NULL;
-		PublishingPiwigoPiwigoPublisher* _tmp51_ = NULL;
-		gboolean _tmp52_ = FALSE;
-		GtkBuilder* _tmp53_ = NULL;
-		GObject* _tmp54_ = NULL;
-		GtkButton* _tmp55_ = NULL;
-		GtkEntry* _tmp56_ = NULL;
-		GtkEntry* _tmp57_ = NULL;
-		GtkEntry* _tmp58_ = NULL;
-		GtkButton* _tmp59_ = NULL;
-		GtkAlignment* _tmp60_ = NULL;
-		GtkBox* _tmp61_ = NULL;
-		PublishingPiwigoPiwigoPublisher* _tmp62_ = NULL;
-		SpitPublishingPluginHost* _tmp63_ = NULL;
-		SpitPublishingPluginHost* _tmp64_ = NULL;
-		GtkButton* _tmp65_ = NULL;
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp1_ = gtk_builder_new ();
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	G_OBJECT_CLASS (publishing_piwigo_authentication_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane), G_TYPE_OBJECT, GObject));
 #line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->builder);
+	_tmp0_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
 #line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->builder = _tmp1_;
+	builder = _tmp0_;
 #line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp2_ = self->priv->builder;
+	_tmp1_ = builder;
 #line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/piwigo_authentication_pane.ui", &_inner_error_);
+	_tmp2_ = gtk_builder_get_object (_tmp1_, "message_label");
 #line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7549 "PiwigoPublishing.c"
-			goto __catch45_g_error;
-		}
+	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp2_) : NULL);
+#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	message_label = _tmp3_;
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp3_ = self->priv->builder;
+	_tmp4_ = self->priv->_mode;
 #line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_builder_connect_signals (_tmp3_, NULL);
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp4_ = self->priv->builder;
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp5_ = gtk_builder_get_object (_tmp4_, "alignment");
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp5_) : NULL);
-#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		align = _tmp6_;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = self->priv->builder;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = gtk_builder_get_object (_tmp7_, "message_label");
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
+	switch (_tmp4_) {
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO:
+#line 7637 "PiwigoPublishing.c"
+		{
+			GtkLabel* _tmp5_ = NULL;
+			const gchar* _tmp6_ = NULL;
+#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp5_ = message_label;
+#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp6_ = publishing_piwigo_authentication_pane_INTRO_MESSAGE;
+#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			gtk_label_set_text (_tmp5_, _tmp6_);
 #line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		message_label = _tmp9_;
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = mode;
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		switch (_tmp10_) {
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_INTRO:
-#line 7578 "PiwigoPublishing.c"
-			{
-				GtkLabel* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
+			break;
+#line 7649 "PiwigoPublishing.c"
+		}
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL:
+#line 7653 "PiwigoPublishing.c"
+		{
+			GtkLabel* _tmp7_ = NULL;
+			const gchar* _tmp8_ = NULL;
+			const gchar* _tmp9_ = NULL;
+			gchar* _tmp10_ = NULL;
+			gchar* _tmp11_ = NULL;
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp11_ = message_label;
+			_tmp7_ = message_label;
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp12_ = publishing_piwigo_authentication_pane_INTRO_MESSAGE;
+			_tmp8_ = _ ("Invalid URL");
 #line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				gtk_label_set_text (_tmp11_, _tmp12_);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				break;
-#line 7590 "PiwigoPublishing.c"
-			}
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_URL:
-#line 7594 "PiwigoPublishing.c"
-			{
-				GtkLabel* _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				const gchar* _tmp15_ = NULL;
-				gchar* _tmp16_ = NULL;
-				gchar* _tmp17_ = NULL;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp13_ = message_label;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp14_ = _ ("Invalid URL");
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp15_ = publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp16_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp14_, _tmp15_);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp17_ = _tmp16_;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				gtk_label_set_markup (_tmp13_, _tmp17_);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_g_free0 (_tmp17_);
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				break;
-#line 7617 "PiwigoPublishing.c"
-			}
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
-#line 7621 "PiwigoPublishing.c"
-			{
-				GtkLabel* _tmp18_ = NULL;
-				const gchar* _tmp19_ = NULL;
-				const gchar* _tmp20_ = NULL;
-				gchar* _tmp21_ = NULL;
-				gchar* _tmp22_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp18_ = message_label;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp19_ = _ ("Invalid User Name or Password");
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp20_ = publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp21_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp19_, _tmp20_);
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp22_ = _tmp21_;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				gtk_label_set_markup (_tmp18_, _tmp22_);
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_g_free0 (_tmp22_);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				break;
-#line 7644 "PiwigoPublishing.c"
-			}
-			default:
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp9_ = publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE;
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp10_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp8_, _tmp9_);
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp11_ = _tmp10_;
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			gtk_label_set_markup (_tmp7_, _tmp11_);
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_g_free0 (_tmp11_);
+#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			break;
-#line 7649 "PiwigoPublishing.c"
+#line 7676 "PiwigoPublishing.c"
 		}
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp23_ = self->priv->builder;
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp24_ = gtk_builder_get_object (_tmp23_, "url_entry");
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp24_) : NULL);
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->url_entry);
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->url_entry = _tmp25_;
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE_FAILED_RETRY_USER:
+#line 7680 "PiwigoPublishing.c"
+		{
+			GtkLabel* _tmp12_ = NULL;
+			const gchar* _tmp13_ = NULL;
+			const gchar* _tmp14_ = NULL;
+			gchar* _tmp15_ = NULL;
+			gchar* _tmp16_ = NULL;
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp12_ = message_label;
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp13_ = _ ("Invalid User Name or Password");
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp14_ = publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE;
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp15_ = g_strdup_printf ("<b>%s</b>\n\n%s", _tmp13_, _tmp14_);
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp16_ = _tmp15_;
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			gtk_label_set_markup (_tmp12_, _tmp16_);
+#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_g_free0 (_tmp16_);
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			break;
+#line 7703 "PiwigoPublishing.c"
+		}
+		default:
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 7708 "PiwigoPublishing.c"
+	}
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp17_ = builder;
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp18_ = gtk_builder_get_object (_tmp17_, "url_entry");
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp18_) : NULL);
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->url_entry);
+#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->url_entry = _tmp19_;
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp20_ = self->priv->_publisher;
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp21_ = publishing_piwigo_piwigo_publisher_get_persistent_url (_tmp20_);
+#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	persistent_url = _tmp21_;
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp22_ = persistent_url;
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp22_ != NULL) {
+#line 7730 "PiwigoPublishing.c"
+		GtkEntry* _tmp23_ = NULL;
+		const gchar* _tmp24_ = NULL;
+#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp23_ = self->priv->url_entry;
+#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp24_ = persistent_url;
+#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_entry_set_text (_tmp23_, _tmp24_);
+#line 7739 "PiwigoPublishing.c"
+	}
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp25_ = builder;
 #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp26_ = publisher;
+	_tmp26_ = gtk_builder_get_object (_tmp25_, "username_entry");
 #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp27_ = publishing_piwigo_piwigo_publisher_get_persistent_url (_tmp26_);
+	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp26_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp26_) : NULL);
 #line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		persistent_url = _tmp27_;
+	_g_object_unref0 (self->priv->username_entry);
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->username_entry = _tmp27_;
 #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp28_ = persistent_url;
+	_tmp28_ = self->priv->_publisher;
 #line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp28_ != NULL) {
-#line 7671 "PiwigoPublishing.c"
-			GtkEntry* _tmp29_ = NULL;
-			const gchar* _tmp30_ = NULL;
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp29_ = self->priv->url_entry;
+	_tmp29_ = publishing_piwigo_piwigo_publisher_get_persistent_username (_tmp28_);
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	persistent_username = _tmp29_;
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp30_ = persistent_url;
+	_tmp30_ = persistent_username;
 #line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			gtk_entry_set_text (_tmp29_, _tmp30_);
-#line 7680 "PiwigoPublishing.c"
-		}
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp31_ = self->priv->builder;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp32_ = gtk_builder_get_object (_tmp31_, "username_entry");
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp32_) : NULL);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->username_entry);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->username_entry = _tmp33_;
+	if (_tmp30_ != NULL) {
+#line 7761 "PiwigoPublishing.c"
+		GtkEntry* _tmp31_ = NULL;
+		const gchar* _tmp32_ = NULL;
+#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp31_ = self->priv->username_entry;
+#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp32_ = persistent_username;
+#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_entry_set_text (_tmp31_, _tmp32_);
+#line 7770 "PiwigoPublishing.c"
+	}
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp33_ = builder;
+#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp34_ = gtk_builder_get_object (_tmp33_, "password_entry");
 #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp34_ = publisher;
+	_tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp34_) : NULL);
 #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp35_ = publishing_piwigo_piwigo_publisher_get_persistent_username (_tmp34_);
+	_g_object_unref0 (self->priv->password_entry);
 #line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		persistent_username = _tmp35_;
+	self->priv->password_entry = _tmp35_;
 #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp36_ = persistent_username;
+	_tmp36_ = self->priv->_publisher;
 #line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp36_ != NULL) {
-#line 7702 "PiwigoPublishing.c"
-			GtkEntry* _tmp37_ = NULL;
-			const gchar* _tmp38_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp37_ = self->priv->username_entry;
+	_tmp37_ = publishing_piwigo_piwigo_publisher_get_persistent_password (_tmp36_);
+#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	persistent_password = _tmp37_;
 #line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp38_ = persistent_username;
+	_tmp38_ = persistent_password;
 #line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			gtk_entry_set_text (_tmp37_, _tmp38_);
-#line 7711 "PiwigoPublishing.c"
-		}
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp39_ = self->priv->builder;
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp40_ = gtk_builder_get_object (_tmp39_, "password_entry");
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp40_) : NULL);
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->password_entry);
-#line 1135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->password_entry = _tmp41_;
+	if (_tmp38_ != NULL) {
+#line 7792 "PiwigoPublishing.c"
+		GtkEntry* _tmp39_ = NULL;
+		const gchar* _tmp40_ = NULL;
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp39_ = self->priv->password_entry;
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp40_ = persistent_password;
+#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_entry_set_text (_tmp39_, _tmp40_);
+#line 7801 "PiwigoPublishing.c"
+	}
 #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp42_ = publisher;
+	_tmp41_ = builder;
 #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp43_ = publishing_piwigo_piwigo_publisher_get_persistent_password (_tmp42_);
+	_tmp42_ = gtk_builder_get_object (_tmp41_, "remember_password_checkbutton");
 #line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		persistent_password = _tmp43_;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp44_ = persistent_password;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp44_ != NULL) {
-#line 7733 "PiwigoPublishing.c"
-			GtkEntry* _tmp45_ = NULL;
-			const gchar* _tmp46_ = NULL;
+	_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, gtk_switch_get_type ()) ? ((GtkSwitch*) _tmp42_) : NULL);
+#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->remember_password_checkbutton);
+#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->remember_password_checkbutton = _tmp43_;
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp45_ = self->priv->password_entry;
+	_tmp44_ = self->priv->remember_password_checkbutton;
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp46_ = persistent_password;
+	_tmp45_ = self->priv->_publisher;
 #line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			gtk_entry_set_text (_tmp45_, _tmp46_);
-#line 7742 "PiwigoPublishing.c"
-		}
+	_tmp46_ = publishing_piwigo_piwigo_publisher_get_remember_password (_tmp45_);
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_switch_set_active (_tmp44_, _tmp46_);
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp47_ = self->priv->builder;
+	_tmp47_ = builder;
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp48_ = gtk_builder_get_object (_tmp47_, "remember_password_checkbutton");
+	_tmp48_ = gtk_builder_get_object (_tmp47_, "login_button");
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp48_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp48_) : NULL);
+	_tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp48_, gtk_button_get_type ()) ? ((GtkButton*) _tmp48_) : NULL);
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->remember_password_checkbutton);
+	_g_object_unref0 (self->priv->login_button);
 #line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->remember_password_checkbutton = _tmp49_;
-#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp50_ = self->priv->remember_password_checkbutton;
-#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp51_ = publisher;
+	self->priv->login_button = _tmp49_;
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp52_ = publishing_piwigo_piwigo_publisher_get_remember_password (_tmp51_);
+	_tmp50_ = self->priv->username_entry;
 #line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp52_);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp51_ = self->priv->url_entry;
+#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0);
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp53_ = self->priv->builder;
+	_tmp52_ = self->priv->password_entry;
 #line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp54_ = gtk_builder_get_object (_tmp53_, "login_button");
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp55_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp54_, gtk_button_get_type ()) ? ((GtkButton*) _tmp54_) : NULL);
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->login_button);
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->login_button = _tmp55_;
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp56_ = self->priv->username_entry;
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_user_changed_gtk_editable_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp53_ = self->priv->login_button;
+#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_signal_connect_object (_tmp53_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp57_ = self->priv->url_entry;
+	_tmp54_ = self->priv->_publisher;
 #line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_url_changed_gtk_editable_changed, self, 0);
-#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp58_ = self->priv->password_entry;
-#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_authentication_pane_on_password_changed_gtk_editable_changed, self, 0);
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp59_ = self->priv->login_button;
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (_tmp59_, "clicked", (GCallback) _publishing_piwigo_authentication_pane_on_login_button_clicked_gtk_button_clicked, self, 0);
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp60_ = align;
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp61_ = self->priv->pane_widget;
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp62_ = publisher;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp63_ = publishing_piwigo_piwigo_publisher_get_host (_tmp62_);
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp64_ = _tmp63_;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp65_ = self->priv->login_button;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		spit_publishing_plugin_host_set_dialog_default_widget (_tmp64_, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget));
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (_tmp64_);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (persistent_password);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (persistent_username);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (persistent_url);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (message_label);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (align);
-#line 7816 "PiwigoPublishing.c"
-	}
-	goto __finally45;
-	__catch45_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp66_ = NULL;
-		const gchar* _tmp67_ = NULL;
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		e = _inner_error_;
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_inner_error_ = NULL;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp66_ = e;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp67_ = _tmp66_->message;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_warning ("PiwigoPublishing.vala:1154: Could not load UI: %s", _tmp67_);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_error_free0 (e);
-#line 7836 "PiwigoPublishing.c"
-	}
-	__finally45:
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		return NULL;
-#line 7847 "PiwigoPublishing.c"
-	}
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return self;
-#line 7851 "PiwigoPublishing.c"
-}
-
-
-PublishingPiwigoAuthenticationPane* publishing_piwigo_authentication_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoAuthenticationPaneMode mode) {
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return publishing_piwigo_authentication_pane_construct (PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, publisher, mode);
-#line 7858 "PiwigoPublishing.c"
-}
-
-
-GtkWidget* publishing_piwigo_authentication_pane_get_default_widget (PublishingPiwigoAuthenticationPane* self) {
-	GtkWidget* result = NULL;
-	GtkButton* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self), NULL);
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = self->priv->login_button;
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_;
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return result;
-#line 7876 "PiwigoPublishing.c"
+	_tmp55_ = publishing_piwigo_piwigo_publisher_get_host (_tmp54_);
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp56_ = _tmp55_;
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp57_ = self->priv->login_button;
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	spit_publishing_plugin_host_set_dialog_default_widget (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget));
+#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (_tmp56_);
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (persistent_password);
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (persistent_username);
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (persistent_url);
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (message_label);
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (builder);
+#line 7869 "PiwigoPublishing.c"
 }
 
 
@@ -7895,56 +7888,56 @@ static void publishing_piwigo_authentication_pane_on_login_button_clicked (Publi
 	const gchar* _tmp3_ = NULL;
 	GtkEntry* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-	GtkCheckButton* _tmp6_ = NULL;
+	GtkSwitch* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->url_entry;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->username_entry;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = gtk_entry_get_text (_tmp2_);
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->password_entry;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = gtk_entry_get_text (_tmp4_);
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->remember_password_checkbutton;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp7_ = gtk_switch_get_active (_tmp6_);
+#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_emit_by_name (self, "login", _tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 7909 "PiwigoPublishing.c"
+#line 7902 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_on_url_changed (PublishingPiwigoAuthenticationPane* self) {
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7918 "PiwigoPublishing.c"
+#line 7911 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_on_user_changed (PublishingPiwigoAuthenticationPane* self) {
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7927 "PiwigoPublishing.c"
+#line 7920 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_on_password_changed (PublishingPiwigoAuthenticationPane* self) {
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 7936 "PiwigoPublishing.c"
+#line 7929 "PiwigoPublishing.c"
 }
 
 
@@ -7955,124 +7948,144 @@ static void publishing_piwigo_authentication_pane_update_login_button_sensitivit
 	guint _tmp3_ = 0U;
 	guint _tmp4_ = 0U;
 	GtkButton* _tmp11_ = NULL;
-#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->url_entry;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = gtk_entry_get_text_length (_tmp2_);
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp4_ != ((guint) 0)) {
-#line 7957 "PiwigoPublishing.c"
+#line 7950 "PiwigoPublishing.c"
 		GtkEntry* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		guint _tmp7_ = 0U;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = self->priv->username_entry;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = gtk_entry_get_text_length (_tmp5_);
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = _tmp7_ != ((guint) 0);
-#line 7969 "PiwigoPublishing.c"
+#line 7962 "PiwigoPublishing.c"
 	} else {
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = FALSE;
-#line 7973 "PiwigoPublishing.c"
+#line 7966 "PiwigoPublishing.c"
 	}
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp1_) {
-#line 7977 "PiwigoPublishing.c"
+#line 7970 "PiwigoPublishing.c"
 		GtkEntry* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
 		guint _tmp10_ = 0U;
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->password_entry;
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = gtk_entry_get_text_length (_tmp8_);
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = _tmp9_;
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _tmp10_ != ((guint) 0);
-#line 7989 "PiwigoPublishing.c"
+#line 7982 "PiwigoPublishing.c"
 	} else {
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = FALSE;
-#line 7993 "PiwigoPublishing.c"
+#line 7986 "PiwigoPublishing.c"
 	}
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = self->priv->login_button;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 7999 "PiwigoPublishing.c"
+#line 7992 "PiwigoPublishing.c"
 }
 
 
-static GtkWidget* publishing_piwigo_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
-	PublishingPiwigoAuthenticationPane * self;
-	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return result;
-#line 8018 "PiwigoPublishing.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingPiwigoAuthenticationPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return result;
-#line 8031 "PiwigoPublishing.c"
-}
-
-
-static void publishing_piwigo_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void publishing_piwigo_authentication_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base) {
 	PublishingPiwigoAuthenticationPane * self;
 	GtkEntry* _tmp0_ = NULL;
 	GtkEntry* _tmp1_ = NULL;
 	GtkButton* _tmp2_ = NULL;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CLASS (publishing_piwigo_authentication_pane_parent_class)->on_pane_installed (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->url_entry;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->password_entry;
-#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_entry_set_activates_default (_tmp1_, TRUE);
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->login_button;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_update_login_button_sensitivity (self);
-#line 8056 "PiwigoPublishing.c"
+#line 8019 "PiwigoPublishing.c"
 }
 
 
-static void publishing_piwigo_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingPiwigoAuthenticationPane * self;
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 8064 "PiwigoPublishing.c"
+PublishingPiwigoAuthenticationPaneMode publishing_piwigo_authentication_pane_get_mode (PublishingPiwigoAuthenticationPane* self) {
+	PublishingPiwigoAuthenticationPaneMode result;
+	PublishingPiwigoAuthenticationPaneMode _tmp0_ = 0;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self), 0);
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_mode;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp0_;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 8034 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_authentication_pane_set_mode (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoAuthenticationPaneMode value) {
+	PublishingPiwigoAuthenticationPaneMode _tmp0_ = 0;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_mode = _tmp0_;
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "mode");
+#line 8048 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoPiwigoPublisher* publishing_piwigo_authentication_pane_get_publisher (PublishingPiwigoAuthenticationPane* self) {
+	PublishingPiwigoPiwigoPublisher* result;
+	PublishingPiwigoPiwigoPublisher* _tmp0_ = NULL;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self), NULL);
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_publisher;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp0_;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 8063 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_authentication_pane_set_publisher (PublishingPiwigoAuthenticationPane* self, PublishingPiwigoPiwigoPublisher* value) {
+	PublishingPiwigoPiwigoPublisher* _tmp0_ = NULL;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_AUTHENTICATION_PANE (self));
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_publisher = _tmp0_;
+#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "publisher");
+#line 8077 "PiwigoPublishing.c"
 }
 
 
@@ -8083,27 +8096,27 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN (GClosure
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (n_param_values == 5);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data1 = closure->data;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 8083 "PiwigoPublishing.c"
+#line 8096 "PiwigoPublishing.c"
 	} else {
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = closure->data;
-#line 8089 "PiwigoPublishing.c"
+#line 8102 "PiwigoPublishing.c"
 	}
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING_STRING_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_string (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 8095 "PiwigoPublishing.c"
+#line 8108 "PiwigoPublishing.c"
 }
 
 
@@ -8114,83 +8127,74 @@ static void publishing_piwigo_authentication_pane_class_init (PublishingPiwigoAu
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoAuthenticationPanePrivate));
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	((GObjectClass *) klass)->constructed = publishing_piwigo_authentication_pane_real_constructed;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = publishing_piwigo_authentication_pane_real_on_pane_installed;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_authentication_pane_get_property;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	G_OBJECT_CLASS (klass)->set_property = _vala_publishing_piwigo_authentication_pane_set_property;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_authentication_pane_finalize;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE, g_param_spec_enum ("mode", "mode", "mode", PUBLISHING_PIWIGO_AUTHENTICATION_PANE_TYPE_MODE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER, g_param_spec_object ("publisher", "publisher", "publisher", PUBLISHING_PIWIGO_TYPE_PIWIGO_PUBLISHER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_new ("login", PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_STRING_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = _ ("Enter the URL of your Piwigo photo library as well as the username and" \
 " password associated with your Piwigo account for that library.");
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_INTRO_MESSAGE = _tmp1_;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = _ ("Shotwell cannot contact your Piwigo photo library. Please verify the U" \
 "RL you entered");
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_FAILED_RETRY_URL_MESSAGE = _tmp3_;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _ ("Username and/or password invalid. Please try again");
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_authentication_pane_FAILED_RETRY_USER_MESSAGE = _tmp5_;
-#line 8132 "PiwigoPublishing.c"
-}
-
-
-static void publishing_piwigo_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_piwigo_authentication_pane_real_get_widget;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_piwigo_authentication_pane_real_get_preferred_geometry;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_authentication_pane_real_on_pane_installed;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_authentication_pane_real_on_pane_uninstalled;
-#line 8147 "PiwigoPublishing.c"
+#line 8157 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_instance_init (PublishingPiwigoAuthenticationPane * self) {
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_AUTHENTICATION_PANE_GET_PRIVATE (self);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->pane_widget = NULL;
-#line 8156 "PiwigoPublishing.c"
+#line 8164 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_authentication_pane_finalize (GObject* obj) {
 	PublishingPiwigoAuthenticationPane * self;
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1083 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->url_entry);
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1084 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->username_entry);
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->password_entry);
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->remember_password_checkbutton);
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->login_button);
-#line 1079 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_authentication_pane_parent_class)->finalize (obj);
-#line 8180 "PiwigoPublishing.c"
+#line 8184 "PiwigoPublishing.c"
 }
 
 
@@ -8202,655 +8206,572 @@ GType publishing_piwigo_authentication_pane_get_type (void) {
 	static volatile gsize publishing_piwigo_authentication_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_authentication_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoAuthenticationPane), 0, (GInstanceInitFunc) publishing_piwigo_authentication_pane_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_piwigo_authentication_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
 		GType publishing_piwigo_authentication_pane_type_id;
-		publishing_piwigo_authentication_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingPiwigoAuthenticationPane", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_piwigo_authentication_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+		publishing_piwigo_authentication_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, "PublishingPiwigoAuthenticationPane", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_piwigo_authentication_pane_type_id__volatile, publishing_piwigo_authentication_pane_type_id);
 	}
 	return publishing_piwigo_authentication_pane_type_id__volatile;
 }
 
 
+static void _vala_publishing_piwigo_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+	PublishingPiwigoAuthenticationPane * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	switch (property_id) {
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE:
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_set_enum (value, publishing_piwigo_authentication_pane_get_mode (self));
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER:
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_set_object (value, publishing_piwigo_authentication_pane_get_publisher (self));
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 8221 "PiwigoPublishing.c"
+		default:
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 8227 "PiwigoPublishing.c"
+	}
+}
+
+
+static void _vala_publishing_piwigo_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+	PublishingPiwigoAuthenticationPane * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_AUTHENTICATION_PANE, PublishingPiwigoAuthenticationPane);
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	switch (property_id) {
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_MODE:
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_authentication_pane_set_mode (self, g_value_get_enum (value));
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_AUTHENTICATION_PANE_PUBLISHER:
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_authentication_pane_set_publisher (self, g_value_get_object (value));
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 8249 "PiwigoPublishing.c"
+		default:
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 8255 "PiwigoPublishing.c"
+	}
+}
+
+
+static gpointer _publishing_piwigo_category_ref0 (gpointer self) {
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return self ? publishing_piwigo_category_ref (self) : NULL;
+#line 8263 "PiwigoPublishing.c"
+}
+
+
+static PublishingPiwigoCategory** _vala_array_dup14 (PublishingPiwigoCategory** self, int length) {
+	PublishingPiwigoCategory** result;
+	int i;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = g_new0 (PublishingPiwigoCategory*, length + 1);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	for (i = 0; i < length; i++) {
+#line 8274 "PiwigoPublishing.c"
+		PublishingPiwigoCategory* _tmp0_ = NULL;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp0_ = _publishing_piwigo_category_ref0 (self[i]);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		result[i] = _tmp0_;
+#line 8280 "PiwigoPublishing.c"
+	}
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 8284 "PiwigoPublishing.c"
+}
+
+
+static gboolean _publishing_piwigo_category_equal_gee_equal_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+	gboolean result;
+	result = publishing_piwigo_category_equal ((PublishingPiwigoCategory*) a, (PublishingPiwigoCategory*) b);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 8293 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
+	PublishingPiwigoPublishingOptionsPane * self = NULL;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	gboolean _tmp3_ = FALSE;
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp5_ = FALSE;
+	PublishingPiwigoCategory** _tmp6_ = NULL;
+	gint _tmp6__length1 = 0;
+	PublishingPiwigoCategory** _tmp7_ = NULL;
+	gint _tmp7__length1 = 0;
+	GeeArrayList* _tmp8_ = NULL;
+	GeeArrayList* _tmp9_ = NULL;
+	PublishingPiwigoPiwigoPublisher* _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+	gchar* _tmp12_ = NULL;
+#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = last_category;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = last_permission_level;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp2_ = last_photo_size;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp3_ = last_title_as_comment;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp4_ = last_no_upload_tags;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp5_ = strip_metadata_enabled;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp6_ = categories;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp6__length1 = categories_length1;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp7_ = (_tmp6_ != NULL) ? _vala_array_dup14 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp7__length1 = _tmp6__length1;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp8_ = gee_array_list_new_wrap (PUBLISHING_PIWIGO_TYPE_CATEGORY, (GBoxedCopyFunc) publishing_piwigo_category_ref, publishing_piwigo_category_unref, _tmp7_, _tmp7__length1, _publishing_piwigo_category_equal_gee_equal_data_func, NULL, NULL);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp9_ = _tmp8_;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp10_ = publisher;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp11_ = publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (_tmp10_);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp12_ = _tmp11_;
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self = (PublishingPiwigoPublishingOptionsPane*) g_object_new (object_type, "resource-path", PLUGIN_RESOURCE_PATH "/piwigo_publishing_options_pane.ui", "connect-signals", TRUE, "default-id", "publish_button", "last-category", _tmp0_, "last-permission-level", _tmp1_, "last-photo-size", _tmp2_, "last-title-as-comment", _tmp3_, "last-no-upload-tags", _tmp4_, "strip-metadata-enabled", _tmp5_, "existing-categories", _tmp9_, "default-comment", _tmp12_, NULL);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp12_);
+#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (_tmp9_);
+#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return self;
+#line 8354 "PiwigoPublishing.c"
+}
+
+
+PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
+#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return publishing_piwigo_publishing_options_pane_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, publisher, categories, categories_length1, last_category, last_permission_level, last_photo_size, last_title_as_comment, last_no_upload_tags, strip_metadata_enabled);
+#line 8361 "PiwigoPublishing.c"
+}
+
+
 static void _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_logout_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8205 "PiwigoPublishing.c"
+#line 8368 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_publish_button_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8212 "PiwigoPublishing.c"
+#line 8375 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8219 "PiwigoPublishing.c"
+#line 8382 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8226 "PiwigoPublishing.c"
+#line 8389 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_new_category_entry_changed ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8233 "PiwigoPublishing.c"
+#line 8396 "PiwigoPublishing.c"
 }
 
 
 static void _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_on_existing_combo_changed ((PublishingPiwigoPublishingOptionsPane*) self);
-#line 8240 "PiwigoPublishing.c"
-}
-
-
-static gpointer _publishing_piwigo_category_ref0 (gpointer self) {
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return self ? publishing_piwigo_category_ref (self) : NULL;
-#line 8247 "PiwigoPublishing.c"
+#line 8403 "PiwigoPublishing.c"
 }
 
 
-static PublishingPiwigoCategory** _vala_array_dup11 (PublishingPiwigoCategory** self, int length) {
-	PublishingPiwigoCategory** result;
-	int i;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = g_new0 (PublishingPiwigoCategory*, length + 1);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	for (i = 0; i < length; i++) {
-#line 8258 "PiwigoPublishing.c"
-		PublishingPiwigoCategory* _tmp0_ = NULL;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp0_ = _publishing_piwigo_category_ref0 (self[i]);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		result[i] = _tmp0_;
-#line 8264 "PiwigoPublishing.c"
-	}
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return result;
-#line 8268 "PiwigoPublishing.c"
-}
-
-
-PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_construct (GType object_type, PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
-	PublishingPiwigoPublishingOptionsPane * self = NULL;
-	GtkBox* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_ = FALSE;
-	PublishingPiwigoCategory** _tmp78_ = NULL;
-	gint _tmp78__length1 = 0;
-	PublishingPiwigoCategory** _tmp79_ = NULL;
-	gint _tmp79__length1 = 0;
-	gint _tmp80_ = 0;
-	PublishingPiwigoPermissionLevel** _tmp81_ = NULL;
-	gint _tmp82_ = 0;
-	PublishingPiwigoSizeEntry** _tmp83_ = NULL;
-	GtkTextView* _tmp84_ = NULL;
-	GtkTextBuffer* _tmp85_ = NULL;
-	GtkTextBuffer* _tmp86_ = NULL;
-	PublishingPiwigoPiwigoPublisher* _tmp87_ = NULL;
-	gchar* _tmp88_ = NULL;
-	gchar* _tmp89_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = (PublishingPiwigoPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_object_ref_sink (_tmp0_);
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->pane_widget = _tmp0_;
+static void publishing_piwigo_publishing_options_pane_real_constructed (GObject* base) {
+	PublishingPiwigoPublishingOptionsPane * self;
+	GtkBuilder* builder = NULL;
+	GtkBuilder* _tmp0_ = NULL;
+	GObject* _tmp1_ = NULL;
+	GtkRadioButton* _tmp2_ = NULL;
+	GObject* _tmp3_ = NULL;
+	GtkRadioButton* _tmp4_ = NULL;
+	GObject* _tmp5_ = NULL;
+	GtkComboBoxText* _tmp6_ = NULL;
+	GObject* _tmp7_ = NULL;
+	GtkEntry* _tmp8_ = NULL;
+	GObject* _tmp9_ = NULL;
+	GtkLabel* _tmp10_ = NULL;
+	GObject* _tmp11_ = NULL;
+	GtkComboBoxText* _tmp12_ = NULL;
+	GObject* _tmp13_ = NULL;
+	GtkTextView* _tmp14_ = NULL;
+	GtkTextView* _tmp15_ = NULL;
+	GtkTextBuffer* _tmp16_ = NULL;
+	GtkTextBuffer* _tmp17_ = NULL;
+	GObject* _tmp18_ = NULL;
+	GtkLabel* _tmp19_ = NULL;
+	GObject* _tmp20_ = NULL;
+	GtkComboBoxText* _tmp21_ = NULL;
+	GObject* _tmp22_ = NULL;
+	GtkComboBoxText* _tmp23_ = NULL;
+	GObject* _tmp24_ = NULL;
+	GtkCheckButton* _tmp25_ = NULL;
+	GtkCheckButton* _tmp26_ = NULL;
+	gboolean _tmp27_ = FALSE;
+	GObject* _tmp28_ = NULL;
+	GtkCheckButton* _tmp29_ = NULL;
+	GtkCheckButton* _tmp30_ = NULL;
+	gboolean _tmp31_ = FALSE;
+	GObject* _tmp32_ = NULL;
+	GtkCheckButton* _tmp33_ = NULL;
+	GtkCheckButton* _tmp34_ = NULL;
+	gboolean _tmp35_ = FALSE;
+	GObject* _tmp36_ = NULL;
+	GtkButton* _tmp37_ = NULL;
+	GtkButton* _tmp38_ = NULL;
+	GObject* _tmp39_ = NULL;
+	GtkButton* _tmp40_ = NULL;
+	GtkButton* _tmp41_ = NULL;
+	GtkRadioButton* _tmp42_ = NULL;
+	GtkRadioButton* _tmp43_ = NULL;
+	GtkEntry* _tmp44_ = NULL;
+	GtkComboBoxText* _tmp45_ = NULL;
+	gint _tmp46_ = 0;
+	PublishingPiwigoPermissionLevel** _tmp47_ = NULL;
+	gint _tmp48_ = 0;
+	PublishingPiwigoSizeEntry** _tmp49_ = NULL;
+	GtkTextView* _tmp50_ = NULL;
+	GtkTextBuffer* _tmp51_ = NULL;
+	GtkTextBuffer* _tmp52_ = NULL;
+	const gchar* _tmp53_ = NULL;
+#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
+#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	G_OBJECT_CLASS (publishing_piwigo_publishing_options_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane), G_TYPE_OBJECT, GObject));
+#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 1246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	builder = _tmp0_;
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = last_category;
+	_tmp1_ = gtk_builder_get_object (builder, "use_existing_radio");
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp1_) : NULL);
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->use_existing_radio);
 #line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->last_category = _tmp1_;
+	self->priv->use_existing_radio = _tmp2_;
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp3_ = gtk_builder_get_object (builder, "create_new_radio");
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp2_ = last_permission_level;
+	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp3_) : NULL);
 #line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->last_permission_level = _tmp2_;
+	_g_object_unref0 (self->priv->create_new_radio);
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->create_new_radio = _tmp4_;
+#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp5_ = gtk_builder_get_object (builder, "existing_categories_combo");
 #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp3_ = last_photo_size;
+	_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp5_) : NULL);
 #line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->last_photo_size = _tmp3_;
+	_g_object_unref0 (self->priv->existing_categories_combo);
+#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->existing_categories_combo = _tmp6_;
+#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp7_ = gtk_builder_get_object (builder, "new_category_entry");
+#line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp7_) : NULL);
 #line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp4_ = last_title_as_comment;
+	_g_object_unref0 (self->priv->new_category_entry);
 #line 1251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->last_title_as_comment = _tmp4_;
+	self->priv->new_category_entry = _tmp8_;
 #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = last_no_upload_tags;
+	_tmp9_ = gtk_builder_get_object (builder, "within_existing_label");
 #line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->last_no_upload_tags = _tmp5_;
-#line 8327 "PiwigoPublishing.c"
-	{
-		GtkBuilder* _tmp6_ = NULL;
-		GtkBuilder* _tmp7_ = NULL;
-		GtkBuilder* _tmp8_ = NULL;
-		GtkAlignment* align = NULL;
-		GtkBuilder* _tmp9_ = NULL;
-		GObject* _tmp10_ = NULL;
-		GtkAlignment* _tmp11_ = NULL;
-		GtkBuilder* _tmp12_ = NULL;
-		GObject* _tmp13_ = NULL;
-		GtkRadioButton* _tmp14_ = NULL;
-		GtkBuilder* _tmp15_ = NULL;
-		GObject* _tmp16_ = NULL;
-		GtkRadioButton* _tmp17_ = NULL;
-		GtkBuilder* _tmp18_ = NULL;
-		GObject* _tmp19_ = NULL;
-		GtkComboBoxText* _tmp20_ = NULL;
-		GtkBuilder* _tmp21_ = NULL;
-		GObject* _tmp22_ = NULL;
-		GtkEntry* _tmp23_ = NULL;
-		GtkBuilder* _tmp24_ = NULL;
-		GObject* _tmp25_ = NULL;
-		GtkLabel* _tmp26_ = NULL;
-		GtkBuilder* _tmp27_ = NULL;
-		GObject* _tmp28_ = NULL;
-		GtkComboBoxText* _tmp29_ = NULL;
-		GtkBuilder* _tmp30_ = NULL;
-		GObject* _tmp31_ = NULL;
-		GtkTextView* _tmp32_ = NULL;
-		GtkTextView* _tmp33_ = NULL;
-		GtkTextBuffer* _tmp34_ = NULL;
-		GtkTextBuffer* _tmp35_ = NULL;
-		GtkBuilder* _tmp36_ = NULL;
-		GObject* _tmp37_ = NULL;
-		GtkLabel* _tmp38_ = NULL;
-		GtkBuilder* _tmp39_ = NULL;
-		GObject* _tmp40_ = NULL;
-		GtkComboBoxText* _tmp41_ = NULL;
-		GtkBuilder* _tmp42_ = NULL;
-		GObject* _tmp43_ = NULL;
-		GtkComboBoxText* _tmp44_ = NULL;
-		GtkBuilder* _tmp45_ = NULL;
-		GObject* _tmp46_ = NULL;
-		GtkCheckButton* _tmp47_ = NULL;
-		GtkCheckButton* _tmp48_ = NULL;
-		gboolean _tmp49_ = FALSE;
-		GtkBuilder* _tmp50_ = NULL;
-		GObject* _tmp51_ = NULL;
-		GtkCheckButton* _tmp52_ = NULL;
-		GtkCheckButton* _tmp53_ = NULL;
-		gboolean _tmp54_ = FALSE;
-		GtkBuilder* _tmp55_ = NULL;
-		GObject* _tmp56_ = NULL;
-		GtkCheckButton* _tmp57_ = NULL;
-		GtkCheckButton* _tmp58_ = NULL;
-		gboolean _tmp59_ = FALSE;
-		GtkBuilder* _tmp60_ = NULL;
-		GObject* _tmp61_ = NULL;
-		GtkButton* _tmp62_ = NULL;
-		GtkButton* _tmp63_ = NULL;
-		GtkBuilder* _tmp64_ = NULL;
-		GObject* _tmp65_ = NULL;
-		GtkButton* _tmp66_ = NULL;
-		GtkButton* _tmp67_ = NULL;
-		GtkRadioButton* _tmp68_ = NULL;
-		GtkRadioButton* _tmp69_ = NULL;
-		GtkEntry* _tmp70_ = NULL;
-		GtkComboBoxText* _tmp71_ = NULL;
-		GtkAlignment* _tmp72_ = NULL;
-		GtkBox* _tmp73_ = NULL;
-		GtkBox* _tmp74_ = NULL;
-		GtkAlignment* _tmp75_ = NULL;
+	_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp9_) : NULL);
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->within_existing_label);
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->within_existing_label = _tmp10_;
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp11_ = gtk_builder_get_object (builder, "within_existing_combo");
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp11_) : NULL);
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->within_existing_combo);
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->within_existing_combo = _tmp12_;
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp13_ = gtk_builder_get_object (builder, "album_comment");
 #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp6_ = gtk_builder_new ();
+	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_text_view_get_type ()) ? ((GtkTextView*) _tmp13_) : NULL);
 #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->builder);
+	_g_object_unref0 (self->priv->album_comment);
 #line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->builder = _tmp6_;
+	self->priv->album_comment = _tmp14_;
 #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = self->priv->builder;
+	_tmp15_ = self->priv->album_comment;
 #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_builder_add_from_resource (_tmp7_, PLUGIN_RESOURCE_PATH "/piwigo_publishing_options_pane.ui", &_inner_error_);
+	_tmp16_ = gtk_text_buffer_new (NULL);
 #line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8412 "PiwigoPublishing.c"
-			goto __catch46_g_error;
-		}
+	_tmp17_ = _tmp16_;
+#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_text_view_set_buffer (_tmp15_, _tmp17_);
+#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (_tmp17_);
 #line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = self->priv->builder;
+	_tmp18_ = gtk_builder_get_object (builder, "album_comment_label");
 #line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_builder_connect_signals (_tmp8_, NULL);
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = self->priv->builder;
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = gtk_builder_get_object (_tmp9_, "alignment");
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp10_) : NULL);
-#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		align = _tmp11_;
-#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp12_ = self->priv->builder;
+	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp18_) : NULL);
+#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->album_comment_label);
+#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->album_comment_label = _tmp19_;
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp20_ = gtk_builder_get_object (builder, "perms_combo");
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp20_) : NULL);
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->perms_combo);
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->perms_combo = _tmp21_;
 #line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp13_ = gtk_builder_get_object (_tmp12_, "use_existing_radio");
+	_tmp22_ = gtk_builder_get_object (builder, "size_combo");
 #line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp13_) : NULL);
+	_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp22_) : NULL);
 #line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->use_existing_radio);
+	_g_object_unref0 (self->priv->size_combo);
 #line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->use_existing_radio = _tmp14_;
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp15_ = self->priv->builder;
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp16_ = gtk_builder_get_object (_tmp15_, "create_new_radio");
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp16_) : NULL);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->create_new_radio);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->create_new_radio = _tmp17_;
+	self->priv->size_combo = _tmp23_;
 #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp18_ = self->priv->builder;
+	_tmp24_ = gtk_builder_get_object (builder, "strip_metadata_check");
 #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp19_ = gtk_builder_get_object (_tmp18_, "existing_categories_combo");
+	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp24_) : NULL);
 #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp19_) : NULL);
-#line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->existing_categories_combo);
+	_g_object_unref0 (self->priv->strip_metadata_check);
 #line 1262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->existing_categories_combo = _tmp20_;
+	self->priv->strip_metadata_check = _tmp25_;
 #line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp21_ = self->priv->builder;
+	_tmp26_ = self->priv->strip_metadata_check;
 #line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp22_ = gtk_builder_get_object (_tmp21_, "new_category_entry");
+	_tmp27_ = self->priv->_strip_metadata_enabled;
 #line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp22_) : NULL);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->new_category_entry);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->new_category_entry = _tmp23_;
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp24_ = self->priv->builder;
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp25_ = gtk_builder_get_object (_tmp24_, "within_existing_label");
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp25_) : NULL);
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->within_existing_label);
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->within_existing_label = _tmp26_;
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp27_);
 #line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp27_ = self->priv->builder;
+	_tmp28_ = gtk_builder_get_object (builder, "title_as_comment_check");
 #line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp28_ = gtk_builder_get_object (_tmp27_, "within_existing_combo");
+	_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp28_) : NULL);
 #line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp28_) : NULL);
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->within_existing_combo);
+	_g_object_unref0 (self->priv->title_as_comment_check);
 #line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->within_existing_combo = _tmp29_;
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp30_ = self->priv->builder;
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp31_ = gtk_builder_get_object (_tmp30_, "album_comment");
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, gtk_text_view_get_type ()) ? ((GtkTextView*) _tmp31_) : NULL);
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->album_comment);
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->album_comment = _tmp32_;
+	self->priv->title_as_comment_check = _tmp29_;
+#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp30_ = self->priv->title_as_comment_check;
+#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp31_ = self->priv->_last_title_as_comment;
+#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp31_);
 #line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp33_ = self->priv->album_comment;
+	_tmp32_ = gtk_builder_get_object (builder, "no_upload_tags_check");
 #line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp34_ = gtk_text_buffer_new (NULL);
+	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp32_) : NULL);
 #line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp35_ = _tmp34_;
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_text_view_set_buffer (_tmp33_, _tmp35_);
+	_g_object_unref0 (self->priv->no_upload_tags_check);
 #line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (_tmp35_);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp36_ = self->priv->builder;
+	self->priv->no_upload_tags_check = _tmp33_;
 #line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp37_ = gtk_builder_get_object (_tmp36_, "album_comment_label");
+	_tmp34_ = self->priv->no_upload_tags_check;
 #line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp37_) : NULL);
+	_tmp35_ = self->priv->_last_no_upload_tags;
 #line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->album_comment_label);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->album_comment_label = _tmp38_;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp39_ = self->priv->builder;
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp35_);
 #line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp40_ = gtk_builder_get_object (_tmp39_, "perms_combo");
+	_tmp36_ = gtk_builder_get_object (builder, "logout_button");
 #line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp40_) : NULL);
+	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, gtk_button_get_type ()) ? ((GtkButton*) _tmp36_) : NULL);
 #line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->perms_combo);
+	_g_object_unref0 (self->priv->logout_button);
 #line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->perms_combo = _tmp41_;
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp42_ = self->priv->builder;
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp43_ = gtk_builder_get_object (_tmp42_, "size_combo");
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp43_) : NULL);
+	self->priv->logout_button = _tmp37_;
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->size_combo);
+	_tmp38_ = self->priv->logout_button;
 #line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->size_combo = _tmp44_;
+	g_signal_connect_object (_tmp38_, "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked, self, 0);
 #line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp45_ = self->priv->builder;
+	_tmp39_ = gtk_builder_get_object (builder, "publish_button");
 #line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp46_ = gtk_builder_get_object (_tmp45_, "strip_metadata_check");
+	_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, gtk_button_get_type ()) ? ((GtkButton*) _tmp39_) : NULL);
 #line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp46_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp46_) : NULL);
-#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->strip_metadata_check);
+	_g_object_unref0 (self->priv->publish_button);
 #line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->strip_metadata_check = _tmp47_;
-#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp48_ = self->priv->strip_metadata_check;
+	self->priv->publish_button = _tmp40_;
 #line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp49_ = strip_metadata_enabled;
+	_tmp41_ = self->priv->publish_button;
 #line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp49_);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp50_ = self->priv->builder;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp51_ = gtk_builder_get_object (_tmp50_, "title_as_comment_check");
+	g_signal_connect_object (_tmp41_, "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked, self, 0);
 #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp52_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp51_) : NULL);
+	_tmp42_ = self->priv->use_existing_radio;
 #line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->title_as_comment_check);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->title_as_comment_check = _tmp52_;
-#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp53_ = self->priv->title_as_comment_check;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
 #line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp54_ = last_title_as_comment;
+	_tmp43_ = self->priv->create_new_radio;
 #line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp54_);
-#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp55_ = self->priv->builder;
-#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp56_ = gtk_builder_get_object (_tmp55_, "no_upload_tags_check");
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp44_ = self->priv->new_category_entry;
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed, self, 0);
 #line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp56_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp56_) : NULL);
+	_tmp45_ = self->priv->within_existing_combo;
 #line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->no_upload_tags_check);
-#line 1280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->no_upload_tags_check = _tmp57_;
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp58_ = self->priv->no_upload_tags_check;
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp59_ = last_no_upload_tags;
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp59_);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed, self, 0);
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp47_ = publishing_piwigo_publishing_options_pane_create_perm_levels (self, &_tmp46_);
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->perm_levels = (_vala_array_free (self->priv->perm_levels, self->priv->perm_levels_length1, (GDestroyNotify) publishing_piwigo_permission_level_unref), NULL);
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->perm_levels = _tmp47_;
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->perm_levels_length1 = _tmp46_;
+#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_perm_levels_size_ = self->priv->perm_levels_length1;
 #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp60_ = self->priv->builder;
+	_tmp49_ = publishing_piwigo_publishing_options_pane_create_sizes (self, &_tmp48_);
 #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp61_ = gtk_builder_get_object (_tmp60_, "logout_button");
+	self->priv->photo_sizes = (_vala_array_free (self->priv->photo_sizes, self->priv->photo_sizes_length1, (GDestroyNotify) publishing_piwigo_size_entry_unref), NULL);
 #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp62_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp61_, gtk_button_get_type ()) ? ((GtkButton*) _tmp61_) : NULL);
+	self->priv->photo_sizes = _tmp49_;
 #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->logout_button);
+	self->priv->photo_sizes_length1 = _tmp48_;
 #line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->logout_button = _tmp62_;
+	self->priv->_photo_sizes_size_ = self->priv->photo_sizes_length1;
 #line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp63_ = self->priv->logout_button;
+	_tmp50_ = self->priv->album_comment;
 #line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked, self, 0);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp64_ = self->priv->builder;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp65_ = gtk_builder_get_object (_tmp64_, "publish_button");
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp66_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp65_, gtk_button_get_type ()) ? ((GtkButton*) _tmp65_) : NULL);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (self->priv->publish_button);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		self->priv->publish_button = _tmp66_;
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp67_ = self->priv->publish_button;
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (_tmp67_, "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked, self, 0);
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp68_ = self->priv->use_existing_radio;
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp69_ = self->priv->create_new_radio;
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_piwigo_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp70_ = self->priv->new_category_entry;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_new_category_entry_changed_gtk_editable_changed, self, 0);
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp71_ = self->priv->within_existing_combo;
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_piwigo_publishing_options_pane_on_existing_combo_changed_gtk_combo_box_changed, self, 0);
-#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp72_ = align;
-#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp73_ = self->priv->pane_widget;
-#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_widget_get_type (), GtkWidget));
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp74_ = self->priv->pane_widget;
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp75_ = align;
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_box_set_child_packing (_tmp74_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_object_unref0 (align);
-#line 8643 "PiwigoPublishing.c"
-	}
-	goto __finally46;
-	__catch46_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp76_ = NULL;
-		const gchar* _tmp77_ = NULL;
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		e = _inner_error_;
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_inner_error_ = NULL;
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp76_ = e;
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp77_ = _tmp76_->message;
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_warning ("PiwigoPublishing.vala:1297: Could not load UI: %s", _tmp77_);
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_error_free0 (e);
-#line 8663 "PiwigoPublishing.c"
-	}
-	__finally46:
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		return NULL;
-#line 8674 "PiwigoPublishing.c"
-	}
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp78_ = categories;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp78__length1 = categories_length1;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp79_ = (_tmp78_ != NULL) ? _vala_array_dup11 (_tmp78_, _tmp78__length1) : ((gpointer) _tmp78_);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp79__length1 = _tmp78__length1;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->existing_categories = (_vala_array_free (self->priv->existing_categories, self->priv->existing_categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->existing_categories = _tmp79_;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->existing_categories_length1 = _tmp79__length1;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_existing_categories_size_ = self->priv->existing_categories_length1;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp81_ = publishing_piwigo_publishing_options_pane_create_perm_levels (self, &_tmp80_);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->perm_levels = (_vala_array_free (self->priv->perm_levels, self->priv->perm_levels_length1, (GDestroyNotify) publishing_piwigo_permission_level_unref), NULL);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->perm_levels = _tmp81_;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->perm_levels_length1 = _tmp80_;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_perm_levels_size_ = self->priv->perm_levels_length1;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp83_ = publishing_piwigo_publishing_options_pane_create_sizes (self, &_tmp82_);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->photo_sizes = (_vala_array_free (self->priv->photo_sizes, self->priv->photo_sizes_length1, (GDestroyNotify) publishing_piwigo_size_entry_unref), NULL);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->photo_sizes = _tmp83_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->photo_sizes_length1 = _tmp82_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->_photo_sizes_size_ = self->priv->photo_sizes_length1;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp84_ = self->priv->album_comment;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp85_ = gtk_text_view_get_buffer (_tmp84_);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp86_ = _tmp85_;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp87_ = publisher;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp88_ = publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (self, _tmp87_);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp89_ = _tmp88_;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_text_buffer_set_text (_tmp86_, _tmp89_, -1);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp89_);
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return self;
-#line 8730 "PiwigoPublishing.c"
-}
-
-
-PublishingPiwigoPublishingOptionsPane* publishing_piwigo_publishing_options_pane_new (PublishingPiwigoPiwigoPublisher* publisher, PublishingPiwigoCategory** categories, int categories_length1, gint last_category, gint last_permission_level, gint last_photo_size, gboolean last_title_as_comment, gboolean last_no_upload_tags, gboolean strip_metadata_enabled) {
-#line 1242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return publishing_piwigo_publishing_options_pane_construct (PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, publisher, categories, categories_length1, last_category, last_permission_level, last_photo_size, last_title_as_comment, last_no_upload_tags, strip_metadata_enabled);
-#line 8737 "PiwigoPublishing.c"
-}
-
-
-GtkWidget* publishing_piwigo_publishing_options_pane_get_default_widget (PublishingPiwigoPublishingOptionsPane* self) {
-	GtkWidget* result = NULL;
-	GtkButton* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = self->priv->publish_button;
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_;
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return result;
-#line 8755 "PiwigoPublishing.c"
+	_tmp51_ = gtk_text_view_get_buffer (_tmp50_);
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp52_ = _tmp51_;
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp53_ = self->priv->_default_comment;
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_text_buffer_set_text (_tmp52_, _tmp53_, -1);
+#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (builder);
+#line 8676 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add35 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8766 "PiwigoPublishing.c"
+#line 8687 "PiwigoPublishing.c"
 	}
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8772 "PiwigoPublishing.c"
+#line 8693 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8783 "PiwigoPublishing.c"
+#line 8704 "PiwigoPublishing.c"
 	}
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8789 "PiwigoPublishing.c"
+#line 8710 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8800 "PiwigoPublishing.c"
+#line 8721 "PiwigoPublishing.c"
 	}
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8806 "PiwigoPublishing.c"
+#line 8727 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add38 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8817 "PiwigoPublishing.c"
+#line 8738 "PiwigoPublishing.c"
 	}
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8823 "PiwigoPublishing.c"
+#line 8744 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add39 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoPermissionLevel*, *array, (*size) + 1);
-#line 8834 "PiwigoPublishing.c"
+#line 8755 "PiwigoPublishing.c"
 	}
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8840 "PiwigoPublishing.c"
+#line 8761 "PiwigoPublishing.c"
 }
 
 
@@ -8882,166 +8803,166 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 	PublishingPiwigoPermissionLevel* _tmp15_ = NULL;
 	PublishingPiwigoPermissionLevel** _tmp16_ = NULL;
 	gint _tmp16__length1 = 0;
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = g_new0 (PublishingPiwigoPermissionLevel*, 0 + 1);
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = _tmp0_;
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result__length1 = 0;
-#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _result_;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = _ ("Everyone");
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_permission_level_new (0, _tmp2_);
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add35 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _result_;
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = _ ("Admins, Family, Friends, Contacts");
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_permission_level_new (1, _tmp5_);
-#line 1314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _result_;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = _ ("Admins, Family, Friends");
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = publishing_piwigo_permission_level_new (2, _tmp8_);
-#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = _result_;
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = _ ("Admins, Family");
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = publishing_piwigo_permission_level_new (4, _tmp11_);
-#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = _result_;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13__length1 = _result__length1;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = _ ("Admins");
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = publishing_piwigo_permission_level_new (8, _tmp14_);
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = _result_;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16__length1 = _result__length1;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (result_length1) {
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*result_length1 = _tmp16__length1;
-#line 8940 "PiwigoPublishing.c"
+#line 8861 "PiwigoPublishing.c"
 	}
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp16_;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 8946 "PiwigoPublishing.c"
+#line 8867 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add40 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8957 "PiwigoPublishing.c"
+#line 8878 "PiwigoPublishing.c"
 	}
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8963 "PiwigoPublishing.c"
+#line 8884 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add41 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8974 "PiwigoPublishing.c"
+#line 8895 "PiwigoPublishing.c"
 	}
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8980 "PiwigoPublishing.c"
+#line 8901 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add42 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 8991 "PiwigoPublishing.c"
+#line 8912 "PiwigoPublishing.c"
 	}
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8997 "PiwigoPublishing.c"
+#line 8918 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add43 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 9008 "PiwigoPublishing.c"
+#line 8929 "PiwigoPublishing.c"
 	}
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 9014 "PiwigoPublishing.c"
+#line 8935 "PiwigoPublishing.c"
 }
 
 
 static void _vala_array_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*array = g_renew (PublishingPiwigoSizeEntry*, *array, (*size) + 1);
-#line 9025 "PiwigoPublishing.c"
+#line 8946 "PiwigoPublishing.c"
 	}
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	(*array)[*length] = NULL;
-#line 9031 "PiwigoPublishing.c"
+#line 8952 "PiwigoPublishing.c"
 }
 
 
@@ -9073,104 +8994,104 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 	PublishingPiwigoSizeEntry* _tmp15_ = NULL;
 	PublishingPiwigoSizeEntry** _tmp16_ = NULL;
 	gint _tmp16__length1 = 0;
-#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = g_new0 (PublishingPiwigoSizeEntry*, 0 + 1);
-#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = _tmp0_;
-#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result__length1 = 0;
-#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = _result_;
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = _ ("500 × 375 pixels");
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_size_entry_new (500, _tmp2_);
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _result_;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = _ ("1024 × 768 pixels");
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_size_entry_new (1024, _tmp5_);
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _result_;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = _ ("2048 × 1536 pixels");
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = publishing_piwigo_size_entry_new (2048, _tmp8_);
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = _result_;
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = _ ("4096 × 3072 pixels");
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = publishing_piwigo_size_entry_new (4096, _tmp11_);
-#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = _result_;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13__length1 = _result__length1;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = _ ("Original size");
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = publishing_piwigo_size_entry_new (PUBLISHING_PIWIGO_ORIGINAL_SIZE, _tmp14_);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = _result_;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16__length1 = _result__length1;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (result_length1) {
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		*result_length1 = _tmp16__length1;
-#line 9131 "PiwigoPublishing.c"
+#line 9052 "PiwigoPublishing.c"
 	}
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp16_;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 9137 "PiwigoPublishing.c"
+#line 9058 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_on_logout_button_clicked (PublishingPiwigoPublishingOptionsPane* self) {
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 9146 "PiwigoPublishing.c"
+#line 9067 "PiwigoPublishing.c"
 }
 
 
 static gpointer _publishing_piwigo_permission_level_ref0 (gpointer self) {
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_permission_level_ref (self) : NULL;
-#line 9153 "PiwigoPublishing.c"
+#line 9074 "PiwigoPublishing.c"
 }
 
 
 static gpointer _publishing_piwigo_size_entry_ref0 (gpointer self) {
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_piwigo_size_entry_ref (self) : NULL;
-#line 9160 "PiwigoPublishing.c"
+#line 9081 "PiwigoPublishing.c"
 }
 
 
@@ -9202,71 +9123,71 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 	PublishingPiwigoPublishingParameters* _tmp53_ = NULL;
 	GtkCheckButton* _tmp54_ = NULL;
 	gboolean _tmp55_ = FALSE;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = publishing_piwigo_publishing_parameters_new ();
-#line 1339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	params = _tmp0_;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = params;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->perm_levels;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2__length1 = self->priv->perm_levels_length1;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->perms_combo;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = _tmp2_[_tmp4_];
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = _publishing_piwigo_permission_level_ref0 (_tmp5_);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_permission_level_unref0 (_tmp1_->perm_level);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_->perm_level = _tmp6_;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = params;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = self->priv->photo_sizes;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8__length1 = self->priv->photo_sizes_length1;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = self->priv->size_combo;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp11_ = _tmp8_[_tmp10_];
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = _publishing_piwigo_size_entry_ref0 (_tmp11_);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_size_entry_unref0 (_tmp7_->photo_size);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_->photo_size = _tmp12_;
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = params;
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = self->priv->title_as_comment_check;
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_->title_as_comment = _tmp15_;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = params;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp17_ = self->priv->no_upload_tags_check;
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_->no_upload_tags = _tmp18_;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = self->priv->create_new_radio;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp20_) {
-#line 9256 "PiwigoPublishing.c"
+#line 9177 "PiwigoPublishing.c"
 		gchar* uploadcomment = NULL;
 		GtkTextView* _tmp21_ = NULL;
 		GtkTextBuffer* _tmp22_ = NULL;
@@ -9280,141 +9201,137 @@ static void publishing_piwigo_publishing_options_pane_on_publish_button_clicked
 		GtkComboBoxText* _tmp29_ = NULL;
 		gint _tmp30_ = 0;
 		gint _tmp31_ = 0;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp21_ = self->priv->album_comment;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp22_ = gtk_text_view_get_buffer (_tmp21_);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp23_ = _tmp22_;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_object_get (_tmp23_, "text", &_tmp24_, NULL);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp25_ = _tmp24_;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp26_ = _tmp25_;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp27_ = string_strip (_tmp26_);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp28_ = _tmp27_;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp26_);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		uploadcomment = _tmp28_;
-#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp29_ = self->priv->within_existing_combo;
-#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp30_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		a = _tmp30_;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp31_ = a;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp31_ == 0) {
-#line 9300 "PiwigoPublishing.c"
+#line 9221 "PiwigoPublishing.c"
 			PublishingPiwigoPublishingParameters* _tmp32_ = NULL;
 			GtkEntry* _tmp33_ = NULL;
 			const gchar* _tmp34_ = NULL;
 			const gchar* _tmp35_ = NULL;
 			PublishingPiwigoCategory* _tmp36_ = NULL;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp32_ = params;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp33_ = self->priv->new_category_entry;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp34_ = gtk_entry_get_text (_tmp33_);
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp35_ = uploadcomment;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp36_ = publishing_piwigo_category_new_local (_tmp34_, 0, _tmp35_);
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_piwigo_category_unref0 (_tmp32_->category);
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp32_->category = _tmp36_;
-#line 9320 "PiwigoPublishing.c"
+#line 9241 "PiwigoPublishing.c"
 		} else {
 			gint _tmp37_ = 0;
 			PublishingPiwigoPublishingParameters* _tmp38_ = NULL;
 			GtkEntry* _tmp39_ = NULL;
 			const gchar* _tmp40_ = NULL;
-			PublishingPiwigoCategory** _tmp41_ = NULL;
-			gint _tmp41__length1 = 0;
+			GeeList* _tmp41_ = NULL;
 			gint _tmp42_ = 0;
-			PublishingPiwigoCategory* _tmp43_ = NULL;
-			gint _tmp44_ = 0;
-			const gchar* _tmp45_ = NULL;
-			PublishingPiwigoCategory* _tmp46_ = NULL;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			gpointer _tmp43_ = NULL;
+			PublishingPiwigoCategory* _tmp44_ = NULL;
+			gint _tmp45_ = 0;
+			const gchar* _tmp46_ = NULL;
+			PublishingPiwigoCategory* _tmp47_ = NULL;
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp37_ = a;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			a = _tmp37_ - 1;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp38_ = params;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp39_ = self->priv->new_category_entry;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp40_ = gtk_entry_get_text (_tmp39_);
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp41_ = self->priv->existing_categories;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp41__length1 = self->priv->existing_categories_length1;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp41_ = self->priv->_existing_categories;
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp42_ = a;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp43_ = _tmp41_[_tmp42_];
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp44_ = _tmp43_->id;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp45_ = uploadcomment;
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp46_ = publishing_piwigo_category_new_local (_tmp40_, _tmp44_, _tmp45_);
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp43_ = gee_list_get (_tmp41_, _tmp42_);
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp44_ = (PublishingPiwigoCategory*) _tmp43_;
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp45_ = _tmp44_->id;
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp46_ = uploadcomment;
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp47_ = publishing_piwigo_category_new_local (_tmp40_, _tmp45_, _tmp46_);
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_piwigo_category_unref0 (_tmp38_->category);
-#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp38_->category = _tmp46_;
-#line 9361 "PiwigoPublishing.c"
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp38_->category = _tmp47_;
+#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_publishing_piwigo_category_unref0 (_tmp44_);
+#line 9284 "PiwigoPublishing.c"
 		}
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (uploadcomment);
-#line 9365 "PiwigoPublishing.c"
+#line 9288 "PiwigoPublishing.c"
 	} else {
-		PublishingPiwigoPublishingParameters* _tmp47_ = NULL;
-		PublishingPiwigoCategory** _tmp48_ = NULL;
-		gint _tmp48__length1 = 0;
-		GtkComboBoxText* _tmp49_ = NULL;
-		gint _tmp50_ = 0;
-		PublishingPiwigoCategory* _tmp51_ = NULL;
-		PublishingPiwigoCategory* _tmp52_ = NULL;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp47_ = params;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp48_ = self->priv->existing_categories;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp48__length1 = self->priv->existing_categories_length1;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp49_ = self->priv->existing_categories_combo;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp50_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp51_ = _tmp48_[_tmp50_];
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp52_ = _publishing_piwigo_category_ref0 (_tmp51_);
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_publishing_piwigo_category_unref0 (_tmp47_->category);
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp47_->category = _tmp52_;
-#line 9392 "PiwigoPublishing.c"
+		PublishingPiwigoPublishingParameters* _tmp48_ = NULL;
+		GeeList* _tmp49_ = NULL;
+		GtkComboBoxText* _tmp50_ = NULL;
+		gint _tmp51_ = 0;
+		gpointer _tmp52_ = NULL;
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp48_ = params;
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp49_ = self->priv->_existing_categories;
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp50_ = self->priv->existing_categories_combo;
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp51_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_combo_box_get_type (), GtkComboBox));
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp52_ = gee_list_get (_tmp49_, _tmp51_);
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_publishing_piwigo_category_unref0 (_tmp48_->category);
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp48_->category = (PublishingPiwigoCategory*) _tmp52_;
+#line 9309 "PiwigoPublishing.c"
 	}
-#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp53_ = params;
-#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp54_ = self->priv->strip_metadata_check;
-#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp55_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp53_, _tmp55_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (params);
-#line 9404 "PiwigoPublishing.c"
+#line 9321 "PiwigoPublishing.c"
 }
 
 
@@ -9426,39 +9343,39 @@ static void publishing_piwigo_publishing_options_pane_on_use_existing_radio_clic
 	GtkComboBoxText* _tmp4_ = NULL;
 	GtkLabel* _tmp5_ = NULL;
 	GtkTextView* _tmp6_ = NULL;
-#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->existing_categories_combo;
-#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->new_category_entry;
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->within_existing_label;
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1343 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->within_existing_combo;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->existing_categories_combo;
-#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->album_comment_label;
-#line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->album_comment;
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9448 "PiwigoPublishing.c"
+#line 9365 "PiwigoPublishing.c"
 }
 
 
@@ -9470,57 +9387,57 @@ static void publishing_piwigo_publishing_options_pane_on_create_new_radio_clicke
 	GtkTextView* _tmp4_ = NULL;
 	GtkComboBoxText* _tmp5_ = NULL;
 	GtkEntry* _tmp6_ = NULL;
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->new_category_entry;
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = self->priv->within_existing_label;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->within_existing_combo;
-#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->album_comment_label;
-#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = self->priv->album_comment;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = self->priv->existing_categories_combo;
-#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->new_category_entry;
-#line 1381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9492 "PiwigoPublishing.c"
+#line 9409 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_on_new_category_entry_changed (PublishingPiwigoPublishingOptionsPane* self) {
-#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9501 "PiwigoPublishing.c"
+#line 9418 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_on_existing_combo_changed (PublishingPiwigoPublishingOptionsPane* self) {
-#line 1389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9510 "PiwigoPublishing.c"
+#line 9427 "PiwigoPublishing.c"
 }
 
 
@@ -9534,186 +9451,158 @@ static void publishing_piwigo_publishing_options_pane_update_publish_button_sens
 	gint _tmp4_ = 0;
 	gchar* search_name = NULL;
 	gint _tmp5_ = 0;
-	gboolean _tmp17_ = FALSE;
-	GtkRadioButton* _tmp18_ = NULL;
-	gboolean _tmp19_ = FALSE;
-	GtkButton* _tmp24_ = NULL;
-#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gboolean _tmp18_ = FALSE;
+	GtkRadioButton* _tmp19_ = NULL;
+	gboolean _tmp20_ = FALSE;
+	GtkButton* _tmp25_ = NULL;
+#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->new_category_entry;
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = string_strip (_tmp1_);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	category_name = _tmp2_;
-#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = self->priv->within_existing_combo;
-#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	a = _tmp4_;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = a;
-#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp5_ <= 0) {
-#line 9548 "PiwigoPublishing.c"
+#line 9465 "PiwigoPublishing.c"
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = category_name;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = g_strconcat ("/ ", _tmp6_, NULL);
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (search_name);
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		search_name = _tmp7_;
-#line 9559 "PiwigoPublishing.c"
+#line 9476 "PiwigoPublishing.c"
 	} else {
 		gint _tmp8_ = 0;
-		PublishingPiwigoCategory** _tmp9_ = NULL;
-		gint _tmp9__length1 = 0;
+		GeeList* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-		PublishingPiwigoCategory* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
+		gpointer _tmp11_ = NULL;
+		PublishingPiwigoCategory* _tmp12_ = NULL;
+		const gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gchar* _tmp15_ = NULL;
+		const gchar* _tmp16_ = NULL;
+		gchar* _tmp17_ = NULL;
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = a;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		a = _tmp8_ - 1;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = self->priv->existing_categories;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9__length1 = self->priv->existing_categories_length1;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp9_ = self->priv->_existing_categories;
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = a;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp11_ = _tmp9_[_tmp10_];
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp12_ = _tmp11_->display_name;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp13_ = g_strconcat (_tmp12_, "/ ", NULL);
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp14_ = _tmp13_;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp15_ = category_name;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp16_ = g_strconcat (_tmp14_, _tmp15_, NULL);
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp11_ = gee_list_get (_tmp9_, _tmp10_);
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp12_ = (PublishingPiwigoCategory*) _tmp11_;
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp13_ = _tmp12_->display_name;
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp14_ = g_strconcat (_tmp13_, "/ ", NULL);
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp15_ = _tmp14_;
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp16_ = category_name;
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp17_ = g_strconcat (_tmp15_, _tmp16_, NULL);
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (search_name);
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		search_name = _tmp16_;
-#line 1401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_g_free0 (_tmp14_);
-#line 9599 "PiwigoPublishing.c"
-	}
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp18_ = self->priv->create_new_radio;
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp19_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp19_) {
-#line 9607 "PiwigoPublishing.c"
-		gboolean _tmp20_ = FALSE;
-		const gchar* _tmp21_ = NULL;
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp21_ = category_name;
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (g_strcmp0 (_tmp21_, "") == 0) {
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp20_ = TRUE;
-#line 9616 "PiwigoPublishing.c"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		search_name = _tmp17_;
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_free0 (_tmp15_);
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_publishing_piwigo_category_unref0 (_tmp12_);
+#line 9518 "PiwigoPublishing.c"
+	}
+#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp19_ = self->priv->create_new_radio;
+#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp20_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp20_) {
+#line 9526 "PiwigoPublishing.c"
+		gboolean _tmp21_ = FALSE;
+		const gchar* _tmp22_ = NULL;
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp22_ = category_name;
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		if (g_strcmp0 (_tmp22_, "") == 0) {
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp21_ = TRUE;
+#line 9535 "PiwigoPublishing.c"
 		} else {
-			const gchar* _tmp22_ = NULL;
-			gboolean _tmp23_ = FALSE;
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp22_ = search_name;
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp23_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp22_);
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp20_ = _tmp23_;
-#line 9626 "PiwigoPublishing.c"
+			const gchar* _tmp23_ = NULL;
+			gboolean _tmp24_ = FALSE;
+#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp23_ = search_name;
+#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp24_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp23_);
+#line 1385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp21_ = _tmp24_;
+#line 9545 "PiwigoPublishing.c"
 		}
-#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp17_ = _tmp20_;
-#line 9630 "PiwigoPublishing.c"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp18_ = _tmp21_;
+#line 9549 "PiwigoPublishing.c"
 	} else {
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp17_ = FALSE;
-#line 9634 "PiwigoPublishing.c"
+#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp18_ = FALSE;
+#line 9553 "PiwigoPublishing.c"
 	}
-#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp24_ = self->priv->publish_button;
-#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), !_tmp17_);
-#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp25_ = self->priv->publish_button;
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), !_tmp18_);
+#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (search_name);
-#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (category_name);
-#line 9644 "PiwigoPublishing.c"
-}
-
-
-static GtkWidget* publishing_piwigo_publishing_options_pane_real_get_widget (SpitPublishingDialogPane* base) {
-	PublishingPiwigoPublishingOptionsPane * self;
-	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = _tmp1_;
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return result;
-#line 9663 "PiwigoPublishing.c"
+#line 9563 "PiwigoPublishing.c"
 }
 
 
-static SpitPublishingDialogPaneGeometryOptions publishing_piwigo_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingPiwigoPublishingOptionsPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	return result;
-#line 9676 "PiwigoPublishing.c"
-}
-
-
-static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+static void publishing_piwigo_publishing_options_pane_real_on_pane_installed (ShotwellPluginsCommonBuilderPane* base) {
 	PublishingPiwigoPublishingOptionsPane * self;
 	GtkButton* _tmp0_ = NULL;
-#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	SHOTWELL_PLUGINS_COMMON_BUILDER_PANE_CLASS (publishing_piwigo_publishing_options_pane_parent_class)->on_pane_installed (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
+#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_create_categories_combo (self);
-#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_create_within_categories_combo (self);
-#line 1425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_create_permissions_combo (self);
-#line 1426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_create_size_combo (self);
-#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->publish_button;
-#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 9699 "PiwigoPublishing.c"
+#line 9588 "PiwigoPublishing.c"
 }
 
 
-static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPublishingOptionsPane* self, PublishingPiwigoPiwigoPublisher* publisher) {
+static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_possible (PublishingPiwigoPiwigoPublisher* publisher) {
 	gchar* result = NULL;
 	SpitPublishingPublishable** publishables = NULL;
 	PublishingPiwigoPiwigoPublisher* _tmp0_ = NULL;
@@ -9731,388 +9620,440 @@ static gchar* publishing_piwigo_publishing_options_pane_get_common_comment_if_po
 	SpitPublishingPublishable** _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
 	const gchar* _tmp19_ = NULL;
-#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PIWIGO_PUBLISHER (publisher), NULL);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = publisher;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishing_piwigo_piwigo_publisher_get_host (_tmp0_);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = spit_publishing_plugin_host_get_publishables (_tmp2_, &_tmp3_);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5__length1 = _tmp3_;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables = _tmp5_;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables_length1 = _tmp5__length1;
-#line 1435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = g_strdup ("");
-#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	common = _tmp6_;
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	isfirst = TRUE;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = publishables;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7__length1 = publishables_length1;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ != NULL) {
-#line 9757 "PiwigoPublishing.c"
+#line 9644 "PiwigoPublishing.c"
 		SpitPublishingPublishable** _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = publishables;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8__length1 = publishables_length1;
-#line 9764 "PiwigoPublishing.c"
+#line 9651 "PiwigoPublishing.c"
 		{
 			SpitPublishingPublishable** pub_collection = NULL;
 			gint pub_collection_length1 = 0;
 			gint _pub_collection_size_ = 0;
 			gint pub_it = 0;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			pub_collection = _tmp8_;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			pub_collection_length1 = _tmp8__length1;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			for (pub_it = 0; pub_it < _tmp8__length1; pub_it = pub_it + 1) {
-#line 9776 "PiwigoPublishing.c"
+#line 9663 "PiwigoPublishing.c"
 				SpitPublishingPublishable* _tmp9_ = NULL;
 				SpitPublishingPublishable* pub = NULL;
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp9_ = _g_object_ref0 (pub_collection[pub_it]);
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				pub = _tmp9_;
-#line 9783 "PiwigoPublishing.c"
+#line 9670 "PiwigoPublishing.c"
 				{
 					gchar* cur = NULL;
 					SpitPublishingPublishable* _tmp10_ = NULL;
 					gchar* _tmp11_ = NULL;
 					const gchar* _tmp12_ = NULL;
 					gboolean _tmp13_ = FALSE;
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp10_ = pub;
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp11_ = spit_publishing_publishable_get_param_string (_tmp10_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_EVENTCOMMENT);
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					cur = _tmp11_;
-#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp12_ = cur;
-#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_tmp12_ == NULL) {
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_free0 (cur);
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_object_unref0 (pub);
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						continue;
-#line 9806 "PiwigoPublishing.c"
+#line 9693 "PiwigoPublishing.c"
 					}
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp13_ = isfirst;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					if (_tmp13_) {
-#line 9812 "PiwigoPublishing.c"
+#line 9699 "PiwigoPublishing.c"
 						const gchar* _tmp14_ = NULL;
 						gchar* _tmp15_ = NULL;
-#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp14_ = cur;
-#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp15_ = g_strdup (_tmp14_);
-#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_g_free0 (common);
-#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						common = _tmp15_;
-#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						isfirst = FALSE;
-#line 9825 "PiwigoPublishing.c"
+#line 9712 "PiwigoPublishing.c"
 					} else {
 						const gchar* _tmp16_ = NULL;
 						const gchar* _tmp17_ = NULL;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp16_ = cur;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						_tmp17_ = common;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 						if (g_strcmp0 (_tmp16_, _tmp17_) != 0) {
-#line 9835 "PiwigoPublishing.c"
+#line 9722 "PiwigoPublishing.c"
 							gchar* _tmp18_ = NULL;
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_tmp18_ = g_strdup ("");
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_free0 (common);
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							common = _tmp18_;
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_free0 (cur);
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							_g_object_unref0 (pub);
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 							break;
-#line 9849 "PiwigoPublishing.c"
+#line 9736 "PiwigoPublishing.c"
 						}
 					}
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_free0 (cur);
-#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_object_unref0 (pub);
-#line 9856 "PiwigoPublishing.c"
+#line 9743 "PiwigoPublishing.c"
 				}
 			}
 		}
 	}
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = common;
-#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:1457: PiwigoConnector: found common event commen" \
+#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:1428: PiwigoConnector: found common event commen" \
 "t %s\n", _tmp19_);
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = common;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 9871 "PiwigoPublishing.c"
+#line 9758 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_create_categories_combo (PublishingPiwigoPublishingOptionsPane* self) {
-	PublishingPiwigoCategory** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	PublishingPiwigoCategory** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	const gchar* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-#line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	GeeList* _tmp14_ = NULL;
+	gboolean _tmp15_ = FALSE;
+	gboolean _tmp16_ = FALSE;
+	const gchar* _tmp30_ = NULL;
+	gboolean _tmp31_ = FALSE;
+#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = self->priv->existing_categories;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0__length1 = self->priv->existing_categories_length1;
-#line 9888 "PiwigoPublishing.c"
+#line 9770 "PiwigoPublishing.c"
 	{
-		PublishingPiwigoCategory** cat_collection = NULL;
-		gint cat_collection_length1 = 0;
-		gint _cat_collection_size_ = 0;
-		gint cat_it = 0;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		cat_collection = _tmp0_;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		cat_collection_length1 = _tmp0__length1;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		for (cat_it = 0; cat_it < _tmp0__length1; cat_it = cat_it + 1) {
-#line 9900 "PiwigoPublishing.c"
-			PublishingPiwigoCategory* _tmp1_ = NULL;
+		GeeList* _cat_list = NULL;
+		GeeList* _tmp0_ = NULL;
+		GeeList* _tmp1_ = NULL;
+		gint _cat_size = 0;
+		GeeList* _tmp2_ = NULL;
+		gint _tmp3_ = 0;
+		gint _tmp4_ = 0;
+		gint _cat_index = 0;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp0_ = self->priv->_existing_categories;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_cat_list = _tmp1_;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp2_ = _cat_list;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp4_ = _tmp3_;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_cat_size = _tmp4_;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_cat_index = -1;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		while (TRUE) {
+#line 9798 "PiwigoPublishing.c"
+			gint _tmp5_ = 0;
+			gint _tmp6_ = 0;
+			gint _tmp7_ = 0;
 			PublishingPiwigoCategory* cat = NULL;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp1_ = _publishing_piwigo_category_ref0 (cat_collection[cat_it]);
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			cat = _tmp1_;
-#line 9907 "PiwigoPublishing.c"
-			{
-				GtkComboBoxText* _tmp2_ = NULL;
-				PublishingPiwigoCategory* _tmp3_ = NULL;
-				const gchar* _tmp4_ = NULL;
-#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp2_ = self->priv->existing_categories_combo;
-#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp3_ = cat;
-#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp4_ = _tmp3_->display_name;
-#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_publishing_piwigo_category_unref0 (cat);
-#line 9922 "PiwigoPublishing.c"
+			GeeList* _tmp8_ = NULL;
+			gint _tmp9_ = 0;
+			gpointer _tmp10_ = NULL;
+			GtkComboBoxText* _tmp11_ = NULL;
+			PublishingPiwigoCategory* _tmp12_ = NULL;
+			const gchar* _tmp13_ = NULL;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp5_ = _cat_index;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_cat_index = _tmp5_ + 1;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp6_ = _cat_index;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp7_ = _cat_size;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			if (!(_tmp6_ < _tmp7_)) {
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				break;
+#line 9821 "PiwigoPublishing.c"
 			}
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp8_ = _cat_list;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp9_ = _cat_index;
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			cat = (PublishingPiwigoCategory*) _tmp10_;
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp11_ = self->priv->existing_categories_combo;
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp12_ = cat;
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp13_ = _tmp12_->display_name;
+#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			gtk_combo_box_text_append_text (_tmp11_, _tmp13_);
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_publishing_piwigo_category_unref0 (cat);
+#line 9841 "PiwigoPublishing.c"
 		}
+#line 1433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (_cat_list);
+#line 9845 "PiwigoPublishing.c"
 	}
-#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = self->priv->existing_categories;
-#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5__length1 = self->priv->existing_categories_length1;
-#line 1465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (_tmp5__length1 == 0) {
-#line 9932 "PiwigoPublishing.c"
-		GtkComboBoxText* _tmp6_ = NULL;
-		GtkRadioButton* _tmp7_ = NULL;
-		GtkRadioButton* _tmp8_ = NULL;
-		GtkTextView* _tmp9_ = NULL;
-		GtkLabel* _tmp10_ = NULL;
-		GtkEntry* _tmp11_ = NULL;
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp6_ = self->priv->existing_categories_combo;
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp7_ = self->priv->use_existing_radio;
-#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp8_ = self->priv->create_new_radio;
-#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp9_ = self->priv->album_comment;
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp10_ = self->priv->album_comment_label;
-#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp11_ = self->priv->new_category_entry;
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 9963 "PiwigoPublishing.c"
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp14_ = self->priv->_existing_categories;
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp15_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp16_ = _tmp15_;
+#line 1436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp16_) {
+#line 9855 "PiwigoPublishing.c"
+		GtkComboBoxText* _tmp17_ = NULL;
+		GtkRadioButton* _tmp18_ = NULL;
+		GtkRadioButton* _tmp19_ = NULL;
+		GtkTextView* _tmp20_ = NULL;
+		GtkLabel* _tmp21_ = NULL;
+		GtkEntry* _tmp22_ = NULL;
+#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp17_ = self->priv->existing_categories_combo;
+#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp18_ = self->priv->use_existing_radio;
+#line 1439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp19_ = self->priv->create_new_radio;
+#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp20_ = self->priv->album_comment;
+#line 1441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp21_ = self->priv->album_comment_label;
+#line 1442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp22_ = self->priv->new_category_entry;
+#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
+#line 9886 "PiwigoPublishing.c"
 	} else {
 		gint last_category_index = 0;
-		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
-		gint _tmp14_ = 0;
-		GtkEntry* _tmp18_ = NULL;
-		GtkTextView* _tmp19_ = NULL;
-		GtkLabel* _tmp20_ = NULL;
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp12_ = self->priv->last_category;
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp13_ = publishing_piwigo_publishing_options_pane_find_category_index (self, _tmp12_);
-#line 1474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		last_category_index = _tmp13_;
-#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp14_ = last_category_index;
-#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		if (_tmp14_ < 0) {
-#line 9982 "PiwigoPublishing.c"
-			GtkComboBoxText* _tmp15_ = NULL;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp15_ = self->priv->existing_categories_combo;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 9988 "PiwigoPublishing.c"
-		} else {
-			GtkComboBoxText* _tmp16_ = NULL;
-			gint _tmp17_ = 0;
-#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp16_ = self->priv->existing_categories_combo;
-#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp17_ = last_category_index;
-#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), _tmp17_);
-#line 9998 "PiwigoPublishing.c"
-		}
-#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp18_ = self->priv->new_category_entry;
-#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp19_ = self->priv->album_comment;
-#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp20_ = self->priv->album_comment_label;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 10012 "PiwigoPublishing.c"
+		gint _tmp23_ = 0;
+		gint _tmp24_ = 0;
+		GtkComboBoxText* _tmp25_ = NULL;
+		gint _tmp26_ = 0;
+		GtkEntry* _tmp27_ = NULL;
+		GtkTextView* _tmp28_ = NULL;
+		GtkLabel* _tmp29_ = NULL;
+#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp23_ = self->priv->_last_category;
+#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp24_ = publishing_piwigo_publishing_options_pane_find_category_index (self, _tmp23_);
+#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		last_category_index = _tmp24_;
+#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp25_ = self->priv->existing_categories_combo;
+#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp26_ = last_category_index;
+#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), _tmp26_);
+#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp27_ = self->priv->new_category_entry;
+#line 1447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp28_ = self->priv->album_comment;
+#line 1448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp29_ = self->priv->album_comment_label;
+#line 1449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 9920 "PiwigoPublishing.c"
 	}
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp21_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp22_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp21_);
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	if (!_tmp22_) {
-#line 10020 "PiwigoPublishing.c"
-		GtkEntry* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp23_ = self->priv->new_category_entry;
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		_tmp24_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
-#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		gtk_entry_set_text (_tmp23_, _tmp24_);
-#line 10029 "PiwigoPublishing.c"
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp30_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp31_ = publishing_piwigo_publishing_options_pane_category_already_exists (self, _tmp30_);
+#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (!_tmp31_) {
+#line 9928 "PiwigoPublishing.c"
+		GtkEntry* _tmp32_ = NULL;
+		const gchar* _tmp33_ = NULL;
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp32_ = self->priv->new_category_entry;
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp33_ = publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME;
+#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		gtk_entry_set_text (_tmp32_, _tmp33_);
+#line 9937 "PiwigoPublishing.c"
 	}
 }
 
 
 static void publishing_piwigo_publishing_options_pane_create_within_categories_combo (PublishingPiwigoPublishingOptionsPane* self) {
 	GtkComboBoxText* _tmp0_ = NULL;
-	PublishingPiwigoCategory** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	GtkLabel* _tmp6_ = NULL;
-	GtkComboBoxText* _tmp7_ = NULL;
-	GtkComboBoxText* _tmp8_ = NULL;
-#line 1488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	GtkLabel* _tmp15_ = NULL;
+	GtkComboBoxText* _tmp16_ = NULL;
+	GtkComboBoxText* _tmp17_ = NULL;
+#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->within_existing_combo;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	gtk_combo_box_text_append_text (_tmp0_, "/ ");
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1_ = self->priv->existing_categories;
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp1__length1 = self->priv->existing_categories_length1;
-#line 10051 "PiwigoPublishing.c"
+#line 9953 "PiwigoPublishing.c"
 	{
-		PublishingPiwigoCategory** cat_collection = NULL;
-		gint cat_collection_length1 = 0;
-		gint _cat_collection_size_ = 0;
-		gint cat_it = 0;
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		cat_collection = _tmp1_;
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		cat_collection_length1 = _tmp1__length1;
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		for (cat_it = 0; cat_it < _tmp1__length1; cat_it = cat_it + 1) {
-#line 10063 "PiwigoPublishing.c"
-			PublishingPiwigoCategory* _tmp2_ = NULL;
+		GeeList* _cat_list = NULL;
+		GeeList* _tmp1_ = NULL;
+		GeeList* _tmp2_ = NULL;
+		gint _cat_size = 0;
+		GeeList* _tmp3_ = NULL;
+		gint _tmp4_ = 0;
+		gint _tmp5_ = 0;
+		gint _cat_index = 0;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp1_ = self->priv->_existing_categories;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp2_ = _g_object_ref0 (_tmp1_);
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_cat_list = _tmp2_;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp3_ = _cat_list;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp5_ = _tmp4_;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_cat_size = _tmp5_;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_cat_index = -1;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		while (TRUE) {
+#line 9981 "PiwigoPublishing.c"
+			gint _tmp6_ = 0;
+			gint _tmp7_ = 0;
+			gint _tmp8_ = 0;
 			PublishingPiwigoCategory* cat = NULL;
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp2_ = _publishing_piwigo_category_ref0 (cat_collection[cat_it]);
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			cat = _tmp2_;
-#line 10070 "PiwigoPublishing.c"
-			{
-				GtkComboBoxText* _tmp3_ = NULL;
-				PublishingPiwigoCategory* _tmp4_ = NULL;
-				const gchar* _tmp5_ = NULL;
-#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp3_ = self->priv->within_existing_combo;
-#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp4_ = cat;
-#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp5_ = _tmp4_->display_name;
-#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				gtk_combo_box_text_append_text (_tmp3_, _tmp5_);
-#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_publishing_piwigo_category_unref0 (cat);
-#line 10085 "PiwigoPublishing.c"
+			GeeList* _tmp9_ = NULL;
+			gint _tmp10_ = 0;
+			gpointer _tmp11_ = NULL;
+			GtkComboBoxText* _tmp12_ = NULL;
+			PublishingPiwigoCategory* _tmp13_ = NULL;
+			const gchar* _tmp14_ = NULL;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp6_ = _cat_index;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_cat_index = _tmp6_ + 1;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp7_ = _cat_index;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp8_ = _cat_size;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			if (!(_tmp7_ < _tmp8_)) {
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				break;
+#line 10004 "PiwigoPublishing.c"
 			}
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp9_ = _cat_list;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp10_ = _cat_index;
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp11_ = gee_list_get (_tmp9_, _tmp10_);
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			cat = (PublishingPiwigoCategory*) _tmp11_;
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp12_ = self->priv->within_existing_combo;
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp13_ = cat;
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp14_ = _tmp13_->display_name;
+#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			gtk_combo_box_text_append_text (_tmp12_, _tmp14_);
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_publishing_piwigo_category_unref0 (cat);
+#line 10024 "PiwigoPublishing.c"
 		}
+#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (_cat_list);
+#line 10028 "PiwigoPublishing.c"
 	}
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp6_ = self->priv->within_existing_label;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp7_ = self->priv->within_existing_combo;
-#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp8_ = self->priv->within_existing_combo;
-#line 1497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 10101 "PiwigoPublishing.c"
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp15_ = self->priv->within_existing_label;
+#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp16_ = self->priv->within_existing_combo;
+#line 1463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp17_ = self->priv->within_existing_combo;
+#line 1464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 10042 "PiwigoPublishing.c"
 }
 
 
@@ -10123,77 +10064,77 @@ static void publishing_piwigo_publishing_options_pane_create_permissions_combo (
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 1500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->perm_levels;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0__length1 = self->priv->perm_levels_length1;
-#line 10118 "PiwigoPublishing.c"
+#line 10059 "PiwigoPublishing.c"
 	{
 		PublishingPiwigoPermissionLevel** perm_collection = NULL;
 		gint perm_collection_length1 = 0;
 		gint _perm_collection_size_ = 0;
 		gint perm_it = 0;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		perm_collection = _tmp0_;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		perm_collection_length1 = _tmp0__length1;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (perm_it = 0; perm_it < _tmp0__length1; perm_it = perm_it + 1) {
-#line 10130 "PiwigoPublishing.c"
+#line 10071 "PiwigoPublishing.c"
 			PublishingPiwigoPermissionLevel* _tmp1_ = NULL;
 			PublishingPiwigoPermissionLevel* perm = NULL;
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp1_ = _publishing_piwigo_permission_level_ref0 (perm_collection[perm_it]);
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			perm = _tmp1_;
-#line 10137 "PiwigoPublishing.c"
+#line 10078 "PiwigoPublishing.c"
 			{
 				GtkComboBoxText* _tmp2_ = NULL;
 				PublishingPiwigoPermissionLevel* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = self->priv->perms_combo;
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3_ = perm;
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = _tmp3_->name;
-#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
-#line 1501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_permission_level_unref0 (perm);
-#line 10152 "PiwigoPublishing.c"
+#line 10093 "PiwigoPublishing.c"
 			}
 		}
 	}
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = self->priv->last_permission_level;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp5_ = self->priv->_last_permission_level;
+#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_publishing_options_pane_find_permission_level_index (self, _tmp5_);
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	last_permission_level_index = _tmp6_;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = last_permission_level_index;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ < 0) {
-#line 10166 "PiwigoPublishing.c"
+#line 10107 "PiwigoPublishing.c"
 		GtkComboBoxText* _tmp8_ = NULL;
-#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->perms_combo;
-#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 10172 "PiwigoPublishing.c"
+#line 10113 "PiwigoPublishing.c"
 	} else {
 		GtkComboBoxText* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = self->priv->perms_combo;
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = last_permission_level_index;
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox), _tmp10_);
-#line 10182 "PiwigoPublishing.c"
+#line 10123 "PiwigoPublishing.c"
 	}
 }
 
@@ -10205,200 +10146,200 @@ static void publishing_piwigo_publishing_options_pane_create_size_combo (Publish
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 1512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->photo_sizes;
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0__length1 = self->priv->photo_sizes_length1;
-#line 10200 "PiwigoPublishing.c"
+#line 10141 "PiwigoPublishing.c"
 	{
 		PublishingPiwigoSizeEntry** size_collection = NULL;
 		gint size_collection_length1 = 0;
 		gint _size_collection_size_ = 0;
 		gint size_it = 0;
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		size_collection = _tmp0_;
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		size_collection_length1 = _tmp0__length1;
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (size_it = 0; size_it < _tmp0__length1; size_it = size_it + 1) {
-#line 10212 "PiwigoPublishing.c"
+#line 10153 "PiwigoPublishing.c"
 			PublishingPiwigoSizeEntry* _tmp1_ = NULL;
 			PublishingPiwigoSizeEntry* size = NULL;
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp1_ = _publishing_piwigo_size_entry_ref0 (size_collection[size_it]);
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			size = _tmp1_;
-#line 10219 "PiwigoPublishing.c"
+#line 10160 "PiwigoPublishing.c"
 			{
 				GtkComboBoxText* _tmp2_ = NULL;
 				PublishingPiwigoSizeEntry* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = self->priv->size_combo;
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3_ = size;
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = _tmp3_->name;
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
-#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_size_entry_unref0 (size);
-#line 10234 "PiwigoPublishing.c"
+#line 10175 "PiwigoPublishing.c"
 			}
 		}
 	}
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp5_ = self->priv->last_photo_size;
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp5_ = self->priv->_last_photo_size;
+#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_publishing_options_pane_find_size_index (self, _tmp5_);
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	last_size_index = _tmp6_;
-#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = last_size_index;
-#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp7_ < 0) {
-#line 10248 "PiwigoPublishing.c"
+#line 10189 "PiwigoPublishing.c"
 		GtkComboBoxText* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = self->priv->size_combo;
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = publishing_piwigo_publishing_options_pane_find_size_index (self, PUBLISHING_PIWIGO_ORIGINAL_SIZE);
-#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), _tmp9_);
-#line 10257 "PiwigoPublishing.c"
+#line 10198 "PiwigoPublishing.c"
 	} else {
 		GtkComboBoxText* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = self->priv->size_combo;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = last_size_index;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_combo_box_get_type (), GtkComboBox), _tmp11_);
-#line 10267 "PiwigoPublishing.c"
+#line 10208 "PiwigoPublishing.c"
 	}
 }
 
 
-static void publishing_piwigo_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingPiwigoPublishingOptionsPane * self;
-#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 10276 "PiwigoPublishing.c"
-}
-
-
 static gint publishing_piwigo_publishing_options_pane_find_category_index (PublishingPiwigoPublishingOptionsPane* self, gint category_id) {
 	gint result = 0;
 	gint _result_ = 0;
-#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
-#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_result_ = -1;
-#line 10287 "PiwigoPublishing.c"
+#line 1492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_result_ = 0;
+#line 10220 "PiwigoPublishing.c"
 	{
 		gint i = 0;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		i = 0;
-#line 10292 "PiwigoPublishing.c"
+#line 10225 "PiwigoPublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp0_ = TRUE;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 10299 "PiwigoPublishing.c"
+#line 10232 "PiwigoPublishing.c"
 				gint _tmp2_ = 0;
-				PublishingPiwigoCategory** _tmp3_ = NULL;
-				gint _tmp3__length1 = 0;
-				PublishingPiwigoCategory** _tmp4_ = NULL;
-				gint _tmp4__length1 = 0;
+				GeeList* _tmp3_ = NULL;
+				gint _tmp4_ = 0;
 				gint _tmp5_ = 0;
-				PublishingPiwigoCategory* _tmp6_ = NULL;
+				GeeList* _tmp6_ = NULL;
 				gint _tmp7_ = 0;
-				gint _tmp8_ = 0;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				gpointer _tmp8_ = NULL;
+				PublishingPiwigoCategory* _tmp9_ = NULL;
+				gint _tmp10_ = 0;
+				gint _tmp11_ = 0;
+				gboolean _tmp12_ = FALSE;
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp0_) {
-#line 10311 "PiwigoPublishing.c"
+#line 10246 "PiwigoPublishing.c"
 					gint _tmp1_ = 0;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp1_ = i;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					i = _tmp1_ + 1;
-#line 10317 "PiwigoPublishing.c"
+#line 10252 "PiwigoPublishing.c"
 				}
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp0_ = FALSE;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = i;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp3_ = self->priv->existing_categories;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp3__length1 = self->priv->existing_categories_length1;
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (!(_tmp2_ < _tmp3__length1)) {
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp3_ = self->priv->_existing_categories;
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp5_ = _tmp4_;
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				if (!(_tmp2_ < _tmp5_)) {
+#line 1493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10331 "PiwigoPublishing.c"
+#line 10268 "PiwigoPublishing.c"
 				}
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp4_ = self->priv->existing_categories;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp4__length1 = self->priv->existing_categories_length1;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp5_ = i;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp6_ = _tmp4_[_tmp5_];
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp7_ = _tmp6_->id;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp8_ = category_id;
-#line 1530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (_tmp7_ == _tmp8_) {
-#line 10347 "PiwigoPublishing.c"
-					gint _tmp9_ = 0;
-#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_tmp9_ = i;
-#line 1531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_result_ = _tmp9_;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp6_ = self->priv->_existing_categories;
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp7_ = i;
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp8_ = gee_list_get (_tmp6_, _tmp7_);
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp9_ = (PublishingPiwigoCategory*) _tmp8_;
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp10_ = _tmp9_->id;
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp11_ = category_id;
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_tmp12_ = _tmp10_ == _tmp11_;
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_publishing_piwigo_category_unref0 (_tmp9_);
+#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				if (_tmp12_) {
+#line 10288 "PiwigoPublishing.c"
+					gint _tmp13_ = 0;
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_tmp13_ = i;
+#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+					_result_ = _tmp13_;
+#line 1496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10355 "PiwigoPublishing.c"
+#line 10296 "PiwigoPublishing.c"
 				}
 			}
 		}
 	}
-#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _result_;
-#line 1535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10364 "PiwigoPublishing.c"
+#line 10305 "PiwigoPublishing.c"
 }
 
 
 static gint publishing_piwigo_publishing_options_pane_find_permission_level_index (PublishingPiwigoPublishingOptionsPane* self, gint permission_level_id) {
 	gint result = 0;
 	gint _result_ = 0;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
-#line 1539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = -1;
-#line 10375 "PiwigoPublishing.c"
+#line 10316 "PiwigoPublishing.c"
 	{
 		gint i = 0;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		i = 0;
-#line 10380 "PiwigoPublishing.c"
+#line 10321 "PiwigoPublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp0_ = TRUE;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 10387 "PiwigoPublishing.c"
+#line 10328 "PiwigoPublishing.c"
 				gint _tmp2_ = 0;
 				PublishingPiwigoPermissionLevel** _tmp3_ = NULL;
 				gint _tmp3__length1 = 0;
@@ -10408,85 +10349,85 @@ static gint publishing_piwigo_publishing_options_pane_find_permission_level_inde
 				PublishingPiwigoPermissionLevel* _tmp6_ = NULL;
 				gint _tmp7_ = 0;
 				gint _tmp8_ = 0;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp0_) {
-#line 10399 "PiwigoPublishing.c"
+#line 10340 "PiwigoPublishing.c"
 					gint _tmp1_ = 0;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp1_ = i;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					i = _tmp1_ + 1;
-#line 10405 "PiwigoPublishing.c"
+#line 10346 "PiwigoPublishing.c"
 				}
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp0_ = FALSE;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = i;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3_ = self->priv->perm_levels;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3__length1 = self->priv->perm_levels_length1;
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!(_tmp2_ < _tmp3__length1)) {
-#line 1540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10419 "PiwigoPublishing.c"
+#line 10360 "PiwigoPublishing.c"
 				}
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = self->priv->perm_levels;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4__length1 = self->priv->perm_levels_length1;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp5_ = i;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = _tmp4_[_tmp5_];
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp7_ = _tmp6_->id;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp8_ = permission_level_id;
-#line 1541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_tmp7_ == _tmp8_) {
-#line 10435 "PiwigoPublishing.c"
+#line 10376 "PiwigoPublishing.c"
 					gint _tmp9_ = 0;
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp9_ = i;
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_result_ = _tmp9_;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10443 "PiwigoPublishing.c"
+#line 10384 "PiwigoPublishing.c"
 				}
 			}
 		}
 	}
-#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _result_;
-#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10452 "PiwigoPublishing.c"
+#line 10393 "PiwigoPublishing.c"
 }
 
 
 static gint publishing_piwigo_publishing_options_pane_find_size_index (PublishingPiwigoPublishingOptionsPane* self, gint size_id) {
 	gint result = 0;
 	gint _result_ = 0;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
-#line 1550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = -1;
-#line 10463 "PiwigoPublishing.c"
+#line 10404 "PiwigoPublishing.c"
 	{
 		gint i = 0;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		i = 0;
-#line 10468 "PiwigoPublishing.c"
+#line 10409 "PiwigoPublishing.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp0_ = TRUE;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			while (TRUE) {
-#line 10475 "PiwigoPublishing.c"
+#line 10416 "PiwigoPublishing.c"
 				gint _tmp2_ = 0;
 				PublishingPiwigoSizeEntry** _tmp3_ = NULL;
 				gint _tmp3__length1 = 0;
@@ -10496,142 +10437,417 @@ static gint publishing_piwigo_publishing_options_pane_find_size_index (Publishin
 				PublishingPiwigoSizeEntry* _tmp6_ = NULL;
 				gint _tmp7_ = 0;
 				gint _tmp8_ = 0;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!_tmp0_) {
-#line 10487 "PiwigoPublishing.c"
+#line 10428 "PiwigoPublishing.c"
 					gint _tmp1_ = 0;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp1_ = i;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					i = _tmp1_ + 1;
-#line 10493 "PiwigoPublishing.c"
+#line 10434 "PiwigoPublishing.c"
 				}
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp0_ = FALSE;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp2_ = i;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3_ = self->priv->photo_sizes;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp3__length1 = self->priv->photo_sizes_length1;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (!(_tmp2_ < _tmp3__length1)) {
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10507 "PiwigoPublishing.c"
+#line 10448 "PiwigoPublishing.c"
 				}
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4_ = self->priv->photo_sizes;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp4__length1 = self->priv->photo_sizes_length1;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp5_ = i;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp6_ = _tmp4_[_tmp5_];
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp7_ = _tmp6_->id;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp8_ = size_id;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				if (_tmp7_ == _tmp8_) {
-#line 10523 "PiwigoPublishing.c"
+#line 10464 "PiwigoPublishing.c"
 					gint _tmp9_ = 0;
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_tmp9_ = i;
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_result_ = _tmp9_;
-#line 1554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					break;
-#line 10531 "PiwigoPublishing.c"
+#line 10472 "PiwigoPublishing.c"
 				}
 			}
 		}
 	}
-#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _result_;
-#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10540 "PiwigoPublishing.c"
+#line 10481 "PiwigoPublishing.c"
 }
 
 
 static gboolean publishing_piwigo_publishing_options_pane_category_already_exists (PublishingPiwigoPublishingOptionsPane* self, const gchar* category_name) {
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	PublishingPiwigoCategory** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
-#line 1560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (category_name != NULL, FALSE);
-#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_result_ = FALSE;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0_ = self->priv->existing_categories;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp0__length1 = self->priv->existing_categories_length1;
-#line 10559 "PiwigoPublishing.c"
+#line 10494 "PiwigoPublishing.c"
 	{
-		PublishingPiwigoCategory** category_collection = NULL;
-		gint category_collection_length1 = 0;
-		gint _category_collection_size_ = 0;
-		gint category_it = 0;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		category_collection = _tmp0_;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		category_collection_length1 = _tmp0__length1;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-		for (category_it = 0; category_it < _tmp0__length1; category_it = category_it + 1) {
-#line 10571 "PiwigoPublishing.c"
-			PublishingPiwigoCategory* _tmp1_ = NULL;
+		GeeList* _category_list = NULL;
+		GeeList* _tmp0_ = NULL;
+		GeeList* _tmp1_ = NULL;
+		gint _category_size = 0;
+		GeeList* _tmp2_ = NULL;
+		gint _tmp3_ = 0;
+		gint _tmp4_ = 0;
+		gint _category_index = 0;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp0_ = self->priv->_existing_categories;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_category_list = _tmp1_;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp2_ = _category_list;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp4_ = _tmp3_;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_category_size = _tmp4_;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_category_index = -1;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		while (TRUE) {
+#line 10522 "PiwigoPublishing.c"
+			gint _tmp5_ = 0;
+			gint _tmp6_ = 0;
+			gint _tmp7_ = 0;
 			PublishingPiwigoCategory* category = NULL;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			_tmp1_ = _publishing_piwigo_category_ref0 (category_collection[category_it]);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-			category = _tmp1_;
-#line 10578 "PiwigoPublishing.c"
-			{
-				PublishingPiwigoCategory* _tmp2_ = NULL;
-				const gchar* _tmp3_ = NULL;
-				gchar* _tmp4_ = NULL;
-				gchar* _tmp5_ = NULL;
-				const gchar* _tmp6_ = NULL;
-				gboolean _tmp7_ = FALSE;
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp2_ = category;
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp3_ = _tmp2_->display_name;
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp4_ = string_strip (_tmp3_);
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp5_ = _tmp4_;
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp6_ = category_name;
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_tmp7_ = g_strcmp0 (_tmp5_, _tmp6_) == 0;
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				_g_free0 (_tmp5_);
-#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-				if (_tmp7_) {
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_result_ = TRUE;
-#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					_publishing_piwigo_category_unref0 (category);
-#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-					break;
-#line 10608 "PiwigoPublishing.c"
-				}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			GeeList* _tmp8_ = NULL;
+			gint _tmp9_ = 0;
+			gpointer _tmp10_ = NULL;
+			PublishingPiwigoCategory* _tmp11_ = NULL;
+			const gchar* _tmp12_ = NULL;
+			gchar* _tmp13_ = NULL;
+			gchar* _tmp14_ = NULL;
+			const gchar* _tmp15_ = NULL;
+			gboolean _tmp16_ = FALSE;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp5_ = _category_index;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_category_index = _tmp5_ + 1;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp6_ = _category_index;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp7_ = _category_size;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			if (!(_tmp6_ < _tmp7_)) {
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				break;
+#line 10548 "PiwigoPublishing.c"
+			}
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp8_ = _category_list;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp9_ = _category_index;
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			category = (PublishingPiwigoCategory*) _tmp10_;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp11_ = category;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp12_ = _tmp11_->display_name;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp13_ = string_strip (_tmp12_);
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp14_ = _tmp13_;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp15_ = category_name;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_tmp16_ = g_strcmp0 (_tmp14_, _tmp15_) == 0;
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_g_free0 (_tmp14_);
+#line 1527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			if (_tmp16_) {
+#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				_result_ = TRUE;
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_piwigo_category_unref0 (category);
-#line 10612 "PiwigoPublishing.c"
+#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+				break;
+#line 10580 "PiwigoPublishing.c"
 			}
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+			_publishing_piwigo_category_unref0 (category);
+#line 10584 "PiwigoPublishing.c"
 		}
+#line 1526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_object_unref0 (_category_list);
+#line 10588 "PiwigoPublishing.c"
 	}
-#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _result_;
-#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 10594 "PiwigoPublishing.c"
+}
+
+
+static gint publishing_piwigo_publishing_options_pane_get_last_category (PublishingPiwigoPublishingOptionsPane* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_last_category;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp0_;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 10609 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_last_category (PublishingPiwigoPublishingOptionsPane* self, gint value) {
+	gint _tmp0_ = 0;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_last_category = _tmp0_;
+#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "last-category");
+#line 10623 "PiwigoPublishing.c"
+}
+
+
+static gint publishing_piwigo_publishing_options_pane_get_last_permission_level (PublishingPiwigoPublishingOptionsPane* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_last_permission_level;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp0_;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 10638 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_last_permission_level (PublishingPiwigoPublishingOptionsPane* self, gint value) {
+	gint _tmp0_ = 0;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_last_permission_level = _tmp0_;
+#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "last-permission-level");
+#line 10652 "PiwigoPublishing.c"
+}
+
+
+static gint publishing_piwigo_publishing_options_pane_get_last_photo_size (PublishingPiwigoPublishingOptionsPane* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), 0);
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_last_photo_size;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp0_;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 10667 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_last_photo_size (PublishingPiwigoPublishingOptionsPane* self, gint value) {
+	gint _tmp0_ = 0;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_last_photo_size = _tmp0_;
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "last-photo-size");
+#line 10681 "PiwigoPublishing.c"
+}
+
+
+static gboolean publishing_piwigo_publishing_options_pane_get_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self) {
+	gboolean result;
+	gboolean _tmp0_ = FALSE;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_last_title_as_comment;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp0_;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 10696 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_last_title_as_comment (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
+	gboolean _tmp0_ = FALSE;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_last_title_as_comment = _tmp0_;
+#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "last-title-as-comment");
+#line 10710 "PiwigoPublishing.c"
+}
+
+
+static gboolean publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self) {
+	gboolean result;
+	gboolean _tmp0_ = FALSE;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_last_no_upload_tags;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp0_;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 10725 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
+	gboolean _tmp0_ = FALSE;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_last_no_upload_tags = _tmp0_;
+#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "last-no-upload-tags");
+#line 10739 "PiwigoPublishing.c"
+}
+
+
+static gboolean publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self) {
+	gboolean result;
+	gboolean _tmp0_ = FALSE;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_strip_metadata_enabled;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp0_;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 10754 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (PublishingPiwigoPublishingOptionsPane* self, gboolean value) {
+	gboolean _tmp0_ = FALSE;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_strip_metadata_enabled = _tmp0_;
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "strip-metadata-enabled");
+#line 10768 "PiwigoPublishing.c"
+}
+
+
+static GeeList* publishing_piwigo_publishing_options_pane_get_existing_categories (PublishingPiwigoPublishingOptionsPane* self) {
+	GeeList* result;
+	GeeList* _tmp0_ = NULL;
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_existing_categories;
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp0_;
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10620 "PiwigoPublishing.c"
+#line 10783 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_existing_categories (PublishingPiwigoPublishingOptionsPane* self, GeeList* value) {
+	GeeList* _tmp0_ = NULL;
+	GeeList* _tmp1_ = NULL;
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->_existing_categories);
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_existing_categories = _tmp1_;
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "existing-categories");
+#line 10802 "PiwigoPublishing.c"
+}
+
+
+static const gchar* publishing_piwigo_publishing_options_pane_get_default_comment (PublishingPiwigoPublishingOptionsPane* self) {
+	const gchar* result;
+	const gchar* _tmp0_ = NULL;
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = self->priv->_default_comment;
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	result = _tmp0_;
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	return result;
+#line 10817 "PiwigoPublishing.c"
+}
+
+
+static void publishing_piwigo_publishing_options_pane_set_default_comment (PublishingPiwigoPublishingOptionsPane* self, const gchar* value) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_return_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_OPTIONS_PANE (self));
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp0_ = value;
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (self->priv->_default_comment);
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->_default_comment = _tmp1_;
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_notify ((GObject *) self, "default-comment");
+#line 10836 "PiwigoPublishing.c"
 }
 
 
@@ -10642,130 +10858,135 @@ static void g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETER
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data1 = closure->data;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 10639 "PiwigoPublishing.c"
+#line 10855 "PiwigoPublishing.c"
 	} else {
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		data2 = closure->data;
-#line 10645 "PiwigoPublishing.c"
+#line 10861 "PiwigoPublishing.c"
 	}
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback = (GMarshalFunc_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	callback (data1, publishing_piwigo_value_get_publishing_parameters (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 10651 "PiwigoPublishing.c"
+#line 10867 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_class_init (PublishingPiwigoPublishingOptionsPaneClass * klass) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoPublishingOptionsPanePrivate));
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	((GObjectClass *) klass)->constructed = publishing_piwigo_publishing_options_pane_real_constructed;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	((ShotwellPluginsCommonBuilderPaneClass *) klass)->on_pane_installed = publishing_piwigo_publishing_options_pane_real_on_pane_installed;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	G_OBJECT_CLASS (klass)->get_property = _vala_publishing_piwigo_publishing_options_pane_get_property;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	G_OBJECT_CLASS (klass)->set_property = _vala_publishing_piwigo_publishing_options_pane_set_property;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_piwigo_publishing_options_pane_finalize;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY, g_param_spec_int ("last-category", "last-category", "last-category", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL, g_param_spec_int ("last-permission-level", "last-permission-level", "last-permission-level", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE, g_param_spec_int ("last-photo-size", "last-photo-size", "last-photo-size", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT, g_param_spec_boolean ("last-title-as-comment", "last-title-as-comment", "last-title-as-comment", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS, g_param_spec_boolean ("last-no-upload-tags", "last-no-upload-tags", "last-no-upload-tags", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED, g_param_spec_boolean ("strip-metadata-enabled", "strip-metadata-enabled", "strip-metadata-enabled", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES, g_param_spec_object ("existing-categories", "existing-categories", "existing-categories", GEE_TYPE_LIST, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT, g_param_spec_string ("default-comment", "default-comment", "default-comment", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_new ("publish", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PUBLISHING_PIWIGO_PUBLISHING_PARAMETERS_BOOLEAN, G_TYPE_NONE, 2, PUBLISHING_PIWIGO_TYPE_PUBLISHING_PARAMETERS, G_TYPE_BOOLEAN);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = _ ("Shotwell Connect");
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_publishing_options_pane_DEFAULT_CATEGORY_NAME = _tmp1_;
-#line 10674 "PiwigoPublishing.c"
-}
-
-
-static void publishing_piwigo_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_piwigo_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_get_widget;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_get_preferred_geometry;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_on_pane_installed;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_piwigo_publishing_options_pane_real_on_pane_uninstalled;
-#line 10689 "PiwigoPublishing.c"
+#line 10914 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_instance_init (PublishingPiwigoPublishingOptionsPane * self) {
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->pane_widget = NULL;
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->strip_metadata_check = NULL;
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->title_as_comment_check = NULL;
-#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->no_upload_tags_check = NULL;
-#line 10704 "PiwigoPublishing.c"
+#line 10927 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_publishing_options_pane_finalize (GObject* obj) {
 	PublishingPiwigoPublishingOptionsPane * self;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 1213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->use_existing_radio);
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->create_new_radio);
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->existing_categories_combo);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->new_category_entry);
-#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->within_existing_label);
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->within_existing_combo);
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->perms_combo);
-#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->title_as_comment_check);
-#line 1223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->no_upload_tags_check);
-#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->album_comment);
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (self->priv->album_comment_label);
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->existing_categories = (_vala_array_free (self->priv->existing_categories, self->priv->existing_categories_length1, (GDestroyNotify) publishing_piwigo_category_unref), NULL);
-#line 1230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->perm_levels = (_vala_array_free (self->priv->perm_levels, self->priv->perm_levels_length1, (GDestroyNotify) publishing_piwigo_permission_level_unref), NULL);
-#line 1231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	self->priv->photo_sizes = (_vala_array_free (self->priv->photo_sizes, self->priv->photo_sizes_length1, (GDestroyNotify) publishing_piwigo_size_entry_unref), NULL);
 #line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	self->priv->photo_sizes = (_vala_array_free (self->priv->photo_sizes, self->priv->photo_sizes_length1, (GDestroyNotify) publishing_piwigo_size_entry_unref), NULL);
+#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_object_unref0 (self->priv->_existing_categories);
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (self->priv->_default_comment);
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	G_OBJECT_CLASS (publishing_piwigo_publishing_options_pane_parent_class)->finalize (obj);
-#line 10754 "PiwigoPublishing.c"
+#line 10975 "PiwigoPublishing.c"
 }
 
 
@@ -10776,30 +10997,156 @@ GType publishing_piwigo_publishing_options_pane_get_type (void) {
 	static volatile gsize publishing_piwigo_publishing_options_pane_type_id__volatile = 0;
 	if (g_once_init_enter (&publishing_piwigo_publishing_options_pane_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PublishingPiwigoPublishingOptionsPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_piwigo_publishing_options_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPiwigoPublishingOptionsPane), 0, (GInstanceInitFunc) publishing_piwigo_publishing_options_pane_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_piwigo_publishing_options_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
 		GType publishing_piwigo_publishing_options_pane_type_id;
-		publishing_piwigo_publishing_options_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingPiwigoPublishingOptionsPane", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_piwigo_publishing_options_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+		publishing_piwigo_publishing_options_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, "PublishingPiwigoPublishingOptionsPane", &g_define_type_info, 0);
 		g_once_init_leave (&publishing_piwigo_publishing_options_pane_type_id__volatile, publishing_piwigo_publishing_options_pane_type_id);
 	}
 	return publishing_piwigo_publishing_options_pane_type_id__volatile;
 }
 
 
+static void _vala_publishing_piwigo_publishing_options_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+	PublishingPiwigoPublishingOptionsPane * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	switch (property_id) {
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_set_int (value, publishing_piwigo_publishing_options_pane_get_last_category (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_set_int (value, publishing_piwigo_publishing_options_pane_get_last_permission_level (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_set_int (value, publishing_piwigo_publishing_options_pane_get_last_photo_size (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_set_boolean (value, publishing_piwigo_publishing_options_pane_get_last_title_as_comment (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_set_boolean (value, publishing_piwigo_publishing_options_pane_get_last_no_upload_tags (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_set_boolean (value, publishing_piwigo_publishing_options_pane_get_strip_metadata_enabled (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_set_object (value, publishing_piwigo_publishing_options_pane_get_existing_categories (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		g_value_set_string (value, publishing_piwigo_publishing_options_pane_get_default_comment (self));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 11047 "PiwigoPublishing.c"
+		default:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 11053 "PiwigoPublishing.c"
+	}
+}
+
+
+static void _vala_publishing_piwigo_publishing_options_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+	PublishingPiwigoPublishingOptionsPane * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, PUBLISHING_PIWIGO_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPiwigoPublishingOptionsPane);
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	switch (property_id) {
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_CATEGORY:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_publishing_options_pane_set_last_category (self, g_value_get_int (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PERMISSION_LEVEL:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_publishing_options_pane_set_last_permission_level (self, g_value_get_int (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_PHOTO_SIZE:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_publishing_options_pane_set_last_photo_size (self, g_value_get_int (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_TITLE_AS_COMMENT:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_publishing_options_pane_set_last_title_as_comment (self, g_value_get_boolean (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_LAST_NO_UPLOAD_TAGS:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_publishing_options_pane_set_last_no_upload_tags (self, g_value_get_boolean (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_STRIP_METADATA_ENABLED:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_publishing_options_pane_set_strip_metadata_enabled (self, g_value_get_boolean (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_EXISTING_CATEGORIES:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_publishing_options_pane_set_existing_categories (self, g_value_get_object (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		case PUBLISHING_PIWIGO_PUBLISHING_OPTIONS_PANE_DEFAULT_COMMENT:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		publishing_piwigo_publishing_options_pane_set_default_comment (self, g_value_get_string (value));
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 11111 "PiwigoPublishing.c"
+		default:
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		break;
+#line 11117 "PiwigoPublishing.c"
+	}
+}
+
+
 PublishingPiwigoSession* publishing_piwigo_session_construct (GType object_type) {
 	PublishingPiwigoSession* self = NULL;
-#line 1584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSession*) publishing_rest_support_session_construct (object_type, "");
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 10781 "PiwigoPublishing.c"
+#line 11128 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSession* publishing_piwigo_session_new (void) {
-#line 1583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_construct (PUBLISHING_PIWIGO_TYPE_SESSION);
-#line 10788 "PiwigoPublishing.c"
+#line 11135 "PiwigoPublishing.c"
 }
 
 
@@ -10809,43 +11156,43 @@ static gboolean publishing_piwigo_session_real_is_authenticated (PublishingRESTS
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	const gchar* _tmp2_ = NULL;
-#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = self->priv->pwg_id;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp2_ != NULL) {
-#line 10804 "PiwigoPublishing.c"
+#line 11151 "PiwigoPublishing.c"
 		const gchar* _tmp3_ = NULL;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = self->priv->pwg_url;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 10810 "PiwigoPublishing.c"
+#line 11157 "PiwigoPublishing.c"
 	} else {
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp1_ = FALSE;
-#line 10814 "PiwigoPublishing.c"
+#line 11161 "PiwigoPublishing.c"
 	}
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp1_) {
-#line 10818 "PiwigoPublishing.c"
+#line 11165 "PiwigoPublishing.c"
 		const gchar* _tmp4_ = NULL;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = self->priv->username;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 10824 "PiwigoPublishing.c"
+#line 11171 "PiwigoPublishing.c"
 	} else {
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp0_ = FALSE;
-#line 10828 "PiwigoPublishing.c"
+#line 11175 "PiwigoPublishing.c"
 	}
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp0_;
-#line 1588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10834 "PiwigoPublishing.c"
+#line 11181 "PiwigoPublishing.c"
 }
 
 
@@ -10856,58 +11203,58 @@ void publishing_piwigo_session_authenticate (PublishingPiwigoSession* self, cons
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (url != NULL);
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (username != NULL);
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (id != NULL);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = url;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_url);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_url = _tmp1_;
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = username;
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->username = _tmp3_;
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = id;
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_id);
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_id = _tmp5_;
-#line 10877 "PiwigoPublishing.c"
+#line 11224 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_session_deauthenticate (PublishingPiwigoSession* self) {
-#line 1597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
-#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_url);
-#line 1598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_url = NULL;
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_id);
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_id = NULL;
-#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->username = NULL;
-#line 10896 "PiwigoPublishing.c"
+#line 11243 "PiwigoPublishing.c"
 }
 
 
@@ -10915,17 +11262,17 @@ gchar* publishing_piwigo_session_get_username (PublishingPiwigoSession* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL);
-#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->username;
-#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 1604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10914 "PiwigoPublishing.c"
+#line 11261 "PiwigoPublishing.c"
 }
 
 
@@ -10933,17 +11280,17 @@ gchar* publishing_piwigo_session_get_pwg_url (PublishingPiwigoSession* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL);
-#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->pwg_url;
-#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10932 "PiwigoPublishing.c"
+#line 11279 "PiwigoPublishing.c"
 }
 
 
@@ -10951,78 +11298,78 @@ gchar* publishing_piwigo_session_get_pwg_id (PublishingPiwigoSession* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self), NULL);
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = self->priv->pwg_id;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp1_;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 10950 "PiwigoPublishing.c"
+#line 11297 "PiwigoPublishing.c"
 }
 
 
 void publishing_piwigo_session_set_pwg_id (PublishingPiwigoSession* self, const gchar* id) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (PUBLISHING_PIWIGO_IS_SESSION (self));
-#line 1615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_if_fail (id != NULL);
-#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = id;
-#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_id);
-#line 1616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_id = _tmp1_;
-#line 10969 "PiwigoPublishing.c"
+#line 11316 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_class_init (PublishingPiwigoSessionClass * klass) {
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_parent_class = g_type_class_peek_parent (klass);
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_piwigo_session_finalize;
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoSessionPrivate));
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_piwigo_session_real_is_authenticated;
-#line 10982 "PiwigoPublishing.c"
+#line 11329 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_instance_init (PublishingPiwigoSession * self) {
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_SESSION_GET_PRIVATE (self);
-#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_url = NULL;
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->pwg_id = NULL;
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->username = NULL;
-#line 10995 "PiwigoPublishing.c"
+#line 11342 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_finalize (PublishingRESTSupportSession* obj) {
 	PublishingPiwigoSession * self;
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_SESSION, PublishingPiwigoSession);
-#line 1579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_url);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->pwg_id);
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 1578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_piwigo_session_parent_class)->finalize (obj);
-#line 11011 "PiwigoPublishing.c"
+#line 11358 "PiwigoPublishing.c"
 }
 
 
@@ -11047,52 +11394,52 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct (GType obje
 	PublishingPiwigoSession* _tmp0_ = NULL;
 	PublishingPiwigoSession* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = session;
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp2_) {
-#line 11048 "PiwigoPublishing.c"
+#line 11395 "PiwigoPublishing.c"
 		PublishingPiwigoSession* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = session;
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = publishing_piwigo_session_get_pwg_id (_tmp3_);
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = _tmp4_;
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = g_strconcat ("pwg_id=", _tmp5_, NULL);
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp7_);
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 11070 "PiwigoPublishing.c"
+#line 11417 "PiwigoPublishing.c"
 	}
-#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11074 "PiwigoPublishing.c"
+#line 11421 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoTransaction* publishing_piwigo_transaction_new (PublishingPiwigoSession* session) {
-#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_transaction_construct (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session);
-#line 11081 "PiwigoPublishing.c"
+#line 11428 "PiwigoPublishing.c"
 }
 
 
@@ -11107,46 +11454,46 @@ PublishingPiwigoTransaction* publishing_piwigo_transaction_construct_authenticat
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = session;
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_piwigo_session_get_pwg_url (_tmp1_);
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = session;
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = publishing_piwigo_session_get_pwg_id (_tmp4_);
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = g_strconcat ("pwg_id=", _tmp6_, NULL);
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp8_);
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 1638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11128 "PiwigoPublishing.c"
+#line 11475 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoTransaction* publishing_piwigo_transaction_new_authenticated (PublishingPiwigoSession* session) {
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_transaction_construct_authenticated (PUBLISHING_PIWIGO_TYPE_TRANSACTION, session);
-#line 11135 "PiwigoPublishing.c"
+#line 11482 "PiwigoPublishing.c"
 }
 
 
@@ -11170,143 +11517,143 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 	gchar* _tmp18_ = NULL;
 	gchar* _tmp19_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = doc;
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	root = _tmp1_;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = root;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat");
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	status = _tmp3_;
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = status;
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp4_ == NULL) {
-#line 11177 "PiwigoPublishing.c"
+#line 11524 "PiwigoPublishing.c"
 		gchar* _tmp5_ = NULL;
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = g_strdup ("No status property in root node");
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result = _tmp5_;
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (status);
-#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 11187 "PiwigoPublishing.c"
+#line 11534 "PiwigoPublishing.c"
 	}
-#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = status;
-#line 1649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_strcmp0 (_tmp6_, "ok") == 0) {
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result = NULL;
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (status);
-#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 11199 "PiwigoPublishing.c"
+#line 11546 "PiwigoPublishing.c"
 	}
 	{
 		xmlNode* _tmp7_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
 		xmlNode* _tmp9_ = NULL;
 		xmlNode* _tmp10_ = NULL;
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = doc;
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = root;
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_);
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = _tmp10_;
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 11218 "PiwigoPublishing.c"
-				goto __catch47_spit_publishing_publishing_error;
+#line 11565 "PiwigoPublishing.c"
+				goto __catch44_spit_publishing_publishing_error;
 			}
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (status);
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return NULL;
-#line 11229 "PiwigoPublishing.c"
+#line 11576 "PiwigoPublishing.c"
 		}
-#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		errcode = _tmp7_;
-#line 11233 "PiwigoPublishing.c"
+#line 11580 "PiwigoPublishing.c"
 	}
-	goto __finally47;
-	__catch47_spit_publishing_publishing_error:
+	goto __finally44;
+	__catch44_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp11_ = NULL;
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = g_strdup ("No error code specified");
-#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result = _tmp11_;
-#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (status);
-#line 1656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 11254 "PiwigoPublishing.c"
+#line 11601 "PiwigoPublishing.c"
 	}
-	__finally47:
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	__finally44:
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (status);
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return NULL;
-#line 11267 "PiwigoPublishing.c"
+#line 11614 "PiwigoPublishing.c"
 	}
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = errcode;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg");
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = errcode;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code");
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp17_ = _tmp16_;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_);
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp19_ = _tmp18_;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp17_);
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp14_);
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp19_;
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (status);
-#line 1659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11295 "PiwigoPublishing.c"
+#line 11642 "PiwigoPublishing.c"
 }
 
 
@@ -11319,93 +11666,93 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 	xmlNode* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = doc;
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	root = _tmp1_;
-#line 11316 "PiwigoPublishing.c"
+#line 11663 "PiwigoPublishing.c"
 	{
 		xmlNode* _tmp2_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp3_ = NULL;
 		xmlNode* _tmp4_ = NULL;
 		xmlNode* _tmp5_ = NULL;
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = doc;
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = root;
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = publishing_rest_support_xml_document_get_named_child (_tmp3_, _tmp4_, "err", &_inner_error_);
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp2_ = _tmp5_;
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 11334 "PiwigoPublishing.c"
-				goto __catch48_spit_publishing_publishing_error;
+#line 11681 "PiwigoPublishing.c"
+				goto __catch45_spit_publishing_publishing_error;
 			}
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			return NULL;
-#line 11343 "PiwigoPublishing.c"
+#line 11690 "PiwigoPublishing.c"
 		}
-#line 1666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		errcode = _tmp2_;
-#line 11347 "PiwigoPublishing.c"
+#line 11694 "PiwigoPublishing.c"
 	}
-	goto __finally48;
-	__catch48_spit_publishing_publishing_error:
+	goto __finally45;
+	__catch45_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		err = _inner_error_;
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_inner_error_ = NULL;
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp6_ = g_strdup ("0");
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		result = _tmp6_;
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_error_free0 (err);
-#line 1668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return result;
-#line 11366 "PiwigoPublishing.c"
+#line 11713 "PiwigoPublishing.c"
 	}
-	__finally48:
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	__finally45:
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		return NULL;
-#line 11377 "PiwigoPublishing.c"
+#line 11724 "PiwigoPublishing.c"
 	}
-#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = errcode;
-#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp8_ = (gchar*) xmlGetProp (_tmp7_, (xmlChar*) "code");
-#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	result = _tmp8_;
-#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return result;
-#line 11387 "PiwigoPublishing.c"
+#line 11734 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_transaction_class_init (PublishingPiwigoTransactionClass * klass) {
-#line 1628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11394 "PiwigoPublishing.c"
+#line 11741 "PiwigoPublishing.c"
 }
 
 
@@ -11439,47 +11786,47 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (username != NULL, NULL);
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (password != NULL, NULL);
-#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = url;
-#line 1679 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.login");
-#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = username;
-#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "username", _tmp2_);
-#line 1683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = password;
-#line 1683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "password", _tmp3_);
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11454 "PiwigoPublishing.c"
+#line 11801 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password) {
-#line 1678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_login_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, url, username, password);
-#line 11461 "PiwigoPublishing.c"
+#line 11808 "PiwigoPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 11468 "PiwigoPublishing.c"
+#line 11815 "PiwigoPublishing.c"
 }
 
 
@@ -11492,87 +11839,87 @@ PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transac
 	PublishingPiwigoTransaction* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
 	PublishingRESTSupportArgument** _tmp6_ = NULL;
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_TRANSACTION (other), NULL);
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = other;
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSessionLoginTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = other;
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp5_);
-#line 11501 "PiwigoPublishing.c"
+#line 11848 "PiwigoPublishing.c"
 	{
 		PublishingRESTSupportArgument** argument_collection = NULL;
 		gint argument_collection_length1 = 0;
 		gint _argument_collection_size_ = 0;
 		gint argument_it = 0;
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		argument_collection = _tmp6_;
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		argument_collection_length1 = _tmp5_;
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		for (argument_it = 0; argument_it < _tmp5_; argument_it = argument_it + 1) {
-#line 11513 "PiwigoPublishing.c"
+#line 11860 "PiwigoPublishing.c"
 			PublishingRESTSupportArgument* _tmp7_ = NULL;
 			PublishingRESTSupportArgument* argument = NULL;
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp7_ = _publishing_rest_support_argument_ref0 (argument_collection[argument_it]);
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			argument = _tmp7_;
-#line 11520 "PiwigoPublishing.c"
+#line 11867 "PiwigoPublishing.c"
 			{
 				PublishingRESTSupportArgument* _tmp8_ = NULL;
 				const gchar* _tmp9_ = NULL;
 				PublishingRESTSupportArgument* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
-#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp8_ = argument;
-#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp9_ = _tmp8_->key;
-#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp10_ = argument;
-#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp11_ = _tmp10_->value;
-#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp9_, _tmp11_);
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_argument_unref0 (argument);
-#line 11538 "PiwigoPublishing.c"
+#line 11885 "PiwigoPublishing.c"
 			}
 		}
-#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		argument_collection = (_vala_array_free (argument_collection, argument_collection_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 11543 "PiwigoPublishing.c"
+#line 11890 "PiwigoPublishing.c"
 	}
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11547 "PiwigoPublishing.c"
+#line 11894 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new_from_other (PublishingPiwigoSession* session, PublishingPiwigoTransaction* other) {
-#line 1686 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_login_transaction_construct_from_other (PUBLISHING_PIWIGO_TYPE_SESSION_LOGIN_TRANSACTION, session, other);
-#line 11554 "PiwigoPublishing.c"
+#line 11901 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_login_transaction_class_init (PublishingPiwigoSessionLoginTransactionClass * klass) {
-#line 1677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_login_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11561 "PiwigoPublishing.c"
+#line 11908 "PiwigoPublishing.c"
 }
 
 
@@ -11604,77 +11951,77 @@ PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_statu
 	gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (pwg_id != NULL, NULL);
-#line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = url;
-#line 1700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = session;
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_session_get_pwg_id (_tmp2_);
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = g_strconcat ("pwg_id=", _tmp4_, NULL);
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp6_);
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp6_);
-#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp4_);
-#line 1703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11625 "PiwigoPublishing.c"
+#line 11972 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new_unauthenticated (PublishingPiwigoSession* session, const gchar* url, const gchar* pwg_id) {
-#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_get_status_transaction_construct_unauthenticated (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session, url, pwg_id);
-#line 11632 "PiwigoPublishing.c"
+#line 11979 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
 	PublishingPiwigoSessionGetStatusTransaction* self = NULL;
 	PublishingPiwigoSession* _tmp0_ = NULL;
-#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSessionGetStatusTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
-#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.getStatus");
-#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11649 "PiwigoPublishing.c"
+#line 11996 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionGetStatusTransaction* publishing_piwigo_session_get_status_transaction_new (PublishingPiwigoSession* session) {
-#line 1706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_get_status_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_GET_STATUS_TRANSACTION, session);
-#line 11656 "PiwigoPublishing.c"
+#line 12003 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_get_status_transaction_class_init (PublishingPiwigoSessionGetStatusTransactionClass * klass) {
-#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_get_status_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11663 "PiwigoPublishing.c"
+#line 12010 "PiwigoPublishing.c"
 }
 
 
@@ -11700,33 +12047,33 @@ GType publishing_piwigo_session_get_status_transaction_get_type (void) {
 PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
 	PublishingPiwigoCategoriesGetListTransaction* self = NULL;
 	PublishingPiwigoSession* _tmp0_ = NULL;
-#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoCategoriesGetListTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
-#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.categories.getList");
-#line 1721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "recursive", "true");
-#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11701 "PiwigoPublishing.c"
+#line 12048 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategoriesGetListTransaction* publishing_piwigo_categories_get_list_transaction_new (PublishingPiwigoSession* session) {
-#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_categories_get_list_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_GET_LIST_TRANSACTION, session);
-#line 11708 "PiwigoPublishing.c"
+#line 12055 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_categories_get_list_transaction_class_init (PublishingPiwigoCategoriesGetListTransactionClass * klass) {
-#line 1716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_categories_get_list_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11715 "PiwigoPublishing.c"
+#line 12062 "PiwigoPublishing.c"
 }
 
 
@@ -11752,31 +12099,31 @@ GType publishing_piwigo_categories_get_list_transaction_get_type (void) {
 PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_construct (GType object_type, PublishingPiwigoSession* session) {
 	PublishingPiwigoSessionLogoutTransaction* self = NULL;
 	PublishingPiwigoSession* _tmp0_ = NULL;
-#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoSessionLogoutTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
-#line 1729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.session.logout");
-#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11751 "PiwigoPublishing.c"
+#line 12098 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoSessionLogoutTransaction* publishing_piwigo_session_logout_transaction_new (PublishingPiwigoSession* session) {
-#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_session_logout_transaction_construct (PUBLISHING_PIWIGO_TYPE_SESSION_LOGOUT_TRANSACTION, session);
-#line 11758 "PiwigoPublishing.c"
+#line 12105 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_session_logout_transaction_class_init (PublishingPiwigoSessionLogoutTransactionClass * klass) {
-#line 1725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_session_logout_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11765 "PiwigoPublishing.c"
+#line 12112 "PiwigoPublishing.c"
 }
 
 
@@ -11802,69 +12149,69 @@ PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_trans
 	const gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	const gchar* _tmp6_ = NULL;
-#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (category != NULL, NULL);
-#line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoCategoriesAddTransaction*) publishing_piwigo_transaction_construct_authenticated (object_type, _tmp0_);
-#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.categories.add");
-#line 1738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = category;
-#line 1738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp1_);
-#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = parent_id;
-#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp2_ != 0) {
-#line 11809 "PiwigoPublishing.c"
+#line 12156 "PiwigoPublishing.c"
 		gint _tmp3_ = 0;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp3_ = parent_id;
-#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp4_ = g_strdup_printf ("%i", _tmp3_);
-#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp5_ = _tmp4_;
-#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "parent", _tmp5_);
-#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 11823 "PiwigoPublishing.c"
+#line 12170 "PiwigoPublishing.c"
 	}
-#line 1744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = comment;
-#line 1744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_strcmp0 (_tmp6_, "") != 0) {
-#line 11829 "PiwigoPublishing.c"
+#line 12176 "PiwigoPublishing.c"
 		const gchar* _tmp7_ = NULL;
-#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = comment;
-#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp7_);
-#line 11835 "PiwigoPublishing.c"
+#line 12182 "PiwigoPublishing.c"
 	}
-#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 11839 "PiwigoPublishing.c"
+#line 12186 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoCategoriesAddTransaction* publishing_piwigo_categories_add_transaction_new (PublishingPiwigoSession* session, const gchar* category, gint parent_id, const gchar* comment) {
-#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_categories_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_CATEGORIES_ADD_TRANSACTION, session, category, parent_id, comment);
-#line 11846 "PiwigoPublishing.c"
+#line 12193 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_categories_add_transaction_class_init (PublishingPiwigoCategoriesAddTransactionClass * klass) {
-#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_categories_add_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 11853 "PiwigoPublishing.c"
+#line 12200 "PiwigoPublishing.c"
 }
 
 
@@ -11897,7 +12244,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	if (_tmp0_ == NULL) {
 #line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
-#line 11886 "PiwigoPublishing.c"
+#line 12233 "PiwigoPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
@@ -11907,7 +12254,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	if (_tmp3_ != NULL) {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 11896 "PiwigoPublishing.c"
+#line 12243 "PiwigoPublishing.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
@@ -11917,13 +12264,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp4__length1 = str_array_length1;
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 11906 "PiwigoPublishing.c"
+#line 12253 "PiwigoPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 11912 "PiwigoPublishing.c"
+#line 12259 "PiwigoPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
@@ -11934,7 +12281,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp6__length1 = str_array_length1;
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 11923 "PiwigoPublishing.c"
+#line 12270 "PiwigoPublishing.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
@@ -11946,19 +12293,19 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp8_ = _tmp7_[0];
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 11935 "PiwigoPublishing.c"
+#line 12282 "PiwigoPublishing.c"
 		} else {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 11939 "PiwigoPublishing.c"
+#line 12286 "PiwigoPublishing.c"
 		}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 11943 "PiwigoPublishing.c"
+#line 12290 "PiwigoPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 11947 "PiwigoPublishing.c"
+#line 12294 "PiwigoPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
 		gint _tmp31_ = 0;
@@ -11981,7 +12328,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp62_ = NULL;
 #line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 11970 "PiwigoPublishing.c"
+#line 12317 "PiwigoPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -11990,7 +12337,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp9_ = TRUE;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 11979 "PiwigoPublishing.c"
+#line 12326 "PiwigoPublishing.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
 				gchar** _tmp13_ = NULL;
@@ -12003,13 +12350,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gsize _tmp30_ = 0UL;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
-#line 11992 "PiwigoPublishing.c"
+#line 12339 "PiwigoPublishing.c"
 					gint _tmp10_ = 0;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 11998 "PiwigoPublishing.c"
+#line 12345 "PiwigoPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
@@ -12019,7 +12366,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp13__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 12008 "PiwigoPublishing.c"
+#line 12355 "PiwigoPublishing.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
@@ -12031,17 +12378,17 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp15__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 12020 "PiwigoPublishing.c"
+#line 12367 "PiwigoPublishing.c"
 				} else {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 12024 "PiwigoPublishing.c"
+#line 12371 "PiwigoPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 12030 "PiwigoPublishing.c"
+#line 12377 "PiwigoPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
@@ -12052,7 +12399,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp17__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 12041 "PiwigoPublishing.c"
+#line 12388 "PiwigoPublishing.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
@@ -12067,21 +12414,21 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 						_tmp20_ = _tmp18_[_tmp19_];
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 12056 "PiwigoPublishing.c"
+#line 12403 "PiwigoPublishing.c"
 					} else {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 12060 "PiwigoPublishing.c"
+#line 12407 "PiwigoPublishing.c"
 					}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 12064 "PiwigoPublishing.c"
+#line 12411 "PiwigoPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
-#line 12070 "PiwigoPublishing.c"
+#line 12417 "PiwigoPublishing.c"
 				}
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
@@ -12093,7 +12440,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp24_ = _tmp22_[_tmp23_];
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 12082 "PiwigoPublishing.c"
+#line 12429 "PiwigoPublishing.c"
 					gchar** _tmp25_ = NULL;
 					gint _tmp25__length1 = 0;
 					gint _tmp26_ = 0;
@@ -12114,24 +12461,24 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp29_ = _tmp28_;
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 12103 "PiwigoPublishing.c"
+#line 12450 "PiwigoPublishing.c"
 				} else {
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 12107 "PiwigoPublishing.c"
+#line 12454 "PiwigoPublishing.c"
 				}
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 12113 "PiwigoPublishing.c"
+#line 12460 "PiwigoPublishing.c"
 			}
 		}
 #line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
 #line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 12120 "PiwigoPublishing.c"
+#line 12467 "PiwigoPublishing.c"
 			gchar* _tmp32_ = NULL;
 #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
@@ -12139,7 +12486,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			result = _tmp32_;
 #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
-#line 12128 "PiwigoPublishing.c"
+#line 12475 "PiwigoPublishing.c"
 		}
 #line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
@@ -12177,7 +12524,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
 #line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 12166 "PiwigoPublishing.c"
+#line 12513 "PiwigoPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -12186,7 +12533,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp46_ = TRUE;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 12175 "PiwigoPublishing.c"
+#line 12522 "PiwigoPublishing.c"
 				gint _tmp48_ = 0;
 				gchar** _tmp49_ = NULL;
 				gint _tmp49__length1 = 0;
@@ -12202,13 +12549,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				void* _tmp61_ = NULL;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
-#line 12191 "PiwigoPublishing.c"
+#line 12538 "PiwigoPublishing.c"
 					gint _tmp47_ = 0;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 12197 "PiwigoPublishing.c"
+#line 12544 "PiwigoPublishing.c"
 				}
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
@@ -12222,7 +12569,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				if (!(_tmp48_ < _tmp49__length1)) {
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
-#line 12211 "PiwigoPublishing.c"
+#line 12558 "PiwigoPublishing.c"
 				}
 #line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
@@ -12242,7 +12589,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp56_ = _tmp54_[_tmp55_];
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 12231 "PiwigoPublishing.c"
+#line 12578 "PiwigoPublishing.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
@@ -12257,11 +12604,11 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp59_ = _tmp57_[_tmp58_];
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 12246 "PiwigoPublishing.c"
+#line 12593 "PiwigoPublishing.c"
 				} else {
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 12250 "PiwigoPublishing.c"
+#line 12597 "PiwigoPublishing.c"
 				}
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
@@ -12269,7 +12616,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 12258 "PiwigoPublishing.c"
+#line 12605 "PiwigoPublishing.c"
 			}
 		}
 #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -12280,7 +12627,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		result = (gchar*) _tmp62_;
 #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 12269 "PiwigoPublishing.c"
+#line 12616 "PiwigoPublishing.c"
 	} else {
 		gchar* _tmp63_ = NULL;
 #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -12289,15 +12636,15 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		result = _tmp63_;
 #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 12278 "PiwigoPublishing.c"
+#line 12625 "PiwigoPublishing.c"
 	}
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	var = (g_free (var), NULL);
-#line 12286 "PiwigoPublishing.c"
+#line 12633 "PiwigoPublishing.c"
 }
 
 
@@ -12363,381 +12710,381 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	gchar* _tmp74_ = NULL;
 	gchar* _tmp75_ = NULL;
 	gchar* _tmp76_ = NULL;
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp0_ = session;
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp1_ = publishable;
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp2_ = session;
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_session_get_pwg_url (_tmp2_);
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = (PublishingPiwigoImagesAddTransaction*) publishing_rest_support_upload_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp4_);
-#line 1754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp4_);
-#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp5_ = session;
-#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp6_) {
-#line 12378 "PiwigoPublishing.c"
+#line 12725 "PiwigoPublishing.c"
 		PublishingPiwigoSession* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp7_ = session;
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp8_ = publishing_piwigo_session_get_pwg_id (_tmp7_);
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp9_ = _tmp8_;
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp10_ = g_strconcat ("pwg_id=", _tmp9_, NULL);
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp11_ = _tmp10_;
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Cookie", _tmp11_);
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp11_);
-#line 1756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (_tmp9_);
-#line 12400 "PiwigoPublishing.c"
+#line 12747 "PiwigoPublishing.c"
 	}
-#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = parameters;
-#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = _publishing_piwigo_publishing_parameters_ref0 (_tmp12_);
-#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 1758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->parameters = _tmp13_;
-#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp14_ = publishable;
-#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = spit_publishing_publishable_get_publishing_keywords (_tmp14_, &_tmp15_);
-#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	keywords = _tmp16_;
-#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	keywords_length1 = _tmp15_;
-#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_keywords_size_ = keywords_length1;
-#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp17_ = g_strdup ("");
-#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	tags = _tmp17_;
-#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18_ = keywords;
-#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp18__length1 = keywords_length1;
-#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp18_ != NULL) {
-#line 12430 "PiwigoPublishing.c"
+#line 12777 "PiwigoPublishing.c"
 		gchar** _tmp19_ = NULL;
 		gint _tmp19__length1 = 0;
 		gchar* _tmp20_ = NULL;
-#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp19_ = keywords;
-#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp19__length1 = keywords_length1;
-#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp20_ = _vala_g_strjoinv (",", _tmp19_, _tmp19__length1);
-#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (tags);
-#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		tags = _tmp20_;
-#line 12444 "PiwigoPublishing.c"
+#line 12791 "PiwigoPublishing.c"
 	}
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = publishable;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp22_ = spit_publishing_publishable_get_serialized_file (_tmp21_);
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp23_ = _tmp22_;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp24_ = g_file_get_basename (_tmp23_);
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp25_ = _tmp24_;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp26_ = parameters;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp27_ = _tmp26_->category;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp28_ = _tmp27_->id;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp29_ = parameters;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp30_ = _tmp29_->perm_level;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp31_ = _tmp30_->id;
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_debug ("PiwigoPublishing.vala:1766: PiwigoConnector: Uploading photo %s to cat" \
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_debug ("PiwigoPublishing.vala:1730: PiwigoConnector: Uploading photo %s to cat" \
 "egory id %d with perm level %d", _tmp25_, _tmp28_, _tmp31_);
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp25_);
-#line 1766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (_tmp23_);
-#line 1769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp32_ = publishable;
-#line 1769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp33_ = spit_publishing_publishable_get_publishing_name (_tmp32_);
-#line 1769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	name = _tmp33_;
-#line 1770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp34_ = publishable;
-#line 1770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp35_ = spit_publishing_publishable_get_param_string (_tmp34_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_COMMENT);
-#line 1770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	comment = _tmp35_;
-#line 1772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp36_ = name;
-#line 1772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (g_strcmp0 (_tmp36_, "") != 0) {
-#line 12490 "PiwigoPublishing.c"
+#line 12837 "PiwigoPublishing.c"
 		SpitPublishingPublishable* _tmp37_ = NULL;
 		gchar* _tmp38_ = NULL;
 		const gchar* _tmp39_ = NULL;
 		gboolean _tmp40_ = FALSE;
 		const gchar* _tmp41_ = NULL;
-#line 1773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp37_ = publishable;
-#line 1773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp38_ = spit_publishing_publishable_get_param_string (_tmp37_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 1773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_g_free0 (name);
-#line 1773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		name = _tmp38_;
-#line 1775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp39_ = name;
-#line 1775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp39_);
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp41_ = comment;
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp41_ != NULL) {
-#line 12512 "PiwigoPublishing.c"
+#line 12859 "PiwigoPublishing.c"
 			const gchar* _tmp42_ = NULL;
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp42_ = comment;
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp40_ = g_strcmp0 (_tmp42_, "") != 0;
-#line 12518 "PiwigoPublishing.c"
+#line 12865 "PiwigoPublishing.c"
 		} else {
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp40_ = FALSE;
-#line 12522 "PiwigoPublishing.c"
+#line 12869 "PiwigoPublishing.c"
 		}
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp40_) {
-#line 12526 "PiwigoPublishing.c"
+#line 12873 "PiwigoPublishing.c"
 			const gchar* _tmp43_ = NULL;
-#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp43_ = comment;
-#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp43_);
-#line 12532 "PiwigoPublishing.c"
+#line 12879 "PiwigoPublishing.c"
 		}
 	} else {
 		gboolean _tmp44_ = FALSE;
 		const gchar* _tmp45_ = NULL;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp45_ = comment;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp45_ != NULL) {
-#line 12541 "PiwigoPublishing.c"
+#line 12888 "PiwigoPublishing.c"
 			const gchar* _tmp46_ = NULL;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp46_ = comment;
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp44_ = g_strcmp0 (_tmp46_, "") != 0;
-#line 12547 "PiwigoPublishing.c"
+#line 12894 "PiwigoPublishing.c"
 		} else {
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp44_ = FALSE;
-#line 12551 "PiwigoPublishing.c"
+#line 12898 "PiwigoPublishing.c"
 		}
-#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp44_) {
-#line 12555 "PiwigoPublishing.c"
+#line 12902 "PiwigoPublishing.c"
 			const gchar* _tmp47_ = NULL;
 			const gchar* _tmp48_ = NULL;
-#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp47_ = name;
-#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp47_);
-#line 1783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp48_ = comment;
-#line 1783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp48_);
-#line 12566 "PiwigoPublishing.c"
+#line 12913 "PiwigoPublishing.c"
 		} else {
 			PublishingPiwigoPublishingParameters* _tmp49_ = NULL;
 			gboolean _tmp50_ = FALSE;
-#line 1788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp49_ = parameters;
-#line 1788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp50_ = _tmp49_->title_as_comment;
-#line 1788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			if (_tmp50_) {
-#line 12576 "PiwigoPublishing.c"
+#line 12923 "PiwigoPublishing.c"
 				const gchar* _tmp51_ = NULL;
-#line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp51_ = name;
-#line 1789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "comment", _tmp51_);
-#line 12582 "PiwigoPublishing.c"
+#line 12929 "PiwigoPublishing.c"
 			} else {
 				const gchar* _tmp52_ = NULL;
-#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_tmp52_ = name;
-#line 1791 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "name", _tmp52_);
-#line 12589 "PiwigoPublishing.c"
+#line 12936 "PiwigoPublishing.c"
 			}
 		}
 	}
-#line 1795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "method", "pwg.images.addSimple");
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp53_ = parameters;
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp54_ = _tmp53_->category;
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp55_ = _tmp54_->id;
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp56_ = g_strdup_printf ("%i", _tmp55_);
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp57_ = _tmp56_;
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "category", _tmp57_);
-#line 1796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp57_);
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp58_ = parameters;
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp59_ = _tmp58_->perm_level;
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp60_ = _tmp59_->id;
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp61_ = g_strdup_printf ("%i", _tmp60_);
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp62_ = _tmp61_;
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "level", _tmp62_);
-#line 1797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp62_);
-#line 1798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp63_ = parameters;
-#line 1798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp64_ = _tmp63_->no_upload_tags;
-#line 1798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (!_tmp64_) {
-#line 12629 "PiwigoPublishing.c"
+#line 12976 "PiwigoPublishing.c"
 		const gchar* _tmp65_ = NULL;
-#line 1799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp65_ = tags;
-#line 1799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (g_strcmp0 (_tmp65_, "") != 0) {
-#line 12635 "PiwigoPublishing.c"
+#line 12982 "PiwigoPublishing.c"
 			const gchar* _tmp66_ = NULL;
-#line 1800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp66_ = tags;
-#line 1800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "tags", _tmp66_);
-#line 12641 "PiwigoPublishing.c"
+#line 12988 "PiwigoPublishing.c"
 		}
 	}
-#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp67_ = g_str_hash;
-#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp68_ = g_str_equal;
-#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp69_ = g_hash_table_new_full (_tmp67_, _tmp68_, _g_free0_, _g_free0_);
-#line 1810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	disposition_table = _tmp69_;
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp70_ = g_strdup ("filename");
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp71_ = publishable;
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp72_ = spit_publishing_publishable_get_param_string (_tmp71_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp73_ = _tmp72_;
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp74_ = soup_uri_encode (_tmp73_, NULL);
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_hash_table_insert (disposition_table, _tmp70_, _tmp74_);
-#line 1812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (_tmp73_);
-#line 1815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp75_ = g_strdup ("name");
-#line 1815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp76_ = g_strdup ("image");
-#line 1815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_hash_table_insert (disposition_table, _tmp75_, _tmp76_);
-#line 1817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), disposition_table);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_hash_table_unref0 (disposition_table);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (comment);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (name);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_free0 (tags);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return self;
-#line 12686 "PiwigoPublishing.c"
+#line 13033 "PiwigoPublishing.c"
 }
 
 
 PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_new (PublishingPiwigoSession* session, PublishingPiwigoPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 1753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	return publishing_piwigo_images_add_transaction_construct (PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, session, parameters, publishable);
-#line 12693 "PiwigoPublishing.c"
+#line 13040 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_images_add_transaction_class_init (PublishingPiwigoImagesAddTransactionClass * klass) {
-#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	publishing_piwigo_images_add_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_piwigo_images_add_transaction_finalize;
-#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPiwigoImagesAddTransactionPrivate));
-#line 12704 "PiwigoPublishing.c"
+#line 13051 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_images_add_transaction_instance_init (PublishingPiwigoImagesAddTransaction * self) {
-#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv = PUBLISHING_PIWIGO_IMAGES_ADD_TRANSACTION_GET_PRIVATE (self);
-#line 1751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self->priv->parameters = NULL;
-#line 12713 "PiwigoPublishing.c"
+#line 13060 "PiwigoPublishing.c"
 }
 
 
 static void publishing_piwigo_images_add_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingPiwigoImagesAddTransaction * self;
-#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PIWIGO_TYPE_IMAGES_ADD_TRANSACTION, PublishingPiwigoImagesAddTransaction);
-#line 1751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_publishing_piwigo_publishing_parameters_unref0 (self->priv->parameters);
-#line 1750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+#line 1714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_piwigo_images_add_transaction_parent_class)->finalize (obj);
-#line 12725 "PiwigoPublishing.c"
+#line 13072 "PiwigoPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala
index 0b98f05..ca07554 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -85,6 +85,10 @@ internal class Category {
     public bool is_local() {
         return this.id == NO_ID;
     }
+
+    public static bool equal (Category self, Category other) {
+        return self.id == other.id;
+    }
 }
 
 internal class PermissionLevel {
@@ -613,35 +617,29 @@ public class PiwigoPublisher : Spit.Publishing.Publisher, GLib.Object {
             string name = "";
             string id_string = "";
             string uppercats = "";
+            var id_map = new Gee.HashMap<string, string> ();
+
             for ( ; category_node_iter != null; category_node_iter = category_node_iter->next) {
                 name_node = doc.get_named_child(category_node_iter, "name");
                 name = name_node->get_content();
                 uppercats_node = doc.get_named_child(category_node_iter, "uppercats");
                 uppercats = (string)uppercats_node->get_content();
                 id_string = category_node_iter->get_prop("id");
+                id_map.set (id_string, name);
+
                 if (categories == null) {
                     categories = new Category[0];
                 }
                 categories += new Category(int.parse(id_string), name, uppercats);
             }
+
             // compute the display name for the categories
-            // currently done by an unnecessary triple loop
-            // one could make a loop that goes over the categories
-            // and creates a list of back references cat_id -> index
-            // but since cat_ids are not guaranteed to be continuous
-            // that needs a perl hash ;-)
             for(int i = 0; i < categories.length; i++) {
                 string[] upcatids = categories[i].uppercats.split(",");
                 var builder = new StringBuilder();
                 for (int j=0; j < upcatids.length; j++) {
                     builder.append ("/ ");
-                    // search for the upper category
-                    for (int k=0; k < categories.length; k++) {
-                        if (upcatids[j] == categories[k].id.to_string()) {
-                            builder.append (categories[k].name);
-                            break;
-                        }
-                    }
+                    builder.append (id_map.get (upcatids[j]));
                     builder.append (" ");
                 }
                 categories[i].display_name = builder.str;
@@ -1005,158 +1003,148 @@ internal class Uploader : Publishing.RESTSupport.BatchUploader {
 
 // UI elements
 
-internal class SSLErrorPane : Spit.Publishing.DialogPane, Object {
-    private Gtk.Builder builder;
-    private Gtk.Widget content;
+internal class SSLErrorPane : Shotwell.Plugins.Common.BuilderPane {
 
     public signal void proceed ();
+    public string host { owned get; construct; }
+    public TlsCertificate cert { private get; construct; }
+    public string error_text { owned get; construct; }
 
     public SSLErrorPane (SessionLoginTransaction transaction,
                          string host) {
-        try {
-            TlsCertificate cert;
-            this.builder = new Gtk.Builder ();
-            this.builder.add_from_resource (Resources.RESOURCE_PATH +
-                                            "/piwigo_ssl_failure_pane.ui");
-            this.content = this.builder.get_object ("content") as Gtk.Widget;
-            var label = this.builder.get_object ("main_text") as Gtk.Label;
-            // %s is the host name that we tried to connect to
-            label.set_text (_("This does not look like the real <b>%s</b>. Attackers might be trying to steal or alter information going to or from this site (for example, private messages, credit card information, or passwords).").printf (host));
-            label.use_markup = true;
-
-            label = this.builder.get_object ("ssl_errors") as Gtk.Label;
-            var text = transaction.detailed_error_from_tls_flags (out cert);
-            label.set_text (text);
-
-            var info = this.builder.get_object ("default") as Gtk.Button;
-            info.clicked.connect (() => {
-                var simple_cert = new Gcr.SimpleCertificate (cert.certificate.data);
-                var widget = new Gcr.CertificateWidget (simple_cert);
-
-                var dialog = new Gtk.Dialog ();
-                dialog.get_content_area ().add (widget);
-                dialog.add_button ("_OK", Gtk.ResponseType.OK);
-                dialog.set_default_response (Gtk.ResponseType.OK);
-                dialog.set_default_size (640, -1);
-                dialog.show_all ();
-                dialog.run ();
-                dialog.destroy ();
-            });
-
-            var proceed = this.builder.get_object ("proceed_button") as Gtk.Button;
-            proceed.clicked.connect (() => { this.proceed (); });
-
-            if (this.content.parent != null) {
-                this.content.parent.remove (this.content);
+        TlsCertificate cert;
+        var text = transaction.detailed_error_from_tls_flags (out cert);
+        Object (resource_path : Resources.RESOURCE_PATH +
+                                "/piwigo_ssl_failure_pane.ui",
+                default_id: "default",
+                cert : cert,
+                error_text : text,
+                host : host);
+    }
+
+    public override void constructed () {
+        base.constructed ();
+
+        var label = this.get_builder ().get_object ("main_text") as Gtk.Label;
+        // %s is the host name that we tried to connect to
+        label.set_text (_("This does not look like the real <b>%s</b>. Attackers might be trying to steal or alter information going to or from this site (for example, private messages, credit card information, or passwords).").printf (host));
+        label.use_markup = true;
+
+        label = this.get_builder ().get_object ("ssl_errors") as Gtk.Label;
+        label.set_text (error_text);
+
+        var info = this.get_builder ().get_object ("default") as Gtk.Button;
+        info.clicked.connect (() => {
+            var simple_cert = new Gcr.SimpleCertificate (cert.certificate.data);
+            var widget = new Gcr.CertificateWidget (simple_cert);
+            bool use_header = true;
+            Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
+            var flags = (Gtk.DialogFlags) 0;
+            if (use_header) {
+                flags |= Gtk.DialogFlags.USE_HEADER_BAR;
             }
-        } catch (Error error) {
-            warning ("Failed to create ui file: %s", error.message);
-            assert_not_reached ();
-        }
-    }
 
-    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry () {
-        return Spit.Publishing.DialogPane.GeometryOptions.NONE;
-    }
-
-    public Gtk.Widget get_widget () {
-        return this.content;
-    }
+            var dialog = new Gtk.Dialog.with_buttons (
+                            _("Certificate of %s").printf (host),
+                            null,
+                            flags,
+                            _("_OK"), Gtk.ResponseType.OK);
+            dialog.get_content_area ().add (widget);
+            dialog.set_default_response (Gtk.ResponseType.OK);
+            dialog.set_default_size (640, -1);
+            dialog.show_all ();
+            dialog.run ();
+            dialog.destroy ();
+        });
 
-    public Gtk.Widget get_default_widget () {
-        return this.builder.get_object ("default") as Gtk.Widget;
+        var proceed = this.get_builder ().get_object ("proceed_button") as Gtk.Button;
+        proceed.clicked.connect (() => { this.proceed (); });
     }
-
-    public void on_pane_installed () { }
-
-    public void on_pane_uninstalled () { }
 }
 
 /**
  * The authentication pane used when asking service URL, user name and password
  * from the user.
  */
-internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
+internal class AuthenticationPane : Shotwell.Plugins.Common.BuilderPane {
     public enum Mode {
         INTRO,
         FAILED_RETRY_URL,
         FAILED_RETRY_USER
     }
+
+    public Mode mode { get; construct; }
+    public unowned PiwigoPublisher publisher { get; construct; }
+
     private static string INTRO_MESSAGE = _("Enter the URL of your Piwigo photo library as well as the username and password associated with your Piwigo account for that library.");
     private static string FAILED_RETRY_URL_MESSAGE = _("Shotwell cannot contact your Piwigo photo library. Please verify the URL you entered");
     private static string FAILED_RETRY_USER_MESSAGE = _("Username and/or password invalid. Please try again");
 
-    private Gtk.Box pane_widget = null;
-    private Gtk.Builder builder;
     private Gtk.Entry url_entry;
     private Gtk.Entry username_entry;
     private Gtk.Entry password_entry;
-    private Gtk.CheckButton remember_password_checkbutton;
+    private Gtk.Switch remember_password_checkbutton;
     private Gtk.Button login_button;
 
     public signal void login(string url, string user, string password, bool remember_password);
 
-    public AuthenticationPane(PiwigoPublisher publisher, Mode mode = Mode.INTRO) {
-        this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
+    public AuthenticationPane (PiwigoPublisher publisher, Mode mode = Mode.INTRO) {
+        Object (resource_path : Resources.RESOURCE_PATH +
+                                "/piwigo_authentication_pane.ui",
+                connect_signals : true,
+                default_id : "login_button",
+                mode : mode,
+                publisher : publisher);
+    }
 
-        try {
-            builder = new Gtk.Builder();
-            builder.add_from_resource (Resources.RESOURCE_PATH + "/piwigo_authentication_pane.ui");
-            builder.connect_signals(null);
-            Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment;
-            
-            Gtk.Label message_label = builder.get_object("message_label") as Gtk.Label;
-            switch (mode) {
-                case Mode.INTRO:
-                    message_label.set_text(INTRO_MESSAGE);
-                    break;
-
-                case Mode.FAILED_RETRY_URL:
-                    message_label.set_markup("<b>%s</b>\n\n%s".printf(_(
-                        "Invalid URL"), FAILED_RETRY_URL_MESSAGE));
-                    break;
-
-                case Mode.FAILED_RETRY_USER:
-                    message_label.set_markup("<b>%s</b>\n\n%s".printf(_(
-                        "Invalid User Name or Password"), FAILED_RETRY_USER_MESSAGE));
-                    break;
-            }
+    public override void constructed () {
+        base.constructed ();
 
-            url_entry = builder.get_object ("url_entry") as Gtk.Entry;
-            string? persistent_url = publisher.get_persistent_url();
-            if (persistent_url != null) {
-                url_entry.set_text(persistent_url);
-            }
-            username_entry = builder.get_object ("username_entry") as Gtk.Entry;
-            string? persistent_username = publisher.get_persistent_username();
-            if (persistent_username != null) {
-                username_entry.set_text(persistent_username);
-            }
-            password_entry = builder.get_object ("password_entry") as Gtk.Entry;
-            string? persistent_password = publisher.get_persistent_password();
-            if (persistent_password != null) {
-                password_entry.set_text(persistent_password);
-            }
-            remember_password_checkbutton =
-                builder.get_object ("remember_password_checkbutton") as Gtk.CheckButton;
-            remember_password_checkbutton.set_active(publisher.get_remember_password());
+        var builder = this.get_builder ();
+        var message_label = builder.get_object("message_label") as Gtk.Label;
+        switch (mode) {
+            case Mode.INTRO:
+                message_label.set_text(INTRO_MESSAGE);
+                break;
 
-            login_button = builder.get_object("login_button") as Gtk.Button;
+            case Mode.FAILED_RETRY_URL:
+                message_label.set_markup("<b>%s</b>\n\n%s".printf(_(
+                    "Invalid URL"), FAILED_RETRY_URL_MESSAGE));
+                break;
 
-            username_entry.changed.connect(on_user_changed);
-            url_entry.changed.connect(on_url_changed);
-            password_entry.changed.connect(on_password_changed);
-            login_button.clicked.connect(on_login_button_clicked);
+            case Mode.FAILED_RETRY_USER:
+                message_label.set_markup("<b>%s</b>\n\n%s".printf(_(
+                    "Invalid User Name or Password"), FAILED_RETRY_USER_MESSAGE));
+                break;
+        }
 
-            align.reparent(pane_widget);
-            publisher.get_host().set_dialog_default_widget(login_button);
-        } catch (Error e) {
-            warning("Could not load UI: %s", e.message);
+        url_entry = builder.get_object ("url_entry") as Gtk.Entry;
+        string? persistent_url = publisher.get_persistent_url();
+        if (persistent_url != null) {
+            url_entry.set_text(persistent_url);
         }
-    }
-    
-    public Gtk.Widget get_default_widget() {
-        return login_button;
+        username_entry = builder.get_object ("username_entry") as Gtk.Entry;
+        string? persistent_username = publisher.get_persistent_username();
+        if (persistent_username != null) {
+            username_entry.set_text(persistent_username);
+        }
+        password_entry = builder.get_object ("password_entry") as Gtk.Entry;
+        string? persistent_password = publisher.get_persistent_password();
+        if (persistent_password != null) {
+            password_entry.set_text(persistent_password);
+        }
+        remember_password_checkbutton =
+            builder.get_object ("remember_password_checkbutton") as Gtk.Switch;
+        remember_password_checkbutton.set_active(publisher.get_remember_password());
+
+        login_button = builder.get_object("login_button") as Gtk.Button;
+
+        username_entry.changed.connect(on_user_changed);
+        url_entry.changed.connect(on_url_changed);
+        password_entry.changed.connect(on_password_changed);
+        login_button.clicked.connect(on_login_button_clicked);
+
+        publisher.get_host().set_dialog_default_widget(login_button);
     }
 
     private void on_login_button_clicked() {
@@ -1182,34 +1170,23 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object {
                                    password_entry.text_length != 0);
     }
     
-    public Gtk.Widget get_widget() {
-        return pane_widget;
-    }
-    
-    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
-        return Spit.Publishing.DialogPane.GeometryOptions.NONE;
-    }
-    
-    public void on_pane_installed() {
+    public override void on_pane_installed() {
+        base.on_pane_installed ();
+
         url_entry.grab_focus();
         password_entry.set_activates_default(true);
         login_button.can_default = true;
         update_login_button_sensitivity();
     }
-    
-    public void on_pane_uninstalled() {
-    }
 }
 
 /**
  * The publishing options pane.
  */
-internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
+internal class PublishingOptionsPane : Shotwell.Plugins.Common.BuilderPane {
 
     private static string DEFAULT_CATEGORY_NAME = _("Shotwell Connect");
 
-    private Gtk.Box pane_widget = null;
-    private Gtk.Builder builder;
     private Gtk.RadioButton use_existing_radio;
     private Gtk.RadioButton create_new_radio;
     private Gtk.ComboBoxText existing_categories_combo;
@@ -1225,88 +1202,88 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
     private Gtk.Button publish_button;
     private Gtk.TextView album_comment;
     private Gtk.Label album_comment_label;
-    
-    private Category[] existing_categories;
+
     private PermissionLevel[] perm_levels;
     private SizeEntry[] photo_sizes;
-    
-    private int last_category;
-    private int last_permission_level;
-    private int last_photo_size;
-    private bool last_title_as_comment;
-    private bool last_no_upload_tags;
+
+    public int last_category { private get; construct; }
+    public int last_permission_level { private get; construct; }
+    public int last_photo_size { private get; construct; }
+    public bool last_title_as_comment { private get; construct; }
+    public bool last_no_upload_tags { private get; construct; }
+    public bool strip_metadata_enabled { private get; construct; }
+    public Gee.List<Category> existing_categories { private get; construct; }
+    public string default_comment { private get; construct; }
 
     public signal void publish(PublishingParameters parameters, bool strip_metadata);
     public signal void logout();
 
-    public PublishingOptionsPane(
-        PiwigoPublisher publisher, Category[] categories,
-        int last_category, int last_permission_level, int last_photo_size,
-        bool last_title_as_comment, bool last_no_upload_tags, bool strip_metadata_enabled
-    ) {
-        this.pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-        this.last_category = last_category;
-        this.last_permission_level = last_permission_level;
-        this.last_photo_size = last_photo_size;
-        this.last_title_as_comment = last_title_as_comment;
-        this.last_no_upload_tags = last_no_upload_tags;
+    public PublishingOptionsPane(PiwigoPublisher publisher,
+                                 Category[] categories,
+                                 int last_category,
+                                 int last_permission_level,
+                                 int last_photo_size,
+                                 bool last_title_as_comment,
+                                 bool last_no_upload_tags,
+                                 bool strip_metadata_enabled) {
+        Object (resource_path : Resources.RESOURCE_PATH +
+                                "/piwigo_publishing_options_pane.ui",
+                connect_signals : true,
+                default_id : "publish_button",
+                last_category : last_category,
+                last_permission_level : last_permission_level,
+                last_photo_size : last_photo_size,
+                last_title_as_comment : last_title_as_comment,
+                last_no_upload_tags : last_no_upload_tags,
+                strip_metadata_enabled : strip_metadata_enabled,
+                existing_categories : new Gee.ArrayList<Category>.wrap (categories,
+                                                          Category.equal),
+                default_comment : get_common_comment_if_possible (publisher));
+    }
+
+    public override void constructed () {
+        base.constructed ();
+        var builder = this.get_builder ();
+
+        use_existing_radio = builder.get_object("use_existing_radio") as Gtk.RadioButton;
+        create_new_radio = builder.get_object("create_new_radio") as Gtk.RadioButton;
+        existing_categories_combo = builder.get_object("existing_categories_combo") as Gtk.ComboBoxText;
+        new_category_entry = builder.get_object ("new_category_entry") as Gtk.Entry;
+        within_existing_label = builder.get_object ("within_existing_label") as Gtk.Label;
+        within_existing_combo = builder.get_object ("within_existing_combo") as Gtk.ComboBoxText;
+
+        album_comment = builder.get_object ("album_comment") as Gtk.TextView;
+        album_comment.buffer = new Gtk.TextBuffer(null);
+        album_comment_label = builder.get_object ("album_comment_label") as Gtk.Label;
+
+        perms_combo = builder.get_object("perms_combo") as Gtk.ComboBoxText;
+        size_combo = builder.get_object("size_combo") as Gtk.ComboBoxText;
+
+        strip_metadata_check = builder.get_object("strip_metadata_check") as Gtk.CheckButton;
+        strip_metadata_check.set_active(strip_metadata_enabled);
+
+        title_as_comment_check = builder.get_object("title_as_comment_check") as Gtk.CheckButton;
+        title_as_comment_check.set_active(last_title_as_comment);
+
+        no_upload_tags_check = builder.get_object("no_upload_tags_check") as Gtk.CheckButton;
+        no_upload_tags_check.set_active(last_no_upload_tags);
+
+        logout_button = builder.get_object("logout_button") as Gtk.Button;
+        logout_button.clicked.connect(on_logout_button_clicked);
+
+        publish_button = builder.get_object("publish_button") as Gtk.Button;
+        publish_button.clicked.connect(on_publish_button_clicked);
+
+        use_existing_radio.clicked.connect(on_use_existing_radio_clicked);
+        create_new_radio.clicked.connect(on_create_new_radio_clicked);
+        new_category_entry.changed.connect(on_new_category_entry_changed);
+        within_existing_combo.changed.connect(on_existing_combo_changed);
 
-        try {
-            builder = new Gtk.Builder();
-            builder.add_from_resource (Resources.RESOURCE_PATH + "/piwigo_publishing_options_pane.ui");
-            builder.connect_signals(null);
-            Gtk.Alignment align = builder.get_object("alignment") as Gtk.Alignment;
-            
-            use_existing_radio = builder.get_object("use_existing_radio") as Gtk.RadioButton;
-            create_new_radio = builder.get_object("create_new_radio") as Gtk.RadioButton;
-            existing_categories_combo = builder.get_object("existing_categories_combo") as Gtk.ComboBoxText;
-            new_category_entry = builder.get_object ("new_category_entry") as Gtk.Entry;
-            within_existing_label = builder.get_object ("within_existing_label") as Gtk.Label;
-            within_existing_combo = builder.get_object ("within_existing_combo") as Gtk.ComboBoxText;
-
-            album_comment = builder.get_object ("album_comment") as Gtk.TextView;
-            album_comment.buffer = new Gtk.TextBuffer(null);
-            album_comment_label = builder.get_object ("album_comment_label") as Gtk.Label;
-
-            perms_combo = builder.get_object("perms_combo") as Gtk.ComboBoxText;
-            size_combo = builder.get_object("size_combo") as Gtk.ComboBoxText;
-
-            strip_metadata_check = builder.get_object("strip_metadata_check") as Gtk.CheckButton;
-            strip_metadata_check.set_active(strip_metadata_enabled);
-
-            title_as_comment_check = builder.get_object("title_as_comment_check") as Gtk.CheckButton;
-            title_as_comment_check.set_active(last_title_as_comment);
-
-            no_upload_tags_check = builder.get_object("no_upload_tags_check") as Gtk.CheckButton;
-            no_upload_tags_check.set_active(last_no_upload_tags);
-
-            logout_button = builder.get_object("logout_button") as Gtk.Button;
-            logout_button.clicked.connect(on_logout_button_clicked);
-
-            publish_button = builder.get_object("publish_button") as Gtk.Button;
-            publish_button.clicked.connect(on_publish_button_clicked);
-            
-            use_existing_radio.clicked.connect(on_use_existing_radio_clicked);
-            create_new_radio.clicked.connect(on_create_new_radio_clicked);
-            new_category_entry.changed.connect(on_new_category_entry_changed);
-            within_existing_combo.changed.connect(on_existing_combo_changed);
-
-            align.reparent(pane_widget);
-            pane_widget.set_child_packing(align, true, true, 0, Gtk.PackType.START);
-        } catch (Error e) {
-            warning("Could not load UI: %s", e.message);
-        }
-        
-        this.existing_categories = categories;
         this.perm_levels = create_perm_levels();
         this.photo_sizes = create_sizes();
-        this.album_comment.buffer.set_text(get_common_comment_if_possible(publisher));
-    }
-    
-    public Gtk.Widget get_default_widget() {
-        return publish_button;
+        this.album_comment.buffer.set_text(this.default_comment);
     }
-    
+
     private PermissionLevel[] create_perm_levels() {
         PermissionLevel[] result = new PermissionLevel[0];
 
@@ -1410,16 +1387,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
             )
         );
     }
-    
-    public Gtk.Widget get_widget() {
-        return pane_widget;
-    }
-    
-    public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
-        return Spit.Publishing.DialogPane.GeometryOptions.NONE;
-    }
-    
-    public void on_pane_installed() {
+
+    public override void on_pane_installed() {
+        base.on_pane_installed ();
+
         create_categories_combo();
         create_within_categories_combo();
         create_permissions_combo();
@@ -1428,8 +1399,8 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
         publish_button.can_default = true;
         update_publish_button_sensitivity();
     }
-    
-    private string get_common_comment_if_possible(PiwigoPublisher publisher) {
+
+    private static string get_common_comment_if_possible(PiwigoPublisher publisher) {
         // we have to determine whether all the publishing items
         // belong to the same event
         Spit.Publishing.Publishable[] publishables = publisher.get_host().get_publishables();
@@ -1462,7 +1433,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
         foreach (Category cat in existing_categories) {
             existing_categories_combo.append_text(cat.display_name);
         }
-        if (existing_categories.length == 0) {
+        if (existing_categories.is_empty) {
             // if no existing categories, disable the option to choose one
             existing_categories_combo.set_sensitive(false);
             use_existing_radio.set_sensitive(false);
@@ -1472,11 +1443,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
             new_category_entry.grab_focus();
         } else {
             int last_category_index = find_category_index(last_category);
-            if (last_category_index < 0) {
-                existing_categories_combo.set_active(0);
-            } else {
-                existing_categories_combo.set_active(last_category_index);
-            }
+            existing_categories_combo.set_active(last_category_index);
             new_category_entry.set_sensitive(false);
             album_comment.set_sensitive(false);
             album_comment_label.set_sensitive(false);
@@ -1520,13 +1487,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
             size_combo.set_active(last_size_index);
         }
     }
-    
-    public void on_pane_uninstalled() {
-    }
-    
+
     private int find_category_index(int category_id) {
-        int result = -1;
-        for(int i = 0; i < existing_categories.length; i++) {
+        int result = 0;
+        for(int i = 0; i < existing_categories.size; i++) {
             if (existing_categories[i].id == category_id) {
                 result = i;
                 break;
diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c
index b1f6d33..f1adc38 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.c
+++ b/plugins/shotwell-publishing/YouTubePublishing.c
@@ -294,7 +294,7 @@ static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
 static const gchar* you_tube_service_real_get_id (SpitPluggable* base);
 static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* base);
 static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info);
-static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length);
+static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length);
 static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPublishingService* base, SpitPublishingPluginHost* host);
 PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host);
 PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host);
@@ -438,8 +438,10 @@ enum  {
 PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
 PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
 static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
+static guint8* _vala_array_dup11 (guint8* self, int length);
 static void _vala_SoupBuffer_free (SoupBuffer* self);
 static void _vala_SoupMultipart_free (SoupMultipart* self);
+static guint8* _vala_array_dup12 (guint8* self, int length);
 static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
 #define PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploaderPrivate))
 enum  {
@@ -465,7 +467,7 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d
 	_tmp0__length1 = you_tube_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 447 "YouTubePublishing.c"
+#line 449 "YouTubePublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -478,18 +480,18 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d
 		you_tube_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_you_tube_service_icon_pixbuf_set_size_ = you_tube_service_icon_pixbuf_set_length1;
-#line 460 "YouTubePublishing.c"
+#line 462 "YouTubePublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 464 "YouTubePublishing.c"
+#line 466 "YouTubePublishing.c"
 }
 
 
 YouTubeService* you_tube_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return you_tube_service_construct (TYPE_YOU_TUBE_SERVICE, resource_directory);
-#line 471 "YouTubePublishing.c"
+#line 473 "YouTubePublishing.c"
 }
 
 
@@ -511,7 +513,7 @@ static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 493 "YouTubePublishing.c"
+#line 495 "YouTubePublishing.c"
 }
 
 
@@ -524,7 +526,7 @@ static const gchar* you_tube_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.youtube";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 506 "YouTubePublishing.c"
+#line 508 "YouTubePublishing.c"
 }
 
 
@@ -537,35 +539,35 @@ static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* bas
 	result = "YouTube";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 519 "YouTubePublishing.c"
+#line 521 "YouTubePublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 526 "YouTubePublishing.c"
+#line 528 "YouTubePublishing.c"
 }
 
 
-static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length) {
+static GdkPixbuf** _vala_array_dup10 (GdkPixbuf** self, int length) {
 	GdkPixbuf** result;
 	int i;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 537 "YouTubePublishing.c"
+#line 539 "YouTubePublishing.c"
 		GdkPixbuf* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		result[i] = _tmp0_;
-#line 543 "YouTubePublishing.c"
+#line 545 "YouTubePublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 547 "YouTubePublishing.c"
+#line 549 "YouTubePublishing.c"
 }
 
 
@@ -638,7 +640,7 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8__length1 = you_tube_service_icon_pixbuf_set_length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup9 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup10 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp9__length1 = _tmp8__length1;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -647,7 +649,7 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 	(*info).icons = _tmp9_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*info).icons_length1 = _tmp9__length1;
-#line 629 "YouTubePublishing.c"
+#line 631 "YouTubePublishing.c"
 }
 
 
@@ -668,7 +670,7 @@ static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPubl
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 650 "YouTubePublishing.c"
+#line 652 "YouTubePublishing.c"
 }
 
 
@@ -681,7 +683,7 @@ static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_medi
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 663 "YouTubePublishing.c"
+#line 665 "YouTubePublishing.c"
 }
 
 
@@ -689,7 +691,7 @@ static void you_tube_service_real_activation (SpitPluggable* base, gboolean enab
 	YouTubeService * self;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
-#line 671 "YouTubePublishing.c"
+#line 673 "YouTubePublishing.c"
 }
 
 
@@ -698,7 +700,7 @@ static void you_tube_service_class_init (YouTubeServiceClass * klass) {
 	you_tube_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = you_tube_service_finalize;
-#line 680 "YouTubePublishing.c"
+#line 682 "YouTubePublishing.c"
 }
 
 
@@ -715,7 +717,7 @@ static void you_tube_service_spit_pluggable_interface_init (SpitPluggableIface *
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) you_tube_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) you_tube_service_real_activation;
-#line 697 "YouTubePublishing.c"
+#line 699 "YouTubePublishing.c"
 }
 
 
@@ -726,7 +728,7 @@ static void you_tube_service_spit_publishing_service_interface_init (SpitPublish
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) you_tube_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) you_tube_service_real_get_supported_media;
-#line 708 "YouTubePublishing.c"
+#line 710 "YouTubePublishing.c"
 }
 
 
@@ -740,7 +742,7 @@ static void you_tube_service_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_YOU_TUBE_SERVICE, YouTubeService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (you_tube_service_parent_class)->finalize (obj);
-#line 722 "YouTubePublishing.c"
+#line 724 "YouTubePublishing.c"
 }
 
 
@@ -788,14 +790,14 @@ PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters
 	self->priv->user_name = NULL;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 770 "YouTubePublishing.c"
+#line 772 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_new (void) {
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_publishing_parameters_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS);
-#line 777 "YouTubePublishing.c"
+#line 779 "YouTubePublishing.c"
 }
 
 
@@ -810,7 +812,7 @@ PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_pr
 	result = _tmp0_;
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 792 "YouTubePublishing.c"
+#line 794 "YouTubePublishing.c"
 }
 
 
@@ -822,7 +824,7 @@ void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePub
 	_tmp0_ = privacy;
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy = _tmp0_;
-#line 804 "YouTubePublishing.c"
+#line 806 "YouTubePublishing.c"
 }
 
 
@@ -840,7 +842,7 @@ gchar* publishing_you_tube_publishing_parameters_get_channel_name (PublishingYou
 	result = _tmp1_;
 #line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 822 "YouTubePublishing.c"
+#line 824 "YouTubePublishing.c"
 }
 
 
@@ -857,7 +859,7 @@ void publishing_you_tube_publishing_parameters_set_channel_name (PublishingYouTu
 	_g_free0 (self->priv->channel_name);
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->channel_name = _tmp1_;
-#line 839 "YouTubePublishing.c"
+#line 841 "YouTubePublishing.c"
 }
 
 
@@ -875,7 +877,7 @@ gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTub
 	result = _tmp1_;
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 857 "YouTubePublishing.c"
+#line 859 "YouTubePublishing.c"
 }
 
 
@@ -892,14 +894,14 @@ void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubeP
 	_g_free0 (self->priv->user_name);
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->user_name = _tmp1_;
-#line 874 "YouTubePublishing.c"
+#line 876 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_value_publishing_parameters_init (GValue* value) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 881 "YouTubePublishing.c"
+#line 883 "YouTubePublishing.c"
 }
 
 
@@ -908,7 +910,7 @@ static void publishing_you_tube_value_publishing_parameters_free_value (GValue*
 	if (value->data[0].v_pointer) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (value->data[0].v_pointer);
-#line 890 "YouTubePublishing.c"
+#line 892 "YouTubePublishing.c"
 	}
 }
 
@@ -918,11 +920,11 @@ static void publishing_you_tube_value_publishing_parameters_copy_value (const GV
 	if (src_value->data[0].v_pointer) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 900 "YouTubePublishing.c"
+#line 902 "YouTubePublishing.c"
 	} else {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 904 "YouTubePublishing.c"
+#line 906 "YouTubePublishing.c"
 	}
 }
 
@@ -930,37 +932,37 @@ static void publishing_you_tube_value_publishing_parameters_copy_value (const GV
 static gpointer publishing_you_tube_value_publishing_parameters_peek_pointer (const GValue* value) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 912 "YouTubePublishing.c"
+#line 914 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 919 "YouTubePublishing.c"
+#line 921 "YouTubePublishing.c"
 		PublishingYouTubePublishingParameters* object;
 		object = collect_values[0].v_pointer;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 926 "YouTubePublishing.c"
+#line 928 "YouTubePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 930 "YouTubePublishing.c"
+#line 932 "YouTubePublishing.c"
 		}
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (object);
-#line 934 "YouTubePublishing.c"
+#line 936 "YouTubePublishing.c"
 	} else {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 938 "YouTubePublishing.c"
+#line 940 "YouTubePublishing.c"
 	}
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 942 "YouTubePublishing.c"
+#line 944 "YouTubePublishing.c"
 }
 
 
@@ -971,25 +973,25 @@ static gchar* publishing_you_tube_value_publishing_parameters_lcopy_value (const
 	if (!object_p) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 953 "YouTubePublishing.c"
+#line 955 "YouTubePublishing.c"
 	}
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = NULL;
-#line 959 "YouTubePublishing.c"
+#line 961 "YouTubePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 963 "YouTubePublishing.c"
+#line 965 "YouTubePublishing.c"
 	} else {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 967 "YouTubePublishing.c"
+#line 969 "YouTubePublishing.c"
 	}
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 971 "YouTubePublishing.c"
+#line 973 "YouTubePublishing.c"
 }
 
 
@@ -1003,7 +1005,7 @@ GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* n
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 985 "YouTubePublishing.c"
+#line 987 "YouTubePublishing.c"
 }
 
 
@@ -1012,7 +1014,7 @@ gpointer publishing_you_tube_value_get_publishing_parameters (const GValue* valu
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS), NULL);
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 994 "YouTubePublishing.c"
+#line 996 "YouTubePublishing.c"
 }
 
 
@@ -1032,17 +1034,17 @@ void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointe
 		value->data[0].v_pointer = v_object;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1014 "YouTubePublishing.c"
+#line 1016 "YouTubePublishing.c"
 	} else {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1018 "YouTubePublishing.c"
+#line 1020 "YouTubePublishing.c"
 	}
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (old);
-#line 1024 "YouTubePublishing.c"
+#line 1026 "YouTubePublishing.c"
 	}
 }
 
@@ -1061,17 +1063,17 @@ void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpoint
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1043 "YouTubePublishing.c"
+#line 1045 "YouTubePublishing.c"
 	} else {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1047 "YouTubePublishing.c"
+#line 1049 "YouTubePublishing.c"
 	}
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (old);
-#line 1053 "YouTubePublishing.c"
+#line 1055 "YouTubePublishing.c"
 	}
 }
 
@@ -1083,7 +1085,7 @@ static void publishing_you_tube_publishing_parameters_class_init (PublishingYouT
 	((PublishingYouTubePublishingParametersClass *) klass)->finalize = publishing_you_tube_publishing_parameters_finalize;
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubePublishingParametersPrivate));
-#line 1065 "YouTubePublishing.c"
+#line 1067 "YouTubePublishing.c"
 }
 
 
@@ -1092,7 +1094,7 @@ static void publishing_you_tube_publishing_parameters_instance_init (PublishingY
 	self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->ref_count = 1;
-#line 1074 "YouTubePublishing.c"
+#line 1076 "YouTubePublishing.c"
 }
 
 
@@ -1106,7 +1108,7 @@ static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTub
 	_g_free0 (self->priv->channel_name);
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 1088 "YouTubePublishing.c"
+#line 1090 "YouTubePublishing.c"
 }
 
 
@@ -1131,7 +1133,7 @@ gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return instance;
-#line 1113 "YouTubePublishing.c"
+#line 1115 "YouTubePublishing.c"
 }
 
 
@@ -1144,7 +1146,7 @@ void publishing_you_tube_publishing_parameters_unref (gpointer instance) {
 		PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
 #line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1126 "YouTubePublishing.c"
+#line 1128 "YouTubePublishing.c"
 	}
 }
 
@@ -1198,14 +1200,14 @@ PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_constr
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 1180 "YouTubePublishing.c"
+#line 1182 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_you_tube_publisher_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, service, host);
-#line 1187 "YouTubePublishing.c"
+#line 1189 "YouTubePublishing.c"
 }
 
 
@@ -1221,7 +1223,7 @@ static gboolean publishing_you_tube_you_tube_publisher_real_is_running (Publishi
 	result = _tmp0_;
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 1203 "YouTubePublishing.c"
+#line 1205 "YouTubePublishing.c"
 }
 
 
@@ -1239,7 +1241,7 @@ static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSup
 	if (_tmp0_) {
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1221 "YouTubePublishing.c"
+#line 1223 "YouTubePublishing.c"
 	}
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->running = TRUE;
@@ -1249,14 +1251,14 @@ static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSup
 	if (_tmp1_ == NULL) {
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (self);
-#line 1231 "YouTubePublishing.c"
+#line 1233 "YouTubePublishing.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp2_ = self->priv->refresh_token;
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp2_);
-#line 1238 "YouTubePublishing.c"
+#line 1240 "YouTubePublishing.c"
 	}
 }
 
@@ -1279,7 +1281,7 @@ static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupp
 	publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 1261 "YouTubePublishing.c"
+#line 1263 "YouTubePublishing.c"
 }
 
 
@@ -1306,7 +1308,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 	_tmp2_ = _tmp1_->name;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (g_strcmp0 (_tmp2_, "feed") == 0) {
-#line 1288 "YouTubePublishing.c"
+#line 1290 "YouTubePublishing.c"
 		xmlNode* _tmp3_ = NULL;
 		xmlNode* _tmp4_ = NULL;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1315,7 +1317,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 		_tmp4_ = _tmp3_->children;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		doc_node_iter = _tmp4_;
-#line 1297 "YouTubePublishing.c"
+#line 1299 "YouTubePublishing.c"
 	} else {
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -1325,13 +1327,13 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 		_tmp6_ = _tmp5_->name;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (g_strcmp0 (_tmp6_, "entry") == 0) {
-#line 1307 "YouTubePublishing.c"
+#line 1309 "YouTubePublishing.c"
 			xmlNode* _tmp7_ = NULL;
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_tmp7_ = document_root;
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			doc_node_iter = _tmp7_;
-#line 1313 "YouTubePublishing.c"
+#line 1315 "YouTubePublishing.c"
 		} else {
 			GError* _tmp8_ = NULL;
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1346,7 +1348,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 				_g_free0 (_result_);
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				return NULL;
-#line 1328 "YouTubePublishing.c"
+#line 1330 "YouTubePublishing.c"
 			} else {
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				_g_free0 (_result_);
@@ -1356,7 +1358,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 				g_clear_error (&_inner_error_);
 #line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				return NULL;
-#line 1338 "YouTubePublishing.c"
+#line 1340 "YouTubePublishing.c"
 			}
 		}
 	}
@@ -1366,7 +1368,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 		_tmp9_ = TRUE;
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		while (TRUE) {
-#line 1348 "YouTubePublishing.c"
+#line 1350 "YouTubePublishing.c"
 			xmlNode* _tmp12_ = NULL;
 			xmlNode* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
@@ -1379,7 +1381,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 			gchar* _tmp33_ = NULL;
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			if (!_tmp9_) {
-#line 1361 "YouTubePublishing.c"
+#line 1363 "YouTubePublishing.c"
 				xmlNode* _tmp10_ = NULL;
 				xmlNode* _tmp11_ = NULL;
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1388,7 +1390,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 				_tmp11_ = _tmp10_->next;
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				doc_node_iter = _tmp11_;
-#line 1370 "YouTubePublishing.c"
+#line 1372 "YouTubePublishing.c"
 			}
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_tmp9_ = FALSE;
@@ -1398,7 +1400,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 			if (!(_tmp12_ != NULL)) {
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				break;
-#line 1380 "YouTubePublishing.c"
+#line 1382 "YouTubePublishing.c"
 			}
 #line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_tmp13_ = doc_node_iter;
@@ -1408,7 +1410,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 			if (g_strcmp0 (_tmp14_, "entry") != 0) {
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				continue;
-#line 1390 "YouTubePublishing.c"
+#line 1392 "YouTubePublishing.c"
 			}
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			name_val = NULL;
@@ -1420,20 +1422,20 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 			_tmp16_ = _tmp15_->children;
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			channel_node_iter = _tmp16_;
-#line 1402 "YouTubePublishing.c"
+#line 1404 "YouTubePublishing.c"
 			{
 				gboolean _tmp17_ = FALSE;
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				_tmp17_ = TRUE;
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				while (TRUE) {
-#line 1409 "YouTubePublishing.c"
+#line 1411 "YouTubePublishing.c"
 					xmlNode* _tmp20_ = NULL;
 					xmlNode* _tmp21_ = NULL;
 					const gchar* _tmp22_ = NULL;
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 					if (!_tmp17_) {
-#line 1415 "YouTubePublishing.c"
+#line 1417 "YouTubePublishing.c"
 						xmlNode* _tmp18_ = NULL;
 						xmlNode* _tmp19_ = NULL;
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1442,7 +1444,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 						_tmp19_ = _tmp18_->next;
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 						channel_node_iter = _tmp19_;
-#line 1424 "YouTubePublishing.c"
+#line 1426 "YouTubePublishing.c"
 					}
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 					_tmp17_ = FALSE;
@@ -1452,7 +1454,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 					if (!(_tmp20_ != NULL)) {
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 						break;
-#line 1434 "YouTubePublishing.c"
+#line 1436 "YouTubePublishing.c"
 					}
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 					_tmp21_ = channel_node_iter;
@@ -1460,7 +1462,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 					_tmp22_ = _tmp21_->name;
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 					if (g_strcmp0 (_tmp22_, "title") == 0) {
-#line 1442 "YouTubePublishing.c"
+#line 1444 "YouTubePublishing.c"
 						xmlNode* _tmp23_ = NULL;
 						gchar* _tmp24_ = NULL;
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1471,7 +1473,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 						_g_free0 (name_val);
 #line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 						name_val = _tmp24_;
-#line 1453 "YouTubePublishing.c"
+#line 1455 "YouTubePublishing.c"
 					} else {
 						xmlNode* _tmp25_ = NULL;
 						const gchar* _tmp26_ = NULL;
@@ -1481,7 +1483,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 						_tmp26_ = _tmp25_->name;
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 						if (g_strcmp0 (_tmp26_, "id") == 0) {
-#line 1463 "YouTubePublishing.c"
+#line 1465 "YouTubePublishing.c"
 							xmlNode* _tmp27_ = NULL;
 							xmlNs* _tmp28_ = NULL;
 							const gchar* _tmp29_ = NULL;
@@ -1497,7 +1499,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 							if (_tmp29_ != NULL) {
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 								continue;
-#line 1479 "YouTubePublishing.c"
+#line 1481 "YouTubePublishing.c"
 							}
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 							_tmp30_ = channel_node_iter;
@@ -1507,7 +1509,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 							_g_free0 (url_val);
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 							url_val = _tmp31_;
-#line 1489 "YouTubePublishing.c"
+#line 1491 "YouTubePublishing.c"
 						}
 					}
 				}
@@ -1526,7 +1528,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 			_g_free0 (name_val);
 #line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			break;
-#line 1508 "YouTubePublishing.c"
+#line 1510 "YouTubePublishing.c"
 		}
 	}
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1538,7 +1540,7 @@ static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper
 	result = _result_;
 #line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 1519 "YouTubePublishing.c"
+#line 1521 "YouTubePublishing.c"
 }
 
 
@@ -1556,13 +1558,13 @@ static void publishing_you_tube_you_tube_publisher_on_service_welcome_login (Pub
 	if (!_tmp0_) {
 #line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1536 "YouTubePublishing.c"
+#line 1538 "YouTubePublishing.c"
 	}
 #line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = self->priv->refresh_token;
 #line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp1_);
-#line 1542 "YouTubePublishing.c"
+#line 1544 "YouTubePublishing.c"
 }
 
 
@@ -1616,21 +1618,21 @@ static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (
 	_publishing_rest_support_session_unref0 (_tmp7_);
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_fetch_account_information (self);
-#line 1596 "YouTubePublishing.c"
+#line 1598 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete ((PublishingYouTubeYouTubePublisher*) self, _sender);
-#line 1603 "YouTubePublishing.c"
+#line 1605 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
 #line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err);
-#line 1610 "YouTubePublishing.c"
+#line 1612 "YouTubePublishing.c"
 }
 
 
@@ -1666,13 +1668,13 @@ static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_comp
 	if (!_tmp4_) {
 #line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1645 "YouTubePublishing.c"
+#line 1647 "YouTubePublishing.c"
 	}
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = txn;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, PublishingYouTubeYouTubePublisherChannelDirectoryTransaction));
-#line 1651 "YouTubePublishing.c"
+#line 1653 "YouTubePublishing.c"
 }
 
 
@@ -1720,7 +1722,7 @@ static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_erro
 	if (!_tmp7_) {
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1698 "YouTubePublishing.c"
+#line 1700 "YouTubePublishing.c"
 	}
 #line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
@@ -1728,7 +1730,7 @@ static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_erro
 	_tmp9_ = err;
 #line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 1706 "YouTubePublishing.c"
+#line 1708 "YouTubePublishing.c"
 }
 
 
@@ -1745,11 +1747,11 @@ static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout
 	if (!_tmp0_) {
 #line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1722 "YouTubePublishing.c"
+#line 1724 "YouTubePublishing.c"
 	}
 #line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1726 "YouTubePublishing.c"
+#line 1728 "YouTubePublishing.c"
 }
 
 
@@ -1766,11 +1768,11 @@ static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish
 	if (!_tmp0_) {
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1742 "YouTubePublishing.c"
+#line 1744 "YouTubePublishing.c"
 	}
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_upload (self);
-#line 1746 "YouTubePublishing.c"
+#line 1748 "YouTubePublishing.c"
 }
 
 
@@ -1802,7 +1804,7 @@ static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (Pub
 	if (!_tmp2_) {
 #line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1777 "YouTubePublishing.c"
+#line 1779 "YouTubePublishing.c"
 	}
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
@@ -1814,21 +1816,21 @@ static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (Pub
 	_tmp5_ = completed_fraction;
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 1789 "YouTubePublishing.c"
+#line 1791 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_complete ((PublishingYouTubeYouTubePublisher*) self, _sender, num_photos_published);
-#line 1796 "YouTubePublishing.c"
+#line 1798 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
 #line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err);
-#line 1803 "YouTubePublishing.c"
+#line 1805 "YouTubePublishing.c"
 }
 
 
@@ -1866,11 +1868,11 @@ static void publishing_you_tube_you_tube_publisher_on_upload_complete (Publishin
 	if (!_tmp5_) {
 #line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1840 "YouTubePublishing.c"
+#line 1842 "YouTubePublishing.c"
 	}
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_show_success_pane (self);
-#line 1844 "YouTubePublishing.c"
+#line 1846 "YouTubePublishing.c"
 }
 
 
@@ -1906,7 +1908,7 @@ static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYo
 	if (!_tmp4_) {
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1880 "YouTubePublishing.c"
+#line 1882 "YouTubePublishing.c"
 	}
 #line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = err;
@@ -1921,14 +1923,14 @@ static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYo
 	_tmp8_ = err;
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1894 "YouTubePublishing.c"
+#line 1896 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_service_welcome_login ((PublishingYouTubeYouTubePublisher*) self);
-#line 1901 "YouTubePublishing.c"
+#line 1903 "YouTubePublishing.c"
 }
 
 
@@ -1942,7 +1944,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_YOU_TUBE_SERVICE_WELCOME_MESSAGE, _publishing_you_tube_you_tube_publisher_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 1915 "YouTubePublishing.c"
+#line 1917 "YouTubePublishing.c"
 }
 
 
@@ -1983,7 +1985,7 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
 #line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 1956 "YouTubePublishing.c"
+#line 1958 "YouTubePublishing.c"
 	{
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
@@ -1991,7 +1993,7 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1964 "YouTubePublishing.c"
+#line 1966 "YouTubePublishing.c"
 				goto __catch27_spit_publishing_publishing_error;
 			}
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2002,7 +2004,7 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information
 			g_clear_error (&_inner_error_);
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 1975 "YouTubePublishing.c"
+#line 1977 "YouTubePublishing.c"
 		}
 	}
 	goto __finally27;
@@ -2020,7 +2022,7 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information
 		publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_);
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_error_free0 (err);
-#line 1993 "YouTubePublishing.c"
+#line 1995 "YouTubePublishing.c"
 	}
 	__finally27:
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2033,11 +2035,11 @@ static void publishing_you_tube_you_tube_publisher_do_fetch_account_information
 		g_clear_error (&_inner_error_);
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2006 "YouTubePublishing.c"
+#line 2008 "YouTubePublishing.c"
 	}
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 2010 "YouTubePublishing.c"
+#line 2012 "YouTubePublishing.c"
 }
 
 
@@ -2046,7 +2048,7 @@ static gchar* _publishing_you_tube_you_tube_publisher_channel_directory_transact
 	result = publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml (doc);
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 2019 "YouTubePublishing.c"
+#line 2021 "YouTubePublishing.c"
 }
 
 
@@ -2060,7 +2062,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
 #line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_debug ("YouTubePublishing.vala:329: ACTION: extracting account and channel inf" \
 "ormation from body of server response");
-#line 2032 "YouTubePublishing.c"
+#line 2034 "YouTubePublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
 		PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* _tmp1_ = NULL;
@@ -2087,7 +2089,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2059 "YouTubePublishing.c"
+#line 2061 "YouTubePublishing.c"
 				goto __catch28_spit_publishing_publishing_error;
 			}
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2098,7 +2100,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
 			g_clear_error (&_inner_error_);
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 2070 "YouTubePublishing.c"
+#line 2072 "YouTubePublishing.c"
 		}
 #line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp6_ = _tmp0_;
@@ -2110,7 +2112,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
 		response_doc = _tmp6_;
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 2082 "YouTubePublishing.c"
+#line 2084 "YouTubePublishing.c"
 	}
 	goto __finally28;
 	__catch28_spit_publishing_publishing_error:
@@ -2134,7 +2136,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
 		_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2106 "YouTubePublishing.c"
+#line 2108 "YouTubePublishing.c"
 	}
 	__finally28:
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2147,7 +2149,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
 		g_clear_error (&_inner_error_);
 #line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2119 "YouTubePublishing.c"
+#line 2121 "YouTubePublishing.c"
 	}
 	{
 		gchar* _tmp9_ = NULL;
@@ -2167,7 +2169,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2139 "YouTubePublishing.c"
+#line 2141 "YouTubePublishing.c"
 				goto __catch29_spit_publishing_publishing_error;
 			}
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2178,7 +2180,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
 			g_clear_error (&_inner_error_);
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 2150 "YouTubePublishing.c"
+#line 2152 "YouTubePublishing.c"
 		}
 #line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp13_ = self->priv->publishing_parameters;
@@ -2186,7 +2188,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
 		publishing_you_tube_publishing_parameters_set_channel_name (_tmp13_, _tmp9_);
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_free0 (_tmp9_);
-#line 2158 "YouTubePublishing.c"
+#line 2160 "YouTubePublishing.c"
 	}
 	goto __finally29;
 	__catch29_spit_publishing_publishing_error:
@@ -2210,7 +2212,7 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
 		_publishing_rest_support_xml_document_unref0 (response_doc);
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2182 "YouTubePublishing.c"
+#line 2184 "YouTubePublishing.c"
 	}
 	__finally29:
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2223,27 +2225,27 @@ static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_
 		g_clear_error (&_inner_error_);
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2195 "YouTubePublishing.c"
+#line 2197 "YouTubePublishing.c"
 	}
 #line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (self);
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2201 "YouTubePublishing.c"
+#line 2203 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) {
 #line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_publishing_options_publish ((PublishingYouTubeYouTubePublisher*) self);
-#line 2208 "YouTubePublishing.c"
+#line 2210 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) {
 #line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_publishing_options_logout ((PublishingYouTubeYouTubePublisher*) self);
-#line 2215 "YouTubePublishing.c"
+#line 2217 "YouTubePublishing.c"
 }
 
 
@@ -2269,7 +2271,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 	_tmp0_ = gtk_builder_new ();
 #line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	builder = _tmp0_;
-#line 2241 "YouTubePublishing.c"
+#line 2243 "YouTubePublishing.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
 #line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2278,7 +2280,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/youtube_publishing_options_pane.ui", &_inner_error_);
 #line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2250 "YouTubePublishing.c"
+#line 2252 "YouTubePublishing.c"
 			goto __catch30_g_error;
 		}
 	}
@@ -2321,7 +2323,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 		_g_object_unref0 (builder);
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2292 "YouTubePublishing.c"
+#line 2294 "YouTubePublishing.c"
 	}
 	__finally30:
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2334,7 +2336,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 		g_clear_error (&_inner_error_);
 #line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2305 "YouTubePublishing.c"
+#line 2307 "YouTubePublishing.c"
 	}
 #line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
@@ -2368,14 +2370,14 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 	_g_object_unref0 (opts_pane);
 #line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (builder);
-#line 2339 "YouTubePublishing.c"
+#line 2341 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
 #line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_status_updated ((PublishingYouTubeYouTubePublisher*) self, file_number, fraction_complete);
-#line 2346 "YouTubePublishing.c"
+#line 2348 "YouTubePublishing.c"
 }
 
 
@@ -2441,7 +2443,7 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY
 	if (!_tmp6_) {
 #line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2411 "YouTubePublishing.c"
+#line 2413 "YouTubePublishing.c"
 	}
 #line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
@@ -2487,7 +2489,7 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
 #line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2457 "YouTubePublishing.c"
+#line 2459 "YouTubePublishing.c"
 }
 
 
@@ -2506,7 +2508,7 @@ static void publishing_you_tube_you_tube_publisher_do_show_success_pane (Publish
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2476 "YouTubePublishing.c"
+#line 2478 "YouTubePublishing.c"
 }
 
 
@@ -2537,7 +2539,7 @@ static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRES
 	spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token");
 #line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (self);
-#line 2507 "YouTubePublishing.c"
+#line 2509 "YouTubePublishing.c"
 }
 
 
@@ -2552,14 +2554,14 @@ static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_
 	self = (PublishingYouTubeYouTubePublisherChannelDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 2522 "YouTubePublishing.c"
+#line 2524 "YouTubePublishing.c"
 }
 
 
 static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_you_tube_you_tube_publisher_channel_directory_transaction_new (PublishingRESTSupportGoogleSession* session) {
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_you_tube_publisher_channel_directory_transaction_construct (PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, session);
-#line 2529 "YouTubePublishing.c"
+#line 2531 "YouTubePublishing.c"
 }
 
 
@@ -2587,7 +2589,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti
 	if (g_strcmp0 (_tmp4_, "feed") == 0) {
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp2_ = TRUE;
-#line 2557 "YouTubePublishing.c"
+#line 2559 "YouTubePublishing.c"
 	} else {
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -2597,7 +2599,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti
 		_tmp6_ = _tmp5_->name;
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0;
-#line 2567 "YouTubePublishing.c"
+#line 2569 "YouTubePublishing.c"
 	}
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (_tmp2_) {
@@ -2605,7 +2607,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti
 		result = NULL;
 #line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return result;
-#line 2575 "YouTubePublishing.c"
+#line 2577 "YouTubePublishing.c"
 	} else {
 		gchar* _tmp7_ = NULL;
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -2614,7 +2616,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti
 		result = _tmp7_;
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return result;
-#line 2584 "YouTubePublishing.c"
+#line 2586 "YouTubePublishing.c"
 	}
 }
 
@@ -2622,7 +2624,7 @@ static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transacti
 static void publishing_you_tube_you_tube_publisher_channel_directory_transaction_class_init (PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass * klass) {
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_channel_directory_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2592 "YouTubePublishing.c"
+#line 2594 "YouTubePublishing.c"
 }
 
 
@@ -2659,14 +2661,14 @@ static void publishing_you_tube_you_tube_publisher_class_init (PublishingYouTube
 	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_you_tube_you_tube_publisher_real_do_logout;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_publisher_finalize;
-#line 2629 "YouTubePublishing.c"
+#line 2631 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_instance_init (PublishingYouTubeYouTubePublisher * self) {
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE (self);
-#line 2636 "YouTubePublishing.c"
+#line 2638 "YouTubePublishing.c"
 }
 
 
@@ -2688,7 +2690,7 @@ static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj) {
 	self->priv->progress_reporter_target_destroy_notify = NULL;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (publishing_you_tube_you_tube_publisher_parent_class)->finalize (obj);
-#line 2658 "YouTubePublishing.c"
+#line 2660 "YouTubePublishing.c"
 }
 
 
@@ -2707,28 +2709,28 @@ GType publishing_you_tube_you_tube_publisher_get_type (void) {
 static gpointer _publishing_you_tube_publishing_parameters_ref0 (gpointer self) {
 #line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? publishing_you_tube_publishing_parameters_ref (self) : NULL;
-#line 2677 "YouTubePublishing.c"
+#line 2679 "YouTubePublishing.c"
 }
 
 
 static gpointer _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (gpointer self) {
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? publishing_you_tube_publishing_options_pane_privacy_description_ref (self) : NULL;
-#line 2684 "YouTubePublishing.c"
+#line 2686 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_on_logout_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2691 "YouTubePublishing.c"
+#line 2693 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_on_publish_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2698 "YouTubePublishing.c"
+#line 2700 "YouTubePublishing.c"
 }
 
 
@@ -2951,7 +2953,7 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 	_tmp46_ = self->priv->privacy_descriptions;
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp46__length1 = self->priv->privacy_descriptions_length1;
-#line 2921 "YouTubePublishing.c"
+#line 2923 "YouTubePublishing.c"
 	{
 		PublishingYouTubePublishingOptionsPanePrivacyDescription** desc_collection = NULL;
 		gint desc_collection_length1 = 0;
@@ -2963,14 +2965,14 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 		desc_collection_length1 = _tmp46__length1;
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		for (desc_it = 0; desc_it < _tmp46__length1; desc_it = desc_it + 1) {
-#line 2933 "YouTubePublishing.c"
+#line 2935 "YouTubePublishing.c"
 			PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp47_ = NULL;
 			PublishingYouTubePublishingOptionsPanePrivacyDescription* desc = NULL;
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_tmp47_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]);
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			desc = _tmp47_;
-#line 2940 "YouTubePublishing.c"
+#line 2942 "YouTubePublishing.c"
 			{
 				GtkComboBoxText* _tmp48_ = NULL;
 				PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp49_ = NULL;
@@ -2985,7 +2987,7 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 				gtk_combo_box_text_append_text (_tmp48_, _tmp50_);
 #line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				_publishing_you_tube_publishing_options_pane_privacy_description_unref0 (desc);
-#line 2955 "YouTubePublishing.c"
+#line 2957 "YouTubePublishing.c"
 			}
 		}
 	}
@@ -3009,14 +3011,14 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 	g_signal_connect_object (_tmp55_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
 #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 2979 "YouTubePublishing.c"
+#line 2981 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
 #line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_publishing_options_pane_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, host, builder, publishing_parameters);
-#line 2986 "YouTubePublishing.c"
+#line 2988 "YouTubePublishing.c"
 }
 
 
@@ -3048,7 +3050,7 @@ static void publishing_you_tube_publishing_options_pane_on_publish_clicked (Publ
 	publishing_you_tube_publishing_parameters_set_privacy (_tmp0_, _tmp5_);
 #line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_emit_by_name (self, "publish");
-#line 3018 "YouTubePublishing.c"
+#line 3020 "YouTubePublishing.c"
 }
 
 
@@ -3057,7 +3059,7 @@ static void publishing_you_tube_publishing_options_pane_on_logout_clicked (Publi
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 3027 "YouTubePublishing.c"
+#line 3029 "YouTubePublishing.c"
 }
 
 
@@ -3069,7 +3071,7 @@ static void publishing_you_tube_publishing_options_pane_update_publish_button_se
 	_tmp0_ = self->priv->publish_button;
 #line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3039 "YouTubePublishing.c"
+#line 3041 "YouTubePublishing.c"
 }
 
 
@@ -3080,13 +3082,13 @@ static void _vala_array_add31 (PublishingYouTubePublishingOptionsPanePrivacyDesc
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 3050 "YouTubePublishing.c"
+#line 3052 "YouTubePublishing.c"
 	}
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[*length] = NULL;
-#line 3056 "YouTubePublishing.c"
+#line 3058 "YouTubePublishing.c"
 }
 
 
@@ -3097,13 +3099,13 @@ static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDesc
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 3067 "YouTubePublishing.c"
+#line 3069 "YouTubePublishing.c"
 	}
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[*length] = NULL;
-#line 3073 "YouTubePublishing.c"
+#line 3075 "YouTubePublishing.c"
 }
 
 
@@ -3114,13 +3116,13 @@ static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDesc
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 3084 "YouTubePublishing.c"
+#line 3086 "YouTubePublishing.c"
 	}
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[(*length)++] = value;
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[*length] = NULL;
-#line 3090 "YouTubePublishing.c"
+#line 3092 "YouTubePublishing.c"
 }
 
 
@@ -3192,13 +3194,13 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 	if (result_length1) {
 #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*result_length1 = _tmp10__length1;
-#line 3162 "YouTubePublishing.c"
+#line 3164 "YouTubePublishing.c"
 	}
 #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = _tmp10_;
 #line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 3168 "YouTubePublishing.c"
+#line 3170 "YouTubePublishing.c"
 }
 
 
@@ -3222,7 +3224,7 @@ static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (S
 	result = _tmp2_;
 #line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 3192 "YouTubePublishing.c"
+#line 3194 "YouTubePublishing.c"
 }
 
 
@@ -3235,7 +3237,7 @@ static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_op
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
 #line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 3205 "YouTubePublishing.c"
+#line 3207 "YouTubePublishing.c"
 }
 
 
@@ -3245,7 +3247,7 @@ static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
 #line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 3215 "YouTubePublishing.c"
+#line 3217 "YouTubePublishing.c"
 }
 
 
@@ -3253,7 +3255,7 @@ static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled
 	PublishingYouTubePublishingOptionsPane * self;
 #line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 3223 "YouTubePublishing.c"
+#line 3225 "YouTubePublishing.c"
 }
 
 
@@ -3280,21 +3282,21 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_
 	self->privacy_setting = _tmp2_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 3250 "YouTubePublishing.c"
+#line 3252 "YouTubePublishing.c"
 }
 
 
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting) {
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_publishing_options_pane_privacy_description_construct (PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting);
-#line 3257 "YouTubePublishing.c"
+#line 3259 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_privacy_description_init (GValue* value) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 3264 "YouTubePublishing.c"
+#line 3266 "YouTubePublishing.c"
 }
 
 
@@ -3303,7 +3305,7 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio
 	if (value->data[0].v_pointer) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer);
-#line 3273 "YouTubePublishing.c"
+#line 3275 "YouTubePublishing.c"
 	}
 }
 
@@ -3313,11 +3315,11 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio
 	if (src_value->data[0].v_pointer) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer);
-#line 3283 "YouTubePublishing.c"
+#line 3285 "YouTubePublishing.c"
 	} else {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3287 "YouTubePublishing.c"
+#line 3289 "YouTubePublishing.c"
 	}
 }
 
@@ -3325,37 +3327,37 @@ static void publishing_you_tube_publishing_options_pane_value_privacy_descriptio
 static gpointer publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 3295 "YouTubePublishing.c"
+#line 3297 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 3302 "YouTubePublishing.c"
+#line 3304 "YouTubePublishing.c"
 		PublishingYouTubePublishingOptionsPanePrivacyDescription* object;
 		object = collect_values[0].v_pointer;
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3309 "YouTubePublishing.c"
+#line 3311 "YouTubePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3313 "YouTubePublishing.c"
+#line 3315 "YouTubePublishing.c"
 		}
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (object);
-#line 3317 "YouTubePublishing.c"
+#line 3319 "YouTubePublishing.c"
 	} else {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3321 "YouTubePublishing.c"
+#line 3323 "YouTubePublishing.c"
 	}
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 3325 "YouTubePublishing.c"
+#line 3327 "YouTubePublishing.c"
 }
 
 
@@ -3366,25 +3368,25 @@ static gchar* publishing_you_tube_publishing_options_pane_value_privacy_descript
 	if (!object_p) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3336 "YouTubePublishing.c"
+#line 3338 "YouTubePublishing.c"
 	}
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!value->data[0].v_pointer) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = NULL;
-#line 3342 "YouTubePublishing.c"
+#line 3344 "YouTubePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3346 "YouTubePublishing.c"
+#line 3348 "YouTubePublishing.c"
 	} else {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 3350 "YouTubePublishing.c"
+#line 3352 "YouTubePublishing.c"
 	}
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 3354 "YouTubePublishing.c"
+#line 3356 "YouTubePublishing.c"
 }
 
 
@@ -3398,7 +3400,7 @@ static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privac
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 3368 "YouTubePublishing.c"
+#line 3370 "YouTubePublishing.c"
 }
 
 
@@ -3407,7 +3409,7 @@ static gpointer publishing_you_tube_publishing_options_pane_value_get_privacy_de
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 3377 "YouTubePublishing.c"
+#line 3379 "YouTubePublishing.c"
 }
 
 
@@ -3427,17 +3429,17 @@ static void publishing_you_tube_publishing_options_pane_value_set_privacy_descri
 		value->data[0].v_pointer = v_object;
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 3397 "YouTubePublishing.c"
+#line 3399 "YouTubePublishing.c"
 	} else {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3401 "YouTubePublishing.c"
+#line 3403 "YouTubePublishing.c"
 	}
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 3407 "YouTubePublishing.c"
+#line 3409 "YouTubePublishing.c"
 	}
 }
 
@@ -3456,17 +3458,17 @@ static void publishing_you_tube_publishing_options_pane_value_take_privacy_descr
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 3426 "YouTubePublishing.c"
+#line 3428 "YouTubePublishing.c"
 	} else {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3430 "YouTubePublishing.c"
+#line 3432 "YouTubePublishing.c"
 	}
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 3436 "YouTubePublishing.c"
+#line 3438 "YouTubePublishing.c"
 	}
 }
 
@@ -3476,14 +3478,14 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_clas
 	publishing_you_tube_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass);
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_you_tube_publishing_options_pane_privacy_description_finalize;
-#line 3446 "YouTubePublishing.c"
+#line 3448 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_privacy_description_instance_init (PublishingYouTubePublishingOptionsPanePrivacyDescription * self) {
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->ref_count = 1;
-#line 3453 "YouTubePublishing.c"
+#line 3455 "YouTubePublishing.c"
 }
 
 
@@ -3495,7 +3497,7 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_fina
 	g_signal_handlers_destroy (self);
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->description);
-#line 3465 "YouTubePublishing.c"
+#line 3467 "YouTubePublishing.c"
 }
 
 
@@ -3520,7 +3522,7 @@ static gpointer publishing_you_tube_publishing_options_pane_privacy_description_
 	g_atomic_int_inc (&self->ref_count);
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return instance;
-#line 3490 "YouTubePublishing.c"
+#line 3492 "YouTubePublishing.c"
 }
 
 
@@ -3533,7 +3535,7 @@ static void publishing_you_tube_publishing_options_pane_privacy_description_unre
 		PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
 #line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3503 "YouTubePublishing.c"
+#line 3505 "YouTubePublishing.c"
 	}
 }
 
@@ -3549,7 +3551,7 @@ static void publishing_you_tube_publishing_options_pane_class_init (PublishingYo
 	g_signal_new ("publish", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_new ("logout", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3519 "YouTubePublishing.c"
+#line 3521 "YouTubePublishing.c"
 }
 
 
@@ -3564,7 +3566,7 @@ static void publishing_you_tube_publishing_options_pane_spit_publishing_dialog_p
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_installed;
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled;
-#line 3534 "YouTubePublishing.c"
+#line 3536 "YouTubePublishing.c"
 }
 
 
@@ -3587,7 +3589,7 @@ static void publishing_you_tube_publishing_options_pane_instance_init (Publishin
 	self->priv->builder = NULL;
 #line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_label = NULL;
-#line 3557 "YouTubePublishing.c"
+#line 3559 "YouTubePublishing.c"
 }
 
 
@@ -3617,7 +3619,7 @@ static void publishing_you_tube_publishing_options_pane_finalize (GObject* obj)
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
 #line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (publishing_you_tube_publishing_options_pane_parent_class)->finalize (obj);
-#line 3587 "YouTubePublishing.c"
+#line 3589 "YouTubePublishing.c"
 }
 
 
@@ -3638,7 +3640,7 @@ GType publishing_you_tube_publishing_options_pane_get_type (void) {
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
 #line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3608 "YouTubePublishing.c"
+#line 3610 "YouTubePublishing.c"
 }
 
 
@@ -3695,14 +3697,14 @@ PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_const
 	self->priv->publishable = _tmp8_;
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 3665 "YouTubePublishing.c"
+#line 3667 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 #line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_upload_transaction_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 3672 "YouTubePublishing.c"
+#line 3674 "YouTubePublishing.c"
 }
 
 
@@ -3746,27 +3748,41 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 3716 "YouTubePublishing.c"
+#line 3718 "YouTubePublishing.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3722 "YouTubePublishing.c"
+#line 3724 "YouTubePublishing.c"
+}
+
+
+static guint8* _vala_array_dup11 (guint8* self, int length) {
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return g_memdup (self, length * sizeof (guint8));
+#line 3731 "YouTubePublishing.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 3729 "YouTubePublishing.c"
+#line 3738 "YouTubePublishing.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 3736 "YouTubePublishing.c"
+#line 3745 "YouTubePublishing.c"
+}
+
+
+static guint8* _vala_array_dup12 (guint8* self, int length) {
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return g_memdup (self, length * sizeof (guint8));
+#line 3752 "YouTubePublishing.c"
 }
 
 
@@ -3802,44 +3818,47 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	gint _tmp22__length1 = 0;
 	guint8* _tmp23_ = NULL;
 	gint _tmp23__length1 = 0;
-	SoupBuffer* _tmp24_ = NULL;
-	SoupMultipart* _tmp25_ = NULL;
-	SoupBuffer* _tmp26_ = NULL;
+	guint8* _tmp24_ = NULL;
+	gint _tmp24__length1 = 0;
+	SoupBuffer* _tmp25_ = NULL;
+	SoupMultipart* _tmp26_ = NULL;
+	SoupBuffer* _tmp27_ = NULL;
 	gchar* video_data = NULL;
 	gsize data_length = 0UL;
 	SoupBuffer* bindable_data = NULL;
-	const gchar* _tmp46_ = NULL;
-	guint8* _tmp47_ = NULL;
-	gint _tmp47__length1 = 0;
+	const gchar* _tmp47_ = NULL;
 	guint8* _tmp48_ = NULL;
 	gint _tmp48__length1 = 0;
-	gsize _tmp49_ = 0UL;
-	SoupBuffer* _tmp50_ = NULL;
-	SoupMultipart* _tmp51_ = NULL;
-	SpitPublishingPublishable* _tmp52_ = NULL;
-	GFile* _tmp53_ = NULL;
+	guint8* _tmp49_ = NULL;
+	gint _tmp49__length1 = 0;
+	guint8* _tmp50_ = NULL;
+	gint _tmp50__length1 = 0;
+	SoupBuffer* _tmp51_ = NULL;
+	SoupMultipart* _tmp52_ = NULL;
+	SpitPublishingPublishable* _tmp53_ = NULL;
 	GFile* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
+	GFile* _tmp55_ = NULL;
 	gchar* _tmp56_ = NULL;
-	SoupMessage* outbound_message = NULL;
 	gchar* _tmp57_ = NULL;
+	SoupMessage* outbound_message = NULL;
 	gchar* _tmp58_ = NULL;
-	SoupMultipart* _tmp59_ = NULL;
-	SoupMessage* _tmp60_ = NULL;
+	gchar* _tmp59_ = NULL;
+	SoupMultipart* _tmp60_ = NULL;
 	SoupMessage* _tmp61_ = NULL;
-	SoupMessageHeaders* _tmp62_ = NULL;
-	gchar* _tmp63_ = NULL;
+	SoupMessage* _tmp62_ = NULL;
+	SoupMessageHeaders* _tmp63_ = NULL;
 	gchar* _tmp64_ = NULL;
-	SoupMessageHeaders* _tmp65_ = NULL;
-	SpitPublishingPublishable* _tmp66_ = NULL;
-	gchar* _tmp67_ = NULL;
+	gchar* _tmp65_ = NULL;
+	SoupMessageHeaders* _tmp66_ = NULL;
+	SpitPublishingPublishable* _tmp67_ = NULL;
 	gchar* _tmp68_ = NULL;
-	SoupMessageHeaders* _tmp69_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp70_ = NULL;
-	gchar* _tmp71_ = NULL;
+	gchar* _tmp69_ = NULL;
+	SoupMessageHeaders* _tmp70_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp71_ = NULL;
 	gchar* _tmp72_ = NULL;
 	gchar* _tmp73_ = NULL;
 	gchar* _tmp74_ = NULL;
+	gchar* _tmp75_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction);
@@ -3855,11 +3874,11 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	if (_tmp3_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) {
 #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp1_ = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_UNLISTED_XML;
-#line 3825 "YouTubePublishing.c"
+#line 3844 "YouTubePublishing.c"
 	} else {
 #line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp1_ = "";
-#line 3829 "YouTubePublishing.c"
+#line 3848 "YouTubePublishing.c"
 	}
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = g_strdup (_tmp1_);
@@ -3873,11 +3892,11 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	if (_tmp7_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE) {
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp5_ = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_PRIVATE_XML;
-#line 3843 "YouTubePublishing.c"
+#line 3862 "YouTubePublishing.c"
 	} else {
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp5_ = "";
-#line 3847 "YouTubePublishing.c"
+#line 3866 "YouTubePublishing.c"
 	}
 #line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = g_strdup (_tmp5_);
@@ -3893,7 +3912,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	_tmp11_ = title;
 #line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (g_strcmp0 (_tmp11_, "") == 0) {
-#line 3863 "YouTubePublishing.c"
+#line 3882 "YouTubePublishing.c"
 		SpitPublishingPublishable* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -3904,7 +3923,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 		_g_free0 (title);
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		title = _tmp13_;
-#line 3874 "YouTubePublishing.c"
+#line 3893 "YouTubePublishing.c"
 	}
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp14_ = title;
@@ -3933,51 +3952,55 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp23__length1 = _tmp22__length1;
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp24_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp23_, _tmp23__length1);
+	_tmp24_ = (_tmp23_ != NULL) ? _vala_array_dup11 (_tmp23_, _tmp23__length1) : ((gpointer) _tmp23_);
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp24__length1 = _tmp23__length1;
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	metadata_buffer = _tmp24_;
+	_tmp25_ = soup_buffer_new_take (_tmp24_, _tmp24__length1);
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	metadata_buffer = _tmp25_;
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp25_ = message_parts;
+	_tmp26_ = message_parts;
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp26_ = metadata_buffer;
+	_tmp27_ = metadata_buffer;
 #line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_multipart_append_form_file (_tmp25_, "", "", "application/atom+xml", _tmp26_);
-#line 3912 "YouTubePublishing.c"
+	soup_multipart_append_form_file (_tmp26_, "", "", "application/atom+xml", _tmp27_);
+#line 3935 "YouTubePublishing.c"
 	{
-		SpitPublishingPublishable* _tmp27_ = NULL;
-		GFile* _tmp28_ = NULL;
+		SpitPublishingPublishable* _tmp28_ = NULL;
 		GFile* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
+		GFile* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
 		gchar* _tmp32_ = NULL;
-		gsize _tmp33_ = 0UL;
+		gchar* _tmp33_ = NULL;
+		gsize _tmp34_ = 0UL;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp27_ = self->priv->publishable;
+		_tmp28_ = self->priv->publishable;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp28_ = spit_publishing_publishable_get_serialized_file (_tmp27_);
+		_tmp29_ = spit_publishing_publishable_get_serialized_file (_tmp28_);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp29_ = _tmp28_;
+		_tmp30_ = _tmp29_;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp30_ = g_file_get_path (_tmp29_);
+		_tmp31_ = g_file_get_path (_tmp30_);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp31_ = _tmp30_;
+		_tmp32_ = _tmp31_;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_file_get_contents (_tmp31_, &_tmp32_, &_tmp33_, &_inner_error_);
+		g_file_get_contents (_tmp32_, &_tmp33_, &_tmp34_, &_inner_error_);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_free0 (video_data);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		video_data = _tmp32_;
+		video_data = _tmp33_;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		data_length = _tmp33_;
+		data_length = _tmp34_;
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (_tmp31_);
+		_g_free0 (_tmp32_);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_object_unref0 (_tmp29_);
+		_g_object_unref0 (_tmp30_);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 3947 "YouTubePublishing.c"
+#line 3970 "YouTubePublishing.c"
 				goto __catch31_g_file_error;
 			}
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -4000,7 +4023,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			g_clear_error (&_inner_error_);
 #line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 3970 "YouTubePublishing.c"
+#line 3993 "YouTubePublishing.c"
 		}
 	}
 	goto __finally31;
@@ -4008,61 +4031,61 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	{
 		GError* e = NULL;
 		gchar* msg = NULL;
-		SpitPublishingPublishable* _tmp34_ = NULL;
-		GFile* _tmp35_ = NULL;
+		SpitPublishingPublishable* _tmp35_ = NULL;
 		GFile* _tmp36_ = NULL;
-		gchar* _tmp37_ = NULL;
+		GFile* _tmp37_ = NULL;
 		gchar* _tmp38_ = NULL;
-		GError* _tmp39_ = NULL;
-		const gchar* _tmp40_ = NULL;
-		gchar* _tmp41_ = NULL;
+		gchar* _tmp39_ = NULL;
+		GError* _tmp40_ = NULL;
+		const gchar* _tmp41_ = NULL;
 		gchar* _tmp42_ = NULL;
-		const gchar* _tmp43_ = NULL;
+		gchar* _tmp43_ = NULL;
 		const gchar* _tmp44_ = NULL;
-		GError* _tmp45_ = NULL;
+		const gchar* _tmp45_ = NULL;
+		GError* _tmp46_ = NULL;
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		e = _inner_error_;
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_inner_error_ = NULL;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp34_ = self->priv->publishable;
+		_tmp35_ = self->priv->publishable;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp35_ = spit_publishing_publishable_get_serialized_file (_tmp34_);
+		_tmp36_ = spit_publishing_publishable_get_serialized_file (_tmp35_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp36_ = _tmp35_;
+		_tmp37_ = _tmp36_;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp37_ = g_file_get_path (_tmp36_);
+		_tmp38_ = g_file_get_path (_tmp37_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp38_ = _tmp37_;
+		_tmp39_ = _tmp38_;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp39_ = e;
+		_tmp40_ = e;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp40_ = _tmp39_->message;
+		_tmp41_ = _tmp40_->message;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp41_ = g_strdup_printf ("YouTube: couldn't read data from %s: %s", _tmp38_, _tmp40_);
+		_tmp42_ = g_strdup_printf ("YouTube: couldn't read data from %s: %s", _tmp39_, _tmp41_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp42_ = _tmp41_;
+		_tmp43_ = _tmp42_;
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (_tmp38_);
+		_g_free0 (_tmp39_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_object_unref0 (_tmp36_);
+		_g_object_unref0 (_tmp37_);
 #line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		msg = _tmp42_;
+		msg = _tmp43_;
 #line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp43_ = msg;
+		_tmp44_ = msg;
 #line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_warning ("YouTubePublishing.vala:580: %s", _tmp43_);
+		g_warning ("YouTubePublishing.vala:580: %s", _tmp44_);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp44_ = msg;
+		_tmp45_ = msg;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp45_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp44_);
+		_tmp46_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp45_);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_inner_error_ = _tmp45_;
+		_inner_error_ = _tmp46_;
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_free0 (msg);
 #line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_error_free0 (e);
-#line 4032 "YouTubePublishing.c"
+#line 4055 "YouTubePublishing.c"
 		goto __finally31;
 	}
 	__finally31:
@@ -4088,7 +4111,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			__vala_SoupMultipart_free0 (message_parts);
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 4058 "YouTubePublishing.c"
+#line 4081 "YouTubePublishing.c"
 		} else {
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (video_data);
@@ -4110,154 +4133,156 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 			g_clear_error (&_inner_error_);
 #line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 4080 "YouTubePublishing.c"
+#line 4103 "YouTubePublishing.c"
 		}
 	}
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp46_ = video_data;
+	_tmp47_ = video_data;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp47_ = string_get_data (_tmp46_, &_tmp47__length1);
+	_tmp48_ = string_get_data (_tmp47_, &_tmp48__length1);
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp48_ = _tmp47_;
+	_tmp49_ = _tmp48_;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp48__length1 = _tmp47__length1;
+	_tmp49__length1 = _tmp48__length1;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp49_ = data_length;
+	_tmp50_ = (_tmp49_ != NULL) ? _vala_array_dup12 (_tmp49_, _tmp49__length1) : ((gpointer) _tmp49_);
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp50_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp48_ + 0, ((gint) _tmp49_) - 0);
+	_tmp50__length1 = _tmp49__length1;
 #line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	bindable_data = _tmp50_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp51_ = message_parts;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp52_ = self->priv->publishable;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp53_ = spit_publishing_publishable_get_serialized_file (_tmp52_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp54_ = _tmp53_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp55_ = g_file_get_path (_tmp54_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp56_ = _tmp55_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_multipart_append_form_file (_tmp51_, "", _tmp56_, "video/mpeg", bindable_data);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp56_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (_tmp54_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp57_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp58_ = _tmp57_;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp59_ = message_parts;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp60_ = soup_form_request_new_from_multipart (_tmp58_, _tmp59_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp61_ = _tmp60_;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp58_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	outbound_message = _tmp61_;
+	_tmp51_ = soup_buffer_new_take (_tmp50_, _tmp50__length1);
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	bindable_data = _tmp51_;
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp52_ = message_parts;
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp53_ = self->priv->publishable;
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp54_ = spit_publishing_publishable_get_serialized_file (_tmp53_);
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp55_ = _tmp54_;
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp56_ = g_file_get_path (_tmp55_);
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp57_ = _tmp56_;
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	soup_multipart_append_form_file (_tmp52_, "", _tmp57_, "video/mpeg", bindable_data);
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (_tmp57_);
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_tmp55_);
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp58_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp59_ = _tmp58_;
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp60_ = message_parts;
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp61_ = soup_form_request_new_from_multipart (_tmp59_, _tmp60_);
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp62_ = _tmp61_;
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (_tmp59_);
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	outbound_message = _tmp62_;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp63_ = outbound_message->request_headers;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp64_ = g_strdup_printf ("key=%s", PUBLISHING_YOU_TUBE_DEVELOPER_KEY);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp65_ = _tmp64_;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	soup_message_headers_append (_tmp63_, "X-GData-Key", _tmp65_);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (_tmp65_);
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp66_ = outbound_message->request_headers;
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp62_ = outbound_message->request_headers;
+	_tmp67_ = self->priv->publishable;
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp63_ = g_strdup_printf ("key=%s", PUBLISHING_YOU_TUBE_DEVELOPER_KEY);
+	_tmp68_ = spit_publishing_publishable_get_param_string (_tmp67_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp64_ = _tmp63_;
+	_tmp69_ = _tmp68_;
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_message_headers_append (_tmp62_, "X-GData-Key", _tmp64_);
+	soup_message_headers_append (_tmp66_, "Slug", _tmp69_);
 #line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp64_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp65_ = outbound_message->request_headers;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp66_ = self->priv->publishable;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp67_ = spit_publishing_publishable_get_param_string (_tmp66_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp68_ = _tmp67_;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_message_headers_append (_tmp65_, "Slug", _tmp68_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp68_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp69_ = outbound_message->request_headers;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp70_ = self->priv->session;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp71_ = publishing_rest_support_google_session_get_access_token (_tmp70_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp72_ = _tmp71_;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp73_ = g_strconcat ("Bearer ", _tmp72_, NULL);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp74_ = _tmp73_;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_message_headers_append (_tmp69_, "Authorization", _tmp74_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp74_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp72_);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (_tmp69_);
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp70_ = outbound_message->request_headers;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp71_ = self->priv->session;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp72_ = publishing_rest_support_google_session_get_access_token (_tmp71_);
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp73_ = _tmp72_;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp74_ = g_strconcat ("Bearer ", _tmp73_, NULL);
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp75_ = _tmp74_;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	soup_message_headers_append (_tmp70_, "Authorization", _tmp75_);
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (_tmp75_);
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (_tmp73_);
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_object_unref0 (outbound_message);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			__vala_SoupBuffer_free0 (bindable_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (video_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (metadata);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (title);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (private_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (unlisted_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 4201 "YouTubePublishing.c"
+#line 4226 "YouTubePublishing.c"
 		} else {
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_object_unref0 (outbound_message);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			__vala_SoupBuffer_free0 (bindable_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (video_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (metadata);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (title);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (private_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (unlisted_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 4227 "YouTubePublishing.c"
+#line 4252 "YouTubePublishing.c"
 		}
 	}
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -4278,7 +4303,7 @@ static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTS
 	_g_free0 (unlisted_video);
 #line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	__vala_SoupMultipart_free0 (message_parts);
-#line 4248 "YouTubePublishing.c"
+#line 4273 "YouTubePublishing.c"
 }
 
 
@@ -4291,14 +4316,14 @@ static void publishing_you_tube_upload_transaction_class_init (PublishingYouTube
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeUploadTransactionPrivate));
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_you_tube_upload_transaction_real_execute;
-#line 4261 "YouTubePublishing.c"
+#line 4286 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_instance_init (PublishingYouTubeUploadTransaction * self) {
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 4268 "YouTubePublishing.c"
+#line 4293 "YouTubePublishing.c"
 }
 
 
@@ -4314,7 +4339,7 @@ static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSuppo
 	_g_object_unref0 (self->priv->publishable);
 #line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_you_tube_upload_transaction_parent_class)->finalize (obj);
-#line 4284 "YouTubePublishing.c"
+#line 4309 "YouTubePublishing.c"
 }
 
 
@@ -4337,36 +4362,36 @@ PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_
 	gint _tmp1__length1 = 0;
 	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
 	PublishingYouTubePublishingParameters* _tmp3_ = NULL;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = session;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = publishables;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubeUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = parameters;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp2_);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 4329 "YouTubePublishing.c"
+#line 4354 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubeUploader* publishing_you_tube_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_uploader_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 4336 "YouTubePublishing.c"
+#line 4361 "YouTubePublishing.c"
 }
 
 
@@ -4380,65 +4405,65 @@ static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_creat
 	SpitPublishingPublishable* _tmp4_ = NULL;
 	PublishingYouTubeUploadTransaction* _tmp5_ = NULL;
 	PublishingRESTSupportTransaction* _tmp6_ = NULL;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = self->priv->parameters;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = publishing_you_tube_upload_transaction_new (_tmp1_, _tmp2_, _tmp4_);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (_tmp4_);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = _tmp6_;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 4376 "YouTubePublishing.c"
+#line 4401 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderClass * klass) {
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_you_tube_uploader_finalize;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeUploaderPrivate));
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_you_tube_uploader_real_create_transaction;
-#line 4389 "YouTubePublishing.c"
+#line 4414 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_instance_init (PublishingYouTubeUploader * self) {
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE (self);
-#line 4396 "YouTubePublishing.c"
+#line 4421 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingYouTubeUploader * self;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
 #line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_you_tube_uploader_parent_class)->finalize (obj);
-#line 4408 "YouTubePublishing.c"
+#line 4433 "YouTubePublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala b/plugins/shotwell-publishing/YouTubePublishing.vala
index 48241bd..d7db9f8 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.vala
+++ b/plugins/shotwell-publishing/YouTubePublishing.vala
@@ -565,7 +565,7 @@ internal class UploadTransaction : Publishing.RESTSupport.GooglePublisher.Authen
 
         string metadata = METADATA_TEMPLATE.printf(Publishing.RESTSupport.decimal_entity_encode(title),
             private_video, unlisted_video);
-        Soup.Buffer metadata_buffer = new Soup.Buffer(Soup.MemoryUse.COPY, metadata.data);
+        var metadata_buffer = new Soup.Buffer.take (metadata.data);
         message_parts.append_form_file("", "", "application/atom+xml", metadata_buffer);
 
         // attempt to read the binary video data from disk
@@ -585,8 +585,7 @@ internal class UploadTransaction : Publishing.RESTSupport.GooglePublisher.Authen
         // bind the binary video data read from disk into a Soup.Buffer object so that we
         // can attach it to the multipart request, then actaully append the buffer
         // to the multipart request. Then, set the MIME type for this part.
-        Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY,
-            video_data.data[0:data_length]);
+        var bindable_data = new Soup.Buffer.take (video_data.data);
 
         message_parts.append_form_file("", publishable.get_serialized_file().get_path(),
             "video/mpeg", bindable_data);
diff --git a/plugins/shotwell-publishing/piwigo_authentication_pane.ui b/plugins/shotwell-publishing/piwigo_authentication_pane.ui
index ec24aed..39c8d7c 100644
--- a/plugins/shotwell-publishing/piwigo_authentication_pane.ui
+++ b/plugins/shotwell-publishing/piwigo_authentication_pane.ui
@@ -1,173 +1,174 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkWindow" id="authentication_pane">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkAlignment" id="alignment">
+      <object class="GtkBox" id="content">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xscale">0.5</property>
-        <property name="yscale">0.5</property>
+        <property name="margin_left">30</property>
+        <property name="margin_right">30</property>
+        <property name="hexpand">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkLabel" id="message_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">30</property>
-            <property name="margin_right">30</property>
+            <property name="halign">start</property>
             <property name="hexpand">True</property>
-            <property name="spacing">8</property>
+            <property name="vexpand">True</property>
+            <property name="label">label</property>
+            <property name="wrap">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="field_table">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
             <child>
-              <object class="GtkLabel" id="message_label">
+              <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">_URL of your Piwigo photo library</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">url_entry</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="url_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="no">label</property>
-                <property name="wrap">True</property>
+                <property name="invisible_char">●</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="password_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
+                <property name="visibility">False</property>
+                <property name="invisible_char">●</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSwitch" id="remember_password_checkbutton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="halign">start</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkTable" id="field_table">
+              <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="n_rows">3</property>
-                <property name="n_columns">2</property>
-                <property name="column_spacing">8</property>
-                <property name="row_spacing">2</property>
-                <child>
-                  <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_URL of your Piwigo photo library</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">url_entry</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">User _name</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">username_entry</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Password</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">password_entry</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="url_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">●</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="username_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">●</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="password_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="visibility">False</property>
-                    <property name="invisible_char">●</property>
-                    <property name="invisible_char_set">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                  </packing>
-                </child>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">User _name</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="remember_password_checkbutton">
-                <property name="label" translatable="yes">_Remember Password</property>
+              <object class="GtkEntry" id="username_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
+                <property name="hexpand">True</property>
+                <property name="invisible_char">●</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">_Password</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
+                <property name="mnemonic_widget">password_entry</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="GtkHButtonBox" id="hbuttonbox1">
+              <object class="GtkLabel">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkButton" id="login_button">
-                    <property name="label" translatable="yes">Log in</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_action_appearance">False</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Remember Password</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">center</property>
+            <child>
+              <object class="GtkButton" id="login_button">
+                <property name="label" translatable="yes">Log in</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
         </child>
       </object>
     </child>
diff --git a/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui b/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
index 7197603..bbcd942 100644
--- a/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
@@ -1,312 +1,287 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="publishing_options_pane">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkAlignment" id="alignment">
+      <object class="GtkBox" id="content">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xscale">0.5</property>
-        <property name="yscale">0.5</property>
+        <property name="margin_left">10</property>
+        <property name="margin_right">10</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
         <child>
-          <object class="GtkBox" id="vbox1">
+          <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="margin_right">10</property>
-            <property name="orientation">vertical</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">Photos will appear in:</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid" id="field_table">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">12</property>
+            <child>
+              <object class="GtkRadioButton" id="use_existing_radio">
+                <property name="label" translatable="yes">An _existing category</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="halign">end</property>
+                <property name="use_underline">True</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
             <child>
-              <object class="GtkLabel" id="label1">
+              <object class="GtkComboBoxText" id="existing_categories_combo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Photos will appear in:</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkTable" id="field_table">
+              <object class="GtkComboBoxText" id="within_existing_combo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="n_rows">7</property>
-                <property name="n_columns">2</property>
-                <child>
-                  <object class="GtkRadioButton" id="use_existing_radio">
-                    <property name="label" translatable="yes">An _existing category:</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">1</property>
-                    <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkRadioButton" id="create_new_radio">
-                    <property name="label" translatable="yes">A _new album named:</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="xalign">1</property>
-                    <property name="active">True</property>
-                    <property name="draw_indicator">True</property>
-                    <property name="group">use_existing_radio</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="existing_categories_combo">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="y_options">GTK_EXPAND</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="new_category_entry">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="invisible_char">●</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="within_existing_combo">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="y_options">GTK_EXPAND</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSeparator" id="hseparator1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">4</property>
-                    <property name="bottom_attach">5</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="xpad">5</property>
-                    <property name="label" translatable="yes">Photos will be _visible by:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">perms_combo</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">5</property>
-                    <property name="bottom_attach">6</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="perms_combo">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">5</property>
-                    <property name="bottom_attach">6</property>
-                    <property name="y_options">GTK_EXPAND</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="xpad">5</property>
-                    <property name="label" translatable="yes">Photo size:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">6</property>
-                    <property name="bottom_attach">7</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="size_combo">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">6</property>
-                    <property name="bottom_attach">7</property>
-                    <property name="y_options">GTK_EXPAND</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="within_existing_label">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="xpad">5</property>
-                    <property name="label" translatable="yes">within category:</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                  </packing>
-                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="perms_combo">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="size_combo">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="album_comment_scroll">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="album_comment_scroll">
+                  <object class="GtkTextView" id="album_comment">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="shadow_type">in</property>
-                    <child>
-                      <object class="GtkTextView" id="album_comment">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="wrap_mode">word</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="album_comment_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">1</property>
-                    <property name="yalign">0</property>
-                    <property name="xpad">5</property>
-                    <property name="label" translatable="yes">Album comment:</property>
+                    <property name="wrap_mode">word</property>
                   </object>
-                  <packing>
-                    <property name="top_attach">3</property>
-                    <property name="bottom_attach">4</property>
-                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="strip_metadata_check">
-                <property name="label" translatable="yes">_Remove location, camera, and other identifying information before uploading</property>
+              <object class="GtkRadioButton" id="create_new_radio">
+                <property name="label" translatable="yes">A _new album named</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
+                <property name="halign">end</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0</property>
+                <property name="active">True</property>
                 <property name="draw_indicator">True</property>
+                <property name="group">use_existing_radio</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="title_as_comment_check">
-                <property name="label" translatable="yes">_If a title is set and comment unset, use title as comment</property>
+              <object class="GtkEntry" id="new_category_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
+                <property name="invisible_char">●</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="within_existing_label">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">within category</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="album_comment_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="valign">start</property>
+                <property name="label" translatable="yes">Album comment</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Photos will be _visible by</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
+                <property name="mnemonic_widget">perms_combo</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">end</property>
+                <property name="label" translatable="yes">Photo size</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">6</property>
               </packing>
             </child>
             <child>
-              <object class="GtkCheckButton" id="no_upload_tags_check">
-                <property name="label" translatable="yes">_Do no upload tags</property>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="strip_metadata_check">
+            <property name="label" translatable="yes">_Remove location, camera, and other identifying information before uploading</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="halign">start</property>
+            <property name="use_underline">True</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="title_as_comment_check">
+            <property name="label" translatable="yes">_If a title is set and comment unset, use title as comment</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="halign">start</property>
+            <property name="use_underline">True</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="no_upload_tags_check">
+            <property name="label" translatable="yes">_Do no upload tags</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="halign">start</property>
+            <property name="use_underline">True</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkButton" id="logout_button">
+                <property name="label" translatable="yes">Logout</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_underline">True</property>
-                <property name="xalign">0</property>
-                <property name="draw_indicator">True</property>
+                <property name="receives_default">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">4</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButtonBox" id="hbuttonbox1">
+              <object class="GtkButton" id="publish_button">
+                <property name="label" translatable="yes">Publish</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkButton" id="logout_button">
-                    <property name="label" translatable="yes">Logout</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="publish_button">
-                    <property name="label" translatable="yes">Publish</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">5</property>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">5</property>
+          </packing>
         </child>
       </object>
     </child>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4c0ef0d..4d7e209 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,20 +7,8 @@ misc/org.yorba.shotwell-extras.gschema.xml
 misc/org.yorba.shotwell.gschema.xml
 plugins/common/Resources.vala
 plugins/common/RESTSupport.vala
-plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala
-plugins/shotwell-data-imports/FSpotDatabaseTable.vala
-plugins/shotwell-data-imports/FSpotDatabase.vala
 plugins/shotwell-data-imports/FSpotImporter.vala
-plugins/shotwell-data-imports/FSpotMetaTable.vala
-plugins/shotwell-data-imports/FSpotPhotosTable.vala
-plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala
-plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala
-plugins/shotwell-data-imports/FSpotRollsTable.vala
-plugins/shotwell-data-imports/FSpotTableBehavior.vala
-plugins/shotwell-data-imports/FSpotTagsTable.vala
 plugins/shotwell-data-imports/shotwell-data-imports.vala
-plugins/shotwell-data-imports/SqliteSupport.vala
-plugins/shotwell-data-imports/VersionNumber.vala
 plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
 plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui
 plugins/shotwell-publishing-extras/GalleryConnector.vala
@@ -59,64 +47,20 @@ plugins/shotwell-transitions/SlideEffect.vala
 plugins/shotwell-transitions/SquaresEffect.vala
 plugins/shotwell-transitions/StripesEffect.vala
 src/AppDirs.vala
-src/Application.vala
 src/AppWindow.vala
 src/BatchImport.vala
-src/Box.vala
 src/camera/Branch.vala
-src/camera/CameraTable.vala
-src/camera/Camera.vala
-src/camera/GPhoto.vala
 src/camera/ImportPage.vala
-src/CheckerboardLayout.vala
 src/CollectionPage.vala
-src/ColorTransformation.vala
-src/CommandManager.vala
 src/Commands.vala
-src/config/ConfigurationInterfaces.vala
-src/config/Config.vala
-src/config/GSettingsEngine.vala
-src/core/Alteration.vala
-src/core/ContainerSourceCollection.vala
-src/core/Core.vala
-src/core/DatabaseSourceCollection.vala
-src/core/DataCollection.vala
-src/core/DataObject.vala
-src/core/DataSet.vala
-src/core/DataSourceTypes.vala
-src/core/DataSource.vala
-src/core/DataViewTypes.vala
-src/core/DataView.vala
-src/core/SourceCollection.vala
-src/core/SourceHoldingTank.vala
-src/core/SourceInterfaces.vala
-src/core/Tracker.vala
-src/core/util.vala
-src/core/ViewCollection.vala
-src/CustomComponents.vala
-src/data_imports/DataImportJob.vala
-src/data_imports/DataImportSource.vala
 src/data_imports/DataImportsPluginHost.vala
 src/data_imports/DataImportsUI.vala
 src/data_imports/DataImports.vala
 src/db/DatabaseTable.vala
-src/db/Db.vala
-src/db/EventTable.vala
-src/db/PhotoTable.vala
-src/db/SavedSearchDBTable.vala
-src/db/TagTable.vala
-src/db/TombstoneTable.vala
-src/db/VersionTable.vala
-src/db/VideoTable.vala
-src/Debug.vala
 src/DesktopIntegration.vala
 src/Dialogs.vala
 src/Dimensions.vala
 src/direct/DirectPhotoPage.vala
-src/direct/DirectPhoto.vala
-src/direct/Direct.vala
-src/direct/DirectView.vala
-src/direct/DirectWindow.vala
 src/DirectoryMonitor.vala
 src/editing_tools/EditingTools.vala
 src/editing_tools/StraightenTool.vala
@@ -124,64 +68,29 @@ src/events/Branch.vala
 src/events/EventDirectoryItem.vala
 src/events/EventPage.vala
 src/events/EventsDirectoryPage.vala
-src/events/Events.vala
 src/Event.vala
 src/Exporter.vala
 src/folders/Branch.vala
-src/folders/Folders.vala
-src/folders/Page.vala
-src/International.vala
 src/library/Branch.vala
-src/LibraryFiles.vala
 src/library/FlaggedPage.vala
-src/library/FlaggedSidebarEntry.vala
 src/library/ImportQueuePage.vala
-src/library/ImportQueueSidebarEntry.vala
 src/library/LastImportPage.vala
-src/library/LastImportSidebarEntry.vala
-src/library/Library.vala
 src/library/LibraryWindow.vala
-src/LibraryMonitor.vala
 src/library/OfflinePage.vala
-src/library/OfflineSidebarEntry.vala
 src/library/TrashPage.vala
-src/library/TrashSidebarEntry.vala
 src/main.vala
-src/MediaDataRepresentation.vala
-src/MediaInterfaces.vala
-src/MediaMetadata.vala
 src/MediaMonitor.vala
 src/MediaPage.vala
-src/MediaViewTracker.vala
-src/MetadataWriter.vala
-src/Orientation.vala
 src/Page.vala
-src/PhotoMonitor.vala
 src/PhotoPage.vala
 src/photos/BmpSupport.vala
-src/photos/GdkSupport.vala
-src/photos/GRaw.vala
 src/photos/JfifSupport.vala
-src/photos/PhotoFileAdapter.vala
-src/photos/PhotoFileFormat.vala
-src/photos/PhotoFileSniffer.vala
-src/photos/PhotoMetadata.vala
-src/photos/Photos.vala
 src/photos/PngSupport.vala
 src/photos/RawSupport.vala
 src/photos/TiffSupport.vala
 src/Photo.vala
-src/PixbufCache.vala
-src/plugins/DataImportsInterfaces.vala
-src/plugins/ManifestWidget.vala
-src/plugins/Plugins.vala
-src/plugins/PublishingInterfaces.vala
-src/plugins/SpitInterfaces.vala
-src/plugins/StandardHostInterface.vala
-src/plugins/TransitionsInterfaces.vala
 src/Printing.vala
 src/Properties.vala
-src/publishing/APIGlue.vala
 src/publishing/PublishingPluginHost.vala
 src/publishing/PublishingUI.vala
 src/publishing/Publishing.vala
@@ -189,48 +98,33 @@ src/Resources.vala
 src/Screensaver.vala
 src/searches/Branch.vala
 src/searches/SavedSearchDialog.vala
-src/searches/SavedSearchPage.vala
 src/searches/SearchBoolean.vala
-src/searches/Searches.vala
 src/SearchFilter.vala
-src/sidebar/Branch.vala
-src/sidebar/common.vala
-src/sidebar/Entry.vala
-src/sidebar/Sidebar.vala
-src/sidebar/Tree.vala
 src/SlideshowPage.vala
 src/slideshow/Slideshow.vala
 src/slideshow/TransitionEffects.vala
-src/SortedList.vala
 src/tags/Branch.vala
-src/tags/HierarchicalTagIndex.vala
-src/tags/HierarchicalTagUtilities.vala
-src/tags/TagPage.vala
-src/tags/Tags.vala
 src/Tag.vala
-src/threads/BackgroundJob.vala
-src/threads/Semaphore.vala
-src/threads/Threads.vala
-src/threads/Workers.vala
-src/ThumbnailCache.vala
-src/Thumbnail.vala
-src/TimedQueue.vala
-src/Tombstone.vala
-src/unit/rc/template.vala
-src/unit/Unit.vala
-src/UnityProgressBar.vala
-src/Upgrades.vala
-src/util/file.vala
-src/util/image.vala
-src/util/KeyValueMap.vala
-src/util/misc.vala
-src/util/string.vala
-src/util/system.vala
-src/util/ui.vala
-src/util/Util.vala
-src/VideoMetadata.vala
-src/VideoMonitor.vala
 src/VideoSupport.vala
+ui/collection.ui
+ui/direct_context.ui
+ui/direct.ui
+ui/events_directory.ui
+ui/event.ui
+ui/import_queue.ui
+ui/import.ui
+ui/media.ui
+ui/offline.ui
+ui/photo_context.ui
+ui/photo.ui
+ui/savedsearch.ui
+ui/search_bar.ui
+ui/search_sidebar_context.ui
 ui/set_background_dialog.ui
 ui/set_background_slideshow_dialog.ui
 ui/shotwell.ui
+ui/sidebar_default_context.ui
+ui/tag_sidebar_context.ui
+ui/tags.ui
+ui/top.ui
+ui/trash.ui
diff --git a/po/cs.gmo b/po/cs.gmo
index 482830d..d4fce83 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 5119413..95d3c04 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,11 +14,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: shotwell-0.15\n"
+"Project-Id-Version: shotwell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-10-08 14:29+0000\n"
-"PO-Revision-Date: 2016-10-16 22:00+0200\n"
+"POT-Creation-Date: 2016-11-16 22:10+0000\n"
+"PO-Revision-Date: 2016-11-17 11:21+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -30,7 +30,9 @@ msgstr ""
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300
+#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:354
+#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344
+#: ui/tags.ui:354
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -1383,7 +1385,7 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "Navštívit web aplikace Shotwell"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:679
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:593
 msgid "translator-credits"
 msgstr ""
 "David Štancl <dstancl@dstancl.cz>\n"
@@ -1451,7 +1453,7 @@ msgstr ""
 "si nastavení data na svém počítači."
 
 #: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Dočasný soubor potřebný pro zveřejnění není k dispozici"
 
@@ -1598,9 +1600,9 @@ msgstr "nebo"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
 #: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:115
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:142
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229
@@ -1610,13 +1612,14 @@ msgstr "_Odhlásit"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
 #: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:129
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:156
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2454
 msgid "_Publish"
 msgstr "_Zveřejnit"
 
@@ -1644,7 +1647,7 @@ msgstr "pixely"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1329
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Původní velikost"
@@ -1746,51 +1749,50 @@ msgstr "Nerozpoznaný uživatel"
 msgid " Site Not Found"
 msgstr " Server nenalezen"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:49
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:43
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:49
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:43
 msgid "_Email address"
 msgstr "_E-mailová adresa"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:59
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:53
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:59
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:73
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:53
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr "_Heslo"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:103
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:97
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "Za_pamatovat"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:125
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:118
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:101
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
 msgid "Log in"
 msgstr "Přihlásit se"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
 msgid "An _existing album:"
 msgstr "_Stávající album:"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:52
 msgid "A _new album named:"
 msgstr "_Nové album s názvem:"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1005
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
 msgid "_Hide album"
 msgstr "S_krýt album"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "Otevřít cílové _album v prohlížeči"
 
@@ -1814,14 +1816,14 @@ msgstr "Neplatná e-mailová adresa a/nebo heslo. Zkuste to prosím znovu"
 msgid "Invalid User Email or Password"
 msgstr "Neplatná e-mailová adresa nebo heslo"
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1012
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
 msgid "You are logged into Rajce as %s."
 msgstr "Jste přihlášeni k Rajčeti jako %s."
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
 #: plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:24
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
 msgid "Photos will appear in:"
 msgstr "Fotky se objeví:"
 
@@ -1844,13 +1846,13 @@ msgstr "Copyright 2012 BJA Electronics"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1325
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
 msgid "500 × 375 pixels"
 msgstr "500 × 375 pixelů"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1326
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr "1024 × 768 pixelů"
 
@@ -1876,22 +1878,22 @@ msgid "Enter the username and password associated with your Tumblr account."
 msgstr "Zadejte uživatelské jméno a heslo ke svému účtu Tumblr."
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1087
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
 msgid "Username and/or password invalid. Please try again"
 msgstr "Neplatné uživatelské jméno a/nebo heslo. Zkuste to prosím znovu"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1121
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
 msgid "Invalid User Name or Password"
 msgstr "Neplatné uživatelské jméno nebo heslo"
 
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:634
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:752
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
 #, c-format
 msgid "Could not load UI: %s"
 msgstr "Nelze načíst uživatelské rozhraní: %s"
 
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:734
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
 #, c-format
 msgid ""
 "You are logged into Tumblr as %s.\n"
@@ -1912,36 +1914,36 @@ msgstr "Navštivte webové stránky Yandex.Fotki"
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Momentálně nejste k Yandex.Fotki přihlášeni."
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Veřejné"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
+msgid "Friends"
+msgstr "Přátelé"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:498
+msgid "Private"
+msgstr "Soukromé"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:44
 msgid "_Albums (or write new):"
 msgstr "_Alba (nebo vepište nové):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:59
 msgid "Access _type:"
 msgstr "_Typ přístupu:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:103
 msgid "Disable _comments"
 msgstr "Zakázat _komentáře"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:120
 msgid "_Forbid downloading original photo"
 msgstr "Ne_dovolit stahovat originální fotografii"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-msgid "Public"
-msgstr "Veřejné"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
-msgid "Friends"
-msgstr "Přátelé"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
-msgstr "Soukromé"
-
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
 msgid "Publish to an e_xisting album:"
 msgstr "Zveřejnit ve stáva_jícím albu:"
@@ -1962,7 +1964,7 @@ msgstr "Videa a nová fotoalba jsou viditelná:"
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:226
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr ""
@@ -1971,7 +1973,7 @@ msgstr ""
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:62
 #: plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1209
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr "Připojení Shotwell"
 
@@ -2048,7 +2050,7 @@ msgstr "mě výhradně"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1145
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1313
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "všem"
 
@@ -2163,12 +2165,12 @@ msgid "Friends only"
 msgstr "přátele výhradně"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1327
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 pixelů"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1328
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 pixelů"
 
@@ -2228,71 +2230,75 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 pixelů)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:755
 msgid "Original Size"
 msgstr "Původní velikost"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
 msgid "_URL of your Piwigo photo library"
 msgstr "Adresa _URL vaší fotoknihovny Piwigo"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
 msgid "User _name"
 msgstr "Uživatelské jmé_no"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
-msgid "_Remember Password"
-msgstr "Zapamatovat si _heslo"
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+msgid "Remember Password"
+msgstr "Zapamatovat si heslo"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+msgid "An _existing category"
+msgstr "Stávající kategori_e"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
-msgid "An _existing category:"
-msgstr "Stávající kategori_e:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+msgid "A _new album named"
+msgstr "_Nové album s názvem"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
-msgid "Photos will be _visible by:"
-msgstr "Fotky budou _viditelné:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+msgid "within category"
+msgstr "v rámci kategorie"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
-msgid "Photo size:"
-msgstr "Velikost fotky:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr "Komentář k albu"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
-msgid "within category:"
-msgstr "v rámci kategorie:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+msgid "Photos will be _visible by"
+msgstr "Fotky budou _viditelné"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
-msgid "Album comment:"
-msgstr "Komentář k albu:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr "Velikost fotky"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
 msgid "_If a title is set and comment unset, use title as comment"
 msgstr ""
 "Když je nastaven název a není nastaven komentář, použít název jako komentář"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
 msgid "_Do no upload tags"
 msgstr "_Nenahrávat štítky"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
 msgid "Logout"
 msgstr "Odhlásit"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291
-#: src/Resources.vala:295
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:295 ui/collection.ui:190
 msgid "Publish"
 msgstr "Zveřejnit"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:775
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
 msgid "Creating album %s…"
 msgstr "Vytváří se album %s…"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:948
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr "Při zveřejňování na Piwigo došlo k chybě. Zkuste to prosím znovu."
 
 #. %s is the host name that we tried to connect to
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1024
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1030
 #, c-format
 msgid ""
 "This does not look like the real <b>%s</b>. Attackers might be trying to "
@@ -2303,7 +2309,17 @@ msgstr ""
 "ukrást nebo změnit údaje jdoucí do nebo z tohoto serveru (například soukromé "
 "zprávy, údaje z platebních karet nebo hesla)."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1085
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "Certifikát serveru %s"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:166
+msgid "_OK"
+msgstr "_Budiž"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
@@ -2311,7 +2327,7 @@ msgstr ""
 "Zadejte adresu URL fotoknihovny Piwigo a k tomu uživatelské jméno a heslo "
 "spojené s vaším účtem Piwigo pro danou knihovnu."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1086
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
@@ -2319,23 +2335,23 @@ msgstr ""
 "Shotwell se nemůže připojit k vaší fotoknihovně Piwigo. Ověřte prosím adresu "
 "URL, kterou jste zadali"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1116
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "Neplatná adresa URL"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1314
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Administrátoři, rodina, přátelé, kontakty"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1315
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Administrátoři, rodina, přátelé"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1316
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "Administrátoři, rodina"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1317
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Administrátoři"
 
@@ -2486,38 +2502,27 @@ msgstr "Nelze nastavit složku %s jako zapisovatelnou"
 msgid "Could not make directory %s writable: %s"
 msgstr "Nelze nastavit složku %s jako zapisovatelnou: %s"
 
-#: src/AppWindow.vala:54
+#: src/AppWindow.vala:45
 msgid "Pin Toolbar"
 msgstr "Připíchnout lištu"
 
-#: src/AppWindow.vala:55
+#: src/AppWindow.vala:46
 msgid "Pin the toolbar open"
 msgstr "Připíchnout otevřenou nástrojovou lištu"
 
-#: src/AppWindow.vala:60
+#: src/AppWindow.vala:51
 msgid "Leave fullscreen"
 msgstr "Opustit režim celé obrazovky"
 
-#: src/AppWindow.vala:499
-msgid "_Contents"
-msgstr "_Obsah"
-
-#: src/AppWindow.vala:504
-msgid "_Frequently Asked Questions"
-msgstr "Ča_sté dotazy a odpovědi"
-
-#: src/AppWindow.vala:509
-msgid "_Report a Problem…"
-msgstr "_Nahlásit problém…"
-
-#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
+#: src/AppWindow.vala:522 src/AppWindow.vala:543 src/AppWindow.vala:560
 #: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
 #: src/Dialogs.vala:28 src/Dialogs.vala:1441 src/Dialogs.vala:1464
-#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
+#: src/publishing/PublishingUI.vala:296 src/publishing/PublishingUI.vala:524
+#: src/Resources.vala:157
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/AppWindow.vala:656
+#: src/AppWindow.vala:570
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2530,21 +2535,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:676
+#: src/AppWindow.vala:590
 msgid "Visit the Shotwell web site"
 msgstr "Navštívit web aplikace Shotwell"
 
-#: src/AppWindow.vala:688
+#: src/AppWindow.vala:602
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nelze zobrazit nápovědu: %s"
 
-#: src/AppWindow.vala:696
+#: src/AppWindow.vala:610
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nelze se připojit k databázi chyb: %s"
 
-#: src/AppWindow.vala:704
+#: src/AppWindow.vala:618
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nelze zobrazit časté dotazy a odpovědi: %s"
@@ -2615,8 +2620,9 @@ msgid "Cameras"
 msgstr "Fotoaparáty"
 
 #: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/MediaPage.vala:440
-#: src/photos/RawSupport.vala:303
+#: src/camera/ImportPage.vala:726 src/photos/RawSupport.vala:303
+#: ui/collection.ui:90 ui/event.ui:359 ui/event.ui:527 ui/media.ui:359
+#: ui/photo_context.ui:96 ui/photo.ui:349 ui/tags.ui:359
 msgid "Camera"
 msgstr "Fotoaparát"
 
@@ -2650,32 +2656,8 @@ msgstr ""
 msgid "No new photos/videos found on camera"
 msgstr "Ve fotoaparátu nejsou žádné nové fotografie/videa"
 
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451
-msgid "_Titles"
-msgstr "_Názvy"
-
-#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452
-msgid "Display the title of each photo"
-msgstr "U každé fotografie zobrazit název"
-
-#: src/camera/ImportPage.vala:885
-msgid "Import _Selected"
-msgstr "Importovat vy_brané"
-
-#: src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr "Importovat vybrané fotografie do knihovny"
-
-#: src/camera/ImportPage.vala:891
-msgid "Import _All"
-msgstr "Importovat _vše"
-
-#: src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr "Importovat všechny fotografie do knihovny"
-
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1013
+#: src/camera/ImportPage.vala:999
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2683,15 +2665,15 @@ msgstr ""
 "Shotwell potřebuje kvůli přístupu odpojit fotoaparát ze souborového systému. "
 "Pokračovat?"
 
-#: src/camera/ImportPage.vala:1019
+#: src/camera/ImportPage.vala:1005
 msgid "_Unmount"
 msgstr "_Odpojit"
 
-#: src/camera/ImportPage.vala:1024
+#: src/camera/ImportPage.vala:1010
 msgid "Please unmount the camera."
 msgstr "Odpojte prosím fotoaparát."
 
-#: src/camera/ImportPage.vala:1029
+#: src/camera/ImportPage.vala:1015
 msgid ""
 "The camera is locked by another application. Shotwell can only access the "
 "camera when it’s unlocked. Please close any other application using the "
@@ -2701,11 +2683,11 @@ msgstr ""
 "který není blokovaný jinou aplikací. Ukončete všechny aplikace, které ho "
 "používají, a zkuste to znovu."
 
-#: src/camera/ImportPage.vala:1039
+#: src/camera/ImportPage.vala:1025
 msgid "Please close any other application using the camera."
 msgstr "Ukončete prosím ostatní aplikace používající fotoaparát."
 
-#: src/camera/ImportPage.vala:1044
+#: src/camera/ImportPage.vala:1030
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2714,29 +2696,29 @@ msgstr ""
 "Nelze načíst náhledy z fotoaparátu:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1061
+#: src/camera/ImportPage.vala:1047
 msgid "Unmounting…"
 msgstr "Odpojuje se…"
 
-#: src/camera/ImportPage.vala:1152
+#: src/camera/ImportPage.vala:1138
 msgid "Starting import, please wait…"
 msgstr "Začíná import, čekejte prosím…"
 
-#: src/camera/ImportPage.vala:1169
+#: src/camera/ImportPage.vala:1155
 msgid "Fetching photo information"
 msgstr "Získávají se informace o fotografii"
 
-#: src/camera/ImportPage.vala:1527
+#: src/camera/ImportPage.vala:1513
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Získává se náhled pro %s"
 
-#: src/camera/ImportPage.vala:1643
+#: src/camera/ImportPage.vala:1629
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Nelze uzamknout fotoaparát: %s"
 
-#: src/camera/ImportPage.vala:1728
+#: src/camera/ImportPage.vala:1714
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2744,7 +2726,7 @@ msgstr[0] "Smazat tuto fotografii z fotoaparátu?"
 msgstr[1] "Smazat tyto %d fotografie z fotoaparátu?"
 msgstr[2] "Smazat těchto %d fotografií z fotoaparátu?"
 
-#: src/camera/ImportPage.vala:1731
+#: src/camera/ImportPage.vala:1717
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2752,7 +2734,7 @@ msgstr[0] "Smazat toto video z fotoaparátu?"
 msgstr[1] "Smazat tato %d videa z fotoaparátu?"
 msgstr[2] "Smazat těchto %d videí z fotoaparátu?"
 
-#: src/camera/ImportPage.vala:1734
+#: src/camera/ImportPage.vala:1720
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2760,7 +2742,7 @@ msgstr[0] "Smazat tuto fotografii/video z fotoaparátu?"
 msgstr[1] "Smazat tyto %d fotografie/videa z fotoaparátu?"
 msgstr[2] "Smazat těchto %d fotografií/videí z fotoaparátu?"
 
-#: src/camera/ImportPage.vala:1737
+#: src/camera/ImportPage.vala:1723
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2768,15 +2750,15 @@ msgstr[0] "Smazat tento soubor z fotoaparátu?"
 msgstr[1] "Smazat tyto %d soubory z fotoaparátu?"
 msgstr[2] "Smazat těchto %d souborů z fotoaparátu?"
 
-#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1408
+#: src/camera/ImportPage.vala:1731 src/Dialogs.vala:1408
 msgid "_Keep"
 msgstr "_Zachovat"
 
-#: src/camera/ImportPage.vala:1764
+#: src/camera/ImportPage.vala:1750
 msgid "Removing photos/videos from camera"
 msgstr "Odstraňují se fotografie/videa z fotoaparátu"
 
-#: src/camera/ImportPage.vala:1768
+#: src/camera/ImportPage.vala:1754
 #, c-format
 msgid "Unable to delete %d photo/video from the camera due to errors."
 msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
@@ -2784,51 +2766,127 @@ msgstr[0] "Kvůli chybě nelze smazat fotografii/video z fotoaparátu."
 msgstr[1] "Kvůli chybě nelze smazat %d fotografie/videa z fotoaparátu."
 msgstr[2] "Kvůli chybě nelze smazat %d fotografií/videí z fotoaparátu."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635
+#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:78
+#: src/PhotoPage.vala:2449 src/Resources.vala:170
+msgid "_Print"
+msgstr "_Tisk"
+
+#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
+#: ui/direct_context.ui:26 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28
+msgid "Send _To…"
+msgstr "Odesla_t…"
+
+#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:83
+#: src/PhotoPage.vala:2459 src/Resources.vala:220
+msgid "Set as _Desktop Background"
+msgstr "Nastavit jako poza_dí plochy"
+
+#: src/CollectionPage.vala:86 src/Resources.vala:286
+msgid "_Duplicate"
+msgstr "_Duplikovat"
+
+#: src/CollectionPage.vala:94
+msgid "Fullscreen"
+msgstr "Celá obrazovka"
+
+#: src/CollectionPage.vala:96 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "P_romítat"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636
-msgid "Play a slideshow"
-msgstr "Spustit promítání snímků"
+#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "Otočit dop_rava"
+
+#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "Otočit do_leva"
+
+#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Překlopit vo_dorovně"
+
+#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "Překlopit s_visle"
+
+#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8
+#: ui/direct_context.ui:10 ui/direct.ui:134 ui/event.ui:445
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "_Vylepšit"
+
+#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
+#: ui/direct_context.ui:15 ui/direct.ui:161 ui/event.ui:450
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "_Vrátit zpět na původní"
+
+#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "_Kopírovat úpravu barev"
+
+#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "Vložit ú_pravu barev"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:129
+msgid "Adjust Date and Time…"
+msgstr "Nastavit datum a čas…"
+
+#: src/CollectionPage.vala:137 src/Resources.vala:319
+msgid "Open With E_xternal Editor"
+msgstr "Otevřít v e_xterním editoru"
+
+#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
+#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363
+msgid "Open With RA_W Editor"
+msgstr "Otevřít v editoru RA_W"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:167
+msgid "_Play"
+msgstr "_Přehrát"
+
+#: src/CollectionPage.vala:399
 msgid "Export Photo/Video"
 msgstr "Export fotografie/videa"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:399
 msgid "Export Photos/Videos"
 msgstr "Export fotografií/videí"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209
+#: src/CollectionPage.vala:401 src/Dialogs.vala:59 src/PhotoPage.vala:2986
 msgid "Export Photo"
 msgstr "Export fotografie"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:84
+#: src/CollectionPage.vala:401 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Export fotografií"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:488 src/CollectionPage.vala:504
 msgid "Rotating"
 msgstr "Otáčí se"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:488 src/CollectionPage.vala:504
 msgid "Undoing Rotate"
 msgstr "Vrací se zpět otočení"
 
-#: src/CollectionPage.vala:570
+#: src/CollectionPage.vala:513
 msgid "Flipping Horizontally"
 msgstr "Překlápí se vodorovně"
 
-#: src/CollectionPage.vala:571
+#: src/CollectionPage.vala:514
 msgid "Undoing Flip Horizontally"
 msgstr "Vrací se zpět vodorovné překlopení"
 
-#: src/CollectionPage.vala:580
+#: src/CollectionPage.vala:523
 msgid "Flipping Vertically"
 msgstr "Překlápí se svisle"
 
-#: src/CollectionPage.vala:581
+#: src/CollectionPage.vala:524
 msgid "Undoing Flip Vertically"
 msgstr "Vrací se zpět svislé překlopení"
 
@@ -3045,7 +3103,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Databázový soubor:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:766
 msgid "_Import"
 msgstr "_Import"
 
@@ -3057,7 +3115,7 @@ msgstr "Import z aplikace"
 msgid "Import media _from:"
 msgstr "Importovat _multimédia z:"
 
-#: src/data_imports/DataImportsUI.vala:408 src/publishing/PublishingUI.vala:507
+#: src/data_imports/DataImportsUI.vala:408 src/publishing/PublishingUI.vala:519
 msgid "_Close"
 msgstr "_Zavřít"
 
@@ -3094,7 +3152,7 @@ msgstr ""
 "Chyba:\n"
 "%s"
 
-#: src/db/DatabaseTable.vala:88
+#: src/db/DatabaseTable.vala:92
 #, c-format
 msgid "Unable to restore photo database %s"
 msgstr "Nelze obnovit databázi s fotografiemi %s"
@@ -3127,8 +3185,9 @@ msgstr[1] "Tím odstraníte štítek „%s“ ze %d fotografií. Pokračovat?"
 msgstr[2] "Tím odstraníte štítek „%s“ z %d fotografií. Pokračovat?"
 
 #: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1409
-#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409
-#: src/Resources.vala:674
+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
+#: src/Resources.vala:658 ui/savedsearch.ui:16 ui/trash.ui:63 ui/trash.ui:216
+#: ui/trash.ui:258
 msgid "_Delete"
 msgstr "S_mazat"
 
@@ -3616,9 +3675,9 @@ msgstr "Import dokončen"
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "%d vteřina"
-msgstr[1] "%d vteřiny"
-msgstr[2] "%d vteřin"
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekundy"
+msgstr[2] "%d sekund"
 
 #: src/Dialogs.vala:1177
 #, c-format
@@ -3825,9 +3884,9 @@ msgstr[2] "minut"
 #: src/Dialogs.vala:1928
 msgid "second"
 msgid_plural "seconds"
-msgstr[0] "vteřinu"
-msgstr[1] "vteřiny"
-msgstr[2] "vteřin"
+msgstr[0] "sekundu"
+msgstr[1] "sekundy"
+msgstr[2] "sekund"
 
 #: src/Dialogs.vala:1972
 #, c-format
@@ -3926,7 +3985,7 @@ msgstr "rok%směsíc-den"
 msgid "Year-Month-Day"
 msgstr "rok-měsíc-den"
 
-#: src/Dialogs.vala:2364 src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2364 src/editing_tools/EditingTools.vala:780
 msgid "Custom"
 msgstr "Vlastní"
 
@@ -3957,11 +4016,11 @@ msgstr "_Importovat bez kopírování"
 msgid "Import to Library"
 msgstr "Import do knihovny"
 
-#: src/Dialogs.vala:2720 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2720 src/PhotoPage.vala:2862
 msgid "Remove From Library"
 msgstr "Odstranění z knihovny"
 
-#: src/Dialogs.vala:2721 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2721 src/PhotoPage.vala:2862
 msgid "Removing Photo From Library"
 msgstr "Odstraňuje se fotografie z knihovny"
 
@@ -4082,157 +4141,51 @@ msgstr "Šířka"
 msgid "Height"
 msgstr "Výška"
 
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Soubor"
-
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
-#: src/Resources.vala:175
-msgid "_Save"
-msgstr "_Uložit"
-
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Uložit fotografii"
-
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As…"
-msgstr "Uložit j_ako"
-
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Uložit fotografii pod jiným názvem"
-
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Vytisknout fotografii na tiskárně připojené k počítači"
-
-#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
-#: src/Resources.vala:159
-msgid "_Edit"
-msgstr "_Upravit"
-
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Fotografie"
-
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416
-msgid "T_ools"
-msgstr "Nástr_oje"
-
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421
-msgid "_Previous Photo"
-msgstr "_Předchozí fotka"
-
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422
-msgid "Previous Photo"
-msgstr "Předchozí fotografie"
-
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427
-msgid "_Next Photo"
-msgstr "_Následující fotka"
-
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428
-msgid "Next Photo"
-msgstr "Následující fotografie"
-
-#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
-#: src/PhotoPage.vala:2412
-msgid "_View"
-msgstr "_Zobrazit"
-
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
-#: src/Resources.vala:162
-msgid "_Help"
-msgstr "_Nápověda"
-
-#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
-#: src/PhotoPage.vala:2591 src/Resources.vala:183
-msgid "Zoom _In"
-msgstr "Přiblíž_it"
-
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592
-msgid "Increase the magnification of the photo"
-msgstr "Zvýšit přiblížení fotografie"
-
-#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
-#: src/PhotoPage.vala:2597 src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr "_Oddálit"
-
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598
-msgid "Decrease the magnification of the photo"
-msgstr "Snížit přiblížení fotografie"
-
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603
-msgid "Fit to _Page"
-msgstr "Přizpůsobit _stránce"
-
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604
-msgid "Zoom the photo to fit on the screen"
-msgstr "Přizpůsobit přiblížení fotografie velikosti obrazovky"
-
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Přiblížení _100%"
-
-#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Zobrazit fotografii v původní velikosti"
-
-#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Přiblížení _200%"
-
-#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Zobrazit fotografii v dvojnásobku původní velikosti"
-
-#: src/direct/DirectPhotoPage.vala:227
+#: src/direct/DirectPhotoPage.vala:92
 #, c-format
 msgid "%s does not exist."
 msgstr "%s neexistuje."
 
-#: src/direct/DirectPhotoPage.vala:229
+#: src/direct/DirectPhotoPage.vala:94
 #, c-format
 msgid "%s is not a file."
 msgstr "%s není soubor."
 
-#: src/direct/DirectPhotoPage.vala:231
+#: src/direct/DirectPhotoPage.vala:96
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
 "%s."
 msgstr "%s nepodporuje formát %s."
 
-#: src/direct/DirectPhotoPage.vala:248
+#: src/direct/DirectPhotoPage.vala:113
 #, c-format
 msgid "Unable open photo %s. Sorry."
 msgstr "Nelze otevřít fotografii %s."
 
-#: src/direct/DirectPhotoPage.vala:432
+#: src/direct/DirectPhotoPage.vala:297 src/Resources.vala:175 ui/direct.ui:8
+msgid "_Save"
+msgstr "_Uložit"
+
+#: src/direct/DirectPhotoPage.vala:297
 msgid "_Save a Copy"
 msgstr "Uložit _kopii"
 
-#: src/direct/DirectPhotoPage.vala:435
+#: src/direct/DirectPhotoPage.vala:300
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Zahodit změny v %s?"
 
-#: src/direct/DirectPhotoPage.vala:436
+#: src/direct/DirectPhotoPage.vala:301
 msgid "Close _without Saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/direct/DirectPhotoPage.vala:469
+#: src/direct/DirectPhotoPage.vala:334
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Chyba při ukládání %s: %s"
 
-#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518
+#: src/direct/DirectPhotoPage.vala:362 src/direct/DirectPhotoPage.vala:383
 msgid "Save As"
 msgstr "Uložení jako"
 
@@ -4242,201 +4195,201 @@ msgstr "Uložení jako"
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Nelze sledovat %s: nejedná se o složku (%s)"
 
-#: src/editing_tools/EditingTools.vala:665
+#: src/editing_tools/EditingTools.vala:664
 msgid "Return to current photo dimensions"
 msgstr "Vrátit se k původním rozměrům fotky"
 
-#: src/editing_tools/EditingTools.vala:668
+#: src/editing_tools/EditingTools.vala:667
 msgid "Set the crop for this photo"
 msgstr "Nastaví oříznutí fotografie"
 
-#: src/editing_tools/EditingTools.vala:680
+#: src/editing_tools/EditingTools.vala:679
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Přetočit ořezový rám mezi orientací na výšku a na šířku"
 
-#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:752
 msgid "Unconstrained"
 msgstr "Neomezeně"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:753
 msgid "Square"
 msgstr "Čtverec"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:754
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: src/editing_tools/EditingTools.vala:757
-#: src/editing_tools/EditingTools.vala:760
-#: src/editing_tools/EditingTools.vala:770
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:779
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:757
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD video (4:3)"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:758
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD video (16:9)"
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:760 src/Printing.vala:818
 msgid "Wallet (2 × 3 in.)"
 msgstr "Do peněženky (2 × 3 palce)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:821
 msgid "Notecard (3 × 5 in.)"
 msgstr "Poznámková karta (3 × 5 palců)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:824
 msgid "4 × 6 in."
 msgstr "4 × 6 palců"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:827
 msgid "5 × 7 in."
 msgstr "5 × 7 palců"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:830
 msgid "8 × 10 in."
 msgstr "8 × 10 palců"
 
-#: src/editing_tools/EditingTools.vala:766
+#: src/editing_tools/EditingTools.vala:765
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8,5 x 11 palců)"
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:833
 msgid "11 × 14 in."
 msgstr "11 × 14 palců"
 
-#: src/editing_tools/EditingTools.vala:768
+#: src/editing_tools/EditingTools.vala:767
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 × 17 palců)"
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:836
 msgid "16 × 20 in."
 msgstr "16 × 20 palců"
 
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:842
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Do peněženky (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:845
 msgid "Postcard (10 × 15 cm)"
 msgstr "Pohlednice (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:848
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:851
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:775
+#: src/editing_tools/EditingTools.vala:774
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:854
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:857
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:860
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779
+#: src/editing_tools/EditingTools.vala:778
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395
+#: src/editing_tools/EditingTools.vala:1878 src/Properties.vala:395
 msgid "Size:"
 msgstr "Velikost:"
 
-#: src/editing_tools/EditingTools.vala:1887
+#: src/editing_tools/EditingTools.vala:1893
 msgid "Close the red-eye tool"
 msgstr "Zavřít nástroj pro odstranění červených očí"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1896
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Odstranit efekt červených očí ve vybrané oblasti"
 
-#: src/editing_tools/EditingTools.vala:2229
+#: src/editing_tools/EditingTools.vala:2236
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Původní"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:436
+#: src/editing_tools/EditingTools.vala:2250 src/Properties.vala:436
 #: src/Properties.vala:440 src/Properties.vala:447
 msgid "Exposure:"
 msgstr "Expozice:"
 
-#: src/editing_tools/EditingTools.vala:2251
+#: src/editing_tools/EditingTools.vala:2259
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: src/editing_tools/EditingTools.vala:2268
 msgid "Saturation:"
 msgstr "Sytost:"
 
-#: src/editing_tools/EditingTools.vala:2267
+#: src/editing_tools/EditingTools.vala:2277
 msgid "Tint:"
 msgstr "Odstín:"
 
-#: src/editing_tools/EditingTools.vala:2276
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Temperature:"
 msgstr "Teplota:"
 
-#: src/editing_tools/EditingTools.vala:2284
+#: src/editing_tools/EditingTools.vala:2296
 msgid "Shadows:"
 msgstr "Tmavé tóny:"
 
-#: src/editing_tools/EditingTools.vala:2292
+#: src/editing_tools/EditingTools.vala:2305
 msgid "Highlights:"
 msgstr "Světlé tóny:"
 
-#: src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2361
 msgid "Reset Colors"
 msgstr "Původní barvy"
 
-#: src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2361
 msgid "Reset all color adjustments to original"
 msgstr "Obnovit nastavení barev na původní"
 
-#: src/editing_tools/EditingTools.vala:2705
+#: src/editing_tools/EditingTools.vala:2720
 msgid "Temperature"
 msgstr "Teplota"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: src/editing_tools/EditingTools.vala:2732
 msgid "Tint"
 msgstr "Odstín"
 
-#: src/editing_tools/EditingTools.vala:2729
+#: src/editing_tools/EditingTools.vala:2744
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2743
+#: src/editing_tools/EditingTools.vala:2758
 msgid "Saturation"
 msgstr "Sytost"
 
-#: src/editing_tools/EditingTools.vala:2756
+#: src/editing_tools/EditingTools.vala:2771
 msgid "Exposure"
 msgstr "Expozice"
 
-#: src/editing_tools/EditingTools.vala:2769
+#: src/editing_tools/EditingTools.vala:2784
 msgid "Shadows"
 msgstr "Tmavé tóny"
 
-#: src/editing_tools/EditingTools.vala:2782
+#: src/editing_tools/EditingTools.vala:2797
 msgid "Highlights"
 msgstr "Světlé tóny"
 
-#: src/editing_tools/EditingTools.vala:2792
+#: src/editing_tools/EditingTools.vala:2807
 msgid "Contrast Expansion"
 msgstr "Zvýšení kontrastu"
 
@@ -4445,6 +4398,7 @@ msgid "Angle:"
 msgstr "Úhel:"
 
 #: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "_Vyrovnat"
 
@@ -4476,39 +4430,31 @@ msgstr[0] "%d fotografie"
 msgstr[1] "%d fotografie"
 msgstr[2] "%d fotografií"
 
-#: src/events/EventPage.vala:129
+#: src/events/EventPage.vala:121
 msgid "No Event"
 msgstr "Žádná událost"
 
-#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
-msgid "_Comments"
-msgstr "_Komentáře"
-
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "U každé události zobrazit komentář"
-
-#: src/events/EventsDirectoryPage.vala:155
+#: src/events/EventsDirectoryPage.vala:143
 msgid "No events"
 msgstr "Žádné události"
 
-#: src/events/EventsDirectoryPage.vala:159
+#: src/events/EventsDirectoryPage.vala:147
 msgid "No events found"
 msgstr "Nebyly nalezeny žádné události"
 
-#: src/events/EventsDirectoryPage.vala:230
+#: src/events/EventsDirectoryPage.vala:220
 msgid "All Events"
 msgstr "Všechny události"
 
-#: src/events/EventsDirectoryPage.vala:244
+#: src/events/EventsDirectoryPage.vala:234
 msgid "Undated"
 msgstr "Bez data"
 
-#: src/events/EventsDirectoryPage.vala:245
+#: src/events/EventsDirectoryPage.vala:235
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:246
+#: src/events/EventsDirectoryPage.vala:236
 msgid "%B"
 msgstr "%B"
 
@@ -4548,7 +4494,7 @@ msgstr "Přepsat _vše"
 msgid "Export"
 msgstr "Export"
 
-#: src/folders/Branch.vala:141
+#: src/folders/Branch.vala:144
 msgid "Folders"
 msgstr "Složky"
 
@@ -4556,13 +4502,12 @@ msgstr "Složky"
 msgid "Library"
 msgstr "Knihovna"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:608
-#: src/SearchFilter.vala:609
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1104
 msgid "Photos"
 msgstr "Fotografie"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602
-#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1123
+#: src/SearchFilter.vala:1124
 msgid "Flagged"
 msgstr "Označeno"
 
@@ -4570,19 +4515,11 @@ msgstr "Označeno"
 msgid "Importing…"
 msgstr "Import…"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "Za_stavit import"
-
-#: src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Zastavit import fotografií"
-
-#: src/library/ImportQueuePage.vala:124
+#: src/library/ImportQueuePage.vala:122
 msgid "Preparing to import…"
 msgstr "Připravuje se k importu…"
 
-#: src/library/ImportQueuePage.vala:151
+#: src/library/ImportQueuePage.vala:149
 #, c-format
 msgid "Imported %s"
 msgstr "Naimportováno %s"
@@ -4591,128 +4528,19 @@ msgstr "Naimportováno %s"
 msgid "Last Import"
 msgstr "Poslední import"
 
-#: src/library/LibraryWindow.vala:285
-msgid "_Import From Folder…"
-msgstr "_Import ze složky…"
-
-#: src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Importovat fotografie z disku do knihovny"
-
-#: src/library/LibraryWindow.vala:293
-msgid "Import From _Application…"
-msgstr "Import z _aplikace…"
-
-#: src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "S_eřadit události"
-
-#: src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Vyp_rázdnit koš"
-
-#: src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Vymazat všechny fotografie v koši"
-
-#: src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Zobrazit u_dálosti pro fotku"
-
-#: src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "Na_jít"
-
-#: src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Najít fotografie nebo videa podle zadaných kritérií"
-
-#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
-#: src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search…"
-msgstr "No_vé uložené vyhledávání…"
-
-#: src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Fotografie"
-
-#: src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "Událos_ti"
-
-#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr "Štít_ky"
-
-#: src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "_Základní informace"
-
-#: src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Zobrazovat základní informace o vybrané fotografii"
-
-#: src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "_Rozšiřující informace"
-
-#: src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Zobrazovat více informací o vybrané fotografii"
-
-#: src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "Vy_hledávací lišta"
-
-#: src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Zobrazovat vyhledávací lištu"
-
-#: src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "P_ostranní panel"
-
-#: src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Zobrazovat postranní panel"
-
-#: src/library/LibraryWindow.vala:398
-msgid "T_oolbar"
-msgstr "Nástroj_ová lišta"
-
-#: src/library/LibraryWindow.vala:399
-msgid "Display the tool bar"
-msgstr "Zobrazovat nástrojovou lištu"
-
-#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr "_Vzestupně"
-
-#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr "Seřadit fotografie ve vzestupném pořadí"
-
-#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
-msgid "D_escending"
-msgstr "_Sestupně"
-
-#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr "Seřadit fotografie v sestupném pořadí"
-
-#: src/library/LibraryWindow.vala:657
+#: src/library/LibraryWindow.vala:501
 msgid "Import From Folder"
 msgstr "Import ze složky"
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:570 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Vyprázdnění koše"
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:570
 msgid "Emptying Trash…"
 msgstr "Vyprazdňuje se koš…"
 
-#: src/library/LibraryWindow.vala:901
+#: src/library/LibraryWindow.vala:763
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4724,33 +4552,33 @@ msgstr ""
 "Doporučujeme to v <span weight=\"bold\">Upravit %s Předvolby</span> změnit.\n"
 "Chcete pokračovat v importu fotografií?"
 
-#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
+#: src/library/LibraryWindow.vala:766 ui/shotwell.ui:784
 msgid "Library Location"
 msgstr "Umístění knihovny"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:917
+#: src/library/LibraryWindow.vala:779
 msgid "Photos cannot be imported from this directory."
 msgstr "Z této složky nemohou být fotografie importovány."
 
-#: src/library/LibraryWindow.vala:1203
+#: src/library/LibraryWindow.vala:1059
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d %%)"
 
-#: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258
+#: src/library/LibraryWindow.vala:1103 src/library/LibraryWindow.vala:1114
 msgid "Updating library…"
 msgstr "Aktualizuje se knihovna…"
 
-#: src/library/LibraryWindow.vala:1264
+#: src/library/LibraryWindow.vala:1120
 msgid "Preparing to auto-import photos…"
 msgstr "Připravuje se automatický import fotografií…"
 
-#: src/library/LibraryWindow.vala:1269
+#: src/library/LibraryWindow.vala:1125
 msgid "Auto-importing photos…"
 msgstr "Provádí se automatický import fotografií…"
 
-#: src/library/LibraryWindow.vala:1277
+#: src/library/LibraryWindow.vala:1133
 msgid "Writing metadata to files…"
 msgstr "Zapisují se metadata do souborů…"
 
@@ -4758,7 +4586,7 @@ msgstr "Zapisují se metadata do souborů…"
 msgid "Missing Files"
 msgstr "Chybějící soubory"
 
-#: src/library/OfflinePage.vala:106
+#: src/library/OfflinePage.vala:103
 msgid "Deleting…"
 msgstr "Maže se…"
 
@@ -4766,15 +4594,15 @@ msgstr "Maže se…"
 msgid "Trash"
 msgstr "Koš"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:101
 msgid "Trash is empty"
 msgstr "Koš je prázdný"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:105
 msgid "Delete"
 msgstr "Smazání"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:106
 msgid "Deleting Photos"
 msgstr "Mažou se fotografie"
 
@@ -4861,71 +4689,7 @@ msgstr "Nelze sledovat změny: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Nastavit velikost náhledů"
 
-#: src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Zvětšit velikost náhledů"
-
-#: src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Zmenšit velikost náhledů"
-
-#: src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Seřadit _fotky"
-
-#: src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "_Přehrát video"
-
-#: src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Otevřít vybraná videa v systémovém přehrávači videí"
-
-#: src/MediaPage.vala:428 src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr "_Vývojka"
-
-#: src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "U každé fotografie zobrazit komentář"
-
-#: src/MediaPage.vala:470
-msgid "Display each photo’s tags"
-msgstr "U každé fotografie zobrazit štítky"
-
-#: src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "Podle _názvu"
-
-#: src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Seřadit fotografie podle názvu"
-
-#: src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Podle _data pořízení"
-
 #: src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Seřadit fotografie podle data pořízení"
-
-#: src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Podle _hodnocení"
-
-#: src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Seřadit fotografie podle hodnocení"
-
-#: src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Podle názvu _souboru"
-
-#: src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Seřadit fotografie podle názvu souboru"
-
-#: src/MediaPage.vala:723
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4934,16 +4698,16 @@ msgstr ""
 "Nelze přehrát vybrané video:\n"
 "%s"
 
-#: src/Page.vala:1266
+#: src/Page.vala:1338
 msgid "No photos/videos"
 msgstr "Žádné fotografie/videa"
 
-#: src/Page.vala:1270
+#: src/Page.vala:1342
 msgid "No photos/videos found which match the current filter"
 msgstr ""
 "Nebyly nalezeny žádné fotografie/videa, které by vyhovovaly aktuálnímu filtru"
 
-#: src/Page.vala:2576
+#: src/Page.vala:2648
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotografie nelze exportovat do této složky."
 
@@ -4962,7 +4726,7 @@ msgstr "Následující fotografie"
 msgid "Photo source file missing: %s"
 msgstr "Chybí zdrojový soubor s fotografií: %s"
 
-#: src/PhotoPage.vala:3229
+#: src/PhotoPage.vala:3006
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Nelze exportovat %s: %s"
@@ -5113,7 +4877,7 @@ msgstr "Délka:"
 #: src/Properties.vala:404
 #, c-format
 msgid "%.1f seconds"
-msgstr "%.1f vteřin"
+msgstr "%.1f sekund"
 
 #: src/Properties.vala:408
 msgid "Developer:"
@@ -5260,11 +5024,11 @@ msgstr "Zveřejni_t fotografie a videa na"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:397
+#: src/publishing/PublishingUI.vala:409
 msgid "Unable to publish"
 msgstr "Nelze zveřejnit"
 
-#: src/publishing/PublishingUI.vala:398
+#: src/publishing/PublishingUI.vala:410
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5281,11 +5045,7 @@ msgstr ""
 msgid "Publishing"
 msgstr "Zveřejňování"
 
-#: src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Otočit dop_rava"
-
-#: src/Resources.vala:140 src/Resources.vala:145
+#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
 msgid "Rotate"
 msgstr "Otočit"
 
@@ -5293,14 +5053,10 @@ msgstr "Otočit"
 msgid "Rotate Right"
 msgstr "Otočit doprava"
 
-#: src/Resources.vala:142
+#: src/Resources.vala:142 ui/collection.ui:146
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Otočit fotografii doprava (pro otočení doleva zmáčkněte Ctrl)"
 
-#: src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "Otočit do_leva"
-
 #: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr "Otočit doleva"
@@ -5309,23 +5065,17 @@ msgstr "Otočit doleva"
 msgid "Rotate the photos left"
 msgstr "Otočí fotografii doleva"
 
-#: src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Překlopit vo_dorovně"
-
 #: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr "Překlopit vodorovně"
 
-#: src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "Překlopit s_visle"
-
 #: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr "Překlopit svisle"
 
-#: src/Resources.vala:155
+#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419
+#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207
 msgid "_About"
 msgstr "O _aplikaci"
 
@@ -5333,14 +5083,30 @@ msgstr "O _aplikaci"
 msgid "_Apply"
 msgstr "_Použít"
 
+#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
+#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37
+msgid "_Edit"
+msgstr "_Upravit"
+
 #: src/Resources.vala:160
 msgid "_Forward"
 msgstr "V_před"
 
-#: src/Resources.vala:161
+#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "_Celá obrazovka"
 
+#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418
+#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420
+#: ui/tags.ui:423 ui/top.ui:40 ui/trash.ui:189 ui/trash.ui:192
+msgid "_Help"
+msgstr "_Nápověda"
+
 #: src/Resources.vala:163
 msgid "Leave _Fullscreen"
 msgstr "Opustit _celou obrazovku"
@@ -5353,15 +5119,9 @@ msgstr "_Nový"
 msgid "_Next"
 msgstr "_Následující"
 
-#: src/Resources.vala:166
-msgid "_OK"
-msgstr "_Budiž"
-
-#: src/Resources.vala:167
-msgid "_Play"
-msgstr "_Přehrát"
-
-#: src/Resources.vala:168 src/Resources.vala:317
+#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
+#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
 msgid "_Preferences"
 msgstr "_Předvolby"
 
@@ -5369,11 +5129,9 @@ msgstr "_Předvolby"
 msgid "_Previous"
 msgstr "_Předchozí"
 
-#: src/Resources.vala:170
-msgid "_Print"
-msgstr "_Tisk"
-
-#: src/Resources.vala:171
+#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40
+#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30
 msgid "_Quit"
 msgstr "U_končit"
 
@@ -5413,22 +5171,24 @@ msgstr "_Normální velikost"
 msgid "Best _Fit"
 msgstr "Přizpůso_bit"
 
-#: src/Resources.vala:186
-msgid "_Enhance"
-msgstr "_Vylepšit"
+#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "Přiblíž_it"
 
-#: src/Resources.vala:187
+#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "_Oddálit"
+
+#: src/Resources.vala:187 ui/collection.ui:165
 msgid "Enhance"
 msgstr "Vylepšit"
 
-#: src/Resources.vala:188
+#: src/Resources.vala:188 ui/collection.ui:162
 msgid "Automatically improve the photo’s appearance"
 msgstr "Automaticky vylepšit vzhled fotografie"
 
-#: src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "_Kopírovat úpravu barev"
-
 #: src/Resources.vala:191
 msgid "Copy Color Adjustments"
 msgstr "Kopírovat úpravu barev"
@@ -5437,10 +5197,6 @@ msgstr "Kopírovat úpravu barev"
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Kopírovat parametry úpravy barev použité u fotografie"
 
-#: src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "Vložit ú_pravu barev"
-
 #: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr "Vložit úpravu barev"
@@ -5449,7 +5205,7 @@ msgstr "Vložit úpravu barev"
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Použít u vybraných fotografií zkopírované parametry úpravy barev"
 
-#: src/Resources.vala:198
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Oříznout"
 
@@ -5469,7 +5225,7 @@ msgstr "Vyrovnat"
 msgid "Straighten the photo"
 msgstr "Vyrovnat fotografii"
 
-#: src/Resources.vala:206
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "Če_rvené oči"
 
@@ -5481,7 +5237,7 @@ msgstr "Červené oči"
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Odstranit nebo potlačit efekt červených očí ve fotografii"
 
-#: src/Resources.vala:210
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Upravit"
 
@@ -5493,10 +5249,6 @@ msgstr "Upravit"
 msgid "Adjust the photo’s color and tone"
 msgstr "Upravit barvy a tón fotografie"
 
-#: src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "_Vrátit zpět na původní"
-
 #: src/Resources.vala:215
 msgid "Revert to Original"
 msgstr "Vrátit zpět na původní"
@@ -5509,10 +5261,6 @@ msgstr "Vrátit zpět e_xterní úpravy"
 msgid "Revert to the master photo"
 msgstr "Zrušit změny a vrátit se zpět k původní fotografii"
 
-#: src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Nastavit jako poza_dí plochy"
-
 #: src/Resources.vala:221
 msgid "Set selected image to be the new desktop background"
 msgstr "Nastavit vybranou fotografii jako obrázek na pozadí pracovní plochy"
@@ -5521,7 +5269,9 @@ msgstr "Nastavit vybranou fotografii jako obrázek na pozadí pracovní plochy"
 msgid "Set as _Desktop Slideshow…"
 msgstr "Nastavit jako prezentaci na p_loše…"
 
-#: src/Resources.vala:224
+#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35
+#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
 msgid "_Undo"
 msgstr "_Zpět"
 
@@ -5529,7 +5279,9 @@ msgstr "_Zpět"
 msgid "Undo"
 msgstr "Zpět"
 
-#: src/Resources.vala:227
+#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40
+#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
 msgid "_Redo"
 msgstr "Zn_ovu"
 
@@ -5537,11 +5289,12 @@ msgstr "Zn_ovu"
 msgid "Redo"
 msgstr "Znovu"
 
-#: src/Resources.vala:230
+#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:391 ui/event.ui:584
 msgid "Re_name Event…"
 msgstr "Přejme_novat událost…"
 
-#: src/Resources.vala:233
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
 msgid "Make _Key Photo for Event"
 msgstr "Použít jako _klíčovou fotku pro událost"
 
@@ -5549,7 +5302,7 @@ msgstr "Použít jako _klíčovou fotku pro událost"
 msgid "Make Key Photo for Event"
 msgstr "Nastavit jako klíčovou fotografii pro událost"
 
-#: src/Resources.vala:236
+#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
 msgid "_New Event"
 msgstr "_Nová událost"
 
@@ -5565,7 +5318,7 @@ msgstr "Přesunout fotky"
 msgid "Move photos to an event"
 msgstr "Přiřadit fotografie k události"
 
-#: src/Resources.vala:242
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "S_pojit události"
 
@@ -5577,7 +5330,8 @@ msgstr "Spojit"
 msgid "Combine events into a single event"
 msgstr "Sloučit události do jedné"
 
-#: src/Resources.vala:246
+#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Hodnotit"
 
@@ -5589,7 +5343,8 @@ msgstr "Nastavit hodnocení"
 msgid "Change the rating of your photo"
 msgstr "Změnit hodnocení své fotografie"
 
-#: src/Resources.vala:250
+#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "Z_výšit"
 
@@ -5597,7 +5352,8 @@ msgstr "Z_výšit"
 msgid "Increase Rating"
 msgstr "Zvýšení hodnocení"
 
-#: src/Resources.vala:253
+#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "S_nížit"
 
@@ -5605,7 +5361,8 @@ msgstr "S_nížit"
 msgid "Decrease Rating"
 msgstr "Snížení hodnocení"
 
-#: src/Resources.vala:256
+#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Bez ohodnocení"
 
@@ -5625,7 +5382,8 @@ msgstr "Nastavuje se jako nehodnocené"
 msgid "Remove any ratings"
 msgstr "Odebrat hodnocení"
 
-#: src/Resources.vala:262
+#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "_Zamítnout"
 
@@ -5645,7 +5403,8 @@ msgstr "Nastavuje se na zamítnuté"
 msgid "Set rating to rejected"
 msgstr "Nastavit hodnocení na zamítnuté"
 
-#: src/Resources.vala:268
+#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
 msgid "Rejected _Only"
 msgstr "Jen _zamítnuté"
 
@@ -5657,7 +5416,8 @@ msgstr "Jen zamítnuté"
 msgid "Show only rejected photos"
 msgstr "Zobrazovat je zamítnuté fotografie"
 
-#: src/Resources.vala:272
+#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
 msgid "All + _Rejected"
 msgstr "Všechny + _zamítnuté"
 
@@ -5666,7 +5426,8 @@ msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Zobrazovat všechny fotografie, včetně zamítnutých"
 
-#: src/Resources.vala:275
+#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
 msgid "_All Photos"
 msgstr "_Všechny fotografie"
 
@@ -5675,7 +5436,8 @@ msgstr "_Všechny fotografie"
 msgid "Show all photos"
 msgstr "Zobrazovat všechny fotografie"
 
-#: src/Resources.vala:279
+#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Hodnocení"
 
@@ -5683,7 +5445,8 @@ msgstr "_Hodnocení"
 msgid "Display each photo’s rating"
 msgstr "U každé fotografie zobrazit hodnocení"
 
-#: src/Resources.vala:282
+#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
 msgid "_Filter Photos"
 msgstr "_Filtrovat fotografie"
 
@@ -5695,10 +5458,6 @@ msgstr "Filtrovat fotografie"
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Omezit počet zobrazených fotografií pomocí filtru"
 
-#: src/Resources.vala:286
-msgid "_Duplicate"
-msgstr "_Duplikovat"
-
 #: src/Resources.vala:287
 msgid "Duplicate"
 msgstr "Duplikovat"
@@ -5719,11 +5478,12 @@ msgstr "_Tisk…"
 msgid "Pu_blish…"
 msgstr "Z_veřejnit…"
 
-#: src/Resources.vala:296
+#: src/Resources.vala:296 ui/collection.ui:187
 msgid "Publish to various websites"
 msgstr "Zveřejnit na různých webových stránkách"
 
-#: src/Resources.vala:298
+#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
 msgid "Edit _Title…"
 msgstr "Úpravi_t název…"
 
@@ -5733,7 +5493,9 @@ msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Upravit název"
 
-#: src/Resources.vala:302
+#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539
+#: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344
 msgid "Edit _Comment…"
 msgstr "Upravit _komentář…"
 
@@ -5742,11 +5504,11 @@ msgstr "Upravit _komentář…"
 msgid "Edit Comment"
 msgstr "Upravit komentář"
 
-#: src/Resources.vala:306
+#: src/Resources.vala:306 ui/event.ui:588
 msgid "Edit Event _Comment…"
 msgstr "Úpravit _komentář k události…"
 
-#: src/Resources.vala:309
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
 msgid "_Adjust Date and Time…"
 msgstr "N_astavit datum a čas…"
 
@@ -5754,11 +5516,12 @@ msgstr "N_astavit datum a čas…"
 msgid "Adjust Date and Time"
 msgstr "Nastavení data a času"
 
-#: src/Resources.vala:312
+#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456
+#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388
 msgid "Add _Tags…"
 msgstr "Přidat š_títky…"
 
-#: src/Resources.vala:313
+#: src/Resources.vala:313 ui/photo_context.ui:17
 msgid "_Add Tags…"
 msgstr "Přid_at štítky…"
 
@@ -5768,19 +5531,7 @@ msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Přidání štítků"
 
-#: src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr "Otevřít v e_xterním editoru"
-
-#: src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr "Otevřít v editoru RA_W"
-
-#: src/Resources.vala:323
-msgid "Send _To…"
-msgstr "Odesla_t…"
-
-#: src/Resources.vala:324
+#: src/Resources.vala:324 ui/photo_context.ui:133
 msgid "Send T_o…"
 msgstr "_Odeslat…"
 
@@ -5788,11 +5539,13 @@ msgstr "_Odeslat…"
 msgid "_Find…"
 msgstr "Na_jít…"
 
-#: src/Resources.vala:327
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Najít"
 
-#: src/Resources.vala:328
+#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Najít obrázky, jejichž název nebo štítek obsahují napsaný text"
 
@@ -5854,7 +5607,8 @@ msgstr "Přejmenovat štítek „%s“ na „%s“"
 msgid "_Rename…"
 msgstr "_Přejmenovat…"
 
-#: src/Resources.vala:375
+#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461
+#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393
 msgid "Modif_y Tags…"
 msgstr "Změn_it štítky…"
 
@@ -5865,162 +5619,159 @@ msgstr "Změnit štítky"
 #: src/Resources.vala:379
 #, c-format
 msgid "Tag Photo as “%s”"
-msgstr "Oštítkovat fotku jak „%s“"
-
-#: src/Resources.vala:379
-#, c-format
-msgid "Tag Photos as “%s”"
-msgstr "Oštítkovat fotku jak „%s“"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Oštítkovat fotku jako „%s“"
+msgstr[1] "Oštítkovat fotky jako „%s“"
+msgstr[2] "Oštítkovat fotky jako „%s“"
 
-#: src/Resources.vala:383
+#: src/Resources.vala:385
 #, c-format
 msgid "Tag the selected photo as “%s”"
-msgstr "Oštítkovat vybranou fotku jako „%s“"
-
-#: src/Resources.vala:384
-#, c-format
-msgid "Tag the selected photos as “%s”"
-msgstr "Oštítkovat vybrané fotky jako „%s“"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "Oštítkovat vybranou fotku jako „%s“"
+msgstr[1] "Oštítkovat vybrané fotky jako „%s“"
+msgstr[2] "Oštítkovat vybrané fotky jako „%s“"
 
-#: src/Resources.vala:388
+#: src/Resources.vala:391
 #, c-format
 msgid "Remove Tag “%s” From _Photo"
-msgstr "Odstranit z _fotky štítek „%s“"
-
-#: src/Resources.vala:389
-#, c-format
-msgid "Remove Tag “%s” From _Photos"
-msgstr "Odstranit z _fotek štítek „%s“"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "Odstranit z _fotky štítek „%s“"
+msgstr[1] "Odstranit z _fotek štítek „%s“"
+msgstr[2] "Odstranit z _fotek štítek „%s“"
 
-#: src/Resources.vala:393
+#: src/Resources.vala:397
 #, c-format
 msgid "Remove Tag “%s” From Photo"
-msgstr "Odstranit z fotky šítek „%s“"
-
-#: src/Resources.vala:394
-#, c-format
-msgid "Remove Tag “%s” From Photos"
-msgstr "Odstranit z fotek štítek „%s“"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "Odstranit z fotky šítek „%s“"
+msgstr[1] "Odstranit z fotek šítek „%s“"
+msgstr[2] "Odstranit z fotek šítek „%s“"
 
-#: src/Resources.vala:398
+#: src/Resources.vala:403
 #, c-format
 msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr "Nelze přejmenovat šítek na „%s“, protože takový už existuje."
 
-#: src/Resources.vala:402
+#: src/Resources.vala:407
 #, c-format
 msgid "Unable to rename search to “%s” because the search already exists."
 msgstr "Nelze přejmenovat hledání na „%s“, protože takové už existuje."
 
 #. Saved search button
-#: src/Resources.vala:405 src/SearchFilter.vala:1210
+#: src/Resources.vala:410 src/SearchFilter.vala:1145
 msgid "Saved Search"
 msgstr "Uložené hledání"
 
-#: src/Resources.vala:407
+#: src/Resources.vala:412
 msgid "Delete Search"
 msgstr "Smazat hledání"
 
-#: src/Resources.vala:410
+#: src/Resources.vala:415 ui/savedsearch.ui:12
 msgid "_Edit…"
 msgstr "_Upravit…"
 
-#: src/Resources.vala:411
+#: src/Resources.vala:416 ui/savedsearch.ui:8
 msgid "Re_name…"
 msgstr "Přejme_novat…"
 
-#: src/Resources.vala:414
+#: src/Resources.vala:419
 #, c-format
 msgid "Rename Search “%s” to “%s”"
 msgstr "Přejmenovat hledání „%s“ na „%s“"
 
-#: src/Resources.vala:418
+#: src/Resources.vala:423
 #, c-format
 msgid "Delete Search “%s”"
 msgstr "Smazat hledání „%s“"
 
-#: src/Resources.vala:576
+#: src/Resources.vala:560
 #, c-format
 msgid "Rate %s"
 msgstr "Hodnocení %s"
 
-#: src/Resources.vala:577
+#: src/Resources.vala:561
 #, c-format
 msgid "Set rating to %s"
 msgstr "Nastavit ohodnocení na %s"
 
-#: src/Resources.vala:578
+#: src/Resources.vala:562
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Nastavuje se ohodnocení na %s"
 
-#: src/Resources.vala:580
+#: src/Resources.vala:564
 #, c-format
 msgid "Display %s"
 msgstr "Zobrazit %s"
 
-#: src/Resources.vala:581
+#: src/Resources.vala:565
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Zobrazit jen fotografie s ohodnocením %s"
 
-#: src/Resources.vala:582
+#: src/Resources.vala:566
 #, c-format
 msgid "%s or Better"
 msgstr "%s nebo lepší"
 
-#: src/Resources.vala:583
+#: src/Resources.vala:567
 #, c-format
 msgid "Display %s or Better"
 msgstr "Zobrazit %s nebo lepší"
 
-#: src/Resources.vala:584
+#: src/Resources.vala:568
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Zobrazit jen fotografie s hodnocením %s nebo lepším"
 
-#: src/Resources.vala:675
+#: src/Resources.vala:659 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Odstranit vybrané fotografie z koše"
 
-#: src/Resources.vala:676
+#: src/Resources.vala:660 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Odstraní vybrané fotografie z knihovny"
 
-#: src/Resources.vala:678
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "O_bnovit"
 
-#: src/Resources.vala:679
+#: src/Resources.vala:663 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Přesunout vybrané fotografie zpět do knihovny"
 
-#: src/Resources.vala:681
+#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:21
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27
+#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Otevřít ve _správci souborů"
 
-#: src/Resources.vala:682
+#: src/Resources.vala:666
 msgid "Open the selected photo’s directory in the file manager"
 msgstr "Otevřít vybranou složku s fotografiemi ve správci souborů"
 
-#: src/Resources.vala:685
+#: src/Resources.vala:669
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Nelze otevřít ve správci souborů: %s"
 
-#: src/Resources.vala:688
+#: src/Resources.vala:672 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr "O_dstranit z knihovny"
 
-#: src/Resources.vala:690
+#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569
+#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "Přesu_nout do koše"
 
-#: src/Resources.vala:692
+#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
 msgid "Select _All"
 msgstr "Vybrat _vše"
 
-#: src/Resources.vala:693
+#: src/Resources.vala:677
 msgid "Select all items"
 msgstr "Vybrat všechny položky"
 
@@ -6033,14 +5784,14 @@ msgstr "Vybrat všechny položky"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:782
+#: src/Resources.vala:766
 msgid "%a %b %d, %Y"
 msgstr "%a, %e. %B %Y"
 
 #. / Locale-specific starting date format for multi-date strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:787
+#: src/Resources.vala:771
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a, %e."
@@ -6048,7 +5799,7 @@ msgstr "%a, %e."
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:792
+#: src/Resources.vala:776
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%e. %B %Y"
@@ -6056,7 +5807,7 @@ msgstr "%e. %B %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:797
+#: src/Resources.vala:781
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a, %e. %B"
@@ -6064,7 +5815,7 @@ msgstr "%a, %e. %B"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:802
+#: src/Resources.vala:786
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a, %e. %B %Y"
@@ -6078,139 +5829,139 @@ msgid "Saved Searches"
 msgstr "Uložená hledání"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
 msgstr "obsahuje"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:169
-#: src/searches/SavedSearchDialog.vala:500
+#: src/searches/SavedSearchDialog.vala:163
+#: src/searches/SavedSearchDialog.vala:494
 msgid "is exactly"
 msgstr "je přesně"
 
-#: src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:164
 msgid "starts with"
 msgstr "začíná"
 
-#: src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:165
 msgid "ends with"
 msgstr "končí"
 
-#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:166
 msgid "does not contain"
 msgstr "neobsahuje"
 
-#: src/searches/SavedSearchDialog.vala:173
-#: src/searches/SavedSearchDialog.vala:504
+#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:498
 msgid "is not set"
 msgstr "není nastaveno"
 
-#: src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:168
 msgid "is set"
 msgstr "je nastaveno"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:248
-#: src/searches/SavedSearchDialog.vala:379
-#: src/searches/SavedSearchDialog.vala:444
+#: src/searches/SavedSearchDialog.vala:242
+#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:438
 msgid "is"
 msgstr "je"
 
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:243
 msgid "is not"
 msgstr "není"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:249
 msgid "any photo"
 msgstr "libovolná fotka"
 
-#: src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:250
 msgid "a raw photo"
 msgstr "fotka RAW"
 
-#: src/searches/SavedSearchDialog.vala:257
+#: src/searches/SavedSearchDialog.vala:251
 msgid "a video"
 msgstr "video"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:305
 msgid "has"
 msgstr "má"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:306
 msgid "has no"
 msgstr "nemá"
 
-#: src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:311
 msgid "modifications"
 msgstr "změny"
 
-#: src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:312
 msgid "internal modifications"
 msgstr "interní změny"
 
-#: src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:313
 msgid "external modifications"
 msgstr "externí změny"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:367
 msgid "flagged"
 msgstr "označeno"
 
-#: src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:368
 msgid "not flagged"
 msgstr "neoznačeno"
 
-#: src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:431
 msgid "and higher"
 msgstr "a více"
 
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:432
 msgid "only"
 msgstr "jen"
 
-#: src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:433
 msgid "and lower"
 msgstr "a méně"
 
-#: src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:495
 msgid "is after"
 msgstr "je po"
 
-#: src/searches/SavedSearchDialog.vala:502
+#: src/searches/SavedSearchDialog.vala:496
 msgid "is before"
 msgstr "je před"
 
-#: src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:497
 msgid "is between"
 msgstr "je mezi"
 
-#: src/searches/SavedSearchDialog.vala:516
+#: src/searches/SavedSearchDialog.vala:510
 msgid "and"
 msgstr "a"
 
-#: src/searches/SavedSearchDialog.vala:697
+#: src/searches/SavedSearchDialog.vala:691
 msgid "Search"
 msgstr "Hledání"
 
-#: src/searches/SavedSearchDialog.vala:702
+#: src/searches/SavedSearchDialog.vala:696
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/searches/SavedSearchDialog.vala:703
+#: src/searches/SavedSearchDialog.vala:697
 msgid "OK"
 msgstr "Budiž"
 
-#: src/searches/SavedSearchDialog.vala:721
+#: src/searches/SavedSearchDialog.vala:716
 msgid "any"
 msgstr "cokoliv"
 
-#: src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:717
 msgid "all"
 msgstr "vše"
 
-#: src/searches/SavedSearchDialog.vala:723
+#: src/searches/SavedSearchDialog.vala:718
 msgid "none"
 msgstr "nic"
 
@@ -6250,8 +6001,8 @@ msgstr "Stav označení"
 msgid "Photo state"
 msgstr "Stav fotky"
 
-#. Rating button
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:851
+#: src/SearchFilter.vala:1135
 msgid "Rating"
 msgstr "Hodnocení"
 
@@ -6259,45 +6010,57 @@ msgstr "Hodnocení"
 msgid "Date"
 msgstr "Datum"
 
-#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
-msgid "Videos"
-msgstr "Videa"
+#: src/SearchFilter.vala:835
+msgid "★+ Rating"
+msgstr "Hodnocení ★+"
 
-#: src/SearchFilter.vala:620
-msgid "RAW Photos"
-msgstr "Fotografie RAW"
+#: src/SearchFilter.vala:838
+msgid "★★+ Rating"
+msgstr "Hodnocení ★★+"
 
-#: src/SearchFilter.vala:621
-msgid "RAW photos"
-msgstr "Fotografie RAW"
+#: src/SearchFilter.vala:841
+msgid "★★★+ Rating"
+msgstr "Hodnocení ★★★+"
 
-#: src/SearchFilter.vala:1148
+#: src/SearchFilter.vala:844
+msgid "★★★★+ Rating"
+msgstr "Hodnocení ★★★★+"
+
+#: src/SearchFilter.vala:848
+msgid "★★★★★+ Rating"
+msgstr "Hodnocení ★★★★★+"
+
+#: src/SearchFilter.vala:1085
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Chyba při čtení souboru %s s uživatelským rozhraním: %s"
+msgid "Error loading search bar UI: %s"
+msgstr "Chyba při načítání uživatelského rozhraním vyhledávací lišty: %s"
 
 #. Ticket #3260 - Add a 'close' context menu to
 #. the searchbar.
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:1159
+#: src/SearchFilter.vala:1094
 msgid "Close"
 msgstr "Zavřít"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1165
+#: src/SearchFilter.vala:1100
 msgid "Type"
 msgstr "Typ"
 
-#: src/SearchFilter.vala:1211
+#: src/SearchFilter.vala:1107
+msgid "Videos"
+msgstr "Videa"
+
+#: src/SearchFilter.vala:1110
+msgid "RAW Photos"
+msgstr "Fotografie RAW"
+
+#: src/SearchFilter.vala:1146
 msgid "Use a saved search to filter items in the current view"
 msgstr "Použít uložené hledání k filtrování položek v aktuálním zobrazení"
 
-#: src/sidebar/Tree.vala:203
-msgid "New _Tag…"
-msgstr "Nový š_títek…"
-
 #: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Nastavení"
@@ -6370,10 +6133,229 @@ msgid "untitled"
 msgstr "bez názvu"
 
 #. multiple videos
-#: src/VideoSupport.vala:490
+#: src/VideoSupport.vala:507
 msgid "Export Videos"
 msgstr "Export videí"
 
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr "_Přepnout označení"
+
+#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351
+#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351
+msgid "_Developer"
+msgstr "_Vývojka"
+
+#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
+msgid "Open with E_xternal Editor"
+msgstr "Otevřít v e_xterním editoru"
+
+#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379
+#: ui/photo_context.ui:124 ui/tags.ui:379
+msgid "View Eve_nt for Photo"
+msgstr "Zobrazit u_dálosti pro fotku"
+
+#: ui/direct_context.ui:7
+msgid "DirectContextMenu"
+msgstr "DirectContextMenu"
+
+#: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5
+#: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5
+#: ui/top.ui:5 ui/trash.ui:5
+msgid "_File"
+msgstr "_Soubor"
+
+#: ui/direct.ui:13 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 ui/tags.ui:17
+msgid "Save _As…"
+msgstr "Uložit j_ako"
+
+#: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99
+#: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78
+#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87
+msgid "_View"
+msgstr "_Zobrazit"
+
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "Přizpůsobit _stránce"
+
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "Přiblížení _100%"
+
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "Přiblížení _200%"
+
+#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+msgid "_Photo"
+msgstr "_Fotografie"
+
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "_Předchozí fotka"
+
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "_Následující fotka"
+
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "Nástr_oje"
+
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188
+#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "Ča_sté dotazy a odpovědi"
+
+#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:430
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:413 ui/offline.ui:192
+#: ui/photo.ui:396 ui/tags.ui:432 ui/trash.ui:201
+msgid "_Report a Problem…"
+msgstr "_Nahlásit problém…"
+
+#: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
+#: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
+msgid "_Import from Folder…"
+msgstr "_Import ze složky…"
+
+#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
+#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13
+#: ui/trash.ui:13
+msgid "Import From _Application…"
+msgstr "Import z _aplikace…"
+
+#: ui/events_directory.ui:19 ui/event.ui:34 ui/import_queue.ui:25
+#: ui/import.ui:27 ui/media.ui:34 ui/offline.ui:19 ui/photo.ui:42 ui/tags.ui:34
+#: ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242
+msgid "Empty T_rash"
+msgstr "Vyp_rázdnit koš"
+
+#: ui/events_directory.ui:47 ui/event.ui:62 ui/import.ui:55 ui/media.ui:62
+#: ui/offline.ui:47 ui/tags.ui:62 ui/trash.ui:52
+msgid "_Find"
+msgstr "Na_jít"
+
+#: ui/events_directory.ui:51 ui/event.ui:66 ui/media.ui:66 ui/offline.ui:51
+#: ui/photo.ui:70 ui/search_sidebar_context.ui:6
+#: ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56
+msgid "Ne_w Saved Search…"
+msgstr "No_vé uložené vyhledávání…"
+
+#: ui/events_directory.ui:74 ui/event.ui:102 ui/import_queue.ui:41
+#: ui/import.ui:77 ui/media.ui:102 ui/offline.ui:81 ui/photo.ui:98
+#: ui/tags.ui:102 ui/trash.ui:90
+msgid "_Basic Information"
+msgstr "_Základní informace"
+
+#: ui/events_directory.ui:79 ui/event.ui:107 ui/import.ui:82 ui/media.ui:107
+#: ui/offline.ui:86 ui/photo.ui:103 ui/tags.ui:107 ui/trash.ui:95
+msgid "E_xtended Information"
+msgstr "_Rozšiřující informace"
+
+#: ui/events_directory.ui:84 ui/event.ui:112 ui/import.ui:87 ui/media.ui:112
+#: ui/offline.ui:91 ui/tags.ui:112 ui/trash.ui:100
+msgid "_Search Bar"
+msgstr "Vy_hledávací lišta"
+
+#: ui/events_directory.ui:89 ui/event.ui:117 ui/import.ui:92 ui/media.ui:117
+#: ui/offline.ui:96 ui/photo.ui:108 ui/tags.ui:117 ui/trash.ui:105
+msgid "S_idebar"
+msgstr "P_ostranní panel"
+
+#: ui/events_directory.ui:94 ui/event.ui:122 ui/import.ui:97 ui/media.ui:122
+#: ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110
+msgid "T_oolbar"
+msgstr "Nástroj_ová lišta"
+
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Komentáře"
+
+#: ui/events_directory.ui:108 ui/event.ui:243 ui/import_queue.ui:48
+#: ui/import.ui:166 ui/media.ui:243 ui/offline.ui:163 ui/photo.ui:127
+#: ui/tags.ui:243 ui/trash.ui:172
+msgid "Sort _Events"
+msgstr "S_eřadit události"
+
+#: ui/events_directory.ui:111 ui/event.ui:231 ui/event.ui:246
+#: ui/import_queue.ui:51 ui/import.ui:169 ui/media.ui:231 ui/media.ui:246
+#: ui/offline.ui:166 ui/photo.ui:130 ui/tags.ui:231 ui/tags.ui:246
+#: ui/trash.ui:175
+msgid "_Ascending"
+msgstr "_Vzestupně"
+
+#: ui/events_directory.ui:116 ui/event.ui:236 ui/import_queue.ui:56
+#: ui/media.ui:236 ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180
+msgid "D_escending"
+msgstr "_Sestupně"
+
+#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
+#: ui/top.ui:30
+msgid "Even_ts"
+msgstr "Událos_ti"
+
+#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
+#: ui/photo.ui:77 ui/tags.ui:74
+msgid "R_emove from Library"
+msgstr "O_dstranit z knihovny"
+
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "_Názvy"
+
+#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385
+#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35
+msgid "Ta_gs"
+msgstr "Štít_ky"
+
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "Seřadit _fotky"
+
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "Podle _názvu"
+
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "Podle názvu _souboru"
+
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "Podle _data pořízení"
+
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "Podle _hodnocení"
+
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+msgid "_Descending"
+msgstr "_Sestupně"
+
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25
+msgid "_Photos"
+msgstr "_Fotografie"
+
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "Za_stavit import"
+
+#: ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr "Importovat vy_brané"
+
+#: ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "Importovat _vše"
+
+#: ui/savedsearch.ui:5
+msgid "SearchContextMenu"
+msgstr "SearchContextMenu"
+
 #: ui/set_background_dialog.ui:15
 msgid "Set as Desktop Background"
 msgstr "Nastavit jako pozadí plochy"
@@ -6382,7 +6364,7 @@ msgstr "Nastavit jako pozadí plochy"
 msgid "Use for Desktop"
 msgstr "Použít pro pracovní plochu"
 
-#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:92 ui/set_background_slideshow_dialog.ui:148
 msgid "Use for Lock Screen"
 msgstr "Použít pro zamykací obrazovku"
 
@@ -6560,7 +6542,13 @@ msgstr "Zobrazovat n_ázev"
 
 #: ui/shotwell.ui:1534 ui/shotwell.ui:1547
 msgid "seconds"
-msgstr "vteřin"
+msgstr "sekund"
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nový š_títek…"
+
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Vymazat všechny fotografie v koši"
 
-#~ msgid "Login"
-#~ msgstr "Přihlásit"
diff --git a/po/de.gmo b/po/de.gmo
index 92fb6d4..f5c5947 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 0f20f48..0a1e24e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -46,8 +46,8 @@ msgstr ""
 "Project-Id-Version: master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-09-29 21:07+0000\n"
-"PO-Revision-Date: 2016-09-30 09:04+0200\n"
+"POT-Creation-Date: 2016-10-18 08:41+0000\n"
+"PO-Revision-Date: 2016-10-30 19:08+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -55,7 +55,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
@@ -73,7 +73,7 @@ msgid ""
 "desktop. It allows you to import photos from your camera or disk, organize "
 "them by date and subject matter, even ratings. It also offers basic photo "
 "editing, like crop, red-eye correction, color adjustments, and straighten. "
-"Shotwell's non-destructive photo editor does not alter your master photos, "
+"Shotwell’s non-destructive photo editor does not alter your master photos, "
 "making it easy to experiment and correct errors."
 msgstr ""
 "Shotwell ist eine einfach zu bedienende, schnelle Fotoverwaltung, die für "
@@ -158,7 +158,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Geheimer Token zum Signieren von OAuth-Anfragen"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:486
 msgid "default size"
 msgstr "Standardgröße"
 
@@ -186,9 +186,9 @@ msgid "URL of the Rajce server."
 msgstr "Adresse des Rajce-Servers"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:384
-#: misc/org.yorba.shotwell.gschema.xml:442
-#: misc/org.yorba.shotwell.gschema.xml:498
+#: misc/org.yorba.shotwell.gschema.xml:454
+#: misc/org.yorba.shotwell.gschema.xml:512
+#: misc/org.yorba.shotwell.gschema.xml:568
 msgid "username"
 msgstr "Benutzername"
 
@@ -205,7 +205,7 @@ msgid "user token, if remembered."
 msgstr "Benutzer-Token, falls gespeichert."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "last category"
 msgstr "Letzte Kategorie"
 
@@ -214,7 +214,7 @@ msgid "The last selected Rajce category."
 msgstr "Die zuletzt in Rajce ausgewählte Kategorie."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:472
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last photo size"
 msgstr "Letzte Bildgröße"
 
@@ -254,11 +254,11 @@ msgstr ""
 "geöffnet werden soll."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:364
-#: misc/org.yorba.shotwell.gschema.xml:402
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:478
-#: misc/org.yorba.shotwell.gschema.xml:522
+#: misc/org.yorba.shotwell.gschema.xml:434
+#: misc/org.yorba.shotwell.gschema.xml:472
+#: misc/org.yorba.shotwell.gschema.xml:498
+#: misc/org.yorba.shotwell.gschema.xml:548
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "remove sensitive info from uploads"
 msgstr "Sensible Informationen entfernen"
 
@@ -269,58 +269,58 @@ msgid ""
 msgstr ""
 "Legt fest, ob Metadaten vor dem Hochladen zu Rajce entfernt werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:22
+#: misc/org.yorba.shotwell.gschema.xml:23
 msgid "display basic properties"
 msgstr "Grundlegende Informationen anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:23
+#: misc/org.yorba.shotwell.gschema.xml:24
 msgid "True if the basic properties pane is to be displayed, false otherwise."
 msgstr ""
 "Legt fest, ob die grundlegenden Informationen angezeigt werden sollen oder "
 "nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:28
+#: misc/org.yorba.shotwell.gschema.xml:29
 msgid "display extended properties"
 msgstr "Erweiterte Informationen anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:29
+#: misc/org.yorba.shotwell.gschema.xml:30
 msgid ""
 "True if the extended properties window is to be displayed, false otherwise."
 msgstr ""
 "Legt fest, ob das Fenster für die erweiterten Informationen angezeigt werden "
 "soll oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:34
+#: misc/org.yorba.shotwell.gschema.xml:35
 msgid "display sidebar"
 msgstr "Seitenleiste anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:35
+#: misc/org.yorba.shotwell.gschema.xml:36
 msgid "True if the sidebar is to be displayed, false otherwise."
 msgstr "Legt fest, ob die Seitenleiste angezeigt werden soll oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:40
+#: misc/org.yorba.shotwell.gschema.xml:41
 msgid "display toolbar"
 msgstr "Werkzeugleiste anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:41
+#: misc/org.yorba.shotwell.gschema.xml:42
 msgid "True if the bottom toolbar is to be displayed, false otherwise."
 msgstr ""
 "Legt fest, ob die untere Werkzeugleiste angezeigt werden soll oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:46
+#: misc/org.yorba.shotwell.gschema.xml:47
 msgid "display search bar"
 msgstr "Suchleiste anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:47
+#: misc/org.yorba.shotwell.gschema.xml:48
 msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
 msgstr ""
 "Legt fest, ob die Such- und Filterleiste angezeigt werden soll oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:52
+#: misc/org.yorba.shotwell.gschema.xml:53
 msgid "display photo titles"
 msgstr "Bildtitel anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:53
+#: misc/org.yorba.shotwell.gschema.xml:54
 msgid ""
 "True if photo titles are to be displayed beneath thumbnails in collection "
 "views, false otherwise."
@@ -328,11 +328,11 @@ msgstr ""
 "Legt fest, ob Bildtitel unter den Vorschaubildern in Sammlungsansichten "
 "angezeigt werden sollen oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:58
+#: misc/org.yorba.shotwell.gschema.xml:59
 msgid "display photo comments"
 msgstr "Kommentare zu den Fotos anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:59
+#: misc/org.yorba.shotwell.gschema.xml:60
 msgid ""
 "True if photo comments are to be displayed beneath thumbnails in collection "
 "views, false otherwise."
@@ -340,11 +340,11 @@ msgstr ""
 "Legt fest, ob Kommentare unter den Vorschaubildern in Sammlungsansichten "
 "angezeigt werden sollen oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:64
+#: misc/org.yorba.shotwell.gschema.xml:65
 msgid "display event comments"
 msgstr "Kommentare zu den Ereignissen anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:65
+#: misc/org.yorba.shotwell.gschema.xml:66
 msgid ""
 "True if event comments are to be displayed beneath thumbnails in event "
 "views, false otherwise."
@@ -352,11 +352,11 @@ msgstr ""
 "Legt fest, ob Kommentare unter den Vorschaubildern in Ereignisansichten "
 "angezeigt werden sollen oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:70
+#: misc/org.yorba.shotwell.gschema.xml:71
 msgid "display photo tags"
 msgstr "Stichworte jedes Fotos anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:71
+#: misc/org.yorba.shotwell.gschema.xml:72
 msgid ""
 "True if photo tags are to be listed beneath thumbnails in collection views, "
 "false otherwise."
@@ -364,23 +364,23 @@ msgstr ""
 "Legt fest, ob Stichworte unter den Vorschaubildern in Sammlungsansichten "
 "angezeigt werden sollen oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:76
+#: misc/org.yorba.shotwell.gschema.xml:77
 msgid "display photo ratings"
 msgstr "Bewertung jedes Fotos anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:77
+#: misc/org.yorba.shotwell.gschema.xml:78
 msgid ""
-"True if a photo's rating should be displayed as overlaid trinket, false "
+"True if a photo’s rating should be displayed as overlaid trinket, false "
 "otherwise."
 msgstr ""
 "Legt fest, ob Bewertungen als überlagerte Markierung angezeigt werden sollen "
 "oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:82
+#: misc/org.yorba.shotwell.gschema.xml:83
 msgid "rating filter level"
 msgstr "Filterstufe für Bewertungen"
 
-#: misc/org.yorba.shotwell.gschema.xml:83
+#: misc/org.yorba.shotwell.gschema.xml:84
 msgid ""
 "Determines how to filter photos based on their ratings. 1: Rejected or "
 "better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
@@ -391,60 +391,60 @@ msgstr ""
 "Zwei oder besser, 5: Drei oder besser, 6: Vier oder besser, 7: Fünf oder "
 "besser."
 
-#: misc/org.yorba.shotwell.gschema.xml:88
+#: misc/org.yorba.shotwell.gschema.xml:89
 msgid "sort events ascending"
 msgstr "Ereignisse absteigend sortieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:89
+#: misc/org.yorba.shotwell.gschema.xml:90
 msgid "True if events should be sorted ascending, false if descending."
 msgstr ""
 "Legt fest, ob Ereignisse aufsteigend sortiert werden sollen, anderenfalls "
 "absteigend."
 
-#: misc/org.yorba.shotwell.gschema.xml:94
+#: misc/org.yorba.shotwell.gschema.xml:95
 msgid "sort library photos ascending"
 msgstr "Fotos in der Bibliothek aufsteigend sortieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:95
+#: misc/org.yorba.shotwell.gschema.xml:96
 msgid "True if library photos should be sorted ascending, false if descending."
 msgstr ""
 "Legt fest, ob Fotos in der Bibliothek aufsteigend sortiert werden sollen, "
 "anderenfalls absteigend."
 
-#: misc/org.yorba.shotwell.gschema.xml:100
+#: misc/org.yorba.shotwell.gschema.xml:101
 msgid "sort library photos criteria"
 msgstr "Kriterien für Fotosortierung"
 
-#: misc/org.yorba.shotwell.gschema.xml:101
+#: misc/org.yorba.shotwell.gschema.xml:102
 msgid ""
 "A numeric code that specifies the sort criteria for photos in library views."
 msgstr ""
 "Ein Zahlencode, der die Sortierkriterien für Fotos in Bibliotheksansichten "
 "darstellt."
 
-#: misc/org.yorba.shotwell.gschema.xml:106
+#: misc/org.yorba.shotwell.gschema.xml:107
 msgid "sort event photos ascending"
 msgstr "Fotos in Ereignissen aufsteigend sortieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:107
+#: misc/org.yorba.shotwell.gschema.xml:108
 msgid "True if event photos should be sorted ascending, false if descending."
 msgstr ""
 "Legt fest, ob Fotos in Ereignissen aufsteigend sortiert werden sollen, "
 "anderenfalls absteigend."
 
-#: misc/org.yorba.shotwell.gschema.xml:112
+#: misc/org.yorba.shotwell.gschema.xml:113
 msgid "sort event photos criteria"
 msgstr "Kriterien für Fotosortierung in Ereignissen"
 
-#: misc/org.yorba.shotwell.gschema.xml:113
+#: misc/org.yorba.shotwell.gschema.xml:114
 msgid "Specifies the sort criteria for event photos."
 msgstr "Legt die Sortierkriterien für Fotos in Ereignissen fest."
 
-#: misc/org.yorba.shotwell.gschema.xml:118
+#: misc/org.yorba.shotwell.gschema.xml:119
 msgid "use 24 hour time"
 msgstr "Zeitangaben im 24-Stunden-System"
 
-#: misc/org.yorba.shotwell.gschema.xml:119
+#: misc/org.yorba.shotwell.gschema.xml:120
 msgid ""
 "True if should display times with a 24 hour clock, false if times should use "
 "AM/PM notation."
@@ -452,11 +452,11 @@ msgstr ""
 "Legt fest, ob Zeiten im 24-Stunden-Format angegeben werden sollen, "
 "anderenfalls im AM/PM-Format."
 
-#: misc/org.yorba.shotwell.gschema.xml:124
+#: misc/org.yorba.shotwell.gschema.xml:125
 msgid "keep relative time between photos"
 msgstr "Relative Zeit zwischen Fotos erhalten"
 
-#: misc/org.yorba.shotwell.gschema.xml:125
+#: misc/org.yorba.shotwell.gschema.xml:126
 msgid ""
 "True if when adjusting time/date of photos, relative time should be "
 "maintained. False if all photos should be set to the same time."
@@ -465,11 +465,11 @@ msgstr ""
 "erhalten bleiben soll, anderenfalls werden alle Fotos auf die gleiche Zeit "
 "gesetzt."
 
-#: misc/org.yorba.shotwell.gschema.xml:130
+#: misc/org.yorba.shotwell.gschema.xml:131
 msgid "modify original photo files"
 msgstr "Originale Bilddateien verändern"
 
-#: misc/org.yorba.shotwell.gschema.xml:131
+#: misc/org.yorba.shotwell.gschema.xml:132
 msgid ""
 "True if when adjusting time/date of photos, the original files should be "
 "modified as well. False if changes are made only in the database."
@@ -478,11 +478,11 @@ msgstr ""
 "ebenfalls verändert werden sollen, oder die Zeitstempel nur in der Datenbank "
 "verändert werden."
 
-#: misc/org.yorba.shotwell.gschema.xml:136
+#: misc/org.yorba.shotwell.gschema.xml:137
 msgid "show welcome dialog on startup"
 msgstr "Begrüßungsdialog beim Start anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:137
+#: misc/org.yorba.shotwell.gschema.xml:138
 msgid ""
 "True if, when on startup, a welcome dialog should be shown. False if it "
 "should not be shown."
@@ -490,77 +490,77 @@ msgstr ""
 "Legt fest, ob dem Start ein Begrüßungsdialog angezeigt werden soll oder "
 "nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:142
+#: misc/org.yorba.shotwell.gschema.xml:143
 msgid "sidebar position"
 msgstr "Position der Seitenleiste"
 
-#: misc/org.yorba.shotwell.gschema.xml:143
+#: misc/org.yorba.shotwell.gschema.xml:144
 msgid "The width, in pixels, of the sidebar"
 msgstr "Größe der Seitenleiste in Pixel"
 
-#: misc/org.yorba.shotwell.gschema.xml:148
+#: misc/org.yorba.shotwell.gschema.xml:149
 msgid "photo thumbnail scale"
 msgstr "Vorschaubild-Skalierung"
 
-#: misc/org.yorba.shotwell.gschema.xml:149
+#: misc/org.yorba.shotwell.gschema.xml:150
 msgid "The scale of photo thumbnails, ranging from 72 to 360."
 msgstr "Vorschaubild-Skalierung im Bereich von 72 bis 360."
 
-#: misc/org.yorba.shotwell.gschema.xml:154
+#: misc/org.yorba.shotwell.gschema.xml:155
 msgid "pin toolbar state"
 msgstr "Anheften-Status der Werkzeugleiste"
 
-#: misc/org.yorba.shotwell.gschema.xml:155
+#: misc/org.yorba.shotwell.gschema.xml:156
 msgid "Pin toolbar in fullscreen, or not."
 msgstr ""
 "Legt fest, ob die Werkzeugleiste im Vollbildmodus angeheftet werden soll "
 "oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:160
+#: misc/org.yorba.shotwell.gschema.xml:161
 msgid "background color"
 msgstr "Hintergrundfarbe"
 
-#: misc/org.yorba.shotwell.gschema.xml:161
+#: misc/org.yorba.shotwell.gschema.xml:162
 msgid "A grayscale color for use as the background color."
 msgstr ""
 "Eine Farbe der Graustufenskala, die als Hintergrundfarbe verwendet werden "
 "soll."
 
-#: misc/org.yorba.shotwell.gschema.xml:166
-msgid "Selection state of \"hide photos\" option"
+#: misc/org.yorba.shotwell.gschema.xml:167
+msgid "Selection state of “hide photos” option"
 msgstr "Auswahlstatus für »Bereits importierte Fotos verbergen«"
 
-#: misc/org.yorba.shotwell.gschema.xml:167
+#: misc/org.yorba.shotwell.gschema.xml:168
 msgid ""
-"Last used selection state of the \"hide photos already imported\" option in "
+"Last used selection state of the “hide photos already imported” option in "
 "the import page."
 msgstr ""
 "Der zuletzt verwendete Status der Option »Bereits importierte Fotos "
 "verbergen« der Importseite."
 
-#: misc/org.yorba.shotwell.gschema.xml:174
+#: misc/org.yorba.shotwell.gschema.xml:175
 msgid "delay"
 msgstr "Verzögerung"
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:176
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Verzögerung des Bildwechsels in einer Diaschau (in Sekunden)."
 
-#: misc/org.yorba.shotwell.gschema.xml:180
+#: misc/org.yorba.shotwell.gschema.xml:181
 msgid "transition delay"
 msgstr "Übergangsverzögerung"
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:182
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 "Die Dauer eines Übergangs zwischen Fotos (in Sekunden) in einer Diaschau"
 
-#: misc/org.yorba.shotwell.gschema.xml:186
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "transition effect id"
 msgstr "Übergangseffekt-Kennung"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
@@ -568,71 +568,71 @@ msgstr ""
 "Der Name des Übergangseffekts, der zwischen Fotos während einer Diaschau "
 "angewendet werden soll"
 
-#: misc/org.yorba.shotwell.gschema.xml:192
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "Show title"
 msgstr "Titel anzeigen"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr ""
 "Legt fest, ob der Titel einer Bildes in einer Diaschau angezeigt werden soll"
 
-#: misc/org.yorba.shotwell.gschema.xml:200
+#: misc/org.yorba.shotwell.gschema.xml:201
 msgid "maximize library window"
 msgstr "Bibliotheksfenster maximieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:202
 msgid "True if library application is maximized, false otherwise."
 msgstr "Legt fest, ob das Bibliotheksfenster maximiert ist oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:206
+#: misc/org.yorba.shotwell.gschema.xml:207
 msgid "width of library window"
 msgstr "Breite des Bibliotheksfensters"
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:208
 msgid "The last recorded width of the library application window."
 msgstr "Die zuletzt gespeicherte Breite des Bibliotheksfensters der Anwendung."
 
-#: misc/org.yorba.shotwell.gschema.xml:212
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "height of library window"
 msgstr "Höhe des Bibliotheksfensters"
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "The last recorded height of the library application window."
 msgstr "Die zuletzt gespeicherte Höhe des Bibliotheksfensters der Anwendung."
 
-#: misc/org.yorba.shotwell.gschema.xml:218
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "maximize direct-edit window"
 msgstr "Direktbearbeitungsfenster maximieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 "Legt fest, ob das Direktbearbeitungsfenster maximiert werden soll oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:224
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "width of direct-edit window"
 msgstr "Breite des Direktbearbeitungsfensters"
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded width of the direct-edit application window."
 msgstr ""
 "Die zuletzt gespeicherte Breite des Direktbearbeitungsfensters der Anwendung."
 
-#: misc/org.yorba.shotwell.gschema.xml:230
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "height of direct-edit window"
 msgstr "Höhe des Direktbearbeitungsfensters"
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "The last recorded height of the direct-edit application window."
 msgstr ""
 "Die zuletzt gespeicherte Höhe des Direktbearbeitungsfensters der Anwendung."
 
-#: misc/org.yorba.shotwell.gschema.xml:236
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "sidebar divider position"
 msgstr "Position des Seitenleistentrenners"
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -640,30 +640,30 @@ msgstr ""
 "Die zuletzt gespeicherte Position des Trenners zwischen der Werkzeugleiste "
 "und der Ansicht im Bibliotheksfenster der Anwendung."
 
-#: misc/org.yorba.shotwell.gschema.xml:244
+#: misc/org.yorba.shotwell.gschema.xml:245
 msgid "import directory"
 msgstr "Import-Ordner"
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:246
 msgid "Directory in which imported photo files are placed."
 msgstr "Ordner, in dem die importierten Fotodateien abgelegt werden."
 
-#: misc/org.yorba.shotwell.gschema.xml:250
+#: misc/org.yorba.shotwell.gschema.xml:251
 msgid "watch library directory for new files"
 msgstr "Bibliotheksordner auf neue Dateien überwachen"
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:252
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Legt fest, ob die zum Bibliotheksordner hinzugefügten Dateien automatisch "
 "importiert werden sollen."
 
-#: misc/org.yorba.shotwell.gschema.xml:256
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "write metadata to master files"
 msgstr "Metadaten in Master-Dateien schreiben"
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -671,11 +671,11 @@ msgstr ""
 "Legt fest, ob geänderte Metadaten (Stichworte, Titel usw.) in die Master-"
 "Datei geschrieben werden sollen."
 
-#: misc/org.yorba.shotwell.gschema.xml:262
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "use lowercase filenames"
 msgstr "Dateinamen in Kleinschreibung"
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -683,11 +683,11 @@ msgstr ""
 "Legt fest, ob Shotwell beim Import von Fotodateien alle Dateinamen in "
 "Kleinbuchstaben umwandeln soll"
 
-#: misc/org.yorba.shotwell.gschema.xml:268
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "directory pattern"
 msgstr "Muster für Ordnernamen"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -695,11 +695,11 @@ msgstr ""
 "Eine Zeichenkette, die als Namensmuster beim Benennen der importierten Foto-"
 "Ordner verwendet werden soll."
 
-#: misc/org.yorba.shotwell.gschema.xml:274
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "directory pattern custom"
 msgstr "Benutzerdefiniertes Muster für Ordnernamen"
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -707,32 +707,32 @@ msgstr ""
 "Eine Zeichenkette, die als benutzerdefiniertes Namensmuster beim Benennen "
 "der importierten Foto-Ordner verwendet werden soll."
 
-#: misc/org.yorba.shotwell.gschema.xml:280
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "RAW developer default"
 msgstr "Standard-RAW-Entwickler"
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Vorgabe für den durch Shotwell zu verwendenden RAW-Entwickler."
 
-#: misc/org.yorba.shotwell.gschema.xml:288
+#: misc/org.yorba.shotwell.gschema.xml:289
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr ""
 "Das im Menü am häufigsten ausgewählte Seitenverhältnis beim Zuschneiden."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:290
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Ein Zahlencode, der das im Menü am häufigsten ausgewählte Seitenverhältnis "
 "beim Zuschneiden darstellt."
 
-#: misc/org.yorba.shotwell.gschema.xml:293
-msgid "Most-recently-used crop custom aspect ratio's numerator."
+#: misc/org.yorba.shotwell.gschema.xml:294
+msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr ""
 "Erster Wert (Zähler) des am häufigsten verwendeten benutzerdefinierten "
 "Seitenverhältnisses beim Zuschneiden."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:295
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -740,13 +740,13 @@ msgstr ""
 "Eine von Null verschiedene, positive Ganzzahl, die die zuletzt genutzte und "
 "gespeicherte Höhe des Zuschnittverhältnisses darstellt."
 
-#: misc/org.yorba.shotwell.gschema.xml:298
-msgid "Most-recently-used crop custom aspect ratio's denominator."
+#: misc/org.yorba.shotwell.gschema.xml:299
+msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr ""
 "Zweiter Wert (Nenner) des am häufigsten verwendeten benutzerdefinierten "
 "Seitenverhältnisses beim Zuschneiden."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:300
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -754,97 +754,142 @@ msgstr ""
 "Eine von Null verschiedene, positive Ganzzahl, die das zuletzt genutzte und "
 "gespeicherte Zuschnittverhältnis darstellt."
 
-#: misc/org.yorba.shotwell.gschema.xml:306
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid "external photo editor"
 msgstr "Externer Foto-Editor"
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:308
 msgid "External application used to edit photos."
 msgstr "Externe Anwendung zum Bearbeiten von Fotos."
 
-#: misc/org.yorba.shotwell.gschema.xml:312
+#: misc/org.yorba.shotwell.gschema.xml:313
 msgid "external raw editor"
 msgstr "Externer RAW-Editor"
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:314
 msgid "External application used to edit RAW photos."
 msgstr "Externe Anwendung zum Bearbeiten von RAW-Fotos."
 
-#: misc/org.yorba.shotwell.gschema.xml:320
+#: misc/org.yorba.shotwell.gschema.xml:352
+#: misc/org.yorba.shotwell.gschema.xml:353
+msgid "Setting in export dialog: how to trim images"
+msgstr "Einstellung im Exportdialog: Zuschneiden von Bildern"
+
+#: misc/org.yorba.shotwell.gschema.xml:358
+msgid "export metadata"
+msgstr "Metadaten exportieren"
+
+#: misc/org.yorba.shotwell.gschema.xml:359
+msgid "Setting in export dialog: option to export metadata"
+msgstr "Einstellung im Exportdialog: Option zum Exportieren von Metadaten"
+
+#: misc/org.yorba.shotwell.gschema.xml:364
+msgid "format setting, special value"
+msgstr "Formatierungseinstellung, spezieller Wert"
+
+#: misc/org.yorba.shotwell.gschema.xml:365
+msgid "Setting in export dialog: format setting, special value"
+msgstr "Einstellung im Exportdialog: Formatierungseinstellung, spezieller Wert"
+
+#: misc/org.yorba.shotwell.gschema.xml:370
+msgid "format setting, type value"
+msgstr "Formatierungseinstellung, Typwert"
+
+#: misc/org.yorba.shotwell.gschema.xml:371
+msgid "Setting in export dialog: format setting, type value"
+msgstr "Einstellung im Exportdialog: Formatierungseinstellung, Typwert"
+
+#: misc/org.yorba.shotwell.gschema.xml:376
+msgid "JPEG quality option"
+msgstr "JPEG-Qualitätsoption"
+
+#: misc/org.yorba.shotwell.gschema.xml:377
+msgid "Setting in export dialog: jpeg quality option"
+msgstr "Einstellung im Exportdialog: JPEG-Qualitätsoption"
+
+#: misc/org.yorba.shotwell.gschema.xml:382
+msgid "maximal size of image"
+msgstr "Maximale Bildgröße"
+
+#: misc/org.yorba.shotwell.gschema.xml:383
+msgid "Setting in export dialog: maximal size of image"
+msgstr "Einstellung im Exportdialog: Maximale Bildgröße"
+
+#: misc/org.yorba.shotwell.gschema.xml:390
 msgid "last used publishing service"
 msgstr "Zuletzt genutzter Veröffentlichungsdienst"
 
-#: misc/org.yorba.shotwell.gschema.xml:321
-#: misc/org.yorba.shotwell.gschema.xml:327
+#: misc/org.yorba.shotwell.gschema.xml:391
+#: misc/org.yorba.shotwell.gschema.xml:397
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Ein Zahlencode, der den letzten Dienst darstellt, bei dem Fotos "
 "veröffentlicht wurden"
 
-#: misc/org.yorba.shotwell.gschema.xml:326
+#: misc/org.yorba.shotwell.gschema.xml:396
 msgid "default publishing service"
 msgstr "Standard-Veröffentlichungsdienst"
 
-#: misc/org.yorba.shotwell.gschema.xml:340
+#: misc/org.yorba.shotwell.gschema.xml:410
 msgid "access token"
 msgstr "Zugriffs-Token"
 
-#: misc/org.yorba.shotwell.gschema.xml:341
+#: misc/org.yorba.shotwell.gschema.xml:411
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr "OAuth-Token für die aktuell laufende Facebook-Sitzung, falls vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:346
+#: misc/org.yorba.shotwell.gschema.xml:416
 msgid "user i.d."
 msgstr "Benutzerkennung"
 
-#: misc/org.yorba.shotwell.gschema.xml:347
+#: misc/org.yorba.shotwell.gschema.xml:417
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
 "Benutzerkennung für die aktuell laufende Facebook-Sitzung, falls vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:352
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "user name"
 msgstr "Benutzername"
 
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Name des aktuell angemeldeten Facebook-Benutzers, falls vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:428
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "default size code"
 msgstr "Code für Standardgröße"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Ein Zahlencode, der die Standardgröße für Fotos darstellt, die zu Facebook "
 "hochgeladen werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr ""
 "Legt fest, ob Metadaten vor dem Hochladen zu Facebook entfernt werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:372
+#: misc/org.yorba.shotwell.gschema.xml:442
 msgid "OAuth Access Phase Token"
 msgstr "OAuth-Token für die Zugriffsphase"
 
-#: misc/org.yorba.shotwell.gschema.xml:373
+#: misc/org.yorba.shotwell.gschema.xml:443
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
 "Authentifizierungs-Token für den aktuell angemeldeten Facebook-Benutzer, "
 "falls vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:378
+#: misc/org.yorba.shotwell.gschema.xml:448
 msgid "OAuth Access Phase Token Secret"
 msgstr "OAuth-Token-Geheimnis für die Zugriffsphase"
 
-#: misc/org.yorba.shotwell.gschema.xml:379
+#: misc/org.yorba.shotwell.gschema.xml:449
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -853,22 +898,22 @@ msgstr ""
 "Authentifizierungs-Token des zur Zeit angemeldeten Flickr-Benutzers "
 "verwendet wird, soweit vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:385
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "Name des aktuell angemeldeten Flickr-Benutzers, falls vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Ein Zahlencode, der die Standardgröße für Fotos darstellt, die zu Flickr "
 "hochgeladen werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:466
 msgid "default visibility"
 msgstr "Standard-Sichtbarkeit"
 
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -876,19 +921,19 @@ msgstr ""
 "Ein Zahlencode, der die Standard-Sichtbarkeit für Fotos darstellt, die zu "
 "Flickr hochgeladen werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr ""
 "Legt fest, ob Metadaten vor dem Hochladen zu Flickr entfernt werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:480
+#: misc/org.yorba.shotwell.gschema.xml:612
 msgid "refresh token"
 msgstr "Auffrischungs-Token"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:481
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -896,7 +941,7 @@ msgstr ""
 "Der OAuth-Token, der beim Auffrischen der Picasa-Web-Album-Sitzung des "
 "aktuell angemeldeten Benutzers verwendet wird, soweit vorhanden."
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:487
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -904,68 +949,68 @@ msgstr ""
 "Ein Zahlencode, der die Standardgröße für Fotos darstellt, die zu Picasa "
 "Webalben hochgeladen werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
-#: misc/org.yorba.shotwell.gschema.xml:516
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "last album"
 msgstr "Letztes Album"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
-#: misc/org.yorba.shotwell.gschema.xml:517
+#: misc/org.yorba.shotwell.gschema.xml:493
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
 "Der Name des letzten Albums, in dem der Benutzer Fotos veröffentlicht hat, "
 "falls vorhanden"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr ""
 "Legt fest, ob Metadaten vor dem Hochladen zu Picasa entfernt werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:436
+#: misc/org.yorba.shotwell.gschema.xml:506
 msgid "Piwigo URL"
 msgstr "Piwigo-Adresse"
 
-#: misc/org.yorba.shotwell.gschema.xml:437
+#: misc/org.yorba.shotwell.gschema.xml:507
 msgid "URL of the Piwigo server."
 msgstr "Adresse des Piwigo-Servers"
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:513
 msgid "Piwigo username, if logged in."
 msgstr "Piwigo-Benutzername für die Anmeldung"
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "password"
 msgstr "Passwort"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "Piwigo password, if logged in."
 msgstr "Piwigo-Passwort für die Anmeldung"
 
-#: misc/org.yorba.shotwell.gschema.xml:454
+#: misc/org.yorba.shotwell.gschema.xml:524
 msgid "remember password"
 msgstr "Passwort speichern"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "If true, remember the Piwigo password."
 msgstr ""
 "Legt fest, ob das Piwigo-Passwort für weitere Anmeldungen gespeichert werden "
 "soll."
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "The last selected Piwigo category."
 msgstr "Die zuletzt in Piwigo ausgewählte Kategorie."
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "last permission level"
 msgstr "Letzte Zugriffsstufe"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "The last chosen Piwigo permission level."
 msgstr "Die zuletzt gewählte Zugriffsstufe bei Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -973,21 +1018,21 @@ msgstr ""
 "Ein Zahlencode, der die Größe des letzten Fotos darstellt, das zu Piwigo "
 "hochgeladen wurde."
 
-#: misc/org.yorba.shotwell.gschema.xml:479
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr ""
 "Legt fest, ob Metadaten vor dem Hochladen zu Piwigo entfernt werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "Falls ein Titel und kein Kommentar gesetzt ist, den Titel als Kommentar beim "
 "Hochladen zu Piwigo verwenden"
 
-#: misc/org.yorba.shotwell.gschema.xml:485
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -995,11 +1040,11 @@ msgstr ""
 "Legt fest, ob beim Hochladen von Bildern zu Piwigo die Kommentare aus den "
 "Titeln erzeugt werden, sofern Titel, aber keine Kommentare festgelegt sind"
 
-#: misc/org.yorba.shotwell.gschema.xml:490
+#: misc/org.yorba.shotwell.gschema.xml:560
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "Keine Stichworte zu Piwigo hochladen"
 
-#: misc/org.yorba.shotwell.gschema.xml:491
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their tags removed on "
 "upload, such that these tags will not appear on the remote Piwigo server."
@@ -1008,46 +1053,46 @@ msgstr ""
 "werden sollen, so dass diese auf dem entfernten Piwigo-Server nicht "
 "erscheinen."
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:569
 msgid "Gallery3 username"
 msgstr "Gallery3-Benutzername"
 
-#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:574
 msgid "API key"
 msgstr "API-Schlüssel"
 
-#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:575
 msgid "Gallery3 API key"
 msgstr "Gallery3-API-Schlüssel"
 
-#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "URL"
 msgstr "Adresse"
 
-#: misc/org.yorba.shotwell.gschema.xml:511
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 site URL"
 msgstr "Gallery3-Adresse"
 
-#: misc/org.yorba.shotwell.gschema.xml:523
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
 msgstr ""
 "Legt fest, ob Metadaten vor dem Hochladen zu Gallery3 entfernt werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:528
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "scaling constraint of uploaded picture"
 msgstr "Skalierungsbeschränkung des hochgeladenen Bildes"
 
-#: misc/org.yorba.shotwell.gschema.xml:529
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "Die Kennung der Skalierungsbeschränkung des hochgeladenen Bildes"
 
-#: misc/org.yorba.shotwell.gschema.xml:534
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "pixels of the major axis uploaded picture"
 msgstr "Pixel der Hauptachse des hochgeladenen Bildes"
 
-#: misc/org.yorba.shotwell.gschema.xml:535
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1055,7 +1100,7 @@ msgstr ""
 "Pixel der Hauptachse des hochzuladenden Bildes. Dies wird nur verwendet, "
 "wenn scaling-constraint-id auf einen entsprechenden Wert gesetzt ist"
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:613
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1063,32 +1108,32 @@ msgstr ""
 "Der OAuth-Token, der beim Auffrischen der YouTube-Sitzung des aktuell "
 "angemeldeten Benutzers verwendet wird, soweit vorhanden."
 
-#: misc/org.yorba.shotwell.gschema.xml:550
+#: misc/org.yorba.shotwell.gschema.xml:620
 msgid "last used import service"
 msgstr "Zuletzt verwendeter Importdienst"
 
-#: misc/org.yorba.shotwell.gschema.xml:551
+#: misc/org.yorba.shotwell.gschema.xml:621
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Ein Zahlencode, der den letzten Dienst darstellt, von dem Fotos importiert "
 "wurden"
 
-#: misc/org.yorba.shotwell.gschema.xml:558
+#: misc/org.yorba.shotwell.gschema.xml:628
 msgid "interpreter state cookie"
 msgstr "Cookie für Interpreter-Status"
 
-#: misc/org.yorba.shotwell.gschema.xml:559
+#: misc/org.yorba.shotwell.gschema.xml:629
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr ""
 "Ein Zahlencode, der den Status der Plugin-Umgebung von GStreamer darstellt"
 
-#: misc/org.yorba.shotwell.gschema.xml:566
+#: misc/org.yorba.shotwell.gschema.xml:636
 msgid "content layout mode"
 msgstr "Anordnungsmodus"
 
-#: misc/org.yorba.shotwell.gschema.xml:567
+#: misc/org.yorba.shotwell.gschema.xml:637
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1096,35 +1141,35 @@ msgstr ""
 "Ein Zahlencode, der darstellt, wie Fotos auf dem Medium beim Druck "
 "angeordnet werden sollen"
 
-#: misc/org.yorba.shotwell.gschema.xml:572
+#: misc/org.yorba.shotwell.gschema.xml:642
 msgid "content ppi"
 msgstr "PPI für den Inhalt"
 
-#: misc/org.yorba.shotwell.gschema.xml:573
+#: misc/org.yorba.shotwell.gschema.xml:643
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr "Wert für Pixel pro Zoll (ppi), der an den Drucker gesendet werden soll"
 
-#: misc/org.yorba.shotwell.gschema.xml:578
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content width"
 msgstr "Breite des Inhalts"
 
-#: misc/org.yorba.shotwell.gschema.xml:579
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "Die Breite des Druckbereiches auf der Seite"
 
-#: misc/org.yorba.shotwell.gschema.xml:584
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content height"
 msgstr "Höhe des Inhalts"
 
-#: misc/org.yorba.shotwell.gschema.xml:585
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "Die Höhe des Druckbereiches auf der Seite"
 
-#: misc/org.yorba.shotwell.gschema.xml:590
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content units"
 msgstr "Einheiten für Inhalte"
 
-#: misc/org.yorba.shotwell.gschema.xml:591
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1132,11 +1177,11 @@ msgstr ""
 "Ein Zahlencode, der die beim Drucken verwendete Maßeinheit (Zoll oder "
 "Millimeter) darstellt"
 
-#: misc/org.yorba.shotwell.gschema.xml:596
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "images per page code"
 msgstr "Anzahl der Bilder pro Seite"
 
-#: misc/org.yorba.shotwell.gschema.xml:597
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1144,22 +1189,22 @@ msgstr ""
 "Ein Zahlencode, der den aktuell ausgewählten Bilder-pro-Seite-Modus beim "
 "Drucken darstellt"
 
-#: misc/org.yorba.shotwell.gschema.xml:602
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "size selection"
 msgstr "Größenauswahl"
 
-#: misc/org.yorba.shotwell.gschema.xml:603
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "Der Index der aktuellen Druckgröße aus einer vordefinierten Liste von "
 "Standardgrößen"
 
-#: misc/org.yorba.shotwell.gschema.xml:608
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "match aspect ratio"
 msgstr "Seitenverhältnis beibehalten"
 
-#: misc/org.yorba.shotwell.gschema.xml:609
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1167,205 +1212,205 @@ msgstr ""
 "Legt fest, ob benutzerdefinierte Druckgrößen dem Seitenverhältnis des "
 "Originalfotos entsprechen müssen"
 
-#: misc/org.yorba.shotwell.gschema.xml:614
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "print titles"
 msgstr "Bildtitel drucken"
 
-#: misc/org.yorba.shotwell.gschema.xml:615
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
 msgstr ""
 "Legt fest, ob der Bildtitel beim Drucken mit gedruckt werden soll oder nicht."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "titles font"
 msgstr "Titelschrift"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr ""
 "Der Name der Schrift, die beim Drucken für Bildtitel verwendet werden soll."
 
-#: misc/org.yorba.shotwell.gschema.xml:632
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "enable facebook publishing plugin"
 msgstr "Facebook-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:633
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Facebook-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:638
+#: misc/org.yorba.shotwell.gschema.xml:708
 msgid "enable flickr publishing plugin"
 msgstr "Flickr-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:639
+#: misc/org.yorba.shotwell.gschema.xml:709
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Flickr-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:644
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable picasa publishing plugin"
 msgstr "Picasa-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:645
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Picasa-Webalben-Veröffentlichungs-Plugin aktiviert ist "
 "oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:650
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable youtube publishing plugin"
 msgstr "Youtube-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:651
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Youtube-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:656
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable piwigo publishing plugin"
 msgstr "Piwigo-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:657
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Piwigo-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:662
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable yandex publishing plugin"
 msgstr "Yandex-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:663
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Yandex.Fotki-Veröffentlichungs-Plugin aktiviert ist oder "
 "nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:668
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable tumblr publishing plugin"
 msgstr "Tumblr-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:669
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Tumblr-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:674
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable rajce publishing plugin"
 msgstr "Rajce-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:675
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Rajce-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:680
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable gallery3 publishing plugin"
 msgstr "Gallery3-Veröffentlichungs-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:681
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob das Gallery3-Veröffentlichungs-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:686
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable F-Spot import plugin"
 msgstr "F-Spot-Import-Plugin aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:687
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr "Legt fest, ob das F-Spot-Import-Plugin aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:692
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable slideshow crumble transition"
 msgstr "Zerfallen-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:693
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Zerfallen-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:698
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable slideshow fade transition"
 msgstr "Überblendung für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:699
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr "Legt fest, ob die Überbledung für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:704
-#: misc/org.yorba.shotwell.gschema.xml:728
+#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow slide transition"
 msgstr "Gleiten-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:705
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Gleiten-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:710
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow clock transition"
 msgstr "Uhr-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:711
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr "Legt fest, ob der Uhr-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:716
-#: misc/org.yorba.shotwell.gschema.xml:722
+#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow circle transition"
 msgstr "Kreis-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:717
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Kreis-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:723
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Kreis-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:729
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Vorhang-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:734
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow squares transition"
 msgstr "Quadrat-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:735
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Quadrat-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:740
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow stripes transition"
 msgstr "Streifen-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:741
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Streifen-Übergang für Diaschauen aktiviert ist oder nicht"
 
-#: misc/org.yorba.shotwell.gschema.xml:746
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow chess transition"
 msgstr "Schachbrett-Übergang für Diaschauen aktivieren"
 
-#: misc/org.yorba.shotwell.gschema.xml:747
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1383,14 +1428,76 @@ msgstr ""
 "Christian Kirbach <Christian.Kirbach@gmail.com>, 2014, 2015, 2016\n"
 "Mario Blättermann <mario.blaettermann@gmail.com>"
 
-#: plugins/common/RESTSupport.vala:451
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:202
+msgid ""
+"⚫ This website presented identification that belongs to a different website."
+msgstr ""
+"⚫ Die von dieser Webseite erhaltene Identifizierung verweist auf eine andere "
+"Webseite."
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:207
+msgid ""
+"⚫ This website’s identification is too old to trust. Check the date on your "
+"computer’s calendar."
+msgstr ""
+"⚫ Die von dieser Webseite erhaltene Identifizierung ist zu alt, um "
+"vertrauenswürdig zu sein. Überprüfen Sie das Datum mithilfe des Kalenders "
+"Ihres Rechners."
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:212
+msgid ""
+"⚫ This website’s identification was not issued by a trusted organization."
+msgstr ""
+"⚫ Die von dieser Webseite erhaltene Identifizierung wurde nicht von einer "
+"vertrauenswürdigen Organisation herausgegeben."
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:217
+msgid ""
+"⚫ This website’s identification could not be processed. It may be corrupted."
+msgstr ""
+"⚫ Die von dieser Webseite erhaltene Identifizierung konnte nicht verarbeitet "
+"werden. Sie könnte beschädigt sein."
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:222
+msgid ""
+"⚫ This website’s identification has been revoked by the trusted organization "
+"that issued it."
+msgstr ""
+"⚫ Die von dieser Webseite erhaltene Identifizierung wurde von der "
+"vertrauenswürdigen Organisation zurückgezogen, von der sie ausgegeben wurde."
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:227
+msgid ""
+"⚫ This website’s identification cannot be trusted because it uses very weak "
+"encryption."
+msgstr ""
+"⚫ Die von dieser Webseite erhaltene Identifizierung ist nicht "
+"vertrauenswürdig, weil die Verschlüsselung zu schwach ist."
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:232
+msgid ""
+"⚫ This website’s identification is only valid for future dates. Check the "
+"date on your computer’s calendar."
+msgstr ""
+"⚫ Die von dieser Webseite erhaltene Identifizierung gilt nur für ein Datum "
+"in der Zukunft. Überprüfen Sie das Datum mithilfe des Kalenders Ihres "
+"Rechners."
+
+#: plugins/common/RESTSupport.vala:509
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
 msgid "A temporary file needed for publishing is unavailable"
 msgstr ""
 "Eine temporäre Datei, die für das Veröffentlichen benötigt wird, ist nicht "
 "verfügbar"
 
-#: plugins/common/RESTSupport.vala:1157
+#: plugins/common/RESTSupport.vala:1167
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -1509,7 +1616,7 @@ msgstr "_Zurück gehen"
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
 #: ui/shotwell.ui:1627
-msgid "_Login"
+msgid "_Log in"
 msgstr "_Anmelden"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
@@ -1580,7 +1687,7 @@ msgstr "Pixel"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1329
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Ursprüngliche Größe"
@@ -1615,8 +1722,8 @@ msgstr "Vorgabeordner für Shotwell"
 msgid ""
 "\n"
 "\n"
-"The file \"%s\" may not be supported by or may be too large for this "
-"instance of Gallery3."
+"The file “%s” may not be supported by or may be too large for this instance "
+"of Gallery3."
 msgstr ""
 "\n"
 "\n"
@@ -1636,7 +1743,7 @@ msgstr ""
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
 #, c-format
 msgid ""
-"A file required for publishing is unavailable. Publishing to %s can't "
+"A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
 msgstr ""
 "Eine Datei, die veröffentlicht werden soll, ist nicht verfügbar. Die "
@@ -1707,8 +1814,8 @@ msgstr "Dauerhaft _merken"
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
 #: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151
-msgid "Login"
-msgstr "Anmelden"
+msgid "Log in"
+msgstr "Anmelden in"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
@@ -1734,8 +1841,9 @@ msgid "Open target _album in browser"
 msgstr "Ziel-_Album im Browser öffnen"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-msgid "Copyright (C) 2013 rajce.net"
-msgstr "Copyright (C) 2013 rajce.net"
+#| msgid "Copyright (C) 2013 rajce.net"
+msgid "Copyright © 2013 rajce.net"
+msgstr "Copyright © 2013 rajce.net"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
 msgid "An error message occurred when publishing to Rajce. Please try again."
@@ -1785,30 +1893,33 @@ msgstr "Copyright 2012 BJA Electronics"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1230
-msgid "500 x 375 pixels"
-msgstr "500 x 375 Pixel"
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1325
+#| msgid "500 x 375 pixels"
+msgid "500 × 375 pixels"
+msgstr "500 × 375 Pixel"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1231
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 Pixel"
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1326
+#| msgid "1024 x 768 pixels"
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 Pixel"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 Pixel"
+#| msgid "1280 x 853 pixels"
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 Pixel"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
 #, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
+msgid "“%s” isn’t a valid response to an OAuth authentication request"
 msgstr ""
 "»%s« ist keine gültige Antwort auf eine OAuth-Authentifizierungsanfrage"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
 msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
 msgstr ""
 "TumblrPublisher: start( ): kann nicht gestartet werden; das Werkzeug zum "
 "Veröffentlichen ist nicht neu startbar."
@@ -1820,13 +1931,13 @@ msgstr ""
 "Konto ein."
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:992
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1087
 msgid "Username and/or password invalid. Please try again"
 msgstr ""
 "Benutzername und/oder Passwort sind ungültig. Bitte versuchen Sie es erneut"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1026
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1121
 msgid "Invalid User Name or Password"
 msgstr "Ungültiger Benutzername oder Passwort"
 
@@ -1854,7 +1965,7 @@ msgstr "Copyright 2010+ Jewgeni Poljakow <zbr@ioremap.net>"
 msgid "Visit the Yandex.Fotki web site"
 msgstr "Besuchen Sie die Yandex.Fotki-Webseite"
 
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:658
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Sie sind aktuell nicht bei Yandex.Fotki angemeldet."
 
@@ -1879,7 +1990,7 @@ msgid "Public"
 msgstr "Öffentlich"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1194
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
 msgid "Friends"
 msgstr "Freunde"
 
@@ -1897,7 +2008,7 @@ msgid "Create a _new album named:"
 msgstr "Ein _neues Album mit folgendem Namen erstellen:"
 
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1034
+#: plugins/shotwell-publishing/FacebookPublishing.vala:984
 msgid "Upload _size:"
 msgstr "_Größe zum Hochladen:"
 
@@ -1917,7 +2028,7 @@ msgstr ""
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:62
 #: plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1114
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1209
 msgid "Shotwell Connect"
 msgstr "Shotwell Connect"
 
@@ -1925,7 +2036,7 @@ msgstr "Shotwell Connect"
 msgid ""
 "You are not currently logged into Facebook.\n"
 "\n"
-"If you don't yet have a Facebook account, you can create one during the "
+"If you don’t yet have a Facebook account, you can create one during the "
 "login process. During login, Shotwell Connect may ask you for permission to "
 "upload photos and publish to your feed. These permissions are required for "
 "Shotwell Connect to function."
@@ -1959,23 +2070,23 @@ msgid "Large (2048 pixels)"
 msgstr "Groß (2048 Pixel)"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:255
-msgid "Testing connection to Facebook..."
+msgid "Testing connection to Facebook…"
 msgstr "Verbindung zu Facebook wird geprüft …"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:348
 #: plugins/shotwell-publishing/PicasaPublishing.vala:379
-msgid "Creating album..."
+msgid "Creating album…"
 msgstr "Album wird erstellt …"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:374
 msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can't "
+"A file required for publishing is unavailable. Publishing to Facebook can’t "
 "continue."
 msgstr ""
 "Eine Datei, die veröffentlicht werden soll, ist nicht verfügbar. Die "
 "Veröffentlichung auf Facebook ist nicht möglich."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1032
+#: plugins/shotwell-publishing/FacebookPublishing.vala:982
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -1984,18 +2095,18 @@ msgstr ""
 "Sie sind bei Facebook als %s angemeldet.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1033
+#: plugins/shotwell-publishing/FacebookPublishing.vala:983
 msgid "Where would you like to publish the selected photos?"
 msgstr "Wo möchten Sie die ausgewählten Fotos veröffentlichen?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1193
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Just me"
 msgstr "Nur mich"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1195
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1218
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1313
 msgid "Everyone"
 msgstr "Alle"
 
@@ -2011,7 +2122,7 @@ msgstr ""
 msgid "Authorization _Number:"
 msgstr "Autorisierungsnummer:"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:132
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:128
 msgid "Con_tinue"
 msgstr "For_tsetzen"
 
@@ -2019,7 +2130,7 @@ msgstr "For_tsetzen"
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
-"Click Login to log into Flickr in your Web browser.  You will have to "
+"Click Log in to log into Flickr in your Web browser. You will have to "
 "authorize Shotwell Connect to link to your Flickr account."
 msgstr ""
 "Sie sind zurzeit nicht bei Flickr angemeldet.\n"
@@ -2040,21 +2151,21 @@ msgstr ""
 "starten Sie es nochmals und versuchen es dann erneut."
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login..."
+msgid "Preparing for login…"
 msgstr "Anmeldung wird vorbereitet …"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:444
 #: plugins/shotwell-publishing/FlickrPublishing.vala:594
 msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
 msgstr ""
 "Eine Datei, die veröffentlicht werden soll, ist nicht verfügbar. Die "
 "Veröffentlichung auf Flickr ist nicht möglich."
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Autorisierung wird bestätigt …"
+msgid "Verifying authorization…"
+msgstr "Legitimierung wird bestätigt …"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1152
 #, c-format
@@ -2111,14 +2222,16 @@ msgid "Friends only"
 msgstr "Nur Freunde"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1232
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 Pixel"
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1327
+#| msgid "2048 x 1536 pixels"
+msgid "2048 × 1536 pixels"
+msgstr "2048 × 1536 Pixel"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1233
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 Pixel"
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1328
+#| msgid "4096 x 3072 pixels"
+msgid "4096 × 3072 pixels"
+msgstr "4096 × 3072 Pixel"
 
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
 msgid "L_ist album in public gallery"
@@ -2132,8 +2245,8 @@ msgstr "Voreingestellte Foto_größe:"
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
+"Click Log in to log into Picasa Web Albums in your Web browser. You will "
+"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
 "Sie sind zur Zeit nicht bei Picasa Webalben angemeldet.\n"
 "\n"
@@ -2143,7 +2256,7 @@ msgstr ""
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:361
 msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can't "
+"A file required for publishing is unavailable. Publishing to Picasa can’t "
 "continue."
 msgstr ""
 "Eine Datei, die veröffentlicht werden soll, ist nicht verfügbar. Die "
@@ -2160,20 +2273,20 @@ msgid "Videos will appear in:"
 msgstr "Videos werden folgendermaßen dargestellt:"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Klein (640 x 480 Pixel)"
+msgid "Small (640 × 480 pixels)"
+msgstr "Klein (640 × 480 Pixel)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Mittel (1024 x 768 Pixel)"
+msgid "Medium (1024 × 768 pixels)"
+msgstr "Mittel (1024 × 768 Pixel)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Empfohlen (1600 x 1200 Pixel)"
+msgid "Recommended (1600 × 1200 pixels)"
+msgstr "Empfohlen (1600 × 1200 Pixel)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 Pixel)"
+msgid "Google+ (2048 × 1536 pixels)"
+msgstr "Google+ (2048 × 1536 Pixel)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:750
 #: src/editing_tools/EditingTools.vala:756
@@ -2231,18 +2344,31 @@ msgstr "Abmelden"
 msgid "Publish"
 msgstr "Veröffentlichen"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:747
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:775
 #, c-format
-msgid "Creating album %s..."
+msgid "Creating album %s…"
 msgstr "Album %s wird erstellt …"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:920
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:948
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr ""
 "Ein Fehler trat beim Veröffentlichen auf Piwigo auf. Bitte versuchen Sie "
 "erneut."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:990
+#. %s is the host name that we tried to connect to
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1024
+#, c-format
+msgid ""
+"This does not look like the real <b>%s</b>. Attackers might be trying to "
+"steal or alter information going to or from this site (for example, private "
+"messages, credit card information, or passwords)."
+msgstr ""
+"Dies scheint kein echtes <b>%s</b> zu sein. Angreifer könnten versuchen, von "
+"oder zu dieser Seite übertragene Informationen zu stehlen oder zu "
+"beeinflussen (zum Beispiel private Nachrichten, Kreditkartendaten oder "
+"Passwörter)."
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1085
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
@@ -2250,7 +2376,7 @@ msgstr ""
 "Geben Sie die Adresse Ihrer Piwigo-Fotobibliothek sowie Ihren Benutzernamen "
 "und Passwort für das mit Ihrer Bibliothek verbundene Piwigo-Benutzerkonto an."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:991
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1086
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
@@ -2258,26 +2384,38 @@ msgstr ""
 "Shotwell kann sich nicht mit Ihrer Piwigo-Fotobibliothek verbinden. Bitte "
 "überprüfen Sie Ihre angegebene Adresse."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1021
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1116
 msgid "Invalid URL"
 msgstr "Ungültige Adresse"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1219
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1314
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Admins, Familie, Freunde, Kontakte"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1220
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1315
 msgid "Admins, Family, Friends"
 msgstr "Admins, Familie, Freunde"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1221
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1316
 msgid "Admins, Family"
 msgstr "Admins, Familie"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1222
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1317
 msgid "Admins"
 msgstr "Admins"
 
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
+msgstr "Diese Verbindung ist nicht sicher"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
+msgstr "Zertifikat anzeigen …"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr "Verstanden, bitte _fortfahren."
+
 #: plugins/shotwell-publishing/shotwell-publishing.vala:26
 msgid "Core Publishing Services"
 msgstr "Standard-Veröffentlichungsdienste"
@@ -2302,7 +2440,7 @@ msgstr ""
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:363
 msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
+"A file required for publishing is unavailable. Publishing to YouTube can’t "
 "continue."
 msgstr ""
 "Eine Datei, die veröffentlicht werden soll, ist nicht verfügbar. Die "
@@ -2315,7 +2453,7 @@ msgstr "Sie sind bei YouTube als %s angemeldet."
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:464
 #, c-format
-msgid "Videos will appear in '%s'"
+msgid "Videos will appear in “%s”"
 msgstr "Videos werden in »%s« erscheinen"
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:496
@@ -2440,7 +2578,7 @@ msgstr "_Ein Problem melden …"
 
 #: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
 #: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1425 src/Dialogs.vala:1448
+#: src/Dialogs.vala:28 src/Dialogs.vala:1441 src/Dialogs.vala:1464
 #: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
 msgid "_Cancel"
 msgstr "_Abbrechen"
@@ -2448,7 +2586,7 @@ msgstr "_Abbrechen"
 #: src/AppWindow.vala:656
 #, c-format
 msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
 "continue.\n"
 "\n"
 "%s"
@@ -2554,7 +2692,7 @@ msgstr "RAW+JPEG"
 
 #: src/camera/ImportPage.vala:458
 msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
+"Unable to unmount camera. Try unmounting the camera from the file manager."
 msgstr ""
 "Das Kameramedium kann nicht ausgehängt werden. Versuchen Sie es bitte über "
 "die Dateiverwaltung."
@@ -2606,7 +2744,7 @@ msgstr "Alle Fotos in die Bibliothek importieren"
 #: src/camera/ImportPage.vala:1013
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
+"it. Continue?"
 msgstr ""
 "Shotwell muss die Kamera aus dem Dateisystem aushängen, um auf sie zugreifen "
 "zu können. Möchten Sie fortsetzen?"
@@ -2621,8 +2759,8 @@ msgstr "Bitte hängen Sie die Kamera aus."
 
 #: src/camera/ImportPage.vala:1029
 msgid ""
-"The camera is locked by another application.  Shotwell can only access the "
-"camera when it's unlocked.  Please close any other application using the "
+"The camera is locked by another application. Shotwell can only access the "
+"camera when it’s unlocked. Please close any other application using the "
 "camera and try again."
 msgstr ""
 "Die Kamera ist von einer anderen Anwendung reserviert. Shotwell kann nur auf "
@@ -2693,7 +2831,7 @@ msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Sollen diese Dateien von der Kamera gelöscht werden?"
 msgstr[1] "Sollen diese %d Dateien von der Kamera gelöscht werden?"
 
-#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1392
+#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1408
 msgid "_Keep"
 msgstr "_Behalten"
 
@@ -2730,7 +2868,7 @@ msgstr "Fotos/Videos exportieren"
 msgid "Export Photo"
 msgstr "Foto exportieren"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:88
+#: src/CollectionPage.vala:458 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Fotos exportieren"
 
@@ -2882,7 +3020,7 @@ msgstr "Stichwort zuordnen"
 
 #: src/Commands.vala:1695
 #, c-format
-msgid "Move Tag \"%s\""
+msgid "Move Tag “%s”"
 msgstr "Stichwort »%s« verschieben"
 
 #: src/Commands.vala:2347
@@ -2943,7 +3081,7 @@ msgstr "%s-Datenbank"
 #: src/data_imports/DataImportsPluginHost.vala:148
 #: src/data_imports/DataImportsPluginHost.vala:294
 #, c-format
-msgid "Importing from %s can't continue because an error occurred:"
+msgid "Importing from %s can’t continue because an error occurred:"
 msgstr "Import von %s kann nicht fortgesetzt werden, da ein Fehler auftrat:"
 
 #: src/data_imports/DataImportsPluginHost.vala:151
@@ -3047,12 +3185,12 @@ msgstr "Die Hintergrund-Bildvorführung kann nicht vorbereitet werden: %s"
 
 #: src/Dialogs.vala:16
 #, c-format
-msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+msgid "This will remove the tag “%s” from one photo. Continue?"
+msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "Dies wird das Stichwort »%s« von einem Foto entfernen. Fortsetzen?"
 msgstr[1] "Dies wird das Stichwort »%s« von %d Fotos entfernen. Fortsetzen?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1393
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1409
 #: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409
 #: src/Resources.vala:674
 msgid "_Delete"
@@ -3060,7 +3198,7 @@ msgstr "_Löschen"
 
 #: src/Dialogs.vala:25
 #, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
+msgid "This will remove the saved search “%s”. Continue?"
 msgstr ""
 "Hiermit wird die gespeicherte Suche »%s« entfernt. Soll fortgesetzt werden?"
 
@@ -3091,16 +3229,16 @@ msgstr "Video exportieren"
 #. if we can't copy an image over for editing in an external tool.
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
-#: src/Dialogs.vala:116
+#: src/Dialogs.vala:112
 #, c-format
 msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
+"Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
 msgstr ""
 "Shotwell konnte keine Datei zur Bearbeitung dieses Fotos erstellen, weil Sie "
 "keine Berechtigung haben, um auf %s zu schreiben."
 
-#: src/Dialogs.vala:125
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -3108,7 +3246,7 @@ msgstr ""
 "Das Foto kann wegen eines Dateifehlers nicht exportiert werden.\n"
 "\n"
 
-#: src/Dialogs.vala:131
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -3121,61 +3259,61 @@ msgstr ""
 #. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
 #. aren't formats so much as they are operating modes that determine specific formats.
 #. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:148
+#: src/Dialogs.vala:144
 msgid "Unmodified"
 msgstr "Unverändert"
 
 # Bildformat
-#: src/Dialogs.vala:149
+#: src/Dialogs.vala:145
 msgid "Current"
 msgstr "Aktuelles"
 
 #. layout controls
-#: src/Dialogs.vala:216
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "_Format:"
 
-#: src/Dialogs.vala:219
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "_Qualität:"
 
-#: src/Dialogs.vala:222
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "_Skalierungsbeschränkung:"
 
-#: src/Dialogs.vala:225
+#: src/Dialogs.vala:230
 msgid "_Pixels:"
 msgstr "_Pixel:"
 
-#: src/Dialogs.vala:228
-msgid "Export metadata"
-msgstr "Metadaten exportieren"
+#: src/Dialogs.vala:234
+msgid "Export _metadata:"
+msgstr "_Metadaten exportieren:"
 
-#: src/Dialogs.vala:462
+#: src/Dialogs.vala:478
 msgid "Save Details…"
 msgstr "Details speichern …"
 
-#: src/Dialogs.vala:463
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "Details speichern"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(und %d andere)\n"
 
-#: src/Dialogs.vala:531
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "Importergebnisse anzeigen"
 
-#: src/Dialogs.vala:535
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "%d Datei zu importieren versucht."
 msgstr[1] "%d Dateien zu importieren versucht."
 
-#: src/Dialogs.vala:538
+#: src/Dialogs.vala:554
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3185,31 +3323,31 @@ msgstr[1] "Davon wurden %d Dateien erfolgreich importiert."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:550
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Duplikate von Fotos und Videos wurden nicht importiert:"
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
 msgstr "dupliziert bestehendes Medienelement"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:565
+#: src/Dialogs.vala:581
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Fotos/Videos wurden aufgrund von Kamera-Fehlern nicht importiert:"
 
-#: src/Dialogs.vala:568 src/Dialogs.vala:583 src/Dialogs.vala:598
-#: src/Dialogs.vala:614 src/Dialogs.vala:629 src/Dialogs.vala:643
+#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
+#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
 msgid "error message:"
 msgstr "Fehlermeldung:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:579
-msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#: src/Dialogs.vala:595
+msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 "Diese Dateien wurden nicht importiert, da Sie nicht als Foto oder Video "
 "erkannt wurden:"
@@ -3217,9 +3355,9 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:594
+#: src/Dialogs.vala:610
 msgid ""
-"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
 msgstr ""
 "Dateien wurden nicht importiert, da Sie nicht in einem mit Shotwell "
@@ -3228,18 +3366,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:609
+#: src/Dialogs.vala:625
 msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr ""
 "Dateien wurden nicht importiert, da Sie nicht in die Bibliothek kopiert "
 "werden konnten:"
 
-#: src/Dialogs.vala:613
+#: src/Dialogs.vala:629
 #, c-format
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 msgstr ""
 "%s konnte nicht\n"
@@ -3248,7 +3386,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:641
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr ""
 "Fotos/Videos konnten nicht importiert werden, da die Dateien beschädigt sind:"
@@ -3256,32 +3394,32 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:640
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Foto/Videos wurden aus anderen Gründen nicht importiert:"
 
-#: src/Dialogs.vala:660
+#: src/Dialogs.vala:676
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "1 Duplikat des Fotos wurde nicht importiert:\n"
 msgstr[1] "%d Duplikate des Fotos wurden nicht importiert:\n"
 
-#: src/Dialogs.vala:663
+#: src/Dialogs.vala:679
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "1 Duplikat des Videos wurde nicht importiert:\n"
 msgstr[1] "%d Duplikate des Videos wurden nicht importiert:\n"
 
-#: src/Dialogs.vala:666
+#: src/Dialogs.vala:682
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "1 Duplikat des Fotos/Videos wurde nicht importiert:\n"
 msgstr[1] "%d Duplikate der Fotos/Videos wurden nicht importiert:\n"
 
-#: src/Dialogs.vala:680
+#: src/Dialogs.vala:696
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
@@ -3291,7 +3429,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Fotos konnten wegen Datei- oder Hardwarefehlern nicht importiert werden:\n"
 
-#: src/Dialogs.vala:683
+#: src/Dialogs.vala:699
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
@@ -3302,7 +3440,7 @@ msgstr[1] ""
 "%d Videos konnten wegen Datei- oder Hardwarefehlern nicht importiert "
 "werden:\n"
 
-#: src/Dialogs.vala:686
+#: src/Dialogs.vala:702
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3314,7 +3452,7 @@ msgstr[1] ""
 "%d Fotos/Videos konnten wegen Datei- oder Hardwarefehlern nicht importiert "
 "werden:\n"
 
-#: src/Dialogs.vala:689
+#: src/Dialogs.vala:705
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
@@ -3325,7 +3463,7 @@ msgstr[1] ""
 "%d Dateien konnten wegen eines Datei- oder Hardwarefehlers nicht importiert "
 "werden:\n"
 
-#: src/Dialogs.vala:703
+#: src/Dialogs.vala:719
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3339,7 +3477,7 @@ msgstr[1] ""
 "%d Fotos wurden nicht importiert, weil der Ordner der Foto-Bibliothek "
 "schreibgeschützt ist:\n"
 
-#: src/Dialogs.vala:706
+#: src/Dialogs.vala:722
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3353,7 +3491,7 @@ msgstr[1] ""
 "%d Videos wurden nicht importiert, weil der Ordner mit der Foto-Bibliothek "
 "schreibgeschützt ist:\n"
 
-#: src/Dialogs.vala:709
+#: src/Dialogs.vala:725
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3368,7 +3506,7 @@ msgstr[1] ""
 "%d Fotos/Videos wurden nicht importiert, weil der Ordner mit der Foto-"
 "Bibliothek schreibgeschützt ist:\n"
 
-#: src/Dialogs.vala:712
+#: src/Dialogs.vala:728
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3382,7 +3520,7 @@ msgstr[1] ""
 "%d Dateien wurden nicht importiert, weil der Ordner mit der Foto-Bibliothek "
 "schreibgeschützt ist:\n"
 
-#: src/Dialogs.vala:726
+#: src/Dialogs.vala:742
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
@@ -3391,7 +3529,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Fotos konnten wegen eines Kamerafehlers nicht importiert werden:\n"
 
-#: src/Dialogs.vala:729
+#: src/Dialogs.vala:745
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
@@ -3400,7 +3538,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Videos konnten wegen eines Kamerafehlers nicht importiert werden:\n"
 
-#: src/Dialogs.vala:732
+#: src/Dialogs.vala:748
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
@@ -3409,7 +3547,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Fotos/Videos konnten wegen eines Kamerafehlers nicht importiert werden:\n"
 
-#: src/Dialogs.vala:735
+#: src/Dialogs.vala:751
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
@@ -3418,7 +3556,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Dateien konnte wegen eines Kamerafehlers nicht importiert werden:\n"
 
-#: src/Dialogs.vala:749
+#: src/Dialogs.vala:765
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
@@ -3428,7 +3566,7 @@ msgstr[1] ""
 "%d Fotos konnten nicht importiert werden, weil die Dateien beschädigt "
 "waren:\n"
 
-#: src/Dialogs.vala:752
+#: src/Dialogs.vala:768
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
@@ -3437,7 +3575,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Videos konnten nicht importiert werden, weil die Datei beschädigt war:\n"
 
-#: src/Dialogs.vala:755
+#: src/Dialogs.vala:771
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
@@ -3448,7 +3586,7 @@ msgstr[1] ""
 "%d Fotos/Videos konnten nicht importiert werden, weil die Datei beschädigt "
 "war:\n"
 
-#: src/Dialogs.vala:758
+#: src/Dialogs.vala:774
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -3461,7 +3599,7 @@ msgstr[1] ""
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: src/Dialogs.vala:775
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3470,56 +3608,56 @@ msgstr[1] "%d Fotos mit nicht unterstütztem Format wurden übersprungen:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:790
+#: src/Dialogs.vala:806
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "Eine Nicht-Bilddatei wurde übersprungen.\n"
 msgstr[1] "%d Nicht-Bilddateien wurde übersprungen.\n"
 
-#: src/Dialogs.vala:801
+#: src/Dialogs.vala:817
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "Ein Foto wurde wegen Abbruchs durch den Benutzer übersprungen:\n"
 msgstr[1] "%d Fotos wurden wegen Abbruchs durch den Benutzer übersprungen:\n"
 
-#: src/Dialogs.vala:804
+#: src/Dialogs.vala:820
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "Ein Video wurde wegen Abbruchs durch den Benutzer übersprungen:\n"
 msgstr[1] "%d Videos wurden wegen Abbruchs durch den Benutzer übersprungen:\n"
 
-#: src/Dialogs.vala:807
+#: src/Dialogs.vala:823
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] "Ein Foto/Video wegen Abbruchs durch den Benutzer übersprungen.\n"
 msgstr[1] "%d Fotos/Videos wegen Abbruchs durch den Benutzer übersprungen.\n"
 
-#: src/Dialogs.vala:810
+#: src/Dialogs.vala:826
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "Eine Datei wegen Abbruchs durch den Benutzer übersprungen.\n"
 msgstr[1] "%d Dateien wegen Abbruchs durch den Benutzer übersprungen.\n"
 
-#: src/Dialogs.vala:824
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "Ein Foto wurde erfolgreich importiert.\n"
 msgstr[1] "%d Fotos wurden erfolgreich importiert.\n"
 
-#: src/Dialogs.vala:827
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "Ein Video wurde erfolgreich importiert.\n"
 msgstr[1] "%d Videos wurden erfolgreich importiert.\n"
 
-#: src/Dialogs.vala:830
+#: src/Dialogs.vala:846
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3528,179 +3666,179 @@ msgstr[1] "%d Fotos/Videos wurden erfolgreich importiert.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:862
 msgid "No photos or videos imported.\n"
 msgstr "Es wurden keine Fotos oder Videos importiert.\n"
 
-#: src/Dialogs.vala:853 src/Dialogs.vala:872
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "Import abgeschlossen"
 
-#: src/Dialogs.vala:1158
+#: src/Dialogs.vala:1174
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: src/Dialogs.vala:1161
+#: src/Dialogs.vala:1177
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: src/Dialogs.vala:1165
+#: src/Dialogs.vala:1181
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: src/Dialogs.vala:1168
+#: src/Dialogs.vala:1184
 msgid "1 day"
 msgstr "1 Tag"
 
-#: src/Dialogs.vala:1322 src/Resources.vala:231
+#: src/Dialogs.vala:1338 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Ereignis umbenennen"
 
-#: src/Dialogs.vala:1322
+#: src/Dialogs.vala:1338
 msgid "Name:"
 msgstr "Name:"
 
 #. Dialog title
-#: src/Dialogs.vala:1333
+#: src/Dialogs.vala:1349
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Titel bearbeiten"
 
-#: src/Dialogs.vala:1334 src/Properties.vala:340
+#: src/Dialogs.vala:1350 src/Properties.vala:340
 msgid "Title:"
 msgstr "Titel:"
 
 #. Dialog title
-#: src/Dialogs.vala:1350 src/Resources.vala:307
+#: src/Dialogs.vala:1366 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Kommentar des Ereignisses bearbeiten"
 
-#: src/Dialogs.vala:1351
+#: src/Dialogs.vala:1367
 msgid "Edit Photo/Video Comment"
 msgstr "Foto-/Video-Kommentar bearbeiten"
 
-#: src/Dialogs.vala:1352 src/Properties.vala:628
+#: src/Dialogs.vala:1368 src/Properties.vala:628
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/Dialogs.vala:1368
+#: src/Dialogs.vala:1384
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Datei entfernen und _löschen"
 msgstr[1] "Dateien entfernen und _löschen"
 
-#: src/Dialogs.vala:1372
+#: src/Dialogs.vala:1388
 msgid "_Remove From Library"
 msgstr "Aus der Bibliothek _entfernen"
 
-#: src/Dialogs.vala:1415
+#: src/Dialogs.vala:1431
 msgid "Revert External Edit?"
 msgstr "Externe Veränderung zurücknehmen?"
 
-#: src/Dialogs.vala:1415
+#: src/Dialogs.vala:1431
 msgid "Revert External Edits?"
 msgstr "Externe Veränderungen zurücknehmen?"
 
-#: src/Dialogs.vala:1417
+#: src/Dialogs.vala:1433
 #, c-format
-msgid "This will destroy all changes made to the external file.  Continue?"
+msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
-"This will destroy all changes made to %d external files.  Continue?"
+"This will destroy all changes made to %d external files. Continue?"
 msgstr[0] ""
 "Dies wird alle Veränderungen der externen Datei zerstören. Fortfahren?"
 msgstr[1] ""
 "Dies wird alle Veränderungen der %d externen Dateien zerstören. Fortfahren?"
 
-#: src/Dialogs.vala:1421
+#: src/Dialogs.vala:1437
 msgid "Re_vert External Edit"
 msgstr "Externe _Veränderung zurücknehmen"
 
-#: src/Dialogs.vala:1421
+#: src/Dialogs.vala:1437
 msgid "Re_vert External Edits"
 msgstr "Externe _Veränderungen zurücknehmen"
 
-#: src/Dialogs.vala:1442
+#: src/Dialogs.vala:1458
 #, c-format
-msgid "This will remove the photo from the library.  Continue?"
-msgid_plural "This will remove %d photos from the library.  Continue?"
+msgid "This will remove the photo from the library. Continue?"
+msgid_plural "This will remove %d photos from the library. Continue?"
 msgstr[0] "Dies wird das Foto aus der Bibliothek entfernen. Fortsetzen?"
 msgstr[1] "Dies wird %d Fotos aus der Bibliothek entfernen. Fortsetzen?"
 
-#: src/Dialogs.vala:1449 src/Resources.vala:173
+#: src/Dialogs.vala:1465 src/Resources.vala:173
 msgid "_Remove"
 msgstr "Entfe_rnen"
 
-#: src/Dialogs.vala:1450
+#: src/Dialogs.vala:1466
 msgid "Remove Photo From Library"
 msgstr "Foto aus der Bibliothek entfernen"
 
-#: src/Dialogs.vala:1450
+#: src/Dialogs.vala:1466
 msgid "Remove Photos From Library"
 msgstr "Fotos aus der Bibliothek entfernen"
 
-#: src/Dialogs.vala:1543
+#: src/Dialogs.vala:1559
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1697
+#: src/Dialogs.vala:1713
 msgid "AM"
 msgstr "Vormittag"
 
-#: src/Dialogs.vala:1698
+#: src/Dialogs.vala:1714
 msgid "PM"
 msgstr "Nachmittag"
 
-#: src/Dialogs.vala:1699
+#: src/Dialogs.vala:1715
 msgid "24 Hr"
 msgstr "24 Stunden"
 
-#: src/Dialogs.vala:1714
+#: src/Dialogs.vala:1730
 msgid "_Shift photos/videos by the same amount"
 msgstr "Fotos/Videos um den gleichen Betrag _versetzen"
 
-#: src/Dialogs.vala:1719
+#: src/Dialogs.vala:1735
 msgid "Set _all photos/videos to this time"
 msgstr "Zeit für _alle Fotos/Videos setzen"
 
-#: src/Dialogs.vala:1726
+#: src/Dialogs.vala:1742
 msgid "_Modify original photo file"
 msgstr "Originale Bilddatei _verändern"
 
-#: src/Dialogs.vala:1726
+#: src/Dialogs.vala:1742
 msgid "_Modify original photo files"
 msgstr "Originale Bilddateien _verändern"
 
-#: src/Dialogs.vala:1729
+#: src/Dialogs.vala:1745
 msgid "_Modify original file"
 msgstr "Originaldateien _bearbeiten"
 
-#: src/Dialogs.vala:1729
+#: src/Dialogs.vala:1745
 msgid "_Modify original files"
 msgstr "Originaldateien _verändern"
 
-#: src/Dialogs.vala:1815
+#: src/Dialogs.vala:1831
 msgid "Original: "
 msgstr "Ursprüngliche Größe:"
 
-#: src/Dialogs.vala:1816
+#: src/Dialogs.vala:1832
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d.%m.%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1817
+#: src/Dialogs.vala:1833
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d.%m.%Y, %I:%M:%S %p"
 
-#: src/Dialogs.vala:1906
+#: src/Dialogs.vala:1922
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3709,7 +3847,7 @@ msgstr ""
 "Aufnahmezeit wird um \n"
 "%d %s, %d %s, %d %s, und %d %s nach vorne verlegt."
 
-#: src/Dialogs.vala:1907
+#: src/Dialogs.vala:1923
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3718,31 +3856,31 @@ msgstr ""
 "Aufnahmezeit wird um \n"
 "%d %s, %d %s, %d %s, und %d %s nach hinten verlegt."
 
-#: src/Dialogs.vala:1909
+#: src/Dialogs.vala:1925
 msgid "day"
 msgid_plural "days"
 msgstr[0] "Tag"
 msgstr[1] "Tage"
 
-#: src/Dialogs.vala:1910
+#: src/Dialogs.vala:1926
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "Stunde"
 msgstr[1] "Stunden"
 
-#: src/Dialogs.vala:1911
+#: src/Dialogs.vala:1927
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "Minute"
 msgstr[1] "Minuten"
 
-#: src/Dialogs.vala:1912
+#: src/Dialogs.vala:1928
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "Sekunde"
 msgstr[1] "Sekunden"
 
-#: src/Dialogs.vala:1956
+#: src/Dialogs.vala:1972
 #, c-format
 msgid ""
 "\n"
@@ -3761,50 +3899,50 @@ msgstr[1] ""
 "\n"
 "und %d andere."
 
-#: src/Dialogs.vala:1980 src/Dialogs.vala:2007
+#: src/Dialogs.vala:1996 src/Dialogs.vala:2023
 msgid "Tags (separated by commas):"
 msgstr "Stichworte (getrennt durch Kommata):"
 
-#: src/Dialogs.vala:2087
+#: src/Dialogs.vala:2103
 msgid "Welcome!"
 msgstr "Willkommen!"
 
-#: src/Dialogs.vala:2094
+#: src/Dialogs.vala:2110
 msgid "Welcome to Shotwell!"
 msgstr "Willkommen zu Shotwell!"
 
-#: src/Dialogs.vala:2098
+#: src/Dialogs.vala:2114
 msgid "To get started, import photos in any of these ways:"
 msgstr "Importieren Sie zunächst Fotos auf eine der folgenden Arten:"
 
-#: src/Dialogs.vala:2117
+#: src/Dialogs.vala:2133
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr ""
 "Wählen Sie <span weight=\"bold\">Datei %s aus Ordner importieren</span>"
 
-#: src/Dialogs.vala:2118
+#: src/Dialogs.vala:2134
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Verschieben Sie Fotos per Ziehen und Ablegen in das Shotwell-Fenster"
 
-#: src/Dialogs.vala:2119
+#: src/Dialogs.vala:2135
 msgid "Connect a camera to your computer and import"
 msgstr "Verbinden Sie die Kamera mit Ihrem Rechner und importieren Sie"
 
-#: src/Dialogs.vala:2129
+#: src/Dialogs.vala:2145
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "Fotos aus dem Ordner »%s« _importieren"
 
-#: src/Dialogs.vala:2136
+#: src/Dialogs.vala:2152
 msgid "You can also import photos in any of these ways:"
 msgstr "Sie können Fotos auch auf eine der folgenden Weisen importieren:"
 
-#: src/Dialogs.vala:2146
-msgid "_Don't show this message again"
+#: src/Dialogs.vala:2162
+msgid "_Don’t show this message again"
 msgstr "Diese Meldung nicht noch einmal _zeigen"
 
-#: src/Dialogs.vala:2181
+#: src/Dialogs.vala:2197
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Bilder aus der %s-Bibliothek importieren"
@@ -3812,41 +3950,41 @@ msgstr "Bilder aus der %s-Bibliothek importieren"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2328 src/Dialogs.vala:2332
+#: src/Dialogs.vala:2344 src/Dialogs.vala:2348
 msgid "(Help)"
 msgstr "(Hilfe)"
 
-#: src/Dialogs.vala:2341
+#: src/Dialogs.vala:2357
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Jahr%sMonat%sTag"
 
-#: src/Dialogs.vala:2343
+#: src/Dialogs.vala:2359
 #, c-format
 msgid "Year%sMonth"
 msgstr "Jahr%sMonat"
 
-#: src/Dialogs.vala:2345
+#: src/Dialogs.vala:2361
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Jahr%sMonat-Tag"
 
-#: src/Dialogs.vala:2347
+#: src/Dialogs.vala:2363
 msgid "Year-Month-Day"
 msgstr "Jahr-Monat-Tag"
 
-#: src/Dialogs.vala:2348 src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2364 src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2585
+#: src/Dialogs.vala:2601
 msgid "Invalid pattern"
 msgstr "Ungültiges Muster"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2687
+#: src/Dialogs.vala:2703
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3854,40 +3992,40 @@ msgstr ""
 "Shotwell kann die Fotos aus dem Ordner in die Bibliothek kopieren oder sie "
 "können verknüpft werden, ohne sie zu kopieren."
 
-#: src/Dialogs.vala:2692
+#: src/Dialogs.vala:2708
 msgid "Co_py Photos"
 msgstr "Fotos ko_pieren"
 
-#: src/Dialogs.vala:2693
+#: src/Dialogs.vala:2709
 msgid "_Import in Place"
 msgstr "_Import durch Verknüpfen"
 
-#: src/Dialogs.vala:2694
+#: src/Dialogs.vala:2710
 msgid "Import to Library"
 msgstr "In Bibliothek importieren"
 
-#: src/Dialogs.vala:2704 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2720 src/PhotoPage.vala:3085
 msgid "Remove From Library"
 msgstr "Aus Bibliothek entfernen"
 
-#: src/Dialogs.vala:2705 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2721 src/PhotoPage.vala:3085
 msgid "Removing Photo From Library"
 msgstr "Foto wird aus Bibliothek entfernt"
 
-#: src/Dialogs.vala:2705
+#: src/Dialogs.vala:2721
 msgid "Removing Photos From Library"
 msgstr "Fotos werden aus Bibliothek entfernt"
 
-#: src/Dialogs.vala:2719
+#: src/Dialogs.vala:2735
 #, c-format
 msgid ""
-"This will remove the photo/video from your Shotwell library.  Would you also "
+"This will remove the photo/video from your Shotwell library. Would you also "
 "like to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos/videos from your Shotwell library.  Would you "
-"also like to move the files to your desktop trash?\n"
+"This will remove %d photos/videos from your Shotwell library. Would you also "
+"like to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
@@ -3901,15 +4039,15 @@ msgstr[1] ""
 "\n"
 "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: src/Dialogs.vala:2723
+#: src/Dialogs.vala:2739
 #, c-format
 msgid ""
-"This will remove the video from your Shotwell library.  Would you also like "
+"This will remove the video from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d videos from your Shotwell library.  Would you also like "
+"This will remove %d videos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
@@ -3924,15 +4062,15 @@ msgstr[1] ""
 "\n"
 "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: src/Dialogs.vala:2727
+#: src/Dialogs.vala:2743
 #, c-format
 msgid ""
-"This will remove the photo from your Shotwell library.  Would you also like "
+"This will remove the photo from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos from your Shotwell library.  Would you also like "
+"This will remove %d photos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
@@ -3947,12 +4085,12 @@ msgstr[1] ""
 "\n"
 "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: src/Dialogs.vala:2759
+#: src/Dialogs.vala:2775
 #, c-format
 msgid ""
-"The photo or video cannot be moved to your desktop trash.  Delete this file?"
+"The photo or video cannot be moved to your desktop trash. Delete this file?"
 msgid_plural ""
-"%d photos/videos cannot be moved to your desktop trash.  Delete these files?"
+"%d photos/videos cannot be moved to your desktop trash. Delete these files?"
 msgstr[0] ""
 "Das Foto oder Video konnte nicht in den Papierkorb verschoben werden. "
 "Endgültig löschen?"
@@ -3961,7 +4099,7 @@ msgstr[1] ""
 "löschen?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2776
+#: src/Dialogs.vala:2792
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4170,84 +4308,84 @@ msgid "-"
 msgstr "-"
 
 #: src/editing_tools/EditingTools.vala:758
-msgid "SD Video (4 : 3)"
+msgid "SD Video (4 ∶ 3)"
 msgstr "SD-Video (4 : 3)"
 
 #: src/editing_tools/EditingTools.vala:759
-msgid "HD Video (16 : 9)"
+msgid "HD Video (16 ∶ 9)"
 msgstr "HD-Video (16 : 9)"
 
 #: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
-msgid "Wallet (2 x 3 in.)"
-msgstr "Brieftasche (2 x 3 Zoll)"
+msgid "Wallet (2 × 3 in.)"
+msgstr "Brieftasche (2 × 3 Zoll)"
 
 #: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
-msgid "Notecard (3 x 5 in.)"
-msgstr "Notizzettel (3 x 5 Zoll)"
+msgid "Notecard (3 × 5 in.)"
+msgstr "Notizzettel (3 × 5 Zoll)"
 
 #: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
-msgid "4 x 6 in."
-msgstr "4 x 6 Zoll"
+msgid "4 × 6 in."
+msgstr "4 × 6 Zoll"
 
 #: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
-msgid "5 x 7 in."
-msgstr "5 x 7 Zoll"
+msgid "5 × 7 in."
+msgstr "5 × 7 Zoll"
 
 #: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
-msgid "8 x 10 in."
-msgstr "8 x 10 Zoll"
+msgid "8 × 10 in."
+msgstr "8 × 10 Zoll"
 
 #: src/editing_tools/EditingTools.vala:766
-msgid "Letter (8.5 x 11 in.)"
-msgstr "US-Letter (8.5 x 11 in.)"
+msgid "Letter (8.5 × 11 in.)"
+msgstr "US-Letter (8.5 × 11 Zoll)"
 
 #: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
-msgid "11 x 14 in."
-msgstr "11 x 14 Zoll"
+msgid "11 × 14 in."
+msgstr "11 × 14 Zoll"
 
 #: src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "Boulevardblatt (11 x 17 in.)"
+msgid "Tabloid (11 × 17 in.)"
+msgstr "Boulevardblatt (11 × 17 Zoll)"
 
 #: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
-msgid "16 x 20 in."
-msgstr "16 x 20 Zoll"
+msgid "16 × 20 in."
+msgstr "16 × 20 Zoll"
 
 #: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Metrische Brieftasche (9 x 13 cm)"
+msgid "Metric Wallet (9 × 13 cm)"
+msgstr "Metrische Brieftasche (9 × 13 cm)"
 
 #: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
-msgid "Postcard (10 x 15 cm)"
-msgstr "Postkarte (10 x 15 cm)"
+msgid "Postcard (10 × 15 cm)"
+msgstr "Postkarte (10 × 15 cm)"
 
 #: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
-msgid "13 x 18 cm"
-msgstr "13 x 18 cm"
+msgid "13 × 18 cm"
+msgstr "13 × 18 cm"
 
 #: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
-msgid "18 x 24 cm"
-msgstr "18 x 24 cm"
+msgid "18 × 24 cm"
+msgstr "18 × 24 cm"
 
 #: src/editing_tools/EditingTools.vala:775
-msgid "A4 (210 x 297 mm)"
-msgstr "A4 (210 x 297 mm)"
+msgid "A4 (210 × 297 mm)"
+msgstr "A4 (210 × 297 mm)"
 
 #: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
-msgid "20 x 30 cm"
-msgstr "20 x 30 cm"
+msgid "20 × 30 cm"
+msgstr "20 × 30 cm"
 
 #: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
-msgid "24 x 40 cm"
-msgstr "24 x 40 cm"
+msgid "24 × 40 cm"
+msgstr "24 × 40 cm"
 
 #: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
-msgid "30 x 40 cm"
-msgstr "30 x 40 cm"
+msgid "30 × 40 cm"
+msgstr "30 × 40 cm"
 
 #: src/editing_tools/EditingTools.vala:779
-msgid "A3 (297 x 420 mm)"
-msgstr "A3 (297 x 420 mm)"
+msgid "A3 (297 × 420 mm)"
+msgstr "A3 (297 × 420 mm)"
 
 #: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395
 msgid "Size:"
@@ -4422,7 +4560,7 @@ msgstr "Wird exportiert"
 
 #: src/Exporter.vala:317
 #, c-format
-msgid "File %s already exists.  Replace?"
+msgid "File %s already exists. Replace?"
 msgstr "Die Datei %s existiert bereits. Soll sie überschrieben werden?"
 
 #: src/Exporter.vala:319
@@ -4638,7 +4776,6 @@ msgid "Updating library…"
 msgstr "Bibliothek wird aktualisiert …"
 
 #: src/library/LibraryWindow.vala:1264
-#| msgid "Preparing to auto-import photos..."
 msgid "Preparing to auto-import photos…"
 msgstr "Preparing to auto-import photos…"
 
@@ -4677,9 +4814,9 @@ msgstr "Fotos werden gelöscht"
 #: src/main.vala:54
 #, c-format
 msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please use the latest version of Shotwell."
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please use the latest version of Shotwell."
 msgstr ""
 "Die Datenbank für die Foto-Bibliothek ist nicht mit dieser Version von "
 "Shotwell kompatibel. Es sieht so aus, als wäre sie von Shotwell %s (Schema "
@@ -4690,7 +4827,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Shotwell was unable to upgrade your photo library from version %s (schema "
-"%d) to %s (schema %d).  For more information please check the Shotwell Wiki "
+"%d) to %s (schema %d). For more information please check the Shotwell Wiki "
 "at %s"
 msgstr ""
 "Shotwell konnte Ihre Foto-Bibliothek nicht von Version %s (Schema %d) zu %s "
@@ -4700,9 +4837,9 @@ msgstr ""
 #: src/main.vala:65
 #, c-format
 msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please clear your library by deleting %s and re-import your "
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please clear your library by deleting %s and re-import your "
 "photos."
 msgstr ""
 "Die Datenbank für die Foto-Bibliothek ist nicht mit dieser Version von "
@@ -4712,7 +4849,7 @@ msgstr ""
 
 #: src/main.vala:71
 #, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgid "Unknown error attempting to verify Shotwell’s database: %s"
 msgstr "Unbekannter Fehler bei der Überprüfung von Shotwells Datenbank: %s"
 
 #: src/main.vala:104
@@ -4720,7 +4857,7 @@ msgid "Loading Shotwell"
 msgstr "Shotwell wird geladen"
 
 #: src/main.vala:294
-msgid "Path to Shotwell's private data"
+msgid "Path to Shotwell’s private data"
 msgstr "Pfad zu Shotwells Verwaltungsinformation"
 
 #: src/main.vala:294
@@ -4732,11 +4869,11 @@ msgid "Do not monitor library directory at runtime for changes"
 msgstr "Bibliotheksordner nicht laufend auf Veränderungen prüfen"
 
 #: src/main.vala:302
-msgid "Don't display startup progress meter"
+msgid "Don’t display startup progress meter"
 msgstr "Fortschrittsbalken beim Start nicht anzeigen"
 
 #: src/main.vala:306
-msgid "Show the application's version"
+msgid "Show the application’s version"
 msgstr "Versionsnummer anzeigen"
 
 #. init GTK (valac has already called g_threads_init())
@@ -4746,7 +4883,7 @@ msgstr "[DATEI]"
 
 #: src/main.vala:342
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
 "Rufen Sie »%s --help« auf, um eine vollständige Liste von möglichen "
 "Befehlszeilenoptionen zu erhalten.\n"
@@ -4790,7 +4927,7 @@ msgid "Display the comment of each photo"
 msgstr "Die Kommentare zu jedem Bild anzeigen"
 
 #: src/MediaPage.vala:470
-msgid "Display each photo's tags"
+msgid "Display each photo’s tags"
 msgstr "Stichworte jedes Fotos anzeigen"
 
 #: src/MediaPage.vala:486
@@ -5097,7 +5234,7 @@ msgstr "%d von %d wird hochgeladen"
 
 #: src/publishing/PublishingPluginHost.vala:81
 #, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
+msgid "Publishing to %s can’t continue because an error occurred:"
 msgstr ""
 "Veröffentlichung auf %s kann nicht fortgesetzt werden, weil ein Fehler "
 "aufgetreten ist:"
@@ -5325,7 +5462,7 @@ msgid "Enhance"
 msgstr "Verbessern"
 
 #: src/Resources.vala:188
-msgid "Automatically improve the photo's appearance"
+msgid "Automatically improve the photo’s appearance"
 msgstr "Automatisch das Aussehen des Fotos verbessern"
 
 #: src/Resources.vala:190
@@ -5361,7 +5498,7 @@ msgid "Crop"
 msgstr "Zuschneiden"
 
 #: src/Resources.vala:200
-msgid "Crop the photo's size"
+msgid "Crop the photo’s size"
 msgstr "Foto auf eine gewünschte Größe zuschneiden"
 
 #: src/Resources.vala:203
@@ -5393,7 +5530,7 @@ msgid "Adjust"
 msgstr "Anpassen"
 
 #: src/Resources.vala:212
-msgid "Adjust the photo's color and tone"
+msgid "Adjust the photo’s color and tone"
 msgstr "Farbe und Farbton des Fotos anpassen"
 
 #: src/Resources.vala:214
@@ -5583,7 +5720,7 @@ msgid "_Ratings"
 msgstr "_Bewertungen"
 
 #: src/Resources.vala:280
-msgid "Display each photo's rating"
+msgid "Display each photo’s rating"
 msgstr "Bewertung jedes Fotos anzeigen"
 
 #: src/Resources.vala:282
@@ -5716,13 +5853,13 @@ msgstr "Editor kann nicht gestartet werden: %s"
 
 #: src/Resources.vala:340
 #, c-format
-msgid "Add Tag \"%s\""
+msgid "Add Tag “%s”"
 msgstr "Stichwort »%s« hinzufügen"
 
 #. Used when adding two tags to photo(s)
 #: src/Resources.vala:343
 #, c-format
-msgid "Add Tags \"%s\" and \"%s\""
+msgid "Add Tags “%s” and “%s”"
 msgstr "Stichworte »%s« und »%s« hinzufügen"
 
 #. Undo/Redo command name (in Edit menu)
@@ -5733,12 +5870,12 @@ msgstr "Stichworte hinzufügen"
 
 #: src/Resources.vala:353
 #, c-format
-msgid "_Delete Tag \"%s\""
+msgid "_Delete Tag “%s”"
 msgstr "Stichwort »%s« _entfernen"
 
 #: src/Resources.vala:357
 #, c-format
-msgid "Delete Tag \"%s\""
+msgid "Delete Tag “%s”"
 msgstr "Stichwort »%s« entfernen"
 
 #: src/Resources.vala:360
@@ -5747,12 +5884,12 @@ msgstr "Stichwort entfernen"
 
 #: src/Resources.vala:366
 #, c-format
-msgid "Re_name Tag \"%s\"…"
+msgid "Re_name Tag “%s”…"
 msgstr "Stichwort »%s« _umbenennen …"
 
 #: src/Resources.vala:370
 #, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
+msgid "Rename Tag “%s” to “%s”"
 msgstr "Stichwort »%s« zu »%s« umbenennen"
 
 #: src/Resources.vala:373
@@ -5769,54 +5906,54 @@ msgstr "Stichworte ändern"
 
 #: src/Resources.vala:379
 #, c-format
-msgid "Tag Photo as \"%s\""
+msgid "Tag Photo as “%s”"
 msgstr "Foto mit Stichwort »%s« versehen"
 
 #: src/Resources.vala:379
 #, c-format
-msgid "Tag Photos as \"%s\""
+msgid "Tag Photos as “%s”"
 msgstr "Fotos mit Stichwort »%s« versehen"
 
 #: src/Resources.vala:383
 #, c-format
-msgid "Tag the selected photo as \"%s\""
+msgid "Tag the selected photo as “%s”"
 msgstr "Ausgewähltes Foto mit Stichwort »%s« versehen"
 
 #: src/Resources.vala:384
 #, c-format
-msgid "Tag the selected photos as \"%s\""
+msgid "Tag the selected photos as “%s”"
 msgstr "Ausgewählte Fotos mit Stichwort »%s« versehen"
 
 #: src/Resources.vala:388
 #, c-format
-msgid "Remove Tag \"%s\" From _Photo"
+msgid "Remove Tag “%s” From _Photo"
 msgstr "Stichwort »%s« von _Foto entfernen"
 
 #: src/Resources.vala:389
 #, c-format
-msgid "Remove Tag \"%s\" From _Photos"
+msgid "Remove Tag “%s” From _Photos"
 msgstr "Stichwort »%s« von _Fotos entfernen"
 
 #: src/Resources.vala:393
 #, c-format
-msgid "Remove Tag \"%s\" From Photo"
+msgid "Remove Tag “%s” From Photo"
 msgstr "Stichwort »%s« von Foto entfernen"
 
 #: src/Resources.vala:394
 #, c-format
-msgid "Remove Tag \"%s\" From Photos"
+msgid "Remove Tag “%s” From Photos"
 msgstr "Stichwort »%s« von Fotos entfernen"
 
 #: src/Resources.vala:398
 #, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
+msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr ""
 "Stichwort kann nicht zu »%s« umbenannt werden, weil ein entsprechendes "
 "Stichwort bereits vorhanden ist."
 
 #: src/Resources.vala:402
 #, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
+msgid "Unable to rename search to “%s” because the search already exists."
 msgstr ""
 "Die Suche kann nicht nach »%s« umbenannt werden, weil die Suche bereits "
 "vorhanden ist."
@@ -5840,12 +5977,12 @@ msgstr "_Umbenennen …"
 
 #: src/Resources.vala:414
 #, c-format
-msgid "Rename Search \"%s\" to \"%s\""
+msgid "Rename Search “%s” to “%s”"
 msgstr "Suche »%s« zu »%s« umbenennen"
 
 #: src/Resources.vala:418
 #, c-format
-msgid "Delete Search \"%s\""
+msgid "Delete Search “%s”"
 msgstr "Suche »%s« löschen"
 
 #: src/Resources.vala:576
@@ -5909,8 +6046,9 @@ msgid "Show in File Mana_ger"
 msgstr "Mit der Dateiverwaltun_g öffnen"
 
 #: src/Resources.vala:682
-msgid "Open the selected photo's directory in the file manager"
-msgstr "Den Speicherort des ausgewählten Fotos in der Dateiverwaltung öffnen"
+msgid "Open the selected photo’s directory in the file manager"
+msgstr ""
+"Den Speicherordner des ausgewählten Fotos in der Dateiverwaltung öffnen"
 
 #: src/Resources.vala:685
 #, c-format
@@ -6473,6 +6611,9 @@ msgstr "T_itel anzeigen"
 msgid "seconds"
 msgstr "Sekunden"
 
+#~ msgid "Login"
+#~ msgstr "Anmelden"
+
 #~ msgid "Save Details..."
 #~ msgstr "Details speichern …"
 
diff --git a/po/es.gmo b/po/es.gmo
index 33634f6..da53c6a 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 6f38f69..2a78542 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6559 +1,6912 @@
-# po/shotwell-core/shotwell.pot
-# PO message string template file for Shotwell Core Components
-# Copyright 2016 Software Freedom Conservancy Inc.
-# See COPYING for license.
-#
-#
-# Translators:
-# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2011-2013
-# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2013
-# Alejandro Johnson C. <alejandrojohnson750@hotmail.com>, 2012
-# Andres <andreshko9@hotmail.com>, 2011
-# Claudio Rodrigo Pereyra Diaz <elsupergomez@gmail.com>, 2012-2013
-# Jorge González <aloriel@gmail.com>, 2011
-# Matias Menich <und34d@gmail.com>, 2012
-# Rodrigo Cares <rcares@gmail.com>, 2012-2013
-# verayin <vera@yorba.org>, 2011
-# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2011-2012
-# freddy  sequera <nemecis000@gmail.com>, 2011
-# Jorge González <aloriel@gmail.com>, 2011
-# lsbeeler <lucas@yorba.org>, 2011
-# Matias Menich <und34d@gmail.com>, 2012
-# Rodrigo Cares <rcares@gmail.com>, 2012
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2015, 2016.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-09-29 21:07+0000\n"
-"PO-Revision-Date: 2016-09-30 12:17+0200\n"
-"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
-"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
-"Language: es\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: Gtranslator 2.91.6\n"
-
-#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: misc/shotwell.appdata.xml.in:9
-msgid "Popular photo manager"
-msgstr "Gestor de fotos popular"
-
-#: misc/shotwell.appdata.xml.in:11
-msgid ""
-"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
-"desktop. It allows you to import photos from your camera or disk, organize "
-"them by date and subject matter, even ratings. It also offers basic photo "
-"editing, like crop, red-eye correction, color adjustments, and straighten. "
-"Shotwell's non-destructive photo editor does not alter your master photos, "
-"making it easy to experiment and correct errors."
-msgstr ""
-"Shotwell es un organizador de fotos fácil de usar, diseñado para el "
-"escritorio GNOME. Le permite importar fotos de su cámara o disco, "
-"organizarlas por fecha y asunto o por puntuación. También ofree edición "
-"básica, como recortar, eliminar ojos rojos, ajustes de color y enderezar. El "
-"editor no destructivo de Shotwell no altera las fotos originales, haciendo "
-"que sea más fácil experimentar y corregir errores."
-
-#: misc/shotwell.appdata.xml.in:18
-msgid ""
-"When ready, Shotwell can upload your photos to various web sites, such as "
-"Facebook, Flickr, Picasa (Google Plus), and more."
-msgstr ""
-"Cuando esté preparado, Shotwell puede subir sus fotos a varios sitios web, "
-"tales como Facebook, Flickr, Picasa (Google Plus) y más"
-
-#: misc/shotwell.appdata.xml.in:22
-msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
-msgstr "Shotwell soporta JPEG, PNG, TIFF, y varios formatos de archivos RAW."
-
-#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "Gestor de fotos"
-
-#: misc/shotwell.desktop.in.in:6
-msgid "Organize your photos"
-msgstr "Organice sus fotos"
-
-#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: misc/shotwell.desktop.in.in:8
-msgid ""
-"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
-"organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
-"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
-msgstr ""
-"álbum;cámara;cámaras;recortar;editar;mejorar;exportar;galería;imagen;"
-"imágenes;importar;organizar;foto;fotográfos;fotos;fotografía;imprimir;"
-"publicar;rotar;compartir;etiquetas;vídeo;facebook;flickr;picasa;youtube;"
-"piwigo;"
-
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
-msgid "shotwell"
-msgstr "shotwell"
-
-#: misc/shotwell-viewer.desktop.in.in:4
-msgid "Shotwell Viewer"
-msgstr "Visor de fotos Shotwell"
-
-#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "Visor de fotos"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:6
-msgid "authentication token"
-msgstr "testigo de autenticación"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:7
-msgid "Yandex-Fotki authentication token, if logged in."
-msgstr "Testigo de autenticación en Yandex-Fotki, si ha iniciado sesión."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:14
-msgid "Token"
-msgstr "Testigo"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:15
-msgid "The token to access tumblr"
-msgstr "El testigo para acceder a Tumblr"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:20
-msgid "Secret token"
-msgstr "Testigo secreto"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:21
-msgid "The secret token to sign oauth requests"
-msgstr "El testigo secreto para firmar peticiones oauth"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:416
-msgid "default size"
-msgstr "tamaño predeterminado"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:27
-msgid ""
-"A numeric code representing the default size for photos uploaded to Tumblr"
-msgstr ""
-"Un código numérico que representa el tamaño predeterminado de las fotos "
-"subidas a Tumblr"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:32
-msgid "default blog"
-msgstr "blog prederminado"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:33
-msgid "The name of the default blog of the user, if any"
-msgstr "El nombre del blog predeterminado del usuario, si existe"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:40
-msgid "Rajce URL"
-msgstr "URL de Rajce"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:41
-msgid "URL of the Rajce server."
-msgstr "URL del servidor Rajce."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:384
-#: misc/org.yorba.shotwell.gschema.xml:442
-#: misc/org.yorba.shotwell.gschema.xml:498
-msgid "username"
-msgstr "nombre de usuario"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:47
-msgid "Rajce username, if logged in."
-msgstr "Nombre de usuario de Rajce, si ha iniciado sesión."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:52
-msgid "token"
-msgstr "testigo"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:53
-msgid "user token, if remembered."
-msgstr "testigo de usuario, si se recuerda."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:460
-msgid "last category"
-msgstr "última categoría"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:59
-msgid "The last selected Rajce category."
-msgstr "La última categoría de Rajce seleccionada."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:472
-msgid "last photo size"
-msgstr "último tamaño de foto"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:65
-msgid ""
-"A numeric code representing the last photo size preset used when publishing "
-"to Rajce."
-msgstr ""
-"Un código numérico que representa el último tamaño de foto predefinido usado "
-"para publicar en Rajce."
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:70
-msgid "remember"
-msgstr "recordar"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:71
-msgid "If true, remember last login."
-msgstr "Si es cierto, recordar el último inicio de sesión"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:76
-msgid "hide album"
-msgstr "ocultar álbum"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:77
-msgid "If true, hide the newly created Rajce album."
-msgstr ""
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:82
-msgid "open album in web browser"
-msgstr "abrir álbum en el navegador"
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:83
-msgid ""
-"If true, open target album in the web browser just after uploading photos"
-msgstr ""
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:364
-#: misc/org.yorba.shotwell.gschema.xml:402
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:478
-#: misc/org.yorba.shotwell.gschema.xml:522
-msgid "remove sensitive info from uploads"
-msgstr ""
-
-#: misc/org.yorba.shotwell-extras.gschema.xml:89
-msgid ""
-"Whether images being uploaded to Rajce should have their metadata removed "
-"first"
-msgstr ""
-"Indica si se deben eliminar los metadatos antes de subir las imágenes a Rajce"
-
-#: misc/org.yorba.shotwell.gschema.xml:22
-msgid "display basic properties"
-msgstr "mostrar propiedades básicas"
-
-#: misc/org.yorba.shotwell.gschema.xml:23
-msgid "True if the basic properties pane is to be displayed, false otherwise."
-msgstr ""
-"Cierto si se muestra el panel de propiedades básicas, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:28
-msgid "display extended properties"
-msgstr "mostrar propiedades extendidas"
-
-#: misc/org.yorba.shotwell.gschema.xml:29
-msgid ""
-"True if the extended properties window is to be displayed, false otherwise."
-msgstr ""
-"Cierto si se muestra la ventana de propiedades ampliadas, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:34
-msgid "display sidebar"
-msgstr "mostrar barra lateral"
-
-#: misc/org.yorba.shotwell.gschema.xml:35
-msgid "True if the sidebar is to be displayed, false otherwise."
-msgstr "Cierto si se debe mostrar la barra lateral, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:40
-#| msgid "display sidebar"
-msgid "display toolbar"
-msgstr "mostrar barra de herramientas"
-
-#: misc/org.yorba.shotwell.gschema.xml:41
-#| msgid "True if the sidebar is to be displayed, false otherwise."
-msgid "True if the bottom toolbar is to be displayed, false otherwise."
-msgstr ""
-"Cierto si se debe mostrar la barra de herramientas inferior, falso en otro "
-"caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:46
-msgid "display search bar"
-msgstr "mostrar barra de búsqueda"
-
-#: misc/org.yorba.shotwell.gschema.xml:47
-msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
-msgstr ""
-"Cierto si se muestra la barra de herramientas de buscar/filtrar, falso en "
-"otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:52
-msgid "display photo titles"
-msgstr "mostrar títulos de las fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:53
-msgid ""
-"True if photo titles are to be displayed beneath thumbnails in collection "
-"views, false otherwise."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:58
-msgid "display photo comments"
-msgstr "mostrar comentarios de las fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:59
-msgid ""
-"True if photo comments are to be displayed beneath thumbnails in collection "
-"views, false otherwise."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:64
-msgid "display event comments"
-msgstr "mostrar comentarios del evento"
-
-#: misc/org.yorba.shotwell.gschema.xml:65
-msgid ""
-"True if event comments are to be displayed beneath thumbnails in event "
-"views, false otherwise."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:70
-msgid "display photo tags"
-msgstr "mostrar etiquetas de las fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:71
-msgid ""
-"True if photo tags are to be listed beneath thumbnails in collection views, "
-"false otherwise."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:76
-msgid "display photo ratings"
-msgstr "mostrar puntuación de las fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:77
-msgid ""
-"True if a photo's rating should be displayed as overlaid trinket, false "
-"otherwise."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:82
-msgid "rating filter level"
-msgstr "nivel de filtrado de puntuación"
-
-#: misc/org.yorba.shotwell.gschema.xml:83
-msgid ""
-"Determines how to filter photos based on their ratings. 1: Rejected or "
-"better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
-"or better, 6: Four or better, 7: Five or better."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:88
-msgid "sort events ascending"
-msgstr "ordenar eventos ascendentemente"
-
-#: misc/org.yorba.shotwell.gschema.xml:89
-msgid "True if events should be sorted ascending, false if descending."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:94
-msgid "sort library photos ascending"
-msgstr "ordenar fotos de la biblioteca ascendentemente"
-
-#: misc/org.yorba.shotwell.gschema.xml:95
-msgid "True if library photos should be sorted ascending, false if descending."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:100
-msgid "sort library photos criteria"
-msgstr "criterio de ordenación de fotos en la biblioteca"
-
-#: misc/org.yorba.shotwell.gschema.xml:101
-msgid ""
-"A numeric code that specifies the sort criteria for photos in library views."
-msgstr ""
-"Un código numérico que representa el criterio de ordenación de las fotos el "
-"vistas de biblioteca."
-
-#: misc/org.yorba.shotwell.gschema.xml:106
-msgid "sort event photos ascending"
-msgstr "ordenar fotos de eventos ascendentemente"
-
-#: misc/org.yorba.shotwell.gschema.xml:107
-msgid "True if event photos should be sorted ascending, false if descending."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:112
-msgid "sort event photos criteria"
-msgstr "criterio de ordenación de las fotos de eventos"
-
-#: misc/org.yorba.shotwell.gschema.xml:113
-msgid "Specifies the sort criteria for event photos."
-msgstr "Especifica el criterio de ordenación de las fotos de eventos."
-
-#: misc/org.yorba.shotwell.gschema.xml:118
-msgid "use 24 hour time"
-msgstr "usar formato de 24 horas"
-
-#: misc/org.yorba.shotwell.gschema.xml:119
-msgid ""
-"True if should display times with a 24 hour clock, false if times should use "
-"AM/PM notation."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:124
-msgid "keep relative time between photos"
-msgstr "mantener el tiempo relativo entre fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:125
-msgid ""
-"True if when adjusting time/date of photos, relative time should be "
-"maintained. False if all photos should be set to the same time."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:130
-msgid "modify original photo files"
-msgstr "modificar archivos de fotos originales"
-
-#: misc/org.yorba.shotwell.gschema.xml:131
-msgid ""
-"True if when adjusting time/date of photos, the original files should be "
-"modified as well. False if changes are made only in the database."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:136
-msgid "show welcome dialog on startup"
-msgstr "mostrar diálogo de bienvenida al inicio"
-
-#: misc/org.yorba.shotwell.gschema.xml:137
-msgid ""
-"True if, when on startup, a welcome dialog should be shown. False if it "
-"should not be shown."
-msgstr ""
-"Cierto si se debe mostrar un diálogo de bienvenida al inicio. Falso si no se "
-"debe mostrar."
-
-#: misc/org.yorba.shotwell.gschema.xml:142
-msgid "sidebar position"
-msgstr "posición de la barra lateral"
-
-#: misc/org.yorba.shotwell.gschema.xml:143
-msgid "The width, in pixels, of the sidebar"
-msgstr "La anchura en píxeles de la barra lateral"
-
-#: misc/org.yorba.shotwell.gschema.xml:148
-msgid "photo thumbnail scale"
-msgstr "escala de la miniatura de la foto"
-
-#: misc/org.yorba.shotwell.gschema.xml:149
-msgid "The scale of photo thumbnails, ranging from 72 to 360."
-msgstr "La escala de las miniaturas de las fotos, en un rango de 72 a 360."
-
-#: misc/org.yorba.shotwell.gschema.xml:154
-msgid "pin toolbar state"
-msgstr "estado de anclaje de la barra de herramientas"
-
-#: misc/org.yorba.shotwell.gschema.xml:155
-msgid "Pin toolbar in fullscreen, or not."
-msgstr "Anclar o no la barra de herramientas en modo a pantalla completa."
-
-#: misc/org.yorba.shotwell.gschema.xml:160
-msgid "background color"
-msgstr "color de fondo"
-
-#: misc/org.yorba.shotwell.gschema.xml:161
-msgid "A grayscale color for use as the background color."
-msgstr "La escala de color que usar como color de fondo."
-
-#: misc/org.yorba.shotwell.gschema.xml:166
-msgid "Selection state of \"hide photos\" option"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:167
-msgid ""
-"Last used selection state of the \"hide photos already imported\" option in "
-"the import page."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:174
-msgid "delay"
-msgstr "retardo"
-
-#: misc/org.yorba.shotwell.gschema.xml:175
-msgid "Delay (in seconds) between photos in the slideshow."
-msgstr "Retardo (en segundos) entre fotos en la presentación de diapositivas."
-
-#: misc/org.yorba.shotwell.gschema.xml:180
-msgid "transition delay"
-msgstr "retraso de la transición"
-
-#: misc/org.yorba.shotwell.gschema.xml:181
-msgid ""
-"The time (in seconds) that a transition runs between photos in a slideshow"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:186
-msgid "transition effect id"
-msgstr "ID del efecto de transición"
-
-#: misc/org.yorba.shotwell.gschema.xml:187
-msgid ""
-"The name of the transition effect that will be used between photos when "
-"running a slideshow"
-msgstr ""
-"El nombre del efecto de transición que se usará entre fotos al hacer una "
-"presentación"
-
-#: misc/org.yorba.shotwell.gschema.xml:192
-msgid "Show title"
-msgstr "Mostrar título"
-
-#: misc/org.yorba.shotwell.gschema.xml:193
-msgid "Whether to show the title of a photo during the slideshow"
-msgstr ""
-"Indica si se debe mostrar el título de una foto durante la presentación de "
-"diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:200
-msgid "maximize library window"
-msgstr "maximizar ventana de biblioteca"
-
-#: misc/org.yorba.shotwell.gschema.xml:201
-msgid "True if library application is maximized, false otherwise."
-msgstr ""
-"Cierto si la aplicación de biblioteca está maximizada, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:206
-msgid "width of library window"
-msgstr "anchura de la ventana de biblioteca"
-
-#: misc/org.yorba.shotwell.gschema.xml:207
-msgid "The last recorded width of the library application window."
-msgstr ""
-"La última anchura guardada de la ventana de la aplicación de biblioteca."
-
-#: misc/org.yorba.shotwell.gschema.xml:212
-msgid "height of library window"
-msgstr "altura de la ventana de biblioteca"
-
-#: misc/org.yorba.shotwell.gschema.xml:213
-msgid "The last recorded height of the library application window."
-msgstr ""
-"La última altura guardada de la ventana de la aplicación de biblioteca."
-
-#: misc/org.yorba.shotwell.gschema.xml:218
-msgid "maximize direct-edit window"
-msgstr "maximizar ventana de edición directa"
-
-#: misc/org.yorba.shotwell.gschema.xml:219
-msgid "True if direct-edit application is maximized, false otherwise."
-msgstr ""
-"Cierto si la ventana de edición directa está maximizada, falso en otro caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:224
-msgid "width of direct-edit window"
-msgstr "anchura de la ventana de edición directa"
-
-#: misc/org.yorba.shotwell.gschema.xml:225
-msgid "The last recorded width of the direct-edit application window."
-msgstr "La última anchura guardada de la ventana de edición directa."
-
-#: misc/org.yorba.shotwell.gschema.xml:230
-msgid "height of direct-edit window"
-msgstr "altura de la ventana de edición directa"
-
-#: misc/org.yorba.shotwell.gschema.xml:231
-msgid "The last recorded height of the direct-edit application window."
-msgstr "La última altura guardada de la ventana de edición directa."
-
-#: misc/org.yorba.shotwell.gschema.xml:236
-msgid "sidebar divider position"
-msgstr "posición del divisor de la barra lateral"
-
-#: misc/org.yorba.shotwell.gschema.xml:237
-msgid ""
-"The last recorded position of the divider between the sidebar and view in "
-"library application window."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:244
-msgid "import directory"
-msgstr "importar carpeta"
-
-#: misc/org.yorba.shotwell.gschema.xml:245
-msgid "Directory in which imported photo files are placed."
-msgstr "Carpeta en la que se guardan los archivos de fotos importadas."
-
-#: misc/org.yorba.shotwell.gschema.xml:250
-msgid "watch library directory for new files"
-msgstr "vigilar carpeta de biblioteca en busca de archivos nuevos"
-
-#: misc/org.yorba.shotwell.gschema.xml:251
-msgid ""
-"If true, files added to the library directory are automatically imported."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:256
-msgid "write metadata to master files"
-msgstr "escribir metadatos en archivos maestros"
-
-#: misc/org.yorba.shotwell.gschema.xml:257
-msgid ""
-"If true, changes to metadata (tags, titles, etc.) are written to the master "
-"photo file."
-msgstr ""
-"Si es cierto, los cambios en los metadatos (etiquetas, títulos, etc.) se "
-"escriben al archivo de foto maestro."
-
-#: misc/org.yorba.shotwell.gschema.xml:262
-msgid "use lowercase filenames"
-msgstr "usar nombres de archivos en minúscula"
-
-#: misc/org.yorba.shotwell.gschema.xml:263
-msgid ""
-"If true, Shotwell will convert all filenames to lowercase when importing "
-"photo files"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:268
-msgid "directory pattern"
-msgstr "patrón de carpetas"
-
-#: misc/org.yorba.shotwell.gschema.xml:269
-msgid ""
-"A string encoding a naming pattern that will be used to name photo "
-"directories on import."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:274
-msgid "directory pattern custom"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:275
-msgid ""
-"A string encoding a custom naming pattern that will be used to name photo "
-"directories on import."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:280
-msgid "RAW developer default"
-msgstr "desarrollador RAW predeterminado"
-
-#: misc/org.yorba.shotwell.gschema.xml:281
-msgid "Default option for which RAW developer Shotwell will use."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:288
-msgid "Most-recently-used crop aspect ratio menu choice."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:289
-msgid "A numeric code representing the last crop menu choice the user made."
-msgstr ""
-"Un código numérico que representa la última elección del menú de recortar "
-"que hizo el usuario."
-
-#: misc/org.yorba.shotwell.gschema.xml:293
-msgid "Most-recently-used crop custom aspect ratio's numerator."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:294
-msgid ""
-"A nonzero, positive integer representing the width part of the last custom "
-"crop ratio the user entered."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:298
-msgid "Most-recently-used crop custom aspect ratio's denominator."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:299
-msgid ""
-"A nonzero, positive integer representing the height part of the last custom "
-"crop ratio the user entered."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:306
-msgid "external photo editor"
-msgstr "dditor de fotos externo"
-
-#: misc/org.yorba.shotwell.gschema.xml:307
-msgid "External application used to edit photos."
-msgstr "Aplicación externa usada para editar fotos."
-
-#: misc/org.yorba.shotwell.gschema.xml:312
-msgid "external raw editor"
-msgstr "editor RAW externo"
-
-#: misc/org.yorba.shotwell.gschema.xml:313
-msgid "External application used to edit RAW photos."
-msgstr "Aplicación externa usada para editar fotos RAW."
-
-#: misc/org.yorba.shotwell.gschema.xml:320
-msgid "last used publishing service"
-msgstr "último servicio de publicación usado"
-
-#: misc/org.yorba.shotwell.gschema.xml:321
-#: misc/org.yorba.shotwell.gschema.xml:327
-msgid ""
-"A numeric code representing the last service to which photos were published"
-msgstr ""
-"Un código numérico que representa el último servicio en el que se publicaron "
-"las fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:326
-msgid "default publishing service"
-msgstr "servicio de publicación predeterminado"
-
-#: misc/org.yorba.shotwell.gschema.xml:340
-msgid "access token"
-msgstr "testigo de acceso"
-
-#: misc/org.yorba.shotwell.gschema.xml:341
-msgid "Facebook OAuth token for the currently logged in session, if any"
-msgstr ""
-"Testigo OAuth de Facebook para el usuario que ha iniciado sesión "
-"actualmente, si existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:346
-msgid "user i.d."
-msgstr "ID de usuario"
-
-#: misc/org.yorba.shotwell.gschema.xml:347
-msgid "Facebook user i.d. for the currently logged in user, if any"
-msgstr ""
-"ID del usuario de Facebook que ha iniciado sesión actualmente, si existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:352
-msgid "user name"
-msgstr "nombre de usuario"
-
-#: misc/org.yorba.shotwell.gschema.xml:353
-msgid "The name of the currently logged in Facebook user, if any"
-msgstr ""
-"El nombre del usuario que actualmente ha iniciado sesión en Facebook, si "
-"existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:358
-#: misc/org.yorba.shotwell.gschema.xml:390
-msgid "default size code"
-msgstr "código de tamaño predeterminado"
-
-#: misc/org.yorba.shotwell.gschema.xml:359
-msgid ""
-"A numeric code representing the default size for photos published to Facebook"
-msgstr ""
-"Un código numérico que representa el tamaño predeterminado de las fotos "
-"publicadas en Facebook"
-
-#: misc/org.yorba.shotwell.gschema.xml:365
-msgid ""
-"Whether images being uploaded to Facebook should have their metadata removed "
-"first"
-msgstr ""
-"Indica si se deben eliminar los metadatos antes de subir las imágenes a "
-"Facebook"
-
-#: misc/org.yorba.shotwell.gschema.xml:372
-msgid "OAuth Access Phase Token"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:373
-msgid "The authorization token for the currently logged in Flickr user, if any"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:378
-msgid "OAuth Access Phase Token Secret"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:379
-msgid ""
-"The cryptographic secret used to sign requests against the authorization "
-"token for the currently logged in Flickr user, if any"
-msgstr ""
-"El secreto criptográfico usado para firmar peticiones con el testigo de "
-"autenticación para el usuario que actualmente ha iniciado sesión en Flickr, "
-"si existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:385
-msgid "The user name of the currently logged in Flickr user, if any"
-msgstr ""
-"El nombre del usuario que actualmente ha iniciado sesión en Flickr, si existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:391
-msgid ""
-"A numeric code representing the default size for photos published to Flickr"
-msgstr ""
-"Un código numérico que representa el tamaño predeterminado de las fotos "
-"publicadas en Flickr"
-
-#: misc/org.yorba.shotwell.gschema.xml:396
-msgid "default visibility"
-msgstr "visibilidad predeterminada"
-
-#: misc/org.yorba.shotwell.gschema.xml:397
-msgid ""
-"A numeric code representing the default visibility for photos published to "
-"Flickr"
-msgstr ""
-"Un código numérico que representa la visibilidad predeterminada de las fotos "
-"publicadas en Flickr"
-
-#: misc/org.yorba.shotwell.gschema.xml:403
-msgid ""
-"Whether images being uploaded to Flickr should have their metadata removed "
-"first"
-msgstr ""
-"Indica si se deben eliminar los metadatos antes de subir las imágenes a "
-"Flicrk"
-
-#: misc/org.yorba.shotwell.gschema.xml:410
-#: misc/org.yorba.shotwell.gschema.xml:542
-msgid "refresh token"
-msgstr "actualizar testigo"
-
-#: misc/org.yorba.shotwell.gschema.xml:411
-msgid ""
-"The OAuth token used to refresh the Picasa Web Albums session for the "
-"currently logged in user, if any."
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:417
-msgid ""
-"A numeric code representing the default size for photos uploaded to Picasa "
-"Web Albums"
-msgstr ""
-"Un código numérico que representa el tamaño predeterminado de las fotos "
-"subidas a álbumes web Picasa"
-
-#: misc/org.yorba.shotwell.gschema.xml:422
-#: misc/org.yorba.shotwell.gschema.xml:516
-msgid "last album"
-msgstr "último álbum"
-
-#: misc/org.yorba.shotwell.gschema.xml:423
-#: misc/org.yorba.shotwell.gschema.xml:517
-msgid "The name of the last album the user published photos to, if any"
-msgstr ""
-"El nombre del último álbum en el que el usuario publicó fotos, si existe"
-
-#: misc/org.yorba.shotwell.gschema.xml:429
-msgid ""
-"Whether images being uploaded to Picasa should have their metadata removed "
-"first"
-msgstr ""
-"Indica si se deben eliminar los metadatos antes de subir las imágenes a "
-"Picasa"
-
-#: misc/org.yorba.shotwell.gschema.xml:436
-#| msgid "Piwigio URL"
-msgid "Piwigo URL"
-msgstr "URL de Pigwio"
-
-#: misc/org.yorba.shotwell.gschema.xml:437
-msgid "URL of the Piwigo server."
-msgstr "URL del servidor Piwigo."
-
-#: misc/org.yorba.shotwell.gschema.xml:443
-msgid "Piwigo username, if logged in."
-msgstr "Nombre de usuario de Piwigo, si ha iniciado sesión."
-
-#: misc/org.yorba.shotwell.gschema.xml:448
-msgid "password"
-msgstr "contraseña"
-
-#: misc/org.yorba.shotwell.gschema.xml:449
-msgid "Piwigo password, if logged in."
-msgstr "Contraseña de Piwigo, si ha iniciado sesión."
-
-#: misc/org.yorba.shotwell.gschema.xml:454
-msgid "remember password"
-msgstr "recortar contraseña"
-
-#: misc/org.yorba.shotwell.gschema.xml:455
-msgid "If true, remember the Piwigo password."
-msgstr "Si es cierto, recordar la contraseña de Piwigo."
-
-#: misc/org.yorba.shotwell.gschema.xml:461
-msgid "The last selected Piwigo category."
-msgstr "La última categoría de Piwigo seleccionada."
-
-#: misc/org.yorba.shotwell.gschema.xml:466
-msgid "last permission level"
-msgstr "último nivel de permisos"
-
-#: misc/org.yorba.shotwell.gschema.xml:467
-msgid "The last chosen Piwigo permission level."
-msgstr "El último nivel de privilegios elegido el Piwigo."
-
-#: misc/org.yorba.shotwell.gschema.xml:473
-msgid ""
-"A numeric code representing the last photo size preset used when publishing "
-"to Piwigo."
-msgstr ""
-"Un código numérico que representa el último tamaño de foto predefinido usado "
-"para publicar en Piwigo."
-
-#: misc/org.yorba.shotwell.gschema.xml:479
-msgid ""
-"Whether images being uploaded to Piwigo should have their metadata removed "
-"first"
-msgstr ""
-"Indica si se deben eliminar los metadatos antes de subir las imágenes a "
-"Piwigo"
-
-#: misc/org.yorba.shotwell.gschema.xml:484
-msgid ""
-"if title is set and comment unset, use title as comment for uploads to Piwigo"
-msgstr ""
-"si se definió el titulo pero no un comentario, usar el título como "
-"comentario para las subidas a Piwigo"
-
-#: misc/org.yorba.shotwell.gschema.xml:485
-msgid ""
-"Whether images being uploaded to Piwigo should have their comment set from "
-"the title if title is set and comment unset"
-msgstr ""
-"Indica si las imágenes que se vayan a subir a Piwigo deben tener un "
-"comentario a partir del título, si tiene, y no tiene comentario"
-
-#: misc/org.yorba.shotwell.gschema.xml:490
-msgid "do not upload tags when uploading to Piwigo"
-msgstr "no subir etiquetas al subir a Piwigo"
-
-#: misc/org.yorba.shotwell.gschema.xml:491
-msgid ""
-"Whether images being uploaded to Piwigo should have their tags removed on "
-"upload, such that these tags will not appear on the remote Piwigo server."
-msgstr ""
-"Indica si se deben eliminar las etiquetas antes de subir las imágenes a "
-"Piwigo, para que esas etiquetas no aparezcan en el servidor remoto de Piwigo."
-
-#: misc/org.yorba.shotwell.gschema.xml:499
-msgid "Gallery3 username"
-msgstr "Nombre de usuario de Gallery3"
-
-#: misc/org.yorba.shotwell.gschema.xml:504
-msgid "API key"
-msgstr "Clave de la API"
-
-#: misc/org.yorba.shotwell.gschema.xml:505
-msgid "Gallery3 API key"
-msgstr "Clave de la API de Gallery3"
-
-#: misc/org.yorba.shotwell.gschema.xml:510
-msgid "URL"
-msgstr "URL"
-
-#: misc/org.yorba.shotwell.gschema.xml:511
-msgid "Gallery3 site URL"
-msgstr "URL de Gallery3"
-
-#: misc/org.yorba.shotwell.gschema.xml:523
-msgid ""
-"Indicates whether images being uploaded to Gallery3 should have their "
-"metadata removed first"
-msgstr ""
-"Indica si se deben eliminar los metadatos antes de subir las imágenes a "
-"Gallery3"
-
-#: misc/org.yorba.shotwell.gschema.xml:528
-msgid "scaling constraint of uploaded picture"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:529
-msgid "The scaling constraint ID of the picture to be uploaded"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:534
-msgid "pixels of the major axis uploaded picture"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:535
-msgid ""
-"The pixels of the major axis of the picture to be uploaded; used only if "
-"scaling-constraint-id is an appropriate value"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:543
-msgid ""
-"The OAuth token used to refresh the YouTube session for the currently logged "
-"in user, if any."
-msgstr ""
-"El testigo OAuth usado para actualizar la sesión de Youtube para el usuario "
-"que ha iniciado sesión actualmente, si existe."
-
-#: misc/org.yorba.shotwell.gschema.xml:550
-msgid "last used import service"
-msgstr "último servicio de importación usado"
-
-#: misc/org.yorba.shotwell.gschema.xml:551
-msgid ""
-"A numeric code representing the last service from which photos were imported"
-msgstr ""
-"Un código numérico que representa el último servicio del que se importaron "
-"fotos"
-
-#: misc/org.yorba.shotwell.gschema.xml:558
-msgid "interpreter state cookie"
-msgstr "cookie de estado del intérprete"
-
-#: misc/org.yorba.shotwell.gschema.xml:559
-msgid ""
-"A numeric code that captures the state of the GStreamer plug-in environment"
-msgstr ""
-"Un código numérico que captura el estado del entorno del complemento "
-"GStreamer"
-
-#: misc/org.yorba.shotwell.gschema.xml:566
-msgid "content layout mode"
-msgstr "modo de distribución del contenido"
-
-#: misc/org.yorba.shotwell.gschema.xml:567
-msgid ""
-"A numeric code that describes how photos are laid out on the page during "
-"printing"
-msgstr ""
-"Un código numérico que representa cuántas fotos aparecen en la página al "
-"imprimir"
-
-#: misc/org.yorba.shotwell.gschema.xml:572
-msgid "content ppi"
-msgstr "ppp del contenido"
-
-#: misc/org.yorba.shotwell.gschema.xml:573
-msgid "The number of pixels per inch (ppi) sent to the printer during printing"
-msgstr ""
-"El número de píxeles por pulgada (ppp) enviado a la impresora al imprimir"
-
-#: misc/org.yorba.shotwell.gschema.xml:578
-msgid "content width"
-msgstr "anchura del contenido"
-
-#: misc/org.yorba.shotwell.gschema.xml:579
-msgid "The width of the printed emulsion on the page when printing"
-msgstr "La anchura de la emulsión impresa en la página al imprimir"
-
-#: misc/org.yorba.shotwell.gschema.xml:584
-msgid "content height"
-msgstr "altura del contenido"
-
-#: misc/org.yorba.shotwell.gschema.xml:585
-msgid "The height of the printed emulsion on the page when printing"
-msgstr "La altura de la emulsión impresa en la página al imprimir"
-
-#: misc/org.yorba.shotwell.gschema.xml:590
-msgid "content units"
-msgstr "unidades del contenido"
-
-#: misc/org.yorba.shotwell.gschema.xml:591
-msgid ""
-"A numeric code representing unit of measure (inches or centimeters) used "
-"when printing"
-msgstr ""
-"Un código numérico que representa la unidad de medida (pulgadas o "
-"centímetros) usada al imprimir"
-
-#: misc/org.yorba.shotwell.gschema.xml:596
-msgid "images per page code"
-msgstr "código de imágenes por página"
-
-#: misc/org.yorba.shotwell.gschema.xml:597
-msgid ""
-"A numeric code representing the currently selected images per page mode used "
-"when printing"
-msgstr ""
-"Un código numérico que representa el modo usado de imágenes por página "
-"seleccionadas actualmente al imprimir"
-
-#: misc/org.yorba.shotwell.gschema.xml:602
-msgid "size selection"
-msgstr "tamaño de la selección"
-
-#: misc/org.yorba.shotwell.gschema.xml:603
-msgid ""
-"The index of the current print size in a pre-defined list of standard sizes"
-msgstr ""
-"El índice del tamaño de impresión actual en una lista de tamaños estándar "
-"predefinidos"
-
-#: misc/org.yorba.shotwell.gschema.xml:608
-msgid "match aspect ratio"
-msgstr "coincidir con relación de aspecto"
-
-#: misc/org.yorba.shotwell.gschema.xml:609
-msgid ""
-"Determines whether custom print sizes must match the aspect ratio of the "
-"original photo"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:614
-msgid "print titles"
-msgstr "imprimir títulos"
-
-#: misc/org.yorba.shotwell.gschema.xml:615
-msgid ""
-"True if the title of a photo should be printed when the photo is printed, "
-"false otherwise."
-msgstr ""
-"Cierto si se debe imprimir el título de la foto al imprimirla, falso en otro "
-"caso."
-
-#: misc/org.yorba.shotwell.gschema.xml:620
-msgid "titles font"
-msgstr "tipografía de los títulos"
-
-#: misc/org.yorba.shotwell.gschema.xml:621
-msgid "The name of the font to use for photo titles when they are printed."
-msgstr "El nombre de la tipografía que usar cuando se imprimen los títulos."
-
-#: misc/org.yorba.shotwell.gschema.xml:632
-msgid "enable facebook publishing plugin"
-msgstr "activar complemento de publicación en Facebook"
-
-#: misc/org.yorba.shotwell.gschema.xml:633
-msgid "True if the Facebook publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Facebook está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:638
-msgid "enable flickr publishing plugin"
-msgstr "activar complemento de publicación en Flickr"
-
-#: misc/org.yorba.shotwell.gschema.xml:639
-msgid "True if the Flickr publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Flickr está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:644
-msgid "enable picasa publishing plugin"
-msgstr "activar complemento de publicación en Picasa"
-
-#: misc/org.yorba.shotwell.gschema.xml:645
-msgid ""
-"True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en álbumes web Picasa está activado, "
-"falso en otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:650
-msgid "enable youtube publishing plugin"
-msgstr "activar complemento de publicación en Youtube"
-
-#: misc/org.yorba.shotwell.gschema.xml:651
-msgid "True if the YouTube publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Youtube está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:656
-msgid "enable piwigo publishing plugin"
-msgstr "activar complemento de publicación en Piwigo"
-
-#: misc/org.yorba.shotwell.gschema.xml:657
-msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Piwigo está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:662
-msgid "enable yandex publishing plugin"
-msgstr "activar complemento de publicación en Yandex"
-
-#: misc/org.yorba.shotwell.gschema.xml:663
-msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Yandex.Fotki está activado, falso "
-"en otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:668
-msgid "enable tumblr publishing plugin"
-msgstr "activar complemento de publicación en Tumblr"
-
-#: misc/org.yorba.shotwell.gschema.xml:669
-msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Tumblr está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:674
-msgid "enable rajce publishing plugin"
-msgstr "activar complemento de publicación en Rajce"
-
-#: misc/org.yorba.shotwell.gschema.xml:675
-msgid "True if the Rajce publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Rajce está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:680
-msgid "enable gallery3 publishing plugin"
-msgstr "activar complemento de publicación en Gallery3"
-
-#: misc/org.yorba.shotwell.gschema.xml:681
-msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de publicación en Gallery3 está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:686
-msgid "enable F-Spot import plugin"
-msgstr "activar complemento de importación de F-Spot"
-
-#: misc/org.yorba.shotwell.gschema.xml:687
-msgid "True if the F-Spot import plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de importación de F-Spot está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:692
-msgid "enable slideshow crumble transition"
-msgstr "activar transición de desmenuzado del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:693
-msgid ""
-"True if the Crumble slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición de desmoronar está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:698
-msgid "enable slideshow fade transition"
-msgstr "activar transición de fundido del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:699
-msgid ""
-"True if the Fade slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición de fundido está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:704
-#: misc/org.yorba.shotwell.gschema.xml:728
-msgid "enable slideshow slide transition"
-msgstr "activar transición lateral del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:705
-msgid ""
-"True if the Slide slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición lateral está activado, falso en otro "
-"caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:710
-msgid "enable slideshow clock transition"
-msgstr "activar transición de reloj del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:711
-msgid ""
-"True if the Clock slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición de reloj está activado, falso en otro "
-"caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:716
-#: misc/org.yorba.shotwell.gschema.xml:722
-msgid "enable slideshow circle transition"
-msgstr "activar transición circular del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:717
-msgid ""
-"True if the Circle slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición circular está activado, falso en otro "
-"caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:723
-msgid ""
-"True if the Circles slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición en círculos está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:729
-msgid ""
-"True if the Blinds slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-
-#: misc/org.yorba.shotwell.gschema.xml:734
-msgid "enable slideshow squares transition"
-msgstr "activar transición de cuadros del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:735
-msgid ""
-"True if the Squares slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición de cuadros está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:740
-msgid "enable slideshow stripes transition"
-msgstr "activar transición de bandas del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:741
-msgid ""
-"True if the Stripes slideshow transition plugin is enabled, false otherwise"
-msgstr ""
-"Cierto si el complemento de transición de bandas está activado, falso en "
-"otro caso"
-
-#: misc/org.yorba.shotwell.gschema.xml:746
-msgid "enable slideshow chess transition"
-msgstr "activar transición de ajedrez del pase de diapositivas"
-
-#: misc/org.yorba.shotwell.gschema.xml:747
-msgid ""
-"True if the Chess-Board slideshow transition plugin is enabled, false "
-"otherwise"
-msgstr ""
-"Cierto si el complemento de transición de tablero de ajedrez está activado, "
-"falso en otro caso"
-
-#: plugins/common/Resources.vala:12
-msgid "Visit the Shotwell home page"
-msgstr "Visite la página web de Shotwell"
-
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:679
-msgid "translator-credits"
-msgstr ""
-"Daniel Mustieles <daniel.mustieles@gmail.com>, 2014-2016\n"
-"Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2011–2013\n"
-"Claudio Rodrigo Pereyra Diaz <elsupergomez@fedoraproject.org>, 2011–2013\n"
-"monkey.libre <monkey.libre@gmail.com>\n"
-"Jorge González <jorgegonz@svn.gnome.org>, 2011\n"
-"José Luis Navarro <jlnavarro111@gmail.com>"
-
-#: plugins/common/RESTSupport.vala:451
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
-msgid "A temporary file needed for publishing is unavailable"
-msgstr "No está disponible un archivo temporal necesario para la publicación"
-
-#: plugins/common/RESTSupport.vala:1157
-msgid ""
-"You have already logged in and out of a Google service during this Shotwell "
-"session.\n"
-"\n"
-"To continue publishing to Google services, quit and restart Shotwell, then "
-"try publishing again."
-msgstr ""
-"Ya ha iniciado y cerrado sesión de Google durante esta sesión de Shotwell.\n"
-"Para seguir publicando en servicios de Google, cierre y reinicie Shotwell, e "
-"intente publicar de nuevo."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:36
-#: plugins/shotwell-publishing/FacebookPublishing.vala:33
-#: plugins/shotwell-publishing/FlickrPublishing.vala:33
-#: plugins/shotwell-publishing/PicasaPublishing.vala:33
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
-#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:58
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select a library to import, either by selecting one of the existing "
-"libraries found by Shotwell or by selecting an alternative F-Spot database "
-"file."
-msgstr ""
-"Bienvenido/a al servicio de importación de F-Spot.\n"
-"\n"
-"Seleccione una colección a importar, ya sea eligiendo una de las colecciones "
-"existentes encontradas por Shotwell o eligiendo un archivo de base de datos "
-"de F-Spot alternativo."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:60
-msgid ""
-"Welcome to the F-Spot library import service.\n"
-"\n"
-"Please select an F-Spot database file."
-msgstr ""
-"Bienvenido/a al servicio de importación de colecciones de F-Spot.\n"
-"\n"
-"Seleccione un archivo de colección de F-Spot."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:62
-msgid "Manually select an F-Spot database file to import:"
-msgstr "Seleccionar manualmente una colección de F-Spot para importar:"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:64
-msgid ""
-"Cannot open the selected F-Spot database file: the file does not exist or is "
-"not an F-Spot database"
-msgstr ""
-"No se puede abrir el archivo seleccionado de F-Spot: el archivo no existe o "
-"no es un archivo de colección de F-Spot"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:66
-msgid ""
-"Cannot open the selected F-Spot database file: this version of the F-Spot "
-"database is not supported by Shotwell"
-msgstr ""
-"No se puede abrir el archivo seleccionado de F-Spot: esta versión de F-Spot "
-"no está soportada por Shotwell"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:68
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading tags table"
-msgstr ""
-"No se puede abrir el archivo seleccionado de F-Spot: error al leer la tabla "
-"de etiquetas"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:70
-msgid ""
-"Cannot read the selected F-Spot database file: error while reading photos "
-"table"
-msgstr ""
-"No se puede abrir el archivo seleccionado de F-Spot: error al leer la tabla "
-"de fotos"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:72
-#, c-format
-msgid ""
-"Shotwell has found %d photos in the F-Spot library and is currently "
-"importing them. Duplicates will be automatically detected and removed.\n"
-"\n"
-"You can close this dialog and start using Shotwell while the import is "
-"taking place in the background."
-msgstr ""
-"Shotwell encontró %d fotos en la colección de F-Spot y está importándolas "
-"ahora. Los duplicados se detectarán y eliminarán automáticamente.\n"
-"\n"
-"Puede cerrar este diálogo y empezar a utilizar Shotwell mientras el proceso "
-"de importación ocurre en segundo plano."
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:86
-#, c-format
-msgid "F-Spot library: %s"
-msgstr "Colección de F-Spot: %s"
-
-#: plugins/shotwell-data-imports/FSpotImporter.vala:424
-msgid "Preparing to import"
-msgstr "Preparando para importar"
-
-#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
-msgid "Core Data Import Services"
-msgstr "Servicios de importación de datos de núcleo"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "A_trás"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1627
-msgid "_Login"
-msgstr "Iniciar _sesión"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
-msgid "_Gallery3 URL:"
-msgstr "URL de _Gallery3:"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
-msgid "_User name:"
-msgstr "_Nombre de usuario:"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
-msgid "_Password:"
-msgstr "_Contraseña:"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
-msgid "API _Key:"
-msgstr "_Clave de la API:"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
-msgid "or"
-msgstr "o"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:115
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-msgid "_Logout"
-msgstr "Cerrar _sesión"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:129
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
-msgid "_Publish"
-msgstr "_Publicar"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11
-msgid "A _new album"
-msgstr "Un álbum _nuevo"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "Un álbum _existente"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
-msgid "_Remove location, tag and camera-identifying data before uploading"
-msgstr "_Quitar ubicación, etiqueta y datos de la cámara antes de subir"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
-msgid "Scaling constraint:"
-msgstr "Re_stricción de escalado:"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
-msgid "pixels"
-msgstr "píxeles"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
-#: src/Dimensions.vala:17
-msgid "Original size"
-msgstr "Tamaño original"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
-#: src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Anchura o altura"
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
-msgid "Gallery3 publishing module"
-msgstr "Módulo de publicación Gallery3"
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:114
-msgid ""
-"You are not currently logged into your Gallery.\n"
-"\n"
-"You must have already signed up for a Gallery3 account to complete the login "
-"process."
-msgstr ""
-"No ha iniciado sesión en su Galería.\n"
-"\n"
-"Debe haber registrado una cuenta de Gallery3 para poder iniciar sesión."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:117
-msgid "Shotwell default directory"
-msgstr "Carpeta predeterminada de Shotwell"
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
-#, c-format
-msgid ""
-"\n"
-"\n"
-"The file \"%s\" may not be supported by or may be too large for this "
-"instance of Gallery3."
-msgstr ""
-"\n"
-"\n"
-"El archivo «%s» puede no estar soportado o ser demasiado grande para esta "
-"instancia de Gallery3."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
-msgid ""
-"\n"
-"Note that Gallery3 only supports the video types that Flowplayer does."
-msgstr ""
-"\n"
-"Tenga en cuenta que Gallery3 sólo soporta los mismos tipos de vídeo que "
-"Flowplayer."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
-#, c-format
-msgid ""
-"A file required for publishing is unavailable. Publishing to %s can't "
-"continue."
-msgstr ""
-"No está disponible un archivo necesario para publicar. La publicación en %s "
-"no puede continuar."
-
-#. populate any widgets whose contents are
-#. programmatically-generated
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
-#, c-format
-msgid "Publishing to %s as %s."
-msgstr "Publicar en %s como %s."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
-msgid ""
-"Enter the URL for your Gallery3 site and the username and password (or API "
-"key) for your Gallery3 account."
-msgstr ""
-"Escriba el URL de su sitio Gallery3, así como el nombre de usuario y "
-"contraseña (o clave API) para su cuenta de Gallery3."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
-msgid ""
-"The username and password or API key were incorrect. To try again, re-enter "
-"your username and password below."
-msgstr ""
-"El nombre de usuario y la contraseña o la clave de la API no son correctos. "
-"Para interntarlo de nuevo, vuelva a introducir su nombre y su contraseña a "
-"continuación."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
-#| msgid ""
-#| "The URL entered does not appear to be the main directory of a Gallery3 "
-#| "instance. Please make sure you typed it correctly and it does not have "
-#| "any trailing components (e.g, index.php)."
-msgid ""
-"The URL entered does not appear to be the main directory of a Gallery3 "
-"instance. Please make sure you typed it correctly and it does not have any "
-"trailing components (e.g., index.php)."
-msgstr ""
-"El URL introducido no parece ser la carpeta principal de una instancia de "
-"Gallery3. Asegúrese de que lo ha escrito correctamente y que no tiene "
-"elementos adicionales (ej. index.php)."
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
-msgid "Unrecognized User"
-msgstr "Usuario no reconocido"
-
-#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
-msgid " Site Not Found"
-msgstr " Sitio no encontrado"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:49
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:49
-msgid "_Email address"
-msgstr "Dirección de correo _electrónico"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:59
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:59
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:73
-msgid "_Password"
-msgstr "_Contraseña"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:103
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
-msgid "_Remember"
-msgstr "_Recordar"
-
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:125
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151
-msgid "Login"
-msgstr "Iniciar sesión"
-
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
-msgid "An _existing album:"
-msgstr "Un álbum _existente:"
-
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:52
-msgid "A _new album named:"
-msgstr "Un álbum _nuevo:"
-
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1005
-msgid "_Hide album"
-msgstr "_Ocultar álbum"
-
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-msgid "Open target _album in browser"
-msgstr "Abrir ál_bum objetivo en el navegador"
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-msgid "Copyright (C) 2013 rajce.net"
-msgstr "Copyright (C) 2013 rajce.net"
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
-msgid "An error message occurred when publishing to Rajce. Please try again."
-msgstr "Ocurrió un error al publicar en Rajce. Inténtelo de nuevo."
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
-msgid "Enter email and password associated with your Rajce account."
-msgstr ""
-"Escriba el nombre de usuario y contraseña asociados con su cuenta de Rajce."
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
-msgid "Invalid email and/or password. Please try again"
-msgstr "Usuario y/o contraseña no válidos. Inténtelo de nuevo"
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
-msgid "Invalid User Email or Password"
-msgstr "Nombre de usuario o contraseña no válidos"
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1012
-#, c-format
-msgid "You are logged into Rajce as %s."
-msgstr "Ha iniciado sesión en Rajce como %s."
-
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
-#: plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:24
-msgid "Photos will appear in:"
-msgstr "Las fotos aparecen en:"
-
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
-msgid "Shotwell Extra Publishing Services"
-msgstr "Servicios de publicación adicionales de Shotwell"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
-msgid "Blogs:"
-msgstr "Blogs:"
-
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
-msgid "Photo _size:"
-msgstr "_Tamaño de la foto:"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Copyright 2012 BJA Electronics"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1230
-msgid "500 x 375 pixels"
-msgstr "500 × 375 píxeles"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1231
-msgid "1024 x 768 pixels"
-msgstr "1024 × 768 píxeles"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 x 853 pixels"
-msgstr "1280 × 853 píxeles"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
-#, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgstr "«%s» no es una respuesta válida a una solicitud de autenticación OAuth"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
-msgstr ""
-"TumblrPublisher: start( ): no puede iniciar, este publicador no es "
-"reiniciable."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-msgid "Enter the username and password associated with your Tumblr account."
-msgstr ""
-"Escriba el nombre de usuario y contraseña asociados con su cuenta de Tumblr."
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:992
-msgid "Username and/or password invalid. Please try again"
-msgstr "Usuario y/o contraseña no válidos. Inténtelo de nuevo"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1026
-msgid "Invalid User Name or Password"
-msgstr "Nombre de usuario o contraseña no válidos"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:634
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:752
-#, c-format
-msgid "Could not load UI: %s"
-msgstr "No se pudo cargar la IU: %s"
-
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:734
-#, c-format
-msgid ""
-"You are logged into Tumblr as %s.\n"
-"\n"
-msgstr ""
-"Ha iniciado sesión en Tumblr como %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
-msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:25
-msgid "Visit the Yandex.Fotki web site"
-msgstr "Visitar el sitio web de Yandex.Fotki"
-
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:658
-msgid "You are not currently logged into Yandex.Fotki."
-msgstr "Actualmente no ha iniciado sesión en Yandex.Fotki."
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
-msgid "_Albums (or write new):"
-msgstr "Álb_umes (o crear uno nuevo):"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
-msgid "Access _type:"
-msgstr "_Tipo de acceso:"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
-msgid "Disable _comments"
-msgstr "Desactivar _comentarios"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
-msgid "_Forbid downloading original photo"
-msgstr "_No permitir la descarga de la foto original"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-msgid "Public"
-msgstr "Público"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1194
-msgid "Friends"
-msgstr "Amigos"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
-msgstr "Privado"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
-msgid "Publish to an e_xisting album:"
-msgstr "Publicar en un álbum e_xistente:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57
-msgid "Create a _new album named:"
-msgstr "Crear un álbum _nuevo llamado:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1034
-msgid "Upload _size:"
-msgstr "_Tamaño de subida:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139
-msgid "Videos and new photo albums _visible to:"
-msgstr "Vídeos y álbumes de fotos nuevos _visibles para:"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:226
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
-msgstr "_Quitar ubicación, cámara y otra información antes de subir"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:62
-#: plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1114
-msgid "Shotwell Connect"
-msgstr "Shotwell Connect"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:64
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don't yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
-msgstr ""
-"Actualmente no ha iniciado sesión en Facebook.\n"
-"\n"
-"Si no tiene una cuenta de Facebook, puede crear una durante el proceso de "
-"inicio de sesión. Durante el inicio de sesión, Shotwell Connect le puede "
-"pedir permiso para subir fotos y publicar en su muro. Estos permisos son "
-"necesarios para que Shotwell Connect funcione."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:66
-msgid ""
-"You have already logged in and out of Facebook during this Shotwell "
-"session.\n"
-"To continue publishing to Facebook, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Ya ha iniciado y cerrado sesión de Facebook durante esta sesión de "
-"Shotwell.\n"
-"Para seguir publicando en Facebook, cierre y reinicie Shotwell, e intente "
-"publicar de nuevo."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:87
-msgid "Standard (720 pixels)"
-msgstr "Estándar (720 píxeles)"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:90
-msgid "Large (2048 pixels)"
-msgstr "Grande (2048 píxeles)"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:255
-msgid "Testing connection to Facebook..."
-msgstr "Comprobando la conexión a Facebook…"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-msgid "Creating album..."
-msgstr "Creando el álbum…"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
-msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can't "
-"continue."
-msgstr ""
-"No está disponible un archivo necesario para publicar. La publicación en "
-"Facebook no puede continuar."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1032
-#, c-format
-msgid ""
-"You are logged into Facebook as %s.\n"
-"\n"
-msgstr ""
-"Ha iniciado sesión en Facebook como %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1033
-msgid "Where would you like to publish the selected photos?"
-msgstr "¿Dónde quiere publicar las fotos seleccionadas?"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1193
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
-msgid "Just me"
-msgstr "Solo yo"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1218
-msgid "Everyone"
-msgstr "Todos"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Introduzca el número de confirmación que aparece en su navegador web después "
-"de iniciar sesión en Flickr."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Número de autorización:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83
-#: src/Dialogs.vala:132
-msgid "Con_tinue"
-msgstr "Con_tinuar"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:60
-msgid ""
-"You are not currently logged into Flickr.\n"
-"\n"
-"Click Login to log into Flickr in your Web browser.  You will have to "
-"authorize Shotwell Connect to link to your Flickr account."
-msgstr ""
-"Actualmente no ha iniciado sesión en Flickr.\n"
-"\n"
-"Pulse Iniciar sesión para identificarse en Flickr en su navegador web.  "
-"Tendrá que autorizar a Shotwell Connect para que se enlace a su cuenta de "
-"Flickr."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:62
-msgid ""
-"You have already logged in and out of Flickr during this Shotwell session.\n"
-"To continue publishing to Flickr, quit and restart Shotwell, then try "
-"publishing again."
-msgstr ""
-"Ya ha iniciado y cerrado sesión de Flickr durante esta sesión de Shotwell.\n"
-"Para seguir publicando en Flickr, cierre y reinicie Shotwell, e intente "
-"publicar de nuevo."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login..."
-msgstr "Preparándose para iniciar sesión…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:594
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
-"continue."
-msgstr ""
-"No está disponible un archivo necesario para publicar. La publicación en "
-"Flickr no puede continuar."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Comprobando la autorización…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
-#, c-format
-msgid ""
-"You are logged into Flickr as %s.\n"
-"\n"
-msgstr ""
-"Ha iniciado sesión en Flickr como %s.\n"
-"\n"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
-#, c-format
-msgid ""
-"Your free Flickr account limits how much data you can upload per month.\n"
-"This month you have %d megabyte remaining in your upload quota."
-msgid_plural ""
-"Your free Flickr account limits how much data you can upload per month.\n"
-"This month you have %d megabytes remaining in your upload quota."
-msgstr[0] ""
-"Su cuenta gratuita de Flickr limita la cantidad de datos que puede subir al "
-"mes.\n"
-"Este mes tiene %d megabyte restantes de su límite de subida."
-msgstr[1] ""
-"Su cuenta gratuita de Flickr limita la cantidad de datos que puede subir al "
-"mes.\n"
-"Este mes tiene %d megabytes restantes de su límite de sudiba."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
-msgid "Your Flickr Pro account entitles you to unlimited uploads."
-msgstr "Su cuenta de Flickr Pro le permite subidas ilimitadas."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
-msgid "Photos _visible to:"
-msgstr "Fotos _visibles para:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
-msgid "Videos _visible to:"
-msgstr "Vídeos _visibles para:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
-msgid "Photos and videos _visible to:"
-msgstr "Fotos y vídeos _visibles para:"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
-msgid "Friends & family only"
-msgstr "Solo amigos y familia"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
-msgid "Family only"
-msgstr "Solo familia"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
-msgid "Friends only"
-msgstr "Solo amigos"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1232
-msgid "2048 x 1536 pixels"
-msgstr "2048 × 1536 píxeles"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1233
-msgid "4096 x 3072 pixels"
-msgstr "4096 × 3072 píxeles"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
-msgid "L_ist album in public gallery"
-msgstr "_Listar álbum en la galería pública"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
-msgid "Photo _size preset:"
-msgstr "_Tamaño de foto predefinido:"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"Actualmente no ha iniciado sesión en Álbumes web de Picasa.\n"
-"\n"
-"Pulse Iniciar sesión para identificarse en Álbumes web de Picasa en su "
-"navegador web. Tendrá que autorizar a Shotwell Connect para que se enlace a "
-"su cuenta de Álbumes web de Picasa."
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
-msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can't "
-"continue."
-msgstr ""
-"No está disponible un archivo necesario para publicar. La publicación en "
-"Picasa no puede continuar."
-
-#. populate any widgets whose contents are programmatically-generated.
-#: plugins/shotwell-publishing/PicasaPublishing.vala:659
-#, c-format
-msgid "You are logged into Picasa Web Albums as %s."
-msgstr "Ha iniciado sesión en Álbumes web de Picasa como %s."
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
-msgid "Videos will appear in:"
-msgstr "Los vídeos aparecerán en:"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Pequeño (640 × 480 píxeles)"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Mediano (1024 × 768 píxeles)"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Recomendado (1600 × 1200 píxeles)"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 × 1536 píxeles)"
-
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:756
-msgid "Original Size"
-msgstr "Tamaño original"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
-msgid "_URL of your Piwigo photo library"
-msgstr "_URL de su biblioteca de fotos Piwigo"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
-msgid "User _name"
-msgstr "_Nombre de usuario"
-
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
-msgid "_Remember Password"
-msgstr "_Recortar contraseña"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
-msgid "An _existing category:"
-msgstr "Una categoría _existente:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
-msgid "Photos will be _visible by:"
-msgstr "Las fotos serán _visibles para:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
-msgid "Photo size:"
-msgstr "Tamaño de la foto:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
-msgid "within category:"
-msgstr "en la categoría:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
-msgid "Album comment:"
-msgstr "Comentario del álbum:"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr ""
-"_Si se definió el titulo pero no un comentario, usar el título como "
-"comentario"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
-msgid "_Do no upload tags"
-msgstr "_No cargar las etiquetas"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
-msgid "Logout"
-msgstr "Salir"
-
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291
-#: src/Resources.vala:295
-msgid "Publish"
-msgstr "Publicar"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:747
-#, c-format
-msgid "Creating album %s..."
-msgstr "Creando el álbum %s…"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:920
-msgid "An error message occurred when publishing to Piwigo. Please try again."
-msgstr "Ocurrió un error al publicar en Piwigo. Inténtelo de nuevo."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:990
-msgid ""
-"Enter the URL of your Piwigo photo library as well as the username and "
-"password associated with your Piwigo account for that library."
-msgstr ""
-"Escriba el URL de su colección fotográfica de Piwigo, así como el nombre de "
-"usuario y contraseña asociados a esa colección."
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:991
-msgid ""
-"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
-"entered"
-msgstr ""
-"Shotwell no puede contactar su colección de fotos de Piwigo. Compruebe la "
-"URL que ha introducido"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1021
-msgid "Invalid URL"
-msgstr "URL no válida"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1219
-msgid "Admins, Family, Friends, Contacts"
-msgstr "Administradores, Familia, Amigos, Contactos"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1220
-msgid "Admins, Family, Friends"
-msgstr "Administradores, Familia, Amigos"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1221
-msgid "Admins, Family"
-msgstr "Administradores, Familia"
-
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1222
-msgid "Admins"
-msgstr "Administradores"
-
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Servicios de publicación"
-
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
-msgid "Video privacy _setting:"
-msgstr "Co_nfiguración de privacidad de vídeos:"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:58
-msgid ""
-"You are not currently logged into YouTube.\n"
-"\n"
-"You must have already signed up for a Google account and set it up for use "
-"with YouTube to continue. You can set up most accounts by using your browser "
-"to log into the YouTube site at least once."
-msgstr ""
-"No ha iniciado sesión en YouTube.\n"
-"\n"
-"Debe haber registrado una cuenta de Google y configurarla para utilizarla "
-"con YouTube para continuar. Puede configurar la mayoría de cuentas mediante "
-"el uso de su navegador para registrarse en el sitio de YouTube al menos una "
-"vez."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:363
-msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
-"continue."
-msgstr ""
-"No está disponible un archivo necesario para publicar. La publicación en "
-"Youtube no puede continuar."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
-#, c-format
-msgid "You are logged into YouTube as %s."
-msgstr "Ha iniciado sesión en YouTube como %s."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Los vídeos aparecerán en «%s»"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
-msgid "Public listed"
-msgstr "Listado públicamente"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Public unlisted"
-msgstr "No listado públicamente"
-
-#: plugins/shotwell-transitions/BlindsEffect.vala:20
-msgid "Blinds"
-msgstr "Persianas"
-
-#: plugins/shotwell-transitions/ChessEffect.vala:20
-msgid "Chess"
-msgstr "Ajedrez"
-
-#: plugins/shotwell-transitions/CircleEffect.vala:20
-msgid "Circle"
-msgstr "Círculo"
-
-#: plugins/shotwell-transitions/CirclesEffect.vala:20
-msgid "Circles"
-msgstr "Círculos"
-
-#: plugins/shotwell-transitions/ClockEffect.vala:20
-msgid "Clock"
-msgstr "Reloj"
-
-#: plugins/shotwell-transitions/CrumbleEffect.vala:20
-msgid "Crumble"
-msgstr "Desmoronar"
-
-#: plugins/shotwell-transitions/FadeEffect.vala:20
-msgid "Fade"
-msgstr "Desvanecer"
-
-#: plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "Transiciones de pase de diapositivas"
-
-#: plugins/shotwell-transitions/shotwell-transitions.vala:76
-msgid ""
-"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
-"Inc."
-msgstr ""
-"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
-"Inc."
-
-#: plugins/shotwell-transitions/SlideEffect.vala:20
-msgid "Slide"
-msgstr "Diapositiva"
-
-#: plugins/shotwell-transitions/SquaresEffect.vala:20
-msgid "Squares"
-msgstr "Cuadrados"
-
-#: plugins/shotwell-transitions/StripesEffect.vala:20
-msgid "Stripes"
-msgstr "Franjas"
-
-#: src/AppDirs.vala:64 src/AppDirs.vala:115
-#, c-format
-msgid "Unable to create cache directory %s: %s"
-msgstr "No se pudo crear la carpeta de caché %s: %s"
-
-#: src/AppDirs.vala:74 src/AppDirs.vala:104
-#, c-format
-msgid "Unable to create data directory %s: %s"
-msgstr "No se puede crear la carpeta de datos %s: %s"
-
-#. If XDG yarfed, use ~/Pictures
-#: src/AppDirs.vala:168
-msgid "Pictures"
-msgstr "Imágenes"
-
-#: src/AppDirs.vala:206
-#, c-format
-msgid "Unable to create temporary directory %s: %s"
-msgstr "No se puede crear la carpeta temporal %s: %s"
-
-#: src/AppDirs.vala:223 src/AppDirs.vala:254
-#, c-format
-msgid "Unable to create data subdirectory %s: %s"
-msgstr "No se puede crear la subcarpeta de datos %s: %s"
-
-#: src/AppDirs.vala:236
-#, c-format
-msgid "Could not make directory %s writable"
-msgstr "No se pudo hacer que la carpeta %s sea escribible"
-
-#: src/AppDirs.vala:239
-#, c-format
-msgid "Could not make directory %s writable: %s"
-msgstr "No se pudo hacer escribible la carpeta %s: %s"
-
-#: src/AppWindow.vala:54
-msgid "Pin Toolbar"
-msgstr "Anclar la barra de herramientas"
-
-#: src/AppWindow.vala:55
-msgid "Pin the toolbar open"
-msgstr "Mantener abierta la barra de herramientas"
-
-#: src/AppWindow.vala:60
-msgid "Leave fullscreen"
-msgstr "Salir de pantalla completa"
-
-#: src/AppWindow.vala:499
-msgid "_Contents"
-msgstr "_Contenido"
-
-#: src/AppWindow.vala:504
-msgid "_Frequently Asked Questions"
-msgstr "_Preguntas más frecuentes"
-
-#: src/AppWindow.vala:509
-#| msgid "_Report a Problem..."
-msgid "_Report a Problem…"
-msgstr "_Informar de un problema…"
-
-#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
-#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1425 src/Dialogs.vala:1448
-#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#: src/AppWindow.vala:656
-#, c-format
-msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
-"continue.\n"
-"\n"
-"%s"
-msgstr ""
-"Ocurrió un error grave al acceder a la colección de Shotwell. Shotwell no "
-"puede continuar.\n"
-"\n"
-"%s"
-
-#: src/AppWindow.vala:676
-msgid "Visit the Shotwell web site"
-msgstr "Visite la página web de Shotwell"
-
-#: src/AppWindow.vala:688
-#, c-format
-msgid "Unable to display help: %s"
-msgstr "No se puede mostrar la ayuda: %s"
-
-#: src/AppWindow.vala:696
-#, c-format
-msgid "Unable to navigate to bug database: %s"
-msgstr "No se pudo navegar en la base de datos de errores: %s"
-
-#: src/AppWindow.vala:704
-#, c-format
-msgid "Unable to display FAQ: %s"
-msgstr "No se pudieron mostrar las P+F: %s"
-
-#: src/BatchImport.vala:26
-msgid "Success"
-msgstr "Éxito"
-
-#: src/BatchImport.vala:29
-msgid "File error"
-msgstr "Error de archivo"
-
-#: src/BatchImport.vala:32
-msgid "Unable to decode file"
-msgstr "No se puede descodificar el archivo"
-
-#: src/BatchImport.vala:35
-msgid "Database error"
-msgstr "Error de la base de datos"
-
-#: src/BatchImport.vala:38
-msgid "User aborted import"
-msgstr "El usuario canceló la importación"
-
-#: src/BatchImport.vala:41
-msgid "Not a file"
-msgstr "No es un archivo"
-
-#: src/BatchImport.vala:44
-msgid "File already exists in database"
-msgstr "El archivo ya existe en la base de datos"
-
-#: src/BatchImport.vala:47
-msgid "Unsupported file format"
-msgstr "Formato de archivo no soportado"
-
-#: src/BatchImport.vala:50
-msgid "Not an image file"
-msgstr "No es un archivo de imagen"
-
-#: src/BatchImport.vala:53
-msgid "Disk failure"
-msgstr "Fallo en disco"
-
-#: src/BatchImport.vala:56
-msgid "Disk full"
-msgstr "Disco lleno"
-
-#: src/BatchImport.vala:59
-msgid "Camera error"
-msgstr "Error de la cámara"
-
-#: src/BatchImport.vala:62
-msgid "File write error"
-msgstr "Error de escritura en el archivo"
-
-#: src/BatchImport.vala:65
-msgid "Corrupt image file"
-msgstr "Archivo de imagen dañado"
-
-#: src/BatchImport.vala:68
-#, c-format
-msgid "Imported failed (%d)"
-msgstr "Fallo de importación (%d)"
-
-#: src/camera/Branch.vala:85
-msgid "Cameras"
-msgstr "Cámaras"
-
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/MediaPage.vala:440
-#: src/photos/RawSupport.vala:303
-msgid "Camera"
-msgstr "Cámara"
-
-#: src/camera/ImportPage.vala:311 src/Properties.vala:227
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
-
-#: src/camera/ImportPage.vala:458
-msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
-msgstr ""
-"No se puede desmontar la cámara. Intente desmontar la cámara desde el gestor "
-"de archivos."
-
-#. hide duplicates checkbox
-#: src/camera/ImportPage.vala:775
-msgid "Hide photos already imported"
-msgstr "Ocultar fotos ya importadas"
-
-#: src/camera/ImportPage.vala:776
-msgid "Only display photos that have not been imported"
-msgstr "Mostrar solo las fotos que no han sido importadas"
-
-#: src/camera/ImportPage.vala:842
-msgid "The camera seems to be empty. No photos/videos found to import"
-msgstr ""
-
-#: src/camera/ImportPage.vala:846
-#| msgid "No photos/videos found"
-msgid "No new photos/videos found on camera"
-msgstr "No se encontraron fotos/vídeos en la cámara"
-
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451
-msgid "_Titles"
-msgstr "_Títulos"
-
-#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452
-msgid "Display the title of each photo"
-msgstr "Mostrar el título de cada foto"
-
-#: src/camera/ImportPage.vala:885
-msgid "Import _Selected"
-msgstr "Importar _seleccionadas"
-
-#: src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr "Importar las fotos seleccionadas a su colección"
-
-#: src/camera/ImportPage.vala:891
-msgid "Import _All"
-msgstr "Importar tod_as"
-
-#: src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr "Importar todas las fotos a su colección"
-
-#. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1013
-msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
-msgstr ""
-"Shotwell necesita desmontar la cámara del sistema de archivos con el fin de "
-"acceder a ella. ¿Continuar?"
-
-#: src/camera/ImportPage.vala:1019
-msgid "_Unmount"
-msgstr "_Desmontar"
-
-#: src/camera/ImportPage.vala:1024
-msgid "Please unmount the camera."
-msgstr "Desmonte la cámara."
-
-#: src/camera/ImportPage.vala:1029
-msgid ""
-"The camera is locked by another application.  Shotwell can only access the "
-"camera when it's unlocked.  Please close any other application using the "
-"camera and try again."
-msgstr ""
-"La cámara está bloqueada por otra aplicación. Shotwell solo puede acceder a "
-"la cámara cuando está desbloqueada. Cierre cualquier otra aplicación que "
-"esté utilizando la cámara e inténtelo de nuevo."
-
-#: src/camera/ImportPage.vala:1039
-msgid "Please close any other application using the camera."
-msgstr "Cierre cualquier otra aplicación que esté utilizando la cámara."
-
-#: src/camera/ImportPage.vala:1044
-#, c-format
-msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
-msgstr ""
-"No se pueden obtener previsualizaciones de la cámara:\n"
-"%s"
-
-#: src/camera/ImportPage.vala:1061
-#| msgid "Unmounting..."
-msgid "Unmounting…"
-msgstr "Desmontando…"
-
-#: src/camera/ImportPage.vala:1152
-#| msgid "Starting import, please wait..."
-msgid "Starting import, please wait…"
-msgstr "Iniciando la importación, espere un momento…"
-
-#: src/camera/ImportPage.vala:1169
-msgid "Fetching photo information"
-msgstr "Obteniendo información de la foto"
-
-#: src/camera/ImportPage.vala:1527
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "Obteniendo previsualización para %s"
-
-#: src/camera/ImportPage.vala:1643
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "No se puede bloquear la cámara: %s"
-
-#: src/camera/ImportPage.vala:1728
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "¿Quiere eliminar esta foto de la cámara?"
-msgstr[1] "¿Quiere eliminar estas %d fotos de la cámara?"
-
-#: src/camera/ImportPage.vala:1731
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "¿Quiere eliminar esta foto de la cámara?"
-msgstr[1] "¿Quiere eliminar estas %d fotos de la cámara?"
-
-#: src/camera/ImportPage.vala:1734
-#, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "¿Quiere eliminar esta foto/vídeo de la cámara?"
-msgstr[1] "¿Quiere eliminar estas %d fotos/vídeos de la cámara?"
-
-#: src/camera/ImportPage.vala:1737
-#, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "¿Eliminar este archivo de la cámara?"
-msgstr[1] "¿Eliminar estos %d archivos de la cámara?"
-
-#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1392
-msgid "_Keep"
-msgstr "_Mantener"
-
-#: src/camera/ImportPage.vala:1764
-msgid "Removing photos/videos from camera"
-msgstr "Eliminando fotos/vídeos de la cámara"
-
-#: src/camera/ImportPage.vala:1768
-#, c-format
-msgid "Unable to delete %d photo/video from the camera due to errors."
-msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
-msgstr[0] "No se puede eliminar %d foto/vídeo de la cámara, debido a errores."
-msgstr[1] ""
-"No se pueden eliminar %d fotos/vídeos de la cámara, debido a errores."
-
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635
-msgid "S_lideshow"
-msgstr "_Diapositivas"
-
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636
-msgid "Play a slideshow"
-msgstr "Iniciar un pase de diapositivas"
-
-#: src/CollectionPage.vala:456
-msgid "Export Photo/Video"
-msgstr "Exportar foto o vídeo"
-
-#: src/CollectionPage.vala:456
-msgid "Export Photos/Videos"
-msgstr "Exportar fotos/vídeos"
-
-#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209
-msgid "Export Photo"
-msgstr "Exportar foto"
-
-#: src/CollectionPage.vala:458 src/Dialogs.vala:88
-msgid "Export Photos"
-msgstr "Exportar fotos"
-
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Rotating"
-msgstr "Girando"
-
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
-msgid "Undoing Rotate"
-msgstr "Deshaciendo el giro"
-
-#: src/CollectionPage.vala:570
-msgid "Flipping Horizontally"
-msgstr "Volteando horizontalmente"
-
-#: src/CollectionPage.vala:571
-msgid "Undoing Flip Horizontally"
-msgstr "Deshaciendo volteo horizontal"
-
-#: src/CollectionPage.vala:580
-msgid "Flipping Vertically"
-msgstr "Volteando verticalmente"
-
-#: src/CollectionPage.vala:581
-msgid "Undoing Flip Vertically"
-msgstr "Deshaciendo volteo vertical"
-
-#: src/Commands.vala:737
-msgid "Reverting"
-msgstr "Revirtiendo"
-
-#: src/Commands.vala:737
-msgid "Undoing Revert"
-msgstr "Deshaciendo reversión"
-
-#: src/Commands.vala:781
-msgid "Enhancing"
-msgstr "Mejorando"
-
-#: src/Commands.vala:781
-msgid "Undoing Enhance"
-msgstr "Deshaciendo mejora"
-
-#: src/Commands.vala:857
-msgid "Applying Color Transformations"
-msgstr "Aplicando transformación de color"
-
-#: src/Commands.vala:857
-msgid "Undoing Color Transformations"
-msgstr "Deshaciendo transformación de color"
-
-#: src/Commands.vala:1007
-msgid "Creating New Event"
-msgstr "Creando un evento nuevo"
-
-#: src/Commands.vala:1008
-msgid "Removing Event"
-msgstr "Quitando el evento"
-
-#: src/Commands.vala:1017
-msgid "Moving Photos to New Event"
-msgstr "Moviendo fotos a un evento nuevo"
-
-#: src/Commands.vala:1018
-msgid "Setting Photos to Previous Event"
-msgstr "Estableciendo fotos al evento anterior"
-
-#: src/Commands.vala:1075
-msgid "Merging"
-msgstr "Combinando"
-
-#: src/Commands.vala:1076
-msgid "Unmerging"
-msgstr "Deshaciendo la combinación"
-
-#: src/Commands.vala:1085
-msgid "Duplicating photos"
-msgstr "Duplicando las fotos"
-
-#: src/Commands.vala:1085
-msgid "Removing duplicated photos"
-msgstr "Quitando las fotos duplicadas"
-
-#: src/Commands.vala:1108
-#, c-format
-msgid "Unable to duplicate one photo due to a file error"
-msgid_plural "Unable to duplicate %d photos due to file errors"
-msgstr[0] "No se puede duplicar una foto debido a un error de archivo"
-msgstr[1] "No se pueden duplicar %d fotos debido a errores de archivo"
-
-#: src/Commands.vala:1195
-msgid "Restoring previous rating"
-msgstr "Restaurar valoración anterior"
-
-#: src/Commands.vala:1205 src/Commands.vala:1206
-msgid "Increasing ratings"
-msgstr "Aumentando la valoración"
-
-#: src/Commands.vala:1205 src/Commands.vala:1206
-msgid "Decreasing ratings"
-msgstr "Disminuyendo la valoración"
-
-#: src/Commands.vala:1256
-msgid "Setting RAW developer"
-msgstr "Configurando el revelador RAW"
-
-#: src/Commands.vala:1256
-msgid "Restoring previous RAW developer"
-msgstr "Restaurando el revelador RAW anterior"
-
-#: src/Commands.vala:1257
-msgid "Set Developer"
-msgstr "Establecer revelador"
-
-#: src/Commands.vala:1347
-msgid "Original photo could not be adjusted."
-msgstr "No se pudo ajustar la foto original."
-
-#: src/Commands.vala:1368
-msgid "Adjusting Date and Time"
-msgstr "Ajustar fecha y hora"
-
-#: src/Commands.vala:1368
-msgid "Undoing Date and Time Adjustment"
-msgstr "Deshacer ajuste de fecha y hora"
-
-#: src/Commands.vala:1399
-msgid "One original photo could not be adjusted."
-msgid_plural "The following original photos could not be adjusted."
-msgstr[0] "No se pudo modificar una foto original."
-msgstr[1] "No se pudieron modificar las siguientes fotos originales."
-
-#: src/Commands.vala:1401 src/Commands.vala:1425
-msgid "Time Adjustment Error"
-msgstr "Error al ajustar la hora"
-
-#: src/Commands.vala:1423
-msgid "Time adjustments could not be undone on the following photo file."
-msgid_plural ""
-"Time adjustments could not be undone on the following photo files."
-msgstr[0] ""
-"El ajuste de la hora no se puede deshacer en el archivo de la foto siguiente."
-msgstr[1] ""
-"El ajuste de la hora no se puede deshacer en el archivo de la foto siguiente."
-
-#: src/Commands.vala:1637 src/Commands.vala:1660
-msgid "Create Tag"
-msgstr "Crear etiqueta"
-
-#: src/Commands.vala:1695
-#, c-format
-msgid "Move Tag \"%s\""
-msgstr "Mover etiqueta «%s»"
-
-#: src/Commands.vala:2347
-msgid "Move Photos to Trash"
-msgstr "Mover fotos a la papelera"
-
-#: src/Commands.vala:2347
-msgid "Restore Photos from Trash"
-msgstr "Restaurar fotos desde la papelera"
-
-#: src/Commands.vala:2348
-msgid "Move the photos to the Shotwell trash"
-msgstr "Mover las fotos a la papelera de Shotwell"
-
-#: src/Commands.vala:2348
-msgid "Restore the photos back to the Shotwell library"
-msgstr "Restaurar las fotos a la colección de Shotwell"
-
-#: src/Commands.vala:2367
-msgid "Moving Photos to Trash"
-msgstr "Mover fotos a la papelera"
-
-#: src/Commands.vala:2367
-msgid "Restoring Photos From Trash"
-msgstr "Restaurar fotos desde la papelera"
-
-#: src/Commands.vala:2453
-msgid "Flag selected photos"
-msgstr "Marcar las fotos seleccionadas"
-
-#: src/Commands.vala:2454
-msgid "Unflag selected photos"
-msgstr "Desmarcar las fotos seleccionadas"
-
-#: src/Commands.vala:2455
-msgid "Flagging selected photos"
-msgstr "Marcando las fotos seleccionadas"
-
-#: src/Commands.vala:2456
-msgid "Unflagging selected photos"
-msgstr "Desmarcando las fotos seleccionadas"
-
-#: src/Commands.vala:2463
-msgid "Flag"
-msgstr "Marcar"
-
-#: src/Commands.vala:2463
-msgid "Unflag"
-msgstr "Desmarcar"
-
-#. Send an empty job to the queue to mark the end of the import
-#: src/data_imports/DataImportsPluginHost.vala:65
-#: src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "Base de datos %s"
-
-#: src/data_imports/DataImportsPluginHost.vala:148
-#: src/data_imports/DataImportsPluginHost.vala:294
-#, c-format
-msgid "Importing from %s can't continue because an error occurred:"
-msgstr ""
-"La importación desde %s no puede continuar porque ha ocurrido un error:"
-
-#: src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-"Para intentar importar desde otro servicio, seleccione uno desde el menú "
-"anterior."
-
-#: src/data_imports/DataImportsUI.vala:10
-msgid ""
-"You do not have any data imports plugins enabled.\n"
-"\n"
-"In order to use the Import From Application functionality, you need to have "
-"at least one data imports plugin enabled. Plugins can be enabled in the "
-"Preferences dialog."
-msgstr ""
-"No tiene ningún complemento de importación de datos activado.\n"
-"\n"
-"Para utilizar la función Importar desde aplicación, necesita activar al "
-"menos un complemento de importación. Puede hacerlo en el cuadro de diálogo "
-"Preferencias."
-
-#: src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "Archivo de base de datos:"
-
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904
-msgid "_Import"
-msgstr "_Importar"
-
-#: src/data_imports/DataImportsUI.vala:220
-msgid "Import From Application"
-msgstr "Importar desde aplicación"
-
-#: src/data_imports/DataImportsUI.vala:221
-msgid "Import media _from:"
-msgstr "Importar medios _desde:"
-
-#: src/data_imports/DataImportsUI.vala:408
-#: src/publishing/PublishingUI.vala:507
-msgid "_Close"
-msgstr "_Cerrar"
-
-#: src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "Importaciones de datos"
-
-#: src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "No se puede abrir/crear base de datos de fotos %s: código de error %d"
-
-#: src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"No se pudo escribir el archivo de la base de datos de fotos:\n"
-"%s"
-
-#: src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Error al acceder al archivo de la base de datos:\n"
-"%s\n"
-"\n"
-"El error fue:\n"
-"%s"
-
-#: src/db/DatabaseTable.vala:88
-#, c-format
-msgid "Unable to restore photo database %s"
-msgstr "No se pudo restaurar la base de datos de fotos %s"
-
-#: src/DesktopIntegration.vala:121
-#, c-format
-msgid "Unable to launch Nautilus Send-To: %s"
-msgstr "No se puede abrir Nautilus Enviar a: %s"
-
-#: src/DesktopIntegration.vala:129
-msgid "Send To"
-msgstr "Enviar a"
-
-#: src/DesktopIntegration.vala:174
-#, c-format
-msgid "Unable to export background to %s: %s"
-msgstr "No se puede exportar el fondo de pantalla a %s: %s"
-
-#: src/DesktopIntegration.vala:311
-#, c-format
-msgid "Unable to prepare desktop slideshow: %s"
-msgstr "No se puede preparar el presentación de diapositivas de escritorio: %s"
-
-#: src/Dialogs.vala:16
-#, c-format
-msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
-msgstr[0] "Esto eliminará la etiqueta «%s» de una foto. ¿Continuar?"
-msgstr[1] "Esto eliminará la etiqueta «%s» de %d fotos. ¿Continuar?"
-
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1393
-#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409
-#: src/Resources.vala:674
-msgid "_Delete"
-msgstr "_Eliminar"
-
-#: src/Dialogs.vala:25
-#, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
-msgstr "Esto quitará la búsqueda guardada «%s». ¿Quiere continuar?"
-
-#: src/Dialogs.vala:36
-msgid ""
-"Switching developers will undo all changes you have made to this photo in "
-"Shotwell"
-msgid_plural ""
-"Switching developers will undo all changes you have made to these photos in "
-"Shotwell"
-msgstr[0] ""
-"Al cambiar de revelador se desharán todos los cambios que realizó a esta "
-"foto en Shotwell"
-msgstr[1] ""
-"Al cambiar de revelador se desharán todos los cambios que realizó a estas "
-"fotos en Shotwell"
-
-#: src/Dialogs.vala:40
-msgid "_Switch Developer"
-msgstr "_Cambiar de revelador"
-
-#: src/Dialogs.vala:59
-msgid "Export Video"
-msgstr "Exportar vídeo"
-
-#. Ticket #3023
-#. Attempt to replace the system error with something friendlier
-#. if we can't copy an image over for editing in an external tool.
-#. Did we fail because we can't write to this directory?
-#. Yes - display an alternate error message here.
-#: src/Dialogs.vala:116
-#, c-format
-msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
-"have permission to write to %s."
-msgstr ""
-"Shotwell no pudo crear un archivo para editar esta foto porque no tiene "
-"permiso para escribir en %s."
-
-#: src/Dialogs.vala:125
-msgid ""
-"Unable to export the following photo due to a file error.\n"
-"\n"
-msgstr "No se puede exportar la siguiente foto debido a un error de archivo.\n"
-
-#: src/Dialogs.vala:131
-msgid ""
-"\n"
-"\n"
-"Would you like to continue exporting?"
-msgstr ""
-"\n"
-"\n"
-"¿Quiere continuar la exportación?"
-
-#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
-#. aren't formats so much as they are operating modes that determine specific formats.
-#. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:148
-msgid "Unmodified"
-msgstr "Sin modificar"
-
-#: src/Dialogs.vala:149
-msgid "Current"
-msgstr "Actual"
-
-#. layout controls
-#: src/Dialogs.vala:216
-msgid "_Format:"
-msgstr "_Formato:"
-
-#: src/Dialogs.vala:219
-msgid "_Quality:"
-msgstr "_Calidad:"
-
-#: src/Dialogs.vala:222
-msgid "_Scaling constraint:"
-msgstr "Re_stricción de escala:"
-
-#: src/Dialogs.vala:225
-msgid "_Pixels:"
-msgstr "_Píxeles:"
-
-#: src/Dialogs.vala:228
-msgid "Export metadata"
-msgstr "Exportar metadatos"
-
-#: src/Dialogs.vala:462
-#| msgid "Save Details"
-msgid "Save Details…"
-msgstr "Guardar detalles…"
-
-#: src/Dialogs.vala:463
-msgid "Save Details"
-msgstr "Guardar detalles"
-
-#: src/Dialogs.vala:478
-#, c-format
-msgid "(and %d more)\n"
-msgstr "(y %d más)\n"
-
-#: src/Dialogs.vala:531
-msgid "Import Results Report"
-msgstr "Informe de resultados de importación"
-
-#: src/Dialogs.vala:535
-#, c-format
-msgid "Attempted to import %d file."
-msgid_plural "Attempted to import %d files."
-msgstr[0] "Se intentó importar %d archivo."
-msgstr[1] "Se intentaron importar %d archivos."
-
-#: src/Dialogs.vala:538
-#, c-format
-msgid "Of these, %d file was successfully imported."
-msgid_plural "Of these, %d files were successfully imported."
-msgstr[0] "De ellos, se importó %d archivo correctamente."
-msgstr[1] "De ellos, se importaron %d archivos correctamente."
-
-#.
-#. Duplicates
-#.
-#: src/Dialogs.vala:550
-msgid "Duplicate Photos/Videos Not Imported:"
-msgstr "Fotos/vídeos duplicados no importados:"
-
-#: src/Dialogs.vala:554
-msgid "duplicates existing media item"
-msgstr "duplica el elemento existente"
-
-#.
-#. Files Not Imported Due to Camera Errors
-#.
-#: src/Dialogs.vala:565
-msgid "Photos/Videos Not Imported Due to Camera Errors:"
-msgstr "Fotos/vídeos no importados debido a errores de cámara:"
-
-#: src/Dialogs.vala:568 src/Dialogs.vala:583 src/Dialogs.vala:598
-#: src/Dialogs.vala:614 src/Dialogs.vala:629 src/Dialogs.vala:643
-msgid "error message:"
-msgstr "mensaje de error:"
-
-#.
-#. Files Not Imported Because They Weren't Recognized as Photos or Videos
-#.
-#: src/Dialogs.vala:579
-msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
-msgstr "Archivos no importados porque no se reconocieron como fotos o vídeos:"
-
-#.
-#. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
-#.
-#: src/Dialogs.vala:594
-msgid ""
-"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
-"Understands:"
-msgstr ""
-"Fotos/vídeos no importados porque no estaban en un formato compatible con "
-"Shotwell:"
-
-#.
-#. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
-#.
-#: src/Dialogs.vala:609
-msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
-"Library:"
-msgstr ""
-"Fotos/vídeos no importados porque Shotwell no pudo copiarlos a su colección:"
-
-#: src/Dialogs.vala:613
-#, c-format
-msgid ""
-"couldn't copy %s\n"
-"\tto %s"
-msgstr ""
-"no se pudo copiar %s\n"
-"\ta %s"
-
-#.
-#. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
-#.
-#: src/Dialogs.vala:625
-msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
-msgstr "No se importaron las fotos/vídeos porque los archivos están dañados:"
-
-#.
-#. Photos/Videos Not Imported for Other Reasons
-#.
-#: src/Dialogs.vala:640
-msgid "Photos/Videos Not Imported for Other Reasons:"
-msgstr "Fotos/vídeos no importados por otros motivos:"
-
-#: src/Dialogs.vala:660
-#, c-format
-msgid "1 duplicate photo was not imported:\n"
-msgid_plural "%d duplicate photos were not imported:\n"
-msgstr[0] "No se importó 1 foto duplicada:\r\n"
-msgstr[1] "No se importaron %d fotos duplicadas:\r\n"
-
-#: src/Dialogs.vala:663
-#, c-format
-msgid "1 duplicate video was not imported:\n"
-msgid_plural "%d duplicate videos were not imported:\n"
-msgstr[0] "No se importó 1 vídeo duplicado:\r\n"
-msgstr[1] "No se importaron %d vídeos duplicados:\r\n"
-
-#: src/Dialogs.vala:666
-#, c-format
-msgid "1 duplicate photo/video was not imported:\n"
-msgid_plural "%d duplicate photos/videos were not imported:\n"
-msgstr[0] "No se importó 1 foto/vídeo duplicado:\r\n"
-msgstr[1] "No se importaron %d fotos/vídeos duplicados:\r\n"
-
-#: src/Dialogs.vala:680
-#, c-format
-msgid "1 photo failed to import due to a file or hardware error:\n"
-msgid_plural "%d photos failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-"Falló al importar 1 foto debido a un error del archivo o de hardware:\n"
-msgstr[1] ""
-"Falló al importar %d fotos debido a un error del archivo o de hardware:\n"
-
-#: src/Dialogs.vala:683
-#, c-format
-msgid "1 video failed to import due to a file or hardware error:\n"
-msgid_plural "%d videos failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-"Falló al importar 1 vídeo debido a un error del archivo o de hardware:\r\n"
-msgstr[1] ""
-"Falló al importar %d vídeos debido a un error del archivo o de hardware:\r\n"
-
-#: src/Dialogs.vala:686
-#, c-format
-msgid "1 photo/video failed to import due to a file or hardware error:\n"
-msgid_plural ""
-"%d photos/videos failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-"Falló al importar 1 foto/vídeo debido a un error del archivo o de hardware:"
-"\r\n"
-msgstr[1] ""
-"Falló al importar %d fotos/vídeos debido a un error del archivo o de "
-"hardware:\r\n"
-
-#: src/Dialogs.vala:689
-#, c-format
-msgid "1 file failed to import due to a file or hardware error:\n"
-msgid_plural "%d files failed to import due to a file or hardware error:\n"
-msgstr[0] ""
-"Falló al importar 1 archivo debido a un error del archivo o de hardware:\n"
-msgstr[1] ""
-"Falló al importar %d archivos debido a un error de archivo o de hardware:\n"
-
-#: src/Dialogs.vala:703
-#, c-format
-msgid ""
-"1 photo failed to import because the photo library folder was not writable:\n"
-msgid_plural ""
-"%d photos failed to import because the photo library folder was not "
-"writable:\n"
-msgstr[0] ""
-"Falló al importar 1 foto porque la carpeta de la colección de fotos no se "
-"puede escribir:\n"
-msgstr[1] ""
-"Falló al importar %d fotos porque la carpeta de la colección de fotos no se "
-"puede escribir:\n"
-
-#: src/Dialogs.vala:706
-#, c-format
-msgid ""
-"1 video failed to import because the photo library folder was not writable:\n"
-msgid_plural ""
-"%d videos failed to import because the photo library folder was not "
-"writable:\n"
-msgstr[0] ""
-"Falló al importar 1 foto porque la carpeta de la colección de fotos no se "
-"puede escribir:\n"
-msgstr[1] ""
-"Falló al importar %d fotos porque la carpeta de la colección de fotos no se "
-"puede escribir:\n"
-
-#: src/Dialogs.vala:709
-#, c-format
-msgid ""
-"1 photo/video failed to import because the photo library folder was not "
-"writable:\n"
-msgid_plural ""
-"%d photos/videos failed to import because the photo library folder was not "
-"writable:\n"
-msgstr[0] ""
-"Falló al importar 1 foto/vídeo porque la carpeta de la colección de fotos no "
-"se puede escribir:\n"
-msgstr[1] ""
-"Falló al importar %d fotos/vídeos porque la carpeta de la colección de fotos "
-"no se puede escribir:\n"
-
-#: src/Dialogs.vala:712
-#, c-format
-msgid ""
-"1 file failed to import because the photo library folder was not writable:\n"
-msgid_plural ""
-"%d files failed to import because the photo library folder was not "
-"writable:\n"
-msgstr[0] ""
-"Falló la importación de 1 archivo porque no se puede escribir en la "
-"colección de fotos:\n"
-msgstr[1] ""
-"Falló la importación de %d archivos porque no se puede escribir en la "
-"colección de fotos:\n"
-
-#: src/Dialogs.vala:726
-#, c-format
-msgid "1 photo failed to import due to a camera error:\n"
-msgid_plural "%d photos failed to import due to a camera error:\n"
-msgstr[0] "Falló al importar 1 foto/vídeo debido a un error de la cámara:\n"
-msgstr[1] "Falló al importar %d fotos debido a un error de la cámara:\n"
-
-#: src/Dialogs.vala:729
-#, c-format
-msgid "1 video failed to import due to a camera error:\n"
-msgid_plural "%d videos failed to import due to a camera error:\n"
-msgstr[0] "Falló al importar 1 foto/vídeo debido a un error de la cámara:\n"
-msgstr[1] "Falló al importar %d vídeos debido a un error de la cámara:\n"
-
-#: src/Dialogs.vala:732
-#, c-format
-msgid "1 photo/video failed to import due to a camera error:\n"
-msgid_plural "%d photos/videos failed to import due to a camera error:\n"
-msgstr[0] "Falló al importar 1 foto/vídeo debido a un error de la cámara:\n"
-msgstr[1] "Falló al importar %d foto/vídeo debido a un error de la cámara:\n"
-
-#: src/Dialogs.vala:735
-#, c-format
-msgid "1 file failed to import due to a camera error:\n"
-msgid_plural "%d files failed to import due to a camera error:\n"
-msgstr[0] "Falló al importar 1 archivo debido a un error de la cámara: \n"
-msgstr[1] "Falló al importar %d archivor debido a un error de la cámara: \n"
-
-#: src/Dialogs.vala:749
-#, c-format
-msgid "1 photo failed to import because it was corrupt:\n"
-msgid_plural "%d photos failed to import because they were corrupt:\n"
-msgstr[0] "No se pudo importar una foto porque está dañada:\n"
-msgstr[1] "No se pudieron importar %d fotos porque están dañadas:\n"
-
-#: src/Dialogs.vala:752
-#, c-format
-msgid "1 video failed to import because it was corrupt:\n"
-msgid_plural "%d videos failed to import because they were corrupt:\n"
-msgstr[0] "No se pudo importar un vídeo porque está dañado:\n"
-msgstr[1] "No se pudieron importar %d vídeos porque están dañados:\n"
-
-#: src/Dialogs.vala:755
-#, c-format
-msgid "1 photo/video failed to import because it was corrupt:\n"
-msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
-msgstr[0] "No se pudo importar 1 foto/vídeo porque está dañado:\n"
-msgstr[1] "No se pudieron importar %d fotos/vídeos porque están dañados:\n"
-
-#: src/Dialogs.vala:758
-#, c-format
-msgid "1 file failed to import because it was corrupt:\n"
-msgid_plural "%d files failed to import because it was corrupt:\n"
-msgstr[0] "No se pudo importar un archivo porque está dañado:\n"
-msgstr[1] "No se pudieron importar %d archivos porque están dañados:\n"
-
-#. we have no notion of "unsupported" video files right now in Shotwell (all
-#. standard container formats are supported, it's just that the streams in them
-#. might or might not be interpretable), so this message does not need to be
-#. media specific
-#: src/Dialogs.vala:775
-#, c-format
-msgid "1 unsupported photo skipped:\n"
-msgid_plural "%d unsupported photos skipped:\n"
-msgstr[0] "Se omitió 1 foto no compatible:\n"
-msgstr[1] "Se omitieron %d fotos no compatibles:\n"
-
-#. we have no notion of "non-video" video files right now in Shotwell, so this
-#. message doesn't need to be media specific
-#: src/Dialogs.vala:790
-#, c-format
-msgid "1 non-image file skipped.\n"
-msgid_plural "%d non-image files skipped.\n"
-msgstr[0] "Se omitió 1 archivo que no era una imagen.\n"
-msgstr[1] "Se omitieron %d archivos que no eran imágenes.\n"
-
-#: src/Dialogs.vala:801
-#, c-format
-msgid "1 photo skipped due to user cancel:\n"
-msgid_plural "%d photos skipped due to user cancel:\n"
-msgstr[0] "Se omitió 1 foto debido a la cancelación del usuario:\n"
-msgstr[1] "Se omitieron %d fotos debido a la cancelación del usuario:\n"
-
-#: src/Dialogs.vala:804
-#, c-format
-msgid "1 video skipped due to user cancel:\n"
-msgid_plural "%d videos skipped due to user cancel:\n"
-msgstr[0] "Se omitió 1 vídeo debido a la cancelación del usuario:\n"
-msgstr[1] "Se omitieron %d vídeos debido a la cancelación del usuario:\n"
-
-#: src/Dialogs.vala:807
-#, c-format
-msgid "1 photo/video skipped due to user cancel:\n"
-msgid_plural "%d photos/videos skipped due to user cancel:\n"
-msgstr[0] "Se omitió 1 foto/vídeo debido a la cancelación del usuario:\n"
-msgstr[1] "Se omitieron %d fotos/vídeos debido a la cancelación del usuario:\n"
-
-#: src/Dialogs.vala:810
-#, c-format
-msgid "1 file skipped due to user cancel:\n"
-msgid_plural "%d file skipped due to user cancel:\n"
-msgstr[0] "Se omitió 1 archivo debido a la cancelación del usuario:\n"
-msgstr[1] "Se omitieron %d archivos debido a la cancelación del usuario:\n"
-
-#: src/Dialogs.vala:824
-#, c-format
-msgid "1 photo successfully imported.\n"
-msgid_plural "%d photos successfully imported.\n"
-msgstr[0] "1 foto correctamente importada.\n"
-msgstr[1] "%d fotos importadas correctamente.\n"
-
-#: src/Dialogs.vala:827
-#, c-format
-msgid "1 video successfully imported.\n"
-msgid_plural "%d videos successfully imported.\n"
-msgstr[0] "1 vídeo correctamente importado.\n"
-msgstr[1] "%d vídeos importados correctamente.\n"
-
-#: src/Dialogs.vala:830
-#, c-format
-msgid "1 photo/video successfully imported.\n"
-msgid_plural "%d photos/videos successfully imported.\n"
-msgstr[0] "1 foto/vídeo correctamente importado.\n"
-msgstr[1] "%d fotos/vídeos importados correctamente.\n"
-
-#. if no media items were imported at all (i.e. an empty directory attempted), need to at least
-#. report that nothing was imported
-#: src/Dialogs.vala:846
-msgid "No photos or videos imported.\n"
-msgstr "No se importó ninguna foto o vídeo.\n"
-
-#: src/Dialogs.vala:853 src/Dialogs.vala:872
-msgid "Import Complete"
-msgstr "Importación completa"
-
-#: src/Dialogs.vala:1158
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d segundo"
-msgstr[1] "%d segundos"
-
-#: src/Dialogs.vala:1161
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuto"
-msgstr[1] "%d minutos"
-
-#: src/Dialogs.vala:1165
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hora"
-msgstr[1] "%d horas"
-
-#: src/Dialogs.vala:1168
-msgid "1 day"
-msgstr "1 día"
-
-#: src/Dialogs.vala:1322 src/Resources.vala:231
-msgid "Rename Event"
-msgstr "Renombrar evento"
-
-#: src/Dialogs.vala:1322
-msgid "Name:"
-msgstr "Nombre:"
-
-#. Dialog title
-#: src/Dialogs.vala:1333
-msgctxt "Dialog Title"
-msgid "Edit Title"
-msgstr "Editar título"
-
-#: src/Dialogs.vala:1334 src/Properties.vala:340
-msgid "Title:"
-msgstr "Título:"
-
-#. Dialog title
-#: src/Dialogs.vala:1350 src/Resources.vala:307
-msgid "Edit Event Comment"
-msgstr "Editar comentario de evento"
-
-#: src/Dialogs.vala:1351
-msgid "Edit Photo/Video Comment"
-msgstr "Editar comentario de foto/vídeo"
-
-#: src/Dialogs.vala:1352 src/Properties.vala:628
-msgid "Comment:"
-msgstr "Comentario:"
-
-#: src/Dialogs.vala:1368
-msgid "Remove and _Trash File"
-msgid_plural "Remove and _Trash Files"
-msgstr[0] "Eliminar archivo y mover a la _papelera"
-msgstr[1] "Eliminar archivos y mover a la _papelera"
-
-#: src/Dialogs.vala:1372
-msgid "_Remove From Library"
-msgstr "_Quitar de la colección"
-
-#: src/Dialogs.vala:1415
-msgid "Revert External Edit?"
-msgstr "¿Revertir las ediciones externas?"
-
-#: src/Dialogs.vala:1415
-msgid "Revert External Edits?"
-msgstr "¿Revertir ediciones externas?"
-
-#: src/Dialogs.vala:1417
-#, c-format
-msgid "This will destroy all changes made to the external file.  Continue?"
-msgid_plural ""
-"This will destroy all changes made to %d external files.  Continue?"
-msgstr[0] ""
-"Esto destruirá todos los cambios realizados en el archivo externo.  "
-"¿Continuar?"
-msgstr[1] ""
-"Esto destruirá todos los cambios realizados en los %d archivos externos.  "
-"¿Continuar?"
-
-#: src/Dialogs.vala:1421
-msgid "Re_vert External Edit"
-msgstr "Re_vertir edición externa"
-
-#: src/Dialogs.vala:1421
-msgid "Re_vert External Edits"
-msgstr "Re_vertir ediciones externas"
-
-#: src/Dialogs.vala:1442
-#, c-format
-msgid "This will remove the photo from the library.  Continue?"
-msgid_plural "This will remove %d photos from the library.  Continue?"
-msgstr[0] "Esto quitará la foto de la colección. ¿Continuar?"
-msgstr[1] "Esto quitará las %d fotos de la colección. ¿Continuar?"
-
-#: src/Dialogs.vala:1449 src/Resources.vala:173
-msgid "_Remove"
-msgstr "_Quitar"
-
-#: src/Dialogs.vala:1450
-msgid "Remove Photo From Library"
-msgstr "Quitar la foto de la colección"
-
-#: src/Dialogs.vala:1450
-msgid "Remove Photos From Library"
-msgstr "Quitar fotos de la colección"
-
-#: src/Dialogs.vala:1543
-#, c-format
-msgid "%d%%"
-msgstr "%d%%"
-
-#: src/Dialogs.vala:1697
-msgid "AM"
-msgstr "a.m."
-
-#: src/Dialogs.vala:1698
-msgid "PM"
-msgstr "p.m."
-
-#: src/Dialogs.vala:1699
-msgid "24 Hr"
-msgstr "24 hrs."
-
-#: src/Dialogs.vala:1714
-msgid "_Shift photos/videos by the same amount"
-msgstr "_Desplazar todas las fotos y/o vídeos la misma cantidad"
-
-#: src/Dialogs.vala:1719
-msgid "Set _all photos/videos to this time"
-msgstr "Ajustar _todas las fotos y/o vídeos a esta hora"
-
-#: src/Dialogs.vala:1726
-msgid "_Modify original photo file"
-msgstr "_Modificar archivo de foto original"
-
-#: src/Dialogs.vala:1726
-msgid "_Modify original photo files"
-msgstr ":Modificar archivos de fotos originales"
-
-#: src/Dialogs.vala:1729
-msgid "_Modify original file"
-msgstr "_Modificar archivos originales"
-
-#: src/Dialogs.vala:1729
-msgid "_Modify original files"
-msgstr "_Modificar archivos originales"
-
-#: src/Dialogs.vala:1815
-msgid "Original: "
-msgstr "Original:"
-
-#: src/Dialogs.vala:1816
-msgid "%m/%d/%Y, %H:%M:%S"
-msgstr "%d/%m/%Y, %H:%M:%S"
-
-#: src/Dialogs.vala:1817
-msgid "%m/%d/%Y, %I:%M:%S %p"
-msgstr "%d/%m/%Y, %H:%M:%S %p"
-
-#: src/Dialogs.vala:1906
-#, c-format
-msgid ""
-"Exposure time will be shifted forward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"El tiempo de exposición se adelantará por\n"
-"%d %s, %d %s, %d %s, y %d %s."
-
-#: src/Dialogs.vala:1907
-#, c-format
-msgid ""
-"Exposure time will be shifted backward by\n"
-"%d %s, %d %s, %d %s, and %d %s."
-msgstr ""
-"El tiempo de exposición se atrasará por\n"
-"%d %s, %d %s, %d %s, y %d %s."
-
-#: src/Dialogs.vala:1909
-msgid "day"
-msgid_plural "days"
-msgstr[0] "día"
-msgstr[1] "días"
-
-#: src/Dialogs.vala:1910
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hora"
-msgstr[1] "horas"
-
-#: src/Dialogs.vala:1911
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuto"
-msgstr[1] "minutos"
-
-#: src/Dialogs.vala:1912
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "segundo"
-msgstr[1] "segundos"
-
-#: src/Dialogs.vala:1956
-#, c-format
-msgid ""
-"\n"
-"\n"
-"And %d other."
-msgid_plural ""
-"\n"
-"\n"
-"And %d others."
-msgstr[0] ""
-"\n"
-"\n"
-"Y %d más."
-msgstr[1] ""
-"\n"
-"\n"
-"Y %d más."
-
-#: src/Dialogs.vala:1980 src/Dialogs.vala:2007
-msgid "Tags (separated by commas):"
-msgstr "Etiquetas (separadas por comas):"
-
-#: src/Dialogs.vala:2087
-msgid "Welcome!"
-msgstr "Bienvenido/a"
-
-#: src/Dialogs.vala:2094
-msgid "Welcome to Shotwell!"
-msgstr "Bienvenido/a a Shotwell."
-
-#: src/Dialogs.vala:2098
-msgid "To get started, import photos in any of these ways:"
-msgstr "Para comenzar, importe fotos de cualquiera de las siguientes formas:"
-
-#: src/Dialogs.vala:2117
-#, c-format
-msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
-msgstr "Elija <span weight=\"bold\">Archivo %s Importar desde carpeta</span>"
-
-#: src/Dialogs.vala:2118
-msgid "Drag and drop photos onto the Shotwell window"
-msgstr "Arrastre y suelte fotos en la ventana de Shotwell"
-
-#: src/Dialogs.vala:2119
-msgid "Connect a camera to your computer and import"
-msgstr "Conecte una cámara al equipo e importe"
-
-#: src/Dialogs.vala:2129
-#, c-format
-msgid "_Import photos from your %s folder"
-msgstr "_Importar fotos desde su carpeta %s"
-
-#: src/Dialogs.vala:2136
-msgid "You can also import photos in any of these ways:"
-msgstr "También puede importar fotos en cualquiera de estas formas:"
-
-#: src/Dialogs.vala:2146
-msgid "_Don't show this message again"
-msgstr "_No mostrar este mensaje de nuevo"
-
-#: src/Dialogs.vala:2181
-#, c-format
-msgid "Import photos from your %s library"
-msgstr "Importar fotos desde su colección %s"
-
-#. We're installed system-wide, so use the system help.
-#. We're being run from the build directory; we'll have to handle clicks to this
-#. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2328 src/Dialogs.vala:2332
-msgid "(Help)"
-msgstr "(Ayuda)"
-
-#: src/Dialogs.vala:2341
-#, c-format
-msgid "Year%sMonth%sDay"
-msgstr "Año%sMes%sDía"
-
-#: src/Dialogs.vala:2343
-#, c-format
-msgid "Year%sMonth"
-msgstr "Año%sMes"
-
-#: src/Dialogs.vala:2345
-#, c-format
-msgid "Year%sMonth-Day"
-msgstr "Año%sMes-Día"
-
-#: src/Dialogs.vala:2347
-msgid "Year-Month-Day"
-msgstr "Año-Mes-Día"
-
-#: src/Dialogs.vala:2348 src/editing_tools/EditingTools.vala:781
-msgid "Custom"
-msgstr "Personalizado"
-
-#. Invalid pattern.
-#: src/Dialogs.vala:2585
-msgid "Invalid pattern"
-msgstr "Patrón no válido"
-
-#. This function is used to determine whether or not files should be copied or linked when imported.
-#. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2687
-msgid ""
-"Shotwell can copy the photos into your library folder or it can import them "
-"without copying."
-msgstr ""
-"Shotwell puede copiar las fotos en su colección o puede importarlas sin "
-"copiarlas."
-
-#: src/Dialogs.vala:2692
-msgid "Co_py Photos"
-msgstr "C_opiar fotos"
-
-#: src/Dialogs.vala:2693
-msgid "_Import in Place"
-msgstr "_Importar en el lugar"
-
-#: src/Dialogs.vala:2694
-msgid "Import to Library"
-msgstr "Importar a la colección"
-
-#: src/Dialogs.vala:2704 src/PhotoPage.vala:3085
-msgid "Remove From Library"
-msgstr "Quitar de la colección"
-
-#: src/Dialogs.vala:2705 src/PhotoPage.vala:3085
-msgid "Removing Photo From Library"
-msgstr "Quitando la foto de la colección"
-
-#: src/Dialogs.vala:2705
-msgid "Removing Photos From Library"
-msgstr "Quitando fotos de la colección"
-
-#: src/Dialogs.vala:2719
-#, c-format
-msgid ""
-"This will remove the photo/video from your Shotwell library.  Would you also "
-"like to move the file to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgid_plural ""
-"This will remove %d photos/videos from your Shotwell library.  Would you "
-"also like to move the files to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgstr[0] ""
-"Esto quitará la foto y/o el vídeo de su colección de Shotwell. ¿Le gustaría "
-"mover el archivo a la papelera del escritorio?\n"
-"\n"
-"Esta acción no se puede deshacer."
-msgstr[1] ""
-"Esto quitará %d fotos y/o vídeos de su colección de Shotwell. ¿Le gustaría "
-"mover los archivos a la papelera del escritorio?\n"
-"\n"
-"Esta acción no se puede deshacer."
-
-#: src/Dialogs.vala:2723
-#, c-format
-msgid ""
-"This will remove the video from your Shotwell library.  Would you also like "
-"to move the file to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgid_plural ""
-"This will remove %d videos from your Shotwell library.  Would you also like "
-"to move the files to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgstr[0] ""
-"Esto quitará el vídeo de su colección de Shotwell. ¿Le gustaría mover el "
-"archivo a la papelera del escritorio?\n"
-"\n"
-"Esta acción no se puede deshacer."
-msgstr[1] ""
-"Esto quitará los %d vídeos de su colección de Shotwell. ¿Le gustaría mover "
-"los archivos a la papelera del escritorio?\n"
-"\n"
-"Esta acción no se puede deshacer."
-
-#: src/Dialogs.vala:2727
-#, c-format
-msgid ""
-"This will remove the photo from your Shotwell library.  Would you also like "
-"to move the file to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgid_plural ""
-"This will remove %d photos from your Shotwell library.  Would you also like "
-"to move the files to your desktop trash?\n"
-"\n"
-"This action cannot be undone."
-msgstr[0] ""
-"Esto quitará la foto de su colección de Shotwell. ¿Le gustaría mover el "
-"archivo a la papelera del escritorio?\n"
-"\n"
-"Esta acción no se puede deshacer."
-msgstr[1] ""
-"Esto quitará %d fotos de su colección de Shotwell. ¿Le gustaría mover los "
-"archivos a la papelera del escritorio?\n"
-"\n"
-"Esta acción no se puede deshacer."
-
-#: src/Dialogs.vala:2759
-#, c-format
-msgid ""
-"The photo or video cannot be moved to your desktop trash.  Delete this file?"
-msgid_plural ""
-"%d photos/videos cannot be moved to your desktop trash.  Delete these files?"
-msgstr[0] ""
-"No se puede mover la foto o el vídeo a la papelera de su escritorio. "
-"¿Eliminar este archivo?"
-msgstr[1] ""
-"No se pueden mover las %d fotos o vídeos a la papelera de su escritorio. "
-"¿Eliminar estos archivos?"
-
-#. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2776
-#, c-format
-msgid "The photo or video cannot be deleted."
-msgid_plural "%d photos/videos cannot be deleted."
-msgstr[0] "No se puede eliminar la foto o el vídeo."
-msgstr[1] "No se pueden eliminar las %d fotos o vídeos."
-
-#: src/Dimensions.vala:23
-msgid "Width"
-msgstr "Anchura"
-
-#: src/Dimensions.vala:26
-msgid "Height"
-msgstr "Altura"
-
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Archivo"
-
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
-#: src/Resources.vala:175
-msgid "_Save"
-msgstr "_Guardar"
-
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Guardar la foto"
-
-#: src/direct/DirectPhotoPage.vala:57
-#| msgid "Save _As"
-msgid "Save _As…"
-msgstr "Guardar _como…"
-
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Guardar la foto con un nombre diferente"
-
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Imprimir la foto en una impresora conectada a su equipo"
-
-#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
-#: src/Resources.vala:159
-msgid "_Edit"
-msgstr "_Editar"
-
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Foto"
-
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416
-msgid "T_ools"
-msgstr "_Herramientas"
-
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421
-msgid "_Previous Photo"
-msgstr "Foto _anterior"
-
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422
-msgid "Previous Photo"
-msgstr "Foto anterior"
-
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427
-msgid "_Next Photo"
-msgstr "_Siguiente foto"
-
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428
-msgid "Next Photo"
-msgstr "Siguiente foto"
-
-#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
-#: src/PhotoPage.vala:2412
-msgid "_View"
-msgstr "_Ver"
-
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
-#: src/Resources.vala:162
-msgid "_Help"
-msgstr "Ay_uda"
-
-#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
-#: src/PhotoPage.vala:2591 src/Resources.vala:183
-msgid "Zoom _In"
-msgstr "_Ampliar"
-
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592
-msgid "Increase the magnification of the photo"
-msgstr "Aumentar la ampliación de la foto"
-
-#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
-#: src/PhotoPage.vala:2597 src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr "Re_ducir"
-
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598
-msgid "Decrease the magnification of the photo"
-msgstr "Reducir la ampliación de la foto"
-
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603
-msgid "Fit to _Page"
-msgstr "Aj_ustar a la página"
-
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604
-msgid "Zoom the photo to fit on the screen"
-msgstr "Aumentar la foto hasta ajustar a la pantalla"
-
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Ampliar al _100%"
-
-#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Ampliar la foto al 100%"
-
-#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Ampliar al _200%"
-
-#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Ampliar la foto al 200%"
-
-#: src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid "%s does not exist."
-msgstr "%s no existe."
-
-#: src/direct/DirectPhotoPage.vala:229
-#, c-format
-msgid "%s is not a file."
-msgstr "%s no es un archivo."
-
-#: src/direct/DirectPhotoPage.vala:231
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s no es compatible con el formato de archivo de\n"
-"%s."
-
-#: src/direct/DirectPhotoPage.vala:248
-#, c-format
-msgid "Unable open photo %s. Sorry."
-msgstr "No se puede abrir la foto %s."
-
-#: src/direct/DirectPhotoPage.vala:432
-msgid "_Save a Copy"
-msgstr "_Guardar una copia"
-
-#: src/direct/DirectPhotoPage.vala:435
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "¿Quiere descartar los cambios a %s?"
-
-#: src/direct/DirectPhotoPage.vala:436
-msgid "Close _without Saving"
-msgstr "Cerrar _sin guardar"
-
-#: src/direct/DirectPhotoPage.vala:469
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "Error al guardar en %s: %s"
-
-#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518
-msgid "Save As"
-msgstr "Guardar como"
-
-#. verify this is a directory
-#: src/DirectoryMonitor.vala:889
-#, c-format
-msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr "No se puede monitorizar %s: No es un directorio (%s)"
-
-#: src/editing_tools/EditingTools.vala:665
-msgid "Return to current photo dimensions"
-msgstr "Volver a las dimensiones actuales de la foto"
-
-#: src/editing_tools/EditingTools.vala:668
-msgid "Set the crop for this photo"
-msgstr "Establecer el corte para esta foto"
-
-#: src/editing_tools/EditingTools.vala:680
-msgid "Pivot the crop rectangle between portrait and landscape orientations"
-msgstr ""
-"Girar el rectángulo de corte entre las orientaciones vertical y horizontal"
-
-#: src/editing_tools/EditingTools.vala:753
-msgid "Unconstrained"
-msgstr "Sin restricciones"
-
-#: src/editing_tools/EditingTools.vala:754
-msgid "Square"
-msgstr "Cuadrado"
-
-#: src/editing_tools/EditingTools.vala:755
-msgid "Screen"
-msgstr "Pantalla"
-
-#: src/editing_tools/EditingTools.vala:757
-#: src/editing_tools/EditingTools.vala:760
-#: src/editing_tools/EditingTools.vala:770
-#: src/editing_tools/EditingTools.vala:780
-msgid "-"
-msgstr "-"
-
-#: src/editing_tools/EditingTools.vala:758
-msgid "SD Video (4 : 3)"
-msgstr "Vídeo SD (4:3)"
-
-#: src/editing_tools/EditingTools.vala:759
-msgid "HD Video (16 : 9)"
-msgstr "Vídeo HD (16:9)"
-
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
-msgid "Wallet (2 x 3 in.)"
-msgstr "Cartera (2 × 3 pulg.)"
-
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
-msgid "Notecard (3 x 5 in.)"
-msgstr "Tarjeta de notas (3 × 5 pulg.)"
-
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
-msgid "4 x 6 in."
-msgstr "4 × 6 pulg."
-
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
-msgid "5 x 7 in."
-msgstr "5 × 7 pulg."
-
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
-msgid "8 x 10 in."
-msgstr "8 × 10 pulg."
-
-#: src/editing_tools/EditingTools.vala:766
-msgid "Letter (8.5 x 11 in.)"
-msgstr "Carta (8.5 × 11 pulg.)"
-
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
-msgid "11 x 14 in."
-msgstr "11 × 14 pulg."
-
-#: src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "Tabloide (11 × 17 pulg.)"
-
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
-msgid "16 x 20 in."
-msgstr "16 × 20 pulg."
-
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Cartera métrica (9 × 13 cm)"
-
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
-msgid "Postcard (10 x 15 cm)"
-msgstr "Tarjeta postal (10 × 15 cm)"
-
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
-msgid "13 x 18 cm"
-msgstr "13 × 18 cm"
-
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
-msgid "18 x 24 cm"
-msgstr "18 × 24 cm"
-
-#: src/editing_tools/EditingTools.vala:775
-msgid "A4 (210 x 297 mm)"
-msgstr "A4 (210 × 297 mm)"
-
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
-msgid "20 x 30 cm"
-msgstr "20 × 30 cm"
-
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
-msgid "24 x 40 cm"
-msgstr "24 × 40 cm"
-
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
-msgid "30 x 40 cm"
-msgstr "30 × 40 cm"
-
-#: src/editing_tools/EditingTools.vala:779
-msgid "A3 (297 x 420 mm)"
-msgstr "A3 (297 × 420 mm)"
-
-#: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395
-msgid "Size:"
-msgstr "Tamaño:"
-
-#: src/editing_tools/EditingTools.vala:1887
-msgid "Close the red-eye tool"
-msgstr "Cerrar la herramienta de ojos rojos"
-
-#: src/editing_tools/EditingTools.vala:1890
-msgid "Remove any red-eye effects in the selected region"
-msgstr "Quitar cualquier efecto de ojos rojos en la región seleccionada"
-
-#: src/editing_tools/EditingTools.vala:2229
-#: src/editing_tools/StraightenTool.vala:102
-msgid "_Reset"
-msgstr "_Restablecer"
-
-#. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:436
-#: src/Properties.vala:440 src/Properties.vala:447
-msgid "Exposure:"
-msgstr "Exposición:"
-
-#: src/editing_tools/EditingTools.vala:2251
-msgid "Contrast:"
-msgstr "Contraste:"
-
-#: src/editing_tools/EditingTools.vala:2259
-msgid "Saturation:"
-msgstr "Saturación:"
-
-#: src/editing_tools/EditingTools.vala:2267
-msgid "Tint:"
-msgstr "Matiz:"
-
-#: src/editing_tools/EditingTools.vala:2276
-msgid "Temperature:"
-msgstr "Temperatura:"
-
-#: src/editing_tools/EditingTools.vala:2284
-msgid "Shadows:"
-msgstr "Sombras:"
-
-#: src/editing_tools/EditingTools.vala:2292
-msgid "Highlights:"
-msgstr "Resaltadas:"
-
-#: src/editing_tools/EditingTools.vala:2346
-msgid "Reset Colors"
-msgstr "Restablecer colores"
-
-#: src/editing_tools/EditingTools.vala:2346
-msgid "Reset all color adjustments to original"
-msgstr "Restablecer todos los ajustes de color al original"
-
-#: src/editing_tools/EditingTools.vala:2705
-msgid "Temperature"
-msgstr "Temperatura"
-
-#: src/editing_tools/EditingTools.vala:2717
-msgid "Tint"
-msgstr "Matiz"
-
-#: src/editing_tools/EditingTools.vala:2729
-#| msgid "Contrast Expansion"
-msgid "Contrast"
-msgstr "Contraste"
-
-#: src/editing_tools/EditingTools.vala:2743
-msgid "Saturation"
-msgstr "Saturación"
-
-#: src/editing_tools/EditingTools.vala:2756
-msgid "Exposure"
-msgstr "Exposición"
-
-#: src/editing_tools/EditingTools.vala:2769
-msgid "Shadows"
-msgstr "Sombras"
-
-#: src/editing_tools/EditingTools.vala:2782
-msgid "Highlights"
-msgstr "Resaltadas"
-
-#: src/editing_tools/EditingTools.vala:2792
-msgid "Contrast Expansion"
-msgstr "Expansión de contraste"
-
-#: src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Ángulo:"
-
-#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
-msgid "_Straighten"
-msgstr "_Enderezar"
-
-#: src/events/Branch.vala:25
-msgid "Events"
-msgstr "Eventos"
-
-#: src/events/EventDirectoryItem.vala:83
-#, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d foto/vídeo"
-msgstr[1] "%d fotos/vídeos"
-
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:355
-#, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d vídeo"
-msgstr[1] "%d vídeos"
-
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:353
-#, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d foto"
-msgstr[1] "%d fotos"
-
-#: src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "No hay eventos"
-
-#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
-msgid "_Comments"
-msgstr "_Comentarios"
-
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Mostrar el comentario de cada evento"
-
-#: src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "No hay eventos"
-
-#: src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "No se encontraron eventos"
-
-#: src/events/EventsDirectoryPage.vala:230
-msgid "All Events"
-msgstr "Todos los eventos"
-
-#: src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Sin fecha"
-
-#: src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
-
-#: src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
-
-#. if no name, pretty up the start time
-#: src/Event.vala:753
-#, c-format
-msgid "Event %s"
-msgstr "Evento %s"
-
-#: src/Exporter.vala:232
-#, c-format
-msgid "Unable to generate a temporary file for %s: %s"
-msgstr "No se puede crear el directorio temporal %s: %s"
-
-#: src/Exporter.vala:299
-msgid "Exporting"
-msgstr "Exportando"
-
-#: src/Exporter.vala:317
-#, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "El archivo %s ya existe. ¿Quiere reemplazarlo?"
-
-#: src/Exporter.vala:319
-msgid "_Skip"
-msgstr "_Omitir"
-
-#: src/Exporter.vala:319
-msgid "_Replace"
-msgstr "_Reemplazar"
-
-#: src/Exporter.vala:319
-msgid "Replace _All"
-msgstr "Reempla_zar todo"
-
-#: src/Exporter.vala:319
-msgid "Export"
-msgstr "Exportar"
-
-#: src/folders/Branch.vala:141
-msgid "Folders"
-msgstr "Carpetas"
-
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1191
-msgid "Library"
-msgstr "Colección"
-
-#: src/library/Branch.vala:97 src/SearchFilter.vala:608
-#: src/SearchFilter.vala:609
-msgid "Photos"
-msgstr "Fotos"
-
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602
-#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188
-msgid "Flagged"
-msgstr "Marcada"
-
-#: src/library/ImportQueuePage.vala:8
-#| msgid "Importing"
-msgid "Importing…"
-msgstr "Importando…"
-
-#: src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "_Detener importación"
-
-#: src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Detener la importación de fotos"
-
-#: src/library/ImportQueuePage.vala:124
-#| msgid "Preparing to import"
-msgid "Preparing to import…"
-msgstr "Preparando para importar…"
-
-#: src/library/ImportQueuePage.vala:151
-#, c-format
-msgid "Imported %s"
-msgstr "Importada %s"
-
-#: src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Última importación"
-
-#: src/library/LibraryWindow.vala:285
-#| msgid "Import From Folder"
-msgid "_Import From Folder…"
-msgstr "_Importar desde carpeta…"
-
-#: src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Importar fotos desde el disco a la colección"
-
-#: src/library/LibraryWindow.vala:293
-#| msgid "Import From Application"
-msgid "Import From _Application…"
-msgstr "Importar desde _aplicación…"
-
-#: src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Ordenar _eventos"
-
-#: src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Vaciar la papele_ra"
-
-#: src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Eliminar todas las fotos en la papelera"
-
-#: src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Ver eve_nto para la foto"
-
-#: src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "_Buscar"
-
-#: src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Buscar fotos y vídeos por criterio de búsqueda"
-
-#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
-#: src/sidebar/Tree.vala:199
-#| msgid "Ne_w Saved Search..."
-msgid "Ne_w Saved Search…"
-msgstr "_Búsqueda guardada nueva…"
-
-#: src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Fotos"
-
-#: src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "Even_tos"
-
-#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr "_Etiquetas"
-
-#: src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "Información _básica"
-
-#: src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Mostrar la información básica para la selección"
-
-#: src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "Información e_xtendida"
-
-#: src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Mostrar la información extendida para la selección"
-
-#: src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "_Barra de búsqueda"
-
-#: src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Mostrar la barra de búsqueda"
-
-#: src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "_Barra lateral"
-
-#: src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Mostrar la barra lateral"
-
-#: src/library/LibraryWindow.vala:398
-#| msgid "Pin Toolbar"
-msgid "T_oolbar"
-msgstr "B_arra de herramientas"
-
-#: src/library/LibraryWindow.vala:399
-#| msgid "Display the sidebar"
-msgid "Display the tool bar"
-msgstr "Mostrar la barra de herramientas"
-
-#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr "_Ascendente"
-
-#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr "Ordenar fotos en orden ascendente"
-
-#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
-msgid "D_escending"
-msgstr "D_escendente"
-
-#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr "Ordenar fotos en orden descendente"
-
-#: src/library/LibraryWindow.vala:657
-msgid "Import From Folder"
-msgstr "Importar desde carpeta"
-
-#: src/library/LibraryWindow.vala:726
-msgid "Empty Trash"
-msgstr "Vaciar la papelera"
-
-#: src/library/LibraryWindow.vala:726
-#| msgid "Emptying Trash..."
-msgid "Emptying Trash…"
-msgstr "Vaciando la papelera…"
-
-#: src/library/LibraryWindow.vala:901
-#, c-format
-msgid ""
-"Shotwell is configured to import photos to your home directory.\n"
-"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
-"span>.\n"
-"Do you want to continue importing photos?"
-msgstr ""
-"Shotwell esta´configurado para importar fotos a su carpeta personal.\n"
-"Se recomienda cambiar esto en <span weight=\"bold\">Editar %s Preferencias</"
-"span>.\n"
-"¿Quiere seguir importando fotos?"
-
-#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
-msgid "Library Location"
-msgstr "Ubicación de la colección"
-
-#. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:917
-msgid "Photos cannot be imported from this directory."
-msgstr "Las fotos no pueden importarse desde esta carpeta."
-
-#: src/library/LibraryWindow.vala:1203
-#, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
-
-#: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258
-#| msgid "Updating library..."
-msgid "Updating library…"
-msgstr "Actualizando la colección…"
-
-#: src/library/LibraryWindow.vala:1264
-#| msgid "Preparing to auto-import photos..."
-msgid "Preparing to auto-import photos…"
-msgstr "Preparando para importar fotos automáticamente…"
-
-#: src/library/LibraryWindow.vala:1269
-#| msgid "Auto-importing photos..."
-msgid "Auto-importing photos…"
-msgstr "Importando fotos automáticamente…"
-
-#: src/library/LibraryWindow.vala:1277
-#| msgid "Writing metadata to files..."
-msgid "Writing metadata to files…"
-msgstr "Escribiendo metadatos en los archivos…"
-
-#: src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Archivos faltantes"
-
-#: src/library/OfflinePage.vala:106
-#| msgid "Deleting..."
-msgid "Deleting…"
-msgstr "Eliminando…"
-
-#: src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Papelera"
-
-#: src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "La papelera está vacía"
-
-#: src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Eliminar"
-
-#: src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "Eliminando fotos"
-
-#: src/main.vala:54
-#, c-format
-msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please use the latest version of Shotwell."
-msgstr ""
-"Su colección de fotos no es compatible con esta versión de Shotwell. Parece "
-"que fue creada por Shotwell %s (esquema %d). Esta versión es %s (esquema "
-"%d). Use la versión más reciente de Shotwell."
-
-#: src/main.vala:59
-#, c-format
-msgid ""
-"Shotwell was unable to upgrade your photo library from version %s (schema "
-"%d) to %s (schema %d).  For more information please check the Shotwell Wiki "
-"at %s"
-msgstr ""
-"Shotwell no pudo actualizar su colección de fotos desde la versión %s "
-"(esquema %d) a la %s (esquema %d). Para obtener más información , consulte "
-"el wiki de Shotwell en %s"
-
-#: src/main.vala:65
-#, c-format
-msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please clear your library by deleting %s and re-import your "
-"photos."
-msgstr ""
-"Su colección de fotos no es compatible con esta versión de Shotwell. Parece "
-"que fue creada por Shotwell %s (esquema %d). Esta versión es %s (esquema "
-"%d). Vacíe la colección mediante la eliminación de %s, y vuelva a importar "
-"las fotos."
-
-#: src/main.vala:71
-#, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr ""
-"Error desconocido al intentar verificar la base de datos de Shotwell: %s"
-
-#: src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Cargando Shotwell"
-
-#: src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "Ruta a los datos privados de Shotwell"
-
-#: src/main.vala:294
-msgid "DIRECTORY"
-msgstr "DIRECTORIO"
-
-#: src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-msgstr ""
-"No monitorear el directorio de la colección en tiempo de ejecución para "
-"buscar cambios"
-
-#: src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr "No mostrar medidor de progreso de inicio"
-
-#: src/main.vala:306
-msgid "Show the application's version"
-msgstr "Mostrar la versión de la aplicación"
-
-#. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
-msgid "[FILE]"
-msgstr "[ARCHIVO]"
-
-#: src/main.vala:342
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Ejecute «%s --help» para ver una lista completa de opciones de línea de "
-"órdenes.\n"
-
-#: src/MediaMonitor.vala:400
-#, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "No se pueden procesar las actualizaciones de la monitorización %s"
-
-#: src/MediaPage.vala:158
-msgid "Adjust the size of the thumbnails"
-msgstr "Ajustar el tamaño de las miniaturas"
-
-#: src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Aumentar la ampliación de las miniaturas"
-
-#: src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Disminuir la ampliación de las miniaturas"
-
-#: src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Ordenar _fotos"
-
-#: src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "_Reproducir vídeo"
-
-#: src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Abrir los vídeos seleccionados en el reproductor de vídeos del sistema"
-
-#: src/MediaPage.vala:428 src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr "_Revelador"
-
-#: src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Mostrar el comentario de cada foto"
-
-#: src/MediaPage.vala:470
-msgid "Display each photo's tags"
-msgstr "Mostrar la etiqueta de cada foto"
-
-#: src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "Por _título"
-
-#: src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Ordenar las fotos por título"
-
-#: src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Por fecha de exposición"
-
-#: src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Ordenar fotos por fecha de exposición"
-
-#: src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Por p_untuación"
-
-#: src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Ordenar fotos por puntuación"
-
-#: src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Por _nombre del archivo"
-
-#: src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Ordenar fotos por nombre"
-
-#: src/MediaPage.vala:723
-#, c-format
-msgid ""
-"Shotwell was unable to play the selected video:\n"
-"%s"
-msgstr ""
-"Shotwell no pudo reproducir el vídeo seleccionado:\n"
-"%s"
-
-#: src/Page.vala:1266
-msgid "No photos/videos"
-msgstr "No hay fotos/vídeos"
-
-#: src/Page.vala:1270
-msgid "No photos/videos found which match the current filter"
-msgstr "No se han encontrado fotos/vídeos que coincidan con el filtro actual"
-
-#: src/Page.vala:2576
-msgid "Photos cannot be exported to this directory."
-msgstr "No se pueden exportar las fotos a este directorio."
-
-#. previous button
-#: src/PhotoPage.vala:533
-msgid "Previous photo"
-msgstr "Foto anterior"
-
-#. next button
-#: src/PhotoPage.vala:539
-msgid "Next photo"
-msgstr "Siguiente foto"
-
-#: src/PhotoPage.vala:1845
-#, c-format
-msgid "Photo source file missing: %s"
-msgstr "Falta el archivo de origen de la foto: %s"
-
-#: src/PhotoPage.vala:3229
-#, c-format
-msgid "Unable to export %s: %s"
-msgstr "No se puede exportar %s: %s"
-
-#: src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
-
-#: src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
-
-#: src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Baja (%d%%)"
-
-#: src/photos/JfifSupport.vala:188
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Media (%d%%)"
-
-#: src/photos/JfifSupport.vala:191
-#, c-format
-msgid "High (%d%%)"
-msgstr "Alta (%d%%)"
-
-#: src/photos/JfifSupport.vala:194
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "Máxima (%d%%)"
-
-#: src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
-
-#: src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
-
-#: src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
-
-#: src/Photo.vala:3753
-msgid "modified"
-msgstr "modificada"
-
-#: src/Printing.vala:255
-msgid "Fill the entire page"
-msgstr "Llenar la página entera"
-
-#: src/Printing.vala:256
-msgid "2 images per page"
-msgstr "2 imágenes por página"
-
-#: src/Printing.vala:257
-msgid "4 images per page"
-msgstr "4 imágenes por página"
-
-#: src/Printing.vala:258
-msgid "6 images per page"
-msgstr "6 imágenes por página"
-
-#: src/Printing.vala:259
-msgid "8 images per page"
-msgstr "8 imágenes por página"
-
-#: src/Printing.vala:260
-msgid "16 images per page"
-msgstr "16 imágenes por página"
-
-#: src/Printing.vala:261
-msgid "32 images per page"
-msgstr "32 imágenes por página"
-
-#: src/Printing.vala:348
-msgid "in."
-msgstr "pulg."
-
-#: src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: src/Printing.vala:876
-msgid "Image Settings"
-msgstr "Ajustes de la imagen"
-
-#: src/Printing.vala:889
-#| msgid "Printing..."
-msgid "Printing…"
-msgstr "Imprimiendo…"
-
-#: src/Printing.vala:909 src/Printing.vala:1112
-#, c-format
-msgid ""
-"Unable to print photo:\n"
-"\n"
-"%s"
-msgstr ""
-"No se puede imprimir la foto:\n"
-"\n"
-"%s"
-
-#: src/Properties.vala:84
-msgid "Today"
-msgstr "Hoy"
-
-#: src/Properties.vala:86
-msgid "Yesterday"
-msgstr "Ayer"
-
-#: src/Properties.vala:343
-msgid "Items:"
-msgstr "Elementos:"
-
-#: src/Properties.vala:346
-#, c-format
-msgid "%d Event"
-msgid_plural "%d Events"
-msgstr[0] "%d evento"
-msgstr[1] "%d eventos"
-
-#. display only one date if start and end are the same
-#: src/Properties.vala:377
-msgid "Date:"
-msgstr "Fecha:"
-
-#. display only one time if start and end are the same
-#: src/Properties.vala:381
-msgid "Time:"
-msgstr "Hora:"
-
-#. display time range
-#. display date range
-#: src/Properties.vala:384 src/Properties.vala:389
-msgid "From:"
-msgstr "De:"
-
-#: src/Properties.vala:385 src/Properties.vala:390
-msgid "To:"
-msgstr "A:"
-
-#: src/Properties.vala:404
-msgid "Duration:"
-msgstr "Duración:"
-
-#: src/Properties.vala:404
-#, c-format
-msgid "%.1f seconds"
-msgstr "%.1f segundos"
-
-#: src/Properties.vala:408
-msgid "Developer:"
-msgstr "Revelador:"
-
-#. nothing special to be done for now for Events
-#: src/Properties.vala:583
-msgid "Location:"
-msgstr "Ubicación:"
-
-#: src/Properties.vala:586
-msgid "File size:"
-msgstr "Tamaño del archivo:"
-
-#: src/Properties.vala:590
-msgid "Current Development:"
-msgstr "Desarrollo actual:"
-
-#: src/Properties.vala:592
-msgid "Original dimensions:"
-msgstr "Dimensiones originales:"
-
-#: src/Properties.vala:595
-msgid "Camera make:"
-msgstr "Cámara:"
-
-#: src/Properties.vala:598
-msgid "Camera model:"
-msgstr "Modelo de la cámara:"
-
-#: src/Properties.vala:601
-msgid "Flash:"
-msgstr "Flash:"
-
-#: src/Properties.vala:603
-msgid "Focal length:"
-msgstr "Longitud focal:"
-
-#: src/Properties.vala:606
-msgid "Exposure date:"
-msgstr "Fecha de exposición:"
-
-#: src/Properties.vala:609
-msgid "Exposure time:"
-msgstr "Tiempo de exposición:"
-
-#: src/Properties.vala:612
-msgid "Exposure bias:"
-msgstr "Exposición:"
-
-#: src/Properties.vala:614
-msgid "GPS latitude:"
-msgstr "Latitud GPS:"
-
-#: src/Properties.vala:617
-msgid "GPS longitude:"
-msgstr "Longitud GPS:"
-
-#: src/Properties.vala:620
-msgid "Artist:"
-msgstr "Artista:"
-
-#: src/Properties.vala:622
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: src/Properties.vala:624
-msgid "Software:"
-msgstr "Software:"
-
-#: src/Properties.vala:641
-msgid "Extended Information"
-msgstr "Información extendida"
-
-#: src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "Preparando para subir"
-
-#: src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "Subiendo %d de %d"
-
-#: src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr "No se puede continuar la publicación en %s porque ocurrió un error:"
-
-#: src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr ""
-"Para intentar publicar en otro servicio, seleccione uno en el menú de arriba."
-
-#: src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Las fotos/vídeos seleccionados se publicaron correctamente."
-
-#: src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Las fotos seleccionadas se publicaron correctamente."
-
-#: src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Las fotos seleccionadas se publicaron correctamente."
-
-#: src/publishing/PublishingUI.vala:112
-msgid "The selected video was successfully published."
-msgstr "El vídeo seleccionado se publicó correctamente."
-
-#: src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr "La foto seleccionada se publicó correctamente."
-
-#: src/publishing/PublishingUI.vala:122
-#| msgid "Fetching account information..."
-msgid "Fetching account information…"
-msgstr "Obteniendo información de la cuenta…"
-
-#: src/publishing/PublishingUI.vala:128
-#| msgid "Logging in..."
-msgid "Logging in…"
-msgstr "Iniciando sesión…"
-
-#: src/publishing/PublishingUI.vala:188
-msgid "Publish Photos"
-msgstr "Publicar fotos"
-
-#: src/publishing/PublishingUI.vala:189
-msgid "Publish photos _to:"
-msgstr "Publicar fo_tos en:"
-
-#: src/publishing/PublishingUI.vala:191
-msgid "Publish Videos"
-msgstr "Publicar vídeos"
-
-#: src/publishing/PublishingUI.vala:192
-msgid "Publish videos _to"
-msgstr "Publicar vídeos _en"
-
-#: src/publishing/PublishingUI.vala:194
-msgid "Publish Photos and Videos"
-msgstr "Publicar fotos y vídeos"
-
-#: src/publishing/PublishingUI.vala:195
-msgid "Publish photos and videos _to"
-msgstr "Publicar fotos y vídeos _en"
-
-#. There are no enabled publishing services that accept this media type,
-#. warn the user.
-#: src/publishing/PublishingUI.vala:397
-msgid "Unable to publish"
-msgstr "No se pudo publicar"
-
-#: src/publishing/PublishingUI.vala:398
-#, c-format
-msgid ""
-"Shotwell cannot publish the selected items because you do not have a "
-"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
-"Preferences</b> and enable one or more of the publishing plugins on the "
-"<b>Plugins</b> tab."
-msgstr ""
-"Shotwell no puede publicar el elemento seleccionado porque no tiene activado "
-"un complemento compatible. Para corregir esto, vaya a <b>Editar %s "
-"Preferencias</b> y active uno o más complementos de publicación en la "
-"pestaña <b>Complementos</b>."
-
-#: src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "Publicando"
-
-#: src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Girar a la _derecha"
-
-#: src/Resources.vala:140 src/Resources.vala:145
-msgid "Rotate"
-msgstr "Girar"
-
-#: src/Resources.vala:141
-msgid "Rotate Right"
-msgstr "Girar a la derecha"
-
-#: src/Resources.vala:142
-msgid "Rotate the photos right (press Ctrl to rotate left)"
-msgstr "Girar las fotos a la derecha (oprima Ctrl para girar a la izquierda)"
-
-#: src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "Girar a la izq_uierda"
-
-#: src/Resources.vala:146
-msgid "Rotate Left"
-msgstr "Girar a la izquierda"
-
-#: src/Resources.vala:147
-msgid "Rotate the photos left"
-msgstr "Girar las fotos a la izquierda"
-
-#: src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Voltear hori_zontalmente"
-
-#: src/Resources.vala:150
-msgid "Flip Horizontally"
-msgstr "Voltear horizontalmente"
-
-#: src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "Voltear _verticalmente"
-
-#: src/Resources.vala:153
-msgid "Flip Vertically"
-msgstr "Voltear verticalmente"
-
-#: src/Resources.vala:155
-msgid "_About"
-msgstr "_Acerca de"
-
-#: src/Resources.vala:156
-msgid "_Apply"
-msgstr "_Aplicar"
-
-#: src/Resources.vala:160
-msgid "_Forward"
-msgstr "_Adelante"
-
-#: src/Resources.vala:161
-msgid "Fulls_creen"
-msgstr "Pantalla c_ompleta"
-
-#: src/Resources.vala:163
-msgid "Leave _Fullscreen"
-msgstr "Salir de pantalla co_mpleta"
-
-#: src/Resources.vala:164 src/Resources.vala:363
-msgid "_New"
-msgstr "_Nueva"
-
-#: src/Resources.vala:165
-msgid "_Next"
-msgstr "_Siguiente"
-
-#: src/Resources.vala:166
-msgid "_OK"
-msgstr "_Aceptar"
-
-#: src/Resources.vala:167
-msgid "_Play"
-msgstr "_Reproducir"
-
-#: src/Resources.vala:168 src/Resources.vala:317
-msgid "_Preferences"
-msgstr "_Preferencias"
-
-#: src/Resources.vala:169
-msgid "_Previous"
-msgstr "_Anterior"
-
-#: src/Resources.vala:170
-msgid "_Print"
-msgstr "_Imprimir"
-
-#: src/Resources.vala:171
-msgid "_Quit"
-msgstr "_Salir"
-
-#: src/Resources.vala:172
-msgid "_Refresh"
-msgstr "_Actualizar"
-
-#: src/Resources.vala:174
-msgid "_Revert"
-msgstr "_Revertir"
-
-#: src/Resources.vala:176
-msgid "Save _As"
-msgstr "Guardar _como"
-
-#: src/Resources.vala:177
-msgid "Sort _Ascending"
-msgstr "Ordenar _ascendentemente"
-
-#: src/Resources.vala:178
-msgid "Sort _Descending"
-msgstr "Ordenar d_escendentemente"
-
-#: src/Resources.vala:179
-msgid "_Stop"
-msgstr "_Detener"
-
-#: src/Resources.vala:180
-msgid "_Undelete"
-msgstr "_Recuperar"
-
-#: src/Resources.vala:181
-msgid "_Normal Size"
-msgstr "Tamaño _normal"
-
-#: src/Resources.vala:182
-msgid "Best _Fit"
-msgstr "_Mejor ajuste"
-
-#: src/Resources.vala:186
-msgid "_Enhance"
-msgstr "M_ejorar"
-
-#: src/Resources.vala:187
-msgid "Enhance"
-msgstr "Mejorar"
-
-#: src/Resources.vala:188
-msgid "Automatically improve the photo's appearance"
-msgstr "Mejorar automáticamente la apariencia de la foto"
-
-#: src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "_Copiar ajustes de color"
-
-#: src/Resources.vala:191
-msgid "Copy Color Adjustments"
-msgstr "Copiar ajustes de color"
-
-#: src/Resources.vala:192
-msgid "Copy the color adjustments applied to the photo"
-msgstr "Copiar los ajustes de color aplicados a la foto"
-
-#: src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "_Pegar ajustes de color"
-
-#: src/Resources.vala:195
-msgid "Paste Color Adjustments"
-msgstr "Pegar ajustes de color"
-
-#: src/Resources.vala:196
-msgid "Apply copied color adjustments to the selected photos"
-msgstr "Aplicar ajuste de color copiado a las fotos seleccionadas"
-
-#: src/Resources.vala:198
-msgid "_Crop"
-msgstr "Re_cortar"
-
-#: src/Resources.vala:199
-msgid "Crop"
-msgstr "Recortar"
-
-#: src/Resources.vala:200
-msgid "Crop the photo's size"
-msgstr "Recortar el tamaño de la foto"
-
-#: src/Resources.vala:203
-msgid "Straighten"
-msgstr "Enderezar"
-
-#: src/Resources.vala:204
-msgid "Straighten the photo"
-msgstr "Enderezar la foto"
-
-#: src/Resources.vala:206
-msgid "_Red-eye"
-msgstr "Ojos _rojos"
-
-#: src/Resources.vala:207
-msgid "Red-eye"
-msgstr "Ojos rojos"
-
-#: src/Resources.vala:208
-msgid "Reduce or eliminate any red-eye effects in the photo"
-msgstr "Reducir o eliminar cualquier efecto de ojos rojos en la foto"
-
-#: src/Resources.vala:210
-msgid "_Adjust"
-msgstr "_Ajuste"
-
-#: src/Resources.vala:211
-msgid "Adjust"
-msgstr "Ajuste"
-
-#: src/Resources.vala:212
-msgid "Adjust the photo's color and tone"
-msgstr "Ajustar el color y el tono de la foto"
-
-#: src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "_Volver al original"
-
-#: src/Resources.vala:215
-msgid "Revert to Original"
-msgstr "Volver al original"
-
-#: src/Resources.vala:217
-msgid "Revert External E_dits"
-msgstr "Revertir e_diciones externas"
-
-#: src/Resources.vala:218
-msgid "Revert to the master photo"
-msgstr "Revertir a la foto original"
-
-#: src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Establecer como fondo _de escritorio"
-
-#: src/Resources.vala:221
-msgid "Set selected image to be the new desktop background"
-msgstr "Establezca la imagen seleccionada como nuevo fondo de escritorio"
-
-#: src/Resources.vala:222
-#| msgid "Set as Desktop Slideshow"
-msgid "Set as _Desktop Slideshow…"
-msgstr "Establecer como pase de _diapositivas de escritorio…"
-
-#: src/Resources.vala:224
-msgid "_Undo"
-msgstr "_Deshacer"
-
-#: src/Resources.vala:225
-msgid "Undo"
-msgstr "Deshacer"
-
-#: src/Resources.vala:227
-msgid "_Redo"
-msgstr "_Rehacer"
-
-#: src/Resources.vala:228
-msgid "Redo"
-msgstr "Rehacer"
-
-#: src/Resources.vala:230
-#| msgid "Rename Event"
-msgid "Re_name Event…"
-msgstr "Re_nombrar evento…"
-
-#: src/Resources.vala:233
-msgid "Make _Key Photo for Event"
-msgstr "Hacer foto _clave para el evento"
-
-#: src/Resources.vala:234
-msgid "Make Key Photo for Event"
-msgstr "Hacer foto clave para el evento"
-
-#: src/Resources.vala:236
-msgid "_New Event"
-msgstr "Evento _nuevo"
-
-#: src/Resources.vala:237
-msgid "New Event"
-msgstr "Evento nuevo"
-
-#: src/Resources.vala:239
-msgid "Move Photos"
-msgstr "Mover fotos"
-
-#: src/Resources.vala:240
-msgid "Move photos to an event"
-msgstr "Mover fotos a un evento"
-
-#: src/Resources.vala:242
-msgid "_Merge Events"
-msgstr "_Combinar eventos"
-
-#: src/Resources.vala:243
-msgid "Merge"
-msgstr "Combinar"
-
-#: src/Resources.vala:244
-msgid "Combine events into a single event"
-msgstr "Combinar eventos en uno solo"
-
-#: src/Resources.vala:246
-msgid "_Set Rating"
-msgstr "Establecer p_untuación"
-
-#: src/Resources.vala:247
-msgid "Set Rating"
-msgstr "Establecer puntuación"
-
-#: src/Resources.vala:248
-msgid "Change the rating of your photo"
-msgstr "Cambiar la puntuación de su foto"
-
-#: src/Resources.vala:250
-msgid "_Increase"
-msgstr "_Aumentar"
-
-#: src/Resources.vala:251
-msgid "Increase Rating"
-msgstr "Aumentar puntuación"
-
-#: src/Resources.vala:253
-msgid "_Decrease"
-msgstr "Disminuir"
-
-#: src/Resources.vala:254
-msgid "Decrease Rating"
-msgstr "Disminuir puntuación"
-
-#: src/Resources.vala:256
-msgid "_Unrated"
-msgstr "_Sin puntuar"
-
-#: src/Resources.vala:257
-msgid "Unrated"
-msgstr "Sin puntuar"
-
-#: src/Resources.vala:258
-msgid "Rate Unrated"
-msgstr "Puntuar no puntuadas"
-
-#: src/Resources.vala:259
-msgid "Setting as unrated"
-msgstr "Establecer como sin puntuación"
-
-#: src/Resources.vala:260
-msgid "Remove any ratings"
-msgstr "Quitar cualquier puntuación"
-
-#: src/Resources.vala:262
-msgid "_Rejected"
-msgstr "_Rechazado"
-
-#: src/Resources.vala:263
-msgid "Rejected"
-msgstr "Rechazada"
-
-#: src/Resources.vala:264
-msgid "Rate Rejected"
-msgstr "Puntuar rechazadas"
-
-#: src/Resources.vala:265
-msgid "Setting as rejected"
-msgstr "Estableciendo como rechazada"
-
-#: src/Resources.vala:266
-msgid "Set rating to rejected"
-msgstr "Establecer puntuación para rechazadas"
-
-#: src/Resources.vala:268
-msgid "Rejected _Only"
-msgstr "Solo _rechazadas"
-
-#: src/Resources.vala:269
-msgid "Rejected Only"
-msgstr "Solo rechazadas"
-
-#: src/Resources.vala:270
-msgid "Show only rejected photos"
-msgstr "Mostrar solo las fotos rechazadas"
-
-#: src/Resources.vala:272
-msgid "All + _Rejected"
-msgstr "Todas + _rechazadas"
-
-#: src/Resources.vala:273
-msgctxt "Tooltip"
-msgid "Show all photos, including rejected"
-msgstr "Mostrar todas las fotos, incluyendo las rechazadas"
-
-#: src/Resources.vala:275
-msgid "_All Photos"
-msgstr "Todas las _fotos"
-
-#. Button tooltip
-#: src/Resources.vala:277
-msgid "Show all photos"
-msgstr "Mostrar todas las fotos"
-
-#: src/Resources.vala:279
-msgid "_Ratings"
-msgstr "_Puntuaciones"
-
-#: src/Resources.vala:280
-msgid "Display each photo's rating"
-msgstr "Mostrar la puntuación de cada foto"
-
-#: src/Resources.vala:282
-msgid "_Filter Photos"
-msgstr "_Filtrar fotos"
-
-#: src/Resources.vala:283
-msgid "Filter Photos"
-msgstr "Filtrar fotos"
-
-#: src/Resources.vala:284
-msgid "Limit the number of photos displayed based on a filter"
-msgstr "Limitar el número de fotos mostradas en base al filtro"
-
-#: src/Resources.vala:286
-msgid "_Duplicate"
-msgstr "_Duplicar"
-
-#: src/Resources.vala:287
-msgid "Duplicate"
-msgstr "Duplicar"
-
-#: src/Resources.vala:288
-msgid "Make a duplicate of the photo"
-msgstr "Hacer un duplicado de la foto"
-
-#: src/Resources.vala:290
-#| msgid "Export"
-msgid "_Export…"
-msgstr "_Exportar…"
-
-#: src/Resources.vala:292
-#| msgid "_Print"
-msgid "_Print…"
-msgstr "_Imprimir…"
-
-#: src/Resources.vala:294
-#| msgid "Publish"
-msgid "Pu_blish…"
-msgstr "Pu_blicar…"
-
-#: src/Resources.vala:296
-msgid "Publish to various websites"
-msgstr "Publicar en varios sitios web"
-
-#: src/Resources.vala:298
-#| msgctxt "Dialog Title"
-#| msgid "Edit Title"
-msgid "Edit _Title…"
-msgstr "Editar _título…"
-
-#. Button label
-#: src/Resources.vala:300
-msgctxt "Button Label"
-msgid "Edit Title"
-msgstr "Editar título"
-
-#: src/Resources.vala:302
-#| msgid "Edit Comment"
-msgid "Edit _Comment…"
-msgstr "Editar _comentario…"
-
-#. Button label
-#: src/Resources.vala:304
-msgid "Edit Comment"
-msgstr "Editar comentario"
-
-#: src/Resources.vala:306
-#| msgid "Edit Event Comment"
-msgid "Edit Event _Comment…"
-msgstr "Editar _comentario de evento…"
-
-#: src/Resources.vala:309
-#| msgid "Adjust Date and Time"
-msgid "_Adjust Date and Time…"
-msgstr "_Ajustar fecha y hora…"
-
-#: src/Resources.vala:310
-msgid "Adjust Date and Time"
-msgstr "Ajustar fecha y hora"
-
-#: src/Resources.vala:312
-#| msgctxt "Dialog Title"
-#| msgid "Add Tags"
-msgid "Add _Tags…"
-msgstr "Añadir e_tiquetas…"
-
-#: src/Resources.vala:313
-#| msgctxt "Dialog Title"
-#| msgid "Add Tags"
-msgid "_Add Tags…"
-msgstr "_Añadir etiquetas…"
-
-#. Dialog title
-#: src/Resources.vala:315
-msgctxt "Dialog Title"
-msgid "Add Tags"
-msgstr "Añadir etiquetas"
-
-#: src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr "Abrir con editor e_xterno"
-
-#: src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr "Abrir con editor RA_W"
-
-#: src/Resources.vala:323
-#| msgid "Send To"
-msgid "Send _To…"
-msgstr "En_viar a…"
-
-#: src/Resources.vala:324
-#| msgid "Send To"
-msgid "Send T_o…"
-msgstr "Env_iar a…"
-
-#: src/Resources.vala:326
-#| msgid "_Find"
-msgid "_Find…"
-msgstr "_Buscar…"
-
-#: src/Resources.vala:327
-msgid "Find"
-msgstr "Buscar"
-
-#: src/Resources.vala:328
-msgid "Find an image by typing text that appears in its name or tags"
-msgstr ""
-"Buscar una imagen escribiendo el texto que aparece en su nombre o etiquetas"
-
-#: src/Resources.vala:330
-msgid "_Flag"
-msgstr "_Marcar"
-
-#: src/Resources.vala:332
-msgid "Un_flag"
-msgstr "_Desmarcar"
-
-#: src/Resources.vala:335
-#, c-format
-msgid "Unable to launch editor: %s"
-msgstr "No se puede abrir el editor: %s"
-
-#: src/Resources.vala:340
-#, c-format
-msgid "Add Tag \"%s\""
-msgstr "Añadir etiqueta «%s»"
-
-#. Used when adding two tags to photo(s)
-#: src/Resources.vala:343
-#, c-format
-msgid "Add Tags \"%s\" and \"%s\""
-msgstr "Añadir etiquetas «%s» y «%s»"
-
-#. Undo/Redo command name (in Edit menu)
-#: src/Resources.vala:348
-msgctxt "UndoRedo menu entry"
-msgid "Add Tags"
-msgstr "Añadir etiquetas"
-
-#: src/Resources.vala:353
-#, c-format
-msgid "_Delete Tag \"%s\""
-msgstr "_Eliminar etiqueta «%s»"
-
-#: src/Resources.vala:357
-#, c-format
-msgid "Delete Tag \"%s\""
-msgstr "Eliminar etiqueta «%s»"
-
-#: src/Resources.vala:360
-msgid "Delete Tag"
-msgstr "Eliminar etiqueta"
-
-#: src/Resources.vala:366
-#, c-format
-#| msgid "Re_name Tag \"%s\"..."
-msgid "Re_name Tag \"%s\"…"
-msgstr "Re_nombrar etiqueta «%s»…"
-
-#: src/Resources.vala:370
-#, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
-msgstr "Renombrar la etiqueta «%s» a «%s»"
-
-#: src/Resources.vala:373
-#| msgid "_Rename..."
-msgid "_Rename…"
-msgstr "_Renombrar…"
-
-#: src/Resources.vala:375
-#| msgid "Modify Tags"
-msgid "Modif_y Tags…"
-msgstr "Mod_ificar etiquetas…"
-
-#: src/Resources.vala:376
-msgid "Modify Tags"
-msgstr "Modificar etiquetas"
-
-#: src/Resources.vala:379
-#, c-format
-msgid "Tag Photo as \"%s\""
-msgstr "Etiquetar fotos como «%s»"
-
-#: src/Resources.vala:379
-#, c-format
-msgid "Tag Photos as \"%s\""
-msgstr "Etiquetar fotos como «%s»"
-
-#: src/Resources.vala:383
-#, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr "Etiquetar las fotos seleccionadas como «%s»"
-
-#: src/Resources.vala:384
-#, c-format
-msgid "Tag the selected photos as \"%s\""
-msgstr "Etiquetar las fotos seleccionadas como «%s»"
-
-#: src/Resources.vala:388
-#, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr "Quitar la etiqueta «%s» de las _fotos"
-
-#: src/Resources.vala:389
-#, c-format
-msgid "Remove Tag \"%s\" From _Photos"
-msgstr "Quitar la etiqueta «%s» de las _fotos"
-
-#: src/Resources.vala:393
-#, c-format
-msgid "Remove Tag \"%s\" From Photo"
-msgstr "Quitar la etiqueta «%s» de las fotos"
-
-#: src/Resources.vala:394
-#, c-format
-msgid "Remove Tag \"%s\" From Photos"
-msgstr "Quitar la etiqueta «%s» de las fotos"
-
-#: src/Resources.vala:398
-#, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
-msgstr "No se puede renombrar la etiqueta a «%s» porque la etiqueta ya existe."
-
-#: src/Resources.vala:402
-#, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
-msgstr "No se pudo renombrar la búsqueda «%s» porque la búsqueda ya existe."
-
-#. Saved search button
-#: src/Resources.vala:405 src/SearchFilter.vala:1210
-msgid "Saved Search"
-msgstr "Búsqueda guardada"
-
-#: src/Resources.vala:407
-msgid "Delete Search"
-msgstr "Eliminar búsqueda"
-
-#: src/Resources.vala:410
-#| msgid "_Edit"
-msgid "_Edit…"
-msgstr "_Editar…"
-
-#: src/Resources.vala:411
-#| msgid "Re_name..."
-msgid "Re_name…"
-msgstr "Re_nombrar…"
-
-#: src/Resources.vala:414
-#, c-format
-msgid "Rename Search \"%s\" to \"%s\""
-msgstr "Renombrar la búsqueda «%s» a «%s»"
-
-#: src/Resources.vala:418
-#, c-format
-msgid "Delete Search \"%s\""
-msgstr "Eliminar búsqueda «%s»"
-
-#: src/Resources.vala:576
-#, c-format
-msgid "Rate %s"
-msgstr "Puntuar %s"
-
-#: src/Resources.vala:577
-#, c-format
-msgid "Set rating to %s"
-msgstr "Establecer puntuación para %s"
-
-#: src/Resources.vala:578
-#, c-format
-msgid "Setting rating to %s"
-msgstr "Estableciendo la puntuación de %s"
-
-#: src/Resources.vala:580
-#, c-format
-msgid "Display %s"
-msgstr "Mostrar %s"
-
-#: src/Resources.vala:581
-#, c-format
-msgid "Only show photos with a rating of %s"
-msgstr "Solo mostrar fotos con puntuación %s"
-
-#: src/Resources.vala:582
-#, c-format
-msgid "%s or Better"
-msgstr "%s o mayor"
-
-#: src/Resources.vala:583
-#, c-format
-msgid "Display %s or Better"
-msgstr "Mostrar %s o mayor"
-
-#: src/Resources.vala:584
-#, c-format
-msgid "Only show photos with a rating of %s or better"
-msgstr "Solo mostrar fotos con puntuación %s o mayor"
-
-#: src/Resources.vala:675
-msgid "Remove the selected photos from the trash"
-msgstr "Quitar las fotos seleccionadas de la papelera"
-
-#: src/Resources.vala:676
-msgid "Remove the selected photos from the library"
-msgstr "Quitar las fotos seleccionadas de la colección"
-
-#: src/Resources.vala:678
-msgid "_Restore"
-msgstr "_Restaurar"
-
-#: src/Resources.vala:679
-msgid "Move the selected photos back into the library"
-msgstr "Mover las fotos seleccionadas de vuelta a la colección"
-
-#: src/Resources.vala:681
-msgid "Show in File Mana_ger"
-msgstr "Mostrar en ge_stor de archivos"
-
-#: src/Resources.vala:682
-msgid "Open the selected photo's directory in the file manager"
-msgstr "Abrir el directorio de la foto seleccionada en el gestor de archivos"
-
-#: src/Resources.vala:685
-#, c-format
-msgid "Unable to open in file manager: %s"
-msgstr "No se puede abrir el gestor de archivos: %s"
-
-#: src/Resources.vala:688
-msgid "R_emove From Library"
-msgstr "_Quitar de la colección"
-
-#: src/Resources.vala:690
-msgid "_Move to Trash"
-msgstr "_Mover a la papelera"
-
-#: src/Resources.vala:692
-msgid "Select _All"
-msgstr "Seleccionar _todo"
-
-#: src/Resources.vala:693
-msgid "Select all items"
-msgstr "Seleccionar todos los elementos"
-
-#. ...precache the timestamp string...
-#. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
-#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
-#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:782
-msgid "%a %b %d, %Y"
-msgstr "%a %d de %b de %Y"
-
-#. / Locale-specific starting date format for multi-date strings,
-#. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:787
-#| msgid "%a %b %d"
-msgctxt "MultidayFormat"
-msgid "%a %b %d"
-msgstr "%a, %d de %b"
-
-#. / Locale-specific ending date format for multi-date strings,
-#. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:792
-#| msgid "%d, %Y"
-msgctxt "MultidayFormat"
-msgid "%d, %Y"
-msgstr "%d, %Y"
-
-#. / Locale-specific calendar date format for multi-month strings,
-#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:797
-#| msgid "%a %b %d"
-msgctxt "MultimonthFormat"
-msgid "%a %b %d"
-msgstr "%a, %d de %b"
-
-#. / Locale-specific calendar date format for multi-month strings,
-#. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:802
-#| msgid "%a %b %d, %Y"
-msgctxt "MultimonthFormat"
-msgid "%a %b %d, %Y"
-msgstr "%a %d de %b de %Y"
-
-#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
-msgid "Slideshow"
-msgstr "Diapositivas"
-
-#: src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Búsquedas guardadas"
-
-#. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:168
-msgid "contains"
-msgstr "contiene"
-
-#. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:169
-#: src/searches/SavedSearchDialog.vala:500
-msgid "is exactly"
-msgstr "es exactamente"
-
-#: src/searches/SavedSearchDialog.vala:170
-msgid "starts with"
-msgstr "comienza por"
-
-#: src/searches/SavedSearchDialog.vala:171
-msgid "ends with"
-msgstr "termina por"
-
-#: src/searches/SavedSearchDialog.vala:172
-msgid "does not contain"
-msgstr "no contiene"
-
-#: src/searches/SavedSearchDialog.vala:173
-#: src/searches/SavedSearchDialog.vala:504
-msgid "is not set"
-msgstr "no está establecida"
-
-#: src/searches/SavedSearchDialog.vala:174
-msgid "is set"
-msgstr "está establecida"
-
-#. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:248
-#: src/searches/SavedSearchDialog.vala:379
-#: src/searches/SavedSearchDialog.vala:444
-msgid "is"
-msgstr "es"
-
-#: src/searches/SavedSearchDialog.vala:249
-msgid "is not"
-msgstr "no es"
-
-#. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:255
-msgid "any photo"
-msgstr "cualquier foto"
-
-#: src/searches/SavedSearchDialog.vala:256
-msgid "a raw photo"
-msgstr "una foto en «raw»"
-
-#: src/searches/SavedSearchDialog.vala:257
-msgid "a video"
-msgstr "un vídeo"
-
-#: src/searches/SavedSearchDialog.vala:311
-msgid "has"
-msgstr "tiene"
-
-#: src/searches/SavedSearchDialog.vala:312
-msgid "has no"
-msgstr "no tiene"
-
-#: src/searches/SavedSearchDialog.vala:317
-msgid "modifications"
-msgstr "modificaciones"
-
-#: src/searches/SavedSearchDialog.vala:318
-msgid "internal modifications"
-msgstr "modificaciones internas"
-
-#: src/searches/SavedSearchDialog.vala:319
-msgid "external modifications"
-msgstr "modificaciones externas"
-
-#. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:373
-msgid "flagged"
-msgstr "marcada"
-
-#: src/searches/SavedSearchDialog.vala:374
-msgid "not flagged"
-msgstr "no marcada"
-
-#: src/searches/SavedSearchDialog.vala:437
-msgid "and higher"
-msgstr "y superior"
-
-#: src/searches/SavedSearchDialog.vala:438
-msgid "only"
-msgstr "solo"
-
-#: src/searches/SavedSearchDialog.vala:439
-msgid "and lower"
-msgstr "e inferior"
-
-#: src/searches/SavedSearchDialog.vala:501
-msgid "is after"
-msgstr "está después"
-
-#: src/searches/SavedSearchDialog.vala:502
-msgid "is before"
-msgstr "está antes"
-
-#: src/searches/SavedSearchDialog.vala:503
-msgid "is between"
-msgstr "está entre"
-
-#: src/searches/SavedSearchDialog.vala:516
-msgid "and"
-msgstr "y"
-
-#: src/searches/SavedSearchDialog.vala:697
-msgid "Search"
-msgstr "Búsqueda"
-
-#: src/searches/SavedSearchDialog.vala:702
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/searches/SavedSearchDialog.vala:703
-msgid "OK"
-msgstr "Aceptar"
-
-#: src/searches/SavedSearchDialog.vala:721
-msgid "any"
-msgstr "cualquiera"
-
-#: src/searches/SavedSearchDialog.vala:722
-msgid "all"
-msgstr "todos"
-
-#: src/searches/SavedSearchDialog.vala:723
-msgid "none"
-msgstr "ninguna"
-
-#: src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr "Cualquier texto"
-
-#: src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "Título"
-
-#: src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr "Etiqueta"
-
-#: src/searches/SearchBoolean.vala:166
-msgid "Comment"
-msgstr "Comentario"
-
-#: src/searches/SearchBoolean.vala:169
-msgid "Event name"
-msgstr "Nombre del acontecimiento"
-
-#: src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "Nombre del archivo"
-
-#: src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr "Tipo de medio"
-
-#: src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr "Estado de la opción"
-
-#: src/searches/SearchBoolean.vala:181
-msgid "Photo state"
-msgstr "Estado de la foto"
-
-#. Rating button
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199
-msgid "Rating"
-msgstr "Puntuación"
-
-#: src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "Fecha"
-
-#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
-msgid "Videos"
-msgstr "Vídeos"
-
-#: src/SearchFilter.vala:620
-msgid "RAW Photos"
-msgstr "Fotos RAW"
-
-#: src/SearchFilter.vala:621
-msgid "RAW photos"
-msgstr "Fotos RAW"
-
-#: src/SearchFilter.vala:1148
-#, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Error al cargar el archivo de IU %s: %s"
-
-#. Ticket #3260 - Add a 'close' context menu to
-#. the searchbar.
-#. Prepare the close menu for use, but don't
-#. display it yet; we'll connect it to secondary
-#. click later on.
-#: src/SearchFilter.vala:1159
-msgid "Close"
-msgstr "Cerrar"
-
-#. Type label and toggles
-#: src/SearchFilter.vala:1165
-msgid "Type"
-msgstr "Tipo"
-
-#: src/SearchFilter.vala:1211
-msgid "Use a saved search to filter items in the current view"
-msgstr ""
-
-#: src/sidebar/Tree.vala:203
-#| msgid "New _Tag..."
-msgid "New _Tag…"
-msgstr "E_tiqueta nueva…"
-
-#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Configuración"
-
-#. Set up toolbar
-#. add toolbar buttons
-#: src/SlideshowPage.vala:160
-msgid "Back"
-msgstr "Atrás"
-
-#: src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Ir a la foto anterior"
-
-#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
-msgid "Pause the slideshow"
-msgstr "Pausar la presentación"
-
-#: src/SlideshowPage.vala:174
-msgid "Next"
-msgstr "Siguiente"
-
-#: src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Ir a la siguiente foto"
-
-#: src/SlideshowPage.vala:184
-msgid "Change slideshow settings"
-msgstr "Cambiar la configuración de la presentación"
-
-#. An entire slideshow set might be missing, so check for a loop.
-#: src/SlideshowPage.vala:238
-msgid "All photo source files are missing."
-msgstr "Todos los archivos origen de fotos están perdidos."
-
-#: src/SlideshowPage.vala:270
-msgid "Play"
-msgstr "Reproducir"
-
-#: src/SlideshowPage.vala:271
-msgid "Continue the slideshow"
-msgstr "Continuar la presentación"
-
-#: src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "Transiciones de diapositiva"
-
-#: src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr "(Ninguna)"
-
-#: src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr "Ninguna"
-
-#: src/slideshow/TransitionEffects.vala:339
-msgid "Random"
-msgstr "Aleatorio"
-
-#: src/tags/Branch.vala:131
-msgid "Tags"
-msgstr "Etiquetas"
-
-#: src/Tag.vala:830
-msgid "untitled"
-msgstr "sin título"
-
-#. multiple videos
-#: src/VideoSupport.vala:490
-msgid "Export Videos"
-msgstr "Exportar vídeos"
-
-#: ui/set_background_dialog.ui:15
-msgid "Set as Desktop Background"
-msgstr "Establecer como fondo de escritorio"
-
-#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
-msgid "Use for Desktop"
-msgstr "Usar para el escritorio"
-
-#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
-msgid "Use for Lock Screen"
-msgstr "Usar para la pantalla de bloqueo"
-
-#: ui/set_background_slideshow_dialog.ui:15
-msgid "Set as Desktop Slideshow"
-msgstr "Establecer como pase de diapositivas de escritorio"
-
-#: ui/set_background_slideshow_dialog.ui:33
-msgid "Show each photo for"
-msgstr "Mostrar cada foto para"
-
-#: ui/set_background_slideshow_dialog.ui:45
-msgid "period of time"
-msgstr "periodo de tiempo"
-
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Generar un pase de diapositivas de fondo de escritorio"
-
-#: ui/set_background_slideshow_dialog.ui:115
-msgid "How long each photo is shown on the desktop background"
-msgstr "Cuánto tiempo se muestra cada foto en el fondo de escritorio"
-
-#: ui/shotwell.ui:23
-msgid "_Name of search:"
-msgstr "_Nombre de la búsqueda:"
-
-#: ui/shotwell.ui:81
-msgid "_Match"
-msgstr "_Coincidir"
-
-#: ui/shotwell.ui:108
-msgid "of the following:"
-msgstr "de los siguientes:"
-
-#: ui/shotwell.ui:195
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Tamaño de imagen impresa</b>"
-
-#: ui/shotwell.ui:212
-msgid "Use a _standard size:"
-msgstr "Utilizar un tamaño e_stándar:"
-
-#: ui/shotwell.ui:255
-msgid "Use a c_ustom size:"
-msgstr "Utilizar un tamaño p_ersonalizado:"
-
-#: ui/shotwell.ui:345
-msgid "_Match photo aspect ratio"
-msgstr "E_mparejar relación de aspecto de la foto"
-
-#: ui/shotwell.ui:369
-msgid "_Autosize:"
-msgstr "Tamaño _automático:"
-
-#: ui/shotwell.ui:409
-msgid "<b>Titles</b>"
-msgstr "<b>Títulos</b>"
-
-#: ui/shotwell.ui:426
-msgid "Print image _title"
-msgstr "Imprimir el _título de la imagen"
-
-#: ui/shotwell.ui:470
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Resolución de píxeles</b>"
-
-#: ui/shotwell.ui:490
-msgid "_Output photo at:"
-msgstr "_Salida de foto en:"
-
-#: ui/shotwell.ui:525
-msgid "pixels per inch"
-msgstr "píxeles por pulgada"
-
-#: ui/shotwell.ui:559
-msgid "label"
-msgstr "etiqueta"
-
-#: ui/shotwell.ui:681
-msgid "Shotwell Preferences"
-msgstr "Preferencias de Shotwell"
-
-#: ui/shotwell.ui:730
-msgid "white"
-msgstr "blanco"
-
-#: ui/shotwell.ui:757
-msgid "black"
-msgstr "negro"
-
-#: ui/shotwell.ui:805
-msgid "_Watch library directory for new files"
-msgstr "_Vigilar mi colección en busca de archivos nuevos"
-
-#: ui/shotwell.ui:834
-msgid "Metadata"
-msgstr "Metadatos"
-
-#: ui/shotwell.ui:854
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr ""
-"Escribir etiquetas, títulos y otros _metadatos en los archivos de fotos"
-
-#: ui/shotwell.ui:880
-msgid "Display"
-msgstr "Mostrar"
-
-#: ui/shotwell.ui:901
-msgid "_Import photos to:"
-msgstr "_Importar fotos a:"
-
-#: ui/shotwell.ui:924
-msgid "_Background:"
-msgstr "_Fondo:"
-
-#: ui/shotwell.ui:947
-msgid "Importing"
-msgstr "Importando"
-
-#: ui/shotwell.ui:970
-msgid "_Directory structure:"
-msgstr "Estructura de _carpetas:"
-
-#: ui/shotwell.ui:1009
-msgid "_Pattern:"
-msgstr "_Patrón:"
-
-#: ui/shotwell.ui:1091
-msgid "Example:"
-msgstr "Ejemplo:"
-
-#: ui/shotwell.ui:1108
-msgid "R_ename imported files to lowercase"
-msgstr "R_enombrar los archivos importados a minúsculas"
-
-#: ui/shotwell.ui:1137
-msgid "RAW Developer"
-msgstr "Revelador RAW"
-
-#: ui/shotwell.ui:1172
-msgid "De_fault:"
-msgstr "_Predeterminado:"
-
-#: ui/shotwell.ui:1226
-msgid "E_xternal photo editor:"
-msgstr "Editor de fotos e_xterno:"
-
-#: ui/shotwell.ui:1242
-msgid "External _RAW editor:"
-msgstr "Editor _RAW externo:"
-
-#: ui/shotwell.ui:1307
-msgid "External Editors"
-msgstr "Editores externos"
-
-#: ui/shotwell.ui:1334
-msgid "Plugins"
-msgstr "Complementos"
-
-#: ui/shotwell.ui:1400
-msgid "_Delay:"
-msgstr "_Retardo:"
-
-#: ui/shotwell.ui:1416
-msgid "_Transition effect:"
-msgstr "Efecto de _transición:"
-
-#: ui/shotwell.ui:1432
-msgid "Transition d_elay:"
-msgstr "R_etraso de transición:"
-
-#: ui/shotwell.ui:1444
-msgid "Show t_itle"
-msgstr "Mostrar tít_ulo"
-
-#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
-msgid "seconds"
-msgstr "segundos"
-
-#~ msgid "Save Details..."
-#~ msgstr "Guardar detalles…"
-
-#~ msgid "Save _As..."
-#~ msgstr "G_uardar como…"
-
-#~ msgid "Importing..."
-#~ msgstr "Importando…"
-
-#~ msgid "Preparing to import..."
-#~ msgstr "Preparando importación…"
-
-#~ msgid "_Import From Folder..."
-#~ msgstr "_Importar desde carpeta…"
-
-#~ msgid "Import From _Application..."
-#~ msgstr "Importar desde _aplicación…"
-
-#~ msgid "Set as _Desktop Slideshow..."
-#~ msgstr "Establecer como pase de _diapositivas de escritorio…"
-
-#~ msgid "Re_name Event..."
-#~ msgstr "Re_nombrar evento…"
-
-#~ msgid "_Export..."
-#~ msgstr "_Exportar…"
-
-#~ msgid "_Print..."
-#~ msgstr "_Imprimir…"
-
-#~ msgid "Pu_blish..."
-#~ msgstr "Pu_blicar…"
-
-#~ msgid "Edit _Title..."
-#~ msgstr "Editar el _título…"
-
-#~ msgid "Edit _Comment..."
-#~ msgstr "Editar _comentario…"
-
-#~ msgid "Edit Event _Comment..."
-#~ msgstr "Editar _comentario del evento…"
-
-#~ msgid "_Adjust Date and Time..."
-#~ msgstr "_Ajustar fecha y hora…"
-
-#~ msgid "Add _Tags..."
-#~ msgstr "Añadir e_tiquetas…"
-
-#~ msgid "_Add Tags..."
-#~ msgstr "_Añadir etiquetas…"
-
-#~ msgid "Send _To..."
-#~ msgstr "En_viar a…"
-
-#~ msgid "Send T_o..."
-#~ msgstr "En_viar a…"
-
-#~ msgid "_Find..."
-#~ msgstr "Buscar…"
-
-#~ msgid "Modif_y Tags..."
-#~ msgstr "Modif_icar etiquetas…"
-
-#~ msgid "_Edit..."
-#~ msgstr "_Editar…"
-
-#~ msgid "%-I:%M %p"
-#~ msgstr "%-I:%M %p"
-
-#~ msgid "%-I:%M:%S %p"
-#~ msgstr "%-I:%M:%S %p"
-
-#~ msgid "Intro message replaced at runtime"
-#~ msgstr "Mensaje de introducción reemplazado en tiempo de ejecución"
-
-#~ msgid "'Publishing to $url as $username' (populated in application code)"
-#~ msgstr ""
-#~ "«Publicando en $url como $username» (informado en el código de la "
-#~ "aplicación)"
-
-#~ msgid "you are logged in rajce as $name"
-#~ msgstr "ha iniciado sesión en rajce como $name"
-
-#~ msgid "$mediatype will appear in"
-#~ msgstr "$mediatype aparecerá en"
-
-#~ msgid "Copyright 2009-2015 Yorba Foundation"
-#~ msgstr "Copyright 2009-2015 Fundación Yorba"
-
-#~ msgid "Visit the Yorba web site"
-#~ msgstr "Visitar el sitio web de Yorba"
-
-#, fuzzy
-#~| msgid ""
-#~| "A file required for publishing is unavailable. Publishing to Flickr "
-#~| "can't continue."
-#~ msgid "A file required for publishing is unavailable. Publishing to "
-#~ msgstr ""
-#~ "No está disponible un archivo necesario para publicar. La publicación en "
-#~ "Flickr no puede continuar."
-
-#~ msgid "Only _Remove"
-#~ msgstr "Solo quita_r"
-
-#~ msgid "Shotwell is configured to import photos to your home directory.\n"
-#~ msgstr ""
-#~ "Shotwell está configurado para importar fotos desde su carpeta personal.\n"
-
-#~ msgid ""
-#~ " (text depends on fb username and is modified in the app - \n"
-#~ "anything put into this field won't display)"
-#~ msgstr ""
-#~ " (el texto depende del nombre de usuario de Facebook y se modifica en la "
-#~ "aplicación;\n"
-#~ "no se mostrará el contenido de este campo)"
-
-#~ msgid ""
-#~ "You are logged into Flickr as (name).\n"
-#~ "\n"
-#~ "(this label's string is populated and set inside the code, \n"
-#~ "so changes made here will not display)"
-#~ msgstr ""
-#~ "Ha iniciado sesión en Flickr como (name).\n"
-#~ "\n"
-#~ "(la etiqueta de esta cadena se rellena y se ubica en el código, \n"
-#~ "y los cambios hechos aquí no se mostrarán)"
-
-#~ msgid "_visibility label (populated in the code)"
-#~ msgstr "etiqueta de _visibilidad (rellenada en el código)"
-
-#~ msgid ""
-#~ "$mediatype will appear in\n"
-#~ "(populated in code)"
-#~ msgstr ""
-#~ "$mediatype aparecerá en\n"
-#~ "(rellenado en el código)"
-
-#~ msgid ""
-#~ "You are logged into Tumblr as (name).\n"
-#~ "\n"
-#~ "(this label's string is populated and set inside the code, \n"
-#~ "so changes made here will not display)"
-#~ msgstr ""
-#~ "Ha iniciado sesión en Tumblr como (nombre).\n"
-#~ "\n"
-#~ "(la etiqueta de esta cadena se rellena y se ubica en el código, \n"
-#~ "y los cambios hechos aquí no se mostrarán)"
+# po/shotwell-core/shotwell.pot

+# PO message string template file for Shotwell Core Components

+# Copyright 2016 Software Freedom Conservancy Inc.

+# See COPYING for license.

+#

+#

+# Translators:

+# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2011-2013

+# Alejandro Johnson C. <alejandrojohnson750@hotmail.com>, 2012

+# Andres <andreshko9@hotmail.com>, 2011

+# Claudio Rodrigo Pereyra Diaz <elsupergomez@gmail.com>, 2012-2013

+# Jorge González <aloriel@gmail.com>, 2011

+# Matias Menich <und34d@gmail.com>, 2012

+# Rodrigo Cares <rcares@gmail.com>, 2012-2013

+# verayin <vera@yorba.org>, 2011

+# freddy  sequera <nemecis000@gmail.com>, 2011

+# Jorge González <aloriel@gmail.com>, 2011

+# lsbeeler <lucas@yorba.org>, 2011

+# Matias Menich <und34d@gmail.com>, 2012

+# Rodrigo Cares <rcares@gmail.com>, 2012

+#

+#

+#

+#

+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2015, 2016.
, 2016.

+#

+msgid ""

+msgstr ""

+"Project-Id-Version: shotwell-0.15\n"

+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"

+"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"

+"POT-Creation-Date: 2016-11-10 11:50+0000\n"

+"PO-Revision-Date: 2016-11-11 \n"

+"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"

+"Language-Team: es <gnome-es-list@gnome.org>\n"

+"Language: es\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: Gtranslator 2.91.6\n"

+

+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:115

+#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300

+msgid "Shotwell"

+msgstr "Shotwell"

+

+#: misc/shotwell.appdata.xml.in:9

+msgid "Popular photo manager"

+msgstr "Gestor de fotos popular"

+

+#: misc/shotwell.appdata.xml.in:11

+msgid ""

+"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "

+"desktop. It allows you to import photos from your camera or disk, organize "

+"them by date and subject matter, even ratings. It also offers basic photo "

+"editing, like crop, red-eye correction, color adjustments, and straighten. "

+"Shotwell’s non-destructive photo editor does not alter your master photos, "

+"making it easy to experiment and correct errors."

+msgstr ""

+"Shotwell es un organizador de fotos fácil de usar, diseñado para el "

+"escritorio GNOME. Le permite importar fotos de su cámara o disco, "

+"organizarlas por fecha y asunto o por puntuación. También ofree edición "

+"básica, como recortar, eliminar ojos rojos, ajustes de color y enderezar. El "

+"editor no destructivo de Shotwell no altera las fotos originales, haciendo "

+"que sea más fácil experimentar y corregir errores."

+

+#: misc/shotwell.appdata.xml.in:18

+msgid ""

+"When ready, Shotwell can upload your photos to various web sites, such as "

+"Facebook, Flickr, Picasa (Google Plus), and more."

+msgstr ""

+"Cuando esté preparado, Shotwell puede subir sus fotos a varios sitios web, "

+"tales como Facebook, Flickr, Picasa (Google Plus) y más"

+

+#: misc/shotwell.appdata.xml.in:22

+msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."

+msgstr "Shotwell soporta JPEG, PNG, TIFF, y varios formatos de archivos RAW."

+

+#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17

+msgid "Photo Manager"

+msgstr "Gestor de fotos"

+

+#: misc/shotwell.desktop.in.in:6

+msgid "Organize your photos"

+msgstr "Organice sus fotos"

+

+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!

+#: misc/shotwell.desktop.in.in:8

+msgid ""

+"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"

+"organize;photo;photographs;photos;picture;pictures;photography;print;publish;"

+"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"

+msgstr ""

+"álbum;cámara;cámaras;recortar;editar;mejorar;exportar;galería;imagen;"

+"imágenes;importar;organizar;foto;fotográfos;fotos;fotografía;imprimir;"

+"publicar;rotar;compartir;etiquetas;vídeo;facebook;flickr;picasa;youtube;"

+"piwigo;"

+

+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!

+#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8

+msgid "shotwell"

+msgstr "shotwell"

+

+#: misc/shotwell-viewer.desktop.in.in:4

+msgid "Shotwell Viewer"

+msgstr "Visor de fotos Shotwell"

+

+#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18

+msgid "Photo Viewer"

+msgstr "Visor de fotos"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:6

+msgid "authentication token"

+msgstr "testigo de autenticación"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:7

+msgid "Yandex-Fotki authentication token, if logged in."

+msgstr "Testigo de autenticación en Yandex-Fotki, si ha iniciado sesión."

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:14

+msgid "Token"

+msgstr "Testigo"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:15

+msgid "The token to access tumblr"

+msgstr "El testigo para acceder a Tumblr"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:20

+msgid "Secret token"

+msgstr "Testigo secreto"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:21

+msgid "The secret token to sign oauth requests"

+msgstr "El testigo secreto para firmar peticiones oauth"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:26

+#: misc/org.yorba.shotwell.gschema.xml:486

+msgid "default size"

+msgstr "tamaño predeterminado"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:27

+msgid ""

+"A numeric code representing the default size for photos uploaded to Tumblr"

+msgstr ""

+"Un código numérico que representa el tamaño predeterminado de las fotos "

+"subidas a Tumblr"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:32

+msgid "default blog"

+msgstr "blog prederminado"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:33

+msgid "The name of the default blog of the user, if any"

+msgstr "El nombre del blog predeterminado del usuario, si existe"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:40

+msgid "Rajce URL"

+msgstr "URL de Rajce"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:41

+msgid "URL of the Rajce server."

+msgstr "URL del servidor Rajce."

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:46

+#: misc/org.yorba.shotwell.gschema.xml:454

+#: misc/org.yorba.shotwell.gschema.xml:512

+#: misc/org.yorba.shotwell.gschema.xml:568

+msgid "username"

+msgstr "nombre de usuario"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:47

+msgid "Rajce username, if logged in."

+msgstr "Nombre de usuario de Rajce, si ha iniciado sesión."

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:52

+msgid "token"

+msgstr "testigo"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:53

+msgid "user token, if remembered."

+msgstr "testigo de usuario, si se recuerda."

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:58

+#: misc/org.yorba.shotwell.gschema.xml:530

+msgid "last category"

+msgstr "última categoría"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:59

+msgid "The last selected Rajce category."

+msgstr "La última categoría de Rajce seleccionada."

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:64

+#: misc/org.yorba.shotwell.gschema.xml:542

+msgid "last photo size"

+msgstr "último tamaño de foto"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:65

+msgid ""

+"A numeric code representing the last photo size preset used when publishing "

+"to Rajce."

+msgstr ""

+"Un código numérico que representa el último tamaño de foto predefinido usado "

+"para publicar en Rajce."

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:70

+msgid "remember"

+msgstr "recordar"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:71

+msgid "If true, remember last login."

+msgstr "Si es cierto, recordar el último inicio de sesión"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:76

+msgid "hide album"

+msgstr "ocultar álbum"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:77

+msgid "If true, hide the newly created Rajce album."

+msgstr "Si es cierto, ocultar el nuevo álbum creado en Rajce."

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:82

+msgid "open album in web browser"

+msgstr "abrir álbum en el navegador"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:83

+msgid ""

+"If true, open target album in the web browser just after uploading photos"

+msgstr ""

+"Si es cierto, abrir el álbum objetivo en el navegador web justo después de "

+"subir las fotos"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:88

+#: misc/org.yorba.shotwell.gschema.xml:434

+#: misc/org.yorba.shotwell.gschema.xml:472

+#: misc/org.yorba.shotwell.gschema.xml:498

+#: misc/org.yorba.shotwell.gschema.xml:548

+#: misc/org.yorba.shotwell.gschema.xml:592

+msgid "remove sensitive info from uploads"

+msgstr "eliminar contenido comprometido de las subidas"

+

+#: misc/org.yorba.shotwell-extras.gschema.xml:89

+msgid ""

+"Whether images being uploaded to Rajce should have their metadata removed "

+"first"

+msgstr ""

+"Indica si se deben eliminar los metadatos antes de subir las imágenes a Rajce"

+

+#: misc/org.yorba.shotwell.gschema.xml:23

+msgid "display basic properties"

+msgstr "mostrar propiedades básicas"

+

+#: misc/org.yorba.shotwell.gschema.xml:24

+msgid "True if the basic properties pane is to be displayed, false otherwise."

+msgstr ""

+"Cierto si se muestra el panel de propiedades básicas, falso en otro caso."

+

+#: misc/org.yorba.shotwell.gschema.xml:29

+msgid "display extended properties"

+msgstr "mostrar propiedades extendidas"

+

+#: misc/org.yorba.shotwell.gschema.xml:30

+msgid ""

+"True if the extended properties window is to be displayed, false otherwise."

+msgstr ""

+"Cierto si se muestra la ventana de propiedades ampliadas, falso en otro caso."

+

+#: misc/org.yorba.shotwell.gschema.xml:35

+msgid "display sidebar"

+msgstr "mostrar barra lateral"

+

+#: misc/org.yorba.shotwell.gschema.xml:36

+msgid "True if the sidebar is to be displayed, false otherwise."

+msgstr "Cierto si se debe mostrar la barra lateral, falso en otro caso."

+

+#: misc/org.yorba.shotwell.gschema.xml:41

+msgid "display toolbar"

+msgstr "mostrar barra de herramientas"

+

+#: misc/org.yorba.shotwell.gschema.xml:42

+msgid "True if the bottom toolbar is to be displayed, false otherwise."

+msgstr ""

+"Cierto si se debe mostrar la barra de herramientas inferior, falso en otro "

+"caso."

+

+#: misc/org.yorba.shotwell.gschema.xml:47

+msgid "display search bar"

+msgstr "mostrar barra de búsqueda"

+

+#: misc/org.yorba.shotwell.gschema.xml:48

+msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."

+msgstr ""

+"Cierto si se muestra la barra de herramientas de buscar/filtrar, falso en "

+"otro caso."

+

+#: misc/org.yorba.shotwell.gschema.xml:53

+msgid "display photo titles"

+msgstr "mostrar títulos de las fotos"

+

+#: misc/org.yorba.shotwell.gschema.xml:54

+msgid ""

+"True if photo titles are to be displayed beneath thumbnails in collection "

+"views, false otherwise."

+msgstr ""

+"Cierto si se deben mostrar los títulos de las fotos debajo de las miniaturas "

+"en la vista de la colección, falso en otro caso."

+

+#: misc/org.yorba.shotwell.gschema.xml:59

+msgid "display photo comments"

+msgstr "mostrar comentarios de las fotos"

+

+#: misc/org.yorba.shotwell.gschema.xml:60

+msgid ""

+"True if photo comments are to be displayed beneath thumbnails in collection "

+"views, false otherwise."

+msgstr ""

+"Cierto si se deben mostrar los comentarios debajo de las miniaturas en la "

+"vista de la colección, falso en otro caso."

+

+#: misc/org.yorba.shotwell.gschema.xml:65

+msgid "display event comments"

+msgstr "mostrar comentarios del evento"

+

+#: misc/org.yorba.shotwell.gschema.xml:66

+msgid ""

+"True if event comments are to be displayed beneath thumbnails in event "

+"views, false otherwise."

+msgstr ""

+"Cierto si se deben mostrar los comentarios debajo de las miniaturas en la "

+"vista de la colección, falso en otro caso."

+

+#: misc/org.yorba.shotwell.gschema.xml:71

+msgid "display photo tags"

+msgstr "mostrar etiquetas de las fotos"

+

+#: misc/org.yorba.shotwell.gschema.xml:72

+msgid ""

+"True if photo tags are to be listed beneath thumbnails in collection views, "

+"false otherwise."

+msgstr ""

+"Cierto si se deben poner en una lista las etiquetas de las fotos debajo de "

+"las miniaturas en la vista de colección."

+

+#: misc/org.yorba.shotwell.gschema.xml:77

+msgid "display photo ratings"

+msgstr "mostrar puntuación de las fotos"

+

+#: misc/org.yorba.shotwell.gschema.xml:78

+#| msgid ""

+#| "True if the basic properties pane is to be displayed, false otherwise."

+msgid ""

+"True if a photo’s rating should be displayed as overlaid trinket, false "

+"otherwise."

+msgstr ""

+"Cierto si se muestra el panel de propiedades básicas, falso en otro caso."

+

+#: misc/org.yorba.shotwell.gschema.xml:83

+msgid "rating filter level"

+msgstr "nivel de filtrado de puntuación"

+

+#: misc/org.yorba.shotwell.gschema.xml:84

+msgid ""

+"Determines how to filter photos based on their ratings. 1: Rejected or "

+"better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "

+"or better, 6: Four or better, 7: Five or better."

+msgstr ""

+"Determina cómo filtrar las fotos según sus calificaciones. 1: rechazada o "

+"mejor, 2: sin puntuar o mejor, 3: una o mejor, 4: dos o mejor, 5: tres o "

+"mejor, 6: cuatro o mejor, 7: cinco o mejor"

+

+#: misc/org.yorba.shotwell.gschema.xml:89

+msgid "sort events ascending"

+msgstr "ordenar eventos ascendentemente"

+

+#: misc/org.yorba.shotwell.gschema.xml:90

+msgid "True if events should be sorted ascending, false if descending."

+msgstr ""

+"Cierto si se deben clasificar los eventos ascendentemente, falso si "

+"descendentemente."

+

+#: misc/org.yorba.shotwell.gschema.xml:95

+msgid "sort library photos ascending"

+msgstr "ordenar fotos de la biblioteca ascendentemente"

+

+#: misc/org.yorba.shotwell.gschema.xml:96

+msgid "True if library photos should be sorted ascending, false if descending."

+msgstr ""

+"Cierto si se debe clasificar la biblioteca de fotos ascendentemente, falso "

+"si descendentemente."

+

+#: misc/org.yorba.shotwell.gschema.xml:101

+msgid "sort library photos criteria"

+msgstr "criterio de ordenación de fotos en la biblioteca"

+

+#: misc/org.yorba.shotwell.gschema.xml:102

+msgid ""

+"A numeric code that specifies the sort criteria for photos in library views."

+msgstr ""

+"Un código numérico que representa el criterio de ordenación de las fotos el "

+"vistas de biblioteca."

+

+#: misc/org.yorba.shotwell.gschema.xml:107

+msgid "sort event photos ascending"

+msgstr "ordenar fotos de eventos ascendentemente"

+

+#: misc/org.yorba.shotwell.gschema.xml:108

+msgid "True if event photos should be sorted ascending, false if descending."

+msgstr ""

+"Cierto si se deben ordenar las fotos de eventos ascendentemente, falso si es "

+"descendentemente."

+

+#: misc/org.yorba.shotwell.gschema.xml:113

+msgid "sort event photos criteria"

+msgstr "criterio de ordenación de las fotos de eventos"

+

+#: misc/org.yorba.shotwell.gschema.xml:114

+msgid "Specifies the sort criteria for event photos."

+msgstr "Especifica el criterio de ordenación de las fotos de eventos."

+

+#: misc/org.yorba.shotwell.gschema.xml:119

+msgid "use 24 hour time"

+msgstr "usar formato de 24 horas"

+

+#: misc/org.yorba.shotwell.gschema.xml:120

+msgid ""

+"True if should display times with a 24 hour clock, false if times should use "

+"AM/PM notation."

+msgstr ""

+"Cierto si se debe mostrar la hora con formato 24 horas, falso si se debe "

+"usar el formato am/pm."

+

+#: misc/org.yorba.shotwell.gschema.xml:125

+msgid "keep relative time between photos"

+msgstr "mantener el tiempo relativo entre fotos"

+

+#: misc/org.yorba.shotwell.gschema.xml:126

+msgid ""

+"True if when adjusting time/date of photos, relative time should be "

+"maintained. False if all photos should be set to the same time."

+msgstr ""

+"Cierto si cuando se ajusta la hora y la fecha de las fotos se mantiene la "

+"hora relativa. Falso si todas las fotos deben ajustarse a la misma hora."

+

+#: misc/org.yorba.shotwell.gschema.xml:131

+msgid "modify original photo files"

+msgstr "modificar archivos de fotos originales"

+

+#: misc/org.yorba.shotwell.gschema.xml:132

+msgid ""

+"True if when adjusting time/date of photos, the original files should be "

+"modified as well. False if changes are made only in the database."

+msgstr ""

+"Cierto si cuando ajustamos la hora y la fecha de las fotos los archivos "

+"originales también se deben modificar. Falso si los cambios sólo se hacen en "

+"la base de datos."

+

+#: misc/org.yorba.shotwell.gschema.xml:137

+msgid "show welcome dialog on startup"

+msgstr "mostrar diálogo de bienvenida al inicio"

+

+#: misc/org.yorba.shotwell.gschema.xml:138

+msgid ""

+"True if, when on startup, a welcome dialog should be shown. False if it "

+"should not be shown."

+msgstr ""

+"Cierto si se debe mostrar un diálogo de bienvenida al inicio. Falso si no se "

+"debe mostrar."

+

+#: misc/org.yorba.shotwell.gschema.xml:143

+msgid "sidebar position"

+msgstr "posición de la barra lateral"

+

+#: misc/org.yorba.shotwell.gschema.xml:144

+msgid "The width, in pixels, of the sidebar"

+msgstr "La anchura en píxeles de la barra lateral"

+

+#: misc/org.yorba.shotwell.gschema.xml:149

+msgid "photo thumbnail scale"

+msgstr "escala de la miniatura de la foto"

+

+#: misc/org.yorba.shotwell.gschema.xml:150

+msgid "The scale of photo thumbnails, ranging from 72 to 360."

+msgstr "La escala de las miniaturas de las fotos, en un rango de 72 a 360."

+

+#: misc/org.yorba.shotwell.gschema.xml:155

+msgid "pin toolbar state"

+msgstr "estado de anclaje de la barra de herramientas"

+

+#: misc/org.yorba.shotwell.gschema.xml:156

+msgid "Pin toolbar in fullscreen, or not."

+msgstr "Anclar o no la barra de herramientas en modo a pantalla completa."

+

+#: misc/org.yorba.shotwell.gschema.xml:161

+msgid "background color"

+msgstr "color de fondo"

+

+#: misc/org.yorba.shotwell.gschema.xml:162

+msgid "A grayscale color for use as the background color."

+msgstr "La escala de color que usar como color de fondo."

+

+#: misc/org.yorba.shotwell.gschema.xml:167

+msgid "Selection state of “hide photos” option"

+msgstr "Estado de la selección de la opción «ocultar fotos»"

+

+#: misc/org.yorba.shotwell.gschema.xml:168

+msgid ""

+"Last used selection state of the “hide photos already imported” option in "

+"the import page."

+msgstr ""

+"Último estado de selección usado de la opción «ocultar fotos ya importadas» "

+"en la página de importación."

+

+#: misc/org.yorba.shotwell.gschema.xml:175

+msgid "delay"

+msgstr "retardo"

+

+#: misc/org.yorba.shotwell.gschema.xml:176

+msgid "Delay (in seconds) between photos in the slideshow."

+msgstr "Retardo (en segundos) entre fotos en la presentación de diapositivas."

+

+#: misc/org.yorba.shotwell.gschema.xml:181

+msgid "transition delay"

+msgstr "retraso de la transición"

+

+#: misc/org.yorba.shotwell.gschema.xml:182

+msgid ""

+"The time (in seconds) that a transition runs between photos in a slideshow"

+msgstr ""

+"El tiempo (en segundos) que transcurre entre las fotos en una presentación "

+"de diapositivas"

+

+#: misc/org.yorba.shotwell.gschema.xml:187

+msgid "transition effect id"

+msgstr "ID del efecto de transición"

+

+#: misc/org.yorba.shotwell.gschema.xml:188

+msgid ""

+"The name of the transition effect that will be used between photos when "

+"running a slideshow"

+msgstr ""

+"El nombre del efecto de transición que se usará entre fotos al hacer una "

+"presentación"

+

+#: misc/org.yorba.shotwell.gschema.xml:193

+msgid "Show title"

+msgstr "Mostrar título"

+

+#: misc/org.yorba.shotwell.gschema.xml:194

+msgid "Whether to show the title of a photo during the slideshow"

+msgstr ""

+"Indica si se debe mostrar el título de una foto durante la presentación de "

+"diapositivas"

+

+#: misc/org.yorba.shotwell.gschema.xml:201

+msgid "maximize library window"

+msgstr "maximizar ventana de biblioteca"

+

+#: misc/org.yorba.shotwell.gschema.xml:202

+msgid "True if library application is maximized, false otherwise."

+msgstr ""

+"Cierto si la aplicación de biblioteca está maximizada, falso en otro caso."

+

+#: misc/org.yorba.shotwell.gschema.xml:207

+msgid "width of library window"

+msgstr "anchura de la ventana de biblioteca"

+

+#: misc/org.yorba.shotwell.gschema.xml:208

+msgid "The last recorded width of the library application window."

+msgstr ""

+"La última anchura guardada de la ventana de la aplicación de biblioteca."

+

+#: misc/org.yorba.shotwell.gschema.xml:213

+msgid "height of library window"

+msgstr "altura de la ventana de biblioteca"

+

+#: misc/org.yorba.shotwell.gschema.xml:214

+msgid "The last recorded height of the library application window."

+msgstr ""

+"La última altura guardada de la ventana de la aplicación de biblioteca."

+

+#: misc/org.yorba.shotwell.gschema.xml:219

+msgid "maximize direct-edit window"

+msgstr "maximizar ventana de edición directa"

+

+#: misc/org.yorba.shotwell.gschema.xml:220

+msgid "True if direct-edit application is maximized, false otherwise."

+msgstr ""

+"Cierto si la ventana de edición directa está maximizada, falso en otro caso."

+

+#: misc/org.yorba.shotwell.gschema.xml:225

+msgid "width of direct-edit window"

+msgstr "anchura de la ventana de edición directa"

+

+#: misc/org.yorba.shotwell.gschema.xml:226

+msgid "The last recorded width of the direct-edit application window."

+msgstr "La última anchura guardada de la ventana de edición directa."

+

+#: misc/org.yorba.shotwell.gschema.xml:231

+msgid "height of direct-edit window"

+msgstr "altura de la ventana de edición directa"

+

+#: misc/org.yorba.shotwell.gschema.xml:232

+msgid "The last recorded height of the direct-edit application window."

+msgstr "La última altura guardada de la ventana de edición directa."

+

+#: misc/org.yorba.shotwell.gschema.xml:237

+msgid "sidebar divider position"

+msgstr "posición del divisor de la barra lateral"

+

+#: misc/org.yorba.shotwell.gschema.xml:238

+msgid ""

+"The last recorded position of the divider between the sidebar and view in "

+"library application window."

+msgstr ""

+"La última posición registrada del divisor entre la barra lateral y la vista "

+"de la ventana de la aplicación de la biblioteca."

+

+#: misc/org.yorba.shotwell.gschema.xml:245

+msgid "import directory"

+msgstr "importar carpeta"

+

+#: misc/org.yorba.shotwell.gschema.xml:246

+msgid "Directory in which imported photo files are placed."

+msgstr "Carpeta en la que se guardan los archivos de fotos importadas."

+

+#: misc/org.yorba.shotwell.gschema.xml:251

+msgid "watch library directory for new files"

+msgstr "vigilar carpeta de biblioteca en busca de archivos nuevos"

+

+#: misc/org.yorba.shotwell.gschema.xml:252

+msgid ""

+"If true, files added to the library directory are automatically imported."

+msgstr ""

+"Si es cierto si los archivos añadidos a la carpeta de la biblioteca se "

+"importan automáticamente."

+

+#: misc/org.yorba.shotwell.gschema.xml:257

+msgid "write metadata to master files"

+msgstr "escribir metadatos en archivos maestros"

+

+#: misc/org.yorba.shotwell.gschema.xml:258

+msgid ""

+"If true, changes to metadata (tags, titles, etc.) are written to the master "

+"photo file."

+msgstr ""

+"Si es cierto, los cambios en los metadatos (etiquetas, títulos, etc.) se "

+"escriben al archivo de foto maestro."

+

+#: misc/org.yorba.shotwell.gschema.xml:263

+msgid "use lowercase filenames"

+msgstr "usar nombres de archivos en minúscula"

+

+#: misc/org.yorba.shotwell.gschema.xml:264

+msgid ""

+"If true, Shotwell will convert all filenames to lowercase when importing "

+"photo files"

+msgstr ""

+"Si es cierto, Shotwell convertirá todos los nombres de archivos en "

+"minúsculas cuando importe archivos de fotos"

+

+#: misc/org.yorba.shotwell.gschema.xml:269

+msgid "directory pattern"

+msgstr "patrón de carpetas"

+

+#: misc/org.yorba.shotwell.gschema.xml:270

+msgid ""

+"A string encoding a naming pattern that will be used to name photo "

+"directories on import."

+msgstr ""

+"Una cadena que codifica un patrón de nombre que se utilizará para nombrar "

+"las carpetas de fotos en la importación."

+

+#: misc/org.yorba.shotwell.gschema.xml:275

+msgid "directory pattern custom"

+msgstr "Patrón de carpetas personalizadas"

+

+#: misc/org.yorba.shotwell.gschema.xml:276

+msgid ""

+"A string encoding a custom naming pattern that will be used to name photo "

+"directories on import."

+msgstr ""

+"Una cadena que codifica un patrón de nombre que se utilizará para nombrar "

+"las carpetas de fotos en la importación."

+

+#: misc/org.yorba.shotwell.gschema.xml:281

+msgid "RAW developer default"

+msgstr "desarrollador RAW predeterminado"

+

+#: misc/org.yorba.shotwell.gschema.xml:282

+msgid "Default option for which RAW developer Shotwell will use."

+msgstr "Opción predeterminada que utilizará el desarrollador RAW Shotwell."

+

+#: misc/org.yorba.shotwell.gschema.xml:289

+msgid "Most-recently-used crop aspect ratio menu choice."

+msgstr "Elección más reciente del menú de relación de aspecto del recorte."

+

+#: misc/org.yorba.shotwell.gschema.xml:290

+msgid "A numeric code representing the last crop menu choice the user made."

+msgstr ""

+"Un código numérico que representa la última elección del menú de recortar "

+"que hizo el usuario."

+

+#: misc/org.yorba.shotwell.gschema.xml:294

+msgid "Most-recently-used crop custom aspect ratio’s numerator."

+msgstr ""

+"Numerador utilizado más recientemente de relación de aspecto del recorte "

+"personalizado."

+

+#: misc/org.yorba.shotwell.gschema.xml:295

+msgid ""

+"A nonzero, positive integer representing the width part of the last custom "

+"crop ratio the user entered."

+msgstr ""

+"Un número entero positivo no cero que representa el ancho de la última "

+"relación del recorte personalizado que el usuario introdujo."

+

+#: misc/org.yorba.shotwell.gschema.xml:299

+msgid "Most-recently-used crop custom aspect ratio’s denominator."

+msgstr ""

+"Denominador utilizado más recientemente de relación de aspecto del recorte "

+"personalizado."

+

+#: misc/org.yorba.shotwell.gschema.xml:300

+msgid ""

+"A nonzero, positive integer representing the height part of the last custom "

+"crop ratio the user entered."

+msgstr ""

+"Un número entero positivo no cero que representa la altura de la última "

+"relación del recorte personalizado que el usuario introdujo."

+

+#: misc/org.yorba.shotwell.gschema.xml:307

+msgid "external photo editor"

+msgstr "editor de fotos externo"

+

+#: misc/org.yorba.shotwell.gschema.xml:308

+msgid "External application used to edit photos."

+msgstr "Aplicación externa usada para editar fotos."

+

+#: misc/org.yorba.shotwell.gschema.xml:313

+msgid "external raw editor"

+msgstr "editor RAW externo"

+

+#: misc/org.yorba.shotwell.gschema.xml:314

+msgid "External application used to edit RAW photos."

+msgstr "Aplicación externa usada para editar fotos RAW."

+

+#: misc/org.yorba.shotwell.gschema.xml:352

+#: misc/org.yorba.shotwell.gschema.xml:353

+msgid "Setting in export dialog: how to trim images"

+msgstr ""

+"Configurando el cuadro de diálogo de exportación: cómo recortar imágenes"

+

+#: misc/org.yorba.shotwell.gschema.xml:358

+msgid "export metadata"

+msgstr "exportar metadatos"

+

+#: misc/org.yorba.shotwell.gschema.xml:359

+msgid "Setting in export dialog: option to export metadata"

+msgstr ""

+"Configurando el cuadro de diálogo de exportación: opción para exportar "

+"metadatos"

+

+#: misc/org.yorba.shotwell.gschema.xml:364

+msgid "format setting, special value"

+msgstr "configuración de formato, valor especial"

+

+#: misc/org.yorba.shotwell.gschema.xml:365

+msgid "Setting in export dialog: format setting, special value"

+msgstr ""

+"Configurando el cuadro de diálogo de exportación: configuración de formato, "

+"valor especial"

+

+#: misc/org.yorba.shotwell.gschema.xml:370

+msgid "format setting, type value"

+msgstr "configuración de formato, valor de tipo"

+

+#: misc/org.yorba.shotwell.gschema.xml:371

+msgid "Setting in export dialog: format setting, type value"

+msgstr ""

+"Configurando el cuadro de diálogo de exportación: configuración de formato, "

+"valor de tipo"

+

+#: misc/org.yorba.shotwell.gschema.xml:376

+msgid "JPEG quality option"

+msgstr "Opción de calidad JPEG"

+

+#: misc/org.yorba.shotwell.gschema.xml:377

+msgid "Setting in export dialog: jpeg quality option"

+msgstr ""

+"Configurando el cuadro de diálogo de exportación: opción de calidad JPEG"

+

+#: misc/org.yorba.shotwell.gschema.xml:382

+msgid "maximal size of image"

+msgstr "tamaño máximo de la imagen"

+

+#: misc/org.yorba.shotwell.gschema.xml:383

+msgid "Setting in export dialog: maximal size of image"

+msgstr ""

+"Configurando el cuadro de diálogo de exportación: tamaño máximo de la imagen"

+

+#: misc/org.yorba.shotwell.gschema.xml:390

+msgid "last used publishing service"

+msgstr "último servicio de publicación usado"

+

+#: misc/org.yorba.shotwell.gschema.xml:391

+#: misc/org.yorba.shotwell.gschema.xml:397

+msgid ""

+"A numeric code representing the last service to which photos were published"

+msgstr ""

+"Un código numérico que representa el último servicio en el que se publicaron "

+"las fotos"

+

+#: misc/org.yorba.shotwell.gschema.xml:396

+msgid "default publishing service"

+msgstr "servicio de publicación predeterminado"

+

+#: misc/org.yorba.shotwell.gschema.xml:410

+msgid "access token"

+msgstr "testigo de acceso"

+

+#: misc/org.yorba.shotwell.gschema.xml:411

+msgid "Facebook OAuth token for the currently logged in session, if any"

+msgstr ""

+"Testigo OAuth de Facebook para el usuario que ha iniciado sesión "

+"actualmente, si existe"

+

+#: misc/org.yorba.shotwell.gschema.xml:416

+msgid "user i.d."

+msgstr "ID de usuario"

+

+#: misc/org.yorba.shotwell.gschema.xml:417

+msgid "Facebook user i.d. for the currently logged in user, if any"

+msgstr ""

+"ID del usuario de Facebook que ha iniciado sesión actualmente, si existe"

+

+#: misc/org.yorba.shotwell.gschema.xml:422

+msgid "user name"

+msgstr "nombre de usuario"

+

+#: misc/org.yorba.shotwell.gschema.xml:423

+msgid "The name of the currently logged in Facebook user, if any"

+msgstr ""

+"El nombre del usuario que actualmente ha iniciado sesión en Facebook, si "

+"existe"

+

+#: misc/org.yorba.shotwell.gschema.xml:428

+#: misc/org.yorba.shotwell.gschema.xml:460

+msgid "default size code"

+msgstr "código de tamaño predeterminado"

+

+#: misc/org.yorba.shotwell.gschema.xml:429

+msgid ""

+"A numeric code representing the default size for photos published to Facebook"

+msgstr ""

+"Un código numérico que representa el tamaño predeterminado de las fotos "

+"publicadas en Facebook"

+

+#: misc/org.yorba.shotwell.gschema.xml:435

+msgid ""

+"Whether images being uploaded to Facebook should have their metadata removed "

+"first"

+msgstr ""

+"Indica si se deben eliminar los metadatos antes de subir las imágenes a "

+"Facebook"

+

+#: misc/org.yorba.shotwell.gschema.xml:442

+msgid "OAuth Access Phase Token"

+msgstr "Fase de acceso de testigo OAuth"

+

+#: misc/org.yorba.shotwell.gschema.xml:443

+msgid "The authorization token for the currently logged in Flickr user, if any"

+msgstr ""

+"El testigo de autenticación para el usuario que actualmente ha iniciado "

+"sesión en Flickr, si existe"

+

+#: misc/org.yorba.shotwell.gschema.xml:448

+msgid "OAuth Access Phase Token Secret"

+msgstr "Fase de acceso del testigo secreto OAuth"

+

+#: misc/org.yorba.shotwell.gschema.xml:449

+msgid ""

+"The cryptographic secret used to sign requests against the authorization "

+"token for the currently logged in Flickr user, if any"

+msgstr ""

+"El secreto criptográfico usado para firmar peticiones con el testigo de "

+"autenticación para el usuario que actualmente ha iniciado sesión en Flickr, "

+"si existe"

+

+#: misc/org.yorba.shotwell.gschema.xml:455

+msgid "The user name of the currently logged in Flickr user, if any"

+msgstr ""

+"El nombre del usuario que actualmente ha iniciado sesión en Flickr, si existe"

+

+#: misc/org.yorba.shotwell.gschema.xml:461

+msgid ""

+"A numeric code representing the default size for photos published to Flickr"

+msgstr ""

+"Un código numérico que representa el tamaño predeterminado de las fotos "

+"publicadas en Flickr"

+

+#: misc/org.yorba.shotwell.gschema.xml:466

+msgid "default visibility"

+msgstr "visibilidad predeterminada"

+

+#: misc/org.yorba.shotwell.gschema.xml:467

+msgid ""

+"A numeric code representing the default visibility for photos published to "

+"Flickr"

+msgstr ""

+"Un código numérico que representa la visibilidad predeterminada de las fotos "

+"publicadas en Flickr"

+

+#: misc/org.yorba.shotwell.gschema.xml:473

+msgid ""

+"Whether images being uploaded to Flickr should have their metadata removed "

+"first"

+msgstr ""

+"Indica si se deben eliminar los metadatos antes de subir las imágenes a "

+"Flicrk"

+

+#: misc/org.yorba.shotwell.gschema.xml:480

+#: misc/org.yorba.shotwell.gschema.xml:612

+msgid "refresh token"

+msgstr "actualizar testigo"

+

+#: misc/org.yorba.shotwell.gschema.xml:481

+msgid ""

+"The OAuth token used to refresh the Picasa Web Albums session for the "

+"currently logged in user, if any."

+msgstr ""

+"El testigo OAuth utilizado para actualizar la sesión de álbumes web de "

+"Picasa para el usuario que actualmente ha iniciado sesión, si existe"

+

+#: misc/org.yorba.shotwell.gschema.xml:487

+msgid ""

+"A numeric code representing the default size for photos uploaded to Picasa "

+"Web Albums"

+msgstr ""

+"Un código numérico que representa el tamaño predeterminado de las fotos "

+"subidas a álbumes web Picasa"

+

+#: misc/org.yorba.shotwell.gschema.xml:492

+#: misc/org.yorba.shotwell.gschema.xml:586

+msgid "last album"

+msgstr "último álbum"

+

+#: misc/org.yorba.shotwell.gschema.xml:493

+#: misc/org.yorba.shotwell.gschema.xml:587

+msgid "The name of the last album the user published photos to, if any"

+msgstr ""

+"El nombre del último álbum en el que el usuario publicó fotos, si existe"

+

+#: misc/org.yorba.shotwell.gschema.xml:499

+msgid ""

+"Whether images being uploaded to Picasa should have their metadata removed "

+"first"

+msgstr ""

+"Indica si se deben eliminar los metadatos antes de subir las imágenes a "

+"Picasa"

+

+#: misc/org.yorba.shotwell.gschema.xml:506

+msgid "Piwigo URL"

+msgstr "URL de Pigwio"

+

+#: misc/org.yorba.shotwell.gschema.xml:507

+msgid "URL of the Piwigo server."

+msgstr "URL del servidor Piwigo."

+

+#: misc/org.yorba.shotwell.gschema.xml:513

+msgid "Piwigo username, if logged in."

+msgstr "Nombre de usuario de Piwigo, si ha iniciado sesión."

+

+#: misc/org.yorba.shotwell.gschema.xml:518

+msgid "password"

+msgstr "contraseña"

+

+#: misc/org.yorba.shotwell.gschema.xml:519

+msgid "Piwigo password, if logged in."

+msgstr "Contraseña de Piwigo, si ha iniciado sesión."

+

+#: misc/org.yorba.shotwell.gschema.xml:524

+msgid "remember password"

+msgstr "recortar contraseña"

+

+#: misc/org.yorba.shotwell.gschema.xml:525

+msgid "If true, remember the Piwigo password."

+msgstr "Si es cierto, recordar la contraseña de Piwigo."

+

+#: misc/org.yorba.shotwell.gschema.xml:531

+msgid "The last selected Piwigo category."

+msgstr "La última categoría de Piwigo seleccionada."

+

+#: misc/org.yorba.shotwell.gschema.xml:536

+msgid "last permission level"

+msgstr "último nivel de permisos"

+

+#: misc/org.yorba.shotwell.gschema.xml:537

+msgid "The last chosen Piwigo permission level."

+msgstr "El último nivel de privilegios elegido el Piwigo."

+

+#: misc/org.yorba.shotwell.gschema.xml:543

+msgid ""

+"A numeric code representing the last photo size preset used when publishing "

+"to Piwigo."

+msgstr ""

+"Un código numérico que representa el último tamaño de foto predefinido usado "

+"para publicar en Piwigo."

+

+#: misc/org.yorba.shotwell.gschema.xml:549

+msgid ""

+"Whether images being uploaded to Piwigo should have their metadata removed "

+"first"

+msgstr ""

+"Indica si se deben eliminar los metadatos antes de subir las imágenes a "

+"Piwigo"

+

+#: misc/org.yorba.shotwell.gschema.xml:554

+msgid ""

+"if title is set and comment unset, use title as comment for uploads to Piwigo"

+msgstr ""

+"si se definió el titulo pero no un comentario, usar el título como "

+"comentario para las subidas a Piwigo"

+

+#: misc/org.yorba.shotwell.gschema.xml:555

+msgid ""

+"Whether images being uploaded to Piwigo should have their comment set from "

+"the title if title is set and comment unset"

+msgstr ""

+"Indica si las imágenes que se vayan a subir a Piwigo deben tener un "

+"comentario a partir del título, si tiene, y no tiene comentario"

+

+#: misc/org.yorba.shotwell.gschema.xml:560

+msgid "do not upload tags when uploading to Piwigo"

+msgstr "no subir etiquetas al subir a Piwigo"

+

+#: misc/org.yorba.shotwell.gschema.xml:561

+msgid ""

+"Whether images being uploaded to Piwigo should have their tags removed on "

+"upload, such that these tags will not appear on the remote Piwigo server."

+msgstr ""

+"Indica si se deben eliminar las etiquetas antes de subir las imágenes a "

+"Piwigo, para que esas etiquetas no aparezcan en el servidor remoto de Piwigo."

+

+#: misc/org.yorba.shotwell.gschema.xml:569

+msgid "Gallery3 username"

+msgstr "Nombre de usuario de Gallery3"

+

+#: misc/org.yorba.shotwell.gschema.xml:574

+msgid "API key"

+msgstr "Clave de la API"

+

+#: misc/org.yorba.shotwell.gschema.xml:575

+msgid "Gallery3 API key"

+msgstr "Clave de la API de Gallery3"

+

+#: misc/org.yorba.shotwell.gschema.xml:580

+msgid "URL"

+msgstr "URL"

+

+#: misc/org.yorba.shotwell.gschema.xml:581

+msgid "Gallery3 site URL"

+msgstr "URL de Gallery3"

+

+#: misc/org.yorba.shotwell.gschema.xml:593

+msgid ""

+"Indicates whether images being uploaded to Gallery3 should have their "

+"metadata removed first"

+msgstr ""

+"Indica si se deben eliminar los metadatos antes de subir las imágenes a "

+"Gallery3"

+

+#: misc/org.yorba.shotwell.gschema.xml:598

+msgid "scaling constraint of uploaded picture"

+msgstr "restricción de escala de una foto subida"

+

+#: misc/org.yorba.shotwell.gschema.xml:599

+msgid "The scaling constraint ID of the picture to be uploaded"

+msgstr "El ID de la restricción de escala de la foto que se subirá"

+

+#: misc/org.yorba.shotwell.gschema.xml:604

+msgid "pixels of the major axis uploaded picture"

+msgstr "píxeles del eje principal de la foto subida"

+

+#: misc/org.yorba.shotwell.gschema.xml:605

+msgid ""

+"The pixels of the major axis of the picture to be uploaded; used only if "

+"scaling-constraint-id is an appropriate value"

+msgstr ""

+"Los píxeles del eje principal de la foto que se subirá; usados solo si el ID "

+"de la restricción de escala tiene un valor adecuado"

+

+#: misc/org.yorba.shotwell.gschema.xml:613

+msgid ""

+"The OAuth token used to refresh the YouTube session for the currently logged "

+"in user, if any."

+msgstr ""

+"El testigo OAuth usado para actualizar la sesión de Youtube para el usuario "

+"que ha iniciado sesión actualmente, si existe."

+

+#: misc/org.yorba.shotwell.gschema.xml:620

+msgid "last used import service"

+msgstr "último servicio de importación usado"

+

+#: misc/org.yorba.shotwell.gschema.xml:621

+msgid ""

+"A numeric code representing the last service from which photos were imported"

+msgstr ""

+"Un código numérico que representa el último servicio del que se importaron "

+"fotos"

+

+#: misc/org.yorba.shotwell.gschema.xml:628

+msgid "interpreter state cookie"

+msgstr "cookie de estado del intérprete"

+

+#: misc/org.yorba.shotwell.gschema.xml:629

+msgid ""

+"A numeric code that captures the state of the GStreamer plug-in environment"

+msgstr ""

+"Un código numérico que captura el estado del entorno del complemento "

+"GStreamer"

+

+#: misc/org.yorba.shotwell.gschema.xml:636

+msgid "content layout mode"

+msgstr "modo de distribución del contenido"

+

+#: misc/org.yorba.shotwell.gschema.xml:637

+msgid ""

+"A numeric code that describes how photos are laid out on the page during "

+"printing"

+msgstr ""

+"Un código numérico que representa cuántas fotos aparecen en la página al "

+"imprimir"

+

+#: misc/org.yorba.shotwell.gschema.xml:642

+msgid "content ppi"

+msgstr "ppp del contenido"

+

+#: misc/org.yorba.shotwell.gschema.xml:643

+msgid "The number of pixels per inch (ppi) sent to the printer during printing"

+msgstr ""

+"El número de píxeles por pulgada (ppp) enviado a la impresora al imprimir"

+

+#: misc/org.yorba.shotwell.gschema.xml:648

+msgid "content width"

+msgstr "anchura del contenido"

+

+#: misc/org.yorba.shotwell.gschema.xml:649

+msgid "The width of the printed emulsion on the page when printing"

+msgstr "La anchura de la emulsión impresa en la página al imprimir"

+

+#: misc/org.yorba.shotwell.gschema.xml:654

+msgid "content height"

+msgstr "altura del contenido"

+

+#: misc/org.yorba.shotwell.gschema.xml:655

+msgid "The height of the printed emulsion on the page when printing"

+msgstr "La altura de la emulsión impresa en la página al imprimir"

+

+#: misc/org.yorba.shotwell.gschema.xml:660

+msgid "content units"

+msgstr "unidades del contenido"

+

+#: misc/org.yorba.shotwell.gschema.xml:661

+msgid ""

+"A numeric code representing unit of measure (inches or centimeters) used "

+"when printing"

+msgstr ""

+"Un código numérico que representa la unidad de medida (pulgadas o "

+"centímetros) usada al imprimir"

+

+#: misc/org.yorba.shotwell.gschema.xml:666

+msgid "images per page code"

+msgstr "código de imágenes por página"

+

+#: misc/org.yorba.shotwell.gschema.xml:667

+msgid ""

+"A numeric code representing the currently selected images per page mode used "

+"when printing"

+msgstr ""

+"Un código numérico que representa el modo usado de imágenes por página "

+"seleccionadas actualmente al imprimir"

+

+#: misc/org.yorba.shotwell.gschema.xml:672

+msgid "size selection"

+msgstr "tamaño de la selección"

+

+#: misc/org.yorba.shotwell.gschema.xml:673

+msgid ""

+"The index of the current print size in a pre-defined list of standard sizes"

+msgstr ""

+"El índice del tamaño de impresión actual en una lista de tamaños estándar "

+"predefinidos"

+

+#: misc/org.yorba.shotwell.gschema.xml:678

+msgid "match aspect ratio"

+msgstr "coincidir con relación de aspecto"

+

+#: misc/org.yorba.shotwell.gschema.xml:679

+msgid ""

+"Determines whether custom print sizes must match the aspect ratio of the "

+"original photo"

+msgstr ""

+"Determina si los tamaños de impresión personalizados deben coincidir con la "

+"relación de aspecto de la fotografía original"

+

+#: misc/org.yorba.shotwell.gschema.xml:684

+msgid "print titles"

+msgstr "imprimir títulos"

+

+#: misc/org.yorba.shotwell.gschema.xml:685

+msgid ""

+"True if the title of a photo should be printed when the photo is printed, "

+"false otherwise."

+msgstr ""

+"Cierto si se debe imprimir el título de la foto al imprimirla, falso en otro "

+"caso."

+

+#: misc/org.yorba.shotwell.gschema.xml:690

+msgid "titles font"

+msgstr "tipografía de los títulos"

+

+#: misc/org.yorba.shotwell.gschema.xml:691

+msgid "The name of the font to use for photo titles when they are printed."

+msgstr "El nombre de la tipografía que usar cuando se imprimen los títulos."

+

+#: misc/org.yorba.shotwell.gschema.xml:702

+msgid "enable facebook publishing plugin"

+msgstr "activar complemento de publicación en Facebook"

+

+#: misc/org.yorba.shotwell.gschema.xml:703

+msgid "True if the Facebook publishing plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de publicación en Facebook está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:708

+msgid "enable flickr publishing plugin"

+msgstr "activar complemento de publicación en Flickr"

+

+#: misc/org.yorba.shotwell.gschema.xml:709

+msgid "True if the Flickr publishing plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de publicación en Flickr está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:714

+msgid "enable picasa publishing plugin"

+msgstr "activar complemento de publicación en Picasa"

+

+#: misc/org.yorba.shotwell.gschema.xml:715

+msgid ""

+"True if the Picasa Web Albums publishing plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de publicación en álbumes web Picasa está activado, "

+"falso en otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:720

+msgid "enable youtube publishing plugin"

+msgstr "activar complemento de publicación en Youtube"

+

+#: misc/org.yorba.shotwell.gschema.xml:721

+msgid "True if the YouTube publishing plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de publicación en Youtube está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:726

+msgid "enable piwigo publishing plugin"

+msgstr "activar complemento de publicación en Piwigo"

+

+#: misc/org.yorba.shotwell.gschema.xml:727

+msgid "True if the Piwigo publishing plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de publicación en Piwigo está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:732

+msgid "enable yandex publishing plugin"

+msgstr "activar complemento de publicación en Yandex"

+

+#: misc/org.yorba.shotwell.gschema.xml:733

+msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de publicación en Yandex.Fotki está activado, falso "

+"en otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:738

+msgid "enable tumblr publishing plugin"

+msgstr "activar complemento de publicación en Tumblr"

+

+#: misc/org.yorba.shotwell.gschema.xml:739

+msgid "True if the Tumblr publishing plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de publicación en Tumblr está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:744

+msgid "enable rajce publishing plugin"

+msgstr "activar complemento de publicación en Rajce"

+

+#: misc/org.yorba.shotwell.gschema.xml:745

+msgid "True if the Rajce publishing plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de publicación en Rajce está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:750

+msgid "enable gallery3 publishing plugin"

+msgstr "activar complemento de publicación en Gallery3"

+

+#: misc/org.yorba.shotwell.gschema.xml:751

+msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de publicación en Gallery3 está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:756

+msgid "enable F-Spot import plugin"

+msgstr "activar complemento de importación de F-Spot"

+

+#: misc/org.yorba.shotwell.gschema.xml:757

+msgid "True if the F-Spot import plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de importación de F-Spot está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:762

+msgid "enable slideshow crumble transition"

+msgstr "activar transición de desmenuzado del pase de diapositivas"

+

+#: misc/org.yorba.shotwell.gschema.xml:763

+msgid ""

+"True if the Crumble slideshow transition plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de transición de desmoronar está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:768

+msgid "enable slideshow fade transition"

+msgstr "activar transición de fundido del pase de diapositivas"

+

+#: misc/org.yorba.shotwell.gschema.xml:769

+msgid ""

+"True if the Fade slideshow transition plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de transición de fundido está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:774

+#: misc/org.yorba.shotwell.gschema.xml:798

+msgid "enable slideshow slide transition"

+msgstr "activar transición lateral del pase de diapositivas"

+

+#: misc/org.yorba.shotwell.gschema.xml:775

+msgid ""

+"True if the Slide slideshow transition plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de transición lateral está activado, falso en otro "

+"caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:780

+msgid "enable slideshow clock transition"

+msgstr "activar transición de reloj del pase de diapositivas"

+

+#: misc/org.yorba.shotwell.gschema.xml:781

+msgid ""

+"True if the Clock slideshow transition plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de transición de reloj está activado, falso en otro "

+"caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:786

+#: misc/org.yorba.shotwell.gschema.xml:792

+msgid "enable slideshow circle transition"

+msgstr "activar transición circular del pase de diapositivas"

+

+#: misc/org.yorba.shotwell.gschema.xml:787

+msgid ""

+"True if the Circle slideshow transition plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de transición circular está activado, falso en otro "

+"caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:793

+msgid ""

+"True if the Circles slideshow transition plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de transición en círculos está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:799

+msgid ""

+"True if the Blinds slideshow transition plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de transición de persianas está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:804

+msgid "enable slideshow squares transition"

+msgstr "activar transición de cuadros del pase de diapositivas"

+

+#: misc/org.yorba.shotwell.gschema.xml:805

+msgid ""

+"True if the Squares slideshow transition plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de transición de cuadros está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:810

+msgid "enable slideshow stripes transition"

+msgstr "activar transición de bandas del pase de diapositivas"

+

+#: misc/org.yorba.shotwell.gschema.xml:811

+msgid ""

+"True if the Stripes slideshow transition plugin is enabled, false otherwise"

+msgstr ""

+"Cierto si el complemento de transición de bandas está activado, falso en "

+"otro caso"

+

+#: misc/org.yorba.shotwell.gschema.xml:816

+msgid "enable slideshow chess transition"

+msgstr "activar transición de ajedrez del pase de diapositivas"

+

+#: misc/org.yorba.shotwell.gschema.xml:817

+msgid ""

+"True if the Chess-Board slideshow transition plugin is enabled, false "

+"otherwise"

+msgstr ""

+"Cierto si el complemento de transición de tablero de ajedrez está activado, "

+"falso en otro caso"

+

+#: plugins/common/Resources.vala:12

+msgid "Visit the Shotwell home page"

+msgstr "Visite la página web de Shotwell"

+

+#: plugins/common/Resources.vala:31 src/AppWindow.vala:679

+msgid "translator-credits"

+msgstr ""

+"Daniel Mustieles <daniel.mustieles@gmail.com>, 2014-2016\n"

+"Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2011–2013\n"

+"Claudio Rodrigo Pereyra Diaz <elsupergomez@fedoraproject.org>, 2011–2013\n"

+"monkey.libre <monkey.libre@gmail.com>\n"

+"Jorge González <jorgegonz@svn.gnome.org>, 2011\n"

+"José Luis Navarro <jlnavarro111@gmail.com>"

+

+#. Possible error message when a site presents a bad certificate.

+#: plugins/common/RESTSupport.vala:202

+msgid ""

+"⚫ This website presented identification that belongs to a different website."

+msgstr ""

+"⚫ Este sitio web presenta una identificación que pertenece a un sitio web "

+"diferente."

+

+#. Possible error message when a site presents a bad certificate.

+#: plugins/common/RESTSupport.vala:207

+msgid ""

+"⚫ This website’s identification is too old to trust. Check the date on your "

+"computer’s calendar."

+msgstr ""

+"⚫ La identificación de este sitio web es demasiado antigua como para "

+"confiar. Compruebe la fecha en el calendario de su equipo."

+

+#. Possible error message when a site presents a bad certificate.

+#: plugins/common/RESTSupport.vala:212

+msgid ""

+"⚫ This website’s identification was not issued by a trusted organization."

+msgstr ""

+"⚫ La identificación de este sitio web no ha sido emitida por una "

+"organización de confianza."

+

+#. Possible error message when a site presents a bad certificate.

+#: plugins/common/RESTSupport.vala:217

+msgid ""

+"⚫ This website’s identification could not be processed. It may be corrupted."

+msgstr ""

+"⚫ La identificación de este sitio web no se pudo procesar. Puede estar "

+"dañada."

+

+#. Possible error message when a site presents a bad certificate.

+#: plugins/common/RESTSupport.vala:222

+msgid ""

+"⚫ This website’s identification has been revoked by the trusted organization "

+"that issued it."

+msgstr ""

+"⚫ La identificación de este sitio web ha sido revocada por la organización "

+"de confianza que la emitió."

+

+#. Possible error message when a site presents a bad certificate.

+#: plugins/common/RESTSupport.vala:227

+msgid ""

+"⚫ This website’s identification cannot be trusted because it uses very weak "

+"encryption."

+msgstr ""

+"⚫ No se puede confiar en la identificación de este sitio web porque utiliza "

+"un cifrado muy débil."

+

+#. Possible error message when a site presents a bad certificate.

+#: plugins/common/RESTSupport.vala:232

+msgid ""

+"⚫ This website’s identification is only valid for future dates. Check the "

+"date on your computer’s calendar."

+msgstr ""

+"⚫ La identificación de este sitio web sólo es válida para fechas futuras. "

+"Compruebe la fecha en el calendario de su equipo."

+

+#: plugins/common/RESTSupport.vala:509

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958

+msgid "A temporary file needed for publishing is unavailable"

+msgstr "No está disponible un archivo temporal necesario para la publicación"

+

+#: plugins/common/RESTSupport.vala:1167

+msgid ""

+"You have already logged in and out of a Google service during this Shotwell "

+"session.\n"

+"\n"

+"To continue publishing to Google services, quit and restart Shotwell, then "

+"try publishing again."

+msgstr ""

+"Ya ha iniciado y cerrado sesión de Google durante esta sesión de Shotwell.\n"

+"Para seguir publicando en servicios de Google, cierre y reinicie Shotwell, e "

+"intente publicar de nuevo."

+

+#: plugins/shotwell-data-imports/FSpotImporter.vala:36

+#: plugins/shotwell-publishing/FacebookPublishing.vala:33

+#: plugins/shotwell-publishing/FlickrPublishing.vala:33

+#: plugins/shotwell-publishing/PicasaPublishing.vala:33

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33

+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27

+msgid "Copyright 2016 Software Freedom Conservancy Inc."

+msgstr "Copyright 2016 Software Freedom Conservancy Inc."

+

+#: plugins/shotwell-data-imports/FSpotImporter.vala:58

+msgid ""

+"Welcome to the F-Spot library import service.\n"

+"\n"

+"Please select a library to import, either by selecting one of the existing "

+"libraries found by Shotwell or by selecting an alternative F-Spot database "

+"file."

+msgstr ""

+"Bienvenido/a al servicio de importación de F-Spot.\n"

+"\n"

+"Seleccione una colección a importar, ya sea eligiendo una de las colecciones "

+"existentes encontradas por Shotwell o eligiendo un archivo de base de datos "

+"de F-Spot alternativo."

+

+#: plugins/shotwell-data-imports/FSpotImporter.vala:60

+msgid ""

+"Welcome to the F-Spot library import service.\n"

+"\n"

+"Please select an F-Spot database file."

+msgstr ""

+"Bienvenido/a al servicio de importación de colecciones de F-Spot.\n"

+"\n"

+"Seleccione un archivo de colección de F-Spot."

+

+#: plugins/shotwell-data-imports/FSpotImporter.vala:62

+msgid "Manually select an F-Spot database file to import:"

+msgstr "Seleccionar manualmente una colección de F-Spot para importar:"

+

+#: plugins/shotwell-data-imports/FSpotImporter.vala:64

+msgid ""

+"Cannot open the selected F-Spot database file: the file does not exist or is "

+"not an F-Spot database"

+msgstr ""

+"No se puede abrir el archivo seleccionado de F-Spot: el archivo no existe o "

+"no es un archivo de colección de F-Spot"

+

+#: plugins/shotwell-data-imports/FSpotImporter.vala:66

+msgid ""

+"Cannot open the selected F-Spot database file: this version of the F-Spot "

+"database is not supported by Shotwell"

+msgstr ""

+"No se puede abrir el archivo seleccionado de F-Spot: esta versión de F-Spot "

+"no está soportada por Shotwell"

+

+#: plugins/shotwell-data-imports/FSpotImporter.vala:68

+msgid ""

+"Cannot read the selected F-Spot database file: error while reading tags table"

+msgstr ""

+"No se puede abrir el archivo seleccionado de F-Spot: error al leer la tabla "

+"de etiquetas"

+

+#: plugins/shotwell-data-imports/FSpotImporter.vala:70

+msgid ""

+"Cannot read the selected F-Spot database file: error while reading photos "

+"table"

+msgstr ""

+"No se puede abrir el archivo seleccionado de F-Spot: error al leer la tabla "

+"de fotos"

+

+#: plugins/shotwell-data-imports/FSpotImporter.vala:72

+#, c-format

+msgid ""

+"Shotwell has found %d photos in the F-Spot library and is currently "

+"importing them. Duplicates will be automatically detected and removed.\n"

+"\n"

+"You can close this dialog and start using Shotwell while the import is "

+"taking place in the background."

+msgstr ""

+"Shotwell encontró %d fotos en la colección de F-Spot y está importándolas "

+"ahora. Los duplicados se detectarán y eliminarán automáticamente.\n"

+"\n"

+"Puede cerrar este diálogo y empezar a utilizar Shotwell mientras el proceso "

+"de importación ocurre en segundo plano."

+

+#: plugins/shotwell-data-imports/FSpotImporter.vala:86

+#, c-format

+msgid "F-Spot library: %s"

+msgstr "Colección de F-Spot: %s"

+

+#: plugins/shotwell-data-imports/FSpotImporter.vala:424

+msgid "Preparing to import"

+msgstr "Preparando para importar"

+

+#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22

+msgid "Core Data Import Services"

+msgstr "Servicios de importación de datos de núcleo"

+

+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5

+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125

+msgid "Go _Back"

+msgstr "A_trás"

+

+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8

+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145

+#: ui/shotwell.ui:1627

+#| msgid "_Login"

+msgid "_Log in"

+msgstr "Iniciar _sesión"

+

+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34

+msgid "_Gallery3 URL:"

+msgstr "URL de _Gallery3:"

+

+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64

+msgid "_User name:"

+msgstr "_Nombre de usuario:"

+

+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79

+msgid "_Password:"

+msgstr "_Contraseña:"

+

+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178

+msgid "API _Key:"

+msgstr "_Clave de la API:"

+

+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208

+msgid "or"

+msgstr "o"

+

+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5

+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018

+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116

+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:115

+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197

+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137

+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229

+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99

+msgid "_Logout"

+msgstr "Cerrar _sesión"

+

+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8

+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017

+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134

+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:129

+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212

+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153

+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243

+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115

+msgid "_Publish"

+msgstr "_Publicar"

+

+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11

+msgid "A _new album"

+msgstr "Un álbum _nuevo"

+

+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17

+msgid "An _existing album"

+msgstr "Un álbum _existente"

+

+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22

+msgid "_Remove location, tag and camera-identifying data before uploading"

+msgstr "_Quitar ubicación, etiqueta y datos de la cámara antes de subir"

+

+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135

+msgid "Scaling constraint:"

+msgstr "Re_stricción de escalado:"

+

+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153

+msgid "pixels"

+msgstr "píxeles"

+

+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1235

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1329

+#: src/Dimensions.vala:17

+msgid "Original size"

+msgstr "Tamaño original"

+

+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196

+#: src/Dimensions.vala:20

+msgid "Width or height"

+msgstr "Anchura o altura"

+

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:41

+msgid "Gallery3 publishing module"

+msgstr "Módulo de publicación Gallery3"

+

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:114

+msgid ""

+"You are not currently logged into your Gallery.\n"

+"\n"

+"You must have already signed up for a Gallery3 account to complete the login "

+"process."

+msgstr ""

+"No ha iniciado sesión en su Galería.\n"

+"\n"

+"Debe haber registrado una cuenta de Gallery3 para poder iniciar sesión."

+

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:117

+msgid "Shotwell default directory"

+msgstr "Carpeta predeterminada de Shotwell"

+

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:801

+#, c-format

+#| msgid ""

+#| "\n"

+#| "\n"

+#| "The file \"%s\" may not be supported by or may be too large for this "

+#| "instance of Gallery3."

+msgid ""

+"\n"

+"\n"

+"The file “%s” may not be supported by or may be too large for this instance "

+"of Gallery3."

+msgstr ""

+"\n"

+"\n"

+"El archivo «%s» puede no estar soportado o ser demasiado grande para esta "

+"instancia de Gallery3."

+

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:802

+msgid ""

+"\n"

+"Note that Gallery3 only supports the video types that Flowplayer does."

+msgstr ""

+"\n"

+"Tenga en cuenta que Gallery3 sólo soporta los mismos tipos de vídeo que "

+"Flowplayer."

+

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773

+#, c-format

+#| msgid ""

+#| "A file required for publishing is unavailable. Publishing to %s can't "

+#| "continue."

+msgid ""

+"A file required for publishing is unavailable. Publishing to %s can’t "

+"continue."

+msgstr ""

+"No está disponible un archivo necesario para publicar. La publicación en %s "

+"no puede continuar."

+

+#. populate any widgets whose contents are

+#. programmatically-generated

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550

+#, c-format

+msgid "Publishing to %s as %s."

+msgstr "Publicar en %s como %s."

+

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817

+msgid ""

+"Enter the URL for your Gallery3 site and the username and password (or API "

+"key) for your Gallery3 account."

+msgstr ""

+"Escriba el URL de su sitio Gallery3, así como el nombre de usuario y "

+"contraseña (o clave API) para su cuenta de Gallery3."

+

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818

+msgid ""

+"The username and password or API key were incorrect. To try again, re-enter "

+"your username and password below."

+msgstr ""

+"El nombre de usuario y la contraseña o la clave de la API no son correctos. "

+"Para interntarlo de nuevo, vuelva a introducir su nombre y su contraseña a "

+"continuación."

+

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819

+msgid ""

+"The URL entered does not appear to be the main directory of a Gallery3 "

+"instance. Please make sure you typed it correctly and it does not have any "

+"trailing components (e.g., index.php)."

+msgstr ""

+"El URL introducido no parece ser la carpeta principal de una instancia de "

+"Gallery3. Asegúrese de que lo ha escrito correctamente y que no tiene "

+"elementos adicionales (ej. index.php)."

+

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872

+msgid "Unrecognized User"

+msgstr "Usuario no reconocido"

+

+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877

+msgid " Site Not Found"

+msgstr " Sitio no encontrado"

+

+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:49

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892

+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:49

+msgid "_Email address"

+msgstr "Dirección de correo _electrónico"

+

+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:59

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893

+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:59

+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:73

+msgid "_Password"

+msgstr "_Contraseña"

+

+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:103

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:894

+msgid "_Remember"

+msgstr "_Recordar"

+

+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:125

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895

+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107

+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151

+#| msgid "Logging in…"

+msgid "Log in"

+msgstr "Iniciando sesión…"

+

+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014

+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75

+msgid "An _existing album:"

+msgstr "Un álbum _existente:"

+

+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015

+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94

+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:52

+msgid "A _new album named:"

+msgstr "Un álbum _nuevo:"

+

+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1005

+msgid "_Hide album"

+msgstr "_Ocultar álbum"

+

+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016

+msgid "Open target _album in browser"

+msgstr "Abrir ál_bum objetivo en el navegador"

+

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:40

+#| msgid "Copyright (C) 2013 rajce.net"

+msgid "Copyright © 2013 rajce.net"

+msgstr "Copyright (C) 2013 rajce.net"

+

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:744

+msgid "An error message occurred when publishing to Rajce. Please try again."

+msgstr "Ocurrió un error al publicar en Rajce. Inténtelo de nuevo."

+

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833

+msgid "Enter email and password associated with your Rajce account."

+msgstr ""

+"Escriba el nombre de usuario y contraseña asociados con su cuenta de Rajce."

+

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834

+msgid "Invalid email and/or password. Please try again"

+msgstr "Usuario y/o contraseña no válidos. Inténtelo de nuevo"

+

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865

+msgid "Invalid User Email or Password"

+msgstr "Nombre de usuario o contraseña no válidos"

+

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1012

+#, c-format

+msgid "You are logged into Rajce as %s."

+msgstr "Ha iniciado sesión en Rajce como %s."

+

+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013

+#: plugins/shotwell-publishing/PicasaPublishing.vala:670

+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:24

+msgid "Photos will appear in:"

+msgstr "Las fotos aparecen en:"

+

+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20

+msgid "Shotwell Extra Publishing Services"

+msgstr "Servicios de publicación adicionales de Shotwell"

+

+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43

+msgid "Blogs:"

+msgstr "Blogs:"

+

+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60

+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61

+msgid "Photo _size:"

+msgstr "_Tamaño de la foto:"

+

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36

+msgid "Copyright 2012 BJA Electronics"

+msgstr "Copyright 2012 BJA Electronics"

+

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1231

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1325

+#| msgid "500 x 375 pixels"

+msgid "500 × 375 pixels"

+msgstr "500 × 375 píxeles"

+

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1232

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1326

+#| msgid "1024 x 768 pixels"

+msgid "1024 × 768 pixels"

+msgstr "1024 × 768 píxeles"

+

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107

+#| msgid "1280 x 853 pixels"

+msgid "1280 × 853 pixels"

+msgstr "1280 × 853 píxeles"

+

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321

+#, c-format

+#| msgid "'%s' isn't a valid response to an OAuth authentication request"

+msgid "“%s” isn’t a valid response to an OAuth authentication request"

+msgstr "«%s» no es una respuesta válida a una solicitud de autenticación OAuth"

+

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559

+#| msgid ""

+#| "TumblrPublisher: start( ): can't start; this publisher is not restartable."

+msgid ""

+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."

+msgstr ""

+"TumblrPublisher: start( ): no puede iniciar, este publicador no es "

+"reiniciable."

+

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587

+msgid "Enter the username and password associated with your Tumblr account."

+msgstr ""

+"Escriba el nombre de usuario y contraseña asociados con su cuenta de Tumblr."

+

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1087

+msgid "Username and/or password invalid. Please try again"

+msgstr "Usuario y/o contraseña no válidos. Inténtelo de nuevo"

+

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1121

+msgid "Invalid User Name or Password"

+msgstr "Nombre de usuario o contraseña no válidos"

+

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:634

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:752

+#, c-format

+msgid "Could not load UI: %s"

+msgstr "No se pudo cargar la IU: %s"

+

+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:734

+#, c-format

+msgid ""

+"You are logged into Tumblr as %s.\n"

+"\n"

+msgstr ""

+"Ha iniciado sesión en Tumblr como %s.\n"

+"\n"

+

+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:22

+msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"

+msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"

+

+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:25

+msgid "Visit the Yandex.Fotki web site"

+msgstr "Visitar el sitio web de Yandex.Fotki"

+

+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609

+msgid "You are not currently logged into Yandex.Fotki."

+msgstr "Actualmente no ha iniciado sesión en Yandex.Fotki."

+

+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24

+msgid "_Albums (or write new):"

+msgstr "Álb_umes (o crear uno nuevo):"

+

+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38

+msgid "Access _type:"

+msgstr "_Tipo de acceso:"

+

+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81

+msgid "Disable _comments"

+msgstr "Desactivar _comentarios"

+

+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96

+msgid "_Forbid downloading original photo"

+msgstr "_No permitir la descarga de la foto original"

+

+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159

+msgid "Public"

+msgstr "Público"

+

+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162

+#: plugins/shotwell-publishing/FacebookPublishing.vala:1144

+msgid "Friends"

+msgstr "Amigos"

+

+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165

+#: plugins/shotwell-publishing/YouTubePublishing.vala:498

+msgid "Private"

+msgstr "Privado"

+

+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39

+msgid "Publish to an e_xisting album:"

+msgstr "Publicar en un álbum e_xistente:"

+

+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57

+msgid "Create a _new album named:"

+msgstr "Crear un álbum _nuevo llamado:"

+

+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108

+#: plugins/shotwell-publishing/FacebookPublishing.vala:984

+msgid "Upload _size:"

+msgstr "_Tamaño de subida:"

+

+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139

+msgid "Videos and new photo albums _visible to:"

+msgstr "Vídeos y álbumes de fotos nuevos _visibles para:"

+

+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175

+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102

+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178

+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:226

+msgid ""

+"_Remove location, camera, and other identifying information before uploading"

+msgstr "_Quitar ubicación, cámara y otra información antes de subir"

+

+#: plugins/shotwell-publishing/FacebookPublishing.vala:62

+#: plugins/shotwell-publishing/PicasaPublishing.vala:60

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1209

+msgid "Shotwell Connect"

+msgstr "Shotwell Connect"

+

+#: plugins/shotwell-publishing/FacebookPublishing.vala:64

+#| msgid ""

+#| "You are not currently logged into Facebook.\n"

+#| "\n"

+#| "If you don't yet have a Facebook account, you can create one during the "

+#| "login process. During login, Shotwell Connect may ask you for permission "

+#| "to upload photos and publish to your feed. These permissions are required "

+#| "for Shotwell Connect to function."

+msgid ""

+"You are not currently logged into Facebook.\n"

+"\n"

+"If you don’t yet have a Facebook account, you can create one during the "

+"login process. During login, Shotwell Connect may ask you for permission to "

+"upload photos and publish to your feed. These permissions are required for "

+"Shotwell Connect to function."

+msgstr ""

+"Actualmente no ha iniciado sesión en Facebook.\n"

+"\n"

+"Si no tiene una cuenta de Facebook, puede crear una durante el proceso de "

+"inicio de sesión. Durante el inicio de sesión, Shotwell Connect le puede "

+"pedir permiso para subir fotos y publicar en su muro. Estos permisos son "

+"necesarios para que Shotwell Connect funcione."

+

+#: plugins/shotwell-publishing/FacebookPublishing.vala:66

+msgid ""

+"You have already logged in and out of Facebook during this Shotwell "

+"session.\n"

+"To continue publishing to Facebook, quit and restart Shotwell, then try "

+"publishing again."

+msgstr ""

+"Ya ha iniciado y cerrado sesión de Facebook durante esta sesión de "

+"Shotwell.\n"

+"Para seguir publicando en Facebook, cierre y reinicie Shotwell, e intente "

+"publicar de nuevo."

+

+#: plugins/shotwell-publishing/FacebookPublishing.vala:87

+msgid "Standard (720 pixels)"

+msgstr "Estándar (720 píxeles)"

+

+#: plugins/shotwell-publishing/FacebookPublishing.vala:90

+msgid "Large (2048 pixels)"

+msgstr "Grande (2048 píxeles)"

+

+#: plugins/shotwell-publishing/FacebookPublishing.vala:255

+#| msgid "Testing connection to Facebook..."

+msgid "Testing connection to Facebook…"

+msgstr "Comprobando la conexión a Facebook…"

+

+#: plugins/shotwell-publishing/FacebookPublishing.vala:348

+#: plugins/shotwell-publishing/PicasaPublishing.vala:379

+#| msgid "Creating album..."

+msgid "Creating album…"

+msgstr "Creando el álbum…"

+

+#: plugins/shotwell-publishing/FacebookPublishing.vala:374

+#| msgid ""

+#| "A file required for publishing is unavailable. Publishing to Facebook "

+#| "can't continue."

+msgid ""

+"A file required for publishing is unavailable. Publishing to Facebook can’t "

+"continue."

+msgstr ""

+"No está disponible un archivo necesario para publicar. La publicación en "

+"Facebook no puede continuar."

+

+#: plugins/shotwell-publishing/FacebookPublishing.vala:982

+#, c-format

+msgid ""

+"You are logged into Facebook as %s.\n"

+"\n"

+msgstr ""

+"Ha iniciado sesión en Facebook como %s.\n"

+"\n"

+

+#: plugins/shotwell-publishing/FacebookPublishing.vala:983

+msgid "Where would you like to publish the selected photos?"

+msgstr "¿Dónde quiere publicar las fotos seleccionadas?"

+

+#: plugins/shotwell-publishing/FacebookPublishing.vala:1143

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1213

+msgid "Just me"

+msgstr "Solo yo"

+

+#: plugins/shotwell-publishing/FacebookPublishing.vala:1145

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1209

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1313

+msgid "Everyone"

+msgstr "Todos"

+

+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16

+msgid ""

+"Enter the confirmation number which appears after you log into Flickr in "

+"your Web browser."

+msgstr ""

+"Introduzca el número de confirmación que aparece en su navegador web después "

+"de iniciar sesión en Flickr."

+

+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37

+msgid "Authorization _Number:"

+msgstr "_Número de autorización:"

+

+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83

+#: src/Dialogs.vala:128

+msgid "Con_tinue"

+msgstr "Con_tinuar"

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:60

+#| msgid ""

+#| "You are not currently logged into Flickr.\n"

+#| "\n"

+#| "Click Login to log into Flickr in your Web browser.  You will have to "

+#| "authorize Shotwell Connect to link to your Flickr account."

+msgid ""

+"You are not currently logged into Flickr.\n"

+"\n"

+"Click Log in to log into Flickr in your Web browser. You will have to "

+"authorize Shotwell Connect to link to your Flickr account."

+msgstr ""

+"Actualmente no ha iniciado sesión en Flickr.\n"

+"\n"

+"Pulse Iniciar sesión para identificarse en Flickr en su navegador web.  "

+"Tendrá que autorizar a Shotwell Connect para que se enlace a su cuenta de "

+"Flickr."

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:62

+msgid ""

+"You have already logged in and out of Flickr during this Shotwell session.\n"

+"To continue publishing to Flickr, quit and restart Shotwell, then try "

+"publishing again."

+msgstr ""

+"Ya ha iniciado y cerrado sesión de Flickr durante esta sesión de Shotwell.\n"

+"Para seguir publicando en Flickr, cierre y reinicie Shotwell, e intente "

+"publicar de nuevo."

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:374

+#| msgid "Preparing for login..."

+msgid "Preparing for login…"

+msgstr "Preparándose para iniciar sesión…"

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:444

+#: plugins/shotwell-publishing/FlickrPublishing.vala:594

+#| msgid ""

+#| "A file required for publishing is unavailable. Publishing to Flickr can't "

+#| "continue."

+msgid ""

+"A file required for publishing is unavailable. Publishing to Flickr can’t "

+"continue."

+msgstr ""

+"No está disponible un archivo necesario para publicar. La publicación en "

+"Flickr no puede continuar."

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:457

+#| msgid "Verifying authorization..."

+msgid "Verifying authorization…"

+msgstr "Comprobando la autorización…"

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1152

+#, c-format

+msgid ""

+"You are logged into Flickr as %s.\n"

+"\n"

+msgstr ""

+"Ha iniciado sesión en Flickr como %s.\n"

+"\n"

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1155

+#, c-format

+msgid ""

+"Your free Flickr account limits how much data you can upload per month.\n"

+"This month you have %d megabyte remaining in your upload quota."

+msgid_plural ""

+"Your free Flickr account limits how much data you can upload per month.\n"

+"This month you have %d megabytes remaining in your upload quota."

+msgstr[0] ""

+"Su cuenta gratuita de Flickr limita la cantidad de datos que puede subir al "

+"mes.\n"

+"Este mes tiene %d megabyte restantes de su límite de subida."

+msgstr[1] ""

+"Su cuenta gratuita de Flickr limita la cantidad de datos que puede subir al "

+"mes.\n"

+"Este mes tiene %d megabytes restantes de su límite de sudiba."

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1159

+msgid "Your Flickr Pro account entitles you to unlimited uploads."

+msgstr "Su cuenta de Flickr Pro le permite subidas ilimitadas."

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1164

+msgid "Photos _visible to:"

+msgstr "Fotos _visibles para:"

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1166

+msgid "Videos _visible to:"

+msgstr "Vídeos _visibles para:"

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1169

+msgid "Photos and videos _visible to:"

+msgstr "Fotos y vídeos _visibles para:"

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1210

+msgid "Friends & family only"

+msgstr "Solo amigos y familia"

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1211

+msgid "Family only"

+msgstr "Solo familia"

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1212

+msgid "Friends only"

+msgstr "Solo amigos"

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1233

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1327

+#| msgid "2048 x 1536 pixels"

+msgid "2048 × 1536 pixels"

+msgstr "2048 × 1536 píxeles"

+

+#: plugins/shotwell-publishing/FlickrPublishing.vala:1234

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1328

+#| msgid "4096 x 3072 pixels"

+msgid "4096 × 3072 pixels"

+msgstr "4096 × 3072 píxeles"

+

+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113

+msgid "L_ist album in public gallery"

+msgstr "_Listar álbum en la galería pública"

+

+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150

+msgid "Photo _size preset:"

+msgstr "_Tamaño de foto predefinido:"

+

+#: plugins/shotwell-publishing/PicasaPublishing.vala:59

+#| msgid ""

+#| "You are not currently logged into Picasa Web Albums.\n"

+#| "\n"

+#| "Click Login to log into Picasa Web Albums in your Web browser. You will "

+#| "have to authorize Shotwell Connect to link to your Picasa Web Albums "

+#| "account."

+msgid ""

+"You are not currently logged into Picasa Web Albums.\n"

+"\n"

+"Click Log in to log into Picasa Web Albums in your Web browser. You will "

+"have to authorize Shotwell Connect to link to your Picasa Web Albums account."

+msgstr ""

+"Actualmente no ha iniciado sesión en Álbumes web de Picasa.\n"

+"\n"

+"Pulse Iniciar sesión para identificarse en Álbumes web de Picasa en su "

+"navegador web. Tendrá que autorizar a Shotwell Connect para que se enlace a "

+"su cuenta de Álbumes web de Picasa."

+

+#: plugins/shotwell-publishing/PicasaPublishing.vala:361

+#| msgid ""

+#| "A file required for publishing is unavailable. Publishing to Picasa can't "

+#| "continue."

+msgid ""

+"A file required for publishing is unavailable. Publishing to Picasa can’t "

+"continue."

+msgstr ""

+"No está disponible un archivo necesario para publicar. La publicación en "

+"Picasa no puede continuar."

+

+#. populate any widgets whose contents are programmatically-generated.

+#: plugins/shotwell-publishing/PicasaPublishing.vala:659

+#, c-format

+msgid "You are logged into Picasa Web Albums as %s."

+msgstr "Ha iniciado sesión en Álbumes web de Picasa como %s."

+

+#: plugins/shotwell-publishing/PicasaPublishing.vala:665

+msgid "Videos will appear in:"

+msgstr "Los vídeos aparecerán en:"

+

+#: plugins/shotwell-publishing/PicasaPublishing.vala:746

+#| msgid "Small (640 x 480 pixels)"

+msgid "Small (640 × 480 pixels)"

+msgstr "Pequeño (640 × 480 píxeles)"

+

+#: plugins/shotwell-publishing/PicasaPublishing.vala:747

+#| msgid "Medium (1024 x 768 pixels)"

+msgid "Medium (1024 × 768 pixels)"

+msgstr "Mediano (1024 × 768 píxeles)"

+

+#: plugins/shotwell-publishing/PicasaPublishing.vala:748

+#| msgid "Recommended (1600 x 1200 pixels)"

+msgid "Recommended (1600 × 1200 pixels)"

+msgstr "Recomendado (1600 × 1200 píxeles)"

+

+#: plugins/shotwell-publishing/PicasaPublishing.vala:749

+#| msgid "Google+ (2048 x 1536 pixels)"

+msgid "Google+ (2048 × 1536 pixels)"

+msgstr "Google+ (2048 × 1536 píxeles)"

+

+#: plugins/shotwell-publishing/PicasaPublishing.vala:750

+#: src/editing_tools/EditingTools.vala:756

+msgid "Original Size"

+msgstr "Tamaño original"

+

+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49

+msgid "_URL of your Piwigo photo library"

+msgstr "_URL de su biblioteca de fotos Piwigo"

+

+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59

+msgid "User _name"

+msgstr "_Nombre de usuario"

+

+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130

+msgid "_Remember Password"

+msgstr "_Recortar contraseña"

+

+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40

+msgid "An _existing category:"

+msgstr "Una categoría _existente:"

+

+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121

+msgid "Photos will be _visible by:"

+msgstr "Las fotos serán _visibles para:"

+

+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149

+msgid "Photo size:"

+msgstr "Tamaño de la foto:"

+

+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176

+msgid "within category:"

+msgstr "en la categoría:"

+

+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210

+msgid "Album comment:"

+msgstr "Comentario del álbum:"

+

+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242

+msgid "_If a title is set and comment unset, use title as comment"

+msgstr ""

+"_Si se definió el titulo pero no un comentario, usar el título como "

+"comentario"

+

+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258

+msgid "_Do no upload tags"

+msgstr "_No cargar las etiquetas"

+

+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278

+msgid "Logout"

+msgstr "Salir"

+

+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291

+#: src/Resources.vala:295

+msgid "Publish"

+msgstr "Publicar"

+

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:775

+#, c-format

+#| msgid "Creating album %s..."

+msgid "Creating album %s…"

+msgstr "Creando el álbum %s…"

+

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:948

+msgid "An error message occurred when publishing to Piwigo. Please try again."

+msgstr "Ocurrió un error al publicar en Piwigo. Inténtelo de nuevo."

+

+#. %s is the host name that we tried to connect to

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1024

+#, c-format

+msgid ""

+"This does not look like the real <b>%s</b>. Attackers might be trying to "

+"steal or alter information going to or from this site (for example, private "

+"messages, credit card information, or passwords)."

+msgstr ""

+"Esto no parece el <b>%s</b> real. Los atacantes pueden estar tratando de "

+"robar o alterar la información que entra o sale de este sitio (por ejemplo, "

+"mensajes privados, información de tarjetas de crédito o contraseñas)."

+

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1085

+msgid ""

+"Enter the URL of your Piwigo photo library as well as the username and "

+"password associated with your Piwigo account for that library."

+msgstr ""

+"Escriba el URL de su colección fotográfica de Piwigo, así como el nombre de "

+"usuario y contraseña asociados a esa colección."

+

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1086

+msgid ""

+"Shotwell cannot contact your Piwigo photo library. Please verify the URL you "

+"entered"

+msgstr ""

+"Shotwell no puede contactar su colección de fotos de Piwigo. Compruebe la "

+"URL que ha introducido"

+

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1116

+msgid "Invalid URL"

+msgstr "URL no válida"

+

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1314

+msgid "Admins, Family, Friends, Contacts"

+msgstr "Administradores, Familia, Amigos, Contactos"

+

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1315

+msgid "Admins, Family, Friends"

+msgstr "Administradores, Familia, Amigos"

+

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1316

+msgid "Admins, Family"

+msgstr "Administradores, Familia"

+

+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1317

+msgid "Admins"

+msgstr "Administradores"

+

+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21

+msgid "This connection is not secure"

+msgstr "Esta conexión no es segura"

+

+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75

+msgid "Show the certificate…"

+msgstr "Mostrar el certificado…"

+

+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88

+msgid "I understand, please _proceed."

+msgstr "Lo entiendo, _continuar."

+

+#: plugins/shotwell-publishing/shotwell-publishing.vala:26

+msgid "Core Publishing Services"

+msgstr "Servicios de publicación"

+

+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55

+msgid "Video privacy _setting:"

+msgstr "Co_nfiguración de privacidad de vídeos:"

+

+#: plugins/shotwell-publishing/YouTubePublishing.vala:58

+msgid ""

+"You are not currently logged into YouTube.\n"

+"\n"

+"You must have already signed up for a Google account and set it up for use "

+"with YouTube to continue. You can set up most accounts by using your browser "

+"to log into the YouTube site at least once."

+msgstr ""

+"No ha iniciado sesión en YouTube.\n"

+"\n"

+"Debe haber registrado una cuenta de Google y configurarla para utilizarla "

+"con YouTube para continuar. Puede configurar la mayoría de cuentas mediante "

+"el uso de su navegador para registrarse en el sitio de YouTube al menos una "

+"vez."

+

+#: plugins/shotwell-publishing/YouTubePublishing.vala:363

+#| msgid ""

+#| "A file required for publishing is unavailable. Publishing to Youtube "

+#| "can't continue."

+msgid ""

+"A file required for publishing is unavailable. Publishing to YouTube can’t "

+"continue."

+msgstr ""

+"No está disponible un archivo necesario para publicar. La publicación en "

+"Youtube no puede continuar."

+

+#: plugins/shotwell-publishing/YouTubePublishing.vala:462

+#, c-format

+msgid "You are logged into YouTube as %s."

+msgstr "Ha iniciado sesión en YouTube como %s."

+

+#: plugins/shotwell-publishing/YouTubePublishing.vala:464

+#, c-format

+#| msgid "Videos will appear in '%s'"

+msgid "Videos will appear in “%s”"

+msgstr "Los vídeos aparecerán en «%s»"

+

+#: plugins/shotwell-publishing/YouTubePublishing.vala:496

+msgid "Public listed"

+msgstr "Listado públicamente"

+

+#: plugins/shotwell-publishing/YouTubePublishing.vala:497

+msgid "Public unlisted"

+msgstr "No listado públicamente"

+

+#: plugins/shotwell-transitions/BlindsEffect.vala:20

+msgid "Blinds"

+msgstr "Persianas"

+

+#: plugins/shotwell-transitions/ChessEffect.vala:20

+msgid "Chess"

+msgstr "Ajedrez"

+

+#: plugins/shotwell-transitions/CircleEffect.vala:20

+msgid "Circle"

+msgstr "Círculo"

+

+#: plugins/shotwell-transitions/CirclesEffect.vala:20

+msgid "Circles"

+msgstr "Círculos"

+

+#: plugins/shotwell-transitions/ClockEffect.vala:20

+msgid "Clock"

+msgstr "Reloj"

+

+#: plugins/shotwell-transitions/CrumbleEffect.vala:20

+msgid "Crumble"

+msgstr "Desmoronar"

+

+#: plugins/shotwell-transitions/FadeEffect.vala:20

+msgid "Fade"

+msgstr "Desvanecer"

+

+#: plugins/shotwell-transitions/shotwell-transitions.vala:28

+msgid "Core Slideshow Transitions"

+msgstr "Transiciones de pase de diapositivas"

+

+#: plugins/shotwell-transitions/shotwell-transitions.vala:76

+msgid ""

+"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "

+"Inc."

+msgstr ""

+"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "

+"Inc."

+

+#: plugins/shotwell-transitions/SlideEffect.vala:20

+msgid "Slide"

+msgstr "Diapositiva"

+

+#: plugins/shotwell-transitions/SquaresEffect.vala:20

+msgid "Squares"

+msgstr "Cuadrados"

+

+#: plugins/shotwell-transitions/StripesEffect.vala:20

+msgid "Stripes"

+msgstr "Franjas"

+

+#: src/AppDirs.vala:64 src/AppDirs.vala:115

+#, c-format

+msgid "Unable to create cache directory %s: %s"

+msgstr "No se pudo crear la carpeta de caché %s: %s"

+

+#: src/AppDirs.vala:74 src/AppDirs.vala:104

+#, c-format

+msgid "Unable to create data directory %s: %s"

+msgstr "No se puede crear la carpeta de datos %s: %s"

+

+#. If XDG yarfed, use ~/Pictures

+#: src/AppDirs.vala:168

+msgid "Pictures"

+msgstr "Imágenes"

+

+#: src/AppDirs.vala:206

+#, c-format

+msgid "Unable to create temporary directory %s: %s"

+msgstr "No se puede crear la carpeta temporal %s: %s"

+

+#: src/AppDirs.vala:223 src/AppDirs.vala:254

+#, c-format

+msgid "Unable to create data subdirectory %s: %s"

+msgstr "No se puede crear la subcarpeta de datos %s: %s"

+

+#: src/AppDirs.vala:236

+#, c-format

+msgid "Could not make directory %s writable"

+msgstr "No se pudo hacer que la carpeta %s sea escribible"

+

+#: src/AppDirs.vala:239

+#, c-format

+msgid "Could not make directory %s writable: %s"

+msgstr "No se pudo hacer escribible la carpeta %s: %s"

+

+#: src/AppWindow.vala:54

+msgid "Pin Toolbar"

+msgstr "Anclar la barra de herramientas"

+

+#: src/AppWindow.vala:55

+msgid "Pin the toolbar open"

+msgstr "Mantener abierta la barra de herramientas"

+

+#: src/AppWindow.vala:60

+msgid "Leave fullscreen"

+msgstr "Salir de pantalla completa"

+

+#: src/AppWindow.vala:499

+msgid "_Contents"

+msgstr "_Contenido"

+

+#: src/AppWindow.vala:504

+msgid "_Frequently Asked Questions"

+msgstr "_Preguntas más frecuentes"

+

+#: src/AppWindow.vala:509

+msgid "_Report a Problem…"

+msgstr "_Informar de un problema…"

+

+#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646

+#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20

+#: src/Dialogs.vala:28 src/Dialogs.vala:1441 src/Dialogs.vala:1464

+#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157

+msgid "_Cancel"

+msgstr "_Cancelar"

+

+#: src/AppWindow.vala:656

+#, c-format

+#| msgid ""

+#| "A fatal error occurred when accessing Shotwell's library.  Shotwell "

+#| "cannot continue.\n"

+#| "\n"

+#| "%s"

+msgid ""

+"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "

+"continue.\n"

+"\n"

+"%s"

+msgstr ""

+"Ocurrió un error grave al acceder a la colección de Shotwell. Shotwell no "

+"puede continuar.\n"

+"\n"

+"%s"

+

+#: src/AppWindow.vala:676

+msgid "Visit the Shotwell web site"

+msgstr "Visite la página web de Shotwell"

+

+#: src/AppWindow.vala:688

+#, c-format

+msgid "Unable to display help: %s"

+msgstr "No se puede mostrar la ayuda: %s"

+

+#: src/AppWindow.vala:696

+#, c-format

+msgid "Unable to navigate to bug database: %s"

+msgstr "No se pudo navegar en la base de datos de errores: %s"

+

+#: src/AppWindow.vala:704

+#, c-format

+msgid "Unable to display FAQ: %s"

+msgstr "No se pudieron mostrar las P+F: %s"

+

+#: src/BatchImport.vala:26

+msgid "Success"

+msgstr "Éxito"

+

+#: src/BatchImport.vala:29

+msgid "File error"

+msgstr "Error de archivo"

+

+#: src/BatchImport.vala:32

+msgid "Unable to decode file"

+msgstr "No se puede descodificar el archivo"

+

+#: src/BatchImport.vala:35

+msgid "Database error"

+msgstr "Error de la base de datos"

+

+#: src/BatchImport.vala:38

+msgid "User aborted import"

+msgstr "El usuario canceló la importación"

+

+#: src/BatchImport.vala:41

+msgid "Not a file"

+msgstr "No es un archivo"

+

+#: src/BatchImport.vala:44

+msgid "File already exists in database"

+msgstr "El archivo ya existe en la base de datos"

+

+#: src/BatchImport.vala:47

+msgid "Unsupported file format"

+msgstr "Formato de archivo no soportado"

+

+#: src/BatchImport.vala:50

+msgid "Not an image file"

+msgstr "No es un archivo de imagen"

+

+#: src/BatchImport.vala:53

+msgid "Disk failure"

+msgstr "Fallo en disco"

+

+#: src/BatchImport.vala:56

+msgid "Disk full"

+msgstr "Disco lleno"

+

+#: src/BatchImport.vala:59

+msgid "Camera error"

+msgstr "Error de la cámara"

+

+#: src/BatchImport.vala:62

+msgid "File write error"

+msgstr "Error de escritura en el archivo"

+

+#: src/BatchImport.vala:65

+msgid "Corrupt image file"

+msgstr "Archivo de imagen dañado"

+

+#: src/BatchImport.vala:68

+#, c-format

+msgid "Imported failed (%d)"

+msgstr "Fallo de importación (%d)"

+

+#: src/camera/Branch.vala:85

+msgid "Cameras"

+msgstr "Cámaras"

+

+#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710

+#: src/camera/ImportPage.vala:726 src/MediaPage.vala:440

+#: src/photos/RawSupport.vala:303

+msgid "Camera"

+msgstr "Cámara"

+

+#: src/camera/ImportPage.vala:311 src/Properties.vala:227

+msgid "RAW+JPEG"

+msgstr "RAW+JPEG"

+

+#: src/camera/ImportPage.vala:458

+#| msgid ""

+#| "Unable to unmount camera.  Try unmounting the camera from the file "

+#| "manager."

+msgid ""

+"Unable to unmount camera. Try unmounting the camera from the file manager."

+msgstr ""

+"No se puede desmontar la cámara. Intente desmontar la cámara desde el gestor "

+"de archivos."

+

+#. hide duplicates checkbox

+#: src/camera/ImportPage.vala:775

+msgid "Hide photos already imported"

+msgstr "Ocultar fotos ya importadas"

+

+#: src/camera/ImportPage.vala:776

+msgid "Only display photos that have not been imported"

+msgstr "Mostrar solo las fotos que no han sido importadas"

+

+#: src/camera/ImportPage.vala:842

+msgid "The camera seems to be empty. No photos/videos found to import"

+msgstr "La cámara parece estar vacía. No se han importado fotos/vídeos"

+

+#: src/camera/ImportPage.vala:846

+msgid "No new photos/videos found on camera"

+msgstr "No se encontraron fotos/vídeos en la cámara"

+

+#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451

+msgid "_Titles"

+msgstr "_Títulos"

+

+#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452

+msgid "Display the title of each photo"

+msgstr "Mostrar el título de cada foto"

+

+#: src/camera/ImportPage.vala:885

+msgid "Import _Selected"

+msgstr "Importar _seleccionadas"

+

+#: src/camera/ImportPage.vala:886

+msgid "Import the selected photos into your library"

+msgstr "Importar las fotos seleccionadas a su colección"

+

+#: src/camera/ImportPage.vala:891

+msgid "Import _All"

+msgstr "Importar tod_as"

+

+#: src/camera/ImportPage.vala:892

+msgid "Import all the photos into your library"

+msgstr "Importar todas las fotos a su colección"

+

+#. it's mounted, offer to unmount for the user

+#: src/camera/ImportPage.vala:1013

+#| msgid ""

+#| "Shotwell needs to unmount the camera from the filesystem in order to "

+#| "access it.  Continue?"

+msgid ""

+"Shotwell needs to unmount the camera from the filesystem in order to access "

+"it. Continue?"

+msgstr ""

+"Shotwell necesita desmontar la cámara del sistema de archivos con el fin de "

+"acceder a ella. ¿Continuar?"

+

+#: src/camera/ImportPage.vala:1019

+msgid "_Unmount"

+msgstr "_Desmontar"

+

+#: src/camera/ImportPage.vala:1024

+msgid "Please unmount the camera."

+msgstr "Desmonte la cámara."

+

+#: src/camera/ImportPage.vala:1029

+#| msgid ""

+#| "The camera is locked by another application.  Shotwell can only access "

+#| "the camera when it's unlocked.  Please close any other application using "

+#| "the camera and try again."

+msgid ""

+"The camera is locked by another application. Shotwell can only access the "

+"camera when it’s unlocked. Please close any other application using the "

+"camera and try again."

+msgstr ""

+"La cámara está bloqueada por otra aplicación. Shotwell solo puede acceder a "

+"la cámara cuando está desbloqueada. Cierre cualquier otra aplicación que "

+"esté utilizando la cámara e inténtelo de nuevo."

+

+#: src/camera/ImportPage.vala:1039

+msgid "Please close any other application using the camera."

+msgstr "Cierre cualquier otra aplicación que esté utilizando la cámara."

+

+#: src/camera/ImportPage.vala:1044

+#, c-format

+msgid ""

+"Unable to fetch previews from the camera:\n"

+"%s"

+msgstr ""

+"No se pueden obtener previsualizaciones de la cámara:\n"

+"%s"

+

+#: src/camera/ImportPage.vala:1061

+msgid "Unmounting…"

+msgstr "Desmontando…"

+

+#: src/camera/ImportPage.vala:1152

+msgid "Starting import, please wait…"

+msgstr "Iniciando la importación, espere un momento…"

+

+#: src/camera/ImportPage.vala:1169

+msgid "Fetching photo information"

+msgstr "Obteniendo información de la foto"

+

+#: src/camera/ImportPage.vala:1527

+#, c-format

+msgid "Fetching preview for %s"

+msgstr "Obteniendo previsualización para %s"

+

+#: src/camera/ImportPage.vala:1643

+#, c-format

+msgid "Unable to lock camera: %s"

+msgstr "No se puede bloquear la cámara: %s"

+

+#: src/camera/ImportPage.vala:1728

+#, c-format

+msgid "Delete this photo from camera?"

+msgid_plural "Delete these %d photos from camera?"

+msgstr[0] "¿Quiere eliminar esta foto de la cámara?"

+msgstr[1] "¿Quiere eliminar estas %d fotos de la cámara?"

+

+#: src/camera/ImportPage.vala:1731

+#, c-format

+msgid "Delete this video from camera?"

+msgid_plural "Delete these %d videos from camera?"

+msgstr[0] "¿Quiere eliminar esta foto de la cámara?"

+msgstr[1] "¿Quiere eliminar estas %d fotos de la cámara?"

+

+#: src/camera/ImportPage.vala:1734

+#, c-format

+msgid "Delete this photo/video from camera?"

+msgid_plural "Delete these %d photos/videos from camera?"

+msgstr[0] "¿Quiere eliminar esta foto/vídeo de la cámara?"

+msgstr[1] "¿Quiere eliminar estas %d fotos/vídeos de la cámara?"

+

+#: src/camera/ImportPage.vala:1737

+#, c-format

+msgid "Delete these files from camera?"

+msgid_plural "Delete these %d files from camera?"

+msgstr[0] "¿Eliminar este archivo de la cámara?"

+msgstr[1] "¿Eliminar estos %d archivos de la cámara?"

+

+#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1408

+msgid "_Keep"

+msgstr "_Mantener"

+

+#: src/camera/ImportPage.vala:1764

+msgid "Removing photos/videos from camera"

+msgstr "Eliminando fotos/vídeos de la cámara"

+

+#: src/camera/ImportPage.vala:1768

+#, c-format

+msgid "Unable to delete %d photo/video from the camera due to errors."

+msgid_plural "Unable to delete %d photos/videos from the camera due to errors."

+msgstr[0] "No se puede eliminar %d foto/vídeo de la cámara, debido a errores."

+msgstr[1] ""

+"No se pueden eliminar %d fotos/vídeos de la cámara, debido a errores."

+

+#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635

+msgid "S_lideshow"

+msgstr "_Diapositivas"

+

+#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636

+msgid "Play a slideshow"

+msgstr "Iniciar un pase de diapositivas"

+

+#: src/CollectionPage.vala:456

+msgid "Export Photo/Video"

+msgstr "Exportar foto o vídeo"

+

+#: src/CollectionPage.vala:456

+msgid "Export Photos/Videos"

+msgstr "Exportar fotos/vídeos"

+

+#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209

+msgid "Export Photo"

+msgstr "Exportar foto"

+

+#: src/CollectionPage.vala:458 src/Dialogs.vala:84

+msgid "Export Photos"

+msgstr "Exportar fotos"

+

+#: src/CollectionPage.vala:545 src/CollectionPage.vala:561

+msgid "Rotating"

+msgstr "Girando"

+

+#: src/CollectionPage.vala:545 src/CollectionPage.vala:561

+msgid "Undoing Rotate"

+msgstr "Deshaciendo el giro"

+

+#: src/CollectionPage.vala:570

+msgid "Flipping Horizontally"

+msgstr "Volteando horizontalmente"

+

+#: src/CollectionPage.vala:571

+msgid "Undoing Flip Horizontally"

+msgstr "Deshaciendo volteo horizontal"

+

+#: src/CollectionPage.vala:580

+msgid "Flipping Vertically"

+msgstr "Volteando verticalmente"

+

+#: src/CollectionPage.vala:581

+msgid "Undoing Flip Vertically"

+msgstr "Deshaciendo volteo vertical"

+

+#: src/Commands.vala:737

+msgid "Reverting"

+msgstr "Revirtiendo"

+

+#: src/Commands.vala:737

+msgid "Undoing Revert"

+msgstr "Deshaciendo reversión"

+

+#: src/Commands.vala:781

+msgid "Enhancing"

+msgstr "Mejorando"

+

+#: src/Commands.vala:781

+msgid "Undoing Enhance"

+msgstr "Deshaciendo mejora"

+

+#: src/Commands.vala:857

+msgid "Applying Color Transformations"

+msgstr "Aplicando transformación de color"

+

+#: src/Commands.vala:857

+msgid "Undoing Color Transformations"

+msgstr "Deshaciendo transformación de color"

+

+#: src/Commands.vala:1007

+msgid "Creating New Event"

+msgstr "Creando un evento nuevo"

+

+#: src/Commands.vala:1008

+msgid "Removing Event"

+msgstr "Quitando el evento"

+

+#: src/Commands.vala:1017

+msgid "Moving Photos to New Event"

+msgstr "Moviendo fotos a un evento nuevo"

+

+#: src/Commands.vala:1018

+msgid "Setting Photos to Previous Event"

+msgstr "Estableciendo fotos al evento anterior"

+

+#: src/Commands.vala:1075

+msgid "Merging"

+msgstr "Combinando"

+

+#: src/Commands.vala:1076

+msgid "Unmerging"

+msgstr "Deshaciendo la combinación"

+

+#: src/Commands.vala:1085

+msgid "Duplicating photos"

+msgstr "Duplicando las fotos"

+

+#: src/Commands.vala:1085

+msgid "Removing duplicated photos"

+msgstr "Quitando las fotos duplicadas"

+

+#: src/Commands.vala:1108

+#, c-format

+msgid "Unable to duplicate one photo due to a file error"

+msgid_plural "Unable to duplicate %d photos due to file errors"

+msgstr[0] "No se puede duplicar una foto debido a un error de archivo"

+msgstr[1] "No se pueden duplicar %d fotos debido a errores de archivo"

+

+#: src/Commands.vala:1195

+msgid "Restoring previous rating"

+msgstr "Restaurar valoración anterior"

+

+#: src/Commands.vala:1205 src/Commands.vala:1206

+msgid "Increasing ratings"

+msgstr "Aumentando la valoración"

+

+#: src/Commands.vala:1205 src/Commands.vala:1206

+msgid "Decreasing ratings"

+msgstr "Disminuyendo la valoración"

+

+#: src/Commands.vala:1256

+msgid "Setting RAW developer"

+msgstr "Configurando el revelador RAW"

+

+#: src/Commands.vala:1256

+msgid "Restoring previous RAW developer"

+msgstr "Restaurando el revelador RAW anterior"

+

+#: src/Commands.vala:1257

+msgid "Set Developer"

+msgstr "Establecer revelador"

+

+#: src/Commands.vala:1347

+msgid "Original photo could not be adjusted."

+msgstr "No se pudo ajustar la foto original."

+

+#: src/Commands.vala:1368

+msgid "Adjusting Date and Time"

+msgstr "Ajustar fecha y hora"

+

+#: src/Commands.vala:1368

+msgid "Undoing Date and Time Adjustment"

+msgstr "Deshacer ajuste de fecha y hora"

+

+#: src/Commands.vala:1399

+msgid "One original photo could not be adjusted."

+msgid_plural "The following original photos could not be adjusted."

+msgstr[0] "No se pudo modificar una foto original."

+msgstr[1] "No se pudieron modificar las siguientes fotos originales."

+

+#: src/Commands.vala:1401 src/Commands.vala:1425

+msgid "Time Adjustment Error"

+msgstr "Error al ajustar la hora"

+

+#: src/Commands.vala:1423

+msgid "Time adjustments could not be undone on the following photo file."

+msgid_plural ""

+"Time adjustments could not be undone on the following photo files."

+msgstr[0] ""

+"El ajuste de la hora no se puede deshacer en el archivo de la foto siguiente."

+msgstr[1] ""

+"El ajuste de la hora no se puede deshacer en el archivo de la foto siguiente."

+

+#: src/Commands.vala:1637 src/Commands.vala:1660

+msgid "Create Tag"

+msgstr "Crear etiqueta"

+

+#: src/Commands.vala:1695

+#, c-format

+#| msgid "Move Tag \"%s\""

+msgid "Move Tag “%s”"

+msgstr "Mover etiqueta «%s»"

+

+#: src/Commands.vala:2347

+msgid "Move Photos to Trash"

+msgstr "Mover fotos a la papelera"

+

+#: src/Commands.vala:2347

+msgid "Restore Photos from Trash"

+msgstr "Restaurar fotos desde la papelera"

+

+#: src/Commands.vala:2348

+msgid "Move the photos to the Shotwell trash"

+msgstr "Mover las fotos a la papelera de Shotwell"

+

+#: src/Commands.vala:2348

+msgid "Restore the photos back to the Shotwell library"

+msgstr "Restaurar las fotos a la colección de Shotwell"

+

+#: src/Commands.vala:2367

+msgid "Moving Photos to Trash"

+msgstr "Mover fotos a la papelera"

+

+#: src/Commands.vala:2367

+msgid "Restoring Photos From Trash"

+msgstr "Restaurar fotos desde la papelera"

+

+#: src/Commands.vala:2453

+msgid "Flag selected photos"

+msgstr "Marcar las fotos seleccionadas"

+

+#: src/Commands.vala:2454

+msgid "Unflag selected photos"

+msgstr "Desmarcar las fotos seleccionadas"

+

+#: src/Commands.vala:2455

+msgid "Flagging selected photos"

+msgstr "Marcando las fotos seleccionadas"

+

+#: src/Commands.vala:2456

+msgid "Unflagging selected photos"

+msgstr "Desmarcando las fotos seleccionadas"

+

+#: src/Commands.vala:2463

+msgid "Flag"

+msgstr "Marcar"

+

+#: src/Commands.vala:2463

+msgid "Unflag"

+msgstr "Desmarcar"

+

+#. Send an empty job to the queue to mark the end of the import

+#: src/data_imports/DataImportsPluginHost.vala:65

+#: src/data_imports/DataImportsPluginHost.vala:78

+#, c-format

+msgid "%s Database"

+msgstr "Base de datos %s"

+

+#: src/data_imports/DataImportsPluginHost.vala:148

+#: src/data_imports/DataImportsPluginHost.vala:294

+#, c-format

+#| msgid "Importing from %s can't continue because an error occurred:"

+msgid "Importing from %s can’t continue because an error occurred:"

+msgstr ""

+"La importación desde %s no puede continuar porque ha ocurrido un error:"

+

+#: src/data_imports/DataImportsPluginHost.vala:151

+msgid "To try importing from another service, select one from the above menu."

+msgstr ""

+"Para intentar importar desde otro servicio, seleccione uno desde el menú "

+"anterior."

+

+#: src/data_imports/DataImportsUI.vala:10

+msgid ""

+"You do not have any data imports plugins enabled.\n"

+"\n"

+"In order to use the Import From Application functionality, you need to have "

+"at least one data imports plugin enabled. Plugins can be enabled in the "

+"Preferences dialog."

+msgstr ""

+"No tiene ningún complemento de importación de datos activado.\n"

+"\n"

+"Para utilizar la función Importar desde aplicación, necesita activar al "

+"menos un complemento de importación. Puede hacerlo en el cuadro de diálogo "

+"Preferencias."

+

+#: src/data_imports/DataImportsUI.vala:100

+msgid "Database file:"

+msgstr "Archivo de base de datos:"

+

+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904

+msgid "_Import"

+msgstr "_Importar"

+

+#: src/data_imports/DataImportsUI.vala:220

+msgid "Import From Application"

+msgstr "Importar desde aplicación"

+

+#: src/data_imports/DataImportsUI.vala:221

+msgid "Import media _from:"

+msgstr "Importar medios _desde:"

+

+#: src/data_imports/DataImportsUI.vala:408

+#: src/publishing/PublishingUI.vala:507

+msgid "_Close"

+msgstr "_Cerrar"

+

+#: src/data_imports/DataImports.vala:22

+msgid "Data Imports"

+msgstr "Importaciones de datos"

+

+#: src/db/DatabaseTable.vala:37

+#, c-format

+msgid "Unable to open/create photo database %s: error code %d"

+msgstr "No se puede abrir/crear base de datos de fotos %s: código de error %d"

+

+#: src/db/DatabaseTable.vala:46

+#, c-format

+msgid ""

+"Unable to write to photo database file:\n"

+" %s"

+msgstr ""

+"No se pudo escribir el archivo de la base de datos de fotos:\n"

+"%s"

+

+#: src/db/DatabaseTable.vala:48

+#, c-format

+msgid ""

+"Error accessing database file:\n"

+" %s\n"

+"\n"

+"Error was: \n"

+"%s"

+msgstr ""

+"Error al acceder al archivo de la base de datos:\n"

+"%s\n"

+"\n"

+"El error fue:\n"

+"%s"

+

+#: src/db/DatabaseTable.vala:92

+#, c-format

+msgid "Unable to restore photo database %s"

+msgstr "No se pudo restaurar la base de datos de fotos %s"

+

+#: src/DesktopIntegration.vala:121

+#, c-format

+msgid "Unable to launch Nautilus Send-To: %s"

+msgstr "No se puede abrir Nautilus Enviar a: %s"

+

+#: src/DesktopIntegration.vala:129

+msgid "Send To"

+msgstr "Enviar a"

+

+#: src/DesktopIntegration.vala:174

+#, c-format

+msgid "Unable to export background to %s: %s"

+msgstr "No se puede exportar el fondo de pantalla a %s: %s"

+

+#: src/DesktopIntegration.vala:311

+#, c-format

+msgid "Unable to prepare desktop slideshow: %s"

+msgstr "No se puede preparar el presentación de diapositivas de escritorio: %s"

+

+#: src/Dialogs.vala:16

+#, c-format

+#| msgid "This will remove the tag \"%s\" from one photo.  Continue?"

+#| msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"

+msgid "This will remove the tag “%s” from one photo. Continue?"

+msgid_plural "This will remove the tag “%s” from %d photos. Continue?"

+msgstr[0] "Esto eliminará la etiqueta «%s» de una foto. ¿Continuar?"

+msgstr[1] "Esto eliminará la etiqueta «%s» de %d fotos. ¿Continuar?"

+

+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1409

+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414

+#: src/Resources.vala:679

+msgid "_Delete"

+msgstr "_Eliminar"

+

+#: src/Dialogs.vala:25

+#, c-format

+#| msgid "This will remove the saved search \"%s\".  Continue?"

+msgid "This will remove the saved search “%s”. Continue?"

+msgstr "Esto quitará la búsqueda guardada «%s». ¿Quiere continuar?"

+

+#: src/Dialogs.vala:36

+msgid ""

+"Switching developers will undo all changes you have made to this photo in "

+"Shotwell"

+msgid_plural ""

+"Switching developers will undo all changes you have made to these photos in "

+"Shotwell"

+msgstr[0] ""

+"Al cambiar de revelador se desharán todos los cambios que realizó a esta "

+"foto en Shotwell"

+msgstr[1] ""

+"Al cambiar de revelador se desharán todos los cambios que realizó a estas "

+"fotos en Shotwell"

+

+#: src/Dialogs.vala:40

+msgid "_Switch Developer"

+msgstr "_Cambiar de revelador"

+

+#: src/Dialogs.vala:59

+msgid "Export Video"

+msgstr "Exportar vídeo"

+

+#. Ticket #3023

+#. Attempt to replace the system error with something friendlier

+#. if we can't copy an image over for editing in an external tool.

+#. Did we fail because we can't write to this directory?

+#. Yes - display an alternate error message here.

+#: src/Dialogs.vala:112

+#, c-format

+#| msgid ""

+#| "Shotwell couldn't create a file for editing this photo because you do not "

+#| "have permission to write to %s."

+msgid ""

+"Shotwell couldn’t create a file for editing this photo because you do not "

+"have permission to write to %s."

+msgstr ""

+"Shotwell no pudo crear un archivo para editar esta foto porque no tiene "

+"permiso para escribir en %s."

+

+#: src/Dialogs.vala:121

+msgid ""

+"Unable to export the following photo due to a file error.\n"

+"\n"

+msgstr "No se puede exportar la siguiente foto debido a un error de archivo.\n"

+

+#: src/Dialogs.vala:127

+msgid ""

+"\n"

+"\n"

+"Would you like to continue exporting?"

+msgstr ""

+"\n"

+"\n"

+"¿Quiere continuar la exportación?"

+

+#. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really

+#. aren't formats so much as they are operating modes that determine specific formats.

+#. Hereafter we'll refer to these as "special formats."

+#: src/Dialogs.vala:144

+msgid "Unmodified"

+msgstr "Sin modificar"

+

+#: src/Dialogs.vala:145

+msgid "Current"

+msgstr "Actual"

+

+#. layout controls

+#: src/Dialogs.vala:221

+msgid "_Format:"

+msgstr "_Formato:"

+

+#: src/Dialogs.vala:224

+msgid "_Quality:"

+msgstr "_Calidad:"

+

+#: src/Dialogs.vala:227

+msgid "_Scaling constraint:"

+msgstr "Re_stricción de escala:"

+

+#: src/Dialogs.vala:230

+msgid "_Pixels:"

+msgstr "_Píxeles:"

+

+#: src/Dialogs.vala:234

+#| msgid "Export metadata"

+msgid "Export _metadata:"

+msgstr "Exportar metadatos:"

+

+#: src/Dialogs.vala:478

+msgid "Save Details…"

+msgstr "Guardar detalles…"

+

+#: src/Dialogs.vala:479

+msgid "Save Details"

+msgstr "Guardar detalles"

+

+#: src/Dialogs.vala:494

+#, c-format

+msgid "(and %d more)\n"

+msgstr "(y %d más)\n"

+

+#: src/Dialogs.vala:547

+msgid "Import Results Report"

+msgstr "Informe de resultados de importación"

+

+#: src/Dialogs.vala:551

+#, c-format

+msgid "Attempted to import %d file."

+msgid_plural "Attempted to import %d files."

+msgstr[0] "Se intentó importar %d archivo."

+msgstr[1] "Se intentaron importar %d archivos."

+

+#: src/Dialogs.vala:554

+#, c-format

+msgid "Of these, %d file was successfully imported."

+msgid_plural "Of these, %d files were successfully imported."

+msgstr[0] "De ellos, se importó %d archivo correctamente."

+msgstr[1] "De ellos, se importaron %d archivos correctamente."

+

+#.

+#. Duplicates

+#.

+#: src/Dialogs.vala:566

+msgid "Duplicate Photos/Videos Not Imported:"

+msgstr "Fotos/vídeos duplicados no importados:"

+

+#: src/Dialogs.vala:570

+msgid "duplicates existing media item"

+msgstr "duplica el elemento existente"

+

+#.

+#. Files Not Imported Due to Camera Errors

+#.

+#: src/Dialogs.vala:581

+msgid "Photos/Videos Not Imported Due to Camera Errors:"

+msgstr "Fotos/vídeos no importados debido a errores de cámara:"

+

+#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614

+#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659

+msgid "error message:"

+msgstr "mensaje de error:"

+

+#.

+#. Files Not Imported Because They Weren't Recognized as Photos or Videos

+#.

+#: src/Dialogs.vala:595

+#| msgid ""

+#| "Files Not Imported Because They Weren't Recognized as Photos or Videos:"

+msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"

+msgstr "Archivos no importados porque no se reconocieron como fotos o vídeos:"

+

+#.

+#. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands

+#.

+#: src/Dialogs.vala:610

+#| msgid ""

+#| "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "

+#| "Understands:"

+msgid ""

+"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "

+"Understands:"

+msgstr ""

+"Fotos/vídeos no importados porque no estaban en un formato compatible con "

+"Shotwell:"

+

+#.

+#. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library

+#.

+#: src/Dialogs.vala:625

+#| msgid ""

+#| "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "

+#| "Library:"

+msgid ""

+"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "

+"Library:"

+msgstr ""

+"Fotos/vídeos no importados porque Shotwell no pudo copiarlos a su colección:"

+

+#: src/Dialogs.vala:629

+#, c-format

+#| msgid ""

+#| "couldn't copy %s\n"

+#| "\tto %s"

+msgid ""

+"couldn’t copy %s\n"

+"\tto %s"

+msgstr ""

+"no se pudo copiar %s\n"

+"\ta %s"

+

+#.

+#. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt

+#.

+#: src/Dialogs.vala:641

+msgid "Photos/Videos Not Imported Because Files Are Corrupt:"

+msgstr "No se importaron las fotos/vídeos porque los archivos están dañados:"

+

+#.

+#. Photos/Videos Not Imported for Other Reasons

+#.

+#: src/Dialogs.vala:656

+msgid "Photos/Videos Not Imported for Other Reasons:"

+msgstr "Fotos/vídeos no importados por otros motivos:"

+

+#: src/Dialogs.vala:676

+#, c-format

+msgid "1 duplicate photo was not imported:\n"

+msgid_plural "%d duplicate photos were not imported:\n"

+msgstr[0] "No se importó 1 foto duplicada:\r\n"

+msgstr[1] "No se importaron %d fotos duplicadas:\r\n"

+

+#: src/Dialogs.vala:679

+#, c-format

+msgid "1 duplicate video was not imported:\n"

+msgid_plural "%d duplicate videos were not imported:\n"

+msgstr[0] "No se importó 1 vídeo duplicado:\r\n"

+msgstr[1] "No se importaron %d vídeos duplicados:\r\n"

+

+#: src/Dialogs.vala:682

+#, c-format

+msgid "1 duplicate photo/video was not imported:\n"

+msgid_plural "%d duplicate photos/videos were not imported:\n"

+msgstr[0] "No se importó 1 foto/vídeo duplicado:\r\n"

+msgstr[1] "No se importaron %d fotos/vídeos duplicados:\r\n"

+

+#: src/Dialogs.vala:696

+#, c-format

+msgid "1 photo failed to import due to a file or hardware error:\n"

+msgid_plural "%d photos failed to import due to a file or hardware error:\n"

+msgstr[0] ""

+"Falló al importar 1 foto debido a un error del archivo o de hardware:\n"

+msgstr[1] ""

+"Falló al importar %d fotos debido a un error del archivo o de hardware:\n"

+

+#: src/Dialogs.vala:699

+#, c-format

+msgid "1 video failed to import due to a file or hardware error:\n"

+msgid_plural "%d videos failed to import due to a file or hardware error:\n"

+msgstr[0] ""

+"Falló al importar 1 vídeo debido a un error del archivo o de hardware:\r\n"

+msgstr[1] ""

+"Falló al importar %d vídeos debido a un error del archivo o de hardware:\r\n"

+

+#: src/Dialogs.vala:702

+#, c-format

+msgid "1 photo/video failed to import due to a file or hardware error:\n"

+msgid_plural ""

+"%d photos/videos failed to import due to a file or hardware error:\n"

+msgstr[0] ""

+"Falló al importar 1 foto/vídeo debido a un error del archivo o de hardware:"

+"\r\n"

+msgstr[1] ""

+"Falló al importar %d fotos/vídeos debido a un error del archivo o de "

+"hardware:\r\n"

+

+#: src/Dialogs.vala:705

+#, c-format

+msgid "1 file failed to import due to a file or hardware error:\n"

+msgid_plural "%d files failed to import due to a file or hardware error:\n"

+msgstr[0] ""

+"Falló al importar 1 archivo debido a un error del archivo o de hardware:\n"

+msgstr[1] ""

+"Falló al importar %d archivos debido a un error de archivo o de hardware:\n"

+

+#: src/Dialogs.vala:719

+#, c-format

+msgid ""

+"1 photo failed to import because the photo library folder was not writable:\n"

+msgid_plural ""

+"%d photos failed to import because the photo library folder was not "

+"writable:\n"

+msgstr[0] ""

+"Falló al importar 1 foto porque la carpeta de la colección de fotos no se "

+"puede escribir:\n"

+msgstr[1] ""

+"Falló al importar %d fotos porque la carpeta de la colección de fotos no se "

+"puede escribir:\n"

+

+#: src/Dialogs.vala:722

+#, c-format

+msgid ""

+"1 video failed to import because the photo library folder was not writable:\n"

+msgid_plural ""

+"%d videos failed to import because the photo library folder was not "

+"writable:\n"

+msgstr[0] ""

+"Falló al importar 1 foto porque la carpeta de la colección de fotos no se "

+"puede escribir:\n"

+msgstr[1] ""

+"Falló al importar %d fotos porque la carpeta de la colección de fotos no se "

+"puede escribir:\n"

+

+#: src/Dialogs.vala:725

+#, c-format

+msgid ""

+"1 photo/video failed to import because the photo library folder was not "

+"writable:\n"

+msgid_plural ""

+"%d photos/videos failed to import because the photo library folder was not "

+"writable:\n"

+msgstr[0] ""

+"Falló al importar 1 foto/vídeo porque la carpeta de la colección de fotos no "

+"se puede escribir:\n"

+msgstr[1] ""

+"Falló al importar %d fotos/vídeos porque la carpeta de la colección de fotos "

+"no se puede escribir:\n"

+

+#: src/Dialogs.vala:728

+#, c-format

+msgid ""

+"1 file failed to import because the photo library folder was not writable:\n"

+msgid_plural ""

+"%d files failed to import because the photo library folder was not "

+"writable:\n"

+msgstr[0] ""

+"Falló la importación de 1 archivo porque no se puede escribir en la "

+"colección de fotos:\n"

+msgstr[1] ""

+"Falló la importación de %d archivos porque no se puede escribir en la "

+"colección de fotos:\n"

+

+#: src/Dialogs.vala:742

+#, c-format

+msgid "1 photo failed to import due to a camera error:\n"

+msgid_plural "%d photos failed to import due to a camera error:\n"

+msgstr[0] "Falló al importar 1 foto/vídeo debido a un error de la cámara:\n"

+msgstr[1] "Falló al importar %d fotos debido a un error de la cámara:\n"

+

+#: src/Dialogs.vala:745

+#, c-format

+msgid "1 video failed to import due to a camera error:\n"

+msgid_plural "%d videos failed to import due to a camera error:\n"

+msgstr[0] "Falló al importar 1 foto/vídeo debido a un error de la cámara:\n"

+msgstr[1] "Falló al importar %d vídeos debido a un error de la cámara:\n"

+

+#: src/Dialogs.vala:748

+#, c-format

+msgid "1 photo/video failed to import due to a camera error:\n"

+msgid_plural "%d photos/videos failed to import due to a camera error:\n"

+msgstr[0] "Falló al importar 1 foto/vídeo debido a un error de la cámara:\n"

+msgstr[1] "Falló al importar %d foto/vídeo debido a un error de la cámara:\n"

+

+#: src/Dialogs.vala:751

+#, c-format

+msgid "1 file failed to import due to a camera error:\n"

+msgid_plural "%d files failed to import due to a camera error:\n"

+msgstr[0] "Falló al importar 1 archivo debido a un error de la cámara: \n"

+msgstr[1] "Falló al importar %d archivor debido a un error de la cámara: \n"

+

+#: src/Dialogs.vala:765

+#, c-format

+msgid "1 photo failed to import because it was corrupt:\n"

+msgid_plural "%d photos failed to import because they were corrupt:\n"

+msgstr[0] "No se pudo importar una foto porque está dañada:\n"

+msgstr[1] "No se pudieron importar %d fotos porque están dañadas:\n"

+

+#: src/Dialogs.vala:768

+#, c-format

+msgid "1 video failed to import because it was corrupt:\n"

+msgid_plural "%d videos failed to import because they were corrupt:\n"

+msgstr[0] "No se pudo importar un vídeo porque está dañado:\n"

+msgstr[1] "No se pudieron importar %d vídeos porque están dañados:\n"

+

+#: src/Dialogs.vala:771

+#, c-format

+msgid "1 photo/video failed to import because it was corrupt:\n"

+msgid_plural "%d photos/videos failed to import because they were corrupt:\n"

+msgstr[0] "No se pudo importar 1 foto/vídeo porque está dañado:\n"

+msgstr[1] "No se pudieron importar %d fotos/vídeos porque están dañados:\n"

+

+#: src/Dialogs.vala:774

+#, c-format

+msgid "1 file failed to import because it was corrupt:\n"

+msgid_plural "%d files failed to import because it was corrupt:\n"

+msgstr[0] "No se pudo importar un archivo porque está dañado:\n"

+msgstr[1] "No se pudieron importar %d archivos porque están dañados:\n"

+

+#. we have no notion of "unsupported" video files right now in Shotwell (all

+#. standard container formats are supported, it's just that the streams in them

+#. might or might not be interpretable), so this message does not need to be

+#. media specific

+#: src/Dialogs.vala:791

+#, c-format

+msgid "1 unsupported photo skipped:\n"

+msgid_plural "%d unsupported photos skipped:\n"

+msgstr[0] "Se omitió 1 foto no compatible:\n"

+msgstr[1] "Se omitieron %d fotos no compatibles:\n"

+

+#. we have no notion of "non-video" video files right now in Shotwell, so this

+#. message doesn't need to be media specific

+#: src/Dialogs.vala:806

+#, c-format

+msgid "1 non-image file skipped.\n"

+msgid_plural "%d non-image files skipped.\n"

+msgstr[0] "Se omitió 1 archivo que no era una imagen.\n"

+msgstr[1] "Se omitieron %d archivos que no eran imágenes.\n"

+

+#: src/Dialogs.vala:817

+#, c-format

+msgid "1 photo skipped due to user cancel:\n"

+msgid_plural "%d photos skipped due to user cancel:\n"

+msgstr[0] "Se omitió 1 foto debido a la cancelación del usuario:\n"

+msgstr[1] "Se omitieron %d fotos debido a la cancelación del usuario:\n"

+

+#: src/Dialogs.vala:820

+#, c-format

+msgid "1 video skipped due to user cancel:\n"

+msgid_plural "%d videos skipped due to user cancel:\n"

+msgstr[0] "Se omitió 1 vídeo debido a la cancelación del usuario:\n"

+msgstr[1] "Se omitieron %d vídeos debido a la cancelación del usuario:\n"

+

+#: src/Dialogs.vala:823

+#, c-format

+msgid "1 photo/video skipped due to user cancel:\n"

+msgid_plural "%d photos/videos skipped due to user cancel:\n"

+msgstr[0] "Se omitió 1 foto/vídeo debido a la cancelación del usuario:\n"

+msgstr[1] "Se omitieron %d fotos/vídeos debido a la cancelación del usuario:\n"

+

+#: src/Dialogs.vala:826

+#, c-format

+msgid "1 file skipped due to user cancel:\n"

+msgid_plural "%d file skipped due to user cancel:\n"

+msgstr[0] "Se omitió 1 archivo debido a la cancelación del usuario:\n"

+msgstr[1] "Se omitieron %d archivos debido a la cancelación del usuario:\n"

+

+#: src/Dialogs.vala:840

+#, c-format

+msgid "1 photo successfully imported.\n"

+msgid_plural "%d photos successfully imported.\n"

+msgstr[0] "1 foto correctamente importada.\n"

+msgstr[1] "%d fotos importadas correctamente.\n"

+

+#: src/Dialogs.vala:843

+#, c-format

+msgid "1 video successfully imported.\n"

+msgid_plural "%d videos successfully imported.\n"

+msgstr[0] "1 vídeo correctamente importado.\n"

+msgstr[1] "%d vídeos importados correctamente.\n"

+

+#: src/Dialogs.vala:846

+#, c-format

+msgid "1 photo/video successfully imported.\n"

+msgid_plural "%d photos/videos successfully imported.\n"

+msgstr[0] "1 foto/vídeo correctamente importado.\n"

+msgstr[1] "%d fotos/vídeos importados correctamente.\n"

+

+#. if no media items were imported at all (i.e. an empty directory attempted), need to at least

+#. report that nothing was imported

+#: src/Dialogs.vala:862

+msgid "No photos or videos imported.\n"

+msgstr "No se importó ninguna foto o vídeo.\n"

+

+#: src/Dialogs.vala:869 src/Dialogs.vala:888

+msgid "Import Complete"

+msgstr "Importación completa"

+

+#: src/Dialogs.vala:1174

+#, c-format

+msgid "%d second"

+msgid_plural "%d seconds"

+msgstr[0] "%d segundo"

+msgstr[1] "%d segundos"

+

+#: src/Dialogs.vala:1177

+#, c-format

+msgid "%d minute"

+msgid_plural "%d minutes"

+msgstr[0] "%d minuto"

+msgstr[1] "%d minutos"

+

+#: src/Dialogs.vala:1181

+#, c-format

+msgid "%d hour"

+msgid_plural "%d hours"

+msgstr[0] "%d hora"

+msgstr[1] "%d horas"

+

+#: src/Dialogs.vala:1184

+msgid "1 day"

+msgstr "1 día"

+

+#: src/Dialogs.vala:1338 src/Resources.vala:231

+msgid "Rename Event"

+msgstr "Renombrar evento"

+

+#: src/Dialogs.vala:1338

+msgid "Name:"

+msgstr "Nombre:"

+

+#. Dialog title

+#: src/Dialogs.vala:1349

+msgctxt "Dialog Title"

+msgid "Edit Title"

+msgstr "Editar título"

+

+#: src/Dialogs.vala:1350 src/Properties.vala:340

+msgid "Title:"

+msgstr "Título:"

+

+#. Dialog title

+#: src/Dialogs.vala:1366 src/Resources.vala:307

+msgid "Edit Event Comment"

+msgstr "Editar comentario de evento"

+

+#: src/Dialogs.vala:1367

+msgid "Edit Photo/Video Comment"

+msgstr "Editar comentario de foto/vídeo"

+

+#: src/Dialogs.vala:1368 src/Properties.vala:628

+msgid "Comment:"

+msgstr "Comentario:"

+

+#: src/Dialogs.vala:1384

+msgid "Remove and _Trash File"

+msgid_plural "Remove and _Trash Files"

+msgstr[0] "Eliminar archivo y mover a la _papelera"

+msgstr[1] "Eliminar archivos y mover a la _papelera"

+

+#: src/Dialogs.vala:1388

+msgid "_Remove From Library"

+msgstr "_Quitar de la colección"

+

+#: src/Dialogs.vala:1431

+msgid "Revert External Edit?"

+msgstr "¿Revertir las ediciones externas?"

+

+#: src/Dialogs.vala:1431

+msgid "Revert External Edits?"

+msgstr "¿Revertir ediciones externas?"

+

+#: src/Dialogs.vala:1433

+#, c-format

+#| msgid "This will destroy all changes made to the external file.  Continue?"

+#| msgid_plural ""

+#| "This will destroy all changes made to %d external files.  Continue?"

+msgid "This will destroy all changes made to the external file. Continue?"

+msgid_plural ""

+"This will destroy all changes made to %d external files. Continue?"

+msgstr[0] ""

+"Esto destruirá todos los cambios realizados en el archivo externo. "

+"¿Continuar?"

+msgstr[1] ""

+"Esto destruirá todos los cambios realizados en los %d archivos externos.  "

+"¿Continuar?"

+

+#: src/Dialogs.vala:1437

+msgid "Re_vert External Edit"

+msgstr "Re_vertir edición externa"

+

+#: src/Dialogs.vala:1437

+msgid "Re_vert External Edits"

+msgstr "Re_vertir ediciones externas"

+

+#: src/Dialogs.vala:1458

+#, c-format

+#| msgid "This will remove the photo from the library.  Continue?"

+#| msgid_plural "This will remove %d photos from the library.  Continue?"

+msgid "This will remove the photo from the library. Continue?"

+msgid_plural "This will remove %d photos from the library. Continue?"

+msgstr[0] "Esto quitará la foto de la colección. ¿Continuar?"

+msgstr[1] "Esto quitará las %d fotos de la colección. ¿Continuar?"

+

+#: src/Dialogs.vala:1465 src/Resources.vala:173

+msgid "_Remove"

+msgstr "_Quitar"

+

+#: src/Dialogs.vala:1466

+msgid "Remove Photo From Library"

+msgstr "Quitar la foto de la colección"

+

+#: src/Dialogs.vala:1466

+msgid "Remove Photos From Library"

+msgstr "Quitar fotos de la colección"

+

+#: src/Dialogs.vala:1559

+#, c-format

+msgid "%d%%"

+msgstr "%d%%"

+

+#: src/Dialogs.vala:1713

+msgid "AM"

+msgstr "a.m."

+

+#: src/Dialogs.vala:1714

+msgid "PM"

+msgstr "p.m."

+

+#: src/Dialogs.vala:1715

+msgid "24 Hr"

+msgstr "24 hrs."

+

+#: src/Dialogs.vala:1730

+msgid "_Shift photos/videos by the same amount"

+msgstr "_Desplazar todas las fotos y/o vídeos la misma cantidad"

+

+#: src/Dialogs.vala:1735

+msgid "Set _all photos/videos to this time"

+msgstr "Ajustar _todas las fotos y/o vídeos a esta hora"

+

+#: src/Dialogs.vala:1742

+msgid "_Modify original photo file"

+msgstr "_Modificar archivo de foto original"

+

+#: src/Dialogs.vala:1742

+msgid "_Modify original photo files"

+msgstr ":Modificar archivos de fotos originales"

+

+#: src/Dialogs.vala:1745

+msgid "_Modify original file"

+msgstr "_Modificar archivos originales"

+

+#: src/Dialogs.vala:1745

+msgid "_Modify original files"

+msgstr "_Modificar archivos originales"

+

+#: src/Dialogs.vala:1831

+msgid "Original: "

+msgstr "Original:"

+

+#: src/Dialogs.vala:1832

+msgid "%m/%d/%Y, %H:%M:%S"

+msgstr "%d/%m/%Y, %H:%M:%S"

+

+#: src/Dialogs.vala:1833

+msgid "%m/%d/%Y, %I:%M:%S %p"

+msgstr "%d/%m/%Y, %H:%M:%S %p"

+

+#: src/Dialogs.vala:1922

+#, c-format

+msgid ""

+"Exposure time will be shifted forward by\n"

+"%d %s, %d %s, %d %s, and %d %s."

+msgstr ""

+"El tiempo de exposición se adelantará por\n"

+"%d %s, %d %s, %d %s, y %d %s."

+

+#: src/Dialogs.vala:1923

+#, c-format

+msgid ""

+"Exposure time will be shifted backward by\n"

+"%d %s, %d %s, %d %s, and %d %s."

+msgstr ""

+"El tiempo de exposición se atrasará por\n"

+"%d %s, %d %s, %d %s, y %d %s."

+

+#: src/Dialogs.vala:1925

+msgid "day"

+msgid_plural "days"

+msgstr[0] "día"

+msgstr[1] "días"

+

+#: src/Dialogs.vala:1926

+msgid "hour"

+msgid_plural "hours"

+msgstr[0] "hora"

+msgstr[1] "horas"

+

+#: src/Dialogs.vala:1927

+msgid "minute"

+msgid_plural "minutes"

+msgstr[0] "minuto"

+msgstr[1] "minutos"

+

+#: src/Dialogs.vala:1928

+msgid "second"

+msgid_plural "seconds"

+msgstr[0] "segundo"

+msgstr[1] "segundos"

+

+#: src/Dialogs.vala:1972

+#, c-format

+msgid ""

+"\n"

+"\n"

+"And %d other."

+msgid_plural ""

+"\n"

+"\n"

+"And %d others."

+msgstr[0] ""

+"\n"

+"\n"

+"Y %d más."

+msgstr[1] ""

+"\n"

+"\n"

+"Y %d más."

+

+#: src/Dialogs.vala:1996 src/Dialogs.vala:2023

+msgid "Tags (separated by commas):"

+msgstr "Etiquetas (separadas por comas):"

+

+#: src/Dialogs.vala:2103

+msgid "Welcome!"

+msgstr "Bienvenido/a"

+

+#: src/Dialogs.vala:2110

+msgid "Welcome to Shotwell!"

+msgstr "Bienvenido/a a Shotwell."

+

+#: src/Dialogs.vala:2114

+msgid "To get started, import photos in any of these ways:"

+msgstr "Para comenzar, importe fotos de cualquiera de las siguientes formas:"

+

+#: src/Dialogs.vala:2133

+#, c-format

+msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"

+msgstr "Elija <span weight=\"bold\">Archivo %s Importar desde carpeta</span>"

+

+#: src/Dialogs.vala:2134

+msgid "Drag and drop photos onto the Shotwell window"

+msgstr "Arrastre y suelte fotos en la ventana de Shotwell"

+

+#: src/Dialogs.vala:2135

+msgid "Connect a camera to your computer and import"

+msgstr "Conecte una cámara al equipo e importe"

+

+#: src/Dialogs.vala:2145

+#, c-format

+msgid "_Import photos from your %s folder"

+msgstr "_Importar fotos desde su carpeta %s"

+

+#: src/Dialogs.vala:2152

+msgid "You can also import photos in any of these ways:"

+msgstr "También puede importar fotos en cualquiera de estas formas:"

+

+#: src/Dialogs.vala:2162

+#| msgid "_Don't show this message again"

+msgid "_Don’t show this message again"

+msgstr "_No mostrar este mensaje de nuevo"

+

+#: src/Dialogs.vala:2197

+#, c-format

+msgid "Import photos from your %s library"

+msgstr "Importar fotos desde su colección %s"

+

+#. We're installed system-wide, so use the system help.

+#. We're being run from the build directory; we'll have to handle clicks to this

+#. link manually ourselves, due to a limitation of help: URIs.

+#: src/Dialogs.vala:2344 src/Dialogs.vala:2348

+msgid "(Help)"

+msgstr "(Ayuda)"

+

+#: src/Dialogs.vala:2357

+#, c-format

+msgid "Year%sMonth%sDay"

+msgstr "Año%sMes%sDía"

+

+#: src/Dialogs.vala:2359

+#, c-format

+msgid "Year%sMonth"

+msgstr "Año%sMes"

+

+#: src/Dialogs.vala:2361

+#, c-format

+msgid "Year%sMonth-Day"

+msgstr "Año%sMes-Día"

+

+#: src/Dialogs.vala:2363

+msgid "Year-Month-Day"

+msgstr "Año-Mes-Día"

+

+#: src/Dialogs.vala:2364 src/editing_tools/EditingTools.vala:781

+msgid "Custom"

+msgstr "Personalizado"

+

+#. Invalid pattern.

+#: src/Dialogs.vala:2601

+msgid "Invalid pattern"

+msgstr "Patrón no válido"

+

+#. This function is used to determine whether or not files should be copied or linked when imported.

+#. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.

+#: src/Dialogs.vala:2703

+msgid ""

+"Shotwell can copy the photos into your library folder or it can import them "

+"without copying."

+msgstr ""

+"Shotwell puede copiar las fotos en su colección o puede importarlas sin "

+"copiarlas."

+

+#: src/Dialogs.vala:2708

+msgid "Co_py Photos"

+msgstr "C_opiar fotos"

+

+#: src/Dialogs.vala:2709

+msgid "_Import in Place"

+msgstr "_Importar en el lugar"

+

+#: src/Dialogs.vala:2710

+msgid "Import to Library"

+msgstr "Importar a la colección"

+

+#: src/Dialogs.vala:2720 src/PhotoPage.vala:3085

+msgid "Remove From Library"

+msgstr "Quitar de la colección"

+

+#: src/Dialogs.vala:2721 src/PhotoPage.vala:3085

+msgid "Removing Photo From Library"

+msgstr "Quitando la foto de la colección"

+

+#: src/Dialogs.vala:2721

+msgid "Removing Photos From Library"

+msgstr "Quitando fotos de la colección"

+

+#: src/Dialogs.vala:2735

+#, c-format

+#| msgid ""

+#| "This will remove the photo/video from your Shotwell library.  Would you "

+#| "also like to move the file to your desktop trash?\n"

+#| "\n"

+#| "This action cannot be undone."

+#| msgid_plural ""

+#| "This will remove %d photos/videos from your Shotwell library.  Would you "

+#| "also like to move the files to your desktop trash?\n"

+#| "\n"

+#| "This action cannot be undone."

+msgid ""

+"This will remove the photo/video from your Shotwell library. Would you also "

+"like to move the file to your desktop trash?\n"

+"\n"

+"This action cannot be undone."

+msgid_plural ""

+"This will remove %d photos/videos from your Shotwell library. Would you also "

+"like to move the files to your desktop trash?\n"

+"\n"

+"This action cannot be undone."

+msgstr[0] ""

+"Esto quitará la foto y/o el vídeo de su colección de Shotwell. ¿Le gustaría "

+"mover el archivo a la papelera del escritorio?\n"

+"\n"

+"Esta acción no se puede deshacer."

+msgstr[1] ""

+"Esto quitará %d fotos y/o vídeos de su colección de Shotwell. ¿Le gustaría "

+"mover los archivos a la papelera del escritorio?\n"

+"\n"

+"Esta acción no se puede deshacer."

+

+#: src/Dialogs.vala:2739

+#, c-format

+#| msgid ""

+#| "This will remove the video from your Shotwell library.  Would you also "

+#| "like to move the file to your desktop trash?\n"

+#| "\n"

+#| "This action cannot be undone."

+#| msgid_plural ""

+#| "This will remove %d videos from your Shotwell library.  Would you also "

+#| "like to move the files to your desktop trash?\n"

+#| "\n"

+#| "This action cannot be undone."

+msgid ""

+"This will remove the video from your Shotwell library. Would you also like "

+"to move the file to your desktop trash?\n"

+"\n"

+"This action cannot be undone."

+msgid_plural ""

+"This will remove %d videos from your Shotwell library. Would you also like "

+"to move the files to your desktop trash?\n"

+"\n"

+"This action cannot be undone."

+msgstr[0] ""

+"Esto quitará el vídeo de su colección de Shotwell. ¿Le gustaría mover el "

+"archivo a la papelera del escritorio?\n"

+"\n"

+"Esta acción no se puede deshacer."

+msgstr[1] ""

+"Esto quitará los %d vídeos de su colección de Shotwell. ¿Le gustaría mover "

+"los archivos a la papelera del escritorio?\n"

+"\n"

+"Esta acción no se puede deshacer."

+

+#: src/Dialogs.vala:2743

+#, c-format

+#| msgid ""

+#| "This will remove the photo from your Shotwell library.  Would you also "

+#| "like to move the file to your desktop trash?\n"

+#| "\n"

+#| "This action cannot be undone."

+#| msgid_plural ""

+#| "This will remove %d photos from your Shotwell library.  Would you also "

+#| "like to move the files to your desktop trash?\n"

+#| "\n"

+#| "This action cannot be undone."

+msgid ""

+"This will remove the photo from your Shotwell library. Would you also like "

+"to move the file to your desktop trash?\n"

+"\n"

+"This action cannot be undone."

+msgid_plural ""

+"This will remove %d photos from your Shotwell library. Would you also like "

+"to move the files to your desktop trash?\n"

+"\n"

+"This action cannot be undone."

+msgstr[0] ""

+"Esto quitará la foto de su colección de Shotwell. ¿Le gustaría mover el "

+"archivo a la papelera del escritorio?\n"

+"\n"

+"Esta acción no se puede deshacer."

+msgstr[1] ""

+"Esto quitará %d fotos de su colección de Shotwell. ¿Le gustaría mover los "

+"archivos a la papelera del escritorio?\n"

+"\n"

+"Esta acción no se puede deshacer."

+

+#: src/Dialogs.vala:2775

+#, c-format

+#| msgid ""

+#| "The photo or video cannot be moved to your desktop trash.  Delete this "

+#| "file?"

+#| msgid_plural ""

+#| "%d photos/videos cannot be moved to your desktop trash.  Delete these "

+#| "files?"

+msgid ""

+"The photo or video cannot be moved to your desktop trash. Delete this file?"

+msgid_plural ""

+"%d photos/videos cannot be moved to your desktop trash. Delete these files?"

+msgstr[0] ""

+"No se puede mover la foto o el vídeo a la papelera de su escritorio. "

+"¿Eliminar este archivo?"

+msgstr[1] ""

+"No se pueden mover las %d fotos o vídeos a la papelera de su escritorio. "

+"¿Eliminar estos archivos?"

+

+#. Alert the user that the files were not removed.

+#: src/Dialogs.vala:2792

+#, c-format

+msgid "The photo or video cannot be deleted."

+msgid_plural "%d photos/videos cannot be deleted."

+msgstr[0] "No se puede eliminar la foto o el vídeo."

+msgstr[1] "No se pueden eliminar las %d fotos o vídeos."

+

+#: src/Dimensions.vala:23

+msgid "Width"

+msgstr "Anchura"

+

+#: src/Dimensions.vala:26

+msgid "Height"

+msgstr "Altura"

+

+#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335

+msgid "_File"

+msgstr "_Archivo"

+

+#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432

+#: src/Resources.vala:175

+msgid "_Save"

+msgstr "_Guardar"

+

+#: src/direct/DirectPhotoPage.vala:52

+msgid "Save photo"

+msgstr "Guardar la foto"

+

+#: src/direct/DirectPhotoPage.vala:57

+msgid "Save _As…"

+msgstr "Guardar _como…"

+

+#: src/direct/DirectPhotoPage.vala:58

+msgid "Save photo with a different name"

+msgstr "Guardar la foto con un nombre diferente"

+

+#: src/direct/DirectPhotoPage.vala:69

+msgid "Print the photo to a printer connected to your computer"

+msgstr "Imprimir la foto en una impresora conectada a su equipo"

+

+#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339

+#: src/Resources.vala:159

+msgid "_Edit"

+msgstr "_Editar"

+

+#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347

+msgid "_Photo"

+msgstr "_Foto"

+

+#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416

+msgid "T_ools"

+msgstr "_Herramientas"

+

+#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421

+msgid "_Previous Photo"

+msgstr "Foto _anterior"

+

+#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422

+msgid "Previous Photo"

+msgstr "Foto anterior"

+

+#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427

+msgid "_Next Photo"

+msgstr "_Siguiente foto"

+

+#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428

+msgid "Next Photo"

+msgstr "Siguiente foto"

+

+#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343

+#: src/PhotoPage.vala:2412

+msgid "_View"

+msgstr "_Ver"

+

+#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363

+#: src/Resources.vala:162

+msgid "_Help"

+msgstr "Ay_uda"

+

+#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340

+#: src/PhotoPage.vala:2591 src/Resources.vala:183

+msgid "Zoom _In"

+msgstr "_Ampliar"

+

+#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592

+msgid "Increase the magnification of the photo"

+msgstr "Aumentar la ampliación de la foto"

+

+#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346

+#: src/PhotoPage.vala:2597 src/Resources.vala:184

+msgid "Zoom _Out"

+msgstr "Re_ducir"

+

+#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598

+msgid "Decrease the magnification of the photo"

+msgstr "Reducir la ampliación de la foto"

+

+#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603

+msgid "Fit to _Page"

+msgstr "Aj_ustar a la página"

+

+#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604

+msgid "Zoom the photo to fit on the screen"

+msgstr "Aumentar la foto hasta ajustar a la pantalla"

+

+#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610

+#, no-c-format

+msgid "Zoom _100%"

+msgstr "Ampliar al _100%"

+

+#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612

+#, no-c-format

+msgid "Zoom the photo to 100% magnification"

+msgstr "Ampliar la foto al 100%"

+

+#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618

+#, no-c-format

+msgid "Zoom _200%"

+msgstr "Ampliar al _200%"

+

+#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620

+#, no-c-format

+msgid "Zoom the photo to 200% magnification"

+msgstr "Ampliar la foto al 200%"

+

+#: src/direct/DirectPhotoPage.vala:227

+#, c-format

+msgid "%s does not exist."

+msgstr "%s no existe."

+

+#: src/direct/DirectPhotoPage.vala:229

+#, c-format

+msgid "%s is not a file."

+msgstr "%s no es un archivo."

+

+#: src/direct/DirectPhotoPage.vala:231

+#, c-format

+msgid ""

+"%s does not support the file format of\n"

+"%s."

+msgstr ""

+"%s no es compatible con el formato de archivo de\n"

+"%s."

+

+#: src/direct/DirectPhotoPage.vala:248

+#, c-format

+msgid "Unable open photo %s. Sorry."

+msgstr "No se puede abrir la foto %s."

+

+#: src/direct/DirectPhotoPage.vala:432

+msgid "_Save a Copy"

+msgstr "_Guardar una copia"

+

+#: src/direct/DirectPhotoPage.vala:435

+#, c-format

+msgid "Lose changes to %s?"

+msgstr "¿Quiere descartar los cambios a %s?"

+

+#: src/direct/DirectPhotoPage.vala:436

+msgid "Close _without Saving"

+msgstr "Cerrar _sin guardar"

+

+#: src/direct/DirectPhotoPage.vala:469

+#, c-format

+msgid "Error while saving to %s: %s"

+msgstr "Error al guardar en %s: %s"

+

+#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518

+msgid "Save As"

+msgstr "Guardar como"

+

+#. verify this is a directory

+#: src/DirectoryMonitor.vala:889

+#, c-format

+msgid "Unable to monitor %s: Not a directory (%s)"

+msgstr "No se puede monitorizar %s: No es un directorio (%s)"

+

+#: src/editing_tools/EditingTools.vala:665

+msgid "Return to current photo dimensions"

+msgstr "Volver a las dimensiones actuales de la foto"

+

+#: src/editing_tools/EditingTools.vala:668

+msgid "Set the crop for this photo"

+msgstr "Establecer el corte para esta foto"

+

+#: src/editing_tools/EditingTools.vala:680

+msgid "Pivot the crop rectangle between portrait and landscape orientations"

+msgstr ""

+"Girar el rectángulo de corte entre las orientaciones vertical y horizontal"

+

+#: src/editing_tools/EditingTools.vala:753

+msgid "Unconstrained"

+msgstr "Sin restricciones"

+

+#: src/editing_tools/EditingTools.vala:754

+msgid "Square"

+msgstr "Cuadrado"

+

+#: src/editing_tools/EditingTools.vala:755

+msgid "Screen"

+msgstr "Pantalla"

+

+#: src/editing_tools/EditingTools.vala:757

+#: src/editing_tools/EditingTools.vala:760

+#: src/editing_tools/EditingTools.vala:770

+#: src/editing_tools/EditingTools.vala:780

+msgid "-"

+msgstr "-"

+

+#: src/editing_tools/EditingTools.vala:758

+#| msgid "SD Video (4 : 3)"

+msgid "SD Video (4 ∶ 3)"

+msgstr "Vídeo SD (4:3)"

+

+#: src/editing_tools/EditingTools.vala:759

+#| msgid "HD Video (16 : 9)"

+msgid "HD Video (16 ∶ 9)"

+msgstr "Vídeo HD (16:9)"

+

+#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818

+#| msgid "Wallet (2 x 3 in.)"

+msgid "Wallet (2 × 3 in.)"

+msgstr "Cartera (2 × 3 pulg.)"

+

+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821

+#| msgid "Notecard (3 x 5 in.)"

+msgid "Notecard (3 × 5 in.)"

+msgstr "Tarjeta de notas (3 × 5 pulg.)"

+

+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824

+#| msgid "4 x 6 in."

+msgid "4 × 6 in."

+msgstr "4 × 6 pulg."

+

+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827

+#| msgid "5 x 7 in."

+msgid "5 × 7 in."

+msgstr "5 × 7 pulg."

+

+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830

+#| msgid "8 x 10 in."

+msgid "8 × 10 in."

+msgstr "8 × 10 pulg."

+

+#: src/editing_tools/EditingTools.vala:766

+#| msgid "Letter (8.5 x 11 in.)"

+msgid "Letter (8.5 × 11 in.)"

+msgstr "Carta (8.5 × 11 pulg.)"

+

+#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833

+#| msgid "11 x 14 in."

+msgid "11 × 14 in."

+msgstr "11 × 14 pulg."

+

+#: src/editing_tools/EditingTools.vala:768

+#| msgid "Tabloid (11 x 17 in.)"

+msgid "Tabloid (11 × 17 in.)"

+msgstr "Tabloide (11 × 17 pulg.)"

+

+#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836

+#| msgid "16 x 20 in."

+msgid "16 × 20 in."

+msgstr "16 × 20 pulg."

+

+#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842

+#| msgid "Metric Wallet (9 x 13 cm)"

+msgid "Metric Wallet (9 × 13 cm)"

+msgstr "Cartera métrica (9 × 13 cm)"

+

+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845

+#| msgid "Postcard (10 x 15 cm)"

+msgid "Postcard (10 × 15 cm)"

+msgstr "Tarjeta postal (10 × 15 cm)"

+

+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848

+#| msgid "13 x 18 cm"

+msgid "13 × 18 cm"

+msgstr "13 × 18 cm"

+

+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851

+#| msgid "18 x 24 cm"

+msgid "18 × 24 cm"

+msgstr "18 × 24 cm"

+

+#: src/editing_tools/EditingTools.vala:775

+#| msgid "A4 (210 x 297 mm)"

+msgid "A4 (210 × 297 mm)"

+msgstr "A4 (210 × 297 mm)"

+

+#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854

+#| msgid "20 x 30 cm"

+msgid "20 × 30 cm"

+msgstr "20 × 30 cm"

+

+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857

+#| msgid "24 x 40 cm"

+msgid "24 × 40 cm"

+msgstr "24 × 40 cm"

+

+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860

+#| msgid "30 x 40 cm"

+msgid "30 × 40 cm"

+msgstr "30 × 40 cm"

+

+#: src/editing_tools/EditingTools.vala:779

+#| msgid "A3 (297 x 420 mm)"

+msgid "A3 (297 × 420 mm)"

+msgstr "A3 (297 × 420 mm)"

+

+#: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395

+msgid "Size:"

+msgstr "Tamaño:"

+

+#: src/editing_tools/EditingTools.vala:1887

+msgid "Close the red-eye tool"

+msgstr "Cerrar la herramienta de ojos rojos"

+

+#: src/editing_tools/EditingTools.vala:1890

+msgid "Remove any red-eye effects in the selected region"

+msgstr "Quitar cualquier efecto de ojos rojos en la región seleccionada"

+

+#: src/editing_tools/EditingTools.vala:2229

+#: src/editing_tools/StraightenTool.vala:102

+msgid "_Reset"

+msgstr "_Restablecer"

+

+#. fit both on the top line, emit and move on

+#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:436

+#: src/Properties.vala:440 src/Properties.vala:447

+msgid "Exposure:"

+msgstr "Exposición:"

+

+#: src/editing_tools/EditingTools.vala:2251

+msgid "Contrast:"

+msgstr "Contraste:"

+

+#: src/editing_tools/EditingTools.vala:2259

+msgid "Saturation:"

+msgstr "Saturación:"

+

+#: src/editing_tools/EditingTools.vala:2267

+msgid "Tint:"

+msgstr "Matiz:"

+

+#: src/editing_tools/EditingTools.vala:2276

+msgid "Temperature:"

+msgstr "Temperatura:"

+

+#: src/editing_tools/EditingTools.vala:2284

+msgid "Shadows:"

+msgstr "Sombras:"

+

+#: src/editing_tools/EditingTools.vala:2292

+msgid "Highlights:"

+msgstr "Resaltadas:"

+

+#: src/editing_tools/EditingTools.vala:2346

+msgid "Reset Colors"

+msgstr "Restablecer colores"

+

+#: src/editing_tools/EditingTools.vala:2346

+msgid "Reset all color adjustments to original"

+msgstr "Restablecer todos los ajustes de color al original"

+

+#: src/editing_tools/EditingTools.vala:2705

+msgid "Temperature"

+msgstr "Temperatura"

+

+#: src/editing_tools/EditingTools.vala:2717

+msgid "Tint"

+msgstr "Matiz"

+

+#: src/editing_tools/EditingTools.vala:2729

+msgid "Contrast"

+msgstr "Contraste"

+

+#: src/editing_tools/EditingTools.vala:2743

+msgid "Saturation"

+msgstr "Saturación"

+

+#: src/editing_tools/EditingTools.vala:2756

+msgid "Exposure"

+msgstr "Exposición"

+

+#: src/editing_tools/EditingTools.vala:2769

+msgid "Shadows"

+msgstr "Sombras"

+

+#: src/editing_tools/EditingTools.vala:2782

+msgid "Highlights"

+msgstr "Resaltadas"

+

+#: src/editing_tools/EditingTools.vala:2792

+msgid "Contrast Expansion"

+msgstr "Expansión de contraste"

+

+#: src/editing_tools/StraightenTool.vala:99

+msgid "Angle:"

+msgstr "Ángulo:"

+

+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202

+msgid "_Straighten"

+msgstr "_Enderezar"

+

+#: src/events/Branch.vala:25

+msgid "Events"

+msgstr "Eventos"

+

+#: src/events/EventDirectoryItem.vala:83

+#, c-format

+msgid "%d Photo/Video"

+msgid_plural "%d Photos/Videos"

+msgstr[0] "%d foto/vídeo"

+msgstr[1] "%d fotos/vídeos"

+

+#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:355

+#, c-format

+msgid "%d Video"

+msgid_plural "%d Videos"

+msgstr[0] "%d vídeo"

+msgstr[1] "%d vídeos"

+

+#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:353

+#, c-format

+msgid "%d Photo"

+msgid_plural "%d Photos"

+msgstr[0] "%d foto"

+msgstr[1] "%d fotos"

+

+#: src/events/EventPage.vala:129

+msgid "No Event"

+msgstr "No hay eventos"

+

+#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457

+msgid "_Comments"

+msgstr "_Comentarios"

+

+#: src/events/EventsDirectoryPage.vala:131

+msgid "Display the comment of each event"

+msgstr "Mostrar el comentario de cada evento"

+

+#: src/events/EventsDirectoryPage.vala:155

+msgid "No events"

+msgstr "No hay eventos"

+

+#: src/events/EventsDirectoryPage.vala:159

+msgid "No events found"

+msgstr "No se encontraron eventos"

+

+#: src/events/EventsDirectoryPage.vala:230

+msgid "All Events"

+msgstr "Todos los eventos"

+

+#: src/events/EventsDirectoryPage.vala:244

+msgid "Undated"

+msgstr "Sin fecha"

+

+#: src/events/EventsDirectoryPage.vala:245

+msgid "%Y"

+msgstr "%Y"

+

+#: src/events/EventsDirectoryPage.vala:246

+msgid "%B"

+msgstr "%B"

+

+#. if no name, pretty up the start time

+#: src/Event.vala:753

+#, c-format

+msgid "Event %s"

+msgstr "Evento %s"

+

+#: src/Exporter.vala:232

+#, c-format

+msgid "Unable to generate a temporary file for %s: %s"

+msgstr "No se puede crear el directorio temporal %s: %s"

+

+#: src/Exporter.vala:299

+msgid "Exporting"

+msgstr "Exportando"

+

+#: src/Exporter.vala:317

+#, c-format

+#| msgid "File %s already exists.  Replace?"

+msgid "File %s already exists. Replace?"

+msgstr "El archivo %s ya existe. ¿Quiere reemplazarlo?"

+

+#: src/Exporter.vala:319

+msgid "_Skip"

+msgstr "_Omitir"

+

+#: src/Exporter.vala:319

+msgid "_Replace"

+msgstr "_Reemplazar"

+

+#: src/Exporter.vala:319

+msgid "Replace _All"

+msgstr "Reempla_zar todo"

+

+#: src/Exporter.vala:319

+msgid "Export"

+msgstr "Exportar"

+

+#: src/folders/Branch.vala:144

+msgid "Folders"

+msgstr "Carpetas"

+

+#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1191

+msgid "Library"

+msgstr "Colección"

+

+#: src/library/Branch.vala:97 src/SearchFilter.vala:608

+#: src/SearchFilter.vala:609

+msgid "Photos"

+msgstr "Fotos"

+

+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602

+#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188

+msgid "Flagged"

+msgstr "Marcada"

+

+#: src/library/ImportQueuePage.vala:8

+msgid "Importing…"

+msgstr "Importando…"

+

+#: src/library/ImportQueuePage.vala:67

+msgid "_Stop Import"

+msgstr "_Detener importación"

+

+#: src/library/ImportQueuePage.vala:68

+msgid "Stop importing photos"

+msgstr "Detener la importación de fotos"

+

+#: src/library/ImportQueuePage.vala:124

+msgid "Preparing to import…"

+msgstr "Preparando para importar…"

+

+#: src/library/ImportQueuePage.vala:151

+#, c-format

+msgid "Imported %s"

+msgstr "Importada %s"

+

+#: src/library/LastImportPage.vala:8

+msgid "Last Import"

+msgstr "Última importación"

+

+#: src/library/LibraryWindow.vala:285

+msgid "_Import From Folder…"

+msgstr "_Importar desde carpeta…"

+

+#: src/library/LibraryWindow.vala:286

+msgid "Import photos from disk to library"

+msgstr "Importar fotos desde el disco a la colección"

+

+#: src/library/LibraryWindow.vala:293

+msgid "Import From _Application…"

+msgstr "Importar desde _aplicación…"

+

+#: src/library/LibraryWindow.vala:297

+msgid "Sort _Events"

+msgstr "Ordenar _eventos"

+

+#: src/library/LibraryWindow.vala:307

+msgid "Empty T_rash"

+msgstr "Vaciar la papele_ra"

+

+#: src/library/LibraryWindow.vala:308

+msgid "Delete all photos in the trash"

+msgstr "Eliminar todas las fotos en la papelera"

+

+#: src/library/LibraryWindow.vala:313

+msgid "View Eve_nt for Photo"

+msgstr "Ver eve_nto para la foto"

+

+#: src/library/LibraryWindow.vala:317

+msgid "_Find"

+msgstr "_Buscar"

+

+#: src/library/LibraryWindow.vala:318

+msgid "Find photos and videos by search criteria"

+msgstr "Buscar fotos y vídeos por criterio de búsqueda"

+

+#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77

+#: src/sidebar/Tree.vala:199

+msgid "Ne_w Saved Search…"

+msgstr "_Búsqueda guardada nueva…"

+

+#: src/library/LibraryWindow.vala:351

+msgid "_Photos"

+msgstr "_Fotos"

+

+#: src/library/LibraryWindow.vala:355

+msgid "Even_ts"

+msgstr "Even_tos"

+

+#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469

+msgid "Ta_gs"

+msgstr "_Etiquetas"

+

+#: src/library/LibraryWindow.vala:374

+msgid "_Basic Information"

+msgstr "Información _básica"

+

+#: src/library/LibraryWindow.vala:375

+msgid "Display basic information for the selection"

+msgstr "Mostrar la información básica para la selección"

+

+#: src/library/LibraryWindow.vala:380

+msgid "E_xtended Information"

+msgstr "Información e_xtendida"

+

+#: src/library/LibraryWindow.vala:381

+msgid "Display extended information for the selection"

+msgstr "Mostrar la información extendida para la selección"

+

+#: src/library/LibraryWindow.vala:386

+msgid "_Search Bar"

+msgstr "_Barra de búsqueda"

+

+#: src/library/LibraryWindow.vala:387

+msgid "Display the search bar"

+msgstr "Mostrar la barra de búsqueda"

+

+#: src/library/LibraryWindow.vala:392

+msgid "S_idebar"

+msgstr "_Barra lateral"

+

+#: src/library/LibraryWindow.vala:393

+msgid "Display the sidebar"

+msgstr "Mostrar la barra lateral"

+

+#: src/library/LibraryWindow.vala:398

+msgid "T_oolbar"

+msgstr "B_arra de herramientas"

+

+#: src/library/LibraryWindow.vala:399

+msgid "Display the tool bar"

+msgstr "Mostrar la barra de herramientas"

+

+#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515

+msgid "_Ascending"

+msgstr "_Ascendente"

+

+#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516

+msgid "Sort photos in an ascending order"

+msgstr "Ordenar fotos en orden ascendente"

+

+#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521

+msgid "D_escending"

+msgstr "D_escendente"

+

+#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522

+msgid "Sort photos in a descending order"

+msgstr "Ordenar fotos en orden descendente"

+

+#: src/library/LibraryWindow.vala:657

+msgid "Import From Folder"

+msgstr "Importar desde carpeta"

+

+#: src/library/LibraryWindow.vala:726

+msgid "Empty Trash"

+msgstr "Vaciar la papelera"

+

+#: src/library/LibraryWindow.vala:726

+msgid "Emptying Trash…"

+msgstr "Vaciando la papelera…"

+

+#: src/library/LibraryWindow.vala:901

+#, c-format

+msgid ""

+"Shotwell is configured to import photos to your home directory.\n"

+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"

+"span>.\n"

+"Do you want to continue importing photos?"

+msgstr ""

+"Shotwell esta´configurado para importar fotos a su carpeta personal.\n"

+"Se recomienda cambiar esto en <span weight=\"bold\">Editar %s Preferencias</"

+"span>.\n"

+"¿Quiere seguir importando fotos?"

+

+#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784

+msgid "Library Location"

+msgstr "Ubicación de la colección"

+

+#. TODO: Specify which directory/file.

+#: src/library/LibraryWindow.vala:917

+msgid "Photos cannot be imported from this directory."

+msgstr "Las fotos no pueden importarse desde esta carpeta."

+

+#: src/library/LibraryWindow.vala:1203

+#, c-format

+msgid "%s (%d%%)"

+msgstr "%s (%d%%)"

+

+#: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258

+msgid "Updating library…"

+msgstr "Actualizando la colección…"

+

+#: src/library/LibraryWindow.vala:1264

+msgid "Preparing to auto-import photos…"

+msgstr "Preparando para importar fotos automáticamente…"

+

+#: src/library/LibraryWindow.vala:1269

+msgid "Auto-importing photos…"

+msgstr "Importando fotos automáticamente…"

+

+#: src/library/LibraryWindow.vala:1277

+msgid "Writing metadata to files…"

+msgstr "Escribiendo metadatos en los archivos…"

+

+#: src/library/OfflinePage.vala:8

+msgid "Missing Files"

+msgstr "Archivos faltantes"

+

+#: src/library/OfflinePage.vala:106

+msgid "Deleting…"

+msgstr "Eliminando…"

+

+#: src/library/TrashPage.vala:8

+msgid "Trash"

+msgstr "Papelera"

+

+#: src/library/TrashPage.vala:108

+msgid "Trash is empty"

+msgstr "La papelera está vacía"

+

+#: src/library/TrashPage.vala:112

+msgid "Delete"

+msgstr "Eliminar"

+

+#: src/library/TrashPage.vala:113

+msgid "Deleting Photos"

+msgstr "Eliminando fotos"

+

+#: src/main.vala:54

+#, c-format

+#| msgid ""

+#| "Your photo library is not compatible with this version of Shotwell.  It "

+#| "appears it was created by Shotwell %s (schema %d).  This version is %s "

+#| "(schema %d).  Please use the latest version of Shotwell."

+msgid ""

+"Your photo library is not compatible with this version of Shotwell. It "

+"appears it was created by Shotwell %s (schema %d). This version is %s "

+"(schema %d). Please use the latest version of Shotwell."

+msgstr ""

+"Su colección de fotos no es compatible con esta versión de Shotwell. Parece "

+"que fue creada por Shotwell %s (esquema %d). Esta versión es %s (esquema %"

+"d). Use la versión más reciente de Shotwell."

+

+#: src/main.vala:59

+#, c-format

+#| msgid ""

+#| "Shotwell was unable to upgrade your photo library from version %s (schema "

+#| "%d) to %s (schema %d).  For more information please check the Shotwell "

+#| "Wiki at %s"

+msgid ""

+"Shotwell was unable to upgrade your photo library from version %s (schema %"

+"d) to %s (schema %d). For more information please check the Shotwell Wiki at "

+"%s"

+msgstr ""

+"Shotwell no pudo actualizar su colección de fotos desde la versión %s "

+"(esquema %d) a la %s (esquema %d). Para obtener más información , consulte "

+"el wiki de Shotwell en %s"

+

+#: src/main.vala:65

+#, c-format

+#| msgid ""

+#| "Your photo library is not compatible with this version of Shotwell.  It "

+#| "appears it was created by Shotwell %s (schema %d).  This version is %s "

+#| "(schema %d).  Please clear your library by deleting %s and re-import your "

+#| "photos."

+msgid ""

+"Your photo library is not compatible with this version of Shotwell. It "

+"appears it was created by Shotwell %s (schema %d). This version is %s "

+"(schema %d). Please clear your library by deleting %s and re-import your "

+"photos."

+msgstr ""

+"Su colección de fotos no es compatible con esta versión de Shotwell. Parece "

+"que fue creada por Shotwell %s (esquema %d). Esta versión es %s (esquema %"

+"d). Vacíe la colección mediante la eliminación de %s, y vuelva a importar "

+"las fotos."

+

+#: src/main.vala:71

+#, c-format

+#| msgid "Unknown error attempting to verify Shotwell's database: %s"

+msgid "Unknown error attempting to verify Shotwell’s database: %s"

+msgstr ""

+"Error desconocido al intentar verificar la base de datos de Shotwell: %s"

+

+#: src/main.vala:104

+msgid "Loading Shotwell"

+msgstr "Cargando Shotwell"

+

+#: src/main.vala:294

+#| msgid "Path to Shotwell's private data"

+msgid "Path to Shotwell’s private data"

+msgstr "Ruta a los datos privados de Shotwell"

+

+#: src/main.vala:294

+msgid "DIRECTORY"

+msgstr "DIRECTORIO"

+

+#: src/main.vala:298

+msgid "Do not monitor library directory at runtime for changes"

+msgstr ""

+"No monitorear el directorio de la colección en tiempo de ejecución para "

+"buscar cambios"

+

+#: src/main.vala:302

+#| msgid "Don't display startup progress meter"

+msgid "Don’t display startup progress meter"

+msgstr "No mostrar medidor de progreso de inicio"

+

+#: src/main.vala:306

+#| msgid "Show the application's version"

+msgid "Show the application’s version"

+msgstr "Mostrar la versión de la aplicación"

+

+#. init GTK (valac has already called g_threads_init())

+#: src/main.vala:338

+msgid "[FILE]"

+msgstr "[ARCHIVO]"

+

+#: src/main.vala:342

+#, c-format

+#| msgid ""

+#| "Run '%s --help' to see a full list of available command line options.\n"

+msgid "Run “%s --help” to see a full list of available command line options.\n"

+msgstr ""

+"Ejecute «%s --help» para ver una lista completa de opciones de línea de "

+"órdenes.\n"

+

+#: src/MediaMonitor.vala:400

+#, c-format

+msgid "Unable to process monitoring updates: %s"

+msgstr "No se pueden procesar las actualizaciones de la monitorización %s"

+

+#: src/MediaPage.vala:158

+msgid "Adjust the size of the thumbnails"

+msgstr "Ajustar el tamaño de las miniaturas"

+

+#: src/MediaPage.vala:341

+msgid "Increase the magnification of the thumbnails"

+msgstr "Aumentar la ampliación de las miniaturas"

+

+#: src/MediaPage.vala:347

+msgid "Decrease the magnification of the thumbnails"

+msgstr "Disminuir la ampliación de las miniaturas"

+

+#: src/MediaPage.vala:414

+msgid "Sort _Photos"

+msgstr "Ordenar _fotos"

+

+#: src/MediaPage.vala:423

+msgid "_Play Video"

+msgstr "_Reproducir vídeo"

+

+#: src/MediaPage.vala:424

+msgid "Open the selected videos in the system video player"

+msgstr "Abrir los vídeos seleccionados en el reproductor de vídeos del sistema"

+

+#: src/MediaPage.vala:428 src/PhotoPage.vala:2640

+msgid "_Developer"

+msgstr "_Revelador"

+

+#: src/MediaPage.vala:458

+msgid "Display the comment of each photo"

+msgstr "Mostrar el comentario de cada foto"

+

+#: src/MediaPage.vala:470

+#| msgid "Display each photo's tags"

+msgid "Display each photo’s tags"

+msgstr "Mostrar la etiqueta de cada foto"

+

+#: src/MediaPage.vala:486

+msgid "By _Title"

+msgstr "Por _título"

+

+#: src/MediaPage.vala:487

+msgid "Sort photos by title"

+msgstr "Ordenar las fotos por título"

+

+#: src/MediaPage.vala:492

+msgid "By Exposure _Date"

+msgstr "Por fecha de exposición"

+

+#: src/MediaPage.vala:493

+msgid "Sort photos by exposure date"

+msgstr "Ordenar fotos por fecha de exposición"

+

+#: src/MediaPage.vala:498

+msgid "By _Rating"

+msgstr "Por p_untuación"

+

+#: src/MediaPage.vala:499

+msgid "Sort photos by rating"

+msgstr "Ordenar fotos por puntuación"

+

+#: src/MediaPage.vala:504

+msgid "By _Filename"

+msgstr "Por _nombre del archivo"

+

+#: src/MediaPage.vala:505

+msgid "Sort photos by filename"

+msgstr "Ordenar fotos por nombre"

+

+#: src/MediaPage.vala:723

+#, c-format

+msgid ""

+"Shotwell was unable to play the selected video:\n"

+"%s"

+msgstr ""

+"Shotwell no pudo reproducir el vídeo seleccionado:\n"

+"%s"

+

+#: src/Page.vala:1266

+msgid "No photos/videos"

+msgstr "No hay fotos/vídeos"

+

+#: src/Page.vala:1270

+msgid "No photos/videos found which match the current filter"

+msgstr "No se han encontrado fotos/vídeos que coincidan con el filtro actual"

+

+#: src/Page.vala:2576

+msgid "Photos cannot be exported to this directory."

+msgstr "No se pueden exportar las fotos a este directorio."

+

+#. previous button

+#: src/PhotoPage.vala:533

+msgid "Previous photo"

+msgstr "Foto anterior"

+

+#. next button

+#: src/PhotoPage.vala:539

+msgid "Next photo"

+msgstr "Siguiente foto"

+

+#: src/PhotoPage.vala:1845

+#, c-format

+msgid "Photo source file missing: %s"

+msgstr "Falta el archivo de origen de la foto: %s"

+

+#: src/PhotoPage.vala:3229

+#, c-format

+msgid "Unable to export %s: %s"

+msgstr "No se puede exportar %s: %s"

+

+#: src/photos/BmpSupport.vala:32

+msgid "BMP"

+msgstr "BMP"

+

+#: src/photos/JfifSupport.vala:84

+msgid "JPEG"

+msgstr "JPEG"

+

+#: src/photos/JfifSupport.vala:185

+#, c-format

+msgid "Low (%d%%)"

+msgstr "Baja (%d%%)"

+

+#: src/photos/JfifSupport.vala:188

+#, c-format

+msgid "Medium (%d%%)"

+msgstr "Media (%d%%)"

+

+#: src/photos/JfifSupport.vala:191

+#, c-format

+msgid "High (%d%%)"

+msgstr "Alta (%d%%)"

+

+#: src/photos/JfifSupport.vala:194

+#, c-format

+msgid "Maximum (%d%%)"

+msgstr "Máxima (%d%%)"

+

+#: src/photos/PngSupport.vala:30

+msgid "PNG"

+msgstr "PNG"

+

+#: src/photos/RawSupport.vala:134

+msgid "RAW"

+msgstr "RAW"

+

+#: src/photos/TiffSupport.vala:86

+msgid "TIFF"

+msgstr "TIFF"

+

+#: src/Photo.vala:3753

+msgid "modified"

+msgstr "modificada"

+

+#: src/Printing.vala:255

+msgid "Fill the entire page"

+msgstr "Llenar la página entera"

+

+#: src/Printing.vala:256

+msgid "2 images per page"

+msgstr "2 imágenes por página"

+

+#: src/Printing.vala:257

+msgid "4 images per page"

+msgstr "4 imágenes por página"

+

+#: src/Printing.vala:258

+msgid "6 images per page"

+msgstr "6 imágenes por página"

+

+#: src/Printing.vala:259

+msgid "8 images per page"

+msgstr "8 imágenes por página"

+

+#: src/Printing.vala:260

+msgid "16 images per page"

+msgstr "16 imágenes por página"

+

+#: src/Printing.vala:261

+msgid "32 images per page"

+msgstr "32 imágenes por página"

+

+#: src/Printing.vala:348

+msgid "in."

+msgstr "pulg."

+

+#: src/Printing.vala:349

+msgid "cm"

+msgstr "cm"

+

+#: src/Printing.vala:876

+msgid "Image Settings"

+msgstr "Ajustes de la imagen"

+

+#: src/Printing.vala:889

+msgid "Printing…"

+msgstr "Imprimiendo…"

+

+#: src/Printing.vala:909 src/Printing.vala:1112

+#, c-format

+msgid ""

+"Unable to print photo:\n"

+"\n"

+"%s"

+msgstr ""

+"No se puede imprimir la foto:\n"

+"\n"

+"%s"

+

+#: src/Properties.vala:84

+msgid "Today"

+msgstr "Hoy"

+

+#: src/Properties.vala:86

+msgid "Yesterday"

+msgstr "Ayer"

+

+#: src/Properties.vala:343

+msgid "Items:"

+msgstr "Elementos:"

+

+#: src/Properties.vala:346

+#, c-format

+msgid "%d Event"

+msgid_plural "%d Events"

+msgstr[0] "%d evento"

+msgstr[1] "%d eventos"

+

+#. display only one date if start and end are the same

+#: src/Properties.vala:377

+msgid "Date:"

+msgstr "Fecha:"

+

+#. display only one time if start and end are the same

+#: src/Properties.vala:381

+msgid "Time:"

+msgstr "Hora:"

+

+#. display time range

+#. display date range

+#: src/Properties.vala:384 src/Properties.vala:389

+msgid "From:"

+msgstr "De:"

+

+#: src/Properties.vala:385 src/Properties.vala:390

+msgid "To:"

+msgstr "A:"

+

+#: src/Properties.vala:404

+msgid "Duration:"

+msgstr "Duración:"

+

+#: src/Properties.vala:404

+#, c-format

+msgid "%.1f seconds"

+msgstr "%.1f segundos"

+

+#: src/Properties.vala:408

+msgid "Developer:"

+msgstr "Revelador:"

+

+#. nothing special to be done for now for Events

+#: src/Properties.vala:583

+msgid "Location:"

+msgstr "Ubicación:"

+

+#: src/Properties.vala:586

+msgid "File size:"

+msgstr "Tamaño del archivo:"

+

+#: src/Properties.vala:590

+msgid "Current Development:"

+msgstr "Desarrollo actual:"

+

+#: src/Properties.vala:592

+msgid "Original dimensions:"

+msgstr "Dimensiones originales:"

+

+#: src/Properties.vala:595

+msgid "Camera make:"

+msgstr "Cámara:"

+

+#: src/Properties.vala:598

+msgid "Camera model:"

+msgstr "Modelo de la cámara:"

+

+#: src/Properties.vala:601

+msgid "Flash:"

+msgstr "Flash:"

+

+#: src/Properties.vala:603

+msgid "Focal length:"

+msgstr "Longitud focal:"

+

+#: src/Properties.vala:606

+msgid "Exposure date:"

+msgstr "Fecha de exposición:"

+

+#: src/Properties.vala:609

+msgid "Exposure time:"

+msgstr "Tiempo de exposición:"

+

+#: src/Properties.vala:612

+msgid "Exposure bias:"

+msgstr "Exposición:"

+

+#: src/Properties.vala:614

+msgid "GPS latitude:"

+msgstr "Latitud GPS:"

+

+#: src/Properties.vala:617

+msgid "GPS longitude:"

+msgstr "Longitud GPS:"

+

+#: src/Properties.vala:620

+msgid "Artist:"

+msgstr "Artista:"

+

+#: src/Properties.vala:622

+msgid "Copyright:"

+msgstr "Copyright:"

+

+#: src/Properties.vala:624

+msgid "Software:"

+msgstr "Software:"

+

+#: src/Properties.vala:641

+msgid "Extended Information"

+msgstr "Información extendida"

+

+#: src/publishing/PublishingPluginHost.vala:11

+msgid "Preparing for upload"

+msgstr "Preparando para subir"

+

+#: src/publishing/PublishingPluginHost.vala:12

+#, c-format

+msgid "Uploading %d of %d"

+msgstr "Subiendo %d de %d"

+

+#: src/publishing/PublishingPluginHost.vala:81

+#, c-format

+#| msgid "Publishing to %s can't continue because an error occurred:"

+msgid "Publishing to %s can’t continue because an error occurred:"

+msgstr "No se puede continuar la publicación en %s porque ocurrió un error:"

+

+#: src/publishing/PublishingPluginHost.vala:84

+msgid "To try publishing to another service, select one from the above menu."

+msgstr ""

+"Para intentar publicar en otro servicio, seleccione uno en el menú de arriba."

+

+#: src/publishing/PublishingUI.vala:105

+msgid "The selected photos/videos were successfully published."

+msgstr "Las fotos/vídeos seleccionados se publicaron correctamente."

+

+#: src/publishing/PublishingUI.vala:107

+msgid "The selected videos were successfully published."

+msgstr "Las fotos seleccionadas se publicaron correctamente."

+

+#: src/publishing/PublishingUI.vala:109

+msgid "The selected photos were successfully published."

+msgstr "Las fotos seleccionadas se publicaron correctamente."

+

+#: src/publishing/PublishingUI.vala:112

+msgid "The selected video was successfully published."

+msgstr "El vídeo seleccionado se publicó correctamente."

+

+#: src/publishing/PublishingUI.vala:114

+msgid "The selected photo was successfully published."

+msgstr "La foto seleccionada se publicó correctamente."

+

+#: src/publishing/PublishingUI.vala:122

+msgid "Fetching account information…"

+msgstr "Obteniendo información de la cuenta…"

+

+#: src/publishing/PublishingUI.vala:128

+msgid "Logging in…"

+msgstr "Iniciando sesión…"

+

+#: src/publishing/PublishingUI.vala:188

+msgid "Publish Photos"

+msgstr "Publicar fotos"

+

+#: src/publishing/PublishingUI.vala:189

+msgid "Publish photos _to:"

+msgstr "Publicar fo_tos en:"

+

+#: src/publishing/PublishingUI.vala:191

+msgid "Publish Videos"

+msgstr "Publicar vídeos"

+

+#: src/publishing/PublishingUI.vala:192

+msgid "Publish videos _to"

+msgstr "Publicar vídeos _en"

+

+#: src/publishing/PublishingUI.vala:194

+msgid "Publish Photos and Videos"

+msgstr "Publicar fotos y vídeos"

+

+#: src/publishing/PublishingUI.vala:195

+msgid "Publish photos and videos _to"

+msgstr "Publicar fotos y vídeos _en"

+

+#. There are no enabled publishing services that accept this media type,

+#. warn the user.

+#: src/publishing/PublishingUI.vala:397

+msgid "Unable to publish"

+msgstr "No se pudo publicar"

+

+#: src/publishing/PublishingUI.vala:398

+#, c-format

+msgid ""

+"Shotwell cannot publish the selected items because you do not have a "

+"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "

+"Preferences</b> and enable one or more of the publishing plugins on the "

+"<b>Plugins</b> tab."

+msgstr ""

+"Shotwell no puede publicar el elemento seleccionado porque no tiene activado "

+"un complemento compatible. Para corregir esto, vaya a <b>Editar %s "

+"Preferencias</b> y active uno o más complementos de publicación en la "

+"pestaña <b>Complementos</b>."

+

+#: src/publishing/Publishing.vala:16

+msgid "Publishing"

+msgstr "Publicando"

+

+#: src/Resources.vala:139

+msgid "Rotate _Right"

+msgstr "Girar a la _derecha"

+

+#: src/Resources.vala:140 src/Resources.vala:145

+msgid "Rotate"

+msgstr "Girar"

+

+#: src/Resources.vala:141

+msgid "Rotate Right"

+msgstr "Girar a la derecha"

+

+#: src/Resources.vala:142

+msgid "Rotate the photos right (press Ctrl to rotate left)"

+msgstr "Girar las fotos a la derecha (oprima Ctrl para girar a la izquierda)"

+

+#: src/Resources.vala:144

+msgid "Rotate _Left"

+msgstr "Girar a la izq_uierda"

+

+#: src/Resources.vala:146

+msgid "Rotate Left"

+msgstr "Girar a la izquierda"

+

+#: src/Resources.vala:147

+msgid "Rotate the photos left"

+msgstr "Girar las fotos a la izquierda"

+

+#: src/Resources.vala:149

+msgid "Flip Hori_zontally"

+msgstr "Voltear hori_zontalmente"

+

+#: src/Resources.vala:150

+msgid "Flip Horizontally"

+msgstr "Voltear horizontalmente"

+

+#: src/Resources.vala:152

+msgid "Flip Verti_cally"

+msgstr "Voltear _verticalmente"

+

+#: src/Resources.vala:153

+msgid "Flip Vertically"

+msgstr "Voltear verticalmente"

+

+#: src/Resources.vala:155

+msgid "_About"

+msgstr "_Acerca de"

+

+#: src/Resources.vala:156

+msgid "_Apply"

+msgstr "_Aplicar"

+

+#: src/Resources.vala:160

+msgid "_Forward"

+msgstr "_Adelante"

+

+#: src/Resources.vala:161

+msgid "Fulls_creen"

+msgstr "Pantalla c_ompleta"

+

+#: src/Resources.vala:163

+msgid "Leave _Fullscreen"

+msgstr "Salir de pantalla co_mpleta"

+

+#: src/Resources.vala:164 src/Resources.vala:363

+msgid "_New"

+msgstr "_Nueva"

+

+#: src/Resources.vala:165

+msgid "_Next"

+msgstr "_Siguiente"

+

+#: src/Resources.vala:166

+msgid "_OK"

+msgstr "_Aceptar"

+

+#: src/Resources.vala:167

+msgid "_Play"

+msgstr "_Reproducir"

+

+#: src/Resources.vala:168 src/Resources.vala:317

+msgid "_Preferences"

+msgstr "_Preferencias"

+

+#: src/Resources.vala:169

+msgid "_Previous"

+msgstr "_Anterior"

+

+#: src/Resources.vala:170

+msgid "_Print"

+msgstr "_Imprimir"

+

+#: src/Resources.vala:171

+msgid "_Quit"

+msgstr "_Salir"

+

+#: src/Resources.vala:172

+msgid "_Refresh"

+msgstr "_Actualizar"

+

+#: src/Resources.vala:174

+msgid "_Revert"

+msgstr "_Revertir"

+

+#: src/Resources.vala:176

+msgid "Save _As"

+msgstr "Guardar _como"

+

+#: src/Resources.vala:177

+msgid "Sort _Ascending"

+msgstr "Ordenar _ascendentemente"

+

+#: src/Resources.vala:178

+msgid "Sort _Descending"

+msgstr "Ordenar d_escendentemente"

+

+#: src/Resources.vala:179

+msgid "_Stop"

+msgstr "_Detener"

+

+#: src/Resources.vala:180

+msgid "_Undelete"

+msgstr "_Recuperar"

+

+#: src/Resources.vala:181

+msgid "_Normal Size"

+msgstr "Tamaño _normal"

+

+#: src/Resources.vala:182

+msgid "Best _Fit"

+msgstr "_Mejor ajuste"

+

+#: src/Resources.vala:186

+msgid "_Enhance"

+msgstr "M_ejorar"

+

+#: src/Resources.vala:187

+msgid "Enhance"

+msgstr "Mejorar"

+

+#: src/Resources.vala:188

+#| msgid "Automatically improve the photo's appearance"

+msgid "Automatically improve the photo’s appearance"

+msgstr "Mejorar automáticamente la apariencia de la foto"

+

+#: src/Resources.vala:190

+msgid "_Copy Color Adjustments"

+msgstr "_Copiar ajustes de color"

+

+#: src/Resources.vala:191

+msgid "Copy Color Adjustments"

+msgstr "Copiar ajustes de color"

+

+#: src/Resources.vala:192

+msgid "Copy the color adjustments applied to the photo"

+msgstr "Copiar los ajustes de color aplicados a la foto"

+

+#: src/Resources.vala:194

+msgid "_Paste Color Adjustments"

+msgstr "_Pegar ajustes de color"

+

+#: src/Resources.vala:195

+msgid "Paste Color Adjustments"

+msgstr "Pegar ajustes de color"

+

+#: src/Resources.vala:196

+msgid "Apply copied color adjustments to the selected photos"

+msgstr "Aplicar ajuste de color copiado a las fotos seleccionadas"

+

+#: src/Resources.vala:198

+msgid "_Crop"

+msgstr "Re_cortar"

+

+#: src/Resources.vala:199

+msgid "Crop"

+msgstr "Recortar"

+

+#: src/Resources.vala:200

+#| msgid "Crop the photo's size"

+msgid "Crop the photo’s size"

+msgstr "Recortar el tamaño de la foto"

+

+#: src/Resources.vala:203

+msgid "Straighten"

+msgstr "Enderezar"

+

+#: src/Resources.vala:204

+msgid "Straighten the photo"

+msgstr "Enderezar la foto"

+

+#: src/Resources.vala:206

+msgid "_Red-eye"

+msgstr "Ojos _rojos"

+

+#: src/Resources.vala:207

+msgid "Red-eye"

+msgstr "Ojos rojos"

+

+#: src/Resources.vala:208

+msgid "Reduce or eliminate any red-eye effects in the photo"

+msgstr "Reducir o eliminar cualquier efecto de ojos rojos en la foto"

+

+#: src/Resources.vala:210

+msgid "_Adjust"

+msgstr "_Ajuste"

+

+#: src/Resources.vala:211

+msgid "Adjust"

+msgstr "Ajuste"

+

+#: src/Resources.vala:212

+#| msgid "Adjust the photo's color and tone"

+msgid "Adjust the photo’s color and tone"

+msgstr "Ajustar el color y el tono de la foto"

+

+#: src/Resources.vala:214

+msgid "Re_vert to Original"

+msgstr "_Volver al original"

+

+#: src/Resources.vala:215

+msgid "Revert to Original"

+msgstr "Volver al original"

+

+#: src/Resources.vala:217

+msgid "Revert External E_dits"

+msgstr "Revertir e_diciones externas"

+

+#: src/Resources.vala:218

+msgid "Revert to the master photo"

+msgstr "Revertir a la foto original"

+

+#: src/Resources.vala:220

+msgid "Set as _Desktop Background"

+msgstr "Establecer como fondo _de escritorio"

+

+#: src/Resources.vala:221

+msgid "Set selected image to be the new desktop background"

+msgstr "Establezca la imagen seleccionada como nuevo fondo de escritorio"

+

+#: src/Resources.vala:222

+msgid "Set as _Desktop Slideshow…"

+msgstr "Establecer como pase de _diapositivas de escritorio…"

+

+#: src/Resources.vala:224

+msgid "_Undo"

+msgstr "_Deshacer"

+

+#: src/Resources.vala:225

+msgid "Undo"

+msgstr "Deshacer"

+

+#: src/Resources.vala:227

+msgid "_Redo"

+msgstr "_Rehacer"

+

+#: src/Resources.vala:228

+msgid "Redo"

+msgstr "Rehacer"

+

+#: src/Resources.vala:230

+msgid "Re_name Event…"

+msgstr "Re_nombrar evento…"

+

+#: src/Resources.vala:233

+msgid "Make _Key Photo for Event"

+msgstr "Hacer foto _clave para el evento"

+

+#: src/Resources.vala:234

+msgid "Make Key Photo for Event"

+msgstr "Hacer foto clave para el evento"

+

+#: src/Resources.vala:236

+msgid "_New Event"

+msgstr "Evento _nuevo"

+

+#: src/Resources.vala:237

+msgid "New Event"

+msgstr "Evento nuevo"

+

+#: src/Resources.vala:239

+msgid "Move Photos"

+msgstr "Mover fotos"

+

+#: src/Resources.vala:240

+msgid "Move photos to an event"

+msgstr "Mover fotos a un evento"

+

+#: src/Resources.vala:242

+msgid "_Merge Events"

+msgstr "_Combinar eventos"

+

+#: src/Resources.vala:243

+msgid "Merge"

+msgstr "Combinar"

+

+#: src/Resources.vala:244

+msgid "Combine events into a single event"

+msgstr "Combinar eventos en uno solo"

+

+#: src/Resources.vala:246

+msgid "_Set Rating"

+msgstr "Establecer p_untuación"

+

+#: src/Resources.vala:247

+msgid "Set Rating"

+msgstr "Establecer puntuación"

+

+#: src/Resources.vala:248

+msgid "Change the rating of your photo"

+msgstr "Cambiar la puntuación de su foto"

+

+#: src/Resources.vala:250

+msgid "_Increase"

+msgstr "_Aumentar"

+

+#: src/Resources.vala:251

+msgid "Increase Rating"

+msgstr "Aumentar puntuación"

+

+#: src/Resources.vala:253

+msgid "_Decrease"

+msgstr "Disminuir"

+

+#: src/Resources.vala:254

+msgid "Decrease Rating"

+msgstr "Disminuir puntuación"

+

+#: src/Resources.vala:256

+msgid "_Unrated"

+msgstr "_Sin puntuar"

+

+#: src/Resources.vala:257

+msgid "Unrated"

+msgstr "Sin puntuar"

+

+#: src/Resources.vala:258

+msgid "Rate Unrated"

+msgstr "Puntuar no puntuadas"

+

+#: src/Resources.vala:259

+msgid "Setting as unrated"

+msgstr "Establecer como sin puntuación"

+

+#: src/Resources.vala:260

+msgid "Remove any ratings"

+msgstr "Quitar cualquier puntuación"

+

+#: src/Resources.vala:262

+msgid "_Rejected"

+msgstr "_Rechazado"

+

+#: src/Resources.vala:263

+msgid "Rejected"

+msgstr "Rechazada"

+

+#: src/Resources.vala:264

+msgid "Rate Rejected"

+msgstr "Puntuar rechazadas"

+

+#: src/Resources.vala:265

+msgid "Setting as rejected"

+msgstr "Estableciendo como rechazada"

+

+#: src/Resources.vala:266

+msgid "Set rating to rejected"

+msgstr "Establecer puntuación para rechazadas"

+

+#: src/Resources.vala:268

+msgid "Rejected _Only"

+msgstr "Solo _rechazadas"

+

+#: src/Resources.vala:269

+msgid "Rejected Only"

+msgstr "Solo rechazadas"

+

+#: src/Resources.vala:270

+msgid "Show only rejected photos"

+msgstr "Mostrar solo las fotos rechazadas"

+

+#: src/Resources.vala:272

+msgid "All + _Rejected"

+msgstr "Todas + _rechazadas"

+

+#: src/Resources.vala:273

+msgctxt "Tooltip"

+msgid "Show all photos, including rejected"

+msgstr "Mostrar todas las fotos, incluyendo las rechazadas"

+

+#: src/Resources.vala:275

+msgid "_All Photos"

+msgstr "Todas las _fotos"

+

+#. Button tooltip

+#: src/Resources.vala:277

+msgid "Show all photos"

+msgstr "Mostrar todas las fotos"

+

+#: src/Resources.vala:279

+msgid "_Ratings"

+msgstr "_Puntuaciones"

+

+#: src/Resources.vala:280

+#| msgid "Display each photo's rating"

+msgid "Display each photo’s rating"

+msgstr "Mostrar la puntuación de cada foto"

+

+#: src/Resources.vala:282

+msgid "_Filter Photos"

+msgstr "_Filtrar fotos"

+

+#: src/Resources.vala:283

+msgid "Filter Photos"

+msgstr "Filtrar fotos"

+

+#: src/Resources.vala:284

+msgid "Limit the number of photos displayed based on a filter"

+msgstr "Limitar el número de fotos mostradas en base al filtro"

+

+#: src/Resources.vala:286

+msgid "_Duplicate"

+msgstr "_Duplicar"

+

+#: src/Resources.vala:287

+msgid "Duplicate"

+msgstr "Duplicar"

+

+#: src/Resources.vala:288

+msgid "Make a duplicate of the photo"

+msgstr "Hacer un duplicado de la foto"

+

+#: src/Resources.vala:290

+msgid "_Export…"

+msgstr "_Exportar…"

+

+#: src/Resources.vala:292

+msgid "_Print…"

+msgstr "_Imprimir…"

+

+#: src/Resources.vala:294

+msgid "Pu_blish…"

+msgstr "Pu_blicar…"

+

+#: src/Resources.vala:296

+msgid "Publish to various websites"

+msgstr "Publicar en varios sitios web"

+

+#: src/Resources.vala:298

+msgid "Edit _Title…"

+msgstr "Editar _título…"

+

+#. Button label

+#: src/Resources.vala:300

+msgctxt "Button Label"

+msgid "Edit Title"

+msgstr "Editar título"

+

+#: src/Resources.vala:302

+msgid "Edit _Comment…"

+msgstr "Editar _comentario…"

+

+#. Button label

+#: src/Resources.vala:304

+msgid "Edit Comment"

+msgstr "Editar comentario"

+

+#: src/Resources.vala:306

+msgid "Edit Event _Comment…"

+msgstr "Editar _comentario de evento…"

+

+#: src/Resources.vala:309

+msgid "_Adjust Date and Time…"

+msgstr "_Ajustar fecha y hora…"

+

+#: src/Resources.vala:310

+msgid "Adjust Date and Time"

+msgstr "Ajustar fecha y hora"

+

+#: src/Resources.vala:312

+msgid "Add _Tags…"

+msgstr "Añadir e_tiquetas…"

+

+#: src/Resources.vala:313

+msgid "_Add Tags…"

+msgstr "_Añadir etiquetas…"

+

+#. Dialog title

+#: src/Resources.vala:315

+msgctxt "Dialog Title"

+msgid "Add Tags"

+msgstr "Añadir etiquetas"

+

+#: src/Resources.vala:319

+msgid "Open With E_xternal Editor"

+msgstr "Abrir con editor e_xterno"

+

+#: src/Resources.vala:321

+msgid "Open With RA_W Editor"

+msgstr "Abrir con editor RA_W"

+

+#: src/Resources.vala:323

+msgid "Send _To…"

+msgstr "En_viar a…"

+

+#: src/Resources.vala:324

+msgid "Send T_o…"

+msgstr "Env_iar a…"

+

+#: src/Resources.vala:326

+msgid "_Find…"

+msgstr "_Buscar…"

+

+#: src/Resources.vala:327

+msgid "Find"

+msgstr "Buscar"

+

+#: src/Resources.vala:328

+msgid "Find an image by typing text that appears in its name or tags"

+msgstr ""

+"Buscar una imagen escribiendo el texto que aparece en su nombre o etiquetas"

+

+#: src/Resources.vala:330

+msgid "_Flag"

+msgstr "_Marcar"

+

+#: src/Resources.vala:332

+msgid "Un_flag"

+msgstr "_Desmarcar"

+

+#: src/Resources.vala:335

+#, c-format

+msgid "Unable to launch editor: %s"

+msgstr "No se puede abrir el editor: %s"

+

+#: src/Resources.vala:340

+#, c-format

+#| msgid "Add Tag \"%s\""

+msgid "Add Tag “%s”"

+msgstr "Añadir etiqueta «%s»"

+

+#. Used when adding two tags to photo(s)

+#: src/Resources.vala:343

+#, c-format

+#| msgid "Add Tags \"%s\" and \"%s\""

+msgid "Add Tags “%s” and “%s”"

+msgstr "Añadir etiquetas «%s» y «%s»"

+

+#. Undo/Redo command name (in Edit menu)

+#: src/Resources.vala:348

+msgctxt "UndoRedo menu entry"

+msgid "Add Tags"

+msgstr "Añadir etiquetas"

+

+#: src/Resources.vala:353

+#, c-format

+#| msgid "_Delete Tag \"%s\""

+msgid "_Delete Tag “%s”"

+msgstr "_Eliminar etiqueta «%s»"

+

+#: src/Resources.vala:357

+#, c-format

+#| msgid "Delete Tag \"%s\""

+msgid "Delete Tag “%s”"

+msgstr "Eliminar etiqueta «%s»"

+

+#: src/Resources.vala:360

+msgid "Delete Tag"

+msgstr "Eliminar etiqueta"

+

+#: src/Resources.vala:366

+#, c-format

+#| msgid "Re_name Tag \"%s\"…"

+msgid "Re_name Tag “%s”…"

+msgstr "Re_nombrar etiqueta «%s»…"

+

+#: src/Resources.vala:370

+#, c-format

+#| msgid "Rename Tag \"%s\" to \"%s\""

+msgid "Rename Tag “%s” to “%s”"

+msgstr "Renombrar la etiqueta «%s» a «%s»"

+

+#: src/Resources.vala:373

+msgid "_Rename…"

+msgstr "_Renombrar…"

+

+#: src/Resources.vala:375

+msgid "Modif_y Tags…"

+msgstr "Mod_ificar etiquetas…"

+

+#: src/Resources.vala:376

+msgid "Modify Tags"

+msgstr "Modificar etiquetas"

+

+#: src/Resources.vala:379

+#, c-format

+#| msgid "Tag Photo as \"%s\""

+msgid "Tag Photo as “%s”"

+msgid_plural "Tag Photos as “%s”"

+msgstr[0] "Etiquetar fotos como «%s»"

+msgstr[1] "Etiquetar fotos como «%s»"

+

+#: src/Resources.vala:385

+#, c-format

+#| msgid "Tag the selected photo as \"%s\""

+msgid "Tag the selected photo as “%s”"

+msgid_plural "Tag the selected photos as “%s”"

+msgstr[0] "Etiquetar las fotos seleccionadas como «%s»"

+msgstr[1] "Etiquetar las fotos seleccionadas como «%s»"

+

+#: src/Resources.vala:391

+#, c-format

+#| msgid "Remove Tag \"%s\" From _Photo"

+msgid "Remove Tag “%s” From _Photo"

+msgid_plural "Remove Tag “%s” From _Photos"

+msgstr[0] "Quitar la etiqueta «%s» de las _fotos"

+msgstr[1] "Quitar la etiqueta «%s» de las _fotos"

+

+#: src/Resources.vala:397

+#, c-format

+#| msgid "Remove Tag \"%s\" From Photo"

+msgid "Remove Tag “%s” From Photo"

+msgid_plural "Remove Tag “%s” From Photos"

+msgstr[0] "Quitar la etiqueta «%s» de las fotos"

+msgstr[1] "Quitar la etiqueta «%s» de las fotos"

+

+#: src/Resources.vala:403

+#, c-format

+#| msgid "Unable to rename tag to \"%s\" because the tag already exists."

+msgid "Unable to rename tag to “%s” because the tag already exists."

+msgstr "No se puede renombrar la etiqueta a «%s» porque la etiqueta ya existe."

+

+#: src/Resources.vala:407

+#, c-format

+#| msgid "Unable to rename search to \"%s\" because the search already exists."

+msgid "Unable to rename search to “%s” because the search already exists."

+msgstr "No se pudo renombrar la búsqueda «%s» porque la búsqueda ya existe."

+

+#. Saved search button

+#: src/Resources.vala:410 src/SearchFilter.vala:1210

+msgid "Saved Search"

+msgstr "Búsqueda guardada"

+

+#: src/Resources.vala:412

+msgid "Delete Search"

+msgstr "Eliminar búsqueda"

+

+#: src/Resources.vala:415

+msgid "_Edit…"

+msgstr "_Editar…"

+

+#: src/Resources.vala:416

+msgid "Re_name…"

+msgstr "Re_nombrar…"

+

+#: src/Resources.vala:419

+#, c-format

+#| msgid "Rename Search \"%s\" to \"%s\""

+msgid "Rename Search “%s” to “%s”"

+msgstr "Renombrar la búsqueda «%s» a «%s»"

+

+#: src/Resources.vala:423

+#, c-format

+#| msgid "Delete Search \"%s\""

+msgid "Delete Search “%s”"

+msgstr "Eliminar búsqueda «%s»"

+

+#: src/Resources.vala:581

+#, c-format

+msgid "Rate %s"

+msgstr "Puntuar %s"

+

+#: src/Resources.vala:582

+#, c-format

+msgid "Set rating to %s"

+msgstr "Establecer puntuación para %s"

+

+#: src/Resources.vala:583

+#, c-format

+msgid "Setting rating to %s"

+msgstr "Estableciendo la puntuación de %s"

+

+#: src/Resources.vala:585

+#, c-format

+msgid "Display %s"

+msgstr "Mostrar %s"

+

+#: src/Resources.vala:586

+#, c-format

+msgid "Only show photos with a rating of %s"

+msgstr "Solo mostrar fotos con puntuación %s"

+

+#: src/Resources.vala:587

+#, c-format

+msgid "%s or Better"

+msgstr "%s o mayor"

+

+#: src/Resources.vala:588

+#, c-format

+msgid "Display %s or Better"

+msgstr "Mostrar %s o mayor"

+

+#: src/Resources.vala:589

+#, c-format

+msgid "Only show photos with a rating of %s or better"

+msgstr "Solo mostrar fotos con puntuación %s o mayor"

+

+#: src/Resources.vala:680

+msgid "Remove the selected photos from the trash"

+msgstr "Quitar las fotos seleccionadas de la papelera"

+

+#: src/Resources.vala:681

+msgid "Remove the selected photos from the library"

+msgstr "Quitar las fotos seleccionadas de la colección"

+

+#: src/Resources.vala:683

+msgid "_Restore"

+msgstr "_Restaurar"

+

+#: src/Resources.vala:684

+msgid "Move the selected photos back into the library"

+msgstr "Mover las fotos seleccionadas de vuelta a la colección"

+

+#: src/Resources.vala:686

+msgid "Show in File Mana_ger"

+msgstr "Mostrar en ge_stor de archivos"

+

+#: src/Resources.vala:687

+#| msgid "Open the selected photo's directory in the file manager"

+msgid "Open the selected photo’s directory in the file manager"

+msgstr "Abrir el directorio de la foto seleccionada en el gestor de archivos"

+

+#: src/Resources.vala:690

+#, c-format

+msgid "Unable to open in file manager: %s"

+msgstr "No se puede abrir el gestor de archivos: %s"

+

+#: src/Resources.vala:693

+msgid "R_emove From Library"

+msgstr "_Quitar de la colección"

+

+#: src/Resources.vala:695

+msgid "_Move to Trash"

+msgstr "_Mover a la papelera"

+

+#: src/Resources.vala:697

+msgid "Select _All"

+msgstr "Seleccionar _todo"

+

+#: src/Resources.vala:698

+msgid "Select all items"

+msgstr "Seleccionar todos los elementos"

+

+#. ...precache the timestamp string...

+#. / Locale-specific time format for 12-hour time, i.e. 8:31 PM

+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes

+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format

+#. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM

+#. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes

+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format

+#. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"

+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format

+#: src/Resources.vala:787

+msgid "%a %b %d, %Y"

+msgstr "%a %d de %b de %Y"

+

+#. / Locale-specific starting date format for multi-date strings,

+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"

+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format

+#: src/Resources.vala:792

+msgctxt "MultidayFormat"

+msgid "%a %b %d"

+msgstr "%a, %d de %b"

+

+#. / Locale-specific ending date format for multi-date strings,

+#. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"

+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format

+#: src/Resources.vala:797

+msgctxt "MultidayFormat"

+msgid "%d, %Y"

+msgstr "%d, %Y"

+

+#. / Locale-specific calendar date format for multi-month strings,

+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"

+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format

+#: src/Resources.vala:802

+msgctxt "MultimonthFormat"

+msgid "%a %b %d"

+msgstr "%a, %d de %b"

+

+#. / Locale-specific calendar date format for multi-month strings,

+#. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"

+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format

+#: src/Resources.vala:807

+msgctxt "MultimonthFormat"

+msgid "%a %b %d, %Y"

+msgstr "%a %d de %b de %Y"

+

+#: src/Screensaver.vala:18 src/SlideshowPage.vala:141

+msgid "Slideshow"

+msgstr "Diapositivas"

+

+#: src/searches/Branch.vala:68

+msgid "Saved Searches"

+msgstr "Búsquedas guardadas"

+

+#. Ordering must correspond with SearchConditionText.Context

+#: src/searches/SavedSearchDialog.vala:168

+msgid "contains"

+msgstr "contiene"

+

+#. Ordering must correspond with Context

+#: src/searches/SavedSearchDialog.vala:169

+#: src/searches/SavedSearchDialog.vala:500

+msgid "is exactly"

+msgstr "es exactamente"

+

+#: src/searches/SavedSearchDialog.vala:170

+msgid "starts with"

+msgstr "comienza por"

+

+#: src/searches/SavedSearchDialog.vala:171

+msgid "ends with"

+msgstr "termina por"

+

+#: src/searches/SavedSearchDialog.vala:172

+msgid "does not contain"

+msgstr "no contiene"

+

+#: src/searches/SavedSearchDialog.vala:173

+#: src/searches/SavedSearchDialog.vala:504

+msgid "is not set"

+msgstr "no está establecida"

+

+#: src/searches/SavedSearchDialog.vala:174

+msgid "is set"

+msgstr "está establecida"

+

+#. Ordering must correspond with SearchConditionMediaType.Context

+#: src/searches/SavedSearchDialog.vala:248

+#: src/searches/SavedSearchDialog.vala:379

+#: src/searches/SavedSearchDialog.vala:444

+msgid "is"

+msgstr "es"

+

+#: src/searches/SavedSearchDialog.vala:249

+msgid "is not"

+msgstr "no es"

+

+#. Ordering must correspond with SearchConditionMediaType.MediaType

+#: src/searches/SavedSearchDialog.vala:255

+msgid "any photo"

+msgstr "cualquier foto"

+

+#: src/searches/SavedSearchDialog.vala:256

+msgid "a raw photo"

+msgstr "una foto en «raw»"

+

+#: src/searches/SavedSearchDialog.vala:257

+msgid "a video"

+msgstr "un vídeo"

+

+#: src/searches/SavedSearchDialog.vala:311

+msgid "has"

+msgstr "tiene"

+

+#: src/searches/SavedSearchDialog.vala:312

+msgid "has no"

+msgstr "no tiene"

+

+#: src/searches/SavedSearchDialog.vala:317

+msgid "modifications"

+msgstr "modificaciones"

+

+#: src/searches/SavedSearchDialog.vala:318

+msgid "internal modifications"

+msgstr "modificaciones internas"

+

+#: src/searches/SavedSearchDialog.vala:319

+msgid "external modifications"

+msgstr "modificaciones externas"

+

+#. Ordering must correspond with SearchConditionFlagged.State

+#: src/searches/SavedSearchDialog.vala:373

+msgid "flagged"

+msgstr "marcada"

+

+#: src/searches/SavedSearchDialog.vala:374

+msgid "not flagged"

+msgstr "no marcada"

+

+#: src/searches/SavedSearchDialog.vala:437

+msgid "and higher"

+msgstr "y superior"

+

+#: src/searches/SavedSearchDialog.vala:438

+msgid "only"

+msgstr "solo"

+

+#: src/searches/SavedSearchDialog.vala:439

+msgid "and lower"

+msgstr "e inferior"

+

+#: src/searches/SavedSearchDialog.vala:501

+msgid "is after"

+msgstr "está después"

+

+#: src/searches/SavedSearchDialog.vala:502

+msgid "is before"

+msgstr "está antes"

+

+#: src/searches/SavedSearchDialog.vala:503

+msgid "is between"

+msgstr "está entre"

+

+#: src/searches/SavedSearchDialog.vala:516

+msgid "and"

+msgstr "y"

+

+#: src/searches/SavedSearchDialog.vala:697

+msgid "Search"

+msgstr "Búsqueda"

+

+#: src/searches/SavedSearchDialog.vala:702

+msgid "Cancel"

+msgstr "Cancelar"

+

+#: src/searches/SavedSearchDialog.vala:703

+msgid "OK"

+msgstr "Aceptar"

+

+#: src/searches/SavedSearchDialog.vala:721

+msgid "any"

+msgstr "cualquiera"

+

+#: src/searches/SavedSearchDialog.vala:722

+msgid "all"

+msgstr "todos"

+

+#: src/searches/SavedSearchDialog.vala:723

+msgid "none"

+msgstr "ninguna"

+

+#: src/searches/SearchBoolean.vala:157

+msgid "Any text"

+msgstr "Cualquier texto"

+

+#: src/searches/SearchBoolean.vala:160

+msgid "Title"

+msgstr "Título"

+

+#: src/searches/SearchBoolean.vala:163

+msgid "Tag"

+msgstr "Etiqueta"

+

+#: src/searches/SearchBoolean.vala:166

+msgid "Comment"

+msgstr "Comentario"

+

+#: src/searches/SearchBoolean.vala:169

+msgid "Event name"

+msgstr "Nombre del acontecimiento"

+

+#: src/searches/SearchBoolean.vala:172

+msgid "File name"

+msgstr "Nombre del archivo"

+

+#: src/searches/SearchBoolean.vala:175

+msgid "Media type"

+msgstr "Tipo de medio"

+

+#: src/searches/SearchBoolean.vala:178

+msgid "Flag state"

+msgstr "Estado de la opción"

+

+#: src/searches/SearchBoolean.vala:181

+msgid "Photo state"

+msgstr "Estado de la foto"

+

+#. Rating button

+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199

+msgid "Rating"

+msgstr "Puntuación"

+

+#: src/searches/SearchBoolean.vala:187

+msgid "Date"

+msgstr "Fecha"

+

+#: src/SearchFilter.vala:614 src/SearchFilter.vala:615

+msgid "Videos"

+msgstr "Vídeos"

+

+#: src/SearchFilter.vala:620

+msgid "RAW Photos"

+msgstr "Fotos RAW"

+

+#: src/SearchFilter.vala:621

+msgid "RAW photos"

+msgstr "Fotos RAW"

+

+#: src/SearchFilter.vala:1148

+#, c-format

+msgid "Error loading UI file %s: %s"

+msgstr "Error al cargar el archivo de IU %s: %s"

+

+#. Ticket #3260 - Add a 'close' context menu to

+#. the searchbar.

+#. Prepare the close menu for use, but don't

+#. display it yet; we'll connect it to secondary

+#. click later on.

+#: src/SearchFilter.vala:1159

+msgid "Close"

+msgstr "Cerrar"

+

+#. Type label and toggles

+#: src/SearchFilter.vala:1165

+msgid "Type"

+msgstr "Tipo"

+

+#: src/SearchFilter.vala:1211

+msgid "Use a saved search to filter items in the current view"

+msgstr ""

+"Utilizar una búsqueda guardada para filtrar elementos en la vista actual"

+

+#: src/sidebar/Tree.vala:203

+msgid "New _Tag…"

+msgstr "E_tiqueta nueva…"

+

+#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183

+msgid "Settings"

+msgstr "Configuración"

+

+#. Set up toolbar

+#. add toolbar buttons

+#: src/SlideshowPage.vala:160

+msgid "Back"

+msgstr "Atrás"

+

+#: src/SlideshowPage.vala:162

+msgid "Go to the previous photo"

+msgstr "Ir a la foto anterior"

+

+#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274

+msgid "Pause"

+msgstr "Pausa"

+

+#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275

+msgid "Pause the slideshow"

+msgstr "Pausar la presentación"

+

+#: src/SlideshowPage.vala:174

+msgid "Next"

+msgstr "Siguiente"

+

+#: src/SlideshowPage.vala:176

+msgid "Go to the next photo"

+msgstr "Ir a la siguiente foto"

+

+#: src/SlideshowPage.vala:184

+msgid "Change slideshow settings"

+msgstr "Cambiar la configuración de la presentación"

+

+#. An entire slideshow set might be missing, so check for a loop.

+#: src/SlideshowPage.vala:238

+msgid "All photo source files are missing."

+msgstr "Todos los archivos origen de fotos están perdidos."

+

+#: src/SlideshowPage.vala:270

+msgid "Play"

+msgstr "Reproducir"

+

+#: src/SlideshowPage.vala:271

+msgid "Continue the slideshow"

+msgstr "Continuar la presentación"

+

+#: src/slideshow/Slideshow.vala:22

+msgid "Slideshow Transitions"

+msgstr "Transiciones de diapositiva"

+

+#: src/slideshow/TransitionEffects.vala:98

+msgid "(None)"

+msgstr "(Ninguna)"

+

+#: src/slideshow/TransitionEffects.vala:287

+msgid "None"

+msgstr "Ninguna"

+

+#: src/slideshow/TransitionEffects.vala:339

+msgid "Random"

+msgstr "Aleatorio"

+

+#: src/tags/Branch.vala:131

+msgid "Tags"

+msgstr "Etiquetas"

+

+#: src/Tag.vala:830

+msgid "untitled"

+msgstr "sin título"

+

+#. multiple videos

+#: src/VideoSupport.vala:507

+msgid "Export Videos"

+msgstr "Exportar vídeos"

+

+#: ui/set_background_dialog.ui:15

+msgid "Set as Desktop Background"

+msgstr "Establecer como fondo de escritorio"

+

+#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132

+msgid "Use for Desktop"

+msgstr "Usar para el escritorio"

+

+#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148

+msgid "Use for Lock Screen"

+msgstr "Usar para la pantalla de bloqueo"

+

+#: ui/set_background_slideshow_dialog.ui:15

+msgid "Set as Desktop Slideshow"

+msgstr "Establecer como pase de diapositivas de escritorio"

+

+#: ui/set_background_slideshow_dialog.ui:33

+msgid "Show each photo for"

+msgstr "Mostrar cada foto para"

+

+#: ui/set_background_slideshow_dialog.ui:45

+msgid "period of time"

+msgstr "periodo de tiempo"

+

+#: ui/set_background_slideshow_dialog.ui:94

+msgid "Generate desktop background slideshow"

+msgstr "Generar un pase de diapositivas de fondo de escritorio"

+

+#: ui/set_background_slideshow_dialog.ui:115

+msgid "How long each photo is shown on the desktop background"

+msgstr "Cuánto tiempo se muestra cada foto en el fondo de escritorio"

+

+#: ui/shotwell.ui:23

+msgid "_Name of search:"

+msgstr "_Nombre de la búsqueda:"

+

+#: ui/shotwell.ui:81

+msgid "_Match"

+msgstr "_Coincidir"

+

+#: ui/shotwell.ui:108

+msgid "of the following:"

+msgstr "de los siguientes:"

+

+#: ui/shotwell.ui:195

+msgid "<b>Printed Image Size</b>"

+msgstr "<b>Tamaño de imagen impresa</b>"

+

+#: ui/shotwell.ui:212

+msgid "Use a _standard size:"

+msgstr "Utilizar un tamaño e_stándar:"

+

+#: ui/shotwell.ui:255

+msgid "Use a c_ustom size:"

+msgstr "Utilizar un tamaño p_ersonalizado:"

+

+#: ui/shotwell.ui:345

+msgid "_Match photo aspect ratio"

+msgstr "E_mparejar relación de aspecto de la foto"

+

+#: ui/shotwell.ui:369

+msgid "_Autosize:"

+msgstr "Tamaño _automático:"

+

+#: ui/shotwell.ui:409

+msgid "<b>Titles</b>"

+msgstr "<b>Títulos</b>"

+

+#: ui/shotwell.ui:426

+msgid "Print image _title"

+msgstr "Imprimir el _título de la imagen"

+

+#: ui/shotwell.ui:470

+msgid "<b>Pixel Resolution</b>"

+msgstr "<b>Resolución de píxeles</b>"

+

+#: ui/shotwell.ui:490

+msgid "_Output photo at:"

+msgstr "_Salida de foto en:"

+

+#: ui/shotwell.ui:525

+msgid "pixels per inch"

+msgstr "píxeles por pulgada"

+

+#: ui/shotwell.ui:559

+msgid "label"

+msgstr "etiqueta"

+

+#: ui/shotwell.ui:681

+msgid "Shotwell Preferences"

+msgstr "Preferencias de Shotwell"

+

+#: ui/shotwell.ui:730

+msgid "white"

+msgstr "blanco"

+

+#: ui/shotwell.ui:757

+msgid "black"

+msgstr "negro"

+

+#: ui/shotwell.ui:805

+msgid "_Watch library directory for new files"

+msgstr "_Vigilar mi colección en busca de archivos nuevos"

+

+#: ui/shotwell.ui:834

+msgid "Metadata"

+msgstr "Metadatos"

+

+#: ui/shotwell.ui:854

+msgid "Write tags, titles, and other _metadata to photo files"

+msgstr ""

+"Escribir etiquetas, títulos y otros _metadatos en los archivos de fotos"

+

+#: ui/shotwell.ui:880

+msgid "Display"

+msgstr "Mostrar"

+

+#: ui/shotwell.ui:901

+msgid "_Import photos to:"

+msgstr "_Importar fotos a:"

+

+#: ui/shotwell.ui:924

+msgid "_Background:"

+msgstr "_Fondo:"

+

+#: ui/shotwell.ui:947

+msgid "Importing"

+msgstr "Importando"

+

+#: ui/shotwell.ui:970

+msgid "_Directory structure:"

+msgstr "Estructura de _carpetas:"

+

+#: ui/shotwell.ui:1009

+msgid "_Pattern:"

+msgstr "_Patrón:"

+

+#: ui/shotwell.ui:1091

+msgid "Example:"

+msgstr "Ejemplo:"

+

+#: ui/shotwell.ui:1108

+msgid "R_ename imported files to lowercase"

+msgstr "R_enombrar los archivos importados a minúsculas"

+

+#: ui/shotwell.ui:1137

+msgid "RAW Developer"

+msgstr "Revelador RAW"

+

+#: ui/shotwell.ui:1172

+msgid "De_fault:"

+msgstr "_Predeterminado:"

+

+#: ui/shotwell.ui:1226

+msgid "E_xternal photo editor:"

+msgstr "Editor de fotos e_xterno:"

+

+#: ui/shotwell.ui:1242

+msgid "External _RAW editor:"

+msgstr "Editor _RAW externo:"

+

+#: ui/shotwell.ui:1307

+msgid "External Editors"

+msgstr "Editores externos"

+

+#: ui/shotwell.ui:1334

+msgid "Plugins"

+msgstr "Complementos"

+

+#: ui/shotwell.ui:1400

+msgid "_Delay:"

+msgstr "_Retardo:"

+

+#: ui/shotwell.ui:1416

+msgid "_Transition effect:"

+msgstr "Efecto de _transición:"

+

+#: ui/shotwell.ui:1432

+msgid "Transition d_elay:"

+msgstr "R_etraso de transición:"

+

+#: ui/shotwell.ui:1444

+msgid "Show t_itle"

+msgstr "Mostrar tít_ulo"

+

+#: ui/shotwell.ui:1534 ui/shotwell.ui:1547

+msgid "seconds"

+msgstr "segundos"

+

+#, fuzzy

+#~| msgid "Tag Photos as \"%s\""

+#~ msgid "Tag Photos as “%s”"

+#~ msgstr "Etiquetar fotos como «%s»"

+

+#, fuzzy

+#~| msgid "Tag the selected photos as \"%s\""

+#~ msgid "Tag the selected photos as “%s”"

+#~ msgstr "Etiquetar las fotos seleccionadas como «%s»"

+

+#, fuzzy

+#~| msgid "Remove Tag \"%s\" From _Photos"

+#~ msgid "Remove Tag “%s” From _Photos"

+#~ msgstr "Quitar la etiqueta «%s» de las _fotos"

+

+#, fuzzy

+#~| msgid "Remove Tag \"%s\" From Photos"

+#~ msgid "Remove Tag “%s” From Photos"

+#~ msgstr "Quitar la etiqueta «%s» de las fotos"

+

+#~ msgid "Login"

+#~ msgstr "Iniciar sesión"

+

+#~ msgid "Save Details..."

+#~ msgstr "Guardar detalles…"

+

+#~ msgid "Save _As..."

+#~ msgstr "G_uardar como…"

+

+#~ msgid "Importing..."

+#~ msgstr "Importando…"

+

+#~ msgid "Preparing to import..."

+#~ msgstr "Preparando importación…"

+

+#~ msgid "_Import From Folder..."

+#~ msgstr "_Importar desde carpeta…"

+

+#~ msgid "Import From _Application..."

+#~ msgstr "Importar desde _aplicación…"

+

+#~ msgid "Set as _Desktop Slideshow..."

+#~ msgstr "Establecer como pase de _diapositivas de escritorio…"

+

+#~ msgid "Re_name Event..."

+#~ msgstr "Re_nombrar evento…"

+

+#~ msgid "_Export..."

+#~ msgstr "_Exportar…"

+

+#~ msgid "_Print..."

+#~ msgstr "_Imprimir…"

+

+#~ msgid "Pu_blish..."

+#~ msgstr "Pu_blicar…"

+

+#~ msgid "Edit _Title..."

+#~ msgstr "Editar el _título…"

+

+#~ msgid "Edit _Comment..."

+#~ msgstr "Editar _comentario…"

+

+#~ msgid "Edit Event _Comment..."

+#~ msgstr "Editar _comentario del evento…"

+

+#~ msgid "_Adjust Date and Time..."

+#~ msgstr "_Ajustar fecha y hora…"

+

+#~ msgid "Add _Tags..."

+#~ msgstr "Añadir e_tiquetas…"

+

+#~ msgid "_Add Tags..."

+#~ msgstr "_Añadir etiquetas…"

+

+#~ msgid "Send _To..."

+#~ msgstr "En_viar a…"

+

+#~ msgid "Send T_o..."

+#~ msgstr "En_viar a…"

+

+#~ msgid "_Find..."

+#~ msgstr "Buscar…"

+

+#~ msgid "Modif_y Tags..."

+#~ msgstr "Modif_icar etiquetas…"

+

+#~ msgid "_Edit..."

+#~ msgstr "_Editar…"

+

+#~ msgid "%-I:%M %p"

+#~ msgstr "%-I:%M %p"

+

+#~ msgid "%-I:%M:%S %p"

+#~ msgstr "%-I:%M:%S %p"

+

+#~ msgid "Intro message replaced at runtime"

+#~ msgstr "Mensaje de introducción reemplazado en tiempo de ejecución"

+

+#~ msgid "'Publishing to $url as $username' (populated in application code)"

+#~ msgstr ""

+#~ "«Publicando en $url como $username» (informado en el código de la "

+#~ "aplicación)"

+

+#~ msgid "you are logged in rajce as $name"

+#~ msgstr "ha iniciado sesión en rajce como $name"

+

+#~ msgid "$mediatype will appear in"

+#~ msgstr "$mediatype aparecerá en"

+

+#~ msgid "Copyright 2009-2015 Yorba Foundation"

+#~ msgstr "Copyright 2009-2015 Fundación Yorba"

+

+#~ msgid "Visit the Yorba web site"

+#~ msgstr "Visitar el sitio web de Yorba"

+

+#, fuzzy

+#~| msgid ""

+#~| "A file required for publishing is unavailable. Publishing to Flickr "

+#~| "can't continue."

+#~ msgid "A file required for publishing is unavailable. Publishing to "

+#~ msgstr ""

+#~ "No está disponible un archivo necesario para publicar. La publicación en "

+#~ "Flickr no puede continuar."

+

+#~ msgid "Only _Remove"

+#~ msgstr "Solo quita_r"

+

+#~ msgid "Shotwell is configured to import photos to your home directory.\n"

+#~ msgstr ""

+#~ "Shotwell está configurado para importar fotos desde su carpeta personal.\n"

+

+#~ msgid ""

+#~ " (text depends on fb username and is modified in the app - \n"

+#~ "anything put into this field won't display)"

+#~ msgstr ""

+#~ " (el texto depende del nombre de usuario de Facebook y se modifica en la "

+#~ "aplicación;\n"

+#~ "no se mostrará el contenido de este campo)"

+

+#~ msgid ""

+#~ "You are logged into Flickr as (name).\n"

+#~ "\n"

+#~ "(this label's string is populated and set inside the code, \n"

+#~ "so changes made here will not display)"

+#~ msgstr ""

+#~ "Ha iniciado sesión en Flickr como (name).\n"

+#~ "\n"

+#~ "(la etiqueta de esta cadena se rellena y se ubica en el código, \n"

+#~ "y los cambios hechos aquí no se mostrarán)"

+

+#~ msgid "_visibility label (populated in the code)"

+#~ msgstr "etiqueta de _visibilidad (rellenada en el código)"

+

+#~ msgid ""

+#~ "$mediatype will appear in\n"

+#~ "(populated in code)"

+#~ msgstr ""

+#~ "$mediatype aparecerá en\n"

+#~ "(rellenado en el código)"

+

+#~ msgid ""

+#~ "You are logged into Tumblr as (name).\n"

+#~ "\n"

+#~ "(this label's string is populated and set inside the code, \n"

+#~ "so changes made here will not display)"

+#~ msgstr ""

+#~ "Ha iniciado sesión en Tumblr como (nombre).\n"

+#~ "\n"

+#~ "(la etiqueta de esta cadena se rellena y se ubica en el código, \n"

+#~ "y los cambios hechos aquí no se mostrarán)"

diff --git a/po/kk.gmo b/po/kk.gmo
index b780d48..2f646a8 100644
--- a/po/kk.gmo
+++ b/po/kk.gmo
diff --git a/po/kk.po b/po/kk.po
index 3716cbd..d26bd16 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -5,7 +5,7 @@
 #
 #
 # Translators:
-# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2011-2014
+# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2011-2016
 # verayin <vera@yorba.org>, 2011
 # lsbeeler <lucas@yorba.org>, 2011
 msgid ""
@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-05-16 19:21+0000\n"
-"PO-Revision-Date: 2016-05-17 15:44+0500\n"
+"POT-Creation-Date: 2016-10-08 14:29+0000\n"
+"PO-Revision-Date: 2016-11-09 14:16+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh (http://www.transifex.com/projects/p/shotwell/language/"
 "kk/)\n"
@@ -23,14 +23,1344 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 1.8.11\n"
 
-#: ../plugins/common/RESTSupport.vala:425
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: misc/shotwell.appdata.xml.in:9
+msgid "Popular photo manager"
+msgstr "Фотосуреттерді басқарудың әйгілі қолданбасы"
+
+#: misc/shotwell.appdata.xml.in:11
+msgid ""
+"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
+"desktop. It allows you to import photos from your camera or disk, organize "
+"them by date and subject matter, even ratings. It also offers basic photo "
+"editing, like crop, red-eye correction, color adjustments, and straighten. "
+"Shotwell’s non-destructive photo editor does not alter your master photos, "
+"making it easy to experiment and correct errors."
+msgstr ""
+
+#: misc/shotwell.appdata.xml.in:18
+msgid ""
+"When ready, Shotwell can upload your photos to various web sites, such as "
+"Facebook, Flickr, Picasa (Google Plus), and more."
+msgstr ""
+
+#: misc/shotwell.appdata.xml.in:22
+msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
+msgstr ""
+"Shotwell JPEG, PNG, TIFF және RAW файл пішімдерінің бірнеше түрлерін "
+"қолдайды."
+
+#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+msgid "Photo Manager"
+msgstr "Фотосуреттерді басқару қолданбасы"
+
+#: misc/shotwell.desktop.in.in:6
+msgid "Organize your photos"
+msgstr "Фотосуреттеріңізді реттеңіз"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: misc/shotwell.desktop.in.in:8
+msgid ""
+"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
+"organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
+"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
+msgstr ""
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+#| msgid "Shotwell"
+msgid "shotwell"
+msgstr "shotwell"
+
+#: misc/shotwell-viewer.desktop.in.in:4
+#| msgid "Photo Viewer"
+msgid "Shotwell Viewer"
+msgstr "Shotwell көрсетушісі"
+
+#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+msgid "Photo Viewer"
+msgstr "Фотосуреттерді көрсету"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:6
+msgid "authentication token"
+msgstr "аутентификация токені"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:7
+msgid "Yandex-Fotki authentication token, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:14
+msgid "Token"
+msgstr "Токен"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:15
+msgid "The token to access tumblr"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:20
+msgid "Secret token"
+msgstr "Құпия токені"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:21
+msgid "The secret token to sign oauth requests"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:26
+#: misc/org.yorba.shotwell.gschema.xml:486
+msgid "default size"
+msgstr "үнсіз келісім өлшемі"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:27
+msgid ""
+"A numeric code representing the default size for photos uploaded to Tumblr"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:32
+msgid "default blog"
+msgstr "үнсіз келісім блогы"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:33
+msgid "The name of the default blog of the user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:40
+msgid "Rajce URL"
+msgstr "Rajce сілтемесі"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:41
+msgid "URL of the Rajce server."
+msgstr "Rajce серверінің сілтемесі."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:46
+#: misc/org.yorba.shotwell.gschema.xml:454
+#: misc/org.yorba.shotwell.gschema.xml:512
+#: misc/org.yorba.shotwell.gschema.xml:568
+msgid "username"
+msgstr "пайдаланушы аты"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:47
+msgid "Rajce username, if logged in."
+msgstr "Rajce пайдаланушы аты, кірген болса."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:52
+msgid "token"
+msgstr "токен"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:53
+msgid "user token, if remembered."
+msgstr "пайдаланушы токені, сақталған болса."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:58
+#: misc/org.yorba.shotwell.gschema.xml:530
+msgid "last category"
+msgstr "соңғы санат"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:59
+msgid "The last selected Rajce category."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:64
+#: misc/org.yorba.shotwell.gschema.xml:542
+msgid "last photo size"
+msgstr "фотосуреттің соңғы өлшемі"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:65
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Rajce."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:70
+msgid "remember"
+msgstr "есте сақтау"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:71
+msgid "If true, remember last login."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:76
+msgid "hide album"
+msgstr "альбомды жасыру"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:77
+msgid "If true, hide the newly created Rajce album."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:82
+msgid "open album in web browser"
+msgstr "альбомды браузерде ашу"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:83
+msgid ""
+"If true, open target album in the web browser just after uploading photos"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:88
+#: misc/org.yorba.shotwell.gschema.xml:434
+#: misc/org.yorba.shotwell.gschema.xml:472
+#: misc/org.yorba.shotwell.gschema.xml:498
+#: misc/org.yorba.shotwell.gschema.xml:548
+#: misc/org.yorba.shotwell.gschema.xml:592
+msgid "remove sensitive info from uploads"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:89
+msgid ""
+"Whether images being uploaded to Rajce should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:23
+msgid "display basic properties"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:24
+msgid "True if the basic properties pane is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:29
+msgid "display extended properties"
+msgstr "кеңейтілген ақпаратты көрсету"
+
+#: misc/org.yorba.shotwell.gschema.xml:30
+msgid ""
+"True if the extended properties window is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:35
+msgid "display sidebar"
+msgstr "бүйір панелін көрсету"
+
+#: misc/org.yorba.shotwell.gschema.xml:36
+msgid "True if the sidebar is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:41
+msgid "display toolbar"
+msgstr "саймандар панелін көрсету"
+
+#: misc/org.yorba.shotwell.gschema.xml:42
+msgid "True if the bottom toolbar is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:47
+msgid "display search bar"
+msgstr "іздеу өрісін көрсету"
+
+#: misc/org.yorba.shotwell.gschema.xml:48
+msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:53
+msgid "display photo titles"
+msgstr "фото атауларын көрсету"
+
+#: misc/org.yorba.shotwell.gschema.xml:54
+msgid ""
+"True if photo titles are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:59
+msgid "display photo comments"
+msgstr "фото түсіндірмелерін көрсету"
+
+#: misc/org.yorba.shotwell.gschema.xml:60
+msgid ""
+"True if photo comments are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:65
+msgid "display event comments"
+msgstr "оқиға түсіндірмелерін көрсету"
+
+#: misc/org.yorba.shotwell.gschema.xml:66
+msgid ""
+"True if event comments are to be displayed beneath thumbnails in event "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:71
+msgid "display photo tags"
+msgstr "фото тегтерін көрсету"
+
+#: misc/org.yorba.shotwell.gschema.xml:72
+msgid ""
+"True if photo tags are to be listed beneath thumbnails in collection views, "
+"false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:77
+msgid "display photo ratings"
+msgstr "фото рейтингтерін көрсету"
+
+#: misc/org.yorba.shotwell.gschema.xml:78
+msgid ""
+"True if a photo’s rating should be displayed as overlaid trinket, false "
+"otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:83
+msgid "rating filter level"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:84
+msgid ""
+"Determines how to filter photos based on their ratings. 1: Rejected or "
+"better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
+"or better, 6: Four or better, 7: Five or better."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:89
+msgid "sort events ascending"
+msgstr "оқиғаларды өсу ретімен сұрыптау"
+
+#: misc/org.yorba.shotwell.gschema.xml:90
+msgid "True if events should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:95
+#, fuzzy
+#| msgid "Sort photos in an ascending order"
+msgid "sort library photos ascending"
+msgstr "Фотоларды өсу ретімен сұрыптау"
+
+#: misc/org.yorba.shotwell.gschema.xml:96
+msgid "True if library photos should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:101
+msgid "sort library photos criteria"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:102
+msgid ""
+"A numeric code that specifies the sort criteria for photos in library views."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:107
+#, fuzzy
+#| msgid "Sort photos in an ascending order"
+msgid "sort event photos ascending"
+msgstr "Фотоларды өсу ретімен сұрыптау"
+
+#: misc/org.yorba.shotwell.gschema.xml:108
+msgid "True if event photos should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:113
+#, fuzzy
+#| msgid "Sort photos by title"
+msgid "sort event photos criteria"
+msgstr "Фотоларды атаулары бойынша сұрыптау"
+
+#: misc/org.yorba.shotwell.gschema.xml:114
+msgid "Specifies the sort criteria for event photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:119
+msgid "use 24 hour time"
+msgstr "24-сағаттық уақытты қолдану"
+
+#: misc/org.yorba.shotwell.gschema.xml:120
+msgid ""
+"True if should display times with a 24 hour clock, false if times should use "
+"AM/PM notation."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:125
+msgid "keep relative time between photos"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:126
+msgid ""
+"True if when adjusting time/date of photos, relative time should be "
+"maintained. False if all photos should be set to the same time."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:131
+#, fuzzy
+#| msgid "_Modify original photo files"
+msgid "modify original photo files"
+msgstr "Түпнұсқа фотосурет файлдарын тү_зету"
+
+#: misc/org.yorba.shotwell.gschema.xml:132
+msgid ""
+"True if when adjusting time/date of photos, the original files should be "
+"modified as well. False if changes are made only in the database."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:137
+msgid "show welcome dialog on startup"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:138
+msgid ""
+"True if, when on startup, a welcome dialog should be shown. False if it "
+"should not be shown."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:143
+#, fuzzy
+#| msgid "Library Location"
+msgid "sidebar position"
+msgstr "Жинақтың орналасуы"
+
+#: misc/org.yorba.shotwell.gschema.xml:144
+msgid "The width, in pixels, of the sidebar"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:149
+msgid "photo thumbnail scale"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:150
+msgid "The scale of photo thumbnails, ranging from 72 to 360."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:155
+#, fuzzy
+#| msgid "Pin the toolbar open"
+msgid "pin toolbar state"
+msgstr "Панельді ашық түрінде бекіту"
+
+#: misc/org.yorba.shotwell.gschema.xml:156
+msgid "Pin toolbar in fullscreen, or not."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:161
+#, fuzzy
+#| msgid "_Background:"
+msgid "background color"
+msgstr "_Фон:"
+
+#: misc/org.yorba.shotwell.gschema.xml:162
+msgid "A grayscale color for use as the background color."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:167
+msgid "Selection state of “hide photos” option"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid ""
+"Last used selection state of the “hide photos already imported” option in "
+"the import page."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:175
+msgid "delay"
+msgstr "кідіріс"
+
+#: misc/org.yorba.shotwell.gschema.xml:176
+msgid "Delay (in seconds) between photos in the slideshow."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:181
+#, fuzzy
+#| msgid "Transition d_elay:"
+msgid "transition delay"
+msgstr "Алмасу ара_лығы:"
+
+#: misc/org.yorba.shotwell.gschema.xml:182
+msgid ""
+"The time (in seconds) that a transition runs between photos in a slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:187
+#, fuzzy
+#| msgid "_Transition effect:"
+msgid "transition effect id"
+msgstr "Алма_су эффекті:"
+
+#: misc/org.yorba.shotwell.gschema.xml:188
+msgid ""
+"The name of the transition effect that will be used between photos when "
+"running a slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:193
+#, fuzzy
+#| msgid "Show t_itle"
+msgid "Show title"
+msgstr "А_тауын көрсету"
+
+#: misc/org.yorba.shotwell.gschema.xml:194
+msgid "Whether to show the title of a photo during the slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:201
+msgid "maximize library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:202
+msgid "True if library application is maximized, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:207
+msgid "width of library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:208
+msgid "The last recorded width of the library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:213
+msgid "height of library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:214
+msgid "The last recorded height of the library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:219
+msgid "maximize direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:220
+msgid "True if direct-edit application is maximized, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:225
+msgid "width of direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:226
+msgid "The last recorded width of the direct-edit application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:231
+msgid "height of direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:232
+msgid "The last recorded height of the direct-edit application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:237
+msgid "sidebar divider position"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:238
+msgid ""
+"The last recorded position of the divider between the sidebar and view in "
+"library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:245
+#, fuzzy
+#| msgid "Import to Library"
+msgid "import directory"
+msgstr "Жинақ ішіне импорттау"
+
+#: misc/org.yorba.shotwell.gschema.xml:246
+msgid "Directory in which imported photo files are placed."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:251
+#, fuzzy
+#| msgid "_Watch library directory for new files"
+msgid "watch library directory for new files"
+msgstr "Жинақ бу_масын жаңа файлдарға бақылау"
+
+#: misc/org.yorba.shotwell.gschema.xml:252
+msgid ""
+"If true, files added to the library directory are automatically imported."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:257
+#, fuzzy
+#| msgid "Writing metadata to files..."
+msgid "write metadata to master files"
+msgstr "Файлдарға метаақпаратты жазу..."
+
+#: misc/org.yorba.shotwell.gschema.xml:258
+msgid ""
+"If true, changes to metadata (tags, titles, etc.) are written to the master "
+"photo file."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:263
+msgid "use lowercase filenames"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:264
+msgid ""
+"If true, Shotwell will convert all filenames to lowercase when importing "
+"photo files"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:269
+#, fuzzy
+#| msgid "_Directory structure:"
+msgid "directory pattern"
+msgstr "Бу_ма құрылысы:"
+
+#: misc/org.yorba.shotwell.gschema.xml:270
+msgid ""
+"A string encoding a naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:275
+msgid "directory pattern custom"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:276
+msgid ""
+"A string encoding a custom naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:281
+#, fuzzy
+#| msgid "RAW Developer"
+msgid "RAW developer default"
+msgstr "RAW өндіруші"
+
+#: misc/org.yorba.shotwell.gschema.xml:282
+msgid "Default option for which RAW developer Shotwell will use."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:289
+msgid "Most-recently-used crop aspect ratio menu choice."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:290
+msgid "A numeric code representing the last crop menu choice the user made."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:294
+msgid "Most-recently-used crop custom aspect ratio’s numerator."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:295
+msgid ""
+"A nonzero, positive integer representing the width part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:299
+msgid "Most-recently-used crop custom aspect ratio’s denominator."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:300
+msgid ""
+"A nonzero, positive integer representing the height part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:307
+#, fuzzy
+#| msgid "E_xternal photo editor:"
+msgid "external photo editor"
+msgstr "С_ыртқы фото түзетушісі:"
+
+#: misc/org.yorba.shotwell.gschema.xml:308
+msgid "External application used to edit photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:313
+#, fuzzy
+#| msgid "External _RAW editor:"
+msgid "external raw editor"
+msgstr "С_ыртқы RAW түзетушісі:"
+
+#: misc/org.yorba.shotwell.gschema.xml:314
+msgid "External application used to edit RAW photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:352
+#: misc/org.yorba.shotwell.gschema.xml:353
+msgid "Setting in export dialog: how to trim images"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:358
+#, fuzzy
+#| msgid "Export metadata"
+msgid "export metadata"
+msgstr "Метаақпаратты экспорттау"
+
+#: misc/org.yorba.shotwell.gschema.xml:359
+msgid "Setting in export dialog: option to export metadata"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:364
+msgid "format setting, special value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:365
+msgid "Setting in export dialog: format setting, special value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:370
+msgid "format setting, type value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:371
+msgid "Setting in export dialog: format setting, type value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:376
+msgid "JPEG quality option"
+msgstr "JPEG сапасы опциясы"
+
+#: misc/org.yorba.shotwell.gschema.xml:377
+msgid "Setting in export dialog: jpeg quality option"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:382
+msgid "maximal size of image"
+msgstr "суреттің максималды өлшемі"
+
+#: misc/org.yorba.shotwell.gschema.xml:383
+msgid "Setting in export dialog: maximal size of image"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:390
+#, fuzzy
+#| msgid "Core Publishing Services"
+msgid "last used publishing service"
+msgstr "Жариялау қызметтері"
+
+#: misc/org.yorba.shotwell.gschema.xml:391
+#: misc/org.yorba.shotwell.gschema.xml:397
+msgid ""
+"A numeric code representing the last service to which photos were published"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:396
+#, fuzzy
+#| msgid "Core Publishing Services"
+msgid "default publishing service"
+msgstr "Жариялау қызметтері"
+
+#: misc/org.yorba.shotwell.gschema.xml:410
+#, fuzzy
+#| msgid "Access _type:"
+msgid "access token"
+msgstr "Қатынау _түрі:"
+
+#: misc/org.yorba.shotwell.gschema.xml:411
+msgid "Facebook OAuth token for the currently logged in session, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:416
+msgid "user i.d."
+msgstr "пайдаланушы идентификаторы"
+
+#: misc/org.yorba.shotwell.gschema.xml:417
+msgid "Facebook user i.d. for the currently logged in user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:422
+msgid "user name"
+msgstr "пайдаланушы аты"
+
+#: misc/org.yorba.shotwell.gschema.xml:423
+#, fuzzy
+#| msgid "You are not currently logged into Yandex.Fotki."
+msgid "The name of the currently logged in Facebook user, if any"
+msgstr "Сіз қазір Яндекс.Фотки ішіне кірмегенсіз."
+
+#: misc/org.yorba.shotwell.gschema.xml:428
+#: misc/org.yorba.shotwell.gschema.xml:460
+msgid "default size code"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:429
+msgid ""
+"A numeric code representing the default size for photos published to Facebook"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:435
+msgid ""
+"Whether images being uploaded to Facebook should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:442
+msgid "OAuth Access Phase Token"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:443
+msgid "The authorization token for the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:448
+msgid "OAuth Access Phase Token Secret"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:449
+msgid ""
+"The cryptographic secret used to sign requests against the authorization "
+"token for the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:455
+msgid "The user name of the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:461
+msgid ""
+"A numeric code representing the default size for photos published to Flickr"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:466
+msgid "default visibility"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:467
+msgid ""
+"A numeric code representing the default visibility for photos published to "
+"Flickr"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:473
+msgid ""
+"Whether images being uploaded to Flickr should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:480
+#: misc/org.yorba.shotwell.gschema.xml:612
+msgid "refresh token"
+msgstr "токенді жаңарту"
+
+#: misc/org.yorba.shotwell.gschema.xml:481
+msgid ""
+"The OAuth token used to refresh the Picasa Web Albums session for the "
+"currently logged in user, if any."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:487
+msgid ""
+"A numeric code representing the default size for photos uploaded to Picasa "
+"Web Albums"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:586
+msgid "last album"
+msgstr "соңғы альбом"
+
+#: misc/org.yorba.shotwell.gschema.xml:493
+#: misc/org.yorba.shotwell.gschema.xml:587
+msgid "The name of the last album the user published photos to, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:499
+msgid ""
+"Whether images being uploaded to Picasa should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:506
+msgid "Piwigo URL"
+msgstr "Piwigo сілтемесі"
+
+#: misc/org.yorba.shotwell.gschema.xml:507
+msgid "URL of the Piwigo server."
+msgstr "Piwigo серверінің сілтемесі."
+
+#: misc/org.yorba.shotwell.gschema.xml:513
+msgid "Piwigo username, if logged in."
+msgstr "Piwigo пайдаланушы аты, кірген болса."
+
+#: misc/org.yorba.shotwell.gschema.xml:518
+msgid "password"
+msgstr "пароль"
+
+#: misc/org.yorba.shotwell.gschema.xml:519
+msgid "Piwigo password, if logged in."
+msgstr "Piwigo паролі, кірген болса."
+
+#: misc/org.yorba.shotwell.gschema.xml:524
+msgid "remember password"
+msgstr "парольді есте сақтау"
+
+#: misc/org.yorba.shotwell.gschema.xml:525
+msgid "If true, remember the Piwigo password."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:531
+msgid "The last selected Piwigo category."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:536
+msgid "last permission level"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:537
+msgid "The last chosen Piwigo permission level."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:543
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Piwigo."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:549
+msgid ""
+"Whether images being uploaded to Piwigo should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:554
+#, fuzzy
+#| msgid "_If a title is set and comment unset, use title as comment"
+msgid ""
+"if title is set and comment unset, use title as comment for uploads to Piwigo"
+msgstr ""
+"Егер а_тауы болса, ал түсіндірмесі болмаса, атауды түсіндірме ретінде қолдану"
+
+#: misc/org.yorba.shotwell.gschema.xml:555
+msgid ""
+"Whether images being uploaded to Piwigo should have their comment set from "
+"the title if title is set and comment unset"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:560
+msgid "do not upload tags when uploading to Piwigo"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:561
+msgid ""
+"Whether images being uploaded to Piwigo should have their tags removed on "
+"upload, such that these tags will not appear on the remote Piwigo server."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:569
+msgid "Gallery3 username"
+msgstr "Gallery3 пайдаланушы аты"
+
+#: misc/org.yorba.shotwell.gschema.xml:574
+msgid "API key"
+msgstr "API кілті"
+
+#: misc/org.yorba.shotwell.gschema.xml:575
+#| msgid "_Gallery3 URL:"
+msgid "Gallery3 API key"
+msgstr "Gallery3 API кілті"
+
+#: misc/org.yorba.shotwell.gschema.xml:580
+msgid "URL"
+msgstr "Сілтеме"
+
+#: misc/org.yorba.shotwell.gschema.xml:581
+#| msgid "_Gallery3 URL:"
+msgid "Gallery3 site URL"
+msgstr "Gallery3 сайт сілтемесі"
+
+#: misc/org.yorba.shotwell.gschema.xml:593
+msgid ""
+"Indicates whether images being uploaded to Gallery3 should have their "
+"metadata removed first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:598
+msgid "scaling constraint of uploaded picture"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:599
+msgid "The scaling constraint ID of the picture to be uploaded"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:604
+msgid "pixels of the major axis uploaded picture"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:605
+msgid ""
+"The pixels of the major axis of the picture to be uploaded; used only if "
+"scaling-constraint-id is an appropriate value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:613
+msgid ""
+"The OAuth token used to refresh the YouTube session for the currently logged "
+"in user, if any."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:620
+#, fuzzy
+#| msgid "Core Data Import Services"
+msgid "last used import service"
+msgstr "Өзек мәлімет импорттау қызметтері"
+
+#: misc/org.yorba.shotwell.gschema.xml:621
+msgid ""
+"A numeric code representing the last service from which photos were imported"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:628
+msgid "interpreter state cookie"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:629
+msgid ""
+"A numeric code that captures the state of the GStreamer plug-in environment"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:636
+msgid "content layout mode"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:637
+msgid ""
+"A numeric code that describes how photos are laid out on the page during "
+"printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:642
+#, fuzzy
+#| msgid "_Contents"
+msgid "content ppi"
+msgstr "Құра_масы"
+
+#: misc/org.yorba.shotwell.gschema.xml:643
+msgid "The number of pixels per inch (ppi) sent to the printer during printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:648
+msgid "content width"
+msgstr "құрама ені"
+
+#: misc/org.yorba.shotwell.gschema.xml:649
+msgid "The width of the printed emulsion on the page when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:654
+#, fuzzy
+#| msgid "Rotate Right"
+msgid "content height"
+msgstr "Оңға бұру"
+
+#: misc/org.yorba.shotwell.gschema.xml:655
+msgid "The height of the printed emulsion on the page when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:660
+#, fuzzy
+#| msgid "_Contents"
+msgid "content units"
+msgstr "Құра_масы"
+
+#: misc/org.yorba.shotwell.gschema.xml:661
+msgid ""
+"A numeric code representing unit of measure (inches or centimeters) used "
+"when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:666
+#, fuzzy
+#| msgid "2 images per page"
+msgid "images per page code"
+msgstr "2 сурет парақта"
+
+#: misc/org.yorba.shotwell.gschema.xml:667
+msgid ""
+"A numeric code representing the currently selected images per page mode used "
+"when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:672
+msgid "size selection"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:673
+msgid ""
+"The index of the current print size in a pre-defined list of standard sizes"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:678
+#, fuzzy
+#| msgid "_Match photo aspect ratio"
+msgid "match aspect ratio"
+msgstr "_Фото жақтарының қатынасын сақтау"
+
+#: misc/org.yorba.shotwell.gschema.xml:679
+msgid ""
+"Determines whether custom print sizes must match the aspect ratio of the "
+"original photo"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:684
+#, fuzzy
+#| msgid "Print image _title"
+msgid "print titles"
+msgstr "Сурет ат_ауын да баспаға шығару"
+
+#: misc/org.yorba.shotwell.gschema.xml:685
+msgid ""
+"True if the title of a photo should be printed when the photo is printed, "
+"false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:690
+msgid "titles font"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:691
+msgid "The name of the font to use for photo titles when they are printed."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:702
+msgid "enable facebook publishing plugin"
+msgstr "facebook жариялау плагинін іске қосу"
+
+#: misc/org.yorba.shotwell.gschema.xml:703
+msgid "True if the Facebook publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:708
+msgid "enable flickr publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:709
+msgid "True if the Flickr publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:714
+msgid "enable picasa publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:715
+msgid ""
+"True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:720
+#| msgid "Unable to publish"
+msgid "enable youtube publishing plugin"
+msgstr "youtube жариялау плагинін іске қосу"
+
+#: misc/org.yorba.shotwell.gschema.xml:721
+msgid "True if the YouTube publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:726
+#| msgid "Unable to publish"
+msgid "enable piwigo publishing plugin"
+msgstr "piwigo жариялау плагинін іске қосу"
+
+#: misc/org.yorba.shotwell.gschema.xml:727
+msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:732
+msgid "enable yandex publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:733
+msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:738
+#| msgid "Unable to publish"
+msgid "enable tumblr publishing plugin"
+msgstr "tumblr жариялау плагинін іске қосу"
+
+#: misc/org.yorba.shotwell.gschema.xml:739
+msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:744
+#| msgid "Gallery3 publishing module"
+msgid "enable rajce publishing plugin"
+msgstr "rajce жариялау плагинін іске қосу"
+
+#: misc/org.yorba.shotwell.gschema.xml:745
+msgid "True if the Rajce publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:750
+#| msgid "Gallery3 publishing module"
+msgid "enable gallery3 publishing plugin"
+msgstr "gallery3 жариялау плагинін іске қосу"
+
+#: misc/org.yorba.shotwell.gschema.xml:751
+msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:756
+msgid "enable F-Spot import plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:757
+msgid "True if the F-Spot import plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:762
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow crumble transition"
+msgstr "Слайдшоу арасында өту аралығы"
+
+#: misc/org.yorba.shotwell.gschema.xml:763
+msgid ""
+"True if the Crumble slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:768
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow fade transition"
+msgstr "Слайдшоу арасында өту аралығы"
+
+#: misc/org.yorba.shotwell.gschema.xml:769
+msgid ""
+"True if the Fade slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:798
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow slide transition"
+msgstr "Слайдшоу арасында өту аралығы"
+
+#: misc/org.yorba.shotwell.gschema.xml:775
+msgid ""
+"True if the Slide slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:780
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow clock transition"
+msgstr "Слайдшоу арасында өту аралығы"
+
+#: misc/org.yorba.shotwell.gschema.xml:781
+msgid ""
+"True if the Clock slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:792
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow circle transition"
+msgstr "Слайдшоу арасында өту аралығы"
+
+#: misc/org.yorba.shotwell.gschema.xml:787
+msgid ""
+"True if the Circle slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:793
+msgid ""
+"True if the Circles slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:799
+msgid ""
+"True if the Blinds slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:804
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow squares transition"
+msgstr "Слайдшоу арасында өту аралығы"
+
+#: misc/org.yorba.shotwell.gschema.xml:805
+msgid ""
+"True if the Squares slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:810
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow stripes transition"
+msgstr "Слайдшоу арасында өту аралығы"
+
+#: misc/org.yorba.shotwell.gschema.xml:811
+msgid ""
+"True if the Stripes slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:816
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow chess transition"
+msgstr "Слайдшоу арасында өту аралығы"
+
+#: misc/org.yorba.shotwell.gschema.xml:817
+msgid ""
+"True if the Chess-Board slideshow transition plugin is enabled, false "
+"otherwise"
+msgstr ""
+
+#: plugins/common/Resources.vala:12
+msgid "Visit the Shotwell home page"
+msgstr "Shotwell үй парағын шолу"
+
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:679
+msgid "translator-credits"
+msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>"
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:202
+msgid ""
+"⚫ This website presented identification that belongs to a different website."
+msgstr ""
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:207
+msgid ""
+"⚫ This website’s identification is too old to trust. Check the date on your "
+"computer’s calendar."
+msgstr ""
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:212
+msgid ""
+"⚫ This website’s identification was not issued by a trusted organization."
+msgstr ""
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:217
+msgid ""
+"⚫ This website’s identification could not be processed. It may be corrupted."
+msgstr ""
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:222
+msgid ""
+"⚫ This website’s identification has been revoked by the trusted organization "
+"that issued it."
+msgstr ""
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:227
+msgid ""
+"⚫ This website’s identification cannot be trusted because it uses very weak "
+"encryption."
+msgstr ""
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:232
+msgid ""
+"⚫ This website’s identification is only valid for future dates. Check the "
+"date on your computer’s calendar."
+msgstr ""
+
+#: plugins/common/RESTSupport.vala:509
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Жариялау үшін керек уақытша файл қолжетерсіз"
 
-#: ../plugins/common/RESTSupport.vala:1145
+#: plugins/common/RESTSupport.vala:1167
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -42,25 +1372,16 @@ msgstr ""
 "Google ішіне жариялауды жалғастыру үшін, Shotwell қайта қосыңыз, одан кейін "
 "жариялап көріңіз."
 
-#: ../plugins/common/Resources.vala:9
-msgid "Visit the Shotwell home page"
-msgstr "Shotwell үй парағын шолу"
-
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:698
-msgid "translator-credits"
-msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>"
-
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:32
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:34
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:32
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: ../src/Resources.vala:27
+#: plugins/shotwell-data-imports/FSpotImporter.vala:36
+#: plugins/shotwell-publishing/FacebookPublishing.vala:33
+#: plugins/shotwell-publishing/FlickrPublishing.vala:33
+#: plugins/shotwell-publishing/PicasaPublishing.vala:33
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:33
+#: plugins/shotwell-publishing/YouTubePublishing.vala:33 src/Resources.vala:27
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
+#: plugins/shotwell-data-imports/FSpotImporter.vala:58
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
@@ -73,7 +1394,7 @@ msgstr ""
 "Импорттау үшін жинақты таңдаңыз, Shotwell тапқан жинақтардың біреуін таңдап, "
 "немесе басқа F-Spot дерекқор файлын қолмен көрсетіңіз."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
+#: plugins/shotwell-data-imports/FSpotImporter.vala:60
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
@@ -83,11 +1404,11 @@ msgstr ""
 "\n"
 "F-Spot дерекқор файлын таңдаңыз."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+#: plugins/shotwell-data-imports/FSpotImporter.vala:62
 msgid "Manually select an F-Spot database file to import:"
 msgstr "Импорттау үшін F-Spot дерекқор файлын қолмен көрсетіңіз:"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:62
+#: plugins/shotwell-data-imports/FSpotImporter.vala:64
 msgid ""
 "Cannot open the selected F-Spot database file: the file does not exist or is "
 "not an F-Spot database"
@@ -95,7 +1416,7 @@ msgstr ""
 "Таңдалған F-Spot дерекқор файлын ашу мүмкін емес: файл жоқ болып тұр немесе "
 "ол файл F-Spot дерекқор файлы емес"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:64
+#: plugins/shotwell-data-imports/FSpotImporter.vala:66
 msgid ""
 "Cannot open the selected F-Spot database file: this version of the F-Spot "
 "database is not supported by Shotwell"
@@ -103,13 +1424,13 @@ msgstr ""
 "Таңдалған F-Spot дерекқор файлын ашу мүмкін емес: F-Spot дерекқор нұсқасын "
 "Shotwell қолдамайды"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+#: plugins/shotwell-data-imports/FSpotImporter.vala:68
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading tags table"
 msgstr ""
 "Таңдалған F-Spot дерекқор файлын оқу мүмкін емес: тегтер кестесін оқу қатесі"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+#: plugins/shotwell-data-imports/FSpotImporter.vala:70
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading photos "
 "table"
@@ -117,7 +1438,7 @@ msgstr ""
 "Таңдалған F-Spot дерекқор файлын оқу мүмкін емес: фотосуреттер кестесін оқу "
 "қатесі"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:70
+#: plugins/shotwell-data-imports/FSpotImporter.vala:72
 #, c-format
 msgid ""
 "Shotwell has found %d photos in the F-Spot library and is currently "
@@ -133,24 +1454,112 @@ msgstr ""
 "Бұл терезені жауып, Shotwell қолдана беруіңізге болады, импорт үрдісі соңына "
 "дейін фонда орындалады."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#: plugins/shotwell-data-imports/FSpotImporter.vala:86
 #, c-format
 msgid "F-Spot library: %s"
 msgstr "F-Spot жинағы: %s"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:422
+#: plugins/shotwell-data-imports/FSpotImporter.vala:424
 msgid "Preparing to import"
 msgstr "Импортқа дайындалу"
 
-#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
 msgid "Core Data Import Services"
 msgstr "Өзек мәлімет импорттау қызметтері"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+msgid "Go _Back"
+msgstr "Ар_тқа"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
+#: ui/shotwell.ui:1627
+msgid "_Log in"
+msgstr "_Кіру"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
+msgid "_Gallery3 URL:"
+msgstr "_Gallery3 сілтемесі:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+msgid "_User name:"
+msgstr "Па_йдаланушы аты:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+msgid "_Password:"
+msgstr "Пар_оль:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+msgid "API _Key:"
+msgstr "API _кілті:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+msgid "or"
+msgstr "немесе"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:115
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "_Шығу"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:129
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+msgid "_Publish"
+msgstr "Жари_ялау"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11
+msgid "A _new album"
+msgstr "_Жаңа альбом"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
+msgid "An _existing album"
+msgstr "Б_ар болып тұрған альбом"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr ""
+"Жүктеу алдында орналасу, тег және камераны сипаттайтын ақпаратты ө_шіру"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+msgid "Scaling constraint:"
+msgstr "Масштабтау шегі:"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+msgid "pixels"
+msgstr "пиксель"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1329
+#: src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Бастапқы өлшемі"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
+#: src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Ені не биіктігі"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Gallery3 жариялау модулі"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 msgid ""
 "You are not currently logged into your Gallery.\n"
 "\n"
@@ -161,29 +1570,29 @@ msgstr ""
 "\n"
 "Кіруді сәтті орындау үшін сізде Gallery3 тіркелгісі болуы тиіс."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: ../src/MediaPage.vala:435 ../src/photos/RawSupport.vala:300
-msgid "Shotwell"
-msgstr "Shotwell"
-
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:117
 msgid "Shotwell default directory"
 msgstr "Shotwell негізгі бумасы"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
-#, c-format
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "The file \"%s\" may not be supported by or may be too large for this "
+#| "instance of Gallery3."
 msgid ""
 "\n"
 "\n"
-"The file \"%s\" may not be supported by or may be too large for this "
-"instance of Gallery3."
+"The file “%s” may not be supported by or may be too large for this instance "
+"of Gallery3."
 msgstr ""
 "\n"
 "\n"
 "\"%s\" файлына қолдау жоқ болуы мүмкін, немесе ол Gallery3 бұл орнатуы үшін "
 "тым үлкен болуы мүмкін."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
 msgid ""
 "\n"
 "Note that Gallery3 only supports the video types that Flowplayer does."
@@ -192,11 +1601,14 @@ msgstr ""
 "Есіңізде болсын, Gallery3 ішінде тек Flowplayer қолдайтын видео түрлеріне "
 "қолдау бар. "
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1775
-#, c-format
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
+#, fuzzy, c-format
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to %s can't "
+#| "continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to %s can't "
+"A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
 msgstr ""
 "Жариялау үшін керек файл қолжетерсіз. %s қызметіне жариялауды жалғастыру "
@@ -204,12 +1616,12 @@ msgstr ""
 
 #. populate any widgets whose contents are
 #. programmatically-generated
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1551
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
 #, c-format
 msgid "Publishing to %s as %s."
 msgstr "%s қызметіне %s ретінде жариялау."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
 msgid ""
 "Enter the URL for your Gallery3 site and the username and password (or API "
 "key) for your Gallery3 account."
@@ -217,7 +1629,7 @@ msgstr ""
 "Gallery3 сайтыңыздың сілтемесін, және сіздің Gallery3 тіркелгіңіздің "
 "пайдаланушы атыңыз бен парольді (немесе API кілтін) көрсетіңіз."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1820
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
@@ -225,7 +1637,7 @@ msgstr ""
 "Пайдаланушы аты мен пароль немесе API кілті дұрыс көрсетілмеді. Қайтадан "
 "көру үшін, төменде пайдаланушы атын мен пароліңізді қайта енгізіңіз."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1821
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
 msgid ""
 "The URL entered does not appear to be the main directory of a Gallery3 "
 "instance. Please make sure you typed it correctly and it does not have any "
@@ -234,172 +1646,168 @@ msgstr ""
 "Енгізілген сілтеме Gallery3 орнатуының басты бумасына ұқсамайды. Оны дұрыс "
 "енгізілгенін және соңында артық сөздер (мыс. index.php) жоқтығын тесеріңіз."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
 msgstr "Пайдаланушы танылмады"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
 msgstr " Сайт табылмады"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
-msgid "Copyright (C) 2013 rajce.net"
-msgstr "Copyright (C) 2013 rajce.net"
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:49
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:49
+msgid "_Email address"
+msgstr "_Эл. пошта адресі"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:59
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:59
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:73
+msgid "_Password"
+msgstr "Пар_оль"
+
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:103
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
+msgid "_Remember"
+msgstr "_Есте сақтау"
+
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:125
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151
+msgid "Log in"
+msgstr "Жүйеге кіру"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
+msgid "An _existing album:"
+msgstr "Б_ар болып тұрған альбом:"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:52
+msgid "A _new album named:"
+msgstr "Атау_ы келесідей жаңа альбомда:"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1005
+msgid "_Hide album"
+msgstr "Альбомды жа_сыру"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+msgid "Open target _album in browser"
+msgstr "Мақсат _альбомды браузерде ашу"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
+#| msgid "Copyright (C) 2013 rajce.net"
+msgid "Copyright © 2013 rajce.net"
+msgstr "Copyright © 2013 rajce.net"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
 msgid "An error message occurred when publishing to Rajce. Please try again."
 msgstr ""
 "Rajce қызметіне жариялау кезінде қате хабарламасы алынды. Қайталап көріңіз."
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
 msgid "Enter email and password associated with your Rajce account."
 msgstr "Rajce тіркелгіңіздің пайдаланушы аты мен паролін енгізіңіз."
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
 msgid "Invalid email and/or password. Please try again"
 msgstr "Эл. пошта мен/не пароль қате. Қайтадан енгізіп көріңіз"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
 msgid "Invalid User Email or Password"
 msgstr "Пайдаланушы эл. поштасы не паролі қате"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
-msgid "_Email address"
-msgstr "_Эл. пошта адресі"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
-msgid "_Password"
-msgstr "Пар_оль"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
-msgid "_Remember"
-msgstr "_Есте сақтау"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:5
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
-msgid "Login"
-msgstr "Кіру"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
-msgid "_Hide album"
-msgstr "Альбомды жа_сыру"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1012
 #, c-format
 msgid "You are logged into Rajce as %s."
 msgstr "Сіз Rajce қызметіне %s ретінде кірдіңіз."
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#: plugins/shotwell-publishing/PicasaPublishing.vala:670
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:24
 msgid "Photos will appear in:"
 msgstr "Фотолар қайда көрінеді:"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
-msgid "An _existing album:"
-msgstr "Б_ар болып тұрған альбом:"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
-msgid "A _new album named:"
-msgstr "Атау_ы келесідей жаңа альбомда:"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
-msgid "Open target _album in browser"
-msgstr "Мақсат _альбомды браузерде ашу"
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+msgid "Shotwell Extra Publishing Services"
+msgstr "Shotwell қосымша жариялау қызметтері"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:8
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:7
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
-msgid "_Publish"
-msgstr "Жари_ялау"
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+msgid "Blogs:"
+msgstr "Блогтар:"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:1
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
-msgid "_Logout"
-msgstr "_Шығу"
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+msgid "Photo _size:"
+msgstr "Фотосурет өл_шемі:"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
 msgid "Copyright 2012 BJA Electronics"
 msgstr "Copyright 2012 BJA Electronics"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-msgid "500 x 375 pixels"
-msgstr "500 x 375 пиксель"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 пиксель"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 пиксель"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
-#, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgstr "'%s' - OAuth аутентификация сұранымына дұрыс жауап емес"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1325
+#| msgid "500 x 375 pixels"
+msgid "500 × 375 pixels"
+msgstr "500 × 375 пиксель"
+
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1232
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1326
+#| msgid "1024 x 768 pixels"
+msgid "1024 × 768 pixels"
+msgstr "1024 × 768 пиксель"
+
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
+#| msgid "1280 x 853 pixels"
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 пиксель"
+
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
+#, c-format
+msgid "“%s” isn’t a valid response to an OAuth authentication request"
+msgstr "\"%s\" - OAuth аутентификация сұранымына дұрыс жауап емес"
+
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
+#, fuzzy
+#| msgid ""
+#| "TumblrPublisher: start( ): can't start; this publisher is not restartable."
 msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
 msgstr ""
 "TumblrPublisher: start( ): бастау мүмкін емес; бұл жарияланушыны іске қайта "
 "қосуға болмайды."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
 msgid "Enter the username and password associated with your Tumblr account."
 msgstr "Tumblr тіркелгіңіздің пайдаланушы аты мен паролін енгізіңіз."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1087
 msgid "Username and/or password invalid. Please try again"
 msgstr "Пайдаланушы аты мен/не пароль қате. Қайтадан енгізіп көріңіз"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:617
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1121
 msgid "Invalid User Name or Password"
 msgstr "Пайдаланушы аты не пароль қате"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:634
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:752
 #, c-format
 msgid "Could not load UI: %s"
 msgstr "UI жүктеу мүмкін емес: %s"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:734
 #, c-format
 msgid ""
 "You are logged into Tumblr as %s.\n"
@@ -408,159 +1816,92 @@ msgstr ""
 "Сіз Tumblr-ге %s ретінде кірдіңіз.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:25
 msgid "Visit the Yandex.Fotki web site"
 msgstr "Яндекс.Фотки веб-сайтын шолу"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:659
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Сіз қазір Яндекс.Фотки ішіне кірмегенсіз."
 
-#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
-msgid "Shotwell Extra Publishing Services"
-msgstr "Shotwell қосымша жариялау қызметтері"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
-msgid "Go _Back"
-msgstr "Ар_тқа"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
-#: ../ui/shotwell.glade.h:42
-msgid "_Login"
-msgstr "_Кіру"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
-msgid "Intro message replaced at runtime"
-msgstr "Орындалу кезінде алмастырылатын қарсы алу хабарламасы"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
-msgid "_Gallery3 URL:"
-msgstr "_Gallery3 сілтемесі:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
-msgid "_User name:"
-msgstr "Па_йдаланушы аты:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
-msgid "_Password:"
-msgstr "Пар_оль:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
-msgid "API _Key:"
-msgstr "API _кілті:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
-msgid "or"
-msgstr "немесе"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
-msgid "A _new album"
-msgstr "_Жаңа альбом"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
-msgid "An _existing album"
-msgstr "Б_ар болып тұрған альбом"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
-msgid "_Remove location, tag and camera-identifying data before uploading"
-msgstr ""
-"Жүктеу алдында орналасу, тег және камераны сипаттайтын ақпаратты ө_шіру"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
-msgid "'Publishing to $url as $username' (populated in application code)"
-msgstr ""
-"'$url қызметіне $username ретінде жариялау' (қолданба коды ішінде "
-"толтырылады)"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
-msgid "Scaling constraint:"
-msgstr "Масштабтау шегі:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
-msgid "pixels"
-msgstr "пиксель"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1236
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-#: ../src/Dimensions.vala:17
-msgid "Original size"
-msgstr "Бастапқы өлшемі"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
-#: ../src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Ені не биіктігі"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:1
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:14
-msgid "label"
-msgstr "белгі"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
-msgid "Blogs:"
-msgstr "Блогтар:"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:1
-msgid "Photo _size:"
-msgstr "Фотосурет өл_шемі:"
-
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
-msgid "you are logged in rajce as $name"
-msgstr "Сіз rajce қызметіне %s ретінде кірдіңіз"
-
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
-msgid "$mediatype will appear in"
-msgstr "$mediatype жарияланатын жері"
-
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
 msgid "_Albums (or write new):"
 msgstr "_Альбомдар (не жаңасын жазыңыз):"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
 msgid "Access _type:"
 msgstr "Қатынау _түрі:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
 msgid "Disable _comments"
 msgstr "_Пікірлерді сөндіру:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
 msgid "_Forbid downloading original photo"
 msgstr "Бастапқы фото_ны жүктеп алуға тыйым салу"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
 msgid "Public"
 msgstr "Публикалық"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1195
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
 msgid "Friends"
 msgstr "Достар"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
+#: plugins/shotwell-publishing/YouTubePublishing.vala:498
 msgid "Private"
 msgstr "Жеке"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
+msgid "Publish to an e_xisting album:"
+msgstr "_Бар болып тұрған альбомға жариялау:"
+
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57
+msgid "Create a _new album named:"
+msgstr "Атауы келесіде_й жаңа альбомды жасау:"
+
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
+#: plugins/shotwell-publishing/FacebookPublishing.vala:984
+msgid "Upload _size:"
+msgstr "Жүктеу ө_лшемі:"
+
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139
+msgid "Videos and new photo albums _visible to:"
+msgstr "Видеолар мен жаңа фото альбомдар кі_мге көрінеді:"
+
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:226
+msgid ""
+"_Remove location, camera, and other identifying information before uploading"
+msgstr "Жүктеу алдында орналасу, камера және басқа сілтеуші ақпаратты ө_шіру"
+
+#: plugins/shotwell-publishing/FacebookPublishing.vala:62
+#: plugins/shotwell-publishing/PicasaPublishing.vala:60
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1209
 msgid "Shotwell Connect"
 msgstr "Shotwell Connect"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+#: plugins/shotwell-publishing/FacebookPublishing.vala:64
+#, fuzzy
+#| msgid ""
+#| "You are not currently logged into Facebook.\n"
+#| "\n"
+#| "If you don't yet have a Facebook account, you can create one during the "
+#| "login process. During login, Shotwell Connect may ask you for permission "
+#| "to upload photos and publish to your feed. These permissions are required "
+#| "for Shotwell Connect to function."
 msgid ""
 "You are not currently logged into Facebook.\n"
 "\n"
-"If you don't yet have a Facebook account, you can create one during the "
+"If you don’t yet have a Facebook account, you can create one during the "
 "login process. During login, Shotwell Connect may ask you for permission to "
 "upload photos and publish to your feed. These permissions are required for "
 "Shotwell Connect to function."
@@ -572,7 +1913,7 @@ msgstr ""
 "сіздің таспаңызға жариялау үшін рұқсат сұрауы мүмкін. Ол рұқсаттар Shotwell "
 "Connect дұрыс жұмысы үшін керек."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
+#: plugins/shotwell-publishing/FacebookPublishing.vala:66
 msgid ""
 "You have already logged in and out of Facebook during this Shotwell "
 "session.\n"
@@ -583,32 +1924,36 @@ msgstr ""
 "Facebook ішіне жариялауды жалғастыру үшін, Shotwell қайта қосыңыз, одан "
 "кейін жариялап көріңіз."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+#: plugins/shotwell-publishing/FacebookPublishing.vala:87
 msgid "Standard (720 pixels)"
 msgstr "Қалыпты (720 пиксель)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+#: plugins/shotwell-publishing/FacebookPublishing.vala:90
 msgid "Large (2048 pixels)"
 msgstr "Үлкен (2048 пиксель)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
-msgstr "Facebook-пен байланысты сынау..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:255
+msgid "Testing connection to Facebook…"
+msgstr "Facebook-пен байланысты сынау…"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
-msgid "Creating album..."
-msgstr "Альбомды жасау..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:348
+#: plugins/shotwell-publishing/PicasaPublishing.vala:379
+msgid "Creating album…"
+msgstr "Альбомды жасау…"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+#: plugins/shotwell-publishing/FacebookPublishing.vala:374
+#, fuzzy
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Facebook "
+#| "can't continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can't "
+"A file required for publishing is unavailable. Publishing to Facebook can’t "
 "continue."
 msgstr ""
 "Жариялау үшін керек файл қолжетерсіз. Facebook-ке жариялауды жалғастыру "
 "мүмкін емес."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1033
+#: plugins/shotwell-publishing/FacebookPublishing.vala:982
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -617,31 +1962,48 @@ msgstr ""
 "Сіз Facebook-ке %s ретінде кірдіңіз.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1034
+#: plugins/shotwell-publishing/FacebookPublishing.vala:983
 msgid "Where would you like to publish the selected photos?"
 msgstr "Таңдалған фотоларды қайда жариялауды қалайсыз?"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1035
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
-msgid "Upload _size:"
-msgstr "Жүктеу ө_лшемі:"
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1194
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Just me"
 msgstr "Тек мен"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1196
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1313
 msgid "Everyone"
 msgstr "Әркім"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:61
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
+msgstr ""
+"Веб браузеріңізде Flickr ішіне кіргеннен кейін көрсетілген растау кодын "
+"енгізіңіз."
+
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
+msgid "Authorization _Number:"
+msgstr "Авторизациялық _нөмірі:"
+
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "Жа_лғастыру"
+
+#: plugins/shotwell-publishing/FlickrPublishing.vala:60
+#, fuzzy
+#| msgid ""
+#| "You are not currently logged into Flickr.\n"
+#| "\n"
+#| "Click Login to log into Flickr in your Web browser.  You will have to "
+#| "authorize Shotwell Connect to link to your Flickr account."
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
-"Click Login to log into Flickr in your Web browser.  You will have to "
+"Click Log in to log into Flickr in your Web browser. You will have to "
 "authorize Shotwell Connect to link to your Flickr account."
 msgstr ""
 "Сіз Flickr ішіне кірген жоқсыз.\n"
@@ -649,7 +2011,7 @@ msgstr ""
 "Flickr ішіне веб браузеріңізбен кіру үшін Кіру батырмасын шертіңіз. Flickr "
 "тіркелгіңізге сілтеу үшін Shotwell Connect үшін авторизация беруіңіз керек."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:63
+#: plugins/shotwell-publishing/FlickrPublishing.vala:62
 msgid ""
 "You have already logged in and out of Flickr during this Shotwell session.\n"
 "To continue publishing to Flickr, quit and restart Shotwell, then try "
@@ -659,24 +2021,28 @@ msgstr ""
 "Flickr ішіне жариялауды жалғастыру үшін, Shotwell қайта қосыңыз, одан кейін "
 "жариялап көріңіз."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
-msgstr "Кіру үшін дайындалу..."
+#: plugins/shotwell-publishing/FlickrPublishing.vala:374
+msgid "Preparing for login…"
+msgstr "Кіру үшін дайындалу…"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:595
+#: plugins/shotwell-publishing/FlickrPublishing.vala:444
+#: plugins/shotwell-publishing/FlickrPublishing.vala:594
+#, fuzzy
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Flickr can't "
+#| "continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
 msgstr ""
 "Жариялау үшін керек файл қолжетерсіз. Flickr-ге жариялауды жалғастыру мүмкін "
 "емес."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Авторизацияны тексеру..."
+#: plugins/shotwell-publishing/FlickrPublishing.vala:457
+msgid "Verifying authorization…"
+msgstr "Авторизацияны тексеру…"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -685,7 +2051,7 @@ msgstr ""
 "Сіз Flickr-ге %s ретінде кірдіңіз.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1156
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -698,50 +2064,67 @@ msgstr[0] ""
 "шектеп отыр.\n"
 "Бұл айда, сізде шекке дейін қалған %d мегабайт бар."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Сіздің Flickr Pro тіркелгіңіз шектелмеген жүктеулерді мүмкін қылады."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
 msgid "Photos _visible to:"
 msgstr "Фотолар кі_мге көрінеді:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
 msgid "Videos _visible to:"
 msgstr "Видеолар кі_мге көрінеді:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
 msgid "Photos and videos _visible to:"
 msgstr "Фото мен видеолар кім_ге көрінеді:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
 msgid "Friends & family only"
 msgstr "Тек отбасы мен достар"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Family only"
 msgstr "Тек отбасы"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Friends only"
 msgstr "Тек достар"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 пиксель"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1327
+#| msgid "2048 x 1536 pixels"
+msgid "2048 × 1536 pixels"
+msgstr "2048 × 1536 пиксель"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 пиксель"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1328
+#| msgid "4096 x 3072 pixels"
+msgid "4096 × 3072 pixels"
+msgstr "4096 × 3072 пиксель"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:58
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
+msgid "L_ist album in public gallery"
+msgstr "Ор_тақ галереясындағы альбомдар тізімі"
+
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+msgid "Photo _size preset:"
+msgstr "Фото өл_шемінің алдын-ала орнатуы:"
+
+#: plugins/shotwell-publishing/PicasaPublishing.vala:59
+#, fuzzy
+#| msgid ""
+#| "You are not currently logged into Picasa Web Albums.\n"
+#| "\n"
+#| "Click Login to log into Picasa Web Albums in your Web browser. You will "
+#| "have to authorize Shotwell Connect to link to your Picasa Web Albums "
+#| "account."
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
+"Click Log in to log into Picasa Web Albums in your Web browser. You will "
+"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
 "Сіз Picasa Web Albums ішіне кірген жоқсыз.\n"
 "\n"
@@ -749,55 +2132,118 @@ msgstr ""
 "шертіңіз. Picasa Web Albums тіркелгіңізге сілтеу үшін Shotwell Connect үшін "
 "авторизация беруіңіз керек."
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+#: plugins/shotwell-publishing/PicasaPublishing.vala:361
+#, fuzzy
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Picasa can't "
+#| "continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can't "
+"A file required for publishing is unavailable. Publishing to Picasa can’t "
 "continue."
 msgstr ""
 "Жариялау үшін керек файл қолжетерсіз. Picasa-ға жариялауды жалғастыру мүмкін "
 "емес."
 
 #. populate any widgets whose contents are programmatically-generated.
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
+#: plugins/shotwell-publishing/PicasaPublishing.vala:659
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr "Сіз Picasa Web Albums ішіне %s ретінде кірдіңіз."
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:665
 msgid "Videos will appear in:"
 msgstr "Видеолар жарияланатын жері:"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Кіші (640 x 480 пиксель)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:746
+msgid "Small (640 × 480 pixels)"
+msgstr "Кіші (640 × 480 пиксель)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Орташа (1024 x 768 пиксель)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:747
+msgid "Medium (1024 × 768 pixels)"
+msgstr "Орташа (1024 × 768 пиксель)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Ұсынылатын (1600 x 1200 пиксель)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:748
+msgid "Recommended (1600 × 1200 pixels)"
+msgstr "Ұсынылатын (1600 × 1200 пиксель)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 пиксель)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:749
+msgid "Google+ (2048 × 1536 pixels)"
+msgstr "Google+ (2048 × 1536 пиксель)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: ../src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: src/editing_tools/EditingTools.vala:756
 msgid "Original Size"
 msgstr "Бастапқы өлшемі"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
+msgid "_URL of your Piwigo photo library"
+msgstr "Сіздің Piwigo фото ж_инағыңыздың URL-ы"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
+msgid "User _name"
+msgstr "Па_йдаланушы аты"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
+msgid "_Remember Password"
+msgstr "Парольді _сақтау"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
+msgid "An _existing category:"
+msgstr "Бар са_натта:"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
+msgid "Photos will be _visible by:"
+msgstr "Фотоларды кі_м көре алады:"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
+msgid "Photo size:"
+msgstr "Фотосурет өлшемі:"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
+msgid "within category:"
+msgstr "санатта:"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
+msgid "Album comment:"
+msgstr "Альбом түсіндірмесі:"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr ""
+"Егер а_тауы болса, ал түсіндірмесі болмаса, атауды түсіндірме ретінде қолдану"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
+msgid "_Do no upload tags"
+msgstr "Тегтерді жү_ктемеу"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
+msgid "Logout"
+msgstr "Шығу"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291
+#: src/Resources.vala:295
+msgid "Publish"
+msgstr "Жариялау"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:775
 #, c-format
-msgid "Creating album %s..."
-msgstr "%s альбомын жасау..."
+msgid "Creating album %s…"
+msgstr "%s альбомын жасау…"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:948
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr "Piwigo-ға жариялау кезінде қате хабарламасы алынды. Қайталап көріңіз."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
+#. %s is the host name that we tried to connect to
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1024
+#, c-format
+msgid ""
+"This does not look like the real <b>%s</b>. Attackers might be trying to "
+"steal or alter information going to or from this site (for example, private "
+"messages, credit card information, or passwords)."
+msgstr ""
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1085
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
@@ -805,7 +2251,7 @@ msgstr ""
 "Piwigo фото жинағыңыздың сілтемесін, және сіздің Piwigo тіркелгіңіздің "
 "пайдаланушы атыңыз бен парольді көрсетіңіз."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1086
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
@@ -813,27 +2259,47 @@ msgstr ""
 "Shotwell сіздің Piwigo фото жинағыңызбен байланыса алмады. Енгізілген "
 "сілтемені тексеріңіз"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1116
 msgid "Invalid URL"
 msgstr "Қате сілтеме"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1314
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Әкімшілер, Отбасы, Достар, Контакттар"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1315
 msgid "Admins, Family, Friends"
 msgstr "Әкімшілер, Отбасы, Достар"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1316
 msgid "Admins, Family"
 msgstr "Әкімшілер, Отбасы"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1317
 msgid "Admins"
 msgstr "Әкімшілер"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
+msgstr "Бұл байланыс қауіпсіщ емес"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
+msgstr "Сертификатты көрсету…"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr "Мен түсіндім, _жалғастыра беріңіз."
+
+#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+msgid "Core Publishing Services"
+msgstr "Жариялау қызметтері"
+
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+msgid "Video privacy _setting:"
+msgstr "Видео ж_екелік баптауы:"
+
+#: plugins/shotwell-publishing/YouTubePublishing.vala:58
 msgid ""
 "You are not currently logged into YouTube.\n"
 "\n"
@@ -847,181 +2313,69 @@ msgstr ""
 "керек. Тіркелгіні осылай баптау үшін браузер көмегімен YouTube сайтына кем "
 "дегенде бір рет кіруіңіз керек."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+#: plugins/shotwell-publishing/YouTubePublishing.vala:363
+#, fuzzy
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Youtube "
+#| "can't continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
+"A file required for publishing is unavailable. Publishing to YouTube can’t "
 "continue."
 msgstr ""
 "Жариялау үшін керек файл қолжетерсіз. Youtube-ге жариялауды жалғастыру "
 "мүмкін емес."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
+#: plugins/shotwell-publishing/YouTubePublishing.vala:462
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Сіз YouTube-ге %s ретінде кірдіңіз."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
+#: plugins/shotwell-publishing/YouTubePublishing.vala:464
 #, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Видеолар '%s' ішінде жарияланады"
+msgid "Videos will appear in “%s”"
+msgstr "Видеолар \"%s\" ішіне жарияланады"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
+#: plugins/shotwell-publishing/YouTubePublishing.vala:496
 msgid "Public listed"
 msgstr "Ортақ жарияланған"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:497
 msgid "Public unlisted"
 msgstr "Ортақ тізілмеген"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
-msgid "Publish to an e_xisting album:"
-msgstr "_Бар болып тұрған альбомға жариялау:"
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
-msgid "Create a _new album named:"
-msgstr "Атауы келесіде_й жаңа альбомды жасау:"
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
-msgid "Videos and new photo albums _visible to:"
-msgstr "Видеолар мен жаңа фото альбомдар кі_мге көрінеді:"
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:5
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:5
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:8
-msgid ""
-"_Remove location, camera, and other identifying information before uploading"
-msgstr "Жүктеу алдында орналасу, камера және басқа сілтеуші ақпаратты ө_шіру"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Веб браузеріңізде Flickr ішіне кіргеннен кейін көрсетілген растау кодын "
-"енгізіңіз."
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
-msgid "Authorization _Number:"
-msgstr "Авторизациялық _нөмірі:"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
-#: ../src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "Жа_лғастыру"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
-msgid "L_ist album in public gallery"
-msgstr "Ор_тақ галереясындағы альбомдар тізімі"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
-msgid "Photo _size preset:"
-msgstr "Фото өл_шемінің алдын-ала орнатуы:"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
-msgid "_URL of your Piwigo photo library"
-msgstr "Сіздің Piwigo фото ж_инағыңыздың URL-ы"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
-msgid "User _name"
-msgstr "Па_йдаланушы аты"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
-msgid "_Remember Password"
-msgstr "Парольді _сақтау"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
-msgid "An _existing category:"
-msgstr "Бар са_натта:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
-msgid "Photos will be _visible by:"
-msgstr "Фотоларды кі_м көре алады:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
-msgid "Photo size:"
-msgstr "Фотосурет өлшемі:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
-msgid "within category:"
-msgstr "санатта:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
-msgid "Album comment:"
-msgstr "Альбом түсіндірмесі:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr ""
-"Егер а_тауы болса, ал түсіндірмесі болмаса, атауды түсіндірме ретінде қолдану"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
-msgid "_Do no upload tags"
-msgstr "Тегтерді жү_ктемеу"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
-msgid "Logout"
-msgstr "Шығу"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:298
-msgid "Publish"
-msgstr "Жариялау"
-
-#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Жариялау қызметтері"
-
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
-msgid "Video privacy _setting:"
-msgstr "Видео ж_екелік баптауы:"
-
-#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+#: plugins/shotwell-transitions/BlindsEffect.vala:20
 msgid "Blinds"
 msgstr "Жалюзи"
 
-#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+#: plugins/shotwell-transitions/ChessEffect.vala:20
 msgid "Chess"
 msgstr "Шахмат"
 
-#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+#: plugins/shotwell-transitions/CircleEffect.vala:20
 msgid "Circle"
 msgstr "Шеңбер"
 
-#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+#: plugins/shotwell-transitions/CirclesEffect.vala:20
 msgid "Circles"
 msgstr "Шеңберлер"
 
-#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+#: plugins/shotwell-transitions/ClockEffect.vala:20
 msgid "Clock"
 msgstr "Сағат"
 
-#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+#: plugins/shotwell-transitions/CrumbleEffect.vala:20
 msgid "Crumble"
 msgstr "Шашырау"
 
-#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+#: plugins/shotwell-transitions/FadeEffect.vala:20
 msgid "Fade"
 msgstr "Сөндіру"
 
-#: ../plugins/shotwell-transitions/SlideEffect.vala:20
-msgid "Slide"
-msgstr "Слайд"
-
-#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
-msgid "Squares"
-msgstr "Шаршылар"
-
-#: ../plugins/shotwell-transitions/StripesEffect.vala:20
-msgid "Stripes"
-msgstr "Жолақтар"
-
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
+#: plugins/shotwell-transitions/shotwell-transitions.vala:28
 msgid "Core Slideshow Transitions"
 msgstr "Слайдшоу арасында өту аралығы"
 
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-#| msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
+#: plugins/shotwell-transitions/shotwell-transitions.vala:76
 msgid ""
 "Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
 "Inc."
@@ -1029,77 +2383,93 @@ msgstr ""
 "Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
 "Inc."
 
-#: ../src/AppDirs.vala:64 ../src/AppDirs.vala:115
+#: plugins/shotwell-transitions/SlideEffect.vala:20
+msgid "Slide"
+msgstr "Слайд"
+
+#: plugins/shotwell-transitions/SquaresEffect.vala:20
+msgid "Squares"
+msgstr "Шаршылар"
+
+#: plugins/shotwell-transitions/StripesEffect.vala:20
+msgid "Stripes"
+msgstr "Жолақтар"
+
+#: src/AppDirs.vala:64 src/AppDirs.vala:115
 #, c-format
 msgid "Unable to create cache directory %s: %s"
 msgstr "%s кэш бумасын жасау мүмкін емес: %s"
 
-#: ../src/AppDirs.vala:74 ../src/AppDirs.vala:104
+#: src/AppDirs.vala:74 src/AppDirs.vala:104
 #, c-format
 msgid "Unable to create data directory %s: %s"
 msgstr "%s мәлімет бумасын жасау мүмкін емес: %s"
 
 #. If XDG yarfed, use ~/Pictures
-#: ../src/AppDirs.vala:168
+#: src/AppDirs.vala:168
 msgid "Pictures"
 msgstr "Суреттер"
 
-#: ../src/AppDirs.vala:206
+#: src/AppDirs.vala:206
 #, c-format
 msgid "Unable to create temporary directory %s: %s"
 msgstr "%s уақытша бумасын жасау мүмкін емес: %s"
 
-#: ../src/AppDirs.vala:223 ../src/AppDirs.vala:254
+#: src/AppDirs.vala:223 src/AppDirs.vala:254
 #, c-format
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "%s мәлімет ішкі бумасын жасау мүмкін емес: %s"
 
-#: ../src/AppDirs.vala:236
+#: src/AppDirs.vala:236
 #, c-format
 msgid "Could not make directory %s writable"
 msgstr "%s бумасын жазу үшін қолжетерлік жасау мүмкін емес."
 
-#: ../src/AppDirs.vala:239
+#: src/AppDirs.vala:239
 #, c-format
 msgid "Could not make directory %s writable: %s"
 msgstr "%s бумасын жазу үшін қолжетерлік жасау мүмкін емес: %s"
 
-#: ../src/AppWindow.vala:53
+#: src/AppWindow.vala:54
 msgid "Pin Toolbar"
 msgstr "Панельді бекіту"
 
-#: ../src/AppWindow.vala:54
+#: src/AppWindow.vala:55
 msgid "Pin the toolbar open"
 msgstr "Панельді ашық түрінде бекіту"
 
-#: ../src/AppWindow.vala:59
+#: src/AppWindow.vala:60
 msgid "Leave fullscreen"
 msgstr "Толық экраннан шығу"
 
-#: ../src/AppWindow.vala:518
+#: src/AppWindow.vala:499
 msgid "_Contents"
 msgstr "Құра_масы"
 
-#: ../src/AppWindow.vala:523
+#: src/AppWindow.vala:504
 msgid "_Frequently Asked Questions"
 msgstr "_Жиі қойылатын сұрақтар"
 
-#: ../src/AppWindow.vala:528
-msgid "_Report a Problem..."
-msgstr "Мә_селе жөнінде хабарлау..."
+#: src/AppWindow.vala:509
+msgid "_Report a Problem…"
+msgstr "Мә_селе жөнінде хабарлау…"
 
-#: ../src/AppWindow.vala:627 ../src/AppWindow.vala:648
-#: ../src/AppWindow.vala:665 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1424 ../src/Dialogs.vala:1447 ../src/Resources.vala:157
-#: ../src/data_imports/DataImportsUI.vala:413
-#: ../src/publishing/PublishingUI.vala:512
+#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
+#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1441 src/Dialogs.vala:1464
+#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
 msgid "_Cancel"
 msgstr "Ба_с тарту"
 
-#: ../src/AppWindow.vala:675
-#, c-format
+#: src/AppWindow.vala:656
+#, fuzzy, c-format
+#| msgid ""
+#| "A fatal error occurred when accessing Shotwell's library.  Shotwell "
+#| "cannot continue.\n"
+#| "\n"
+#| "%s"
 msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
 "continue.\n"
 "\n"
 "%s"
@@ -1109,342 +2479,613 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:695
+#: src/AppWindow.vala:676
 msgid "Visit the Shotwell web site"
 msgstr "Shotwell веб сайтын шолу"
 
-#: ../src/AppWindow.vala:707
+#: src/AppWindow.vala:688
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Көмек ақпаратын көрсету мүмкін емес: %s"
 
-#: ../src/AppWindow.vala:715
+#: src/AppWindow.vala:696
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Ақаулықтар дерекқорына өту мүмкін емес: %s"
 
-#: ../src/AppWindow.vala:723
+#: src/AppWindow.vala:704
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "ЖҚС көрсету мүмкін емес: %s"
 
-#: ../src/BatchImport.vala:26
+#: src/BatchImport.vala:26
 msgid "Success"
 msgstr "Сәтті"
 
-#: ../src/BatchImport.vala:29
+#: src/BatchImport.vala:29
 msgid "File error"
 msgstr "Файл қатесі"
 
-#: ../src/BatchImport.vala:32
+#: src/BatchImport.vala:32
 msgid "Unable to decode file"
 msgstr "Файлды декодалау мүмкін емес"
 
-#: ../src/BatchImport.vala:35
+#: src/BatchImport.vala:35
 msgid "Database error"
 msgstr "Дерекқор қатесі"
 
-#: ../src/BatchImport.vala:38
+#: src/BatchImport.vala:38
 msgid "User aborted import"
 msgstr "Пайдаланушы импортты тоқтатқан"
 
-#: ../src/BatchImport.vala:41
+#: src/BatchImport.vala:41
 msgid "Not a file"
 msgstr "Файл емес"
 
-#: ../src/BatchImport.vala:44
+#: src/BatchImport.vala:44
 msgid "File already exists in database"
 msgstr "Файл дерекқорда бар"
 
-#: ../src/BatchImport.vala:47
+#: src/BatchImport.vala:47
 msgid "Unsupported file format"
 msgstr "Қолдауы жоқ файл пішімі"
 
-#: ../src/BatchImport.vala:50
+#: src/BatchImport.vala:50
 msgid "Not an image file"
 msgstr "Сурет файлы емес"
 
-#: ../src/BatchImport.vala:53
+#: src/BatchImport.vala:53
 msgid "Disk failure"
 msgstr "Диск қатесі"
 
-#: ../src/BatchImport.vala:56
+#: src/BatchImport.vala:56
 msgid "Disk full"
 msgstr "Диск толық"
 
-#: ../src/BatchImport.vala:59
+#: src/BatchImport.vala:59
 msgid "Camera error"
 msgstr "Камера қатесі"
 
-#: ../src/BatchImport.vala:62
+#: src/BatchImport.vala:62
 msgid "File write error"
 msgstr "Файлды жазу қатесі"
 
-#: ../src/BatchImport.vala:65
+#: src/BatchImport.vala:65
 msgid "Corrupt image file"
 msgstr "Зақымдалған сурет файлы"
 
-#: ../src/BatchImport.vala:68
+#: src/BatchImport.vala:68
 #, c-format
 msgid "Imported failed (%d)"
 msgstr "Импорттау қатесі (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
+#: src/camera/Branch.vala:85
+msgid "Cameras"
+msgstr "Камералар"
+
+#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
+#: src/camera/ImportPage.vala:726 src/MediaPage.vala:440
+#: src/photos/RawSupport.vala:303
+msgid "Camera"
+msgstr "Камера"
+
+#: src/camera/ImportPage.vala:311 src/Properties.vala:227
+msgid "RAW+JPEG"
+msgstr "RAW+JPEG"
+
+#: src/camera/ImportPage.vala:458
+#, fuzzy
+#| msgid ""
+#| "Unable to unmount camera.  Try unmounting the camera from the file "
+#| "manager."
+msgid ""
+"Unable to unmount camera. Try unmounting the camera from the file manager."
+msgstr ""
+"Камераны тіркеуден босату мүмкін емес. Камераны файлдар басқарушысынан "
+"тіркеуден босатып көріңіз."
+
+#. hide duplicates checkbox
+#: src/camera/ImportPage.vala:775
+msgid "Hide photos already imported"
+msgstr "Алдыңда импортталған фотоларды жасыру"
+
+#: src/camera/ImportPage.vala:776
+msgid "Only display photos that have not been imported"
+msgstr "Тек импортталмаған фотоларды көрсету"
+
+#: src/camera/ImportPage.vala:842
+msgid "The camera seems to be empty. No photos/videos found to import"
+msgstr ""
+
+#: src/camera/ImportPage.vala:846
+#, fuzzy
+#| msgid "No photos/videos found"
+msgid "No new photos/videos found on camera"
+msgstr "Ешбір фото/видео табылмады"
+
+#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451
+msgid "_Titles"
+msgstr "_Атаулар"
+
+#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452
+msgid "Display the title of each photo"
+msgstr "Әр фотоның атауын көрсету"
+
+#: src/camera/ImportPage.vala:885
+msgid "Import _Selected"
+msgstr "Таңд_алғанды импорттау"
+
+#: src/camera/ImportPage.vala:886
+msgid "Import the selected photos into your library"
+msgstr "Таңдалған фотоларды жинағыңызға импорттау"
+
+#: src/camera/ImportPage.vala:891
+msgid "Import _All"
+msgstr "Барл_ығын импорттау"
+
+#: src/camera/ImportPage.vala:892
+msgid "Import all the photos into your library"
+msgstr "Барлық фотоларды жинағыңызға импорттау"
+
+#. it's mounted, offer to unmount for the user
+#: src/camera/ImportPage.vala:1013
+#, fuzzy
+#| msgid ""
+#| "Shotwell needs to unmount the camera from the filesystem in order to "
+#| "access it.  Continue?"
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it. Continue?"
+msgstr ""
+"Shotwell камераға қолын жеткізу үшін оны алдымен тіркеуден босату керек. "
+"Жалғастыру керек пе?"
+
+#: src/camera/ImportPage.vala:1019
+msgid "_Unmount"
+msgstr "_Тіркеуден босату"
+
+#: src/camera/ImportPage.vala:1024
+msgid "Please unmount the camera."
+msgstr "Камераны тіркеуден босатыңыз."
+
+#: src/camera/ImportPage.vala:1029
+#, fuzzy
+#| msgid ""
+#| "The camera is locked by another application.  Shotwell can only access "
+#| "the camera when it's unlocked.  Please close any other application using "
+#| "the camera and try again."
+msgid ""
+"The camera is locked by another application. Shotwell can only access the "
+"camera when it’s unlocked. Please close any other application using the "
+"camera and try again."
+msgstr ""
+"Камераны басқа бір қолданба ұстап тұр. Shotwell камераға тек ол бос кезінде "
+"ғана қолын жеткізе алады. Камераны қолданып тұрған барлық қолданбалады "
+"жабыңыз да, әрекетті қайталап көріңіз."
+
+#: src/camera/ImportPage.vala:1039
+msgid "Please close any other application using the camera."
+msgstr "Камераны қолданып тұрған барлық қолданбалады жабыңыз."
+
+#: src/camera/ImportPage.vala:1044
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"Камерадан алдын-ала қарауды алу мүмкін емес:\n"
+"%s"
+
+#: src/camera/ImportPage.vala:1061
+msgid "Unmounting…"
+msgstr "Тіркеуден босатылуда…"
+
+#: src/camera/ImportPage.vala:1152
+msgid "Starting import, please wait…"
+msgstr "Импортты бастау, күте тұрыңыз…"
+
+#: src/camera/ImportPage.vala:1169
+msgid "Fetching photo information"
+msgstr "Фото ақпаратын алу"
+
+#: src/camera/ImportPage.vala:1527
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "%s үшін алдын-ала қарауды алу"
+
+#: src/camera/ImportPage.vala:1643
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "Камераны блоктау мүмкін емес: %s"
+
+#: src/camera/ImportPage.vala:1728
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] "Камерадан бұл %d фотоны өшіру керек пе?"
+
+#: src/camera/ImportPage.vala:1731
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] "Камерадан бұл %d видеоны өшіру керек пе?"
+
+#: src/camera/ImportPage.vala:1734
+#, c-format
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] "Камерадан бұл %d фото/видеоны өшіру керек пе?"
+
+#: src/camera/ImportPage.vala:1737
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] "Бұл %d файлды камерадан өшіру керек пе?"
+
+#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1408
+msgid "_Keep"
+msgstr "Ұ_стау"
+
+#: src/camera/ImportPage.vala:1764
+msgid "Removing photos/videos from camera"
+msgstr "Камерадан фотолар/видеоларды өшіру"
+
+#: src/camera/ImportPage.vala:1768
+#, c-format
+msgid "Unable to delete %d photo/video from the camera due to errors."
+msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
+msgstr[0] "Қателер салдарынан камерадан %d фото/видеоны өшіру мүмкін емес."
+
+#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635
 msgid "S_lideshow"
 msgstr "С_лайдшоу"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
+#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636
 msgid "Play a slideshow"
 msgstr "Слайдшоуды ойнату"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:456
 msgid "Export Photo/Video"
 msgstr "Фото/видеоны экспорттау"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:456
 msgid "Export Photos/Videos"
 msgstr "Фото/видеоларды экспорттау"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3211
+#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209
 msgid "Export Photo"
 msgstr "Фото(лар) экспорттау"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+#: src/CollectionPage.vala:458 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Фотоларды экспорттау"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
 msgid "Rotating"
 msgstr "Айналдыру"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
 msgid "Undoing Rotate"
 msgstr "Айналдыруды болдырмау"
 
-#: ../src/CollectionPage.vala:570
+#: src/CollectionPage.vala:570
 msgid "Flipping Horizontally"
 msgstr "Горизонталды айналдыру"
 
-#: ../src/CollectionPage.vala:571
+#: src/CollectionPage.vala:571
 msgid "Undoing Flip Horizontally"
 msgstr "Горизонталды айналдыруды болдырмау"
 
-#: ../src/CollectionPage.vala:580
+#: src/CollectionPage.vala:580
 msgid "Flipping Vertically"
 msgstr "Вертикалды айналдыру"
 
-#: ../src/CollectionPage.vala:581
+#: src/CollectionPage.vala:581
 msgid "Undoing Flip Vertically"
 msgstr "Вертикалды айналдыруды болдырмау"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Reverting"
 msgstr "Қайтару"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Undoing Revert"
 msgstr "Қайтаруды болдырмау"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Enhancing"
 msgstr "Жақсарту"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Undoing Enhance"
 msgstr "Жақсартуды болдырмау"
 
-#: ../src/Commands.vala:853
+#: src/Commands.vala:857
 msgid "Applying Color Transformations"
 msgstr "Түстер түрлендіруін іске асыру"
 
-#: ../src/Commands.vala:853
+#: src/Commands.vala:857
 msgid "Undoing Color Transformations"
 msgstr "Түстер түрлендіруін болдырмау"
 
-#: ../src/Commands.vala:1003
+#: src/Commands.vala:1007
 msgid "Creating New Event"
 msgstr "Жаңа оқиғаны жасау"
 
-#: ../src/Commands.vala:1004
+#: src/Commands.vala:1008
 msgid "Removing Event"
 msgstr "Оқиға өшірілуде"
 
-#: ../src/Commands.vala:1013
+#: src/Commands.vala:1017
 msgid "Moving Photos to New Event"
 msgstr "Фотоларды жаңа оқиғаға жылжыту"
 
-#: ../src/Commands.vala:1014
+#: src/Commands.vala:1018
 msgid "Setting Photos to Previous Event"
 msgstr "Фотоларды алдыңғы оқиғаға орнату"
 
-#: ../src/Commands.vala:1071
+#: src/Commands.vala:1075
 msgid "Merging"
 msgstr "Біріктіру"
 
-#: ../src/Commands.vala:1072
+#: src/Commands.vala:1076
 msgid "Unmerging"
 msgstr "Біріктіруді болдырмау"
 
-#: ../src/Commands.vala:1081
+#: src/Commands.vala:1085
 msgid "Duplicating photos"
 msgstr "Фотолар көшірмелерін жасау"
 
-#: ../src/Commands.vala:1081
+#: src/Commands.vala:1085
 msgid "Removing duplicated photos"
 msgstr "Фотолар көшірмелерін өшіру"
 
-#: ../src/Commands.vala:1104
+#: src/Commands.vala:1108
 #, c-format
 msgid "Unable to duplicate one photo due to a file error"
 msgid_plural "Unable to duplicate %d photos due to file errors"
 msgstr[0] "%d фотоның файл қатесі салдарынан көшірмесін жасау мүмкін емес"
 
-#: ../src/Commands.vala:1191
+#: src/Commands.vala:1195
 msgid "Restoring previous rating"
 msgstr "Алдыңғы рейтингті қайтару"
 
-#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Increasing ratings"
 msgstr "Рейтингтерді үлкейту"
 
-#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Decreasing ratings"
 msgstr "Рейтингтерді кішірейту"
 
-#: ../src/Commands.vala:1252
+#: src/Commands.vala:1256
 msgid "Setting RAW developer"
 msgstr "RAW өндірушісін орнату"
 
-#: ../src/Commands.vala:1252
+#: src/Commands.vala:1256
 msgid "Restoring previous RAW developer"
 msgstr "Алдыңғы RAW өндірушісін қалпына келтіру"
 
-#: ../src/Commands.vala:1253
+#: src/Commands.vala:1257
 msgid "Set Developer"
 msgstr "Өндірушіні орнату"
 
-#: ../src/Commands.vala:1343
+#: src/Commands.vala:1347
 msgid "Original photo could not be adjusted."
 msgstr "Бастапқы фотоны түзету мүмкін емес."
 
-#: ../src/Commands.vala:1364
+#: src/Commands.vala:1368
 msgid "Adjusting Date and Time"
 msgstr "Күн мен уақытын баптау"
 
-#: ../src/Commands.vala:1364
+#: src/Commands.vala:1368
 msgid "Undoing Date and Time Adjustment"
 msgstr "Күн мен уақытын баптауды болдырмау"
 
-#: ../src/Commands.vala:1395
+#: src/Commands.vala:1399
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
 msgstr[0] "Келесі бастапқы фотоны баптау мүмкін емес."
 
-#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
+#: src/Commands.vala:1401 src/Commands.vala:1425
 msgid "Time Adjustment Error"
 msgstr "Уақытты баптау қатесі"
 
-#: ../src/Commands.vala:1419
+#: src/Commands.vala:1423
 msgid "Time adjustments could not be undone on the following photo file."
 msgid_plural ""
 "Time adjustments could not be undone on the following photo files."
 msgstr[0] "Уақытты баптауды келесі файл(дар)ға болдырмау мүмкін емес."
 
-#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
+#: src/Commands.vala:1637 src/Commands.vala:1660
 msgid "Create Tag"
 msgstr "Тегті жасау"
 
-#: ../src/Commands.vala:1691
-#, c-format
-msgid "Move Tag \"%s\""
+#: src/Commands.vala:1695
+#, fuzzy, c-format
+#| msgid "Move Tag \"%s\""
+msgid "Move Tag “%s”"
 msgstr "\"%s\" тегін жылжыту"
 
-#: ../src/Commands.vala:2343
+#: src/Commands.vala:2347
 msgid "Move Photos to Trash"
 msgstr "Фотоларды қоқыс шелегіне тастау"
 
-#: ../src/Commands.vala:2343
+#: src/Commands.vala:2347
 msgid "Restore Photos from Trash"
 msgstr "Фотоларды қоқыс шелегінен қайтару"
 
-#: ../src/Commands.vala:2344
+#: src/Commands.vala:2348
 msgid "Move the photos to the Shotwell trash"
 msgstr "Фотоларды Shotwell қоқыс шелегіне тастау"
 
-#: ../src/Commands.vala:2344
+#: src/Commands.vala:2348
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Фотоларды қайта Shotwell жинағына қалпына келтіру."
 
-#: ../src/Commands.vala:2363
+#: src/Commands.vala:2367
 msgid "Moving Photos to Trash"
 msgstr "Фотолар қоқыс шелегіне тасталуда"
 
-#: ../src/Commands.vala:2363
+#: src/Commands.vala:2367
 msgid "Restoring Photos From Trash"
 msgstr "Фотолар қоқыс шелегінен қайтарылуда"
 
-#: ../src/Commands.vala:2449
+#: src/Commands.vala:2453
 msgid "Flag selected photos"
 msgstr "Таңдалған фотоларға жалауша орнату"
 
-#: ../src/Commands.vala:2450
+#: src/Commands.vala:2454
 msgid "Unflag selected photos"
 msgstr "Таңдалған фотолардан жалаушаны алып тастау"
 
-#: ../src/Commands.vala:2451
+#: src/Commands.vala:2455
 msgid "Flagging selected photos"
 msgstr "Таңдалған фотоларға жалауша орнату"
 
-#: ../src/Commands.vala:2452
+#: src/Commands.vala:2456
 msgid "Unflagging selected photos"
 msgstr "Таңдалған фотолардан жалаушаны алып тастау"
 
-#: ../src/Commands.vala:2459
+#: src/Commands.vala:2463
 msgid "Flag"
 msgstr "Жалауша"
 
-#: ../src/Commands.vala:2459
+#: src/Commands.vala:2463
 msgid "Unflag"
 msgstr "Жалаушаны алу"
 
-#: ../src/DesktopIntegration.vala:121
+#. Send an empty job to the queue to mark the end of the import
+#: src/data_imports/DataImportsPluginHost.vala:65
+#: src/data_imports/DataImportsPluginHost.vala:78
+#, c-format
+msgid "%s Database"
+msgstr "%s дерекқоры"
+
+#: src/data_imports/DataImportsPluginHost.vala:148
+#: src/data_imports/DataImportsPluginHost.vala:294
+#, fuzzy, c-format
+#| msgid "Importing from %s can't continue because an error occurred:"
+msgid "Importing from %s can’t continue because an error occurred:"
+msgstr "%s ішінен импорттау мүмкін емес, өйткені қате орын алды:"
+
+#: src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr ""
+"Басқа қызметтен импорттауды көру үшін, оны жоғарыдағы мәзірден таңдаңыз."
+
+#: src/data_imports/DataImportsUI.vala:10
+msgid ""
+"You do not have any data imports plugins enabled.\n"
+"\n"
+"In order to use the Import From Application functionality, you need to have "
+"at least one data imports plugin enabled. Plugins can be enabled in the "
+"Preferences dialog."
+msgstr ""
+"Сізде іске қосулы мәліметтер импорттау плагиндері жоқ.\n"
+"\n"
+"Қолданбадан импорттау мүмкіндігін қолдану үшін, кем дегенде бір мәліметті "
+"импорттау плагинін іске қосыңыз. Плагиндерді Баптаулар сұхбатында іске "
+"қосуға болады."
+
+#: src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "Дерекқор файлы:"
+
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904
+msgid "_Import"
+msgstr "И_мпорттау"
+
+#: src/data_imports/DataImportsUI.vala:220
+msgid "Import From Application"
+msgstr "Қолданбадан импорттау"
+
+#: src/data_imports/DataImportsUI.vala:221
+msgid "Import media _from:"
+msgstr "Мульт_имедияны қайдан импорттау:"
+
+#: src/data_imports/DataImportsUI.vala:408 src/publishing/PublishingUI.vala:507
+msgid "_Close"
+msgstr "_Жабу"
+
+#: src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "Мәлімет импорты"
+
+#: src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr "%s фотодерекқорын ашу/жасау сәтсіз: қате коды %d"
+
+#: src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"Фотолар дерекқор файлына жазу мүмкін емес:\n"
+" %s"
+
+#: src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"Дерекқор файлына қатынау қатесі:\n"
+" %s\n"
+"\n"
+"Қате: \n"
+"%s"
+
+#: src/db/DatabaseTable.vala:88
+#, c-format
+msgid "Unable to restore photo database %s"
+msgstr "%s фотолар дерекқорын қалпына келтіру мүмкін емес"
+
+#: src/DesktopIntegration.vala:121
 #, c-format
 msgid "Unable to launch Nautilus Send-To: %s"
 msgstr "Nautilus Send-To жөнелту мүмкін емес: %s"
 
-#: ../src/DesktopIntegration.vala:129
+#: src/DesktopIntegration.vala:129
 msgid "Send To"
 msgstr "Қайда жіберу"
 
-#: ../src/DesktopIntegration.vala:174
+#: src/DesktopIntegration.vala:174
 #, c-format
 msgid "Unable to export background to %s: %s"
 msgstr "Фон суретін %s ішіне экспорттау мүмкін емес: %s"
 
-#: ../src/DesktopIntegration.vala:311
+#: src/DesktopIntegration.vala:311
 #, c-format
 msgid "Unable to prepare desktop slideshow: %s"
 msgstr "Жұмыс үстел слайдшоуын дайындау мүмкін емес: %s"
 
-#: ../src/Dialogs.vala:16
-#, c-format
-msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+#: src/Dialogs.vala:16
+#, fuzzy, c-format
+#| msgid "This will remove the tag \"%s\" from one photo.  Continue?"
+#| msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+msgid "This will remove the tag “%s” from one photo. Continue?"
+msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "\"%s\" тегі %d фотодан өшіріледі. Жалғастыру керек пе?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1392
-#: ../src/Resources.vala:158 ../src/Resources.vala:364
-#: ../src/Resources.vala:412 ../src/Resources.vala:677
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1409
+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409
+#: src/Resources.vala:674
 msgid "_Delete"
 msgstr "Ө_шіру"
 
-#: ../src/Dialogs.vala:25
-#, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
+#: src/Dialogs.vala:25
+#, fuzzy, c-format
+#| msgid "This will remove the saved search \"%s\".  Continue?"
+msgid "This will remove the saved search “%s”. Continue?"
 msgstr "Бұл әрекет \"%s\" сақталған іздеуін өшіреді. Жалғастыру керек пе?"
 
-#: ../src/Dialogs.vala:35
+#: src/Dialogs.vala:36
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -1455,11 +3096,11 @@ msgstr[0] ""
 "Өндірушіні ауыстыру әрекеті Shotwell ішінде бұл фотосуреттерге жасалған "
 "барлық өзгерістерді болдырмайды"
 
-#: ../src/Dialogs.vala:39
+#: src/Dialogs.vala:40
 msgid "_Switch Developer"
 msgstr "Өндірушіні ауы_стыру"
 
-#: ../src/Dialogs.vala:58
+#: src/Dialogs.vala:59
 msgid "Export Video"
 msgstr "Видеоны экспорттау"
 
@@ -1468,16 +3109,19 @@ msgstr "Видеоны экспорттау"
 #. if we can't copy an image over for editing in an external tool.
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
-#: ../src/Dialogs.vala:115
-#, c-format
+#: src/Dialogs.vala:112
+#, fuzzy, c-format
+#| msgid ""
+#| "Shotwell couldn't create a file for editing this photo because you do not "
+#| "have permission to write to %s."
 msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
+"Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
 msgstr ""
 "Shotwell бұл фотосуретті түзету үшін керек файлды жасай алмады, өйткені "
 "сізде %s ішіне жазу құқығыңыз жоқ."
 
-#: ../src/Dialogs.vala:124
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -1485,7 +3129,7 @@ msgstr ""
 "Келесі фотоны файл қатесі нәтижесінен экспорттау мүмкін емес.\n"
 "\n"
 
-#: ../src/Dialogs.vala:130
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -1498,59 +3142,59 @@ msgstr ""
 #. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
 #. aren't formats so much as they are operating modes that determine specific formats.
 #. Hereafter we'll refer to these as "special formats."
-#: ../src/Dialogs.vala:147
+#: src/Dialogs.vala:144
 msgid "Unmodified"
 msgstr "Түрлендірілмеген"
 
-#: ../src/Dialogs.vala:148
+#: src/Dialogs.vala:145
 msgid "Current"
 msgstr "Ағымдағы"
 
 #. layout controls
-#: ../src/Dialogs.vala:215
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "Пі_шімі:"
 
-#: ../src/Dialogs.vala:218
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "_Сапасы:"
 
-#: ../src/Dialogs.vala:221
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "_Масштабтау шегі:"
 
-#: ../src/Dialogs.vala:224
+#: src/Dialogs.vala:230
 msgid "_Pixels:"
 msgstr "П_иксель:"
 
-#: ../src/Dialogs.vala:227
-msgid "Export metadata"
-msgstr "Метаақпаратты экспорттау"
+#: src/Dialogs.vala:234
+msgid "Export _metadata:"
+msgstr "_Метаақпаратты экспорттау:"
 
-#: ../src/Dialogs.vala:461
-msgid "Save Details..."
-msgstr "Ақпаратын сақтау..."
+#: src/Dialogs.vala:478
+msgid "Save Details…"
+msgstr "Ақпаратын сақтау…"
 
-#: ../src/Dialogs.vala:462
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "Ақпаратын сақтау"
 
-#: ../src/Dialogs.vala:477
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(және тағы да %d)\n"
 
-#: ../src/Dialogs.vala:530
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "Импорттау нәтижелері"
 
-#: ../src/Dialogs.vala:534
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "%d файлды импорттау талабы жасалды"
 
-#: ../src/Dialogs.vala:537
+#: src/Dialogs.vala:554
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1559,39 +3203,46 @@ msgstr[0] "Осылардан, %d файл сәтті импортталды."
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:549
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Импортталмаған қайталанатын фото/видеолар:"
 
-#: ../src/Dialogs.vala:553
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
 msgstr "бар болып тұрған медиа элементінің көшірмесі"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:564
+#: src/Dialogs.vala:581
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Фото/видеолар камера қатесі салдарынан импортталмады:"
 
-#: ../src/Dialogs.vala:567 ../src/Dialogs.vala:582 ../src/Dialogs.vala:597
-#: ../src/Dialogs.vala:613 ../src/Dialogs.vala:628 ../src/Dialogs.vala:642
+#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
+#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
 msgid "error message:"
 msgstr "қате хабарламасы:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:578
-msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#: src/Dialogs.vala:595
+#, fuzzy
+#| msgid ""
+#| "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr "Файлдар фото не видео ретінде танылмағандықтан импортталмады:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:593
+#: src/Dialogs.vala:610
+#, fuzzy
+#| msgid ""
+#| "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+#| "Understands:"
 msgid ""
-"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
 msgstr ""
 "Фото/видеолар Shotwell түсінетін пішімде емес болғандықтан импортталмады:"
@@ -1599,18 +3250,25 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:608
+#: src/Dialogs.vala:625
+#, fuzzy
+#| msgid ""
+#| "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+#| "Library:"
 msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr ""
 "Фото/видеолар Shotwell оларды өз жинағына көшіре алмаған себебінен "
 "импортталмады:"
 
-#: ../src/Dialogs.vala:612
-#, c-format
+#: src/Dialogs.vala:629
+#, fuzzy, c-format
+#| msgid ""
+#| "couldn't copy %s\n"
+#| "\tto %s"
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 msgstr ""
 "%s көшіру мүмкін емес\n"
@@ -1619,61 +3277,61 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:624
+#: src/Dialogs.vala:641
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Фото/видеолар зақымдалған болғандықтан импортталмады:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:639
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Фото/видеолар келесі себептермен импортталмады:"
 
-#: ../src/Dialogs.vala:659
+#: src/Dialogs.vala:676
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "%d қайталанатын фото импортталмаған:\n"
 
-#: ../src/Dialogs.vala:662
+#: src/Dialogs.vala:679
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "%d қайталанатын видео импортталмады:\n"
 
-#: ../src/Dialogs.vala:665
+#: src/Dialogs.vala:682
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "%d қайталанатын фото/видео импортталмады:\n"
 
-#: ../src/Dialogs.vala:679
+#: src/Dialogs.vala:696
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
 msgstr[0] "%d фото файл не құрылғылық қате салдарынан импортталмаған:\n"
 
-#: ../src/Dialogs.vala:682
+#: src/Dialogs.vala:699
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
 msgstr[0] "%d видео файл не құрылғылық қате салдарынан импортталмаған:\n"
 
-#: ../src/Dialogs.vala:685
+#: src/Dialogs.vala:702
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
 "%d photos/videos failed to import due to a file or hardware error:\n"
 msgstr[0] "%d фото/видео файл не құрылғылық қате салдарынан импортталмады:\n"
 
-#: ../src/Dialogs.vala:688
+#: src/Dialogs.vala:705
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
 msgstr[0] "%d файл файлдық не құрылғылық қате салдарынан импортталмады:\n"
 
-#: ../src/Dialogs.vala:702
+#: src/Dialogs.vala:719
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1683,7 +3341,7 @@ msgid_plural ""
 msgstr[0] ""
 "%d фотосуретті импорттау қате, өйткені фото жинақ бумасына жазу құқығы жоқ:\n"
 
-#: ../src/Dialogs.vala:705
+#: src/Dialogs.vala:722
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1693,7 +3351,7 @@ msgid_plural ""
 msgstr[0] ""
 "%d видеоны импорттау қате, өйткені фото жинақ бумасына жазу құқығы жоқ:\n"
 
-#: ../src/Dialogs.vala:708
+#: src/Dialogs.vala:725
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1705,7 +3363,7 @@ msgstr[0] ""
 "%d фото/видеоны импорттау қате, өйткені фото жинақ бумасына жазу құқығы "
 "жоқ:\n"
 
-#: ../src/Dialogs.vala:711
+#: src/Dialogs.vala:728
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1714,49 +3372,49 @@ msgid_plural ""
 "writable:\n"
 msgstr[0] "%d файл фото жинақ бумасына жазуға болмаған соң импортталмады:\n"
 
-#: ../src/Dialogs.vala:725
+#: src/Dialogs.vala:742
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] "%d фото камера қате салдарынан импортталмаған:\n"
 
-#: ../src/Dialogs.vala:728
+#: src/Dialogs.vala:745
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
 msgstr[0] "%d видео камера қате салдарынан импортталмады:\n"
 
-#: ../src/Dialogs.vala:731
+#: src/Dialogs.vala:748
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
 msgstr[0] "%d фото/видео камера қате салдарынан импортталмады:\n"
 
-#: ../src/Dialogs.vala:734
+#: src/Dialogs.vala:751
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
 msgstr[0] "%d файл камера қатесі салдарынан импортталмады:\n"
 
-#: ../src/Dialogs.vala:748
+#: src/Dialogs.vala:765
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "%d фото зақымдалған болғандықтан импортталмады:\n"
 
-#: ../src/Dialogs.vala:751
+#: src/Dialogs.vala:768
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "%d видео зақымдалған болғандықтан импортталмады:\n"
 
-#: ../src/Dialogs.vala:754
+#: src/Dialogs.vala:771
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
 msgstr[0] "%d фото/видео зақымдалған болғандықтан импортталмады:\n"
 
-#: ../src/Dialogs.vala:757
+#: src/Dialogs.vala:774
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -1766,7 +3424,7 @@ msgstr[0] "%d файл зақымдалған болғандықтан импо�
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: ../src/Dialogs.vala:774
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1774,49 +3432,49 @@ msgstr[0] "%d қолдауы жоқ фотодан аттап өттік:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: ../src/Dialogs.vala:789
+#: src/Dialogs.vala:806
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "%d сурет емес файлдан аттап өттік.\n"
 
-#: ../src/Dialogs.vala:800
+#: src/Dialogs.vala:817
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "%d фото пайдаланушы бас тарқан соң импортталмады:\n"
 
-#: ../src/Dialogs.vala:803
+#: src/Dialogs.vala:820
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "%d видео пайдаланушы бас тартқан соң импортталмады:\n"
 
-#: ../src/Dialogs.vala:806
+#: src/Dialogs.vala:823
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] "%d фото/видео пайдаланушы бас тартқан соң импортталмады:\n"
 
-#: ../src/Dialogs.vala:809
+#: src/Dialogs.vala:826
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "%d файл пайдаланушы бас тартқан соң аттап өтілді:\n"
 
-#: ../src/Dialogs.vala:823
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "%d фото сәтті импортталды.\n"
 
-#: ../src/Dialogs.vala:826
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "%d видео сәтті импортталды.\n"
 
-#: ../src/Dialogs.vala:829
+#: src/Dialogs.vala:846
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1824,175 +3482,178 @@ msgstr[0] "%d фото/видео сәтті импортталды.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: ../src/Dialogs.vala:845
+#: src/Dialogs.vala:862
 msgid "No photos or videos imported.\n"
 msgstr "Ешбір фото не видео импортталмады.\n"
 
-#: ../src/Dialogs.vala:852 ../src/Dialogs.vala:871
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "Импорт аяқталды"
 
-#: ../src/Dialogs.vala:1157
+#: src/Dialogs.vala:1174
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d секунд"
 
-#: ../src/Dialogs.vala:1160
+#: src/Dialogs.vala:1177
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минут"
 
-#: ../src/Dialogs.vala:1164
+#: src/Dialogs.vala:1181
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d сағат"
 
-#: ../src/Dialogs.vala:1167
+#: src/Dialogs.vala:1184
 msgid "1 day"
 msgstr "%d күн"
 
-#: ../src/Dialogs.vala:1321 ../src/Resources.vala:231
+#: src/Dialogs.vala:1338 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Оқиға атын ауыстыру"
 
-#: ../src/Dialogs.vala:1321
+#: src/Dialogs.vala:1338
 msgid "Name:"
 msgstr "Аты:"
 
 #. Dialog title
-#. Button label
-#: ../src/Dialogs.vala:1332 ../src/Resources.vala:303
+#: src/Dialogs.vala:1349
+#, fuzzy
+#| msgid "Edit Title"
+msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Атауды түзету"
 
-#: ../src/Dialogs.vala:1333 ../src/Properties.vala:340
+#: src/Dialogs.vala:1350 src/Properties.vala:340
 msgid "Title:"
 msgstr "Атауы:"
 
 #. Dialog title
-#: ../src/Dialogs.vala:1349 ../src/Resources.vala:310
+#: src/Dialogs.vala:1366 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Оқиға түсіндірмесін түзету"
 
-#: ../src/Dialogs.vala:1350
+#: src/Dialogs.vala:1367
 msgid "Edit Photo/Video Comment"
 msgstr "Фото/видео түсіндірмесін түзету"
 
-#: ../src/Dialogs.vala:1351 ../src/Properties.vala:628
+#: src/Dialogs.vala:1368 src/Properties.vala:628
 msgid "Comment:"
 msgstr "Түсіндірме:"
 
-#: ../src/Dialogs.vala:1367
+#: src/Dialogs.vala:1384
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Файл(дар)ды өшіру және қ_оқыс шелегіне тастау"
 
-#: ../src/Dialogs.vala:1371
+#: src/Dialogs.vala:1388
 msgid "_Remove From Library"
 msgstr "Жинақтан ө_шіру"
 
-#: ../src/Dialogs.vala:1391 ../src/camera/ImportPage.vala:1741
-msgid "_Keep"
-msgstr "Ұ_стау"
-
-#: ../src/Dialogs.vala:1414
+#: src/Dialogs.vala:1431
 msgid "Revert External Edit?"
 msgstr "Сыртқы түзетуді болдырмау керек пе?"
 
-#: ../src/Dialogs.vala:1414
+#: src/Dialogs.vala:1431
 msgid "Revert External Edits?"
 msgstr "Сыртқы түзетулерді болдырмау керек пе?"
 
-#: ../src/Dialogs.vala:1416
-#, c-format
-msgid "This will destroy all changes made to the external file.  Continue?"
+#: src/Dialogs.vala:1433
+#, fuzzy, c-format
+#| msgid "This will destroy all changes made to the external file.  Continue?"
+#| msgid_plural ""
+#| "This will destroy all changes made to %d external files.  Continue?"
+msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
-"This will destroy all changes made to %d external files.  Continue?"
+"This will destroy all changes made to %d external files. Continue?"
 msgstr[0] "%d сыртқы файлға жасалған өзгерістер жоғалады. Жалғастыру керек пе?"
 
-#: ../src/Dialogs.vala:1420
+#: src/Dialogs.vala:1437
 msgid "Re_vert External Edit"
 msgstr "Сыр_тқы түзетуді болдырмау"
 
-#: ../src/Dialogs.vala:1420
+#: src/Dialogs.vala:1437
 msgid "Re_vert External Edits"
 msgstr "Сыр_тқы түзетулерді болдырмау керек пе?"
 
-#: ../src/Dialogs.vala:1441
-#, c-format
-msgid "This will remove the photo from the library.  Continue?"
-msgid_plural "This will remove %d photos from the library.  Continue?"
+#: src/Dialogs.vala:1458
+#, fuzzy, c-format
+#| msgid "This will remove the photo from the library.  Continue?"
+#| msgid_plural "This will remove %d photos from the library.  Continue?"
+msgid "This will remove the photo from the library. Continue?"
+msgid_plural "This will remove %d photos from the library. Continue?"
 msgstr[0] "Жинақтан %d фото өшіріледі. Жалғастыру керек пе?"
 
-#: ../src/Dialogs.vala:1448 ../src/Resources.vala:173
+#: src/Dialogs.vala:1465 src/Resources.vala:173
 msgid "_Remove"
 msgstr "Өші_ру"
 
-#: ../src/Dialogs.vala:1449
+#: src/Dialogs.vala:1466
 msgid "Remove Photo From Library"
 msgstr "Фотоны жинақтан өшіру"
 
-#: ../src/Dialogs.vala:1449
+#: src/Dialogs.vala:1466
 msgid "Remove Photos From Library"
 msgstr "Фотоларды жинақтан өшіру"
 
-#: ../src/Dialogs.vala:1542
+#: src/Dialogs.vala:1559
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1696
+#: src/Dialogs.vala:1713
 msgid "AM"
 msgstr "AM"
 
-#: ../src/Dialogs.vala:1697
+#: src/Dialogs.vala:1714
 msgid "PM"
 msgstr "PM"
 
-#: ../src/Dialogs.vala:1698
+#: src/Dialogs.vala:1715
 msgid "24 Hr"
 msgstr "24 сағ"
 
-#: ../src/Dialogs.vala:1713
+#: src/Dialogs.vala:1730
 msgid "_Shift photos/videos by the same amount"
 msgstr "Бар_лық фото/видеоларды бірдей шамаға жылжыту"
 
-#: ../src/Dialogs.vala:1718
+#: src/Dialogs.vala:1735
 msgid "Set _all photos/videos to this time"
 msgstr "Б_арлық фото/видеоларды бұл уақытқа орнату"
 
-#: ../src/Dialogs.vala:1725
+#: src/Dialogs.vala:1742
 msgid "_Modify original photo file"
 msgstr "Түпнұсқа фотосурет файлын тү_зету"
 
-#: ../src/Dialogs.vala:1725
+#: src/Dialogs.vala:1742
 msgid "_Modify original photo files"
 msgstr "Түпнұсқа фотосурет файлдарын тү_зету"
 
-#: ../src/Dialogs.vala:1728
+#: src/Dialogs.vala:1745
 msgid "_Modify original file"
 msgstr "_Бастапқы файлды түзету"
 
-#: ../src/Dialogs.vala:1728
+#: src/Dialogs.vala:1745
 msgid "_Modify original files"
 msgstr "Баста_пқы файлдарды түзету"
 
-#: ../src/Dialogs.vala:1814
+#: src/Dialogs.vala:1831
 msgid "Original: "
 msgstr "Бастапқы:"
 
-#: ../src/Dialogs.vala:1815
+#: src/Dialogs.vala:1832
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%m/%d/%Y, %H:%M:%S"
 
-#: ../src/Dialogs.vala:1816
+#: src/Dialogs.vala:1833
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%m/%d/%Y, %I:%M:%S %p"
 
-#: ../src/Dialogs.vala:1905
+#: src/Dialogs.vala:1922
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2001,7 +3662,7 @@ msgstr ""
 "Ұсталым уақыты алға келесі мәнге жылжытылады:\n"
 "%d %s, %d %s, %d %s, және %d %s."
 
-#: ../src/Dialogs.vala:1906
+#: src/Dialogs.vala:1923
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2010,27 +3671,27 @@ msgstr ""
 "Ұсталым уақыты артқа келесі мәнге жылжытылады:\n"
 "%d %s, %d %s, %d %s, және %d %s."
 
-#: ../src/Dialogs.vala:1908
+#: src/Dialogs.vala:1925
 msgid "day"
 msgid_plural "days"
 msgstr[0] "күн"
 
-#: ../src/Dialogs.vala:1909
+#: src/Dialogs.vala:1926
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "сағат"
 
-#: ../src/Dialogs.vala:1910
+#: src/Dialogs.vala:1927
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
 
-#: ../src/Dialogs.vala:1911
+#: src/Dialogs.vala:1928
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "секунд"
 
-#: ../src/Dialogs.vala:1955
+#: src/Dialogs.vala:1972
 #, c-format
 msgid ""
 "\n"
@@ -2045,91 +3706,93 @@ msgstr[0] ""
 "\n"
 "Және %d басқа."
 
-#: ../src/Dialogs.vala:1977 ../src/Dialogs.vala:2004
+#: src/Dialogs.vala:1996 src/Dialogs.vala:2023
 msgid "Tags (separated by commas):"
 msgstr "Тегтер (үтірмен ажыратылған):"
 
-#: ../src/Dialogs.vala:2084
+#: src/Dialogs.vala:2103
 msgid "Welcome!"
 msgstr "Қош келдіңіз!"
 
-#: ../src/Dialogs.vala:2091
+#: src/Dialogs.vala:2110
 msgid "Welcome to Shotwell!"
 msgstr "Shotwell қолданбасына қош келдіңіз!"
 
-#: ../src/Dialogs.vala:2095
+#: src/Dialogs.vala:2114
 msgid "To get started, import photos in any of these ways:"
 msgstr "Бастау үшін, фотоларды келесі жолдармен импорттай аласыз:"
 
-#: ../src/Dialogs.vala:2114
+#: src/Dialogs.vala:2133
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "<span weight=\"bold\">Файл %s Бумадан импорттау</span> таңдаңыз"
 
-#: ../src/Dialogs.vala:2115
+#: src/Dialogs.vala:2134
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Фотоларды Shotwell терезесіне тартып апарыңыз"
 
-#: ../src/Dialogs.vala:2116
+#: src/Dialogs.vala:2135
 msgid "Connect a camera to your computer and import"
 msgstr "Компьютеріңізге камераны жалғап, ипорттаңыз"
 
-#: ../src/Dialogs.vala:2126
+#: src/Dialogs.vala:2145
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "Фотоларды сіздің %s _бумаңыздан импорттау"
 
-#: ../src/Dialogs.vala:2133
+#: src/Dialogs.vala:2152
 msgid "You can also import photos in any of these ways:"
 msgstr "Оған қоса, фотоларды осы жолдармен импорттай аласыз:"
 
-#: ../src/Dialogs.vala:2143
-msgid "_Don't show this message again"
+#: src/Dialogs.vala:2162
+#, fuzzy
+#| msgid "_Don't show this message again"
+msgid "_Don’t show this message again"
 msgstr "Бұ_л хабарламаны келесіде көрсетпеу"
 
-#: ../src/Dialogs.vala:2178
+#: src/Dialogs.vala:2197
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Фотоларды сіздің %s жинағыңыздан импорттау"
 
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
-#. link manually ourselves, due to a limitation ghelp: URIs.
-#: ../src/Dialogs.vala:2325 ../src/Dialogs.vala:2329
+#. link manually ourselves, due to a limitation of help: URIs.
+#: src/Dialogs.vala:2344 src/Dialogs.vala:2348
 msgid "(Help)"
 msgstr "(Көмек)"
 
-#: ../src/Dialogs.vala:2338
+#: src/Dialogs.vala:2357
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Жыл%sАй%sКүн"
 
-#: ../src/Dialogs.vala:2340
+#: src/Dialogs.vala:2359
 #, c-format
 msgid "Year%sMonth"
 msgstr "Жыл%sАй"
 
-#: ../src/Dialogs.vala:2342
+#: src/Dialogs.vala:2361
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Жыл%sАй-Күн"
 
-#: ../src/Dialogs.vala:2344
+#: src/Dialogs.vala:2363
 msgid "Year-Month-Day"
 msgstr "Жыл-Ай-Күн"
 
-#: ../src/Dialogs.vala:2345 ../src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2364 src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Таңдауыңызша"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2582
+#: src/Dialogs.vala:2601
 msgid "Invalid pattern"
 msgstr "Шаблон қате"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: ../src/Dialogs.vala:2684
+#: src/Dialogs.vala:2703
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2137,40 +3800,50 @@ msgstr ""
 "Shotwell фотоларды жинағыңызға көшіре алады, немесе көшірмесіз-ақ импорттай "
 "алады."
 
-#: ../src/Dialogs.vala:2689
+#: src/Dialogs.vala:2708
 msgid "Co_py Photos"
 msgstr "Фо_толарды көшіру"
 
-#: ../src/Dialogs.vala:2690
+#: src/Dialogs.vala:2709
 msgid "_Import in Place"
 msgstr "Кө_шірусіз импорттау"
 
-#: ../src/Dialogs.vala:2691
+#: src/Dialogs.vala:2710
 msgid "Import to Library"
 msgstr "Жинақ ішіне импорттау"
 
-#: ../src/Dialogs.vala:2701 ../src/PhotoPage.vala:3087
+#: src/Dialogs.vala:2720 src/PhotoPage.vala:3085
 msgid "Remove From Library"
 msgstr "Жинақтан өшіру"
 
-#: ../src/Dialogs.vala:2702 ../src/PhotoPage.vala:3087
+#: src/Dialogs.vala:2721 src/PhotoPage.vala:3085
 msgid "Removing Photo From Library"
 msgstr "Фото(лар) жинақтан өшіру"
 
-#: ../src/Dialogs.vala:2702
+#: src/Dialogs.vala:2721
 msgid "Removing Photos From Library"
 msgstr "Фотоларды жинақтан өшіру"
 
-#: ../src/Dialogs.vala:2716
-#, c-format
+#: src/Dialogs.vala:2735
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the photo/video from your Shotwell library.  Would you "
+#| "also like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d photos/videos from your Shotwell library.  Would you "
+#| "also like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the photo/video from your Shotwell library.  Would you also "
+"This will remove the photo/video from your Shotwell library. Would you also "
 "like to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos/videos from your Shotwell library.  Would you "
-"also like to move the files to your desktop trash?\n"
+"This will remove %d photos/videos from your Shotwell library. Would you also "
+"like to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
@@ -2179,15 +3852,25 @@ msgstr[0] ""
 "\n"
 "Бұл әрекетті болдырмау мүмкін емес болады."
 
-#: ../src/Dialogs.vala:2720
-#, c-format
+#: src/Dialogs.vala:2739
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the video from your Shotwell library.  Would you also "
+#| "like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d videos from your Shotwell library.  Would you also "
+#| "like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the video from your Shotwell library.  Would you also like "
+"This will remove the video from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d videos from your Shotwell library.  Would you also like "
+"This will remove %d videos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
@@ -2197,15 +3880,25 @@ msgstr[0] ""
 "\n"
 "Бұл әрекетті болдырмау мүмкін емес болады."
 
-#: ../src/Dialogs.vala:2724
-#, c-format
+#: src/Dialogs.vala:2743
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the photo from your Shotwell library.  Would you also "
+#| "like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d photos from your Shotwell library.  Would you also "
+#| "like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the photo from your Shotwell library.  Would you also like "
+"This will remove the photo from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos from your Shotwell library.  Would you also like "
+"This will remove %d photos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
@@ -2215,195 +3908,958 @@ msgstr[0] ""
 "\n"
 "Бұл әрекетті болдырмау мүмкін емес болады."
 
-#: ../src/Dialogs.vala:2756
-#, c-format
+#: src/Dialogs.vala:2775
+#, fuzzy, c-format
+#| msgid ""
+#| "The photo or video cannot be moved to your desktop trash.  Delete this "
+#| "file?"
+#| msgid_plural ""
+#| "%d photos/videos cannot be moved to your desktop trash.  Delete these "
+#| "files?"
 msgid ""
-"The photo or video cannot be moved to your desktop trash.  Delete this file?"
+"The photo or video cannot be moved to your desktop trash. Delete this file?"
 msgid_plural ""
-"%d photos/videos cannot be moved to your desktop trash.  Delete these files?"
+"%d photos/videos cannot be moved to your desktop trash. Delete these files?"
 msgstr[0] ""
 "%d фото/видеоны қоқыс шелегіңізге тастауға мүмкін емес. Ол файл(дар)ды өшіру "
 "керек пе?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2773
+#: src/Dialogs.vala:2792
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "%d фото/видеоны өшіру мүмкін емес."
 
-#: ../src/Dimensions.vala:23
+#: src/Dimensions.vala:23
 msgid "Width"
 msgstr "Ені"
 
-#: ../src/Dimensions.vala:26
+#: src/Dimensions.vala:26
 msgid "Height"
 msgstr "Биіктігі"
 
+#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
+msgid "_File"
+msgstr "_Файл"
+
+#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
+#: src/Resources.vala:175
+msgid "_Save"
+msgstr "_Сақтау"
+
+#: src/direct/DirectPhotoPage.vala:52
+msgid "Save photo"
+msgstr "Фотоны сақтау"
+
+#: src/direct/DirectPhotoPage.vala:57
+msgid "Save _As…"
+msgstr "Қала_йша сақтау…"
+
+#: src/direct/DirectPhotoPage.vala:58
+msgid "Save photo with a different name"
+msgstr "Фотоны басқа атауымен сақтау"
+
+#: src/direct/DirectPhotoPage.vala:69
+msgid "Print the photo to a printer connected to your computer"
+msgstr "Фотоны компьютеріңізге жалғанған принтерден басып шығару"
+
+#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
+#: src/Resources.vala:159
+msgid "_Edit"
+msgstr "Тү_зету"
+
+#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
+msgid "_Photo"
+msgstr "_Фото"
+
+#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416
+msgid "T_ools"
+msgstr "Са_ймандар"
+
+#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421
+msgid "_Previous Photo"
+msgstr "Ал_дыңғы фото"
+
+#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422
+msgid "Previous Photo"
+msgstr "Алдыңғы фото"
+
+#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427
+msgid "_Next Photo"
+msgstr "К_елесі фото"
+
+#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428
+msgid "Next Photo"
+msgstr "Келесі фото"
+
+#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
+#: src/PhotoPage.vala:2412
+msgid "_View"
+msgstr "_Түрі"
+
+#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
+#: src/Resources.vala:162
+msgid "_Help"
+msgstr "_Көмек"
+
+#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
+#: src/PhotoPage.vala:2591 src/Resources.vala:183
+msgid "Zoom _In"
+msgstr "Үлке_йту"
+
+#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592
+msgid "Increase the magnification of the photo"
+msgstr "Фотоны үлкейту"
+
+#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
+#: src/PhotoPage.vala:2597 src/Resources.vala:184
+msgid "Zoom _Out"
+msgstr "Кі_шірейту"
+
+#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598
+msgid "Decrease the magnification of the photo"
+msgstr "Фотоны кішірейту"
+
+#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603
+msgid "Fit to _Page"
+msgstr "Параққа сы_йдыру"
+
+#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604
+msgid "Zoom the photo to fit on the screen"
+msgstr "Фотоны экранды толығымен алатындай етіп келтіру"
+
+#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610
+#, no-c-format
+msgid "Zoom _100%"
+msgstr "Үлкейту - _100%"
+
+#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612
+#, no-c-format
+msgid "Zoom the photo to 100% magnification"
+msgstr "Фотосуретті өлшемнің 100 дейін өзгерту"
+
+#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618
+#, no-c-format
+msgid "Zoom _200%"
+msgstr "Үлкейту - _200%"
+
+#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620
+#, no-c-format
+msgid "Zoom the photo to 200% magnification"
+msgstr "Фотосуретті өлшемнің 200 дейін өзгерту"
+
+#: src/direct/DirectPhotoPage.vala:227
+#, c-format
+msgid "%s does not exist."
+msgstr "%s жоқ болып тұр."
+
+#: src/direct/DirectPhotoPage.vala:229
+#, c-format
+msgid "%s is not a file."
+msgstr "%s файл емес."
+
+#: src/direct/DirectPhotoPage.vala:231
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"%s келесі үшін файл пішімін қолдамайды:\n"
+"%s."
+
+#: src/direct/DirectPhotoPage.vala:248
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to print photo:\n"
+#| "\n"
+#| "%s"
+msgid "Unable open photo %s. Sorry."
+msgstr ""
+"Фотоны баспаға шығару мүмкін емес:\n"
+"\n"
+"%s"
+
+#: src/direct/DirectPhotoPage.vala:432
+msgid "_Save a Copy"
+msgstr "Кө_шірмесін сақтау"
+
+#: src/direct/DirectPhotoPage.vala:435
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "%s үшін өзгерістерді жоғалту керек пе?"
+
+#: src/direct/DirectPhotoPage.vala:436
+msgid "Close _without Saving"
+msgstr "Сақтамай-ақ _жабу"
+
+#: src/direct/DirectPhotoPage.vala:469
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "%s ішіне сақтау қатесі: %s"
+
+#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518
+msgid "Save As"
+msgstr "Қалайша сақтау"
+
 #. verify this is a directory
-#: ../src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:889
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "%s бақылау мүмкін емес: Бума емес (%s)"
 
+#: src/editing_tools/EditingTools.vala:665
+msgid "Return to current photo dimensions"
+msgstr "Фотоның бастапқы өлшемдеріне қайту"
+
+#: src/editing_tools/EditingTools.vala:668
+msgid "Set the crop for this photo"
+msgstr "Бұл фотоны қиып жіберу"
+
+#: src/editing_tools/EditingTools.vala:680
+msgid "Pivot the crop rectangle between portrait and landscape orientations"
+msgstr "Қиып жіберу аймағын тік не жатық қояды"
+
+#: src/editing_tools/EditingTools.vala:753
+msgid "Unconstrained"
+msgstr "Еркін"
+
+#: src/editing_tools/EditingTools.vala:754
+msgid "Square"
+msgstr "Шаршы"
+
+#: src/editing_tools/EditingTools.vala:755
+msgid "Screen"
+msgstr "Экран"
+
+#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:760
+#: src/editing_tools/EditingTools.vala:770
+#: src/editing_tools/EditingTools.vala:780
+msgid "-"
+msgstr "-"
+
+#: src/editing_tools/EditingTools.vala:758
+#| msgid "SD Video (4 : 3)"
+msgid "SD Video (4 ∶ 3)"
+msgstr "SD видео (4 ∶ 3)"
+
+#: src/editing_tools/EditingTools.vala:759
+msgid "HD Video (16 ∶ 9)"
+msgstr "HD видео (16 ∶ 9)"
+
+#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
+#, fuzzy
+#| msgid "Wallet (2 x 3 in.)"
+msgid "Wallet (2 × 3 in.)"
+msgstr "Wallet (2 × 3 дюйм)"
+
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
+#, fuzzy
+#| msgid "Notecard (3 x 5 in.)"
+msgid "Notecard (3 × 5 in.)"
+msgstr "Notecard (3 × 5 дюйм)"
+
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
+#| msgid "4 x 6 in."
+msgid "4 × 6 in."
+msgstr "4 × 6 дюйм"
+
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
+#| msgid "5 x 7 in."
+msgid "5 × 7 in."
+msgstr "5 × 7 дюйм"
+
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
+#| msgid "8 x 10 in."
+msgid "8 × 10 in."
+msgstr "8 × 10 дюйм"
+
+#: src/editing_tools/EditingTools.vala:766
+#, fuzzy
+#| msgid "Letter (8.5 x 11 in.)"
+msgid "Letter (8.5 × 11 in.)"
+msgstr "Letter (8.5 × 11 дюйм)"
+
+#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
+#| msgid "11 x 14 in."
+msgid "11 × 14 in."
+msgstr "11 × 14 дюйм"
+
+#: src/editing_tools/EditingTools.vala:768
+#, fuzzy
+#| msgid "Tabloid (11 x 17 in.)"
+msgid "Tabloid (11 × 17 in.)"
+msgstr "Таблоид (11 x 17 дюйм)"
+
+#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
+#| msgid "16 x 20 in."
+msgid "16 × 20 in."
+msgstr "16 × 20 дюйм"
+
+#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
+#, fuzzy
+#| msgid "Metric Wallet (9 x 13 cm)"
+msgid "Metric Wallet (9 × 13 cm)"
+msgstr "Metric Wallet (9 x 13 см)"
+
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
+#, fuzzy
+#| msgid "Postcard (10 x 15 cm)"
+msgid "Postcard (10 × 15 cm)"
+msgstr "Ашық хат (10 x 15 см)"
+
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
+#| msgid "13 x 18 cm"
+msgid "13 × 18 cm"
+msgstr "13 × 18 см"
+
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
+#| msgid "18 x 24 cm"
+msgid "18 × 24 cm"
+msgstr "18 × 24 см"
+
+#: src/editing_tools/EditingTools.vala:775
+#| msgid "A4 (210 x 297 mm)"
+msgid "A4 (210 × 297 mm)"
+msgstr "A4 (210 × 297 мм)"
+
+#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
+#| msgid "20 x 30 cm"
+msgid "20 × 30 cm"
+msgstr "20 × 30 см"
+
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
+#| msgid "24 x 40 cm"
+msgid "24 × 40 cm"
+msgstr "24 × 40 см"
+
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
+#| msgid "30 x 40 cm"
+msgid "30 × 40 cm"
+msgstr "30 × 40 см"
+
+#: src/editing_tools/EditingTools.vala:779
+#| msgid "A3 (297 x 420 mm)"
+msgid "A3 (297 × 420 mm)"
+msgstr "A3 (297 × 420 мм)"
+
+#: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395
+msgid "Size:"
+msgstr "Өлшемі:"
+
+#: src/editing_tools/EditingTools.vala:1887
+msgid "Close the red-eye tool"
+msgstr "Қызыл көздер сайманын жабу"
+
+#: src/editing_tools/EditingTools.vala:1890
+msgid "Remove any red-eye effects in the selected region"
+msgstr "Таңдалған аймақта \"қызыл көздер\" эффектісін өшіру"
+
+#: src/editing_tools/EditingTools.vala:2229
+#: src/editing_tools/StraightenTool.vala:102
+msgid "_Reset"
+msgstr "_Тастау"
+
+#. fit both on the top line, emit and move on
+#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:436
+#: src/Properties.vala:440 src/Properties.vala:447
+msgid "Exposure:"
+msgstr "Экспозиция:"
+
+#: src/editing_tools/EditingTools.vala:2251
+msgid "Contrast:"
+msgstr "Контраст:"
+
+#: src/editing_tools/EditingTools.vala:2259
+msgid "Saturation:"
+msgstr "Қаңықтылығы:"
+
+#: src/editing_tools/EditingTools.vala:2267
+msgid "Tint:"
+msgstr "Реңі:"
+
+#: src/editing_tools/EditingTools.vala:2276
+msgid "Temperature:"
+msgstr "Температура:"
+
+#: src/editing_tools/EditingTools.vala:2284
+msgid "Shadows:"
+msgstr "Көлеңкелер:"
+
+#: src/editing_tools/EditingTools.vala:2292
+msgid "Highlights:"
+msgstr "Ерекшелеу:"
+
+#: src/editing_tools/EditingTools.vala:2346
+msgid "Reset Colors"
+msgstr "Түстерді тастау"
+
+#: src/editing_tools/EditingTools.vala:2346
+msgid "Reset all color adjustments to original"
+msgstr "Барлық түстерді келтірудерді бастапқы мәндеріне тастау"
+
+#: src/editing_tools/EditingTools.vala:2705
+msgid "Temperature"
+msgstr "Көлеңкелер"
+
+#: src/editing_tools/EditingTools.vala:2717
+msgid "Tint"
+msgstr "Реңі"
+
+#: src/editing_tools/EditingTools.vala:2729
+msgid "Contrast"
+msgstr "Контраст"
+
+#: src/editing_tools/EditingTools.vala:2743
+msgid "Saturation"
+msgstr "Қаңықтылығы"
+
+#: src/editing_tools/EditingTools.vala:2756
+msgid "Exposure"
+msgstr "Экспозиция"
+
+#: src/editing_tools/EditingTools.vala:2769
+msgid "Shadows"
+msgstr "Көлеңкелер"
+
+#: src/editing_tools/EditingTools.vala:2782
+msgid "Highlights"
+msgstr "Ерекшелеу"
+
+#: src/editing_tools/EditingTools.vala:2792
+msgid "Contrast Expansion"
+msgstr "Контраст кеңейтілуі"
+
+#: src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "Бұрыш:"
+
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+msgid "_Straighten"
+msgstr "Тура_лау"
+
+#: src/events/Branch.vala:25
+msgid "Events"
+msgstr "Оқиғалар"
+
+#: src/events/EventDirectoryItem.vala:83
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] "%d фото/видео"
+
+#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:355
+#, c-format
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "%d видео"
+
+#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:353
+#, c-format
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "%d фото"
+
+#: src/events/EventPage.vala:129
+msgid "No Event"
+msgstr "Оқиға жоқ"
+
+#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
+msgid "_Comments"
+msgstr "_Пікірлер"
+
+#: src/events/EventsDirectoryPage.vala:131
+msgid "Display the comment of each event"
+msgstr "Әр оқиғаның түсіндірмесін көрсету"
+
+#: src/events/EventsDirectoryPage.vala:155
+msgid "No events"
+msgstr "Оқиғалар жоқ"
+
+#: src/events/EventsDirectoryPage.vala:159
+msgid "No events found"
+msgstr "Ешбір оқиға табылмады"
+
+#: src/events/EventsDirectoryPage.vala:230
+msgid "All Events"
+msgstr "Барлық оқиғалар"
+
+#: src/events/EventsDirectoryPage.vala:244
+msgid "Undated"
+msgstr "Күні жоқ"
+
+#: src/events/EventsDirectoryPage.vala:245
+msgid "%Y"
+msgstr "%Y"
+
+#: src/events/EventsDirectoryPage.vala:246
+msgid "%B"
+msgstr "%B"
+
 #. if no name, pretty up the start time
-#: ../src/Event.vala:751
+#: src/Event.vala:753
 #, c-format
 msgid "Event %s"
 msgstr "Оқиға %s"
 
-#: ../src/Exporter.vala:232
+#: src/Exporter.vala:232
 #, c-format
 msgid "Unable to generate a temporary file for %s: %s"
 msgstr "%s үшін уақытша файлды жасау мүмкін емес: %s"
 
-#: ../src/Exporter.vala:299
+#: src/Exporter.vala:299
 msgid "Exporting"
 msgstr "Экспорттау"
 
-#: ../src/Exporter.vala:317
+#: src/Exporter.vala:317
 #, c-format
-msgid "File %s already exists.  Replace?"
+msgid "File %s already exists. Replace?"
 msgstr "%s файлы бар болып тұр. Оны алмастыру керек пе?"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Skip"
 msgstr "А_ттап кету"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Replace"
 msgstr "А_лмастыру"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Replace _All"
 msgstr "Барл_ығын алмастыру"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Export"
 msgstr "Экспорт"
 
-#: ../src/MediaMonitor.vala:400
+#: src/folders/Branch.vala:141
+msgid "Folders"
+msgstr "Бумалар"
+
+#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1191
+msgid "Library"
+msgstr "Жинақ"
+
+#: src/library/Branch.vala:97 src/SearchFilter.vala:608
+#: src/SearchFilter.vala:609
+msgid "Photos"
+msgstr "Фотолар"
+
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602
+#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188
+msgid "Flagged"
+msgstr "Жалауша бар"
+
+#: src/library/ImportQueuePage.vala:8
+msgid "Importing…"
+msgstr "Импорттау…"
+
+#: src/library/ImportQueuePage.vala:67
+msgid "_Stop Import"
+msgstr "_Импортты тоқтату"
+
+#: src/library/ImportQueuePage.vala:68
+msgid "Stop importing photos"
+msgstr "Фотолар импортын тоқтату"
+
+#: src/library/ImportQueuePage.vala:124
+#, fuzzy
+#| msgid "Preparing to import"
+msgid "Preparing to import…"
+msgstr "Импортқа дайындалу"
+
+#: src/library/ImportQueuePage.vala:151
+#, c-format
+msgid "Imported %s"
+msgstr "Импортталды %s"
+
+#: src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "Соңғы импорт"
+
+#: src/library/LibraryWindow.vala:285
+#, fuzzy
+#| msgid "Import From Folder"
+msgid "_Import From Folder…"
+msgstr "Бумадан импорттау"
+
+#: src/library/LibraryWindow.vala:286
+msgid "Import photos from disk to library"
+msgstr "Фотоларды дисктен жинаққа импорттау"
+
+#: src/library/LibraryWindow.vala:293
+#, fuzzy
+#| msgid "Import From Application"
+msgid "Import From _Application…"
+msgstr "Қолданбадан импорттау"
+
+#: src/library/LibraryWindow.vala:297
+msgid "Sort _Events"
+msgstr "Оқ_иғаларды сұрыптау"
+
+#: src/library/LibraryWindow.vala:307
+msgid "Empty T_rash"
+msgstr "Қоқ_ыс шелегін тазарту"
+
+#: src/library/LibraryWindow.vala:308
+msgid "Delete all photos in the trash"
+msgstr "Қоқыс шелегінен барлық фотоларды өшіру"
+
+#: src/library/LibraryWindow.vala:313
+msgid "View Eve_nt for Photo"
+msgstr "Фото ү_шін оқиғаны қарау"
+
+#: src/library/LibraryWindow.vala:317
+msgid "_Find"
+msgstr "Т_абу"
+
+#: src/library/LibraryWindow.vala:318
+msgid "Find photos and videos by search criteria"
+msgstr "Фото мен видеоларды іздеу шартына сәйкес табу"
+
+#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
+#: src/sidebar/Tree.vala:199
+#, fuzzy
+#| msgid "Ne_w Saved Search..."
+msgid "Ne_w Saved Search…"
+msgstr "Ж_аңа сақталған іздеу..."
+
+#: src/library/LibraryWindow.vala:351
+msgid "_Photos"
+msgstr "Фо_толар"
+
+#: src/library/LibraryWindow.vala:355
+msgid "Even_ts"
+msgstr "Оқ_иғалар"
+
+#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
+msgid "Ta_gs"
+msgstr "Те_гтер"
+
+#: src/library/LibraryWindow.vala:374
+msgid "_Basic Information"
+msgstr "Не_гізгі ақпарат"
+
+#: src/library/LibraryWindow.vala:375
+msgid "Display basic information for the selection"
+msgstr "Таңдалғаны үшін негізгі ақпаратты көрсету"
+
+#: src/library/LibraryWindow.vala:380
+msgid "E_xtended Information"
+msgstr "Кеңе_йтілген ақпарат"
+
+#: src/library/LibraryWindow.vala:381
+msgid "Display extended information for the selection"
+msgstr "Таңдалғаны үшін кеңейтілген ақпаратты көрсету"
+
+#: src/library/LibraryWindow.vala:386
+msgid "_Search Bar"
+msgstr "Ізд_еу өрісі"
+
+#: src/library/LibraryWindow.vala:387
+msgid "Display the search bar"
+msgstr "Іздеу өрісін көрсету"
+
+#: src/library/LibraryWindow.vala:392
+msgid "S_idebar"
+msgstr "Бү_йір панелі"
+
+#: src/library/LibraryWindow.vala:393
+msgid "Display the sidebar"
+msgstr "Бүйір панелін көрсету"
+
+#: src/library/LibraryWindow.vala:398
+#, fuzzy
+#| msgid "Pin Toolbar"
+msgid "T_oolbar"
+msgstr "Панельді бекіту"
+
+#: src/library/LibraryWindow.vala:399
+#, fuzzy
+#| msgid "Display the sidebar"
+msgid "Display the tool bar"
+msgstr "Бүйір панелін көрсету"
+
+#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
+msgid "_Ascending"
+msgstr "Өс_у ретімен"
+
+#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
+msgid "Sort photos in an ascending order"
+msgstr "Фотоларды өсу ретімен сұрыптау"
+
+#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
+msgid "D_escending"
+msgstr "К_ему ретімен"
+
+#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
+msgid "Sort photos in a descending order"
+msgstr "Фотоларды кему ретімен сұрыптау"
+
+#: src/library/LibraryWindow.vala:657
+msgid "Import From Folder"
+msgstr "Бумадан импорттау"
+
+#: src/library/LibraryWindow.vala:726
+msgid "Empty Trash"
+msgstr "Қоқыс шелегін тазарту"
+
+#: src/library/LibraryWindow.vala:726
+#, fuzzy
+#| msgid "Emptying Trash..."
+msgid "Emptying Trash…"
+msgstr "Қоқыс шелегі тазартылуда..."
+
+#: src/library/LibraryWindow.vala:901
+#, c-format
+msgid ""
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
+msgstr ""
+"Shotwell фотоларды сіздің үй бумаңызға импорттауға бапталған.\n"
+"Біз оны <span weight=\"bold\">Түзету %s Баптаулар</span> ішінде өзгертуді "
+"ұсынамыз.\n"
+"Фотоларды импорттауды жалғастыру керек пе?"
+
+#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
+msgid "Library Location"
+msgstr "Жинақтың орналасуы"
+
+#. TODO: Specify which directory/file.
+#: src/library/LibraryWindow.vala:917
+msgid "Photos cannot be imported from this directory."
+msgstr "Фотоларды бұл бумадан импорттау мүмкін емес."
+
+#: src/library/LibraryWindow.vala:1203
+#, c-format
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
+
+#: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258
+#, fuzzy
+#| msgid "Updating library..."
+msgid "Updating library…"
+msgstr "Жинақты жаңарту..."
+
+#: src/library/LibraryWindow.vala:1264
+#, fuzzy
+#| msgid "Preparing to auto-import photos..."
+msgid "Preparing to auto-import photos…"
+msgstr "Фотоларды автоимпорттауды дайындау..."
+
+#: src/library/LibraryWindow.vala:1269
+#, fuzzy
+#| msgid "Auto-importing photos..."
+msgid "Auto-importing photos…"
+msgstr "Фотоларды автоимпорттау..."
+
+#: src/library/LibraryWindow.vala:1277
+#, fuzzy
+#| msgid "Writing metadata to files..."
+msgid "Writing metadata to files…"
+msgstr "Файлдарға метаақпаратты жазу..."
+
+#: src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "Файлдар жоқ"
+
+#: src/library/OfflinePage.vala:106
+#, fuzzy
+#| msgid "Deleting..."
+msgid "Deleting…"
+msgstr "Өшірілуде..."
+
+#: src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "Қоқыс шелегі"
+
+#: src/library/TrashPage.vala:108
+msgid "Trash is empty"
+msgstr "Қоқыс шелегі бос"
+
+#: src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr "Өшіру"
+
+#: src/library/TrashPage.vala:113
+msgid "Deleting Photos"
+msgstr "Фотоларды өшіру"
+
+#: src/main.vala:54
+#, fuzzy, c-format
+#| msgid ""
+#| "Your photo library is not compatible with this version of Shotwell.  It "
+#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
+#| "(schema %d).  Please use the latest version of Shotwell."
+msgid ""
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please use the latest version of Shotwell."
+msgstr ""
+"Сіздегі фото жинағыңыз Shotwell-дың осы нұсқасымен үйлеспейді. Ол жинақ "
+"Shotwell %s нұсқасымен жасалған сияқты (схема %d). Қазіргі нұсқасы - %s "
+"(схема %d). Shotwell-дың соңғы нұсқасын қолданыңыз."
+
+#: src/main.vala:59
+#, fuzzy, c-format
+#| msgid ""
+#| "Shotwell was unable to upgrade your photo library from version %s (schema "
+#| "%d) to %s (schema %d).  For more information please check the Shotwell "
+#| "Wiki at %s"
+msgid ""
+"Shotwell was unable to upgrade your photo library from version %s (schema "
+"%d) to %s (schema %d). For more information please check the Shotwell Wiki "
+"at %s"
+msgstr ""
+"Shotwell сіздің фото жинағыңызды %s нұсқасынан (схема %d) %s нұсқасына "
+"(схема %d) дейін жаңарта алмады. Көбірек білу үшін Shotwell Wiki оқыңыз: %s"
+
+#: src/main.vala:65
+#, fuzzy, c-format
+#| msgid ""
+#| "Your photo library is not compatible with this version of Shotwell.  It "
+#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
+#| "(schema %d).  Please clear your library by deleting %s and re-import your "
+#| "photos."
+msgid ""
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please clear your library by deleting %s and re-import your "
+"photos."
+msgstr ""
+"Сіздегі фото жинағыңыз Shotwell-дың осы нұсқасымен үйлеспейді. Ол жинақ "
+"Shotwell %s нұсқасымен (схема %d) жасалған сияқты. Қазіргі нұсқасы - %s "
+"(схема %d). %s өшіру арқылы жинағыңызды өшіріңіз де, фотоларды қайта "
+"импорттаңыз."
+
+#: src/main.vala:71
+#, fuzzy, c-format
+#| msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgid "Unknown error attempting to verify Shotwell’s database: %s"
+msgstr "Shotwell дерекқорын тексеру талабын жасау кезіндегі белгісіз қате: %s"
+
+#: src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "Shotwell жүктелуде"
+
+#: src/main.vala:294
+#, fuzzy
+#| msgid "Path to Shotwell's private data"
+msgid "Path to Shotwell’s private data"
+msgstr "Shotwell жеке деректеріне дейінгі жол"
+
+#: src/main.vala:294
+msgid "DIRECTORY"
+msgstr "БУМА"
+
+#: src/main.vala:298
+msgid "Do not monitor library directory at runtime for changes"
+msgstr "Жинақ бумасын өзгерістерге бақылап отырмау"
+
+#: src/main.vala:302
+#, fuzzy
+#| msgid "Don't display startup progress meter"
+msgid "Don’t display startup progress meter"
+msgstr "Іске қосылу үрдіс жолағын көрсетпеу"
+
+#: src/main.vala:306
+#, fuzzy
+#| msgid "Show the application's version"
+msgid "Show the application’s version"
+msgstr "Қолданба нұсқасын көрсету"
+
+#. init GTK (valac has already called g_threads_init())
+#: src/main.vala:338
+msgid "[FILE]"
+msgstr "[ФАЙЛ]"
+
+#: src/main.vala:342
+#, fuzzy, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options.\n"
+msgid "Run “%s --help” to see a full list of available command line options.\n"
+msgstr ""
+"Командалық жолдың барлық опцияларын қарау үшін '%s --help' енгізіңіз.\n"
+
+#: src/MediaMonitor.vala:400
 #, c-format
 msgid "Unable to process monitoring updates: %s"
 msgstr "Жаңартуларды бақылау мүмкін емес: %s"
 
-#: ../src/MediaPage.vala:158
+#: src/MediaPage.vala:158
 msgid "Adjust the size of the thumbnails"
 msgstr "Кіші көріністердің өлшемдерін баптау"
 
-#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593
-#: ../src/Resources.vala:183 ../src/direct/DirectPhotoPage.vala:174
-msgid "Zoom _In"
-msgstr "Үлке_йту"
-
-#: ../src/MediaPage.vala:341
+#: src/MediaPage.vala:341
 msgid "Increase the magnification of the thumbnails"
 msgstr "Кіші көріністерді үлкейту"
 
-#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599
-#: ../src/Resources.vala:184 ../src/direct/DirectPhotoPage.vala:180
-msgid "Zoom _Out"
-msgstr "Кі_шірейту"
-
-#: ../src/MediaPage.vala:347
+#: src/MediaPage.vala:347
 msgid "Decrease the magnification of the thumbnails"
 msgstr "Кіші көріністерді кішірейту"
 
-#: ../src/MediaPage.vala:414
+#: src/MediaPage.vala:414
 msgid "Sort _Photos"
 msgstr "Фот_оларды сұрыптау"
 
-#: ../src/MediaPage.vala:423
+#: src/MediaPage.vala:423
 msgid "_Play Video"
 msgstr "Видеоны о_йнату"
 
-#: ../src/MediaPage.vala:424
+#: src/MediaPage.vala:424
 msgid "Open the selected videos in the system video player"
 msgstr "Таңдалған видеоларды жүйелік видео плеерінде ашу"
 
-#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
+#: src/MediaPage.vala:428 src/PhotoPage.vala:2640
 msgid "_Developer"
 msgstr "Ө_ндіруші"
 
-#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
-#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:303
-msgid "Camera"
-msgstr "Камера"
-
-#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
-msgid "_Titles"
-msgstr "_Атаулар"
-
-#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
-msgid "Display the title of each photo"
-msgstr "Әр фотоның атауын көрсету"
-
-#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "_Пікірлер"
-
-#: ../src/MediaPage.vala:458
+#: src/MediaPage.vala:458
 msgid "Display the comment of each photo"
 msgstr "Әр фотоның түсіндірмесін көрсету"
 
-#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:359
-msgid "Ta_gs"
-msgstr "Те_гтер"
-
-#: ../src/MediaPage.vala:470
-msgid "Display each photo's tags"
+#: src/MediaPage.vala:470
+#, fuzzy
+#| msgid "Display each photo's tags"
+msgid "Display each photo’s tags"
 msgstr "Әр фотоның тегтерін көрсету"
 
-#: ../src/MediaPage.vala:486
+#: src/MediaPage.vala:486
 msgid "By _Title"
 msgstr "А_тауы бойынша"
 
-#: ../src/MediaPage.vala:487
+#: src/MediaPage.vala:487
 msgid "Sort photos by title"
 msgstr "Фотоларды атаулары бойынша сұрыптау"
 
-#: ../src/MediaPage.vala:492
+#: src/MediaPage.vala:492
 msgid "By Exposure _Date"
 msgstr "Түсірілген _күні бойынша"
 
-#: ../src/MediaPage.vala:493
+#: src/MediaPage.vala:493
 msgid "Sort photos by exposure date"
 msgstr "Фотоларды түсірілген күні бойынша сұрыптау"
 
-#: ../src/MediaPage.vala:498
+#: src/MediaPage.vala:498
 msgid "By _Rating"
 msgstr "Ре_йтингі бойынша"
 
-#: ../src/MediaPage.vala:499
+#: src/MediaPage.vala:499
 msgid "Sort photos by rating"
 msgstr "Фотоларды рейтингі бойынша сұрыптау"
 
-#: ../src/MediaPage.vala:504
+#: src/MediaPage.vala:504
 msgid "By _Filename"
 msgstr "_Файл аты бойынша"
 
-#: ../src/MediaPage.vala:505
+#: src/MediaPage.vala:505
 msgid "Sort photos by filename"
 msgstr "Фотоларды файл аты бойынша сұрыптау"
 
-#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:405
-msgid "_Ascending"
-msgstr "Өс_у ретімен"
-
-#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:406
-msgid "Sort photos in an ascending order"
-msgstr "Фотоларды өсу ретімен сұрыптау"
-
-#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:412
-msgid "D_escending"
-msgstr "К_ему ретімен"
-
-#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:413
-msgid "Sort photos in a descending order"
-msgstr "Фотоларды кему ретімен сұрыптау"
-
-#: ../src/MediaPage.vala:723
+#: src/MediaPage.vala:723
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2412,204 +4868,129 @@ msgstr ""
 "Shotwell таңдалған видеоны ойната алмады:\n"
 "%s"
 
-#: ../src/Page.vala:1263
+#: src/Page.vala:1266
 msgid "No photos/videos"
 msgstr "Фото/видеолар жоқ"
 
-#: ../src/Page.vala:1267
-msgid "No photos/videos found"
-msgstr "Ешбір фото/видео табылмады"
+#: src/Page.vala:1270
+msgid "No photos/videos found which match the current filter"
+msgstr ""
 
-#: ../src/Page.vala:2565
+#: src/Page.vala:2576
 msgid "Photos cannot be exported to this directory."
 msgstr "Фотоларды бұл бумаға экспорттау мүмкін емес."
 
-#: ../src/Photo.vala:3753
-msgid "modified"
-msgstr "түрлендірілген"
-
 #. previous button
-#: ../src/PhotoPage.vala:533
+#: src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "Алдыңғы фото"
 
 #. next button
-#: ../src/PhotoPage.vala:539
+#: src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "Келесі фото"
 
-#: ../src/PhotoPage.vala:1847
+#: src/PhotoPage.vala:1845
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Фотоның бастапқы файлы жоқ: %s"
 
-#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:343
-msgid "_View"
-msgstr "_Түрі"
-
-#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
-msgid "T_ools"
-msgstr "Са_ймандар"
-
-#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
-msgid "_Previous Photo"
-msgstr "Ал_дыңғы фото"
-
-#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
-msgid "Previous Photo"
-msgstr "Алдыңғы фото"
-
-#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
-msgid "_Next Photo"
-msgstr "К_елесі фото"
+#: src/PhotoPage.vala:3229
+#, c-format
+msgid "Unable to export %s: %s"
+msgstr "%s экспорттау мүмкін емес: %s"
 
-#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
-msgid "Next Photo"
-msgstr "Келесі фото"
+#: src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
 
-#: ../src/PhotoPage.vala:2594 ../src/direct/DirectPhotoPage.vala:175
-msgid "Increase the magnification of the photo"
-msgstr "Фотоны үлкейту"
+#: src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
 
-#: ../src/PhotoPage.vala:2600 ../src/direct/DirectPhotoPage.vala:181
-msgid "Decrease the magnification of the photo"
-msgstr "Фотоны кішірейту"
+#: src/photos/JfifSupport.vala:185
+#, c-format
+msgid "Low (%d%%)"
+msgstr "Төмен (%d%%)"
 
-#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
-msgid "Fit to _Page"
-msgstr "Параққа сы_йдыру"
+#: src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "Орташа (%d%%)"
 
-#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
-msgid "Zoom the photo to fit on the screen"
-msgstr "Фотоны экранды толығымен алатындай етіп келтіру"
+#: src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "Жоғары (%d%%)"
 
-#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Үлкейту - _100%"
+#: src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "Максимум (%d%%)"
 
-#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Фотосуретті өлшемнің 100 дейін өзгерту"
+#: src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:201
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Үлкейту - _200%"
+#: src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: ../src/PhotoPage.vala:2622 ../src/direct/DirectPhotoPage.vala:203
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Фотосуретті өлшемнің 200 дейін өзгерту"
+#: src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: ../src/PhotoPage.vala:3231
-#, c-format
-msgid "Unable to export %s: %s"
-msgstr "%s экспорттау мүмкін емес: %s"
+#: src/Photo.vala:3753
+msgid "modified"
+msgstr "түрлендірілген"
 
-#: ../src/Printing.vala:255
+#: src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "Парақты түгел толтыру"
 
-#: ../src/Printing.vala:256
+#: src/Printing.vala:256
 msgid "2 images per page"
 msgstr "2 сурет парақта"
 
-#: ../src/Printing.vala:257
+#: src/Printing.vala:257
 msgid "4 images per page"
 msgstr "4 сурет парақта"
 
-#: ../src/Printing.vala:258
+#: src/Printing.vala:258
 msgid "6 images per page"
 msgstr "6 сурет парақта"
 
-#: ../src/Printing.vala:259
+#: src/Printing.vala:259
 msgid "8 images per page"
 msgstr "8 сурет парақта"
 
-#: ../src/Printing.vala:260
+#: src/Printing.vala:260
 msgid "16 images per page"
 msgstr "16 сурет парақта"
 
-#: ../src/Printing.vala:261
+#: src/Printing.vala:261
 msgid "32 images per page"
 msgstr "32 сурет парақта"
 
-#: ../src/Printing.vala:348
+#: src/Printing.vala:348
 msgid "in."
 msgstr "дюйм"
 
-#: ../src/Printing.vala:349
+#: src/Printing.vala:349
 msgid "cm"
 msgstr "см"
 
-#: ../src/Printing.vala:817 ../src/editing_tools/EditingTools.vala:761
-msgid "Wallet (2 x 3 in.)"
-msgstr "Wallet (2 x 3 дюйм)"
-
-#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
-msgid "Notecard (3 x 5 in.)"
-msgstr "Notecard (3 x 5 дюйм)"
-
-#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
-msgid "4 x 6 in."
-msgstr "4 x 6 дюйм"
-
-#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
-msgid "5 x 7 in."
-msgstr "5 x 7 дюйм"
-
-#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
-msgid "8 x 10 in."
-msgstr "8 x 10 дюйм"
-
-#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
-msgid "11 x 14 in."
-msgstr "11 x 14 дюйм"
-
-#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
-msgid "16 x 20 in."
-msgstr "16 x 20 дюйм"
-
-#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Metric Wallet (9 x 13 см)"
-
-#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
-msgid "Postcard (10 x 15 cm)"
-msgstr "Ашық хат (10 x 15 см)"
-
-#: ../src/Printing.vala:847 ../src/editing_tools/EditingTools.vala:773
-msgid "13 x 18 cm"
-msgstr "13 x 18 см"
-
-#: ../src/Printing.vala:850 ../src/editing_tools/EditingTools.vala:774
-msgid "18 x 24 cm"
-msgstr "18 x 24 см"
-
-#: ../src/Printing.vala:853 ../src/editing_tools/EditingTools.vala:776
-msgid "20 x 30 cm"
-msgstr "20 x 30 см"
-
-#: ../src/Printing.vala:856 ../src/editing_tools/EditingTools.vala:777
-msgid "24 x 40 cm"
-msgstr "24 x 40 см"
-
-#: ../src/Printing.vala:859 ../src/editing_tools/EditingTools.vala:778
-msgid "30 x 40 cm"
-msgstr "30 x 40 см"
-
-#: ../src/Printing.vala:875
+#: src/Printing.vala:876
 msgid "Image Settings"
 msgstr "Сурет баптаулары"
 
-#: ../src/Printing.vala:888
-msgid "Printing..."
+#: src/Printing.vala:889
+#, fuzzy
+#| msgid "Printing..."
+msgid "Printing…"
 msgstr "Баспаға шығару..."
 
-#: ../src/Printing.vala:908 ../src/Printing.vala:1111
+#: src/Printing.vala:909 src/Printing.vala:1112
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -2620,909 +5001,1040 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/Properties.vala:84
+#: src/Properties.vala:84
 msgid "Today"
 msgstr "Бүгін"
 
-#: ../src/Properties.vala:86
+#: src/Properties.vala:86
 msgid "Yesterday"
 msgstr "Кеше"
 
-#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
-
-#: ../src/Properties.vala:343
+#: src/Properties.vala:343
 msgid "Items:"
 msgstr "Элементтер:"
 
-#: ../src/Properties.vala:346
+#: src/Properties.vala:346
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
 msgstr[0] "%d оқиға"
 
-#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
-#, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d фото"
-
-#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
-#, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d видео"
-
 #. display only one date if start and end are the same
-#: ../src/Properties.vala:377
+#: src/Properties.vala:377
 msgid "Date:"
 msgstr "Күні:"
 
 #. display only one time if start and end are the same
-#: ../src/Properties.vala:381
+#: src/Properties.vala:381
 msgid "Time:"
 msgstr "Уақыты:"
 
 #. display time range
 #. display date range
-#: ../src/Properties.vala:384 ../src/Properties.vala:389
+#: src/Properties.vala:384 src/Properties.vala:389
 msgid "From:"
 msgstr "Қайдан:"
 
-#: ../src/Properties.vala:385 ../src/Properties.vala:390
+#: src/Properties.vala:385 src/Properties.vala:390
 msgid "To:"
 msgstr "Қайда:"
 
-#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1872
-msgid "Size:"
-msgstr "Өлшемі:"
-
-#: ../src/Properties.vala:404
+#: src/Properties.vala:404
 msgid "Duration:"
 msgstr "Ұзақтығы:"
 
-#: ../src/Properties.vala:404
+#: src/Properties.vala:404
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f секунд"
 
-#: ../src/Properties.vala:408
+#: src/Properties.vala:408
 msgid "Developer:"
 msgstr "Өндіруші:"
 
-#. fit both on the top line, emit and move on
-#: ../src/Properties.vala:436 ../src/Properties.vala:440
-#: ../src/Properties.vala:447 ../src/editing_tools/EditingTools.vala:2240
-msgid "Exposure:"
-msgstr "Экспозиция:"
-
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:583
+#: src/Properties.vala:583
 msgid "Location:"
 msgstr "Орналасуы:"
 
-#: ../src/Properties.vala:586
+#: src/Properties.vala:586
 msgid "File size:"
 msgstr "Файл өлшемі:"
 
-#: ../src/Properties.vala:590
+#: src/Properties.vala:590
 msgid "Current Development:"
 msgstr "Ағымдағы өндеуде:"
 
-#: ../src/Properties.vala:592
+#: src/Properties.vala:592
 msgid "Original dimensions:"
 msgstr "Бастапқы өлшемдері:"
 
-#: ../src/Properties.vala:595
+#: src/Properties.vala:595
 msgid "Camera make:"
 msgstr "Камера моделі:"
 
-#: ../src/Properties.vala:598
+#: src/Properties.vala:598
 msgid "Camera model:"
 msgstr "Камера моделі:"
 
-#: ../src/Properties.vala:601
+#: src/Properties.vala:601
 msgid "Flash:"
 msgstr "Жарқылдау:"
 
-#: ../src/Properties.vala:603
+#: src/Properties.vala:603
 msgid "Focal length:"
 msgstr "Фокустық қашықтығы:"
 
-#: ../src/Properties.vala:606
+#: src/Properties.vala:606
 msgid "Exposure date:"
 msgstr "Экспозиция күні:"
 
-#: ../src/Properties.vala:609
+#: src/Properties.vala:609
 msgid "Exposure time:"
 msgstr "Экспозиция уақыты:"
 
-#: ../src/Properties.vala:612
+#: src/Properties.vala:612
 msgid "Exposure bias:"
 msgstr "Экспозицияны келтіру:"
 
-#: ../src/Properties.vala:614
+#: src/Properties.vala:614
 msgid "GPS latitude:"
 msgstr "GPS ендігі:"
 
-#: ../src/Properties.vala:617
+#: src/Properties.vala:617
 msgid "GPS longitude:"
 msgstr "GPS бойлығы:"
 
-#: ../src/Properties.vala:620
+#: src/Properties.vala:620
 msgid "Artist:"
 msgstr "Орындаушы:"
 
-#: ../src/Properties.vala:622
+#: src/Properties.vala:622
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: ../src/Properties.vala:624
+#: src/Properties.vala:624
 msgid "Software:"
 msgstr "Бағд. қамтамасы:"
 
-#: ../src/Properties.vala:641
+#: src/Properties.vala:641
 msgid "Extended Information"
 msgstr "Кеңейтілген ақпараты"
 
-#: ../src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "Фотосуреттерді басқару қолданбасы"
+#: src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "Жүктеуге дайындау"
 
-#: ../src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "Фотосуреттерді көрсету"
+#: src/publishing/PublishingPluginHost.vala:12
+#, c-format
+msgid "Uploading %d of %d"
+msgstr "Жүктелуде %d, барлығы %d"
+
+#: src/publishing/PublishingPluginHost.vala:81
+#, fuzzy, c-format
+#| msgid "Publishing to %s can't continue because an error occurred:"
+msgid "Publishing to %s can’t continue because an error occurred:"
+msgstr "%s ішіне жариялау мүмкін емес, орын алған қате:"
+
+#: src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr ""
+"Басқа қызметке жариялап көру үшін, үстіндегі мәзірден біреуін таңдаңыз."
+
+#: src/publishing/PublishingUI.vala:105
+msgid "The selected photos/videos were successfully published."
+msgstr "Таңдалған фото/видеолар сәтті жарияланды."
 
-#: ../src/Resources.vala:139
+#: src/publishing/PublishingUI.vala:107
+msgid "The selected videos were successfully published."
+msgstr "Таңдалған видеолар сәтті жарияланды."
+
+#: src/publishing/PublishingUI.vala:109
+msgid "The selected photos were successfully published."
+msgstr "Таңдалған фотолар сәтті жарияланды."
+
+#: src/publishing/PublishingUI.vala:112
+msgid "The selected video was successfully published."
+msgstr "Таңдалған видео сәтті жарияланды."
+
+#: src/publishing/PublishingUI.vala:114
+msgid "The selected photo was successfully published."
+msgstr "Таңдалған фото сәтті жарияланды."
+
+#: src/publishing/PublishingUI.vala:122
+#, fuzzy
+#| msgid "Fetching account information..."
+msgid "Fetching account information…"
+msgstr "Тіркелгі ақпараты алынуда..."
+
+#: src/publishing/PublishingUI.vala:128
+#, fuzzy
+#| msgid "Logging in..."
+msgid "Logging in…"
+msgstr "Жүйеге кіру..."
+
+#: src/publishing/PublishingUI.vala:188
+msgid "Publish Photos"
+msgstr "Фотоларды жариялау"
+
+#: src/publishing/PublishingUI.vala:189
+msgid "Publish photos _to:"
+msgstr "Фотоларды жари_ялау орны:"
+
+#: src/publishing/PublishingUI.vala:191
+msgid "Publish Videos"
+msgstr "Видеоларды жариялау"
+
+#: src/publishing/PublishingUI.vala:192
+msgid "Publish videos _to"
+msgstr "Видеоларды жари_ялау орны:"
+
+#: src/publishing/PublishingUI.vala:194
+msgid "Publish Photos and Videos"
+msgstr "Фото мен видеоларды жариялау"
+
+#: src/publishing/PublishingUI.vala:195
+msgid "Publish photos and videos _to"
+msgstr "Фото мен видеоларды жари_ялау орны:"
+
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: src/publishing/PublishingUI.vala:397
+msgid "Unable to publish"
+msgstr "Жариялау мүмкін емес"
+
+#: src/publishing/PublishingUI.vala:398
+#, c-format
+msgid ""
+"Shotwell cannot publish the selected items because you do not have a "
+"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
+"Preferences</b> and enable one or more of the publishing plugins on the "
+"<b>Plugins</b> tab."
+msgstr ""
+"Shotwell таңдалған нәрселерді жариялай алмайды, өйткені іске қосулы тұрған "
+"үйлесімді жариялау плагині жоқ. Осыны түзету үшін, <b>%s баптауларын түзету</"
+"b> таңдаңыз да, <b>Плагиндер</b> бетінде бір немесе бірнеше жариялау "
+"плагинін іске қосыңыз."
+
+#: src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "Жариялау"
+
+#: src/Resources.vala:139
 msgid "Rotate _Right"
 msgstr "Оңғ_а бұру"
 
-#: ../src/Resources.vala:140 ../src/Resources.vala:145
+#: src/Resources.vala:140 src/Resources.vala:145
 msgid "Rotate"
 msgstr "Бұру"
 
-#: ../src/Resources.vala:141
+#: src/Resources.vala:141
 msgid "Rotate Right"
 msgstr "Оңға бұру"
 
-#: ../src/Resources.vala:142
+#: src/Resources.vala:142
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Фотосуреттерді оңға бұру (Солға бұру үшін Ctrl басыңыз)"
 
-#: ../src/Resources.vala:144
+#: src/Resources.vala:144
 msgid "Rotate _Left"
 msgstr "С_олға бұру"
 
-#: ../src/Resources.vala:146
+#: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr "Солға бұру"
 
-#: ../src/Resources.vala:147
+#: src/Resources.vala:147
 msgid "Rotate the photos left"
 msgstr "Фотоларды солға бұру"
 
-#: ../src/Resources.vala:149
+#: src/Resources.vala:149
 msgid "Flip Hori_zontally"
 msgstr "Горизонта_лды айналдыру"
 
-#: ../src/Resources.vala:150
+#: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr "Горизонталды айналдыру"
 
-#: ../src/Resources.vala:152
+#: src/Resources.vala:152
 msgid "Flip Verti_cally"
 msgstr "_Вертикалды айналдыру"
 
-#: ../src/Resources.vala:153
+#: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr "Вертикалды айналдыру"
 
-#: ../src/Resources.vala:155
+#: src/Resources.vala:155
 msgid "_About"
 msgstr "О_сы туралы"
 
-#: ../src/Resources.vala:156
+#: src/Resources.vala:156
 msgid "_Apply"
 msgstr "Іске _асыру"
 
-#: ../src/Resources.vala:159 ../src/direct/DirectPhotoPage.vala:73
-#: ../src/library/LibraryWindow.vala:339
-msgid "_Edit"
-msgstr "Тү_зету"
-
-#: ../src/Resources.vala:160
+#: src/Resources.vala:160
 msgid "_Forward"
 msgstr "А_лға"
 
-#: ../src/Resources.vala:161
+#: src/Resources.vala:161
 msgid "Fulls_creen"
 msgstr "Т_олық экранға"
 
-#: ../src/Resources.vala:162 ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:363
-msgid "_Help"
-msgstr "_Көмек"
-
-#: ../src/Resources.vala:163
+#: src/Resources.vala:163
 msgid "Leave _Fullscreen"
 msgstr "Т_олық экраннан шығу"
 
-#: ../src/Resources.vala:164 ../src/Resources.vala:366
+#: src/Resources.vala:164 src/Resources.vala:363
 msgid "_New"
 msgstr "Ж_аңа"
 
-#: ../src/Resources.vala:165
+#: src/Resources.vala:165
 msgid "_Next"
 msgstr "_Келесі"
 
-#: ../src/Resources.vala:166
+#: src/Resources.vala:166
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../src/Resources.vala:167
+#: src/Resources.vala:167
 msgid "_Play"
 msgstr "Ой_нату"
 
-#: ../src/Resources.vala:168 ../src/Resources.vala:320
+#: src/Resources.vala:168 src/Resources.vala:317
 msgid "_Preferences"
 msgstr "Ба_птаулар"
 
-#: ../src/Resources.vala:169
+#: src/Resources.vala:169
 msgid "_Previous"
 msgstr "Ал_дыңғы"
 
-#: ../src/Resources.vala:170
+#: src/Resources.vala:170
 msgid "_Print"
 msgstr "Бас_паға шығару"
 
-#: ../src/Resources.vala:171
+#: src/Resources.vala:171
 msgid "_Quit"
 msgstr "_Шығу"
 
-#: ../src/Resources.vala:172
+#: src/Resources.vala:172
 msgid "_Refresh"
 msgstr "Жаңар_ту"
 
-#: ../src/Resources.vala:174
+#: src/Resources.vala:174
 msgid "_Revert"
 msgstr "Қай_тару"
 
-#: ../src/Resources.vala:175 ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:427
-msgid "_Save"
-msgstr "_Сақтау"
-
-#: ../src/Resources.vala:176
+#: src/Resources.vala:176
 msgid "Save _As"
 msgstr "Қала_йша сақтау"
 
-#: ../src/Resources.vala:177
+#: src/Resources.vala:177
 msgid "Sort _Ascending"
 msgstr "Өс_у ретімен сұрыптау"
 
-#: ../src/Resources.vala:178
+#: src/Resources.vala:178
 msgid "Sort _Descending"
 msgstr "К_ему ретімен сұрыптау"
 
-#: ../src/Resources.vala:179
+#: src/Resources.vala:179
 msgid "_Stop"
 msgstr "Тоқ_тату"
 
-#: ../src/Resources.vala:180
+#: src/Resources.vala:180
 msgid "_Undelete"
 msgstr "Ө_шірілгенді қалпына келтіру"
 
-#: ../src/Resources.vala:181
+#: src/Resources.vala:181
 msgid "_Normal Size"
 msgstr "Қалы_пты өлшемі"
 
-#: ../src/Resources.vala:182
+#: src/Resources.vala:182
 msgid "Best _Fit"
 msgstr "Жақ_сырақ сыю"
 
-#: ../src/Resources.vala:186
+#: src/Resources.vala:186
 msgid "_Enhance"
 msgstr "Жақсар_ту"
 
-#: ../src/Resources.vala:187
+#: src/Resources.vala:187
 msgid "Enhance"
 msgstr "Жақсарту"
 
-#: ../src/Resources.vala:188
-msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:188
+#, fuzzy
+#| msgid "Automatically improve the photo's appearance"
+msgid "Automatically improve the photo’s appearance"
 msgstr "Фото түрін автожақсарту"
 
-#: ../src/Resources.vala:190
+#: src/Resources.vala:190
 msgid "_Copy Color Adjustments"
 msgstr "Түстерді келтіруін _көшіріп алу"
 
-#: ../src/Resources.vala:191
+#: src/Resources.vala:191
 msgid "Copy Color Adjustments"
 msgstr "Түстерді келтіруін көшіріп алу"
 
-#: ../src/Resources.vala:192
+#: src/Resources.vala:192
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Фотосуретке іске асырылған түстерді келтіруін көшіріп алу"
 
-#: ../src/Resources.vala:194
+#: src/Resources.vala:194
 msgid "_Paste Color Adjustments"
 msgstr "Түстерді келтіруін кірі_стіру"
 
-#: ../src/Resources.vala:195
+#: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr "Түстерді келтіруін кірістіру"
 
-#: ../src/Resources.vala:196
+#: src/Resources.vala:196
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Таңдалған фотоларға көшірілген түстерді келтіруін кірістіру"
 
-#: ../src/Resources.vala:198
+#: src/Resources.vala:198
 msgid "_Crop"
 msgstr "Қ_иып жіберу"
 
-#: ../src/Resources.vala:199
+#: src/Resources.vala:199
 msgid "Crop"
 msgstr "Қиып жіберу"
 
-#: ../src/Resources.vala:200
-msgid "Crop the photo's size"
+#: src/Resources.vala:200
+#, fuzzy
+#| msgid "Crop the photo's size"
+msgid "Crop the photo’s size"
 msgstr "Фотосуретті қиып жіберу"
 
-#: ../src/Resources.vala:202 ../src/editing_tools/StraightenTool.vala:100
-msgid "_Straighten"
-msgstr "Тура_лау"
-
-#: ../src/Resources.vala:203
+#: src/Resources.vala:203
 msgid "Straighten"
 msgstr "Туралау"
 
-#: ../src/Resources.vala:204
+#: src/Resources.vala:204
 msgid "Straighten the photo"
 msgstr "Фотосуретті туралау"
 
-#: ../src/Resources.vala:206
+#: src/Resources.vala:206
 msgid "_Red-eye"
 msgstr "Қы_зыл көздер"
 
-#: ../src/Resources.vala:207
+#: src/Resources.vala:207
 msgid "Red-eye"
 msgstr "Қызыл көздер"
 
-#: ../src/Resources.vala:208
+#: src/Resources.vala:208
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Фотодағы қызыл көздер эффектілерін жою"
 
-#: ../src/Resources.vala:210
+#: src/Resources.vala:210
 msgid "_Adjust"
 msgstr "К_елтіру"
 
-#: ../src/Resources.vala:211
+#: src/Resources.vala:211
 msgid "Adjust"
 msgstr "Келтіру"
 
-#: ../src/Resources.vala:212
-msgid "Adjust the photo's color and tone"
+#: src/Resources.vala:212
+#, fuzzy
+#| msgid "Adjust the photo's color and tone"
+msgid "Adjust the photo’s color and tone"
 msgstr "Фото түсін мен реңің келтіру"
 
-#: ../src/Resources.vala:214
+#: src/Resources.vala:214
 msgid "Re_vert to Original"
 msgstr "Бастапқ_ыға тастау"
 
-#: ../src/Resources.vala:215
+#: src/Resources.vala:215
 msgid "Revert to Original"
 msgstr "Бастапқы қалпына келтіру"
 
-#: ../src/Resources.vala:217
+#: src/Resources.vala:217
 msgid "Revert External E_dits"
 msgstr "Сыртқы тү_зетулерді болдырмау"
 
-#: ../src/Resources.vala:218
+#: src/Resources.vala:218
 msgid "Revert to the master photo"
 msgstr "Бас фотоға дейін тастау"
 
-#: ../src/Resources.vala:220
+#: src/Resources.vala:220
 msgid "Set as _Desktop Background"
 msgstr "Жұмыс үс_тел тұсқағазы ретінде орнату"
 
-#: ../src/Resources.vala:221
+#: src/Resources.vala:221
 msgid "Set selected image to be the new desktop background"
 msgstr "Таңдалған суретті жұмыс үстелінің тұсқағазы ретінде орнату"
 
-#: ../src/Resources.vala:222
-msgid "Set as _Desktop Slideshow..."
-msgstr "Жұмыс үс_тел слайдшоуы ретінде орнату..."
+#: src/Resources.vala:222
+#, fuzzy
+#| msgid "Set as Desktop Slideshow"
+msgid "Set as _Desktop Slideshow…"
+msgstr "Жұмыс үстел слайдшоуы ретінде орнату"
 
-#: ../src/Resources.vala:224
+#: src/Resources.vala:224
 msgid "_Undo"
 msgstr "Бол_дырмау"
 
-#: ../src/Resources.vala:225
+#: src/Resources.vala:225
 msgid "Undo"
 msgstr "Болдырмау"
 
-#: ../src/Resources.vala:227
+#: src/Resources.vala:227
 msgid "_Redo"
 msgstr "Қа_йталау"
 
-#: ../src/Resources.vala:228
+#: src/Resources.vala:228
 msgid "Redo"
 msgstr "Қайталау"
 
-#: ../src/Resources.vala:230
-msgid "Re_name Event..."
-msgstr "Оқ_иға атауын өзгерту..."
+#: src/Resources.vala:230
+#, fuzzy
+#| msgid "Rename Event"
+msgid "Re_name Event…"
+msgstr "Оқиға атын ауыстыру"
 
-#: ../src/Resources.vala:233
+#: src/Resources.vala:233
 msgid "Make _Key Photo for Event"
 msgstr "Оқиға үшін _негізгі фото жасау"
 
-#: ../src/Resources.vala:234
+#: src/Resources.vala:234
 msgid "Make Key Photo for Event"
 msgstr "Оқиға үшін негізгі фото жасау"
 
-#: ../src/Resources.vala:236
+#: src/Resources.vala:236
 msgid "_New Event"
 msgstr "_Жаңа оқиға"
 
-#: ../src/Resources.vala:237
+#: src/Resources.vala:237
 msgid "New Event"
 msgstr "Жаңа оқиға"
 
-#: ../src/Resources.vala:239
+#: src/Resources.vala:239
 msgid "Move Photos"
 msgstr "Фотоларды жылжыту"
 
-#: ../src/Resources.vala:240
+#: src/Resources.vala:240
 msgid "Move photos to an event"
 msgstr "Фотоларды оқиғаға жылжыту"
 
-#: ../src/Resources.vala:242
+#: src/Resources.vala:242
 msgid "_Merge Events"
 msgstr "_Оқиғаларды біріктіру"
 
-#: ../src/Resources.vala:243
+#: src/Resources.vala:243
 msgid "Merge"
 msgstr "Біріктіру"
 
-#: ../src/Resources.vala:244
+#: src/Resources.vala:244
 msgid "Combine events into a single event"
 msgstr "Оқиғаларды бір оқиғаға біріктіру"
 
-#: ../src/Resources.vala:246
+#: src/Resources.vala:246
 msgid "_Set Rating"
 msgstr "_Рейтингті орнату"
 
-#: ../src/Resources.vala:247
+#: src/Resources.vala:247
 msgid "Set Rating"
 msgstr "Рейтингті орнату"
 
-#: ../src/Resources.vala:248
+#: src/Resources.vala:248
 msgid "Change the rating of your photo"
 msgstr "Фотоңыздың рейтингін орнату"
 
-#: ../src/Resources.vala:250
+#: src/Resources.vala:250
 msgid "_Increase"
 msgstr "Ү_лкейту"
 
-#: ../src/Resources.vala:251
+#: src/Resources.vala:251
 msgid "Increase Rating"
 msgstr "Рейтингі үлкейту"
 
-#: ../src/Resources.vala:253
+#: src/Resources.vala:253
 msgid "_Decrease"
 msgstr "Кі_шірейту"
 
-#: ../src/Resources.vala:254
+#: src/Resources.vala:254
 msgid "Decrease Rating"
 msgstr "Рейтингі кішірейту"
 
-#: ../src/Resources.vala:256
+#: src/Resources.vala:256
 msgid "_Unrated"
 msgstr "Рейт_ингсіз"
 
-#: ../src/Resources.vala:257
+#: src/Resources.vala:257
 msgid "Unrated"
 msgstr "Рейтингсіз"
 
-#: ../src/Resources.vala:258
+#: src/Resources.vala:258
 msgid "Rate Unrated"
 msgstr "Рейтингсіз етіп белгілеу"
 
-#: ../src/Resources.vala:259
+#: src/Resources.vala:259
 msgid "Setting as unrated"
 msgstr "Рейтингсіз етіп белгілеу"
 
-#: ../src/Resources.vala:260
+#: src/Resources.vala:260
 msgid "Remove any ratings"
 msgstr "Бар рейтингілерді өшіру"
 
-#: ../src/Resources.vala:262
+#: src/Resources.vala:262
 msgid "_Rejected"
 msgstr "Та_йдырылған"
 
-#: ../src/Resources.vala:263
+#: src/Resources.vala:263
 msgid "Rejected"
 msgstr "Тайдырылған"
 
-#: ../src/Resources.vala:264
+#: src/Resources.vala:264
 msgid "Rate Rejected"
 msgstr "Тайдырылған етіп белгілеу"
 
-#: ../src/Resources.vala:265
+#: src/Resources.vala:265
 msgid "Setting as rejected"
 msgstr "Тайдырылған етіп белгілеу"
 
-#: ../src/Resources.vala:266
+#: src/Resources.vala:266
 msgid "Set rating to rejected"
 msgstr "Рейтингі тайдырылған етіп орнату"
 
-#: ../src/Resources.vala:268
+#: src/Resources.vala:268
 msgid "Rejected _Only"
 msgstr "Тек та_йдырылған"
 
-#: ../src/Resources.vala:269
+#: src/Resources.vala:269
 msgid "Rejected Only"
 msgstr "Тек тайдырылған"
 
-#: ../src/Resources.vala:270
+#: src/Resources.vala:270
 msgid "Show only rejected photos"
 msgstr "Тек тайдырылған фотоларды көрсету"
 
-#: ../src/Resources.vala:272
+#: src/Resources.vala:272
 msgid "All + _Rejected"
 msgstr "Барл_ығы + тайдырылған"
 
-#: ../src/Resources.vala:273 ../src/Resources.vala:274
+#: src/Resources.vala:273
+#, fuzzy
+#| msgid "Show all photos, including rejected"
+msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Барлық фотоларды көрсету, тайдырылғандармен қоса"
 
-#: ../src/Resources.vala:276
+#: src/Resources.vala:275
 msgid "_All Photos"
 msgstr "_Барлық фотолар"
 
-#. Button label
 #. Button tooltip
-#: ../src/Resources.vala:278 ../src/Resources.vala:280
+#: src/Resources.vala:277
 msgid "Show all photos"
 msgstr "Барлық фотоларды көрсету"
 
-#: ../src/Resources.vala:282
+#: src/Resources.vala:279
 msgid "_Ratings"
 msgstr "Р_ейтингтер"
 
-#: ../src/Resources.vala:283
-msgid "Display each photo's rating"
+#: src/Resources.vala:280
+#, fuzzy
+#| msgid "Display each photo's rating"
+msgid "Display each photo’s rating"
 msgstr "Әр фотоның рейтингі көрсету"
 
-#: ../src/Resources.vala:285
+#: src/Resources.vala:282
 msgid "_Filter Photos"
 msgstr "Фотоларды сүз_гілеу"
 
-#: ../src/Resources.vala:286
+#: src/Resources.vala:283
 msgid "Filter Photos"
 msgstr "Фотоларды сүзгілеу"
 
-#: ../src/Resources.vala:287
+#: src/Resources.vala:284
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Көрсетілетін фотолардың санын сүзгі негізінде азайту"
 
-#: ../src/Resources.vala:289
+#: src/Resources.vala:286
 msgid "_Duplicate"
 msgstr "Кө_шірмесін жасау"
 
-#: ../src/Resources.vala:290
+#: src/Resources.vala:287
 msgid "Duplicate"
 msgstr "Көшірмесін жасау"
 
-#: ../src/Resources.vala:291
+#: src/Resources.vala:288
 msgid "Make a duplicate of the photo"
 msgstr "Фотоның көшірмесін жасау"
 
-#: ../src/Resources.vala:293
-msgid "_Export..."
-msgstr "_Экспорт..."
+#: src/Resources.vala:290
+#, fuzzy
+#| msgid "Export"
+msgid "_Export…"
+msgstr "Экспорт"
 
-#: ../src/Resources.vala:295
-msgid "_Print..."
-msgstr "Бас_паға шығару..."
+#: src/Resources.vala:292
+#, fuzzy
+#| msgid "_Print"
+msgid "_Print…"
+msgstr "Бас_паға шығару"
 
-#: ../src/Resources.vala:297
-msgid "Pu_blish..."
-msgstr "Жари_ялау..."
+#: src/Resources.vala:294
+#, fuzzy
+#| msgid "Publish"
+msgid "Pu_blish…"
+msgstr "Жариялау"
 
-#: ../src/Resources.vala:299
+#: src/Resources.vala:296
 msgid "Publish to various websites"
 msgstr "Әртүрлі веб сайттарға жариялау"
 
-#: ../src/Resources.vala:301
-msgid "Edit _Title..."
-msgstr "Атауын _түзету..."
+#: src/Resources.vala:298
+#, fuzzy
+#| msgid "Edit Title"
+msgid "Edit _Title…"
+msgstr "Атауды түзету"
 
-#: ../src/Resources.vala:305
-msgid "Edit _Comment..."
-msgstr "Тү_сіндірмені түзету..."
+#. Button label
+#: src/Resources.vala:300
+#, fuzzy
+#| msgid "Edit Title"
+msgctxt "Button Label"
+msgid "Edit Title"
+msgstr "Атауды түзету"
+
+#: src/Resources.vala:302
+#, fuzzy
+#| msgid "Edit Comment"
+msgid "Edit _Comment…"
+msgstr "Түсіндірмені түзету"
 
 #. Button label
-#: ../src/Resources.vala:307
+#: src/Resources.vala:304
 msgid "Edit Comment"
 msgstr "Түсіндірмені түзету"
 
-#: ../src/Resources.vala:309
-msgid "Edit Event _Comment..."
-msgstr "Оқиға тү_сіндірмесін түзету..."
+#: src/Resources.vala:306
+#, fuzzy
+#| msgid "Edit Event Comment"
+msgid "Edit Event _Comment…"
+msgstr "Оқиға түсіндірмесін түзету"
 
-#: ../src/Resources.vala:312
-msgid "_Adjust Date and Time..."
-msgstr "_Күн мен уақытын түзету..."
+#: src/Resources.vala:309
+#, fuzzy
+#| msgid "Adjust Date and Time"
+msgid "_Adjust Date and Time…"
+msgstr "Күн мен уақытын түзету"
 
-#: ../src/Resources.vala:313
+#: src/Resources.vala:310
 msgid "Adjust Date and Time"
 msgstr "Күн мен уақытын түзету"
 
-#: ../src/Resources.vala:315
-msgid "Add _Tags..."
-msgstr "Тегтерді қ_осу..."
+#: src/Resources.vala:312
+#, fuzzy
+#| msgid "Add Tags"
+msgid "Add _Tags…"
+msgstr "Тегтерді қосу"
 
-#: ../src/Resources.vala:316
-msgid "_Add Tags..."
-msgstr "Тегтерді қ_осу..."
+#: src/Resources.vala:313
+#, fuzzy
+#| msgid "Add Tags"
+msgid "_Add Tags…"
+msgstr "Тегтерді қосу"
 
 #. Dialog title
-#. Undo/Redo command name (in Edit menu)
-#: ../src/Resources.vala:318 ../src/Resources.vala:351
+#: src/Resources.vala:315
+#, fuzzy
+#| msgid "Add Tags"
+msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Тегтерді қосу"
 
-#: ../src/Resources.vala:322
+#: src/Resources.vala:319
 msgid "Open With E_xternal Editor"
 msgstr "Сыр_тқы түзетушісімен ашу"
 
-#: ../src/Resources.vala:324
+#: src/Resources.vala:321
 msgid "Open With RA_W Editor"
 msgstr "RAW түзетушісімен ашу"
 
-#: ../src/Resources.vala:326
-msgid "Send _To..."
-msgstr "Қа_йда жіберу..."
+#: src/Resources.vala:323
+#, fuzzy
+#| msgid "Send To"
+msgid "Send _To…"
+msgstr "Қайда жіберу"
 
-#: ../src/Resources.vala:327
-msgid "Send T_o..."
-msgstr "Қа_йда жіберу..."
+#: src/Resources.vala:324
+#, fuzzy
+#| msgid "Send To"
+msgid "Send T_o…"
+msgstr "Қайда жіберу"
 
-#: ../src/Resources.vala:329
-msgid "_Find..."
-msgstr "_Табу..."
+#: src/Resources.vala:326
+#, fuzzy
+#| msgid "_Find"
+msgid "_Find…"
+msgstr "Т_абу"
 
-#: ../src/Resources.vala:330
+#: src/Resources.vala:327
 msgid "Find"
 msgstr "Табу"
 
-#: ../src/Resources.vala:331
+#: src/Resources.vala:328
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Суретті оның аты не тегтеріндегі бар мәтін арқылы табу"
 
-#: ../src/Resources.vala:333
+#: src/Resources.vala:330
 msgid "_Flag"
 msgstr "_Жалауша орнату"
 
-#: ../src/Resources.vala:335
+#: src/Resources.vala:332
 msgid "Un_flag"
 msgstr "Жалау_шаны алып тастау"
 
-#: ../src/Resources.vala:338
+#: src/Resources.vala:335
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Түзетушіні жөнелту мүмкін емес: %s"
 
-#: ../src/Resources.vala:343
-#, c-format
-msgid "Add Tag \"%s\""
+#: src/Resources.vala:340
+#, fuzzy, c-format
+#| msgid "Add Tag \"%s\""
+msgid "Add Tag “%s”"
 msgstr "\"%s\" тегін қосу"
 
 #. Used when adding two tags to photo(s)
-#: ../src/Resources.vala:346
-#, c-format
-msgid "Add Tags \"%s\" and \"%s\""
+#: src/Resources.vala:343
+#, fuzzy, c-format
+#| msgid "Add Tags \"%s\" and \"%s\""
+msgid "Add Tags “%s” and “%s”"
 msgstr "\"%s\" және \"%s\" тегтерін қосу"
 
-#: ../src/Resources.vala:356
-#, c-format
-msgid "_Delete Tag \"%s\""
+#. Undo/Redo command name (in Edit menu)
+#: src/Resources.vala:348
+#, fuzzy
+#| msgid "Add Tags"
+msgctxt "UndoRedo menu entry"
+msgid "Add Tags"
+msgstr "Тегтерді қосу"
+
+#: src/Resources.vala:353
+#, fuzzy, c-format
+#| msgid "_Delete Tag \"%s\""
+msgid "_Delete Tag “%s”"
 msgstr "\"%s\" те_гін өшіру"
 
-#: ../src/Resources.vala:360
-#, c-format
-msgid "Delete Tag \"%s\""
+#: src/Resources.vala:357
+#, fuzzy, c-format
+#| msgid "Delete Tag \"%s\""
+msgid "Delete Tag “%s”"
 msgstr "\"%s\" тегін өшіру"
 
-#: ../src/Resources.vala:363
+#: src/Resources.vala:360
 msgid "Delete Tag"
 msgstr "Тегті өшіру"
 
-#: ../src/Resources.vala:369
-#, c-format
-msgid "Re_name Tag \"%s\"..."
+#: src/Resources.vala:366
+#, fuzzy, c-format
+#| msgid "Re_name Tag \"%s\"..."
+msgid "Re_name Tag “%s”…"
 msgstr "\"%s\" тегінің атын ауыст_ыру..."
 
-#: ../src/Resources.vala:373
-#, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
+#: src/Resources.vala:370
+#, fuzzy, c-format
+#| msgid "Rename Tag \"%s\" to \"%s\""
+msgid "Rename Tag “%s” to “%s”"
 msgstr "\"%s\" тегтің атын \"%s\" етіп орнату"
 
-#: ../src/Resources.vala:376
-msgid "_Rename..."
+#: src/Resources.vala:373
+#, fuzzy
+#| msgid "_Rename..."
+msgid "_Rename…"
 msgstr "_Атын ауыстыру..."
 
-#: ../src/Resources.vala:378
-msgid "Modif_y Tags..."
-msgstr "Те_гтерді түзету..."
+#: src/Resources.vala:375
+#, fuzzy
+#| msgid "Modify Tags"
+msgid "Modif_y Tags…"
+msgstr "Тегті түзету"
 
-#: ../src/Resources.vala:379
+#: src/Resources.vala:376
 msgid "Modify Tags"
 msgstr "Тегті түзету"
 
-#: ../src/Resources.vala:382
-#, c-format
-msgid "Tag Photo as \"%s\""
+#: src/Resources.vala:379
+#, fuzzy, c-format
+#| msgid "Tag Photo as \"%s\""
+msgid "Tag Photo as “%s”"
 msgstr "Фото(лар)ға \"%s\" тегін қосу"
 
-#: ../src/Resources.vala:382
-#, c-format
-msgid "Tag Photos as \"%s\""
+#: src/Resources.vala:379
+#, fuzzy, c-format
+#| msgid "Tag Photos as \"%s\""
+msgid "Tag Photos as “%s”"
 msgstr "Фотоларға \"%s\" тегін орнату"
 
-#: ../src/Resources.vala:386
-#, c-format
-msgid "Tag the selected photo as \"%s\""
+#: src/Resources.vala:383
+#, fuzzy, c-format
+#| msgid "Tag the selected photo as \"%s\""
+msgid "Tag the selected photo as “%s”"
 msgstr "Таңдалған фотоға \"%s\" тегін қосу"
 
-#: ../src/Resources.vala:387
-#, c-format
-msgid "Tag the selected photos as \"%s\""
+#: src/Resources.vala:384
+#, fuzzy, c-format
+#| msgid "Tag the selected photos as \"%s\""
+msgid "Tag the selected photos as “%s”"
 msgstr "Таңдалған фотоларға \"%s\" тегін орнату"
 
-#: ../src/Resources.vala:391
-#, c-format
-msgid "Remove Tag \"%s\" From _Photo"
+#: src/Resources.vala:388
+#, fuzzy, c-format
+#| msgid "Remove Tag \"%s\" From _Photo"
+msgid "Remove Tag “%s” From _Photo"
 msgstr "Фото(лар)дан \"%s\" тегін ө_шіру"
 
-#: ../src/Resources.vala:392
-#, c-format
-msgid "Remove Tag \"%s\" From _Photos"
+#: src/Resources.vala:389
+#, fuzzy, c-format
+#| msgid "Remove Tag \"%s\" From _Photos"
+msgid "Remove Tag “%s” From _Photos"
 msgstr "Фо_толардан \"%s\" тегін өшіру"
 
-#: ../src/Resources.vala:396
-#, c-format
-msgid "Remove Tag \"%s\" From Photo"
+#: src/Resources.vala:393
+#, fuzzy, c-format
+#| msgid "Remove Tag \"%s\" From Photo"
+msgid "Remove Tag “%s” From Photo"
 msgstr "Фото(лар)дан \"%s\" тегін өшіру"
 
-#: ../src/Resources.vala:397
-#, c-format
-msgid "Remove Tag \"%s\" From Photos"
+#: src/Resources.vala:394
+#, fuzzy, c-format
+#| msgid "Remove Tag \"%s\" From Photos"
+msgid "Remove Tag “%s” From Photos"
 msgstr "Фотолардан \"%s\" тегін өшіру"
 
-#: ../src/Resources.vala:401
-#, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
+#: src/Resources.vala:398
+#, fuzzy, c-format
+#| msgid "Unable to rename tag to \"%s\" because the tag already exists."
+msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr ""
 "Тег үшін жаңа \"%s\" атауын орнату мүмкін емес, өйткені ондай тег бар болып "
 "тұр."
 
-#: ../src/Resources.vala:405
-#, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
+#: src/Resources.vala:402
+#, fuzzy, c-format
+#| msgid "Unable to rename search to \"%s\" because the search already exists."
+msgid "Unable to rename search to “%s” because the search already exists."
 msgstr ""
 "Іздеудің атын \"%s\" етіп ауыстыру сәтсіз, өйткені іздеу бар болып тұр."
 
-#: ../src/Resources.vala:408
+#. Saved search button
+#: src/Resources.vala:405 src/SearchFilter.vala:1210
 msgid "Saved Search"
 msgstr "Сақталған іздеу"
 
-#: ../src/Resources.vala:410
+#: src/Resources.vala:407
 msgid "Delete Search"
 msgstr "Іздеуді өшіру"
 
-#: ../src/Resources.vala:413
-msgid "_Edit..."
-msgstr "Тү_зету..."
+#: src/Resources.vala:410
+#, fuzzy
+#| msgid "_Edit"
+msgid "_Edit…"
+msgstr "Тү_зету"
 
-#: ../src/Resources.vala:414
-msgid "Re_name..."
+#: src/Resources.vala:411
+#, fuzzy
+#| msgid "Re_name..."
+msgid "Re_name…"
 msgstr "Ат_ын ауыстыру..."
 
-#: ../src/Resources.vala:417
-#, c-format
-msgid "Rename Search \"%s\" to \"%s\""
+#: src/Resources.vala:414
+#, fuzzy, c-format
+#| msgid "Rename Search \"%s\" to \"%s\""
+msgid "Rename Search “%s” to “%s”"
 msgstr "\"%s\" іздеудің атын \"%s\" етіп ауыстыру"
 
-#: ../src/Resources.vala:421
-#, c-format
-msgid "Delete Search \"%s\""
+#: src/Resources.vala:418
+#, fuzzy, c-format
+#| msgid "Delete Search \"%s\""
+msgid "Delete Search “%s”"
 msgstr "\"%s\" іздеуін өшіру"
 
-#: ../src/Resources.vala:579
+#: src/Resources.vala:576
 #, c-format
 msgid "Rate %s"
 msgstr "%s етіп баға беру"
 
-#: ../src/Resources.vala:580
+#: src/Resources.vala:577
 #, c-format
 msgid "Set rating to %s"
 msgstr "Рейтингін %s етіп орнату"
 
-#: ../src/Resources.vala:581
+#: src/Resources.vala:578
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Рейтинг %s етіп орнатылуда"
 
-#: ../src/Resources.vala:583
+#: src/Resources.vala:580
 #, c-format
 msgid "Display %s"
 msgstr "Көрсету %s"
 
-#: ../src/Resources.vala:584
+#: src/Resources.vala:581
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Тек қана рейтингі %s болатын фотоларды көрсету"
 
-#: ../src/Resources.vala:585
+#: src/Resources.vala:582
 #, c-format
 msgid "%s or Better"
 msgstr "%s не жақсырақ"
 
-#: ../src/Resources.vala:586
+#: src/Resources.vala:583
 #, c-format
 msgid "Display %s or Better"
 msgstr "%s не жақсырақ көрсету"
 
-#: ../src/Resources.vala:587
+#: src/Resources.vala:584
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Тек қана рейтингі %s не одан жақсы болатын фотоларды көрсету"
 
-#: ../src/Resources.vala:678
+#: src/Resources.vala:675
 msgid "Remove the selected photos from the trash"
 msgstr "Таңдалған фотоларды қоқыс шелегінен өшіру"
 
-#: ../src/Resources.vala:679
+#: src/Resources.vala:676
 msgid "Remove the selected photos from the library"
 msgstr "Таңдалған фотоларды жинақтан өшіру"
 
-#: ../src/Resources.vala:681
+#: src/Resources.vala:678
 msgid "_Restore"
 msgstr "Қал_пына келтіру"
 
-#: ../src/Resources.vala:682
+#: src/Resources.vala:679
 msgid "Move the selected photos back into the library"
 msgstr "Таңдалған фотоларды жинаққа қайта апару"
 
-#: ../src/Resources.vala:684
+#: src/Resources.vala:681
 msgid "Show in File Mana_ger"
 msgstr "Файлдар басқарушысында көрсету"
 
-#: ../src/Resources.vala:685
-msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:682
+#, fuzzy
+#| msgid "Open the selected photo's directory in the file manager"
+msgid "Open the selected photo’s directory in the file manager"
 msgstr "Таңдалған фотоның бумасын файлдар басқарушысында ашу"
 
-#: ../src/Resources.vala:688
+#: src/Resources.vala:685
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Файлдар басқарушысында ашу сәтсіз: %s"
 
-#: ../src/Resources.vala:691
+#: src/Resources.vala:688
 msgid "R_emove From Library"
 msgstr "Ж_инақтан өшіру"
 
-#: ../src/Resources.vala:693
+#: src/Resources.vala:690
 msgid "_Move to Trash"
 msgstr "Қоқы_с шелегіне тастау"
 
-#: ../src/Resources.vala:695
+#: src/Resources.vala:692
 msgid "Select _All"
 msgstr "Б_арлығын таңдау"
 
-#: ../src/Resources.vala:696
+#: src/Resources.vala:693
 msgid "Select all items"
 msgstr "Барлық нәрсені таңдау"
 
@@ -3530,1405 +6042,639 @@ msgstr "Барлық нәрсені таңдау"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:775
-msgid "%-I:%M %p"
-msgstr "%-I:%M %p"
-
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:780
-msgid "%-I:%M:%S %p"
-msgstr "%-I:%M:%S %p"
-
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:784
+#: src/Resources.vala:782
 msgid "%a %b %d, %Y"
 msgstr "%a %b %d, %Y"
 
 #. / Locale-specific starting date format for multi-date strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#. / Locale-specific calendar date format for multi-month strings,
-#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:789 ../src/Resources.vala:799
+#: src/Resources.vala:787
+#, fuzzy
+#| msgid "%a %b %d"
+msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:794
+#: src/Resources.vala:792
+#, fuzzy
+#| msgid "%d, %Y"
+msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
-#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
-msgid "Slideshow"
-msgstr "Слайдшоу"
-
-#. Flagged label and toggle
-#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
-msgid "Flagged"
-msgstr "Жалауша бар"
-
-#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
-#: ../src/library/Branch.vala:97
-msgid "Photos"
-msgstr "Фотолар"
-
-#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "Видеолар"
-
-#: ../src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "RAW фотосуреттері"
-
-#: ../src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "RAW фотосуреттері"
-
-#: ../src/SearchFilter.vala:934
-#, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "UI %s файлын жүктеу қатесі: %s"
-
-#. Ticket #3260 - Add a 'close' context menu to
-#. the searchbar.
-#. Prepare the close menu for use, but don't
-#. display it yet; we'll connect it to secondary
-#. click later on.
-#: ../src/SearchFilter.vala:945
-msgid "Close"
-msgstr "Жабу"
-
-#. Type label and toggles
-#: ../src/SearchFilter.vala:951
-msgid "Type"
-msgstr "Түрі"
-
-#. Rating label and button
-#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
-msgid "Rating"
-msgstr "Рейтинг"
-
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Баптаулар"
-
-#. Set up toolbar
-#. add toolbar buttons
-#: ../src/SlideshowPage.vala:160
-msgid "Back"
-msgstr "Артқа"
-
-#: ../src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Алдыңғы фотоға өту"
-
-#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
-msgid "Pause"
-msgstr "Аялдату"
-
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
-msgid "Pause the slideshow"
-msgstr "Слайдшоуды аялдату"
-
-#: ../src/SlideshowPage.vala:174
-msgid "Next"
-msgstr "Келесі"
-
-#: ../src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Келесі фотоға өту"
-
-#: ../src/SlideshowPage.vala:184
-msgid "Change slideshow settings"
-msgstr "Слайдшоу баптауларын өзгерту"
-
-#. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:238
-msgid "All photo source files are missing."
-msgstr "Барлық фотолардың бастапқы файлдары жоқ."
-
-#: ../src/SlideshowPage.vala:270
-msgid "Play"
-msgstr "Ойнату"
-
-#: ../src/SlideshowPage.vala:271
-msgid "Continue the slideshow"
-msgstr "Слайдшоуды жалғастыру"
-
-#: ../src/Tag.vala:817
-msgid "untitled"
-msgstr "атаусыз"
-
-#. multiple videos
-#: ../src/VideoSupport.vala:490
-msgid "Export Videos"
-msgstr "Видеоларды экспорттау"
-
-#: ../src/camera/Branch.vala:85
-msgid "Cameras"
-msgstr "Камералар"
-
-#: ../src/camera/ImportPage.vala:459
-msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
-msgstr ""
-"Камераны тіркеуден босату мүмкін емес. Камераны файлдар басқарушысынан "
-"тіркеуден босатып көріңіз."
-
-#. hide duplicates checkbox
-#: ../src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "Алдыңда импортталған фотоларды жасыру"
-
-#: ../src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "Тек импортталмаған фотоларды көрсету"
-
-#. Ticket #3304 - Import page shouldn't display confusing message
-#. prior to import.
-#. TODO: replace this with approved text for "talking to camera,
-#. please wait" once new strings are being accepted.
-#: ../src/camera/ImportPage.vala:847
-msgid "Starting import, please wait..."
-msgstr "Импортты бастау, күте тұрыңыз..."
-
-#: ../src/camera/ImportPage.vala:886
-msgid "Import _Selected"
-msgstr "Таңд_алғанды импорттау"
-
-#: ../src/camera/ImportPage.vala:887
-msgid "Import the selected photos into your library"
-msgstr "Таңдалған фотоларды жинағыңызға импорттау"
-
-#: ../src/camera/ImportPage.vala:892
-msgid "Import _All"
-msgstr "Барл_ығын импорттау"
-
-#: ../src/camera/ImportPage.vala:893
-msgid "Import all the photos into your library"
-msgstr "Барлық фотоларды жинағыңызға импорттау"
-
-#. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1014
-msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
-msgstr ""
-"Shotwell камераға қолын жеткізу үшін оны алдымен тіркеуден босату керек. "
-"Жалғастыру керек пе?"
-
-#: ../src/camera/ImportPage.vala:1020
-msgid "_Unmount"
-msgstr "_Тіркеуден босату"
-
-#: ../src/camera/ImportPage.vala:1025
-msgid "Please unmount the camera."
-msgstr "Камераны тіркеуден босатыңыз."
-
-#: ../src/camera/ImportPage.vala:1030
-msgid ""
-"The camera is locked by another application.  Shotwell can only access the "
-"camera when it's unlocked.  Please close any other application using the "
-"camera and try again."
-msgstr ""
-"Камераны басқа бір қолданба ұстап тұр. Shotwell камераға тек ол бос кезінде "
-"ғана қолын жеткізе алады. Камераны қолданып тұрған барлық қолданбалады "
-"жабыңыз да, әрекетті қайталап көріңіз."
-
-#: ../src/camera/ImportPage.vala:1040
-msgid "Please close any other application using the camera."
-msgstr "Камераны қолданып тұрған барлық қолданбалады жабыңыз."
-
-#: ../src/camera/ImportPage.vala:1045
-#, c-format
-msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
-msgstr ""
-"Камерадан алдын-ала қарауды алу мүмкін емес:\n"
-"%s"
-
-#: ../src/camera/ImportPage.vala:1062
-msgid "Unmounting..."
-msgstr "Тіркеуден босатылуда..."
-
-#: ../src/camera/ImportPage.vala:1168
-msgid "Fetching photo information"
-msgstr "Фото ақпаратын алу"
-
-#: ../src/camera/ImportPage.vala:1523
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "%s үшін алдын-ала қарауды алу"
-
-#: ../src/camera/ImportPage.vala:1639
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "Камераны блоктау мүмкін емес: %s"
-
-#: ../src/camera/ImportPage.vala:1724
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-msgstr[0] "Камерадан бұл %d фотоны өшіру керек пе?"
-
-#: ../src/camera/ImportPage.vala:1727
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-msgstr[0] "Камерадан бұл %d видеоны өшіру керек пе?"
-
-#: ../src/camera/ImportPage.vala:1730
-#, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-msgstr[0] "Камерадан бұл %d фото/видеоны өшіру керек пе?"
-
-#: ../src/camera/ImportPage.vala:1733
-#, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-msgstr[0] "Бұл %d файлды камерадан өшіру керек пе?"
-
-#: ../src/camera/ImportPage.vala:1760
-msgid "Removing photos/videos from camera"
-msgstr "Камерадан фотолар/видеоларды өшіру"
-
-#: ../src/camera/ImportPage.vala:1764
-#, c-format
-msgid "Unable to delete %d photo/video from the camera due to errors."
-msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
-msgstr[0] "Қателер салдарынан камерадан %d фото/видеоны өшіру мүмкін емес."
-
-#: ../src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "Мәлімет импорты"
-
-#. Send an empty job to the queue to mark the end of the import
-#: ../src/data_imports/DataImportsPluginHost.vala:65
-#: ../src/data_imports/DataImportsPluginHost.vala:78
-#, c-format
-msgid "%s Database"
-msgstr "%s дерекқоры"
-
-#: ../src/data_imports/DataImportsPluginHost.vala:148
-#: ../src/data_imports/DataImportsPluginHost.vala:294
-#, c-format
-msgid "Importing from %s can't continue because an error occurred:"
-msgstr "%s ішінен импорттау мүмкін емес, өйткені қате орын алды:"
-
-#: ../src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-"Басқа қызметтен импорттауды көру үшін, оны жоғарыдағы мәзірден таңдаңыз."
-
-#: ../src/data_imports/DataImportsUI.vala:10
-msgid ""
-"You do not have any data imports plugins enabled.\n"
-"\n"
-"In order to use the Import From Application functionality, you need to have "
-"at least one data imports plugin enabled. Plugins can be enabled in the "
-"Preferences dialog."
-msgstr ""
-"Сізде іске қосулы мәліметтер импорттау плагиндері жоқ.\n"
-"\n"
-"Қолданбадан импорттау мүмкіндігін қолдану үшін, кем дегенде бір мәліметті "
-"импорттау плагинін іске қосыңыз. Плагиндерді Баптаулар сұхбатында іске "
-"қосуға болады."
-
-#: ../src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "Дерекқор файлы:"
-
-#: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:882
-msgid "_Import"
-msgstr "И_мпорттау"
-
-#: ../src/data_imports/DataImportsUI.vala:220
-msgid "Import From Application"
-msgstr "Қолданбадан импорттау"
-
-#: ../src/data_imports/DataImportsUI.vala:221
-msgid "Import media _from:"
-msgstr "Мульт_имедияны қайдан импорттау:"
-
-#: ../src/data_imports/DataImportsUI.vala:408
-#: ../src/publishing/PublishingUI.vala:507
-msgid "_Close"
-msgstr "_Жабу"
-
-#: ../src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "%s фотодерекқорын ашу/жасау сәтсіз: қате коды %d"
-
-#: ../src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"Фотолар дерекқор файлына жазу мүмкін емес:\n"
-" %s"
-
-#: ../src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Дерекқор файлына қатынау қатесі:\n"
-" %s\n"
-"\n"
-"Қате: \n"
-"%s"
-
-#: ../src/db/DatabaseTable.vala:81
-#, c-format
-msgid "Unable to restore photo database %s"
-msgstr "%s фотолар дерекқорын қалпына келтіру мүмкін емес"
-
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Файл"
-
-#: ../src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Фотоны сақтау"
-
-#: ../src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "Қала_йша сақтау..."
-
-#: ../src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Фотоны басқа атауымен сақтау"
-
-#: ../src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Фотоны компьютеріңізге жалғанған принтерден басып шығару"
-
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Фото"
-
-#: ../src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid "%s does not exist."
-msgstr "%s жоқ болып тұр."
-
-#: ../src/direct/DirectPhotoPage.vala:229
-#, c-format
-msgid "%s is not a file."
-msgstr "%s файл емес."
-
-#: ../src/direct/DirectPhotoPage.vala:231
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s келесі үшін файл пішімін қолдамайды:\n"
-"%s."
-
-#: ../src/direct/DirectPhotoPage.vala:427
-msgid "_Save a Copy"
-msgstr "Кө_шірмесін сақтау"
-
-#: ../src/direct/DirectPhotoPage.vala:430
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "%s үшін өзгерістерді жоғалту керек пе?"
-
-#: ../src/direct/DirectPhotoPage.vala:431
-msgid "Close _without Saving"
-msgstr "Сақтамай-ақ _жабу"
-
-#: ../src/direct/DirectPhotoPage.vala:464
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "%s ішіне сақтау қатесі: %s"
-
-#: ../src/direct/DirectPhotoPage.vala:492
-#: ../src/direct/DirectPhotoPage.vala:513
-msgid "Save As"
-msgstr "Қалайша сақтау"
-
-#: ../src/editing_tools/EditingTools.vala:665
-msgid "Return to current photo dimensions"
-msgstr "Фотоның бастапқы өлшемдеріне қайту"
-
-#: ../src/editing_tools/EditingTools.vala:668
-msgid "Set the crop for this photo"
-msgstr "Бұл фотоны қиып жіберу"
-
-#: ../src/editing_tools/EditingTools.vala:680
-msgid "Pivot the crop rectangle between portrait and landscape orientations"
-msgstr "Қиып жіберу аймағын тік не жатық қояды"
-
-#: ../src/editing_tools/EditingTools.vala:753
-msgid "Unconstrained"
-msgstr "Еркін"
-
-#: ../src/editing_tools/EditingTools.vala:754
-msgid "Square"
-msgstr "Шаршы"
-
-#: ../src/editing_tools/EditingTools.vala:755
-msgid "Screen"
-msgstr "Экран"
-
-#: ../src/editing_tools/EditingTools.vala:757
-#: ../src/editing_tools/EditingTools.vala:760
-#: ../src/editing_tools/EditingTools.vala:770
-#: ../src/editing_tools/EditingTools.vala:780
-msgid "-"
-msgstr "-"
-
-#: ../src/editing_tools/EditingTools.vala:758
-msgid "SD Video (4 : 3)"
-msgstr "SD видеосы (4 : 3)"
-
-#: ../src/editing_tools/EditingTools.vala:759
-msgid "HD Video (16 : 9)"
-msgstr "HD видеосы (16 : 9)"
-
-#: ../src/editing_tools/EditingTools.vala:766
-msgid "Letter (8.5 x 11 in.)"
-msgstr "Хат (8.5 x 11 дюйм)"
-
-#: ../src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "Таблоид (11 x 17 дюйм)"
-
-#: ../src/editing_tools/EditingTools.vala:775
-msgid "A4 (210 x 297 mm)"
-msgstr "A4 (210 x 297 мм)"
-
-#: ../src/editing_tools/EditingTools.vala:779
-msgid "A3 (297 x 420 mm)"
-msgstr "A3 (297 x 420 мм)"
-
-#: ../src/editing_tools/EditingTools.vala:1887
-msgid "Close the red-eye tool"
-msgstr "Қызыл көздер сайманын жабу"
-
-#: ../src/editing_tools/EditingTools.vala:1890
-msgid "Remove any red-eye effects in the selected region"
-msgstr "Таңдалған аймақта \"қызыл көздер\" эффектісін өшіру"
-
-#: ../src/editing_tools/EditingTools.vala:2226
-#: ../src/editing_tools/StraightenTool.vala:102
-msgid "_Reset"
-msgstr "_Тастау"
-
-#: ../src/editing_tools/EditingTools.vala:2248
-msgid "Saturation:"
-msgstr "Қаңықтылығы:"
-
-#: ../src/editing_tools/EditingTools.vala:2256
-msgid "Tint:"
-msgstr "Реңі:"
-
-#: ../src/editing_tools/EditingTools.vala:2265
-msgid "Temperature:"
-msgstr "Температура:"
-
-#: ../src/editing_tools/EditingTools.vala:2273
-msgid "Shadows:"
-msgstr "Көлеңкелер:"
-
-#: ../src/editing_tools/EditingTools.vala:2281
-msgid "Highlights:"
-msgstr "Ерекшелеу:"
-
-#: ../src/editing_tools/EditingTools.vala:2335
-msgid "Reset Colors"
-msgstr "Түстерді тастау"
-
-#: ../src/editing_tools/EditingTools.vala:2335
-msgid "Reset all color adjustments to original"
-msgstr "Барлық түстерді келтірудерді бастапқы мәндеріне тастау"
-
-#: ../src/editing_tools/EditingTools.vala:2687
-msgid "Temperature"
-msgstr "Көлеңкелер"
-
-#: ../src/editing_tools/EditingTools.vala:2700
-msgid "Tint"
-msgstr "Реңі"
-
-#: ../src/editing_tools/EditingTools.vala:2713
-msgid "Saturation"
-msgstr "Қаңықтылығы"
-
-#: ../src/editing_tools/EditingTools.vala:2726
-msgid "Exposure"
-msgstr "Экспозиция"
-
-#: ../src/editing_tools/EditingTools.vala:2739
-msgid "Shadows"
-msgstr "Көлеңкелер"
-
-#: ../src/editing_tools/EditingTools.vala:2752
-msgid "Highlights"
-msgstr "Ерекшелеу"
-
-#: ../src/editing_tools/EditingTools.vala:2762
-msgid "Contrast Expansion"
-msgstr "Контраст кеңейтілуі"
-
-#: ../src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Бұрыш:"
-
-#: ../src/events/Branch.vala:25
-msgid "Events"
-msgstr "Оқиғалар"
-
-#: ../src/events/EventDirectoryItem.vala:83
-#, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d фото/видео"
-
-#: ../src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "Оқиға жоқ"
-
-#: ../src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Әр оқиғаның түсіндірмесін көрсету"
-
-#: ../src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "Оқиғалар жоқ"
-
-#: ../src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "Ешбір оқиға табылмады"
-
-#: ../src/events/EventsDirectoryPage.vala:230
-msgid "All Events"
-msgstr "Барлық оқиғалар"
-
-#: ../src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Күні жоқ"
-
-#: ../src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
-
-#: ../src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
-
-#: ../src/folders/Branch.vala:141
-msgid "Folders"
-msgstr "Бумалар"
-
-#: ../src/library/Branch.vala:30 ../src/library/Branch.vala:130
-#: ../ui/shotwell.glade.h:32
-msgid "Library"
-msgstr "Жинақ"
-
-#: ../src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Импорттау..."
-
-#: ../src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "_Импортты тоқтату"
-
-#: ../src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Фотолар импортын тоқтату"
-
-#: ../src/library/ImportQueuePage.vala:124
-msgid "Preparing to import..."
-msgstr "Импортқа дайындау..."
-
-#: ../src/library/ImportQueuePage.vala:151
-#, c-format
-msgid "Imported %s"
-msgstr "Импортталды %s"
-
-#: ../src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Соңғы импорт"
-
-#: ../src/library/LibraryWindow.vala:285
-msgid "_Import From Folder..."
-msgstr "Б_умадан импорттау..."
-
-#: ../src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Фотоларды дисктен жинаққа импорттау"
-
-#: ../src/library/LibraryWindow.vala:293
-msgid "Import From _Application..."
-msgstr "Қ_олданбадан импорттау..."
-
-#: ../src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Оқ_иғаларды сұрыптау"
-
-#: ../src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Қоқ_ыс шелегін тазарту"
-
-#: ../src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Қоқыс шелегінен барлық фотоларды өшіру"
-
-#: ../src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Фото ү_шін оқиғаны қарау"
-
-#: ../src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "Т_абу"
-
-#: ../src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Фото мен видеоларды іздеу шартына сәйкес табу"
-
-#: ../src/library/LibraryWindow.vala:329 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search..."
-msgstr "Ж_аңа сақталған іздеу..."
-
-#: ../src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "Фо_толар"
-
-#: ../src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "Оқ_иғалар"
-
-#: ../src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "Не_гізгі ақпарат"
-
-#: ../src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Таңдалғаны үшін негізгі ақпаратты көрсету"
-
-#: ../src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "Кеңе_йтілген ақпарат"
-
-#: ../src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Таңдалғаны үшін кеңейтілген ақпаратты көрсету"
-
-#: ../src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "Ізд_еу өрісі"
-
-#: ../src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Іздеу өрісін көрсету"
-
-#: ../src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "Бү_йір панелі"
-
-#: ../src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Бүйір панелін көрсету"
-
-#: ../src/library/LibraryWindow.vala:651
-msgid "Import From Folder"
-msgstr "Бумадан импорттау"
-
-#: ../src/library/LibraryWindow.vala:720
-msgid "Empty Trash"
-msgstr "Қоқыс шелегін тазарту"
-
-#: ../src/library/LibraryWindow.vala:720
-msgid "Emptying Trash..."
-msgstr "Қоқыс шелегі тазартылуда..."
-
-#: ../src/library/LibraryWindow.vala:879
-#, c-format
-msgid ""
-"Shotwell is configured to import photos to your home directory.\n"
-"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
-"span>.\n"
-"Do you want to continue importing photos?"
-msgstr ""
-"Shotwell фотоларды сіздің үй бумаңызға импорттауға бапталған.\n"
-"Біз оны <span weight=\"bold\">Түзету %s Баптаулар</span> ішінде өзгертуді "
-"ұсынамыз.\n"
-"Фотоларды импорттауды жалғастыру керек пе?"
-
-#: ../src/library/LibraryWindow.vala:882 ../ui/shotwell.glade.h:18
-msgid "Library Location"
-msgstr "Жинақтың орналасуы"
-
-#. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:895
-msgid "Photos cannot be imported from this directory."
-msgstr "Фотоларды бұл бумадан импорттау мүмкін емес."
-
-#: ../src/library/LibraryWindow.vala:1183
-#, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
-
-#: ../src/library/LibraryWindow.vala:1227
-#: ../src/library/LibraryWindow.vala:1238
-msgid "Updating library..."
-msgstr "Жинақты жаңарту..."
-
-#: ../src/library/LibraryWindow.vala:1244
-msgid "Preparing to auto-import photos..."
-msgstr "Фотоларды автоимпорттауды дайындау..."
-
-#: ../src/library/LibraryWindow.vala:1249
-msgid "Auto-importing photos..."
-msgstr "Фотоларды автоимпорттау..."
-
-#: ../src/library/LibraryWindow.vala:1257
-msgid "Writing metadata to files..."
-msgstr "Файлдарға метаақпаратты жазу..."
-
-#: ../src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Файлдар жоқ"
-
-#: ../src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Өшірілуде..."
-
-#: ../src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Қоқыс шелегі"
-
-#: ../src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "Қоқыс шелегі бос"
-
-#: ../src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Өшіру"
-
-#: ../src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "Фотоларды өшіру"
-
-#: ../src/main.vala:54
-#, c-format
-msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please use the latest version of Shotwell."
-msgstr ""
-"Сіздегі фото жинағыңыз Shotwell-дың осы нұсқасымен үйлеспейді. Ол жинақ "
-"Shotwell %s нұсқасымен жасалған сияқты (схема %d). Қазіргі нұсқасы - %s "
-"(схема %d). Shotwell-дың соңғы нұсқасын қолданыңыз."
-
-#: ../src/main.vala:59
-#, c-format
-msgid ""
-"Shotwell was unable to upgrade your photo library from version %s (schema "
-"%d) to %s (schema %d).  For more information please check the Shotwell Wiki "
-"at %s"
-msgstr ""
-"Shotwell сіздің фото жинағыңызды %s нұсқасынан (схема %d) %s нұсқасына "
-"(схема %d) дейін жаңарта алмады. Көбірек білу үшін Shotwell Wiki оқыңыз: %s"
-
-#: ../src/main.vala:65
-#, c-format
-msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please clear your library by deleting %s and re-import your "
-"photos."
-msgstr ""
-"Сіздегі фото жинағыңыз Shotwell-дың осы нұсқасымен үйлеспейді. Ол жинақ "
-"Shotwell %s нұсқасымен (схема %d) жасалған сияқты. Қазіргі нұсқасы - %s "
-"(схема %d). %s өшіру арқылы жинағыңызды өшіріңіз де, фотоларды қайта "
-"импорттаңыз."
-
-#: ../src/main.vala:71
-#, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr "Shotwell дерекқорын тексеру талабын жасау кезіндегі белгісіз қате: %s"
-
-#: ../src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Shotwell жүктелуде"
-
-#: ../src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "Shotwell жеке деректеріне дейінгі жол"
-
-#: ../src/main.vala:294
-msgid "DIRECTORY"
-msgstr "БУМА"
-
-#: ../src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-msgstr "Жинақ бумасын өзгерістерге бақылап отырмау"
-
-#: ../src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr "Іске қосылу үрдіс жолағын көрсетпеу"
-
-#: ../src/main.vala:306
-msgid "Show the application's version"
-msgstr "Қолданба нұсқасын көрсету"
-
-#. init GTK (valac has already called g_threads_init())
-#: ../src/main.vala:338
-msgid "[FILE]"
-msgstr "[ФАЙЛ]"
-
-#: ../src/main.vala:342
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Командалық жолдың барлық опцияларын қарау үшін '%s --help' енгізіңіз.\n"
-
-#: ../src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
-
-#: ../src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
-
-#: ../src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Төмен (%d%%)"
-
-#: ../src/photos/JfifSupport.vala:188
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Орташа (%d%%)"
-
-#: ../src/photos/JfifSupport.vala:191
-#, c-format
-msgid "High (%d%%)"
-msgstr "Жоғары (%d%%)"
-
-#: ../src/photos/JfifSupport.vala:194
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "Максимум (%d%%)"
-
-#: ../src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
-
-#: ../src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
-
-#: ../src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
-
-#: ../src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "Жариялау"
-
-#: ../src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "Жүктеуге дайындау"
-
-#: ../src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "Жүктелуде %d, барлығы %d"
-
-#: ../src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr "%s ішіне жариялау мүмкін емес, орын алған қате:"
-
-#: ../src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr ""
-"Басқа қызметке жариялап көру үшін, үстіндегі мәзірден біреуін таңдаңыз."
-
-#: ../src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Таңдалған фото/видеолар сәтті жарияланды."
-
-#: ../src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Таңдалған видеолар сәтті жарияланды."
-
-#: ../src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Таңдалған фотолар сәтті жарияланды."
-
-#: ../src/publishing/PublishingUI.vala:112
-msgid "The selected video was successfully published."
-msgstr "Таңдалған видео сәтті жарияланды."
-
-#: ../src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr "Таңдалған фото сәтті жарияланды."
-
-#: ../src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
-msgstr "Тіркелгі ақпараты алынуда..."
-
-#: ../src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "Жүйеге кіру..."
-
-#: ../src/publishing/PublishingUI.vala:188
-msgid "Publish Photos"
-msgstr "Фотоларды жариялау"
-
-#: ../src/publishing/PublishingUI.vala:189
-msgid "Publish photos _to:"
-msgstr "Фотоларды жари_ялау орны:"
-
-#: ../src/publishing/PublishingUI.vala:191
-msgid "Publish Videos"
-msgstr "Видеоларды жариялау"
-
-#: ../src/publishing/PublishingUI.vala:192
-msgid "Publish videos _to"
-msgstr "Видеоларды жари_ялау орны:"
-
-#: ../src/publishing/PublishingUI.vala:194
-msgid "Publish Photos and Videos"
-msgstr "Фото мен видеоларды жариялау"
-
-#: ../src/publishing/PublishingUI.vala:195
-msgid "Publish photos and videos _to"
-msgstr "Фото мен видеоларды жари_ялау орны:"
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/Resources.vala:797
+#, fuzzy
+#| msgid "%a %b %d"
+msgctxt "MultimonthFormat"
+msgid "%a %b %d"
+msgstr "%a %b %d"
 
-#. There are no enabled publishing services that accept this media type,
-#. warn the user.
-#: ../src/publishing/PublishingUI.vala:397
-msgid "Unable to publish"
-msgstr "Жариялау мүмкін емес"
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/Resources.vala:802
+#, fuzzy
+#| msgid "%a %b %d, %Y"
+msgctxt "MultimonthFormat"
+msgid "%a %b %d, %Y"
+msgstr "%a %b %d, %Y"
 
-#: ../src/publishing/PublishingUI.vala:398
-#, c-format
-msgid ""
-"Shotwell cannot publish the selected items because you do not have a "
-"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
-"Preferences</b> and enable one or more of the publishing plugins on the "
-"<b>Plugins</b> tab."
-msgstr ""
-"Shotwell таңдалған нәрселерді жариялай алмайды, өйткені іске қосулы тұрған "
-"үйлесімді жариялау плагині жоқ. Осыны түзету үшін, <b>%s баптауларын түзету</"
-"b> таңдаңыз да, <b>Плагиндер</b> бетінде бір немесе бірнеше жариялау "
-"плагинін іске қосыңыз."
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "Слайдшоу"
 
-#: ../src/searches/Branch.vala:68
+#: src/searches/Branch.vala:68
 msgid "Saved Searches"
 msgstr "Сақталған іздеулер"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:168
 msgid "contains"
 msgstr "құрамында бар"
 
 #. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:169
-#: ../src/searches/SavedSearchDialog.vala:500
+#: src/searches/SavedSearchDialog.vala:169
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is exactly"
 msgstr "дәл сәйкес"
 
-#: ../src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:170
 msgid "starts with"
 msgstr "басталады"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:171
 msgid "ends with"
 msgstr "аяқталады"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:172
 msgid "does not contain"
 msgstr "құрамында жоқ"
 
-#: ../src/searches/SavedSearchDialog.vala:173
-#: ../src/searches/SavedSearchDialog.vala:504
+#: src/searches/SavedSearchDialog.vala:173
+#: src/searches/SavedSearchDialog.vala:504
 msgid "is not set"
 msgstr "орнатылмаған"
 
-#: ../src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:174
 msgid "is set"
 msgstr "орнатылған"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:248
-#: ../src/searches/SavedSearchDialog.vala:379
-#: ../src/searches/SavedSearchDialog.vala:444
+#: src/searches/SavedSearchDialog.vala:248
+#: src/searches/SavedSearchDialog.vala:379
+#: src/searches/SavedSearchDialog.vala:444
 msgid "is"
 msgstr "екен"
 
-#: ../src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:249
 msgid "is not"
 msgstr "емес"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:255
 msgid "any photo"
 msgstr "кез-келген фото"
 
-#: ../src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a raw photo"
 msgstr "raw фото"
 
-#: ../src/searches/SavedSearchDialog.vala:257
+#: src/searches/SavedSearchDialog.vala:257
 msgid "a video"
 msgstr "видео"
 
-#: ../src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has"
 msgstr "бар"
 
-#: ../src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:312
 msgid "has no"
 msgstr "жоқ"
 
-#: ../src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:317
 msgid "modifications"
 msgstr "өзгертулер"
 
-#: ../src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:318
 msgid "internal modifications"
 msgstr "ішкі өзгертулер"
 
-#: ../src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:319
 msgid "external modifications"
 msgstr "сыртқы өзгертулер"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:373
 msgid "flagged"
 msgstr "жалаушасы бар"
 
-#: ../src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:374
 msgid "not flagged"
 msgstr "жалаушасы жоқ"
 
-#: ../src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:437
 msgid "and higher"
 msgstr "және көбірек"
 
-#: ../src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:438
 msgid "only"
 msgstr "тек"
 
-#: ../src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:439
 msgid "and lower"
 msgstr "және азырақ"
 
-#: ../src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is after"
 msgstr "кейін"
 
-#: ../src/searches/SavedSearchDialog.vala:502
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is before"
 msgstr "дейін"
 
-#: ../src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is between"
 msgstr "арасында"
 
-#: ../src/searches/SavedSearchDialog.vala:516
+#: src/searches/SavedSearchDialog.vala:516
 msgid "and"
 msgstr "және"
 
-#: ../src/searches/SavedSearchDialog.vala:697
+#: src/searches/SavedSearchDialog.vala:697
 msgid "Search"
 msgstr "Іздеу"
 
-#: ../src/searches/SavedSearchDialog.vala:702
+#: src/searches/SavedSearchDialog.vala:702
 msgid "Cancel"
 msgstr "Бас тарту"
 
-#: ../src/searches/SavedSearchDialog.vala:703
+#: src/searches/SavedSearchDialog.vala:703
 msgid "OK"
 msgstr "ОК"
 
-#: ../src/searches/SavedSearchDialog.vala:721
+#: src/searches/SavedSearchDialog.vala:721
 msgid "any"
 msgstr "кез-келген"
 
-#: ../src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:722
 msgid "all"
 msgstr "барлығы"
 
-#: ../src/searches/SavedSearchDialog.vala:723
+#: src/searches/SavedSearchDialog.vala:723
 msgid "none"
 msgstr "ешнәрсе"
 
-#: ../src/searches/SearchBoolean.vala:157
+#: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "Кез-келген мәтін"
 
-#: ../src/searches/SearchBoolean.vala:160
+#: src/searches/SearchBoolean.vala:160
 msgid "Title"
 msgstr "Атауы"
 
-#: ../src/searches/SearchBoolean.vala:163
+#: src/searches/SearchBoolean.vala:163
 msgid "Tag"
 msgstr "Тег"
 
-#: ../src/searches/SearchBoolean.vala:166
+#: src/searches/SearchBoolean.vala:166
 msgid "Comment"
 msgstr "Түсіндірме"
 
-#: ../src/searches/SearchBoolean.vala:169
+#: src/searches/SearchBoolean.vala:169
 msgid "Event name"
 msgstr "Оқиға аты"
 
-#: ../src/searches/SearchBoolean.vala:172
+#: src/searches/SearchBoolean.vala:172
 msgid "File name"
 msgstr "Файл аты"
 
-#: ../src/searches/SearchBoolean.vala:175
+#: src/searches/SearchBoolean.vala:175
 msgid "Media type"
 msgstr "Медиа түрі"
 
-#: ../src/searches/SearchBoolean.vala:178
+#: src/searches/SearchBoolean.vala:178
 msgid "Flag state"
 msgstr "Жалауша күйі"
 
-#: ../src/searches/SearchBoolean.vala:181
+#: src/searches/SearchBoolean.vala:181
 msgid "Photo state"
 msgstr "Фотосурет күйі"
 
-#: ../src/searches/SearchBoolean.vala:187
+#. Rating button
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199
+msgid "Rating"
+msgstr "Рейтинг"
+
+#: src/searches/SearchBoolean.vala:187
 msgid "Date"
 msgstr "Күн"
 
-#: ../src/sidebar/Tree.vala:203
-msgid "New _Tag..."
+#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
+msgid "Videos"
+msgstr "Видеолар"
+
+#: src/SearchFilter.vala:620
+msgid "RAW Photos"
+msgstr "RAW фотосуреттері"
+
+#: src/SearchFilter.vala:621
+msgid "RAW photos"
+msgstr "RAW фотосуреттері"
+
+#: src/SearchFilter.vala:1148
+#, c-format
+msgid "Error loading UI file %s: %s"
+msgstr "UI %s файлын жүктеу қатесі: %s"
+
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: src/SearchFilter.vala:1159
+msgid "Close"
+msgstr "Жабу"
+
+#. Type label and toggles
+#: src/SearchFilter.vala:1165
+msgid "Type"
+msgstr "Түрі"
+
+#: src/SearchFilter.vala:1211
+msgid "Use a saved search to filter items in the current view"
+msgstr ""
+
+#: src/sidebar/Tree.vala:203
+#, fuzzy
+#| msgid "New _Tag..."
+msgid "New _Tag…"
 msgstr "Жаңа _тег..."
 
-#: ../src/slideshow/Slideshow.vala:22
+#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
+msgid "Settings"
+msgstr "Баптаулар"
+
+#. Set up toolbar
+#. add toolbar buttons
+#: src/SlideshowPage.vala:160
+msgid "Back"
+msgstr "Артқа"
+
+#: src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "Алдыңғы фотоға өту"
+
+#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+msgid "Pause"
+msgstr "Аялдату"
+
+#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+msgid "Pause the slideshow"
+msgstr "Слайдшоуды аялдату"
+
+#: src/SlideshowPage.vala:174
+msgid "Next"
+msgstr "Келесі"
+
+#: src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "Келесі фотоға өту"
+
+#: src/SlideshowPage.vala:184
+msgid "Change slideshow settings"
+msgstr "Слайдшоу баптауларын өзгерту"
+
+#. An entire slideshow set might be missing, so check for a loop.
+#: src/SlideshowPage.vala:238
+msgid "All photo source files are missing."
+msgstr "Барлық фотолардың бастапқы файлдары жоқ."
+
+#: src/SlideshowPage.vala:270
+msgid "Play"
+msgstr "Ойнату"
+
+#: src/SlideshowPage.vala:271
+msgid "Continue the slideshow"
+msgstr "Слайдшоуды жалғастыру"
+
+#: src/slideshow/Slideshow.vala:22
 msgid "Slideshow Transitions"
 msgstr "Слайдшоу эффектілері"
 
-#: ../src/slideshow/TransitionEffects.vala:98
+#: src/slideshow/TransitionEffects.vala:98
 msgid "(None)"
 msgstr "(Ешнәрсе)"
 
-#: ../src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287
 msgid "None"
 msgstr "Ешнәрсе"
 
-#: ../src/slideshow/TransitionEffects.vala:339
+#: src/slideshow/TransitionEffects.vala:339
 msgid "Random"
 msgstr "Кездейсоқ"
 
-#: ../src/tags/Branch.vala:131
+#: src/tags/Branch.vala:131
 msgid "Tags"
 msgstr "Тегтер"
 
-#: ../ui/set_background_dialog.glade.h:1
+#: src/Tag.vala:830
+msgid "untitled"
+msgstr "атаусыз"
+
+#. multiple videos
+#: src/VideoSupport.vala:490
+msgid "Export Videos"
+msgstr "Видеоларды экспорттау"
+
+#: ui/set_background_dialog.ui:15
 msgid "Set as Desktop Background"
 msgstr "Жұмыс үстел тұсқағазы ретінде орнату"
 
-#: ../ui/set_background_dialog.glade.h:2
-#: ../ui/set_background_slideshow_dialog.glade.h:6
+#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
 msgid "Use for Desktop"
 msgstr "Жұмыс үстелі үшін қолдану"
 
-#: ../ui/set_background_dialog.glade.h:3
-#: ../ui/set_background_slideshow_dialog.glade.h:7
+#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
 msgid "Use for Lock Screen"
 msgstr "Блоктау экраны үшін қолдану"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:1
+#: ui/set_background_slideshow_dialog.ui:15
 msgid "Set as Desktop Slideshow"
 msgstr "Жұмыс үстел слайдшоуы ретінде орнату"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:2
+#: ui/set_background_slideshow_dialog.ui:33
 msgid "Show each photo for"
 msgstr "Әр фото көрсету мерзімі"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:3
+#: ui/set_background_slideshow_dialog.ui:45
 msgid "period of time"
 msgstr "уақыт аралығы"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:4
+#: ui/set_background_slideshow_dialog.ui:94
 msgid "Generate desktop background slideshow"
 msgstr "Жұмыс үстел тұсқағаз слайдшоуын жасау"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:5
+#: ui/set_background_slideshow_dialog.ui:115
 msgid "How long each photo is shown on the desktop background"
 msgstr "Әр фото жұмыс үстелдің түсқағазы ретінде тұратын уақыты"
 
-#: ../ui/shotwell.glade.h:1
+#: ui/shotwell.ui:23
 msgid "_Name of search:"
 msgstr "Ізд_еудің аты:"
 
-#: ../ui/shotwell.glade.h:2
+#: ui/shotwell.ui:81
 msgid "_Match"
 msgstr "_Сәйкес"
 
-#: ../ui/shotwell.glade.h:3
+#: ui/shotwell.ui:108
 msgid "of the following:"
 msgstr "келесінің:"
 
-#: ../ui/shotwell.glade.h:4
+#: ui/shotwell.ui:195
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Басылып шығарылатын сурет өлшемі</b>"
 
-#: ../ui/shotwell.glade.h:5
+#: ui/shotwell.ui:212
 msgid "Use a _standard size:"
 msgstr "Қалы_пты өлшемді қолдану:"
 
-#: ../ui/shotwell.glade.h:6
+#: ui/shotwell.ui:255
 msgid "Use a c_ustom size:"
 msgstr "Таңдау_ыңызша өлшемді қолдану:"
 
-#: ../ui/shotwell.glade.h:7
+#: ui/shotwell.ui:345
 msgid "_Match photo aspect ratio"
 msgstr "_Фото жақтарының қатынасын сақтау"
 
-#: ../ui/shotwell.glade.h:8
+#: ui/shotwell.ui:369
 msgid "_Autosize:"
 msgstr "_Автоөлшем:"
 
-#: ../ui/shotwell.glade.h:9
+#: ui/shotwell.ui:409
 msgid "<b>Titles</b>"
 msgstr "<b>Атаулар</b>"
 
-#: ../ui/shotwell.glade.h:10
+#: ui/shotwell.ui:426
 msgid "Print image _title"
 msgstr "Сурет ат_ауын да баспаға шығару"
 
-#: ../ui/shotwell.glade.h:11
+#: ui/shotwell.ui:470
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Пиксель шешімділігі</b>"
 
-#: ../ui/shotwell.glade.h:12
+#: ui/shotwell.ui:490
 msgid "_Output photo at:"
 msgstr "Фото_ны қайда сақтау:"
 
-#: ../ui/shotwell.glade.h:13
+#: ui/shotwell.ui:525
 msgid "pixels per inch"
 msgstr "дюймге пиксель"
 
-#: ../ui/shotwell.glade.h:15
+#: ui/shotwell.ui:559
+msgid "label"
+msgstr "белгі"
+
+#: ui/shotwell.ui:681
 msgid "Shotwell Preferences"
 msgstr "Shotwell баптаулары"
 
-#: ../ui/shotwell.glade.h:16
+#: ui/shotwell.ui:730
 msgid "white"
 msgstr "ақ"
 
-#: ../ui/shotwell.glade.h:17
+#: ui/shotwell.ui:757
 msgid "black"
 msgstr "қара"
 
-#: ../ui/shotwell.glade.h:19
+#: ui/shotwell.ui:805
 msgid "_Watch library directory for new files"
 msgstr "Жинақ бу_масын жаңа файлдарға бақылау"
 
-#: ../ui/shotwell.glade.h:20
+#: ui/shotwell.ui:834
 msgid "Metadata"
 msgstr "Метаақпарат"
 
-#: ../ui/shotwell.glade.h:21
+#: ui/shotwell.ui:854
 msgid "Write tags, titles, and other _metadata to photo files"
 msgstr "Фото файлдарына тег, атау және басқа ме_таақпаратты жазу"
 
-#: ../ui/shotwell.glade.h:22
+#: ui/shotwell.ui:880
 msgid "Display"
 msgstr "Көрсету"
 
-#: ../ui/shotwell.glade.h:23
+#: ui/shotwell.ui:901
 msgid "_Import photos to:"
 msgstr "Фотоларды қа_йда импорттау:"
 
-#: ../ui/shotwell.glade.h:24
+#: ui/shotwell.ui:924
 msgid "_Background:"
 msgstr "_Фон:"
 
-#: ../ui/shotwell.glade.h:25
+#: ui/shotwell.ui:947
 msgid "Importing"
 msgstr "Импорттау"
 
-#: ../ui/shotwell.glade.h:26
+#: ui/shotwell.ui:970
 msgid "_Directory structure:"
 msgstr "Бу_ма құрылысы:"
 
-#: ../ui/shotwell.glade.h:27
+#: ui/shotwell.ui:1009
 msgid "_Pattern:"
 msgstr "_Шаблон:"
 
-#: ../ui/shotwell.glade.h:28
+#: ui/shotwell.ui:1091
 msgid "Example:"
 msgstr "Мысалы:"
 
-#: ../ui/shotwell.glade.h:29
+#: ui/shotwell.ui:1108
 msgid "R_ename imported files to lowercase"
 msgstr "Имп_ортталатын файлдар аттарын төменгі регистрге келтіру"
 
-#: ../ui/shotwell.glade.h:30
+#: ui/shotwell.ui:1137
 msgid "RAW Developer"
 msgstr "RAW өндіруші"
 
-#: ../ui/shotwell.glade.h:31
+#: ui/shotwell.ui:1172
 msgid "De_fault:"
 msgstr "Ба_стапқы:"
 
-#: ../ui/shotwell.glade.h:33
+#: ui/shotwell.ui:1226
 msgid "E_xternal photo editor:"
 msgstr "С_ыртқы фото түзетушісі:"
 
-#: ../ui/shotwell.glade.h:34
+#: ui/shotwell.ui:1242
 msgid "External _RAW editor:"
 msgstr "С_ыртқы RAW түзетушісі:"
 
-#: ../ui/shotwell.glade.h:35
+#: ui/shotwell.ui:1307
 msgid "External Editors"
 msgstr "Сыртқы түзетушілер"
 
-#: ../ui/shotwell.glade.h:36
+#: ui/shotwell.ui:1334
 msgid "Plugins"
 msgstr "Плагиндер"
 
-#: ../ui/shotwell.glade.h:37
+#: ui/shotwell.ui:1400
 msgid "_Delay:"
 msgstr "_Аралық:"
 
-#: ../ui/shotwell.glade.h:38
+#: ui/shotwell.ui:1416
 msgid "_Transition effect:"
 msgstr "Алма_су эффекті:"
 
-#: ../ui/shotwell.glade.h:39
+#: ui/shotwell.ui:1432
 msgid "Transition d_elay:"
 msgstr "Алмасу ара_лығы:"
 
-#: ../ui/shotwell.glade.h:40
+#: ui/shotwell.ui:1444
 msgid "Show t_itle"
 msgstr "А_тауын көрсету"
 
-#: ../ui/shotwell.glade.h:41
+#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
 msgid "seconds"
 msgstr "секунд"
 
+#~ msgid "Login"
+#~ msgstr "Кіру"
+
+#~ msgid "Intro message replaced at runtime"
+#~ msgstr "Орындалу кезінде алмастырылатын қарсы алу хабарламасы"
+
+#~ msgid "'Publishing to $url as $username' (populated in application code)"
+#~ msgstr ""
+#~ "'$url қызметіне $username ретінде жариялау' (қолданба коды ішінде "
+#~ "толтырылады)"
+
+#~ msgid "you are logged in rajce as $name"
+#~ msgstr "Сіз rajce қызметіне %s ретінде кірдіңіз"
+
+#~ msgid "$mediatype will appear in"
+#~ msgstr "$mediatype жарияланатын жері"
+
+#~ msgid "Save Details..."
+#~ msgstr "Ақпаратын сақтау..."
+
+#~ msgid "Set as _Desktop Slideshow..."
+#~ msgstr "Жұмыс үс_тел слайдшоуы ретінде орнату..."
+
+#~ msgid "Re_name Event..."
+#~ msgstr "Оқ_иға атауын өзгерту..."
+
+#~ msgid "_Export..."
+#~ msgstr "_Экспорт..."
+
+#~ msgid "_Print..."
+#~ msgstr "Бас_паға шығару..."
+
+#~ msgid "Pu_blish..."
+#~ msgstr "Жари_ялау..."
+
+#~ msgid "Edit _Title..."
+#~ msgstr "Атауын _түзету..."
+
+#~ msgid "Edit _Comment..."
+#~ msgstr "Тү_сіндірмені түзету..."
+
+#~ msgid "Edit Event _Comment..."
+#~ msgstr "Оқиға тү_сіндірмесін түзету..."
+
+#~ msgid "_Adjust Date and Time..."
+#~ msgstr "_Күн мен уақытын түзету..."
+
+#~ msgid "Add _Tags..."
+#~ msgstr "Тегтерді қ_осу..."
+
+#~ msgid "_Add Tags..."
+#~ msgstr "Тегтерді қ_осу..."
+
+#~ msgid "Send _To..."
+#~ msgstr "Қа_йда жіберу..."
+
+#~ msgid "Send T_o..."
+#~ msgstr "Қа_йда жіберу..."
+
+#~ msgid "_Find..."
+#~ msgstr "_Табу..."
+
+#~ msgid "Modif_y Tags..."
+#~ msgstr "Те_гтерді түзету..."
+
+#~ msgid "_Edit..."
+#~ msgstr "Тү_зету..."
+
+#~ msgid "%-I:%M %p"
+#~ msgstr "%-I:%M %p"
+
+#~ msgid "%-I:%M:%S %p"
+#~ msgstr "%-I:%M:%S %p"
+
+#~ msgid "Save _As..."
+#~ msgstr "Қала_йша сақтау..."
+
+#~ msgid "Importing..."
+#~ msgstr "Импорттау..."
+
+#~ msgid "Preparing to import..."
+#~ msgstr "Импортқа дайындау..."
+
+#~ msgid "_Import From Folder..."
+#~ msgstr "Б_умадан импорттау..."
+
+#~ msgid "Import From _Application..."
+#~ msgstr "Қ_олданбадан импорттау..."
+
 #~ msgid "Copyright 2009-2015 Yorba Foundation"
 #~ msgstr "Copyright 2009-2015 Yorba Foundation"
 
diff --git a/po/lv.gmo b/po/lv.gmo
index 077c269..8a9ceec 100644
--- a/po/lv.gmo
+++ b/po/lv.gmo
diff --git a/po/lv.po b/po/lv.po
index 1ed8f11..1ac9446 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=shotwell"
 "&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-08-24 19:05+0000\n"
-"PO-Revision-Date: 2016-08-25 11:39+0200\n"
+"POT-Creation-Date: 2016-10-08 14:29+0000\n"
+"PO-Revision-Date: 2016-11-08 22:33+0200\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "Language: lv\n"
@@ -35,12 +35,19 @@ msgid "Popular photo manager"
 msgstr "Populārs fotogrāfiju pārvaldnieks"
 
 #: misc/shotwell.appdata.xml.in:11
+#| msgid ""
+#| "Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
+#| "desktop. It allows you to import photos from your camera or disk, "
+#| "organize them by date and subject matter, even ratings. It also offers "
+#| "basic photo editing, like crop, red-eye correction, color adjustments, "
+#| "and straighten. Shotwell's non-destructive photo editor does not alter "
+#| "your master photos, making it easy to experiment and correct errors."
 msgid ""
 "Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
 "desktop. It allows you to import photos from your camera or disk, organize "
 "them by date and subject matter, even ratings. It also offers basic photo "
 "editing, like crop, red-eye correction, color adjustments, and straighten. "
-"Shotwell's non-destructive photo editor does not alter your master photos, "
+"Shotwell’s non-destructive photo editor does not alter your master photos, "
 "making it easy to experiment and correct errors."
 msgstr ""
 "Shotwell ir ātrs, viegli lietojams fotogrāfiju organizētājs, veidots GNOME "
@@ -120,7 +127,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "Slepenais marķieris, ar ko parakstīt oauth pieprasījumus"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:486
 msgid "default size"
 msgstr "noklusējuma izmērs"
 
@@ -148,9 +155,9 @@ msgid "URL of the Rajce server."
 msgstr "Rajce servera URL."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:384
-#: misc/org.yorba.shotwell.gschema.xml:442
-#: misc/org.yorba.shotwell.gschema.xml:498
+#: misc/org.yorba.shotwell.gschema.xml:454
+#: misc/org.yorba.shotwell.gschema.xml:512
+#: misc/org.yorba.shotwell.gschema.xml:568
 msgid "username"
 msgstr "lietotājvārds"
 
@@ -167,7 +174,7 @@ msgid "user token, if remembered."
 msgstr "lietotāja marķieris, ja ir iegaumēts."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "last category"
 msgstr "pēdējā kategorija"
 
@@ -176,7 +183,7 @@ msgid "The last selected Rajce category."
 msgstr "Pēdējā izvēlētā Rajce kategorija."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:472
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last photo size"
 msgstr "pēdējais fotogrāfijas izmērs"
 
@@ -216,11 +223,11 @@ msgstr ""
 "augšupielādēšanas."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:364
-#: misc/org.yorba.shotwell.gschema.xml:402
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:478
-#: misc/org.yorba.shotwell.gschema.xml:522
+#: misc/org.yorba.shotwell.gschema.xml:434
+#: misc/org.yorba.shotwell.gschema.xml:472
+#: misc/org.yorba.shotwell.gschema.xml:498
+#: misc/org.yorba.shotwell.gschema.xml:548
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "remove sensitive info from uploads"
 msgstr "Izņemt sensitīvo informāciju pirms augšupielādēt"
 
@@ -230,52 +237,52 @@ msgid ""
 "first"
 msgstr "Vai, pirms augšupielādēt uz Rajce, no attēliem jāizņem metadati"
 
-#: misc/org.yorba.shotwell.gschema.xml:22
+#: misc/org.yorba.shotwell.gschema.xml:23
 msgid "display basic properties"
 msgstr "rādīt pamata īpašības"
 
-#: misc/org.yorba.shotwell.gschema.xml:23
+#: misc/org.yorba.shotwell.gschema.xml:24
 msgid "True if the basic properties pane is to be displayed, false otherwise."
 msgstr "Patiess, ja ir jāattēlo pamata īpašību rūti, citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:28
+#: misc/org.yorba.shotwell.gschema.xml:29
 msgid "display extended properties"
 msgstr "rādīt paplašinātās īpašības"
 
-#: misc/org.yorba.shotwell.gschema.xml:29
+#: misc/org.yorba.shotwell.gschema.xml:30
 msgid ""
 "True if the extended properties window is to be displayed, false otherwise."
 msgstr "Patiess, ja ir jāattēlo paplašināto īpašību rūti, citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:34
+#: misc/org.yorba.shotwell.gschema.xml:35
 msgid "display sidebar"
 msgstr "rādīt sānu joslu"
 
-#: misc/org.yorba.shotwell.gschema.xml:35
+#: misc/org.yorba.shotwell.gschema.xml:36
 msgid "True if the sidebar is to be displayed, false otherwise."
 msgstr "Patiess, ja ir jāattēlo sānu josla, citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:40
+#: misc/org.yorba.shotwell.gschema.xml:41
 msgid "display toolbar"
 msgstr "rādīt rīkjoslu"
 
-#: misc/org.yorba.shotwell.gschema.xml:41
+#: misc/org.yorba.shotwell.gschema.xml:42
 msgid "True if the bottom toolbar is to be displayed, false otherwise."
 msgstr "Patiess, ja ir jāattēlo rīkjosla, citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:46
+#: misc/org.yorba.shotwell.gschema.xml:47
 msgid "display search bar"
 msgstr "rādīt meklēšanas joslu"
 
-#: misc/org.yorba.shotwell.gschema.xml:47
+#: misc/org.yorba.shotwell.gschema.xml:48
 msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
 msgstr "Patiess, ja ir jāattēlo meklēšanas/filtra josla, citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:52
+#: misc/org.yorba.shotwell.gschema.xml:53
 msgid "display photo titles"
 msgstr "rādīt fotogrāfiju nosaukumus"
 
-#: misc/org.yorba.shotwell.gschema.xml:53
+#: misc/org.yorba.shotwell.gschema.xml:54
 msgid ""
 "True if photo titles are to be displayed beneath thumbnails in collection "
 "views, false otherwise."
@@ -283,11 +290,11 @@ msgstr ""
 "Patiess, ja fotogrāfiju nosaukumus kolekciju skatā jāattēlo zem sīktēliem, "
 "citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:58
+#: misc/org.yorba.shotwell.gschema.xml:59
 msgid "display photo comments"
 msgstr "rādīt fotogrāfiju komentārus"
 
-#: misc/org.yorba.shotwell.gschema.xml:59
+#: misc/org.yorba.shotwell.gschema.xml:60
 msgid ""
 "True if photo comments are to be displayed beneath thumbnails in collection "
 "views, false otherwise."
@@ -295,11 +302,11 @@ msgstr ""
 "Patiess, ja fotogrāfiju komentārus kolekciju skatā jāattēlo zem sīktēliem, "
 "citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:64
+#: misc/org.yorba.shotwell.gschema.xml:65
 msgid "display event comments"
 msgstr "rādīt notikumu komentārus"
 
-#: misc/org.yorba.shotwell.gschema.xml:65
+#: misc/org.yorba.shotwell.gschema.xml:66
 msgid ""
 "True if event comments are to be displayed beneath thumbnails in event "
 "views, false otherwise."
@@ -307,11 +314,11 @@ msgstr ""
 "Patiess, ja notikumu komentārus notikumu skatā jāattēlo zem sīktēliem, "
 "citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:70
+#: misc/org.yorba.shotwell.gschema.xml:71
 msgid "display photo tags"
 msgstr "rādīt fotogrāfiju tagus"
 
-#: misc/org.yorba.shotwell.gschema.xml:71
+#: misc/org.yorba.shotwell.gschema.xml:72
 msgid ""
 "True if photo tags are to be listed beneath thumbnails in collection views, "
 "false otherwise."
@@ -319,23 +326,26 @@ msgstr ""
 "Patiess, ja fotogrāfiju tagus kolekciju skatā jāattēlo zem sīktēliem, citādi "
 "aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:76
+#: misc/org.yorba.shotwell.gschema.xml:77
 msgid "display photo ratings"
 msgstr "rādīt fotogrāfiju vērtējumus"
 
-#: misc/org.yorba.shotwell.gschema.xml:77
+#: misc/org.yorba.shotwell.gschema.xml:78
+#| msgid ""
+#| "True if a photo's rating should be displayed as overlaid trinket, false "
+#| "otherwise."
 msgid ""
-"True if a photo's rating should be displayed as overlaid trinket, false "
+"True if a photo’s rating should be displayed as overlaid trinket, false "
 "otherwise."
 msgstr ""
 "Patiess, ja fotogrāfiju vērtējumus kolekciju skatā jāattēlo zem sīktēliem, "
 "citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:82
+#: misc/org.yorba.shotwell.gschema.xml:83
 msgid "rating filter level"
 msgstr "vērtējumu filtra līmenis"
 
-#: misc/org.yorba.shotwell.gschema.xml:83
+#: misc/org.yorba.shotwell.gschema.xml:84
 msgid ""
 "Determines how to filter photos based on their ratings. 1: Rejected or "
 "better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
@@ -346,57 +356,57 @@ msgstr ""
 "vai labākas, 5: trīs zvaigznes vai labākas, 6: četras zvaigznes vai labākas, "
 "7: piecas zvaigzne vai labākas."
 
-#: misc/org.yorba.shotwell.gschema.xml:88
+#: misc/org.yorba.shotwell.gschema.xml:89
 msgid "sort events ascending"
 msgstr "kārtot notikumus augoši"
 
-#: misc/org.yorba.shotwell.gschema.xml:89
+#: misc/org.yorba.shotwell.gschema.xml:90
 msgid "True if events should be sorted ascending, false if descending."
 msgstr "Patiess, ja notikumiem jābūt augošā secībā; aplams, ja dilstošā."
 
-#: misc/org.yorba.shotwell.gschema.xml:94
+#: misc/org.yorba.shotwell.gschema.xml:95
 msgid "sort library photos ascending"
 msgstr "kārtot bibliotēkas fotogrāfijas augošā secībā"
 
-#: misc/org.yorba.shotwell.gschema.xml:95
+#: misc/org.yorba.shotwell.gschema.xml:96
 msgid "True if library photos should be sorted ascending, false if descending."
 msgstr ""
 "Patiess, ja bibliotēkas fotogrāfijām jābūt augošā secībā; aplams, ja "
 "dilstošā."
 
-#: misc/org.yorba.shotwell.gschema.xml:100
+#: misc/org.yorba.shotwell.gschema.xml:101
 msgid "sort library photos criteria"
 msgstr "bibliotēkas fotogrāfiju kārtošanas kritērijs"
 
-#: misc/org.yorba.shotwell.gschema.xml:101
+#: misc/org.yorba.shotwell.gschema.xml:102
 msgid ""
 "A numeric code that specifies the sort criteria for photos in library views."
 msgstr ""
 "Skaitlisks kods, kas norāda kārtošanas kritēriju fotogrāfijām bibliotēkas "
 "skatos."
 
-#: misc/org.yorba.shotwell.gschema.xml:106
+#: misc/org.yorba.shotwell.gschema.xml:107
 msgid "sort event photos ascending"
 msgstr "kārtot notikumu fotogrāfijas augošā secībā"
 
-#: misc/org.yorba.shotwell.gschema.xml:107
+#: misc/org.yorba.shotwell.gschema.xml:108
 msgid "True if event photos should be sorted ascending, false if descending."
 msgstr ""
 "Patiess, ja notikumu fotogrāfijām jābūt augošā secībā; aplams, ja dilstošā."
 
-#: misc/org.yorba.shotwell.gschema.xml:112
+#: misc/org.yorba.shotwell.gschema.xml:113
 msgid "sort event photos criteria"
 msgstr "kritērijs notikumu fotogrāfiju kārtošanai"
 
-#: misc/org.yorba.shotwell.gschema.xml:113
+#: misc/org.yorba.shotwell.gschema.xml:114
 msgid "Specifies the sort criteria for event photos."
 msgstr "Norāda kārtošana kritēriju notikumu fotogrāfijām."
 
-#: misc/org.yorba.shotwell.gschema.xml:118
+#: misc/org.yorba.shotwell.gschema.xml:119
 msgid "use 24 hour time"
 msgstr "izmantot 24 stundu laiku"
 
-#: misc/org.yorba.shotwell.gschema.xml:119
+#: misc/org.yorba.shotwell.gschema.xml:120
 msgid ""
 "True if should display times with a 24 hour clock, false if times should use "
 "AM/PM notation."
@@ -404,11 +414,11 @@ msgstr ""
 "Patiess,ja laiku vajadzētu attēlot ar 24 stundu pulksteni, aplams, ja "
 "jāizmanto AM/PM notācija."
 
-#: misc/org.yorba.shotwell.gschema.xml:124
+#: misc/org.yorba.shotwell.gschema.xml:125
 msgid "keep relative time between photos"
 msgstr "paturēt relatīvo laiku starp fotogrāfijām"
 
-#: misc/org.yorba.shotwell.gschema.xml:125
+#: misc/org.yorba.shotwell.gschema.xml:126
 msgid ""
 "True if when adjusting time/date of photos, relative time should be "
 "maintained. False if all photos should be set to the same time."
@@ -416,11 +426,11 @@ msgstr ""
 "Patiess, ja jāsaglabā relatīvais laiks, mainot fotogrāfiju laiku/datumu. "
 "Aplams, ja visām fotogrāfijām jāpiemēro vienāds laiks."
 
-#: misc/org.yorba.shotwell.gschema.xml:130
+#: misc/org.yorba.shotwell.gschema.xml:131
 msgid "modify original photo files"
 msgstr "mainīt sākotnējo fotogrāfiju datnes"
 
-#: misc/org.yorba.shotwell.gschema.xml:131
+#: misc/org.yorba.shotwell.gschema.xml:132
 msgid ""
 "True if when adjusting time/date of photos, the original files should be "
 "modified as well. False if changes are made only in the database."
@@ -428,11 +438,11 @@ msgstr ""
 "Patiess, ja pielāgojot fotogrāfiju datumus/laikus, tiks koriģētas arī "
 "sākotnējās datnes. Aplams, ja izmaiņas ir jāveic tikai datubāzē."
 
-#: misc/org.yorba.shotwell.gschema.xml:136
+#: misc/org.yorba.shotwell.gschema.xml:137
 msgid "show welcome dialog on startup"
 msgstr "palaižot lietotni, rādīt sveiciena dialoglodziņu"
 
-#: misc/org.yorba.shotwell.gschema.xml:137
+#: misc/org.yorba.shotwell.gschema.xml:138
 msgid ""
 "True if, when on startup, a welcome dialog should be shown. False if it "
 "should not be shown."
@@ -440,139 +450,143 @@ msgstr ""
 "Ja patiess, palaižot lietotni jārāda sveiciena dialoglodziņš. Aplams, ja to "
 "nav jārāda."
 
-#: misc/org.yorba.shotwell.gschema.xml:142
+#: misc/org.yorba.shotwell.gschema.xml:143
 msgid "sidebar position"
 msgstr "sānu joslas novietojums"
 
-#: misc/org.yorba.shotwell.gschema.xml:143
+#: misc/org.yorba.shotwell.gschema.xml:144
 msgid "The width, in pixels, of the sidebar"
 msgstr "Sānu joslas platums, pikseļos."
 
-#: misc/org.yorba.shotwell.gschema.xml:148
+#: misc/org.yorba.shotwell.gschema.xml:149
 msgid "photo thumbnail scale"
 msgstr "fotogrāfiju sīktēlu mērogs"
 
-#: misc/org.yorba.shotwell.gschema.xml:149
+#: misc/org.yorba.shotwell.gschema.xml:150
 msgid "The scale of photo thumbnails, ranging from 72 to 360."
 msgstr "Fotogrāfiju sīktēlu mērogs, intervālā no 72 līdz 360."
 
-#: misc/org.yorba.shotwell.gschema.xml:154
+#: misc/org.yorba.shotwell.gschema.xml:155
 msgid "pin toolbar state"
 msgstr "nofiksēt rīkjoslas stāvokli"
 
-#: misc/org.yorba.shotwell.gschema.xml:155
+#: misc/org.yorba.shotwell.gschema.xml:156
 msgid "Pin toolbar in fullscreen, or not."
 msgstr "Nofiksēt rīkjoslu pilnekrānā, vai arī nē."
 
-#: misc/org.yorba.shotwell.gschema.xml:160
+#: misc/org.yorba.shotwell.gschema.xml:161
 msgid "background color"
 msgstr "fona krāsa"
 
-#: misc/org.yorba.shotwell.gschema.xml:161
+#: misc/org.yorba.shotwell.gschema.xml:162
 msgid "A grayscale color for use as the background color."
 msgstr "Pelēktoņu krāsa, ko izmantot kā fona krāsu."
 
-#: misc/org.yorba.shotwell.gschema.xml:166
-msgid "Selection state of \"hide photos\" option"
+#: misc/org.yorba.shotwell.gschema.xml:167
+#| msgid "Selection state of \"hide photos\" option"
+msgid "Selection state of “hide photos” option"
 msgstr "Izvēles stāvoklis opcijai “slēpt fotogrāfijas”"
 
-#: misc/org.yorba.shotwell.gschema.xml:167
+#: misc/org.yorba.shotwell.gschema.xml:168
+#| msgid ""
+#| "Last used selection state of the \"hide photos already imported\" option "
+#| "in the import page."
 msgid ""
-"Last used selection state of the \"hide photos already imported\" option in "
+"Last used selection state of the “hide photos already imported” option in "
 "the import page."
 msgstr ""
 "Pēdējais izmantotais stāvoklis opcijai “Slēpt jau importētās fotogrāfijas” "
 "importēšanas lapā."
 
-#: misc/org.yorba.shotwell.gschema.xml:174
+#: misc/org.yorba.shotwell.gschema.xml:175
 msgid "delay"
 msgstr "aizture"
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:176
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Aizture (sekundēs) starp fotogrāfijām slaidrādē."
 
-#: misc/org.yorba.shotwell.gschema.xml:180
+#: misc/org.yorba.shotwell.gschema.xml:181
 msgid "transition delay"
 msgstr "pārejas aizture"
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:182
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr "Laiks (sekundēs), cik ilgi notiek pāreja starp fotogrāfijām slaidrādē"
 
-#: misc/org.yorba.shotwell.gschema.xml:186
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "transition effect id"
 msgstr "pārejas efekta id"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
 msgstr ""
 "Pārejas efekta nosaukums, kas tiks izmantots starp fotogrāfijām slaidrādē."
 
-#: misc/org.yorba.shotwell.gschema.xml:192
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "Show title"
 msgstr "rādīt virsrakstu"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "Vai slaidrādes laikā rādīt fotogrāfijas virsrakstu"
 
-#: misc/org.yorba.shotwell.gschema.xml:200
+#: misc/org.yorba.shotwell.gschema.xml:201
 msgid "maximize library window"
 msgstr "maksimizēt bibliotēkas logu"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:202
 msgid "True if library application is maximized, false otherwise."
 msgstr "Patiess, ja bibliotēkas lietotne ir maksimizēta, citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:206
+#: misc/org.yorba.shotwell.gschema.xml:207
 msgid "width of library window"
 msgstr "bibliotēkas loga platums"
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:208
 msgid "The last recorded width of the library application window."
 msgstr "Pēdējais saglabātais bibliotēkas lietotnes loga platums."
 
-#: misc/org.yorba.shotwell.gschema.xml:212
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "height of library window"
 msgstr "bibliotēkas loga augstums"
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "The last recorded height of the library application window."
 msgstr "Pēdējais saglabātais bibliotēkas lietotnes loga augstums."
 
-#: misc/org.yorba.shotwell.gschema.xml:218
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "maximize direct-edit window"
 msgstr "maksimizēt tiešās rediģēšanas logu"
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr "Patiess, ja tiešās rediģēšanas lietotne ir maksimizēta, citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:224
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "width of direct-edit window"
 msgstr "tiešās rediģēšanas loga platums"
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded width of the direct-edit application window."
 msgstr "Pēdējais saglabātais tiešās rediģēšanas lietotnes loga platums."
 
-#: misc/org.yorba.shotwell.gschema.xml:230
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "height of direct-edit window"
 msgstr "tiešās rediģēšanas loga augstums"
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "The last recorded height of the direct-edit application window."
 msgstr "Pēdējais saglabātais tiešās rediģēšanas lietotnes loga augstums."
 
-#: misc/org.yorba.shotwell.gschema.xml:236
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "sidebar divider position"
 msgstr "sānu joslas atdalītāja novietojums"
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -580,30 +594,30 @@ msgstr ""
 "Pēdējais saglabātais atdalītāja novietojums starp sānu joslu un skatu "
 "lietotnes logā."
 
-#: misc/org.yorba.shotwell.gschema.xml:244
+#: misc/org.yorba.shotwell.gschema.xml:245
 msgid "import directory"
 msgstr "importēšanas direktorija"
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:246
 msgid "Directory in which imported photo files are placed."
 msgstr "Direktorija, kurā tiks novietotas importētās fotogrāfiju datnes."
 
-#: misc/org.yorba.shotwell.gschema.xml:250
+#: misc/org.yorba.shotwell.gschema.xml:251
 msgid "watch library directory for new files"
 msgstr "sekot līdzi jaunām datnēm manā bibliotēkā"
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:252
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Ja patiess, bibliotēkas direktorijā pievienotās datnes tiks automātiski "
 "importētas."
 
-#: misc/org.yorba.shotwell.gschema.xml:256
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "write metadata to master files"
 msgstr "metadatus rakstīt datnēs"
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -611,11 +625,11 @@ msgstr ""
 "Ja patiess, izmaiņas metadatos (tagi, nosaukumi u.c.) tiks rakstīti "
 "oriģinālajā fotogrāfijas datnē."
 
-#: misc/org.yorba.shotwell.gschema.xml:262
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "use lowercase filenames"
 msgstr "lietot mazos burtus datņu nosaukumos"
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -623,11 +637,11 @@ msgstr ""
 "Ja patiess, importējot fotogrāfiju datnes, Shotwell pārveidos visus burtus "
 "datņu nosaukumā uz mazajiem burtiem"
 
-#: misc/org.yorba.shotwell.gschema.xml:268
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "directory pattern"
 msgstr "direktoriju struktūra"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -635,11 +649,11 @@ msgstr ""
 "Virkne, kas iekodē nosaukšanas struktūru, ko izmantos fotogrāfiju "
 "direktoriju nosaukšanai importēšanas laikā."
 
-#: misc/org.yorba.shotwell.gschema.xml:274
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "directory pattern custom"
 msgstr "direktoriju struktūra pielāgota"
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -647,29 +661,30 @@ msgstr ""
 "Virkne, kas iekodē pielāgotu nosaukšanas struktūru, ko izmantos fotogrāfiju "
 "direktoriju nosaukšanai importēšanas laikā."
 
-#: misc/org.yorba.shotwell.gschema.xml:280
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "RAW developer default"
 msgstr "RAW attīstītājs noklusējuma"
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Opcija RAW attīstītājam, kuru pēc noklusējuma izmantos Shotwell."
 
-#: misc/org.yorba.shotwell.gschema.xml:288
+#: misc/org.yorba.shotwell.gschema.xml:289
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr "Pēdējā izmantotā kadrēšanas malu attiecība."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:290
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Skaitlisks kods, kas attēlo pēdējo izmantoto kadrēšanas izvēlnes izvēli, ko "
 "ir veicis lietotājs."
 
-#: misc/org.yorba.shotwell.gschema.xml:293
-msgid "Most-recently-used crop custom aspect ratio's numerator."
+#: misc/org.yorba.shotwell.gschema.xml:294
+#| msgid "Most-recently-used crop custom aspect ratio's numerator."
+msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr "Pēdējās izmantotās pielāgotās kadrēšanas malu attiecības skaitītājs."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:295
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -677,11 +692,12 @@ msgstr ""
 "Pozitīvs vesels skaitlis, kas attēlo platuma daļu pielāgotajai kadrēšanas "
 "malu attiecībai, ko ievadīja lietotājs."
 
-#: misc/org.yorba.shotwell.gschema.xml:298
-msgid "Most-recently-used crop custom aspect ratio's denominator."
+#: misc/org.yorba.shotwell.gschema.xml:299
+#| msgid "Most-recently-used crop custom aspect ratio's denominator."
+msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr "Pēdējās izmantotās pielāgotās kadrēšanas malu attiecības saucējs."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:300
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -689,93 +705,141 @@ msgstr ""
 "Pozitīvs vesels skaitlis, kas attēlo augstuma daļu pielāgotajai kadrēšanas "
 "malu attiecībai, ko ievadīja lietotājs."
 
-#: misc/org.yorba.shotwell.gschema.xml:306
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid "external photo editor"
 msgstr "ārējais fotogrāfiju redaktors"
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:308
 msgid "External application used to edit photos."
 msgstr "Ārējā lietotne, ko izmantot fotogrāfiju rediģēšanai."
 
-#: misc/org.yorba.shotwell.gschema.xml:312
+#: misc/org.yorba.shotwell.gschema.xml:313
 msgid "external raw editor"
 msgstr "ārējais raw redaktors"
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:314
 msgid "External application used to edit RAW photos."
 msgstr "Ārējā lietotne, ko izmantot jēlo fotogrāfiju rediģēšanai."
 
-#: misc/org.yorba.shotwell.gschema.xml:320
+#: misc/org.yorba.shotwell.gschema.xml:352
+#: misc/org.yorba.shotwell.gschema.xml:353
+msgid "Setting in export dialog: how to trim images"
+msgstr "Iestatījums eksportēšanas dialoglodziņā: kā kadrēt attēlus"
+
+#: misc/org.yorba.shotwell.gschema.xml:358
+#| msgid "Export metadata"
+msgid "export metadata"
+msgstr "eksportēt metadatus"
+
+#: misc/org.yorba.shotwell.gschema.xml:359
+msgid "Setting in export dialog: option to export metadata"
+msgstr "Iestatījums eksportēšanas dialoglodziņā: opcija metadatu eksportēšanā"
+
+#: misc/org.yorba.shotwell.gschema.xml:364
+msgid "format setting, special value"
+msgstr "formāta iestatījums, īpaša vērtība"
+
+#: misc/org.yorba.shotwell.gschema.xml:365
+msgid "Setting in export dialog: format setting, special value"
+msgstr ""
+"Iestatījums eksportēšanas dialoglodziņā: formāta iestatījums, īpaša vērtība"
+
+#: misc/org.yorba.shotwell.gschema.xml:370
+msgid "format setting, type value"
+msgstr "formāta iestatījums, tipa vērtība"
+
+#: misc/org.yorba.shotwell.gschema.xml:371
+msgid "Setting in export dialog: format setting, type value"
+msgstr ""
+"Iestatījums eksportēšanas dialoglodziņā: formāta iestatījums, tipa vērtība"
+
+#: misc/org.yorba.shotwell.gschema.xml:376
+msgid "JPEG quality option"
+msgstr "JPEG kvalitātes opcija"
+
+#: misc/org.yorba.shotwell.gschema.xml:377
+msgid "Setting in export dialog: jpeg quality option"
+msgstr "Iestatījums eksportēšanas dialoglodziņā: jpeg kvalitātes opcijas"
+
+#: misc/org.yorba.shotwell.gschema.xml:382
+msgid "maximal size of image"
+msgstr "maksimālais attēla izmērs"
+
+#: misc/org.yorba.shotwell.gschema.xml:383
+msgid "Setting in export dialog: maximal size of image"
+msgstr "Iestatījums eksportēšanas dialoglodziņā: maksimālais attēla izmērs"
+
+#: misc/org.yorba.shotwell.gschema.xml:390
 msgid "last used publishing service"
 msgstr "pēdējais izmantotais publicēšanas pakalpojums"
 
-#: misc/org.yorba.shotwell.gschema.xml:321
-#: misc/org.yorba.shotwell.gschema.xml:327
+#: misc/org.yorba.shotwell.gschema.xml:391
+#: misc/org.yorba.shotwell.gschema.xml:397
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Skaitlisks kods, kas reprezentē pēdējo pakalpojumu, uz kuru publicēja "
 "fotogrāfijas"
 
-#: misc/org.yorba.shotwell.gschema.xml:326
+#: misc/org.yorba.shotwell.gschema.xml:396
 msgid "default publishing service"
 msgstr "noklusējuma publicēšanas pakalpojumi"
 
-#: misc/org.yorba.shotwell.gschema.xml:340
+#: misc/org.yorba.shotwell.gschema.xml:410
 msgid "access token"
 msgstr "piekļuves marķieris"
 
-#: misc/org.yorba.shotwell.gschema.xml:341
+#: misc/org.yorba.shotwell.gschema.xml:411
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr "Facebook OAuth marķieris šai sesijai, ja ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:346
+#: misc/org.yorba.shotwell.gschema.xml:416
 msgid "user i.d."
 msgstr "lietotāja i.d."
 
-#: misc/org.yorba.shotwell.gschema.xml:347
+#: misc/org.yorba.shotwell.gschema.xml:417
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr "Facebook lietotāja identifikācija šai sesijai, ja ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:352
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "user name"
 msgstr "lietotājvārds"
 
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "Vārds pašlaik autorizētajam Facebook lietotājam, ja tāds ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:428
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "default size code"
 msgstr "noklusējuma izmērs kodam"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Skaitlisks kods, kas reprezentē noklusējuma izmēru fotogrāfijām, ko publicēs "
 "Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
 msgstr "Vai pirms uz Facebook augšupielādēt attēlus, no tiem jāizņem metadati"
 
-#: misc/org.yorba.shotwell.gschema.xml:372
+#: misc/org.yorba.shotwell.gschema.xml:442
 msgid "OAuth Access Phase Token"
 msgstr "OAuth piekļuves fāzes marķieris"
 
-#: misc/org.yorba.shotwell.gschema.xml:373
+#: misc/org.yorba.shotwell.gschema.xml:443
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr "Autorizācijas marķieris pašlaik autorizētajam Flickr lietotājam, ja ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:378
+#: misc/org.yorba.shotwell.gschema.xml:448
 msgid "OAuth Access Phase Token Secret"
 msgstr "OAuth piekļuves fāzes marķiera noslēpums"
 
-#: misc/org.yorba.shotwell.gschema.xml:379
+#: misc/org.yorba.shotwell.gschema.xml:449
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -783,22 +847,22 @@ msgstr ""
 "Kriptogrāfiskais noslēpums, ko izmanto pieprasījumu parakstīšanai pret "
 "autorizācijas marķieri pašlaik autorizētam Flickr lietotājam, ja ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:385
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "Lietotājvārds pašlaik autorizētajam Flickr lietotājam, ja tāds ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Skaitlisks kods, kas reprezentē noklusējuma izmēru fotogrāfijām, ko publicēs "
 "Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:466
 msgid "default visibility"
 msgstr "noklusējuma redzamība"
 
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -806,18 +870,18 @@ msgstr ""
 "Skaitlisks kods, kas reprezentē noklusējuma redzamību fotogrāfijām, ko "
 "publicēs Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
 msgstr "Vai pirms uz Flickr augšupielādēt attēlus, no tiem jāizņem metadati"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:480
+#: misc/org.yorba.shotwell.gschema.xml:612
 msgid "refresh token"
 msgstr "atsvaidzināšanas marķieris"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:481
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -825,7 +889,7 @@ msgstr ""
 "OAuth marķieris, ko izmanto Picasa Web Albums sesijas atsvaidzināšanai šīs "
 "sesijas lietotājam, ja ir."
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:487
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -833,63 +897,63 @@ msgstr ""
 "Skaitlisks kods, kas reprezentē noklusējuma izmēru fotogrāfijām, ko publicēs "
 "Picasa Web Albums"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
-#: misc/org.yorba.shotwell.gschema.xml:516
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "last album"
 msgstr "pēdējais albums"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
-#: misc/org.yorba.shotwell.gschema.xml:517
+#: misc/org.yorba.shotwell.gschema.xml:493
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "The name of the last album the user published photos to, if any"
 msgstr "Nosaukums albumam, uz kuru pēdējo reizi lietotājs publicēja, ja ir"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
 msgstr "Vai pirms uz Picasa augšupielādēt attēlus, no tiem jāizņem metadati"
 
-#: misc/org.yorba.shotwell.gschema.xml:436
+#: misc/org.yorba.shotwell.gschema.xml:506
 msgid "Piwigo URL"
 msgstr "Piwigo URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:437
+#: misc/org.yorba.shotwell.gschema.xml:507
 msgid "URL of the Piwigo server."
 msgstr "Piwigo servera URL."
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:513
 msgid "Piwigo username, if logged in."
 msgstr "Piwigo lietotājvārds, ja ir ierakstījies."
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "password"
 msgstr "parole"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "Piwigo password, if logged in."
 msgstr "Piwigo parole, ja ir ierakstījies."
 
-#: misc/org.yorba.shotwell.gschema.xml:454
+#: misc/org.yorba.shotwell.gschema.xml:524
 msgid "remember password"
 msgstr "atcerēties paroli"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "If true, remember the Piwigo password."
 msgstr "Ja patiess, atcerēties Piwigo paroli."
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "The last selected Piwigo category."
 msgstr "Pēdējā izvēlētā Piwigo kategorija."
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "last permission level"
 msgstr "pēdējais atļauju līmenis"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "The last chosen Piwigo permission level."
 msgstr "Pēdējais izvēlētais Piwigo atļauju līmenis."
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -897,20 +961,20 @@ msgstr ""
 "Skaitlisks kods, kas attēlo pēdējo izmantoto priekšiestatījumu, kad "
 "publicēja uz Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:479
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
 msgstr "Vai pirms uz Piwigo augšupielādēt attēlus, no tiem jāizņem metadati"
 
-#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "ja ir iestatīs nosaukums un nav komentāru, izmantot nosaukumu kā komentārus, "
 "kad augšupielādē uz Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:485
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -918,11 +982,11 @@ msgstr ""
 "Vai pirms uz Piwigo augšupielādēt attēlus, vai komentārus jāņem no "
 "nosaukuma, ja ir iestatīs nosaukums, bet ne komentāri"
 
-#: misc/org.yorba.shotwell.gschema.xml:490
+#: misc/org.yorba.shotwell.gschema.xml:560
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "neiekļaut tagus, kad augšupielādē uz Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:491
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their tags removed on "
 "upload, such that these tags will not appear on the remote Piwigo server."
@@ -930,45 +994,45 @@ msgstr ""
 "Vai pirms uz Piwigo augšupielādēt attēlus, no tiem jāizņem tagi tā, lai tie "
 "neparādītos attālinātos Piwigo serveros."
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:569
 msgid "Gallery3 username"
 msgstr "Gallery3 lietotājvārds"
 
-#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:574
 msgid "API key"
 msgstr "API atslēga"
 
-#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:575
 msgid "Gallery3 API key"
 msgstr "Gallery3 API atslēga"
 
-#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "URL"
 msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:511
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 site URL"
 msgstr "Gallery3 vietnes URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:523
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
 msgstr "Vai pirms uz Gallery3 augšupielādēt attēlus, no tiem jāizņem metadati"
 
-#: misc/org.yorba.shotwell.gschema.xml:528
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "scaling constraint of uploaded picture"
 msgstr "mērogošanas ierobežojumi augšupielādētajam attēlam"
 
-#: misc/org.yorba.shotwell.gschema.xml:529
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "Mērogošanas ierobežojuma ID attēlam, kas tiks augšupielādēts"
 
-#: misc/org.yorba.shotwell.gschema.xml:534
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "pixels of the major axis uploaded picture"
 msgstr "pikseļi galvenās ass augšupielādētajam attēlam"
 
-#: misc/org.yorba.shotwell.gschema.xml:535
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -976,7 +1040,7 @@ msgstr ""
 "Pikseļi galvenās ass attēlam, ko augšupielādēs; izmanto tikai, ja scaling-"
 "constraint-id ir atbilstoša vērtība"
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:613
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -984,31 +1048,31 @@ msgstr ""
 "OAuth marķieris, ko izmanto YouTube sesijas atsvaidzināšanai šīs sesijas "
 "lietotājam, ja ir."
 
-#: misc/org.yorba.shotwell.gschema.xml:550
+#: misc/org.yorba.shotwell.gschema.xml:620
 msgid "last used import service"
 msgstr "pēdējais izmantotais importēšanas pakalpojums"
 
-#: misc/org.yorba.shotwell.gschema.xml:551
+#: misc/org.yorba.shotwell.gschema.xml:621
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Skaitlisks kods, kas reprezentē pēdējo pakalpojumu, no kura importēja "
 "fotogrāfijas"
 
-#: misc/org.yorba.shotwell.gschema.xml:558
+#: misc/org.yorba.shotwell.gschema.xml:628
 msgid "interpreter state cookie"
 msgstr "interpretatora stāvokļa sīkdatne"
 
-#: misc/org.yorba.shotwell.gschema.xml:559
+#: misc/org.yorba.shotwell.gschema.xml:629
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr "Skaitlisks kods, kas ietver GStreamer spraudņa vides stāvokli"
 
-#: misc/org.yorba.shotwell.gschema.xml:566
+#: misc/org.yorba.shotwell.gschema.xml:636
 msgid "content layout mode"
 msgstr "satura izkārtojuma režīms"
 
-#: misc/org.yorba.shotwell.gschema.xml:567
+#: misc/org.yorba.shotwell.gschema.xml:637
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1016,35 +1080,35 @@ msgstr ""
 "Skaitlisks kods, kas apraksta, kā drukāšanas laikā fotogrāfijas tiek "
 "izkārtotas uz papīra."
 
-#: misc/org.yorba.shotwell.gschema.xml:572
+#: misc/org.yorba.shotwell.gschema.xml:642
 msgid "content ppi"
 msgstr "satura punkti collā"
 
-#: misc/org.yorba.shotwell.gschema.xml:573
+#: misc/org.yorba.shotwell.gschema.xml:643
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr "Pikseļu skaits collā (ppi), ko drukāšanas laikā sūtīt printerim"
 
-#: misc/org.yorba.shotwell.gschema.xml:578
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content width"
 msgstr "satura platums"
 
-#: misc/org.yorba.shotwell.gschema.xml:579
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "Platums izdrukātajai emulsijai uz papīra"
 
-#: misc/org.yorba.shotwell.gschema.xml:584
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content height"
 msgstr "satura augstums"
 
-#: misc/org.yorba.shotwell.gschema.xml:585
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "Augstums izdrukātajai emulsijai uz papīra"
 
-#: misc/org.yorba.shotwell.gschema.xml:590
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content units"
 msgstr "satura vienības"
 
-#: misc/org.yorba.shotwell.gschema.xml:591
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1052,11 +1116,11 @@ msgstr ""
 "Skaitlisks kods, kas reprezentē mērvienības (collas vai centimetri), ko "
 "izmantot drukājot"
 
-#: misc/org.yorba.shotwell.gschema.xml:596
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "images per page code"
 msgstr "attēli lappusē, kods"
 
-#: misc/org.yorba.shotwell.gschema.xml:597
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1064,22 +1128,22 @@ msgstr ""
 "Skaitlisks kods, kas reprezentē kodu pašlaik izvēlēto attēlu skaitam "
 "lappusē, kad drukā"
 
-#: misc/org.yorba.shotwell.gschema.xml:602
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "size selection"
 msgstr "izmēra izvēle"
 
-#: misc/org.yorba.shotwell.gschema.xml:603
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "Pašreizējā drukāšanas izmēra indekss iepriekš noteiktā standarta izmēru "
 "sarakstā"
 
-#: misc/org.yorba.shotwell.gschema.xml:608
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "match aspect ratio"
 msgstr "atbilst malu attiecībām"
 
-#: misc/org.yorba.shotwell.gschema.xml:609
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1087,192 +1151,192 @@ msgstr ""
 "Nosaka, vai pielāgotie drukāšanas izmēri atbilst sākotnējās fotogrāfijas "
 "malu attiecībām"
 
-#: misc/org.yorba.shotwell.gschema.xml:614
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "print titles"
 msgstr "drukāt nosaukumus"
 
-#: misc/org.yorba.shotwell.gschema.xml:615
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
 msgstr ""
 "Patiess, ja drukāšanas laikā jādrukā fotogrāfijas virsraksts, citādi aplams."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "titles font"
 msgstr "virsrakstu nosaukumi"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr ""
 "Nosaukums fontam, ko izmantot fotogrāfiju virsrakstiem to drukāšanas laikā."
 
-#: misc/org.yorba.shotwell.gschema.xml:632
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "enable facebook publishing plugin"
 msgstr "ieslēgt facebook publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:633
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Facebook publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:638
+#: misc/org.yorba.shotwell.gschema.xml:708
 msgid "enable flickr publishing plugin"
 msgstr "ieslēgt flickr publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:639
+#: misc/org.yorba.shotwell.gschema.xml:709
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Flickr publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:644
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable picasa publishing plugin"
 msgstr "ieslēgt picasa publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:645
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Ja patiess, ieslēgt Picasa Web Albums publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:650
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable youtube publishing plugin"
 msgstr "ieslēgt youtube publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:651
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt YouTube publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:656
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable piwigo publishing plugin"
 msgstr "ieslēgt piwigo publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:657
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Piwigo publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:662
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable yandex publishing plugin"
 msgstr "ieslēgt yandex publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:663
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Yandex.Fotki publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:668
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable tumblr publishing plugin"
 msgstr "ieslēgt tumblr publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:669
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Tumblr publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:674
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable rajce publishing plugin"
 msgstr "ieslēgt rajce publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:675
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Rajce publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:680
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable gallery3 publishing plugin"
 msgstr "ieslēgt gallery3 publicēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:681
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt Gallery3 publicēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:686
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable F-Spot import plugin"
 msgstr "ieslēgt  F-Spot importēšanas spraudni"
 
-#: misc/org.yorba.shotwell.gschema.xml:687
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt F-Spot importēšanas spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:692
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable slideshow crumble transition"
 msgstr "ieslēgt slaidrādes sairšanas pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:693
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Ja patiess, ieslēgt sairšanas slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:698
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable slideshow fade transition"
 msgstr "ieslēgt slaidrādes izgaišanas pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:699
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Ja patiess, ieslēgt izgaišanas slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:704
-#: misc/org.yorba.shotwell.gschema.xml:728
+#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow slide transition"
 msgstr "ieslēgt slaidrādes slīdēšanas pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:705
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Ja patiess, ieslēgt slaidrādes slīdrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:710
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow clock transition"
 msgstr "ieslēgt slaidrādes pulksteņa pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:711
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Ja patiess, ieslēgt pulksteņa slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:716
-#: misc/org.yorba.shotwell.gschema.xml:722
+#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow circle transition"
 msgstr "ieslēgt slaidrādes apļa pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:717
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt apļa slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:723
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt apļa slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:729
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt žalūziju slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:734
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow squares transition"
 msgstr "ieslēgt slaidrādes kvadrātu pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:735
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt kvadrātu slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:740
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow stripes transition"
 msgstr "ieslēgt slaidrādes strīpas pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:741
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr "Ja patiess, ieslēgt strīpas slaidrādes pāreju spraudni, citādi aplams"
 
-#: misc/org.yorba.shotwell.gschema.xml:746
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow chess transition"
 msgstr "ieslēgt slaidrādes šaha pāreju"
 
-#: misc/org.yorba.shotwell.gschema.xml:747
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1283,18 +1347,75 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "Apmeklēt Shotwell mājas lapu"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:676
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:679
 msgid "translator-credits"
 msgstr ""
 "Pēteris Krišjānis <pecisk@gmail.com>\n"
 "Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>"
 
-#: plugins/common/RESTSupport.vala:451
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:202
+msgid ""
+"⚫ This website presented identification that belongs to a different website."
+msgstr ""
+"⚫ Šī tīmekļa vietne sniedza identifikāciju, kas pieder citai tīmekļa vietnei."
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:207
+msgid ""
+"⚫ This website’s identification is too old to trust. Check the date on your "
+"computer’s calendar."
+msgstr ""
+"⚫ Tīmekļa vietnes identifikācija ir pārāk veca, lai tai uzticētos. Pārbaudiet "
+"sava datora kalendāra datumu."
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:212
+msgid ""
+"⚫ This website’s identification was not issued by a trusted organization."
+msgstr "⚫ Šīs tīmekļa vietnes identifikāciju neizdeva uzticama institūcija."
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:217
+msgid ""
+"⚫ This website’s identification could not be processed. It may be corrupted."
+msgstr ""
+"⚫ Šīs tīmekļa vietnes identifikāciju nevarēja apstrādāt. Iespējams, tā ir "
+"bojāta."
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:222
+msgid ""
+"⚫ This website’s identification has been revoked by the trusted organization "
+"that issued it."
+msgstr ""
+"⚫ Šīs tīmekļa vietnes identifikāciju atsauca institūcija, kura to ir izdevusi."
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:227
+msgid ""
+"⚫ This website’s identification cannot be trusted because it uses very weak "
+"encryption."
+msgstr ""
+"⚫ Šīs tīmekļa vietnes identifikācijai nevar uzticēties, jo tā izmanto vāju "
+"šifrēšanu."
+
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:232
+msgid ""
+"⚫ This website’s identification is only valid for future dates. Check the "
+"date on your computer’s calendar."
+msgstr ""
+"⚫ Tīmekļa vietnes identifikācija ir derīga tikai nākotnes datumiem."
+" Pārbaudiet "
+"datumu sava datora kalendārā."
+
+#: plugins/common/RESTSupport.vala:509
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Publicēšanai nepieciešama pagaidu datne"
 
-#: plugins/common/RESTSupport.vala:1157
+#: plugins/common/RESTSupport.vala:1167
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -1410,7 +1531,8 @@ msgstr "Iet _atpakaļ"
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
 #: ui/shotwell.ui:1627
-msgid "_Login"
+#| msgid "_Login"
+msgid "_Log in"
 msgstr "_Ierakstīties"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
@@ -1481,7 +1603,7 @@ msgstr "pikseļi"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1329
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Sākotnējais izmērs"
@@ -1513,11 +1635,16 @@ msgstr "Shotwell noklusējuma direktorija"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
 #, c-format
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "The file \"%s\" may not be supported by or may be too large for this "
+#| "instance of Gallery3."
 msgid ""
 "\n"
 "\n"
-"The file \"%s\" may not be supported by or may be too large for this "
-"instance of Gallery3."
+"The file “%s” may not be supported by or may be too large for this instance "
+"of Gallery3."
 msgstr ""
 "\n"
 "\n"
@@ -1536,8 +1663,11 @@ msgstr ""
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
 #, c-format
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to %s can't "
+#| "continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to %s can't "
+"A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
 msgstr ""
 "Nav pieejama publicēšanai vajadzīgā datne. Nevar turpināt publicēt uz %s."
@@ -1605,7 +1735,8 @@ msgstr "Atce_rēties"
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
 #: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151
-msgid "Login"
+#| msgid "Logging in..."
+msgid "Log in"
 msgstr "Ierakstīties"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
@@ -1632,8 +1763,9 @@ msgid "Open target _album in browser"
 msgstr "Atvērt mērķa _albumu pārlūkā"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-msgid "Copyright (C) 2013 rajce.net"
-msgstr "Autortiesības (C) 2013 rajce.net"
+#| msgid "Copyright (C) 2013 rajce.net"
+msgid "Copyright © 2013 rajce.net"
+msgstr "Autortiesības © 2013 rajce.net"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
 msgid "An error message occurred when publishing to Rajce. Please try again."
@@ -1682,29 +1814,35 @@ msgstr "Autortiesības 2012 BJA Electronics"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1230
-msgid "500 x 375 pixels"
-msgstr "500 × 375 pikseļi "
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1325
+#| msgid "500 x 375 pixels"
+msgid "500 × 375 pixels"
+msgstr "500 × 375 pikseļi"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1231
-msgid "1024 x 768 pixels"
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1326
+#| msgid "1024 x 768 pixels"
+msgid "1024 × 768 pixels"
 msgstr "1024 × 768 pikseļi"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
-msgid "1280 x 853 pixels"
+#| msgid "1280 x 853 pixels"
+msgid "1280 × 853 pixels"
 msgstr "1280 × 853 pikseļi"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:311
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:321
 #, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
+#| msgid "'%s' isn't a valid response to an OAuth authentication request"
+msgid "“%s” isn’t a valid response to an OAuth authentication request"
 msgstr "“%s” nav derīga atbilde OAuth autentifikācijas pieprasījumam"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
+#| msgid ""
+#| "TumblrPublisher: start( ): can't start; this publisher is not restartable."
 msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
 msgstr ""
 "TumblrPublisher: start( ): nevar startēt; publicētājs nav pārstartējams."
 
@@ -1714,12 +1852,12 @@ msgstr ""
 "Ievadiet lietotājvārdu un paroli, kas ir saistītas ar jūsu Tumblr kontu."
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:992
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1087
 msgid "Username and/or password invalid. Please try again"
 msgstr "Lietotājvārds un / vai parole nav pareiza. Lūdzu, mēģiniet vēlreiz"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1026
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1121
 msgid "Invalid User Name or Password"
 msgstr "Nederīgs lietotājvārds vai parole"
 
@@ -1746,7 +1884,7 @@ msgstr "Autortiesības 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgid "Visit the Yandex.Fotki web site"
 msgstr "Apmeklējiet Yandex.Fotki tīmekļa vietni"
 
-#: plugins/shotwell-publishing-extras/YandexPublishing.vala:658
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Jūs šobrīd neesat ierakstījies Yandex.Fotki."
 
@@ -1771,7 +1909,7 @@ msgid "Public"
 msgstr "Publisks"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1194
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
 msgid "Friends"
 msgstr "Draugi"
 
@@ -1789,7 +1927,7 @@ msgid "Create a _new album named:"
 msgstr "Izveidot jau_nu albumu ar nosaukumu:"
 
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1034
+#: plugins/shotwell-publishing/FacebookPublishing.vala:984
 msgid "Upload _size:"
 msgstr "Augšupielāde_s izmērs:"
 
@@ -1809,15 +1947,22 @@ msgstr ""
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:62
 #: plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1114
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1209
 msgid "Shotwell Connect"
 msgstr "Shotwell savienojumi"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:64
+#| msgid ""
+#| "You are not currently logged into Facebook.\n"
+#| "\n"
+#| "If you don't yet have a Facebook account, you can create one during the "
+#| "login process. During login, Shotwell Connect may ask you for permission "
+#| "to upload photos and publish to your feed. These permissions are required "
+#| "for Shotwell Connect to function."
 msgid ""
 "You are not currently logged into Facebook.\n"
 "\n"
-"If you don't yet have a Facebook account, you can create one during the "
+"If you don’t yet have a Facebook account, you can create one during the "
 "login process. During login, Shotwell Connect may ask you for permission to "
 "upload photos and publish to your feed. These permissions are required for "
 "Shotwell Connect to function."
@@ -1850,23 +1995,28 @@ msgid "Large (2048 pixels)"
 msgstr "Liels (2048 pikseļi)"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:255
-msgid "Testing connection to Facebook..."
-msgstr "Pārbauda savienojumu ar Facebook..."
+#| msgid "Testing connection to Facebook..."
+msgid "Testing connection to Facebook…"
+msgstr "Pārbauda savienojumu ar Facebook…"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:348
 #: plugins/shotwell-publishing/PicasaPublishing.vala:379
-msgid "Creating album..."
-msgstr "Veido albumu..."
+#| msgid "Creating album..."
+msgid "Creating album…"
+msgstr "Veido albumu…"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:374
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Facebook "
+#| "can't continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to Facebook can't "
+"A file required for publishing is unavailable. Publishing to Facebook can’t "
 "continue."
 msgstr ""
 "Nav pieejama publicēšanai vajadzīgā datne. Nevar turpināt publicēt uz "
 "Facebook."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1032
+#: plugins/shotwell-publishing/FacebookPublishing.vala:982
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -1875,18 +2025,18 @@ msgstr ""
 "Jūs esat ierakstījies Facebook kā %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1033
+#: plugins/shotwell-publishing/FacebookPublishing.vala:983
 msgid "Where would you like to publish the selected photos?"
 msgstr "Kur vēlaties publicēt izvēlētās fotogrāfijas?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1193
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Just me"
 msgstr "Tikai es"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1195
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1218
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1313
 msgid "Everyone"
 msgstr "Ikviens"
 
@@ -1902,20 +2052,25 @@ msgstr ""
 msgid "Authorization _Number:"
 msgstr "Autorizācijas _skaitlis:"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:132
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:128
 msgid "Con_tinue"
 msgstr "Turpinā_t"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:60
+#| msgid ""
+#| "You are not currently logged into Flickr.\n"
+#| "\n"
+#| "Click Login to log into Flickr in your Web browser.  You will have to "
+#| "authorize Shotwell Connect to link to your Flickr account."
 msgid ""
 "You are not currently logged into Flickr.\n"
 "\n"
-"Click Login to log into Flickr in your Web browser.  You will have to "
+"Click Log in to log into Flickr in your Web browser. You will have to "
 "authorize Shotwell Connect to link to your Flickr account."
 msgstr ""
 "Jūs pašlaik neesat ierakstījies Flickr vietnē.\n"
 "\n"
-"Spiediet “Login”, lai ierakstītos Flickr vietnē tīmekļa pārlūkā. Jums "
+"Spiediet “Log in”, lai ierakstītos Flickr vietnē tīmekļa pārlūkā. Jums "
 "vajadzēs pilnvarot Shotwell savienojumu, lai sasaistītu to ar Flickr kontu."
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:62
@@ -1930,20 +2085,25 @@ msgstr ""
 "to vēlreiz."
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login..."
-msgstr "Gatavojas ierakstīties..."
+#| msgid "Preparing for login..."
+msgid "Preparing for login…"
+msgstr "Gatavojas ierakstīties…"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:444
 #: plugins/shotwell-publishing/FlickrPublishing.vala:594
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Flickr can't "
+#| "continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can't "
+"A file required for publishing is unavailable. Publishing to Flickr can’t "
 "continue."
 msgstr ""
 "Nav pieejama publicēšanai vajadzīgā datne. Nevar turpināt publicēt uz Flickr."
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Pārbauda pilnvarojumu..."
+#| msgid "Verifying authorization..."
+msgid "Verifying authorization…"
+msgstr "Pārbauda pilnvarojumu…"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1152
 #, c-format
@@ -2001,13 +2161,15 @@ msgid "Friends only"
 msgstr "Tikai draugiem"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1232
-msgid "2048 x 1536 pixels"
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1327
+#| msgid "2048 x 1536 pixels"
+msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 pikseļi"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1233
-msgid "4096 x 3072 pixels"
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1328
+#| msgid "4096 x 3072 pixels"
+msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 pikseļi"
 
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
@@ -2019,21 +2181,30 @@ msgid "Photo _size preset:"
 msgstr "Fotogrāfiju izmēru priekšiestatījumus:"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:59
+#| msgid ""
+#| "You are not currently logged into Picasa Web Albums.\n"
+#| "\n"
+#| "Click Login to log into Picasa Web Albums in your Web browser. You will "
+#| "have to authorize Shotwell Connect to link to your Picasa Web Albums "
+#| "account."
 msgid ""
 "You are not currently logged into Picasa Web Albums.\n"
 "\n"
-"Click Login to log into Picasa Web Albums in your Web browser. You will have "
-"to authorize Shotwell Connect to link to your Picasa Web Albums account."
+"Click Log in to log into Picasa Web Albums in your Web browser. You will "
+"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
 msgstr ""
 "Jūs pašlaik neesat ierakstījies Picasa Web Albums vietnē.\n"
 "\n"
-"Spiediet “Login”, lai ierakstītos Picasa Web Albums vietnē tīmekļa pārlūkā. "
+"Spiediet “Log in”, lai ierakstītos Picasa Web Albums vietnē tīmekļa pārlūkā. "
 "Jums vajadzēs pilnvarot Shotwell savienojumu, lai sasaistītu to ar Picasa "
 "Web Albums kontu."
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:361
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Picasa can't "
+#| "continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to Picasa can't "
+"A file required for publishing is unavailable. Publishing to Picasa can’t "
 "continue."
 msgstr ""
 "Nav pieejama publicēšanai vajadzīgā datne. Nevar turpināt publicēt uz Picasa."
@@ -2049,19 +2220,23 @@ msgid "Videos will appear in:"
 msgstr "Video parādīsies:"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
+#| msgid "Small (640 x 480 pixels)"
+msgid "Small (640 × 480 pixels)"
 msgstr "Mazs (640 × 480 pikseļi)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
+#| msgid "Medium (1024 x 768 pixels)"
+msgid "Medium (1024 × 768 pixels)"
 msgstr "Vidējs (1024 × 768 pikseļi)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
+#| msgid "Recommended (1600 x 1200 pixels)"
+msgid "Recommended (1600 × 1200 pixels)"
 msgstr "Ieteiktais (1600 × 1200 pikseļi)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
+#| msgid "Google+ (2048 x 1536 pixels)"
+msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 pikseļi)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:750
@@ -2119,16 +2294,29 @@ msgstr "Izrakstīties"
 msgid "Publish"
 msgstr "Publicēt"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:747
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:775
 #, c-format
-msgid "Creating album %s..."
-msgstr "Veido albumu %s..."
+#| msgid "Creating album %s..."
+msgid "Creating album %s…"
+msgstr "Veido albumu %s…"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:920
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:948
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr "Gadījās kļūda, publicējot uz Piwigo. Lūdzu, mēģiniet vēlreiz."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:990
+#. %s is the host name that we tried to connect to
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1024
+#, c-format
+msgid ""
+"This does not look like the real <b>%s</b>. Attackers might be trying to "
+"steal or alter information going to or from this site (for example, private "
+"messages, credit card information, or passwords)."
+msgstr ""
+"Šī neizskatās pēc īstas <b>%s</b> vietnes. Iespējams, ka "
+"uzbrucēji mēģina nozagt vai mainīt informāciju, kas iet uz vai no šīs "
+"vietnes (piemēram, privātie ziņojumi, kredītkaršu informācija vai paroles)."
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1085
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
@@ -2136,7 +2324,7 @@ msgstr ""
 "Ievadiet savas fotogrāfiju bibliotēkas URL, kā arī lietotājvārdu un paroli, "
 "kas ir saistīta ar Piwigo kontu tai bibliotēkai."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:991
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1086
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
@@ -2144,26 +2332,38 @@ msgstr ""
 "Shotwell nevar sazināties ar jūsu Piwigo fotogrāfiju bibliotēku. Lūdzu, "
 "pārbaudiet ievadīto URL."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1021
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1116
 msgid "Invalid URL"
 msgstr "Nederīgs URL"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1219
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1314
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Administratori, ģimene, draugi, kontakti"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1220
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1315
 msgid "Admins, Family, Friends"
 msgstr "Administratori, ģimene, draugi"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1221
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1316
 msgid "Admins, Family"
 msgstr "Administratori, ģimene"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1222
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1317
 msgid "Admins"
 msgstr "Administratori"
 
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
+msgstr "Šis savienojums nav drošs"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
+msgstr "Rādīt sertifikātu…"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr "Es saprotu, lūdzu, _turpiniet."
+
 #: plugins/shotwell-publishing/shotwell-publishing.vala:26
 msgid "Core Publishing Services"
 msgstr "Pamata publicēšanas servisi"
@@ -2187,12 +2387,15 @@ msgstr ""
 "izmantojot pārlūku un ierakstoties YouTube vismaz vienreiz."
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:363
+#| msgid ""
+#| "A file required for publishing is unavailable. Publishing to Youtube "
+#| "can't continue."
 msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
+"A file required for publishing is unavailable. Publishing to YouTube can’t "
 "continue."
 msgstr ""
 "Nav pieejama publicēšanai vajadzīgā datne. Nevar turpināt publicēt uz "
-"Youtube."
+"YouTube."
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:462
 #, c-format
@@ -2201,7 +2404,8 @@ msgstr "Jūs esat ierakstījies YouTube kā “%s”."
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:464
 #, c-format
-msgid "Videos will appear in '%s'"
+#| msgid "Videos will appear in '%s'"
+msgid "Videos will appear in “%s”"
 msgstr "Video parādīsies pēc “%s”"
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:496
@@ -2311,29 +2515,35 @@ msgstr "Nofiksēt rīkjoslu atvērtu"
 msgid "Leave fullscreen"
 msgstr "Iziet no pilnekrāna režīma"
 
-#: src/AppWindow.vala:496
+#: src/AppWindow.vala:499
 msgid "_Contents"
 msgstr "_Saturs"
 
-#: src/AppWindow.vala:501
+#: src/AppWindow.vala:504
 msgid "_Frequently Asked Questions"
 msgstr "_Biežāk uzdotie jautājumi"
 
-#: src/AppWindow.vala:506
-msgid "_Report a Problem..."
-msgstr "Ziņot par p_roblēmu..."
+#: src/AppWindow.vala:509
+#| msgid "_Report a Problem..."
+msgid "_Report a Problem…"
+msgstr "_Ziņot par problēmu…"
 
-#: src/AppWindow.vala:605 src/AppWindow.vala:626 src/AppWindow.vala:643
+#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
 #: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1425 src/Dialogs.vala:1448
+#: src/Dialogs.vala:28 src/Dialogs.vala:1441 src/Dialogs.vala:1464
 #: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
 msgid "_Cancel"
 msgstr "At_celt"
 
-#: src/AppWindow.vala:653
+#: src/AppWindow.vala:656
 #, c-format
+#| msgid ""
+#| "A fatal error occurred when accessing Shotwell's library.  Shotwell "
+#| "cannot continue.\n"
+#| "\n"
+#| "%s"
 msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
 "continue.\n"
 "\n"
 "%s"
@@ -2343,21 +2553,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:673
+#: src/AppWindow.vala:676
 msgid "Visit the Shotwell web site"
 msgstr "Apmeklējiet Shotwell tīmekļa vietni"
 
-#: src/AppWindow.vala:685
+#: src/AppWindow.vala:688
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nevar parādīt palīdzību — %s"
 
-#: src/AppWindow.vala:693
+#: src/AppWindow.vala:696
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nevar pārvietoties pa kļūdu datubāzi — %s"
 
-#: src/AppWindow.vala:701
+#: src/AppWindow.vala:704
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nevar parādīt BUJ — %s"
@@ -2438,8 +2648,11 @@ msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
 #: src/camera/ImportPage.vala:458
+#| msgid ""
+#| "Unable to unmount camera.  Try unmounting the camera from the file "
+#| "manager."
 msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
+"Unable to unmount camera. Try unmounting the camera from the file manager."
 msgstr ""
 "Neizdevās nomontēt kameru. Mēģiniet nomontēt kameru no datņu pārvaldnieka."
 
@@ -2452,13 +2665,15 @@ msgstr "Slēpt jau importētās fotogrāfijas"
 msgid "Only display photos that have not been imported"
 msgstr "Rādīt tikai fotogrāfijas, kas nav importētas"
 
-#. Ticket #3304 - Import page shouldn't display confusing message
-#. prior to import.
-#. TODO: replace this with approved text for "talking to camera,
-#. please wait" once new strings are being accepted.
+#: src/camera/ImportPage.vala:842
+msgid "The camera seems to be empty. No photos/videos found to import"
+msgstr ""
+"Izskatās, ka kamera ir tukša. Netika atrastas fotogrāfijas/video, ko importēt"
+
 #: src/camera/ImportPage.vala:846
-msgid "Starting import, please wait..."
-msgstr "Sāk importēšanu. Lūdzu, uzgaidiet..."
+#| msgid "Removing photos/videos from camera"
+msgid "No new photos/videos found on camera"
+msgstr "Kamerā nav atrastu jaunu fotogrāfiju/video"
 
 #: src/camera/ImportPage.vala:873 src/MediaPage.vala:451
 msgid "_Titles"
@@ -2486,9 +2701,12 @@ msgstr "Importēt visas fotogrāfijas savā bibliotēkā"
 
 #. it's mounted, offer to unmount for the user
 #: src/camera/ImportPage.vala:1013
+#| msgid ""
+#| "Shotwell needs to unmount the camera from the filesystem in order to "
+#| "access it.  Continue?"
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
+"it. Continue?"
 msgstr ""
 "Shotwell ir jānomontē kamera no datņu sistēmas, lai tai piekļūtu. Turpināt?"
 
@@ -2501,9 +2719,13 @@ msgid "Please unmount the camera."
 msgstr "Lūdzu, nomontējiet kameru."
 
 #: src/camera/ImportPage.vala:1029
+#| msgid ""
+#| "The camera is locked by another application.  Shotwell can only access "
+#| "the camera when it's unlocked.  Please close any other application using "
+#| "the camera and try again."
 msgid ""
-"The camera is locked by another application.  Shotwell can only access the "
-"camera when it's unlocked.  Please close any other application using the "
+"The camera is locked by another application. Shotwell can only access the "
+"camera when it’s unlocked. Please close any other application using the "
 "camera and try again."
 msgstr ""
 "Kameru ir noslēgusi cita lietotne. Shotwell var piekļūt kamerai tikai tad, "
@@ -2524,24 +2746,30 @@ msgstr ""
 "%s"
 
 #: src/camera/ImportPage.vala:1061
-msgid "Unmounting..."
-msgstr "Nomontē..."
+#| msgid "Unmounting..."
+msgid "Unmounting…"
+msgstr "Nomontē…"
 
-#: src/camera/ImportPage.vala:1167
+#: src/camera/ImportPage.vala:1152
+#| msgid "Starting import, please wait..."
+msgid "Starting import, please wait…"
+msgstr "Sāk importēšanu. Lūdzu, uzgaidiet…"
+
+#: src/camera/ImportPage.vala:1169
 msgid "Fetching photo information"
 msgstr "Iegūst informāciju par fotogrāfiju"
 
-#: src/camera/ImportPage.vala:1522
+#: src/camera/ImportPage.vala:1527
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Iegūst %s priekšskatījumu"
 
-#: src/camera/ImportPage.vala:1638
+#: src/camera/ImportPage.vala:1643
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Neizdevās noslēgt kameru — %s"
 
-#: src/camera/ImportPage.vala:1723
+#: src/camera/ImportPage.vala:1728
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2549,7 +2777,7 @@ msgstr[0] "Izdzēst šo %d fotogrāfiju no kameras?"
 msgstr[1] "Izdzēst šīs %d fotogrāfijas no kameras?"
 msgstr[2] "Izdzēst šīs %d fotogrāfijas no kameras?"
 
-#: src/camera/ImportPage.vala:1726
+#: src/camera/ImportPage.vala:1731
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2557,7 +2785,7 @@ msgstr[0] "Dzēst šo %d video no kameras?"
 msgstr[1] "Dzēst šos %d video no kameras?"
 msgstr[2] "Dzēst šos %d video no kameras?"
 
-#: src/camera/ImportPage.vala:1729
+#: src/camera/ImportPage.vala:1734
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2565,7 +2793,7 @@ msgstr[0] "Dzēst šo %d fotogrāfiju/video no kameras?"
 msgstr[1] "Dzēst šīs %d fotogrāfijas/video no kameras?"
 msgstr[2] "Dzēst šīs %d fotogrāfijas/video no kameras?"
 
-#: src/camera/ImportPage.vala:1732
+#: src/camera/ImportPage.vala:1737
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2573,15 +2801,15 @@ msgstr[0] "Dzēst šo %d datni no kameras?"
 msgstr[1] "Dzēst šīs %d datnes no kameras?"
 msgstr[2] "Dzēst šīs %d datnes no kameras?"
 
-#: src/camera/ImportPage.vala:1740 src/Dialogs.vala:1392
+#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1408
 msgid "_Keep"
 msgstr "_Paturēt"
 
-#: src/camera/ImportPage.vala:1759
+#: src/camera/ImportPage.vala:1764
 msgid "Removing photos/videos from camera"
 msgstr "Izņem fotogrāfijas/video no kameras"
 
-#: src/camera/ImportPage.vala:1763
+#: src/camera/ImportPage.vala:1768
 #, c-format
 msgid "Unable to delete %d photo/video from the camera due to errors."
 msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
@@ -2609,7 +2837,7 @@ msgstr "Eksportēt fotogrāfijas/video"
 msgid "Export Photo"
 msgstr "Eksportēt fotogrāfiju"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:88
+#: src/CollectionPage.vala:458 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Eksportēt fotogrāfijas"
 
@@ -2762,7 +2990,8 @@ msgstr "Izveidot tagu"
 
 #: src/Commands.vala:1695
 #, c-format
-msgid "Move Tag \"%s\""
+#| msgid "Move Tag \"%s\""
+msgid "Move Tag “%s”"
 msgstr "Pārvietot tagu “%s”"
 
 #: src/Commands.vala:2347
@@ -2823,7 +3052,8 @@ msgstr "%s datubāze"
 #: src/data_imports/DataImportsPluginHost.vala:148
 #: src/data_imports/DataImportsPluginHost.vala:294
 #, c-format
-msgid "Importing from %s can't continue because an error occurred:"
+#| msgid "Importing from %s can't continue because an error occurred:"
+msgid "Importing from %s can’t continue because an error occurred:"
 msgstr "Nevar turpināt importēt no %s, jo gadījās kļūda:"
 
 #: src/data_imports/DataImportsPluginHost.vala:151
@@ -2925,13 +3155,15 @@ msgstr "Neizdevās sagatavot darbvirsmu slaidrādei — %s"
 
 #: src/Dialogs.vala:16
 #, c-format
-msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+#| msgid "This will remove the tag \"%s\" from one photo.  Continue?"
+#| msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+msgid "This will remove the tag “%s” from one photo. Continue?"
+msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "Tiks izņemts tags “%s” no %d fotogrāfijas. Turpināt?"
 msgstr[1] "Tiks izņemts tags “%s” no %d fotogrāfijām. Turpināt?"
 msgstr[2] "Tiks izņemts tags “%s” no %d fotogrāfijām. Turpināt?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1393
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1409
 #: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409
 #: src/Resources.vala:674
 msgid "_Delete"
@@ -2939,7 +3171,8 @@ msgstr "_Dzēst"
 
 #: src/Dialogs.vala:25
 #, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
+#| msgid "This will remove the saved search \"%s\".  Continue?"
+msgid "This will remove the saved search “%s”. Continue?"
 msgstr "Šī darbība izņems saglabāto meklēšanu “%s”. Turpināt?"
 
 #: src/Dialogs.vala:36
@@ -2972,16 +3205,19 @@ msgstr "Eksportēt video"
 #. if we can't copy an image over for editing in an external tool.
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
-#: src/Dialogs.vala:116
+#: src/Dialogs.vala:112
 #, c-format
+#| msgid ""
+#| "Shotwell couldn't create a file for editing this photo because you do not "
+#| "have permission to write to %s."
 msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
+"Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
 msgstr ""
 "Shotwell nevar izveidot datni šīs fotogrāfijas rediģēšanai, jo jums nav "
 "tiesību rakstīt %s."
 
-#: src/Dialogs.vala:125
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -2989,7 +3225,7 @@ msgstr ""
 "Nevar eksportēt sekojošo fotogrāfiju, jo gadījās datnes kļūda.\n"
 "\n"
 
-#: src/Dialogs.vala:131
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -3002,53 +3238,55 @@ msgstr ""
 #. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
 #. aren't formats so much as they are operating modes that determine specific formats.
 #. Hereafter we'll refer to these as "special formats."
-#: src/Dialogs.vala:148
+#: src/Dialogs.vala:144
 msgid "Unmodified"
 msgstr "Nemainīts"
 
-#: src/Dialogs.vala:149
+#: src/Dialogs.vala:145
 msgid "Current"
 msgstr "Pašreizējais"
 
 #. layout controls
-#: src/Dialogs.vala:216
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "_Formāts:"
 
-#: src/Dialogs.vala:219
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "_Kvalitāte:"
 
-#: src/Dialogs.vala:222
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "_Mērogošanas ierobežojums:"
 
-#: src/Dialogs.vala:225
+#: src/Dialogs.vala:230
 msgid "_Pixels:"
 msgstr " _Pikseļi:"
 
-#: src/Dialogs.vala:228
-msgid "Export metadata"
-msgstr "Eksportēt metadatus"
+#: src/Dialogs.vala:234
+#| msgid "Export metadata"
+msgid "Export _metadata:"
+msgstr "Eksportēt _metadatus:"
 
-#: src/Dialogs.vala:462
-msgid "Save Details..."
-msgstr "Saglabāt detaļas..."
+#: src/Dialogs.vala:478
+#| msgid "Save Details"
+msgid "Save Details…"
+msgstr "Saglabāt detaļas…"
 
-#: src/Dialogs.vala:463
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "Saglabāt detaļas"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(un vēl %d)\n"
 
-#: src/Dialogs.vala:531
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "Importēšanas rezultātu pārskats"
 
-#: src/Dialogs.vala:535
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -3056,7 +3294,7 @@ msgstr[0] "Mēģināja importēt %d datni."
 msgstr[1] "Mēģināja importēt %d datnes."
 msgstr[2] "Mēģināja importēt %d datņu."
 
-#: src/Dialogs.vala:538
+#: src/Dialogs.vala:554
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3067,40 +3305,45 @@ msgstr[2] "No tām, %d tika sekmīgi importētas."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:550
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Neimportētie fotogrāfiju/video dublikāti:"
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
 msgstr "dublē esošo datu nesēju vienumus"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:565
+#: src/Dialogs.vala:581
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "Neimportētās fotogrāfijas/video, jo bija kameras kļūdas:"
 
-#: src/Dialogs.vala:568 src/Dialogs.vala:583 src/Dialogs.vala:598
-#: src/Dialogs.vala:614 src/Dialogs.vala:629 src/Dialogs.vala:643
+#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
+#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
 msgid "error message:"
 msgstr "kļūdas paziņojums:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:579
-msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#: src/Dialogs.vala:595
+#| msgid ""
+#| "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 "Datnes nav importētas, jo tās netika atpazītas kā fotogrāfijas vai video:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:594
+#: src/Dialogs.vala:610
+#| msgid ""
+#| "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+#| "Understands:"
 msgid ""
-"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
 msgstr ""
 "Fotogrāfijas/video netika importētas, jo tās nebija formātā, ko saprot "
@@ -3109,18 +3352,24 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:609
+#: src/Dialogs.vala:625
+#| msgid ""
+#| "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+#| "Library:"
 msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr ""
 "Fotogrāfijas/video netika importētas, jo Shotwell nevarēja tās importēt "
 "bibliotēkā:"
 
-#: src/Dialogs.vala:613
+#: src/Dialogs.vala:629
 #, c-format
+#| msgid ""
+#| "couldn't copy %s\n"
+#| "\tto %s"
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 msgstr ""
 "nevarēja kopēt %s\n"
@@ -3129,18 +3378,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:641
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Fotogrāfijas/video netika importētas, jo datnes ir bojātas:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:640
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Fotogrāfijas/video netika importētas citu iemeslu dēļ:"
 
-#: src/Dialogs.vala:660
+#: src/Dialogs.vala:676
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
@@ -3148,7 +3397,7 @@ msgstr[0] "Netika importēta %d dublējoša fotogrāfija:\n"
 msgstr[1] "Netika importētas %d dublējošas fotogrāfijas:\n"
 msgstr[2] "Netika importētas %d dublējošu fotogrāfijas:\n"
 
-#: src/Dialogs.vala:663
+#: src/Dialogs.vala:679
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
@@ -3156,7 +3405,7 @@ msgstr[0] "Netika importēts %d dublējošs video:\n"
 msgstr[1] "Netika importēti %d dublējoši video:\n"
 msgstr[2] "Netika importēti %d dublējošu video:\n"
 
-#: src/Dialogs.vala:666
+#: src/Dialogs.vala:682
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
@@ -3164,7 +3413,7 @@ msgstr[0] "Netika importēta %d dublējoša fotogrāfija/video:\n"
 msgstr[1] "Netika importētas %d dublējošas fotogrāfijas/video:\n"
 msgstr[2] "Netika importētas %d dublējošu fotogrāfijas/video:\n"
 
-#: src/Dialogs.vala:680
+#: src/Dialogs.vala:696
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
@@ -3175,7 +3424,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d fotogrāfiju importēšana neizdevās dēļ datnes vai aparatūras kļūdas:\n"
 
-#: src/Dialogs.vala:683
+#: src/Dialogs.vala:699
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
@@ -3183,7 +3432,7 @@ msgstr[0] "%d video importēšana neizdevās dēļ datnes vai aparatūras kļūd
 msgstr[1] "%d video importēšana neizdevās dēļ datnes vai aparatūras kļūdas:\n"
 msgstr[2] "%d video importēšana neizdevās dēļ datnes vai aparatūras kļūdas:\n"
 
-#: src/Dialogs.vala:686
+#: src/Dialogs.vala:702
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3198,7 +3447,7 @@ msgstr[2] ""
 "%d fotogrāfiju/video importēšana neizdevās dēļ datnes vai aparatūras "
 "kļūdas:\n"
 
-#: src/Dialogs.vala:689
+#: src/Dialogs.vala:705
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
@@ -3206,7 +3455,7 @@ msgstr[0] "%d datnes importēšana neizdevās dēļ datnes vai aparatūras kļū
 msgstr[1] "%d datņu importēšana neizdevās dēļ datnes vai aparatūras kļūdas:\n"
 msgstr[2] "%d datņu importēšana neizdevās dēļ datnes vai aparatūras kļūdas:\n"
 
-#: src/Dialogs.vala:703
+#: src/Dialogs.vala:719
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3220,7 +3469,7 @@ msgstr[1] ""
 msgstr[2] ""
 "%d fotogrāfiju importēšana neizdevās, jo fotogrāfiju mape nav rakstāma:\n"
 
-#: src/Dialogs.vala:706
+#: src/Dialogs.vala:722
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3231,7 +3480,7 @@ msgstr[0] "%d video importēšana neizdevās, jo fotogrāfiju mape nav rakstāma
 msgstr[1] "%d video importēšana neizdevās, jo fotogrāfiju mape nav rakstāma:\n"
 msgstr[2] "%d video importēšana neizdevās, jo fotogrāfiju mape nav rakstāma:\n"
 
-#: src/Dialogs.vala:709
+#: src/Dialogs.vala:725
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3249,7 +3498,7 @@ msgstr[2] ""
 "%d fotogrāfiju/video importēšana neizdevās, jo fotogrāfiju mape nav "
 "rakstāma:\n"
 
-#: src/Dialogs.vala:712
+#: src/Dialogs.vala:728
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3261,7 +3510,7 @@ msgstr[0] ""
 msgstr[1] "%d datņu importēšana neizdevās, jo fotogrāfiju mape nav rakstāma:\n"
 msgstr[2] "%d datņu importēšana neizdevās, jo fotogrāfiju mape nav rakstāma:\n"
 
-#: src/Dialogs.vala:726
+#: src/Dialogs.vala:742
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
@@ -3269,7 +3518,7 @@ msgstr[0] "%d fotogrāfijas importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[1] "%d fotogrāfiju importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[2] "%d fotogrāfiju importēšana neizdevās dēļ kameras kļūdas:\n"
 
-#: src/Dialogs.vala:729
+#: src/Dialogs.vala:745
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
@@ -3277,7 +3526,7 @@ msgstr[0] "%d video importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[1] "%d video importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[2] "%d video importēšana neizdevās dēļ kameras kļūdas:\n"
 
-#: src/Dialogs.vala:732
+#: src/Dialogs.vala:748
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
@@ -3285,7 +3534,7 @@ msgstr[0] "%d fotogrāfijas/video importēšana neizdevās dēļ kameras kļūda
 msgstr[1] "%d fotogrāfiju/video importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[2] "%d fotogrāfiju/video importēšana neizdevās dēļ kameras kļūdas:\n"
 
-#: src/Dialogs.vala:735
+#: src/Dialogs.vala:751
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
@@ -3293,7 +3542,7 @@ msgstr[0] "%d datnes importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[1] "%d datņu importēšana neizdevās dēļ kameras kļūdas:\n"
 msgstr[2] "%d datņu importēšana neizdevās dēļ kameras kļūdas:\n"
 
-#: src/Dialogs.vala:749
+#: src/Dialogs.vala:765
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
@@ -3301,7 +3550,7 @@ msgstr[0] "%d fotogrāfijas importēšana neizdevās, jo tā ir bojāta:\n"
 msgstr[1] "%d fotogrāfiju importēšana neizdevās, jo tās ir bojātas:\n"
 msgstr[2] "%d fotogrāfiju importēšana neizdevās, jo tās ir bojātas:\n"
 
-#: src/Dialogs.vala:752
+#: src/Dialogs.vala:768
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
@@ -3309,7 +3558,7 @@ msgstr[0] "%d video importēšana neizdevās, jo tas ir bojāts:\n"
 msgstr[1] "%d video importēšana neizdevās, jo tie ir bojāti:\n"
 msgstr[2] "%d video importēšana neizdevās, jo tie ir bojāti:\n"
 
-#: src/Dialogs.vala:755
+#: src/Dialogs.vala:771
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
@@ -3317,7 +3566,7 @@ msgstr[0] "%d fotogrāfijas/video importēšana neizdevās, jo tā ir bojāta:\n
 msgstr[1] "%d fotogrāfiju/video importēšana neizdevās, jo tās ir bojātas:\n"
 msgstr[2] "%d fotogrāfiju/video importēšana neizdevās, jo tās ir bojātas:\n"
 
-#: src/Dialogs.vala:758
+#: src/Dialogs.vala:774
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -3329,7 +3578,7 @@ msgstr[2] "%d datņu importēšana neizdevās, jo tās ir bojātas:\n"
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: src/Dialogs.vala:775
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3339,7 +3588,7 @@ msgstr[2] "Izlaistas %d neatbalstītas fotogrāfijas:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:790
+#: src/Dialogs.vala:806
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -3347,7 +3596,7 @@ msgstr[0] "Izlaista %d ne-attēla datne.\n"
 msgstr[1] "Izlaistas %d ne-attēla datnes.\n"
 msgstr[2] "Izlaistu %d ne-attēla datņu.\n"
 
-#: src/Dialogs.vala:801
+#: src/Dialogs.vala:817
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
@@ -3355,7 +3604,7 @@ msgstr[0] "Izlaista %d lietotāja atcelta fotogrāfija:\n"
 msgstr[1] "Izlaistas %d lietotāja atceltas fotogrāfijas:\n"
 msgstr[2] "Izlaistas %d lietotāja atceltas fotogrāfijas:\n"
 
-#: src/Dialogs.vala:804
+#: src/Dialogs.vala:820
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
@@ -3363,7 +3612,7 @@ msgstr[0] "Izlaists %d lietotāja atcelts video:\n"
 msgstr[1] "Izlaisti %d lietotāja atcelti video:\n"
 msgstr[2] "Izlaisti %d lietotāja atcelti video:\n"
 
-#: src/Dialogs.vala:807
+#: src/Dialogs.vala:823
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -3371,7 +3620,7 @@ msgstr[0] "Izlaista %d lietotāja atcelta fotogrāfija/video:\n"
 msgstr[1] "Izlaistas %d lietotāja atceltas fotogrāfijas/video:\n"
 msgstr[2] "Izlaistas %d lietotāja atceltas fotogrāfijas/video:\n"
 
-#: src/Dialogs.vala:810
+#: src/Dialogs.vala:826
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
@@ -3379,7 +3628,7 @@ msgstr[0] "Izlaista %d lietotāja atcelta datne:\n"
 msgstr[1] "Izlaistas %d lietotāja atceltas datnes:\n"
 msgstr[2] "Izlaistas %d lietotāja atceltas datnes:\n"
 
-#: src/Dialogs.vala:824
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -3387,7 +3636,7 @@ msgstr[0] "%d fotogrāfija veiksmīgi importēta.\n"
 msgstr[1] "%d fotogrāfijas veiksmīgi importētas.\n"
 msgstr[2] "%d fotogrāfijas veiksmīgi importētas.\n"
 
-#: src/Dialogs.vala:827
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -3395,7 +3644,7 @@ msgstr[0] "%d video veiksmīgi importēts.\n"
 msgstr[1] "%d video veiksmīgi importēti.\n"
 msgstr[2] "%d video veiksmīgi importēti.\n"
 
-#: src/Dialogs.vala:830
+#: src/Dialogs.vala:846
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3405,15 +3654,15 @@ msgstr[2] "%d fotogrāfijas/video veiksmīgi importēti.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:846
+#: src/Dialogs.vala:862
 msgid "No photos or videos imported.\n"
 msgstr "Neviena fotogrāfija netika importēta.\n"
 
-#: src/Dialogs.vala:853 src/Dialogs.vala:872
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "Importēšana pabeigta"
 
-#: src/Dialogs.vala:1158
+#: src/Dialogs.vala:1174
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -3421,7 +3670,7 @@ msgstr[0] "%d sekunde"
 msgstr[1] "%d sekundes"
 msgstr[2] "%d sekunžu"
 
-#: src/Dialogs.vala:1161
+#: src/Dialogs.vala:1177
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -3429,7 +3678,7 @@ msgstr[0] "%d minūte"
 msgstr[1] "%d minūtes"
 msgstr[2] "%d minūšu"
 
-#: src/Dialogs.vala:1165
+#: src/Dialogs.vala:1181
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -3437,65 +3686,68 @@ msgstr[0] "%d stunda"
 msgstr[1] "%d stundas"
 msgstr[2] "%d stundu"
 
-#: src/Dialogs.vala:1168
+#: src/Dialogs.vala:1184
 msgid "1 day"
 msgstr "1 diena"
 
-#: src/Dialogs.vala:1322 src/Resources.vala:231
+#: src/Dialogs.vala:1338 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Pārdēvēt notikumu"
 
-#: src/Dialogs.vala:1322
+#: src/Dialogs.vala:1338
 msgid "Name:"
 msgstr "Nosaukums:"
 
 #. Dialog title
-#: src/Dialogs.vala:1333
+#: src/Dialogs.vala:1349
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Rediģēt nosaukumu"
 
-#: src/Dialogs.vala:1334 src/Properties.vala:340
+#: src/Dialogs.vala:1350 src/Properties.vala:340
 msgid "Title:"
 msgstr "Nosaukums:"
 
 #. Dialog title
-#: src/Dialogs.vala:1350 src/Resources.vala:307
+#: src/Dialogs.vala:1366 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Rediģēt notikuma komentāru"
 
-#: src/Dialogs.vala:1351
+#: src/Dialogs.vala:1367
 msgid "Edit Photo/Video Comment"
 msgstr "Drukāt fotogrāfijas/video komentāru"
 
-#: src/Dialogs.vala:1352 src/Properties.vala:628
+#: src/Dialogs.vala:1368 src/Properties.vala:628
 msgid "Comment:"
 msgstr "Komentārs:"
 
-#: src/Dialogs.vala:1368
+#: src/Dialogs.vala:1384
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Izņem_t uz izmest datni"
 msgstr[1] "Izņem_t uz izmest datnes"
 msgstr[2] "Izņem_t uz izmest datnes"
 
-#: src/Dialogs.vala:1372
+#: src/Dialogs.vala:1388
 msgid "_Remove From Library"
 msgstr "_Izņemt no bibliotēkas"
 
-#: src/Dialogs.vala:1415
+#: src/Dialogs.vala:1431
 msgid "Revert External Edit?"
 msgstr "Atgriezt ārējo izmaiņu?"
 
-#: src/Dialogs.vala:1415
+#: src/Dialogs.vala:1431
 msgid "Revert External Edits?"
 msgstr "Atgriezt ārējās izmaiņas?"
 
-#: src/Dialogs.vala:1417
+#: src/Dialogs.vala:1433
 #, c-format
-msgid "This will destroy all changes made to the external file.  Continue?"
+#| msgid "This will destroy all changes made to the external file.  Continue?"
+#| msgid_plural ""
+#| "This will destroy all changes made to %d external files.  Continue?"
+msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
-"This will destroy all changes made to %d external files.  Continue?"
+"This will destroy all changes made to %d external files. Continue?"
 msgstr[0] ""
 "Šī darbība iznīcinās visas izmaiņas, kas ir veiktas ar %d ārējo datni. "
 "Turpināt?"
@@ -3506,88 +3758,90 @@ msgstr[2] ""
 "Šī darbība iznīcinās visas izmaiņas, kas ir veiktas ar %d ārējām datnēm. "
 "Turpināt?"
 
-#: src/Dialogs.vala:1421
+#: src/Dialogs.vala:1437
 msgid "Re_vert External Edit"
 msgstr "At_griezt ārējo izmaiņu"
 
-#: src/Dialogs.vala:1421
+#: src/Dialogs.vala:1437
 msgid "Re_vert External Edits"
 msgstr "At_griezt ārējās izmaiņas"
 
-#: src/Dialogs.vala:1442
+#: src/Dialogs.vala:1458
 #, c-format
-msgid "This will remove the photo from the library.  Continue?"
-msgid_plural "This will remove %d photos from the library.  Continue?"
+#| msgid "This will remove the photo from the library.  Continue?"
+#| msgid_plural "This will remove %d photos from the library.  Continue?"
+msgid "This will remove the photo from the library. Continue?"
+msgid_plural "This will remove %d photos from the library. Continue?"
 msgstr[0] "Šī darbība izņems %d fotogrāfiju no bibliotēkas. Turpināt?"
 msgstr[1] "Šī darbība izņems %d fotogrāfijas no bibliotēkas. Turpināt?"
 msgstr[2] "Šī darbība izņems %d fotogrāfijas no bibliotēkas. Turpināt?"
 
-#: src/Dialogs.vala:1449 src/Resources.vala:173
+#: src/Dialogs.vala:1465 src/Resources.vala:173
 msgid "_Remove"
 msgstr "_Izņemt"
 
-#: src/Dialogs.vala:1450
+#: src/Dialogs.vala:1466
 msgid "Remove Photo From Library"
 msgstr "Izņemt fotogrāfiju no bibliotēkas"
 
-#: src/Dialogs.vala:1450
+#: src/Dialogs.vala:1466
 msgid "Remove Photos From Library"
 msgstr "Izņemt fotogrāfijas no bibliotēkas"
 
-#: src/Dialogs.vala:1543
+#: src/Dialogs.vala:1559
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1697
+#: src/Dialogs.vala:1713
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1698
+#: src/Dialogs.vala:1714
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1699
+#: src/Dialogs.vala:1715
 msgid "24 Hr"
 msgstr "24 st"
 
-#: src/Dialogs.vala:1714
+#: src/Dialogs.vala:1730
 msgid "_Shift photos/videos by the same amount"
 msgstr "Pabīdīt fotogrāfija_s/video par vienādu attālumu"
 
-#: src/Dialogs.vala:1719
+#: src/Dialogs.vala:1735
 msgid "Set _all photos/videos to this time"
 msgstr "Iest_atīt visas fotogrāfijas/video uz šo laiku"
 
-#: src/Dialogs.vala:1726
+#: src/Dialogs.vala:1742
 msgid "_Modify original photo file"
 msgstr "_Mainīt sākotnējo fotogrāfijas datni"
 
-#: src/Dialogs.vala:1726
+#: src/Dialogs.vala:1742
 msgid "_Modify original photo files"
 msgstr "_Mainīt sākotnējās fotogrāfijas datnes"
 
-#: src/Dialogs.vala:1729
+#: src/Dialogs.vala:1745
 msgid "_Modify original file"
 msgstr "_Mainīt sākotnējo datni"
 
-#: src/Dialogs.vala:1729
+#: src/Dialogs.vala:1745
 msgid "_Modify original files"
 msgstr "_Mainīt sākotnējās datnes"
 
-#: src/Dialogs.vala:1815
+#: src/Dialogs.vala:1831
 msgid "Original: "
 msgstr "Oriģināls: "
 
-#: src/Dialogs.vala:1816
+#: src/Dialogs.vala:1832
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d.%m.%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1817
+#: src/Dialogs.vala:1833
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d.%m.%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1906
+#: src/Dialogs.vala:1922
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3596,7 +3850,7 @@ msgstr ""
 "Ekspozīcijas laiks tiks pabīdīts uz priekšu par\n"
 "%d %s, %d %s, %d %s un %d %s."
 
-#: src/Dialogs.vala:1907
+#: src/Dialogs.vala:1923
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3605,35 +3859,35 @@ msgstr ""
 "Ekspozīcijas laiks tiks pabīdīts atpakaļ par\n"
 "%d %s, %d %s, %d %s un %d %s."
 
-#: src/Dialogs.vala:1909
+#: src/Dialogs.vala:1925
 msgid "day"
 msgid_plural "days"
 msgstr[0] "diena"
 msgstr[1] "dienas"
 msgstr[2] "dienu"
 
-#: src/Dialogs.vala:1910
+#: src/Dialogs.vala:1926
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "stunda"
 msgstr[1] "stundas"
 msgstr[2] "stundu"
 
-#: src/Dialogs.vala:1911
+#: src/Dialogs.vala:1927
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minūte"
 msgstr[1] "minūtes"
 msgstr[2] "minūšu"
 
-#: src/Dialogs.vala:1912
+#: src/Dialogs.vala:1928
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekunde"
 msgstr[1] "sekundes"
 msgstr[2] "sekunžu"
 
-#: src/Dialogs.vala:1956
+#: src/Dialogs.vala:1972
 #, c-format
 msgid ""
 "\n"
@@ -3656,49 +3910,50 @@ msgstr[2] ""
 "\n"
 "Un %d citu."
 
-#: src/Dialogs.vala:1980 src/Dialogs.vala:2007
+#: src/Dialogs.vala:1996 src/Dialogs.vala:2023
 msgid "Tags (separated by commas):"
 msgstr "Tagi (atdalītas ar komatu):"
 
-#: src/Dialogs.vala:2087
+#: src/Dialogs.vala:2103
 msgid "Welcome!"
 msgstr "Laipni lūdzam!"
 
-#: src/Dialogs.vala:2094
+#: src/Dialogs.vala:2110
 msgid "Welcome to Shotwell!"
 msgstr "Laipni lūdzam Shotwell!"
 
-#: src/Dialogs.vala:2098
+#: src/Dialogs.vala:2114
 msgid "To get started, import photos in any of these ways:"
 msgstr "Lai sāktu, importējiet fotogrāfijas kādā no šiem veidiem:"
 
-#: src/Dialogs.vala:2117
+#: src/Dialogs.vala:2133
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Izvēlieties <span weight=\"bold\">Datne %s Importēt no mapes</span>"
 
-#: src/Dialogs.vala:2118
+#: src/Dialogs.vala:2134
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Velciet un nometiet fotogrāfijas Shotwell logā"
 
-#: src/Dialogs.vala:2119
+#: src/Dialogs.vala:2135
 msgid "Connect a camera to your computer and import"
 msgstr "Pievienojiet kameru datoram un importējiet"
 
-#: src/Dialogs.vala:2129
+#: src/Dialogs.vala:2145
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importēt fotogrāfijas no savas %s mapes"
 
-#: src/Dialogs.vala:2136
+#: src/Dialogs.vala:2152
 msgid "You can also import photos in any of these ways:"
 msgstr "Jūs varat arī importēt fotogrāfijas kādā no šiem veidiem:"
 
-#: src/Dialogs.vala:2146
-msgid "_Don't show this message again"
-msgstr "Vairs nerādīt šo _ziņojumu"
+#: src/Dialogs.vala:2162
+#| msgid "_Don't show this message again"
+msgid "_Don’t show this message again"
+msgstr "_Vairs nerādīt šo ziņojumu"
 
-#: src/Dialogs.vala:2181
+#: src/Dialogs.vala:2197
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importēt fotogrāfijas no %s bibliotēkas"
@@ -3706,41 +3961,41 @@ msgstr "Importēt fotogrāfijas no %s bibliotēkas"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2328 src/Dialogs.vala:2332
+#: src/Dialogs.vala:2344 src/Dialogs.vala:2348
 msgid "(Help)"
 msgstr "(Palīdzība)"
 
-#: src/Dialogs.vala:2341
+#: src/Dialogs.vala:2357
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Gads%sMēnesis%sDiena"
 
-#: src/Dialogs.vala:2343
+#: src/Dialogs.vala:2359
 #, c-format
 msgid "Year%sMonth"
 msgstr "Gads%sMēnesis"
 
-#: src/Dialogs.vala:2345
+#: src/Dialogs.vala:2361
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Gads%sMēnesis-Diena"
 
-#: src/Dialogs.vala:2347
+#: src/Dialogs.vala:2363
 msgid "Year-Month-Day"
 msgstr "Gads-Mēnesis-Diena"
 
-#: src/Dialogs.vala:2348 src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2364 src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Pielāgots"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2585
+#: src/Dialogs.vala:2601
 msgid "Invalid pattern"
 msgstr "Nederīgs raksts"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2687
+#: src/Dialogs.vala:2703
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3748,40 +4003,50 @@ msgstr ""
 "Shotwell var kopēt fotogrāfijas jūsu bibliotēkas mapē, vai tās var tikt "
 "importētas bez kopēšanas."
 
-#: src/Dialogs.vala:2692
+#: src/Dialogs.vala:2708
 msgid "Co_py Photos"
 msgstr "Ko_pēt fotogrāfijas"
 
-#: src/Dialogs.vala:2693
+#: src/Dialogs.vala:2709
 msgid "_Import in Place"
 msgstr "_Importēt vietā"
 
-#: src/Dialogs.vala:2694
+#: src/Dialogs.vala:2710
 msgid "Import to Library"
 msgstr "Importēt bibliotēkā"
 
-#: src/Dialogs.vala:2704 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2720 src/PhotoPage.vala:3085
 msgid "Remove From Library"
 msgstr "Izņemt no bibliotēkas"
 
-#: src/Dialogs.vala:2705 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2721 src/PhotoPage.vala:3085
 msgid "Removing Photo From Library"
 msgstr "Izņem fotogrāfijas no bibliotēkas"
 
-#: src/Dialogs.vala:2705
+#: src/Dialogs.vala:2721
 msgid "Removing Photos From Library"
 msgstr "Izņem fotogrāfijas no bibliotēkas"
 
-#: src/Dialogs.vala:2719
+#: src/Dialogs.vala:2735
 #, c-format
+#| msgid ""
+#| "This will remove the photo/video from your Shotwell library.  Would you "
+#| "also like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d photos/videos from your Shotwell library.  Would you "
+#| "also like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the photo/video from your Shotwell library.  Would you also "
+"This will remove the photo/video from your Shotwell library. Would you also "
 "like to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos/videos from your Shotwell library.  Would you "
-"also like to move the files to your desktop trash?\n"
+"This will remove %d photos/videos from your Shotwell library. Would you also "
+"like to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgstr[0] ""
@@ -3800,15 +4065,25 @@ msgstr[2] ""
 "\n"
 "Šo darbību nevar atsaukt."
 
-#: src/Dialogs.vala:2723
+#: src/Dialogs.vala:2739
 #, c-format
+#| msgid ""
+#| "This will remove the video from your Shotwell library.  Would you also "
+#| "like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d videos from your Shotwell library.  Would you also "
+#| "like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the video from your Shotwell library.  Would you also like "
+"This will remove the video from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d videos from your Shotwell library.  Would you also like "
+"This will remove %d videos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
@@ -3828,15 +4103,25 @@ msgstr[2] ""
 "\n"
 "Šo darbību nevar atsaukt."
 
-#: src/Dialogs.vala:2727
+#: src/Dialogs.vala:2743
 #, c-format
+#| msgid ""
+#| "This will remove the photo from your Shotwell library.  Would you also "
+#| "like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d photos from your Shotwell library.  Would you also "
+#| "like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the photo from your Shotwell library.  Would you also like "
+"This will remove the photo from your Shotwell library. Would you also like "
 "to move the file to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
 msgid_plural ""
-"This will remove %d photos from your Shotwell library.  Would you also like "
+"This will remove %d photos from your Shotwell library. Would you also like "
 "to move the files to your desktop trash?\n"
 "\n"
 "This action cannot be undone."
@@ -3856,12 +4141,18 @@ msgstr[2] ""
 "\n"
 "Šo darbību nevar atsaukt."
 
-#: src/Dialogs.vala:2759
+#: src/Dialogs.vala:2775
 #, c-format
+#| msgid ""
+#| "The photo or video cannot be moved to your desktop trash.  Delete this "
+#| "file?"
+#| msgid_plural ""
+#| "%d photos/videos cannot be moved to your desktop trash.  Delete these "
+#| "files?"
 msgid ""
-"The photo or video cannot be moved to your desktop trash.  Delete this file?"
+"The photo or video cannot be moved to your desktop trash. Delete this file?"
 msgid_plural ""
-"%d photos/videos cannot be moved to your desktop trash.  Delete these files?"
+"%d photos/videos cannot be moved to your desktop trash. Delete these files?"
 msgstr[0] ""
 "Šo %d fotogrāfiju vai video nevar pārvietot uz miskasti. Dzēst šo datni?"
 msgstr[1] ""
@@ -3870,7 +4161,7 @@ msgstr[2] ""
 "Šīs %d fotogrāfijas vai video nevar pārvietot uz miskasti. Dzēst šīs datnes?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2776
+#: src/Dialogs.vala:2792
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -3900,8 +4191,9 @@ msgid "Save photo"
 msgstr "Saglabāt fotogrāfiju"
 
 #: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "S_aglabāt kā..."
+#| msgid "Save _As"
+msgid "Save _As…"
+msgstr "S_aglabāt kā…"
 
 #: src/direct/DirectPhotoPage.vala:58
 msgid "Save photo with a different name"
@@ -4078,84 +4370,104 @@ msgid "-"
 msgstr "-"
 
 #: src/editing_tools/EditingTools.vala:758
-msgid "SD Video (4 : 3)"
-msgstr "SD video (4 : 3)"
+#| msgid "SD Video (4 : 3)"
+msgid "SD Video (4 ∶ 3)"
+msgstr "SD video (4 ∶ 3)"
 
 #: src/editing_tools/EditingTools.vala:759
-msgid "HD Video (16 : 9)"
-msgstr "HD video (16 : 9)"
+#| msgid "HD Video (16 : 9)"
+msgid "HD Video (16 ∶ 9)"
+msgstr "HD video (16 ∶ 9)"
 
 #: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
-msgid "Wallet (2 x 3 in.)"
-msgstr "Maks (2 x 3 collas)"
+#| msgid "Wallet (2 x 3 in.)"
+msgid "Wallet (2 × 3 in.)"
+msgstr "Maks (2 × 3 collas)"
 
 #: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
-msgid "Notecard (3 x 5 in.)"
-msgstr "Piezīmjkartiņa (3 x 5 collas)"
+#| msgid "Notecard (3 x 5 in.)"
+msgid "Notecard (3 × 5 in.)"
+msgstr "Piezīmjkartiņa (3 × 5 collas)"
 
 #: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
-msgid "4 x 6 in."
-msgstr "4 x 6 collas"
+#| msgid "4 x 6 in."
+msgid "4 × 6 in."
+msgstr "4 × 6 collas"
 
 #: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
-msgid "5 x 7 in."
-msgstr "5 x 7 collas"
+#| msgid "5 x 7 in."
+msgid "5 × 7 in."
+msgstr "5 × 7 collas"
 
 #: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
-msgid "8 x 10 in."
-msgstr "8 x 10 collas"
+#| msgid "8 x 10 in."
+msgid "8 × 10 in."
+msgstr "8 × 10 collas"
 
 #: src/editing_tools/EditingTools.vala:766
-msgid "Letter (8.5 x 11 in.)"
-msgstr "Vēstule (8.5 x 11 collas)"
+#| msgid "Letter (8.5 x 11 in.)"
+msgid "Letter (8.5 × 11 in.)"
+msgstr "Vēstule (8,5 × 11 collas)"
 
 #: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
-msgid "11 x 14 in."
-msgstr "11 x 14 collas"
+#| msgid "11 x 14 in."
+msgid "11 × 14 in."
+msgstr "11 × 14 collas"
 
 #: src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "Tabloīds (11 x 17 collas)"
+#| msgid "Tabloid (11 x 17 in.)"
+msgid "Tabloid (11 × 17 in.)"
+msgstr "Tabloīds (11 × 17 collas)"
 
 #: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
-msgid "16 x 20 in."
-msgstr "16 x 20 collas"
+#| msgid "16 x 20 in."
+msgid "16 × 20 in."
+msgstr "16 × 20 collas"
 
 #: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Metriskais maks (9 x 13 cm)"
+#| msgid "Metric Wallet (9 x 13 cm)"
+msgid "Metric Wallet (9 × 13 cm)"
+msgstr "Metriskais maks (9 × 13 cm)"
 
 #: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
-msgid "Postcard (10 x 15 cm)"
-msgstr "Pastkarte (10 x 15 cm)"
+#| msgid "Postcard (10 x 15 cm)"
+msgid "Postcard (10 × 15 cm)"
+msgstr "Pastkarte (10 × 15 cm)"
 
 #: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
-msgid "13 x 18 cm"
-msgstr "13 x 18 cm"
+#| msgid "13 x 18 cm"
+msgid "13 × 18 cm"
+msgstr "13 × 18 cm"
 
 #: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
-msgid "18 x 24 cm"
-msgstr "18 x 24 cm"
+#| msgid "18 x 24 cm"
+msgid "18 × 24 cm"
+msgstr "18 × 24 cm"
 
 #: src/editing_tools/EditingTools.vala:775
-msgid "A4 (210 x 297 mm)"
-msgstr "A4 (210 x 297 mm)"
+#| msgid "A4 (210 x 297 mm)"
+msgid "A4 (210 × 297 mm)"
+msgstr "A4 (210 × 297 mm)"
 
 #: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
-msgid "20 x 30 cm"
-msgstr "20 x 30 cm"
+#| msgid "20 x 30 cm"
+msgid "20 × 30 cm"
+msgstr "20 × 30 cm"
 
 #: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
-msgid "24 x 40 cm"
-msgstr "24 x 40 cm"
+#| msgid "24 x 40 cm"
+msgid "24 × 40 cm"
+msgstr "24 × 40 cm"
 
 #: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
-msgid "30 x 40 cm"
-msgstr "30 x 40 cm"
+#| msgid "30 x 40 cm"
+msgid "30 × 40 cm"
+msgstr "30 × 40 cm"
 
 #: src/editing_tools/EditingTools.vala:779
-msgid "A3 (297 x 420 mm)"
-msgstr "A3 (297 x 420 mm)"
+#| msgid "A3 (297 x 420 mm)"
+msgid "A3 (297 × 420 mm)"
+msgstr "A3 (297 × 420 mm)"
 
 #: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395
 msgid "Size:"
@@ -4169,70 +4481,79 @@ msgstr "Aizvērt sarkano acu rīku"
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Izņemt sarkano acu efektu izvēlētajā reģionā"
 
-#: src/editing_tools/EditingTools.vala:2226
+#: src/editing_tools/EditingTools.vala:2229
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Atiestatīt"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2240 src/Properties.vala:436
+#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:436
 #: src/Properties.vala:440 src/Properties.vala:447
 msgid "Exposure:"
 msgstr "Ekspozīcija:"
 
-#: src/editing_tools/EditingTools.vala:2248
+#: src/editing_tools/EditingTools.vala:2251
+msgid "Contrast:"
+msgstr "Kontrasts:"
+
+#: src/editing_tools/EditingTools.vala:2259
 msgid "Saturation:"
 msgstr "Piesātinājums:"
 
-#: src/editing_tools/EditingTools.vala:2256
+#: src/editing_tools/EditingTools.vala:2267
 msgid "Tint:"
 msgstr "Tonis:"
 
-#: src/editing_tools/EditingTools.vala:2265
+#: src/editing_tools/EditingTools.vala:2276
 msgid "Temperature:"
 msgstr "Temperatūra:"
 
-#: src/editing_tools/EditingTools.vala:2273
+#: src/editing_tools/EditingTools.vala:2284
 msgid "Shadows:"
 msgstr "Ēnas:"
 
-#: src/editing_tools/EditingTools.vala:2281
+#: src/editing_tools/EditingTools.vala:2292
 msgid "Highlights:"
 msgstr "Gaišās vietas:"
 
-#: src/editing_tools/EditingTools.vala:2335
+#: src/editing_tools/EditingTools.vala:2346
 msgid "Reset Colors"
 msgstr "Atiestatīt krāsas"
 
-#: src/editing_tools/EditingTools.vala:2335
+#: src/editing_tools/EditingTools.vala:2346
 msgid "Reset all color adjustments to original"
 msgstr "Atiestatīt visus krāsu pielāgojumu atpakaļ uz sākotnējo"
 
-#: src/editing_tools/EditingTools.vala:2687
+#: src/editing_tools/EditingTools.vala:2705
 msgid "Temperature"
 msgstr "Temperatūra"
 
-#: src/editing_tools/EditingTools.vala:2700
+#: src/editing_tools/EditingTools.vala:2717
 msgid "Tint"
 msgstr "Tonis"
 
-#: src/editing_tools/EditingTools.vala:2713
+#: src/editing_tools/EditingTools.vala:2729
+#| msgid "Contrast Expansion"
+msgid "Contrast"
+msgstr "Kontrasts"
+
+#: src/editing_tools/EditingTools.vala:2743
 msgid "Saturation"
 msgstr "Piesātinājums"
 
-#: src/editing_tools/EditingTools.vala:2726
+#: src/editing_tools/EditingTools.vala:2756
 msgid "Exposure"
 msgstr "Ekspozīcija"
 
-#: src/editing_tools/EditingTools.vala:2739
+#: src/editing_tools/EditingTools.vala:2769
 msgid "Shadows"
 msgstr "Ēnas"
 
-#: src/editing_tools/EditingTools.vala:2752
+#: src/editing_tools/EditingTools.vala:2782
 msgid "Highlights"
 msgstr "Gaišās vietas"
 
-#: src/editing_tools/EditingTools.vala:2762
+#: src/editing_tools/EditingTools.vala:2792
 msgid "Contrast Expansion"
 msgstr "Kontrasta palielināšana"
 
@@ -4309,7 +4630,7 @@ msgid "%B"
 msgstr "%B"
 
 #. if no name, pretty up the start time
-#: src/Event.vala:751
+#: src/Event.vala:753
 #, c-format
 msgid "Event %s"
 msgstr "Notikums %s"
@@ -4325,8 +4646,9 @@ msgstr "Eksportē"
 
 #: src/Exporter.vala:317
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "Datne %s jau eksistē.  Aizvietot?"
+#| msgid "File %s already exists.  Replace?"
+msgid "File %s already exists. Replace?"
+msgstr "Datne %s jau eksistē. Aizvietot?"
 
 #: src/Exporter.vala:319
 msgid "_Skip"
@@ -4363,8 +4685,9 @@ msgid "Flagged"
 msgstr "Ar karodziņu"
 
 #: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Importē..."
+#| msgid "Importing"
+msgid "Importing…"
+msgstr "Importē…"
 
 #: src/library/ImportQueuePage.vala:67
 msgid "_Stop Import"
@@ -4375,8 +4698,9 @@ msgid "Stop importing photos"
 msgstr "Apturēt fotogrāfiju importēšanu"
 
 #: src/library/ImportQueuePage.vala:124
-msgid "Preparing to import..."
-msgstr "Gatavojas importēt..."
+#| msgid "Preparing to import"
+msgid "Preparing to import…"
+msgstr "Gatavojas importēt…"
 
 #: src/library/ImportQueuePage.vala:151
 #, c-format
@@ -4388,16 +4712,18 @@ msgid "Last Import"
 msgstr "Pēdējais imports"
 
 #: src/library/LibraryWindow.vala:285
-msgid "_Import From Folder..."
-msgstr "_Importēt no mapes..."
+#| msgid "Import From Folder"
+msgid "_Import From Folder…"
+msgstr "_Importēt no mapes…"
 
 #: src/library/LibraryWindow.vala:286
 msgid "Import photos from disk to library"
 msgstr "Importēt fotogrāfijas no diska uz bibliotēku"
 
 #: src/library/LibraryWindow.vala:293
-msgid "Import From _Application..."
-msgstr "Importēt no _lietotnes..."
+#| msgid "Import From Application"
+msgid "Import From _Application…"
+msgstr "Importēt no _lietotnes…"
 
 #: src/library/LibraryWindow.vala:297
 msgid "Sort _Events"
@@ -4425,8 +4751,9 @@ msgstr "Meklēt fotogrāfijas un video pēc meklēšanas kritērija"
 
 #: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
 #: src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search..."
-msgstr "_Jauna saglabātā meklēšana..."
+#| msgid "Ne_w Saved Search..."
+msgid "Ne_w Saved Search…"
+msgstr "_Jauna saglabātā meklēšana…"
 
 #: src/library/LibraryWindow.vala:351
 msgid "_Photos"
@@ -4505,8 +4832,9 @@ msgid "Empty Trash"
 msgstr "Iztukšot miskasti"
 
 #: src/library/LibraryWindow.vala:726
-msgid "Emptying Trash..."
-msgstr "Iztukšo miskasti..."
+#| msgid "Emptying Trash..."
+msgid "Emptying Trash…"
+msgstr "Iztukšo miskasti…"
 
 #: src/library/LibraryWindow.vala:901
 #, c-format
@@ -4536,28 +4864,33 @@ msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
 #: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258
-msgid "Updating library..."
-msgstr "Atjaunina bibliotēku..."
+#| msgid "Updating library..."
+msgid "Updating library…"
+msgstr "Atjaunina bibliotēku…"
 
 #: src/library/LibraryWindow.vala:1264
-msgid "Preparing to auto-import photos..."
-msgstr "Gatavojas automātiski importēt fotogrāfijas..."
+#| msgid "Preparing to auto-import photos..."
+msgid "Preparing to auto-import photos…"
+msgstr "Gatavojas automātiski importēt fotogrāfijas…"
 
 #: src/library/LibraryWindow.vala:1269
-msgid "Auto-importing photos..."
-msgstr "Automātiski importē fotogrāfijas..."
+#| msgid "Auto-importing photos..."
+msgid "Auto-importing photos…"
+msgstr "Automātiski importē fotogrāfijas…"
 
 #: src/library/LibraryWindow.vala:1277
-msgid "Writing metadata to files..."
-msgstr "Datnēs raksta metadatus..."
+#| msgid "Writing metadata to files..."
+msgid "Writing metadata to files…"
+msgstr "Datnēs raksta metadatus…"
 
 #: src/library/OfflinePage.vala:8
 msgid "Missing Files"
 msgstr "Iztrūkstošās datnes"
 
 #: src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Dzēš..."
+#| msgid "Deleting..."
+msgid "Deleting…"
+msgstr "Dzēš…"
 
 #: src/library/TrashPage.vala:8
 msgid "Trash"
@@ -4577,10 +4910,14 @@ msgstr "Dzēš fotogrāfijas"
 
 #: src/main.vala:54
 #, c-format
+#| msgid ""
+#| "Your photo library is not compatible with this version of Shotwell.  It "
+#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
+#| "(schema %d).  Please use the latest version of Shotwell."
 msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please use the latest version of Shotwell."
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please use the latest version of Shotwell."
 msgstr ""
 "Šī fotogrāfiju bibliotēka nav savietojama ar šo Shotwell versiju. Izskatās, "
 "ka tā tika veidota ar Shotwell %s (shēma %d). Šī versija ir %s (shēma %d). "
@@ -4588,9 +4925,13 @@ msgstr ""
 
 #: src/main.vala:59
 #, c-format
+#| msgid ""
+#| "Shotwell was unable to upgrade your photo library from version %s (schema "
+#| "%d) to %s (schema %d).  For more information please check the Shotwell "
+#| "Wiki at %s"
 msgid ""
 "Shotwell was unable to upgrade your photo library from version %s (schema "
-"%d) to %s (schema %d).  For more information please check the Shotwell Wiki "
+"%d) to %s (schema %d). For more information please check the Shotwell Wiki "
 "at %s"
 msgstr ""
 "Shotwell nevarēja uzlabot šo fotogrāfiju bibliotēku no versijas %s (shēma "
@@ -4598,10 +4939,15 @@ msgstr ""
 
 #: src/main.vala:65
 #, c-format
+#| msgid ""
+#| "Your photo library is not compatible with this version of Shotwell.  It "
+#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
+#| "(schema %d).  Please clear your library by deleting %s and re-import your "
+#| "photos."
 msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please clear your library by deleting %s and re-import your "
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please clear your library by deleting %s and re-import your "
 "photos."
 msgstr ""
 "Šī fotogrāfiju bibliotēka nav savietojama ar šo Shotwell versiju. Izskatās, "
@@ -4610,7 +4956,8 @@ msgstr ""
 
 #: src/main.vala:71
 #, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
+#| msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgid "Unknown error attempting to verify Shotwell’s database: %s"
 msgstr "Nezināma kļūda, mēģinot pārbaudīt Shotwell datubāzi — %s"
 
 #: src/main.vala:104
@@ -4618,7 +4965,8 @@ msgid "Loading Shotwell"
 msgstr "Ielādē Shotwell"
 
 #: src/main.vala:294
-msgid "Path to Shotwell's private data"
+#| msgid "Path to Shotwell's private data"
+msgid "Path to Shotwell’s private data"
 msgstr "Ceļš uz Shotwell privātajiem datiem"
 
 #: src/main.vala:294
@@ -4630,11 +4978,13 @@ msgid "Do not monitor library directory at runtime for changes"
 msgstr "Nesekot līdzi bibliotēkas direktorijas izmaiņām"
 
 #: src/main.vala:302
-msgid "Don't display startup progress meter"
+#| msgid "Don't display startup progress meter"
+msgid "Don’t display startup progress meter"
 msgstr "Nerādīt palaišanās progresu"
 
 #: src/main.vala:306
-msgid "Show the application's version"
+#| msgid "Show the application's version"
+msgid "Show the application’s version"
 msgstr "Rādīt lietotnes versiju"
 
 #. init GTK (valac has already called g_threads_init())
@@ -4644,7 +4994,9 @@ msgstr "[DATNE]"
 
 #: src/main.vala:342
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options.\n"
+msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
 "Palaidiet “%s --help”, lai redzētu pilnu pieejamo komandrindas opciju "
 "sarakstu.\n"
@@ -4687,7 +5039,8 @@ msgid "Display the comment of each photo"
 msgstr "Rādīt komentāru katrai fotogrāfijai"
 
 #: src/MediaPage.vala:470
-msgid "Display each photo's tags"
+#| msgid "Display each photo's tags"
+msgid "Display each photo’s tags"
 msgstr "Rādīt katras fotogrāfijas tagu"
 
 #: src/MediaPage.vala:486
@@ -4848,8 +5201,9 @@ msgid "Image Settings"
 msgstr "Attēla iestatījumi"
 
 #: src/Printing.vala:889
-msgid "Printing..."
-msgstr "Drukā..."
+#| msgid "Printing..."
+msgid "Printing…"
+msgstr "Drukā…"
 
 #: src/Printing.vala:909 src/Printing.vala:1112
 #, c-format
@@ -4995,7 +5349,8 @@ msgstr "Augšupielādē %d no %d"
 
 #: src/publishing/PublishingPluginHost.vala:81
 #, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
+#| msgid "Publishing to %s can't continue because an error occurred:"
+msgid "Publishing to %s can’t continue because an error occurred:"
 msgstr "Nevar turpināt publicēšanu uz %s, jo gadījās kļūda:"
 
 #: src/publishing/PublishingPluginHost.vala:84
@@ -5025,12 +5380,14 @@ msgid "The selected photo was successfully published."
 msgstr "Izvēlētā fotogrāfija tika veiksmīgi publicēta."
 
 #: src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
-msgstr "Saņem konta informāciju..."
+#| msgid "Fetching account information..."
+msgid "Fetching account information…"
+msgstr "Saņem konta informāciju…"
 
 #: src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "Ierakstās..."
+#| msgid "Logging in..."
+msgid "Logging in…"
+msgstr "Ierakstās…"
 
 #: src/publishing/PublishingUI.vala:188
 msgid "Publish Photos"
@@ -5221,7 +5578,8 @@ msgid "Enhance"
 msgstr "Uzlabot"
 
 #: src/Resources.vala:188
-msgid "Automatically improve the photo's appearance"
+#| msgid "Automatically improve the photo's appearance"
+msgid "Automatically improve the photo’s appearance"
 msgstr "Automātiski uzlabot fotogrāfijas izskatu"
 
 #: src/Resources.vala:190
@@ -5257,7 +5615,8 @@ msgid "Crop"
 msgstr "Kadrēt"
 
 #: src/Resources.vala:200
-msgid "Crop the photo's size"
+#| msgid "Crop the photo's size"
+msgid "Crop the photo’s size"
 msgstr "Kadrēt fotogrāfijas izmēru"
 
 #: src/Resources.vala:203
@@ -5289,7 +5648,8 @@ msgid "Adjust"
 msgstr "Pielāgot"
 
 #: src/Resources.vala:212
-msgid "Adjust the photo's color and tone"
+#| msgid "Adjust the photo's color and tone"
+msgid "Adjust the photo’s color and tone"
 msgstr "Pielāgot fotogrāfijas krāsu un toni"
 
 #: src/Resources.vala:214
@@ -5317,8 +5677,9 @@ msgid "Set selected image to be the new desktop background"
 msgstr "Iestatīt izvēlētos attēlus kā jaunos darbvirsmas fonus"
 
 #: src/Resources.vala:222
-msgid "Set as _Desktop Slideshow..."
-msgstr "Iestatīt kā _darbvirsmas slaidrādi..."
+#| msgid "Set as Desktop Slideshow"
+msgid "Set as _Desktop Slideshow…"
+msgstr "Iestatīt kā _darbvirsmas slaidrādi…"
 
 #: src/Resources.vala:224
 msgid "_Undo"
@@ -5337,8 +5698,9 @@ msgid "Redo"
 msgstr "Atatsaukt"
 
 #: src/Resources.vala:230
-msgid "Re_name Event..."
-msgstr "Pārdēvēt _notikumu..."
+#| msgid "Rename Event"
+msgid "Re_name Event…"
+msgstr "Pārdēvēt _notikumu…"
 
 #: src/Resources.vala:233
 msgid "Make _Key Photo for Event"
@@ -5479,7 +5841,8 @@ msgid "_Ratings"
 msgstr "Vē_rtējumi"
 
 #: src/Resources.vala:280
-msgid "Display each photo's rating"
+#| msgid "Display each photo's rating"
+msgid "Display each photo’s rating"
 msgstr "Rādīt katras fotogrāfijas vērtējumu"
 
 #: src/Resources.vala:282
@@ -5507,24 +5870,29 @@ msgid "Make a duplicate of the photo"
 msgstr "Izveidot fotogrāfijas dublikātu"
 
 #: src/Resources.vala:290
-msgid "_Export..."
-msgstr "_Eksportēt..."
+#| msgid "Export"
+msgid "_Export…"
+msgstr "_Eksportēt…"
 
 #: src/Resources.vala:292
-msgid "_Print..."
-msgstr "_Drukāt..."
+#| msgid "_Print"
+msgid "_Print…"
+msgstr "_Drukāt…"
 
 #: src/Resources.vala:294
-msgid "Pu_blish..."
-msgstr "Pu_blicēt..."
+#| msgid "Publish"
+msgid "Pu_blish…"
+msgstr "Pu_blicēt…"
 
 #: src/Resources.vala:296
 msgid "Publish to various websites"
 msgstr "Publicēt uz dažādām tīmekļa vietnēm"
 
 #: src/Resources.vala:298
-msgid "Edit _Title..."
-msgstr "Rediģē_t nosaukumu..."
+#| msgctxt "Dialog Title"
+#| msgid "Edit Title"
+msgid "Edit _Title…"
+msgstr "Rediģēt _nosaukumu…"
 
 #. Button label
 #: src/Resources.vala:300
@@ -5533,8 +5901,9 @@ msgid "Edit Title"
 msgstr "Rediģēt nosaukumu"
 
 #: src/Resources.vala:302
-msgid "Edit _Comment..."
-msgstr "Rediģēt _komentāru..."
+#| msgid "Edit Comment"
+msgid "Edit _Comment…"
+msgstr "Rediģēt _komentāru…"
 
 #. Button label
 #: src/Resources.vala:304
@@ -5542,24 +5911,30 @@ msgid "Edit Comment"
 msgstr "Rediģēt komentāru"
 
 #: src/Resources.vala:306
-msgid "Edit Event _Comment..."
-msgstr "Rediģēt notikuma _komentāru..."
+#| msgid "Edit Event Comment"
+msgid "Edit Event _Comment…"
+msgstr "Rediģēt notikuma _komentāru…"
 
 #: src/Resources.vala:309
-msgid "_Adjust Date and Time..."
-msgstr "Pielāgot d_atumu un laiku..."
+#| msgid "Adjust Date and Time"
+msgid "_Adjust Date and Time…"
+msgstr "_Pielāgot datumu un laiku…"
 
 #: src/Resources.vala:310
 msgid "Adjust Date and Time"
 msgstr "Pielāgot datumu un laiku"
 
 #: src/Resources.vala:312
-msgid "Add _Tags..."
-msgstr "Pievienot _tagus..."
+#| msgctxt "Dialog Title"
+#| msgid "Add Tags"
+msgid "Add _Tags…"
+msgstr "Pievienot _tagus…"
 
 #: src/Resources.vala:313
-msgid "_Add Tags..."
-msgstr "Pievienot T_agus..."
+#| msgctxt "Dialog Title"
+#| msgid "Add Tags"
+msgid "_Add Tags…"
+msgstr "Pievienot _tagus…"
 
 #. Dialog title
 #: src/Resources.vala:315
@@ -5576,16 +5951,19 @@ msgid "Open With RA_W Editor"
 msgstr "Atvērt ar RA_W redaktoru"
 
 #: src/Resources.vala:323
-msgid "Send _To..."
-msgstr "Sū_tīt uz..."
+#| msgid "Send To"
+msgid "Send _To…"
+msgstr "Sū_tīt uz…"
 
 #: src/Resources.vala:324
-msgid "Send T_o..."
-msgstr "Sūtīt _uz..."
+#| msgid "Send To"
+msgid "Send T_o…"
+msgstr "Sūtīt _uz…"
 
 #: src/Resources.vala:326
-msgid "_Find..."
-msgstr "_Meklēt..."
+#| msgid "_Find"
+msgid "_Find…"
+msgstr "_Meklēt…"
 
 #: src/Resources.vala:327
 msgid "Find"
@@ -5610,13 +5988,15 @@ msgstr "Nevar palaist redaktoru — %s"
 
 #: src/Resources.vala:340
 #, c-format
-msgid "Add Tag \"%s\""
+#| msgid "Add Tag \"%s\""
+msgid "Add Tag “%s”"
 msgstr "Pievienot tagu “%s”"
 
 #. Used when adding two tags to photo(s)
 #: src/Resources.vala:343
 #, c-format
-msgid "Add Tags \"%s\" and \"%s\""
+#| msgid "Add Tags \"%s\" and \"%s\""
+msgid "Add Tags “%s” and “%s”"
 msgstr "Pievienot tagus “%s” un “%s”"
 
 #. Undo/Redo command name (in Edit menu)
@@ -5627,12 +6007,14 @@ msgstr "Pievienot tagus"
 
 #: src/Resources.vala:353
 #, c-format
-msgid "_Delete Tag \"%s\""
+#| msgid "_Delete Tag \"%s\""
+msgid "_Delete Tag “%s”"
 msgstr "_Dzēst tagu “%s”"
 
 #: src/Resources.vala:357
 #, c-format
-msgid "Delete Tag \"%s\""
+#| msgid "Delete Tag \"%s\""
+msgid "Delete Tag “%s”"
 msgstr "Dzēst tagu “%s”"
 
 #: src/Resources.vala:360
@@ -5641,21 +6023,25 @@ msgstr "Dzēst tagu"
 
 #: src/Resources.vala:366
 #, c-format
-msgid "Re_name Tag \"%s\"..."
-msgstr "_Pārdēvēt tagu “%s”..."
+#| msgid "Re_name Tag \"%s\"..."
+msgid "Re_name Tag “%s”…"
+msgstr "_Pārdēvēt tagu “%s”…"
 
 #: src/Resources.vala:370
 #, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
+#| msgid "Rename Tag \"%s\" to \"%s\""
+msgid "Rename Tag “%s” to “%s”"
 msgstr "Pārdēvēt tagu “%s” uz “%s”"
 
 #: src/Resources.vala:373
-msgid "_Rename..."
-msgstr "Pā_rdēvēt..."
+#| msgid "_Rename..."
+msgid "_Rename…"
+msgstr "Pā_rdēvēt…"
 
 #: src/Resources.vala:375
-msgid "Modif_y Tags..."
-msgstr "Mod_ificēt tagus..."
+#| msgid "Modify Tags"
+msgid "Modif_y Tags…"
+msgstr "Mod_ificēt tagus…"
 
 #: src/Resources.vala:376
 msgid "Modify Tags"
@@ -5663,52 +6049,62 @@ msgstr "Modificēt tagus"
 
 #: src/Resources.vala:379
 #, c-format
-msgid "Tag Photo as \"%s\""
-msgstr "Fotogrāfijām pielikt tagu “%s”"
+#| msgid "Tag Photo as \"%s\""
+msgid "Tag Photo as “%s”"
+msgstr "Tagot fotogrāfiju kā “%s”…"
 
 #: src/Resources.vala:379
 #, c-format
-msgid "Tag Photos as \"%s\""
-msgstr "Tagot fotogrāfijas kā “%s”"
+#| msgid "Tag Photos as \"%s\""
+msgid "Tag Photos as “%s”"
+msgstr "Tagot fotogrāfijas kā “%s”…"
 
 #: src/Resources.vala:383
 #, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr "Izvēlētajām fotogrāfijām pielikt tagu “%s”"
+#| msgid "Tag the selected photo as \"%s\""
+msgid "Tag the selected photo as “%s”"
+msgstr "Tagot izvēlēto fotogrāfiju kā “%s”"
 
 #: src/Resources.vala:384
 #, c-format
-msgid "Tag the selected photos as \"%s\""
+#| msgid "Tag the selected photos as \"%s\""
+msgid "Tag the selected photos as “%s”"
 msgstr "Tagot izvēlētās fotogrāfijas kā “%s”"
 
 #: src/Resources.vala:388
 #, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr "No _fotogrāfijām izņemt tagu “%s”"
+#| msgid "Remove Tag \"%s\" From _Photo"
+msgid "Remove Tag “%s” From _Photo"
+msgstr "Izņemt tagu “%s” no _fotogrāfijas"
 
 #: src/Resources.vala:389
 #, c-format
-msgid "Remove Tag \"%s\" From _Photos"
+#| msgid "Remove Tag \"%s\" From _Photos"
+msgid "Remove Tag “%s” From _Photos"
 msgstr "Izņemt tagu “%s” no _fotogrāfijām"
 
 #: src/Resources.vala:393
 #, c-format
-msgid "Remove Tag \"%s\" From Photo"
-msgstr "No fotogrāfijām izņemt tagu “%s”"
+#| msgid "Remove Tag \"%s\" From Photo"
+msgid "Remove Tag “%s” From Photo"
+msgstr "Izņemt tagu “%s” no fotogrāfijas"
 
 #: src/Resources.vala:394
 #, c-format
-msgid "Remove Tag \"%s\" From Photos"
+#| msgid "Remove Tag \"%s\" From Photos"
+msgid "Remove Tag “%s” From Photos"
 msgstr "Izņemt tagu “%s” no fotogrāfijām"
 
 #: src/Resources.vala:398
 #, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
+#| msgid "Unable to rename tag to \"%s\" because the tag already exists."
+msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr "Tagu “%s” nevar pārdēvēt, jo tāds tags jau eksistē."
 
 #: src/Resources.vala:402
 #, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
+#| msgid "Unable to rename search to \"%s\" because the search already exists."
+msgid "Unable to rename search to “%s” because the search already exists."
 msgstr "Nevar pārdēvēt meklēšanu uz “%s”, jo tāda jau eksistē."
 
 #. Saved search button
@@ -5721,21 +6117,25 @@ msgid "Delete Search"
 msgstr "Dzēst meklēšanu"
 
 #: src/Resources.vala:410
-msgid "_Edit..."
-msgstr "R_ediģēt..."
+#| msgid "_Edit"
+msgid "_Edit…"
+msgstr "R_ediģēt…"
 
 #: src/Resources.vala:411
-msgid "Re_name..."
-msgstr "_Pārdēvēt..."
+#| msgid "Re_name..."
+msgid "Re_name…"
+msgstr "_Pārdēvēt…"
 
 #: src/Resources.vala:414
 #, c-format
-msgid "Rename Search \"%s\" to \"%s\""
+#| msgid "Rename Search \"%s\" to \"%s\""
+msgid "Rename Search “%s” to “%s”"
 msgstr "Pārdēvēt meklēšanu “%s” uz “%s”"
 
 #: src/Resources.vala:418
 #, c-format
-msgid "Delete Search \"%s\""
+#| msgid "Delete Search \"%s\""
+msgid "Delete Search “%s”"
 msgstr "Dzēst meklēšanu “%s”"
 
 #: src/Resources.vala:576
@@ -5799,7 +6199,8 @@ msgid "Show in File Mana_ger"
 msgstr "Rādīt datņu _pārvaldniekā"
 
 #: src/Resources.vala:682
-msgid "Open the selected photo's directory in the file manager"
+#| msgid "Open the selected photo's directory in the file manager"
+msgid "Open the selected photo’s directory in the file manager"
 msgstr "Atvērt izvēlētās fotogrāfijas mapi datņu pārvaldniekā"
 
 #: src/Resources.vala:685
@@ -6094,8 +6495,9 @@ msgid "Use a saved search to filter items in the current view"
 msgstr "Izmantot saglabātu meklējumu, lai filtrētu vienumus šajā skatā"
 
 #: src/sidebar/Tree.vala:203
-msgid "New _Tag..."
-msgstr "Jauns _tags..."
+#| msgid "New _Tag..."
+msgid "New _Tag…"
+msgstr "Jauns _tags…"
 
 #: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
 msgid "Settings"
@@ -6361,3 +6763,71 @@ msgstr "Rādīt v_irsrakstu"
 msgid "seconds"
 msgstr "sekundes"
 
+#~ msgid "Login"
+#~ msgstr "Ierakstīties"
+
+#~ msgid "Save Details..."
+#~ msgstr "Saglabāt detaļas..."
+
+#~ msgid "Save _As..."
+#~ msgstr "S_aglabāt kā..."
+
+#~ msgid "Importing..."
+#~ msgstr "Importē..."
+
+#~ msgid "Preparing to import..."
+#~ msgstr "Gatavojas importēt..."
+
+#~ msgid "_Import From Folder..."
+#~ msgstr "_Importēt no mapes..."
+
+#~ msgid "Import From _Application..."
+#~ msgstr "Importēt no _lietotnes..."
+
+#~ msgid "Set as _Desktop Slideshow..."
+#~ msgstr "Iestatīt kā _darbvirsmas slaidrādi..."
+
+#~ msgid "Re_name Event..."
+#~ msgstr "Pārdēvēt _notikumu..."
+
+#~ msgid "_Export..."
+#~ msgstr "_Eksportēt..."
+
+#~ msgid "_Print..."
+#~ msgstr "_Drukāt..."
+
+#~ msgid "Pu_blish..."
+#~ msgstr "Pu_blicēt..."
+
+#~ msgid "Edit _Title..."
+#~ msgstr "Rediģē_t nosaukumu..."
+
+#~ msgid "Edit _Comment..."
+#~ msgstr "Rediģēt _komentāru..."
+
+#~ msgid "Edit Event _Comment..."
+#~ msgstr "Rediģēt notikuma _komentāru..."
+
+#~ msgid "_Adjust Date and Time..."
+#~ msgstr "Pielāgot d_atumu un laiku..."
+
+#~ msgid "Add _Tags..."
+#~ msgstr "Pievienot _tagus..."
+
+#~ msgid "_Add Tags..."
+#~ msgstr "Pievienot T_agus..."
+
+#~ msgid "Send _To..."
+#~ msgstr "Sū_tīt uz..."
+
+#~ msgid "Send T_o..."
+#~ msgstr "Sūtīt _uz..."
+
+#~ msgid "_Find..."
+#~ msgstr "_Meklēt..."
+
+#~ msgid "Modif_y Tags..."
+#~ msgstr "Mod_ificēt tagus..."
+
+#~ msgid "_Edit..."
+#~ msgstr "R_ediģēt..."
diff --git a/po/pl.gmo b/po/pl.gmo
index b8150e5..2dedc1f 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index a2efbc4..08cab0a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: shotwell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-10-08 14:29+0000\n"
-"PO-Revision-Date: 2016-10-09 08:55+0200\n"
+"POT-Creation-Date: 2016-11-19 01:52+0000\n"
+"PO-Revision-Date: 2016-11-20 18:30+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -24,7 +24,9 @@ msgstr ""
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300
+#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:354
+#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344
+#: ui/tags.ui:354
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -1386,7 +1388,7 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "Witryna programu Shotwell"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:679
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:597
 msgid "translator-credits"
 msgstr ""
 "verayin <vera@yorba.org>, 2011\n"
@@ -1450,7 +1452,7 @@ msgstr ""
 "poprawność daty w kalendarzu komputera."
 
 #: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Plik tymczasowy wymagany do publikacji jest niedostępny"
 
@@ -1571,7 +1573,7 @@ msgstr "_Wstecz"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1627
+#: ui/shotwell.ui:1630
 msgid "_Log in"
 msgstr "Za_loguj"
 
@@ -1597,9 +1599,9 @@ msgstr "lub"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
 #: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:115
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:142
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229
@@ -1609,13 +1611,14 @@ msgstr "_Wyloguj"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
 #: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:129
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:156
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2456
 msgid "_Publish"
 msgstr "Opu_blikuj"
 
@@ -1643,10 +1646,10 @@ msgstr "piksele"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1329
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
-msgstr "Rozmiar pierwotny"
+msgstr "Oryginalny rozmiar"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
 #: src/Dimensions.vala:20
@@ -1745,51 +1748,50 @@ msgstr "Nierozpoznany użytkownik"
 msgid " Site Not Found"
 msgstr " Nie odnaleziono witryny"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:49
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:43
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:49
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:43
 msgid "_Email address"
 msgstr "Adres _e-mail"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:59
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:53
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:59
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:73
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:53
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr "_Hasło"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:103
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:97
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Zapamiętanie"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:125
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:118
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:101
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
 msgid "Log in"
 msgstr "Zaloguj"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
 msgid "An _existing album:"
 msgstr "Istni_ejącym albumie:"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:52
 msgid "A _new album named:"
 msgstr "_Nowym albumie o nazwie:"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1005
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
 msgid "_Hide album"
 msgstr "_Ukrycie albumu"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "Otwieranie _albumu docelowego w przeglądarce"
 
@@ -1815,14 +1817,14 @@ msgstr "Nieprawidłowy adres e-mail lub hasło. Proszę spróbować ponownie"
 msgid "Invalid User Email or Password"
 msgstr "Nieprawidłowa adres e-mail lub hasło użytkownika"
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1012
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
 msgid "You are logged into Rajce as %s."
 msgstr "Zalogowano w serwisie Rajce jako użytkownik %s."
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
 #: plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:24
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
 msgid "Photos will appear in:"
 msgstr "Zdjęcia pojawią się w:"
 
@@ -1845,13 +1847,13 @@ msgstr "Copyright 2012 BJA Electronics"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1325
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
 msgid "500 × 375 pixels"
 msgstr "500×375 pikseli"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1326
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr "1024×768 pikseli"
 
@@ -1878,22 +1880,22 @@ msgstr ""
 "Proszę podać nazwę użytkownika i hasło powiązane z kontem serwisu Tumblr."
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1087
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
 msgid "Username and/or password invalid. Please try again"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło. Proszę spróbować ponownie"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1121
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
 msgid "Invalid User Name or Password"
 msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
 
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:634
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:752
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
 #, c-format
 msgid "Could not load UI: %s"
 msgstr "Nie można wczytać interfejsu użytkownika: %s"
 
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:734
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
 #, c-format
 msgid ""
 "You are logged into Tumblr as %s.\n"
@@ -1914,36 +1916,36 @@ msgstr "Witryna serwisu Yandex.Fotki"
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Obecnie nie zalogowano w serwisie Yandex.Fotki."
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Publiczne"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
+msgid "Friends"
+msgstr "Przyjaciele"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:498
+msgid "Private"
+msgstr "Prywatne"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:44
 msgid "_Albums (or write new):"
 msgstr "_Albumy (lub zapisanie nowego):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:59
 msgid "Access _type:"
 msgstr "_Typ dostępu:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:103
 msgid "Disable _comments"
 msgstr "Wyłączenie _komentarzy"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:120
 msgid "_Forbid downloading original photo"
 msgstr "_Zakazanie pobierania oryginalnego zdjęcia"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-msgid "Public"
-msgstr "Publiczne"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
-msgid "Friends"
-msgstr "Przyjaciele"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
-msgstr "Prywatne"
-
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
 msgid "Publish to an e_xisting album:"
 msgstr "Opublikowanie do i_stniejącego albumu:"
@@ -1964,7 +1966,7 @@ msgstr "Nagrania wideo i nowe albumy zdjęć _widoczne dla:"
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:226
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr ""
@@ -1973,7 +1975,7 @@ msgstr ""
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:62
 #: plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1209
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr "Połączenie programu Shotwell"
 
@@ -2051,7 +2053,7 @@ msgstr "Tylko dla mnie"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1145
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1313
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Wszystkich"
 
@@ -2171,12 +2173,12 @@ msgid "Friends only"
 msgstr "Tylko przyjaciele"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1327
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048×1536 pikseli"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1328
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096×3072 piksele"
 
@@ -2236,74 +2238,78 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048×1536 pikseli)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:755
 msgid "Original Size"
-msgstr "Rozmiar pierwotny"
+msgstr "Oryginalny rozmiar"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
 msgid "_URL of your Piwigo photo library"
 msgstr "Adres _URL kolekcji zdjęć Piwigo"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
 msgid "User _name"
 msgstr "_Nazwa użytkownika"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
-msgid "_Remember Password"
-msgstr "_Zapamiętanie hasła"
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+msgid "Remember Password"
+msgstr "Zapamiętanie hasła"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+msgid "An _existing category"
+msgstr "_Istniejąca kategoria"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
-msgid "An _existing category:"
-msgstr "_Istniejącej kategorii:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+msgid "A _new album named"
+msgstr "_Nowy album o nazwie"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
-msgid "Photos will be _visible by:"
-msgstr "Zdjęcia będą _widoczne dla:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+msgid "within category"
+msgstr "w kategorii"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
-msgid "Photo size:"
-msgstr "Rozmiar zdjęcia:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr "Komentarz albumu"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
-msgid "within category:"
-msgstr "w kategorii:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+msgid "Photos will be _visible by"
+msgstr "Zdjęcia będą _widoczne dla"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
-msgid "Album comment:"
-msgstr "Komentarz albumu:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr "Rozmiar zdjęcia"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
 msgid "_If a title is set and comment unset, use title as comment"
 msgstr ""
 "_Jeśli tytuł jest ustawiony, a komentarz nie, to używanie tytułu jako "
 "komentarz"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
 msgid "_Do no upload tags"
 msgstr "_Bez wysyłania etykiet"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
 msgid "Logout"
 msgstr "Wyloguj"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291
-#: src/Resources.vala:295
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:295 ui/collection.ui:190
 msgid "Publish"
 msgstr "Opublikuj"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:775
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
 msgid "Creating album %s…"
 msgstr "Tworzenie albumu %s…"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:948
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr ""
 "Wystąpił komunikat o błędzie podczas publikowania w serwisie Piwigo. Proszę "
 "spróbować ponownie."
 
 #. %s is the host name that we tried to connect to
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1024
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1030
 #, c-format
 msgid ""
 "This does not look like the real <b>%s</b>. Attackers might be trying to "
@@ -2314,7 +2320,17 @@ msgstr ""
 "lub zmienić informacje wychodzące i przychodzące z tej strony, takie jak "
 "prywatne wiadomości, karty płatnicze lub hasła."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1085
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "Certyfikat „%s”"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:166
+msgid "_OK"
+msgstr "_OK"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
@@ -2322,7 +2338,7 @@ msgstr ""
 "Proszę podać adres URL kolekcji zdjęć serwisu Piwigo oraz nazwę użytkownika "
 "i hasło powiązane z kontem w serwisie Piwigo dla tej kolekcji."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1086
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
@@ -2330,23 +2346,23 @@ msgstr ""
 "Program Shotwell nie może połączyć się z kolekcją zdjęć serwisu Piwigo. "
 "Proszę sprawdzić podany adres URL"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1116
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "Nieprawidłowy adres URL"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1314
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Administratorzy, rodzina, przyjaciele, kontakty"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1315
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Administratorzy, rodzina, przyjaciele"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1316
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "Administratorzy, rodzina"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1317
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Administratorzy"
 
@@ -2498,38 +2514,28 @@ msgstr "Nie można ustawić katalogu %s jako zapisywalnego"
 msgid "Could not make directory %s writable: %s"
 msgstr "Nie można ustawić katalogu %s jako zapisywalnego: %s"
 
-#: src/AppWindow.vala:54
+#: src/AppWindow.vala:45
 msgid "Pin Toolbar"
 msgstr "Przypnij pasek narzędziowy"
 
-#: src/AppWindow.vala:55
+#: src/AppWindow.vala:46
 msgid "Pin the toolbar open"
 msgstr "Przypina pasek narzędziowy"
 
-#: src/AppWindow.vala:60
+#: src/AppWindow.vala:51
 msgid "Leave fullscreen"
 msgstr "Opuszcza pełny ekran"
 
-#: src/AppWindow.vala:499
-msgid "_Contents"
-msgstr "_Spis treści"
-
-#: src/AppWindow.vala:504
-msgid "_Frequently Asked Questions"
-msgstr "Naj_częściej zadawane pytania"
-
-#: src/AppWindow.vala:509
-msgid "_Report a Problem…"
-msgstr "_Zgłoś problem…"
-
-#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
-#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1441 src/Dialogs.vala:1464
-#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
+#: src/AppWindow.vala:526 src/AppWindow.vala:547 src/AppWindow.vala:564
+#: src/data_imports/DataImportsUI.vala:301
+#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1430 src/Dialogs.vala:1453
+#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
+#: src/Resources.vala:157
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/AppWindow.vala:656
+#: src/AppWindow.vala:574
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2542,21 +2548,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:676
+#: src/AppWindow.vala:594
 msgid "Visit the Shotwell web site"
 msgstr "Witryna programu Shotwell"
 
-#: src/AppWindow.vala:688
+#: src/AppWindow.vala:606
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nie można wyświetlić pomocy: %s"
 
-#: src/AppWindow.vala:696
+#: src/AppWindow.vala:614
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nie można przejść do bazy danych błędów: %s"
 
-#: src/AppWindow.vala:704
+#: src/AppWindow.vala:622
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nie można wyświetlić dokumentu FAQ: %s"
@@ -2627,8 +2633,9 @@ msgid "Cameras"
 msgstr "Aparaty"
 
 #: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/MediaPage.vala:440
-#: src/photos/RawSupport.vala:303
+#: src/camera/ImportPage.vala:726 src/photos/RawSupport.vala:303
+#: ui/collection.ui:90 ui/event.ui:359 ui/event.ui:527 ui/media.ui:359
+#: ui/photo_context.ui:96 ui/photo.ui:349 ui/tags.ui:359
 msgid "Camera"
 msgstr "Aparat"
 
@@ -2662,32 +2669,8 @@ msgstr ""
 msgid "No new photos/videos found on camera"
 msgstr "Nie odnaleziono nowych zdjęć/nagrań wideo w aparacie"
 
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451
-msgid "_Titles"
-msgstr "_Tytuły"
-
-#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452
-msgid "Display the title of each photo"
-msgstr "Wyświetla tytuł każdego zdjęcia"
-
-#: src/camera/ImportPage.vala:885
-msgid "Import _Selected"
-msgstr "_Zaimportuj wybrane"
-
-#: src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr "Importuje wybrane zdjęcia do kolekcji"
-
-#: src/camera/ImportPage.vala:891
-msgid "Import _All"
-msgstr "Z_aimportuj wszystkie"
-
-#: src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr "Importuje wszystkie zdjęcia do kolekcji"
-
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1013
+#: src/camera/ImportPage.vala:999
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2695,15 +2678,15 @@ msgstr ""
 "Program Shotwell musi odmontować aparat z systemu plików, aby uzyskać do "
 "niego dostęp. Kontynuować?"
 
-#: src/camera/ImportPage.vala:1019
+#: src/camera/ImportPage.vala:1005
 msgid "_Unmount"
 msgstr "Odmont_uj"
 
-#: src/camera/ImportPage.vala:1024
+#: src/camera/ImportPage.vala:1010
 msgid "Please unmount the camera."
 msgstr "Proszę odmontować aparat."
 
-#: src/camera/ImportPage.vala:1029
+#: src/camera/ImportPage.vala:1015
 msgid ""
 "The camera is locked by another application. Shotwell can only access the "
 "camera when it’s unlocked. Please close any other application using the "
@@ -2713,11 +2696,11 @@ msgstr ""
 "dostęp do aparatu tylko wtedy, kiedy nie jest zablokowany. Proszę zamknąć "
 "wszystkie pozostałe programy używające aparatu i spróbować ponownie."
 
-#: src/camera/ImportPage.vala:1039
+#: src/camera/ImportPage.vala:1025
 msgid "Please close any other application using the camera."
 msgstr "Proszę zamknąć inne programy używające aparatu."
 
-#: src/camera/ImportPage.vala:1044
+#: src/camera/ImportPage.vala:1030
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2726,29 +2709,29 @@ msgstr ""
 "Nie można pobrać podglądu z aparatu:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1061
+#: src/camera/ImportPage.vala:1047
 msgid "Unmounting…"
 msgstr "Odmontowywanie…"
 
-#: src/camera/ImportPage.vala:1152
+#: src/camera/ImportPage.vala:1138
 msgid "Starting import, please wait…"
 msgstr "Rozpoczynanie importowania, proszę czekać…"
 
-#: src/camera/ImportPage.vala:1169
+#: src/camera/ImportPage.vala:1155
 msgid "Fetching photo information"
 msgstr "Pobieranie informacji o zdjęciach"
 
-#: src/camera/ImportPage.vala:1527
+#: src/camera/ImportPage.vala:1513
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Pobieranie podglądu dla %s"
 
-#: src/camera/ImportPage.vala:1643
+#: src/camera/ImportPage.vala:1629
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Nie można zablokować aparatu: %s"
 
-#: src/camera/ImportPage.vala:1728
+#: src/camera/ImportPage.vala:1714
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2756,7 +2739,7 @@ msgstr[0] "Usunąć to zdjęcie z aparatu?"
 msgstr[1] "Usunąć te %d zdjęcia z aparatu?"
 msgstr[2] "Usunąć te %d zdjęć z aparatu?"
 
-#: src/camera/ImportPage.vala:1731
+#: src/camera/ImportPage.vala:1717
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2764,7 +2747,7 @@ msgstr[0] "Usunąć to nagranie wideo z aparatu?"
 msgstr[1] "Usunąć te %d nagrania wideo z aparatu?"
 msgstr[2] "Usunąć te %d nagrań wideo z aparatu?"
 
-#: src/camera/ImportPage.vala:1734
+#: src/camera/ImportPage.vala:1720
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2772,7 +2755,7 @@ msgstr[0] "Usunąć to zdjęcie/nagranie wideo z aparatu?"
 msgstr[1] "Usunąć te %d zdjęcia/nagrania wideo z aparatu?"
 msgstr[2] "Usunąć te %d zdjęć/nagrań wideo z aparatu?"
 
-#: src/camera/ImportPage.vala:1737
+#: src/camera/ImportPage.vala:1723
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2780,15 +2763,15 @@ msgstr[0] "Usunąć te pliki z aparatu?"
 msgstr[1] "Usunąć %d pliki z aparatu?"
 msgstr[2] "Usunąć %d plików z aparatu?"
 
-#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1408
+#: src/camera/ImportPage.vala:1731 src/Dialogs.vala:1397
 msgid "_Keep"
 msgstr "_Zatrzymaj"
 
-#: src/camera/ImportPage.vala:1764
+#: src/camera/ImportPage.vala:1750
 msgid "Removing photos/videos from camera"
 msgstr "Usuwanie zdjęć/nagrań wideo z aparatu"
 
-#: src/camera/ImportPage.vala:1768
+#: src/camera/ImportPage.vala:1754
 #, c-format
 msgid "Unable to delete %d photo/video from the camera due to errors."
 msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
@@ -2797,51 +2780,127 @@ msgstr[0] ""
 msgstr[1] "Nie można usunąć %d zdjęć/nagrań wideo z aparatu z powodu błędów."
 msgstr[2] "Nie można usunąć %d zdjęć/nagrań wideo z aparatu z powodu błędów."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635
+#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:78
+#: src/PhotoPage.vala:2451 src/Resources.vala:170
+msgid "_Print"
+msgstr "Wy_drukuj"
+
+#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
+#: ui/direct_context.ui:26 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28
+msgid "Send _To…"
+msgstr "Wyślij _do…"
+
+#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:83
+#: src/PhotoPage.vala:2461 src/Resources.vala:220
+msgid "Set as _Desktop Background"
+msgstr "Ustaw jako tło p_ulpitu"
+
+#: src/CollectionPage.vala:86 src/Resources.vala:286
+msgid "_Duplicate"
+msgstr "Utwórz _kopię"
+
+#: src/CollectionPage.vala:94
+msgid "Fullscreen"
+msgstr "Pełny ekran"
+
+#: src/CollectionPage.vala:96 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "Pokaz s_lajdów"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636
-msgid "Play a slideshow"
-msgstr "Odtwarza pokaz slajdów"
+#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "Obróć w p_rawo"
+
+#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "Obróć w _lewo"
+
+#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Odwróć po_ziomo"
+
+#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "Odwróć pi_onowo"
+
+#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8
+#: ui/direct_context.ui:10 ui/direct.ui:134 ui/event.ui:445
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "_Uwydatnij"
+
+#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
+#: ui/direct_context.ui:15 ui/direct.ui:161 ui/event.ui:450
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "Przy_wróć oryginalne"
+
+#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "S_kopiuj dostosowania kolorów"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "_Wklej dostosowania kolorów"
+
+#: src/CollectionPage.vala:129
+msgid "Adjust Date and Time…"
+msgstr "Dostosuj datę i czas…"
+
+#: src/CollectionPage.vala:137 src/Resources.vala:319
+msgid "Open With E_xternal Editor"
+msgstr "_Otwórz za pomocą zewnętrznego edytora"
+
+#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
+#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363
+msgid "Open With RA_W Editor"
+msgstr "Otwórz za pomocą edytora plików _RAW"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:167
+msgid "_Play"
+msgstr "Od_twórz"
+
+#: src/CollectionPage.vala:399
 msgid "Export Photo/Video"
 msgstr "Eksport zdjęcia/nagrania wideo"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:399
 msgid "Export Photos/Videos"
 msgstr "Eksport zdjęć/nagrań wideo"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209
+#: src/CollectionPage.vala:401 src/Dialogs.vala:59 src/PhotoPage.vala:2988
 msgid "Export Photo"
 msgstr "Eksport zdjęcia"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:84
+#: src/CollectionPage.vala:401 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Eksport zdjęć"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:488 src/CollectionPage.vala:504
 msgid "Rotating"
 msgstr "Obracanie"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:488 src/CollectionPage.vala:504
 msgid "Undoing Rotate"
 msgstr "Cofanie obrotu"
 
-#: src/CollectionPage.vala:570
+#: src/CollectionPage.vala:513
 msgid "Flipping Horizontally"
 msgstr "Odwracanie poziome"
 
-#: src/CollectionPage.vala:571
+#: src/CollectionPage.vala:514
 msgid "Undoing Flip Horizontally"
 msgstr "Cofanie odwrócenia poziomego"
 
-#: src/CollectionPage.vala:580
+#: src/CollectionPage.vala:523
 msgid "Flipping Vertically"
 msgstr "Odwracanie pionowe"
 
-#: src/CollectionPage.vala:581
+#: src/CollectionPage.vala:524
 msgid "Undoing Flip Vertically"
 msgstr "Cofanie odwrócenia pionowego"
 
@@ -2935,7 +2994,7 @@ msgstr "Ustaw wywoływacz"
 
 #: src/Commands.vala:1347
 msgid "Original photo could not be adjusted."
-msgstr "Nie można dostosować pierwotnego zdjęcia."
+msgstr "Nie można dostosować oryginalnego zdjęcia."
 
 #: src/Commands.vala:1368
 msgid "Adjusting Date and Time"
@@ -2948,9 +3007,9 @@ msgstr "Cofanie dostosowania daty i czasu"
 #: src/Commands.vala:1399
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
-msgstr[0] "Nie można dostosować jednego pierwotnego zdjęcia."
-msgstr[1] "Nie można dostosować poniższych pierwotnych zdjęć."
-msgstr[2] "Nie można dostosować poniższych pierwotnych zdjęć."
+msgstr[0] "Nie można dostosować jednego oryginalnego zdjęcia."
+msgstr[1] "Nie można dostosować poniższych oryginalnych zdjęć."
+msgstr[2] "Nie można dostosować poniższych oryginalnych zdjęć."
 
 #: src/Commands.vala:1401 src/Commands.vala:1425
 msgid "Time Adjustment Error"
@@ -3059,7 +3118,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Plik bazy danych:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:766
 msgid "_Import"
 msgstr "Zai_mportuj"
 
@@ -3071,7 +3130,7 @@ msgstr "Import z programu"
 msgid "Import media _from:"
 msgstr "Importowanie multimediów _z:"
 
-#: src/data_imports/DataImportsUI.vala:408 src/publishing/PublishingUI.vala:507
+#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
 msgid "_Close"
 msgstr "Zam_knij"
 
@@ -3108,7 +3167,7 @@ msgstr ""
 "Błąd: \n"
 "%s"
 
-#: src/db/DatabaseTable.vala:88
+#: src/db/DatabaseTable.vala:92
 #, c-format
 msgid "Unable to restore photo database %s"
 msgstr "Nie można przywrócić bazy danych zdjęć %s"
@@ -3140,9 +3199,10 @@ msgstr[0] "Etykieta „%s” zostanie usunięta ze zdjęcia. Kontynuować?"
 msgstr[1] "Etykieta „%s” zostanie usunięta z %d zdjęć. Kontynuować?"
 msgstr[2] "Etykieta „%s” zostanie usunięta z %d zdjęć. Kontynuować?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1409
-#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409
-#: src/Resources.vala:674
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1398
+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
+#: src/Resources.vala:658 ui/savedsearch.ui:16 ui/trash.ui:63 ui/trash.ui:216
+#: ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Usuń"
 
@@ -3713,57 +3773,57 @@ msgstr[2] "%d godzin"
 msgid "1 day"
 msgstr "dzień"
 
-#: src/Dialogs.vala:1338 src/Resources.vala:231
+#: src/Dialogs.vala:1327 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Zmień nazwę wydarzenia"
 
-#: src/Dialogs.vala:1338
+#: src/Dialogs.vala:1327
 msgid "Name:"
 msgstr "Nazwa:"
 
 #. Dialog title
-#: src/Dialogs.vala:1349
+#: src/Dialogs.vala:1338
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Modyfikacja tytułu"
 
-#: src/Dialogs.vala:1350 src/Properties.vala:340
+#: src/Dialogs.vala:1339 src/Properties.vala:340
 msgid "Title:"
 msgstr "Tytuł:"
 
 #. Dialog title
-#: src/Dialogs.vala:1366 src/Resources.vala:307
+#: src/Dialogs.vala:1355 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Modyfikuj komentarz wydarzenia"
 
-#: src/Dialogs.vala:1367
+#: src/Dialogs.vala:1356
 msgid "Edit Photo/Video Comment"
 msgstr "Modyfikuj komentarz zdjęcia/nagrania wideo"
 
-#: src/Dialogs.vala:1368 src/Properties.vala:628
+#: src/Dialogs.vala:1357 src/Properties.vala:628
 msgid "Comment:"
 msgstr "Komentarz:"
 
-#: src/Dialogs.vala:1384
+#: src/Dialogs.vala:1373
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "_Przenieś plik do kosza"
 msgstr[1] "_Przenieś pliki do kosza"
 msgstr[2] "_Przenieś pliki do kosza"
 
-#: src/Dialogs.vala:1388
+#: src/Dialogs.vala:1377
 msgid "_Remove From Library"
 msgstr "_Usuń z kolekcji"
 
-#: src/Dialogs.vala:1431
+#: src/Dialogs.vala:1420
 msgid "Revert External Edit?"
 msgstr "Odwrócić zewnętrzną modyfikację?"
 
-#: src/Dialogs.vala:1431
+#: src/Dialogs.vala:1420
 msgid "Revert External Edits?"
 msgstr "Odwrócić zewnętrzne modyfikacje?"
 
-#: src/Dialogs.vala:1433
+#: src/Dialogs.vala:1422
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3777,15 +3837,15 @@ msgstr[2] ""
 "Unieważni to wszystkie zmiany wprowadzone do %d zewnętrznych plików. "
 "Kontynuować?"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:1426
 msgid "Re_vert External Edit"
 msgstr "Od_wróć zewnętrzną modyfikację"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:1426
 msgid "Re_vert External Edits"
 msgstr "Od_wróć zewnętrzne modyfikacje"
 
-#: src/Dialogs.vala:1458
+#: src/Dialogs.vala:1447
 #, c-format
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
@@ -3793,72 +3853,70 @@ msgstr[0] "Zdjęcie zostanie usunięte z kolekcji. Kontynuować?"
 msgstr[1] "%d zdjęcia zostaną usunięte z kolekcji. Kontynuować?"
 msgstr[2] "%d zdjęć zostaną usuniętych z kolekcji. Kontynuować?"
 
-#: src/Dialogs.vala:1465 src/Resources.vala:173
+#: src/Dialogs.vala:1454 src/Resources.vala:173
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: src/Dialogs.vala:1466
+#: src/Dialogs.vala:1455
 msgid "Remove Photo From Library"
 msgstr "Usuwanie zdjęcia z kolekcji"
 
-#: src/Dialogs.vala:1466
+#: src/Dialogs.vala:1455
 msgid "Remove Photos From Library"
 msgstr "Usuwanie zdjęć z kolekcji"
 
-#: src/Dialogs.vala:1559
+#: src/Dialogs.vala:1553
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1713
+#: src/Dialogs.vala:1707
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1714
+#: src/Dialogs.vala:1708
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1715
+#: src/Dialogs.vala:1709
 msgid "24 Hr"
 msgstr "24-godzinny"
 
-#: src/Dialogs.vala:1730
+#: src/Dialogs.vala:1724
 msgid "_Shift photos/videos by the same amount"
 msgstr "Prze_suń zdjęcia/nagrania wideo o tę samą wartość"
 
-#: src/Dialogs.vala:1735
+#: src/Dialogs.vala:1729
 msgid "Set _all photos/videos to this time"
 msgstr "Ust_aw wszystkie zdjęcia/nagrania wideo na ten czas"
 
-#: src/Dialogs.vala:1742
+#: src/Dialogs.vala:1735
 msgid "_Modify original photo file"
-msgstr "_Modyfikuj oryginalny plik zdjęcia"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Modyfikuj oryginalny plik zdjęcia"
+msgstr[1] "_Modyfikuj oryginalne pliki zdjęć"
+msgstr[2] "_Modyfikuj oryginalne pliki zdjęć"
 
-#: src/Dialogs.vala:1742
-msgid "_Modify original photo files"
-msgstr "_Modyfikuj oryginalny pliki zdjęć"
-
-#: src/Dialogs.vala:1745
+#: src/Dialogs.vala:1739
 msgid "_Modify original file"
-msgstr "_Modyfikuj pierwotny plik"
-
-#: src/Dialogs.vala:1745
-msgid "_Modify original files"
-msgstr "_Modyfikuj pierwotne pliki"
+msgid_plural "_Modify original files"
+msgstr[0] "_Modyfikuj oryginalny plik"
+msgstr[1] "_Modyfikuj oryginalne pliki"
+msgstr[2] "_Modyfikuj oryginalne pliki"
 
-#: src/Dialogs.vala:1831
+#: src/Dialogs.vala:1827
 msgid "Original: "
 msgstr "Oryginał: "
 
-#: src/Dialogs.vala:1832
+#: src/Dialogs.vala:1828
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d %b %Y, %H∶%M∶%S"
 
-#: src/Dialogs.vala:1833
+#: src/Dialogs.vala:1829
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d %b %Y, %I∶%M∶%S %p"
 
-#: src/Dialogs.vala:1922
+#: src/Dialogs.vala:1918
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3867,7 +3925,7 @@ msgstr ""
 "Czas ekspozycji zostanie przesunięty do przodu o\n"
 "%d %s, %d %s, %d %s i %d %s."
 
-#: src/Dialogs.vala:1923
+#: src/Dialogs.vala:1919
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3876,35 +3934,35 @@ msgstr ""
 "Czas ekspozycji zostanie przesunięty do tyłu o\n"
 "%d %s, %d %s, %d %s i %d %s."
 
-#: src/Dialogs.vala:1925
+#: src/Dialogs.vala:1921
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dzień"
 msgstr[1] "dni"
 msgstr[2] "dni"
 
-#: src/Dialogs.vala:1926
+#: src/Dialogs.vala:1922
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "godzina"
 msgstr[1] "godziny"
 msgstr[2] "godzin"
 
-#: src/Dialogs.vala:1927
+#: src/Dialogs.vala:1923
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuta"
 msgstr[1] "minuty"
 msgstr[2] "minut"
 
-#: src/Dialogs.vala:1928
+#: src/Dialogs.vala:1924
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekunda"
 msgstr[1] "sekundy"
 msgstr[2] "sekund"
 
-#: src/Dialogs.vala:1972
+#: src/Dialogs.vala:1968
 #, c-format
 msgid ""
 "\n"
@@ -3927,42 +3985,42 @@ msgstr[2] ""
 "\n"
 "Oraz %d innych."
 
-#: src/Dialogs.vala:1996 src/Dialogs.vala:2023
+#: src/Dialogs.vala:1992 src/Dialogs.vala:2019
 msgid "Tags (separated by commas):"
 msgstr "Etykiety (oddzielone przecinkami):"
 
-#: src/Dialogs.vala:2103
+#: src/Dialogs.vala:2099
 msgid "Welcome!"
 msgstr "Witamy"
 
-#: src/Dialogs.vala:2110
+#: src/Dialogs.vala:2106
 msgid "Welcome to Shotwell!"
 msgstr "Witamy w programie Shotwell"
 
-#: src/Dialogs.vala:2114
+#: src/Dialogs.vala:2111
 msgid "To get started, import photos in any of these ways:"
 msgstr ""
 "Aby rozpocząć, należy zaimportować zdjęcia na jeden z poniższych sposobów:"
 
-#: src/Dialogs.vala:2133
+#: src/Dialogs.vala:2131
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Wybranie <span weight=\"bold\">Plik %s Zaimportuj z katalogu</span>"
 
-#: src/Dialogs.vala:2134
+#: src/Dialogs.vala:2132
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Przeniesienie zdjęć do okna programu Shotwell"
 
-#: src/Dialogs.vala:2135
+#: src/Dialogs.vala:2133
 msgid "Connect a camera to your computer and import"
 msgstr "Połączenie aparatu do komputera i zaimportowanie"
 
-#: src/Dialogs.vala:2145
+#: src/Dialogs.vala:2144
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Zaimportuj zdjęcia z katalogu %s"
 
-#: src/Dialogs.vala:2152
+#: src/Dialogs.vala:2151
 msgid "You can also import photos in any of these ways:"
 msgstr "Można także zaimportować zdjęcia na jeden z poniższych sposobów:"
 
@@ -3970,7 +4028,7 @@ msgstr "Można także zaimportować zdjęcia na jeden z poniższych sposobów:"
 msgid "_Don’t show this message again"
 msgstr "_Bez wyświetlania tego komunikatu ponownie"
 
-#: src/Dialogs.vala:2197
+#: src/Dialogs.vala:2199
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Import zdjęć z kolekcji programu %s"
@@ -3978,41 +4036,41 @@ msgstr "Import zdjęć z kolekcji programu %s"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2344 src/Dialogs.vala:2348
+#: src/Dialogs.vala:2345 src/Dialogs.vala:2349
 msgid "(Help)"
 msgstr "(Pomoc)"
 
-#: src/Dialogs.vala:2357
+#: src/Dialogs.vala:2356
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Rok%smiesiąc%sdzień"
 
-#: src/Dialogs.vala:2359
+#: src/Dialogs.vala:2358
 #, c-format
 msgid "Year%sMonth"
 msgstr "Rok%smiesiąc"
 
-#: src/Dialogs.vala:2361
+#: src/Dialogs.vala:2360
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Rok%smiesiąc-dzień"
 
-#: src/Dialogs.vala:2363
+#: src/Dialogs.vala:2362
 msgid "Year-Month-Day"
 msgstr "Rok-miesiąc-dzień"
 
-#: src/Dialogs.vala:2364 src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2363 src/editing_tools/EditingTools.vala:780
 msgid "Custom"
 msgstr "Własny"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2601
+#: src/Dialogs.vala:2600
 msgid "Invalid pattern"
 msgstr "Nieprawidłowy wzór"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2703
+#: src/Dialogs.vala:2702
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -4020,31 +4078,31 @@ msgstr ""
 "Program Shotwell może skopiować zdjęcia do katalogu kolekcji lub może "
 "zaimportować je bez tworzenia ich kopii."
 
-#: src/Dialogs.vala:2708
+#: src/Dialogs.vala:2707
 msgid "Co_py Photos"
 msgstr "_Skopiowanie zdjęć"
 
-#: src/Dialogs.vala:2709
+#: src/Dialogs.vala:2708
 msgid "_Import in Place"
 msgstr "_Zaimportowanie"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:2709
 msgid "Import to Library"
 msgstr "Zaimportuj do kolekcji"
 
-#: src/Dialogs.vala:2720 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2719 src/PhotoPage.vala:2864
 msgid "Remove From Library"
 msgstr "Usuń z kolekcji"
 
-#: src/Dialogs.vala:2721 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2720 src/PhotoPage.vala:2864
 msgid "Removing Photo From Library"
 msgstr "Usuwanie zdjęcia z kolekcji"
 
-#: src/Dialogs.vala:2721
+#: src/Dialogs.vala:2720
 msgid "Removing Photos From Library"
 msgstr "Usuwanie zdjęć z kolekcji"
 
-#: src/Dialogs.vala:2735
+#: src/Dialogs.vala:2734
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4072,7 +4130,7 @@ msgstr[2] ""
 "\n"
 "Tej czynności nie można cofnąć."
 
-#: src/Dialogs.vala:2739
+#: src/Dialogs.vala:2738
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4100,7 +4158,7 @@ msgstr[2] ""
 "\n"
 "Tej czynności nie można cofnąć."
 
-#: src/Dialogs.vala:2743
+#: src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4128,7 +4186,7 @@ msgstr[2] ""
 "\n"
 "Tej czynności nie można cofnąć."
 
-#: src/Dialogs.vala:2775
+#: src/Dialogs.vala:2774
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4142,7 +4200,7 @@ msgstr[2] ""
 "Nie można przenieść %d zdjęć lub nagrań wideo do kosza. Usunąć te pliki?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2792
+#: src/Dialogs.vala:2791
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4158,127 +4216,17 @@ msgstr "Szerokość"
 msgid "Height"
 msgstr "Wysokość"
 
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Plik"
-
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
-#: src/Resources.vala:175
-msgid "_Save"
-msgstr "Zapi_sz"
-
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Zapisuje zdjęcie"
-
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As…"
-msgstr "Z_apisz jako…"
-
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Zapisuje zdjęcie pod inną nazwą"
-
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Drukuje zdjęcie na drukarce podłączonej do komputera"
-
-#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
-#: src/Resources.vala:159
-msgid "_Edit"
-msgstr "_Edycja"
-
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Zdjęcie"
-
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416
-msgid "T_ools"
-msgstr "_Narzędzia"
-
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421
-msgid "_Previous Photo"
-msgstr "_Poprzednie zdjęcie"
-
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422
-msgid "Previous Photo"
-msgstr "Poprzednie zdjęcie"
-
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427
-msgid "_Next Photo"
-msgstr "_Następne zdjęcie"
-
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428
-msgid "Next Photo"
-msgstr "Następne zdjęcie"
-
-#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
-#: src/PhotoPage.vala:2412
-msgid "_View"
-msgstr "_Widok"
-
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
-#: src/Resources.vala:162
-msgid "_Help"
-msgstr "Pomo_c"
-
-#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
-#: src/PhotoPage.vala:2591 src/Resources.vala:183
-msgid "Zoom _In"
-msgstr "Pow_iększ"
-
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592
-msgid "Increase the magnification of the photo"
-msgstr "Zwiększa powiększenie zdjęcia"
-
-#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
-#: src/PhotoPage.vala:2597 src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr "P_omniejsz"
-
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598
-msgid "Decrease the magnification of the photo"
-msgstr "Zmniejsza powiększenie zdjęcia"
-
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603
-msgid "Fit to _Page"
-msgstr "Dopasowanie do _strony"
-
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604
-msgid "Zoom the photo to fit on the screen"
-msgstr "Powiększa zdjęcie, aby pasowało do ekranu"
-
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Powiększenie _100%"
-
-#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Powiększa zdjęcie do 100%"
-
-#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Powiększenie _200%"
-
-#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Powiększa zdjęcie do 200%"
-
-#: src/direct/DirectPhotoPage.vala:227
+#: src/direct/DirectPhotoPage.vala:92
 #, c-format
 msgid "%s does not exist."
 msgstr "%s nie istnieje."
 
-#: src/direct/DirectPhotoPage.vala:229
+#: src/direct/DirectPhotoPage.vala:94
 #, c-format
 msgid "%s is not a file."
 msgstr "%s nie jest plikiem."
 
-#: src/direct/DirectPhotoPage.vala:231
+#: src/direct/DirectPhotoPage.vala:96
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
@@ -4287,30 +4235,34 @@ msgstr ""
 "Program %s nie obsługuje formatu pliku\n"
 "%s."
 
-#: src/direct/DirectPhotoPage.vala:248
+#: src/direct/DirectPhotoPage.vala:113
 #, c-format
 msgid "Unable open photo %s. Sorry."
 msgstr "Nie można otworzyć zdjęcia %s."
 
-#: src/direct/DirectPhotoPage.vala:432
+#: src/direct/DirectPhotoPage.vala:297 src/Resources.vala:175 ui/direct.ui:8
+msgid "_Save"
+msgstr "Zapi_sz"
+
+#: src/direct/DirectPhotoPage.vala:297
 msgid "_Save a Copy"
 msgstr "Zapi_sz kopię"
 
-#: src/direct/DirectPhotoPage.vala:435
+#: src/direct/DirectPhotoPage.vala:300
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Utracić zmiany w %s?"
 
-#: src/direct/DirectPhotoPage.vala:436
+#: src/direct/DirectPhotoPage.vala:301
 msgid "Close _without Saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: src/direct/DirectPhotoPage.vala:469
+#: src/direct/DirectPhotoPage.vala:334
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Błąd podczas zapisywania zdjęcia do %s: %s"
 
-#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518
+#: src/direct/DirectPhotoPage.vala:362 src/direct/DirectPhotoPage.vala:383
 msgid "Save As"
 msgstr "Zapisz jako"
 
@@ -4320,201 +4272,201 @@ msgstr "Zapisz jako"
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Nie można monitorować %s: nie jest katalogiem (%s)"
 
-#: src/editing_tools/EditingTools.vala:665
+#: src/editing_tools/EditingTools.vala:664
 msgid "Return to current photo dimensions"
 msgstr "Powraca do bieżących wymiarów zdjęcia"
 
-#: src/editing_tools/EditingTools.vala:668
+#: src/editing_tools/EditingTools.vala:667
 msgid "Set the crop for this photo"
 msgstr "Ustawia przycięcie tego zdjęcia"
 
-#: src/editing_tools/EditingTools.vala:680
+#: src/editing_tools/EditingTools.vala:679
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Obraca prostokąt przycięcia między orientacją poziomą a pionową"
 
-#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:752
 msgid "Unconstrained"
 msgstr "Niewymuszony"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:753
 msgid "Square"
 msgstr "Kwadratowy"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:754
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/editing_tools/EditingTools.vala:757
-#: src/editing_tools/EditingTools.vala:760
-#: src/editing_tools/EditingTools.vala:770
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:779
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:757
 msgid "SD Video (4 ∶ 3)"
 msgstr "Plik wideo SD (4∶3)"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:758
 msgid "HD Video (16 ∶ 9)"
 msgstr "Plik wideo HD (16∶9)"
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:760 src/Printing.vala:818
 msgid "Wallet (2 × 3 in.)"
 msgstr "Portfel (2×3 cale)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:821
 msgid "Notecard (3 × 5 in.)"
 msgstr "Notatka (3×5 cali)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:824
 msgid "4 × 6 in."
 msgstr "4×6 cali"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:827
 msgid "5 × 7 in."
 msgstr "5×7 cali"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:830
 msgid "8 × 10 in."
 msgstr "8×10 cali"
 
-#: src/editing_tools/EditingTools.vala:766
+#: src/editing_tools/EditingTools.vala:765
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8,5×11 cali)"
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:833
 msgid "11 × 14 in."
 msgstr "11×14 cali"
 
-#: src/editing_tools/EditingTools.vala:768
+#: src/editing_tools/EditingTools.vala:767
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11×17 cali)"
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:836
 msgid "16 × 20 in."
 msgstr "16×20 cali"
 
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:842
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Portfel metryczny (9×13 cm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:845
 msgid "Postcard (10 × 15 cm)"
 msgstr "Kartka pocztowa (10×15 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:848
 msgid "13 × 18 cm"
 msgstr "13×18 cm"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:851
 msgid "18 × 24 cm"
 msgstr "18×24 cm"
 
-#: src/editing_tools/EditingTools.vala:775
+#: src/editing_tools/EditingTools.vala:774
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210×297 mm)"
 
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:854
 msgid "20 × 30 cm"
 msgstr "20×30 cm"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:857
 msgid "24 × 40 cm"
 msgstr "24×40 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:860
 msgid "30 × 40 cm"
 msgstr "30×40 cm"
 
-#: src/editing_tools/EditingTools.vala:779
+#: src/editing_tools/EditingTools.vala:778
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297×420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395
+#: src/editing_tools/EditingTools.vala:1878 src/Properties.vala:395
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: src/editing_tools/EditingTools.vala:1887
+#: src/editing_tools/EditingTools.vala:1893
 msgid "Close the red-eye tool"
 msgstr "Zamyka narzędzie usuwania czerwonych oczu"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1896
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Usuwa wszystkie efekty czerwonych oczu na wybranym obszarze"
 
-#: src/editing_tools/EditingTools.vala:2229
+#: src/editing_tools/EditingTools.vala:2236
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "P_rzywróć"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:436
+#: src/editing_tools/EditingTools.vala:2250 src/Properties.vala:436
 #: src/Properties.vala:440 src/Properties.vala:447
 msgid "Exposure:"
 msgstr "Ekspozycja:"
 
-#: src/editing_tools/EditingTools.vala:2251
+#: src/editing_tools/EditingTools.vala:2259
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: src/editing_tools/EditingTools.vala:2268
 msgid "Saturation:"
 msgstr "Nasycenie:"
 
-#: src/editing_tools/EditingTools.vala:2267
+#: src/editing_tools/EditingTools.vala:2277
 msgid "Tint:"
 msgstr "Odcień:"
 
-#: src/editing_tools/EditingTools.vala:2276
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: src/editing_tools/EditingTools.vala:2284
+#: src/editing_tools/EditingTools.vala:2296
 msgid "Shadows:"
 msgstr "Cienie:"
 
-#: src/editing_tools/EditingTools.vala:2292
+#: src/editing_tools/EditingTools.vala:2305
 msgid "Highlights:"
 msgstr "Wyróżnienia:"
 
-#: src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2361
 msgid "Reset Colors"
 msgstr "Przywróć kolory"
 
-#: src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2361
 msgid "Reset all color adjustments to original"
-msgstr "Przywraca wszystkie dostosowania kolorów do pierwotnych"
+msgstr "Przywraca wszystkie dostosowania kolorów do oryginalnych"
 
-#: src/editing_tools/EditingTools.vala:2705
+#: src/editing_tools/EditingTools.vala:2720
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: src/editing_tools/EditingTools.vala:2732
 msgid "Tint"
 msgstr "Odcień"
 
-#: src/editing_tools/EditingTools.vala:2729
+#: src/editing_tools/EditingTools.vala:2744
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2743
+#: src/editing_tools/EditingTools.vala:2758
 msgid "Saturation"
 msgstr "Nasycenie"
 
-#: src/editing_tools/EditingTools.vala:2756
+#: src/editing_tools/EditingTools.vala:2771
 msgid "Exposure"
 msgstr "Ekspozycja"
 
-#: src/editing_tools/EditingTools.vala:2769
+#: src/editing_tools/EditingTools.vala:2784
 msgid "Shadows"
 msgstr "Cienie"
 
-#: src/editing_tools/EditingTools.vala:2782
+#: src/editing_tools/EditingTools.vala:2797
 msgid "Highlights"
 msgstr "Wyróżnienia"
 
-#: src/editing_tools/EditingTools.vala:2792
+#: src/editing_tools/EditingTools.vala:2807
 msgid "Contrast Expansion"
 msgstr "Rozszerzenie kontrastu"
 
@@ -4523,6 +4475,7 @@ msgid "Angle:"
 msgstr "Kąt:"
 
 #: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "_Wyrównaj"
 
@@ -4554,39 +4507,31 @@ msgstr[0] "%d zdjęcie"
 msgstr[1] "%d zdjęcia"
 msgstr[2] "%d zdjęć"
 
-#: src/events/EventPage.vala:129
+#: src/events/EventPage.vala:121
 msgid "No Event"
 msgstr "Brak wydarzenia"
 
-#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
-msgid "_Comments"
-msgstr "_Komentarze"
-
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Wyświetlanie komentarza dla każdego wydarzenia"
-
-#: src/events/EventsDirectoryPage.vala:155
+#: src/events/EventsDirectoryPage.vala:143
 msgid "No events"
 msgstr "Brak wydarzeń"
 
-#: src/events/EventsDirectoryPage.vala:159
+#: src/events/EventsDirectoryPage.vala:147
 msgid "No events found"
 msgstr "Nie odnaleziono wydarzeń"
 
-#: src/events/EventsDirectoryPage.vala:230
+#: src/events/EventsDirectoryPage.vala:220
 msgid "All Events"
 msgstr "Wszystkie wydarzenia"
 
-#: src/events/EventsDirectoryPage.vala:244
+#: src/events/EventsDirectoryPage.vala:234
 msgid "Undated"
 msgstr "Niedatowane"
 
-#: src/events/EventsDirectoryPage.vala:245
+#: src/events/EventsDirectoryPage.vala:235
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:246
+#: src/events/EventsDirectoryPage.vala:236
 msgid "%B"
 msgstr "%B"
 
@@ -4626,21 +4571,20 @@ msgstr "Z_astąp wszystkie"
 msgid "Export"
 msgstr "Eksport"
 
-#: src/folders/Branch.vala:141
+#: src/folders/Branch.vala:144
 msgid "Folders"
 msgstr "Katalogi"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1191
+#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1194
 msgid "Library"
 msgstr "Kolekcja"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:608
-#: src/SearchFilter.vala:609
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1084
 msgid "Photos"
 msgstr "Zdjęcia"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602
-#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1103
+#: src/SearchFilter.vala:1104
 msgid "Flagged"
 msgstr "Oznaczone flagą"
 
@@ -4648,19 +4592,11 @@ msgstr "Oznaczone flagą"
 msgid "Importing…"
 msgstr "Importowanie…"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "_Zatrzymaj importowanie"
-
-#: src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Zatrzymuje importowanie zdjęć"
-
-#: src/library/ImportQueuePage.vala:124
+#: src/library/ImportQueuePage.vala:122
 msgid "Preparing to import…"
 msgstr "Przygotowywanie do zaimportowania…"
 
-#: src/library/ImportQueuePage.vala:151
+#: src/library/ImportQueuePage.vala:149
 #, c-format
 msgid "Imported %s"
 msgstr "Zaimportowano %s"
@@ -4669,128 +4605,19 @@ msgstr "Zaimportowano %s"
 msgid "Last Import"
 msgstr "Ostatni import"
 
-#: src/library/LibraryWindow.vala:285
-msgid "_Import From Folder…"
-msgstr "_Zaimportuj z katalogu…"
-
-#: src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Importuje zdjęcia z dysku do kolekcji"
-
-#: src/library/LibraryWindow.vala:293
-msgid "Import From _Application…"
-msgstr "Zaimportuj z p_rogramu…"
-
-#: src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Uporządkuj wydarz_enia"
-
-#: src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Opróżnij _kosz"
-
-#: src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Usuwa wszystkie zdjęcia z kosza"
-
-#: src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Wyświetl wydarze_nie dla zdjęcia"
-
-#: src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "_Znajdź"
-
-#: src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Wyszukuje zdjęcia i nagrania wideo według kryteriów wyszukiwania"
-
-#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
-#: src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search…"
-msgstr "No_we zapisane wyszukiwanie…"
-
-#: src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Zdjęcia"
-
-#: src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "Wy_darzenia"
-
-#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr "_Etykiety"
-
-#: src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "_Podstawowe informacje"
-
-#: src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Wyświetla podstawowe informacje o wybranych zdjęciach"
-
-#: src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "_Rozszerzone informacje"
-
-#: src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Wyświetla rozszerzone informacje o wybranych zdjęciach"
-
-#: src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "Pasek wy_szukiwania"
-
-#: src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Wyświetla pasek wyszukiwania"
-
-#: src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "Panel _boczny"
-
-#: src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Wyświetla panel boczny"
-
-#: src/library/LibraryWindow.vala:398
-msgid "T_oolbar"
-msgstr "_Pasek narzędziowy"
-
-#: src/library/LibraryWindow.vala:399
-msgid "Display the tool bar"
-msgstr "Wyświetla pasek narzędziowy"
-
-#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr "_Rosnąco"
-
-#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr "Porządkuje zdjęcia w porządku rosnącym"
-
-#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
-msgid "D_escending"
-msgstr "Mal_ejąco"
-
-#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr "Porządkuje zdjęcia w porządku malejącym"
-
-#: src/library/LibraryWindow.vala:657
+#: src/library/LibraryWindow.vala:501
 msgid "Import From Folder"
 msgstr "Importowanie z katalogu"
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:570 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Opróżnij kosz"
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:570
 msgid "Emptying Trash…"
 msgstr "Opróżnianie kosza…"
 
-#: src/library/LibraryWindow.vala:901
+#: src/library/LibraryWindow.vala:763
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4804,33 +4631,33 @@ msgstr ""
 "Preferencje</span>.\n"
 "Kontynuować importowanie zdjęć?"
 
-#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
+#: src/library/LibraryWindow.vala:766 ui/shotwell.ui:784
 msgid "Library Location"
 msgstr "Położenie kolekcji"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:917
+#: src/library/LibraryWindow.vala:779
 msgid "Photos cannot be imported from this directory."
 msgstr "Nie można importować zdjęć z tego katalogu."
 
-#: src/library/LibraryWindow.vala:1203
+#: src/library/LibraryWindow.vala:1059
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258
+#: src/library/LibraryWindow.vala:1103 src/library/LibraryWindow.vala:1114
 msgid "Updating library…"
 msgstr "Aktualizowanie kolekcji…"
 
-#: src/library/LibraryWindow.vala:1264
+#: src/library/LibraryWindow.vala:1120
 msgid "Preparing to auto-import photos…"
 msgstr "Przygotowywanie do automatycznego zaimportowania zdjęć…"
 
-#: src/library/LibraryWindow.vala:1269
+#: src/library/LibraryWindow.vala:1125
 msgid "Auto-importing photos…"
 msgstr "Automatyczne importowanie zdjęć…"
 
-#: src/library/LibraryWindow.vala:1277
+#: src/library/LibraryWindow.vala:1133
 msgid "Writing metadata to files…"
 msgstr "Zapisywanie metadanych do plików…"
 
@@ -4838,7 +4665,7 @@ msgstr "Zapisywanie metadanych do plików…"
 msgid "Missing Files"
 msgstr "Brak plików"
 
-#: src/library/OfflinePage.vala:106
+#: src/library/OfflinePage.vala:103
 msgid "Deleting…"
 msgstr "Usuwanie…"
 
@@ -4846,15 +4673,15 @@ msgstr "Usuwanie…"
 msgid "Trash"
 msgstr "Kosz"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:101
 msgid "Trash is empty"
 msgstr "Kosz jest pusty"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:105
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:106
 msgid "Deleting Photos"
 msgstr "Usuwanie zdjęć"
 
@@ -4944,71 +4771,7 @@ msgstr "Nie można przetworzyć aktualizacji monitorowania: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Dopasowuje rozmiar miniatur"
 
-#: src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Zwiększa powiększenie miniatur"
-
-#: src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Zmniejsza powiększenie miniatur"
-
-#: src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "_Uporządkuj zdjęcia"
-
-#: src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "_Odtwórz nagranie wideo"
-
-#: src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Otwiera wybrane nagrania wideo w systemowym odtwarzaczu filmów"
-
-#: src/MediaPage.vala:428 src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr "_Wywoływacz"
-
-#: src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Wyświetla komentarz każdego zdjęcia"
-
-#: src/MediaPage.vala:470
-msgid "Display each photo’s tags"
-msgstr "Wyświetla etykiety każdego zdjęcia"
-
-#: src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "Według _tytułu"
-
-#: src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Porządkuje zdjęcia według tytułu"
-
-#: src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "We_dług daty ekspozycji"
-
 #: src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Porządkuje zdjęcia według daty ekspozycji"
-
-#: src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Według _oceny"
-
-#: src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Porządkuje zdjęcia według oceny"
-
-#: src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Według _nazw plików"
-
-#: src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Porządkuje zdjęcia według nazw plików"
-
-#: src/MediaPage.vala:723
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -5017,34 +4780,34 @@ msgstr ""
 "Program Shotwell nie może odtworzyć wybranego nagrania wideo:\n"
 "%s"
 
-#: src/Page.vala:1266
+#: src/Page.vala:1338
 msgid "No photos/videos"
 msgstr "Brak zdjęć/nagrań wideo"
 
-#: src/Page.vala:1270
+#: src/Page.vala:1342
 msgid "No photos/videos found which match the current filter"
 msgstr "Nie odnaleziono zdjęć/nagrań wideo pasujących do bieżącego filtra"
 
-#: src/Page.vala:2576
+#: src/Page.vala:2648
 msgid "Photos cannot be exported to this directory."
 msgstr "Nie można eksportować zdjęć do tego katalogu."
 
 #. previous button
-#: src/PhotoPage.vala:533
+#: src/PhotoPage.vala:535
 msgid "Previous photo"
 msgstr "Poprzednie zdjęcie"
 
 #. next button
-#: src/PhotoPage.vala:539
+#: src/PhotoPage.vala:541
 msgid "Next photo"
 msgstr "Następne zdjęcie"
 
-#: src/PhotoPage.vala:1845
+#: src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Brak pliku źródłowego zdjęcia: %s"
 
-#: src/PhotoPage.vala:3229
+#: src/PhotoPage.vala:3008
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Nie można wyeksportować: %s: %s"
@@ -5216,7 +4979,7 @@ msgstr "Bieżący wywoływacz:"
 
 #: src/Properties.vala:592
 msgid "Original dimensions:"
-msgstr "Wymiary pierwotne:"
+msgstr "Oryginalne wymiary:"
 
 #: src/Properties.vala:595
 msgid "Camera make:"
@@ -5290,65 +5053,58 @@ msgstr ""
 "Aby spróbować opublikowania do innego serwisu, należy wybrać jeden "
 "z powyższego menu."
 
-#: src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Wybrane zdjęcia/nagrania wideo zostały pomyślnie opublikowane."
-
-#: src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Wybrane nagrania wideo zostały pomyślnie opublikowane."
-
-#: src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Wybrane zdjęcia zostały pomyślnie opublikowane."
-
-#: src/publishing/PublishingUI.vala:112
+#. Here, we check whether more than one item is being uploaded, and if so, display
+#. an alternate message.
+#: src/publishing/PublishingUI.vala:104 src/publishing/PublishingUI.vala:109
 msgid "The selected video was successfully published."
-msgstr "Wybrane nagranie wideo zostało pomyślnie opublikowane."
+msgid_plural "The selected videos were successfully published."
+msgstr[0] "Wybrane nagranie wideo zostało pomyślnie opublikowane."
+msgstr[1] "Wybrane nagrania wideo zostały pomyślnie opublikowane."
+msgstr[2] "Wybrane nagrania wideo zostały pomyślnie opublikowane."
 
-#: src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr "Wybrane nagrania wideo zostały pomyślnie opublikowane."
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "Wybrane zdjęcia/nagrania wideo zostały pomyślnie opublikowane."
 
-#: src/publishing/PublishingUI.vala:122
+#: src/publishing/PublishingUI.vala:127
 msgid "Fetching account information…"
 msgstr "Pobieranie informacji o koncie…"
 
-#: src/publishing/PublishingUI.vala:128
+#: src/publishing/PublishingUI.vala:133
 msgid "Logging in…"
 msgstr "Logowanie…"
 
-#: src/publishing/PublishingUI.vala:188
+#: src/publishing/PublishingUI.vala:193
 msgid "Publish Photos"
 msgstr "Publikacja zdjęć"
 
-#: src/publishing/PublishingUI.vala:189
+#: src/publishing/PublishingUI.vala:194
 msgid "Publish photos _to:"
 msgstr "Publikowanie zdjęć _do:"
 
-#: src/publishing/PublishingUI.vala:191
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish Videos"
 msgstr "Publikacja nagrań wideo"
 
-#: src/publishing/PublishingUI.vala:192
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish videos _to"
 msgstr "Publikowanie nagrań wideo _do"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish Photos and Videos"
 msgstr "Publikacja zdjęć i nagrań wideo"
 
-#: src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish photos and videos _to"
 msgstr "Publikowanie zdjęć i nagrań wideo _do"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:397
+#: src/publishing/PublishingUI.vala:410
 msgid "Unable to publish"
 msgstr "Nie można opublikować"
 
-#: src/publishing/PublishingUI.vala:398
+#: src/publishing/PublishingUI.vala:411
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5365,11 +5121,7 @@ msgstr ""
 msgid "Publishing"
 msgstr "Publikowanie"
 
-#: src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Obróć w p_rawo"
-
-#: src/Resources.vala:140 src/Resources.vala:145
+#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
 msgid "Rotate"
 msgstr "Obróć"
 
@@ -5377,14 +5129,10 @@ msgstr "Obróć"
 msgid "Rotate Right"
 msgstr "Obróć w prawo"
 
-#: src/Resources.vala:142
+#: src/Resources.vala:142 ui/collection.ui:146
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Obraca zdjęcia w prawo (naciśnięcie klawisza Ctrl obraca w lewo)"
 
-#: src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "Obróć w _lewo"
-
 #: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr "Obróć w lewo"
@@ -5393,23 +5141,17 @@ msgstr "Obróć w lewo"
 msgid "Rotate the photos left"
 msgstr "Obraca zdjęcia w lewo"
 
-#: src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Odwróć po_ziomo"
-
 #: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr "Odwróć poziomo"
 
-#: src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "Odwróć pi_onowo"
-
 #: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr "Odwróć pionowo"
 
-#: src/Resources.vala:155
+#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419
+#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207
 msgid "_About"
 msgstr "_O programie"
 
@@ -5417,14 +5159,30 @@ msgstr "_O programie"
 msgid "_Apply"
 msgstr "_Zastosuj"
 
+#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
+#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37
+msgid "_Edit"
+msgstr "_Edycja"
+
 #: src/Resources.vala:160
 msgid "_Forward"
 msgstr "_Dalej"
 
-#: src/Resources.vala:161
+#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "_Pełny ekran"
 
+#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418
+#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420
+#: ui/tags.ui:423 ui/top.ui:40 ui/trash.ui:189 ui/trash.ui:192
+msgid "_Help"
+msgstr "Pomo_c"
+
 #: src/Resources.vala:163
 msgid "Leave _Fullscreen"
 msgstr "Opuść p_ełny ekran"
@@ -5437,15 +5195,9 @@ msgstr "_Nowa"
 msgid "_Next"
 msgstr "_Dalej"
 
-#: src/Resources.vala:166
-msgid "_OK"
-msgstr "_OK"
-
-#: src/Resources.vala:167
-msgid "_Play"
-msgstr "Od_twórz"
-
-#: src/Resources.vala:168 src/Resources.vala:317
+#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
+#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
 msgid "_Preferences"
 msgstr "_Preferencje"
 
@@ -5453,11 +5205,9 @@ msgstr "_Preferencje"
 msgid "_Previous"
 msgstr "_Wstecz"
 
-#: src/Resources.vala:170
-msgid "_Print"
-msgstr "Wy_drukuj"
-
-#: src/Resources.vala:171
+#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40
+#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30
 msgid "_Quit"
 msgstr "Za_kończ"
 
@@ -5497,22 +5247,24 @@ msgstr "Z_wykły rozmiar"
 msgid "Best _Fit"
 msgstr "_Najlepsze dopasowanie"
 
-#: src/Resources.vala:186
-msgid "_Enhance"
-msgstr "_Uwydatnij"
+#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "Pow_iększ"
 
-#: src/Resources.vala:187
+#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "P_omniejsz"
+
+#: src/Resources.vala:187 ui/collection.ui:165
 msgid "Enhance"
 msgstr "Uwydatnij"
 
-#: src/Resources.vala:188
+#: src/Resources.vala:188 ui/collection.ui:162
 msgid "Automatically improve the photo’s appearance"
 msgstr "Automatycznie ulepsza wygląd zdjęcia"
 
-#: src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "S_kopiuj dostosowania kolorów"
-
 #: src/Resources.vala:191
 msgid "Copy Color Adjustments"
 msgstr "Skopiuj dostosowania kolorów"
@@ -5521,10 +5273,6 @@ msgstr "Skopiuj dostosowania kolorów"
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Kopiuje dostosowania kolorów zastosowane na zdjęciu"
 
-#: src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "_Wklej dostosowania kolorów"
-
 #: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr "Wklej dostosowania kolorów"
@@ -5533,7 +5281,7 @@ msgstr "Wklej dostosowania kolorów"
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Wkleja skopiowane dostosowania kolorów zastosowane na zdjęciu"
 
-#: src/Resources.vala:198
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "Przyt_nij"
 
@@ -5553,7 +5301,7 @@ msgstr "Wyrównaj"
 msgid "Straighten the photo"
 msgstr "Wyrównuje zdjęcie"
 
-#: src/Resources.vala:206
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Czerwone oczy"
 
@@ -5565,7 +5313,7 @@ msgstr "Czerwone oczy"
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Zmniejsza lub usuwa wszystkie efekty czerwonych oczu na zdjęciu"
 
-#: src/Resources.vala:210
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Dopasuj"
 
@@ -5577,13 +5325,9 @@ msgstr "Dopasuj"
 msgid "Adjust the photo’s color and tone"
 msgstr "Dopasowuje kolor i tonację zdjęcia"
 
-#: src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "Przy_wróć pierwotne"
-
 #: src/Resources.vala:215
 msgid "Revert to Original"
-msgstr "Przywróć pierwotne"
+msgstr "Przywróć oryginalne"
 
 #: src/Resources.vala:217
 msgid "Revert External E_dits"
@@ -5593,10 +5337,6 @@ msgstr "Odwróć zewnętrzne mo_dyfikacje"
 msgid "Revert to the master photo"
 msgstr "Przywraca pierwotne zdjęcie"
 
-#: src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Ustaw jako tło p_ulpitu"
-
 #: src/Resources.vala:221
 msgid "Set selected image to be the new desktop background"
 msgstr "Ustawia wybrany obraz jako nowe tło pulpitu"
@@ -5605,7 +5345,9 @@ msgstr "Ustawia wybrany obraz jako nowe tło pulpitu"
 msgid "Set as _Desktop Slideshow…"
 msgstr "Ustaw jako pokaz slaj_dów pulpitu…"
 
-#: src/Resources.vala:224
+#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35
+#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
 msgid "_Undo"
 msgstr "Cof_nij"
 
@@ -5613,7 +5355,9 @@ msgstr "Cof_nij"
 msgid "Undo"
 msgstr "Cofnij"
 
-#: src/Resources.vala:227
+#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40
+#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
 msgid "_Redo"
 msgstr "P_onów"
 
@@ -5621,11 +5365,12 @@ msgstr "P_onów"
 msgid "Redo"
 msgstr "Ponów"
 
-#: src/Resources.vala:230
+#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:391 ui/event.ui:584
 msgid "Re_name Event…"
 msgstr "Zmień _nazwę wydarzenia…"
 
-#: src/Resources.vala:233
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
 msgid "Make _Key Photo for Event"
 msgstr "Utwórz _kluczowe zdjęcie dla wydarzenia"
 
@@ -5633,7 +5378,7 @@ msgstr "Utwórz _kluczowe zdjęcie dla wydarzenia"
 msgid "Make Key Photo for Event"
 msgstr "Tworzy kluczowe zdjęcie dla wydarzenia"
 
-#: src/Resources.vala:236
+#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
 msgid "_New Event"
 msgstr "_Nowe wydarzenie"
 
@@ -5649,7 +5394,7 @@ msgstr "Przenieś zdjęcia"
 msgid "Move photos to an event"
 msgstr "Przenosi zdjęcia do innego wydarzenia"
 
-#: src/Resources.vala:242
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Połącz wydarzenia"
 
@@ -5661,7 +5406,8 @@ msgstr "Połącz"
 msgid "Combine events into a single event"
 msgstr "Łączy wydarzenia w jedno"
 
-#: src/Resources.vala:246
+#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "U_staw ocenę"
 
@@ -5673,7 +5419,8 @@ msgstr "Ustaw ocenę"
 msgid "Change the rating of your photo"
 msgstr "Zmienia ocenę zdjęcia"
 
-#: src/Resources.vala:250
+#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "Z_większ"
 
@@ -5681,7 +5428,8 @@ msgstr "Z_większ"
 msgid "Increase Rating"
 msgstr "Zwiększ ocenę"
 
-#: src/Resources.vala:253
+#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "_Zmniejsz"
 
@@ -5689,7 +5437,8 @@ msgstr "_Zmniejsz"
 msgid "Decrease Rating"
 msgstr "Zmniejsz ocenę"
 
-#: src/Resources.vala:256
+#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Bez oceny"
 
@@ -5709,7 +5458,8 @@ msgstr "Ustawianie jako bez oceny"
 msgid "Remove any ratings"
 msgstr "Usuwa wszystkie oceny"
 
-#: src/Resources.vala:262
+#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "_Odrzucona"
 
@@ -5729,7 +5479,8 @@ msgstr "Ustawianie jako odrzucona"
 msgid "Set rating to rejected"
 msgstr "Ustawia ocenę jako odrzuconą"
 
-#: src/Resources.vala:268
+#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
 msgid "Rejected _Only"
 msgstr "Tylko _odrzucone"
 
@@ -5741,7 +5492,8 @@ msgstr "Tylko odrzucone"
 msgid "Show only rejected photos"
 msgstr "Wyświetla tylko odrzucone zdjęcia"
 
-#: src/Resources.vala:272
+#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
 msgid "All + _Rejected"
 msgstr "Wszystko + _odrzucone"
 
@@ -5750,7 +5502,8 @@ msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Wyświetla wszystkie zdjęcia, w tym odrzucone"
 
-#: src/Resources.vala:275
+#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
 msgid "_All Photos"
 msgstr "_Wszystkie zdjęcia"
 
@@ -5759,7 +5512,8 @@ msgstr "_Wszystkie zdjęcia"
 msgid "Show all photos"
 msgstr "Wyświetla wszystkie zdjęcia"
 
-#: src/Resources.vala:279
+#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "O_ceny"
 
@@ -5767,7 +5521,8 @@ msgstr "O_ceny"
 msgid "Display each photo’s rating"
 msgstr "Wyświetla oceny każdego zdjęcia"
 
-#: src/Resources.vala:282
+#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
 msgid "_Filter Photos"
 msgstr "_Filtruj zdjęcia"
 
@@ -5779,10 +5534,6 @@ msgstr "Filtruj zdjęcia"
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Ogranicza liczbę wyświetlanych zdjęć na podstawie filtru"
 
-#: src/Resources.vala:286
-msgid "_Duplicate"
-msgstr "Utwórz _kopię"
-
 #: src/Resources.vala:287
 msgid "Duplicate"
 msgstr "Utwórz kopię"
@@ -5803,11 +5554,12 @@ msgstr "Wy_drukuj…"
 msgid "Pu_blish…"
 msgstr "Opu_blikuj…"
 
-#: src/Resources.vala:296
+#: src/Resources.vala:296 ui/collection.ui:187
 msgid "Publish to various websites"
 msgstr "Publikuje na różnych witrynach WWW"
 
-#: src/Resources.vala:298
+#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
 msgid "Edit _Title…"
 msgstr "Mo_dyfikuj tytuł…"
 
@@ -5817,7 +5569,9 @@ msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Modyfikuj tytuł"
 
-#: src/Resources.vala:302
+#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539
+#: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344
 msgid "Edit _Comment…"
 msgstr "Modyfikuj _komentarz…"
 
@@ -5826,11 +5580,11 @@ msgstr "Modyfikuj _komentarz…"
 msgid "Edit Comment"
 msgstr "Modyfikacja komentarza"
 
-#: src/Resources.vala:306
+#: src/Resources.vala:306 ui/event.ui:588
 msgid "Edit Event _Comment…"
 msgstr "Modyfikuj _komentarz wydarzenia…"
 
-#: src/Resources.vala:309
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
 msgid "_Adjust Date and Time…"
 msgstr "Dostosuj d_atę i czas…"
 
@@ -5838,11 +5592,12 @@ msgstr "Dostosuj d_atę i czas…"
 msgid "Adjust Date and Time"
 msgstr "Dostosowuje datę i czas"
 
-#: src/Resources.vala:312
+#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456
+#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388
 msgid "Add _Tags…"
 msgstr "Dodaj e_tykiety…"
 
-#: src/Resources.vala:313
+#: src/Resources.vala:313 ui/photo_context.ui:17
 msgid "_Add Tags…"
 msgstr "_Dodaj etykiety…"
 
@@ -5852,19 +5607,7 @@ msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Dodanie etykiet"
 
-#: src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr "_Otwórz za pomocą zewnętrznego edytora"
-
-#: src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr "Otwórz za pomocą edytora plików _RAW"
-
-#: src/Resources.vala:323
-msgid "Send _To…"
-msgstr "Wyślij _do…"
-
-#: src/Resources.vala:324
+#: src/Resources.vala:324 ui/photo_context.ui:133
 msgid "Send T_o…"
 msgstr "Wyślij d_o…"
 
@@ -5872,11 +5615,13 @@ msgstr "Wyślij d_o…"
 msgid "_Find…"
 msgstr "_Znajdź…"
 
-#: src/Resources.vala:327
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Wyszukiwanie"
 
-#: src/Resources.vala:328
+#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Wyszukuje obraz przez wpisanie tekstu pojawiającego się w jego nazwie lub "
@@ -5940,7 +5685,8 @@ msgstr "Zmień nazwę etykiety „%s” na „%s”"
 msgid "_Rename…"
 msgstr "_Zmień nazwę…"
 
-#: src/Resources.vala:375
+#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461
+#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393
 msgid "Modif_y Tags…"
 msgstr "M_odyfikuj etykiety…"
 
@@ -5951,50 +5697,42 @@ msgstr "Modyfikuj etykiety"
 #: src/Resources.vala:379
 #, c-format
 msgid "Tag Photo as “%s”"
-msgstr "Dodaje etykietę „%s” do zdjęcia"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Dodaje etykietę „%s” do zdjęcia"
+msgstr[1] "Dodaje etykietę „%s” do zdjęć"
+msgstr[2] "Dodaje etykietę „%s” do zdjęć"
 
-#: src/Resources.vala:379
-#, c-format
-msgid "Tag Photos as “%s”"
-msgstr "Dodaje etykietę „%s” do zdjęć"
-
-#: src/Resources.vala:383
+#: src/Resources.vala:385
 #, c-format
 msgid "Tag the selected photo as “%s”"
-msgstr "Dodaje etykietę „%s” do wybranego zdjęcia"
-
-#: src/Resources.vala:384
-#, c-format
-msgid "Tag the selected photos as “%s”"
-msgstr "Dodaje etykietę „%s” do wybranych zdjęć"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "Dodaje etykietę „%s” do wybranego zdjęcia"
+msgstr[1] "Dodaje etykietę „%s” do wybranych zdjęć"
+msgstr[2] "Dodaje etykietę „%s” do wybranych zdjęć"
 
-#: src/Resources.vala:388
+#: src/Resources.vala:391
 #, c-format
 msgid "Remove Tag “%s” From _Photo"
-msgstr "Usuń etykietę „%s” ze _zdjęcia"
-
-#: src/Resources.vala:389
-#, c-format
-msgid "Remove Tag “%s” From _Photos"
-msgstr "Usuwa etykietę „%s” ze _zdjęć"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "Usuwa etykietę „%s” ze _zdjęcia"
+msgstr[1] "Usuwa etykietę „%s” ze _zdjęć"
+msgstr[2] "Usuwa etykietę „%s” ze _zdjęć"
 
-#: src/Resources.vala:393
+#: src/Resources.vala:397
 #, c-format
 msgid "Remove Tag “%s” From Photo"
-msgstr "Usuwa etykietę „%s” ze zdjęcia"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "Usuwa etykietę „%s” ze zdjęcia"
+msgstr[1] "Usuwa etykietę „%s” ze zdjęć"
+msgstr[2] "Usuwa etykietę „%s” ze zdjęć"
 
-#: src/Resources.vala:394
-#, c-format
-msgid "Remove Tag “%s” From Photos"
-msgstr "Usuwa etykietę „%s” ze zdjęć"
-
-#: src/Resources.vala:398
+#: src/Resources.vala:403
 #, c-format
 msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr ""
 "Nie można zmienić nazwy etykiety na „%s”, ponieważ ta etykieta już istnieje."
 
-#: src/Resources.vala:402
+#: src/Resources.vala:407
 #, c-format
 msgid "Unable to rename search to “%s” because the search already exists."
 msgstr ""
@@ -6002,114 +5740,119 @@ msgstr ""
 "już istnieje."
 
 #. Saved search button
-#: src/Resources.vala:405 src/SearchFilter.vala:1210
+#: src/Resources.vala:410 src/SearchFilter.vala:1125
 msgid "Saved Search"
 msgstr "Zapisane wyszukiwanie"
 
-#: src/Resources.vala:407
+#: src/Resources.vala:412
 msgid "Delete Search"
 msgstr "Usunięcie wyszukiwania"
 
-#: src/Resources.vala:410
+#: src/Resources.vala:415 ui/savedsearch.ui:12
 msgid "_Edit…"
 msgstr "_Modyfikuj…"
 
-#: src/Resources.vala:411
+#: src/Resources.vala:416 ui/savedsearch.ui:8
 msgid "Re_name…"
 msgstr "Zmień _nazwę…"
 
-#: src/Resources.vala:414
+#: src/Resources.vala:419
 #, c-format
 msgid "Rename Search “%s” to “%s”"
 msgstr "Zmienia nazwę wyszukiwania z „%s” na „%s”"
 
-#: src/Resources.vala:418
+#: src/Resources.vala:423
 #, c-format
 msgid "Delete Search “%s”"
 msgstr "Usuwa wyszukiwanie „%s”"
 
-#: src/Resources.vala:576
+#: src/Resources.vala:560
 #, c-format
 msgid "Rate %s"
 msgstr "Ocena %s"
 
-#: src/Resources.vala:577
+#: src/Resources.vala:561
 #, c-format
 msgid "Set rating to %s"
 msgstr "Ustaw ocenę na %s"
 
-#: src/Resources.vala:578
+#: src/Resources.vala:562
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Ustawianie oceny na %s"
 
-#: src/Resources.vala:580
+#: src/Resources.vala:564
 #, c-format
 msgid "Display %s"
 msgstr "Wyświetlanie %s"
 
-#: src/Resources.vala:581
+#: src/Resources.vala:565
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Wyświetla tylko z oceną %s"
 
-#: src/Resources.vala:582
+#: src/Resources.vala:566
 #, c-format
 msgid "%s or Better"
 msgstr "%s lub lepszą"
 
-#: src/Resources.vala:583
+#: src/Resources.vala:567
 #, c-format
 msgid "Display %s or Better"
 msgstr "Wyświetlanie %s lub lepszych"
 
-#: src/Resources.vala:584
+#: src/Resources.vala:568
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Wyświetla tylko zdjęcia z oceną %s lub lepszą"
 
-#: src/Resources.vala:675
+#: src/Resources.vala:659 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Usuwa wybrane zdjęcia z kosza"
 
-#: src/Resources.vala:676
+#: src/Resources.vala:660 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Usuwa wybrane zdjęcia z kolekcji"
 
-#: src/Resources.vala:678
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "P_rzywróć"
 
-#: src/Resources.vala:679
+#: src/Resources.vala:663 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Przenosi wybrane zdjęcia z powrotem do kolekcji"
 
-#: src/Resources.vala:681
+#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:21
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27
+#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Wyświetl w mene_dżerze plików"
 
-#: src/Resources.vala:682
+#: src/Resources.vala:666
 msgid "Open the selected photo’s directory in the file manager"
 msgstr "Otwiera wybrany katalog zdjęć w menedżerze plików"
 
-#: src/Resources.vala:685
+#: src/Resources.vala:669
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Nie można otworzyć w menedżerze plików: %s"
 
-#: src/Resources.vala:688
+#: src/Resources.vala:672 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr "_Usuń z kolekcji"
 
-#: src/Resources.vala:690
+#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569
+#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "Przenieś do _kosza"
 
-#: src/Resources.vala:692
+#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
 msgid "Select _All"
 msgstr "Z_aznacz wszystkie"
 
-#: src/Resources.vala:693
+#: src/Resources.vala:677
 msgid "Select all items"
 msgstr "Zaznacza wszystkie elementy"
 
@@ -6122,14 +5865,14 @@ msgstr "Zaznacza wszystkie elementy"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:782
+#: src/Resources.vala:766
 msgid "%a %b %d, %Y"
 msgstr "%a, %e %b %Y"
 
 #. / Locale-specific starting date format for multi-date strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:787
+#: src/Resources.vala:771
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a, %e %b"
@@ -6137,7 +5880,7 @@ msgstr "%a, %e %b"
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:792
+#: src/Resources.vala:776
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%e, %Y"
@@ -6145,7 +5888,7 @@ msgstr "%e, %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:797
+#: src/Resources.vala:781
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a, %e %b"
@@ -6153,7 +5896,7 @@ msgstr "%a, %e %b"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:802
+#: src/Resources.vala:786
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a, %e %b %Y"
@@ -6167,139 +5910,139 @@ msgid "Saved Searches"
 msgstr "Zapisane wyszukiwania"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
 msgstr "zawiera"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:169
-#: src/searches/SavedSearchDialog.vala:500
+#: src/searches/SavedSearchDialog.vala:163
+#: src/searches/SavedSearchDialog.vala:494
 msgid "is exactly"
 msgstr "wynosi dokładnie"
 
-#: src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:164
 msgid "starts with"
 msgstr "rozpoczyna się od"
 
-#: src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:165
 msgid "ends with"
 msgstr "kończy się na"
 
-#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:166
 msgid "does not contain"
 msgstr "nie zawiera"
 
-#: src/searches/SavedSearchDialog.vala:173
-#: src/searches/SavedSearchDialog.vala:504
+#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:498
 msgid "is not set"
 msgstr "nie jest ustawione"
 
-#: src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:168
 msgid "is set"
 msgstr "jest ustawione"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:248
-#: src/searches/SavedSearchDialog.vala:379
-#: src/searches/SavedSearchDialog.vala:444
+#: src/searches/SavedSearchDialog.vala:242
+#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:438
 msgid "is"
 msgstr "jest"
 
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:243
 msgid "is not"
 msgstr "nie jest"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:249
 msgid "any photo"
 msgstr "wszystkie zdjęcia"
 
-#: src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:250
 msgid "a raw photo"
 msgstr "surowe zdjęcie"
 
-#: src/searches/SavedSearchDialog.vala:257
+#: src/searches/SavedSearchDialog.vala:251
 msgid "a video"
 msgstr "nagranie wideo"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:305
 msgid "has"
 msgstr "ma"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:306
 msgid "has no"
 msgstr "nie ma"
 
-#: src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:311
 msgid "modifications"
 msgstr "modyfikacje"
 
-#: src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:312
 msgid "internal modifications"
 msgstr "wewnętrzne modyfikacje"
 
-#: src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:313
 msgid "external modifications"
 msgstr "zewnętrzne modyfikacje"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:367
 msgid "flagged"
 msgstr "oznaczone flagą"
 
-#: src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:368
 msgid "not flagged"
 msgstr "nieoznaczone flagą"
 
-#: src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:431
 msgid "and higher"
 msgstr "i wyższe"
 
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:432
 msgid "only"
 msgstr "tylko"
 
-#: src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:433
 msgid "and lower"
 msgstr "i niższe"
 
-#: src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:495
 msgid "is after"
 msgstr "jest po"
 
-#: src/searches/SavedSearchDialog.vala:502
+#: src/searches/SavedSearchDialog.vala:496
 msgid "is before"
 msgstr "jest przed"
 
-#: src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:497
 msgid "is between"
 msgstr "jest między"
 
-#: src/searches/SavedSearchDialog.vala:516
+#: src/searches/SavedSearchDialog.vala:510
 msgid "and"
 msgstr "oraz"
 
-#: src/searches/SavedSearchDialog.vala:697
+#: src/searches/SavedSearchDialog.vala:691
 msgid "Search"
 msgstr "Wyszukiwanie"
 
-#: src/searches/SavedSearchDialog.vala:702
+#: src/searches/SavedSearchDialog.vala:696
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/searches/SavedSearchDialog.vala:703
+#: src/searches/SavedSearchDialog.vala:697
 msgid "OK"
 msgstr "OK"
 
-#: src/searches/SavedSearchDialog.vala:721
+#: src/searches/SavedSearchDialog.vala:716
 msgid "any"
 msgstr "dowolne"
 
-#: src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:717
 msgid "all"
 msgstr "wszystko"
 
-#: src/searches/SavedSearchDialog.vala:723
+#: src/searches/SavedSearchDialog.vala:718
 msgid "none"
 msgstr "brak"
 
@@ -6339,8 +6082,8 @@ msgstr "Stan flagi"
 msgid "Photo state"
 msgstr "Stan zdjęcia"
 
-#. Rating button
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1115
 msgid "Rating"
 msgstr "Ocena"
 
@@ -6348,46 +6091,58 @@ msgstr "Ocena"
 msgid "Date"
 msgstr "Data"
 
-#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
-msgid "Videos"
-msgstr "Nagrania wideo"
+#: src/SearchFilter.vala:815
+msgid "★+ Rating"
+msgstr "Ocena ★+"
 
-#: src/SearchFilter.vala:620
-msgid "RAW Photos"
-msgstr "Zdjęcia RAW"
+#: src/SearchFilter.vala:818
+msgid "★★+ Rating"
+msgstr "Ocena ★★+"
 
-#: src/SearchFilter.vala:621
-msgid "RAW photos"
-msgstr "Zdjęcia RAW"
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
+msgstr "Ocena ★★★+"
+
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
+msgstr "Ocena ★★★★+"
 
-#: src/SearchFilter.vala:1148
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr "Ocena ★★★★★+"
+
+#: src/SearchFilter.vala:1065
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Błąd podczas wczytywania pliku interfejsu użytkownika %s: %s"
+msgid "Error loading search bar UI: %s"
+msgstr "Błąd podczas wczytywania interfejsu użytkownika paska wyszukiwania: %s"
 
 #. Ticket #3260 - Add a 'close' context menu to
 #. the searchbar.
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:1159
+#: src/SearchFilter.vala:1074
 msgid "Close"
 msgstr "Zamknij"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1165
+#: src/SearchFilter.vala:1080
 msgid "Type"
 msgstr "Typ"
 
-#: src/SearchFilter.vala:1211
+#: src/SearchFilter.vala:1087
+msgid "Videos"
+msgstr "Nagrania wideo"
+
+#: src/SearchFilter.vala:1090
+msgid "RAW Photos"
+msgstr "Zdjęcia RAW"
+
+#: src/SearchFilter.vala:1126
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 "Używa zapisanego wyszukiwania do filtrowania elementów w bieżącym widoku"
 
-#: src/sidebar/Tree.vala:203
-msgid "New _Tag…"
-msgstr "Nowa _etykieta…"
-
 #: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Ustawienia"
@@ -6460,10 +6215,229 @@ msgid "untitled"
 msgstr "bez nazwy"
 
 #. multiple videos
-#: src/VideoSupport.vala:490
+#: src/VideoSupport.vala:507
 msgid "Export Videos"
 msgstr "Eksport nagrań wideo"
 
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr "_Przełącz flagę"
+
+#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351
+#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351
+msgid "_Developer"
+msgstr "_Wywoływacz"
+
+#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
+msgid "Open with E_xternal Editor"
+msgstr "_Otwórz za pomocą zewnętrznego edytora"
+
+#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379
+#: ui/photo_context.ui:124 ui/tags.ui:379
+msgid "View Eve_nt for Photo"
+msgstr "Wyświetl wydarze_nie dla zdjęcia"
+
+#: ui/direct_context.ui:7
+msgid "DirectContextMenu"
+msgstr "DirectContextMenu"
+
+#: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5
+#: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5
+#: ui/top.ui:5 ui/trash.ui:5
+msgid "_File"
+msgstr "_Plik"
+
+#: ui/direct.ui:13 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 ui/tags.ui:17
+msgid "Save _As…"
+msgstr "Z_apisz jako…"
+
+#: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99
+#: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78
+#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87
+msgid "_View"
+msgstr "_Widok"
+
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "Dopasowanie do _strony"
+
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "Powiększenie _100%"
+
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "Powiększenie _200%"
+
+#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+msgid "_Photo"
+msgstr "_Zdjęcie"
+
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "_Poprzednie zdjęcie"
+
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "_Następne zdjęcie"
+
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "_Narzędzia"
+
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188
+#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "Naj_częściej zadawane pytania"
+
+#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:430
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:413 ui/offline.ui:192
+#: ui/photo.ui:396 ui/tags.ui:432 ui/trash.ui:201
+msgid "_Report a Problem…"
+msgstr "_Zgłoś problem…"
+
+#: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
+#: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
+msgid "_Import from Folder…"
+msgstr "_Zaimportuj z katalogu…"
+
+#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
+#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13
+#: ui/trash.ui:13
+msgid "Import From _Application…"
+msgstr "Zaimportuj z p_rogramu…"
+
+#: ui/events_directory.ui:19 ui/event.ui:34 ui/import_queue.ui:25
+#: ui/import.ui:27 ui/media.ui:34 ui/offline.ui:19 ui/photo.ui:42 ui/tags.ui:34
+#: ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242
+msgid "Empty T_rash"
+msgstr "Opróżnij _kosz"
+
+#: ui/events_directory.ui:47 ui/event.ui:62 ui/import.ui:55 ui/media.ui:62
+#: ui/offline.ui:47 ui/tags.ui:62 ui/trash.ui:52
+msgid "_Find"
+msgstr "_Znajdź"
+
+#: ui/events_directory.ui:51 ui/event.ui:66 ui/media.ui:66 ui/offline.ui:51
+#: ui/photo.ui:70 ui/search_sidebar_context.ui:6
+#: ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56
+msgid "Ne_w Saved Search…"
+msgstr "No_we zapisane wyszukiwanie…"
+
+#: ui/events_directory.ui:74 ui/event.ui:102 ui/import_queue.ui:41
+#: ui/import.ui:77 ui/media.ui:102 ui/offline.ui:81 ui/photo.ui:98
+#: ui/tags.ui:102 ui/trash.ui:90
+msgid "_Basic Information"
+msgstr "_Podstawowe informacje"
+
+#: ui/events_directory.ui:79 ui/event.ui:107 ui/import.ui:82 ui/media.ui:107
+#: ui/offline.ui:86 ui/photo.ui:103 ui/tags.ui:107 ui/trash.ui:95
+msgid "E_xtended Information"
+msgstr "_Rozszerzone informacje"
+
+#: ui/events_directory.ui:84 ui/event.ui:112 ui/import.ui:87 ui/media.ui:112
+#: ui/offline.ui:91 ui/tags.ui:112 ui/trash.ui:100
+msgid "_Search Bar"
+msgstr "Pasek wy_szukiwania"
+
+#: ui/events_directory.ui:89 ui/event.ui:117 ui/import.ui:92 ui/media.ui:117
+#: ui/offline.ui:96 ui/photo.ui:108 ui/tags.ui:117 ui/trash.ui:105
+msgid "S_idebar"
+msgstr "Panel _boczny"
+
+#: ui/events_directory.ui:94 ui/event.ui:122 ui/import.ui:97 ui/media.ui:122
+#: ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110
+msgid "T_oolbar"
+msgstr "_Pasek narzędziowy"
+
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Komentarze"
+
+#: ui/events_directory.ui:108 ui/event.ui:243 ui/import_queue.ui:48
+#: ui/import.ui:166 ui/media.ui:243 ui/offline.ui:163 ui/photo.ui:127
+#: ui/tags.ui:243 ui/trash.ui:172
+msgid "Sort _Events"
+msgstr "Uporządkuj wydarz_enia"
+
+#: ui/events_directory.ui:111 ui/event.ui:231 ui/event.ui:246
+#: ui/import_queue.ui:51 ui/import.ui:169 ui/media.ui:231 ui/media.ui:246
+#: ui/offline.ui:166 ui/photo.ui:130 ui/tags.ui:231 ui/tags.ui:246
+#: ui/trash.ui:175
+msgid "_Ascending"
+msgstr "_Rosnąco"
+
+#: ui/events_directory.ui:116 ui/event.ui:236 ui/import_queue.ui:56
+#: ui/media.ui:236 ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180
+msgid "D_escending"
+msgstr "Mal_ejąco"
+
+#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
+#: ui/top.ui:30
+msgid "Even_ts"
+msgstr "Wy_darzenia"
+
+#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
+#: ui/photo.ui:77 ui/tags.ui:74
+msgid "R_emove from Library"
+msgstr "_Usuń z kolekcji"
+
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "_Tytuły"
+
+#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385
+#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35
+msgid "Ta_gs"
+msgstr "_Etykiety"
+
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "_Uporządkuj zdjęcia"
+
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "Według _tytułu"
+
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "Według _nazw plików"
+
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "We_dług daty ekspozycji"
+
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "Według _oceny"
+
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+msgid "_Descending"
+msgstr "Mal_ejąco"
+
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25
+msgid "_Photos"
+msgstr "_Zdjęcia"
+
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "_Zatrzymaj importowanie"
+
+#: ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr "_Zaimportuj wybrane"
+
+#: ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "Z_aimportuj wszystkie"
+
+#: ui/savedsearch.ui:5
+msgid "SearchContextMenu"
+msgstr "SearchContextMenu"
+
 #: ui/set_background_dialog.ui:15
 msgid "Set as Desktop Background"
 msgstr "Ustaw jako tło pulpitu"
@@ -6472,7 +6446,7 @@ msgstr "Ustaw jako tło pulpitu"
 msgid "Use for Desktop"
 msgstr "Użycie na pulpicie"
 
-#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:92 ui/set_background_slideshow_dialog.ui:148
 msgid "Use for Lock Screen"
 msgstr "Użycie na ekranie blokady"
 
@@ -6596,58 +6570,66 @@ msgstr "Importowanie"
 msgid "_Directory structure:"
 msgstr "Struktura _katalogów:"
 
-#: ui/shotwell.ui:1009
+#: ui/shotwell.ui:1012
 msgid "_Pattern:"
 msgstr "_Wzór:"
 
-#: ui/shotwell.ui:1091
+#: ui/shotwell.ui:1094
 msgid "Example:"
 msgstr "Przykład:"
 
-#: ui/shotwell.ui:1108
+#: ui/shotwell.ui:1111
 msgid "R_ename imported files to lowercase"
 msgstr "_Zmienianie nazw importowanych plików na małe litery"
 
-#: ui/shotwell.ui:1137
+#: ui/shotwell.ui:1140
 msgid "RAW Developer"
 msgstr "Wywoływacz RAW"
 
-#: ui/shotwell.ui:1172
+#: ui/shotwell.ui:1175
 msgid "De_fault:"
 msgstr "_Domyślnie:"
 
-#: ui/shotwell.ui:1226
+#: ui/shotwell.ui:1229
 msgid "E_xternal photo editor:"
 msgstr "_Zewnętrzny edytor zdjęć:"
 
-#: ui/shotwell.ui:1242
+#: ui/shotwell.ui:1245
 msgid "External _RAW editor:"
 msgstr "Zewnętrzny edytor plików _RAW:"
 
-#: ui/shotwell.ui:1307
+#: ui/shotwell.ui:1310
 msgid "External Editors"
 msgstr "Zewnętrzne edytory"
 
-#: ui/shotwell.ui:1334
+#: ui/shotwell.ui:1337
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: ui/shotwell.ui:1400
+#: ui/shotwell.ui:1403
 msgid "_Delay:"
 msgstr "_Opóźnienie:"
 
-#: ui/shotwell.ui:1416
+#: ui/shotwell.ui:1419
 msgid "_Transition effect:"
 msgstr "_Efekt przejścia:"
 
-#: ui/shotwell.ui:1432
+#: ui/shotwell.ui:1435
 msgid "Transition d_elay:"
 msgstr "Opóźnienie prz_ejścia:"
 
-#: ui/shotwell.ui:1444
+#: ui/shotwell.ui:1447
 msgid "Show t_itle"
 msgstr "Wyświetlanie tyt_ułu"
 
-#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
+#: ui/shotwell.ui:1537 ui/shotwell.ui:1550
 msgid "seconds"
 msgstr "s"
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nowa _etykieta…"
+
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Usuwa wszystkie zdjęcia z kosza"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index c08a8d1..3040651 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4afad63..edd89b4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: shotwell\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=shotwel"
 "l&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-10-04 19:52+0000\n"
-"PO-Revision-Date: 2016-10-06 08:46-0200\n"
+"POT-Creation-Date: 2016-11-18 22:18-0200\n"
+"PO-Revision-Date: 2016-11-18 23:32-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -32,7 +32,9 @@ msgstr ""
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300
+#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:354
+#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344
+#: ui/tags.ui:354
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -88,7 +90,7 @@ msgstr ""
 "álbum;câmera;câmeras;cortar;editar;melhorar;exportar;galeria;imagem;imagens;"
 "importar;organizar;foto;fotografia;fotografias;foto;fotos;imprimir;impressão;"
 "publicar;publicação;girar;compartilhar;etiquetas;vídeo;facebook;flickr;"
-"picasa;youtbe;piwigo;"
+"picasa;youtube;piwigo;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
@@ -128,7 +130,7 @@ msgid "The secret token to sign oauth requests"
 msgstr "O token secreto para assinar requisições oauth"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:26
-#: misc/org.yorba.shotwell.gschema.xml:416
+#: misc/org.yorba.shotwell.gschema.xml:486
 msgid "default size"
 msgstr "tamanho padrão"
 
@@ -136,7 +138,7 @@ msgstr "tamanho padrão"
 msgid ""
 "A numeric code representing the default size for photos uploaded to Tumblr"
 msgstr ""
-"um código numérico representando o tamanho padrão para fotos enviadas ao "
+"Um código numérico representando o tamanho padrão para fotos enviadas ao "
 "Tumblr"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:32
@@ -156,9 +158,9 @@ msgid "URL of the Rajce server."
 msgstr "URL do servidor Rajce."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:46
-#: misc/org.yorba.shotwell.gschema.xml:384
-#: misc/org.yorba.shotwell.gschema.xml:442
-#: misc/org.yorba.shotwell.gschema.xml:498
+#: misc/org.yorba.shotwell.gschema.xml:454
+#: misc/org.yorba.shotwell.gschema.xml:512
+#: misc/org.yorba.shotwell.gschema.xml:568
 msgid "username"
 msgstr "nome de usuário"
 
@@ -175,7 +177,7 @@ msgid "user token, if remembered."
 msgstr "token do usuário, se memorizado."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:58
-#: misc/org.yorba.shotwell.gschema.xml:460
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "last category"
 msgstr "última categoria"
 
@@ -184,7 +186,7 @@ msgid "The last selected Rajce category."
 msgstr "A última categoria Rajce selecionada."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
-#: misc/org.yorba.shotwell.gschema.xml:472
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last photo size"
 msgstr "tamanho da última foto"
 
@@ -222,11 +224,11 @@ msgid ""
 msgstr "Se verdadeiro, abre álbum alvo no navegador só depois de enviar fotos"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:88
-#: misc/org.yorba.shotwell.gschema.xml:364
-#: misc/org.yorba.shotwell.gschema.xml:402
-#: misc/org.yorba.shotwell.gschema.xml:428
-#: misc/org.yorba.shotwell.gschema.xml:478
-#: misc/org.yorba.shotwell.gschema.xml:522
+#: misc/org.yorba.shotwell.gschema.xml:434
+#: misc/org.yorba.shotwell.gschema.xml:472
+#: misc/org.yorba.shotwell.gschema.xml:498
+#: misc/org.yorba.shotwell.gschema.xml:548
+#: misc/org.yorba.shotwell.gschema.xml:592
 msgid "remove sensitive info from uploads"
 msgstr "remover informações sensíveis das fotos"
 
@@ -238,59 +240,59 @@ msgstr ""
 "Se as imagens sendo enviadas para Rajce devem ter seus metadados removidos "
 "primeiro"
 
-#: misc/org.yorba.shotwell.gschema.xml:22
+#: misc/org.yorba.shotwell.gschema.xml:23
 msgid "display basic properties"
 msgstr "exibir propriedades básicas"
 
-#: misc/org.yorba.shotwell.gschema.xml:23
+#: misc/org.yorba.shotwell.gschema.xml:24
 msgid "True if the basic properties pane is to be displayed, false otherwise."
 msgstr ""
 "Verdadeiro se o painel de propriedades básicas deve ser exibido; do "
 "contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:28
+#: misc/org.yorba.shotwell.gschema.xml:29
 msgid "display extended properties"
 msgstr "exibir propriedades estendidas"
 
-#: misc/org.yorba.shotwell.gschema.xml:29
+#: misc/org.yorba.shotwell.gschema.xml:30
 msgid ""
 "True if the extended properties window is to be displayed, false otherwise."
 msgstr ""
 "Verdadeiro se a janela de propriedades estendidas deve ser exibida; do "
 "contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:34
+#: misc/org.yorba.shotwell.gschema.xml:35
 msgid "display sidebar"
 msgstr "exibir barra lateral"
 
-#: misc/org.yorba.shotwell.gschema.xml:35
+#: misc/org.yorba.shotwell.gschema.xml:36
 msgid "True if the sidebar is to be displayed, false otherwise."
 msgstr "Verdadeiro se a barra lateral deve ser exibida; do contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:40
+#: misc/org.yorba.shotwell.gschema.xml:41
 msgid "display toolbar"
 msgstr "exibir barra de ferramentas"
 
-#: misc/org.yorba.shotwell.gschema.xml:41
+#: misc/org.yorba.shotwell.gschema.xml:42
 msgid "True if the bottom toolbar is to be displayed, false otherwise."
 msgstr ""
 "Verdadeiro se a barra de ferramentas deve ser exibida; do contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:46
+#: misc/org.yorba.shotwell.gschema.xml:47
 msgid "display search bar"
 msgstr "exibir barra de pesquisa"
 
-#: misc/org.yorba.shotwell.gschema.xml:47
+#: misc/org.yorba.shotwell.gschema.xml:48
 msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
 msgstr ""
 "Verdadeiro se a barra de ferramentas de pesquisa/filtro deve ser exibida; do "
 "contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:52
+#: misc/org.yorba.shotwell.gschema.xml:53
 msgid "display photo titles"
 msgstr "exibir títulos das fotos"
 
-#: misc/org.yorba.shotwell.gschema.xml:53
+#: misc/org.yorba.shotwell.gschema.xml:54
 msgid ""
 "True if photo titles are to be displayed beneath thumbnails in collection "
 "views, false otherwise."
@@ -298,11 +300,11 @@ msgstr ""
 "Verdadeiro se os títulos de fotos devem ser exibidos sob miniaturas nas "
 "visões de coleção; do contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:58
+#: misc/org.yorba.shotwell.gschema.xml:59
 msgid "display photo comments"
 msgstr "exibir comentários das fotos"
 
-#: misc/org.yorba.shotwell.gschema.xml:59
+#: misc/org.yorba.shotwell.gschema.xml:60
 msgid ""
 "True if photo comments are to be displayed beneath thumbnails in collection "
 "views, false otherwise."
@@ -310,11 +312,11 @@ msgstr ""
 "Verdadeiro se os comentários de fotos devem ser exibidos sob miniaturas nas "
 "visões de coleção; do contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:64
+#: misc/org.yorba.shotwell.gschema.xml:65
 msgid "display event comments"
 msgstr "exibir comentários de eventos"
 
-#: misc/org.yorba.shotwell.gschema.xml:65
+#: misc/org.yorba.shotwell.gschema.xml:66
 msgid ""
 "True if event comments are to be displayed beneath thumbnails in event "
 "views, false otherwise."
@@ -322,11 +324,11 @@ msgstr ""
 "Verdadeiro se os comentários de eventos devem ser exibidos sob miniaturas "
 "nas visões de evento; do contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:70
+#: misc/org.yorba.shotwell.gschema.xml:71
 msgid "display photo tags"
 msgstr "exibir etiquetas das fotos"
 
-#: misc/org.yorba.shotwell.gschema.xml:71
+#: misc/org.yorba.shotwell.gschema.xml:72
 msgid ""
 "True if photo tags are to be listed beneath thumbnails in collection views, "
 "false otherwise."
@@ -334,11 +336,11 @@ msgstr ""
 "Verdadeiro se as etiquetas de fotos devem ser listadas sob miniaturas nas "
 "visões de coleção; do contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:76
+#: misc/org.yorba.shotwell.gschema.xml:77
 msgid "display photo ratings"
 msgstr "exibir avaliações das fotos"
 
-#: misc/org.yorba.shotwell.gschema.xml:77
+#: misc/org.yorba.shotwell.gschema.xml:78
 msgid ""
 "True if a photo’s rating should be displayed as overlaid trinket, false "
 "otherwise."
@@ -346,11 +348,11 @@ msgstr ""
 "Verdadeiro se a avaliação de uma foto deve ser exibida em sobreposição; do "
 "contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:82
+#: misc/org.yorba.shotwell.gschema.xml:83
 msgid "rating filter level"
 msgstr "nível de filtro de avaliação"
 
-#: misc/org.yorba.shotwell.gschema.xml:83
+#: misc/org.yorba.shotwell.gschema.xml:84
 msgid ""
 "Determines how to filter photos based on their ratings. 1: Rejected or "
 "better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
@@ -360,59 +362,59 @@ msgstr ""
 "melhor, 2: Não avaliada ou melhor, 3: Uma ou melhor, 4: Duas ou melhor, 5: "
 "Três ou melhor, 6: Quatro ou melhor, 7: Cinco ou melhor."
 
-#: misc/org.yorba.shotwell.gschema.xml:88
+#: misc/org.yorba.shotwell.gschema.xml:89
 msgid "sort events ascending"
 msgstr "ordenar eventos por ascendência"
 
-#: misc/org.yorba.shotwell.gschema.xml:89
+#: misc/org.yorba.shotwell.gschema.xml:90
 msgid "True if events should be sorted ascending, false if descending."
 msgstr ""
 "Verdadeiro se eventos devem ser ordenados de forma ascendente; se "
 "descendente, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:94
+#: misc/org.yorba.shotwell.gschema.xml:95
 msgid "sort library photos ascending"
 msgstr "ordenar fotos da biblioteca por ascendência"
 
-#: misc/org.yorba.shotwell.gschema.xml:95
+#: misc/org.yorba.shotwell.gschema.xml:96
 msgid "True if library photos should be sorted ascending, false if descending."
 msgstr ""
 "Verdadeiro se fotos da biblioteca devem ser ordenados de forma ascendente."
 
-#: misc/org.yorba.shotwell.gschema.xml:100
+#: misc/org.yorba.shotwell.gschema.xml:101
 msgid "sort library photos criteria"
 msgstr "ordenar fotos da biblioteca por critério"
 
-#: misc/org.yorba.shotwell.gschema.xml:101
+#: misc/org.yorba.shotwell.gschema.xml:102
 msgid ""
 "A numeric code that specifies the sort criteria for photos in library views."
 msgstr ""
 "Um código numérico que especifica a ordem por critério para fotos nas visões "
 "da biblioteca."
 
-#: misc/org.yorba.shotwell.gschema.xml:106
+#: misc/org.yorba.shotwell.gschema.xml:107
 msgid "sort event photos ascending"
 msgstr "ordenar fotos de eventos por ascendência"
 
-#: misc/org.yorba.shotwell.gschema.xml:107
+#: misc/org.yorba.shotwell.gschema.xml:108
 msgid "True if event photos should be sorted ascending, false if descending."
 msgstr ""
 "Verdadeiro se fotos de eventos devam ser ordenados por ascendência; se "
 "descendente, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:112
+#: misc/org.yorba.shotwell.gschema.xml:113
 msgid "sort event photos criteria"
 msgstr "ordenar fotos de eventos por critério"
 
-#: misc/org.yorba.shotwell.gschema.xml:113
+#: misc/org.yorba.shotwell.gschema.xml:114
 msgid "Specifies the sort criteria for event photos."
 msgstr "Especifica a ordem por critério para fotos de eventos."
 
-#: misc/org.yorba.shotwell.gschema.xml:118
+#: misc/org.yorba.shotwell.gschema.xml:119
 msgid "use 24 hour time"
 msgstr "usar 24 horas"
 
-#: misc/org.yorba.shotwell.gschema.xml:119
+#: misc/org.yorba.shotwell.gschema.xml:120
 msgid ""
 "True if should display times with a 24 hour clock, false if times should use "
 "AM/PM notation."
@@ -420,11 +422,11 @@ msgstr ""
 "Verdadeiro se deve ser exibido um relógio de 24 horas; falso, para notação "
 "AM/PM."
 
-#: misc/org.yorba.shotwell.gschema.xml:124
+#: misc/org.yorba.shotwell.gschema.xml:125
 msgid "keep relative time between photos"
 msgstr "manter hora relativa entre fotos"
 
-#: misc/org.yorba.shotwell.gschema.xml:125
+#: misc/org.yorba.shotwell.gschema.xml:126
 msgid ""
 "True if when adjusting time/date of photos, relative time should be "
 "maintained. False if all photos should be set to the same time."
@@ -432,11 +434,11 @@ msgstr ""
 "Verdadeiro se, ao ajustar a hora/data das fotos, a hora relativa deveria ser "
 "mantida. Falso se todas as fotos deve ser definidos com mesma hora."
 
-#: misc/org.yorba.shotwell.gschema.xml:130
+#: misc/org.yorba.shotwell.gschema.xml:131
 msgid "modify original photo files"
 msgstr "modificar arquivos originais da foto"
 
-#: misc/org.yorba.shotwell.gschema.xml:131
+#: misc/org.yorba.shotwell.gschema.xml:132
 msgid ""
 "True if when adjusting time/date of photos, the original files should be "
 "modified as well. False if changes are made only in the database."
@@ -444,11 +446,11 @@ msgstr ""
 "Verdadeiro se ao ajustar hora/data de fotos, os arquivos originais devem ser "
 "modificados também. Falso se alterações são feitas apenas no banco de dados."
 
-#: misc/org.yorba.shotwell.gschema.xml:136
+#: misc/org.yorba.shotwell.gschema.xml:137
 msgid "show welcome dialog on startup"
 msgstr "mostrar diálogo de boas-vindas na inicialização"
 
-#: misc/org.yorba.shotwell.gschema.xml:137
+#: misc/org.yorba.shotwell.gschema.xml:138
 msgid ""
 "True if, when on startup, a welcome dialog should be shown. False if it "
 "should not be shown."
@@ -456,43 +458,43 @@ msgstr ""
 "Verdadeiro se, ao inicializar, um diálogo de boas-vindas deve ser mostrado. "
 "Do contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:142
+#: misc/org.yorba.shotwell.gschema.xml:143
 msgid "sidebar position"
 msgstr "posição da barra lateral"
 
-#: misc/org.yorba.shotwell.gschema.xml:143
+#: misc/org.yorba.shotwell.gschema.xml:144
 msgid "The width, in pixels, of the sidebar"
 msgstr "A largura, em pixels, da barra lateral"
 
-#: misc/org.yorba.shotwell.gschema.xml:148
+#: misc/org.yorba.shotwell.gschema.xml:149
 msgid "photo thumbnail scale"
 msgstr "escala da miniatura da foto"
 
-#: misc/org.yorba.shotwell.gschema.xml:149
+#: misc/org.yorba.shotwell.gschema.xml:150
 msgid "The scale of photo thumbnails, ranging from 72 to 360."
 msgstr "A escala de miniaturas de fotos, variando desde 72 até 360."
 
-#: misc/org.yorba.shotwell.gschema.xml:154
+#: misc/org.yorba.shotwell.gschema.xml:155
 msgid "pin toolbar state"
 msgstr "fixar estado da barra de ferramentas"
 
-#: misc/org.yorba.shotwell.gschema.xml:155
+#: misc/org.yorba.shotwell.gschema.xml:156
 msgid "Pin toolbar in fullscreen, or not."
 msgstr "Fixa a barra de ferramentas em tela cheia, ou não."
 
-#: misc/org.yorba.shotwell.gschema.xml:160
+#: misc/org.yorba.shotwell.gschema.xml:161
 msgid "background color"
 msgstr "cor de fundo"
 
-#: misc/org.yorba.shotwell.gschema.xml:161
+#: misc/org.yorba.shotwell.gschema.xml:162
 msgid "A grayscale color for use as the background color."
 msgstr "Uma cor de escala de cinza para usar como cor de fundo."
 
-#: misc/org.yorba.shotwell.gschema.xml:166
+#: misc/org.yorba.shotwell.gschema.xml:167
 msgid "Selection state of “hide photos” option"
-msgstr "Estado de seleção da opção “ocultar fotos“"
+msgstr "Estado de seleção da opção “ocultar fotos”"
 
-#: misc/org.yorba.shotwell.gschema.xml:167
+#: misc/org.yorba.shotwell.gschema.xml:168
 msgid ""
 "Last used selection state of the “hide photos already imported” option in "
 "the import page."
@@ -500,30 +502,30 @@ msgstr ""
 "Estado da última seleção usada da opção “ocultar fotos já importadas” na "
 "página de importação."
 
-#: misc/org.yorba.shotwell.gschema.xml:174
+#: misc/org.yorba.shotwell.gschema.xml:175
 msgid "delay"
 msgstr "atraso"
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:176
 msgid "Delay (in seconds) between photos in the slideshow."
 msgstr "Atraso (em segundos) entre fotos na apresentação de slides."
 
-#: misc/org.yorba.shotwell.gschema.xml:180
+#: misc/org.yorba.shotwell.gschema.xml:181
 msgid "transition delay"
 msgstr "atraso de transição"
 
-#: misc/org.yorba.shotwell.gschema.xml:181
+#: misc/org.yorba.shotwell.gschema.xml:182
 msgid ""
 "The time (in seconds) that a transition runs between photos in a slideshow"
 msgstr ""
 "A hora (em segundos) que uma transição realiza entre fotos em uma "
 "apresentação de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:186
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "transition effect id"
 msgstr "id de efeito de transição"
 
-#: misc/org.yorba.shotwell.gschema.xml:187
+#: misc/org.yorba.shotwell.gschema.xml:188
 msgid ""
 "The name of the transition effect that will be used between photos when "
 "running a slideshow"
@@ -531,71 +533,71 @@ msgstr ""
 "O nome do efeito de transição que será usado entre fotos quando apresentando "
 "slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:192
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "Show title"
 msgstr "Mostrar título"
 
-#: misc/org.yorba.shotwell.gschema.xml:193
+#: misc/org.yorba.shotwell.gschema.xml:194
 msgid "Whether to show the title of a photo during the slideshow"
 msgstr "Se deve mostrar o título de uma fotos durante a apresentação de slide"
 
-#: misc/org.yorba.shotwell.gschema.xml:200
+#: misc/org.yorba.shotwell.gschema.xml:201
 msgid "maximize library window"
 msgstr "maximizar janela da biblioteca"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:202
 msgid "True if library application is maximized, false otherwise."
 msgstr ""
 "Verdadeiro se o aplicativo da biblioteca está maximizado. Falso, do "
 "contrário."
 
-#: misc/org.yorba.shotwell.gschema.xml:206
+#: misc/org.yorba.shotwell.gschema.xml:207
 msgid "width of library window"
 msgstr "largura da janela da biblioteca"
 
-#: misc/org.yorba.shotwell.gschema.xml:207
+#: misc/org.yorba.shotwell.gschema.xml:208
 msgid "The last recorded width of the library application window."
 msgstr "A última largura registrada da janela do aplicativo da biblioteca."
 
-#: misc/org.yorba.shotwell.gschema.xml:212
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "height of library window"
 msgstr "altura da janela da biblioteca"
 
-#: misc/org.yorba.shotwell.gschema.xml:213
+#: misc/org.yorba.shotwell.gschema.xml:214
 msgid "The last recorded height of the library application window."
 msgstr "A última altura registrada da janela do aplicativo da biblioteca."
 
-#: misc/org.yorba.shotwell.gschema.xml:218
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "maximize direct-edit window"
 msgstr "maximizar janela de edição direta"
 
-#: misc/org.yorba.shotwell.gschema.xml:219
+#: misc/org.yorba.shotwell.gschema.xml:220
 msgid "True if direct-edit application is maximized, false otherwise."
 msgstr ""
 "Verdadeiro se o aplicativo de edição direta está maximizado; do contrário, "
 "falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:224
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "width of direct-edit window"
 msgstr "largura da janela de edição direta"
 
-#: misc/org.yorba.shotwell.gschema.xml:225
+#: misc/org.yorba.shotwell.gschema.xml:226
 msgid "The last recorded width of the direct-edit application window."
 msgstr "A última largura registrada da janela do aplicativo de edição direta."
 
-#: misc/org.yorba.shotwell.gschema.xml:230
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "height of direct-edit window"
 msgstr "altura da janela de edição direta"
 
-#: misc/org.yorba.shotwell.gschema.xml:231
+#: misc/org.yorba.shotwell.gschema.xml:232
 msgid "The last recorded height of the direct-edit application window."
 msgstr "A última altura registrada da janela do aplicativo de edição direta."
 
-#: misc/org.yorba.shotwell.gschema.xml:236
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "sidebar divider position"
 msgstr "posição do divisor da barra lateral"
 
-#: misc/org.yorba.shotwell.gschema.xml:237
+#: misc/org.yorba.shotwell.gschema.xml:238
 msgid ""
 "The last recorded position of the divider between the sidebar and view in "
 "library application window."
@@ -603,30 +605,30 @@ msgstr ""
 "A última posição registrada do divisor entre a barra lateral e a visão na "
 "janela do aplicativo da biblioteca."
 
-#: misc/org.yorba.shotwell.gschema.xml:244
+#: misc/org.yorba.shotwell.gschema.xml:245
 msgid "import directory"
 msgstr "importar diretório"
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:246
 msgid "Directory in which imported photo files are placed."
 msgstr "Diretório no qual arquivos de fotos importadas são colocadas."
 
-#: misc/org.yorba.shotwell.gschema.xml:250
+#: misc/org.yorba.shotwell.gschema.xml:251
 msgid "watch library directory for new files"
 msgstr "monitorar diretório da biblioteca por novos arquivos"
 
-#: misc/org.yorba.shotwell.gschema.xml:251
+#: misc/org.yorba.shotwell.gschema.xml:252
 msgid ""
 "If true, files added to the library directory are automatically imported."
 msgstr ""
 "Se verdadeiro, arquivos adicionados ao diretório da biblioteca são "
 "importados automaticamente."
 
-#: misc/org.yorba.shotwell.gschema.xml:256
+#: misc/org.yorba.shotwell.gschema.xml:257
 msgid "write metadata to master files"
 msgstr "escrever metadados para arquivos mestres"
 
-#: misc/org.yorba.shotwell.gschema.xml:257
+#: misc/org.yorba.shotwell.gschema.xml:258
 msgid ""
 "If true, changes to metadata (tags, titles, etc.) are written to the master "
 "photo file."
@@ -634,11 +636,11 @@ msgstr ""
 "Se verdadeiro, alterações a metadados (etiquetas, títulos, etc.) são "
 "escritos ao arquivo mestre de fotos."
 
-#: misc/org.yorba.shotwell.gschema.xml:262
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "use lowercase filenames"
 msgstr "usar nomes de arquivos em minúsculo"
 
-#: misc/org.yorba.shotwell.gschema.xml:263
+#: misc/org.yorba.shotwell.gschema.xml:264
 msgid ""
 "If true, Shotwell will convert all filenames to lowercase when importing "
 "photo files"
@@ -646,11 +648,11 @@ msgstr ""
 "Se verdadeiro, Shotwell vai converter todos os nomes de arquivos para "
 "minúsculo ao importar arquivos de fotos"
 
-#: misc/org.yorba.shotwell.gschema.xml:268
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "directory pattern"
 msgstr "padrão de diretório"
 
-#: misc/org.yorba.shotwell.gschema.xml:269
+#: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
 "A string encoding a naming pattern that will be used to name photo "
 "directories on import."
@@ -658,11 +660,11 @@ msgstr ""
 "Um texto codificando um padrão de nomes que será usado para nomear "
 "diretórios de fotos na importação."
 
-#: misc/org.yorba.shotwell.gschema.xml:274
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "directory pattern custom"
 msgstr "padrão de diretório personalizado"
 
-#: misc/org.yorba.shotwell.gschema.xml:275
+#: misc/org.yorba.shotwell.gschema.xml:276
 msgid ""
 "A string encoding a custom naming pattern that will be used to name photo "
 "directories on import."
@@ -670,32 +672,32 @@ msgstr ""
 "Um texto codificando um padrão de nomes personalizado que será usado para "
 "nomear diretórios de fotos na importação."
 
-#: misc/org.yorba.shotwell.gschema.xml:280
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "RAW developer default"
 msgstr "desenvolvedor RAW padrão"
 
-#: misc/org.yorba.shotwell.gschema.xml:281
+#: misc/org.yorba.shotwell.gschema.xml:282
 msgid "Default option for which RAW developer Shotwell will use."
 msgstr "Opção padrão para qual desenvolvedor RAW o Shotwell vai usar."
 
-#: misc/org.yorba.shotwell.gschema.xml:288
+#: misc/org.yorba.shotwell.gschema.xml:289
 msgid "Most-recently-used crop aspect ratio menu choice."
 msgstr ""
 "Escolha de menu de proporção de aspecto de corte usado mais recentemente."
 
-#: misc/org.yorba.shotwell.gschema.xml:289
+#: misc/org.yorba.shotwell.gschema.xml:290
 msgid "A numeric code representing the last crop menu choice the user made."
 msgstr ""
 "Um código numérico representando a última escolhe do menu de corte feita "
 "pelo usuário."
 
-#: misc/org.yorba.shotwell.gschema.xml:293
+#: misc/org.yorba.shotwell.gschema.xml:294
 msgid "Most-recently-used crop custom aspect ratio’s numerator."
 msgstr ""
 "Numerador da proporção de aspecto personalizado de corte usado mais "
 "recentemente."
 
-#: misc/org.yorba.shotwell.gschema.xml:294
+#: misc/org.yorba.shotwell.gschema.xml:295
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -703,13 +705,13 @@ msgstr ""
 "Um inteiro positivo não-zero representando uma parte da largura da última "
 "proporção de corte personalizado inserida pelo usuário."
 
-#: misc/org.yorba.shotwell.gschema.xml:298
+#: misc/org.yorba.shotwell.gschema.xml:299
 msgid "Most-recently-used crop custom aspect ratio’s denominator."
 msgstr ""
 "Denominador da proporção de aspecto personalizado de corte usado mais "
 "recentemente."
 
-#: misc/org.yorba.shotwell.gschema.xml:299
+#: misc/org.yorba.shotwell.gschema.xml:300
 msgid ""
 "A nonzero, positive integer representing the height part of the last custom "
 "crop ratio the user entered."
@@ -717,77 +719,126 @@ msgstr ""
 "Um inteiro positivo não-zero representando uma parte da altura da última "
 "proporção de corte personalizado inserida pelo usuário."
 
-#: misc/org.yorba.shotwell.gschema.xml:306
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid "external photo editor"
 msgstr "editor de foto externo"
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:308
 msgid "External application used to edit photos."
 msgstr "Aplicativo externo usado para editar fotos."
 
-#: misc/org.yorba.shotwell.gschema.xml:312
+#: misc/org.yorba.shotwell.gschema.xml:313
 msgid "external raw editor"
 msgstr "editor raw externo"
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:314
 msgid "External application used to edit RAW photos."
 msgstr "Aplicativo externo usado para editar fotos RAW."
 
-#: misc/org.yorba.shotwell.gschema.xml:320
+#: misc/org.yorba.shotwell.gschema.xml:352
+#: misc/org.yorba.shotwell.gschema.xml:353
+msgid "Setting in export dialog: how to trim images"
+msgstr "Configuração no diálogo de exportação: como aparar imagens"
+
+#: misc/org.yorba.shotwell.gschema.xml:358
+msgid "export metadata"
+msgstr "exportar metadados"
+
+#: misc/org.yorba.shotwell.gschema.xml:359
+msgid "Setting in export dialog: option to export metadata"
+msgstr "Configuração no diálogo de exportação: opção para exportar metadados"
+
+#: misc/org.yorba.shotwell.gschema.xml:364
+msgid "format setting, special value"
+msgstr "configuração de formatação, valor especial"
+
+#: misc/org.yorba.shotwell.gschema.xml:365
+msgid "Setting in export dialog: format setting, special value"
+msgstr ""
+"Configuração no diálogo de exportação: configuração de formatação, valor "
+"especial"
+
+#: misc/org.yorba.shotwell.gschema.xml:370
+msgid "format setting, type value"
+msgstr "configuração de formatação, valor de tipo"
+
+#: misc/org.yorba.shotwell.gschema.xml:371
+msgid "Setting in export dialog: format setting, type value"
+msgstr ""
+"Configuração no diálogo de exportação: configuração de formatação, valor de "
+"tipo"
+
+#: misc/org.yorba.shotwell.gschema.xml:376
+msgid "JPEG quality option"
+msgstr "opção de qualidade JPEG"
+
+#: misc/org.yorba.shotwell.gschema.xml:377
+msgid "Setting in export dialog: jpeg quality option"
+msgstr "Configuração no diálogo de exportação: opção de qualidade jpeg"
+
+#: misc/org.yorba.shotwell.gschema.xml:382
+msgid "maximal size of image"
+msgstr "tamanho máximo da imagem"
+
+#: misc/org.yorba.shotwell.gschema.xml:383
+msgid "Setting in export dialog: maximal size of image"
+msgstr "Configuração no diálogo de exportação: tamanho máximo da imagem"
+
+#: misc/org.yorba.shotwell.gschema.xml:390
 msgid "last used publishing service"
 msgstr "último serviço de publicação usado"
 
-#: misc/org.yorba.shotwell.gschema.xml:321
-#: misc/org.yorba.shotwell.gschema.xml:327
+#: misc/org.yorba.shotwell.gschema.xml:391
+#: misc/org.yorba.shotwell.gschema.xml:397
 msgid ""
 "A numeric code representing the last service to which photos were published"
 msgstr ""
 "Um código numérico representando o último serviço para os quais as fotos "
 "serão publicadas"
 
-#: misc/org.yorba.shotwell.gschema.xml:326
+#: misc/org.yorba.shotwell.gschema.xml:396
 msgid "default publishing service"
 msgstr "serviço de publicação padrão"
 
-#: misc/org.yorba.shotwell.gschema.xml:340
+#: misc/org.yorba.shotwell.gschema.xml:410
 msgid "access token"
 msgstr "token de acesso"
 
-#: misc/org.yorba.shotwell.gschema.xml:341
+#: misc/org.yorba.shotwell.gschema.xml:411
 msgid "Facebook OAuth token for the currently logged in session, if any"
 msgstr ""
 "Token de Oauth do Facebook para a sessão atualmente autenticada, se houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:346
+#: misc/org.yorba.shotwell.gschema.xml:416
 msgid "user i.d."
 msgstr "id do usuário"
 
-#: misc/org.yorba.shotwell.gschema.xml:347
+#: misc/org.yorba.shotwell.gschema.xml:417
 msgid "Facebook user i.d. for the currently logged in user, if any"
 msgstr ""
 "id do usuário do Facebook para o usuário atualmente autenticado, se houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:352
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "user name"
 msgstr "nome de usuário"
 
-#: misc/org.yorba.shotwell.gschema.xml:353
+#: misc/org.yorba.shotwell.gschema.xml:423
 msgid "The name of the currently logged in Facebook user, if any"
 msgstr "O nome do usuário Facebook atualmente autenticado, se houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:358
-#: misc/org.yorba.shotwell.gschema.xml:390
+#: misc/org.yorba.shotwell.gschema.xml:428
+#: misc/org.yorba.shotwell.gschema.xml:460
 msgid "default size code"
 msgstr "código de tamanho padrão"
 
-#: misc/org.yorba.shotwell.gschema.xml:359
+#: misc/org.yorba.shotwell.gschema.xml:429
 msgid ""
 "A numeric code representing the default size for photos published to Facebook"
 msgstr ""
 "Um código numérico representando o tamanho padrão para fotos publicadas ao "
 "Facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:365
+#: misc/org.yorba.shotwell.gschema.xml:435
 msgid ""
 "Whether images being uploaded to Facebook should have their metadata removed "
 "first"
@@ -795,21 +846,21 @@ msgstr ""
 "Se as imagens sendo enviadas para Facebook devem possuir seus metadados "
 "removidos primeiro"
 
-#: misc/org.yorba.shotwell.gschema.xml:372
+#: misc/org.yorba.shotwell.gschema.xml:442
 msgid "OAuth Access Phase Token"
 msgstr "Token de fase de acesso Oauth"
 
-#: misc/org.yorba.shotwell.gschema.xml:373
+#: misc/org.yorba.shotwell.gschema.xml:443
 msgid "The authorization token for the currently logged in Flickr user, if any"
 msgstr ""
 "O token de autorização para o usuário Flickr atualmente autenticado, se "
 "houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:378
+#: misc/org.yorba.shotwell.gschema.xml:448
 msgid "OAuth Access Phase Token Secret"
 msgstr "Segredo de token de fase de acesso Oauth"
 
-#: misc/org.yorba.shotwell.gschema.xml:379
+#: misc/org.yorba.shotwell.gschema.xml:449
 msgid ""
 "The cryptographic secret used to sign requests against the authorization "
 "token for the currently logged in Flickr user, if any"
@@ -817,22 +868,22 @@ msgstr ""
 "O segredo criptográfico usado para assinar requisições com o token de "
 "autorização para o usuário Flickr atualmente autenticado, se houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:385
+#: misc/org.yorba.shotwell.gschema.xml:455
 msgid "The user name of the currently logged in Flickr user, if any"
 msgstr "O nome do usuário Flickr atualmente autenticado, se houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:391
+#: misc/org.yorba.shotwell.gschema.xml:461
 msgid ""
 "A numeric code representing the default size for photos published to Flickr"
 msgstr ""
 "Um código numérico representando o tamanho padrão para fotos publicadas ao "
 "Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:396
+#: misc/org.yorba.shotwell.gschema.xml:466
 msgid "default visibility"
 msgstr "visibilidade padrão"
 
-#: misc/org.yorba.shotwell.gschema.xml:397
+#: misc/org.yorba.shotwell.gschema.xml:467
 msgid ""
 "A numeric code representing the default visibility for photos published to "
 "Flickr"
@@ -840,7 +891,7 @@ msgstr ""
 "Um código numérico representando o visibilidade padrão para fotos publicadas "
 "ao Flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:403
+#: misc/org.yorba.shotwell.gschema.xml:473
 msgid ""
 "Whether images being uploaded to Flickr should have their metadata removed "
 "first"
@@ -848,12 +899,12 @@ msgstr ""
 "Se as imagens sendo enviadas para Flickr devem possuir seus metadados "
 "removidos primeiro"
 
-#: misc/org.yorba.shotwell.gschema.xml:410
-#: misc/org.yorba.shotwell.gschema.xml:542
+#: misc/org.yorba.shotwell.gschema.xml:480
+#: misc/org.yorba.shotwell.gschema.xml:612
 msgid "refresh token"
 msgstr "atualizar token"
 
-#: misc/org.yorba.shotwell.gschema.xml:411
+#: misc/org.yorba.shotwell.gschema.xml:481
 msgid ""
 "The OAuth token used to refresh the Picasa Web Albums session for the "
 "currently logged in user, if any."
@@ -861,25 +912,25 @@ msgstr ""
 "O token Oauth usado para atualizar a sessão do Picasa Web Albums para o "
 "usuário atualmente autenticado, se houver."
 
-#: misc/org.yorba.shotwell.gschema.xml:417
+#: misc/org.yorba.shotwell.gschema.xml:487
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
 msgstr ""
-"Um código numérico representando o tamanho padrão para fotos enviadas ao "
+"um código numérico representando o tamanho padrão para fotos enviadas ao "
 "Picasa Web Albums"
 
-#: misc/org.yorba.shotwell.gschema.xml:422
-#: misc/org.yorba.shotwell.gschema.xml:516
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:586
 msgid "last album"
 msgstr "último álbum"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
-#: misc/org.yorba.shotwell.gschema.xml:517
+#: misc/org.yorba.shotwell.gschema.xml:493
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "The name of the last album the user published photos to, if any"
 msgstr "O nome do último álbum para o qual o usuário publicou fotos, se houver"
 
-#: misc/org.yorba.shotwell.gschema.xml:429
+#: misc/org.yorba.shotwell.gschema.xml:499
 msgid ""
 "Whether images being uploaded to Picasa should have their metadata removed "
 "first"
@@ -887,47 +938,47 @@ msgstr ""
 "Se imagens sendo enviadas para o Picasa devem ter primeiro seus metadados "
 "removidos"
 
-#: misc/org.yorba.shotwell.gschema.xml:436
+#: misc/org.yorba.shotwell.gschema.xml:506
 msgid "Piwigo URL"
 msgstr "URL do Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:437
+#: misc/org.yorba.shotwell.gschema.xml:507
 msgid "URL of the Piwigo server."
 msgstr "URL do servidor Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:513
 msgid "Piwigo username, if logged in."
 msgstr "Nome de usuário Piwigo, se autenticado."
 
-#: misc/org.yorba.shotwell.gschema.xml:448
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "password"
 msgstr "senha"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "Piwigo password, if logged in."
 msgstr "Senha Piwigo, se autenticado."
 
-#: misc/org.yorba.shotwell.gschema.xml:454
+#: misc/org.yorba.shotwell.gschema.xml:524
 msgid "remember password"
 msgstr "memorizar senha"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "If true, remember the Piwigo password."
 msgstr "Se verdadeiro, memoria a senha Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "The last selected Piwigo category."
 msgstr "A última categoria Piwigo selecionada."
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "last permission level"
 msgstr "último nível de permissão"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "The last chosen Piwigo permission level."
 msgstr "O último nível de permissão escolhido do Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:473
+#: misc/org.yorba.shotwell.gschema.xml:543
 msgid ""
 "A numeric code representing the last photo size preset used when publishing "
 "to Piwigo."
@@ -935,7 +986,7 @@ msgstr ""
 "Um código numérico representando a predefinição de tamanho da última foto "
 "usada ao publicar para Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:479
+#: misc/org.yorba.shotwell.gschema.xml:549
 msgid ""
 "Whether images being uploaded to Piwigo should have their metadata removed "
 "first"
@@ -943,14 +994,14 @@ msgstr ""
 "Se imagens sendo enviadas para o Piwigo devem ter primeiro seus metadados "
 "removidos"
 
-#: misc/org.yorba.shotwell.gschema.xml:484
+#: misc/org.yorba.shotwell.gschema.xml:554
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
 "se um título for definido e comentário não, use título como comentário para "
 "envios ao Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:485
+#: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
 "Whether images being uploaded to Piwigo should have their comment set from "
 "the title if title is set and comment unset"
@@ -958,11 +1009,11 @@ msgstr ""
 "Se imagens sendo enviadas para Piwigo devem ter seus comentário definido do "
 "título, se título estiver definido e comentário não"
 
-#: misc/org.yorba.shotwell.gschema.xml:490
+#: misc/org.yorba.shotwell.gschema.xml:560
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "não enviar etiquetas ao enviar para o Piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:491
+#: misc/org.yorba.shotwell.gschema.xml:561
 msgid ""
 "Whether images being uploaded to Piwigo should have their tags removed on "
 "upload, such that these tags will not appear on the remote Piwigo server."
@@ -971,27 +1022,27 @@ msgstr ""
 "envio, de forma que essas etiquetas não vão aparecer no servidor remoto do "
 "Piwigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:499
+#: misc/org.yorba.shotwell.gschema.xml:569
 msgid "Gallery3 username"
 msgstr "Nome de usuário Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:504
+#: misc/org.yorba.shotwell.gschema.xml:574
 msgid "API key"
 msgstr "Chave de API"
 
-#: misc/org.yorba.shotwell.gschema.xml:505
+#: misc/org.yorba.shotwell.gschema.xml:575
 msgid "Gallery3 API key"
 msgstr "Chave de API Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "URL"
 msgstr "URL"
 
-#: misc/org.yorba.shotwell.gschema.xml:511
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 site URL"
 msgstr "URL do site Gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:523
+#: misc/org.yorba.shotwell.gschema.xml:593
 msgid ""
 "Indicates whether images being uploaded to Gallery3 should have their "
 "metadata removed first"
@@ -999,19 +1050,19 @@ msgstr ""
 "Indica se as imagens sendo enviadas para Gallery3 devem ter seus metadados "
 "removidos primeiro"
 
-#: misc/org.yorba.shotwell.gschema.xml:528
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "scaling constraint of uploaded picture"
 msgstr "restrição de dimensionamento de imagem enviada"
 
-#: misc/org.yorba.shotwell.gschema.xml:529
+#: misc/org.yorba.shotwell.gschema.xml:599
 msgid "The scaling constraint ID of the picture to be uploaded"
 msgstr "O ID de restrição de dimensionamento da imagem a ser enviada"
 
-#: misc/org.yorba.shotwell.gschema.xml:534
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "pixels of the major axis uploaded picture"
 msgstr "pixels do eixo maior da imagem enviada"
 
-#: misc/org.yorba.shotwell.gschema.xml:535
+#: misc/org.yorba.shotwell.gschema.xml:605
 msgid ""
 "The pixels of the major axis of the picture to be uploaded; used only if "
 "scaling-constraint-id is an appropriate value"
@@ -1019,7 +1070,7 @@ msgstr ""
 "Os pixels do eixo maior da imagem a ser enviada; usado apenas se scaling-"
 "constraint-id for um valor apropriado"
 
-#: misc/org.yorba.shotwell.gschema.xml:543
+#: misc/org.yorba.shotwell.gschema.xml:613
 msgid ""
 "The OAuth token used to refresh the YouTube session for the currently logged "
 "in user, if any."
@@ -1027,32 +1078,32 @@ msgstr ""
 "O token Oauth usado para atualizar a sessão do YouTube para o usuário "
 "atualmente autenticado, se houver."
 
-#: misc/org.yorba.shotwell.gschema.xml:550
+#: misc/org.yorba.shotwell.gschema.xml:620
 msgid "last used import service"
 msgstr "último serviço de importação usado"
 
-#: misc/org.yorba.shotwell.gschema.xml:551
+#: misc/org.yorba.shotwell.gschema.xml:621
 msgid ""
 "A numeric code representing the last service from which photos were imported"
 msgstr ""
 "Um código numérico representando o último serviço por meio do qual fotos "
 "foram importadas"
 
-#: misc/org.yorba.shotwell.gschema.xml:558
+#: misc/org.yorba.shotwell.gschema.xml:628
 msgid "interpreter state cookie"
 msgstr "interpretar cookie de estado"
 
-#: misc/org.yorba.shotwell.gschema.xml:559
+#: misc/org.yorba.shotwell.gschema.xml:629
 msgid ""
 "A numeric code that captures the state of the GStreamer plug-in environment"
 msgstr ""
 "Um código de numérico que captura o estado do ambiente do plug-in GStreamer"
 
-#: misc/org.yorba.shotwell.gschema.xml:566
+#: misc/org.yorba.shotwell.gschema.xml:636
 msgid "content layout mode"
 msgstr "modo de layout do conteúdo"
 
-#: misc/org.yorba.shotwell.gschema.xml:567
+#: misc/org.yorba.shotwell.gschema.xml:637
 msgid ""
 "A numeric code that describes how photos are laid out on the page during "
 "printing"
@@ -1060,37 +1111,37 @@ msgstr ""
 "Um código numérico que descreve como fotos são posicionadas na página "
 "durante a impressão"
 
-#: misc/org.yorba.shotwell.gschema.xml:572
+#: misc/org.yorba.shotwell.gschema.xml:642
 msgid "content ppi"
 msgstr "ppi do conteúdo"
 
-#: misc/org.yorba.shotwell.gschema.xml:573
+#: misc/org.yorba.shotwell.gschema.xml:643
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
 msgstr ""
 "O número de pixels por polegada (ppi) enviado para a impressora durante a "
 "impressão"
 
-#: misc/org.yorba.shotwell.gschema.xml:578
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content width"
 msgstr "largura do conteúdo"
 
-#: misc/org.yorba.shotwell.gschema.xml:579
+#: misc/org.yorba.shotwell.gschema.xml:649
 msgid "The width of the printed emulsion on the page when printing"
 msgstr "A largura da emulsão impressa na página ao imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:584
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content height"
 msgstr "altura do conteúdo"
 
-#: misc/org.yorba.shotwell.gschema.xml:585
+#: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The height of the printed emulsion on the page when printing"
 msgstr "A altura da emulsão impressa na página ao imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:590
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content units"
 msgstr "unidades do conteúdo"
 
-#: misc/org.yorba.shotwell.gschema.xml:591
+#: misc/org.yorba.shotwell.gschema.xml:661
 msgid ""
 "A numeric code representing unit of measure (inches or centimeters) used "
 "when printing"
@@ -1098,11 +1149,11 @@ msgstr ""
 "Um código numérico representando unidade de medida (polegadas ou "
 "centímetros) usada ao imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:596
+#: misc/org.yorba.shotwell.gschema.xml:666
 msgid "images per page code"
 msgstr "imagens por código de página"
 
-#: misc/org.yorba.shotwell.gschema.xml:597
+#: misc/org.yorba.shotwell.gschema.xml:667
 msgid ""
 "A numeric code representing the currently selected images per page mode used "
 "when printing"
@@ -1110,22 +1161,22 @@ msgstr ""
 "Um código numérico representando as imagens atualmente selecionadas para "
 "modo de página usada ao imprimir"
 
-#: misc/org.yorba.shotwell.gschema.xml:602
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "size selection"
 msgstr "seleção de tamanho"
 
-#: misc/org.yorba.shotwell.gschema.xml:603
+#: misc/org.yorba.shotwell.gschema.xml:673
 msgid ""
 "The index of the current print size in a pre-defined list of standard sizes"
 msgstr ""
 "O índice do tamanho de impressão atual em uma lista predefinida dos tamanhos "
 "padrão"
 
-#: misc/org.yorba.shotwell.gschema.xml:608
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "match aspect ratio"
 msgstr "correspondência de proporção de aspecto"
 
-#: misc/org.yorba.shotwell.gschema.xml:609
+#: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
 "Determines whether custom print sizes must match the aspect ratio of the "
 "original photo"
@@ -1133,11 +1184,11 @@ msgstr ""
 "Determina se tamanhos de impressão personalizados devem corresponder à "
 "proporção de aspecto da foto original"
 
-#: misc/org.yorba.shotwell.gschema.xml:614
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "print titles"
 msgstr "imprimir títulos"
 
-#: misc/org.yorba.shotwell.gschema.xml:615
+#: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
 "True if the title of a photo should be printed when the photo is printed, "
 "false otherwise."
@@ -1145,213 +1196,213 @@ msgstr ""
 "Verdadeiro se o título de uma foto deveria ser impresso quando a foto é "
 "impressa; do contrário, falso."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "titles font"
 msgstr "fonte dos títulos"
 
-#: misc/org.yorba.shotwell.gschema.xml:621
+#: misc/org.yorba.shotwell.gschema.xml:691
 msgid "The name of the font to use for photo titles when they are printed."
 msgstr "O nome da fonte usada para títulos de fotos quando elas são impressas."
 
-#: misc/org.yorba.shotwell.gschema.xml:632
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "enable facebook publishing plugin"
 msgstr "habilitar plug-in de publicação no facebook"
 
-#: misc/org.yorba.shotwell.gschema.xml:633
+#: misc/org.yorba.shotwell.gschema.xml:703
 msgid "True if the Facebook publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Facebook está habilitado; do "
 "contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:638
+#: misc/org.yorba.shotwell.gschema.xml:708
 msgid "enable flickr publishing plugin"
 msgstr "habilitar plug-in de publicação no flickr"
 
-#: misc/org.yorba.shotwell.gschema.xml:639
+#: misc/org.yorba.shotwell.gschema.xml:709
 msgid "True if the Flickr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Flickr está habilitado; do contrário, "
 "falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:644
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable picasa publishing plugin"
 msgstr "habilitar plug-in de publicação no picasa"
 
-#: misc/org.yorba.shotwell.gschema.xml:645
+#: misc/org.yorba.shotwell.gschema.xml:715
 msgid ""
 "True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Picasa Web Albums está habilitado; do "
 "contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:650
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable youtube publishing plugin"
 msgstr "habilitar plug-in de publicação no youtube"
 
-#: misc/org.yorba.shotwell.gschema.xml:651
+#: misc/org.yorba.shotwell.gschema.xml:721
 msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no YouTube está habilitado; do "
 "contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:656
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable piwigo publishing plugin"
 msgstr "habilitar plug-in de publicação no piwigo"
 
-#: misc/org.yorba.shotwell.gschema.xml:657
+#: misc/org.yorba.shotwell.gschema.xml:727
 msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Piwigo está habilitado; do contrário, "
 "falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:662
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable yandex publishing plugin"
 msgstr "habilitar plug-in de publicação no yandex"
 
-#: misc/org.yorba.shotwell.gschema.xml:663
+#: misc/org.yorba.shotwell.gschema.xml:733
 msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Yandex.Fotki está habilitado; do "
 "contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:668
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable tumblr publishing plugin"
 msgstr "habilitar plug-in de publicação no tumblr"
 
-#: misc/org.yorba.shotwell.gschema.xml:669
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Tumblr está habilitado; do contrário, "
 "falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:674
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable rajce publishing plugin"
 msgstr "habilitar plug-in de publicação no rajce"
 
-#: misc/org.yorba.shotwell.gschema.xml:675
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Rajce está habilitado; do contrário, "
 "falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:680
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable gallery3 publishing plugin"
 msgstr "habilitar plug-in de publicação no gallery3"
 
-#: misc/org.yorba.shotwell.gschema.xml:681
+#: misc/org.yorba.shotwell.gschema.xml:751
 msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de publicação no Gallery3 está habilitado; do "
 "contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:686
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable F-Spot import plugin"
 msgstr "habilitar plug-in de importação do F-Spot"
 
-#: misc/org.yorba.shotwell.gschema.xml:687
+#: misc/org.yorba.shotwell.gschema.xml:757
 msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de importação do F-Spot está habilitado; do contrário, "
 "falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:692
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable slideshow crumble transition"
 msgstr "habilitar transição de desmoronar de apresentação de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:693
+#: misc/org.yorba.shotwell.gschema.xml:763
 msgid ""
 "True if the Crumble slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de desmoronamento de apresentação de "
 "slides está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:698
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable slideshow fade transition"
 msgstr "habilitar transição de esmaecer de apresentação de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:699
+#: misc/org.yorba.shotwell.gschema.xml:769
 msgid ""
 "True if the Fade slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de esmaecimento de apresentação de slides "
 "está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:704
-#: misc/org.yorba.shotwell.gschema.xml:728
+#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow slide transition"
 msgstr "habilitar transição de deslizar de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:705
+#: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
 "True if the Slide slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de deslizamento de apresentação de slides "
 "está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:710
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow clock transition"
 msgstr "habilitar transição de relógio de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:711
+#: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
 "True if the Clock slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de Relógio de apresentação de slides está "
 "habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:716
-#: misc/org.yorba.shotwell.gschema.xml:722
+#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow circle transition"
 msgstr "habilitar transição circular de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:717
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de círculos de apresentação de slides "
 "está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:723
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de Círculos de apresentação de slides "
 "está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:729
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de escurecimento de apresentação de "
 "slides está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:734
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow squares transition"
 msgstr "habilitar transição de quadrado de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:735
+#: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
 "True if the Squares slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de Quadrados de apresentação de slides "
 "está habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:740
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow stripes transition"
 msgstr "habilitar transição de listras de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:741
+#: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
 "True if the Stripes slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Verdadeiro se plug-in de transição de Listras de apresentação de slides está "
 "habilitado; do contrário, falso"
 
-#: misc/org.yorba.shotwell.gschema.xml:746
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow chess transition"
 msgstr "habilitar transição de xadrez de apresentações de slides"
 
-#: misc/org.yorba.shotwell.gschema.xml:747
+#: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
 "True if the Chess-Board slideshow transition plugin is enabled, false "
 "otherwise"
@@ -1363,7 +1414,7 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr "Visitar o site do Shotwell"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:679
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:597
 msgid "translator-credits"
 msgstr ""
 "Djavan Fagundes <djavan@comum.org>\n"
@@ -1380,7 +1431,8 @@ msgstr ""
 #: plugins/common/RESTSupport.vala:202
 msgid ""
 "⚫ This website presented identification that belongs to a different website."
-msgstr "⚫ Este site apresentou identificação que pertence a um site diferente."
+msgstr ""
+"⚫ Este site apresentou identificação que pertence a um site diferente."
 
 #. Possible error message when a site presents a bad certificate.
 #: plugins/common/RESTSupport.vala:207
@@ -1388,22 +1440,23 @@ msgid ""
 "⚫ This website’s identification is too old to trust. Check the date on your "
 "computer’s calendar."
 msgstr ""
-"⚫ A identificação deste site é atinga demais para confiar. Verifique a data "
-"no calendário de seu computador."
+"⚫ A identificação deste site é muito antiga para ser confiável. "
+"Verifique a data no calendário de seu computador."
 
 #. Possible error message when a site presents a bad certificate.
 #: plugins/common/RESTSupport.vala:212
 msgid ""
 "⚫ This website’s identification was not issued by a trusted organization."
 msgstr ""
-"⚫ A identificação deste site não foi emitido por uma organização confiável."
+"⚫ A identificação deste site não foi emitida por uma organização "
+"confiável."
 
 #. Possible error message when a site presents a bad certificate.
 #: plugins/common/RESTSupport.vala:217
 msgid ""
 "⚫ This website’s identification could not be processed. It may be corrupted."
 msgstr ""
-"⚫ A identificação deste site não pôde ser processada. Ela pode estar "
+"⚫ Não foi possível processar a identificação deste site. Ela pode estar "
 "corrompida."
 
 #. Possible error message when a site presents a bad certificate.
@@ -1412,8 +1465,8 @@ msgid ""
 "⚫ This website’s identification has been revoked by the trusted organization "
 "that issued it."
 msgstr ""
-"⚫ A identificação deste site foi revogada pela organização confiável que a "
-"emitiu."
+"⚫ A identificação deste site foi revogada pela organização confiável "
+"que a emitiu."
 
 #. Possible error message when a site presents a bad certificate.
 #: plugins/common/RESTSupport.vala:227
@@ -1421,8 +1474,8 @@ msgid ""
 "⚫ This website’s identification cannot be trusted because it uses very weak "
 "encryption."
 msgstr ""
-"⚫ A identificação deste site não pode ser confiada porque ela usa uma "
-"criptografia muito fraca."
+"⚫ A identificação deste site pode não ser confiável pois ela utiliza uma "
+"codificação muito fraca."
 
 #. Possible error message when a site presents a bad certificate.
 #: plugins/common/RESTSupport.vala:232
@@ -1430,11 +1483,11 @@ msgid ""
 "⚫ This website’s identification is only valid for future dates. Check the "
 "date on your computer’s calendar."
 msgstr ""
-"⚫ A identificação deste site é válida apenas para datas futuras. Verifique a "
-"data no calendário de seu computador."
+"⚫ A identificação deste site somente é válida para datas futuras. Por "
+"favor, verifique a data no calendário do seu computador."
 
 #: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Um arquivo temporário necessário para a publicação não está disponível"
 
@@ -1555,7 +1608,7 @@ msgstr "_Voltar"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1627
+#: ui/shotwell.ui:1630
 msgid "_Log in"
 msgstr "A_utenticar"
 
@@ -1581,9 +1634,9 @@ msgstr "ou"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
 #: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:115
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:142
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229
@@ -1593,13 +1646,14 @@ msgstr "_Sair"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
 #: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:129
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:156
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2456
 msgid "_Publish"
 msgstr "_Publicar"
 
@@ -1627,7 +1681,7 @@ msgstr "pixels"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1329
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Tamanho original"
@@ -1730,51 +1784,50 @@ msgstr "Usuário não reconhecido"
 msgid " Site Not Found"
 msgstr " Site não encontrado"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:49
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:43
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:49
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:43
 msgid "_Email address"
 msgstr "_Endereço de e-mail"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:59
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:53
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:59
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:73
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:53
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr "_Senha"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:103
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:97
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "Lemb_rar"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:125
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:118
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:101
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
 msgid "Log in"
 msgstr "Autenticar"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
 msgid "An _existing album:"
 msgstr "Um álbum _existente:"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:52
 msgid "A _new album named:"
 msgstr "Um _novo álbum chamado:"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1005
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
 msgid "_Hide album"
 msgstr "_Ocultar álbum"
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "_Abrir álbum alvo no navegador"
 
@@ -1799,14 +1852,14 @@ msgstr "E-mail e/ou senha inválida. Por favor, tente novamente"
 msgid "Invalid User Email or Password"
 msgstr "E-mail de usuário ou senha inválidos"
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1012
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
 msgid "You are logged into Rajce as %s."
 msgstr "Você está autenticado no Rajce como %s."
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
 #: plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:24
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
 msgid "Photos will appear in:"
 msgstr "As fotos irão aparecer em:"
 
@@ -1829,13 +1882,13 @@ msgstr "Copyright 2012 BJA Electronics"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1325
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
 msgid "500 × 375 pixels"
-msgstr "500 x 375 pixels"
+msgstr "500 × 375 pixels"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1326
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr "1024 × 768 pixels"
 
@@ -1860,22 +1913,22 @@ msgid "Enter the username and password associated with your Tumblr account."
 msgstr "Digite o nome de usuário e senha associados à sua conta Tumblr."
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1087
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
 msgid "Username and/or password invalid. Please try again"
 msgstr "Nome de usuário e/ou senha inválida. Por favor, tente novamente"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1121
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
 msgid "Invalid User Name or Password"
 msgstr "Usuário ou senha inválida"
 
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:634
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:752
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
 #, c-format
 msgid "Could not load UI: %s"
 msgstr "Não foi possível carregar a interface gráfica: %s"
 
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:734
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
 #, c-format
 msgid ""
 "You are logged into Tumblr as %s.\n"
@@ -1896,36 +1949,36 @@ msgstr "Visite o site do Yandex.Fotki"
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Você não está atualmente autenticado em Yandex.Fotki."
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Público"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
+msgid "Friends"
+msgstr "Amigos"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:498
+msgid "Private"
+msgstr "Privado"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:44
 msgid "_Albums (or write new):"
 msgstr "Á_lbuns (ou gravar novo):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:59
 msgid "Access _type:"
 msgstr "_Tipo de acesso:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:103
 msgid "Disable _comments"
 msgstr "Desabilitar _comentários"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:120
 msgid "_Forbid downloading original photo"
 msgstr "Proibir o _download da foto original"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-msgid "Public"
-msgstr "Público"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
-msgid "Friends"
-msgstr "Amigos"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
-msgstr "Privado"
-
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
 msgid "Publish to an e_xisting album:"
 msgstr "Publicar em um álbum e_xistente:"
@@ -1946,7 +1999,7 @@ msgstr "Vídeos e álbuns de fotos novos _visível para:"
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:226
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr ""
@@ -1955,7 +2008,7 @@ msgstr ""
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:62
 #: plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1209
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr "Conexão do Shotwell"
 
@@ -2031,7 +2084,7 @@ msgstr "Somente para mim"
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1145
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1313
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Todos"
 
@@ -2060,8 +2113,8 @@ msgid ""
 msgstr ""
 "Você não está conectado no Flickr.\n"
 "\n"
-"Clique em Login para entrar no Flickr no seu navegador de internet. Você "
-"terá que autorizar o Shotwell para conectar a sua conta do Flickr."
+"Clique em Autenticar para entrar no Flickr no seu navegador de internet. "
+"Você terá que autorizar o Shotwell para conectar a sua conta do Flickr."
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:62
 msgid ""
@@ -2143,12 +2196,12 @@ msgid "Friends only"
 msgstr "Somente amigos"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1327
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 pixels"
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1328
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 pixels"
 
@@ -2169,8 +2222,8 @@ msgid ""
 msgstr ""
 "Você não está autenticado no Picasa Web Albums.\n"
 "\n"
-"Clique em Login para entrar no Picasa Web Albums em seu navegador. Você terá "
-"que autorizar a conexão do Shotwell à sua conta Picasa Web Albums."
+"Clique em Autenticar para entrar no Picasa Web Albums em seu navegador. Você "
+"terá que autorizar a conexão do Shotwell à sua conta Picasa Web Albums."
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:361
 msgid ""
@@ -2207,83 +2260,97 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 pixels)"
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:755
 msgid "Original Size"
 msgstr "Tamanho original"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
 msgid "_URL of your Piwigo photo library"
 msgstr "_URL da sua biblioteca de fotos Piwigo"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
 msgid "User _name"
 msgstr "_Nome do usuário"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
-msgid "_Remember Password"
-msgstr "Lemb_rar senha"
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+msgid "Remember Password"
+msgstr "Lembrar da senha"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
-msgid "An _existing category:"
-msgstr "Uma categoria _existente:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+msgid "An _existing category"
+msgstr "Uma categoria _existente"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
-msgid "Photos will be _visible by:"
-msgstr "As fotos estarão _visíveis por:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+msgid "A _new album named"
+msgstr "Um _novo álbum chamado"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
-msgid "Photo size:"
-msgstr "Tamanho da foto:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+msgid "within category"
+msgstr "com categoria"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
-msgid "within category:"
-msgstr "com categoria:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr "Comentário do álbum"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
-msgid "Album comment:"
-msgstr "Comentário do álbum:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+msgid "Photos will be _visible by"
+msgstr "As fotos estarão _visíveis por"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr "Tamanho da foto"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
 msgid "_If a title is set and comment unset, use title as comment"
 msgstr ""
 "_Se um título for definido e comentário não for, use título como comentário"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
 msgid "_Do no upload tags"
 msgstr "_Não enviar etiquetas"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
 msgid "Logout"
 msgstr "Encerrar sessão"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291
-#: src/Resources.vala:295
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:295 ui/collection.ui:190
 msgid "Publish"
 msgstr "Publicar"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:775
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
 msgid "Creating album %s…"
 msgstr "Criando álbum %s…"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:948
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr ""
 "Ocorreu uma mensagem de erro ao publicar o Piwigo. Por favor tente novamente."
 
 #. %s is the host name that we tried to connect to
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1024
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1030
 #, c-format
 msgid ""
 "This does not look like the real <b>%s</b>. Attackers might be trying to "
 "steal or alter information going to or from this site (for example, private "
 "messages, credit card information, or passwords)."
 msgstr ""
-"Esse não se parece com o <b>%s</b> real. Atacantes podem estar tentando "
-"roubar ou alterar informações indo para ou vindo de este site (por exemplo, "
-"mensagens privadas, informações de cartões de crédito ou senhas)."
+"Este não parece ser o <b>%s</b> real. Atacantes podem estar tentando roubar "
+"ou alterar informações indo para ou vindo deste site (por exemplo, mensagens "
+"privadas, informações de cartões de crédito ou senhas)."
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "Certificado de %s"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:166
+msgid "_OK"
+msgstr "_OK"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1085
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
@@ -2291,7 +2358,7 @@ msgstr ""
 "Digite a URL de sua biblioteca de fotos Piwigo, bem como o nome de usuário e "
 "senha associados à sua conta Piwigo para essa biblioteca."
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1086
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
@@ -2299,23 +2366,23 @@ msgstr ""
 "Shotwell não pode acessar sua biblioteca de fotos Piwigo. Por favor, "
 "verifique a URL digitada"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1116
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "URL inválida"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1314
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Administradores, Família, Amigos, Contatos"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1315
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Administradores, Família, Amigos"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1316
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "Administradores, Família"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1317
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Administradores"
 
@@ -2329,7 +2396,7 @@ msgstr "Mostrar o certificado…"
 
 #: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
 msgid "I understand, please _proceed."
-msgstr "Eu entendo, por favor _prosseguir."
+msgstr "Eu entendo, por favor prosseguir."
 
 #: plugins/shotwell-publishing/shotwell-publishing.vala:26
 msgid "Core Publishing Services"
@@ -2359,7 +2426,7 @@ msgid ""
 "continue."
 msgstr ""
 "O arquivo necessário para a publicação não está disponível. A publicação "
-"para o Youtube não pode continuar."
+"para o YouTube não pode continuar."
 
 #: plugins/shotwell-publishing/YouTubePublishing.vala:462
 #, c-format
@@ -2466,38 +2533,28 @@ msgstr "Não foi possível tornar o diretório %s gravável"
 msgid "Could not make directory %s writable: %s"
 msgstr "Não foi possível tornar o diretório %s gravável: %s"
 
-#: src/AppWindow.vala:54
+#: src/AppWindow.vala:45
 msgid "Pin Toolbar"
 msgstr "Fixar a barra de ferramentas"
 
-#: src/AppWindow.vala:55
+#: src/AppWindow.vala:46
 msgid "Pin the toolbar open"
 msgstr "Fixar a barra de ferramentas aberta"
 
-#: src/AppWindow.vala:60
+#: src/AppWindow.vala:51
 msgid "Leave fullscreen"
 msgstr "Sai da tela cheia"
 
-#: src/AppWindow.vala:499
-msgid "_Contents"
-msgstr "_Conteúdo"
-
-#: src/AppWindow.vala:504
-msgid "_Frequently Asked Questions"
-msgstr "Perguntas _frequentes (FAQ)"
-
-#: src/AppWindow.vala:509
-msgid "_Report a Problem…"
-msgstr "_Relate um problema…"
-
-#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
-#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1421 src/Dialogs.vala:1444
-#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
+#: src/AppWindow.vala:526 src/AppWindow.vala:547 src/AppWindow.vala:564
+#: src/data_imports/DataImportsUI.vala:301
+#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1430 src/Dialogs.vala:1453
+#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
+#: src/Resources.vala:157
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/AppWindow.vala:656
+#: src/AppWindow.vala:574
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2510,21 +2567,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:676
+#: src/AppWindow.vala:594
 msgid "Visit the Shotwell web site"
 msgstr "Visitar o página web do Shotwell"
 
-#: src/AppWindow.vala:688
+#: src/AppWindow.vala:606
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Não foi possível exibir a ajuda: %s"
 
-#: src/AppWindow.vala:696
+#: src/AppWindow.vala:614
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Não foi possível navegar no banco de dados de bugs: %s"
 
-#: src/AppWindow.vala:704
+#: src/AppWindow.vala:622
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Não foi possível exibir FAQ: %s"
@@ -2595,8 +2652,9 @@ msgid "Cameras"
 msgstr "Câmeras"
 
 #: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/MediaPage.vala:440
-#: src/photos/RawSupport.vala:303
+#: src/camera/ImportPage.vala:726 src/photos/RawSupport.vala:303
+#: ui/collection.ui:90 ui/event.ui:359 ui/event.ui:527 ui/media.ui:359
+#: ui/photo_context.ui:96 ui/photo.ui:349 ui/tags.ui:359
 msgid "Camera"
 msgstr "Câmera"
 
@@ -2628,32 +2686,8 @@ msgstr "A câmera parece está vazia. Não há fotos ou vídeos para importar"
 msgid "No new photos/videos found on camera"
 msgstr "Sem fotos/vídeos na câmera"
 
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451
-msgid "_Titles"
-msgstr "_Títulos"
-
-#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452
-msgid "Display the title of each photo"
-msgstr "Exibe o título de cada foto"
-
-#: src/camera/ImportPage.vala:885
-msgid "Import _Selected"
-msgstr "Importar _selecionadas"
-
-#: src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr "Importar as fotos selecionadas para a sua biblioteca"
-
-#: src/camera/ImportPage.vala:891
-msgid "Import _All"
-msgstr "Importar _todas"
-
-#: src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr "Importar todas as fotos para sua biblioteca"
-
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1013
+#: src/camera/ImportPage.vala:999
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2661,15 +2695,15 @@ msgstr ""
 "Shotwell precisa desmontar a câmera do sistema de arquivos para acessá-la. "
 "Continuar?"
 
-#: src/camera/ImportPage.vala:1019
+#: src/camera/ImportPage.vala:1005
 msgid "_Unmount"
 msgstr "_Desmontar"
 
-#: src/camera/ImportPage.vala:1024
+#: src/camera/ImportPage.vala:1010
 msgid "Please unmount the camera."
 msgstr "Por favor, desmonte a câmera."
 
-#: src/camera/ImportPage.vala:1029
+#: src/camera/ImportPage.vala:1015
 msgid ""
 "The camera is locked by another application. Shotwell can only access the "
 "camera when it’s unlocked. Please close any other application using the "
@@ -2679,12 +2713,12 @@ msgstr ""
 "a câmera quando ela está destravada. Por favor, feche qualquer outro "
 "aplicativo que estiver usando a câmera e tente novamente."
 
-#: src/camera/ImportPage.vala:1039
+#: src/camera/ImportPage.vala:1025
 msgid "Please close any other application using the camera."
 msgstr ""
 "Por favor, encerre qualquer outro aplicativo que esteja usando a câmera."
 
-#: src/camera/ImportPage.vala:1044
+#: src/camera/ImportPage.vala:1030
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2693,116 +2727,192 @@ msgstr ""
 "Não foi possível obter pré-visualizações da câmera:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1061
+#: src/camera/ImportPage.vala:1047
 msgid "Unmounting…"
 msgstr "Desmontando…"
 
-#: src/camera/ImportPage.vala:1152
+#: src/camera/ImportPage.vala:1138
 msgid "Starting import, please wait…"
 msgstr "Iniciando importação, por favor, aguarde…"
 
-#: src/camera/ImportPage.vala:1169
+#: src/camera/ImportPage.vala:1155
 msgid "Fetching photo information"
 msgstr "Obtendo informação da foto"
 
-#: src/camera/ImportPage.vala:1527
+#: src/camera/ImportPage.vala:1513
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Obtendo visualização para %s"
 
-#: src/camera/ImportPage.vala:1643
+#: src/camera/ImportPage.vala:1629
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Não foi possível travar a câmera: %s"
 
-#: src/camera/ImportPage.vala:1728
+#: src/camera/ImportPage.vala:1714
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Apagar essa foto da câmera?"
 msgstr[1] "Apagar essas %d fotos da câmera?"
 
-#: src/camera/ImportPage.vala:1731
+#: src/camera/ImportPage.vala:1717
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Apagar esse vídeo da câmera?"
 msgstr[1] "Apagar esses %d vídeos da câmera?"
 
-#: src/camera/ImportPage.vala:1734
+#: src/camera/ImportPage.vala:1720
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "Excluir essa foto/vídeo da câmera?"
 msgstr[1] "Excluir essas %d fotos/vídeos da câmera?"
 
-#: src/camera/ImportPage.vala:1737
+#: src/camera/ImportPage.vala:1723
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Apagar esse arquivo da câmera?"
 msgstr[1] "Apagar esses %d arquivos da câmera?"
 
-#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1388
+#: src/camera/ImportPage.vala:1731 src/Dialogs.vala:1397
 msgid "_Keep"
 msgstr "_Manter"
 
-#: src/camera/ImportPage.vala:1764
+#: src/camera/ImportPage.vala:1750
 msgid "Removing photos/videos from camera"
 msgstr "Excluindo fotos/vídeos da câmera"
 
-#: src/camera/ImportPage.vala:1768
+#: src/camera/ImportPage.vala:1754
 #, c-format
 msgid "Unable to delete %d photo/video from the camera due to errors."
 msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
 msgstr[0] "Não foi possível excluir %d foto/vídeo da câmera devido a erros."
 msgstr[1] "Não foi possível excluir %d fotos/vídeos da câmera devido a erros."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635
+#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:78
+#: src/PhotoPage.vala:2451 src/Resources.vala:170
+msgid "_Print"
+msgstr "Im_primir"
+
+#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
+#: ui/direct_context.ui:26 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28
+msgid "Send _To…"
+msgstr "Enviar _para…"
+
+#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:83
+#: src/PhotoPage.vala:2461 src/Resources.vala:220
+msgid "Set as _Desktop Background"
+msgstr "Definir como _plano de fundo da área de trabalho"
+
+#: src/CollectionPage.vala:86 src/Resources.vala:286
+msgid "_Duplicate"
+msgstr "_Duplicar"
+
+#: src/CollectionPage.vala:94
+msgid "Fullscreen"
+msgstr "Tela cheia"
+
+#: src/CollectionPage.vala:96 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "Apresentação de s_lides"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636
-msgid "Play a slideshow"
-msgstr "Exibir apresentação de slides"
+#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "Girar à _direita"
+
+#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "Girar à _esquerda"
+
+#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Inverter hori_zontalmente"
+
+#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "Inverter verti_calmente"
+
+#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8
+#: ui/direct_context.ui:10 ui/direct.ui:134 ui/event.ui:445
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "_Melhorar"
+
+#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
+#: ui/direct_context.ui:15 ui/direct.ui:161 ui/event.ui:450
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "Re_verter para o original"
+
+#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "_Copiar ajustes de cor"
+
+#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "C_olar ajustes de cor"
+
+#: src/CollectionPage.vala:129
+msgid "Adjust Date and Time…"
+msgstr "Ajustar a data e hora…"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:137 src/Resources.vala:319
+msgid "Open With E_xternal Editor"
+msgstr "Abrir com o editor e_xterno"
+
+#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
+#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363
+msgid "Open With RA_W Editor"
+msgstr "Abrir com editor de RA_W"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:167
+msgid "_Play"
+msgstr "_Reproduzir"
+
+#: src/CollectionPage.vala:399
 msgid "Export Photo/Video"
 msgstr "Exportar foto/vídeo"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:399
 msgid "Export Photos/Videos"
 msgstr "Exportar fotos/vídeos"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209
+#: src/CollectionPage.vala:401 src/Dialogs.vala:59 src/PhotoPage.vala:2988
 msgid "Export Photo"
 msgstr "Exportar fotos"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:84
+#: src/CollectionPage.vala:401 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Exportar fotos"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:488 src/CollectionPage.vala:504
 msgid "Rotating"
 msgstr "Girando"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:488 src/CollectionPage.vala:504
 msgid "Undoing Rotate"
 msgstr "Desfazendo rotação"
 
-#: src/CollectionPage.vala:570
+#: src/CollectionPage.vala:513
 msgid "Flipping Horizontally"
 msgstr "Invertendo horizontalmente"
 
-#: src/CollectionPage.vala:571
+#: src/CollectionPage.vala:514
 msgid "Undoing Flip Horizontally"
 msgstr "Desfazendo inversão horizontal"
 
-#: src/CollectionPage.vala:580
+#: src/CollectionPage.vala:523
 msgid "Flipping Vertically"
 msgstr "Invertendo verticalmente"
 
-#: src/CollectionPage.vala:581
+#: src/CollectionPage.vala:524
 msgid "Undoing Flip Vertically"
 msgstr "Desfazendo inversão vertical"
 
@@ -3016,7 +3126,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Arquivo de banco de dados:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:766
 msgid "_Import"
 msgstr "Parar _importação"
 
@@ -3028,7 +3138,7 @@ msgstr "Importação de aplicativo"
 msgid "Import media _from:"
 msgstr "Impo_rtação de mídia de:"
 
-#: src/data_imports/DataImportsUI.vala:408 src/publishing/PublishingUI.vala:507
+#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
 msgid "_Close"
 msgstr "Fe_char"
 
@@ -3066,7 +3176,7 @@ msgstr ""
 "O erro foi: \n"
 "%s"
 
-#: src/db/DatabaseTable.vala:88
+#: src/db/DatabaseTable.vala:92
 #, c-format
 msgid "Unable to restore photo database %s"
 msgstr "Não foi possível restaurar o banco de dados de fotos %s"
@@ -3098,9 +3208,10 @@ msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] "Isto irá remover a etiqueta “%s” de uma foto. Continuar?"
 msgstr[1] "Isto irá remover a etiqueta “%s” de %d fotos. Continuar?"
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1389
-#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409
-#: src/Resources.vala:674
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1398
+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
+#: src/Resources.vala:658 ui/savedsearch.ui:16 ui/trash.ui:63 ui/trash.ui:216
+#: ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Apagar"
 
@@ -3175,51 +3286,51 @@ msgid "Current"
 msgstr "Atual"
 
 #. layout controls
-#: src/Dialogs.vala:212
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "_Formato:"
 
-#: src/Dialogs.vala:215
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "_Qualidade:"
 
-#: src/Dialogs.vala:218
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "Re_strição de dimensionamento:"
 
-#: src/Dialogs.vala:221
+#: src/Dialogs.vala:230
 msgid "_Pixels:"
 msgstr "_Pixels:"
 
-#: src/Dialogs.vala:224
-msgid "Export metadata"
-msgstr "Exportar metadados"
+#: src/Dialogs.vala:234
+msgid "Export _metadata:"
+msgstr "Exportar _metadados:"
 
-#: src/Dialogs.vala:458
+#: src/Dialogs.vala:478
 msgid "Save Details…"
 msgstr "Salvar detalhes…"
 
-#: src/Dialogs.vala:459
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "Salvar Detalhes"
 
-#: src/Dialogs.vala:474
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(e %d outras)\n"
 
-#: src/Dialogs.vala:527
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "Importar Formulários de Resultados"
 
-#: src/Dialogs.vala:531
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "Tentada a importação de %d arquivo."
 msgstr[1] "Tentada a importação de %d arquivos."
 
-#: src/Dialogs.vala:534
+#: src/Dialogs.vala:554
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3229,30 +3340,30 @@ msgstr[1] "Dessa tentativa, %d arquivos foram importados com sucesso."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:546
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Duplicar Fotos/Vídeos Não importados:"
 
-#: src/Dialogs.vala:550
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
 msgstr "duplica itens de mídia existentes"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: src/Dialogs.vala:561
+#: src/Dialogs.vala:581
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "As Fotos/Vídeos não forma Importadas devido à erros com a Câmera:"
 
-#: src/Dialogs.vala:564 src/Dialogs.vala:579 src/Dialogs.vala:594
-#: src/Dialogs.vala:610 src/Dialogs.vala:625 src/Dialogs.vala:639
+#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
+#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
 msgid "error message:"
 msgstr "mensagem de erro:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:575
+#: src/Dialogs.vala:595
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 "Arquivos não foram importados porque não foram reconhecidos como Fotos ou "
@@ -3261,7 +3372,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:590
+#: src/Dialogs.vala:610
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3272,7 +3383,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:605
+#: src/Dialogs.vala:625
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
@@ -3280,7 +3391,7 @@ msgstr ""
 "As Fotos/Vídeos não foram importadas pois o Shotwell não pôde copiá-las para "
 "sua Biblioteca:"
 
-#: src/Dialogs.vala:609
+#: src/Dialogs.vala:629
 #, c-format
 msgid ""
 "couldn’t copy %s\n"
@@ -3292,39 +3403,39 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:621
+#: src/Dialogs.vala:641
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Fotos/Vídeos não importados porque os arquivos estão corrompidos:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:636
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "As Fotos/Vídeos não foram importadas por outras razões:"
 
-#: src/Dialogs.vala:656
+#: src/Dialogs.vala:676
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "1 foto duplicada não foi importada:\n"
 msgstr[1] "%d fotos duplicadas não foram importadas:\n"
 
-#: src/Dialogs.vala:659
+#: src/Dialogs.vala:679
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "1 vídeo duplicado não foi importado:\n"
 msgstr[1] "%d vídeos duplicados não foram importados:\n"
 
-#: src/Dialogs.vala:662
+#: src/Dialogs.vala:682
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "1 foto/vídeo duplicado não foi importado:\n"
 msgstr[1] "%d fotos/vídeos duplicados não foram importados:\n"
 
-#: src/Dialogs.vala:676
+#: src/Dialogs.vala:696
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
@@ -3334,7 +3445,7 @@ msgstr[1] ""
 "%d fotos falharam ao serem importadas, ocorreu um erro de arquivo ou de "
 "hardware:\n"
 
-#: src/Dialogs.vala:679
+#: src/Dialogs.vala:699
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
@@ -3344,7 +3455,7 @@ msgstr[1] ""
 "%d vídeos falharam ao serem importados devido a um erro de arquivo ou "
 "hardware:\n"
 
-#: src/Dialogs.vala:682
+#: src/Dialogs.vala:702
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -3356,7 +3467,7 @@ msgstr[1] ""
 "%d fotos/vídeos falharam ao serem importados devido a um erro de arquivo ou "
 "hardware:\n"
 
-#: src/Dialogs.vala:685
+#: src/Dialogs.vala:705
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
@@ -3366,7 +3477,7 @@ msgstr[1] ""
 "%d arquivos falharam ao serem importados devido a um erro de arquivo ou "
 "hardware:\n"
 
-#: src/Dialogs.vala:699
+#: src/Dialogs.vala:719
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -3380,7 +3491,7 @@ msgstr[1] ""
 "%d fotos falharam ao serem importadas pelo fato da pasta de biblioteca de "
 "fotos não ser gravável:\n"
 
-#: src/Dialogs.vala:702
+#: src/Dialogs.vala:722
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -3394,7 +3505,7 @@ msgstr[1] ""
 "%d vídeos falharam ao serem importados pelo fato da pasta de biblioteca de "
 "fotos não ser gravável:\n"
 
-#: src/Dialogs.vala:705
+#: src/Dialogs.vala:725
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -3409,7 +3520,7 @@ msgstr[1] ""
 "%d fotos/vídeos falharam ao serem importados pelo fato da pasta de "
 "biblioteca de fotos não ser gravável:\n"
 
-#: src/Dialogs.vala:708
+#: src/Dialogs.vala:728
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -3423,14 +3534,14 @@ msgstr[1] ""
 "%d arquivos falharam ao serem importados pelo fato da pasta de biblioteca de "
 "fotos não ser gravável:\n"
 
-#: src/Dialogs.vala:722
+#: src/Dialogs.vala:742
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] "1 foto falhou ao ser importada, ocorreu um erro de câmera:\n"
 msgstr[1] "%d fotos falharam ao serem importadas, ocorreu um erro de câmera:\n"
 
-#: src/Dialogs.vala:725
+#: src/Dialogs.vala:745
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
@@ -3438,7 +3549,7 @@ msgstr[0] "1 vídeo falhou ao ser importado devido a um erro da câmera:\n"
 msgstr[1] ""
 "%d vídeos falharam ao serem importados devido a um erro da câmera:\n"
 
-#: src/Dialogs.vala:728
+#: src/Dialogs.vala:748
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
@@ -3446,7 +3557,7 @@ msgstr[0] "1 foto/vídeo falhou ao ser importado devido a um erro da câmera:\n"
 msgstr[1] ""
 "%d fotos/vídeos falharam ao serem importados devido a um erro da câmera:\n"
 
-#: src/Dialogs.vala:731
+#: src/Dialogs.vala:751
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
@@ -3454,21 +3565,21 @@ msgstr[0] "1 arquivo falhou ao ser importado devido a um erro da câmera:\n"
 msgstr[1] ""
 "%d arquivos falharam ao serem importados devido a um erro da câmera:\n"
 
-#: src/Dialogs.vala:745
+#: src/Dialogs.vala:765
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
 msgstr[0] "1 foto falhou na importação porque estava corrompida:\n"
 msgstr[1] "%d fotos falharam na importação porque estavam corrompidas:\n"
 
-#: src/Dialogs.vala:748
+#: src/Dialogs.vala:768
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
 msgstr[0] "1 vídeo falhou na importação porque estava corrompido:\n"
 msgstr[1] "%d vídeos falharam na importação porque estavam corrompidos:\n"
 
-#: src/Dialogs.vala:751
+#: src/Dialogs.vala:771
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
@@ -3476,7 +3587,7 @@ msgstr[0] "1 foto/vídeo falhou na importação porque estava corrompido(a):\n"
 msgstr[1] ""
 "%d vídeos/fotos falharam na importação porque estavam corrompidos:\n"
 
-#: src/Dialogs.vala:754
+#: src/Dialogs.vala:774
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -3487,7 +3598,7 @@ msgstr[1] "%d arquivos falharam na importação porque estavam corrompidos:\n"
 #. standard container formats are supported, it's just that the streams in them
 #. might or might not be interpretable), so this message does not need to be
 #. media specific
-#: src/Dialogs.vala:771
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3496,56 +3607,56 @@ msgstr[1] "%d fotos sem suporte foram puladas:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: src/Dialogs.vala:786
+#: src/Dialogs.vala:806
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "Pulando um arquivo não-imagem.\n"
 msgstr[1] "Pulando %d arquivos não-imagem.\n"
 
-#: src/Dialogs.vala:797
+#: src/Dialogs.vala:817
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "1 foto pulada pelo cancelamento do usuário:\n"
 msgstr[1] "%d fotos puladas pelo cancelamento do usuário:\n"
 
-#: src/Dialogs.vala:800
+#: src/Dialogs.vala:820
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "1 vídeo ignorado por cancelamento do usuário:\n"
 msgstr[1] "%d vídeos ignorados por cancelamento do usuário:\n"
 
-#: src/Dialogs.vala:803
+#: src/Dialogs.vala:823
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] "1 foto/vídeo ignorado por cancelamento do usuário:\n"
 msgstr[1] "%d fotos/vídeos ignorados por cancelamento do usuário:\n"
 
-#: src/Dialogs.vala:806
+#: src/Dialogs.vala:826
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "1 arquivo ignorado por cancelamento do usuário:\n"
 msgstr[1] "%d arquivos ignorados por cancelamento do usuário:\n"
 
-#: src/Dialogs.vala:820
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "1 foto foi importada com sucesso.\n"
 msgstr[1] "%d fotos foram importadas com sucesso.\n"
 
-#: src/Dialogs.vala:823
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "1 vídeo importado com sucesso.\n"
 msgstr[1] "%d vídeos importados com sucesso.\n"
 
-#: src/Dialogs.vala:826
+#: src/Dialogs.vala:846
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3554,89 +3665,89 @@ msgstr[1] "%d fotos/vídeos importados com sucesso.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: src/Dialogs.vala:842
+#: src/Dialogs.vala:862
 msgid "No photos or videos imported.\n"
 msgstr "Sem fotos ou vídeos importados.\n"
 
-#: src/Dialogs.vala:849 src/Dialogs.vala:868
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "Importação concluída"
 
-#: src/Dialogs.vala:1154
+#: src/Dialogs.vala:1174
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: src/Dialogs.vala:1157
+#: src/Dialogs.vala:1177
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutes"
 
-#: src/Dialogs.vala:1161
+#: src/Dialogs.vala:1181
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: src/Dialogs.vala:1164
+#: src/Dialogs.vala:1184
 msgid "1 day"
 msgstr "1 dia"
 
-#: src/Dialogs.vala:1318 src/Resources.vala:231
+#: src/Dialogs.vala:1327 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Renomear evento"
 
-#: src/Dialogs.vala:1318
+#: src/Dialogs.vala:1327
 msgid "Name:"
 msgstr "Nome:"
 
 #. Dialog title
-#: src/Dialogs.vala:1329
+#: src/Dialogs.vala:1338
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Editar título"
 
-#: src/Dialogs.vala:1330 src/Properties.vala:340
+#: src/Dialogs.vala:1339 src/Properties.vala:340
 msgid "Title:"
 msgstr "Título:"
 
 #. Dialog title
-#: src/Dialogs.vala:1346 src/Resources.vala:307
+#: src/Dialogs.vala:1355 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Editar comentário de evento"
 
-#: src/Dialogs.vala:1347
+#: src/Dialogs.vala:1356
 msgid "Edit Photo/Video Comment"
 msgstr "Editar comentário de foto/vídeo"
 
-#: src/Dialogs.vala:1348 src/Properties.vala:628
+#: src/Dialogs.vala:1357 src/Properties.vala:628
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: src/Dialogs.vala:1364
+#: src/Dialogs.vala:1373
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Remover e _apagar arquivo"
 msgstr[1] "Remover e _apagar arquivos"
 
-#: src/Dialogs.vala:1368
+#: src/Dialogs.vala:1377
 msgid "_Remove From Library"
 msgstr "_Remover da biblioteca"
 
-#: src/Dialogs.vala:1411
+#: src/Dialogs.vala:1420
 msgid "Revert External Edit?"
 msgstr "Reverter edição externa?"
 
-#: src/Dialogs.vala:1411
+#: src/Dialogs.vala:1420
 msgid "Revert External Edits?"
 msgstr "Reverter edições externas?"
 
-#: src/Dialogs.vala:1413
+#: src/Dialogs.vala:1422
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3648,87 +3759,83 @@ msgstr[1] ""
 "Isto irá destruir todas as alterações feitas para %d arquivos externos. "
 "Continuar?"
 
-#: src/Dialogs.vala:1417
+#: src/Dialogs.vala:1426
 msgid "Re_vert External Edit"
 msgstr "Re_verter edição externa"
 
-#: src/Dialogs.vala:1417
+#: src/Dialogs.vala:1426
 msgid "Re_vert External Edits"
 msgstr "Re_verter edições externas"
 
-#: src/Dialogs.vala:1438
+#: src/Dialogs.vala:1447
 #, c-format
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
 msgstr[0] "Isto irá remover a foto da biblioteca. Continuar?"
 msgstr[1] "Isto irá remover %d fotos da biblioteca. Continuar?"
 
-#: src/Dialogs.vala:1445 src/Resources.vala:173
+#: src/Dialogs.vala:1454 src/Resources.vala:173
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/Dialogs.vala:1446
+#: src/Dialogs.vala:1455
 msgid "Remove Photo From Library"
 msgstr "Remover fotos da biblioteca"
 
-#: src/Dialogs.vala:1446
+#: src/Dialogs.vala:1455
 msgid "Remove Photos From Library"
 msgstr "Remover fotos da biblioteca"
 
-#: src/Dialogs.vala:1539
+#: src/Dialogs.vala:1553
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1693
+#: src/Dialogs.vala:1707
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1694
+#: src/Dialogs.vala:1708
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1695
+#: src/Dialogs.vala:1709
 msgid "24 Hr"
 msgstr "24 Hr"
 
-#: src/Dialogs.vala:1710
+#: src/Dialogs.vala:1724
 msgid "_Shift photos/videos by the same amount"
 msgstr "De_slocar fotos/vídeos pelo mesmo montante"
 
-#: src/Dialogs.vala:1715
+#: src/Dialogs.vala:1729
 msgid "Set _all photos/videos to this time"
 msgstr "Definir tod_as fotos/vídeos para a mesma hora"
 
-#: src/Dialogs.vala:1722
+#: src/Dialogs.vala:1735
 msgid "_Modify original photo file"
-msgstr "_Modificar arquivo original da foto"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Modificar arquivo original da foto"
+msgstr[1] "_Modificar arquivos originais da foto"
 
-#: src/Dialogs.vala:1722
-msgid "_Modify original photo files"
-msgstr "_Modificar arquivos originais da foto"
-
-#: src/Dialogs.vala:1725
+#: src/Dialogs.vala:1739
 msgid "_Modify original file"
-msgstr "_Modificar originais"
-
-#: src/Dialogs.vala:1725
-msgid "_Modify original files"
-msgstr "_Modificar arquivos originais"
+msgid_plural "_Modify original files"
+msgstr[0] "_Modificar original"
+msgstr[1] "_Modificar originais"
 
-#: src/Dialogs.vala:1811
+#: src/Dialogs.vala:1827
 msgid "Original: "
 msgstr "Original: "
 
-#: src/Dialogs.vala:1812
+#: src/Dialogs.vala:1828
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1813
+#: src/Dialogs.vala:1829
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%m/%Y, %I:%M:%S %p"
 
-#: src/Dialogs.vala:1902
+#: src/Dialogs.vala:1918
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3737,7 +3844,7 @@ msgstr ""
 "O tempo de exposição irá ser mudado para frente, por\n"
 "%d %s, %d %s, %d %s, e %d %s."
 
-#: src/Dialogs.vala:1903
+#: src/Dialogs.vala:1919
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3746,31 +3853,31 @@ msgstr ""
 "O tempo de exposição irá ser mudado para trás, por\n"
 "%d %s, %d %s, %d %s, e %d %s."
 
-#: src/Dialogs.vala:1905
+#: src/Dialogs.vala:1921
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dias"
 
-#: src/Dialogs.vala:1906
+#: src/Dialogs.vala:1922
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: src/Dialogs.vala:1907
+#: src/Dialogs.vala:1923
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: src/Dialogs.vala:1908
+#: src/Dialogs.vala:1924
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "segundo"
 msgstr[1] "segundos"
 
-#: src/Dialogs.vala:1952
+#: src/Dialogs.vala:1968
 #, c-format
 msgid ""
 "\n"
@@ -3789,50 +3896,49 @@ msgstr[1] ""
 "\n"
 "e %d outras."
 
-#: src/Dialogs.vala:1976 src/Dialogs.vala:2003
+#: src/Dialogs.vala:1992 src/Dialogs.vala:2019
 msgid "Tags (separated by commas):"
 msgstr "Etiquetas (separadas por vírgulas):"
 
-#: src/Dialogs.vala:2083
+#: src/Dialogs.vala:2099
 msgid "Welcome!"
 msgstr "Bem-vindo!"
 
-#: src/Dialogs.vala:2090
+#: src/Dialogs.vala:2106
 msgid "Welcome to Shotwell!"
 msgstr "Bem-vindo ao Shotwell!"
 
-#: src/Dialogs.vala:2094
+#: src/Dialogs.vala:2111
 msgid "To get started, import photos in any of these ways:"
 msgstr "Para iniciar, importe fotos de alguma destas formas:"
 
-#: src/Dialogs.vala:2113
+#: src/Dialogs.vala:2131
 #, c-format
-#| msgid "Choose <span weight=“bold“>File %s Import From Folder</span>"
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr "Escolha <span weight=\"bold\">Arquivo %s Importar de uma pasta</span>"
 
-#: src/Dialogs.vala:2114
+#: src/Dialogs.vala:2132
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Arraste e solte fotos para dentro da janela do Shotwell"
 
-#: src/Dialogs.vala:2115
+#: src/Dialogs.vala:2133
 msgid "Connect a camera to your computer and import"
 msgstr "Conectar uma câmera no seu computador e importe"
 
-#: src/Dialogs.vala:2125
+#: src/Dialogs.vala:2144
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importar fotos de seu diretório %s"
 
-#: src/Dialogs.vala:2132
+#: src/Dialogs.vala:2151
 msgid "You can also import photos in any of these ways:"
 msgstr "Você também pode importar fotos de alguma destas formas:"
 
-#: src/Dialogs.vala:2142
+#: src/Dialogs.vala:2162
 msgid "_Don’t show this message again"
-msgstr "Não exibir mais es_ta mensagem"
+msgstr "_Não mostrar esta mensagem novamente"
 
-#: src/Dialogs.vala:2177
+#: src/Dialogs.vala:2199
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Importar fotos de sua biblioteca %s"
@@ -3840,41 +3946,41 @@ msgstr "Importar fotos de sua biblioteca %s"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2324 src/Dialogs.vala:2328
+#: src/Dialogs.vala:2345 src/Dialogs.vala:2349
 msgid "(Help)"
 msgstr "(Ajuda)"
 
-#: src/Dialogs.vala:2337
+#: src/Dialogs.vala:2356
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Ano%sMês%sDia"
 
-#: src/Dialogs.vala:2339
+#: src/Dialogs.vala:2358
 #, c-format
 msgid "Year%sMonth"
 msgstr "Ano%sMês"
 
-#: src/Dialogs.vala:2341
+#: src/Dialogs.vala:2360
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Ano%sMês-Dia"
 
-#: src/Dialogs.vala:2343
+#: src/Dialogs.vala:2362
 msgid "Year-Month-Day"
 msgstr "Ano-Mês-Dia"
 
-#: src/Dialogs.vala:2344 src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2363 src/editing_tools/EditingTools.vala:780
 msgid "Custom"
 msgstr "Personalizar"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2581
+#: src/Dialogs.vala:2600
 msgid "Invalid pattern"
 msgstr "Padrão inválido"
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2683
+#: src/Dialogs.vala:2702
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3882,31 +3988,31 @@ msgstr ""
 "Shotwell pode copiar as fotos na sua pasta de biblioteca ou pode importá-los "
 "sem copiar."
 
-#: src/Dialogs.vala:2688
+#: src/Dialogs.vala:2707
 msgid "Co_py Photos"
 msgstr "Co_piar fotos"
 
-#: src/Dialogs.vala:2689
+#: src/Dialogs.vala:2708
 msgid "_Import in Place"
 msgstr "_Importar no local"
 
-#: src/Dialogs.vala:2690
+#: src/Dialogs.vala:2709
 msgid "Import to Library"
 msgstr "Importar para a biblioteca"
 
-#: src/Dialogs.vala:2700 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2719 src/PhotoPage.vala:2864
 msgid "Remove From Library"
 msgstr "Remover da biblioteca"
 
-#: src/Dialogs.vala:2701 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2720 src/PhotoPage.vala:2864
 msgid "Removing Photo From Library"
 msgstr "Removendo fotos da biblioteca"
 
-#: src/Dialogs.vala:2701
+#: src/Dialogs.vala:2720
 msgid "Removing Photos From Library"
 msgstr "Removendo fotos da biblioteca"
 
-#: src/Dialogs.vala:2715
+#: src/Dialogs.vala:2734
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -3920,16 +4026,16 @@ msgid_plural ""
 "This action cannot be undone."
 msgstr[0] ""
 "Isto irá remover a foto/vídeo da sua biblioteca Shotwell. Você também "
-"gostaria de mover este arquivo para lixeira?\n"
+"gostaria de movê-lo para lixeira?\n"
 "\n"
 "Essa ação não poderá ser desfeita."
 msgstr[1] ""
 "Isto irá remover %d fotos/vídeos da sua biblioteca Shotwell. Você também "
-"gostaria de mover estes arquivos para lixeira?\n"
+"gostaria de movê-los para lixeira?\n"
 "\n"
 "Essa ação não poderá ser desfeita."
 
-#: src/Dialogs.vala:2719
+#: src/Dialogs.vala:2738
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -3943,16 +4049,16 @@ msgid_plural ""
 "This action cannot be undone."
 msgstr[0] ""
 "Isto irá remover o vídeo da sua biblioteca Shotwell. Você também gostaria de "
-"mover este arquivo para lixeira?\n"
+"movê-lo para lixeira?\n"
 "\n"
 "Essa ação não poderá ser desfeita."
 msgstr[1] ""
 "Isto irá remover %d vídeos da sua biblioteca Shotwell. Você também gostaria "
-"de mover estes arquivos para lixeira?\n"
+"de movê-los para lixeira?\n"
 "\n"
 "Essa ação não poderá ser desfeita."
 
-#: src/Dialogs.vala:2723
+#: src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -3966,28 +4072,27 @@ msgid_plural ""
 "This action cannot be undone."
 msgstr[0] ""
 "Isto irá remover a foto da sua biblioteca do Shotwell. Você gostaria também "
-"de mover o arquivo para a lixeira?\n"
+"de movê-la para a lixeira?\n"
 "\n"
 "Esta ação não poderá ser desfeita."
 msgstr[1] ""
-"Isto irá remover %d fotos da sua biblioteca do Shotwell. Você gostaria "
-"também mover os arquivos para a lixeira?\n"
+"Isto irá remover %d fotos da sua biblioteca Shotwell. Você também gostaria "
+"de movê-las para lixeira?\n"
 "\n"
-"Esta ação não poderá ser desfeita."
+"Essa ação não poderá ser desfeita."
 
-#: src/Dialogs.vala:2755
+#: src/Dialogs.vala:2774
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
 msgid_plural ""
 "%d photos/videos cannot be moved to your desktop trash. Delete these files?"
-msgstr[0] ""
-"A foto ou vídeo não pode ser movido para lixeira. Excluir esse arquivo?"
+msgstr[0] "A foto ou vídeo não pode ser movido para lixeira. Excluir esse arquivo?"
 msgstr[1] ""
 "%d fotos/vídeos não podem ser movidos para lixeira. Excluir esses arquivos?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2772
+#: src/Dialogs.vala:2791
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4002,127 +4107,17 @@ msgstr "Largura"
 msgid "Height"
 msgstr "Altura"
 
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Arquivo"
-
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
-#: src/Resources.vala:175
-msgid "_Save"
-msgstr "_Salvar"
-
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Salvar foto"
-
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As…"
-msgstr "_Salvar como…"
-
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Salva a foto com um nome diferente"
-
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Imprime a foto em uma impressora conectada em seu computador"
-
-#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
-#: src/Resources.vala:159
-msgid "_Edit"
-msgstr "_Editar"
-
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Foto"
-
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416
-msgid "T_ools"
-msgstr "F_erramentas"
-
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421
-msgid "_Previous Photo"
-msgstr "Foto a_nterior"
-
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422
-msgid "Previous Photo"
-msgstr "Foto anterior"
-
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427
-msgid "_Next Photo"
-msgstr "Próxi_ma foto"
-
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428
-msgid "Next Photo"
-msgstr "Próxima foto"
-
-#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
-#: src/PhotoPage.vala:2412
-msgid "_View"
-msgstr "_Ver"
-
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
-#: src/Resources.vala:162
-msgid "_Help"
-msgstr "A_juda"
-
-#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
-#: src/PhotoPage.vala:2591 src/Resources.vala:183
-msgid "Zoom _In"
-msgstr "Ampl_iar"
-
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592
-msgid "Increase the magnification of the photo"
-msgstr "Aumentar a ampliação da foto"
-
-#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
-#: src/PhotoPage.vala:2597 src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr "Redu_zir"
-
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598
-msgid "Decrease the magnification of the photo"
-msgstr "Diminuir a ampliação da foto"
-
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603
-msgid "Fit to _Page"
-msgstr "Adaptar à _Página"
-
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604
-msgid "Zoom the photo to fit on the screen"
-msgstr "Ampliar a foto para se adaptar à tela"
-
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Ampliação _100%"
-
-#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Ampliar a foto em 100%"
-
-#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Ampliação _200%"
-
-#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Ampliar a foto em 200%"
-
-#: src/direct/DirectPhotoPage.vala:227
+#: src/direct/DirectPhotoPage.vala:92
 #, c-format
 msgid "%s does not exist."
 msgstr "%s não existe."
 
-#: src/direct/DirectPhotoPage.vala:229
+#: src/direct/DirectPhotoPage.vala:94
 #, c-format
 msgid "%s is not a file."
 msgstr "%s não é um arquivo."
 
-#: src/direct/DirectPhotoPage.vala:231
+#: src/direct/DirectPhotoPage.vala:96
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
@@ -4131,30 +4126,34 @@ msgstr ""
 "%s não oferece suporte ao formato do arquivo de\n"
 "%s."
 
-#: src/direct/DirectPhotoPage.vala:248
+#: src/direct/DirectPhotoPage.vala:113
 #, c-format
 msgid "Unable open photo %s. Sorry."
 msgstr "Não foi possível abrir a foto %s. Desculpe-me."
 
-#: src/direct/DirectPhotoPage.vala:432
+#: src/direct/DirectPhotoPage.vala:297 src/Resources.vala:175 ui/direct.ui:8
+msgid "_Save"
+msgstr "_Salvar"
+
+#: src/direct/DirectPhotoPage.vala:297
 msgid "_Save a Copy"
 msgstr "_Salvar uma cópia"
 
-#: src/direct/DirectPhotoPage.vala:435
+#: src/direct/DirectPhotoPage.vala:300
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Descartar alterações para %s?"
 
-#: src/direct/DirectPhotoPage.vala:436
+#: src/direct/DirectPhotoPage.vala:301
 msgid "Close _without Saving"
 msgstr "Fechar s_em salvar"
 
-#: src/direct/DirectPhotoPage.vala:469
+#: src/direct/DirectPhotoPage.vala:334
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Erro ao salvar para %s: %s"
 
-#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518
+#: src/direct/DirectPhotoPage.vala:362 src/direct/DirectPhotoPage.vala:383
 msgid "Save As"
 msgstr "Salvar como"
 
@@ -4164,201 +4163,201 @@ msgstr "Salvar como"
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Não foi possível monitorar %s: Não é um diretório (%s)"
 
-#: src/editing_tools/EditingTools.vala:665
+#: src/editing_tools/EditingTools.vala:664
 msgid "Return to current photo dimensions"
 msgstr "Retornar a foto para as dimensões atuais"
 
-#: src/editing_tools/EditingTools.vala:668
+#: src/editing_tools/EditingTools.vala:667
 msgid "Set the crop for this photo"
 msgstr "Definir o corte para esta foto"
 
-#: src/editing_tools/EditingTools.vala:680
+#: src/editing_tools/EditingTools.vala:679
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Corte de retângulo dinâmico entre o retrato e a orientação da paisagem"
 
-#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:752
 msgid "Unconstrained"
 msgstr "Sem restrições"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:753
 msgid "Square"
 msgstr "Quadrado"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:754
 msgid "Screen"
 msgstr "Tela"
 
-#: src/editing_tools/EditingTools.vala:757
-#: src/editing_tools/EditingTools.vala:760
-#: src/editing_tools/EditingTools.vala:770
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:769
+#: src/editing_tools/EditingTools.vala:779
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:757
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD Video (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:758
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD Video (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:760 src/Printing.vala:818
 msgid "Wallet (2 × 3 in.)"
 msgstr "Carteira (2 × 3 pol.)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:821
 msgid "Notecard (3 × 5 in.)"
 msgstr "Cartão de notas (3 × 5 pol.)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:824
 msgid "4 × 6 in."
 msgstr "4 × 6 pol."
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:827
 msgid "5 × 7 in."
 msgstr "5 × 7 pol."
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:830
 msgid "8 × 10 in."
 msgstr "8 × 10 pol."
 
-#: src/editing_tools/EditingTools.vala:766
+#: src/editing_tools/EditingTools.vala:765
 msgid "Letter (8.5 × 11 in.)"
-msgstr "Carta (8.5 × 11 in.)"
+msgstr "Carta (8.5 × 11 pol.)"
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:833
 msgid "11 × 14 in."
 msgstr "11 × 14 pol."
 
-#: src/editing_tools/EditingTools.vala:768
+#: src/editing_tools/EditingTools.vala:767
 msgid "Tabloid (11 × 17 in.)"
-msgstr "Tabloide (11 × 17 in.)"
+msgstr "Tabloide (11 × 17 pol.)"
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:836
 msgid "16 × 20 in."
 msgstr "16 × 20 pol."
 
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:842
 msgid "Metric Wallet (9 × 13 cm)"
-msgstr "Carteira Métrica (9 × 13 cm)"
+msgstr "Carteira métrica (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:845
 msgid "Postcard (10 × 15 cm)"
 msgstr "Cartão postal (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:848
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:851
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:775
+#: src/editing_tools/EditingTools.vala:774
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:854
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:857
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:860
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:779
+#: src/editing_tools/EditingTools.vala:778
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395
+#: src/editing_tools/EditingTools.vala:1878 src/Properties.vala:395
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: src/editing_tools/EditingTools.vala:1887
+#: src/editing_tools/EditingTools.vala:1893
 msgid "Close the red-eye tool"
 msgstr "Fechar ferramenta de olhos vermelhos"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1896
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Remove qualquer efeito de olhos vermelhos na região selecionada"
 
-#: src/editing_tools/EditingTools.vala:2229
+#: src/editing_tools/EditingTools.vala:2236
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Reiniciar"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:436
+#: src/editing_tools/EditingTools.vala:2250 src/Properties.vala:436
 #: src/Properties.vala:440 src/Properties.vala:447
 msgid "Exposure:"
 msgstr "Exposição:"
 
-#: src/editing_tools/EditingTools.vala:2251
+#: src/editing_tools/EditingTools.vala:2259
 msgid "Contrast:"
 msgstr "Contraste:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: src/editing_tools/EditingTools.vala:2268
 msgid "Saturation:"
 msgstr "Saturação:"
 
-#: src/editing_tools/EditingTools.vala:2267
+#: src/editing_tools/EditingTools.vala:2277
 msgid "Tint:"
 msgstr "Colorir:"
 
-#: src/editing_tools/EditingTools.vala:2276
+#: src/editing_tools/EditingTools.vala:2287
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: src/editing_tools/EditingTools.vala:2284
+#: src/editing_tools/EditingTools.vala:2296
 msgid "Shadows:"
 msgstr "Sombras:"
 
-#: src/editing_tools/EditingTools.vala:2292
+#: src/editing_tools/EditingTools.vala:2305
 msgid "Highlights:"
 msgstr "Destaques:"
 
-#: src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2361
 msgid "Reset Colors"
 msgstr "Reiniciar cores"
 
-#: src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2361
 msgid "Reset all color adjustments to original"
 msgstr "Reiniciar todos os ajustes de cores para o original"
 
-#: src/editing_tools/EditingTools.vala:2705
+#: src/editing_tools/EditingTools.vala:2720
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: src/editing_tools/EditingTools.vala:2732
 msgid "Tint"
 msgstr "Colorir"
 
-#: src/editing_tools/EditingTools.vala:2729
+#: src/editing_tools/EditingTools.vala:2744
 msgid "Contrast"
 msgstr "Contraste"
 
-#: src/editing_tools/EditingTools.vala:2743
+#: src/editing_tools/EditingTools.vala:2758
 msgid "Saturation"
 msgstr "Saturação"
 
-#: src/editing_tools/EditingTools.vala:2756
+#: src/editing_tools/EditingTools.vala:2771
 msgid "Exposure"
 msgstr "Exposição"
 
-#: src/editing_tools/EditingTools.vala:2769
+#: src/editing_tools/EditingTools.vala:2784
 msgid "Shadows"
 msgstr "Sombras"
 
-#: src/editing_tools/EditingTools.vala:2782
+#: src/editing_tools/EditingTools.vala:2797
 msgid "Highlights"
 msgstr "Destaques"
 
-#: src/editing_tools/EditingTools.vala:2792
+#: src/editing_tools/EditingTools.vala:2807
 msgid "Contrast Expansion"
 msgstr "Expansão de contraste"
 
@@ -4367,6 +4366,7 @@ msgid "Angle:"
 msgstr "Ângulo:"
 
 #: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "En_direitar"
 
@@ -4395,39 +4395,31 @@ msgid_plural "%d Photos"
 msgstr[0] "%d foto"
 msgstr[1] "%d fotos"
 
-#: src/events/EventPage.vala:129
+#: src/events/EventPage.vala:121
 msgid "No Event"
 msgstr "Nenhum Evento"
 
-#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
-msgid "_Comments"
-msgstr "_Comentários"
-
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Exibir o comentário de cada evento"
-
-#: src/events/EventsDirectoryPage.vala:155
+#: src/events/EventsDirectoryPage.vala:143
 msgid "No events"
 msgstr "Sem eventos"
 
-#: src/events/EventsDirectoryPage.vala:159
+#: src/events/EventsDirectoryPage.vala:147
 msgid "No events found"
 msgstr "Sem eventos encontrados"
 
-#: src/events/EventsDirectoryPage.vala:230
+#: src/events/EventsDirectoryPage.vala:220
 msgid "All Events"
 msgstr "Todos eventos"
 
-#: src/events/EventsDirectoryPage.vala:244
+#: src/events/EventsDirectoryPage.vala:234
 msgid "Undated"
 msgstr "Sem data"
 
-#: src/events/EventsDirectoryPage.vala:245
+#: src/events/EventsDirectoryPage.vala:235
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:246
+#: src/events/EventsDirectoryPage.vala:236
 msgid "%B"
 msgstr "%B"
 
@@ -4467,21 +4459,20 @@ msgstr "Sobrescrever _todas"
 msgid "Export"
 msgstr "Exportar"
 
-#: src/folders/Branch.vala:141
+#: src/folders/Branch.vala:144
 msgid "Folders"
 msgstr "Pastas"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1191
+#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1194
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:608
-#: src/SearchFilter.vala:609
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1084
 msgid "Photos"
 msgstr "Fotos"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602
-#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1103
+#: src/SearchFilter.vala:1104
 msgid "Flagged"
 msgstr "Marcadas"
 
@@ -4489,19 +4480,11 @@ msgstr "Marcadas"
 msgid "Importing…"
 msgstr "Importando…"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "Pa_rar importação"
-
-#: src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Parar importação de fotos"
-
-#: src/library/ImportQueuePage.vala:124
+#: src/library/ImportQueuePage.vala:122
 msgid "Preparing to import…"
 msgstr "Preparando para importar…"
 
-#: src/library/ImportQueuePage.vala:151
+#: src/library/ImportQueuePage.vala:149
 #, c-format
 msgid "Imported %s"
 msgstr "Importado %s"
@@ -4510,134 +4493,20 @@ msgstr "Importado %s"
 msgid "Last Import"
 msgstr "Última importação"
 
-#: src/library/LibraryWindow.vala:285
-msgid "_Import From Folder…"
-msgstr "_Importa da pasta…"
-
-#: src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Importar fotos do disco para a biblioteca"
-
-#: src/library/LibraryWindow.vala:293
-msgid "Import From _Application…"
-msgstr "Importação de _aplicativo…"
-
-#: src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Ordenar _eventos"
-
-#: src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Esvaziar l_ixeira"
-
-#: src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Apaga todas as fotos na lixeira"
-
-#: src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Ver eve_nto para foto"
-
-#: src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "_Localizar"
-
-#: src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Localiza fotos e vídeos através de pesquisa"
-
-#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
-#: src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search…"
-msgstr "No_va pesquisa salva…"
-
-#: src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Fotos"
-
-#: src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "Even_tos"
-
-#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr "Eti_quetas"
-
-#: src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "Informações _básicas"
-
-#: src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Exibe informações básicas para a seleção"
-
-#: src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "Informações _estendidas"
-
-#: src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Exibe informações estendidas para a seleção"
-
-#: src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "Barra de pe_squisa"
-
-#: src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Exibe a barra de pesquisa"
-
-#: src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "Ba_rra lateral"
-
-#: src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Exibe a barra lateral"
-
-#: src/library/LibraryWindow.vala:398
-msgid "T_oolbar"
-msgstr "Barra de _ferramentas"
-
-#: src/library/LibraryWindow.vala:399
-msgid "Display the tool bar"
-msgstr "Exibe a barra ferramentas"
-
-#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr "_Ascendente"
-
-#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr "Ordena as fotos em ordem ascendente"
-
-#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
-msgid "D_escending"
-msgstr "D_escendente"
-
-#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr "Ordena as fotos em ordem descendente"
-
-#: src/library/LibraryWindow.vala:657
+#: src/library/LibraryWindow.vala:501
 msgid "Import From Folder"
 msgstr "Importa da pasta"
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:570 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Esvaziar lixeira"
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:570
 msgid "Emptying Trash…"
 msgstr "Esvaziando lixeira…"
 
-#: src/library/LibraryWindow.vala:901
+#: src/library/LibraryWindow.vala:763
 #, c-format
-#| msgid ""
-#| "Shotwell is configured to import photos to your home directory.\n"
-#| "We recommend changing this in <span weight=“bold“>Edit %s Preferences</"
-#| "span>.\n"
-#| "Do you want to continue importing photos?"
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
 "We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
@@ -4649,33 +4518,33 @@ msgstr ""
 "%s</span>.\n"
 "Você deseja continuar a importação de fotos?"
 
-#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
+#: src/library/LibraryWindow.vala:766 ui/shotwell.ui:784
 msgid "Library Location"
 msgstr "Localização da biblioteca"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:917
+#: src/library/LibraryWindow.vala:779
 msgid "Photos cannot be imported from this directory."
 msgstr "Fotos não podem ser importadas deste diretório."
 
-#: src/library/LibraryWindow.vala:1203
+#: src/library/LibraryWindow.vala:1059
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258
+#: src/library/LibraryWindow.vala:1103 src/library/LibraryWindow.vala:1114
 msgid "Updating library…"
 msgstr "Atualizando biblioteca…"
 
-#: src/library/LibraryWindow.vala:1264
+#: src/library/LibraryWindow.vala:1120
 msgid "Preparing to auto-import photos…"
 msgstr "Preparando para auto-importação de fotos…"
 
-#: src/library/LibraryWindow.vala:1269
+#: src/library/LibraryWindow.vala:1125
 msgid "Auto-importing photos…"
 msgstr "Auto-importação de fotos…"
 
-#: src/library/LibraryWindow.vala:1277
+#: src/library/LibraryWindow.vala:1133
 msgid "Writing metadata to files…"
 msgstr "Escrevendo metadados para arquivos…"
 
@@ -4683,23 +4552,23 @@ msgstr "Escrevendo metadados para arquivos…"
 msgid "Missing Files"
 msgstr "Arquivos faltantes"
 
-#: src/library/OfflinePage.vala:106
+#: src/library/OfflinePage.vala:103
 msgid "Deleting…"
-msgstr "Apagando…"
+msgstr "Excluindo…"
 
 #: src/library/TrashPage.vala:8
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:101
 msgid "Trash is empty"
 msgstr "A lixeira está vazia"
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:105
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:106
 msgid "Deleting Photos"
 msgstr "Apagando fotos"
 
@@ -4711,8 +4580,8 @@ msgid ""
 "(schema %d). Please use the latest version of Shotwell."
 msgstr ""
 "Sua biblioteca de fotos não é compatível com essa versão do Shotwell. Parece "
-"que ele foi criado pelo Shotwell %s (schema %d). Essa versão é %s (schema "
-"%d). Por favor use a última versão do Shotwell."
+"que ele foi criado pelo Shotwell %s (schema %d). Essa versão é %s (schema %d)"
+". Por favor use a última versão do Shotwell."
 
 #: src/main.vala:59
 #, c-format
@@ -4721,9 +4590,9 @@ msgid ""
 "%d) to %s (schema %d). For more information please check the Shotwell Wiki "
 "at %s"
 msgstr ""
-"O Shotwell não foi capaz de atualizar sua biblioteca de fotos da versão %s "
-"(schema %d) para %s (schema %d). Para maiores informações consulte o Wiki do "
-"Shotwell Wiki em %s"
+"O Shotwell não foi capaz de atualizar sua biblioteca de fotos da versão %s ("
+"schema %d) para %s (schema %d). Para maiores informações consulte o Wiki do "
+"Shotwell em %s"
 
 #: src/main.vala:65
 #, c-format
@@ -4734,9 +4603,8 @@ msgid ""
 "photos."
 msgstr ""
 "Sua biblioteca de fotos não é compatível com essa versão do Shotwell. Parece "
-"que ele foi criado pelo Shotwell %s (schema %d). Essa versão é %s (schema "
-"%d). Por favor limpe sua biblioteca excluindo %s e importe novamente suas "
-"fotos."
+"que ele foi criado pelo Shotwell %s (schema %d). Essa versão é %s (schema %d)"
+". Por favor limpe sua biblioteca excluindo %s e importe novamente suas fotos."
 
 #: src/main.vala:71
 #, c-format
@@ -4767,7 +4635,7 @@ msgstr "Não exibe a medida do progresso de inicialização"
 
 #: src/main.vala:306
 msgid "Show the application’s version"
-msgstr "Exibe a versão do aplicativo"
+msgstr "Mostra a versão do aplicativo"
 
 #. init GTK (valac has already called g_threads_init())
 #: src/main.vala:338
@@ -4778,8 +4646,8 @@ msgstr "[ARQUIVO]"
 #, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
-"Digite “%s --help” para ver a lista completa das opções de linha de "
-"comando.\n"
+"Execute “%s --help” para ver uma lista completa de opções de linha de "
+"comando disponíveis.\n"
 
 #: src/MediaMonitor.vala:400
 #, c-format
@@ -4790,71 +4658,7 @@ msgstr "Não foi possível processar as atualizações monitoradas: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Ajustar o tamanho das miniaturas"
 
-#: src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Aumentar a ampliação das miniaturas"
-
-#: src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Diminuir a ampliação das miniaturas"
-
-#: src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Ordenar _fotos"
-
-#: src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "_Reproduzir vídeo"
-
-#: src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Abra os vídeos selecionados no reprodutor de vídeo do sistema"
-
-#: src/MediaPage.vala:428 src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr "_Desenvolvedor"
-
-#: src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Exibe o comentário de cada foto"
-
-#: src/MediaPage.vala:470
-msgid "Display each photo’s tags"
-msgstr "Exibe as etiquetas de cada foto"
-
-#: src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "Por _título"
-
-#: src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Ordena as fotos por título"
-
-#: src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Por _data de exposição"
-
 #: src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Ordena as fotos por data de exposição"
-
-#: src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Por _avaliação"
-
-#: src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Ordena as fotos por avaliação"
-
-#: src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Por _nome de arquivo"
-
-#: src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Ordena as fotos por nome do arquivo"
-
-#: src/MediaPage.vala:723
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4863,34 +4667,34 @@ msgstr ""
 "Shotwell foi incapaz de reproduzir o vídeo selecionado:\n"
 "%s"
 
-#: src/Page.vala:1266
+#: src/Page.vala:1338
 msgid "No photos/videos"
 msgstr "Sem fotos/vídeos"
 
-#: src/Page.vala:1270
+#: src/Page.vala:1342
 msgid "No photos/videos found which match the current filter"
 msgstr "Nenhuma foto ou vídeo encontrados que correspondam ao filtro atual"
 
-#: src/Page.vala:2576
+#: src/Page.vala:2648
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotos não podem ser exportadas para este diretório."
 
 #. previous button
-#: src/PhotoPage.vala:533
+#: src/PhotoPage.vala:535
 msgid "Previous photo"
 msgstr "Foto anterior"
 
 #. next button
-#: src/PhotoPage.vala:539
+#: src/PhotoPage.vala:541
 msgid "Next photo"
 msgstr "Próxima foto"
 
-#: src/PhotoPage.vala:1845
+#: src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Faltando arquivo fonte da foto: %s"
 
-#: src/PhotoPage.vala:3229
+#: src/PhotoPage.vala:3008
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Não foi possível exportar %s: %s"
@@ -5133,65 +4937,57 @@ msgstr "A publicação para %s não pôde continuar, ocorreu um erro:"
 msgid "To try publishing to another service, select one from the above menu."
 msgstr "Para tentar publicar em outro serviço, selecione-o no menu acima."
 
-#: src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "As fotos/vídeos selecionados foram publicadas com sucesso."
-
-#: src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Os vídeos selecionados foram publicados com sucesso."
-
-#: src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "As fotos selecionadas foram publicadas com sucesso."
-
-#: src/publishing/PublishingUI.vala:112
+#. Here, we check whether more than one item is being uploaded, and if so, display
+#. an alternate message.
+#: src/publishing/PublishingUI.vala:104 src/publishing/PublishingUI.vala:109
 msgid "The selected video was successfully published."
-msgstr "O vídeo selecionado foi publicado com sucesso."
+msgid_plural "The selected videos were successfully published."
+msgstr[0] "O vídeo selecionado foi publicado com sucesso."
+msgstr[1] "Os vídeos selecionados foram publicados com sucesso."
 
-#: src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr "A foto selecionada foi publicada com sucesso."
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "As fotos/vídeos selecionados foram publicadas com sucesso."
 
-#: src/publishing/PublishingUI.vala:122
+#: src/publishing/PublishingUI.vala:127
 msgid "Fetching account information…"
 msgstr "Obtendo informação da conta…"
 
-#: src/publishing/PublishingUI.vala:128
+#: src/publishing/PublishingUI.vala:133
 msgid "Logging in…"
 msgstr "Autenticando…"
 
-#: src/publishing/PublishingUI.vala:188
+#: src/publishing/PublishingUI.vala:193
 msgid "Publish Photos"
 msgstr "Publicar fotos"
 
-#: src/publishing/PublishingUI.vala:189
+#: src/publishing/PublishingUI.vala:194
 msgid "Publish photos _to:"
 msgstr "Publicar fotos pa_ra:"
 
-#: src/publishing/PublishingUI.vala:191
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish Videos"
 msgstr "Publicar vídeos"
 
-#: src/publishing/PublishingUI.vala:192
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish videos _to"
 msgstr "Publicar vídeos pa_ra"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish Photos and Videos"
 msgstr "Publicar fotos e vídeos"
 
-#: src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish photos and videos _to"
 msgstr "Publicar fotos e vídeos pa_ra"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:397
+#: src/publishing/PublishingUI.vala:410
 msgid "Unable to publish"
 msgstr "Não é possível publicar"
 
-#: src/publishing/PublishingUI.vala:398
+#: src/publishing/PublishingUI.vala:411
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5208,11 +5004,7 @@ msgstr ""
 msgid "Publishing"
 msgstr "Publicando"
 
-#: src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Girar à _direita"
-
-#: src/Resources.vala:140 src/Resources.vala:145
+#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
 msgid "Rotate"
 msgstr "Girar"
 
@@ -5220,14 +5012,10 @@ msgstr "Girar"
 msgid "Rotate Right"
 msgstr "Girar à direita"
 
-#: src/Resources.vala:142
+#: src/Resources.vala:142 ui/collection.ui:146
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Gira as fotos para direita (pressione Ctrl para girar para esquerda)"
 
-#: src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "Girar à _esquerda"
-
 #: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr "Girar à esquerda"
@@ -5236,23 +5024,17 @@ msgstr "Girar à esquerda"
 msgid "Rotate the photos left"
 msgstr "Gira a foto para a esquerda"
 
-#: src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Inverter hori_zontalmente"
-
 #: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr "Inverter horizontalmente"
 
-#: src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "Inverter verti_calmente"
-
 #: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr "Inverter verticalmente"
 
-#: src/Resources.vala:155
+#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419
+#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207
 msgid "_About"
 msgstr "S_obre"
 
@@ -5260,14 +5042,30 @@ msgstr "S_obre"
 msgid "_Apply"
 msgstr "_Aplicar"
 
+#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
+#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37
+msgid "_Edit"
+msgstr "_Editar"
+
 #: src/Resources.vala:160
 msgid "_Forward"
 msgstr "A_vançar"
 
-#: src/Resources.vala:161
+#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "Tela _cheia"
 
+#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418
+#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420
+#: ui/tags.ui:423 ui/top.ui:40 ui/trash.ui:189 ui/trash.ui:192
+msgid "_Help"
+msgstr "A_juda"
+
 #: src/Resources.vala:163
 msgid "Leave _Fullscreen"
 msgstr "Sair da _tela cheia"
@@ -5280,15 +5078,9 @@ msgstr "_Nova"
 msgid "_Next"
 msgstr "_Próximo"
 
-#: src/Resources.vala:166
-msgid "_OK"
-msgstr "_OK"
-
-#: src/Resources.vala:167
-msgid "_Play"
-msgstr "_Reproduzir"
-
-#: src/Resources.vala:168 src/Resources.vala:317
+#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
+#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
 msgid "_Preferences"
 msgstr "_Preferências"
 
@@ -5296,11 +5088,9 @@ msgstr "_Preferências"
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: src/Resources.vala:170
-msgid "_Print"
-msgstr "Im_primir"
-
-#: src/Resources.vala:171
+#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40
+#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30
 msgid "_Quit"
 msgstr "_Sair"
 
@@ -5340,22 +5130,24 @@ msgstr "Tamanho _normal"
 msgid "Best _Fit"
 msgstr "Melhor aj_uste"
 
-#: src/Resources.vala:186
-msgid "_Enhance"
-msgstr "_Melhorar"
+#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "Ampl_iar"
+
+#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "Redu_zir"
 
-#: src/Resources.vala:187
+#: src/Resources.vala:187 ui/collection.ui:165
 msgid "Enhance"
 msgstr "Melhorar"
 
-#: src/Resources.vala:188
+#: src/Resources.vala:188 ui/collection.ui:162
 msgid "Automatically improve the photo’s appearance"
 msgstr "Melhora automaticamente a aparência da foto"
 
-#: src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "_Copiar ajustes de cor"
-
 #: src/Resources.vala:191
 msgid "Copy Color Adjustments"
 msgstr "Copiar ajustes de cor"
@@ -5364,10 +5156,6 @@ msgstr "Copiar ajustes de cor"
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Copiar os ajustes de cor aplicados na foto"
 
-#: src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "C_olar ajustes de cor"
-
 #: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr "Colar ajustes de cor"
@@ -5376,7 +5164,7 @@ msgstr "Colar ajustes de cor"
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Aplicar ajustes de cor copiados nas fotos selecionadas"
 
-#: src/Resources.vala:198
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Cortar"
 
@@ -5396,7 +5184,7 @@ msgstr "Endireitar"
 msgid "Straighten the photo"
 msgstr "Endireita foto"
 
-#: src/Resources.vala:206
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "Olhos ve_rmelhos"
 
@@ -5408,7 +5196,7 @@ msgstr "Olhos vermelhos"
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Reduz ou elimina qualquer efeito de olhos vermelhos na foto"
 
-#: src/Resources.vala:210
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Ajustar"
 
@@ -5420,10 +5208,6 @@ msgstr "Ajustar"
 msgid "Adjust the photo’s color and tone"
 msgstr "Ajusta a cor e os tons das fotos"
 
-#: src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "Re_verter para o original"
-
 #: src/Resources.vala:215
 msgid "Revert to Original"
 msgstr "Reverter para o original"
@@ -5436,10 +5220,6 @@ msgstr "Reverter e_dição externa"
 msgid "Revert to the master photo"
 msgstr "Reverter para a foto mestre"
 
-#: src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Definir como _plano de fundo da área de trabalho"
-
 #: src/Resources.vala:221
 msgid "Set selected image to be the new desktop background"
 msgstr ""
@@ -5447,9 +5227,11 @@ msgstr ""
 
 #: src/Resources.vala:222
 msgid "Set as _Desktop Slideshow…"
-msgstr "Definir apresentação de _slides da área de trabalho…"
+msgstr "Definir como apresentação de sli_des da área de trabalho…"
 
-#: src/Resources.vala:224
+#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35
+#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
 msgid "_Undo"
 msgstr "Des_fazer"
 
@@ -5457,7 +5239,9 @@ msgstr "Des_fazer"
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/Resources.vala:227
+#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40
+#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
 msgid "_Redo"
 msgstr "_Refazer"
 
@@ -5465,11 +5249,12 @@ msgstr "_Refazer"
 msgid "Redo"
 msgstr "Refazer"
 
-#: src/Resources.vala:230
+#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:391 ui/event.ui:584
 msgid "Re_name Event…"
 msgstr "Re_nomear evento…"
 
-#: src/Resources.vala:233
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
 msgid "Make _Key Photo for Event"
 msgstr "Designar f_oto como chave para evento"
 
@@ -5477,7 +5262,7 @@ msgstr "Designar f_oto como chave para evento"
 msgid "Make Key Photo for Event"
 msgstr "Designa a foto como chave para evento"
 
-#: src/Resources.vala:236
+#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
 msgid "_New Event"
 msgstr "_Novo evento"
 
@@ -5493,7 +5278,7 @@ msgstr "Mover fotos"
 msgid "Move photos to an event"
 msgstr "Mover as fotos selecionadas para um evento"
 
-#: src/Resources.vala:242
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Unir eventos"
 
@@ -5505,7 +5290,8 @@ msgstr "Unir"
 msgid "Combine events into a single event"
 msgstr "Combinar eventos em um único evento"
 
-#: src/Resources.vala:246
+#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "A_valiar"
 
@@ -5517,7 +5303,8 @@ msgstr "Avaliar"
 msgid "Change the rating of your photo"
 msgstr "Alterar a avaliação da foto"
 
-#: src/Resources.vala:250
+#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "_Aumentar"
 
@@ -5525,7 +5312,8 @@ msgstr "_Aumentar"
 msgid "Increase Rating"
 msgstr "Aumentar avaliação"
 
-#: src/Resources.vala:253
+#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "_Diminuir"
 
@@ -5533,7 +5321,8 @@ msgstr "_Diminuir"
 msgid "Decrease Rating"
 msgstr "Diminuir avaliação"
 
-#: src/Resources.vala:256
+#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Sem avaliação"
 
@@ -5553,7 +5342,8 @@ msgstr "Definir como não avaliado"
 msgid "Remove any ratings"
 msgstr "Remove avaliação"
 
-#: src/Resources.vala:262
+#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "_Rejeitada"
 
@@ -5573,7 +5363,8 @@ msgstr "Definir como rejeitada"
 msgid "Set rating to rejected"
 msgstr "Avaliar como rejeitada"
 
-#: src/Resources.vala:268
+#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
 msgid "Rejected _Only"
 msgstr "Rejeitada _apenas"
 
@@ -5585,7 +5376,8 @@ msgstr "Rejeitadas apenas"
 msgid "Show only rejected photos"
 msgstr "Exibir apenas fotos rejeitadas"
 
-#: src/Resources.vala:272
+#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
 msgid "All + _Rejected"
 msgstr "Tudo + _rejeitadas"
 
@@ -5594,7 +5386,8 @@ msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Mostrar todas as fotos, inclusive as rejeitadas"
 
-#: src/Resources.vala:275
+#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
 msgid "_All Photos"
 msgstr "Todas as _fotos"
 
@@ -5603,7 +5396,8 @@ msgstr "Todas as _fotos"
 msgid "Show all photos"
 msgstr "Exibe todas fotos"
 
-#: src/Resources.vala:279
+#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Avaliações"
 
@@ -5611,7 +5405,8 @@ msgstr "_Avaliações"
 msgid "Display each photo’s rating"
 msgstr "Exibe as avaliações de cada foto"
 
-#: src/Resources.vala:282
+#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
 msgid "_Filter Photos"
 msgstr "_Filtrar fotos"
 
@@ -5623,10 +5418,6 @@ msgstr "Filtrar fotos"
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Limita o número de fotos mostradas com base num filtro"
 
-#: src/Resources.vala:286
-msgid "_Duplicate"
-msgstr "_Duplicar"
-
 #: src/Resources.vala:287
 msgid "Duplicate"
 msgstr "Duplicar"
@@ -5647,11 +5438,12 @@ msgstr "Im_primir…"
 msgid "Pu_blish…"
 msgstr "Pu_blicar…"
 
-#: src/Resources.vala:296
+#: src/Resources.vala:296 ui/collection.ui:187
 msgid "Publish to various websites"
 msgstr "Publicar para vários sites"
 
-#: src/Resources.vala:298
+#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
 msgid "Edit _Title…"
 msgstr "Editar _título…"
 
@@ -5661,7 +5453,9 @@ msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Editar título"
 
-#: src/Resources.vala:302
+#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539
+#: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344
 msgid "Edit _Comment…"
 msgstr "Editar _comentário…"
 
@@ -5670,23 +5464,24 @@ msgstr "Editar _comentário…"
 msgid "Edit Comment"
 msgstr "Editar comentário"
 
-#: src/Resources.vala:306
+#: src/Resources.vala:306 ui/event.ui:588
 msgid "Edit Event _Comment…"
 msgstr "Editar _comentário de evento…"
 
-#: src/Resources.vala:309
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
 msgid "_Adjust Date and Time…"
-msgstr "_Ajustar a data e hora…"
+msgstr "_Ajustar data e hora…"
 
 #: src/Resources.vala:310
 msgid "Adjust Date and Time"
 msgstr "Ajustar a data e hora"
 
-#: src/Resources.vala:312
+#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456
+#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388
 msgid "Add _Tags…"
 msgstr "Adicionar e_tiquetas…"
 
-#: src/Resources.vala:313
+#: src/Resources.vala:313 ui/photo_context.ui:17
 msgid "_Add Tags…"
 msgstr "_Adicionar etiquetas…"
 
@@ -5696,31 +5491,21 @@ msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Adicionar etiquetas"
 
-#: src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr "Abrir com o editor e_xterno"
-
-#: src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr "Abrir com editor de RA_W"
-
-#: src/Resources.vala:323
-msgid "Send _To…"
-msgstr "Enviar _para…"
-
-#: src/Resources.vala:324
+#: src/Resources.vala:324 ui/photo_context.ui:133
 msgid "Send T_o…"
-msgstr "Enviar pa_ra…"
+msgstr "Enviar p_ara…"
 
 #: src/Resources.vala:326
 msgid "_Find…"
 msgstr "_Localizar…"
 
-#: src/Resources.vala:327
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Localização"
 
-#: src/Resources.vala:328
+#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Encontre uma imagem digitando o texto que aparece em seu nome ou etiquetas"
@@ -5783,7 +5568,8 @@ msgstr "Renomear a etiqueta “%s” para “%s”"
 msgid "_Rename…"
 msgstr "_Renomear…"
 
-#: src/Resources.vala:375
+#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461
+#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393
 msgid "Modif_y Tags…"
 msgstr "_Modificar etiquetas…"
 
@@ -5794,51 +5580,39 @@ msgstr "Modificar etiquetas"
 #: src/Resources.vala:379
 #, c-format
 msgid "Tag Photo as “%s”"
-msgstr "Etiquetar fotos como “%s”"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Etiquetar foto como “%s”"
+msgstr[1] "Etiquetar fotos como “%s”"
 
-#: src/Resources.vala:379
-#, c-format
-msgid "Tag Photos as “%s”"
-msgstr "Etiquetar foto como “%s”"
-
-#: src/Resources.vala:383
+#: src/Resources.vala:385
 #, c-format
 msgid "Tag the selected photo as “%s”"
-msgstr "Etiquetar as fotos selecionadas como “%s”"
-
-#: src/Resources.vala:384
-#, c-format
-msgid "Tag the selected photos as “%s”"
-msgstr "Etiquetar as fotos selecionadas como “%s“"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "Etiquetar a foto selecionada como “%s”"
+msgstr[1] "Etiquetar as fotos selecionadas como “%s”"
 
-#: src/Resources.vala:388
+#: src/Resources.vala:391
 #, c-format
 msgid "Remove Tag “%s” From _Photo"
-msgstr "Remover etiqueta “%s” da _foto"
-
-#: src/Resources.vala:389
-#, c-format
-msgid "Remove Tag “%s” From _Photos"
-msgstr "Remover etiqueta “%s” das _fotos"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "Remover etiqueta “%s” da _foto"
+msgstr[1] "Remover etiqueta “%s” das _fotos"
 
-#: src/Resources.vala:393
+#: src/Resources.vala:397
 #, c-format
 msgid "Remove Tag “%s” From Photo"
-msgstr "Remove a etiqueta “%s” da foto"
-
-#: src/Resources.vala:394
-#, c-format
-msgid "Remove Tag “%s” From Photos"
-msgstr "Remove a etiqueta “%s” das fotos"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "Remove a etiqueta “%s” da foto"
+msgstr[1] "Remove a etiqueta “%s” das fotos"
 
-#: src/Resources.vala:398
+#: src/Resources.vala:403
 #, c-format
 msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr ""
 "Não foi possível renomear a etiqueta para “%s” pelo fato da etiqueta já "
 "existir."
 
-#: src/Resources.vala:402
+#: src/Resources.vala:407
 #, c-format
 msgid "Unable to rename search to “%s” because the search already exists."
 msgstr ""
@@ -5846,114 +5620,119 @@ msgstr ""
 "existir."
 
 #. Saved search button
-#: src/Resources.vala:405 src/SearchFilter.vala:1210
+#: src/Resources.vala:410 src/SearchFilter.vala:1125
 msgid "Saved Search"
 msgstr "Pesquisa salva"
 
-#: src/Resources.vala:407
+#: src/Resources.vala:412
 msgid "Delete Search"
 msgstr "Apagar pesquisa"
 
-#: src/Resources.vala:410
+#: src/Resources.vala:415 ui/savedsearch.ui:12
 msgid "_Edit…"
 msgstr "_Editar…"
 
-#: src/Resources.vala:411
+#: src/Resources.vala:416 ui/savedsearch.ui:8
 msgid "Re_name…"
 msgstr "Re_nomear…"
 
-#: src/Resources.vala:414
+#: src/Resources.vala:419
 #, c-format
 msgid "Rename Search “%s” to “%s”"
 msgstr "Renomeia a pesquisa “%s” para “%s”"
 
-#: src/Resources.vala:418
+#: src/Resources.vala:423
 #, c-format
 msgid "Delete Search “%s”"
 msgstr "Apagar pesquisa “%s”"
 
-#: src/Resources.vala:576
+#: src/Resources.vala:560
 #, c-format
 msgid "Rate %s"
 msgstr "Avaliar %s"
 
-#: src/Resources.vala:577
+#: src/Resources.vala:561
 #, c-format
 msgid "Set rating to %s"
 msgstr "Avaliar como %s"
 
-#: src/Resources.vala:578
+#: src/Resources.vala:562
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Avaliando como %s"
 
-#: src/Resources.vala:580
+#: src/Resources.vala:564
 #, c-format
 msgid "Display %s"
 msgstr "Mostra %s"
 
-#: src/Resources.vala:581
+#: src/Resources.vala:565
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Mostra somente as fotos com avaliação de %s"
 
-#: src/Resources.vala:582
+#: src/Resources.vala:566
 #, c-format
 msgid "%s or Better"
 msgstr "%s ou melhor"
 
-#: src/Resources.vala:583
+#: src/Resources.vala:567
 #, c-format
 msgid "Display %s or Better"
 msgstr "Mostrar %s ou melhor"
 
-#: src/Resources.vala:584
+#: src/Resources.vala:568
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Mostra somente as fotos com avaliação de %s ou melhor"
 
-#: src/Resources.vala:675
+#: src/Resources.vala:659 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Remover as fotos selecionadas para a lixeira"
 
-#: src/Resources.vala:676
+#: src/Resources.vala:660 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Remover as fotos selecionadas da biblioteca"
 
-#: src/Resources.vala:678
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Restaurar"
 
-#: src/Resources.vala:679
+#: src/Resources.vala:663 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Mover as fotos selecionadas para a biblioteca"
 
-#: src/Resources.vala:681
+#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:21
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27
+#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Abrir com o gerenciador de a_rquivos"
 
-#: src/Resources.vala:682
+#: src/Resources.vala:666
 msgid "Open the selected photo’s directory in the file manager"
 msgstr "Abre o diretório da foto selecionada no gerenciador de arquivos"
 
-#: src/Resources.vala:685
+#: src/Resources.vala:669
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Não foi possível abrir no gerenciador de arquivos: %s"
 
-#: src/Resources.vala:688
+#: src/Resources.vala:672 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr "R_emover da biblioteca"
 
-#: src/Resources.vala:690
+#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569
+#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "_Mover para a lixeira"
 
-#: src/Resources.vala:692
+#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
 msgid "Select _All"
 msgstr "Selecionar _todas"
 
-#: src/Resources.vala:693
+#: src/Resources.vala:677
 msgid "Select all items"
 msgstr "Selecionar todos os itens"
 
@@ -5966,14 +5745,14 @@ msgstr "Selecionar todos os itens"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:782
+#: src/Resources.vala:766
 msgid "%a %b %d, %Y"
 msgstr "%a, %d de %b de %Y"
 
 #. / Locale-specific starting date format for multi-date strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:787
+#: src/Resources.vala:771
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
@@ -5981,7 +5760,7 @@ msgstr "%a, %d de %b"
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:792
+#: src/Resources.vala:776
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
@@ -5989,7 +5768,7 @@ msgstr "%d, %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:797
+#: src/Resources.vala:781
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a, %d de %b"
@@ -5997,7 +5776,7 @@ msgstr "%a, %d de %b"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:802
+#: src/Resources.vala:786
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a, %d de %b de %Y"
@@ -6011,139 +5790,139 @@ msgid "Saved Searches"
 msgstr "Pesquisas salvas"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
 msgstr "contém"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:169
-#: src/searches/SavedSearchDialog.vala:500
+#: src/searches/SavedSearchDialog.vala:163
+#: src/searches/SavedSearchDialog.vala:494
 msgid "is exactly"
 msgstr "é exatamente"
 
-#: src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:164
 msgid "starts with"
 msgstr "inicia com"
 
-#: src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:165
 msgid "ends with"
 msgstr "termina com"
 
-#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:166
 msgid "does not contain"
 msgstr "não contém"
 
-#: src/searches/SavedSearchDialog.vala:173
-#: src/searches/SavedSearchDialog.vala:504
+#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:498
 msgid "is not set"
 msgstr "não está definido"
 
-#: src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:168
 msgid "is set"
 msgstr "está definido"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:248
-#: src/searches/SavedSearchDialog.vala:379
-#: src/searches/SavedSearchDialog.vala:444
+#: src/searches/SavedSearchDialog.vala:242
+#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:438
 msgid "is"
 msgstr "é"
 
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:243
 msgid "is not"
 msgstr "não é"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:249
 msgid "any photo"
 msgstr "qualquer foto"
 
-#: src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:250
 msgid "a raw photo"
 msgstr "uma foto raw"
 
-#: src/searches/SavedSearchDialog.vala:257
+#: src/searches/SavedSearchDialog.vala:251
 msgid "a video"
 msgstr "um vídeo"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:305
 msgid "has"
 msgstr "tem"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:306
 msgid "has no"
 msgstr "não tem"
 
-#: src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:311
 msgid "modifications"
 msgstr "modificações"
 
-#: src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:312
 msgid "internal modifications"
 msgstr "modificações internas"
 
-#: src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:313
 msgid "external modifications"
 msgstr "modificações externas"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:367
 msgid "flagged"
 msgstr "marcada"
 
-#: src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:368
 msgid "not flagged"
 msgstr "não marcada"
 
-#: src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:431
 msgid "and higher"
 msgstr "e maior"
 
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:432
 msgid "only"
 msgstr "somente"
 
-#: src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:433
 msgid "and lower"
 msgstr "e baixo"
 
-#: src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:495
 msgid "is after"
 msgstr "é depois"
 
-#: src/searches/SavedSearchDialog.vala:502
+#: src/searches/SavedSearchDialog.vala:496
 msgid "is before"
 msgstr "é antes"
 
-#: src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:497
 msgid "is between"
 msgstr "é entre"
 
-#: src/searches/SavedSearchDialog.vala:516
+#: src/searches/SavedSearchDialog.vala:510
 msgid "and"
 msgstr "e"
 
-#: src/searches/SavedSearchDialog.vala:697
+#: src/searches/SavedSearchDialog.vala:691
 msgid "Search"
 msgstr "Pesquisa"
 
-#: src/searches/SavedSearchDialog.vala:702
+#: src/searches/SavedSearchDialog.vala:696
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/searches/SavedSearchDialog.vala:703
+#: src/searches/SavedSearchDialog.vala:697
 msgid "OK"
 msgstr "OK"
 
-#: src/searches/SavedSearchDialog.vala:721
+#: src/searches/SavedSearchDialog.vala:716
 msgid "any"
 msgstr "qualquer"
 
-#: src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:717
 msgid "all"
 msgstr "todos"
 
-#: src/searches/SavedSearchDialog.vala:723
+#: src/searches/SavedSearchDialog.vala:718
 msgid "none"
 msgstr "nenhum"
 
@@ -6183,8 +5962,8 @@ msgstr "Marcada"
 msgid "Photo state"
 msgstr "Estado da foto"
 
-#. Rating button
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1115
 msgid "Rating"
 msgstr "Avaliação"
 
@@ -6192,45 +5971,57 @@ msgstr "Avaliação"
 msgid "Date"
 msgstr "Data"
 
-#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
-msgid "Videos"
-msgstr "Vídeos"
+#: src/SearchFilter.vala:815
+msgid "★+ Rating"
+msgstr "★+ Avaliação"
 
-#: src/SearchFilter.vala:620
-msgid "RAW Photos"
-msgstr "Fotos RAW"
+#: src/SearchFilter.vala:818
+msgid "★★+ Rating"
+msgstr "★★+ Avaliação"
 
-#: src/SearchFilter.vala:621
-msgid "RAW photos"
-msgstr "Fotos RAW"
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
+msgstr "★★★+ Avaliação"
+
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
+msgstr "★★★★+ Avaliação"
+
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr "★★★★★+ Avaliação"
 
-#: src/SearchFilter.vala:1148
+#: src/SearchFilter.vala:1065
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Erro ao carregar arquivo de UI %s: %s"
+msgid "Error loading search bar UI: %s"
+msgstr "Erro ao carregar barra de pesquisa de UI: %s"
 
 #. Ticket #3260 - Add a 'close' context menu to
 #. the searchbar.
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:1159
+#: src/SearchFilter.vala:1074
 msgid "Close"
 msgstr "Fechar"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1165
+#: src/SearchFilter.vala:1080
 msgid "Type"
 msgstr "Tipo"
 
-#: src/SearchFilter.vala:1211
+#: src/SearchFilter.vala:1087
+msgid "Videos"
+msgstr "Vídeos"
+
+#: src/SearchFilter.vala:1090
+msgid "RAW Photos"
+msgstr "Fotos RAW"
+
+#: src/SearchFilter.vala:1126
 msgid "Use a saved search to filter items in the current view"
 msgstr "Use uma pesquisa salva para filtrar itens na visão atual"
 
-#: src/sidebar/Tree.vala:203
-msgid "New _Tag…"
-msgstr "Nova etique_ta…"
-
 #: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Configurações"
@@ -6300,13 +6091,232 @@ msgstr "Etiquetas"
 
 #: src/Tag.vala:830
 msgid "untitled"
-msgstr "sem título"
+msgstr "Sem título"
 
 #. multiple videos
-#: src/VideoSupport.vala:490
+#: src/VideoSupport.vala:507
 msgid "Export Videos"
 msgstr "Exportar vídeos"
 
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr "Alternar _marca"
+
+#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351
+#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351
+msgid "_Developer"
+msgstr "_Desenvolvedor"
+
+#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
+msgid "Open with E_xternal Editor"
+msgstr "Abrir com editor e_xterno"
+
+#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379
+#: ui/photo_context.ui:124 ui/tags.ui:379
+msgid "View Eve_nt for Photo"
+msgstr "Ver eve_nto para foto"
+
+#: ui/direct_context.ui:7
+msgid "DirectContextMenu"
+msgstr "DirectContextMenu"
+
+#: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5
+#: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5
+#: ui/top.ui:5 ui/trash.ui:5
+msgid "_File"
+msgstr "_Arquivo"
+
+#: ui/direct.ui:13 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 ui/tags.ui:17
+msgid "Save _As…"
+msgstr "Salvar _como…"
+
+#: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99
+#: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78
+#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87
+msgid "_View"
+msgstr "_Ver"
+
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "Adaptar à _Página"
+
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "Ampliação _100%"
+
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "Ampliação _200%"
+
+#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+msgid "_Photo"
+msgstr "_Foto"
+
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "Foto a_nterior"
+
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "Próxi_ma foto"
+
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "F_erramentas"
+
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188
+#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "Perguntas _frequentes (FAQ)"
+
+#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:430
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:413 ui/offline.ui:192
+#: ui/photo.ui:396 ui/tags.ui:432 ui/trash.ui:201
+msgid "_Report a Problem…"
+msgstr "_Relate um problema…"
+
+#: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
+#: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
+msgid "_Import from Folder…"
+msgstr "_Importar da pasta…"
+
+#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
+#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13
+#: ui/trash.ui:13
+msgid "Import From _Application…"
+msgstr "Importação de _aplicativo…"
+
+#: ui/events_directory.ui:19 ui/event.ui:34 ui/import_queue.ui:25
+#: ui/import.ui:27 ui/media.ui:34 ui/offline.ui:19 ui/photo.ui:42 ui/tags.ui:34
+#: ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242
+msgid "Empty T_rash"
+msgstr "Esvaziar l_ixeira"
+
+#: ui/events_directory.ui:47 ui/event.ui:62 ui/import.ui:55 ui/media.ui:62
+#: ui/offline.ui:47 ui/tags.ui:62 ui/trash.ui:52
+msgid "_Find"
+msgstr "_Localizar"
+
+#: ui/events_directory.ui:51 ui/event.ui:66 ui/media.ui:66 ui/offline.ui:51
+#: ui/photo.ui:70 ui/search_sidebar_context.ui:6
+#: ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56
+msgid "Ne_w Saved Search…"
+msgstr "No_va pesquisa salva…"
+
+#: ui/events_directory.ui:74 ui/event.ui:102 ui/import_queue.ui:41
+#: ui/import.ui:77 ui/media.ui:102 ui/offline.ui:81 ui/photo.ui:98
+#: ui/tags.ui:102 ui/trash.ui:90
+msgid "_Basic Information"
+msgstr "Informações _básicas"
+
+#: ui/events_directory.ui:79 ui/event.ui:107 ui/import.ui:82 ui/media.ui:107
+#: ui/offline.ui:86 ui/photo.ui:103 ui/tags.ui:107 ui/trash.ui:95
+msgid "E_xtended Information"
+msgstr "Informações _estendidas"
+
+#: ui/events_directory.ui:84 ui/event.ui:112 ui/import.ui:87 ui/media.ui:112
+#: ui/offline.ui:91 ui/tags.ui:112 ui/trash.ui:100
+msgid "_Search Bar"
+msgstr "Barra de pe_squisa"
+
+#: ui/events_directory.ui:89 ui/event.ui:117 ui/import.ui:92 ui/media.ui:117
+#: ui/offline.ui:96 ui/photo.ui:108 ui/tags.ui:117 ui/trash.ui:105
+msgid "S_idebar"
+msgstr "Ba_rra lateral"
+
+#: ui/events_directory.ui:94 ui/event.ui:122 ui/import.ui:97 ui/media.ui:122
+#: ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110
+msgid "T_oolbar"
+msgstr "Barra de _ferramentas"
+
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Comentários"
+
+#: ui/events_directory.ui:108 ui/event.ui:243 ui/import_queue.ui:48
+#: ui/import.ui:166 ui/media.ui:243 ui/offline.ui:163 ui/photo.ui:127
+#: ui/tags.ui:243 ui/trash.ui:172
+msgid "Sort _Events"
+msgstr "Ordenar _eventos"
+
+#: ui/events_directory.ui:111 ui/event.ui:231 ui/event.ui:246
+#: ui/import_queue.ui:51 ui/import.ui:169 ui/media.ui:231 ui/media.ui:246
+#: ui/offline.ui:166 ui/photo.ui:130 ui/tags.ui:231 ui/tags.ui:246
+#: ui/trash.ui:175
+msgid "_Ascending"
+msgstr "_Ascendente"
+
+#: ui/events_directory.ui:116 ui/event.ui:236 ui/import_queue.ui:56
+#: ui/media.ui:236 ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180
+msgid "D_escending"
+msgstr "D_escendente"
+
+#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
+#: ui/top.ui:30
+msgid "Even_ts"
+msgstr "Even_tos"
+
+#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
+#: ui/photo.ui:77 ui/tags.ui:74
+msgid "R_emove from Library"
+msgstr "R_emover da biblioteca"
+
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "_Títulos"
+
+#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385
+#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35
+msgid "Ta_gs"
+msgstr "Eti_quetas"
+
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "Ordenar _fotos"
+
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "Por _título"
+
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "Por _nome de arquivo"
+
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "Por _data de exposição"
+
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "Por _avaliação"
+
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+msgid "_Descending"
+msgstr "_Descendente"
+
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25
+msgid "_Photos"
+msgstr "_Fotos"
+
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "Pa_rar importação"
+
+#: ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr "Importar _selecionadas"
+
+#: ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "Importar _todas"
+
+#: ui/savedsearch.ui:5
+msgid "SearchContextMenu"
+msgstr "SearchContextMenu"
+
 #: ui/set_background_dialog.ui:15
 msgid "Set as Desktop Background"
 msgstr "Definir como plano de fundo da área de trabalho"
@@ -6315,7 +6325,7 @@ msgstr "Definir como plano de fundo da área de trabalho"
 msgid "Use for Desktop"
 msgstr "Usar para área de trabalho"
 
-#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:92 ui/set_background_slideshow_dialog.ui:148
 msgid "Use for Lock Screen"
 msgstr "Usar para tela de bloqueio"
 
@@ -6440,130 +6450,885 @@ msgstr "Importando"
 msgid "_Directory structure:"
 msgstr "Estrutura de _diretório:"
 
-#: ui/shotwell.ui:1009
+#: ui/shotwell.ui:1012
 msgid "_Pattern:"
 msgstr "_Padrão:"
 
-#: ui/shotwell.ui:1091
+#: ui/shotwell.ui:1094
 msgid "Example:"
 msgstr "Exemplo:"
 
-#: ui/shotwell.ui:1108
+#: ui/shotwell.ui:1111
 msgid "R_ename imported files to lowercase"
 msgstr "R_enomear arquivos importados para letra minúscula"
 
-#: ui/shotwell.ui:1137
+#: ui/shotwell.ui:1140
 msgid "RAW Developer"
 msgstr "Desenvolvedor RAW"
 
-#: ui/shotwell.ui:1172
+#: ui/shotwell.ui:1175
 msgid "De_fault:"
 msgstr "Pa_drão:"
 
-#: ui/shotwell.ui:1226
+#: ui/shotwell.ui:1229
 msgid "E_xternal photo editor:"
 msgstr "Editor de foto e_xterno:"
 
-#: ui/shotwell.ui:1242
+#: ui/shotwell.ui:1245
 msgid "External _RAW editor:"
 msgstr "Editor _RAW externo:"
 
-#: ui/shotwell.ui:1307
+#: ui/shotwell.ui:1310
 msgid "External Editors"
 msgstr "Editores externos"
 
-#: ui/shotwell.ui:1334
+#: ui/shotwell.ui:1337
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ui/shotwell.ui:1400
+#: ui/shotwell.ui:1403
 msgid "_Delay:"
 msgstr "A_traso:"
 
-#: ui/shotwell.ui:1416
+#: ui/shotwell.ui:1419
 msgid "_Transition effect:"
 msgstr "Efeito de _transição:"
 
-#: ui/shotwell.ui:1432
+#: ui/shotwell.ui:1435
 msgid "Transition d_elay:"
 msgstr "A_traso de transição:"
 
-#: ui/shotwell.ui:1444
+#: ui/shotwell.ui:1447
 msgid "Show t_itle"
 msgstr "Mostrar títul_o"
 
-#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
+#: ui/shotwell.ui:1537 ui/shotwell.ui:1550
 msgid "seconds"
 msgstr "segundos"
 
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nova etique_ta…"
+
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Apaga todas as fotos na lixeira"
+
+#~ msgid ""
+#~ "Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
+#~ "desktop. It allows you to import photos from your camera or disk, "
+#~ "organize them by date and subject matter, even ratings. It also offers "
+#~ "basic photo editing, like crop, red-eye correction, color adjustments, "
+#~ "and straighten. Shotwell's non-destructive photo editor does not alter "
+#~ "your master photos, making it easy to experiment and correct errors."
+#~ msgstr ""
+#~ "Shotwell é um organizador de fotos rápido e fácil de usar, projetado para "
+#~ "o ambiente GNOME. Ele permite que você importe fotos de sua câmera ou sue "
+#~ "disco, organize-os por data e assunto, e até mesmo avalie-as. Também "
+#~ "oferece edição básica de fotos, como corte, correção de olho vermelho, "
+#~ "ajuste de cor e correções. O editor de fotos não-destrutível do Shotwell "
+#~ "não altera suas fotos mestres, tornando mais fácil experimentar e "
+#~ "corrigir erros."
+
+#~ msgid ""
+#~ "True if a photo's rating should be displayed as overlaid trinket, false "
+#~ "otherwise."
+#~ msgstr ""
+#~ "Verdadeiro se a avaliação de uma foto deve ser exibida em sobreposição; "
+#~ "do contrário, falso."
+
+#~ msgid "Selection state of \"hide photos\" option"
+#~ msgstr "Estado de seleção da opção “ocultar fotos”"
+
+#~ msgid ""
+#~ "Last used selection state of the \"hide photos already imported\" option "
+#~ "in the import page."
+#~ msgstr ""
+#~ "Estado da última seleção usada da opção “ocultar fotos já importadas” na "
+#~ "página de importação."
+
+#~ msgid "Most-recently-used crop custom aspect ratio's numerator."
+#~ msgstr ""
+#~ "Numerador da proporção de aspecto personalizado de corte usado mais "
+#~ "recentemente."
+
+#~ msgid "Most-recently-used crop custom aspect ratio's denominator."
+#~ msgstr ""
+#~ "Denominador da proporção de aspecto personalizado de corte usado mais "
+#~ "recentemente."
+
+#~ msgid "_Login"
+#~ msgstr "A_utenticar"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "The file \"%s\" may not be supported by or may be too large for this "
+#~ "instance of Gallery3."
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "O arquivo “%s” pode não ter suporte no ou ser muito grande para essa "
+#~ "instalação do Gallery3."
+
+#~ msgid ""
+#~ "A file required for publishing is unavailable. Publishing to %s can't "
+#~ "continue."
+#~ msgstr ""
+#~ "Um arquivo necessário para a publicação não está disponível. A publicação "
+#~ "para %s não pode continuar."
+
 #~ msgid "Login"
 #~ msgstr "Iniciar sessão"
 
+#~ msgid "Copyright (C) 2013 rajce.net"
+#~ msgstr "Copyright (C) 2013 rajce.net"
+
+#~ msgid "500 x 375 pixels"
+#~ msgstr "500 x 375 pixels"
+
+#~ msgid "1024 x 768 pixels"
+#~ msgstr "1024 x 768 pixels"
+
+#~ msgid "1280 x 853 pixels"
+#~ msgstr "1280 x 853 pixels"
+
+#~ msgid "“%s” isn't a valid response to an OAuth authentication request"
+#~ msgstr "“%s” não é uma resposta válida para o pedido de autenticação OAuth"
+
+#~ msgid ""
+#~ "TumblrPublisher: start( ): can't start; this publisher is not restartable."
+#~ msgstr ""
+#~ "TumblrPublisher: start( ): não pode iniciar, o editor não é reiniciável."
+
+#~ msgid ""
+#~ "You are not currently logged into Facebook.\n"
+#~ "\n"
+#~ "If you don't yet have a Facebook account, you can create one during the "
+#~ "login process. During login, Shotwell Connect may ask you for permission "
+#~ "to upload photos and publish to your feed. These permissions are required "
+#~ "for Shotwell Connect to function."
+#~ msgstr ""
+#~ "Você atualmente não está conectado ao Facebook.\n"
+#~ "\n"
+#~ "Se você ainda não possui uma conta no Facebook, você pode criar uma "
+#~ "durante o processo de autenticação. Durante o processo, o Shotwell pode "
+#~ "perguntar você sobre permissão de envio de fotos e publicação para seus "
+#~ "feeds. Estas permissões são necessárias para o a conexão do Shotwell "
+#~ "funcionar."
+
+#~ msgid "Testing connection to Facebook..."
+#~ msgstr "Testando conexão com o Facebook…"
+
+#~ msgid "Creating album..."
+#~ msgstr "Criando álbum…"
+
+#~ msgid ""
+#~ "A file required for publishing is unavailable. Publishing to Facebook "
+#~ "can't continue."
+#~ msgstr ""
+#~ "O arquivo necessário para a publicação não está disponível. A publicação "
+#~ "para o Facebook não pode continuar."
+
+#~ msgid ""
+#~ "You are not currently logged into Flickr.\n"
+#~ "\n"
+#~ "Click Login to log into Flickr in your Web browser.  You will have to "
+#~ "authorize Shotwell Connect to link to your Flickr account."
+#~ msgstr ""
+#~ "Você não está conectado no Flickr.\n"
+#~ "\n"
+#~ "Clique em Login para entrar no Flickr no seu navegador de internet. Você "
+#~ "terá que autorizar o Shotwell para conectar a sua conta do Flickr."
+
+#~ msgid "Preparing for login..."
+#~ msgstr "Preparando para iniciar sessão…"
+
+#~ msgid ""
+#~ "A file required for publishing is unavailable. Publishing to Flickr can't "
+#~ "continue."
+#~ msgstr ""
+#~ "O arquivo necessário para a publicação não está disponível. A publicação "
+#~ "para o Flickr não pode continuar."
+
+#~ msgid "Verifying authorization..."
+#~ msgstr "Verificando autorização…"
+
+#~ msgid "2048 x 1536 pixels"
+#~ msgstr "2048 x 1536 pixels"
+
+#~ msgid "4096 x 3072 pixels"
+#~ msgstr "4096 x 3072 pixels"
+
+#~ msgid ""
+#~ "You are not currently logged into Picasa Web Albums.\n"
+#~ "\n"
+#~ "Click Login to log into Picasa Web Albums in your Web browser. You will "
+#~ "have to authorize Shotwell Connect to link to your Picasa Web Albums "
+#~ "account."
+#~ msgstr ""
+#~ "Você não está autenticado no Picasa Web Albums.\n"
+#~ "\n"
+#~ "Clique em Login para entrar no Picasa Web Albums em seu navegador. Você "
+#~ "terá que autorizar a conexão do Shotwell à sua conta Picasa Web Albums."
+
+#~ msgid ""
+#~ "A file required for publishing is unavailable. Publishing to Picasa can't "
+#~ "continue."
+#~ msgstr ""
+#~ "O arquivo necessário para a publicação não está disponível. A publicação "
+#~ "para o Picasa não pode continuar."
+
+#~ msgid "Small (640 x 480 pixels)"
+#~ msgstr "Pequeno (640 x 480 pixels)"
+
+#~ msgid "Medium (1024 x 768 pixels)"
+#~ msgstr "Médio (1024 x 768 pixels)"
+
+#~ msgid "Recommended (1600 x 1200 pixels)"
+#~ msgstr "Recomendado (1600 x 1200 pixels)"
+
+#~ msgid "Google+ (2048 x 1536 pixels)"
+#~ msgstr "Google+ (2048 x 1536 pixels)"
+
+#~ msgid "_Remember Password"
+#~ msgstr "Lemb_rar senha"
+
+#~ msgid "An _existing category:"
+#~ msgstr "Uma categoria _existente:"
+
+#~ msgid "Photos will be _visible by:"
+#~ msgstr "As fotos estarão _visíveis por:"
+
+#~ msgid "Photo size:"
+#~ msgstr "Tamanho da foto:"
+
+#~ msgid "within category:"
+#~ msgstr "com categoria:"
+
+#~ msgid "Album comment:"
+#~ msgstr "Comentário do álbum:"
+
+#~ msgid "Creating album %s..."
+#~ msgstr "Criando álbum %s…"
+
+#~ msgid ""
+#~ "A file required for publishing is unavailable. Publishing to Youtube "
+#~ "can't continue."
+#~ msgstr ""
+#~ "O arquivo necessário para a publicação não está disponível. A publicação "
+#~ "para o Youtube não pode continuar."
+
+#~ msgid "Videos will appear in '%s'"
+#~ msgstr "Os vídeos irão aparecer em “%s”"
+
+#~ msgid "_Contents"
+#~ msgstr "_Conteúdo"
+
+#~ msgid "_Report a Problem..."
+#~ msgstr "_Relate um Problema…"
+
+#~ msgid ""
+#~ "A fatal error occurred when accessing Shotwell's library.  Shotwell "
+#~ "cannot continue.\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Um erro fatal ocorreu ao acessar a biblioteca do Shotwell. O Shotwell não "
+#~ "pode continuar.\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Unable to unmount camera.  Try unmounting the camera from the file "
+#~ "manager."
+#~ msgstr ""
+#~ "Não foi possível desmontar a câmera. Tente desmontando a câmera no "
+#~ "gerenciador de arquivos."
+
+#~ msgid "Display the title of each photo"
+#~ msgstr "Exibe o título de cada foto"
+
+#~ msgid "Import the selected photos into your library"
+#~ msgstr "Importar as fotos selecionadas para a sua biblioteca"
+
+#~ msgid "Import all the photos into your library"
+#~ msgstr "Importar todas as fotos para sua biblioteca"
+
+#~ msgid ""
+#~ "Shotwell needs to unmount the camera from the filesystem in order to "
+#~ "access it.  Continue?"
+#~ msgstr ""
+#~ "Shotwell precisa desmontar a câmera do sistema de arquivos para acessá-"
+#~ "la.  Continuar?"
+
+#~ msgid ""
+#~ "The camera is locked by another application.  Shotwell can only access "
+#~ "the camera when it's unlocked.  Please close any other application using "
+#~ "the camera and try again."
+#~ msgstr ""
+#~ "A câmera está travada por outro aplicativo. O Shotwell somente pode "
+#~ "acessar a câmera quando ela está destravada. Por favor, feche qualquer "
+#~ "outro aplicativo que estiver usando a câmera e tente novamente."
+
+#~ msgid "Unmounting..."
+#~ msgstr "Desmontando…"
+
+#~ msgid "Starting import, please wait..."
+#~ msgstr "Iniciando importação, por favor, aguarde…"
+
+#~ msgid "Play a slideshow"
+#~ msgstr "Exibir apresentação de slides"
+
+#~ msgid "Move Tag \"%s\""
+#~ msgstr "Mover etiqueta “%s”"
+
+#~ msgid "Importing from %s can't continue because an error occurred:"
+#~ msgstr "A importação de %s não pode continuar porque ocorreu um erro:"
+
+#~ msgid "This will remove the tag \"%s\" from one photo.  Continue?"
+#~ msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+#~ msgstr[0] "Isto irá remover a etiqueta “%s” de uma foto. Continuar?"
+#~ msgstr[1] "Isto irá remover a etiqueta “%s” de %d fotos. Continuar?"
+
+#~ msgid "This will remove the saved search \"%s\".  Continue?"
+#~ msgstr "Isto irá remover a pesquisa salva “%s”. Continuar?"
+
+#~ msgid ""
+#~ "Shotwell couldn't create a file for editing this photo because you do not "
+#~ "have permission to write to %s."
+#~ msgstr ""
+#~ "O Shotwell não pôde criar um arquivo para edição desta foto pelo fato de "
+#~ "você não possuir permissão de gravação em %s."
+
+#~ msgid "Export metadata"
+#~ msgstr "Exportar metadados"
+
 #~ msgid "Save Details..."
-#~ msgstr "Salvar Detalhes..."
+#~ msgstr "Salvar Detalhes…"
+
+#~ msgid ""
+#~ "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#~ msgstr ""
+#~ "Arquivos não foram importados porque não foram reconhecidos como Fotos ou "
+#~ "Vídeos:"
+
+#~ msgid ""
+#~ "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+#~ "Understands:"
+#~ msgstr ""
+#~ "As Fotos/Vídeos Não foram Importados pois não estavam em um formato que o "
+#~ "Shotwell entendesse:"
+
+#~ msgid ""
+#~ "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+#~ "Library:"
+#~ msgstr ""
+#~ "As Fotos/Vídeos não foram importadas pois o Shotwell não pôde copiá-las "
+#~ "para sua Biblioteca:"
+
+#~ msgid ""
+#~ "couldn't copy %s\n"
+#~ "\tto %s"
+#~ msgstr ""
+#~ "não foi possível copiar %s\n"
+#~ "\tpara %s"
+
+#~ msgid "This will destroy all changes made to the external file.  Continue?"
+#~ msgid_plural ""
+#~ "This will destroy all changes made to %d external files.  Continue?"
+#~ msgstr[0] ""
+#~ "Isto irá destruir todas as alterações feitas para o arquivo externo. "
+#~ "Continuar?"
+#~ msgstr[1] ""
+#~ "Isto irá destruir todas as alterações feitas para %d arquivos externos. "
+#~ "Continuar?"
+
+#~ msgid "This will remove the photo from the library.  Continue?"
+#~ msgid_plural "This will remove %d photos from the library.  Continue?"
+#~ msgstr[0] "Isto irá remover a foto da biblioteca. Continuar?"
+#~ msgstr[1] "Isto irá remover %d fotos da biblioteca. Continuar?"
+
+#~ msgid "_Modify original photo files"
+#~ msgstr "_Modificar arquivos originais da foto"
+
+#~ msgid "_Modify original files"
+#~ msgstr "_Modificar arquivos originais"
+
+#~ msgid "_Don't show this message again"
+#~ msgstr "Não exibir mais es_ta mensagem"
+
+#~ msgid ""
+#~ "This will remove the photo/video from your Shotwell library.  Would you "
+#~ "also like to move the file to your desktop trash?\n"
+#~ "\n"
+#~ "This action cannot be undone."
+#~ msgid_plural ""
+#~ "This will remove %d photos/videos from your Shotwell library.  Would you "
+#~ "also like to move the files to your desktop trash?\n"
+#~ "\n"
+#~ "This action cannot be undone."
+#~ msgstr[0] ""
+#~ "Isto irá remover a foto/vídeo da sua biblioteca Shotwell. Você também "
+#~ "gostaria de mover este arquivo para lixeira?\n"
+#~ "\n"
+#~ "Essa ação não poderá ser desfeita."
+#~ msgstr[1] ""
+#~ "Isto irá remover %d fotos/vídeos da sua biblioteca Shotwell. Você também "
+#~ "gostaria de mover estes arquivos para lixeira?\n"
+#~ "\n"
+#~ "Essa ação não poderá ser desfeita."
+
+#~ msgid ""
+#~ "This will remove the video from your Shotwell library.  Would you also "
+#~ "like to move the file to your desktop trash?\n"
+#~ "\n"
+#~ "This action cannot be undone."
+#~ msgid_plural ""
+#~ "This will remove %d videos from your Shotwell library.  Would you also "
+#~ "like to move the files to your desktop trash?\n"
+#~ "\n"
+#~ "This action cannot be undone."
+#~ msgstr[0] ""
+#~ "Isto irá remover o vídeo da sua biblioteca Shotwell. Você também gostaria "
+#~ "de mover este arquivo para lixeira?\n"
+#~ "\n"
+#~ "Essa ação não poderá ser desfeita."
+#~ msgstr[1] ""
+#~ "Isto irá remover %d vídeos da sua biblioteca Shotwell. Você também "
+#~ "gostaria de mover estes arquivos para lixeira?\n"
+#~ "\n"
+#~ "Essa ação não poderá ser desfeita."
+
+#~ msgid ""
+#~ "This will remove the photo from your Shotwell library.  Would you also "
+#~ "like to move the file to your desktop trash?\n"
+#~ "\n"
+#~ "This action cannot be undone."
+#~ msgid_plural ""
+#~ "This will remove %d photos from your Shotwell library.  Would you also "
+#~ "like to move the files to your desktop trash?\n"
+#~ "\n"
+#~ "This action cannot be undone."
+#~ msgstr[0] ""
+#~ "Isto irá remover a foto da sua biblioteca do Shotwell. Você gostaria "
+#~ "também de mover o arquivo para a lixeira?\n"
+#~ "\n"
+#~ "Esta ação não poderá ser desfeita."
+#~ msgstr[1] ""
+#~ "Isto irá remover %d fotos da sua biblioteca do Shotwell. Você gostaria "
+#~ "também mover os arquivos para a lixeira?\n"
+#~ "\n"
+#~ "Esta ação não poderá ser desfeita."
+
+#~ msgid ""
+#~ "The photo or video cannot be moved to your desktop trash.  Delete this "
+#~ "file?"
+#~ msgid_plural ""
+#~ "%d photos/videos cannot be moved to your desktop trash.  Delete these "
+#~ "files?"
+#~ msgstr[0] ""
+#~ "A foto ou vídeo não pode ser movido para lixeira. Excluir esse arquivo?"
+#~ msgstr[1] ""
+#~ "%d fotos/vídeos não podem ser movidos para lixeira. Excluir esses "
+#~ "arquivos?"
+
+#~ msgid "Save photo"
+#~ msgstr "Salvar foto"
 
 #~ msgid "Save _As..."
-#~ msgstr "Salvar _como..."
+#~ msgstr "Salvar _como…"
+
+#~ msgid "Save photo with a different name"
+#~ msgstr "Salva a foto com um nome diferente"
+
+#~ msgid "Print the photo to a printer connected to your computer"
+#~ msgstr "Imprime a foto em uma impressora conectada em seu computador"
+
+#~ msgid "Previous Photo"
+#~ msgstr "Foto anterior"
+
+#~ msgid "Next Photo"
+#~ msgstr "Próxima foto"
+
+#~ msgid "Increase the magnification of the photo"
+#~ msgstr "Aumentar a ampliação da foto"
+
+#~ msgid "Decrease the magnification of the photo"
+#~ msgstr "Diminuir a ampliação da foto"
+
+#~ msgid "Zoom the photo to fit on the screen"
+#~ msgstr "Ampliar a foto para se adaptar à tela"
+
+#~ msgid "Zoom the photo to 100% magnification"
+#~ msgstr "Ampliar a foto em 100%"
+
+#~ msgid "Zoom the photo to 200% magnification"
+#~ msgstr "Ampliar a foto em 200%"
+
+#~ msgid "SD Video (4 : 3)"
+#~ msgstr "SD Video (4 : 3)"
+
+#~ msgid "HD Video (16 : 9)"
+#~ msgstr "HD Video (16 : 9)"
+
+#~ msgid "Wallet (2 x 3 in.)"
+#~ msgstr "Carteira (2 x 3 pol.)"
+
+#~ msgid "Notecard (3 x 5 in.)"
+#~ msgstr "Cartão de notas (3 x 5 pol.)"
+
+#~ msgid "4 x 6 in."
+#~ msgstr "4 x 6 pol."
+
+#~ msgid "5 x 7 in."
+#~ msgstr "5 x 7 pol."
+
+#~ msgid "8 x 10 in."
+#~ msgstr "8 x 10 pol."
+
+#~ msgid "Letter (8.5 x 11 in.)"
+#~ msgstr "Carta (8.5 x 11 in.)"
+
+#~ msgid "11 x 14 in."
+#~ msgstr "11 x 14 pol."
+
+#~ msgid "Tabloid (11 x 17 in.)"
+#~ msgstr "Tabloide (11 x 17 in.)"
+
+#~ msgid "16 x 20 in."
+#~ msgstr "16 x 20 pol."
+
+#~ msgid "Metric Wallet (9 x 13 cm)"
+#~ msgstr "Carteira Métrica (9 x 13 cm)"
+
+#~ msgid "Postcard (10 x 15 cm)"
+#~ msgstr "Cartão postal (10 x 15 cm)"
+
+#~ msgid "13 x 18 cm"
+#~ msgstr "13 x 18 cm"
+
+#~ msgid "18 x 24 cm"
+#~ msgstr "18 x 24 cm"
+
+#~ msgid "A4 (210 x 297 mm)"
+#~ msgstr "A4 (210 x 297 mm)"
+
+#~ msgid "20 x 30 cm"
+#~ msgstr "20 x 30 cm"
+
+#~ msgid "24 x 40 cm"
+#~ msgstr "24 x 40 cm"
+
+#~ msgid "30 x 40 cm"
+#~ msgstr "30 x 40 cm"
+
+#~ msgid "A3 (297 x 420 mm)"
+#~ msgstr "A4 (210 x 297 mm)"
+
+#~ msgid "Display the comment of each event"
+#~ msgstr "Exibir o comentário de cada evento"
+
+#~ msgid "File %s already exists.  Replace?"
+#~ msgstr "%s já existe. Sobrescrever?"
 
 #~ msgid "Importing..."
-#~ msgstr "Importando..."
+#~ msgstr "Importando…"
+
+#~ msgid "Stop importing photos"
+#~ msgstr "Parar importação de fotos"
 
 #~ msgid "Preparing to import..."
-#~ msgstr "Preparando para importar..."
+#~ msgstr "Preparando para importar…"
 
 #~ msgid "_Import From Folder..."
-#~ msgstr "_Importar da pasta..."
+#~ msgstr "_Importar da pasta…"
+
+#~ msgid "Import photos from disk to library"
+#~ msgstr "Importar fotos do disco para a biblioteca"
 
 #~ msgid "Import From _Application..."
-#~ msgstr "Importação de _aplicativo..."
+#~ msgstr "Importação de _aplicativo…"
+
+#~ msgid "Find photos and videos by search criteria"
+#~ msgstr "Localiza fotos e vídeos através de pesquisa"
+
+#~ msgid "Ne_w Saved Search..."
+#~ msgstr "No_va pesquisa salva…"
+
+#~ msgid "Display basic information for the selection"
+#~ msgstr "Exibe informações básicas para a seleção"
+
+#~ msgid "Display extended information for the selection"
+#~ msgstr "Exibe informações estendidas para a seleção"
+
+#~ msgid "Display the search bar"
+#~ msgstr "Exibe a barra de pesquisa"
+
+#~ msgid "Display the sidebar"
+#~ msgstr "Exibe a barra lateral"
+
+#~ msgid "Display the tool bar"
+#~ msgstr "Exibe a barra ferramentas"
+
+#~ msgid "Sort photos in an ascending order"
+#~ msgstr "Ordena as fotos em ordem ascendente"
+
+#~ msgid "Sort photos in a descending order"
+#~ msgstr "Ordena as fotos em ordem descendente"
+
+#~ msgid "Emptying Trash..."
+#~ msgstr "Esvaziando lixeira…"
+
+#~ msgid "Updating library..."
+#~ msgstr "Atualizando biblioteca…"
+
+#~ msgid "Preparing to auto-import photos..."
+#~ msgstr "Preparando para auto-importação de fotos…"
+
+#~ msgid "Auto-importing photos..."
+#~ msgstr "Auto-importação de fotos…"
+
+#~ msgid "Writing metadata to files..."
+#~ msgstr "Escrevendo metadados para arquivos…"
+
+#~ msgid "Deleting..."
+#~ msgstr "Apagando…"
+
+#~ msgid ""
+#~ "Your photo library is not compatible with this version of Shotwell.  It "
+#~ "appears it was created by Shotwell %s (schema %d).  This version is %s "
+#~ "(schema %d).  Please use the latest version of Shotwell."
+#~ msgstr ""
+#~ "Sua biblioteca de fotos não é compatível com essa versão do Shotwell.  "
+#~ "Parece que ele foi criado pelo Shotwell %s (schema %d).  Essa versão é %s "
+#~ "(schema %d).  Por favor use a última versão do Shotwell."
+
+#~ msgid ""
+#~ "Shotwell was unable to upgrade your photo library from version %s (schema "
+#~ "%d) to %s (schema %d).  For more information please check the Shotwell "
+#~ "Wiki at %s"
+#~ msgstr ""
+#~ "O Shotwell não foi capaz de atualizar sua biblioteca de fotos da versão "
+#~ "%s (schema %d) para %s (schema %d).  Para maiores informações consulte o "
+#~ "Wiki do Shotwell Wiki em %s"
+
+#~ msgid ""
+#~ "Your photo library is not compatible with this version of Shotwell.  It "
+#~ "appears it was created by Shotwell %s (schema %d).  This version is %s "
+#~ "(schema %d).  Please clear your library by deleting %s and re-import your "
+#~ "photos."
+#~ msgstr ""
+#~ "Sua biblioteca de fotos não é compatível com essa versão do Shotwell.  "
+#~ "Parece que ele foi criado pelo Shotwell %s (schema %d).  Essa versão é %s "
+#~ "(schema %d).  Por favor limpe sua biblioteca excluindo %s e importe "
+#~ "novamente suas fotos."
+
+#~ msgid "Unknown error attempting to verify Shotwell's database: %s"
+#~ msgstr ""
+#~ "Erro desconhecido ao tentar verificar o banco de dados do Shotwell: %s"
+
+#~ msgid "Path to Shotwell's private data"
+#~ msgstr "Caminho para os dados privados do Shotwell"
+
+#~ msgid "Don't display startup progress meter"
+#~ msgstr "Não exibe a medida do progresso de inicialização"
+
+#~ msgid "Show the application's version"
+#~ msgstr "Exibe a versão do aplicativo"
+
+#~ msgid ""
+#~ "Run '%s --help' to see a full list of available command line options.\n"
+#~ msgstr ""
+#~ "Digite “%s --help” para ver a lista completa das opções de linha de "
+#~ "comando.\n"
+
+#~ msgid "Increase the magnification of the thumbnails"
+#~ msgstr "Aumentar a ampliação das miniaturas"
+
+#~ msgid "Decrease the magnification of the thumbnails"
+#~ msgstr "Diminuir a ampliação das miniaturas"
+
+#~ msgid "_Play Video"
+#~ msgstr "_Reproduzir vídeo"
+
+#~ msgid "Open the selected videos in the system video player"
+#~ msgstr "Abra os vídeos selecionados no reprodutor de vídeo do sistema"
+
+#~ msgid "Display the comment of each photo"
+#~ msgstr "Exibe o comentário de cada foto"
+
+#~ msgid "Display each photo's tags"
+#~ msgstr "Exibe as etiquetas de cada foto"
+
+#~ msgid "Sort photos by title"
+#~ msgstr "Ordena as fotos por título"
+
+#~ msgid "Sort photos by exposure date"
+#~ msgstr "Ordena as fotos por data de exposição"
+
+#~ msgid "Sort photos by rating"
+#~ msgstr "Ordena as fotos por avaliação"
+
+#~ msgid "Sort photos by filename"
+#~ msgstr "Ordena as fotos por nome do arquivo"
+
+#~ msgid "Printing..."
+#~ msgstr "Imprimindo…"
+
+#~ msgid "Publishing to %s can't continue because an error occurred:"
+#~ msgstr "A publicação para %s não pôde continuar, ocorreu um erro:"
+
+#~ msgid "The selected videos were successfully published."
+#~ msgstr "Os vídeos selecionados foram publicados com sucesso."
+
+#~ msgid "The selected photos were successfully published."
+#~ msgstr "As fotos selecionadas foram publicadas com sucesso."
+
+#~ msgid "The selected photo was successfully published."
+#~ msgstr "A foto selecionada foi publicada com sucesso."
+
+#~ msgid "Fetching account information..."
+#~ msgstr "Obtendo informação da conta…"
+
+#~ msgid "Logging in..."
+#~ msgstr "Autenticando…"
+
+#~ msgid "Automatically improve the photo's appearance"
+#~ msgstr "Melhora automaticamente a aparência da foto"
+
+#~ msgid "Crop the photo's size"
+#~ msgstr "Corta o tamanho da foto"
+
+#~ msgid "Adjust the photo's color and tone"
+#~ msgstr "Ajusta a cor e os tons das fotos"
 
 #~ msgid "Set as _Desktop Slideshow..."
-#~ msgstr "Definir como apresentação de sli_des da área de trabalho..."
+#~ msgstr "Definir como apresentação de sli_des da área de trabalho…"
 
 #~ msgid "Re_name Event..."
-#~ msgstr "Re_nomear evento..."
+#~ msgstr "Re_nomear evento…"
+
+#~ msgid "Display each photo's rating"
+#~ msgstr "Exibe as avaliações de cada foto"
 
 #~ msgid "_Export..."
-#~ msgstr "_Exportar..."
+#~ msgstr "_Exportar…"
 
 #~ msgid "_Print..."
-#~ msgstr "Imprimi_r..."
+#~ msgstr "Imprimi_r…"
 
 #~ msgid "Pu_blish..."
-#~ msgstr "Pu_blicar..."
+#~ msgstr "Pu_blicar…"
 
 #~ msgid "Edit _Title..."
-#~ msgstr "Editar _título..."
+#~ msgstr "Editar _título…"
 
 #~ msgid "Edit _Comment..."
-#~ msgstr "Editar _comentário..."
+#~ msgstr "Editar _comentário…"
 
 #~ msgid "Edit Event _Comment..."
-#~ msgstr "Editar _comentário de evento..."
+#~ msgstr "Editar _comentário de evento…"
 
 #~ msgid "_Adjust Date and Time..."
-#~ msgstr "_Ajustar data e hora..."
+#~ msgstr "_Ajustar data e hora…"
 
 #~ msgid "Add _Tags..."
-#~ msgstr "Adicionar e_tiquetas..."
+#~ msgstr "Adicionar e_tiquetas…"
 
 #~ msgid "_Add Tags..."
-#~ msgstr "_Adicionar etiquetas..."
+#~ msgstr "_Adicionar etiquetas…"
 
 #~ msgid "Send _To..."
-#~ msgstr "Enviar _para..."
+#~ msgstr "Enviar _para…"
 
 #~ msgid "Send T_o..."
-#~ msgstr "Enviar p_ara..."
+#~ msgstr "Enviar p_ara…"
 
 #~ msgid "_Find..."
-#~ msgstr "_Localizar..."
+#~ msgstr "_Localizar…"
+
+#~ msgid "Add Tag \"%s\""
+#~ msgstr "Adicionar etiqueta “%s”"
+
+#~ msgid "Add Tags \"%s\" and \"%s\""
+#~ msgstr "Adicionar etiquetas “%s” e “%s”"
+
+#~ msgid "_Delete Tag \"%s\""
+#~ msgstr "A_pagar etiqueta “%s”"
+
+#~ msgid "Delete Tag \"%s\""
+#~ msgstr "Apagar etiqueta “%s”"
+
+#~ msgid "Re_name Tag \"%s\"..."
+#~ msgstr "Re_nomear etiqueta “%s”…"
+
+#~ msgid "Rename Tag \"%s\" to \"%s\""
+#~ msgstr "Renomear a etiqueta “%s” para “%s”"
+
+#~ msgid "_Rename..."
+#~ msgstr "_Renomear…"
 
 #~ msgid "Modif_y Tags..."
-#~ msgstr "_Modificar etiquetas..."
+#~ msgstr "_Modificar etiquetas…"
+
+#~ msgid "Tag Photo as \"%s\""
+#~ msgstr "Etiquetar fotos como “%s”"
+
+#~ msgid "Tag Photos as \"%s\""
+#~ msgstr "Etiquetar foto como “%s”"
+
+#~ msgid "Tag the selected photo as \"%s\""
+#~ msgstr "Etiquetar as fotos selecionadas como “%s”"
+
+#~ msgid "Tag the selected photos as \"%s\""
+#~ msgstr "Etiquetar as fotos selecionadas como “%s”"
+
+#~ msgid "Remove Tag \"%s\" From _Photo"
+#~ msgstr "Remover etiqueta “%s” da _foto"
+
+#~ msgid "Remove Tag \"%s\" From _Photos"
+#~ msgstr "Remover etiqueta “%s” das _fotos"
+
+#~ msgid "Remove Tag \"%s\" From Photo"
+#~ msgstr "Remove a etiqueta “%s” da foto"
+
+#~ msgid "Remove Tag \"%s\" From Photos"
+#~ msgstr "Remove a etiqueta “%s” das fotos"
+
+#~ msgid "Unable to rename tag to \"%s\" because the tag already exists."
+#~ msgstr ""
+#~ "Não foi possível renomear a etiqueta para “%s” pelo fato da etiqueta já "
+#~ "existir."
+
+#~ msgid "Unable to rename search to \"%s\" because the search already exists."
+#~ msgstr ""
+#~ "Não foi possível renomear a pesquisa para “%s” pelo fato da pesquisa já "
+#~ "existir."
 
 #~ msgid "_Edit..."
-#~ msgstr "_Editar..."
+#~ msgstr "_Editar…"
+
+#~ msgid "Re_name..."
+#~ msgstr "Re_nomear…"
+
+#~ msgid "Rename Search \"%s\" to \"%s\""
+#~ msgstr "Renomeia a pesquisa “%s” para “%s”"
+
+#~ msgid "Delete Search \"%s\""
+#~ msgstr "Apagar pesquisa “%s”"
+
+#~ msgid "Open the selected photo's directory in the file manager"
+#~ msgstr "Abre o diretório da foto selecionada no gerenciador de arquivos"
+
+#~ msgid "RAW photos"
+#~ msgstr "Fotos RAW"
+
+#~ msgid "Error loading UI file %s: %s"
+#~ msgstr "Erro ao carregar arquivo de UI %s: %s"
+
+#~ msgid "New _Tag..."
+#~ msgstr "Nova etique_ta…"
 
 # Translated with 24-hour time - default in Brazil. i.e.: 20:31 -- Rafael
 #~ msgid "%-I:%M %p"
diff --git a/po/shotwell.pot b/po/shotwell.pot
index 69fa009..0ec2957 100644
--- a/po/shotwell.pot
+++ b/po/shotwell.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: shotwell 0.25.0\n"
+"Project-Id-Version: shotwell 0.25.1\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=Shotwell&component=Internationalization\n"
-"POT-Creation-Date: 2016-11-07 23:18+0100\n"
+"POT-Creation-Date: 2016-11-21 20:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,9 @@ msgstr ""
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300
+#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:354
+#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344
+#: ui/tags.ui:354
 msgid "Shotwell"
 msgstr ""
 
@@ -1215,7 +1217,7 @@ msgstr ""
 msgid "Visit the Shotwell home page"
 msgstr ""
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:679
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:602
 msgid "translator-credits"
 msgstr ""
 
@@ -1266,7 +1268,7 @@ msgid ""
 msgstr ""
 
 #: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
 msgid "A temporary file needed for publishing is unavailable"
 msgstr ""
 
@@ -1361,7 +1363,7 @@ msgstr ""
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1627
+#: ui/shotwell.ui:1464
 msgid "_Log in"
 msgstr ""
 
@@ -1387,9 +1389,9 @@ msgstr ""
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
 #: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:115
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:142
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229
@@ -1399,13 +1401,14 @@ msgstr ""
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
 #: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:129
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:156
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2456
 msgid "_Publish"
 msgstr ""
 
@@ -1431,7 +1434,7 @@ msgstr ""
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1329
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr ""
@@ -1514,51 +1517,50 @@ msgstr ""
 msgid " Site Not Found"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:49
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:43
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:49
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:43
 msgid "_Email address"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:59
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:53
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:59
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:73
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:53
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:103
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:97
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:125
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:118
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:101
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
 msgid "Log in"
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
 msgid "An _existing album:"
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:52
 msgid "A _new album named:"
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1005
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
 msgid "_Hide album"
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr ""
 
@@ -1582,14 +1584,14 @@ msgstr ""
 msgid "Invalid User Email or Password"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1012
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
 msgid "You are logged into Rajce as %s."
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
 #: plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:24
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
 msgid "Photos will appear in:"
 msgstr ""
 
@@ -1612,13 +1614,13 @@ msgstr ""
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1325
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1302
 msgid "500 × 375 pixels"
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1326
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr ""
 
@@ -1642,22 +1644,22 @@ msgid "Enter the username and password associated with your Tumblr account."
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1087
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
 msgid "Username and/or password invalid. Please try again"
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1121
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
 msgid "Invalid User Name or Password"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:634
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:752
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
 #, c-format
 msgid "Could not load UI: %s"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:734
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
 #, c-format
 msgid ""
 "You are logged into Tumblr as %s.\n"
@@ -1676,34 +1678,34 @@ msgstr ""
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
-msgid "_Albums (or write new):"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
-msgid "Access _type:"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
+msgid "Friends"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
-msgid "Disable _comments"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:498
+msgid "Private"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
-msgid "_Forbid downloading original photo"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:44
+msgid "_Albums (or write new):"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-msgid "Public"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:59
+msgid "Access _type:"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
-msgid "Friends"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:103
+msgid "Disable _comments"
 msgstr ""
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:120
+msgid "_Forbid downloading original photo"
 msgstr ""
 
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
@@ -1726,14 +1728,14 @@ msgstr ""
 #: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:226
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
 msgstr ""
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:62
 #: plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1209
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr ""
 
@@ -1796,7 +1798,7 @@ msgstr ""
 
 #: plugins/shotwell-publishing/FacebookPublishing.vala:1145
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1209
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1313
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr ""
 
@@ -1891,12 +1893,12 @@ msgid "Friends only"
 msgstr ""
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1327
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr ""
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1328
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr ""
 
@@ -1949,70 +1951,74 @@ msgid "Google+ (2048 × 1536 pixels)"
 msgstr ""
 
 #: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:752
 msgid "Original Size"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
 msgid "_URL of your Piwigo photo library"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
 msgid "User _name"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
-msgid "_Remember Password"
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+msgid "Remember Password"
+msgstr ""
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+msgid "An _existing category"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
-msgid "An _existing category:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+msgid "A _new album named"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
-msgid "Photos will be _visible by:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+msgid "within category"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
-msgid "Photo size:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
-msgid "within category:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+msgid "Photos will be _visible by"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
-msgid "Album comment:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
 msgid "_If a title is set and comment unset, use title as comment"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
 msgid "_Do no upload tags"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
 msgid "Logout"
 msgstr ""
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291
-#: src/Resources.vala:295
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:295 ui/collection.ui:190
 msgid "Publish"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:775
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
 msgid "Creating album %s…"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:948
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
 msgid "An error message occurred when publishing to Piwigo. Please try again."
 msgstr ""
 
 #. %s is the host name that we tried to connect to
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1024
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1030
 #, c-format
 msgid ""
 "This does not look like the real <b>%s</b>. Attackers might be trying to "
@@ -2020,35 +2026,45 @@ msgid ""
 "messages, credit card information, or passwords)."
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1085
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr ""
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:166
+msgid "_OK"
+msgstr ""
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1086
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1116
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1314
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1315
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1316
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1317
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr ""
 
@@ -2190,38 +2206,28 @@ msgstr ""
 msgid "Could not make directory %s writable: %s"
 msgstr ""
 
-#: src/AppWindow.vala:54
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr ""
 
-#: src/AppWindow.vala:55
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr ""
 
-#: src/AppWindow.vala:60
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr ""
 
-#: src/AppWindow.vala:499
-msgid "_Contents"
-msgstr ""
-
-#: src/AppWindow.vala:504
-msgid "_Frequently Asked Questions"
-msgstr ""
-
-#: src/AppWindow.vala:509
-msgid "_Report a Problem…"
-msgstr ""
-
-#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
-#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1441 src/Dialogs.vala:1464
-#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
+#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
+#: src/data_imports/DataImportsUI.vala:301
+#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1430 src/Dialogs.vala:1453
+#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
+#: src/Resources.vala:157
 msgid "_Cancel"
 msgstr ""
 
-#: src/AppWindow.vala:656
+#: src/AppWindow.vala:579
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2230,21 +2236,21 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/AppWindow.vala:676
+#: src/AppWindow.vala:599
 msgid "Visit the Shotwell web site"
 msgstr ""
 
-#: src/AppWindow.vala:688
+#: src/AppWindow.vala:611
 #, c-format
 msgid "Unable to display help: %s"
 msgstr ""
 
-#: src/AppWindow.vala:696
+#: src/AppWindow.vala:619
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr ""
 
-#: src/AppWindow.vala:704
+#: src/AppWindow.vala:627
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr ""
@@ -2315,12 +2321,13 @@ msgid "Cameras"
 msgstr ""
 
 #: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/MediaPage.vala:440
-#: src/photos/RawSupport.vala:303
+#: src/camera/ImportPage.vala:726 src/photos/RawSupport.vala:303
+#: ui/collection.ui:90 ui/event.ui:359 ui/event.ui:527 ui/media.ui:359
+#: ui/photo_context.ui:96 ui/photo.ui:349 ui/tags.ui:359
 msgid "Camera"
 msgstr ""
 
-#: src/camera/ImportPage.vala:311 src/Properties.vala:227
+#: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr ""
 
@@ -2346,173 +2353,225 @@ msgstr ""
 msgid "No new photos/videos found on camera"
 msgstr ""
 
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451
-msgid "_Titles"
-msgstr ""
-
-#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452
-msgid "Display the title of each photo"
-msgstr ""
-
-#: src/camera/ImportPage.vala:885
-msgid "Import _Selected"
-msgstr ""
-
-#: src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr ""
-
-#: src/camera/ImportPage.vala:891
-msgid "Import _All"
-msgstr ""
-
-#: src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr ""
-
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1013
+#: src/camera/ImportPage.vala:999
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1019
+#: src/camera/ImportPage.vala:1005
 msgid "_Unmount"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1024
+#: src/camera/ImportPage.vala:1010
 msgid "Please unmount the camera."
 msgstr ""
 
-#: src/camera/ImportPage.vala:1029
+#: src/camera/ImportPage.vala:1015
 msgid ""
 "The camera is locked by another application. Shotwell can only access the "
 "camera when it’s unlocked. Please close any other application using the "
 "camera and try again."
 msgstr ""
 
-#: src/camera/ImportPage.vala:1039
+#: src/camera/ImportPage.vala:1025
 msgid "Please close any other application using the camera."
 msgstr ""
 
-#: src/camera/ImportPage.vala:1044
+#: src/camera/ImportPage.vala:1030
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
 "%s"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1061
+#: src/camera/ImportPage.vala:1047
 msgid "Unmounting…"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1152
+#: src/camera/ImportPage.vala:1138
 msgid "Starting import, please wait…"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1169
+#: src/camera/ImportPage.vala:1155
 msgid "Fetching photo information"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1527
+#: src/camera/ImportPage.vala:1513
 #, c-format
 msgid "Fetching preview for %s"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1643
+#: src/camera/ImportPage.vala:1629
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1728
+#: src/camera/ImportPage.vala:1714
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/camera/ImportPage.vala:1731
+#: src/camera/ImportPage.vala:1717
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/camera/ImportPage.vala:1734
+#: src/camera/ImportPage.vala:1720
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/camera/ImportPage.vala:1737
+#: src/camera/ImportPage.vala:1723
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1408
+#: src/camera/ImportPage.vala:1731 src/Dialogs.vala:1397
 msgid "_Keep"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1764
+#: src/camera/ImportPage.vala:1750
 msgid "Removing photos/videos from camera"
 msgstr ""
 
-#: src/camera/ImportPage.vala:1768
+#: src/camera/ImportPage.vala:1754
 #, c-format
 msgid "Unable to delete %d photo/video from the camera due to errors."
 msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635
+#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:78
+#: src/PhotoPage.vala:2451 src/Resources.vala:170
+msgid "_Print"
+msgstr ""
+
+#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
+#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28
+msgid "Send _To…"
+msgstr ""
+
+#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:83
+#: src/PhotoPage.vala:2461 src/Resources.vala:220
+msgid "Set as _Desktop Background"
+msgstr ""
+
+#: src/CollectionPage.vala:86 src/Resources.vala:286
+msgid "_Duplicate"
+msgstr ""
+
+#: src/CollectionPage.vala:94
+msgid "Fullscreen"
+msgstr ""
+
+#: src/CollectionPage.vala:96 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr ""
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636
-msgid "Play a slideshow"
+#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr ""
+
+#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr ""
+
+#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr ""
+
+#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr ""
+
+#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8
+#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:445
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr ""
+
+#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
+#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:450
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr ""
+
+#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr ""
+
+#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr ""
+
+#: src/CollectionPage.vala:129
+msgid "Adjust Date and Time…"
 msgstr ""
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:137 src/Resources.vala:319
+msgid "Open With E_xternal Editor"
+msgstr ""
+
+#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
+#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363
+msgid "Open With RA_W Editor"
+msgstr ""
+
+#: src/CollectionPage.vala:143 src/Resources.vala:167
+msgid "_Play"
+msgstr ""
+
+#: src/CollectionPage.vala:404
 msgid "Export Photo/Video"
 msgstr ""
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:404
 msgid "Export Photos/Videos"
 msgstr ""
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209
+#: src/CollectionPage.vala:406 src/Dialogs.vala:59 src/PhotoPage.vala:2988
 msgid "Export Photo"
 msgstr ""
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:84
+#: src/CollectionPage.vala:406 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr ""
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:493 src/CollectionPage.vala:509
 msgid "Rotating"
 msgstr ""
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:493 src/CollectionPage.vala:509
 msgid "Undoing Rotate"
 msgstr ""
 
-#: src/CollectionPage.vala:570
+#: src/CollectionPage.vala:518
 msgid "Flipping Horizontally"
 msgstr ""
 
-#: src/CollectionPage.vala:571
+#: src/CollectionPage.vala:519
 msgid "Undoing Flip Horizontally"
 msgstr ""
 
-#: src/CollectionPage.vala:580
+#: src/CollectionPage.vala:528
 msgid "Flipping Vertically"
 msgstr ""
 
-#: src/CollectionPage.vala:581
+#: src/CollectionPage.vala:529
 msgid "Undoing Flip Vertically"
 msgstr ""
 
@@ -2719,7 +2778,7 @@ msgstr ""
 msgid "Database file:"
 msgstr ""
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:766
 msgid "_Import"
 msgstr ""
 
@@ -2731,7 +2790,7 @@ msgstr ""
 msgid "Import media _from:"
 msgstr ""
 
-#: src/data_imports/DataImportsUI.vala:408 src/publishing/PublishingUI.vala:507
+#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
 msgid "_Close"
 msgstr ""
 
@@ -2792,9 +2851,10 @@ msgid_plural "This will remove the tag “%s” from %d photos. Continue?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1409
-#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409
-#: src/Resources.vala:674
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1398
+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/trash.ui:63 ui/trash.ui:216
+#: ui/trash.ui:258
 msgid "_Delete"
 msgstr ""
 
@@ -3229,56 +3289,56 @@ msgstr[1] ""
 msgid "1 day"
 msgstr ""
 
-#: src/Dialogs.vala:1338 src/Resources.vala:231
+#: src/Dialogs.vala:1327 src/Resources.vala:231
 msgid "Rename Event"
 msgstr ""
 
-#: src/Dialogs.vala:1338
+#: src/Dialogs.vala:1327
 msgid "Name:"
 msgstr ""
 
 #. Dialog title
-#: src/Dialogs.vala:1349
+#: src/Dialogs.vala:1338
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr ""
 
-#: src/Dialogs.vala:1350 src/Properties.vala:340
+#: src/Dialogs.vala:1339 src/Properties.vala:343
 msgid "Title:"
 msgstr ""
 
 #. Dialog title
-#: src/Dialogs.vala:1366 src/Resources.vala:307
+#: src/Dialogs.vala:1355 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr ""
 
-#: src/Dialogs.vala:1367
+#: src/Dialogs.vala:1356
 msgid "Edit Photo/Video Comment"
 msgstr ""
 
-#: src/Dialogs.vala:1368 src/Properties.vala:628
+#: src/Dialogs.vala:1357 src/Properties.vala:631
 msgid "Comment:"
 msgstr ""
 
-#: src/Dialogs.vala:1384
+#: src/Dialogs.vala:1373
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1388
+#: src/Dialogs.vala:1377
 msgid "_Remove From Library"
 msgstr ""
 
-#: src/Dialogs.vala:1431
+#: src/Dialogs.vala:1420
 msgid "Revert External Edit?"
 msgstr ""
 
-#: src/Dialogs.vala:1431
+#: src/Dialogs.vala:1420
 msgid "Revert External Edits?"
 msgstr ""
 
-#: src/Dialogs.vala:1433
+#: src/Dialogs.vala:1422
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3286,125 +3346,121 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:1426
 msgid "Re_vert External Edit"
 msgstr ""
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:1426
 msgid "Re_vert External Edits"
 msgstr ""
 
-#: src/Dialogs.vala:1458
+#: src/Dialogs.vala:1447
 #, c-format
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1465 src/Resources.vala:173
+#: src/Dialogs.vala:1454 src/Resources.vala:173
 msgid "_Remove"
 msgstr ""
 
-#: src/Dialogs.vala:1466
+#: src/Dialogs.vala:1455
 msgid "Remove Photo From Library"
 msgstr ""
 
-#: src/Dialogs.vala:1466
+#: src/Dialogs.vala:1455
 msgid "Remove Photos From Library"
 msgstr ""
 
-#: src/Dialogs.vala:1559
+#: src/Dialogs.vala:1553
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: src/Dialogs.vala:1713
+#: src/Dialogs.vala:1707
 msgid "AM"
 msgstr ""
 
-#: src/Dialogs.vala:1714
+#: src/Dialogs.vala:1708
 msgid "PM"
 msgstr ""
 
-#: src/Dialogs.vala:1715
+#: src/Dialogs.vala:1709
 msgid "24 Hr"
 msgstr ""
 
-#: src/Dialogs.vala:1730
+#: src/Dialogs.vala:1724
 msgid "_Shift photos/videos by the same amount"
 msgstr ""
 
-#: src/Dialogs.vala:1735
+#: src/Dialogs.vala:1729
 msgid "Set _all photos/videos to this time"
 msgstr ""
 
-#: src/Dialogs.vala:1742
+#: src/Dialogs.vala:1735
 msgid "_Modify original photo file"
-msgstr ""
-
-#: src/Dialogs.vala:1742
-msgid "_Modify original photo files"
-msgstr ""
+msgid_plural "_Modify original photo files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Dialogs.vala:1745
+#: src/Dialogs.vala:1739
 msgid "_Modify original file"
-msgstr ""
-
-#: src/Dialogs.vala:1745
-msgid "_Modify original files"
-msgstr ""
+msgid_plural "_Modify original files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Dialogs.vala:1831
+#: src/Dialogs.vala:1827
 msgid "Original: "
 msgstr ""
 
-#: src/Dialogs.vala:1832
+#: src/Dialogs.vala:1828
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr ""
 
-#: src/Dialogs.vala:1833
+#: src/Dialogs.vala:1829
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr ""
 
-#: src/Dialogs.vala:1922
+#: src/Dialogs.vala:1918
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
 "%d %s, %d %s, %d %s, and %d %s."
 msgstr ""
 
-#: src/Dialogs.vala:1923
+#: src/Dialogs.vala:1919
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
 "%d %s, %d %s, %d %s, and %d %s."
 msgstr ""
 
-#: src/Dialogs.vala:1925
+#: src/Dialogs.vala:1921
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1926
+#: src/Dialogs.vala:1922
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1927
+#: src/Dialogs.vala:1923
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1928
+#: src/Dialogs.vala:1924
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1972
+#: src/Dialogs.vala:1968
 #, c-format
 msgid ""
 "\n"
@@ -3417,41 +3473,41 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1996 src/Dialogs.vala:2023
+#: src/Dialogs.vala:1992 src/Dialogs.vala:2019
 msgid "Tags (separated by commas):"
 msgstr ""
 
-#: src/Dialogs.vala:2103
+#: src/Dialogs.vala:2099
 msgid "Welcome!"
 msgstr ""
 
-#: src/Dialogs.vala:2110
+#: src/Dialogs.vala:2106
 msgid "Welcome to Shotwell!"
 msgstr ""
 
-#: src/Dialogs.vala:2114
+#: src/Dialogs.vala:2111
 msgid "To get started, import photos in any of these ways:"
 msgstr ""
 
-#: src/Dialogs.vala:2133
+#: src/Dialogs.vala:2131
 #, c-format
 msgid "Choose <span weight=\"bold\">File %s Import From Folder</span>"
 msgstr ""
 
-#: src/Dialogs.vala:2134
+#: src/Dialogs.vala:2132
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr ""
 
-#: src/Dialogs.vala:2135
+#: src/Dialogs.vala:2133
 msgid "Connect a camera to your computer and import"
 msgstr ""
 
-#: src/Dialogs.vala:2145
+#: src/Dialogs.vala:2144
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr ""
 
-#: src/Dialogs.vala:2152
+#: src/Dialogs.vala:2151
 msgid "You can also import photos in any of these ways:"
 msgstr ""
 
@@ -3459,7 +3515,7 @@ msgstr ""
 msgid "_Don’t show this message again"
 msgstr ""
 
-#: src/Dialogs.vala:2197
+#: src/Dialogs.vala:2199
 #, c-format
 msgid "Import photos from your %s library"
 msgstr ""
@@ -3467,71 +3523,71 @@ msgstr ""
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2344 src/Dialogs.vala:2348
+#: src/Dialogs.vala:2345 src/Dialogs.vala:2349
 msgid "(Help)"
 msgstr ""
 
-#: src/Dialogs.vala:2357
+#: src/Dialogs.vala:2356
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr ""
 
-#: src/Dialogs.vala:2359
+#: src/Dialogs.vala:2358
 #, c-format
 msgid "Year%sMonth"
 msgstr ""
 
-#: src/Dialogs.vala:2361
+#: src/Dialogs.vala:2360
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr ""
 
-#: src/Dialogs.vala:2363
+#: src/Dialogs.vala:2362
 msgid "Year-Month-Day"
 msgstr ""
 
-#: src/Dialogs.vala:2364 src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2363 src/editing_tools/EditingTools.vala:777
 msgid "Custom"
 msgstr ""
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2601
+#: src/Dialogs.vala:2600
 msgid "Invalid pattern"
 msgstr ""
 
 #. This function is used to determine whether or not files should be copied or linked when imported.
 #. Returns ACCEPT for copy, REJECT for link, and CANCEL for (drum-roll) cancel.
-#: src/Dialogs.vala:2703
+#: src/Dialogs.vala:2702
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
 msgstr ""
 
-#: src/Dialogs.vala:2708
+#: src/Dialogs.vala:2707
 msgid "Co_py Photos"
 msgstr ""
 
-#: src/Dialogs.vala:2709
+#: src/Dialogs.vala:2708
 msgid "_Import in Place"
 msgstr ""
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:2709
 msgid "Import to Library"
 msgstr ""
 
-#: src/Dialogs.vala:2720 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2719 src/PhotoPage.vala:2864
 msgid "Remove From Library"
 msgstr ""
 
-#: src/Dialogs.vala:2721 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2720 src/PhotoPage.vala:2864
 msgid "Removing Photo From Library"
 msgstr ""
 
-#: src/Dialogs.vala:2721
+#: src/Dialogs.vala:2720
 msgid "Removing Photos From Library"
 msgstr ""
 
-#: src/Dialogs.vala:2735
+#: src/Dialogs.vala:2734
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -3546,7 +3602,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:2739
+#: src/Dialogs.vala:2738
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -3561,7 +3617,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:2743
+#: src/Dialogs.vala:2742
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -3576,7 +3632,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:2775
+#: src/Dialogs.vala:2774
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -3586,7 +3642,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2792
+#: src/Dialogs.vala:2791
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -3601,157 +3657,51 @@ msgstr ""
 msgid "Height"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
-#: src/Resources.vala:175
-msgid "_Save"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As…"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
-#: src/Resources.vala:159
-msgid "_Edit"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416
-msgid "T_ools"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421
-msgid "_Previous Photo"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422
-msgid "Previous Photo"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427
-msgid "_Next Photo"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428
-msgid "Next Photo"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
-#: src/PhotoPage.vala:2412
-msgid "_View"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
-#: src/Resources.vala:162
-msgid "_Help"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
-#: src/PhotoPage.vala:2591 src/Resources.vala:183
-msgid "Zoom _In"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592
-msgid "Increase the magnification of the photo"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
-#: src/PhotoPage.vala:2597 src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598
-msgid "Decrease the magnification of the photo"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603
-msgid "Fit to _Page"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604
-msgid "Zoom the photo to fit on the screen"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610
-#, no-c-format
-msgid "Zoom _100%"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618
-#, no-c-format
-msgid "Zoom _200%"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr ""
-
-#: src/direct/DirectPhotoPage.vala:227
+#: src/direct/DirectPhotoPage.vala:92
 #, c-format
 msgid "%s does not exist."
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:229
+#: src/direct/DirectPhotoPage.vala:94
 #, c-format
 msgid "%s is not a file."
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:231
+#: src/direct/DirectPhotoPage.vala:96
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
 "%s."
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:248
+#: src/direct/DirectPhotoPage.vala:113
 #, c-format
 msgid "Unable open photo %s. Sorry."
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:432
+#: src/direct/DirectPhotoPage.vala:297 src/Resources.vala:175 ui/direct.ui:8
+msgid "_Save"
+msgstr ""
+
+#: src/direct/DirectPhotoPage.vala:297
 msgid "_Save a Copy"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:435
+#: src/direct/DirectPhotoPage.vala:300
 #, c-format
 msgid "Lose changes to %s?"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:436
+#: src/direct/DirectPhotoPage.vala:301
 msgid "Close _without Saving"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:469
+#: src/direct/DirectPhotoPage.vala:334
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr ""
 
-#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518
+#: src/direct/DirectPhotoPage.vala:362 src/direct/DirectPhotoPage.vala:383
 msgid "Save As"
 msgstr ""
 
@@ -3761,201 +3711,201 @@ msgstr ""
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:665
+#: src/editing_tools/EditingTools.vala:661
 msgid "Return to current photo dimensions"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:668
+#: src/editing_tools/EditingTools.vala:664
 msgid "Set the crop for this photo"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:680
+#: src/editing_tools/EditingTools.vala:676
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:749
 msgid "Unconstrained"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:750
 msgid "Square"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:751
 msgid "Screen"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:757
-#: src/editing_tools/EditingTools.vala:760
-#: src/editing_tools/EditingTools.vala:770
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:756
+#: src/editing_tools/EditingTools.vala:766
+#: src/editing_tools/EditingTools.vala:776
 msgid "-"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:754
 msgid "SD Video (4 ∶ 3)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:755
 msgid "HD Video (16 ∶ 9)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:818
 msgid "Wallet (2 × 3 in.)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:758 src/Printing.vala:821
 msgid "Notecard (3 × 5 in.)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:759 src/Printing.vala:824
 msgid "4 × 6 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:760 src/Printing.vala:827
 msgid "5 × 7 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:830
 msgid "8 × 10 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:766
+#: src/editing_tools/EditingTools.vala:762
 msgid "Letter (8.5 × 11 in.)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:833
 msgid "11 × 14 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:768
+#: src/editing_tools/EditingTools.vala:764
 msgid "Tabloid (11 × 17 in.)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:836
 msgid "16 × 20 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:842
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:845
 msgid "Postcard (10 × 15 cm)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:848
 msgid "13 × 18 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:851
 msgid "18 × 24 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:775
+#: src/editing_tools/EditingTools.vala:771
 msgid "A4 (210 × 297 mm)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:854
 msgid "20 × 30 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:857
 msgid "24 × 40 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:860
 msgid "30 × 40 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:779
+#: src/editing_tools/EditingTools.vala:775
 msgid "A3 (297 × 420 mm)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395
+#: src/editing_tools/EditingTools.vala:1875 src/Properties.vala:398
 msgid "Size:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:1887
+#: src/editing_tools/EditingTools.vala:1890
 msgid "Close the red-eye tool"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1893
 msgid "Remove any red-eye effects in the selected region"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2229
+#: src/editing_tools/EditingTools.vala:2233
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr ""
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:436
-#: src/Properties.vala:440 src/Properties.vala:447
+#: src/editing_tools/EditingTools.vala:2247 src/Properties.vala:439
+#: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2251
+#: src/editing_tools/EditingTools.vala:2256
 msgid "Contrast:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2259
+#: src/editing_tools/EditingTools.vala:2265
 msgid "Saturation:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2267
+#: src/editing_tools/EditingTools.vala:2274
 msgid "Tint:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2276
+#: src/editing_tools/EditingTools.vala:2284
 msgid "Temperature:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2284
+#: src/editing_tools/EditingTools.vala:2293
 msgid "Shadows:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2292
+#: src/editing_tools/EditingTools.vala:2302
 msgid "Highlights:"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2358
 msgid "Reset Colors"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2358
 msgid "Reset all color adjustments to original"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2705
+#: src/editing_tools/EditingTools.vala:2717
 msgid "Temperature"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2717
+#: src/editing_tools/EditingTools.vala:2729
 msgid "Tint"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2729
+#: src/editing_tools/EditingTools.vala:2741
 msgid "Contrast"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2743
+#: src/editing_tools/EditingTools.vala:2755
 msgid "Saturation"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2756
+#: src/editing_tools/EditingTools.vala:2768
 msgid "Exposure"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2769
+#: src/editing_tools/EditingTools.vala:2781
 msgid "Shadows"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2782
+#: src/editing_tools/EditingTools.vala:2794
 msgid "Highlights"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:2792
+#: src/editing_tools/EditingTools.vala:2804
 msgid "Contrast Expansion"
 msgstr ""
 
@@ -3964,6 +3914,7 @@ msgid "Angle:"
 msgstr ""
 
 #: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr ""
 
@@ -3978,53 +3929,45 @@ msgid_plural "%d Photos/Videos"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:355
+#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:353
+#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/events/EventPage.vala:129
+#: src/events/EventPage.vala:121
 msgid "No Event"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
-msgid "_Comments"
-msgstr ""
-
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr ""
-
-#: src/events/EventsDirectoryPage.vala:155
+#: src/events/EventsDirectoryPage.vala:143
 msgid "No events"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:159
+#: src/events/EventsDirectoryPage.vala:147
 msgid "No events found"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:230
+#: src/events/EventsDirectoryPage.vala:220
 msgid "All Events"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:244
+#: src/events/EventsDirectoryPage.vala:234
 msgid "Undated"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:245
+#: src/events/EventsDirectoryPage.vala:235
 msgid "%Y"
 msgstr ""
 
-#: src/events/EventsDirectoryPage.vala:246
+#: src/events/EventsDirectoryPage.vala:236
 msgid "%B"
 msgstr ""
 
@@ -4068,17 +4011,16 @@ msgstr ""
 msgid "Folders"
 msgstr ""
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1191
+#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
 msgid "Library"
 msgstr ""
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:608
-#: src/SearchFilter.vala:609
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1084
 msgid "Photos"
 msgstr ""
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602
-#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1103
+#: src/SearchFilter.vala:1104
 msgid "Flagged"
 msgstr ""
 
@@ -4086,19 +4028,11 @@ msgstr ""
 msgid "Importing…"
 msgstr ""
 
-#: src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr ""
-
-#: src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr ""
-
-#: src/library/ImportQueuePage.vala:124
+#: src/library/ImportQueuePage.vala:122
 msgid "Preparing to import…"
 msgstr ""
 
-#: src/library/ImportQueuePage.vala:151
+#: src/library/ImportQueuePage.vala:149
 #, c-format
 msgid "Imported %s"
 msgstr ""
@@ -4107,128 +4041,19 @@ msgstr ""
 msgid "Last Import"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:285
-msgid "_Import From Folder…"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:293
-msgid "Import From _Application…"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
-#: src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search…"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:398
-msgid "T_oolbar"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:399
-msgid "Display the tool bar"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
-msgid "D_escending"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr ""
-
-#: src/library/LibraryWindow.vala:657
+#: src/library/LibraryWindow.vala:501
 msgid "Import From Folder"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:570 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:570
 msgid "Emptying Trash…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:901
+#: src/library/LibraryWindow.vala:763
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4237,33 +4062,33 @@ msgid ""
 "Do you want to continue importing photos?"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
+#: src/library/LibraryWindow.vala:766 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr ""
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:917
+#: src/library/LibraryWindow.vala:779
 msgid "Photos cannot be imported from this directory."
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1203
+#: src/library/LibraryWindow.vala:1059
 #, c-format
 msgid "%s (%d%%)"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258
+#: src/library/LibraryWindow.vala:1103 src/library/LibraryWindow.vala:1114
 msgid "Updating library…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1264
+#: src/library/LibraryWindow.vala:1120
 msgid "Preparing to auto-import photos…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1269
+#: src/library/LibraryWindow.vala:1125
 msgid "Auto-importing photos…"
 msgstr ""
 
-#: src/library/LibraryWindow.vala:1277
+#: src/library/LibraryWindow.vala:1133
 msgid "Writing metadata to files…"
 msgstr ""
 
@@ -4271,7 +4096,7 @@ msgstr ""
 msgid "Missing Files"
 msgstr ""
 
-#: src/library/OfflinePage.vala:106
+#: src/library/OfflinePage.vala:103
 msgid "Deleting…"
 msgstr ""
 
@@ -4279,15 +4104,15 @@ msgstr ""
 msgid "Trash"
 msgstr ""
 
-#: src/library/TrashPage.vala:108
+#: src/library/TrashPage.vala:101
 msgid "Trash is empty"
 msgstr ""
 
-#: src/library/TrashPage.vala:112
+#: src/library/TrashPage.vala:105
 msgid "Delete"
 msgstr ""
 
-#: src/library/TrashPage.vala:113
+#: src/library/TrashPage.vala:106
 msgid "Deleting Photos"
 msgstr ""
 
@@ -4364,105 +4189,41 @@ msgstr ""
 msgid "Adjust the size of the thumbnails"
 msgstr ""
 
-#: src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr ""
-
-#: src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr ""
-
-#: src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr ""
-
-#: src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr ""
-
-#: src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr ""
-
-#: src/MediaPage.vala:428 src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr ""
-
-#: src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr ""
-
-#: src/MediaPage.vala:470
-msgid "Display each photo’s tags"
-msgstr ""
-
-#: src/MediaPage.vala:486
-msgid "By _Title"
-msgstr ""
-
-#: src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr ""
-
-#: src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr ""
-
 #: src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr ""
-
-#: src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr ""
-
-#: src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr ""
-
-#: src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr ""
-
-#: src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr ""
-
-#: src/MediaPage.vala:723
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
 "%s"
 msgstr ""
 
-#: src/Page.vala:1266
+#: src/Page.vala:1338
 msgid "No photos/videos"
 msgstr ""
 
-#: src/Page.vala:1270
+#: src/Page.vala:1342
 msgid "No photos/videos found which match the current filter"
 msgstr ""
 
-#: src/Page.vala:2576
+#: src/Page.vala:2648
 msgid "Photos cannot be exported to this directory."
 msgstr ""
 
 #. previous button
-#: src/PhotoPage.vala:533
+#: src/PhotoPage.vala:535
 msgid "Previous photo"
 msgstr ""
 
 #. next button
-#: src/PhotoPage.vala:539
+#: src/PhotoPage.vala:541
 msgid "Next photo"
 msgstr ""
 
-#: src/PhotoPage.vala:1845
+#: src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr ""
 
-#: src/PhotoPage.vala:3229
+#: src/PhotoPage.vala:3008
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr ""
@@ -4563,19 +4324,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr ""
 
-#: src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr ""
 
-#: src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
 msgstr ""
 
-#: src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
@@ -4583,104 +4344,104 @@ msgstr[0] ""
 msgstr[1] ""
 
 #. display only one date if start and end are the same
-#: src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr ""
 
 #. display only one time if start and end are the same
-#: src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr ""
 
 #. display time range
 #. display date range
-#: src/Properties.vala:384 src/Properties.vala:389
+#: src/Properties.vala:387 src/Properties.vala:392
 msgid "From:"
 msgstr ""
 
-#: src/Properties.vala:385 src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr ""
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr ""
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr ""
 
-#: src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr ""
 
 #. nothing special to be done for now for Events
-#: src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr ""
 
-#: src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr ""
 
-#: src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr ""
 
-#: src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr ""
 
-#: src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr ""
 
-#: src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr ""
 
-#: src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr ""
 
-#: src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr ""
 
-#: src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr ""
 
-#: src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr ""
 
-#: src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr ""
 
-#: src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr ""
 
-#: src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr ""
 
-#: src/Properties.vala:620
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr ""
 
-#: src/Properties.vala:622
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr ""
 
-#: src/Properties.vala:624
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr ""
 
-#: src/Properties.vala:641
+#: src/Properties.vala:644
 msgid "Extended Information"
 msgstr ""
 
@@ -4702,65 +4463,57 @@ msgstr ""
 msgid "To try publishing to another service, select one from the above menu."
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr ""
-
-#: src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr ""
-
-#: src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr ""
-
-#: src/publishing/PublishingUI.vala:112
+#. Here, we check whether more than one item is being uploaded, and if so, display
+#. an alternate message.
+#: src/publishing/PublishingUI.vala:104 src/publishing/PublishingUI.vala:109
 msgid "The selected video was successfully published."
-msgstr ""
+msgid_plural "The selected videos were successfully published."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:122
+#: src/publishing/PublishingUI.vala:127
 msgid "Fetching account information…"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:128
+#: src/publishing/PublishingUI.vala:133
 msgid "Logging in…"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:188
+#: src/publishing/PublishingUI.vala:193
 msgid "Publish Photos"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:189
+#: src/publishing/PublishingUI.vala:194
 msgid "Publish photos _to:"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:191
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish Videos"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:192
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish videos _to"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish Photos and Videos"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish photos and videos _to"
 msgstr ""
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:397
+#: src/publishing/PublishingUI.vala:410
 msgid "Unable to publish"
 msgstr ""
 
-#: src/publishing/PublishingUI.vala:398
+#: src/publishing/PublishingUI.vala:411
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -4773,11 +4526,7 @@ msgstr ""
 msgid "Publishing"
 msgstr ""
 
-#: src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr ""
-
-#: src/Resources.vala:140 src/Resources.vala:145
+#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
 msgid "Rotate"
 msgstr ""
 
@@ -4785,14 +4534,10 @@ msgstr ""
 msgid "Rotate Right"
 msgstr ""
 
-#: src/Resources.vala:142
+#: src/Resources.vala:142 ui/collection.ui:146
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr ""
 
-#: src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr ""
-
 #: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr ""
@@ -4801,23 +4546,17 @@ msgstr ""
 msgid "Rotate the photos left"
 msgstr ""
 
-#: src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr ""
-
 #: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr ""
 
-#: src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr ""
-
 #: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr ""
 
-#: src/Resources.vala:155
+#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419
+#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207
 msgid "_About"
 msgstr ""
 
@@ -4825,14 +4564,30 @@ msgstr ""
 msgid "_Apply"
 msgstr ""
 
+#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
+#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37
+msgid "_Edit"
+msgstr ""
+
 #: src/Resources.vala:160
 msgid "_Forward"
 msgstr ""
 
-#: src/Resources.vala:161
+#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr ""
 
+#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418
+#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420
+#: ui/tags.ui:423 ui/top.ui:40 ui/trash.ui:189 ui/trash.ui:192
+msgid "_Help"
+msgstr ""
+
 #: src/Resources.vala:163
 msgid "Leave _Fullscreen"
 msgstr ""
@@ -4845,15 +4600,9 @@ msgstr ""
 msgid "_Next"
 msgstr ""
 
-#: src/Resources.vala:166
-msgid "_OK"
-msgstr ""
-
-#: src/Resources.vala:167
-msgid "_Play"
-msgstr ""
-
-#: src/Resources.vala:168 src/Resources.vala:317
+#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
+#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
 msgid "_Preferences"
 msgstr ""
 
@@ -4861,11 +4610,9 @@ msgstr ""
 msgid "_Previous"
 msgstr ""
 
-#: src/Resources.vala:170
-msgid "_Print"
-msgstr ""
-
-#: src/Resources.vala:171
+#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40
+#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30
 msgid "_Quit"
 msgstr ""
 
@@ -4905,20 +4652,22 @@ msgstr ""
 msgid "Best _Fit"
 msgstr ""
 
-#: src/Resources.vala:186
-msgid "_Enhance"
+#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
 msgstr ""
 
-#: src/Resources.vala:187
-msgid "Enhance"
+#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
 msgstr ""
 
-#: src/Resources.vala:188
-msgid "Automatically improve the photo’s appearance"
+#: src/Resources.vala:187 ui/collection.ui:165
+msgid "Enhance"
 msgstr ""
 
-#: src/Resources.vala:190
-msgid "_Copy Color Adjustments"
+#: src/Resources.vala:188 ui/collection.ui:162
+msgid "Automatically improve the photo’s appearance"
 msgstr ""
 
 #: src/Resources.vala:191
@@ -4929,10 +4678,6 @@ msgstr ""
 msgid "Copy the color adjustments applied to the photo"
 msgstr ""
 
-#: src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr ""
-
 #: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr ""
@@ -4941,7 +4686,7 @@ msgstr ""
 msgid "Apply copied color adjustments to the selected photos"
 msgstr ""
 
-#: src/Resources.vala:198
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr ""
 
@@ -4961,7 +4706,7 @@ msgstr ""
 msgid "Straighten the photo"
 msgstr ""
 
-#: src/Resources.vala:206
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr ""
 
@@ -4973,7 +4718,7 @@ msgstr ""
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr ""
 
-#: src/Resources.vala:210
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr ""
 
@@ -4985,10 +4730,6 @@ msgstr ""
 msgid "Adjust the photo’s color and tone"
 msgstr ""
 
-#: src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr ""
-
 #: src/Resources.vala:215
 msgid "Revert to Original"
 msgstr ""
@@ -5001,10 +4742,6 @@ msgstr ""
 msgid "Revert to the master photo"
 msgstr ""
 
-#: src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr ""
-
 #: src/Resources.vala:221
 msgid "Set selected image to be the new desktop background"
 msgstr ""
@@ -5013,7 +4750,9 @@ msgstr ""
 msgid "Set as _Desktop Slideshow…"
 msgstr ""
 
-#: src/Resources.vala:224
+#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35
+#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
 msgid "_Undo"
 msgstr ""
 
@@ -5021,7 +4760,9 @@ msgstr ""
 msgid "Undo"
 msgstr ""
 
-#: src/Resources.vala:227
+#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40
+#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
 msgid "_Redo"
 msgstr ""
 
@@ -5029,11 +4770,12 @@ msgstr ""
 msgid "Redo"
 msgstr ""
 
-#: src/Resources.vala:230
+#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:391 ui/event.ui:584
 msgid "Re_name Event…"
 msgstr ""
 
-#: src/Resources.vala:233
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
 msgid "Make _Key Photo for Event"
 msgstr ""
 
@@ -5041,7 +4783,7 @@ msgstr ""
 msgid "Make Key Photo for Event"
 msgstr ""
 
-#: src/Resources.vala:236
+#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
 msgid "_New Event"
 msgstr ""
 
@@ -5057,7 +4799,7 @@ msgstr ""
 msgid "Move photos to an event"
 msgstr ""
 
-#: src/Resources.vala:242
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr ""
 
@@ -5069,7 +4811,8 @@ msgstr ""
 msgid "Combine events into a single event"
 msgstr ""
 
-#: src/Resources.vala:246
+#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr ""
 
@@ -5081,7 +4824,8 @@ msgstr ""
 msgid "Change the rating of your photo"
 msgstr ""
 
-#: src/Resources.vala:250
+#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr ""
 
@@ -5089,7 +4833,8 @@ msgstr ""
 msgid "Increase Rating"
 msgstr ""
 
-#: src/Resources.vala:253
+#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr ""
 
@@ -5097,7 +4842,8 @@ msgstr ""
 msgid "Decrease Rating"
 msgstr ""
 
-#: src/Resources.vala:256
+#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr ""
 
@@ -5117,7 +4863,8 @@ msgstr ""
 msgid "Remove any ratings"
 msgstr ""
 
-#: src/Resources.vala:262
+#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr ""
 
@@ -5137,7 +4884,8 @@ msgstr ""
 msgid "Set rating to rejected"
 msgstr ""
 
-#: src/Resources.vala:268
+#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
 msgid "Rejected _Only"
 msgstr ""
 
@@ -5149,7 +4897,8 @@ msgstr ""
 msgid "Show only rejected photos"
 msgstr ""
 
-#: src/Resources.vala:272
+#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
 msgid "All + _Rejected"
 msgstr ""
 
@@ -5158,7 +4907,8 @@ msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr ""
 
-#: src/Resources.vala:275
+#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
 msgid "_All Photos"
 msgstr ""
 
@@ -5167,7 +4917,8 @@ msgstr ""
 msgid "Show all photos"
 msgstr ""
 
-#: src/Resources.vala:279
+#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr ""
 
@@ -5175,7 +4926,8 @@ msgstr ""
 msgid "Display each photo’s rating"
 msgstr ""
 
-#: src/Resources.vala:282
+#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
 msgid "_Filter Photos"
 msgstr ""
 
@@ -5187,10 +4939,6 @@ msgstr ""
 msgid "Limit the number of photos displayed based on a filter"
 msgstr ""
 
-#: src/Resources.vala:286
-msgid "_Duplicate"
-msgstr ""
-
 #: src/Resources.vala:287
 msgid "Duplicate"
 msgstr ""
@@ -5211,11 +4959,12 @@ msgstr ""
 msgid "Pu_blish…"
 msgstr ""
 
-#: src/Resources.vala:296
+#: src/Resources.vala:296 ui/collection.ui:187
 msgid "Publish to various websites"
 msgstr ""
 
-#: src/Resources.vala:298
+#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
 msgid "Edit _Title…"
 msgstr ""
 
@@ -5225,7 +4974,9 @@ msgctxt "Button Label"
 msgid "Edit Title"
 msgstr ""
 
-#: src/Resources.vala:302
+#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539
+#: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344
 msgid "Edit _Comment…"
 msgstr ""
 
@@ -5234,11 +4985,11 @@ msgstr ""
 msgid "Edit Comment"
 msgstr ""
 
-#: src/Resources.vala:306
+#: src/Resources.vala:306 ui/event.ui:588
 msgid "Edit Event _Comment…"
 msgstr ""
 
-#: src/Resources.vala:309
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
 msgid "_Adjust Date and Time…"
 msgstr ""
 
@@ -5246,11 +4997,12 @@ msgstr ""
 msgid "Adjust Date and Time"
 msgstr ""
 
-#: src/Resources.vala:312
+#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456
+#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388
 msgid "Add _Tags…"
 msgstr ""
 
-#: src/Resources.vala:313
+#: src/Resources.vala:313 ui/photo_context.ui:17
 msgid "_Add Tags…"
 msgstr ""
 
@@ -5260,19 +5012,7 @@ msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr ""
 
-#: src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr ""
-
-#: src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr ""
-
-#: src/Resources.vala:323
-msgid "Send _To…"
-msgstr ""
-
-#: src/Resources.vala:324
+#: src/Resources.vala:324 ui/photo_context.ui:133
 msgid "Send T_o…"
 msgstr ""
 
@@ -5280,11 +5020,13 @@ msgstr ""
 msgid "_Find…"
 msgstr ""
 
-#: src/Resources.vala:327
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr ""
 
-#: src/Resources.vala:328
+#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 
@@ -5346,7 +5088,8 @@ msgstr ""
 msgid "_Rename…"
 msgstr ""
 
-#: src/Resources.vala:375
+#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461
+#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393
 msgid "Modif_y Tags…"
 msgstr ""
 
@@ -5357,162 +5100,155 @@ msgstr ""
 #: src/Resources.vala:379
 #, c-format
 msgid "Tag Photo as “%s”"
-msgstr ""
-
-#: src/Resources.vala:379
-#, c-format
-msgid "Tag Photos as “%s”"
-msgstr ""
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:383
+#: src/Resources.vala:385
 #, c-format
 msgid "Tag the selected photo as “%s”"
-msgstr ""
-
-#: src/Resources.vala:384
-#, c-format
-msgid "Tag the selected photos as “%s”"
-msgstr ""
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:388
+#: src/Resources.vala:391
 #, c-format
 msgid "Remove Tag “%s” From _Photo"
-msgstr ""
-
-#: src/Resources.vala:389
-#, c-format
-msgid "Remove Tag “%s” From _Photos"
-msgstr ""
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:393
+#: src/Resources.vala:397
 #, c-format
 msgid "Remove Tag “%s” From Photo"
-msgstr ""
-
-#: src/Resources.vala:394
-#, c-format
-msgid "Remove Tag “%s” From Photos"
-msgstr ""
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/Resources.vala:398
+#: src/Resources.vala:403
 #, c-format
 msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr ""
 
-#: src/Resources.vala:402
+#: src/Resources.vala:407
 #, c-format
 msgid "Unable to rename search to “%s” because the search already exists."
 msgstr ""
 
 #. Saved search button
-#: src/Resources.vala:405 src/SearchFilter.vala:1210
+#: src/Resources.vala:410 src/SearchFilter.vala:1125
 msgid "Saved Search"
 msgstr ""
 
-#: src/Resources.vala:407
+#: src/Resources.vala:412
 msgid "Delete Search"
 msgstr ""
 
-#: src/Resources.vala:410
+#: src/Resources.vala:415 ui/savedsearch.ui:11
 msgid "_Edit…"
 msgstr ""
 
-#: src/Resources.vala:411
+#: src/Resources.vala:416 ui/savedsearch.ui:7
 msgid "Re_name…"
 msgstr ""
 
-#: src/Resources.vala:414
+#: src/Resources.vala:419
 #, c-format
 msgid "Rename Search “%s” to “%s”"
 msgstr ""
 
-#: src/Resources.vala:418
+#: src/Resources.vala:423
 #, c-format
 msgid "Delete Search “%s”"
 msgstr ""
 
-#: src/Resources.vala:576
+#: src/Resources.vala:560
 #, c-format
 msgid "Rate %s"
 msgstr ""
 
-#: src/Resources.vala:577
+#: src/Resources.vala:561
 #, c-format
 msgid "Set rating to %s"
 msgstr ""
 
-#: src/Resources.vala:578
+#: src/Resources.vala:562
 #, c-format
 msgid "Setting rating to %s"
 msgstr ""
 
-#: src/Resources.vala:580
+#: src/Resources.vala:564
 #, c-format
 msgid "Display %s"
 msgstr ""
 
-#: src/Resources.vala:581
+#: src/Resources.vala:565
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr ""
 
-#: src/Resources.vala:582
+#: src/Resources.vala:566
 #, c-format
 msgid "%s or Better"
 msgstr ""
 
-#: src/Resources.vala:583
+#: src/Resources.vala:567
 #, c-format
 msgid "Display %s or Better"
 msgstr ""
 
-#: src/Resources.vala:584
+#: src/Resources.vala:568
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr ""
 
-#: src/Resources.vala:675
+#: src/Resources.vala:659 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr ""
 
-#: src/Resources.vala:676
+#: src/Resources.vala:660 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr ""
 
-#: src/Resources.vala:678
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr ""
 
-#: src/Resources.vala:679
+#: src/Resources.vala:663 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr ""
 
-#: src/Resources.vala:681
+#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:20
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27
+#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr ""
 
-#: src/Resources.vala:682
+#: src/Resources.vala:666
 msgid "Open the selected photo’s directory in the file manager"
 msgstr ""
 
-#: src/Resources.vala:685
+#: src/Resources.vala:669
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr ""
 
-#: src/Resources.vala:688
+#: src/Resources.vala:672 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr ""
 
-#: src/Resources.vala:690
+#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569
+#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr ""
 
-#: src/Resources.vala:692
+#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
 msgid "Select _All"
 msgstr ""
 
-#: src/Resources.vala:693
+#: src/Resources.vala:677
 msgid "Select all items"
 msgstr ""
 
@@ -5525,14 +5261,14 @@ msgstr ""
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:782
+#: src/Resources.vala:766
 msgid "%a %b %d, %Y"
 msgstr ""
 
 #. / Locale-specific starting date format for multi-date strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:787
+#: src/Resources.vala:771
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr ""
@@ -5540,7 +5276,7 @@ msgstr ""
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:792
+#: src/Resources.vala:776
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr ""
@@ -5548,7 +5284,7 @@ msgstr ""
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:797
+#: src/Resources.vala:781
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr ""
@@ -5556,7 +5292,7 @@ msgstr ""
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:802
+#: src/Resources.vala:786
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr ""
@@ -5570,139 +5306,139 @@ msgid "Saved Searches"
 msgstr ""
 
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
 msgstr ""
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:169
-#: src/searches/SavedSearchDialog.vala:500
+#: src/searches/SavedSearchDialog.vala:163
+#: src/searches/SavedSearchDialog.vala:494
 msgid "is exactly"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:164
 msgid "starts with"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:165
 msgid "ends with"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:166
 msgid "does not contain"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:173
-#: src/searches/SavedSearchDialog.vala:504
+#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:498
 msgid "is not set"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:168
 msgid "is set"
 msgstr ""
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:248
-#: src/searches/SavedSearchDialog.vala:379
-#: src/searches/SavedSearchDialog.vala:444
+#: src/searches/SavedSearchDialog.vala:242
+#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:438
 msgid "is"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:243
 msgid "is not"
 msgstr ""
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:249
 msgid "any photo"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:250
 msgid "a raw photo"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:257
+#: src/searches/SavedSearchDialog.vala:251
 msgid "a video"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:305
 msgid "has"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:306
 msgid "has no"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:311
 msgid "modifications"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:312
 msgid "internal modifications"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:313
 msgid "external modifications"
 msgstr ""
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:367
 msgid "flagged"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:368
 msgid "not flagged"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:431
 msgid "and higher"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:432
 msgid "only"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:433
 msgid "and lower"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:495
 msgid "is after"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:502
+#: src/searches/SavedSearchDialog.vala:496
 msgid "is before"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:497
 msgid "is between"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:516
+#: src/searches/SavedSearchDialog.vala:510
 msgid "and"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:697
+#: src/searches/SavedSearchDialog.vala:691
 msgid "Search"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:702
+#: src/searches/SavedSearchDialog.vala:696
 msgid "Cancel"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:703
+#: src/searches/SavedSearchDialog.vala:697
 msgid "OK"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:721
+#: src/searches/SavedSearchDialog.vala:716
 msgid "any"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:717
 msgid "all"
 msgstr ""
 
-#: src/searches/SavedSearchDialog.vala:723
+#: src/searches/SavedSearchDialog.vala:718
 msgid "none"
 msgstr ""
 
@@ -5742,8 +5478,8 @@ msgstr ""
 msgid "Photo state"
 msgstr ""
 
-#. Rating button
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1115
 msgid "Rating"
 msgstr ""
 
@@ -5751,21 +5487,29 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
-msgid "Videos"
+#: src/SearchFilter.vala:815
+msgid "★+ Rating"
 msgstr ""
 
-#: src/SearchFilter.vala:620
-msgid "RAW Photos"
+#: src/SearchFilter.vala:818
+msgid "★★+ Rating"
+msgstr ""
+
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
 msgstr ""
 
-#: src/SearchFilter.vala:621
-msgid "RAW photos"
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
 msgstr ""
 
-#: src/SearchFilter.vala:1148
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr ""
+
+#: src/SearchFilter.vala:1065
 #, c-format
-msgid "Error loading UI file %s: %s"
+msgid "Error loading search bar UI: %s"
 msgstr ""
 
 #. Ticket #3260 - Add a 'close' context menu to
@@ -5773,21 +5517,25 @@ msgstr ""
 #. Prepare the close menu for use, but don't
 #. display it yet; we'll connect it to secondary
 #. click later on.
-#: src/SearchFilter.vala:1159
+#: src/SearchFilter.vala:1074
 msgid "Close"
 msgstr ""
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1165
+#: src/SearchFilter.vala:1080
 msgid "Type"
 msgstr ""
 
-#: src/SearchFilter.vala:1211
-msgid "Use a saved search to filter items in the current view"
+#: src/SearchFilter.vala:1087
+msgid "Videos"
 msgstr ""
 
-#: src/sidebar/Tree.vala:203
-msgid "New _Tag…"
+#: src/SearchFilter.vala:1090
+msgid "RAW Photos"
+msgstr ""
+
+#: src/SearchFilter.vala:1126
+msgid "Use a saved search to filter items in the current view"
 msgstr ""
 
 #: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
@@ -5862,10 +5610,221 @@ msgid "untitled"
 msgstr ""
 
 #. multiple videos
-#: src/VideoSupport.vala:508
+#: src/VideoSupport.vala:507
 msgid "Export Videos"
 msgstr ""
 
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr ""
+
+#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351
+#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351
+msgid "_Developer"
+msgstr ""
+
+#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
+msgid "Open with E_xternal Editor"
+msgstr ""
+
+#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379
+#: ui/photo_context.ui:124 ui/tags.ui:379
+msgid "View Eve_nt for Photo"
+msgstr ""
+
+#: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5
+#: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5
+#: ui/top.ui:5 ui/trash.ui:5
+msgid "_File"
+msgstr ""
+
+#: ui/direct.ui:13 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 ui/tags.ui:17
+msgid "Save _As…"
+msgstr ""
+
+#: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99
+#: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78
+#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87
+msgid "_View"
+msgstr ""
+
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr ""
+
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr ""
+
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr ""
+
+#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+msgid "_Photo"
+msgstr ""
+
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr ""
+
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr ""
+
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr ""
+
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188
+#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr ""
+
+#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:430
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:413 ui/offline.ui:192
+#: ui/photo.ui:396 ui/tags.ui:432 ui/trash.ui:201
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
+#: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
+msgid "_Import from Folder…"
+msgstr ""
+
+#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
+#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13
+#: ui/trash.ui:13
+msgid "Import From _Application…"
+msgstr ""
+
+#: ui/events_directory.ui:19 ui/event.ui:34 ui/import_queue.ui:25
+#: ui/import.ui:27 ui/media.ui:34 ui/offline.ui:19 ui/photo.ui:42 ui/tags.ui:34
+#: ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242
+msgid "Empty T_rash"
+msgstr ""
+
+#: ui/events_directory.ui:47 ui/event.ui:62 ui/import.ui:55 ui/media.ui:62
+#: ui/offline.ui:47 ui/tags.ui:62 ui/trash.ui:52
+msgid "_Find"
+msgstr ""
+
+#: ui/events_directory.ui:51 ui/event.ui:66 ui/media.ui:66 ui/offline.ui:51
+#: ui/photo.ui:70 ui/search_sidebar_context.ui:6
+#: ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56
+msgid "Ne_w Saved Search…"
+msgstr ""
+
+#: ui/events_directory.ui:74 ui/event.ui:102 ui/import_queue.ui:41
+#: ui/import.ui:77 ui/media.ui:102 ui/offline.ui:81 ui/photo.ui:98
+#: ui/tags.ui:102 ui/trash.ui:90
+msgid "_Basic Information"
+msgstr ""
+
+#: ui/events_directory.ui:79 ui/event.ui:107 ui/import.ui:82 ui/media.ui:107
+#: ui/offline.ui:86 ui/photo.ui:103 ui/tags.ui:107 ui/trash.ui:95
+msgid "E_xtended Information"
+msgstr ""
+
+#: ui/events_directory.ui:84 ui/event.ui:112 ui/import.ui:87 ui/media.ui:112
+#: ui/offline.ui:91 ui/tags.ui:112 ui/trash.ui:100
+msgid "_Search Bar"
+msgstr ""
+
+#: ui/events_directory.ui:89 ui/event.ui:117 ui/import.ui:92 ui/media.ui:117
+#: ui/offline.ui:96 ui/photo.ui:108 ui/tags.ui:117 ui/trash.ui:105
+msgid "S_idebar"
+msgstr ""
+
+#: ui/events_directory.ui:94 ui/event.ui:122 ui/import.ui:97 ui/media.ui:122
+#: ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110
+msgid "T_oolbar"
+msgstr ""
+
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr ""
+
+#: ui/events_directory.ui:108 ui/event.ui:243 ui/import_queue.ui:48
+#: ui/import.ui:166 ui/media.ui:243 ui/offline.ui:163 ui/photo.ui:127
+#: ui/tags.ui:243 ui/trash.ui:172
+msgid "Sort _Events"
+msgstr ""
+
+#: ui/events_directory.ui:111 ui/event.ui:231 ui/event.ui:246
+#: ui/import_queue.ui:51 ui/import.ui:169 ui/media.ui:231 ui/media.ui:246
+#: ui/offline.ui:166 ui/photo.ui:130 ui/tags.ui:231 ui/tags.ui:246
+#: ui/trash.ui:175
+msgid "_Ascending"
+msgstr ""
+
+#: ui/events_directory.ui:116 ui/event.ui:236 ui/import_queue.ui:56
+#: ui/media.ui:236 ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180
+msgid "D_escending"
+msgstr ""
+
+#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
+#: ui/top.ui:30
+msgid "Even_ts"
+msgstr ""
+
+#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
+#: ui/photo.ui:77 ui/tags.ui:74
+msgid "R_emove from Library"
+msgstr ""
+
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr ""
+
+#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385
+#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35
+msgid "Ta_gs"
+msgstr ""
+
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr ""
+
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr ""
+
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr ""
+
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr ""
+
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr ""
+
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+msgid "_Descending"
+msgstr ""
+
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25
+msgid "_Photos"
+msgstr ""
+
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr ""
+
+#: ui/import.ui:13 ui/import.ui:210
+msgid "Import _Selected"
+msgstr ""
+
+#: ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr ""
+
 #: ui/set_background_dialog.ui:15
 msgid "Set as Desktop Background"
 msgstr ""
@@ -5874,7 +5833,7 @@ msgstr ""
 msgid "Use for Desktop"
 msgstr ""
 
-#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:92 ui/set_background_slideshow_dialog.ui:148
 msgid "Use for Lock Screen"
 msgstr ""
 
@@ -5898,158 +5857,162 @@ msgstr ""
 msgid "How long each photo is shown on the desktop background"
 msgstr ""
 
-#: ui/shotwell.ui:23
-msgid "_Name of search:"
-msgstr ""
-
-#: ui/shotwell.ui:81
-msgid "_Match"
+#: ui/shotwell.ui:65
+msgid "white"
 msgstr ""
 
-#: ui/shotwell.ui:108
-msgid "of the following:"
+#: ui/shotwell.ui:92
+msgid "black"
 msgstr ""
 
-#: ui/shotwell.ui:195
-msgid "<b>Printed Image Size</b>"
+#: ui/shotwell.ui:123
+msgid "Display"
 msgstr ""
 
-#: ui/shotwell.ui:212
-msgid "Use a _standard size:"
+#: ui/shotwell.ui:160
+msgid "_Background:"
 msgstr ""
 
-#: ui/shotwell.ui:255
-msgid "Use a c_ustom size:"
+#: ui/shotwell.ui:175
+msgid "_Import photos to:"
 msgstr ""
 
-#: ui/shotwell.ui:345
-msgid "_Match photo aspect ratio"
+#: ui/shotwell.ui:186
+msgid "_Watch library directory for new files"
 msgstr ""
 
-#: ui/shotwell.ui:369
-msgid "_Autosize:"
+#: ui/shotwell.ui:209
+msgid "Importing"
 msgstr ""
 
-#: ui/shotwell.ui:409
-msgid "<b>Titles</b>"
+#: ui/shotwell.ui:226
+msgid "_Directory structure:"
 msgstr ""
 
-#: ui/shotwell.ui:426
-msgid "Print image _title"
+#: ui/shotwell.ui:240
+msgid "Example:"
 msgstr ""
 
-#: ui/shotwell.ui:470
-msgid "<b>Pixel Resolution</b>"
+#: ui/shotwell.ui:249
+msgid "R_ename imported files to lowercase"
 msgstr ""
 
-#: ui/shotwell.ui:490
-msgid "_Output photo at:"
+#: ui/shotwell.ui:271
+msgid "Metadata"
 msgstr ""
 
-#: ui/shotwell.ui:525
-msgid "pixels per inch"
+#: ui/shotwell.ui:284
+msgid "Write tags, titles, and other _metadata to photo files"
 msgstr ""
 
-#: ui/shotwell.ui:559
-msgid "label"
+#: ui/shotwell.ui:306
+msgid "RAW Developer"
 msgstr ""
 
-#: ui/shotwell.ui:681
-msgid "Shotwell Preferences"
+#: ui/shotwell.ui:323
+msgid "De_fault:"
 msgstr ""
 
-#: ui/shotwell.ui:730
-msgid "white"
+#: ui/shotwell.ui:377
+msgid "_Pattern:"
 msgstr ""
 
-#: ui/shotwell.ui:757
-msgid "black"
+#: ui/shotwell.ui:439
+msgid "E_xternal photo editor:"
 msgstr ""
 
-#: ui/shotwell.ui:805
-msgid "_Watch library directory for new files"
+#: ui/shotwell.ui:456
+msgid "External _RAW editor:"
 msgstr ""
 
-#: ui/shotwell.ui:834
-msgid "Metadata"
+#: ui/shotwell.ui:517
+msgid "External Editors"
 msgstr ""
 
-#: ui/shotwell.ui:854
-msgid "Write tags, titles, and other _metadata to photo files"
+#: ui/shotwell.ui:542
+msgid "Plugins"
 msgstr ""
 
-#: ui/shotwell.ui:880
-msgid "Display"
+#: ui/shotwell.ui:583
+msgid "<b>Printed Image Size</b>"
 msgstr ""
 
-#: ui/shotwell.ui:901
-msgid "_Import photos to:"
+#: ui/shotwell.ui:600
+msgid "Use a _standard size:"
 msgstr ""
 
-#: ui/shotwell.ui:924
-msgid "_Background:"
+#: ui/shotwell.ui:643
+msgid "Use a c_ustom size:"
 msgstr ""
 
-#: ui/shotwell.ui:947
-msgid "Importing"
+#: ui/shotwell.ui:731
+msgid "_Match photo aspect ratio"
 msgstr ""
 
-#: ui/shotwell.ui:970
-msgid "_Directory structure:"
+#: ui/shotwell.ui:755
+msgid "_Autosize:"
 msgstr ""
 
-#: ui/shotwell.ui:1009
-msgid "_Pattern:"
+#: ui/shotwell.ui:795
+msgid "<b>Titles</b>"
 msgstr ""
 
-#: ui/shotwell.ui:1091
-msgid "Example:"
+#: ui/shotwell.ui:812
+msgid "Print image _title"
 msgstr ""
 
-#: ui/shotwell.ui:1108
-msgid "R_ename imported files to lowercase"
+#: ui/shotwell.ui:855
+msgid "<b>Pixel Resolution</b>"
 msgstr ""
 
-#: ui/shotwell.ui:1137
-msgid "RAW Developer"
+#: ui/shotwell.ui:875
+msgid "_Output photo at:"
 msgstr ""
 
-#: ui/shotwell.ui:1172
-msgid "De_fault:"
+#: ui/shotwell.ui:909
+msgid "pixels per inch"
 msgstr ""
 
-#: ui/shotwell.ui:1226
-msgid "E_xternal photo editor:"
+#: ui/shotwell.ui:949
+msgid "_Name of search:"
 msgstr ""
 
-#: ui/shotwell.ui:1242
-msgid "External _RAW editor:"
+#: ui/shotwell.ui:1003
+msgid "_Match"
 msgstr ""
 
-#: ui/shotwell.ui:1307
-msgid "External Editors"
+#: ui/shotwell.ui:1030
+msgid "of the following:"
 msgstr ""
 
-#: ui/shotwell.ui:1334
-msgid "Plugins"
+#: ui/shotwell.ui:1111
+msgid "label"
 msgstr ""
 
-#: ui/shotwell.ui:1400
+#: ui/shotwell.ui:1262
 msgid "_Delay:"
 msgstr ""
 
-#: ui/shotwell.ui:1416
+#: ui/shotwell.ui:1276
 msgid "_Transition effect:"
 msgstr ""
 
-#: ui/shotwell.ui:1432
+#: ui/shotwell.ui:1290
 msgid "Transition d_elay:"
 msgstr ""
 
-#: ui/shotwell.ui:1444
+#: ui/shotwell.ui:1300
 msgid "Show t_itle"
 msgstr ""
 
-#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
+#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
 msgid "seconds"
 msgstr ""
+
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr ""
+
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr ""
diff --git a/publish.am b/publish.am
index 81bc711..1407713 100644
--- a/publish.am
+++ b/publish.am
@@ -29,8 +29,17 @@ nodist_plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
 	plugins/shotwell-publishing/resource.c
 MOSTLYCLEANFILES += plugins/shotwell-publishing/resource.c
 
-plugins/shotwell-publishing/resource.c: plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(abs_top_srcdir)/plugins/shotwell-publishing --generate $<
+PUBLISHING_RESOURCE_FILE := $(abs_top_srcdir)/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
+
+PUBLISHING_RESOURCE_DEPS = $(shell $(GLIB_COMPILE_RESOURCES) \
+		--sourcedir=$(abs_top_srcdir)/plugins/shotwell-publishing \
+		--generate-dependencies $(PUBLISHING_RESOURCE_FILE))
+
+plugins/shotwell-publishing/resource.c: $(PUBLISHING_RESOURCE_DEPS) $(PUBLISHING_RESOURCE_FILE)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \
+		--target=$@ \
+		--sourcedir=$(abs_top_srcdir)/plugins/shotwell-publishing \
+		--generate $(PUBLISHING_RESOURCE_FILE)
 
 plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS = \
 	$(COMMON_VALAFLAGS) \
diff --git a/shotwell.am b/shotwell.am
index dcade97..1422009 100644
--- a/shotwell.am
+++ b/shotwell.am
@@ -20,6 +20,23 @@ shotwell_VALAFLAGS = $(COMMON_VALAFLAGS) \
 	$(UNITY_VALAFLAGS) \
 	$(COMMON_VALAFLAGS_POST)
 
+dist_noinst_DATA += src/org.gnome.Shotwell.gresource.xml
+
+nodist_shotwell_SOURCES = \
+	src/resource.c
+MOSTLYCLEANFILES += src/resource.c
+
+shotwell_resource_deps = $(shell $(GLIB_COMPILE_RESOURCES) \
+		--sourcedir=$(abs_top_srcdir)/icons \
+		--sourcedir=$(abs_top_srcdir)/ui \
+		--generate-dependencies $(abs_top_srcdir)/src/org.gnome.Shotwell.gresource.xml)
+
+src/resource.c: src/org.gnome.Shotwell.gresource.xml $(shotwell_resource_deps)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
+		--sourcedir=$(abs_top_srcdir)/icons \
+		--sourcedir=$(abs_top_srcdir)/ui \
+		--generate $<
+
 shotwell_SOURCES = \
 	src/unit/Unit.vala \
 	src/util/Util.vala \
diff --git a/src/AppDirs.c b/src/AppDirs.c
index 323dc40..5e4ec30 100644
--- a/src/AppDirs.c
+++ b/src/AppDirs.c
@@ -394,11 +394,11 @@ void app_dirs_try_migrate_data (void) {
 #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 397 "AppDirs.c"
-				goto __catch445_g_error;
+				goto __catch442_g_error;
 			}
 		}
-		goto __finally445;
-		__catch445_g_error:
+		goto __finally442;
+		__catch442_g_error:
 		{
 			GError* err = NULL;
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -409,7 +409,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 411 "AppDirs.c"
 		}
-		__finally445:
+		__finally442:
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -437,11 +437,11 @@ void app_dirs_try_migrate_data (void) {
 #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 440 "AppDirs.c"
-			goto __catch446_g_error;
+			goto __catch443_g_error;
 		}
 	}
-	goto __finally446;
-	__catch446_g_error:
+	goto __finally443;
+	__catch443_g_error:
 	{
 		GError* err = NULL;
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -452,7 +452,7 @@ void app_dirs_try_migrate_data (void) {
 		_g_error_free0 (err);
 #line 454 "AppDirs.c"
 	}
-	__finally446:
+	__finally443:
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -539,11 +539,11 @@ void app_dirs_try_migrate_data (void) {
 #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 542 "AppDirs.c"
-				goto __catch447_g_error;
+				goto __catch444_g_error;
 			}
 		}
-		goto __finally447;
-		__catch447_g_error:
+		goto __finally444;
+		__catch444_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp35_ = NULL;
@@ -584,7 +584,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 586 "AppDirs.c"
 		}
-		__finally447:
+		__finally444:
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -666,11 +666,11 @@ void app_dirs_try_migrate_data (void) {
 #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 669 "AppDirs.c"
-				goto __catch448_g_error;
+				goto __catch445_g_error;
 			}
 		}
-		goto __finally448;
-		__catch448_g_error:
+		goto __finally445;
+		__catch445_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp61_ = NULL;
@@ -719,7 +719,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 721 "AppDirs.c"
 		}
-		__finally448:
+		__finally445:
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -895,12 +895,12 @@ void app_dirs_verify_data_dir (void) {
 #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 898 "AppDirs.c"
-				goto __catch449_g_error;
+				goto __catch446_g_error;
 			}
 		}
 	}
-	goto __finally449;
-	__catch449_g_error:
+	goto __finally446;
+	__catch446_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -941,7 +941,7 @@ void app_dirs_verify_data_dir (void) {
 		_g_error_free0 (err);
 #line 943 "AppDirs.c"
 	}
-	__finally449:
+	__finally446:
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -987,12 +987,12 @@ void app_dirs_verify_cache_dir (void) {
 #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 990 "AppDirs.c"
-				goto __catch450_g_error;
+				goto __catch447_g_error;
 			}
 		}
 	}
-	goto __finally450;
-	__catch450_g_error:
+	goto __finally447;
+	__catch447_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -1033,7 +1033,7 @@ void app_dirs_verify_cache_dir (void) {
 		_g_error_free0 (err);
 #line 1035 "AppDirs.c"
 	}
-	__finally450:
+	__finally447:
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1591,12 +1591,12 @@ GFile* app_dirs_get_temp_dir (void) {
 #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1594 "AppDirs.c"
-					goto __catch451_g_error;
+					goto __catch448_g_error;
 				}
 			}
 		}
-		goto __finally451;
-		__catch451_g_error:
+		goto __finally448;
+		__catch448_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp9_ = NULL;
@@ -1637,7 +1637,7 @@ GFile* app_dirs_get_temp_dir (void) {
 			_g_error_free0 (err);
 #line 1639 "AppDirs.c"
 		}
-		__finally451:
+		__finally448:
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1725,12 +1725,12 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1728 "AppDirs.c"
-				goto __catch452_g_error;
+				goto __catch449_g_error;
 			}
 		}
 	}
-	goto __finally452;
-	__catch452_g_error:
+	goto __finally449;
+	__catch449_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp12_ = NULL;
@@ -1771,7 +1771,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		_g_error_free0 (err);
 #line 1773 "AppDirs.c"
 	}
-	__finally452:
+	__finally449:
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1825,7 +1825,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1828 "AppDirs.c"
-				goto __catch453_g_error;
+				goto __catch450_g_error;
 			}
 #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp4_ = info;
@@ -1846,7 +1846,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				_g_object_unref0 (info);
 #line 1849 "AppDirs.c"
-				goto __catch453_g_error;
+				goto __catch450_g_error;
 			}
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (!_tmp6_) {
@@ -1881,8 +1881,8 @@ void app_dirs_ensure_writable (GFile* dir) {
 			_g_object_unref0 (info);
 #line 1883 "AppDirs.c"
 		}
-		goto __finally453;
-		__catch453_g_error:
+		goto __finally450;
+		__catch450_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp16_ = NULL;
@@ -1923,7 +1923,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 			_g_error_free0 (err);
 #line 1925 "AppDirs.c"
 		}
-		__finally453:
+		__finally450:
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2008,12 +2008,12 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2011 "AppDirs.c"
-				goto __catch454_g_error;
+				goto __catch451_g_error;
 			}
 		}
 	}
-	goto __finally454;
-	__catch454_g_error:
+	goto __finally451;
+	__catch451_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp13_ = NULL;
@@ -2054,7 +2054,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		_g_error_free0 (err);
 #line 2056 "AppDirs.c"
 	}
-	__finally454:
+	__finally451:
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
diff --git a/src/AppWindow.c b/src/AppWindow.c
index 8db77a9..a22d177 100644
--- a/src/AppWindow.c
+++ b/src/AppWindow.c
@@ -55,8 +55,6 @@ typedef struct _FullscreenWindow FullscreenWindow;
 typedef struct _FullscreenWindowClass FullscreenWindowClass;
 typedef struct _FullscreenWindowPrivate FullscreenWindowPrivate;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define TYPE_APP_WINDOW (app_window_get_type ())
 #define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
@@ -107,6 +105,17 @@ typedef struct _SinglePhotoPageClass SinglePhotoPageClass;
 
 typedef struct _SlideshowPage SlideshowPage;
 typedef struct _SlideshowPageClass SlideshowPageClass;
+
+#define TYPE_APPLICATION (application_get_type ())
+#define APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APPLICATION, Application))
+#define APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APPLICATION, ApplicationClass))
+#define IS_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APPLICATION))
+#define IS_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APPLICATION))
+#define APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APPLICATION, ApplicationClass))
+
+typedef struct _Application Application;
+typedef struct _ApplicationClass ApplicationClass;
+#define _application_unref0(var) ((var == NULL) ? NULL : (var = (application_unref (var), NULL)))
 typedef struct _AppWindowPrivate AppWindowPrivate;
 
 #define TYPE_DIMENSIONS (dimensions_get_type ())
@@ -142,17 +151,8 @@ typedef struct _LibraryWindowClass LibraryWindowClass;
 typedef struct _DirectWindow DirectWindow;
 typedef struct _DirectWindowClass DirectWindowClass;
 #define _command_manager_unref0(var) ((var == NULL) ? NULL : (var = (command_manager_unref (var), NULL)))
-
-#define TYPE_APPLICATION (application_get_type ())
-#define APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APPLICATION, Application))
-#define APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APPLICATION, ApplicationClass))
-#define IS_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APPLICATION))
-#define IS_APPLICATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APPLICATION))
-#define APPLICATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APPLICATION, ApplicationClass))
-
-typedef struct _Application Application;
-typedef struct _ApplicationClass ApplicationClass;
-#define _application_unref0(var) ((var == NULL) ? NULL : (var = (application_unref (var), NULL)))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
 #define DATA_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_COLLECTION, DataCollection))
@@ -249,13 +249,12 @@ typedef struct _CommandDescriptionIface CommandDescriptionIface;
 #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 
 struct _PageWindow {
-	GtkWindow parent_instance;
+	GtkApplicationWindow parent_instance;
 	PageWindowPrivate * priv;
-	GtkUIManager* ui;
 };
 
 struct _PageWindowClass {
-	GtkWindowClass parent_class;
+	GtkApplicationWindowClass parent_class;
 	void (*switched_pages) (PageWindow* self, Page* old_page, Page* new_page);
 	void (*set_current_page) (PageWindow* self, Page* page);
 	void (*clear_current_page) (PageWindow* self);
@@ -295,8 +294,6 @@ struct _Dimensions {
 struct _AppWindow {
 	PageWindow parent_instance;
 	AppWindowPrivate * priv;
-	GtkActionGroup** common_action_groups;
-	gint common_action_groups_length1;
 	gboolean maximized;
 	Dimensions dimensions;
 	gint pos_x;
@@ -308,16 +305,11 @@ struct _AppWindowClass {
 	void (*on_fullscreen) (AppWindow* self);
 	gchar* (*get_app_role) (AppWindow* self);
 	void (*on_quit) (AppWindow* self);
-	GtkActionGroup** (*create_common_action_groups) (AppWindow* self, int* result_length1);
-	void (*replace_common_placeholders) (AppWindow* self, GtkUIManager* ui);
+	void (*add_actions) (AppWindow* self);
 	void (*update_common_action_availability) (AppWindow* self, Page* old_page, Page* new_page);
 	void (*update_common_actions) (AppWindow* self, Page* page, gint selected_count, gint count);
 };
 
-struct _AppWindowPrivate {
-	GtkActionGroup* common_action_group;
-};
-
 typedef enum  {
 	DATABASE_ERROR_ERROR,
 	DATABASE_ERROR_BACKING,
@@ -354,14 +346,15 @@ enum  {
 #define FULLSCREEN_WINDOW_TOOLBAR_INVOCATION_MSEC 250
 #define FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC 2
 #define FULLSCREEN_WINDOW_TOOLBAR_CHECK_DISMISSAL_MSEC 500
+static void fullscreen_window_on_close (FullscreenWindow* self);
+static void _fullscreen_window_on_close_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 FullscreenWindow* fullscreen_window_new (Page* page);
 FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page);
 PageWindow* page_window_construct (GType object_type);
 void page_window_set_current_page (PageWindow* self, Page* page);
-GFile* resources_get_ui (const gchar* filename);
-static GtkActionEntry* fullscreen_window_create_actions (FullscreenWindow* self, int* result_length1);
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
+void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1);
 static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkRectangle* result);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
@@ -369,8 +362,6 @@ ConfigFacade* config_facade_get_instance (void);
 gboolean configuration_facade_get_pin_toolbar_state (ConfigurationFacade* self);
 void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self);
 static void _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self);
-static void fullscreen_window_on_close (FullscreenWindow* self);
-static void _fullscreen_window_on_close_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self);
 GtkToolbar* page_get_toolbar (Page* self);
 #define RESOURCES_TRANSIENT_WINDOW_OPACITY 0.90
 GType single_photo_page_get_type (void) G_GNUC_CONST;
@@ -384,10 +375,6 @@ void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self);
 static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event);
 Page* page_window_get_current_page (PageWindow* self);
 void page_switched_to (Page* self);
-#define RESOURCES_LEAVE_FULLSCREEN_LABEL _ ("Leave _Fullscreen")
-#define TRANSLATABLE "translatable"
-static void _fullscreen_window_on_close_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add158 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEventKey* event);
 void configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, gboolean state);
 void app_window_end_fullscreen (AppWindow* self);
@@ -410,7 +397,15 @@ enum  {
 };
 void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_page);
 static void page_window_real_switched_pages (PageWindow* self, Page* old_page, Page* new_page);
-GtkUIManager* page_window_get_ui_manager (PageWindow* self);
+gpointer application_ref (gpointer instance);
+void application_unref (gpointer instance);
+GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_application (GValue* value, gpointer v_object);
+void value_take_application (GValue* value, gpointer v_object);
+gpointer value_get_application (const GValue* value);
+GType application_get_type (void) G_GNUC_CONST;
+Application* application_get_instance (void);
+GtkApplication* application_get_system_app (Application* self);
 static void page_window_real_set_current_page (PageWindow* self, Page* page);
 void page_clear_container (Page* self);
 void page_set_container (Page* self, GtkWindow* container);
@@ -432,7 +427,6 @@ static void page_window_finalize (GObject* obj);
 GType dimensions_get_type (void) G_GNUC_CONST;
 Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
-#define APP_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_APP_WINDOW, AppWindowPrivate))
 enum  {
 	APP_WINDOW_DUMMY_PROPERTY
 };
@@ -444,6 +438,26 @@ void value_take_command_manager (GValue* value, gpointer v_object);
 gpointer value_get_command_manager (const GValue* value);
 GType command_manager_get_type (void) G_GNUC_CONST;
 #define APP_WINDOW_DND_ICON_SCALE 128
+void app_window_on_quit (AppWindow* self);
+static void _app_window_on_quit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void app_window_on_fullscreen (AppWindow* self);
+static void _app_window_on_fullscreen_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void app_window_on_help_contents (AppWindow* self);
+static void _app_window_on_help_contents_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void app_window_on_help_faq (AppWindow* self);
+static void _app_window_on_help_faq_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void app_window_on_help_report_problem (AppWindow* self);
+static void _app_window_on_help_report_problem_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void app_window_on_undo (AppWindow* self);
+static void _app_window_on_undo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void app_window_on_redo (AppWindow* self);
+static void _app_window_on_redo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void app_window_on_jump_to_file (AppWindow* self);
+static void _app_window_on_jump_to_file_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void app_window_on_select_all (AppWindow* self);
+static void _app_window_on_select_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void app_window_on_select_none (AppWindow* self);
+static void _app_window_on_select_none_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 AppWindow* app_window_construct (GType object_type);
 #define RESOURCES_APP_TITLE "Shotwell"
 GType library_window_get_type (void) G_GNUC_CONST;
@@ -455,8 +469,7 @@ CommandManager* command_manager_new (gint depth);
 CommandManager* command_manager_construct (GType object_type, gint depth);
 static void app_window_on_command_manager_altered (AppWindow* self);
 static void _app_window_on_command_manager_altered_command_manager_altered (CommandManager* _sender, gboolean can_undo, gboolean can_redo, gpointer self);
-GtkActionGroup** app_window_create_common_action_groups (AppWindow* self, int* result_length1);
-gchar* build_dummy_ui_string (GtkActionGroup** groups, int groups_length1);
+void app_window_add_actions (AppWindow* self);
 #define RESOURCES_CUSTOM_CSS "LibraryWindow .pane-separator {\n" \
 "               background-color: @borders;\n" \
 "            }\n" \
@@ -465,48 +478,6 @@ gchar* build_dummy_ui_string (GtkActionGroup** groups, int groups_length1);
 "               border-style: solid;\n" \
 "               border-color: @borders;\n" \
 "            }"
-static GtkActionEntry* app_window_create_common_actions (AppWindow* self, int* result_length1);
-#define RESOURCES_QUIT_LABEL _ ("_Quit")
-void app_window_on_quit (AppWindow* self);
-static void _app_window_on_quit_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add159 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ABOUT_LABEL _ ("_About")
-void app_window_on_about (AppWindow* self);
-static void _app_window_on_about_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add160 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_FULLSCREEN_LABEL _ ("Fulls_creen")
-void app_window_on_fullscreen (AppWindow* self);
-static void _app_window_on_fullscreen_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add161 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_HELP_LABEL _ ("_Help")
-static void app_window_on_help_contents (AppWindow* self);
-static void _app_window_on_help_contents_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add162 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void app_window_on_help_faq (AppWindow* self);
-static void _app_window_on_help_faq_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add163 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void app_window_on_help_report_problem (AppWindow* self);
-static void _app_window_on_help_report_problem_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add164 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_UNDO_MENU _ ("_Undo")
-static void app_window_on_undo (AppWindow* self);
-static void _app_window_on_undo_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add165 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_REDO_MENU _ ("_Redo")
-static void app_window_on_redo (AppWindow* self);
-static void _app_window_on_redo_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add166 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_JUMP_TO_FILE_MENU _ ("Show in File Mana_ger")
-void app_window_on_jump_to_file (AppWindow* self);
-static void _app_window_on_jump_to_file_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add167 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_SELECT_ALL_MENU _ ("Select _All")
-static void app_window_on_select_all (AppWindow* self);
-static void _app_window_on_select_all_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add168 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void app_window_on_select_none (AppWindow* self);
-static void _app_window_on_select_none_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add169 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void app_window_real_on_fullscreen (AppWindow* self);
 gboolean app_window_has_instance (void);
 FullscreenWindow* app_window_get_fullscreen (void);
@@ -522,17 +493,10 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 GQuark database_error_quark (void);
 void app_window_database_error (GError* err);
 void app_window_panic (const gchar* msg);
-gpointer application_ref (gpointer instance);
-void application_unref (gpointer instance);
-GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_application (GValue* value, gpointer v_object);
-void value_take_application (GValue* value, gpointer v_object);
-gpointer value_get_application (const GValue* value);
-GType application_get_type (void) G_GNUC_CONST;
-Application* application_get_instance (void);
 void application_panic (Application* self);
 gchar* app_window_get_app_role (AppWindow* self);
 static gchar* app_window_real_get_app_role (AppWindow* self);
+void app_window_on_about (AppWindow* self);
 #define RESOURCES_APP_VERSION _VERSION
 #define RESOURCES_COPYRIGHT _ ("Copyright 2016 Software Freedom Conservancy Inc.")
 #define RESOURCES_HOME_URL "https://wiki.gnome.org/Apps/Shotwell"
@@ -590,16 +554,11 @@ static void app_window_real_destroy (GtkWidget* base);
 gchar* get_nautilus_install_location (void);
 void show_file_in_nautilus (const gchar* filename, GError** error);
 void sys_show_uri (GdkScreen* screen, const gchar* uri, GError** error);
-static GtkActionGroup** app_window_real_create_common_action_groups (AppWindow* self, int* result_length1);
-static void _vala_array_add170 (GtkActionGroup*** array, int* length, int* size, GtkActionGroup* value);
-GtkActionGroup** app_window_get_common_action_groups (AppWindow* self, int* result_length1);
-static GtkActionGroup** _vala_array_dup28 (GtkActionGroup** self, int length);
-void app_window_replace_common_placeholders (AppWindow* self, GtkUIManager* ui);
-static void app_window_real_replace_common_placeholders (AppWindow* self, GtkUIManager* ui);
+static void app_window_real_add_actions (AppWindow* self);
 void app_window_go_fullscreen (AppWindow* self, Page* page);
 void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw);
 void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw);
-GtkAction* app_window_get_common_action (AppWindow* self, const gchar* name);
+GAction* app_window_get_common_action (AppWindow* self, const gchar* name);
 void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, gboolean sensitive);
 void app_window_set_common_action_important (AppWindow* self, const gchar* name, gboolean important);
 void app_window_set_common_action_visible (AppWindow* self, const gchar* name, gboolean visible);
@@ -619,9 +578,9 @@ void app_window_decorate_redo_action (AppWindow* self);
 CommandManager* app_window_get_command_manager (void);
 GType command_description_get_type (void) G_GNUC_CONST;
 static void app_window_decorate_command_manager_action (AppWindow* self, const gchar* name, const gchar* prefix, const gchar* default_explanation, CommandDescription* desc);
-gchar* command_description_get_name (CommandDescription* self);
-gchar* command_description_get_explanation (CommandDescription* self);
+#define RESOURCES_UNDO_MENU _ ("_Undo")
 CommandDescription* command_manager_get_undo_description (CommandManager* self);
+#define RESOURCES_REDO_MENU _ ("_Redo")
 CommandDescription* command_manager_get_redo_description (CommandManager* self);
 gboolean command_manager_undo (CommandManager* self);
 gboolean command_manager_redo (CommandManager* self);
@@ -629,441 +588,318 @@ void view_collection_select_all (ViewCollection* self);
 void view_collection_unselect_all (ViewCollection* self);
 static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfigure* event);
 static void app_window_finalize (GObject* obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
+static const GActionEntry FULLSCREEN_WINDOW_entries[1] = {{"LeaveFullscreen", _fullscreen_window_on_close_gsimple_action_activate_callback}};
+static const GActionEntry APP_WINDOW_common_actions[10] = {{"CommonQuit", _app_window_on_quit_gsimple_action_activate_callback}, {"CommonFullscreen", _app_window_on_fullscreen_gsimple_action_activate_callback}, {"CommonHelpContents", _app_window_on_help_contents_gsimple_action_activate_callback}, {"CommonHelpFAQ", _app_window_on_help_faq_gsimple_action_activate_callback}, {"CommonHelpReportProblem", _app_window_on_help_report_problem_gsimple_action_activate_callback}, {"CommonUndo", _app_window_on_undo_gsimple_action_activate_callback}, {"CommonRedo", _app_window_on_redo_gsimple_action_activate_callback}, {"CommonJumpToFile", _app_window_on_jump_to_file_gsimple_action_activate_callback}, {"CommonSelectAll", _app_window_on_select_all_gsimple_action_activate_callback}, {"CommonSelectNone", _app_window_on_select_none_gsimple_action_activate_callback}};
 extern const gchar* RESOURCES_AUTHORS[6];
 
-static gpointer _g_object_ref0 (gpointer self) {
-#line 38 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 613 "AppWindow.c"
+static void _fullscreen_window_on_close_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	fullscreen_window_on_close ((FullscreenWindow*) self);
+#line 572 "AppWindow.c"
 }
 
 
 static void _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
-#line 57 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 50 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_update_toolbar_dismissal ((FullscreenWindow*) self);
-#line 620 "AppWindow.c"
-}
-
-
-static void _fullscreen_window_on_close_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
-#line 61 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	fullscreen_window_on_close ((FullscreenWindow*) self);
-#line 627 "AppWindow.c"
+#line 579 "AppWindow.c"
 }
 
 
 static void _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar (SlideshowPage* _sender, gpointer self) {
-#line 72 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_hide_toolbar ((FullscreenWindow*) self);
-#line 634 "AppWindow.c"
+#line 586 "AppWindow.c"
 }
 
 
 FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 	FullscreenWindow * self = NULL;
 	Page* _tmp0_ = NULL;
-	GFile* ui_file = NULL;
-	GFile* _tmp1_ = NULL;
-	GtkActionGroup* action_group = NULL;
-	GtkActionGroup* _tmp8_ = NULL;
-	GtkActionGroup* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	GtkActionEntry* _tmp11_ = NULL;
-	GtkActionEntry* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	GtkUIManager* _tmp13_ = NULL;
-	GtkActionGroup* _tmp14_ = NULL;
-	GtkUIManager* _tmp15_ = NULL;
-	GtkAccelGroup* accel_group = NULL;
-	GtkUIManager* _tmp16_ = NULL;
-	GtkAccelGroup* _tmp17_ = NULL;
-	GtkAccelGroup* _tmp18_ = NULL;
-	GtkAccelGroup* _tmp19_ = NULL;
-	AppWindow* _tmp21_ = NULL;
-	AppWindow* _tmp22_ = NULL;
-	GdkScreen* _tmp23_ = NULL;
+	AppWindow* _tmp1_ = NULL;
+	AppWindow* _tmp2_ = NULL;
+#line 32 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	static const gchar* accels[] = {"F11"};
+#line 597 "AppWindow.c"
+	AppWindow* _tmp3_ = NULL;
+	AppWindow* _tmp4_ = NULL;
+	GdkScreen* _tmp5_ = NULL;
 	GdkRectangle monitor = {0};
-	GdkRectangle _tmp24_ = {0};
-	GdkRectangle _tmp25_ = {0};
-	gint _tmp26_ = 0;
-	GdkRectangle _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	ConfigFacade* _tmp29_ = NULL;
-	ConfigFacade* _tmp30_ = NULL;
-	gboolean _tmp31_ = FALSE;
-	GtkToggleToolButton* _tmp32_ = NULL;
-	GtkToggleToolButton* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	GtkToggleToolButton* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
-	GtkToggleToolButton* _tmp37_ = NULL;
-	gboolean _tmp38_ = FALSE;
-	GtkToggleToolButton* _tmp39_ = NULL;
+	GdkRectangle _tmp6_ = {0};
+	GdkRectangle _tmp7_ = {0};
+	gint _tmp8_ = 0;
+	GdkRectangle _tmp9_ = {0};
+	gint _tmp10_ = 0;
+	ConfigFacade* _tmp11_ = NULL;
+	ConfigFacade* _tmp12_ = NULL;
+	gboolean _tmp13_ = FALSE;
+	GtkToggleToolButton* _tmp14_ = NULL;
+	GtkToggleToolButton* _tmp15_ = NULL;
+	const gchar* _tmp16_ = NULL;
+	GtkToggleToolButton* _tmp17_ = NULL;
+	const gchar* _tmp18_ = NULL;
+	GtkToggleToolButton* _tmp19_ = NULL;
+	gboolean _tmp20_ = FALSE;
+	GtkToggleToolButton* _tmp21_ = NULL;
+	GtkToolButton* _tmp22_ = NULL;
+	GtkToolButton* _tmp23_ = NULL;
+	const gchar* _tmp24_ = NULL;
+	GtkToolButton* _tmp25_ = NULL;
+	Page* _tmp26_ = NULL;
+	GtkToolbar* _tmp27_ = NULL;
+	GtkToolbar* _tmp28_ = NULL;
+	GtkToolbar* _tmp29_ = NULL;
+	GtkToolbar* _tmp30_ = NULL;
+	GtkToolbar* _tmp31_ = NULL;
+	GtkToolbar* _tmp32_ = NULL;
+	Page* _tmp33_ = NULL;
+	Page* _tmp37_ = NULL;
+	Page* _tmp38_ = NULL;
+	GtkToolbar* _tmp39_ = NULL;
 	GtkToolButton* _tmp40_ = NULL;
-	GtkToolButton* _tmp41_ = NULL;
-	const gchar* _tmp42_ = NULL;
-	GtkToolButton* _tmp43_ = NULL;
-	Page* _tmp44_ = NULL;
+	GtkOverlay* _tmp41_ = NULL;
+	GtkOverlay* _tmp42_ = NULL;
+	Page* _tmp43_ = NULL;
+	GtkOverlay* _tmp44_ = NULL;
 	GtkToolbar* _tmp45_ = NULL;
-	GtkToolbar* _tmp46_ = NULL;
-	GtkToolbar* _tmp47_ = NULL;
-	GtkToolbar* _tmp48_ = NULL;
-	GtkToolbar* _tmp49_ = NULL;
-	GtkToolbar* _tmp50_ = NULL;
-	Page* _tmp51_ = NULL;
-	Page* _tmp55_ = NULL;
-	Page* _tmp56_ = NULL;
-	GtkToolbar* _tmp57_ = NULL;
-	GtkToolButton* _tmp58_ = NULL;
-	GtkOverlay* _tmp59_ = NULL;
-	GtkOverlay* _tmp60_ = NULL;
-	Page* _tmp61_ = NULL;
-	GtkOverlay* _tmp62_ = NULL;
-	GtkToolbar* _tmp63_ = NULL;
-	GdkRectangle _tmp64_ = {0};
-	gint _tmp65_ = 0;
-	GdkRectangle _tmp66_ = {0};
-	gint _tmp67_ = 0;
-	Page* _tmp68_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	GdkRectangle _tmp46_ = {0};
+	gint _tmp47_ = 0;
+	GdkRectangle _tmp48_ = {0};
+	gint _tmp49_ = 0;
+	Page* _tmp50_ = NULL;
+#line 26 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_PAGE (page), NULL);
-#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = (FullscreenWindow*) page_window_construct (object_type);
-#line 23 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 29 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page;
-#line 23 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 29 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page_window_set_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), _tmp0_);
-#line 25 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_ = resources_get_ui ("fullscreen.ui");
-#line 25 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	ui_file = _tmp1_;
-#line 717 "AppWindow.c"
-	{
-		GtkUIManager* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-#line 28 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
-#line 28 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp3_ = g_file_get_path (ui_file);
-#line 28 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp4_ = _tmp3_;
-#line 28 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_ui_manager_add_ui_from_file (_tmp2_, _tmp4_, &_inner_error_);
-#line 28 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp4_);
-#line 28 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 734 "AppWindow.c"
-			goto __catch224_g_error;
-		}
-	}
-	goto __finally224;
-	__catch224_g_error:
-	{
-		GError* err = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-#line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		err = _inner_error_;
-#line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_inner_error_ = NULL;
-#line 30 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp5_ = g_file_get_path (ui_file);
-#line 30 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp6_ = _tmp5_;
-#line 30 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp7_ = err->message;
-#line 30 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_error ("AppWindow.vala:30: Error loading UI file %s: %s", _tmp6_, _tmp7_);
-#line 30 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp6_);
-#line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_error_free0 (err);
-#line 761 "AppWindow.c"
-	}
-	__finally224:
-#line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_object_unref0 (ui_file);
-#line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_clear_error (&_inner_error_);
-#line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		return NULL;
-#line 774 "AppWindow.c"
-	}
-#line 33 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp8_ = gtk_action_group_new ("FullscreenActionGroup");
+#line 31 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp1_ = app_window_get_instance ();
+#line 31 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp2_ = _tmp1_;
+#line 31 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_action_map_get_type (), GActionMap), FULLSCREEN_WINDOW_entries, G_N_ELEMENTS (FULLSCREEN_WINDOW_entries), self);
+#line 31 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (_tmp2_);
 #line 33 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action_group = _tmp8_;
-#line 34 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp9_ = action_group;
-#line 34 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp11_ = fullscreen_window_create_actions (self, &_tmp10_);
-#line 34 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp12_ = _tmp11_;
-#line 34 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp12__length1 = _tmp10_;
-#line 34 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_action_group_add_actions (_tmp9_, _tmp12_, _tmp10_, self);
-#line 34 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp12_ = (g_free (_tmp12_), NULL);
+	application_set_accels_for_action ("win.LeaveFullscreen", accels, G_N_ELEMENTS (accels));
+#line 35 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp3_ = app_window_get_instance ();
 #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
+	_tmp4_ = _tmp3_;
 #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp14_ = action_group;
+	_tmp5_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow));
 #line 35 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_ui_manager_insert_action_group (_tmp13_, _tmp14_, 0);
-#line 36 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
-#line 36 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_ui_manager_ensure_update (_tmp15_);
-#line 38 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
-#line 38 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp17_ = gtk_ui_manager_get_accel_group (_tmp16_);
+	gtk_window_set_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp5_);
+#line 35 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (_tmp4_);
 #line 38 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp18_ = _g_object_ref0 (_tmp17_);
+	fullscreen_window_get_monitor_geometry (self, &_tmp6_);
 #line 38 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	accel_group = _tmp18_;
+	monitor = _tmp6_;
 #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp19_ = accel_group;
+	_tmp7_ = monitor;
 #line 39 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp19_ != NULL) {
-#line 814 "AppWindow.c"
-		GtkAccelGroup* _tmp20_ = NULL;
-#line 40 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp20_ = accel_group;
-#line 40 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_window_add_accel_group (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp20_);
-#line 820 "AppWindow.c"
-	}
-#line 42 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp21_ = app_window_get_instance ();
-#line 42 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp22_ = _tmp21_;
-#line 42 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp23_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_window_get_type (), GtkWindow));
-#line 42 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_window_set_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp23_);
-#line 42 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (_tmp22_);
-#line 45 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	fullscreen_window_get_monitor_geometry (self, &_tmp24_);
-#line 45 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	monitor = _tmp24_;
-#line 46 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp25_ = monitor;
-#line 46 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp26_ = _tmp25_.x;
-#line 46 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp27_ = monitor;
+	_tmp8_ = _tmp7_.x;
+#line 39 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp9_ = monitor;
+#line 39 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp10_ = _tmp9_.y;
+#line 39 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp8_, _tmp10_);
+#line 41 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), (guint) 0);
+#line 44 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp11_ = config_facade_get_instance ();
+#line 44 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp12_ = _tmp11_;
+#line 44 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp13_ = configuration_facade_get_pin_toolbar_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 44 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	self->priv->is_toolbar_dismissal_enabled = _tmp13_;
+#line 44 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (_tmp12_);
 #line 46 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp28_ = _tmp27_.y;
+	_tmp14_ = self->priv->pin_button;
 #line 46 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp26_, _tmp28_);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_tool_button_get_type (), GtkToolButton), "pin-toolbar");
+#line 47 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp15_ = self->priv->pin_button;
+#line 47 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp16_ = _ ("Pin Toolbar");
+#line 47 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_button_get_type (), GtkToolButton), _tmp16_);
 #line 48 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 51 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp29_ = config_facade_get_instance ();
-#line 51 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp30_ = _tmp29_;
-#line 51 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp31_ = configuration_facade_get_pin_toolbar_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 51 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->priv->is_toolbar_dismissal_enabled = _tmp31_;
-#line 51 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (_tmp30_);
+	_tmp17_ = self->priv->pin_button;
+#line 48 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp18_ = _ ("Pin the toolbar open");
+#line 48 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_item_get_type (), GtkToolItem), _tmp18_);
+#line 49 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp19_ = self->priv->pin_button;
+#line 49 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp20_ = self->priv->is_toolbar_dismissal_enabled;
+#line 49 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_toggle_tool_button_set_active (_tmp19_, !_tmp20_);
+#line 50 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp21_ = self->priv->pin_button;
+#line 50 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_button_get_type (), GtkToolButton), "clicked", (GCallback) _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked, self, 0);
+#line 52 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp22_ = self->priv->close_button;
+#line 52 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_tool_button_set_icon_name (_tmp22_, "view-restore");
 #line 53 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp32_ = self->priv->pin_button;
+	_tmp23_ = self->priv->close_button;
 #line 53 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_button_get_type (), GtkToolButton), "pin-toolbar");
-#line 54 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp33_ = self->priv->pin_button;
+	_tmp24_ = _ ("Leave fullscreen");
+#line 53 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_tool_item_get_type (), GtkToolItem), _tmp24_);
 #line 54 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp34_ = _ ("Pin Toolbar");
+	_tmp25_ = self->priv->close_button;
 #line 54 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_button_get_type (), GtkToolButton), _tmp34_);
-#line 55 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp35_ = self->priv->pin_button;
-#line 55 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp36_ = _ ("Pin the toolbar open");
-#line 55 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), _tmp36_);
+	gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.LeaveFullscreen");
 #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp37_ = self->priv->pin_button;
+	_tmp26_ = page;
 #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp38_ = self->priv->is_toolbar_dismissal_enabled;
+	_tmp27_ = page_get_toolbar (_tmp26_);
+#line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (self->priv->toolbar);
 #line 56 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_toggle_tool_button_set_active (_tmp37_, !_tmp38_);
+	self->priv->toolbar = _tmp27_;
 #line 57 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp39_ = self->priv->pin_button;
+	_tmp28_ = self->priv->toolbar;
 #line 57 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_button_get_type (), GtkToolButton), "clicked", (GCallback) _fullscreen_window_update_toolbar_dismissal_gtk_tool_button_clicked, self, 0);
+	gtk_toolbar_set_show_arrow (_tmp28_, FALSE);
+#line 58 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp29_ = self->priv->toolbar;
+#line 58 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
 #line 59 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp40_ = self->priv->close_button;
+	_tmp30_ = self->priv->toolbar;
 #line 59 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_tool_button_set_icon_name (_tmp40_, "view-restore");
-#line 60 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp41_ = self->priv->close_button;
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 60 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp42_ = _ ("Leave fullscreen");
+	_tmp31_ = self->priv->toolbar;
 #line 60 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_item_get_type (), GtkToolItem), _tmp42_);
+	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), "expand", FALSE, NULL);
 #line 61 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp43_ = self->priv->close_button;
+	_tmp32_ = self->priv->toolbar;
 #line 61 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_signal_connect_object (_tmp43_, "clicked", (GCallback) _fullscreen_window_on_close_gtk_tool_button_clicked, self, 0);
-#line 63 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp44_ = page;
-#line 63 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp45_ = page_get_toolbar (_tmp44_);
+	gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), RESOURCES_TRANSIENT_WINDOW_OPACITY);
 #line 63 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (self->priv->toolbar);
+	_tmp33_ = page;
 #line 63 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->priv->toolbar = _tmp45_;
-#line 64 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp46_ = self->priv->toolbar;
-#line 64 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_toolbar_set_show_arrow (_tmp46_, FALSE);
+	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp33_, TYPE_SLIDESHOW_PAGE)) {
+#line 770 "AppWindow.c"
+		Page* _tmp34_ = NULL;
 #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp47_ = self->priv->toolbar;
+		_tmp34_ = page;
 #line 65 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
-#line 66 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp48_ = self->priv->toolbar;
-#line 66 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
-#line 67 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp49_ = self->priv->toolbar;
-#line 67 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), "expand", FALSE, NULL);
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0);
+#line 776 "AppWindow.c"
+	} else {
+		GtkToolbar* _tmp35_ = NULL;
+		GtkToggleToolButton* _tmp36_ = NULL;
 #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp50_ = self->priv->toolbar;
+		_tmp35_ = self->priv->toolbar;
 #line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), RESOURCES_TRANSIENT_WINDOW_OPACITY);
-#line 70 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp51_ = page;
-#line 70 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, TYPE_SLIDESHOW_PAGE)) {
-#line 930 "AppWindow.c"
-		Page* _tmp52_ = NULL;
+		_tmp36_ = self->priv->pin_button;
+#line 68 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 786 "AppWindow.c"
+	}
+#line 71 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp37_ = page;
+#line 71 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	page_set_cursor_hide_time (_tmp37_, FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC * 1000);
 #line 72 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp52_ = page;
+	_tmp38_ = page;
 #line 72 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_SLIDESHOW_PAGE, SlideshowPage), "hide-toolbar", (GCallback) _fullscreen_window_hide_toolbar_slideshow_page_hide_toolbar, self, 0);
-#line 936 "AppWindow.c"
-	} else {
-		GtkToolbar* _tmp53_ = NULL;
-		GtkToggleToolButton* _tmp54_ = NULL;
-#line 75 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp53_ = self->priv->toolbar;
-#line 75 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp54_ = self->priv->pin_button;
-#line 75 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_toolbar_insert (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 946 "AppWindow.c"
-	}
+	page_start_cursor_hiding (_tmp38_);
+#line 74 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp39_ = self->priv->toolbar;
+#line 74 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp40_ = self->priv->close_button;
+#line 74 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_toolbar_insert (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 76 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp41_ = self->priv->overlay;
+#line 76 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget));
+#line 77 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp42_ = self->priv->overlay;
+#line 77 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp43_ = page;
+#line 77 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget));
+#line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp44_ = self->priv->overlay;
 #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp55_ = page;
+	_tmp45_ = self->priv->toolbar;
 #line 78 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page_set_cursor_hide_time (_tmp55_, FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC * 1000);
-#line 79 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp56_ = page;
-#line 79 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page_start_cursor_hiding (_tmp56_);
-#line 81 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp57_ = self->priv->toolbar;
-#line 81 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp58_ = self->priv->close_button;
-#line 81 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_toolbar_insert (_tmp57_, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_overlay_add_overlay (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
 #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp59_ = self->priv->overlay;
+	_tmp46_ = monitor;
 #line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget));
-#line 84 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp60_ = self->priv->overlay;
-#line 84 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp61_ = page;
-#line 84 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
-#line 85 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp62_ = self->priv->overlay;
-#line 85 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp63_ = self->priv->toolbar;
-#line 85 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_overlay_add_overlay (_tmp62_, G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget));
-#line 90 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp64_ = monitor;
-#line 90 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp65_ = _tmp64_.width;
-#line 90 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp66_ = monitor;
-#line 90 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp67_ = _tmp66_.height;
-#line 90 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp65_, _tmp67_);
-#line 93 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp47_ = _tmp46_.width;
+#line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp48_ = monitor;
+#line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp49_ = _tmp48_.height;
+#line 83 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp47_, _tmp49_);
+#line 86 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 94 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 87 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 97 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 90 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_POINTER_MOTION_MASK);
-#line 100 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 93 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_invoke_toolbar (self);
-#line 103 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp68_ = page;
-#line 103 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget));
-#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (accel_group);
-#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (action_group);
-#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (ui_file);
-#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp50_ = page;
+#line 96 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget));
+#line 99 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE);
+#line 26 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self;
-#line 1008 "AppWindow.c"
+#line 844 "AppWindow.c"
 }
 
 
 FullscreenWindow* fullscreen_window_new (Page* page) {
-#line 22 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 26 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return fullscreen_window_construct (TYPE_FULLSCREEN_WINDOW, page);
-#line 1015 "AppWindow.c"
+#line 851 "AppWindow.c"
 }
 
 
 void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self) {
-#line 106 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 102 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 103 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_dismissal_enabled = FALSE;
-#line 1024 "AppWindow.c"
+#line 860 "AppWindow.c"
 }
 
 
 void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 110 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 106 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 111 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->pin_button;
-#line 111 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gtk_toggle_tool_button_get_active (_tmp0_);
-#line 111 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 107 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_dismissal_enabled = !_tmp1_;
-#line 1039 "AppWindow.c"
+#line 875 "AppWindow.c"
 }
 
 
@@ -1076,31 +912,31 @@ static void fullscreen_window_get_monitor_geometry (FullscreenWindow* self, GdkR
 	GdkWindow* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
 	GdkRectangle _tmp6_ = {0};
-#line 114 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 110 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = gdk_screen_get_monitor_at_window (_tmp1_, _tmp4_);
-#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gdk_screen_get_monitor_geometry (_tmp0_, _tmp5_, &_tmp6_);
-#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	monitor = _tmp6_;
-#line 117 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 113 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 116 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	*result = monitor;
-#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 116 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return;
-#line 1076 "AppWindow.c"
+#line 912 "AppWindow.c"
 }
 
 
@@ -1111,129 +947,40 @@ static gboolean fullscreen_window_real_configure_event (GtkWidget* base, GdkEven
 	GdkEventConfigure* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 119 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 119 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = event;
-#line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 120 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_result_ = _tmp1_;
-#line 126 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 122 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->switched_to;
-#line 126 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 122 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 1101 "AppWindow.c"
+#line 937 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switched_to (_tmp4_);
-#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 123 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp4_);
-#line 128 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 124 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->switched_to = TRUE;
-#line 1114 "AppWindow.c"
+#line 950 "AppWindow.c"
 	}
-#line 131 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _result_;
-#line 131 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	return result;
-#line 1120 "AppWindow.c"
-}
-
-
-static void _fullscreen_window_on_close_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	fullscreen_window_on_close ((FullscreenWindow*) self);
-#line 1127 "AppWindow.c"
-}
-
-
-static void _vala_array_add158 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1138 "AppWindow.c"
-	}
-#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 1142 "AppWindow.c"
-}
-
-
-static GtkActionEntry* fullscreen_window_create_actions (FullscreenWindow* self, int* result_length1) {
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	GtkActionEntry* _tmp0_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry leave_fullscreen = {0};
-	GtkActionEntry _tmp1_ = {0};
-	GtkActionEntry* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	GtkActionEntry _tmp3_ = {0};
-	GtkActionEntry* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-#line 134 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), NULL);
-#line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0_ = g_new0 (GtkActionEntry, 0);
-#line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	actions = _tmp0_;
-#line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	actions_length1 = 0;
-#line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_actions_size_ = actions_length1;
-#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_.name = "LeaveFullscreen";
-#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_.stock_id = RESOURCES_LEAVE_FULLSCREEN_LABEL;
-#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_.label = TRANSLATABLE;
-#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_.accelerator = "F11";
-#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_.tooltip = TRANSLATABLE;
-#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_.callback = (GCallback) _fullscreen_window_on_close_gtk_action_callback;
-#line 137 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	leave_fullscreen = _tmp1_;
-#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	leave_fullscreen.label = RESOURCES_LEAVE_FULLSCREEN_LABEL;
-#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	leave_fullscreen.tooltip = RESOURCES_LEAVE_FULLSCREEN_LABEL;
-#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2_ = actions;
-#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2__length1 = actions_length1;
-#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp3_ = leave_fullscreen;
-#line 141 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add158 (&actions, &actions_length1, &_actions_size_, &_tmp3_);
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_ = actions;
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4__length1 = actions_length1;
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (result_length1) {
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*result_length1 = _tmp4__length1;
-#line 1203 "AppWindow.c"
-	}
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	result = _tmp4_;
-#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 127 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1209 "AppWindow.c"
+#line 956 "AppWindow.c"
 }
 
 
@@ -1249,68 +996,68 @@ static gboolean fullscreen_window_real_key_press_event (GtkWidget* base, GdkEven
 	GdkEventKey* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
-#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 130 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 130 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 148 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 132 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = event;
-#line 148 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 132 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 148 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 132 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 148 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 132 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 149 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 133 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		fullscreen_window_on_close (self);
-#line 151 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 151 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 135 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1243 "AppWindow.c"
+#line 990 "AppWindow.c"
 	}
-#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event != NULL) {
-#line 1247 "AppWindow.c"
+#line 994 "AppWindow.c"
 		GdkEventKey* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = event;
-#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp4_);
-#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp5_;
-#line 1256 "AppWindow.c"
+#line 1003 "AppWindow.c"
 	} else {
-#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = FALSE;
-#line 1260 "AppWindow.c"
+#line 1007 "AppWindow.c"
 	}
-#line 155 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_) {
-#line 156 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 156 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 140 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1268 "AppWindow.c"
+#line 1015 "AppWindow.c"
 	}
-#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = app_window_get_instance ();
-#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = event;
-#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp8_, &_tmp9_);
-#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_;
-#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 143 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1286 "AppWindow.c"
+#line 1033 "AppWindow.c"
 }
 
 
@@ -1320,38 +1067,38 @@ static void fullscreen_window_on_close (FullscreenWindow* self) {
 	gboolean _tmp2_ = FALSE;
 	AppWindow* _tmp3_ = NULL;
 	AppWindow* _tmp4_ = NULL;
-#line 162 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 146 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->is_toolbar_dismissal_enabled;
-#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	configuration_facade_set_pin_toolbar_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
-#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 147 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 164 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 148 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_hide_toolbar (self);
-#line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = app_window_get_instance ();
-#line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_end_fullscreen (_tmp4_);
-#line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 150 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1318 "AppWindow.c"
+#line 1065 "AppWindow.c"
 }
 
 
 void fullscreen_window_close (FullscreenWindow* self) {
-#line 169 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 153 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 170 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_on_close (self);
-#line 1327 "AppWindow.c"
+#line 1074 "AppWindow.c"
 }
 
 
@@ -1360,36 +1107,36 @@ static void fullscreen_window_real_destroy (GtkWidget* base) {
 	Page* page = NULL;
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 173 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 157 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 174 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 158 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 174 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 158 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = _tmp0_;
-#line 175 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page_window_clear_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 177 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 161 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = page;
-#line 177 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 161 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 1348 "AppWindow.c"
+#line 1095 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		Page* _tmp3_ = NULL;
-#line 178 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 162 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = page;
-#line 178 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 162 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_stop_cursor_hiding (_tmp2_);
-#line 179 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 179 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switching_from (_tmp3_);
-#line 1359 "AppWindow.c"
+#line 1106 "AppWindow.c"
 	}
-#line 182 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 166 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	GTK_WIDGET_CLASS (fullscreen_window_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget));
-#line 173 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 157 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 1365 "AppWindow.c"
+#line 1112 "AppWindow.c"
 }
 
 
@@ -1398,34 +1145,34 @@ static gboolean fullscreen_window_real_delete_event (GtkWidget* base, GdkEventAn
 	gboolean result = FALSE;
 	AppWindow* _tmp0_ = NULL;
 	AppWindow* _tmp1_ = NULL;
-#line 185 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 169 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 185 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 169 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 186 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 170 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_on_close (self);
-#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 189 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 173 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = TRUE;
-#line 189 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 173 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1392 "AppWindow.c"
+#line 1139 "AppWindow.c"
 }
 
 
 static gboolean _fullscreen_window_on_check_toolbar_invocation_gsource_func (gpointer self) {
 	gboolean result;
 	result = fullscreen_window_on_check_toolbar_invocation ((FullscreenWindow*) self);
-#line 198 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1401 "AppWindow.c"
+#line 1148 "AppWindow.c"
 }
 
 
@@ -1434,64 +1181,71 @@ static gboolean fullscreen_window_real_motion_notify_event (GtkWidget* base, Gdk
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 192 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 192 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 176 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 193 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 177 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->is_toolbar_shown;
-#line 193 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 177 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp0_) {
-#line 1418 "AppWindow.c"
+#line 1165 "AppWindow.c"
 		gboolean _tmp1_ = FALSE;
 		gboolean _tmp2_ = FALSE;
-#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->waiting_for_invoke;
-#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (!_tmp2_) {
-#line 1425 "AppWindow.c"
+#line 1172 "AppWindow.c"
 			gboolean _tmp3_ = FALSE;
-#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp3_ = fullscreen_window_is_pointer_in_toolbar (self);
-#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp1_ = _tmp3_;
-#line 1431 "AppWindow.c"
+#line 1178 "AppWindow.c"
 		} else {
-#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp1_ = FALSE;
-#line 1435 "AppWindow.c"
+#line 1182 "AppWindow.c"
 		}
-#line 197 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 181 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (_tmp1_) {
-#line 198 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 182 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_INVOCATION_MSEC, _fullscreen_window_on_check_toolbar_invocation_gsource_func, g_object_ref (self), g_object_unref);
-#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 183 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			self->priv->waiting_for_invoke = TRUE;
-#line 1443 "AppWindow.c"
+#line 1190 "AppWindow.c"
 		}
 	}
-#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event != NULL) {
-#line 1448 "AppWindow.c"
+#line 1195 "AppWindow.c"
 		GdkEventMotion* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = event;
-#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = GTK_WIDGET_CLASS (fullscreen_window_parent_class)->motion_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp6_;
-#line 1457 "AppWindow.c"
+#line 1204 "AppWindow.c"
 	} else {
-#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = FALSE;
-#line 1461 "AppWindow.c"
+#line 1208 "AppWindow.c"
 	}
-#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp4_;
-#line 203 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 187 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1467 "AppWindow.c"
+#line 1214 "AppWindow.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 1221 "AppWindow.c"
 }
 
 
@@ -1512,57 +1266,57 @@ static gboolean fullscreen_window_is_pointer_in_toolbar (FullscreenWindow* self)
 	gint _tmp9_ = 0;
 	gint _tmp10_ = 0;
 	gint _tmp11_ = 0;
-#line 206 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 190 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
-#line 207 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_display (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 207 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_display_get_device_manager (_tmp0_);
-#line 207 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 207 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 191 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	devmgr = _tmp2_;
-#line 208 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 192 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = devmgr;
-#line 208 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 192 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 209 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_debug ("AppWindow.vala:209: No device manager for display");
-#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 193 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_debug ("AppWindow.vala:193: No device manager for display");
+#line 195 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = FALSE;
-#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 195 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (devmgr);
-#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 195 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1510 "AppWindow.c"
+#line 1264 "AppWindow.c"
 	}
-#line 215 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = devmgr;
-#line 215 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = gdk_device_manager_get_client_pointer (_tmp4_);
-#line 215 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gdk_device_get_position (_tmp5_, NULL, NULL, &_tmp6_);
-#line 215 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 199 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	py = _tmp6_;
-#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = self->priv->toolbar;
-#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gdk_window_get_geometry (_tmp8_, NULL, &_tmp9_, NULL, NULL);
-#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 202 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	wy = _tmp9_;
-#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = py;
-#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = wy;
-#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_ >= _tmp11_;
-#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (devmgr);
-#line 220 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 204 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1538 "AppWindow.c"
+#line 1292 "AppWindow.c"
 }
 
 
@@ -1570,62 +1324,62 @@ static gboolean fullscreen_window_on_check_toolbar_invocation (FullscreenWindow*
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 223 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 207 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
-#line 224 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 208 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->waiting_for_invoke = FALSE;
-#line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 210 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->is_toolbar_shown;
-#line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 210 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
-#line 227 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = FALSE;
-#line 227 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 211 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1558 "AppWindow.c"
+#line 1312 "AppWindow.c"
 	}
-#line 229 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 213 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = fullscreen_window_is_pointer_in_toolbar (self);
-#line 229 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 213 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp1_) {
-#line 230 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 214 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = FALSE;
-#line 230 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 214 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1568 "AppWindow.c"
+#line 1322 "AppWindow.c"
 	}
-#line 232 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 216 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_invoke_toolbar (self);
-#line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = FALSE;
-#line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1576 "AppWindow.c"
+#line 1330 "AppWindow.c"
 }
 
 
 static gboolean _fullscreen_window_on_check_toolbar_dismissal_gsource_func (gpointer self) {
 	gboolean result;
 	result = fullscreen_window_on_check_toolbar_dismissal ((FullscreenWindow*) self);
-#line 242 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1585 "AppWindow.c"
+#line 1339 "AppWindow.c"
 }
 
 
 static void fullscreen_window_invoke_toolbar (FullscreenWindow* self) {
 	GtkToolbar* _tmp0_ = NULL;
-#line 237 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 221 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 222 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->toolbar;
-#line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 222 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 240 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 224 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_shown = TRUE;
-#line 242 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) FULLSCREEN_WINDOW_TOOLBAR_CHECK_DISMISSAL_MSEC, _fullscreen_window_on_check_toolbar_dismissal_gsource_func, g_object_ref (self), g_object_unref);
-#line 1601 "AppWindow.c"
+#line 1355 "AppWindow.c"
 }
 
 
@@ -1641,99 +1395,99 @@ static gboolean fullscreen_window_on_check_toolbar_dismissal (FullscreenWindow*
 	time_t _tmp7_ = 0;
 	time_t _tmp8_ = 0;
 	time_t _tmp9_ = 0;
-#line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 229 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_FULLSCREEN_WINDOW (self), FALSE);
-#line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->is_toolbar_shown;
-#line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp0_) {
-#line 247 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = FALSE;
-#line 247 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 231 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1627 "AppWindow.c"
+#line 1381 "AppWindow.c"
 	}
-#line 250 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->priv->is_toolbar_dismissal_enabled;
-#line 250 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp1_) {
-#line 251 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 235 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 251 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 235 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1637 "AppWindow.c"
+#line 1391 "AppWindow.c"
 	}
-#line 254 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = fullscreen_window_is_pointer_in_toolbar (self);
-#line 254 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 238 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_) {
-#line 255 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->left_toolbar_time = (time_t) 0;
-#line 257 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 257 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 241 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1649 "AppWindow.c"
+#line 1403 "AppWindow.c"
 	}
-#line 261 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = self->priv->left_toolbar_time;
-#line 261 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ == ((time_t) 0)) {
-#line 1655 "AppWindow.c"
+#line 1409 "AppWindow.c"
 		time_t _tmp4_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = time (NULL);
-#line 262 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->left_toolbar_time = _tmp4_;
-#line 264 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 264 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1665 "AppWindow.c"
+#line 1419 "AppWindow.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 252 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = time (NULL);
-#line 268 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 252 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	now = _tmp5_;
-#line 269 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = now;
-#line 269 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = self->priv->left_toolbar_time;
-#line 269 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_vala_assert (_tmp6_ >= _tmp7_, "now >= left_toolbar_time");
-#line 271 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = now;
-#line 271 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = self->priv->left_toolbar_time;
-#line 271 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 255 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if ((_tmp8_ - _tmp9_) < ((time_t) FULLSCREEN_WINDOW_TOOLBAR_DISMISSAL_SEC)) {
-#line 272 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 256 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 272 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 256 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 1687 "AppWindow.c"
+#line 1441 "AppWindow.c"
 	}
-#line 274 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 258 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fullscreen_window_hide_toolbar (self);
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 260 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = FALSE;
-#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 260 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1695 "AppWindow.c"
+#line 1449 "AppWindow.c"
 }
 
 
 static void fullscreen_window_hide_toolbar (FullscreenWindow* self) {
 	GtkToolbar* _tmp0_ = NULL;
-#line 279 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 263 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (self));
-#line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 264 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->toolbar;
-#line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 264 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 281 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 265 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->is_toolbar_shown = FALSE;
-#line 1709 "AppWindow.c"
+#line 1463 "AppWindow.c"
 }
 
 
@@ -1754,7 +1508,7 @@ static void fullscreen_window_class_init (FullscreenWindowClass * klass) {
 	((GtkWidgetClass *) klass)->motion_notify_event = fullscreen_window_real_motion_notify_event;
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = fullscreen_window_finalize;
-#line 1730 "AppWindow.c"
+#line 1484 "AppWindow.c"
 }
 
 
@@ -1792,7 +1546,7 @@ static void fullscreen_window_instance_init (FullscreenWindow * self) {
 	self->priv->left_toolbar_time = (time_t) 0;
 #line 19 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->switched_to = FALSE;
-#line 1768 "AppWindow.c"
+#line 1522 "AppWindow.c"
 }
 
 
@@ -1810,7 +1564,7 @@ static void fullscreen_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->pin_button);
 #line 7 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (fullscreen_window_parent_class)->finalize (obj);
-#line 1786 "AppWindow.c"
+#line 1540 "AppWindow.c"
 }
 
 
@@ -1827,52 +1581,50 @@ GType fullscreen_window_get_type (void) {
 
 
 static void page_window_real_switched_pages (PageWindow* self, Page* old_page, Page* new_page) {
-#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 1807 "AppWindow.c"
+#line 1561 "AppWindow.c"
 }
 
 
 void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_page) {
-#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 280 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->switched_pages (self, old_page, new_page);
-#line 1816 "AppWindow.c"
+#line 1570 "AppWindow.c"
 }
 
 
 PageWindow* page_window_construct (GType object_type) {
 	PageWindow * self = NULL;
-#line 301 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self = (PageWindow*) g_object_new (object_type, NULL);
-#line 303 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	Application* _tmp0_ = NULL;
+	Application* _tmp1_ = NULL;
+	GtkApplication* _tmp2_ = NULL;
+	GtkApplication* _tmp3_ = NULL;
+#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp0_ = application_get_instance ();
+#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp1_ = _tmp0_;
+#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp2_ = application_get_system_app (_tmp1_);
+#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp3_ = _tmp2_;
+#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	self = (PageWindow*) g_object_new (object_type, "application", _tmp3_, NULL);
+#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (_tmp3_);
+#line 284 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_application_unref0 (_tmp1_);
+#line 287 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) ((GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK) | GDK_STRUCTURE_MASK));
-#line 306 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_window_set_has_resize_grip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 301 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 289 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE);
+#line 283 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self;
-#line 1830 "AppWindow.c"
-}
-
-
-GtkUIManager* page_window_get_ui_manager (PageWindow* self) {
-	GtkUIManager* result = NULL;
-	GtkUIManager* _tmp0_ = NULL;
-	GtkUIManager* _tmp1_ = NULL;
-#line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_val_if_fail (IS_PAGE_WINDOW (self), NULL);
-#line 310 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0_ = self->ui;
-#line 310 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 310 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	result = _tmp1_;
-#line 310 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	return result;
-#line 1848 "AppWindow.c"
+#line 1600 "AppWindow.c"
 }
 
 
@@ -1880,17 +1632,17 @@ Page* page_window_get_current_page (PageWindow* self) {
 	Page* result = NULL;
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 313 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_PAGE_WINDOW (self), NULL);
-#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->current_page;
-#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 1866 "AppWindow.c"
+#line 1618 "AppWindow.c"
 }
 
 
@@ -1903,54 +1655,54 @@ static void page_window_real_set_current_page (PageWindow* self, Page* page) {
 	Page* _tmp5_ = NULL;
 	Page* _tmp6_ = NULL;
 	Page* _tmp7_ = NULL;
-#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->current_page;
-#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 1885 "AppWindow.c"
+#line 1637 "AppWindow.c"
 		Page* _tmp1_ = NULL;
-#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
-#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 298 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_clear_container (_tmp1_);
-#line 1891 "AppWindow.c"
+#line 1643 "AppWindow.c"
 	}
-#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->current_page;
-#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	old_page = _tmp3_;
-#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = page;
-#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (self->priv->current_page);
-#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->current_page = _tmp5_;
-#line 323 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 302 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = self->priv->current_page;
-#line 323 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 302 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page_set_container (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = page;
-#line 325 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page_window_switched_pages (self, old_page, _tmp7_);
-#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (old_page);
-#line 1917 "AppWindow.c"
+#line 1669 "AppWindow.c"
 }
 
 
 void page_window_set_current_page (PageWindow* self, Page* page) {
-#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->set_current_page (self, page);
-#line 1926 "AppWindow.c"
+#line 1678 "AppWindow.c"
 }
 
 
@@ -1959,42 +1711,42 @@ static void page_window_real_clear_current_page (PageWindow* self) {
 	Page* old_page = NULL;
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
-#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->current_page;
-#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 308 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 1939 "AppWindow.c"
+#line 1691 "AppWindow.c"
 		Page* _tmp1_ = NULL;
-#line 330 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
-#line 330 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 309 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_clear_container (_tmp1_);
-#line 1945 "AppWindow.c"
+#line 1697 "AppWindow.c"
 	}
-#line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->priv->current_page;
-#line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 311 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	old_page = _tmp3_;
-#line 333 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 312 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (self->priv->current_page);
-#line 333 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 312 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->current_page = NULL;
-#line 335 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page_window_switched_pages (self, old_page, NULL);
-#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (old_page);
-#line 1961 "AppWindow.c"
+#line 1713 "AppWindow.c"
 }
 
 
 void page_window_clear_current_page (PageWindow* self) {
-#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_GET_CLASS (self)->clear_current_page (self);
-#line 1970 "AppWindow.c"
+#line 1722 "AppWindow.c"
 }
 
 
@@ -2006,92 +1758,92 @@ static gboolean page_window_real_key_press_event (GtkWidget* base, GdkEventKey*
 	gboolean _tmp5_ = FALSE;
 	Page* _tmp6_ = NULL;
 	gboolean _tmp10_ = FALSE;
-#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) {
-#line 1990 "AppWindow.c"
+#line 1742 "AppWindow.c"
 		GtkWidget* _tmp2_ = NULL;
 		GdkEventKey* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = event;
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_emit_by_name (_tmp2_, "key-press-event", _tmp3_, &_tmp4_);
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 2002 "AppWindow.c"
+#line 1754 "AppWindow.c"
 	} else {
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 2006 "AppWindow.c"
+#line 1758 "AppWindow.c"
 	}
-#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
-#line 340 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 340 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 319 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 2014 "AppWindow.c"
+#line 1766 "AppWindow.c"
 	}
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = self->priv->current_page;
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 2020 "AppWindow.c"
+#line 1772 "AppWindow.c"
 		Page* _tmp7_ = NULL;
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = self->priv->current_page;
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = event;
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = page_notify_app_key_pressed (_tmp7_, _tmp8_);
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp9_;
-#line 2032 "AppWindow.c"
+#line 1784 "AppWindow.c"
 	} else {
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 2036 "AppWindow.c"
+#line 1788 "AppWindow.c"
 	}
-#line 342 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 321 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 343 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 343 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 322 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 2044 "AppWindow.c"
+#line 1796 "AppWindow.c"
 	}
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event != NULL) {
-#line 2048 "AppWindow.c"
+#line 1800 "AppWindow.c"
 		GdkEventKey* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = event;
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
+#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 2057 "AppWindow.c"
+#line 1809 "AppWindow.c"
 	} else {
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = FALSE;
-#line 2061 "AppWindow.c"
+#line 1813 "AppWindow.c"
 	}
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_;
-#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2067 "AppWindow.c"
+#line 1819 "AppWindow.c"
 }
 
 
@@ -2103,92 +1855,92 @@ static gboolean page_window_real_key_release_event (GtkWidget* base, GdkEventKey
 	gboolean _tmp5_ = FALSE;
 	Page* _tmp6_ = NULL;
 	gboolean _tmp10_ = FALSE;
-#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 327 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 327 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_entry_get_type ())) {
-#line 2087 "AppWindow.c"
+#line 1839 "AppWindow.c"
 		GtkWidget* _tmp2_ = NULL;
 		GdkEventKey* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = gtk_window_get_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = event;
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_emit_by_name (_tmp2_, "key-release-event", _tmp3_, &_tmp4_);
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 2099 "AppWindow.c"
+#line 1851 "AppWindow.c"
 	} else {
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 2103 "AppWindow.c"
+#line 1855 "AppWindow.c"
 	}
-#line 349 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 328 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
-#line 350 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 350 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 329 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 2111 "AppWindow.c"
+#line 1863 "AppWindow.c"
 	}
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = self->priv->current_page;
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 2117 "AppWindow.c"
+#line 1869 "AppWindow.c"
 		Page* _tmp7_ = NULL;
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = self->priv->current_page;
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = event;
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = page_notify_app_key_released (_tmp7_, _tmp8_);
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp9_;
-#line 2129 "AppWindow.c"
+#line 1881 "AppWindow.c"
 	} else {
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 2133 "AppWindow.c"
+#line 1885 "AppWindow.c"
 	}
-#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 331 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 332 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 2141 "AppWindow.c"
+#line 1893 "AppWindow.c"
 	}
-#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event != NULL) {
-#line 2145 "AppWindow.c"
+#line 1897 "AppWindow.c"
 		GdkEventKey* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
-#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = event;
-#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp12_ = GTK_WIDGET_CLASS (page_window_parent_class)->key_release_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
+#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 2154 "AppWindow.c"
+#line 1906 "AppWindow.c"
 	} else {
-#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = FALSE;
-#line 2158 "AppWindow.c"
+#line 1910 "AppWindow.c"
 	}
-#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp10_;
-#line 355 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 334 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2164 "AppWindow.c"
+#line 1916 "AppWindow.c"
 }
 
 
@@ -2198,62 +1950,62 @@ static gboolean page_window_real_focus_in_event (GtkWidget* base, GdkEventFocus*
 	gboolean _tmp0_ = FALSE;
 	Page* _tmp1_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 358 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 337 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 358 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 337 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->priv->current_page;
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2182 "AppWindow.c"
+#line 1934 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		GdkEventFocus* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->current_page;
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = event;
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_notify_app_focus_in (_tmp2_, _tmp3_);
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 2194 "AppWindow.c"
+#line 1946 "AppWindow.c"
 	} else {
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 2198 "AppWindow.c"
+#line 1950 "AppWindow.c"
 	}
-#line 359 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
-#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 339 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 2206 "AppWindow.c"
+#line 1958 "AppWindow.c"
 	}
-#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event != NULL) {
-#line 2210 "AppWindow.c"
+#line 1962 "AppWindow.c"
 		GdkEventFocus* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
-#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = event;
-#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp6_);
-#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_in_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp6_);
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp7_;
-#line 2219 "AppWindow.c"
+#line 1971 "AppWindow.c"
 	} else {
-#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 2223 "AppWindow.c"
+#line 1975 "AppWindow.c"
 	}
-#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp5_;
-#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 341 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2229 "AppWindow.c"
+#line 1981 "AppWindow.c"
 }
 
 
@@ -2263,62 +2015,62 @@ static gboolean page_window_real_focus_out_event (GtkWidget* base, GdkEventFocus
 	gboolean _tmp0_ = FALSE;
 	Page* _tmp1_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 365 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 344 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 365 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 344 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->priv->current_page;
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2247 "AppWindow.c"
+#line 1999 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		GdkEventFocus* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->current_page;
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = event;
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_notify_app_focus_out (_tmp2_, _tmp3_);
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 2259 "AppWindow.c"
+#line 2011 "AppWindow.c"
 	} else {
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = FALSE;
-#line 2263 "AppWindow.c"
+#line 2015 "AppWindow.c"
 	}
-#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 345 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_) {
-#line 367 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		result = TRUE;
-#line 367 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return result;
-#line 2271 "AppWindow.c"
+#line 2023 "AppWindow.c"
 	}
-#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event != NULL) {
-#line 2275 "AppWindow.c"
+#line 2027 "AppWindow.c"
 		GdkEventFocus* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
-#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = event;
-#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp6_);
-#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp7_ = GTK_WIDGET_CLASS (page_window_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp6_);
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp7_;
-#line 2284 "AppWindow.c"
+#line 2036 "AppWindow.c"
 	} else {
-#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = FALSE;
-#line 2288 "AppWindow.c"
+#line 2040 "AppWindow.c"
 	}
-#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp5_;
-#line 369 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 348 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2294 "AppWindow.c"
+#line 2046 "AppWindow.c"
 }
 
 
@@ -2327,193 +2079,226 @@ static gboolean page_window_real_configure_event (GtkWidget* base, GdkEventConfi
 	gboolean result = FALSE;
 	Page* _tmp0_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 372 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 351 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE_WINDOW, PageWindow);
-#line 372 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 351 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->current_page;
-#line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 352 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 2311 "AppWindow.c"
+#line 2063 "AppWindow.c"
 		Page* _tmp1_ = NULL;
 		GdkEventConfigure* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->current_page;
-#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = event;
-#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page_notify_configure_event (_tmp1_, _tmp2_);
-#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 353 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (_tmp3_) {
-#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 354 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			result = TRUE;
-#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 354 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return result;
-#line 2327 "AppWindow.c"
+#line 2079 "AppWindow.c"
 		}
 	}
-#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (GTK_WIDGET_CLASS (page_window_parent_class)->configure_event != NULL) {
-#line 2332 "AppWindow.c"
+#line 2084 "AppWindow.c"
 		GdkEventConfigure* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = event;
-#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp6_ = GTK_WIDGET_CLASS (page_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp6_ = GTK_WIDGET_CLASS (page_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
+#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp6_;
-#line 2341 "AppWindow.c"
+#line 2093 "AppWindow.c"
 	} else {
-#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = FALSE;
-#line 2345 "AppWindow.c"
+#line 2097 "AppWindow.c"
 	}
-#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp4_;
-#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2351 "AppWindow.c"
+#line 2103 "AppWindow.c"
 }
 
 
 void page_window_set_busy_cursor (PageWindow* self) {
 	gint _tmp0_ = 0;
+	GdkDisplay* display = NULL;
 	GdkWindow* _tmp1_ = NULL;
-	GdkCursor* _tmp2_ = NULL;
-	GdkCursor* _tmp3_ = NULL;
-#line 381 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	GdkDisplay* _tmp2_ = NULL;
+	GdkDisplay* _tmp3_ = NULL;
+	GdkCursor* cursor = NULL;
+	GdkDisplay* _tmp4_ = NULL;
+	GdkCursor* _tmp5_ = NULL;
+	GdkWindow* _tmp6_ = NULL;
+	GdkCursor* _tmp7_ = NULL;
+#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 382 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 361 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->busy_counter;
-#line 382 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 361 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->busy_counter = _tmp0_ + 1;
-#line 382 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 361 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ > 0) {
-#line 383 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 362 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 2370 "AppWindow.c"
+#line 2128 "AppWindow.c"
 	}
-#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2_ = gdk_cursor_new (GDK_WATCH);
-#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp3_ = _tmp2_;
-#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gdk_window_set_cursor (_tmp1_, _tmp3_);
-#line 385 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (_tmp3_);
-#line 386 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp2_ = gdk_window_get_display (_tmp1_);
+#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp3_ = _g_object_ref0 (_tmp2_);
+#line 364 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	display = _tmp3_;
+#line 365 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp4_ = display;
+#line 365 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp5_ = gdk_cursor_new_for_display (_tmp4_, GDK_WATCH);
+#line 365 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	cursor = _tmp5_;
+#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp6_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp7_ = cursor;
+#line 366 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gdk_window_set_cursor (_tmp6_, _tmp7_);
+#line 367 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	spin_event_loop ();
-#line 2384 "AppWindow.c"
+#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (cursor);
+#line 360 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (display);
+#line 2156 "AppWindow.c"
 }
 
 
 void page_window_set_normal_cursor (PageWindow* self) {
 	gint _tmp0_ = 0;
+	GdkDisplay* display = NULL;
 	GdkWindow* _tmp3_ = NULL;
-	GdkCursor* _tmp4_ = NULL;
-	GdkCursor* _tmp5_ = NULL;
-#line 389 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	GdkDisplay* _tmp4_ = NULL;
+	GdkDisplay* _tmp5_ = NULL;
+	GdkCursor* cursor = NULL;
+	GdkDisplay* _tmp6_ = NULL;
+	GdkCursor* _tmp7_ = NULL;
+	GdkWindow* _tmp8_ = NULL;
+	GdkCursor* _tmp9_ = NULL;
+#line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE_WINDOW (self));
-#line 390 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = self->priv->busy_counter;
-#line 390 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 371 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ <= 0) {
-#line 391 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->busy_counter = 0;
-#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 2403 "AppWindow.c"
+#line 2181 "AppWindow.c"
 	} else {
 		gint _tmp1_ = 0;
 		gint _tmp2_ = 0;
-#line 393 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = self->priv->busy_counter;
-#line 393 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->priv->busy_counter = _tmp1_ - 1;
-#line 393 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = self->priv->busy_counter;
-#line 393 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 374 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (_tmp2_ > 0) {
-#line 394 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 375 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 2417 "AppWindow.c"
+#line 2195 "AppWindow.c"
 		}
 	}
-#line 397 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 397 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_ = gdk_cursor_new (GDK_LEFT_PTR);
-#line 397 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp5_ = _tmp4_;
-#line 397 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gdk_window_set_cursor (_tmp3_, _tmp5_);
-#line 397 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (_tmp5_);
-#line 398 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp4_ = gdk_window_get_display (_tmp3_);
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp5_ = _g_object_ref0 (_tmp4_);
+#line 378 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	display = _tmp5_;
+#line 379 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp6_ = display;
+#line 379 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp7_ = gdk_cursor_new_for_display (_tmp6_, GDK_LEFT_PTR);
+#line 379 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	cursor = _tmp7_;
+#line 380 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp8_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 380 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp9_ = cursor;
+#line 380 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gdk_window_set_cursor (_tmp8_, _tmp9_);
+#line 381 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	spin_event_loop ();
-#line 2432 "AppWindow.c"
+#line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (cursor);
+#line 370 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_g_object_unref0 (display);
+#line 2224 "AppWindow.c"
 }
 
 
 static void page_window_class_init (PageWindowClass * klass) {
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page_window_parent_class = g_type_class_peek_parent (klass);
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_type_class_add_private (klass, sizeof (PageWindowPrivate));
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((PageWindowClass *) klass)->switched_pages = page_window_real_switched_pages;
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((PageWindowClass *) klass)->set_current_page = page_window_real_set_current_page;
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((PageWindowClass *) klass)->clear_current_page = page_window_real_clear_current_page;
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->key_press_event = page_window_real_key_press_event;
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->key_release_event = page_window_real_key_release_event;
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->focus_in_event = page_window_real_focus_in_event;
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->focus_out_event = page_window_real_focus_out_event;
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->configure_event = page_window_real_configure_event;
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_window_finalize;
-#line 2459 "AppWindow.c"
+#line 2251 "AppWindow.c"
 }
 
 
 static void page_window_instance_init (PageWindow * self) {
-	GtkUIManager* _tmp0_ = NULL;
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv = PAGE_WINDOW_GET_PRIVATE (self);
-#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0_ = gtk_ui_manager_new ();
-#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->ui = _tmp0_;
-#line 295 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 277 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->current_page = NULL;
-#line 296 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 278 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->priv->busy_counter = 0;
-#line 2475 "AppWindow.c"
+#line 2262 "AppWindow.c"
 }
 
 
 static void page_window_finalize (GObject* obj) {
 	PageWindow * self;
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_WINDOW, PageWindow);
-#line 293 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (self->ui);
-#line 295 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 277 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (self->priv->current_page);
-#line 292 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 276 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (page_window_parent_class)->finalize (obj);
-#line 2489 "AppWindow.c"
+#line 2274 "AppWindow.c"
 }
 
 
@@ -2522,17 +2307,87 @@ GType page_window_get_type (void) {
 	if (g_once_init_enter (&page_window_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (PageWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) page_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PageWindow), 0, (GInstanceInitFunc) page_window_instance_init, NULL };
 		GType page_window_type_id;
-		page_window_type_id = g_type_register_static (gtk_window_get_type (), "PageWindow", &g_define_type_info, G_TYPE_FLAG_ABSTRACT);
+		page_window_type_id = g_type_register_static (gtk_application_window_get_type (), "PageWindow", &g_define_type_info, G_TYPE_FLAG_ABSTRACT);
 		g_once_init_leave (&page_window_type_id__volatile, page_window_type_id);
 	}
 	return page_window_type_id__volatile;
 }
 
 
+static void _app_window_on_quit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_on_quit ((AppWindow*) self);
+#line 2293 "AppWindow.c"
+}
+
+
+static void _app_window_on_fullscreen_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_on_fullscreen ((AppWindow*) self);
+#line 2300 "AppWindow.c"
+}
+
+
+static void _app_window_on_help_contents_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_on_help_contents ((AppWindow*) self);
+#line 2307 "AppWindow.c"
+}
+
+
+static void _app_window_on_help_faq_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_on_help_faq ((AppWindow*) self);
+#line 2314 "AppWindow.c"
+}
+
+
+static void _app_window_on_help_report_problem_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_on_help_report_problem ((AppWindow*) self);
+#line 2321 "AppWindow.c"
+}
+
+
+static void _app_window_on_undo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_on_undo ((AppWindow*) self);
+#line 2328 "AppWindow.c"
+}
+
+
+static void _app_window_on_redo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_on_redo ((AppWindow*) self);
+#line 2335 "AppWindow.c"
+}
+
+
+static void _app_window_on_jump_to_file_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_on_jump_to_file ((AppWindow*) self);
+#line 2342 "AppWindow.c"
+}
+
+
+static void _app_window_on_select_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_on_select_all ((AppWindow*) self);
+#line 2349 "AppWindow.c"
+}
+
+
+static void _app_window_on_select_none_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_on_select_none ((AppWindow*) self);
+#line 2356 "AppWindow.c"
+}
+
+
 static void _app_window_on_command_manager_altered_command_manager_altered (CommandManager* _sender, gboolean can_undo, gboolean can_redo, gpointer self) {
-#line 450 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_command_manager_altered ((AppWindow*) self);
-#line 2508 "AppWindow.c"
+#line 2363 "AppWindow.c"
 }
 
 
@@ -2548,909 +2403,189 @@ AppWindow* app_window_construct (GType object_type) {
 	CommandManager* _tmp15_ = NULL;
 	CommandManager* _tmp16_ = NULL;
 	CommandManager* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	GtkActionGroup** _tmp19_ = NULL;
-	GtkActionGroup** _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	GtkUIManager* _tmp29_ = NULL;
-	GtkUIManager* _tmp30_ = NULL;
-	GtkAccelGroup* _tmp31_ = NULL;
 	GtkCssProvider* provider = NULL;
-	GtkCssProvider* _tmp32_ = NULL;
+	GtkCssProvider* _tmp18_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = (AppWindow*) page_window_construct (object_type);
-#line 429 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 429 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_vala_assert (_tmp0_ == NULL, "instance == null");
-#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _g_object_ref0 (self);
-#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_instance);
-#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 410 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_instance = _tmp1_;
-#line 432 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 412 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
-#line 433 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 413 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_default_icon_name ("shotwell");
-#line 436 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 416 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_LIBRARY_WINDOW)) {
-#line 2552 "AppWindow.c"
+#line 2400 "AppWindow.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
 		Dimensions _tmp5_ = {0};
-#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp2_;
-#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		configuration_facade_get_library_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp4_, &_tmp5_);
-#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->maximized = _tmp4_;
-#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions = _tmp5_;
-#line 437 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2569 "AppWindow.c"
+#line 2417 "AppWindow.c"
 	} else {
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
 		Dimensions _tmp9_ = {0};
-#line 439 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 419 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_WINDOW), "this is DirectWindow");
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		configuration_facade_get_direct_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp8_, &_tmp9_);
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->maximized = _tmp8_;
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions = _tmp9_;
-#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2589 "AppWindow.c"
+#line 2437 "AppWindow.c"
 	}
-#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = self->dimensions;
-#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_.width;
-#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = self->dimensions;
-#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = _tmp12_.height;
-#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp11_, _tmp13_);
-#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = self->maximized;
-#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp14_) {
-#line 446 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 426 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_maximize (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 2607 "AppWindow.c"
+#line 2455 "AppWindow.c"
 	}
-#line 448 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 428 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = app_window_command_manager;
-#line 448 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 428 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_vala_assert (_tmp15_ == NULL, "command_manager == null");
-#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = command_manager_new (COMMAND_MANAGER_DEFAULT_DEPTH);
-#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (app_window_command_manager);
-#line 449 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_command_manager = _tmp16_;
-#line 450 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = app_window_command_manager;
-#line 450 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_signal_connect_object (_tmp17_, "altered", (GCallback) _app_window_on_command_manager_altered_command_manager_altered, self, 0);
-#line 457 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp19_ = app_window_create_common_action_groups (self, &_tmp18_);
-#line 457 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->common_action_groups = (_vala_array_free (self->common_action_groups, self->common_action_groups_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 457 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->common_action_groups = _tmp19_;
-#line 457 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->common_action_groups_length1 = _tmp18_;
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp20_ = self->common_action_groups;
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp20__length1 = self->common_action_groups_length1;
-#line 2635 "AppWindow.c"
-	{
-		GtkActionGroup** group_collection = NULL;
-		gint group_collection_length1 = 0;
-		gint _group_collection_size_ = 0;
-		gint group_it = 0;
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		group_collection = _tmp20_;
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		group_collection_length1 = _tmp20__length1;
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		for (group_it = 0; group_it < _tmp20__length1; group_it = group_it + 1) {
-#line 2647 "AppWindow.c"
-			GtkActionGroup* _tmp21_ = NULL;
-			GtkActionGroup* group = NULL;
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
-			_tmp21_ = _g_object_ref0 (group_collection[group_it]);
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
-			group = _tmp21_;
-#line 2654 "AppWindow.c"
-			{
-				GtkUIManager* _tmp22_ = NULL;
-				GtkActionGroup* _tmp23_ = NULL;
-#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
-#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				_tmp23_ = group;
-#line 459 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				gtk_ui_manager_insert_action_group (_tmp22_, _tmp23_, 0);
-#line 458 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				_g_object_unref0 (group);
-#line 2666 "AppWindow.c"
-			}
-		}
-	}
-	{
-		GtkUIManager* _tmp24_ = NULL;
-		GtkActionGroup** _tmp25_ = NULL;
-		gint _tmp25__length1 = 0;
-		gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
-#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp25_ = self->common_action_groups;
-#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp25__length1 = self->common_action_groups_length1;
-#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp26_ = build_dummy_ui_string (_tmp25_, _tmp25__length1);
-#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp27_ = _tmp26_;
-#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_ui_manager_add_ui_from_string (_tmp24_, _tmp27_, (gssize) -1, &_inner_error_);
-#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp27_);
-#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2692 "AppWindow.c"
-			goto __catch225_g_error;
-		}
-	}
-	goto __finally225;
-	__catch225_g_error:
-	{
-		GError* err = NULL;
-		const gchar* _tmp28_ = NULL;
-#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		err = _inner_error_;
-#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_inner_error_ = NULL;
-#line 464 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp28_ = err->message;
-#line 464 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_error ("AppWindow.vala:464: Unable to add AppWindow UI: %s", _tmp28_);
-#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_error_free0 (err);
-#line 2711 "AppWindow.c"
-	}
-	__finally225:
-#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_clear_error (&_inner_error_);
-#line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		return NULL;
-#line 2722 "AppWindow.c"
-	}
-#line 467 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp29_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
-#line 467 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_ui_manager_ensure_update (_tmp29_);
-#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
-#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp31_ = gtk_ui_manager_get_accel_group (_tmp30_);
-#line 468 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_window_add_accel_group (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp31_);
-#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp32_ = gtk_css_provider_new ();
-#line 470 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	provider = _tmp32_;
-#line 2738 "AppWindow.c"
+#line 438 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_add_actions (self);
+#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp18_ = gtk_css_provider_new ();
+#line 440 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	provider = _tmp18_;
+#line 2477 "AppWindow.c"
 	{
-		GdkScreen* _tmp33_ = NULL;
-#line 472 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		GdkScreen* _tmp19_ = NULL;
+#line 442 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_css_provider_load_from_data (provider, RESOURCES_CUSTOM_CSS, (gssize) -1, &_inner_error_);
-#line 472 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 442 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2745 "AppWindow.c"
-			goto __catch226_g_error;
+#line 2484 "AppWindow.c"
+			goto __catch223_g_error;
 		}
-#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp33_ = gdk_screen_get_default ();
-#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_style_context_add_provider_for_screen (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (provider, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-#line 2752 "AppWindow.c"
+#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp19_ = gdk_screen_get_default ();
+#line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		gtk_style_context_add_provider_for_screen (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (provider, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+#line 2491 "AppWindow.c"
 	}
-	goto __finally226;
-	__catch226_g_error:
+	goto __finally223;
+	__catch223_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp34_ = NULL;
-		const gchar* _tmp35_ = NULL;
-#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		GError* _tmp20_ = NULL;
+		const gchar* _tmp21_ = NULL;
+#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 475 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp34_ = err;
-#line 475 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp35_ = _tmp34_->message;
-#line 475 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_debug ("AppWindow.vala:475: Unable to load custom CSS: %s", _tmp35_);
-#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp20_ = err;
+#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp21_ = _tmp20_->message;
+#line 445 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_debug ("AppWindow.vala:445: Unable to load custom CSS: %s", _tmp21_);
+#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 2772 "AppWindow.c"
+#line 2511 "AppWindow.c"
 	}
-	__finally226:
-#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally223:
+#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (provider);
-#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return NULL;
-#line 2785 "AppWindow.c"
+#line 2524 "AppWindow.c"
 	}
-#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (provider);
-#line 427 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 407 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self;
-#line 2791 "AppWindow.c"
-}
-
-
-static void _app_window_on_quit_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_on_quit ((AppWindow*) self);
-#line 2798 "AppWindow.c"
-}
-
-
-static void _vala_array_add159 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2809 "AppWindow.c"
-	}
-#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2813 "AppWindow.c"
-}
-
-
-static void _app_window_on_about_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_on_about ((AppWindow*) self);
-#line 2820 "AppWindow.c"
-}
-
-
-static void _vala_array_add160 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2831 "AppWindow.c"
-	}
-#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2835 "AppWindow.c"
-}
-
-
-static void _app_window_on_fullscreen_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_on_fullscreen ((AppWindow*) self);
-#line 2842 "AppWindow.c"
-}
-
-
-static void _vala_array_add161 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2853 "AppWindow.c"
-	}
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2857 "AppWindow.c"
-}
-
-
-static void _app_window_on_help_contents_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_on_help_contents ((AppWindow*) self);
-#line 2864 "AppWindow.c"
-}
-
-
-static void _vala_array_add162 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2875 "AppWindow.c"
-	}
-#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2879 "AppWindow.c"
-}
-
-
-static void _app_window_on_help_faq_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_on_help_faq ((AppWindow*) self);
-#line 2886 "AppWindow.c"
-}
-
-
-static void _vala_array_add163 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2897 "AppWindow.c"
-	}
-#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2901 "AppWindow.c"
-}
-
-
-static void _app_window_on_help_report_problem_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_on_help_report_problem ((AppWindow*) self);
-#line 2908 "AppWindow.c"
-}
-
-
-static void _vala_array_add164 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2919 "AppWindow.c"
-	}
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2923 "AppWindow.c"
-}
-
-
-static void _app_window_on_undo_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_on_undo ((AppWindow*) self);
-#line 2930 "AppWindow.c"
-}
-
-
-static void _vala_array_add165 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2941 "AppWindow.c"
-	}
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2945 "AppWindow.c"
-}
-
-
-static void _app_window_on_redo_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_on_redo ((AppWindow*) self);
-#line 2952 "AppWindow.c"
-}
-
-
-static void _vala_array_add166 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2963 "AppWindow.c"
-	}
-#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2967 "AppWindow.c"
-}
-
-
-static void _app_window_on_jump_to_file_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_on_jump_to_file ((AppWindow*) self);
-#line 2974 "AppWindow.c"
-}
-
-
-static void _vala_array_add167 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2985 "AppWindow.c"
-	}
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2989 "AppWindow.c"
-}
-
-
-static void _app_window_on_select_all_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_on_select_all ((AppWindow*) self);
-#line 2996 "AppWindow.c"
-}
-
-
-static void _vala_array_add168 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 3007 "AppWindow.c"
-	}
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 3011 "AppWindow.c"
-}
-
-
-static void _app_window_on_select_none_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_on_select_none ((AppWindow*) self);
-#line 3018 "AppWindow.c"
-}
-
-
-static void _vala_array_add169 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 3029 "AppWindow.c"
-	}
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 3033 "AppWindow.c"
-}
-
-
-static GtkActionEntry* app_window_create_common_actions (AppWindow* self, int* result_length1) {
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	GtkActionEntry* _tmp0_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry quit = {0};
-	GtkActionEntry _tmp1_ = {0};
-	GtkActionEntry* _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	GtkActionEntry _tmp3_ = {0};
-	GtkActionEntry about = {0};
-	GtkActionEntry _tmp4_ = {0};
-	GtkActionEntry* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	GtkActionEntry _tmp6_ = {0};
-	GtkActionEntry fullscreen = {0};
-	GtkActionEntry _tmp7_ = {0};
-	GtkActionEntry* _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	GtkActionEntry _tmp9_ = {0};
-	GtkActionEntry help_contents = {0};
-	GtkActionEntry _tmp10_ = {0};
-	const gchar* _tmp11_ = NULL;
-	GtkActionEntry* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	GtkActionEntry _tmp13_ = {0};
-	GtkActionEntry help_faq = {0};
-	GtkActionEntry _tmp14_ = {0};
-	const gchar* _tmp15_ = NULL;
-	GtkActionEntry* _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	GtkActionEntry _tmp17_ = {0};
-	GtkActionEntry help_report_problem = {0};
-	GtkActionEntry _tmp18_ = {0};
-	const gchar* _tmp19_ = NULL;
-	GtkActionEntry* _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	GtkActionEntry _tmp21_ = {0};
-	GtkActionEntry undo = {0};
-	GtkActionEntry _tmp22_ = {0};
-	GtkActionEntry* _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-	GtkActionEntry _tmp24_ = {0};
-	GtkActionEntry redo = {0};
-	GtkActionEntry _tmp25_ = {0};
-	GtkActionEntry* _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
-	GtkActionEntry _tmp27_ = {0};
-	GtkActionEntry jump_to_file = {0};
-	GtkActionEntry _tmp28_ = {0};
-	GtkActionEntry* _tmp29_ = NULL;
-	gint _tmp29__length1 = 0;
-	GtkActionEntry _tmp30_ = {0};
-	GtkActionEntry select_all = {0};
-	GtkActionEntry _tmp31_ = {0};
-	GtkActionEntry* _tmp32_ = NULL;
-	gint _tmp32__length1 = 0;
-	GtkActionEntry _tmp33_ = {0};
-	GtkActionEntry select_none = {0};
-	GtkActionEntry _tmp34_ = {0};
-	GtkActionEntry* _tmp35_ = NULL;
-	gint _tmp35__length1 = 0;
-	GtkActionEntry _tmp36_ = {0};
-	GtkActionEntry* _tmp37_ = NULL;
-	gint _tmp37__length1 = 0;
-#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0_ = g_new0 (GtkActionEntry, 0);
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	actions = _tmp0_;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	actions_length1 = 0;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_actions_size_ = actions_length1;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_.name = "CommonQuit";
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_.stock_id = RESOURCES_QUIT_LABEL;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_.label = TRANSLATABLE;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_.accelerator = "<Ctrl>Q";
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_.tooltip = TRANSLATABLE;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_.callback = (GCallback) _app_window_on_quit_gtk_action_callback;
-#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	quit = _tmp1_;
-#line 484 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	quit.label = RESOURCES_QUIT_LABEL;
-#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2_ = actions;
-#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2__length1 = actions_length1;
-#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp3_ = quit;
-#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add159 (&actions, &actions_length1, &_actions_size_, &_tmp3_);
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_.name = "CommonAbout";
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_.stock_id = RESOURCES_ABOUT_LABEL;
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_.label = TRANSLATABLE;
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_.accelerator = NULL;
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_.tooltip = TRANSLATABLE;
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_.callback = (GCallback) _app_window_on_about_gtk_action_callback;
-#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	about = _tmp4_;
-#line 489 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	about.label = RESOURCES_ABOUT_LABEL;
-#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp5_ = actions;
-#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp5__length1 = actions_length1;
-#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp6_ = about;
-#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add160 (&actions, &actions_length1, &_actions_size_, &_tmp6_);
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp7_.name = "CommonFullscreen";
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp7_.stock_id = RESOURCES_FULLSCREEN_LABEL;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp7_.label = TRANSLATABLE;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp7_.accelerator = "F11";
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp7_.tooltip = TRANSLATABLE;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp7_.callback = (GCallback) _app_window_on_fullscreen_gtk_action_callback;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	fullscreen = _tmp7_;
-#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	fullscreen.label = RESOURCES_FULLSCREEN_LABEL;
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp8_ = actions;
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp8__length1 = actions_length1;
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp9_ = fullscreen;
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add161 (&actions, &actions_length1, &_actions_size_, &_tmp9_);
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp10_.name = "CommonHelpContents";
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp10_.stock_id = RESOURCES_HELP_LABEL;
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp10_.label = TRANSLATABLE;
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp10_.accelerator = "F1";
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp10_.tooltip = TRANSLATABLE;
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp10_.callback = (GCallback) _app_window_on_help_contents_gtk_action_callback;
-#line 497 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	help_contents = _tmp10_;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp11_ = _ ("_Contents");
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	help_contents.label = _tmp11_;
-#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp12_ = actions;
-#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp12__length1 = actions_length1;
-#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp13_ = help_contents;
-#line 500 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add162 (&actions, &actions_length1, &_actions_size_, &_tmp13_);
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp14_.name = "CommonHelpFAQ";
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp14_.stock_id = NULL;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp14_.label = TRANSLATABLE;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp14_.accelerator = NULL;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp14_.tooltip = TRANSLATABLE;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp14_.callback = (GCallback) _app_window_on_help_faq_gtk_action_callback;
-#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	help_faq = _tmp14_;
-#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp15_ = _ ("_Frequently Asked Questions");
-#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	help_faq.label = _tmp15_;
-#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp16_ = actions;
-#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp16__length1 = actions_length1;
-#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp17_ = help_faq;
-#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add163 (&actions, &actions_length1, &_actions_size_, &_tmp17_);
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp18_.name = "CommonHelpReportProblem";
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp18_.stock_id = NULL;
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp18_.label = TRANSLATABLE;
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp18_.accelerator = NULL;
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp18_.tooltip = TRANSLATABLE;
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp18_.callback = (GCallback) _app_window_on_help_report_problem_gtk_action_callback;
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	help_report_problem = _tmp18_;
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp19_ = _ ("_Report a Problem…");
-#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	help_report_problem.label = _tmp19_;
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp20_ = actions;
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp20__length1 = actions_length1;
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp21_ = help_report_problem;
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add164 (&actions, &actions_length1, &_actions_size_, &_tmp21_);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp22_.name = "CommonUndo";
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp22_.stock_id = RESOURCES_UNDO_MENU;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp22_.label = TRANSLATABLE;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp22_.accelerator = "<Ctrl>Z";
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp22_.tooltip = TRANSLATABLE;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp22_.callback = (GCallback) _app_window_on_undo_gtk_action_callback;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	undo = _tmp22_;
-#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	undo.label = RESOURCES_UNDO_MENU;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp23_ = actions;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp23__length1 = actions_length1;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp24_ = undo;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add165 (&actions, &actions_length1, &_actions_size_, &_tmp24_);
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp25_.name = "CommonRedo";
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp25_.stock_id = RESOURCES_REDO_MENU;
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp25_.label = TRANSLATABLE;
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp25_.accelerator = "<Ctrl><Shift>Z";
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp25_.tooltip = TRANSLATABLE;
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp25_.callback = (GCallback) _app_window_on_redo_gtk_action_callback;
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	redo = _tmp25_;
-#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	redo.label = RESOURCES_REDO_MENU;
-#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp26_ = actions;
-#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp26__length1 = actions_length1;
-#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp27_ = redo;
-#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add166 (&actions, &actions_length1, &_actions_size_, &_tmp27_);
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp28_.name = "CommonJumpToFile";
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp28_.stock_id = RESOURCES_JUMP_TO_FILE_MENU;
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp28_.label = TRANSLATABLE;
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp28_.accelerator = "<Ctrl><Shift>M";
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp28_.tooltip = TRANSLATABLE;
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp28_.callback = (GCallback) _app_window_on_jump_to_file_gtk_action_callback;
-#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	jump_to_file = _tmp28_;
-#line 524 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	jump_to_file.label = RESOURCES_JUMP_TO_FILE_MENU;
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp29_ = actions;
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp29__length1 = actions_length1;
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp30_ = jump_to_file;
-#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add167 (&actions, &actions_length1, &_actions_size_, &_tmp30_);
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp31_.name = "CommonSelectAll";
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp31_.stock_id = RESOURCES_SELECT_ALL_MENU;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp31_.label = TRANSLATABLE;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp31_.accelerator = "<Ctrl>A";
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp31_.tooltip = TRANSLATABLE;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp31_.callback = (GCallback) _app_window_on_select_all_gtk_action_callback;
-#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	select_all = _tmp31_;
-#line 529 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	select_all.label = RESOURCES_SELECT_ALL_MENU;
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp32_ = actions;
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp32__length1 = actions_length1;
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp33_ = select_all;
-#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add168 (&actions, &actions_length1, &_actions_size_, &_tmp33_);
-#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp34_.name = "CommonSelectNone";
-#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp34_.stock_id = NULL;
-#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp34_.label = NULL;
-#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp34_.accelerator = "<Ctrl><Shift>A";
-#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp34_.tooltip = TRANSLATABLE;
-#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp34_.callback = (GCallback) _app_window_on_select_none_gtk_action_callback;
-#line 532 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	select_none = _tmp34_;
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp35_ = actions;
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp35__length1 = actions_length1;
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp36_ = select_none;
-#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add169 (&actions, &actions_length1, &_actions_size_, &_tmp36_);
-#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp37_ = actions;
-#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp37__length1 = actions_length1;
-#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (result_length1) {
-#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*result_length1 = _tmp37__length1;
-#line 3389 "AppWindow.c"
-	}
-#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	result = _tmp37_;
-#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	return result;
-#line 3395 "AppWindow.c"
+#line 2530 "AppWindow.c"
 }
 
 
 static void app_window_real_on_fullscreen (AppWindow* self) {
-#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_critical ("Type `%s' does not implement abstract method `app_window_on_fullscreen'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return;
-#line 3404 "AppWindow.c"
+#line 2539 "AppWindow.c"
 }
 
 
 void app_window_on_fullscreen (AppWindow* self) {
-#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_fullscreen (self);
-#line 3413 "AppWindow.c"
+#line 2548 "AppWindow.c"
 }
 
 
 gboolean app_window_has_instance (void) {
 	gboolean result = FALSE;
 	AppWindow* _tmp0_ = NULL;
-#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp0_ != NULL;
-#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3426 "AppWindow.c"
+#line 2561 "AppWindow.c"
 }
 
 
@@ -3458,15 +2593,15 @@ AppWindow* app_window_get_instance (void) {
 	AppWindow* result = NULL;
 	AppWindow* _tmp0_ = NULL;
 	AppWindow* _tmp1_ = NULL;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3442 "AppWindow.c"
+#line 2577 "AppWindow.c"
 }
 
 
@@ -3474,15 +2609,15 @@ FullscreenWindow* app_window_get_fullscreen (void) {
 	FullscreenWindow* result = NULL;
 	FullscreenWindow* _tmp0_ = NULL;
 	FullscreenWindow* _tmp1_ = NULL;
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3458 "AppWindow.c"
+#line 2593 "AppWindow.c"
 }
 
 
@@ -3492,13 +2627,13 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 	GtkBuilder* _tmp0_ = NULL;
 	void* _tmp12_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (glade_filename != NULL, NULL);
-#line 554 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_builder_new ();
-#line 554 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	builder = _tmp0_;
-#line 3474 "AppWindow.c"
+#line 2609 "AppWindow.c"
 	{
 		GFile* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
@@ -3509,99 +2644,99 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 		GFile* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = app_dirs_get_resources_dir ();
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_;
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_file_get_child (_tmp2_, "ui");
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = glade_filename;
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = g_file_get_child (_tmp4_, _tmp5_);
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = g_file_get_path (_tmp7_);
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_builder_add_from_file (builder, _tmp9_, &_inner_error_);
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp9_);
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp4_);
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3515 "AppWindow.c"
-			goto __catch227_g_error;
+#line 2650 "AppWindow.c"
+			goto __catch224_g_error;
 		}
 	}
-	goto __finally227;
-	__catch227_g_error:
+	goto __finally224;
+	__catch224_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_error_ = _inner_error_;
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _error_;
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = _tmp10_->message;
-#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_warning ("AppWindow.vala:559: Unable to create Gtk.Builder: %s\n", _tmp11_);
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_warning ("AppWindow.vala:482: Unable to create Gtk.Builder: %s\n", _tmp11_);
+#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (_error_);
-#line 3537 "AppWindow.c"
+#line 2672 "AppWindow.c"
 	}
-	__finally227:
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally224:
+#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (builder);
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return NULL;
-#line 3550 "AppWindow.c"
+#line 2685 "AppWindow.c"
 	}
-#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = user;
-#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_builder_connect_signals (builder, _tmp12_);
-#line 564 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = builder;
-#line 564 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3560 "AppWindow.c"
+#line 2695 "AppWindow.c"
 }
 
 
 void app_window_error_message (const gchar* message, GtkWindow* parent) {
 	const gchar* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (message != NULL);
-#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = message;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_error_message_with_title (RESOURCES_APP_TITLE, _tmp0_, _tmp1_, TRUE);
-#line 3577 "AppWindow.c"
+#line 2712 "AppWindow.c"
 }
 
 
@@ -3621,83 +2756,83 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
 	gboolean _tmp14_ = FALSE;
 	gchar* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
-#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (title != NULL);
-#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (message != NULL);
-#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3607 "AppWindow.c"
+#line 2742 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3618 "AppWindow.c"
+#line 2753 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3627 "AppWindow.c"
+#line 2762 "AppWindow.c"
 	}
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = should_escape;
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = build_alert_body_text (_tmp5_, _tmp6_, _tmp7_);
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp9_);
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp10_);
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp9_);
-#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp11_;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = title;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = message;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = should_escape;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = build_alert_body_text (_tmp12_, _tmp13_, _tmp14_);
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = _tmp15_;
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp16_);
-#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp16_);
-#line 581 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (dialog, "use-markup", TRUE, NULL);
-#line 582 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 506 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3673 "AppWindow.c"
+#line 2808 "AppWindow.c"
 }
 
 
@@ -3720,93 +2855,93 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
 	const gchar* _tmp16_ = NULL;
 	gboolean response = FALSE;
 	gint _tmp17_ = 0;
-#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, FALSE);
-#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, FALSE);
-#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, FALSE);
-#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), FALSE);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3708 "AppWindow.c"
+#line 2843 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3719 "AppWindow.c"
+#line 2854 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3728 "AppWindow.c"
+#line 2863 "AppWindow.c"
 	}
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp8_);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp9_);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp8_);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp10_;
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = title;
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = message;
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = build_alert_body_text (_tmp11_, _tmp12_, TRUE);
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp14_);
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp14_);
-#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = negative;
-#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = affirmative;
-#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_NO, _tmp16_, GTK_RESPONSE_YES, NULL);
-#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_urgency_hint (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), TRUE);
-#line 595 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 595 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp17_ == ((gint) GTK_RESPONSE_YES);
-#line 597 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = response;
-#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 599 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3782 "AppWindow.c"
+#line 2917 "AppWindow.c"
 }
 
 
@@ -3830,95 +2965,95 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 	gchar* _tmp17_ = NULL;
 	gint response = 0;
 	gint _tmp18_ = 0;
-#line 602 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 602 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, 0);
-#line 602 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 602 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3818 "AppWindow.c"
+#line 2953 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3829 "AppWindow.c"
+#line 2964 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3838 "AppWindow.c"
+#line 2973 "AppWindow.c"
 	}
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp8_);
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp9_);
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp8_);
-#line 604 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp10_;
-#line 607 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = negative;
-#line 607 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = affirmative;
-#line 607 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = _ ("_Cancel");
-#line 607 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp11_, GTK_RESPONSE_NO, _tmp12_, GTK_RESPONSE_YES, _tmp13_, GTK_RESPONSE_CANCEL, NULL);
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = title;
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = message;
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = build_alert_body_text (_tmp14_, _tmp15_, TRUE);
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = _tmp16_;
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp17_);
-#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp17_);
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (dialog, "use-markup", TRUE, NULL);
-#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 614 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp18_;
-#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3894 "AppWindow.c"
+#line 3029 "AppWindow.c"
 }
 
 
@@ -3942,103 +3077,103 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 	GtkMessageDialog* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	GtkMessageDialog* _tmp19_ = NULL;
-#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3928 "AppWindow.c"
+#line 3063 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3939 "AppWindow.c"
+#line 3074 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3948 "AppWindow.c"
+#line 3083 "AppWindow.c"
 	}
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp5_);
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp6_);
-#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp6_;
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = dialog;
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = message;
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (_tmp7_, _tmp8_);
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = dialog;
-#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (_tmp9_, "use-markup", TRUE, NULL);
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = title;
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp11_ != NULL) {
-#line 3972 "AppWindow.c"
+#line 3107 "AppWindow.c"
 		const gchar* _tmp12_ = NULL;
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = title;
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 3978 "AppWindow.c"
+#line 3113 "AppWindow.c"
 	} else {
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = RESOURCES_APP_TITLE;
-#line 3982 "AppWindow.c"
+#line 3117 "AppWindow.c"
 	}
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = dialog;
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_window_get_type (), GtkWindow), _tmp10_);
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = dialog;
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = affirmative;
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = _ ("_Cancel");
-#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_YES, _tmp16_, GTK_RESPONSE_CANCEL, NULL);
-#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = dialog;
-#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog));
-#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp18_;
-#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp19_ = dialog;
-#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 4014 "AppWindow.c"
+#line 3149 "AppWindow.c"
 }
 
 
@@ -4061,101 +3196,101 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 	GtkMessageDialog* _tmp16_ = NULL;
 	gint _tmp17_ = 0;
 	GtkMessageDialog* _tmp18_ = NULL;
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, 0);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative_all != NULL, 0);
-#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 4051 "AppWindow.c"
+#line 3186 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 4062 "AppWindow.c"
+#line 3197 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 4071 "AppWindow.c"
+#line 3206 "AppWindow.c"
 	}
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp5_);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp6_);
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp6_;
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = title;
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 4085 "AppWindow.c"
+#line 3220 "AppWindow.c"
 		const gchar* _tmp9_ = NULL;
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = title;
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp9_;
-#line 4091 "AppWindow.c"
+#line 3226 "AppWindow.c"
 	} else {
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = RESOURCES_APP_TITLE;
-#line 4095 "AppWindow.c"
+#line 3230 "AppWindow.c"
 	}
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = dialog;
-#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), _tmp7_);
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = dialog;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = negative;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = affirmative;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = affirmative_all;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = _ ("_Cancel");
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_dialog_get_type (), GtkDialog), _tmp12_, GTK_RESPONSE_NO, _tmp13_, GTK_RESPONSE_YES, _tmp14_, GTK_RESPONSE_APPLY, _tmp15_, GTK_RESPONSE_CANCEL, NULL);
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = dialog;
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_dialog_get_type (), GtkDialog));
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp17_;
-#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = dialog;
-#line 650 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 652 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 652 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 652 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 652 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 4131 "AppWindow.c"
+#line 3266 "AppWindow.c"
 }
 
 
@@ -4165,24 +3300,24 @@ void app_window_database_error (GError* err) {
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = _ ("A fatal error occurred when accessing Shotwell’s library. Shotwell can" \
 "not continue.\n" \
 "\n" \
 "%s");
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = err;
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _tmp1_->message;
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_panic (_tmp4_);
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp4_);
-#line 4155 "AppWindow.c"
+#line 3290 "AppWindow.c"
 }
 
 
@@ -4191,43 +3326,43 @@ void app_window_panic (const gchar* msg) {
 	const gchar* _tmp1_ = NULL;
 	Application* _tmp2_ = NULL;
 	Application* _tmp3_ = NULL;
-#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (msg != NULL);
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 584 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = msg;
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_critical ("AppWindow.vala:661: %s", _tmp0_);
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 584 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_critical ("AppWindow.vala:584: %s", _tmp0_);
+#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = msg;
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_error_message (_tmp1_, NULL);
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = application_get_instance ();
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	application_panic (_tmp3_);
-#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp3_);
-#line 4182 "AppWindow.c"
+#line 3317 "AppWindow.c"
 }
 
 
 static gchar* app_window_real_get_app_role (AppWindow* self) {
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_critical ("Type `%s' does not implement abstract method `app_window_get_app_role'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return NULL;
-#line 4191 "AppWindow.c"
+#line 3326 "AppWindow.c"
 }
 
 
 gchar* app_window_get_app_role (AppWindow* self) {
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return APP_WINDOW_GET_CLASS (self)->get_app_role (self);
-#line 4200 "AppWindow.c"
+#line 3335 "AppWindow.c"
 }
 
 
@@ -4238,49 +3373,49 @@ void app_window_on_about (AppWindow* self) {
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_app_role (self);
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _ ("Visit the Shotwell web site");
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = resources_get_icon (RESOURCES_ICON_ABOUT_LOGO, -1);
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _ ("translator-credits");
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_show_about_dialog (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), "version", RESOURCES_APP_VERSION, "comments", _tmp1_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _tmp2_, "authors", RESOURCES_AUTHORS, "logo", _tmp4_, "translator-credits", _tmp5_, NULL, NULL);
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 4231 "AppWindow.c"
+#line 3366 "AppWindow.c"
 }
 
 
 static void app_window_on_help_contents (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 607 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 4239 "AppWindow.c"
+#line 3374 "AppWindow.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
-#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		resources_launch_help (_tmp0_, NULL, &_inner_error_);
-#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4248 "AppWindow.c"
-			goto __catch228_g_error;
+#line 3383 "AppWindow.c"
+			goto __catch225_g_error;
 		}
 	}
-	goto __finally228;
-	__catch228_g_error:
+	goto __finally225;
+	__catch225_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp1_ = NULL;
@@ -4288,58 +3423,58 @@ static void app_window_on_help_contents (AppWindow* self) {
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = _ ("Unable to display help: %s");
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = err;
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp2_->message;
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = g_strdup_printf (_tmp1_, _tmp3_);
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp5_, NULL);
-#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp5_);
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 4281 "AppWindow.c"
+#line 3416 "AppWindow.c"
 	}
-	__finally228:
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally225:
+#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4292 "AppWindow.c"
+#line 3427 "AppWindow.c"
 	}
 }
 
 
 static void app_window_on_help_report_problem (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 615 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 4301 "AppWindow.c"
+#line 3436 "AppWindow.c"
 	{
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_BUG_DB_URL, &_inner_error_);
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4307 "AppWindow.c"
-			goto __catch229_g_error;
+#line 3442 "AppWindow.c"
+			goto __catch226_g_error;
 		}
 	}
-	goto __finally229;
-	__catch229_g_error:
+	goto __finally226;
+	__catch226_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -4347,58 +3482,58 @@ static void app_window_on_help_report_problem (AppWindow* self) {
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _ ("Unable to navigate to bug database: %s");
-#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = err;
-#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_->message;
-#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp4_, NULL);
-#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp4_);
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 4340 "AppWindow.c"
+#line 3475 "AppWindow.c"
 	}
-	__finally229:
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally226:
+#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4351 "AppWindow.c"
+#line 3486 "AppWindow.c"
 	}
 }
 
 
 static void app_window_on_help_faq (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 623 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 4360 "AppWindow.c"
+#line 3495 "AppWindow.c"
 	{
-#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_FAQ_URL, &_inner_error_);
-#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4366 "AppWindow.c"
-			goto __catch230_g_error;
+#line 3501 "AppWindow.c"
+			goto __catch227_g_error;
 		}
 	}
-	goto __finally230;
-	__catch230_g_error:
+	goto __finally227;
+	__catch227_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -4406,38 +3541,38 @@ static void app_window_on_help_faq (AppWindow* self) {
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _ ("Unable to display FAQ: %s");
-#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = err;
-#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_->message;
-#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp4_, NULL);
-#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp4_);
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 4399 "AppWindow.c"
+#line 3534 "AppWindow.c"
 	}
-	__finally230:
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally227:
+#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4410 "AppWindow.c"
+#line 3545 "AppWindow.c"
 	}
 }
 
@@ -4445,24 +3580,24 @@ static void app_window_on_help_faq (AppWindow* self) {
 static void app_window_real_on_quit (AppWindow* self) {
 	Application* _tmp0_ = NULL;
 	Application* _tmp1_ = NULL;
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = application_get_instance ();
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	application_exit (_tmp1_);
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp1_);
-#line 4426 "AppWindow.c"
+#line 3561 "AppWindow.c"
 }
 
 
 void app_window_on_quit (AppWindow* self) {
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 631 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 631 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_quit (self);
-#line 4435 "AppWindow.c"
+#line 3570 "AppWindow.c"
 }
 
 
@@ -4485,71 +3620,71 @@ void app_window_on_jump_to_file (AppWindow* self) {
 	MediaSource* _tmp14_ = NULL;
 	MediaSource* _tmp15_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _tmp4_ != 1;
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 714 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4480 "AppWindow.c"
+#line 3615 "AppWindow.c"
 	}
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = page_get_view (_tmp7_);
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = view_collection_get_selected_at (_tmp9_, 0);
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = data_view_get_source (_tmp11_);
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp12_) : NULL;
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp13_ == NULL) {
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp12_);
-#line 4502 "AppWindow.c"
+#line 3637 "AppWindow.c"
 	}
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_data_collection_unref0 (_tmp9_);
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	media = _tmp14_;
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = media;
-#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp15_ == NULL) {
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (media);
-#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4522 "AppWindow.c"
+#line 3657 "AppWindow.c"
 	}
 	{
 		AppWindow* _tmp16_ = NULL;
@@ -4557,79 +3692,79 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		MediaSource* _tmp18_ = NULL;
 		GFile* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = app_window_get_instance ();
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp18_ = media;
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = media_source_get_master_file (_tmp18_);
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = _tmp19_;
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_file_uri (_tmp17_, _tmp20_, &_inner_error_);
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp20_);
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4548 "AppWindow.c"
-			goto __catch231_g_error;
+#line 3683 "AppWindow.c"
+			goto __catch228_g_error;
 		}
 	}
-	goto __finally231;
-	__catch231_g_error:
+	goto __finally228;
+	__catch228_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = err;
-#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp22_ = resources_jump_to_file_failed (_tmp21_);
-#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp23_ = _tmp22_;
-#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp23_, NULL);
-#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp23_);
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 4575 "AppWindow.c"
+#line 3710 "AppWindow.c"
 	}
-	__finally231:
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally228:
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (media);
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4588 "AppWindow.c"
+#line 3723 "AppWindow.c"
 	}
-#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 635 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (media);
-#line 4592 "AppWindow.c"
+#line 3727 "AppWindow.c"
 }
 
 
 static void app_window_real_destroy (GtkWidget* base) {
 	AppWindow * self;
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 651 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 652 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_quit (self);
-#line 4602 "AppWindow.c"
+#line 3737 "AppWindow.c"
 }
 
 
@@ -4642,7 +3777,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 4615 "AppWindow.c"
+#line 3750 "AppWindow.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -4673,8 +3808,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4646 "AppWindow.c"
-				goto __catch232_g_regex_error;
+#line 3781 "AppWindow.c"
+				goto __catch229_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4682,7 +3817,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4655 "AppWindow.c"
+#line 3790 "AppWindow.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -4698,8 +3833,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4671 "AppWindow.c"
-				goto __catch232_g_regex_error;
+#line 3806 "AppWindow.c"
+				goto __catch229_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -4709,7 +3844,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4682 "AppWindow.c"
+#line 3817 "AppWindow.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -4723,10 +3858,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 4696 "AppWindow.c"
+#line 3831 "AppWindow.c"
 	}
-	goto __finally232;
-	__catch232_g_regex_error:
+	goto __finally229;
+	__catch229_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4737,9 +3872,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 4710 "AppWindow.c"
+#line 3845 "AppWindow.c"
 	}
-	__finally232:
+	__finally229:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4748,7 +3883,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 4721 "AppWindow.c"
+#line 3856 "AppWindow.c"
 	}
 }
 
@@ -4759,53 +3894,53 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 	gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 655 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 655 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = get_nautilus_install_location ();
-#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _tmp1_ != NULL;
-#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 660 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_) {
-#line 4746 "AppWindow.c"
+#line 3881 "AppWindow.c"
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = file;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = g_file_get_uri (_tmp3_);
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = string_replace (_tmp5_, "'", "\\\'");
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (tmp);
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		tmp = _tmp6_;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp5_);
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = tmp;
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		show_file_in_nautilus (_tmp7_, &_inner_error_);
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_propagate_error (error, _inner_error_);
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_g_free0 (tmp);
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 4778 "AppWindow.c"
+#line 3913 "AppWindow.c"
 		}
 	} else {
 		GFile* _tmp8_ = NULL;
@@ -4815,44 +3950,44 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = file;
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = g_file_get_parent (_tmp8_);
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = g_file_get_uri (_tmp10_);
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = _tmp11_;
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = string_replace (_tmp12_, "'", "\\\'");
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (tmp);
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		tmp = _tmp13_;
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp12_);
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp14_ = tmp;
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, _tmp14_, &_inner_error_);
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_propagate_error (error, _inner_error_);
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_g_free0 (tmp);
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 4820 "AppWindow.c"
+#line 3955 "AppWindow.c"
 		}
 	}
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 655 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (tmp);
-#line 4825 "AppWindow.c"
+#line 3960 "AppWindow.c"
 }
 
 
@@ -4861,190 +3996,42 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
 	GdkScreen* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 669 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (url != NULL);
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_window_get_screen (_tmp0_);
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = url;
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	sys_show_uri (_tmp1_, _tmp2_, &_inner_error_);
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_propagate_error (error, _inner_error_);
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4852 "AppWindow.c"
-	}
-}
-
-
-static void _vala_array_add170 (GtkActionGroup*** array, int* length, int* size, GtkActionGroup* value) {
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if ((*length) == (*size)) {
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*array = g_renew (GtkActionGroup*, *array, (*size) + 1);
-#line 4864 "AppWindow.c"
-	}
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[(*length)++] = value;
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	(*array)[*length] = NULL;
-#line 4870 "AppWindow.c"
-}
-
-
-static GtkActionGroup** app_window_real_create_common_action_groups (AppWindow* self, int* result_length1) {
-	GtkActionGroup** result = NULL;
-	GtkActionGroup** groups = NULL;
-	GtkActionGroup** _tmp0_ = NULL;
-	gint groups_length1 = 0;
-	gint _groups_size_ = 0;
-	GtkActionGroup* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	GtkActionEntry* _tmp3_ = NULL;
-	GtkActionEntry* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GtkActionGroup** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	GtkActionGroup* _tmp6_ = NULL;
-	GtkActionGroup* _tmp7_ = NULL;
-	GtkActionGroup** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0_ = g_new0 (GtkActionGroup*, 0 + 1);
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	groups = _tmp0_;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	groups_length1 = 0;
-#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_groups_size_ = groups_length1;
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_ = self->priv->common_action_group;
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp3_ = app_window_create_common_actions (self, &_tmp2_);
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_ = _tmp3_;
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4__length1 = _tmp2_;
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_action_group_add_actions (_tmp1_, _tmp4_, _tmp2_, self);
-#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp4_ = (g_free (_tmp4_), NULL);
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp5_ = groups;
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp5__length1 = groups_length1;
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp6_ = self->priv->common_action_group;
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 754 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_vala_array_add170 (&groups, &groups_length1, &_groups_size_, _tmp7_);
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp8_ = groups;
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp8__length1 = groups_length1;
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (result_length1) {
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*result_length1 = _tmp8__length1;
-#line 4929 "AppWindow.c"
+#line 3987 "AppWindow.c"
 	}
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	result = _tmp8_;
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	return result;
-#line 4935 "AppWindow.c"
 }
 
 
-GtkActionGroup** app_window_create_common_action_groups (AppWindow* self, int* result_length1) {
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	return APP_WINDOW_GET_CLASS (self)->create_common_action_groups (self, result_length1);
-#line 4944 "AppWindow.c"
+static void app_window_real_add_actions (AppWindow* self) {
+#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), APP_WINDOW_common_actions, G_N_ELEMENTS (APP_WINDOW_common_actions), self);
+#line 3995 "AppWindow.c"
 }
 
 
-static GtkActionGroup** _vala_array_dup28 (GtkActionGroup** self, int length) {
-	GtkActionGroup** result;
-	int i;
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	result = g_new0 (GtkActionGroup*, length + 1);
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	for (i = 0; i < length; i++) {
-#line 4955 "AppWindow.c"
-		GtkActionGroup* _tmp0_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp0_ = _g_object_ref0 (self[i]);
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		result[i] = _tmp0_;
-#line 4961 "AppWindow.c"
-	}
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	return result;
-#line 4965 "AppWindow.c"
-}
-
-
-GtkActionGroup** app_window_get_common_action_groups (AppWindow* self, int* result_length1) {
-	GtkActionGroup** result = NULL;
-	GtkActionGroup** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	GtkActionGroup** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	GtkActionGroup** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-#line 759 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0_ = self->common_action_groups;
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0__length1 = self->common_action_groups_length1;
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup28 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1__length1 = _tmp0__length1;
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2_ = _tmp1_;
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2__length1 = _tmp1__length1;
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (result_length1) {
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		*result_length1 = _tmp2__length1;
-#line 4995 "AppWindow.c"
-	}
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	result = _tmp2_;
-#line 760 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	return result;
-#line 5001 "AppWindow.c"
-}
-
-
-static void app_window_real_replace_common_placeholders (AppWindow* self, GtkUIManager* ui) {
-#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (GTK_IS_UI_MANAGER (ui));
-#line 5008 "AppWindow.c"
-}
-
-
-void app_window_replace_common_placeholders (AppWindow* self, GtkUIManager* ui) {
-#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
+void app_window_add_actions (AppWindow* self) {
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	APP_WINDOW_GET_CLASS (self)->replace_common_placeholders (self, ui);
-#line 5017 "AppWindow.c"
+#line 673 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	APP_WINDOW_GET_CLASS (self)->add_actions (self);
+#line 4004 "AppWindow.c"
 }
 
 
@@ -5061,81 +4048,81 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 	FullscreenWindow* _tmp12_ = NULL;
 	FullscreenWindow* _tmp13_ = NULL;
 	FullscreenWindow* _tmp14_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 766 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 768 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 768 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 5042 "AppWindow.c"
+#line 4029 "AppWindow.c"
 		FullscreenWindow* _tmp1_ = NULL;
-#line 769 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = app_window_fullscreen_window;
-#line 769 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
-#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 5050 "AppWindow.c"
+#line 4037 "AppWindow.c"
 	}
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp2_, &_tmp3_);
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_x = _tmp2_;
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_y = _tmp3_;
-#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = page;
-#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = fullscreen_window_new (_tmp4_);
-#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp5_);
-#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fsw = _tmp5_;
-#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_ != NULL;
-#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_) {
-#line 5078 "AppWindow.c"
+#line 4065 "AppWindow.c"
 		Page* _tmp9_ = NULL;
 		Page* _tmp10_ = NULL;
 		FullscreenWindow* _tmp11_ = NULL;
-#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = fsw;
-#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switching_to_fullscreen (_tmp10_, _tmp11_);
-#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 5092 "AppWindow.c"
+#line 4079 "AppWindow.c"
 	}
-#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = fsw;
-#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_fullscreen_window);
-#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_fullscreen_window = _tmp13_;
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = app_window_fullscreen_window;
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 766 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 677 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (fsw);
-#line 5108 "AppWindow.c"
+#line 4095 "AppWindow.c"
 }
 
 
@@ -5148,276 +4135,250 @@ void app_window_end_fullscreen (AppWindow* self) {
 	gboolean _tmp5_ = FALSE;
 	FullscreenWindow* _tmp9_ = NULL;
 	FullscreenWindow* _tmp10_ = NULL;
-#line 786 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ == NULL) {
-#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 5129 "AppWindow.c"
+#line 4116 "AppWindow.c"
 	}
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->pos_x;
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->pos_y;
-#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp1_, _tmp2_);
-#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _tmp4_ != NULL;
-#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 794 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 5149 "AppWindow.c"
+#line 4136 "AppWindow.c"
 		Page* _tmp6_ = NULL;
 		Page* _tmp7_ = NULL;
 		FullscreenWindow* _tmp8_ = NULL;
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = app_window_fullscreen_window;
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_returning_from_fullscreen (_tmp7_, _tmp8_);
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 5163 "AppWindow.c"
+#line 4150 "AppWindow.c"
 	}
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = app_window_fullscreen_window;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = app_window_fullscreen_window;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_fullscreen_window);
-#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_fullscreen_window = NULL;
-#line 801 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 5179 "AppWindow.c"
+#line 4166 "AppWindow.c"
 }
 
 
-GtkAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
-	GtkAction* result = NULL;
-	GtkActionGroup** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	const gchar* _tmp7_ = NULL;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+GAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
+	GAction* result = NULL;
+	const gchar* _tmp0_ = NULL;
+	GAction* _tmp1_ = NULL;
+	GAction* _tmp2_ = NULL;
+#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0_ = self->common_action_groups;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0__length1 = self->common_action_groups_length1;
-#line 5196 "AppWindow.c"
-	{
-		GtkActionGroup** group_collection = NULL;
-		gint group_collection_length1 = 0;
-		gint _group_collection_size_ = 0;
-		gint group_it = 0;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		group_collection = _tmp0_;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		group_collection_length1 = _tmp0__length1;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		for (group_it = 0; group_it < _tmp0__length1; group_it = group_it + 1) {
-#line 5208 "AppWindow.c"
-			GtkActionGroup* _tmp1_ = NULL;
-			GtkActionGroup* group = NULL;
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
-			_tmp1_ = _g_object_ref0 (group_collection[group_it]);
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
-			group = _tmp1_;
-#line 5215 "AppWindow.c"
-			{
-				GtkAction* action = NULL;
-				GtkActionGroup* _tmp2_ = NULL;
-				const gchar* _tmp3_ = NULL;
-				GtkAction* _tmp4_ = NULL;
-				GtkAction* _tmp5_ = NULL;
-				GtkAction* _tmp6_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				_tmp2_ = group;
-#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				_tmp3_ = name;
-#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				_tmp4_ = gtk_action_group_get_action (_tmp2_, _tmp3_);
-#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				action = _tmp5_;
-#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				_tmp6_ = action;
-#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				if (_tmp6_ != NULL) {
-#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
-					result = action;
-#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
-					_g_object_unref0 (group);
-#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
-					return result;
-#line 5243 "AppWindow.c"
-				}
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				_g_object_unref0 (action);
-#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				_g_object_unref0 (group);
-#line 5249 "AppWindow.c"
-			}
-		}
-	}
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp7_ = name;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_warning ("AppWindow.vala:811: No common action found: %s", _tmp7_);
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	result = NULL;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp0_ = name;
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp1_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), _tmp0_);
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp2_ = _g_object_ref0 (_tmp1_);
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	result = _tmp2_;
+#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5261 "AppWindow.c"
+#line 4189 "AppWindow.c"
 }
 
 
 void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, gboolean sensitive) {
-	GtkAction* action = NULL;
+	GSimpleAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	GAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (name != NULL);
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp1_;
-#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2_ = action;
-#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp2_ != NULL) {
-#line 5284 "AppWindow.c"
-		GtkAction* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp3_ = action;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp4_ = sensitive;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_action_set_sensitive (_tmp3_, _tmp4_);
-#line 5293 "AppWindow.c"
+#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
+#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp2_ == NULL) {
+#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_object_unref0 (_tmp1_);
+#line 4213 "AppWindow.c"
+	}
+#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp3_ = action;
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp3_ != NULL) {
+#line 4221 "AppWindow.c"
+		GSimpleAction* _tmp4_ = NULL;
+		gboolean _tmp5_ = FALSE;
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp4_ = action;
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp5_ = sensitive;
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_simple_action_set_enabled (_tmp4_, _tmp5_);
+#line 4230 "AppWindow.c"
 	}
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 719 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 5297 "AppWindow.c"
+#line 4234 "AppWindow.c"
 }
 
 
 void app_window_set_common_action_important (AppWindow* self, const gchar* name, gboolean important) {
-	GtkAction* action = NULL;
+	GSimpleAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	GAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (name != NULL);
-#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp1_;
-#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2_ = action;
-#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp2_ != NULL) {
-#line 5320 "AppWindow.c"
-		GtkAction* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp3_ = action;
-#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp4_ = important;
-#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_action_set_is_important (_tmp3_, _tmp4_);
-#line 5329 "AppWindow.c"
+#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
+#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp2_ == NULL) {
+#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_object_unref0 (_tmp1_);
+#line 4258 "AppWindow.c"
+	}
+#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp3_ = action;
+#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp3_ != NULL) {
+#line 4266 "AppWindow.c"
+		GSimpleAction* _tmp4_ = NULL;
+		gboolean _tmp5_ = FALSE;
+		gboolean _tmp6_ = FALSE;
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp4_ = action;
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp6_ = _tmp5_;
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_simple_action_set_enabled (_tmp4_, _tmp6_);
+#line 4278 "AppWindow.c"
 	}
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 5333 "AppWindow.c"
+#line 4282 "AppWindow.c"
 }
 
 
 void app_window_set_common_action_visible (AppWindow* self, const gchar* name, gboolean visible) {
-	GtkAction* action = NULL;
+	GSimpleAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	GAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (name != NULL);
-#line 829 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 829 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 829 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp1_;
-#line 830 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2_ = action;
-#line 830 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp2_ != NULL) {
-#line 5356 "AppWindow.c"
-		GtkAction* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-#line 831 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp3_ = action;
-#line 831 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp4_ = visible;
-#line 831 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_action_set_visible (_tmp3_, _tmp4_);
-#line 5365 "AppWindow.c"
+#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
+#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp2_ == NULL) {
+#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_object_unref0 (_tmp1_);
+#line 4306 "AppWindow.c"
 	}
-#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp3_ = action;
+#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp3_ != NULL) {
+#line 4314 "AppWindow.c"
+		GSimpleAction* _tmp4_ = NULL;
+		gboolean _tmp5_ = FALSE;
+		gboolean _tmp6_ = FALSE;
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp4_ = action;
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp6_ = _tmp5_;
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		g_simple_action_set_enabled (_tmp4_, _tmp6_);
+#line 4326 "AppWindow.c"
+	}
+#line 731 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 5369 "AppWindow.c"
+#line 4330 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 5376 "AppWindow.c"
+#line 4337 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 5383 "AppWindow.c"
+#line 4344 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 5390 "AppWindow.c"
+#line 4351 "AppWindow.c"
 }
 
 
@@ -5429,23 +4390,23 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 	Page* _tmp15_ = NULL;
 	Page* _tmp34_ = NULL;
 	Page* _tmp35_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = old_page;
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = new_page;
-#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_update_common_action_availability (self, _tmp0_, _tmp1_);
-#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = old_page;
-#line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5418 "AppWindow.c"
+#line 4379 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -5458,49 +4419,49 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		guint _tmp14_ = 0U;
-#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = old_page;
-#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _app_window_on_update_common_actions_data_collection_contents_altered, self);
-#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = old_page;
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE);
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_selection_group_altered, self);
-#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = old_page;
-#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = page_get_view (_tmp11_);
-#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp14_, NULL, FALSE);
-#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self);
-#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 5467 "AppWindow.c"
+#line 4428 "AppWindow.c"
 	}
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = new_page;
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 746 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp15_ != NULL) {
-#line 5473 "AppWindow.c"
+#line 4434 "AppWindow.c"
 		Page* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		ViewCollection* _tmp18_ = NULL;
@@ -5519,135 +4480,135 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		ViewCollection* _tmp31_ = NULL;
 		ViewCollection* _tmp32_ = NULL;
 		gint _tmp33_ = 0;
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = new_page;
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = page_get_view (_tmp16_);
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp18_ = _tmp17_;
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _app_window_on_update_common_actions_data_collection_contents_altered, self, 0);
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp18_);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = new_page;
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = page_get_view (_tmp19_);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = _tmp20_;
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_connect_object (_tmp21_, "selection-group-altered", (GCallback) _app_window_on_update_common_actions_view_collection_selection_group_altered, self, 0);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp21_);
-#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp22_ = new_page;
-#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp23_ = page_get_view (_tmp22_);
-#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp24_ = _tmp23_;
-#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_connect_object (_tmp24_, "items-state-changed", (GCallback) _app_window_on_update_common_actions_view_collection_items_state_changed, self, 0);
-#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp24_);
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp25_ = new_page;
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp26_ = new_page;
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp27_ = page_get_view (_tmp26_);
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp28_ = _tmp27_;
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp29_ = view_collection_get_selected_count (_tmp28_);
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp30_ = new_page;
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp31_ = page_get_view (_tmp30_);
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp32_ = _tmp31_;
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp33_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_COLLECTION, DataCollection));
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_update_common_actions (self, _tmp25_, _tmp29_, _tmp33_);
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp32_);
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp28_);
-#line 5546 "AppWindow.c"
+#line 4507 "AppWindow.c"
 	}
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 755 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp34_ = old_page;
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 755 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp35_ = new_page;
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 755 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	PAGE_WINDOW_CLASS (app_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), _tmp34_, _tmp35_);
-#line 5554 "AppWindow.c"
+#line 4515 "AppWindow.c"
 }
 
 
 static void app_window_real_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
 	gboolean is_checkerboard = FALSE;
 	Page* _tmp0_ = NULL;
-#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = new_page;
-#line 859 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE);
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard);
-#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 765 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonSelectNone", is_checkerboard);
-#line 5573 "AppWindow.c"
+#line 4534 "AppWindow.c"
 }
 
 
 void app_window_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
-#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_action_availability (self, old_page, new_page);
-#line 5582 "AppWindow.c"
+#line 4543 "AppWindow.c"
 }
 
 
 static void app_window_real_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
 	Page* _tmp0_ = NULL;
 	gint _tmp2_ = 0;
-#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 869 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page;
-#line 869 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE)) {
-#line 5595 "AppWindow.c"
+#line 4556 "AppWindow.c"
 		gint _tmp1_ = 0;
-#line 870 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = count;
-#line 870 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_set_common_action_sensitive (self, "CommonSelectAll", _tmp1_ > 0);
-#line 5601 "AppWindow.c"
+#line 4562 "AppWindow.c"
 	}
-#line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = selected_count;
-#line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonJumpToFile", _tmp2_ == 1);
-#line 873 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_undo_action (self);
-#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 5611 "AppWindow.c"
+#line 4572 "AppWindow.c"
 }
 
 
 void app_window_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
-#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 868 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_actions (self, page, selected_count, count);
-#line 5620 "AppWindow.c"
+#line 4581 "AppWindow.c"
 }
 
 
@@ -5655,17 +4616,17 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 	Page* page = NULL;
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 878 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 781 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 878 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 781 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = _tmp0_;
-#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = page;
-#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 5638 "AppWindow.c"
+#line 4599 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -5675,42 +4636,42 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 		ViewCollection* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = page;
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = page;
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection));
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_update_common_actions (self, _tmp2_, _tmp6_, _tmp10_);
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5672 "AppWindow.c"
+#line 4633 "AppWindow.c"
 	}
-#line 877 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 780 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5676 "AppWindow.c"
+#line 4637 "AppWindow.c"
 }
 
 
 static gpointer _command_manager_ref0 (gpointer self) {
-#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self ? command_manager_ref (self) : NULL;
-#line 5683 "AppWindow.c"
+#line 4644 "AppWindow.c"
 }
 
 
@@ -5718,142 +4679,41 @@ CommandManager* app_window_get_command_manager (void) {
 	CommandManager* result = NULL;
 	CommandManager* _tmp0_ = NULL;
 	CommandManager* _tmp1_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _command_manager_ref0 (_tmp0_);
-#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5699 "AppWindow.c"
+#line 4660 "AppWindow.c"
 }
 
 
 static void app_window_on_command_manager_altered (AppWindow* self) {
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_undo_action (self);
-#line 889 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 5710 "AppWindow.c"
+#line 4671 "AppWindow.c"
 }
 
 
 static void app_window_decorate_command_manager_action (AppWindow* self, const gchar* name, const gchar* prefix, const gchar* default_explanation, CommandDescription* desc) {
-	GtkAction* action = NULL;
-	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-	CommandDescription* _tmp3_ = NULL;
-#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (name != NULL);
-#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (prefix != NULL);
-#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (default_explanation != NULL);
-#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((desc == NULL) || IS_COMMAND_DESCRIPTION (desc));
-#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0_ = name;
-#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp1_;
-#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp2_ = action;
-#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp2_ == NULL) {
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_object_unref0 (action);
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		return;
-#line 5744 "AppWindow.c"
-	}
-#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp3_ = desc;
-#line 898 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp3_ != NULL) {
-#line 5750 "AppWindow.c"
-		GtkAction* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		CommandDescription* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		GtkAction* _tmp11_ = NULL;
-		CommandDescription* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		GtkAction* _tmp15_ = NULL;
-#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp4_ = action;
-#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp5_ = prefix;
-#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp6_ = desc;
-#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp7_ = command_description_get_name (_tmp6_);
-#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp8_ = _tmp7_;
-#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp9_ = g_strdup_printf ("%s %s", _tmp5_, _tmp8_);
-#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp10_ = _tmp9_;
-#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_action_set_label (_tmp4_, _tmp10_);
-#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp10_);
-#line 899 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp8_);
-#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp11_ = action;
-#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp12_ = desc;
-#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp13_ = command_description_get_explanation (_tmp12_);
-#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp14_ = _tmp13_;
-#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_action_set_tooltip (_tmp11_, _tmp14_);
-#line 900 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp14_);
-#line 901 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp15_ = action;
-#line 901 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_action_set_sensitive (_tmp15_, TRUE);
-#line 5799 "AppWindow.c"
-	} else {
-		GtkAction* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		GtkAction* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		GtkAction* _tmp20_ = NULL;
-#line 903 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp16_ = action;
-#line 903 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp17_ = prefix;
-#line 903 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_action_set_label (_tmp16_, _tmp17_);
-#line 904 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp18_ = action;
-#line 904 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp19_ = default_explanation;
-#line 904 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_action_set_tooltip (_tmp18_, _tmp19_);
-#line 905 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp20_ = action;
-#line 905 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_action_set_sensitive (_tmp20_, FALSE);
-#line 5822 "AppWindow.c"
-	}
-#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (action);
-#line 5826 "AppWindow.c"
+#line 4686 "AppWindow.c"
 }
 
 
@@ -5862,23 +4722,23 @@ void app_window_decorate_undo_action (AppWindow* self) {
 	CommandManager* _tmp1_ = NULL;
 	CommandDescription* _tmp2_ = NULL;
 	CommandDescription* _tmp3_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = command_manager_get_undo_description (_tmp1_);
-#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_command_manager_action (self, "CommonUndo", RESOURCES_UNDO_MENU, "", _tmp3_);
-#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 910 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5851 "AppWindow.c"
+#line 4711 "AppWindow.c"
 }
 
 
@@ -5887,47 +4747,47 @@ void app_window_decorate_redo_action (AppWindow* self) {
 	CommandManager* _tmp1_ = NULL;
 	CommandDescription* _tmp2_ = NULL;
 	CommandDescription* _tmp3_ = NULL;
-#line 914 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = command_manager_get_redo_description (_tmp1_);
-#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_command_manager_action (self, "CommonRedo", RESOURCES_REDO_MENU, "", _tmp3_);
-#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 915 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5876 "AppWindow.c"
+#line 4736 "AppWindow.c"
 }
 
 
 static void app_window_on_undo (AppWindow* self) {
 	CommandManager* _tmp0_ = NULL;
-#line 919 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 920 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 920 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 825 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_undo (_tmp0_);
-#line 5888 "AppWindow.c"
+#line 4748 "AppWindow.c"
 }
 
 
 static void app_window_on_redo (AppWindow* self) {
 	CommandManager* _tmp0_ = NULL;
-#line 923 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 828 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 924 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 829 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 924 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 829 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_redo (_tmp0_);
-#line 5900 "AppWindow.c"
+#line 4760 "AppWindow.c"
 }
 
 
@@ -5936,43 +4796,43 @@ static void app_window_on_select_all (AppWindow* self) {
 	Page* _tmp0_ = NULL;
 	CheckerboardPage* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 927 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 832 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 928 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 928 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 928 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 928 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5919 "AppWindow.c"
+#line 4779 "AppWindow.c"
 	}
-#line 928 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 929 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page;
-#line 929 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5927 "AppWindow.c"
+#line 4787 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
-#line 930 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 930 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 930 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 930 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		view_collection_select_all (_tmp5_);
-#line 930 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 835 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5941 "AppWindow.c"
+#line 4801 "AppWindow.c"
 	}
-#line 927 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 832 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5945 "AppWindow.c"
+#line 4805 "AppWindow.c"
 }
 
 
@@ -5981,43 +4841,43 @@ static void app_window_on_select_none (AppWindow* self) {
 	Page* _tmp0_ = NULL;
 	CheckerboardPage* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 933 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 934 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 934 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 934 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 934 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5964 "AppWindow.c"
+#line 4824 "AppWindow.c"
 	}
-#line 934 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 935 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page;
-#line 935 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 840 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5972 "AppWindow.c"
+#line 4832 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 936 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 936 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 936 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 936 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5986 "AppWindow.c"
+#line 4846 "AppWindow.c"
 	}
-#line 933 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5990 "AppWindow.c"
+#line 4850 "AppWindow.c"
 }
 
 
@@ -6029,103 +4889,88 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 	gboolean _tmp2_ = FALSE;
 	GdkEventConfigure* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 939 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 939 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 940 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 940 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_window_get_state (_tmp0_);
-#line 940 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->maximized = _tmp1_ == GDK_WINDOW_STATE_MAXIMIZED;
-#line 942 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 847 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->maximized;
-#line 942 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 847 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 6016 "AppWindow.c"
+#line 4876 "AppWindow.c"
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 943 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_get_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), &_tmp3_, &_tmp4_);
-#line 943 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.width = _tmp3_;
-#line 943 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.height = _tmp4_;
-#line 6025 "AppWindow.c"
+#line 4885 "AppWindow.c"
 	}
-#line 945 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = event;
-#line 945 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = GTK_WIDGET_CLASS (app_window_parent_class)->configure_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 945 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp6_;
-#line 945 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 6035 "AppWindow.c"
+#line 4895 "AppWindow.c"
 }
 
 
 static void app_window_class_init (AppWindowClass * klass) {
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_parent_class = g_type_class_peek_parent (klass);
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_type_class_add_private (klass, sizeof (AppWindowPrivate));
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((AppWindowClass *) klass)->on_fullscreen = app_window_real_on_fullscreen;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((AppWindowClass *) klass)->get_app_role = app_window_real_get_app_role;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((AppWindowClass *) klass)->on_quit = app_window_real_on_quit;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->destroy = app_window_real_destroy;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((AppWindowClass *) klass)->create_common_action_groups = app_window_real_create_common_action_groups;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	((AppWindowClass *) klass)->replace_common_placeholders = app_window_real_replace_common_placeholders;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	((AppWindowClass *) klass)->add_actions = app_window_real_add_actions;
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((PageWindowClass *) klass)->switched_pages = app_window_real_switched_pages;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((AppWindowClass *) klass)->update_common_action_availability = app_window_real_update_common_action_availability;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((AppWindowClass *) klass)->update_common_actions = app_window_real_update_common_actions;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	((GtkWidgetClass *) klass)->configure_event = app_window_real_configure_event;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = app_window_finalize;
-#line 6066 "AppWindow.c"
+#line 4922 "AppWindow.c"
 }
 
 
 static void app_window_instance_init (AppWindow * self) {
-	GtkActionGroup* _tmp0_ = NULL;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->priv = APP_WINDOW_GET_PRIVATE (self);
-#line 420 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 402 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->maximized = FALSE;
-#line 422 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 404 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_x = 0;
-#line 423 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 405 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_y = 0;
-#line 425 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0_ = gtk_action_group_new ("AppWindowGlobalActionGroup");
-#line 425 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->priv->common_action_group = _tmp0_;
-#line 6084 "AppWindow.c"
+#line 4933 "AppWindow.c"
 }
 
 
 static void app_window_finalize (GObject* obj) {
 	AppWindow * self;
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_WINDOW, AppWindow);
-#line 419 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->common_action_groups = (_vala_array_free (self->common_action_groups, self->common_action_groups_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 425 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_g_object_unref0 (self->priv->common_action_group);
-#line 409 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (app_window_parent_class)->finalize (obj);
-#line 6098 "AppWindow.c"
+#line 4943 "AppWindow.c"
 }
 
 
@@ -6141,22 +4986,4 @@ GType app_window_get_type (void) {
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	if ((array != NULL) && (destroy_func != NULL)) {
-		int i;
-		for (i = 0; i < array_length; i = i + 1) {
-			if (((gpointer*) array)[i] != NULL) {
-				destroy_func (((gpointer*) array)[i]);
-			}
-		}
-	}
-}
-
-
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
-	_vala_array_destroy (array, array_length, destroy_func);
-	g_free (array);
-}
-
-
 
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index 0103300..41751e8 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -19,26 +19,19 @@ public class FullscreenWindow : PageWindow {
     private bool switched_to = false;
     private bool is_toolbar_dismissal_enabled;
 
+    private const GLib.ActionEntry[] entries = {
+        { "LeaveFullscreen", on_close }
+    };
+
     public FullscreenWindow(Page page) {
-        set_current_page(page);
+        base ();
 
-        File ui_file = Resources.get_ui("fullscreen.ui");
+        set_current_page(page);
 
-        try {
-            ui.add_ui_from_file(ui_file.get_path());
-        } catch (Error err) {
-            error("Error loading UI file %s: %s", ui_file.get_path(), err.message);
-        }
-        
-        Gtk.ActionGroup action_group = new Gtk.ActionGroup("FullscreenActionGroup");
-        action_group.add_actions(create_actions(), this);
-        ui.insert_action_group(action_group, 0);
-        ui.ensure_update();
+        AppWindow.get_instance().add_action_entries (entries, this);
+        const string[] accels = { "F11" };
+        Application.set_accels_for_action ("win.LeaveFullscreen", accels);
 
-        Gtk.AccelGroup accel_group = ui.get_accel_group();
-        if (accel_group != null)
-            add_accel_group(accel_group);
-        
         set_screen(AppWindow.get_instance().get_screen());
         
         // Needed so fullscreen will occur on correct monitor in multi-monitor setups
@@ -58,7 +51,7 @@ public class FullscreenWindow : PageWindow {
         
         close_button.set_icon_name("view-restore");
         close_button.set_tooltip_text(_("Leave fullscreen"));
-        close_button.clicked.connect(on_close);
+        close_button.set_action_name ("win.LeaveFullscreen");
         
         toolbar = page.get_toolbar();
         toolbar.set_show_arrow(false);
@@ -101,6 +94,9 @@ public class FullscreenWindow : PageWindow {
 
         // Toolbar steals keyboard focus from page, put it back again
         page.grab_focus ();
+
+        // Do not show menubar in fullscreen
+        set_show_menubar (false);
     }
 
     public void disable_toolbar_dismissal() {
@@ -130,18 +126,6 @@ public class FullscreenWindow : PageWindow {
         
         return result;
     }
-    
-    private Gtk.ActionEntry[] create_actions() {
-        Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
-        
-        Gtk.ActionEntry leave_fullscreen = { "LeaveFullscreen", Resources.LEAVE_FULLSCREEN_LABEL,
-            TRANSLATABLE, "F11", TRANSLATABLE, on_close };
-        leave_fullscreen.label = Resources.LEAVE_FULLSCREEN_LABEL;
-        leave_fullscreen.tooltip = Resources.LEAVE_FULLSCREEN_LABEL;
-        actions += leave_fullscreen;
-
-        return actions;
-    }
 
     public override bool key_press_event(Gdk.EventKey event) {
         // check for an escape/abort 
@@ -289,9 +273,7 @@ public class FullscreenWindow : PageWindow {
 // subclass.  A subclass should set current_page to the user-visible Page for it to receive
 // various notifications.  It is the responsibility of the subclass to notify Pages when they're
 // switched to and from, and other aspects of the Page interface.
-public abstract class PageWindow : Gtk.Window {
-    protected Gtk.UIManager ui = new Gtk.UIManager();
-
+public abstract class PageWindow : Gtk.ApplicationWindow {
     private Page current_page = null;
     private int busy_counter = 0;
     
@@ -299,15 +281,12 @@ public abstract class PageWindow : Gtk.Window {
     }
     
     public PageWindow() {
+        Object (application: Application.get_instance().get_system_app ());
+
         // the current page needs to know when modifier keys are pressed
         add_events(Gdk.EventMask.KEY_PRESS_MASK | Gdk.EventMask.KEY_RELEASE_MASK
             | Gdk.EventMask.STRUCTURE_MASK);
-            
-        set_has_resize_grip(false);
-    }
-    
-    public Gtk.UIManager get_ui_manager() {
-        return ui;
+        set_show_menubar (true);
     }
     
     public Page? get_current_page() {
@@ -381,8 +360,10 @@ public abstract class PageWindow : Gtk.Window {
     public void set_busy_cursor() {
         if (busy_counter++ > 0)
             return;
-        
-        get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH));
+
+        var display = get_window ().get_display ();
+        var cursor = new Gdk.Cursor.for_display (display, Gdk.CursorType.WATCH);
+        get_window().set_cursor (cursor);
         spin_event_loop();
     }
     
@@ -394,7 +375,9 @@ public abstract class PageWindow : Gtk.Window {
             return;
         }
         
-        get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
+        var display = get_window ().get_display ();
+        var cursor = new Gdk.Cursor.for_display (display, Gdk.CursorType.LEFT_PTR);
+        get_window().set_cursor (cursor);
         spin_event_loop();
     }
     
@@ -416,14 +399,11 @@ public abstract class AppWindow : PageWindow {
     
     // the AppWindow maintains its own UI manager because the first UIManager an action group is
     // added to is the one that claims its accelerators
-    protected Gtk.ActionGroup[] common_action_groups;
     protected bool maximized = false;
     protected Dimensions dimensions;
     protected int pos_x = 0;
     protected int pos_y = 0;
     
-    private Gtk.ActionGroup common_action_group = new Gtk.ActionGroup("AppWindowGlobalActionGroup");
-    
     public AppWindow() {
         // although there are multiple AppWindow types, only one may exist per-process
         assert(instance == null);
@@ -454,18 +434,8 @@ public abstract class AppWindow : PageWindow {
         // UIManager.  In order to activate those accelerators, we need to create a dummy UI string
         // that lists all the common actions.  We build it on-the-fly from the actions associated
         // with each ActionGroup while we're adding the groups to the UIManager.
-        common_action_groups = create_common_action_groups();
-        foreach (Gtk.ActionGroup group in common_action_groups)
-            ui.insert_action_group(group, 0);
-        
-        try {
-            ui.add_ui_from_string(build_dummy_ui_string(common_action_groups), -1);
-        } catch (Error err) {
-            error("Unable to add AppWindow UI: %s", err.message);
-        }
-        
-        ui.ensure_update();
-        add_accel_group(ui.get_accel_group());
+
+        add_actions ();
         
         Gtk.CssProvider provider = new Gtk.CssProvider();
         try {
@@ -475,67 +445,20 @@ public abstract class AppWindow : PageWindow {
             debug("Unable to load custom CSS: %s", err.message);
         }
     }
-    
-    private Gtk.ActionEntry[] create_common_actions() {
-        Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
-        
-        Gtk.ActionEntry quit = { "CommonQuit", Resources.QUIT_LABEL, TRANSLATABLE, "<Ctrl>Q",
-            TRANSLATABLE, on_quit };
-        quit.label = Resources.QUIT_LABEL;
-        actions += quit;
-
-        Gtk.ActionEntry about = { "CommonAbout", Resources.ABOUT_LABEL, TRANSLATABLE, null,
-            TRANSLATABLE, on_about };
-        about.label = Resources.ABOUT_LABEL;
-        actions += about;
-
-        Gtk.ActionEntry fullscreen = { "CommonFullscreen", Resources.FULLSCREEN_LABEL,
-            TRANSLATABLE, "F11", TRANSLATABLE, on_fullscreen };
-        fullscreen.label = Resources.FULLSCREEN_LABEL;
-        actions += fullscreen;
-
-        Gtk.ActionEntry help_contents = { "CommonHelpContents", Resources.HELP_LABEL,
-            TRANSLATABLE, "F1", TRANSLATABLE, on_help_contents };
-        help_contents.label = _("_Contents");
-        actions += help_contents;
-        
-        Gtk.ActionEntry help_faq = { "CommonHelpFAQ", null, TRANSLATABLE, null, 
-            TRANSLATABLE, on_help_faq };
-        help_faq.label = _("_Frequently Asked Questions");
-        actions += help_faq;
-        
-        Gtk.ActionEntry help_report_problem = { "CommonHelpReportProblem", null, TRANSLATABLE, null, 
-            TRANSLATABLE, on_help_report_problem };
-        help_report_problem.label = _("_Report a Problem…");
-        actions += help_report_problem;
 
-        Gtk.ActionEntry undo = { "CommonUndo", Resources.UNDO_MENU, TRANSLATABLE, "<Ctrl>Z",
-            TRANSLATABLE, on_undo };
-        undo.label = Resources.UNDO_MENU;
-        actions += undo;
-        
-        Gtk.ActionEntry redo = { "CommonRedo", Resources.REDO_MENU, TRANSLATABLE, "<Ctrl><Shift>Z",
-            TRANSLATABLE, on_redo };
-        redo.label = Resources.REDO_MENU;
-        actions += redo;
+    private const GLib.ActionEntry[] common_actions = {
+        { "CommonQuit", on_quit },
+        { "CommonFullscreen", on_fullscreen },
+        { "CommonHelpContents", on_help_contents },
+        { "CommonHelpFAQ", on_help_faq },
+        { "CommonHelpReportProblem", on_help_report_problem },
+        { "CommonUndo", on_undo },
+        { "CommonRedo", on_redo },
+        { "CommonJumpToFile", on_jump_to_file },
+        { "CommonSelectAll", on_select_all },
+        { "CommonSelectNone", on_select_none }
+    };
 
-        Gtk.ActionEntry jump_to_file = { "CommonJumpToFile", Resources.JUMP_TO_FILE_MENU, TRANSLATABLE, 
-            "<Ctrl><Shift>M", TRANSLATABLE, on_jump_to_file };
-        jump_to_file.label = Resources.JUMP_TO_FILE_MENU;
-        actions += jump_to_file;
-        
-        Gtk.ActionEntry select_all = { "CommonSelectAll", Resources.SELECT_ALL_MENU, TRANSLATABLE,
-            "<Ctrl>A", TRANSLATABLE, on_select_all };
-        select_all.label = Resources.SELECT_ALL_MENU;
-        actions += select_all;
-        
-        Gtk.ActionEntry select_none = { "CommonSelectNone", null, null,
-            "<Ctrl><Shift>A", TRANSLATABLE, on_select_none };
-        actions += select_none;
-        
-        return actions;
-    }
-    
     protected abstract void on_fullscreen();
     
     public static bool has_instance() {
@@ -747,22 +670,10 @@ public abstract class AppWindow : PageWindow {
         sys_show_uri(get_window().get_screen(), url);
     }
     
-    protected virtual Gtk.ActionGroup[] create_common_action_groups() {
-        Gtk.ActionGroup[] groups = new Gtk.ActionGroup[0];
-        
-        common_action_group.add_actions(create_common_actions(), this);
-        groups += common_action_group;
-        
-        return groups;
-    }
-    
-    public Gtk.ActionGroup[] get_common_action_groups() {
-        return common_action_groups;
+    protected virtual void add_actions () {
+        this.add_action_entries (AppWindow.common_actions, this);
     }
-    
-    public virtual void replace_common_placeholders(Gtk.UIManager ui) {
-    }
-    
+
     public void go_fullscreen(Page page) {
         // if already fullscreen, use that
         if (fullscreen_window != null) {
@@ -801,34 +712,26 @@ public abstract class AppWindow : PageWindow {
         present();
     }
     
-    public Gtk.Action? get_common_action(string name) {
-        foreach (Gtk.ActionGroup group in common_action_groups) {
-            Gtk.Action? action = group.get_action(name);
-            if (action != null)
-                return action;
-        }
-        
-        warning("No common action found: %s", name);
-        
-        return null;
+    public GLib.Action? get_common_action(string name) {
+        return lookup_action (name);
     }
     
     public void set_common_action_sensitive(string name, bool sensitive) {
-        Gtk.Action? action = get_common_action(name);
+        var action = get_common_action(name) as GLib.SimpleAction;
         if (action != null)
-            action.sensitive = sensitive;
+            action.set_enabled (sensitive);
     }
     
     public void set_common_action_important(string name, bool important) {
-        Gtk.Action? action = get_common_action(name);
+        var action = get_common_action(name) as GLib.SimpleAction;
         if (action != null)
-            action.is_important = important;
+            action.set_enabled (sensitive);
     }
     
     public void set_common_action_visible(string name, bool visible) {
-        Gtk.Action? action = get_common_action(name);
+        var action = get_common_action(name) as GLib.SimpleAction;
         if (action != null)
-            action.visible = visible;
+            action.set_enabled (sensitive);
     }
     
     protected override void switched_pages(Page? old_page, Page? new_page) {
@@ -891,6 +794,7 @@ public abstract class AppWindow : PageWindow {
     
     private void decorate_command_manager_action(string name, string prefix,
         string default_explanation, CommandDescription? desc) {
+#if 0
         Gtk.Action? action = get_common_action(name);
         if (action == null)
             return;
@@ -904,6 +808,7 @@ public abstract class AppWindow : PageWindow {
             action.tooltip = default_explanation;
             action.sensitive = false;
         }
+#endif
     }
     
     public void decorate_undo_action() {
diff --git a/src/Application.c b/src/Application.c
index c043b63..7f33933 100644
--- a/src/Application.c
+++ b/src/Application.c
@@ -111,6 +111,7 @@ enum  {
 };
 void application_set_raw_thumbs_fix_required (Application* self, gboolean should_fixup);
 gboolean application_get_raw_thumbs_fix_required (Application* self);
+GtkApplication* application_get_system_app (Application* self);
 static Application* application_new (gboolean is_direct);
 static Application* application_construct (GType object_type, gboolean is_direct);
 void application_panic (Application* self);
@@ -124,6 +125,8 @@ Application* application_get_instance (void);
 void application_present_primary_instance (void);
 gboolean application_get_is_remote (void);
 gboolean application_get_is_direct (void);
+void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1);
+void application_set_menubar (GMenuModel* model);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
@@ -153,7 +156,7 @@ void application_set_raw_thumbs_fix_required (Application* self, gboolean should
 	_tmp0_ = should_fixup;
 #line 25 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->fixup_raw_thumbs = _tmp0_;
-#line 157 "Application.c"
+#line 160 "Application.c"
 }
 
 
@@ -168,30 +171,55 @@ gboolean application_get_raw_thumbs_fix_required (Application* self) {
 	result = _tmp0_;
 #line 29 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 172 "Application.c"
+#line 175 "Application.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 33 "/home/jens/Source/shotwell/src/Application.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 182 "Application.c"
+}
+
+
+GtkApplication* application_get_system_app (Application* self) {
+	GtkApplication* result = NULL;
+	GtkApplication* _tmp0_ = NULL;
+	GtkApplication* _tmp1_ = NULL;
+#line 32 "/home/jens/Source/shotwell/src/Application.vala"
+	g_return_val_if_fail (IS_APPLICATION (self), NULL);
+#line 33 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp0_ = self->priv->system_app;
+#line 33 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 33 "/home/jens/Source/shotwell/src/Application.vala"
+	result = _tmp1_;
+#line 33 "/home/jens/Source/shotwell/src/Application.vala"
+	return result;
+#line 200 "Application.c"
 }
 
 
 static gint _application_on_command_line_g_application_command_line (GApplication* _sender, GApplicationCommandLine* command_line, gpointer self) {
 	gint result;
 	result = application_on_command_line (command_line);
-#line 61 "/home/jens/Source/shotwell/src/Application.vala"
+#line 65 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 181 "Application.c"
+#line 209 "Application.c"
 }
 
 
 static void _application_on_activated_g_application_activate (GApplication* _sender, gpointer self) {
-#line 64 "/home/jens/Source/shotwell/src/Application.vala"
+#line 68 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 188 "Application.c"
+#line 216 "Application.c"
 }
 
 
 static void _application_on_activated_g_application_startup (GApplication* _sender, gpointer self) {
-#line 65 "/home/jens/Source/shotwell/src/Application.vala"
+#line 69 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 195 "Application.c"
+#line 223 "Application.c"
 }
 
 
@@ -203,102 +231,102 @@ static Application* application_construct (GType object_type, gboolean is_direct
 	GtkApplication* _tmp7_ = NULL;
 	GtkApplication* _tmp8_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 35 "/home/jens/Source/shotwell/src/Application.vala"
+#line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	self = (Application*) g_type_create_instance (object_type);
-#line 36 "/home/jens/Source/shotwell/src/Application.vala"
+#line 40 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = is_direct;
-#line 36 "/home/jens/Source/shotwell/src/Application.vala"
+#line 40 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 213 "Application.c"
+#line 241 "Application.c"
 		GtkApplication* _tmp1_ = NULL;
-#line 41 "/home/jens/Source/shotwell/src/Application.vala"
+#line 45 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp1_ = gtk_application_new ("org.yorba.shotwell-direct", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_NON_UNIQUE);
-#line 41 "/home/jens/Source/shotwell/src/Application.vala"
+#line 45 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (self->priv->system_app);
-#line 41 "/home/jens/Source/shotwell/src/Application.vala"
+#line 45 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->system_app = _tmp1_;
-#line 221 "Application.c"
+#line 249 "Application.c"
 	} else {
 		GtkApplication* _tmp2_ = NULL;
-#line 47 "/home/jens/Source/shotwell/src/Application.vala"
+#line 51 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = gtk_application_new ("org.yorba.shotwell", G_APPLICATION_HANDLES_OPEN | G_APPLICATION_HANDLES_COMMAND_LINE);
-#line 47 "/home/jens/Source/shotwell/src/Application.vala"
+#line 51 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (self->priv->system_app);
-#line 47 "/home/jens/Source/shotwell/src/Application.vala"
+#line 51 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->system_app = _tmp2_;
-#line 230 "Application.c"
+#line 258 "Application.c"
 	}
 	{
 		GtkApplication* _tmp3_ = NULL;
-#line 53 "/home/jens/Source/shotwell/src/Application.vala"
+#line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp3_ = self->priv->system_app;
-#line 53 "/home/jens/Source/shotwell/src/Application.vala"
+#line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		g_application_register (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_application_get_type (), GApplication), NULL, &_inner_error_);
-#line 53 "/home/jens/Source/shotwell/src/Application.vala"
+#line 57 "/home/jens/Source/shotwell/src/Application.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 240 "Application.c"
-			goto __catch560_g_error;
+#line 268 "Application.c"
+			goto __catch557_g_error;
 		}
 	}
-	goto __finally560;
-	__catch560_g_error:
+	goto __finally557;
+	__catch557_g_error:
 	{
 		GError* e = NULL;
-#line 52 "/home/jens/Source/shotwell/src/Application.vala"
+#line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		e = _inner_error_;
-#line 52 "/home/jens/Source/shotwell/src/Application.vala"
+#line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		_inner_error_ = NULL;
-#line 55 "/home/jens/Source/shotwell/src/Application.vala"
+#line 59 "/home/jens/Source/shotwell/src/Application.vala"
 		application_panic (self);
-#line 52 "/home/jens/Source/shotwell/src/Application.vala"
+#line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_error_free0 (e);
-#line 256 "Application.c"
+#line 284 "Application.c"
 	}
-	__finally560:
-#line 52 "/home/jens/Source/shotwell/src/Application.vala"
+	__finally557:
+#line 56 "/home/jens/Source/shotwell/src/Application.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 52 "/home/jens/Source/shotwell/src/Application.vala"
+#line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 52 "/home/jens/Source/shotwell/src/Application.vala"
+#line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		g_clear_error (&_inner_error_);
-#line 52 "/home/jens/Source/shotwell/src/Application.vala"
+#line 56 "/home/jens/Source/shotwell/src/Application.vala"
 		return NULL;
-#line 267 "Application.c"
+#line 295 "Application.c"
 	}
-#line 58 "/home/jens/Source/shotwell/src/Application.vala"
+#line 62 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = is_direct;
-#line 58 "/home/jens/Source/shotwell/src/Application.vala"
+#line 62 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->direct = _tmp4_;
-#line 60 "/home/jens/Source/shotwell/src/Application.vala"
+#line 64 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp5_ = self->priv->direct;
-#line 60 "/home/jens/Source/shotwell/src/Application.vala"
+#line 64 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp5_) {
-#line 277 "Application.c"
+#line 305 "Application.c"
 		GtkApplication* _tmp6_ = NULL;
-#line 61 "/home/jens/Source/shotwell/src/Application.vala"
+#line 65 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp6_ = self->priv->system_app;
-#line 61 "/home/jens/Source/shotwell/src/Application.vala"
+#line 65 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_application_get_type (), GApplication), "command-line", (GCallback) _application_on_command_line_g_application_command_line, NULL);
-#line 283 "Application.c"
+#line 311 "Application.c"
 	}
-#line 64 "/home/jens/Source/shotwell/src/Application.vala"
+#line 68 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7_ = self->priv->system_app;
-#line 64 "/home/jens/Source/shotwell/src/Application.vala"
+#line 68 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, g_application_get_type (), GApplication), "activate", (GCallback) _application_on_activated_g_application_activate, NULL);
-#line 65 "/home/jens/Source/shotwell/src/Application.vala"
+#line 69 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp8_ = self->priv->system_app;
-#line 65 "/home/jens/Source/shotwell/src/Application.vala"
+#line 69 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_application_get_type (), GApplication), "startup", (GCallback) _application_on_activated_g_application_startup, NULL);
-#line 35 "/home/jens/Source/shotwell/src/Application.vala"
+#line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	return self;
-#line 295 "Application.c"
+#line 323 "Application.c"
 }
 
 
 static Application* application_new (gboolean is_direct) {
-#line 35 "/home/jens/Source/shotwell/src/Application.vala"
+#line 39 "/home/jens/Source/shotwell/src/Application.vala"
 	return application_construct (TYPE_APPLICATION, is_direct);
-#line 302 "Application.c"
+#line 330 "Application.c"
 }
 
 
@@ -313,21 +341,21 @@ void application_send_to_primary_instance (gchar** argv, int argv_length1) {
 	GtkApplication* _tmp2_ = NULL;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 74 "/home/jens/Source/shotwell/src/Application.vala"
+#line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
-#line 74 "/home/jens/Source/shotwell/src/Application.vala"
+#line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = _tmp0_;
-#line 74 "/home/jens/Source/shotwell/src/Application.vala"
+#line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _tmp1_->priv->system_app;
-#line 74 "/home/jens/Source/shotwell/src/Application.vala"
+#line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = argv;
-#line 74 "/home/jens/Source/shotwell/src/Application.vala"
+#line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3__length1 = argv_length1;
-#line 74 "/home/jens/Source/shotwell/src/Application.vala"
+#line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	g_application_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication), _tmp3__length1, _tmp3_);
-#line 74 "/home/jens/Source/shotwell/src/Application.vala"
+#line 78 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 331 "Application.c"
+#line 359 "Application.c"
 }
 
 
@@ -340,17 +368,17 @@ void application_present_primary_instance (void) {
 	Application* _tmp0_ = NULL;
 	Application* _tmp1_ = NULL;
 	GtkApplication* _tmp2_ = NULL;
-#line 83 "/home/jens/Source/shotwell/src/Application.vala"
+#line 87 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
-#line 83 "/home/jens/Source/shotwell/src/Application.vala"
+#line 87 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = _tmp0_;
-#line 83 "/home/jens/Source/shotwell/src/Application.vala"
+#line 87 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _tmp1_->priv->system_app;
-#line 83 "/home/jens/Source/shotwell/src/Application.vala"
+#line 87 "/home/jens/Source/shotwell/src/Application.vala"
 	g_application_activate (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication));
-#line 83 "/home/jens/Source/shotwell/src/Application.vala"
+#line 87 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 354 "Application.c"
+#line 382 "Application.c"
 }
 
 
@@ -361,23 +389,23 @@ gboolean application_get_is_remote (void) {
 	GtkApplication* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 87 "/home/jens/Source/shotwell/src/Application.vala"
+#line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
-#line 87 "/home/jens/Source/shotwell/src/Application.vala"
+#line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = _tmp0_;
-#line 87 "/home/jens/Source/shotwell/src/Application.vala"
+#line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _tmp1_->priv->system_app;
-#line 87 "/home/jens/Source/shotwell/src/Application.vala"
+#line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = g_application_get_is_remote (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_application_get_type (), GApplication));
-#line 87 "/home/jens/Source/shotwell/src/Application.vala"
+#line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = _tmp3_;
-#line 87 "/home/jens/Source/shotwell/src/Application.vala"
+#line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 87 "/home/jens/Source/shotwell/src/Application.vala"
+#line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp4_;
-#line 87 "/home/jens/Source/shotwell/src/Application.vala"
+#line 91 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 381 "Application.c"
+#line 409 "Application.c"
 }
 
 
@@ -387,21 +415,73 @@ gboolean application_get_is_direct (void) {
 	Application* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 91 "/home/jens/Source/shotwell/src/Application.vala"
+#line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
-#line 91 "/home/jens/Source/shotwell/src/Application.vala"
+#line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = _tmp0_;
-#line 91 "/home/jens/Source/shotwell/src/Application.vala"
+#line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _tmp1_->priv->direct;
-#line 91 "/home/jens/Source/shotwell/src/Application.vala"
+#line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = _tmp2_;
-#line 91 "/home/jens/Source/shotwell/src/Application.vala"
+#line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 91 "/home/jens/Source/shotwell/src/Application.vala"
+#line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp3_;
-#line 91 "/home/jens/Source/shotwell/src/Application.vala"
+#line 95 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 405 "Application.c"
+#line 433 "Application.c"
+}
+
+
+void application_set_accels_for_action (const gchar* action, gchar** accel, int accel_length1) {
+	Application* _tmp0_ = NULL;
+	Application* _tmp1_ = NULL;
+	GtkApplication* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	gchar** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+#line 98 "/home/jens/Source/shotwell/src/Application.vala"
+	g_return_if_fail (action != NULL);
+#line 99 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp0_ = application_get_instance ();
+#line 99 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp1_ = _tmp0_;
+#line 99 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp2_ = _tmp1_->priv->system_app;
+#line 99 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp3_ = action;
+#line 99 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp4_ = accel;
+#line 99 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp4__length1 = accel_length1;
+#line 99 "/home/jens/Source/shotwell/src/Application.vala"
+	gtk_application_set_accels_for_action (_tmp2_, _tmp3_, _tmp4_);
+#line 99 "/home/jens/Source/shotwell/src/Application.vala"
+	_application_unref0 (_tmp1_);
+#line 462 "Application.c"
+}
+
+
+void application_set_menubar (GMenuModel* model) {
+	Application* _tmp0_ = NULL;
+	Application* _tmp1_ = NULL;
+	GtkApplication* _tmp2_ = NULL;
+	GMenuModel* _tmp3_ = NULL;
+#line 102 "/home/jens/Source/shotwell/src/Application.vala"
+	g_return_if_fail ((model == NULL) || G_IS_MENU_MODEL (model));
+#line 103 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp0_ = application_get_instance ();
+#line 103 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp1_ = _tmp0_;
+#line 103 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp2_ = _tmp1_->priv->system_app;
+#line 103 "/home/jens/Source/shotwell/src/Application.vala"
+	_tmp3_ = model;
+#line 103 "/home/jens/Source/shotwell/src/Application.vala"
+	gtk_application_set_menubar (_tmp2_, _tmp3_);
+#line 103 "/home/jens/Source/shotwell/src/Application.vala"
+	_application_unref0 (_tmp1_);
+#line 485 "Application.c"
 }
 
 
@@ -421,58 +501,58 @@ void application_on_activated (void) {
 	LibraryWindow* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	LibraryWindow* _tmp5_ = NULL;
-#line 103 "/home/jens/Source/shotwell/src/Application.vala"
+#line 115 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
-#line 103 "/home/jens/Source/shotwell/src/Application.vala"
+#line 115 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = _tmp0_;
-#line 103 "/home/jens/Source/shotwell/src/Application.vala"
+#line 115 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 105 "/home/jens/Source/shotwell/src/Application.vala"
+#line 117 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 105 "/home/jens/Source/shotwell/src/Application.vala"
+#line 117 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_LIBRARY_WINDOW) ? ((LibraryWindow*) _tmp2_) : NULL;
-#line 105 "/home/jens/Source/shotwell/src/Application.vala"
+#line 117 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp3_ == NULL) {
-#line 105 "/home/jens/Source/shotwell/src/Application.vala"
+#line 117 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (_tmp2_);
-#line 439 "Application.c"
+#line 519 "Application.c"
 	}
-#line 105 "/home/jens/Source/shotwell/src/Application.vala"
+#line 117 "/home/jens/Source/shotwell/src/Application.vala"
 	lw = _tmp3_;
-#line 106 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp5_ = lw;
-#line 106 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp5_ != NULL) {
-#line 447 "Application.c"
+#line 527 "Application.c"
 		gboolean _tmp6_ = FALSE;
-#line 106 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp6_ = application_get_is_direct ();
-#line 106 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = !_tmp6_;
-#line 453 "Application.c"
+#line 533 "Application.c"
 	} else {
-#line 106 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = FALSE;
-#line 457 "Application.c"
+#line 537 "Application.c"
 	}
-#line 106 "/home/jens/Source/shotwell/src/Application.vala"
+#line 118 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp4_) {
-#line 461 "Application.c"
+#line 541 "Application.c"
 		LibraryWindow* _tmp7_ = NULL;
 		LibraryWindow* _tmp8_ = NULL;
-#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp7_ = library_window_get_app ();
-#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp8_ = _tmp7_;
-#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow));
-#line 107 "/home/jens/Source/shotwell/src/Application.vala"
+#line 119 "/home/jens/Source/shotwell/src/Application.vala"
 		_g_object_unref0 (_tmp8_);
-#line 472 "Application.c"
+#line 552 "Application.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/Application.vala"
+#line 114 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (lw);
-#line 476 "Application.c"
+#line 556 "Application.c"
 }
 
 
@@ -494,101 +574,101 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
 	gint _argv_size_ = 0;
 	gchar** _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 119 "/home/jens/Source/shotwell/src/Application.vala"
+#line 131 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (G_IS_APPLICATION_COMMAND_LINE (acl), 0);
-#line 120 "/home/jens/Source/shotwell/src/Application.vala"
+#line 132 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = acl;
-#line 120 "/home/jens/Source/shotwell/src/Application.vala"
+#line 132 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = g_application_command_line_get_arguments (_tmp0_, &_tmp1_);
-#line 120 "/home/jens/Source/shotwell/src/Application.vala"
+#line 132 "/home/jens/Source/shotwell/src/Application.vala"
 	argv = _tmp2_;
-#line 120 "/home/jens/Source/shotwell/src/Application.vala"
+#line 132 "/home/jens/Source/shotwell/src/Application.vala"
 	argv_length1 = _tmp1_;
-#line 120 "/home/jens/Source/shotwell/src/Application.vala"
+#line 132 "/home/jens/Source/shotwell/src/Application.vala"
 	_argv_size_ = argv_length1;
-#line 122 "/home/jens/Source/shotwell/src/Application.vala"
+#line 134 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = argv;
-#line 122 "/home/jens/Source/shotwell/src/Application.vala"
+#line 134 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3__length1 = argv_length1;
-#line 122 "/home/jens/Source/shotwell/src/Application.vala"
+#line 134 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp3_ != NULL) {
-#line 516 "Application.c"
+#line 596 "Application.c"
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 123 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4_ = argv;
-#line 123 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp4__length1 = argv_length1;
-#line 523 "Application.c"
+#line 603 "Application.c"
 		{
 			gchar** s_collection = NULL;
 			gint s_collection_length1 = 0;
 			gint _s_collection_size_ = 0;
 			gint s_it = 0;
-#line 123 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 			s_collection = _tmp4_;
-#line 123 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 			s_collection_length1 = _tmp4__length1;
-#line 123 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 			for (s_it = 0; s_it < _tmp4__length1; s_it = s_it + 1) {
-#line 535 "Application.c"
+#line 615 "Application.c"
 				gchar* _tmp5_ = NULL;
 				gchar* s = NULL;
-#line 123 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 				_tmp5_ = g_strdup (s_collection[s_it]);
-#line 123 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 				s = _tmp5_;
-#line 542 "Application.c"
+#line 622 "Application.c"
 				{
 					LibraryWindow* lw = NULL;
 					AppWindow* _tmp6_ = NULL;
 					LibraryWindow* _tmp7_ = NULL;
 					LibraryWindow* _tmp8_ = NULL;
-#line 124 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp6_ = app_window_get_instance ();
-#line 124 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_LIBRARY_WINDOW) ? ((LibraryWindow*) _tmp6_) : NULL;
-#line 124 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 					if (_tmp7_ == NULL) {
-#line 124 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 						_g_object_unref0 (_tmp6_);
-#line 556 "Application.c"
+#line 636 "Application.c"
 					}
-#line 124 "/home/jens/Source/shotwell/src/Application.vala"
+#line 136 "/home/jens/Source/shotwell/src/Application.vala"
 					lw = _tmp7_;
-#line 125 "/home/jens/Source/shotwell/src/Application.vala"
+#line 137 "/home/jens/Source/shotwell/src/Application.vala"
 					_tmp8_ = lw;
-#line 125 "/home/jens/Source/shotwell/src/Application.vala"
+#line 137 "/home/jens/Source/shotwell/src/Application.vala"
 					if (_tmp8_ != NULL) {
-#line 564 "Application.c"
+#line 644 "Application.c"
 						LibraryWindow* _tmp9_ = NULL;
 						const gchar* _tmp10_ = NULL;
-#line 126 "/home/jens/Source/shotwell/src/Application.vala"
+#line 138 "/home/jens/Source/shotwell/src/Application.vala"
 						_tmp9_ = lw;
-#line 126 "/home/jens/Source/shotwell/src/Application.vala"
+#line 138 "/home/jens/Source/shotwell/src/Application.vala"
 						_tmp10_ = s;
-#line 126 "/home/jens/Source/shotwell/src/Application.vala"
+#line 138 "/home/jens/Source/shotwell/src/Application.vala"
 						library_window_mounted_camera_shell_notification (_tmp9_, _tmp10_, FALSE);
-#line 573 "Application.c"
+#line 653 "Application.c"
 					}
-#line 123 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 					_g_object_unref0 (lw);
-#line 123 "/home/jens/Source/shotwell/src/Application.vala"
+#line 135 "/home/jens/Source/shotwell/src/Application.vala"
 					_g_free0 (s);
-#line 579 "Application.c"
+#line 659 "Application.c"
 				}
 			}
 		}
 	}
-#line 130 "/home/jens/Source/shotwell/src/Application.vala"
+#line 142 "/home/jens/Source/shotwell/src/Application.vala"
 	application_on_activated ();
-#line 131 "/home/jens/Source/shotwell/src/Application.vala"
+#line 143 "/home/jens/Source/shotwell/src/Application.vala"
 	result = 0;
-#line 131 "/home/jens/Source/shotwell/src/Application.vala"
+#line 143 "/home/jens/Source/shotwell/src/Application.vala"
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 131 "/home/jens/Source/shotwell/src/Application.vala"
+#line 143 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 592 "Application.c"
+#line 672 "Application.c"
 }
 
 
@@ -605,22 +685,22 @@ gint application_on_command_line (GApplicationCommandLine* acl) {
      */
 void application_init (gboolean is_direct) {
 	Application* _tmp0_ = NULL;
-#line 146 "/home/jens/Source/shotwell/src/Application.vala"
+#line 158 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_instance;
-#line 146 "/home/jens/Source/shotwell/src/Application.vala"
+#line 158 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_ == NULL) {
-#line 613 "Application.c"
+#line 693 "Application.c"
 		gboolean _tmp1_ = FALSE;
 		Application* _tmp2_ = NULL;
-#line 147 "/home/jens/Source/shotwell/src/Application.vala"
+#line 159 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp1_ = is_direct;
-#line 147 "/home/jens/Source/shotwell/src/Application.vala"
+#line 159 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = application_new (_tmp1_);
-#line 147 "/home/jens/Source/shotwell/src/Application.vala"
+#line 159 "/home/jens/Source/shotwell/src/Application.vala"
 		_application_unref0 (application_instance);
-#line 147 "/home/jens/Source/shotwell/src/Application.vala"
+#line 159 "/home/jens/Source/shotwell/src/Application.vala"
 		application_instance = _tmp2_;
-#line 624 "Application.c"
+#line 704 "Application.c"
 	}
 }
 
@@ -628,22 +708,22 @@ void application_init (gboolean is_direct) {
 void application_terminate (void) {
 	Application* _tmp0_ = NULL;
 	Application* _tmp1_ = NULL;
-#line 151 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_get_instance ();
-#line 151 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = _tmp0_;
-#line 151 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 	application_exit (_tmp1_);
-#line 151 "/home/jens/Source/shotwell/src/Application.vala"
+#line 163 "/home/jens/Source/shotwell/src/Application.vala"
 	_application_unref0 (_tmp1_);
-#line 640 "Application.c"
+#line 720 "Application.c"
 }
 
 
 static gpointer _application_ref0 (gpointer self) {
-#line 157 "/home/jens/Source/shotwell/src/Application.vala"
+#line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	return self ? application_ref (self) : NULL;
-#line 647 "Application.c"
+#line 727 "Application.c"
 }
 
 
@@ -652,19 +732,19 @@ Application* application_get_instance (void) {
 	Application* _tmp0_ = NULL;
 	Application* _tmp1_ = NULL;
 	Application* _tmp2_ = NULL;
-#line 155 "/home/jens/Source/shotwell/src/Application.vala"
+#line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = application_instance;
-#line 155 "/home/jens/Source/shotwell/src/Application.vala"
+#line 167 "/home/jens/Source/shotwell/src/Application.vala"
 	_vala_assert (_tmp0_ != NULL, "instance != null");
-#line 157 "/home/jens/Source/shotwell/src/Application.vala"
+#line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = application_instance;
-#line 157 "/home/jens/Source/shotwell/src/Application.vala"
+#line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _application_ref0 (_tmp1_);
-#line 157 "/home/jens/Source/shotwell/src/Application.vala"
+#line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp2_;
-#line 157 "/home/jens/Source/shotwell/src/Application.vala"
+#line 169 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 668 "Application.c"
+#line 748 "Application.c"
 }
 
 
@@ -684,78 +764,78 @@ void application_start (Application* self, gchar** argv, int argv_length1) {
 	guint _tmp13_ = 0U;
 	GtkApplication* _tmp14_ = NULL;
 	guint _tmp15_ = 0U;
-#line 160 "/home/jens/Source/shotwell/src/Application.vala"
+#line 172 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 161 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->running;
-#line 161 "/home/jens/Source/shotwell/src/Application.vala"
+#line 173 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 162 "/home/jens/Source/shotwell/src/Application.vala"
+#line 174 "/home/jens/Source/shotwell/src/Application.vala"
 		return;
-#line 696 "Application.c"
+#line 776 "Application.c"
 	}
-#line 164 "/home/jens/Source/shotwell/src/Application.vala"
+#line 176 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = TRUE;
-#line 166 "/home/jens/Source/shotwell/src/Application.vala"
+#line 178 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_emit_by_name (self, "starting");
-#line 168 "/home/jens/Source/shotwell/src/Application.vala"
+#line 180 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 168 "/home/jens/Source/shotwell/src/Application.vala"
+#line 180 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _tmp1_;
-#line 168 "/home/jens/Source/shotwell/src/Application.vala"
+#line 180 "/home/jens/Source/shotwell/src/Application.vala"
 	_vala_assert (_tmp2_ != NULL, "AppWindow.get_instance() != null");
-#line 168 "/home/jens/Source/shotwell/src/Application.vala"
+#line 180 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (_tmp2_);
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 181 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = self->priv->system_app;
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 181 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 181 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp5_ = _tmp4_;
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 181 "/home/jens/Source/shotwell/src/Application.vala"
 	gtk_application_add_window (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 169 "/home/jens/Source/shotwell/src/Application.vala"
+#line 181 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (_tmp5_);
-#line 170 "/home/jens/Source/shotwell/src/Application.vala"
+#line 182 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp6_ = self->priv->system_app;
-#line 170 "/home/jens/Source/shotwell/src/Application.vala"
+#line 182 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7_ = argv;
-#line 170 "/home/jens/Source/shotwell/src/Application.vala"
+#line 182 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp7__length1 = argv_length1;
-#line 170 "/home/jens/Source/shotwell/src/Application.vala"
+#line 182 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp8_ = g_application_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, g_application_get_type (), GApplication), _tmp7__length1, _tmp7_);
-#line 170 "/home/jens/Source/shotwell/src/Application.vala"
+#line 182 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->system_app_run_retval = _tmp8_;
-#line 172 "/home/jens/Source/shotwell/src/Application.vala"
+#line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp9_ = self->priv->direct;
-#line 172 "/home/jens/Source/shotwell/src/Application.vala"
+#line 184 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp9_) {
-#line 734 "Application.c"
+#line 814 "Application.c"
 		GtkApplication* _tmp10_ = NULL;
 		guint _tmp11_ = 0U;
-#line 173 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp10_ = self->priv->system_app;
-#line 173 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_parse_name ("command-line", g_application_get_type (), &_tmp11_, NULL, FALSE);
-#line 173 "/home/jens/Source/shotwell/src/Application.vala"
+#line 185 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _application_on_command_line_g_application_command_line, NULL);
-#line 743 "Application.c"
+#line 823 "Application.c"
 	}
-#line 176 "/home/jens/Source/shotwell/src/Application.vala"
+#line 188 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp12_ = self->priv->system_app;
-#line 176 "/home/jens/Source/shotwell/src/Application.vala"
+#line 188 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_parse_name ("activate", g_application_get_type (), &_tmp13_, NULL, FALSE);
-#line 176 "/home/jens/Source/shotwell/src/Application.vala"
+#line 188 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _application_on_activated_g_application_activate, NULL);
-#line 177 "/home/jens/Source/shotwell/src/Application.vala"
+#line 189 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp14_ = self->priv->system_app;
-#line 177 "/home/jens/Source/shotwell/src/Application.vala"
+#line 189 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_parse_name ("startup", g_application_get_type (), &_tmp15_, NULL, FALSE);
-#line 177 "/home/jens/Source/shotwell/src/Application.vala"
+#line 189 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, g_application_get_type (), GApplication), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _application_on_activated_g_application_startup, NULL);
-#line 179 "/home/jens/Source/shotwell/src/Application.vala"
+#line 191 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = FALSE;
-#line 759 "Application.c"
+#line 839 "Application.c"
 }
 
 
@@ -763,58 +843,58 @@ void application_exit (Application* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GtkApplication* _tmp3_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/Application.vala"
+#line 194 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 197 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = self->priv->exiting_fired;
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 197 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp1_) {
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 197 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp0_ = TRUE;
-#line 775 "Application.c"
+#line 855 "Application.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 197 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp2_ = self->priv->running;
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 197 "/home/jens/Source/shotwell/src/Application.vala"
 		_tmp0_ = !_tmp2_;
-#line 782 "Application.c"
+#line 862 "Application.c"
 	}
-#line 185 "/home/jens/Source/shotwell/src/Application.vala"
+#line 197 "/home/jens/Source/shotwell/src/Application.vala"
 	if (_tmp0_) {
-#line 186 "/home/jens/Source/shotwell/src/Application.vala"
+#line 198 "/home/jens/Source/shotwell/src/Application.vala"
 		return;
-#line 788 "Application.c"
+#line 868 "Application.c"
 	}
-#line 188 "/home/jens/Source/shotwell/src/Application.vala"
+#line 200 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->exiting_fired = TRUE;
-#line 190 "/home/jens/Source/shotwell/src/Application.vala"
+#line 202 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_emit_by_name (self, "exiting", FALSE);
-#line 192 "/home/jens/Source/shotwell/src/Application.vala"
+#line 204 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = self->priv->system_app;
-#line 192 "/home/jens/Source/shotwell/src/Application.vala"
+#line 204 "/home/jens/Source/shotwell/src/Application.vala"
 	g_application_release (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_application_get_type (), GApplication));
-#line 798 "Application.c"
+#line 878 "Application.c"
 }
 
 
 void application_panic (Application* self) {
 	gboolean _tmp0_ = FALSE;
-#line 197 "/home/jens/Source/shotwell/src/Application.vala"
+#line 209 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 198 "/home/jens/Source/shotwell/src/Application.vala"
+#line 210 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->exiting_fired;
-#line 198 "/home/jens/Source/shotwell/src/Application.vala"
+#line 210 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!_tmp0_) {
-#line 199 "/home/jens/Source/shotwell/src/Application.vala"
+#line 211 "/home/jens/Source/shotwell/src/Application.vala"
 		self->priv->exiting_fired = TRUE;
-#line 200 "/home/jens/Source/shotwell/src/Application.vala"
+#line 212 "/home/jens/Source/shotwell/src/Application.vala"
 		g_signal_emit_by_name (self, "exiting", TRUE);
-#line 814 "Application.c"
+#line 894 "Application.c"
 	}
-#line 202 "/home/jens/Source/shotwell/src/Application.vala"
+#line 214 "/home/jens/Source/shotwell/src/Application.vala"
 	exit (1);
-#line 818 "Application.c"
+#line 898 "Application.c"
 }
 
 
@@ -834,29 +914,29 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c
 	const gchar* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	guint _tmp6_ = 0U;
-#line 212 "/home/jens/Source/shotwell/src/Application.vala"
+#line 224 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (IS_APPLICATION (self), 0U);
-#line 213 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->system_app;
-#line 213 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 213 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp2_ = _tmp1_;
-#line 213 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp3_ = what;
-#line 213 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp4_ = reason;
-#line 213 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp5_ = gtk_application_inhibit (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_window_get_type (), GtkWindow), _tmp3_, _tmp4_);
-#line 213 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp6_ = _tmp5_;
-#line 213 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (_tmp2_);
-#line 213 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp6_;
-#line 213 "/home/jens/Source/shotwell/src/Application.vala"
+#line 225 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 860 "Application.c"
+#line 940 "Application.c"
 }
 
 
@@ -867,30 +947,30 @@ guint application_inhibit (Application* self, GtkApplicationInhibitFlags what, c
 void application_uninhibit (Application* self, guint cookie) {
 	GtkApplication* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 220 "/home/jens/Source/shotwell/src/Application.vala"
+#line 232 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_if_fail (IS_APPLICATION (self));
-#line 221 "/home/jens/Source/shotwell/src/Application.vala"
+#line 233 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->system_app;
-#line 221 "/home/jens/Source/shotwell/src/Application.vala"
+#line 233 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp1_ = cookie;
-#line 221 "/home/jens/Source/shotwell/src/Application.vala"
+#line 233 "/home/jens/Source/shotwell/src/Application.vala"
 	gtk_application_uninhibit (_tmp0_, _tmp1_);
-#line 879 "Application.c"
+#line 959 "Application.c"
 }
 
 
 gint application_get_run_return_value (Application* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 224 "/home/jens/Source/shotwell/src/Application.vala"
+#line 236 "/home/jens/Source/shotwell/src/Application.vala"
 	g_return_val_if_fail (IS_APPLICATION (self), 0);
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	_tmp0_ = self->priv->system_app_run_retval;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	result = _tmp0_;
-#line 225 "/home/jens/Source/shotwell/src/Application.vala"
+#line 237 "/home/jens/Source/shotwell/src/Application.vala"
 	return result;
-#line 894 "Application.c"
+#line 974 "Application.c"
 }
 
 
@@ -909,7 +989,7 @@ static void application_real_init_done (Application* self) {
 static void value_application_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	value->data[0].v_pointer = NULL;
-#line 913 "Application.c"
+#line 993 "Application.c"
 }
 
 
@@ -918,7 +998,7 @@ static void value_application_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_unref (value->data[0].v_pointer);
-#line 922 "Application.c"
+#line 1002 "Application.c"
 	}
 }
 
@@ -928,11 +1008,11 @@ static void value_application_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		dest_value->data[0].v_pointer = application_ref (src_value->data[0].v_pointer);
-#line 932 "Application.c"
+#line 1012 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 936 "Application.c"
+#line 1016 "Application.c"
 	}
 }
 
@@ -940,37 +1020,37 @@ static void value_application_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_application_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return value->data[0].v_pointer;
-#line 944 "Application.c"
+#line 1024 "Application.c"
 }
 
 
 static gchar* value_application_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (collect_values[0].v_pointer) {
-#line 951 "Application.c"
+#line 1031 "Application.c"
 		Application* object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 958 "Application.c"
+#line 1038 "Application.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 962 "Application.c"
+#line 1042 "Application.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = application_ref (object);
-#line 966 "Application.c"
+#line 1046 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 970 "Application.c"
+#line 1050 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return NULL;
-#line 974 "Application.c"
+#line 1054 "Application.c"
 }
 
 
@@ -981,25 +1061,25 @@ static gchar* value_application_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 985 "Application.c"
+#line 1065 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		*object_p = NULL;
-#line 991 "Application.c"
+#line 1071 "Application.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		*object_p = value->data[0].v_pointer;
-#line 995 "Application.c"
+#line 1075 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		*object_p = application_ref (value->data[0].v_pointer);
-#line 999 "Application.c"
+#line 1079 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return NULL;
-#line 1003 "Application.c"
+#line 1083 "Application.c"
 }
 
 
@@ -1013,7 +1093,7 @@ GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return G_PARAM_SPEC (spec);
-#line 1017 "Application.c"
+#line 1097 "Application.c"
 }
 
 
@@ -1022,7 +1102,7 @@ gpointer value_get_application (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_APPLICATION), NULL);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return value->data[0].v_pointer;
-#line 1026 "Application.c"
+#line 1106 "Application.c"
 }
 
 
@@ -1042,17 +1122,17 @@ void value_set_application (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_ref (value->data[0].v_pointer);
-#line 1046 "Application.c"
+#line 1126 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1050 "Application.c"
+#line 1130 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_unref (old);
-#line 1056 "Application.c"
+#line 1136 "Application.c"
 	}
 }
 
@@ -1071,17 +1151,17 @@ void value_take_application (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = v_object;
-#line 1075 "Application.c"
+#line 1155 "Application.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		value->data[0].v_pointer = NULL;
-#line 1079 "Application.c"
+#line 1159 "Application.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		application_unref (old);
-#line 1085 "Application.c"
+#line 1165 "Application.c"
 	}
 }
 
@@ -1105,7 +1185,7 @@ static void application_class_init (ApplicationClass * klass) {
 	g_signal_new ("exiting", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, exiting), NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	g_signal_new ("init_done", TYPE_APPLICATION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ApplicationClass, init_done), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1109 "Application.c"
+#line 1189 "Application.c"
 }
 
 
@@ -1118,13 +1198,13 @@ static void application_instance_init (Application * self) {
 	self->priv->system_app_run_retval = 0;
 #line 22 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->fixup_raw_thumbs = FALSE;
-#line 32 "/home/jens/Source/shotwell/src/Application.vala"
+#line 36 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->running = FALSE;
-#line 33 "/home/jens/Source/shotwell/src/Application.vala"
+#line 37 "/home/jens/Source/shotwell/src/Application.vala"
 	self->priv->exiting_fired = FALSE;
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	self->ref_count = 1;
-#line 1128 "Application.c"
+#line 1208 "Application.c"
 }
 
 
@@ -1136,7 +1216,7 @@ static void application_finalize (Application* obj) {
 	g_signal_handlers_destroy (self);
 #line 9 "/home/jens/Source/shotwell/src/Application.vala"
 	_g_object_unref0 (self->priv->system_app);
-#line 1140 "Application.c"
+#line 1220 "Application.c"
 }
 
 
@@ -1161,7 +1241,7 @@ gpointer application_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 	return instance;
-#line 1165 "Application.c"
+#line 1245 "Application.c"
 }
 
 
@@ -1174,7 +1254,7 @@ void application_unref (gpointer instance) {
 		APPLICATION_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/Application.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1178 "Application.c"
+#line 1258 "Application.c"
 	}
 }
 
diff --git a/src/Application.vala b/src/Application.vala
index fe3e3e9..4a24fd4 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -29,6 +29,10 @@ public class Application {
         return fixup_raw_thumbs;
     }
 
+    public Gtk.Application get_system_app () {
+        return system_app;
+    }
+
     private bool running = false;
     private bool exiting_fired = false;
 
@@ -91,6 +95,14 @@ public class Application {
         return get_instance().direct;
     }
 
+    public static void set_accels_for_action (string action, string[] accel) {
+        get_instance().system_app.set_accels_for_action (action, accel);
+    }
+
+    public static void set_menubar (GLib.MenuModel? model) {
+        get_instance().system_app.set_menubar (model);
+    }
+
     /**
      * @brief Signal handler for GApplication's 'command-line' signal.
      *
diff --git a/src/BatchImport.c b/src/BatchImport.c
index 2e236c7..f8b107c 100644
--- a/src/BatchImport.c
+++ b/src/BatchImport.c
@@ -2124,9 +2124,9 @@ enum  {
 };
 static void work_sniffer_real_execute (BackgroundJob* base);
 static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GError** error);
-static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b);
+static gint __lambda10_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b);
 gint utf8_cs_compare (void* a, void* b);
-static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
+static gint ___lambda10__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
 void disassemble_filename (const gchar* basename, gchar** name, gchar** ext);
 gboolean is_string_empty (const gchar* s);
 gpointer photo_file_format_properties_ref (gpointer instance);
@@ -5770,14 +5770,14 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5773 "BatchImport.c"
-					goto __catch410_g_error;
+					goto __catch407_g_error;
 				}
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				filesize = _tmp11_;
 #line 5778 "BatchImport.c"
 			}
-			goto __finally410;
-			__catch410_g_error:
+			goto __finally407;
+			__catch407_g_error:
 			{
 				GError* err = NULL;
 				BatchImportResult* _tmp15_ = NULL;
@@ -5810,7 +5810,7 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 				_g_error_free0 (err);
 #line 5812 "BatchImport.c"
 			}
-			__finally410:
+			__finally407:
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8899,11 +8899,11 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 #line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8898 "BatchImport.c"
-						goto __catch411_g_error;
+						goto __catch408_g_error;
 					}
 				}
-				goto __finally411;
-				__catch411_g_error:
+				goto __finally408;
+				__catch408_g_error:
 				{
 					GError* e = NULL;
 					BackingPhotoRow* _tmp68_ = NULL;
@@ -8929,7 +8929,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 					_g_error_free0 (e);
 #line 8926 "BatchImport.c"
 				}
-				__finally411:
+				__finally408:
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9894,11 +9894,11 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 #line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9891 "BatchImport.c"
-					goto __catch412_g_error;
+					goto __catch409_g_error;
 				}
 			}
-			goto __finally412;
-			__catch412_g_error:
+			goto __finally409;
+			__catch409_g_error:
 			{
 				GError* err = NULL;
 				MediaSource* _tmp65_ = NULL;
@@ -9929,7 +9929,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				_g_error_free0 (err);
 #line 9924 "BatchImport.c"
 			}
-			__finally412:
+			__finally409:
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11766,7 +11766,7 @@ WorkSniffer* work_sniffer_new (BatchImport* owner, GeeIterable* jobs, Completion
 }
 
 
-static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) {
+static gint __lambda10_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b) {
 	gint result = 0;
 	FileToPrepare* file_a = NULL;
 	FileToPrepare* _tmp0_ = NULL;
@@ -11821,9 +11821,9 @@ static gint __lambda11_ (WorkSniffer* self, FileToPrepare* a, FileToPrepare* b)
 }
 
 
-static gint ___lambda11__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint ___lambda10__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
-	result = __lambda11_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b);
+	result = __lambda10_ ((WorkSniffer*) self, (FileToPrepare*) a, (FileToPrepare*) b);
 #line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	return result;
 #line 11823 "BatchImport.c"
@@ -11931,11 +11931,11 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 #line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 11927 "BatchImport.c"
-					goto __catch413_g_error;
+					goto __catch410_g_error;
 				}
 			}
-			goto __finally413;
-			__catch413_g_error:
+			goto __finally410;
+			__catch410_g_error:
 			{
 				GError* err = NULL;
 				BatchImportJob* _tmp17_ = NULL;
@@ -11976,7 +11976,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				_g_error_free0 (err);
 #line 11971 "BatchImport.c"
 			}
-			__finally413:
+			__finally410:
 #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12101,7 +12101,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 #line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	_tmp42_ = sorted;
 #line 1483 "/home/jens/Source/shotwell/src/BatchImport.vala"
-	gee_list_sort (_tmp42_, ___lambda11__gcompare_data_func, background_job_ref (self), background_job_unref);
+	gee_list_sort (_tmp42_, ___lambda10__gcompare_data_func, background_job_ref (self), background_job_unref);
 #line 12099 "BatchImport.c"
 	{
 		gint i = 0;
@@ -12676,11 +12676,11 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12672 "BatchImport.c"
-				goto __catch414_g_error;
+				goto __catch411_g_error;
 			}
 		}
-		goto __finally414;
-		__catch414_g_error:
+		goto __finally411;
+		__catch411_g_error:
 		{
 			GError* err = NULL;
 			BatchImportJob* _tmp26_ = NULL;
@@ -12724,7 +12724,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			_g_error_free0 (err);
 #line 12719 "BatchImport.c"
 		}
-		__finally414:
+		__finally411:
 #line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -13013,11 +13013,11 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 #line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 13009 "BatchImport.c"
-					goto __catch415_g_error;
+					goto __catch412_g_error;
 				}
 			}
-			goto __finally415;
-			__catch415_g_error:
+			goto __finally412;
+			__catch412_g_error:
 			{
 				GError* err = NULL;
 				BatchImportJob* _tmp24_ = NULL;
@@ -13061,7 +13061,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 				_g_error_free0 (err);
 #line 13056 "BatchImport.c"
 			}
-			__finally415:
+			__finally412:
 #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14580,7 +14580,7 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 14576 "BatchImport.c"
-			goto __catch416_g_error;
+			goto __catch413_g_error;
 		}
 #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp0_) {
@@ -14635,8 +14635,8 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 #line 14629 "BatchImport.c"
 		}
 	}
-	goto __finally416;
-	__catch416_g_error:
+	goto __finally413;
+	__catch413_g_error:
 	{
 		GError* err = NULL;
 		BatchImportJob* _tmp12_ = NULL;
@@ -14697,7 +14697,7 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 		return result;
 #line 14692 "BatchImport.c"
 	}
-	__finally416:
+	__finally413:
 #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14953,7 +14953,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 #line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 14949 "BatchImport.c"
-			goto __catch417_g_error;
+			goto __catch414_g_error;
 		}
 #line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp20_ = _tmp17_;
@@ -14967,8 +14967,8 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		_g_free0 (_tmp17_);
 #line 14962 "BatchImport.c"
 	}
-	goto __finally417;
-	__catch417_g_error:
+	goto __finally414;
+	__catch414_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp21_ = NULL;
@@ -15024,7 +15024,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		return result;
 #line 15019 "BatchImport.c"
 	}
-	__finally417:
+	__finally414:
 #line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15135,7 +15135,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 #line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 15131 "BatchImport.c"
-				goto __catch418_g_error;
+				goto __catch415_g_error;
 			}
 #line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = _tmp41_;
@@ -15149,8 +15149,8 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			_media_metadata_unref0 (_tmp41_);
 #line 15144 "BatchImport.c"
 		}
-		goto __finally418;
-		__catch418_g_error:
+		goto __finally415;
+		__catch415_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp45_ = NULL;
@@ -15181,7 +15181,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			_g_error_free0 (err);
 #line 15175 "BatchImport.c"
 		}
-		__finally418:
+		__finally415:
 #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15374,14 +15374,14 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 15369 "BatchImport.c"
-			goto __catch419_g_error;
+			goto __catch416_g_error;
 		}
 #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		filesize = _tmp69_;
 #line 15374 "BatchImport.c"
 	}
-	goto __finally419;
-	__catch419_g_error:
+	goto __finally416;
+	__catch416_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp75_ = NULL;
@@ -15437,7 +15437,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		return result;
 #line 15431 "BatchImport.c"
 	}
-	__finally419:
+	__finally416:
 #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15832,11 +15832,11 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 #line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 15827 "BatchImport.c"
-				goto __catch420_g_error;
+				goto __catch417_g_error;
 			}
 		}
-		goto __finally420;
-		__catch420_g_error:
+		goto __finally417;
+		__catch417_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp9_ = NULL;
@@ -15867,7 +15867,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 			_g_error_free0 (err);
 #line 15860 "BatchImport.c"
 		}
-		__finally420:
+		__finally417:
 #line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16384,7 +16384,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 #line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 16378 "BatchImport.c"
-				goto __catch421_g_error;
+				goto __catch418_g_error;
 			}
 #line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = _tmp10_;
@@ -16481,7 +16481,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 #line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_tmp10_);
 #line 16475 "BatchImport.c"
-					goto __catch421_g_error;
+					goto __catch418_g_error;
 				}
 #line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp34_ = _tmp30_;
@@ -16499,8 +16499,8 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_g_object_unref0 (_tmp10_);
 #line 16492 "BatchImport.c"
 		}
-		goto __finally421;
-		__catch421_g_error:
+		goto __finally418;
+		__catch418_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp35_ = NULL;
@@ -16591,7 +16591,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			return;
 #line 16584 "BatchImport.c"
 		}
-		__finally421:
+		__finally418:
 #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16778,11 +16778,11 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 #line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 16772 "BatchImport.c"
-				goto __catch422_g_error;
+				goto __catch419_g_error;
 			}
 		}
-		goto __finally422;
-		__catch422_g_error:
+		goto __finally419;
+		__catch419_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp91_ = NULL;
@@ -16812,7 +16812,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_g_error_free0 (err);
 #line 16805 "BatchImport.c"
 		}
-		__finally422:
+		__finally419:
 #line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -17393,7 +17393,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 #line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 17387 "BatchImport.c"
-			goto __catch423_g_error;
+			goto __catch420_g_error;
 		}
 #line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->completed_import_source;
@@ -17403,8 +17403,8 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		_tmp5_->result = IMPORT_RESULT_SUCCESS;
 #line 17396 "BatchImport.c"
 	}
-	goto __finally423;
-	__catch423_g_error:
+	goto __finally420;
+	__catch420_g_error:
 	{
 		GError* err = NULL;
 		CompletedImportObject* _tmp6_ = NULL;
@@ -17429,7 +17429,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 17422 "BatchImport.c"
 	}
-	__finally423:
+	__finally420:
 #line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
diff --git a/src/CheckerboardLayout.c b/src/CheckerboardLayout.c
index 6b44df3..17f79b6 100644
--- a/src/CheckerboardLayout.c
+++ b/src/CheckerboardLayout.c
@@ -1422,7 +1422,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1425 "CheckerboardLayout.c"
-				goto __catch242_g_regex_error;
+				goto __catch239_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1447,7 +1447,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1450 "CheckerboardLayout.c"
-				goto __catch242_g_regex_error;
+				goto __catch239_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -1473,8 +1473,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 1475 "CheckerboardLayout.c"
 	}
-	goto __finally242;
-	__catch242_g_regex_error:
+	goto __finally239;
+	__catch239_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1487,7 +1487,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 1489 "CheckerboardLayout.c"
 	}
-	__finally242:
+	__finally239:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
diff --git a/src/CollectionPage.c b/src/CollectionPage.c
index b310b4c..07170e5 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -14,10 +14,10 @@
 #include <string.h>
 #include <gee.h>
 #include <gdk/gdk.h>
+#include <gio/gio.h>
 #include <float.h>
 #include <math.h>
 #include <glib/gi18n-lib.h>
-#include <gio/gio.h>
 #include <time.h>
 
 
@@ -311,6 +311,16 @@ typedef struct _MediaPageZoomSliderAssembly MediaPageZoomSliderAssembly;
 typedef struct _MediaPageZoomSliderAssemblyClass MediaPageZoomSliderAssemblyClass;
 #define _injection_group_unref0(var) ((var == NULL) ? NULL : (var = (injection_group_unref (var), NULL)))
 
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
 #define TYPE_THUMBNAIL_SOURCE (thumbnail_source_get_type ())
 #define THUMBNAIL_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_THUMBNAIL_SOURCE, ThumbnailSource))
 #define THUMBNAIL_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_THUMBNAIL_SOURCE, ThumbnailSourceClass))
@@ -416,16 +426,6 @@ typedef struct _MediaSourceItemClass MediaSourceItemClass;
 typedef struct _Thumbnail Thumbnail;
 typedef struct _ThumbnailClass ThumbnailClass;
 
-#define TYPE_APP_WINDOW (app_window_get_type ())
-#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
-#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
-#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
-#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
-#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
-
-typedef struct _AppWindow AppWindow;
-typedef struct _AppWindowClass AppWindowClass;
-
 #define TYPE_LIBRARY_WINDOW (library_window_get_type ())
 #define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow))
 #define LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
@@ -744,7 +744,7 @@ struct _CollectionViewManagerPrivate {
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -754,8 +754,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -763,10 +761,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -878,13 +874,13 @@ struct _MediaPageClass {
 	void (*on_move_to_trash) (MediaPage* self);
 	void (*on_edit_title) (MediaPage* self);
 	void (*on_edit_comment) (MediaPage* self);
-	void (*on_display_titles) (MediaPage* self, GtkAction* action);
-	void (*on_display_comments) (MediaPage* self, GtkAction* action);
-	void (*on_display_ratings) (MediaPage* self, GtkAction* action);
-	void (*on_display_tags) (MediaPage* self, GtkAction* action);
+	void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by);
 	void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by);
-	void (*on_sort_changed) (MediaPage* self);
+	void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*developer_changed) (MediaPage* self, RawDeveloper rd);
 	DataView* (*create_thumbnail) (MediaPage* self, DataSource* source);
 };
@@ -1099,6 +1095,38 @@ enum  {
 CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void);
 CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_construct (GType object_type);
 #define COLLECTION_PAGE_DESKTOP_SLIDESHOW_TRANSITION_SEC 2.0
+static void collection_page_on_print (CollectionPage* self);
+static void _collection_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void collection_page_on_publish (CollectionPage* self);
+static void _collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void collection_page_on_rotate_clockwise (CollectionPage* self);
+static void _collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void collection_page_on_rotate_counterclockwise (CollectionPage* self);
+static void _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void collection_page_on_flip_horizontally (CollectionPage* self);
+static void _collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void collection_page_on_flip_vertically (CollectionPage* self);
+static void _collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void collection_page_on_enhance (CollectionPage* self);
+static void _collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void collection_page_on_copy_adjustments (CollectionPage* self);
+static void _collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void collection_page_on_paste_adjustments (CollectionPage* self);
+static void _collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void collection_page_on_revert (CollectionPage* self);
+static void _collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void collection_page_on_set_background (CollectionPage* self);
+static void _collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void collection_page_on_duplicate_photo (CollectionPage* self);
+static void _collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void collection_page_on_adjust_date_time (CollectionPage* self);
+static void _collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void collection_page_on_external_edit (CollectionPage* self);
+static void _collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void collection_page_on_external_edit_raw (CollectionPage* self);
+static void _collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void collection_page_on_slideshow (CollectionPage* self);
+static void _collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 CollectionPage* collection_page_construct (GType object_type, const gchar* page_name);
 MediaPage* media_page_construct (GType object_type, const gchar* page_name);
 gpointer data_collection_ref (gpointer instance);
@@ -1134,7 +1162,7 @@ void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* sl
 static InjectionGroup* collection_page_create_file_menu_injectables (void);
 InjectionGroup* injection_group_new (const gchar* path);
 InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
-void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action);
+void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
 void injection_group_add_separator (InjectionGroup* self);
 static InjectionGroup* collection_page_create_edit_menu_injectables (void);
 static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (void);
@@ -1143,96 +1171,18 @@ static InjectionGroup* collection_page_create_photos_menu_date_injectables (void
 static InjectionGroup* collection_page_create_photos_menu_externals_injectables (void);
 static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static GtkActionEntry* collection_page_real_init_collect_action_entries (Page* base, int* result_length1);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-#define RESOURCES_PRINT_LABEL _ ("_Print")
-#define TRANSLATABLE "translatable"
-static void collection_page_on_print (CollectionPage* self);
-static void _collection_page_on_print_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PRINT_MENU _ ("_Print…")
-static void _vala_array_add171 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_PUBLISH "applications-internet"
-static void collection_page_on_publish (CollectionPage* self);
-static void _collection_page_on_publish_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PUBLISH_MENU _ ("Pu_blish…")
-#define RESOURCES_PUBLISH_TOOLTIP _ ("Publish to various websites")
-static void _vala_array_add172 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_CLOCKWISE "object-rotate-right"
-static void collection_page_on_rotate_clockwise (CollectionPage* self);
-static void _collection_page_on_rotate_clockwise_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ROTATE_CW_MENU _ ("Rotate _Right")
-#define RESOURCES_ROTATE_CW_TOOLTIP _ ("Rotate the photos right (press Ctrl to rotate left)")
-static void _vala_array_add173 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_COUNTERCLOCKWISE "object-rotate-left"
-static void collection_page_on_rotate_counterclockwise (CollectionPage* self);
-static void _collection_page_on_rotate_counterclockwise_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ROTATE_CCW_MENU _ ("Rotate _Left")
-#define RESOURCES_ROTATE_CCW_TOOLTIP _ ("Rotate the photos left")
-static void _vala_array_add174 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_HFLIP "object-flip-horizontal"
-static void collection_page_on_flip_horizontally (CollectionPage* self);
-static void _collection_page_on_flip_horizontally_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_HFLIP_MENU _ ("Flip Hori_zontally")
-static void _vala_array_add175 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_VFLIP "object-flip-vertical"
-static void collection_page_on_flip_vertically (CollectionPage* self);
-static void _collection_page_on_flip_vertically_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_VFLIP_MENU _ ("Flip Verti_cally")
-static void _vala_array_add176 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ENHANCE "shotwell-auto-enhance"
-static void collection_page_on_enhance (CollectionPage* self);
-static void _collection_page_on_enhance_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ENHANCE_MENU _ ("_Enhance")
-#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance")
-static void _vala_array_add177 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void collection_page_on_copy_adjustments (CollectionPage* self);
-static void _collection_page_on_copy_adjustments_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_COPY_ADJUSTMENTS_MENU _ ("_Copy Color Adjustments")
-#define RESOURCES_COPY_ADJUSTMENTS_TOOLTIP _ ("Copy the color adjustments applied to the photo")
-static void _vala_array_add178 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void collection_page_on_paste_adjustments (CollectionPage* self);
-static void _collection_page_on_paste_adjustments_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PASTE_ADJUSTMENTS_MENU _ ("_Paste Color Adjustments")
-#define RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP _ ("Apply copied color adjustments to the selected photos")
-static void _vala_array_add179 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void collection_page_on_revert (CollectionPage* self);
-static void _collection_page_on_revert_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_REVERT_MENU _ ("Re_vert to Original")
-static void _vala_array_add180 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void collection_page_on_set_background (CollectionPage* self);
-static void _collection_page_on_set_background_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_SET_BACKGROUND_MENU _ ("Set as _Desktop Background")
-#define RESOURCES_SET_BACKGROUND_TOOLTIP _ ("Set selected image to be the new desktop background")
-static void _vala_array_add181 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void collection_page_on_duplicate_photo (CollectionPage* self);
-static void _collection_page_on_duplicate_photo_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_DUPLICATE_PHOTO_MENU _ ("_Duplicate")
-#define RESOURCES_DUPLICATE_PHOTO_TOOLTIP _ ("Make a duplicate of the photo")
-static void _vala_array_add182 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void collection_page_on_adjust_date_time (CollectionPage* self);
-static void _collection_page_on_adjust_date_time_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time…")
-static void _vala_array_add183 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_EDIT_LABEL _ ("_Edit")
-static void collection_page_on_external_edit (CollectionPage* self);
-static void _collection_page_on_external_edit_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EXTERNAL_EDIT_MENU _ ("Open With E_xternal Editor")
-static void _vala_array_add184 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void collection_page_on_external_edit_raw (CollectionPage* self);
-static void _collection_page_on_external_edit_raw_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EXTERNAL_EDIT_RAW_MENU _ ("Open With RA_W Editor")
-static void _vala_array_add185 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void collection_page_on_slideshow (CollectionPage* self);
-static void _collection_page_on_slideshow_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add186 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void collection_page_real_add_actions (Page* base);
+void page_add_actions (Page* self);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 static InjectionGroup** collection_page_real_init_collect_injection_groups (Page* base, int* result_length1);
 InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1);
-static void _vala_array_add187 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add188 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add189 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add190 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add191 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add192 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add76 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add77 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add78 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add79 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add80 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add81 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
 static gboolean collection_page_selection_has_video (CollectionPage* self);
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType media_source_get_type (void) G_GNUC_CONST;
@@ -1250,6 +1200,7 @@ void page_set_action_short_label (Page* self, const gchar* name, const gchar* sh
 #define RESOURCES_PUBLISH_LABEL _ ("Publish")
 void page_set_action_important (Page* self, const gchar* name, gboolean important);
 static void collection_page_real_update_actions (Page* base, gint selected_count, gint count);
+Page* page_window_get_current_page (PageWindow* self);
 void page_update_actions (Page* self, gint selected_count, gint count);
 DataView* view_collection_get_selected_at (ViewCollection* self, gint index);
 DataSource* data_view_get_source (DataView* self);
@@ -1267,8 +1218,6 @@ gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self);
 static gboolean collection_page_can_revert_selected (CollectionPage* self);
 gboolean photo_has_color_adjustments (Photo* self);
 gboolean pixel_transformation_bundle_has_copied_color_adjustments (void);
-GtkAction* page_get_action (Page* self, const gchar* name);
-#define RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU _ ("Set as _Desktop Slideshow…")
 gboolean data_view_is_selected (DataView* self);
 gboolean alteration_has_subject (Alteration* self, const gchar* subject);
 GType library_photo_get_type (void) G_GNUC_CONST;
@@ -1289,7 +1238,6 @@ GType thumbnail_get_type (void) G_GNUC_CONST;
 MediaSource* thumbnail_get_media_source (Thumbnail* self);
 void media_page_on_play_video (MediaPage* self);
 gchar* data_object_to_string (DataObject* self);
-GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
 void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* controller, Photo* current);
@@ -1322,7 +1270,6 @@ void scaling_free (Scaling* self);
 void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result);
 GFile* export_ui_choose_file (const gchar* current_file_basename);
 gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params);
-AppWindow* app_window_get_instance (void);
 void page_window_set_busy_cursor (PageWindow* self);
 void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error);
 PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params);
@@ -1344,6 +1291,7 @@ GType rotate_multiple_command_get_type (void) G_GNUC_CONST;
 GeeList* view_collection_get_selected (ViewCollection* self);
 GType rotation_get_type (void) G_GNUC_CONST;
 #define RESOURCES_ROTATE_CW_FULL_LABEL _ ("Rotate Right")
+#define RESOURCES_ROTATE_CW_TOOLTIP _ ("Rotate the photos right (press Ctrl to rotate left)")
 RotateMultipleCommand* rotate_multiple_command_new (GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text);
 RotateMultipleCommand* rotate_multiple_command_construct (GType object_type, GeeIterable* iter, Rotation rotation, const gchar* name, const gchar* explanation, const gchar* progress_text, const gchar* undo_progress_text);
 gpointer command_manager_ref (gpointer instance);
@@ -1357,6 +1305,7 @@ CommandManager* page_get_command_manager (Page* self);
 void command_manager_execute (CommandManager* self, Command* command);
 void publishing_ui_publishing_dialog_go (GeeCollection* to_publish);
 #define RESOURCES_ROTATE_CCW_FULL_LABEL _ ("Rotate Left")
+#define RESOURCES_ROTATE_CCW_TOOLTIP _ ("Rotate the photos left")
 #define RESOURCES_HFLIP_LABEL _ ("Flip Horizontally")
 #define RESOURCES_VFLIP_LABEL _ ("Flip Vertically")
 gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos);
@@ -1377,6 +1326,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self);
 PixelTransformationBundle* pixel_transformation_bundle_get_copied_color_adjustments (void);
 GType adjust_colors_multiple_command_get_type (void) G_GNUC_CONST;
 #define RESOURCES_PASTE_ADJUSTMENTS_LABEL _ ("Paste Color Adjustments")
+#define RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP _ ("Apply copied color adjustments to the selected photos")
 AdjustColorsMultipleCommand* adjust_colors_multiple_command_new (GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
 AdjustColorsMultipleCommand* adjust_colors_multiple_command_construct (GType object_type, GeeIterable* iter, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
 GType enhance_multiple_command_get_type (void) G_GNUC_CONST;
@@ -1443,11 +1393,12 @@ static void collection_page_finalize (GObject* obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
+static const GActionEntry COLLECTION_PAGE_entries[16] = {{"Print", _collection_page_on_print_gsimple_action_activate_callback}, {"Publish", _collection_page_on_publish_gsimple_action_activate_callback}, {"RotateClockwise", _collection_page_on_rotate_clockwise_gsimple_action_activate_callback}, {"RotateCounterclockwise", _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback}, {"FlipHorizontally", _collection_page_on_flip_horizontally_gsimple_action_activate_callback}, {"FlipVertically", _collection_page_on_flip_vertically_gsimple_action_activate_callback}, {"Enhance", _collection_page_on_enhance_gsimple_action_activate_callback}, {"CopyColorAdjustments", _collection_page_on_copy_adjustments_gsimple_action_activate_callback}, {"PasteColorAdjustments", _collection_page_on_paste_adjustments_gsimple_action_activate_callback}, {"Revert", _collection_page_on_revert_gsimple_action_activate_callback}, {"SetBackground", _collection_page_on_set_background_gsimple_action_activate_callback}, {"Duplicate", _collection_page_on_duplicate_photo_gsimple_action_activate_callback}, {"AdjustDateTime", _collection_page_on_adjust_date_time_gsimple_action_activate_callback}, {"ExternalEdit", _collection_page_on_external_edit_gsimple_action_activate_callback}, {"ExternalEditRAW", _collection_page_on_external_edit_raw_gsimple_action_activate_callback}, {"Slideshow", _collection_page_on_slideshow_gsimple_action_activate_callback}};
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 11 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1451 "CollectionPage.c"
+#line 1402 "CollectionPage.c"
 }
 
 
@@ -1469,14 +1420,14 @@ CollectionViewManager* collection_view_manager_construct (GType object_type, Col
 	self->priv->page = _tmp1_;
 #line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self;
-#line 1473 "CollectionPage.c"
+#line 1424 "CollectionPage.c"
 }
 
 
 CollectionViewManager* collection_view_manager_new (CollectionPage* page) {
 #line 10 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return collection_view_manager_construct (TYPE_COLLECTION_VIEW_MANAGER, page);
-#line 1480 "CollectionPage.c"
+#line 1431 "CollectionPage.c"
 }
 
 
@@ -1500,7 +1451,7 @@ static DataView* collection_view_manager_real_create_view (ViewManager* base, Da
 	result = _tmp2_;
 #line 15 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1504 "CollectionPage.c"
+#line 1455 "CollectionPage.c"
 }
 
 
@@ -1513,14 +1464,14 @@ static void collection_view_manager_class_init (CollectionViewManagerClass * kla
 	g_type_class_add_private (klass, sizeof (CollectionViewManagerPrivate));
 #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	((ViewManagerClass *) klass)->create_view = collection_view_manager_real_create_view;
-#line 1517 "CollectionPage.c"
+#line 1468 "CollectionPage.c"
 }
 
 
 static void collection_view_manager_instance_init (CollectionViewManager * self) {
 #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv = COLLECTION_VIEW_MANAGER_GET_PRIVATE (self);
-#line 1524 "CollectionPage.c"
+#line 1475 "CollectionPage.c"
 }
 
 
@@ -1532,7 +1483,7 @@ static void collection_view_manager_finalize (ViewManager* obj) {
 	_g_object_unref0 (self->priv->page);
 #line 7 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	VIEW_MANAGER_CLASS (collection_view_manager_parent_class)->finalize (obj);
-#line 1536 "CollectionPage.c"
+#line 1487 "CollectionPage.c"
 }
 
 
@@ -1548,17 +1499,129 @@ GType collection_view_manager_get_type (void) {
 }
 
 
+static void _collection_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_print ((CollectionPage*) self);
+#line 1506 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_publish ((CollectionPage*) self);
+#line 1513 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_rotate_clockwise ((CollectionPage*) self);
+#line 1520 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_rotate_counterclockwise ((CollectionPage*) self);
+#line 1527 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_flip_horizontally ((CollectionPage*) self);
+#line 1534 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_flip_vertically ((CollectionPage*) self);
+#line 1541 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_enhance ((CollectionPage*) self);
+#line 1548 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_copy_adjustments ((CollectionPage*) self);
+#line 1555 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_paste_adjustments ((CollectionPage*) self);
+#line 1562 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_revert ((CollectionPage*) self);
+#line 1569 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_set_background ((CollectionPage*) self);
+#line 1576 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_duplicate_photo ((CollectionPage*) self);
+#line 1583 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_adjust_date_time ((CollectionPage*) self);
+#line 1590 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_external_edit ((CollectionPage*) self);
+#line 1597 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_external_edit_raw ((CollectionPage*) self);
+#line 1604 "CollectionPage.c"
+}
+
+
+static void _collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	collection_page_on_slideshow ((CollectionPage*) self);
+#line 1611 "CollectionPage.c"
+}
+
+
 static void _collection_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_photos_altered ((CollectionPage*) self, items);
-#line 1555 "CollectionPage.c"
+#line 1618 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) {
 #line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_external_app_changed ((CollectionPage*) self);
-#line 1562 "CollectionPage.c"
+#line 1625 "CollectionPage.c"
 }
 
 
@@ -1584,9 +1647,9 @@ CollectionPage* collection_page_construct (GType object_type, const gchar* page_
 #line 35 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
 #line 37 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/CollectionContextMenu");
+	checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "CollectionContextMenu");
 #line 38 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_init_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "/CollectionToolbar");
+	page_init_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CollectionToolbar");
 #line 40 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 43 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1599,7 +1662,7 @@ CollectionPage* collection_page_construct (GType object_type, const gchar* page_
 	_g_object_unref0 (_tmp4_);
 #line 32 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self;
-#line 1603 "CollectionPage.c"
+#line 1666 "CollectionPage.c"
 }
 
 
@@ -1615,7 +1678,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp0_ == NULL) {
-#line 1619 "CollectionPage.c"
+#line 1682 "CollectionPage.c"
 		GtkToolbar* _tmp1_ = NULL;
 		GtkToolbar* _tmp2_ = NULL;
 		GtkSeparatorToolItem* separator = NULL;
@@ -1716,7 +1779,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 		_g_object_unref0 (drawn_separator);
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (separator);
-#line 1720 "CollectionPage.c"
+#line 1783 "CollectionPage.c"
 	}
 #line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
@@ -1726,7 +1789,7 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 	result = _tmp21_;
 #line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1730 "CollectionPage.c"
+#line 1793 "CollectionPage.c"
 }
 
 
@@ -1734,25 +1797,37 @@ static InjectionGroup* collection_page_create_file_menu_injectables (void) {
 	InjectionGroup* result = NULL;
 	InjectionGroup* group = NULL;
 	InjectionGroup* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
 #line 72 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp0_ = injection_group_new ("/MenuBar/FileMenu/FileExtrasPlaceholder");
+	_tmp0_ = injection_group_new ("FileExtrasPlaceholder");
 #line 72 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
 #line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "Print", NULL);
+	_tmp1_ = _ ("_Print");
+#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp1_, "Print", "<Primary>p");
 #line 75 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
 #line 76 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "Publish", NULL);
+	_tmp2_ = _ ("_Publish");
+#line 76 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp2_, "Publish", "<Primary><Shift>p");
 #line 77 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "SendTo", NULL);
+	_tmp3_ = _ ("Send _To…");
+#line 77 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp3_, "SendTo", NULL);
+#line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp4_ = _ ("Set as _Desktop Background");
 #line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "SetBackground", NULL);
+	injection_group_add_menu_item (group, _tmp4_, "SetBackground", NULL);
 #line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
 #line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1756 "CollectionPage.c"
+#line 1831 "CollectionPage.c"
 }
 
 
@@ -1760,17 +1835,20 @@ static InjectionGroup* collection_page_create_edit_menu_injectables (void) {
 	InjectionGroup* result = NULL;
 	InjectionGroup* group = NULL;
 	InjectionGroup* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
 #line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp0_ = injection_group_new ("/MenuBar/EditMenu/EditExtrasPlaceholder");
+	_tmp0_ = injection_group_new ("EditExtrasPlaceholder");
 #line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
 #line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "Duplicate", NULL);
+	_tmp1_ = _ ("_Duplicate");
+#line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp1_, "Duplicate", "<Primary>D");
 #line 88 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
 #line 88 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1774 "CollectionPage.c"
+#line 1852 "CollectionPage.c"
 }
 
 
@@ -1778,21 +1856,27 @@ static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (
 	InjectionGroup* result = NULL;
 	InjectionGroup* group = NULL;
 	InjectionGroup* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
 #line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp0_ = injection_group_new ("/MenuBar/ViewMenu/ViewExtrasFullscreenSlideshowPlaceholder");
+	_tmp0_ = injection_group_new ("ViewExtrasFullscreenSlideshowPlaceholder");
 #line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
 #line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "Fullscreen", "CommonFullscreen");
+	_tmp1_ = _ ("Fullscreen");
+#line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp1_, "CommonFullscreen", "F11");
 #line 95 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
 #line 96 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "Slideshow", NULL);
+	_tmp2_ = _ ("S_lideshow");
+#line 96 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp2_, "Slideshow", "F5");
 #line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
 #line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1796 "CollectionPage.c"
+#line 1880 "CollectionPage.c"
 }
 
 
@@ -1800,35 +1884,59 @@ static InjectionGroup* collection_page_create_photos_menu_edits_injectables (voi
 	InjectionGroup* result = NULL;
 	InjectionGroup* group = NULL;
 	InjectionGroup* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	const gchar* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
 #line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp0_ = injection_group_new ("/MenuBar/PhotosMenu/PhotosExtrasEditsPlaceholder");
+	_tmp0_ = injection_group_new ("PhotosExtrasEditsPlaceholder");
 #line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
 #line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "RotateClockwise", NULL);
-#line 105 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "RotateCounterclockwise", NULL);
-#line 106 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "FlipHorizontally", NULL);
+	_tmp1_ = _ ("Rotate _Right");
+#line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp1_, "RotateClockwise", "<Primary>r");
 #line 107 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "FlipVertically", NULL);
-#line 108 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_separator (group);
-#line 109 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "Enhance", NULL);
+	_tmp2_ = _ ("Rotate _Left");
+#line 107 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp2_, "RotateCounterclockwise", "<Primary><Shift>r");
 #line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "Revert", NULL);
+	_tmp3_ = _ ("Flip Hori_zontally");
+#line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp3_, "FlipHorizontally", NULL);
 #line 111 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_separator (group);
+	_tmp4_ = _ ("Flip Verti_cally");
+#line 111 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp4_, "FlipVertically", NULL);
 #line 112 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "CopyColorAdjustments", NULL);
+	injection_group_add_separator (group);
+#line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp5_ = _ ("_Enhance");
 #line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "PasteColorAdjustments", NULL);
+	injection_group_add_menu_item (group, _tmp5_, "Enhance", NULL);
+#line 114 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp6_ = _ ("Re_vert to Original");
+#line 114 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp6_, "Revert", NULL);
 #line 115 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_separator (group);
+#line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp7_ = _ ("_Copy Color Adjustments");
+#line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp7_, "CopyColorAdjustments", "<Primary><Shift>c");
+#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp8_ = _ ("_Paste Color Adjustments");
+#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp8_, "PasteColorAdjustments", "<Primary><Shift>v");
+#line 123 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 115 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1832 "CollectionPage.c"
+#line 1940 "CollectionPage.c"
 }
 
 
@@ -1836,17 +1944,20 @@ static InjectionGroup* collection_page_create_photos_menu_date_injectables (void
 	InjectionGroup* result = NULL;
 	InjectionGroup* group = NULL;
 	InjectionGroup* _tmp0_ = NULL;
-#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp0_ = injection_group_new ("/MenuBar/PhotosMenu/PhotosExtrasDateTimePlaceholder");
-#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	const gchar* _tmp1_ = NULL;
+#line 127 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp0_ = injection_group_new ("PhotosExtrasDateTimePlaceholder");
+#line 127 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 121 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "AdjustDateTime", NULL);
-#line 123 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp1_ = _ ("Adjust Date and Time…");
+#line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp1_, "AdjustDateTime", NULL);
+#line 131 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 123 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1850 "CollectionPage.c"
+#line 1961 "CollectionPage.c"
 }
 
 
@@ -1854,21 +1965,30 @@ static InjectionGroup* collection_page_create_photos_menu_externals_injectables
 	InjectionGroup* result = NULL;
 	InjectionGroup* group = NULL;
 	InjectionGroup* _tmp0_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp0_ = injection_group_new ("/MenuBar/PhotosMenu/PhotosExtrasExternalsPlaceholder");
-#line 127 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+#line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp0_ = injection_group_new ("PhotosExtrasExternalsPlaceholder");
+#line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "ExternalEdit", NULL);
-#line 130 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "ExternalEditRAW", NULL);
-#line 131 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	injection_group_add_menu_item (group, "PlayVideo", NULL);
-#line 133 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp1_ = _ ("Open With E_xternal Editor");
+#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp1_, "ExternalEdit", "<Primary>Return");
+#line 140 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp2_ = _ ("Open With RA_W Editor");
+#line 140 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp2_, "ExternalEditRAW", "<Primary><Shift>Return");
+#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp3_ = _ ("_Play");
+#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	injection_group_add_menu_item (group, _tmp3_, "PlayVideo", "<Primary>Y");
+#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 133 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1872 "CollectionPage.c"
+#line 1992 "CollectionPage.c"
 }
 
 
@@ -1876,999 +1996,141 @@ static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList*
 	CollectionPage * self;
 	GeeList* _tmp0_ = NULL;
 	GeeList* _tmp1_ = NULL;
-#line 136 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 136 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = ui_filenames;
-#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	PAGE_CLASS (collection_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_);
-#line 139 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = ui_filenames;
-#line 139 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "collection.ui");
-#line 1892 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_print_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_print ((CollectionPage*) self);
-#line 1899 "CollectionPage.c"
-}
-
-
-static void _vala_array_add171 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1910 "CollectionPage.c"
-	}
-#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1914 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_publish_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 150 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_publish ((CollectionPage*) self);
-#line 1921 "CollectionPage.c"
-}
-
-
-static void _vala_array_add172 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1932 "CollectionPage.c"
-	}
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1936 "CollectionPage.c"
+#line 2012 "CollectionPage.c"
 }
 
 
-static void _collection_page_on_rotate_clockwise_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 156 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_rotate_clockwise ((CollectionPage*) self);
-#line 1943 "CollectionPage.c"
-}
-
-
-static void _vala_array_add173 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1954 "CollectionPage.c"
-	}
-#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1958 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_rotate_counterclockwise_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 162 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_rotate_counterclockwise ((CollectionPage*) self);
-#line 1965 "CollectionPage.c"
-}
-
-
-static void _vala_array_add174 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 166 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 166 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 166 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1976 "CollectionPage.c"
-	}
-#line 166 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1980 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_flip_horizontally_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 168 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_flip_horizontally ((CollectionPage*) self);
-#line 1987 "CollectionPage.c"
-}
-
-
-static void _vala_array_add175 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 171 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 171 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 171 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1998 "CollectionPage.c"
-	}
-#line 171 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2002 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_flip_vertically_gtk_action_callback (GtkAction* action, gpointer self) {
+static void collection_page_real_add_actions (Page* base) {
+	CollectionPage * self;
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
 #line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_flip_vertically ((CollectionPage*) self);
-#line 2009 "CollectionPage.c"
-}
-
-
-static void _vala_array_add176 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
+#line 174 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	PAGE_CLASS (collection_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page));
 #line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
+	_tmp0_ = app_window_get_instance ();
 #line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
+	_tmp1_ = _tmp0_;
 #line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2020 "CollectionPage.c"
-	}
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), COLLECTION_PAGE_entries, G_N_ELEMENTS (COLLECTION_PAGE_entries), self);
 #line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2024 "CollectionPage.c"
+	_g_object_unref0 (_tmp1_);
+#line 2032 "CollectionPage.c"
 }
 
 
-static void _collection_page_on_enhance_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 178 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_enhance ((CollectionPage*) self);
-#line 2031 "CollectionPage.c"
-}
-
-
-static void _vala_array_add177 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
+static void _vala_array_add76 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
 #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
 #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2042 "CollectionPage.c"
-	}
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2046 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_copy_adjustments_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_copy_adjustments ((CollectionPage*) self);
-#line 2053 "CollectionPage.c"
-}
-
-
-static void _vala_array_add178 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2064 "CollectionPage.c"
-	}
-#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2068 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_paste_adjustments_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_paste_adjustments ((CollectionPage*) self);
-#line 2075 "CollectionPage.c"
-}
-
-
-static void _vala_array_add179 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2086 "CollectionPage.c"
-	}
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2090 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_revert_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_revert ((CollectionPage*) self);
-#line 2097 "CollectionPage.c"
-}
-
-
-static void _vala_array_add180 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2108 "CollectionPage.c"
-	}
-#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2112 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_set_background_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_set_background ((CollectionPage*) self);
-#line 2119 "CollectionPage.c"
-}
-
-
-static void _vala_array_add181 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2130 "CollectionPage.c"
-	}
-#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2134 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_duplicate_photo_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_duplicate_photo ((CollectionPage*) self);
-#line 2141 "CollectionPage.c"
-}
-
-
-static void _vala_array_add182 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2152 "CollectionPage.c"
-	}
-#line 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2156 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_adjust_date_time_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_adjust_date_time ((CollectionPage*) self);
-#line 2163 "CollectionPage.c"
-}
-
-
-static void _vala_array_add183 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 216 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 216 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 216 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2174 "CollectionPage.c"
-	}
-#line 216 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2178 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_external_edit_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_external_edit ((CollectionPage*) self);
-#line 2185 "CollectionPage.c"
-}
-
-
-static void _vala_array_add184 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2196 "CollectionPage.c"
-	}
-#line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2200 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_external_edit_raw_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_external_edit_raw ((CollectionPage*) self);
-#line 2207 "CollectionPage.c"
-}
-
-
-static void _vala_array_add185 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2218 "CollectionPage.c"
-	}
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2222 "CollectionPage.c"
-}
-
-
-static void _collection_page_on_slideshow_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	collection_page_on_slideshow ((CollectionPage*) self);
-#line 2229 "CollectionPage.c"
-}
-
-
-static void _vala_array_add186 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2240 "CollectionPage.c"
-	}
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2244 "CollectionPage.c"
-}
-
-
-static GtkActionEntry* collection_page_real_init_collect_action_entries (Page* base, int* result_length1) {
-	CollectionPage * self;
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	gint _tmp0_ = 0;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry print = {0};
-	GtkActionEntry _tmp2_ = {0};
-	GtkActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkActionEntry _tmp4_ = {0};
-	GtkActionEntry publish = {0};
-	GtkActionEntry _tmp5_ = {0};
-	GtkActionEntry* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	GtkActionEntry _tmp7_ = {0};
-	GtkActionEntry rotate_right = {0};
-	GtkActionEntry _tmp8_ = {0};
-	GtkActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkActionEntry _tmp10_ = {0};
-	GtkActionEntry rotate_left = {0};
-	GtkActionEntry _tmp11_ = {0};
-	GtkActionEntry* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	GtkActionEntry _tmp13_ = {0};
-	GtkActionEntry hflip = {0};
-	GtkActionEntry _tmp14_ = {0};
-	GtkActionEntry* _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	GtkActionEntry _tmp16_ = {0};
-	GtkActionEntry vflip = {0};
-	GtkActionEntry _tmp17_ = {0};
-	GtkActionEntry* _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
-	GtkActionEntry _tmp19_ = {0};
-	GtkActionEntry enhance = {0};
-	GtkActionEntry _tmp20_ = {0};
-	GtkActionEntry* _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
-	GtkActionEntry _tmp22_ = {0};
-	GtkActionEntry copy_adjustments = {0};
-	GtkActionEntry _tmp23_ = {0};
-	GtkActionEntry* _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
-	GtkActionEntry _tmp25_ = {0};
-	GtkActionEntry paste_adjustments = {0};
-	GtkActionEntry _tmp26_ = {0};
-	GtkActionEntry* _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-	GtkActionEntry _tmp28_ = {0};
-	GtkActionEntry revert = {0};
-	GtkActionEntry _tmp29_ = {0};
-	GtkActionEntry* _tmp30_ = NULL;
-	gint _tmp30__length1 = 0;
-	GtkActionEntry _tmp31_ = {0};
-	GtkActionEntry set_background = {0};
-	GtkActionEntry _tmp32_ = {0};
-	GtkActionEntry* _tmp33_ = NULL;
-	gint _tmp33__length1 = 0;
-	GtkActionEntry _tmp34_ = {0};
-	GtkActionEntry duplicate = {0};
-	GtkActionEntry _tmp35_ = {0};
-	GtkActionEntry* _tmp36_ = NULL;
-	gint _tmp36__length1 = 0;
-	GtkActionEntry _tmp37_ = {0};
-	GtkActionEntry adjust_date_time = {0};
-	GtkActionEntry _tmp38_ = {0};
-	GtkActionEntry* _tmp39_ = NULL;
-	gint _tmp39__length1 = 0;
-	GtkActionEntry _tmp40_ = {0};
-	GtkActionEntry external_edit = {0};
-	GtkActionEntry _tmp41_ = {0};
-	GtkActionEntry* _tmp42_ = NULL;
-	gint _tmp42__length1 = 0;
-	GtkActionEntry _tmp43_ = {0};
-	GtkActionEntry edit_raw = {0};
-	GtkActionEntry _tmp44_ = {0};
-	GtkActionEntry* _tmp45_ = NULL;
-	gint _tmp45__length1 = 0;
-	GtkActionEntry _tmp46_ = {0};
-	GtkActionEntry slideshow = {0};
-	GtkActionEntry _tmp47_ = {0};
-	const gchar* _tmp48_ = NULL;
-	const gchar* _tmp49_ = NULL;
-	GtkActionEntry* _tmp50_ = NULL;
-	gint _tmp50__length1 = 0;
-	GtkActionEntry _tmp51_ = {0};
-	GtkActionEntry* _tmp52_ = NULL;
-	gint _tmp52__length1 = 0;
-#line 142 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp1_ = PAGE_CLASS (collection_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), &_tmp0_);
-#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	actions = _tmp1_;
-#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	actions_length1 = _tmp0_;
-#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_actions_size_ = actions_length1;
-#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp2_.name = "Print";
-#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp2_.stock_id = RESOURCES_PRINT_LABEL;
-#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp2_.accelerator = "<Ctrl>P";
-#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp2_.tooltip = TRANSLATABLE;
-#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp2_.callback = (GCallback) _collection_page_on_print_gtk_action_callback;
-#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	print = _tmp2_;
-#line 147 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	print.label = RESOURCES_PRINT_MENU;
-#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp3_ = actions;
-#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp3__length1 = actions_length1;
-#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp4_ = print;
-#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add171 (&actions, &actions_length1, &_actions_size_, &_tmp4_);
-#line 150 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp5_.name = "Publish";
-#line 150 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp5_.stock_id = RESOURCES_PUBLISH;
-#line 150 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 150 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp5_.accelerator = "<Ctrl><Shift>P";
-#line 150 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp5_.tooltip = TRANSLATABLE;
-#line 150 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp5_.callback = (GCallback) _collection_page_on_publish_gtk_action_callback;
-#line 150 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	publish = _tmp5_;
-#line 152 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	publish.label = RESOURCES_PUBLISH_MENU;
-#line 153 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	publish.tooltip = RESOURCES_PUBLISH_TOOLTIP;
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp6_ = actions;
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp6__length1 = actions_length1;
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp7_ = publish;
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add172 (&actions, &actions_length1, &_actions_size_, &_tmp7_);
-#line 156 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp8_.name = "RotateClockwise";
-#line 156 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp8_.stock_id = RESOURCES_CLOCKWISE;
-#line 156 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp8_.label = TRANSLATABLE;
-#line 156 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp8_.accelerator = "<Ctrl>R";
-#line 156 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp8_.tooltip = TRANSLATABLE;
-#line 156 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp8_.callback = (GCallback) _collection_page_on_rotate_clockwise_gtk_action_callback;
-#line 156 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	rotate_right = _tmp8_;
-#line 158 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	rotate_right.label = RESOURCES_ROTATE_CW_MENU;
-#line 159 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	rotate_right.tooltip = RESOURCES_ROTATE_CW_TOOLTIP;
-#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp9_ = actions;
-#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp9__length1 = actions_length1;
-#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp10_ = rotate_right;
-#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add173 (&actions, &actions_length1, &_actions_size_, &_tmp10_);
-#line 162 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp11_.name = "RotateCounterclockwise";
-#line 162 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp11_.stock_id = RESOURCES_COUNTERCLOCKWISE;
-#line 162 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp11_.label = TRANSLATABLE;
-#line 162 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp11_.accelerator = "<Ctrl><Shift>R";
-#line 162 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp11_.tooltip = TRANSLATABLE;
-#line 162 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp11_.callback = (GCallback) _collection_page_on_rotate_counterclockwise_gtk_action_callback;
-#line 162 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	rotate_left = _tmp11_;
-#line 164 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	rotate_left.label = RESOURCES_ROTATE_CCW_MENU;
-#line 165 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	rotate_left.tooltip = RESOURCES_ROTATE_CCW_TOOLTIP;
-#line 166 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp12_ = actions;
-#line 166 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp12__length1 = actions_length1;
-#line 166 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp13_ = rotate_left;
-#line 166 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add174 (&actions, &actions_length1, &_actions_size_, &_tmp13_);
-#line 168 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp14_.name = "FlipHorizontally";
-#line 168 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp14_.stock_id = RESOURCES_HFLIP;
-#line 168 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp14_.label = TRANSLATABLE;
-#line 168 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp14_.accelerator = NULL;
-#line 168 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp14_.tooltip = TRANSLATABLE;
-#line 168 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp14_.callback = (GCallback) _collection_page_on_flip_horizontally_gtk_action_callback;
-#line 168 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	hflip = _tmp14_;
-#line 170 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	hflip.label = RESOURCES_HFLIP_MENU;
-#line 171 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp15_ = actions;
-#line 171 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp15__length1 = actions_length1;
-#line 171 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp16_ = hflip;
-#line 171 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add175 (&actions, &actions_length1, &_actions_size_, &_tmp16_);
-#line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp17_.name = "FlipVertically";
-#line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp17_.stock_id = RESOURCES_VFLIP;
-#line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp17_.label = TRANSLATABLE;
-#line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp17_.accelerator = NULL;
-#line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp17_.tooltip = TRANSLATABLE;
-#line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp17_.callback = (GCallback) _collection_page_on_flip_vertically_gtk_action_callback;
-#line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	vflip = _tmp17_;
-#line 175 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	vflip.label = RESOURCES_VFLIP_MENU;
-#line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp18_ = actions;
-#line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp18__length1 = actions_length1;
-#line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp19_ = vflip;
-#line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add176 (&actions, &actions_length1, &_actions_size_, &_tmp19_);
-#line 178 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp20_.name = "Enhance";
-#line 178 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp20_.stock_id = RESOURCES_ENHANCE;
-#line 178 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp20_.label = TRANSLATABLE;
-#line 178 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp20_.accelerator = "<Ctrl>E";
-#line 178 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp20_.tooltip = TRANSLATABLE;
-#line 178 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp20_.callback = (GCallback) _collection_page_on_enhance_gtk_action_callback;
-#line 178 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	enhance = _tmp20_;
-#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	enhance.label = RESOURCES_ENHANCE_MENU;
-#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	enhance.tooltip = RESOURCES_ENHANCE_TOOLTIP;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp21_ = actions;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp21__length1 = actions_length1;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp22_ = enhance;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add177 (&actions, &actions_length1, &_actions_size_, &_tmp22_);
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp23_.name = "CopyColorAdjustments";
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp23_.stock_id = NULL;
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp23_.label = TRANSLATABLE;
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp23_.accelerator = "<Ctrl><Shift>C";
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp23_.tooltip = TRANSLATABLE;
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp23_.callback = (GCallback) _collection_page_on_copy_adjustments_gtk_action_callback;
-#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	copy_adjustments = _tmp23_;
-#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	copy_adjustments.label = RESOURCES_COPY_ADJUSTMENTS_MENU;
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	copy_adjustments.tooltip = RESOURCES_COPY_ADJUSTMENTS_TOOLTIP;
-#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp24_ = actions;
-#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp24__length1 = actions_length1;
-#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp25_ = copy_adjustments;
-#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add178 (&actions, &actions_length1, &_actions_size_, &_tmp25_);
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp26_.name = "PasteColorAdjustments";
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp26_.stock_id = NULL;
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp26_.label = TRANSLATABLE;
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp26_.accelerator = "<Ctrl><Shift>V";
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp26_.tooltip = TRANSLATABLE;
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp26_.callback = (GCallback) _collection_page_on_paste_adjustments_gtk_action_callback;
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	paste_adjustments = _tmp26_;
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	paste_adjustments.label = RESOURCES_PASTE_ADJUSTMENTS_MENU;
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	paste_adjustments.tooltip = RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp27_ = actions;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp27__length1 = actions_length1;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp28_ = paste_adjustments;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add179 (&actions, &actions_length1, &_actions_size_, &_tmp28_);
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp29_.name = "Revert";
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp29_.stock_id = NULL;
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp29_.label = TRANSLATABLE;
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp29_.accelerator = NULL;
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp29_.tooltip = TRANSLATABLE;
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp29_.callback = (GCallback) _collection_page_on_revert_gtk_action_callback;
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	revert = _tmp29_;
-#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	revert.label = RESOURCES_REVERT_MENU;
-#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp30_ = actions;
-#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp30__length1 = actions_length1;
-#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp31_ = revert;
-#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add180 (&actions, &actions_length1, &_actions_size_, &_tmp31_);
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp32_.name = "SetBackground";
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp32_.stock_id = NULL;
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp32_.label = TRANSLATABLE;
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp32_.accelerator = "<Ctrl>B";
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp32_.tooltip = TRANSLATABLE;
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp32_.callback = (GCallback) _collection_page_on_set_background_gtk_action_callback;
-#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	set_background = _tmp32_;
-#line 203 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	set_background.label = RESOURCES_SET_BACKGROUND_MENU;
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	set_background.tooltip = RESOURCES_SET_BACKGROUND_TOOLTIP;
-#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp33_ = actions;
-#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp33__length1 = actions_length1;
-#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp34_ = set_background;
-#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add181 (&actions, &actions_length1, &_actions_size_, &_tmp34_);
-#line 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp35_.name = "Duplicate";
-#line 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp35_.stock_id = NULL;
-#line 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp35_.label = TRANSLATABLE;
-#line 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp35_.accelerator = "<Ctrl>D";
-#line 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp35_.tooltip = TRANSLATABLE;
-#line 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp35_.callback = (GCallback) _collection_page_on_duplicate_photo_gtk_action_callback;
-#line 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	duplicate = _tmp35_;
-#line 209 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	duplicate.label = RESOURCES_DUPLICATE_PHOTO_MENU;
-#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	duplicate.tooltip = RESOURCES_DUPLICATE_PHOTO_TOOLTIP;
-#line 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp36_ = actions;
-#line 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp36__length1 = actions_length1;
-#line 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp37_ = duplicate;
-#line 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add182 (&actions, &actions_length1, &_actions_size_, &_tmp37_);
-#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp38_.name = "AdjustDateTime";
-#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp38_.stock_id = NULL;
-#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp38_.label = TRANSLATABLE;
-#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp38_.accelerator = NULL;
-#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp38_.tooltip = TRANSLATABLE;
-#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp38_.callback = (GCallback) _collection_page_on_adjust_date_time_gtk_action_callback;
-#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	adjust_date_time = _tmp38_;
-#line 215 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	adjust_date_time.label = RESOURCES_ADJUST_DATE_TIME_MENU;
-#line 216 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp39_ = actions;
-#line 216 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp39__length1 = actions_length1;
-#line 216 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp40_ = adjust_date_time;
-#line 216 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add183 (&actions, &actions_length1, &_actions_size_, &_tmp40_);
-#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp41_.name = "ExternalEdit";
-#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp41_.stock_id = RESOURCES_EDIT_LABEL;
-#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp41_.label = TRANSLATABLE;
-#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp41_.accelerator = "<Ctrl>Return";
-#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp41_.tooltip = TRANSLATABLE;
-#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp41_.callback = (GCallback) _collection_page_on_external_edit_gtk_action_callback;
-#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	external_edit = _tmp41_;
-#line 220 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	external_edit.label = RESOURCES_EXTERNAL_EDIT_MENU;
-#line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp42_ = actions;
-#line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp42__length1 = actions_length1;
-#line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp43_ = external_edit;
-#line 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add184 (&actions, &actions_length1, &_actions_size_, &_tmp43_);
-#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp44_.name = "ExternalEditRAW";
-#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp44_.stock_id = NULL;
-#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp44_.label = TRANSLATABLE;
-#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp44_.accelerator = "<Ctrl><Shift>Return";
-#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp44_.tooltip = TRANSLATABLE;
-#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp44_.callback = (GCallback) _collection_page_on_external_edit_raw_gtk_action_callback;
-#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	edit_raw = _tmp44_;
-#line 225 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	edit_raw.label = RESOURCES_EXTERNAL_EDIT_RAW_MENU;
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp45_ = actions;
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp45__length1 = actions_length1;
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp46_ = edit_raw;
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add185 (&actions, &actions_length1, &_actions_size_, &_tmp46_);
-#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp47_.name = "Slideshow";
-#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp47_.stock_id = NULL;
-#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp47_.label = TRANSLATABLE;
-#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp47_.accelerator = "F5";
-#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp47_.tooltip = TRANSLATABLE;
-#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp47_.callback = (GCallback) _collection_page_on_slideshow_gtk_action_callback;
-#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	slideshow = _tmp47_;
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp48_ = _ ("S_lideshow");
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	slideshow.label = _tmp48_;
-#line 231 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp49_ = _ ("Play a slideshow");
-#line 231 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	slideshow.tooltip = _tmp49_;
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp50_ = actions;
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp50__length1 = actions_length1;
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp51_ = slideshow;
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add186 (&actions, &actions_length1, &_actions_size_, &_tmp51_);
-#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp52_ = actions;
-#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp52__length1 = actions_length1;
-#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (result_length1) {
-#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*result_length1 = _tmp52__length1;
-#line 2764 "CollectionPage.c"
-	}
-#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	result = _tmp52_;
-#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	return result;
-#line 2770 "CollectionPage.c"
-}
-
-
-static void _vala_array_add187 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if ((*length) == (*size)) {
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2781 "CollectionPage.c"
+#line 2043 "CollectionPage.c"
 	}
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2787 "CollectionPage.c"
+#line 2049 "CollectionPage.c"
 }
 
 
-static void _vala_array_add188 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+static void _vala_array_add77 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2798 "CollectionPage.c"
+#line 2060 "CollectionPage.c"
 	}
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2804 "CollectionPage.c"
+#line 2066 "CollectionPage.c"
 }
 
 
-static void _vala_array_add189 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+static void _vala_array_add78 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2815 "CollectionPage.c"
+#line 2077 "CollectionPage.c"
 	}
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2821 "CollectionPage.c"
+#line 2083 "CollectionPage.c"
 }
 
 
-static void _vala_array_add190 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+static void _vala_array_add79 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2832 "CollectionPage.c"
+#line 2094 "CollectionPage.c"
 	}
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2838 "CollectionPage.c"
+#line 2100 "CollectionPage.c"
 }
 
 
-static void _vala_array_add191 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+static void _vala_array_add80 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2849 "CollectionPage.c"
+#line 2111 "CollectionPage.c"
 	}
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2855 "CollectionPage.c"
+#line 2117 "CollectionPage.c"
 }
 
 
-static void _vala_array_add192 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+static void _vala_array_add81 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2866 "CollectionPage.c"
+#line 2128 "CollectionPage.c"
 	}
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2872 "CollectionPage.c"
+#line 2134 "CollectionPage.c"
 }
 
 
@@ -2900,79 +2162,79 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 	InjectionGroup* _tmp13_ = NULL;
 	InjectionGroup** _tmp14_ = NULL;
 	gint _tmp14__length1 = 0;
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = PAGE_CLASS (collection_page_parent_class)->init_collect_injection_groups (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), &_tmp0_);
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	groups = _tmp1_;
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	groups_length1 = _tmp0_;
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_groups_size_ = groups_length1;
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = groups;
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2__length1 = groups_length1;
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = collection_page_create_file_menu_injectables ();
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add187 (&groups, &groups_length1, &_groups_size_, _tmp3_);
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_vala_array_add76 (&groups, &groups_length1, &_groups_size_, _tmp3_);
+#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = groups;
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4__length1 = groups_length1;
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = collection_page_create_edit_menu_injectables ();
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add188 (&groups, &groups_length1, &_groups_size_, _tmp5_);
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_vala_array_add77 (&groups, &groups_length1, &_groups_size_, _tmp5_);
+#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = groups;
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6__length1 = groups_length1;
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = collection_page_create_view_menu_fullscreen_injectables ();
-#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add189 (&groups, &groups_length1, &_groups_size_, _tmp7_);
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_vala_array_add78 (&groups, &groups_length1, &_groups_size_, _tmp7_);
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = groups;
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8__length1 = groups_length1;
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_create_photos_menu_edits_injectables ();
-#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add190 (&groups, &groups_length1, &_groups_size_, _tmp9_);
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_vala_array_add79 (&groups, &groups_length1, &_groups_size_, _tmp9_);
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = groups;
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10__length1 = groups_length1;
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = collection_page_create_photos_menu_date_injectables ();
-#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add191 (&groups, &groups_length1, &_groups_size_, _tmp11_);
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_vala_array_add80 (&groups, &groups_length1, &_groups_size_, _tmp11_);
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = groups;
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12__length1 = groups_length1;
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = collection_page_create_photos_menu_externals_injectables ();
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_vala_array_add192 (&groups, &groups_length1, &_groups_size_, _tmp13_);
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_vala_array_add81 (&groups, &groups_length1, &_groups_size_, _tmp13_);
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = groups;
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14__length1 = groups_length1;
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (result_length1) {
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*result_length1 = _tmp14__length1;
-#line 2970 "CollectionPage.c"
+#line 2232 "CollectionPage.c"
 	}
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp14_;
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2976 "CollectionPage.c"
+#line 2238 "CollectionPage.c"
 }
 
 
@@ -2984,29 +2246,29 @@ static gboolean collection_page_selection_has_video (CollectionPage* self) {
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = media_source_collection_has_video (_tmp3_);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp5_;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 3010 "CollectionPage.c"
+#line 2272 "CollectionPage.c"
 }
 
 
@@ -3018,29 +2280,29 @@ static gboolean collection_page_page_has_photo (CollectionPage* self) {
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_sources (_tmp1_);
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = media_source_collection_has_photo (_tmp3_);
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp5_;
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 3044 "CollectionPage.c"
+#line 2306 "CollectionPage.c"
 }
 
 
@@ -3052,29 +2314,29 @@ static gboolean collection_page_selection_has_photo (CollectionPage* self) {
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = media_source_collection_has_photo (_tmp3_);
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp5_;
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 3078 "CollectionPage.c"
+#line 2340 "CollectionPage.c"
 }
 
 
@@ -3082,613 +2344,604 @@ static void collection_page_real_init_actions (Page* base, gint selected_count,
 	CollectionPage * self;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = selected_count;
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = count;
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	PAGE_CLASS (collection_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_short_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", RESOURCES_ROTATE_CW_LABEL);
-#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_short_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", RESOURCES_ROTATE_CCW_LABEL);
-#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 209 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_short_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", RESOURCES_PUBLISH_LABEL);
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", TRUE);
-#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", TRUE);
-#line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", TRUE);
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", TRUE);
-#line 3108 "CollectionPage.c"
+#line 2370 "CollectionPage.c"
 }
 
 
 static void collection_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	CollectionPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
+	Page* _tmp2_ = NULL;
+	Page* _tmp3_ = NULL;
+	gboolean _tmp4_ = FALSE;
+	gint _tmp5_ = 0;
+	gint _tmp6_ = 0;
 	gboolean one_selected = FALSE;
-	gint _tmp2_ = 0;
+	gint _tmp7_ = 0;
 	gboolean has_selected = FALSE;
-	gint _tmp3_ = 0;
+	gint _tmp8_ = 0;
 	gboolean primary_is_video = FALSE;
-	gboolean _tmp4_ = FALSE;
+	gboolean _tmp9_ = FALSE;
 	gboolean selection_has_videos = FALSE;
-	gboolean _tmp12_ = FALSE;
-	gboolean page_has_photos = FALSE;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
 	gboolean _tmp17_ = FALSE;
+	gboolean page_has_photos = FALSE;
 	gboolean _tmp18_ = FALSE;
 	gboolean _tmp19_ = FALSE;
-	gboolean _tmp25_ = FALSE;
-	gboolean _tmp26_ = FALSE;
-	gboolean _tmp27_ = FALSE;
-	gboolean _tmp28_ = FALSE;
-	gboolean _tmp42_ = FALSE;
-	gboolean _tmp43_ = FALSE;
-	gboolean _tmp45_ = FALSE;
-	gboolean _tmp46_ = FALSE;
+	gboolean _tmp20_ = FALSE;
+	gboolean _tmp22_ = FALSE;
+	gboolean _tmp23_ = FALSE;
+	gboolean _tmp24_ = FALSE;
+	gboolean _tmp30_ = FALSE;
+	gboolean _tmp31_ = FALSE;
+	gboolean _tmp32_ = FALSE;
+	gboolean _tmp33_ = FALSE;
+	gboolean _tmp47_ = FALSE;
 	gboolean _tmp48_ = FALSE;
-	gboolean _tmp49_ = FALSE;
 	gboolean _tmp50_ = FALSE;
-	gboolean _tmp59_ = FALSE;
-	gboolean _tmp60_ = FALSE;
-	gboolean _tmp61_ = FALSE;
+	gboolean _tmp51_ = FALSE;
+	gboolean _tmp53_ = FALSE;
+	gboolean _tmp54_ = FALSE;
+	gboolean _tmp55_ = FALSE;
 	gboolean _tmp64_ = FALSE;
 	gboolean _tmp65_ = FALSE;
-	gboolean _tmp67_ = FALSE;
-	gboolean _tmp68_ = FALSE;
+	gboolean _tmp66_ = FALSE;
+	gboolean _tmp69_ = FALSE;
 	gboolean _tmp70_ = FALSE;
-	gboolean _tmp71_ = FALSE;
+	gboolean _tmp72_ = FALSE;
 	gboolean _tmp73_ = FALSE;
-	gboolean _tmp74_ = FALSE;
+	gboolean _tmp75_ = FALSE;
 	gboolean _tmp76_ = FALSE;
-	gboolean _tmp77_ = FALSE;
 	gboolean _tmp78_ = FALSE;
 	gboolean _tmp79_ = FALSE;
-	gboolean _tmp80_ = FALSE;
 	gboolean _tmp81_ = FALSE;
+	gboolean _tmp82_ = FALSE;
 	gboolean _tmp83_ = FALSE;
 	gboolean _tmp84_ = FALSE;
+	gboolean _tmp85_ = FALSE;
 	gboolean _tmp86_ = FALSE;
-	gboolean _tmp87_ = FALSE;
 	gboolean _tmp88_ = FALSE;
-	gboolean _tmp90_ = FALSE;
-#line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	gboolean _tmp89_ = FALSE;
+	gboolean _tmp91_ = FALSE;
+	gboolean _tmp92_ = FALSE;
+	gboolean _tmp93_ = FALSE;
+	gboolean _tmp95_ = FALSE;
+#line 217 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp0_ = selected_count;
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp1_ = count;
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	PAGE_CLASS (collection_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp2_ = selected_count;
-#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	one_selected = _tmp2_ == 1;
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp3_ = selected_count;
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	has_selected = _tmp3_ > 0;
-#line 281 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	primary_is_video = FALSE;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp4_ = has_selected;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp0_ = app_window_get_instance ();
+#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp1_ = _tmp0_;
+#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow));
+#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp3_ = _tmp2_;
+#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp4_ = _tmp3_ != G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page);
+#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_g_object_unref0 (_tmp3_);
+#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_g_object_unref0 (_tmp1_);
+#line 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp4_) {
-#line 3187 "CollectionPage.c"
-		ViewCollection* _tmp5_ = NULL;
-		ViewCollection* _tmp6_ = NULL;
-		DataView* _tmp7_ = NULL;
-		DataView* _tmp8_ = NULL;
-		DataSource* _tmp9_ = NULL;
-		DataSource* _tmp10_ = NULL;
-		gboolean _tmp11_ = FALSE;
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp6_ = _tmp5_;
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp7_ = view_collection_get_selected_at (_tmp6_, 0);
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp8_ = _tmp7_;
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp9_ = data_view_get_source (_tmp8_);
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp10_ = _tmp9_;
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_VIDEO);
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp10_);
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp8_);
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_data_collection_unref0 (_tmp6_);
-#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		if (_tmp11_) {
-#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			primary_is_video = TRUE;
-#line 3219 "CollectionPage.c"
-		}
+#line 220 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		return;
+#line 2452 "CollectionPage.c"
 	}
-#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp12_ = collection_page_selection_has_video (self);
-#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	selection_has_videos = _tmp12_;
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp13_ = collection_page_page_has_photo (self);
-#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_has_photos = _tmp13_;
-#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp15_ = has_selected;
-#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp15_) {
-#line 3234 "CollectionPage.c"
+#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp5_ = selected_count;
+#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp6_ = count;
+#line 223 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	PAGE_CLASS (collection_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp5_, _tmp6_);
+#line 225 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp7_ = selected_count;
+#line 225 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	one_selected = _tmp7_ == 1;
+#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp8_ = selected_count;
+#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	has_selected = _tmp8_ > 0;
+#line 228 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	primary_is_video = FALSE;
+#line 229 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp9_ = has_selected;
+#line 229 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp9_) {
+#line 2474 "CollectionPage.c"
+		ViewCollection* _tmp10_ = NULL;
+		ViewCollection* _tmp11_ = NULL;
+		DataView* _tmp12_ = NULL;
+		DataView* _tmp13_ = NULL;
+		DataSource* _tmp14_ = NULL;
+		DataSource* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp16_ = selection_has_videos;
-#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp14_ = !_tmp16_;
-#line 3240 "CollectionPage.c"
-	} else {
-#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp14_ = FALSE;
-#line 3244 "CollectionPage.c"
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp11_ = _tmp10_;
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp12_ = view_collection_get_selected_at (_tmp11_, 0);
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp13_ = _tmp12_;
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp14_ = data_view_get_source (_tmp13_);
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp15_ = _tmp14_;
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO);
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (_tmp15_);
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (_tmp13_);
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_data_collection_unref0 (_tmp11_);
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		if (_tmp16_) {
+#line 231 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+			primary_is_video = TRUE;
+#line 2506 "CollectionPage.c"
+		}
 	}
-#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Duplicate", _tmp14_);
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp17_ = primary_is_video;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", !_tmp17_);
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp19_ = one_selected;
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp19_) {
-#line 3256 "CollectionPage.c"
-		ConfigFacade* _tmp20_ = NULL;
-		ConfigFacade* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gboolean _tmp24_ = FALSE;
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp20_ = config_facade_get_instance ();
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp21_ = _tmp20_;
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp22_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp23_ = _tmp22_;
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp24_ = is_string_empty (_tmp23_);
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp18_ = !_tmp24_;
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_free0 (_tmp23_);
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp21_);
-#line 3278 "CollectionPage.c"
+#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp17_ = collection_page_selection_has_video (self);
+#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	selection_has_videos = _tmp17_;
+#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp18_ = collection_page_page_has_photo (self);
+#line 234 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_has_photos = _tmp18_;
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp20_ = has_selected;
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp20_) {
+#line 2521 "CollectionPage.c"
+		gboolean _tmp21_ = FALSE;
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp21_ = selection_has_videos;
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp19_ = !_tmp21_;
+#line 2527 "CollectionPage.c"
 	} else {
-#line 294 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp18_ = FALSE;
-#line 3282 "CollectionPage.c"
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp19_ = FALSE;
+#line 2531 "CollectionPage.c"
 	}
-#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp18_);
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp28_ = one_selected;
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp28_) {
-#line 3290 "CollectionPage.c"
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Duplicate", _tmp19_);
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp22_ = primary_is_video;
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", !_tmp22_);
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp24_ = one_selected;
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp24_) {
+#line 2543 "CollectionPage.c"
+		ConfigFacade* _tmp25_ = NULL;
+		ConfigFacade* _tmp26_ = NULL;
+		gchar* _tmp27_ = NULL;
+		gchar* _tmp28_ = NULL;
 		gboolean _tmp29_ = FALSE;
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp29_ = primary_is_video;
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp27_ = !_tmp29_;
-#line 3296 "CollectionPage.c"
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp25_ = config_facade_get_instance ();
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp26_ = _tmp25_;
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp27_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp28_ = _tmp27_;
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp29_ = is_string_empty (_tmp28_);
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp23_ = !_tmp29_;
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_free0 (_tmp28_);
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (_tmp26_);
+#line 2565 "CollectionPage.c"
 	} else {
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp27_ = FALSE;
-#line 3300 "CollectionPage.c"
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp23_ = FALSE;
+#line 2569 "CollectionPage.c"
 	}
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp27_) {
-#line 3304 "CollectionPage.c"
-		ViewCollection* _tmp30_ = NULL;
-		ViewCollection* _tmp31_ = NULL;
-		DataView* _tmp32_ = NULL;
-		DataView* _tmp33_ = NULL;
-		DataSource* _tmp34_ = NULL;
-		Photo* _tmp35_ = NULL;
-		PhotoFileFormat _tmp36_ = 0;
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp31_ = _tmp30_;
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp32_ = view_collection_get_selected_at (_tmp31_, 0);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp33_ = _tmp32_;
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp34_ = data_view_get_source (_tmp33_);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_PHOTO, Photo);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp36_ = photo_get_master_file_format (_tmp35_);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp26_ = _tmp36_ == PHOTO_FILE_FORMAT_RAW;
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp35_);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp33_);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_data_collection_unref0 (_tmp31_);
-#line 3334 "CollectionPage.c"
+#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp23_);
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp33_ = one_selected;
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp33_) {
+#line 2577 "CollectionPage.c"
+		gboolean _tmp34_ = FALSE;
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp34_ = primary_is_video;
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp32_ = !_tmp34_;
+#line 2583 "CollectionPage.c"
 	} else {
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp26_ = FALSE;
-#line 3338 "CollectionPage.c"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp32_ = FALSE;
+#line 2587 "CollectionPage.c"
 	}
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp26_) {
-#line 3342 "CollectionPage.c"
-		ConfigFacade* _tmp37_ = NULL;
-		ConfigFacade* _tmp38_ = NULL;
-		gchar* _tmp39_ = NULL;
-		gchar* _tmp40_ = NULL;
-		gboolean _tmp41_ = FALSE;
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp37_ = config_facade_get_instance ();
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp32_) {
+#line 2591 "CollectionPage.c"
+		ViewCollection* _tmp35_ = NULL;
+		ViewCollection* _tmp36_ = NULL;
+		DataView* _tmp37_ = NULL;
+		DataView* _tmp38_ = NULL;
+		DataSource* _tmp39_ = NULL;
+		Photo* _tmp40_ = NULL;
+		PhotoFileFormat _tmp41_ = 0;
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp36_ = _tmp35_;
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp37_ = view_collection_get_selected_at (_tmp36_, 0);
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp38_ = _tmp37_;
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp39_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp40_ = _tmp39_;
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp41_ = is_string_empty (_tmp40_);
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp25_ = !_tmp41_;
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_free0 (_tmp40_);
-#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp39_ = data_view_get_source (_tmp38_);
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp40_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo);
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp41_ = photo_get_master_file_format (_tmp40_);
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp31_ = _tmp41_ == PHOTO_FILE_FORMAT_RAW;
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (_tmp40_);
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp38_);
-#line 3364 "CollectionPage.c"
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_data_collection_unref0 (_tmp36_);
+#line 2621 "CollectionPage.c"
 	} else {
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp25_ = FALSE;
-#line 3368 "CollectionPage.c"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp31_ = FALSE;
+#line 2625 "CollectionPage.c"
 	}
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp25_);
-#line 300 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp43_ = selection_has_videos;
-#line 300 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp43_) {
-#line 3376 "CollectionPage.c"
-		gboolean _tmp44_ = FALSE;
-#line 300 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp44_ = collection_page_can_revert_selected (self);
-#line 300 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp42_ = _tmp44_;
-#line 3382 "CollectionPage.c"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp31_) {
+#line 2629 "CollectionPage.c"
+		ConfigFacade* _tmp42_ = NULL;
+		ConfigFacade* _tmp43_ = NULL;
+		gchar* _tmp44_ = NULL;
+		gchar* _tmp45_ = NULL;
+		gboolean _tmp46_ = FALSE;
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp42_ = config_facade_get_instance ();
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp43_ = _tmp42_;
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp44_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp45_ = _tmp44_;
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp46_ = is_string_empty (_tmp45_);
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp30_ = !_tmp46_;
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_free0 (_tmp45_);
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (_tmp43_);
+#line 2651 "CollectionPage.c"
 	} else {
-#line 300 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp42_ = FALSE;
-#line 3386 "CollectionPage.c"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp30_ = FALSE;
+#line 2655 "CollectionPage.c"
 	}
-#line 300 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp42_);
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp46_ = selection_has_videos;
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp46_) {
-#line 3394 "CollectionPage.c"
-		gboolean _tmp47_ = FALSE;
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp47_ = has_selected;
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp45_ = _tmp47_;
-#line 3400 "CollectionPage.c"
+#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp30_);
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp48_ = selection_has_videos;
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp48_) {
+#line 2663 "CollectionPage.c"
+		gboolean _tmp49_ = FALSE;
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp49_ = collection_page_can_revert_selected (self);
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp47_ = _tmp49_;
+#line 2669 "CollectionPage.c"
 	} else {
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp45_ = FALSE;
-#line 3404 "CollectionPage.c"
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp47_ = FALSE;
+#line 2673 "CollectionPage.c"
 	}
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp45_);
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp50_ = selection_has_videos;
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp50_) {
-#line 3412 "CollectionPage.c"
-		gboolean _tmp51_ = FALSE;
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp51_ = one_selected;
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp49_ = _tmp51_;
-#line 3418 "CollectionPage.c"
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp47_);
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp51_ = selection_has_videos;
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp51_) {
+#line 2681 "CollectionPage.c"
+		gboolean _tmp52_ = FALSE;
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp52_ = has_selected;
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp50_ = _tmp52_;
+#line 2687 "CollectionPage.c"
 	} else {
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp49_ = FALSE;
-#line 3422 "CollectionPage.c"
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp50_ = FALSE;
+#line 2691 "CollectionPage.c"
 	}
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp49_) {
-#line 3426 "CollectionPage.c"
-		ViewCollection* _tmp52_ = NULL;
-		ViewCollection* _tmp53_ = NULL;
-		DataView* _tmp54_ = NULL;
-		DataView* _tmp55_ = NULL;
-		DataSource* _tmp56_ = NULL;
-		Photo* _tmp57_ = NULL;
-		gboolean _tmp58_ = FALSE;
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp52_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp53_ = _tmp52_;
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp54_ = view_collection_get_selected_at (_tmp53_, 0);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp55_ = _tmp54_;
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp56_ = data_view_get_source (_tmp55_);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp57_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PHOTO, Photo);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp58_ = photo_has_color_adjustments (_tmp57_);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp48_ = _tmp58_;
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp57_);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp55_);
-#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_data_collection_unref0 (_tmp53_);
-#line 3456 "CollectionPage.c"
+#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp50_);
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp55_ = selection_has_videos;
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp55_) {
+#line 2699 "CollectionPage.c"
+		gboolean _tmp56_ = FALSE;
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp56_ = one_selected;
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp54_ = _tmp56_;
+#line 2705 "CollectionPage.c"
 	} else {
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp48_ = FALSE;
-#line 3460 "CollectionPage.c"
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp54_ = FALSE;
+#line 2709 "CollectionPage.c"
 	}
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp48_);
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp61_ = selection_has_videos;
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp61_) {
-#line 3468 "CollectionPage.c"
-		gboolean _tmp62_ = FALSE;
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp62_ = has_selected;
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp60_ = _tmp62_;
-#line 3474 "CollectionPage.c"
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp54_) {
+#line 2713 "CollectionPage.c"
+		ViewCollection* _tmp57_ = NULL;
+		ViewCollection* _tmp58_ = NULL;
+		DataView* _tmp59_ = NULL;
+		DataView* _tmp60_ = NULL;
+		DataSource* _tmp61_ = NULL;
+		Photo* _tmp62_ = NULL;
+		gboolean _tmp63_ = FALSE;
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp57_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp58_ = _tmp57_;
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp59_ = view_collection_get_selected_at (_tmp58_, 0);
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp60_ = _tmp59_;
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp61_ = data_view_get_source (_tmp60_);
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp62_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_PHOTO, Photo);
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp63_ = photo_has_color_adjustments (_tmp62_);
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp53_ = _tmp63_;
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (_tmp62_);
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (_tmp60_);
+#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_data_collection_unref0 (_tmp58_);
+#line 2743 "CollectionPage.c"
 	} else {
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp60_ = FALSE;
-#line 3478 "CollectionPage.c"
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp53_ = FALSE;
+#line 2747 "CollectionPage.c"
 	}
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp60_) {
-#line 3482 "CollectionPage.c"
-		gboolean _tmp63_ = FALSE;
-#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp63_ = pixel_transformation_bundle_has_copied_color_adjustments ();
-#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp59_ = _tmp63_;
-#line 3488 "CollectionPage.c"
+#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp53_);
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp66_ = selection_has_videos;
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp66_) {
+#line 2755 "CollectionPage.c"
+		gboolean _tmp67_ = FALSE;
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp67_ = has_selected;
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp65_ = _tmp67_;
+#line 2761 "CollectionPage.c"
 	} else {
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp59_ = FALSE;
-#line 3492 "CollectionPage.c"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp65_ = FALSE;
+#line 2765 "CollectionPage.c"
 	}
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp59_);
-#line 306 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp65_ = selection_has_videos;
-#line 306 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp65_) {
-#line 3500 "CollectionPage.c"
-		gboolean _tmp66_ = FALSE;
-#line 306 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp66_ = has_selected;
-#line 306 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp64_ = _tmp66_;
-#line 3506 "CollectionPage.c"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp65_) {
+#line 2769 "CollectionPage.c"
+		gboolean _tmp68_ = FALSE;
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp68_ = pixel_transformation_bundle_has_copied_color_adjustments ();
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp64_ = _tmp68_;
+#line 2775 "CollectionPage.c"
 	} else {
-#line 306 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp64_ = FALSE;
-#line 3510 "CollectionPage.c"
+#line 2779 "CollectionPage.c"
 	}
-#line 306 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp64_);
-#line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp68_ = selection_has_videos;
-#line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp68_) {
-#line 3518 "CollectionPage.c"
-		gboolean _tmp69_ = FALSE;
-#line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp69_ = has_selected;
-#line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp67_ = _tmp69_;
-#line 3524 "CollectionPage.c"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp64_);
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp70_ = selection_has_videos;
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp70_) {
+#line 2787 "CollectionPage.c"
+		gboolean _tmp71_ = FALSE;
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp71_ = has_selected;
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp69_ = _tmp71_;
+#line 2793 "CollectionPage.c"
 	} else {
-#line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp67_ = FALSE;
-#line 3528 "CollectionPage.c"
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp69_ = FALSE;
+#line 2797 "CollectionPage.c"
 	}
-#line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp67_);
-#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp71_ = selection_has_videos;
-#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp71_) {
-#line 3536 "CollectionPage.c"
-		gboolean _tmp72_ = FALSE;
-#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp72_ = has_selected;
-#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp70_ = _tmp72_;
-#line 3542 "CollectionPage.c"
+#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp69_);
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp73_ = selection_has_videos;
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp73_) {
+#line 2805 "CollectionPage.c"
+		gboolean _tmp74_ = FALSE;
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp74_ = has_selected;
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp72_ = _tmp74_;
+#line 2811 "CollectionPage.c"
 	} else {
-#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp70_ = FALSE;
-#line 3546 "CollectionPage.c"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp72_ = FALSE;
+#line 2815 "CollectionPage.c"
 	}
-#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp70_);
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp74_ = selection_has_videos;
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp74_) {
-#line 3554 "CollectionPage.c"
-		gboolean _tmp75_ = FALSE;
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp75_ = has_selected;
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp73_ = _tmp75_;
-#line 3560 "CollectionPage.c"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp72_);
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp76_ = selection_has_videos;
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp76_) {
+#line 2823 "CollectionPage.c"
+		gboolean _tmp77_ = FALSE;
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp77_ = has_selected;
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp75_ = _tmp77_;
+#line 2829 "CollectionPage.c"
 	} else {
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp73_ = FALSE;
-#line 3564 "CollectionPage.c"
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp75_ = FALSE;
+#line 2833 "CollectionPage.c"
 	}
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp73_);
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp76_ = has_selected;
-#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp76_);
-#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp77_ = has_selected;
-#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NewEvent", _tmp77_);
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp78_ = has_selected;
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", _tmp78_);
-#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp79_ = one_selected;
-#line 317 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", _tmp79_);
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp81_ = page_has_photos;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp81_) {
-#line 3588 "CollectionPage.c"
-		gboolean _tmp82_ = FALSE;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp82_ = primary_is_video;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp80_ = !_tmp82_;
-#line 3594 "CollectionPage.c"
+#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp75_);
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp79_ = selection_has_videos;
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp79_) {
+#line 2841 "CollectionPage.c"
+		gboolean _tmp80_ = FALSE;
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp80_ = has_selected;
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp78_ = _tmp80_;
+#line 2847 "CollectionPage.c"
 	} else {
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp80_ = FALSE;
-#line 3598 "CollectionPage.c"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp78_ = FALSE;
+#line 2851 "CollectionPage.c"
 	}
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", _tmp80_);
-#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp84_ = selection_has_videos;
-#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp84_) {
-#line 3606 "CollectionPage.c"
-		gboolean _tmp85_ = FALSE;
-#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp85_ = has_selected;
-#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp83_ = _tmp85_;
-#line 3612 "CollectionPage.c"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp78_);
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp81_ = has_selected;
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp81_);
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp82_ = has_selected;
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NewEvent", _tmp82_);
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp83_ = has_selected;
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", _tmp83_);
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp84_ = one_selected;
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", _tmp84_);
+#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp86_ = page_has_photos;
+#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp86_) {
+#line 2875 "CollectionPage.c"
+		gboolean _tmp87_ = FALSE;
+#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp87_ = primary_is_video;
+#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp85_ = !_tmp87_;
+#line 2881 "CollectionPage.c"
 	} else {
-#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp83_ = FALSE;
-#line 3616 "CollectionPage.c"
+#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp85_ = FALSE;
+#line 2885 "CollectionPage.c"
 	}
-#line 319 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp83_);
-#line 320 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp86_ = has_selected;
-#line 320 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp86_);
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp88_ = selection_has_videos;
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (!_tmp88_) {
-#line 3628 "CollectionPage.c"
-		gboolean _tmp89_ = FALSE;
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp89_ = has_selected;
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp87_ = _tmp89_;
-#line 3634 "CollectionPage.c"
+#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", _tmp85_);
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp89_ = selection_has_videos;
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp89_) {
+#line 2893 "CollectionPage.c"
+		gboolean _tmp90_ = FALSE;
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp90_ = has_selected;
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp88_ = _tmp90_;
+#line 2899 "CollectionPage.c"
 	} else {
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp87_ = FALSE;
-#line 3638 "CollectionPage.c"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp88_ = FALSE;
+#line 2903 "CollectionPage.c"
 	}
-#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp87_);
-#line 323 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp90_ = has_selected;
-#line 323 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	if (_tmp90_) {
-#line 3646 "CollectionPage.c"
-		GtkAction* set_background = NULL;
-		GtkAction* _tmp91_ = NULL;
-		GtkAction* _tmp92_ = NULL;
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp91_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground");
-#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		set_background = _tmp91_;
-#line 325 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp92_ = set_background;
-#line 325 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		if (_tmp92_ != NULL) {
-#line 3658 "CollectionPage.c"
-			const gchar* _tmp93_ = NULL;
-			gboolean _tmp94_ = FALSE;
-			GtkAction* _tmp95_ = NULL;
-#line 326 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp94_ = one_selected;
-#line 326 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			if (_tmp94_) {
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp93_ = RESOURCES_SET_BACKGROUND_MENU;
-#line 3668 "CollectionPage.c"
-			} else {
-#line 328 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-				_tmp93_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU;
-#line 3672 "CollectionPage.c"
-			}
-#line 326 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			_tmp95_ = set_background;
-#line 326 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-			gtk_action_set_label (_tmp95_, _tmp93_);
-#line 3678 "CollectionPage.c"
-		}
-#line 323 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (set_background);
-#line 3682 "CollectionPage.c"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp88_);
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp91_ = has_selected;
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp91_);
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp93_ = selection_has_videos;
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (!_tmp93_) {
+#line 2915 "CollectionPage.c"
+		gboolean _tmp94_ = FALSE;
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp94_ = has_selected;
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp92_ = _tmp94_;
+#line 2921 "CollectionPage.c"
+	} else {
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp92_ = FALSE;
+#line 2925 "CollectionPage.c"
+	}
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp92_);
+#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp95_ = has_selected;
+#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	if (_tmp95_) {
+#line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		g_debug ("CollectionPage.vala:271: Setting action label for SetBackground...");
+#line 2935 "CollectionPage.c"
 	}
 }
 
 
 static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* altered) {
-#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 281 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 281 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 3692 "CollectionPage.c"
+#line 2945 "CollectionPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -3697,25 +2950,25 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 		GeeSet* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = altered;
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = _tmp1_;
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_object_it = _tmp5_;
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 3719 "CollectionPage.c"
+#line 2972 "CollectionPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -3735,120 +2988,120 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 			gboolean _tmp24_ = FALSE;
 			LibraryPhoto* _tmp25_ = NULL;
 			gboolean _tmp26_ = FALSE;
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp6_ = _object_it;
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp7_) {
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3747 "CollectionPage.c"
+#line 3000 "CollectionPage.c"
 			}
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _object_it;
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			object = (DataObject*) _tmp9_;
-#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = object;
-#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
-#line 337 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			view = _tmp11_;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = view;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = data_view_is_selected (_tmp13_);
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp14_) {
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = TRUE;
-#line 3769 "CollectionPage.c"
+#line 3022 "CollectionPage.c"
 			} else {
 				GeeMap* _tmp15_ = NULL;
 				DataView* _tmp16_ = NULL;
 				gpointer _tmp17_ = NULL;
 				Alteration* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = altered;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp16_ = view;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = gee_map_get (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = (Alteration*) _tmp17_;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp19_ = alteration_has_subject (_tmp18_, "image");
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = !_tmp19_;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_alteration_unref0 (_tmp18_);
-#line 3790 "CollectionPage.c"
+#line 3043 "CollectionPage.c"
 			}
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp12_) {
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (view);
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3800 "CollectionPage.c"
+#line 3053 "CollectionPage.c"
 			}
-#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = view;
-#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = data_view_get_source (_tmp20_);
-#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL;
-#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp22_ == NULL) {
-#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 3812 "CollectionPage.c"
+#line 3065 "CollectionPage.c"
 			}
-#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp22_;
-#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp23_ = photo;
-#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp23_ == NULL) {
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (view);
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3828 "CollectionPage.c"
+#line 3081 "CollectionPage.c"
 			}
-#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = collection_page_can_revert_selected (self);
-#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp24_);
-#line 349 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp25_ = photo;
-#line 349 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = photo_has_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo));
-#line 349 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp26_);
-#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (view);
-#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (object);
-#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			break;
-#line 3848 "CollectionPage.c"
+#line 3101 "CollectionPage.c"
 		}
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 284 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_object_it);
-#line 3852 "CollectionPage.c"
+#line 3105 "CollectionPage.c"
 	}
 }
 
@@ -3858,48 +3111,48 @@ static void collection_page_on_print (CollectionPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 355 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 3876 "CollectionPage.c"
+#line 3129 "CollectionPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 3903 "CollectionPage.c"
+#line 3156 "CollectionPage.c"
 	}
 }
 
@@ -3912,52 +3165,52 @@ static void collection_page_on_external_app_changed (CollectionPage* self) {
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
 	gint _tmp5_ = 0;
-#line 362 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_count = _tmp3_;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = selected_count;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_ == 1) {
-#line 3934 "CollectionPage.c"
+#line 3187 "CollectionPage.c"
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = _tmp8_;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = g_strcmp0 (_tmp9_, "") != 0;
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp9_);
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3953 "CollectionPage.c"
+#line 3206 "CollectionPage.c"
 	} else {
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = FALSE;
-#line 3957 "CollectionPage.c"
+#line 3210 "CollectionPage.c"
 	}
-#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp4_);
-#line 3961 "CollectionPage.c"
+#line 3214 "CollectionPage.c"
 }
 
 
@@ -3979,162 +3232,162 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 	gchar* _tmp11_ = NULL;
 	gchar* _tmp12_ = NULL;
 	CheckerboardPageActivator _tmp13_ = 0;
-#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 376 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = item;
-#line 376 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL, Thumbnail));
-#line 376 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	thumbnail = _tmp1_;
-#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = thumbnail;
-#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = thumbnail_get_media_source (_tmp2_);
-#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _tmp3_;
-#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_VIDEO);
-#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_) {
-#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		media_page_on_play_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage));
-#line 383 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 383 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4013 "CollectionPage.c"
+#line 3266 "CollectionPage.c"
 	}
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = thumbnail;
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = thumbnail_get_media_source (_tmp6_);
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp7_) : NULL;
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == NULL) {
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4025 "CollectionPage.c"
+#line 3278 "CollectionPage.c"
 	}
-#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp8_;
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = photo;
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_ == NULL) {
-#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4039 "CollectionPage.c"
+#line 3292 "CollectionPage.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = _tmp11_;
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	g_debug ("CollectionPage.vala:391: activating %s", _tmp12_);
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	g_debug ("CollectionPage.vala:339: activating %s", _tmp12_);
+#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_free0 (_tmp12_);
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = activator;
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp13_ == CHECKERBOARD_PAGE_ACTIVATOR_MOUSE) {
-#line 4055 "CollectionPage.c"
+#line 3308 "CollectionPage.c"
 		CheckerboardPageKeyboardModifiers _tmp14_ = {0};
 		gboolean _tmp15_ = FALSE;
-#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = *modifiers;
-#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = _tmp14_.super_pressed;
-#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp15_) {
-#line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			collection_page_on_external_edit (self);
-#line 4066 "CollectionPage.c"
+#line 3319 "CollectionPage.c"
 		} else {
 			LibraryWindow* _tmp16_ = NULL;
 			LibraryWindow* _tmp17_ = NULL;
 			LibraryPhoto* _tmp18_ = NULL;
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = library_window_get_app ();
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp16_;
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = photo;
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			library_window_switch_to_photo_page (_tmp17_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo));
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp17_);
-#line 4081 "CollectionPage.c"
+#line 3334 "CollectionPage.c"
 		}
 	} else {
 		CheckerboardPageActivator _tmp19_ = 0;
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = activator;
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp19_ == CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD) {
-#line 4089 "CollectionPage.c"
+#line 3342 "CollectionPage.c"
 			gboolean _tmp20_ = FALSE;
 			CheckerboardPageKeyboardModifiers _tmp21_ = {0};
 			gboolean _tmp22_ = FALSE;
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = *modifiers;
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_.shift_pressed;
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp22_) {
-#line 4099 "CollectionPage.c"
+#line 3352 "CollectionPage.c"
 				CheckerboardPageKeyboardModifiers _tmp23_ = {0};
 				gboolean _tmp24_ = FALSE;
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = *modifiers;
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _tmp23_.ctrl_pressed;
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = !_tmp24_;
-#line 4108 "CollectionPage.c"
+#line 3361 "CollectionPage.c"
 			} else {
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = FALSE;
-#line 4112 "CollectionPage.c"
+#line 3365 "CollectionPage.c"
 			}
-#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 4116 "CollectionPage.c"
+#line 3369 "CollectionPage.c"
 				LibraryWindow* _tmp25_ = NULL;
 				LibraryWindow* _tmp26_ = NULL;
 				LibraryPhoto* _tmp27_ = NULL;
-#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = library_window_get_app ();
-#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp26_ = _tmp25_;
-#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp27_ = photo;
-#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				library_window_switch_to_photo_page (_tmp26_, self, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PHOTO, Photo));
-#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp26_);
-#line 4130 "CollectionPage.c"
+#line 3383 "CollectionPage.c"
 			}
 		}
 	}
-#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 4138 "CollectionPage.c"
+#line 3391 "CollectionPage.c"
 }
 
 
@@ -4147,133 +3400,133 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label4 = 0;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label5 = 0;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label6 = 0;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label7 = 0;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label8 = 0;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label9 = 0;
-#line 4171 "CollectionPage.c"
+#line 3424 "CollectionPage.c"
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 405 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	handled = TRUE;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = event;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((((((((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Page_Up")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Page_Up"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Page_Down"))))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Page_Down"))))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("Home"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Home"))))) || (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("End"))))) || (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_End"))))) {
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 4194 "CollectionPage.c"
+#line 3447 "CollectionPage.c"
 			default:
 			{
 				GdkEventKey* _tmp6_ = NULL;
 				gboolean _tmp7_ = FALSE;
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp6_ = event;
-#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp6_, &_tmp7_);
-#line 416 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4205 "CollectionPage.c"
+#line 3458 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("bracketright")))) {
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 4211 "CollectionPage.c"
+#line 3464 "CollectionPage.c"
 			default:
 			{
-#line 419 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 367 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 420 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4218 "CollectionPage.c"
+#line 3471 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("bracketleft")))) {
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 4224 "CollectionPage.c"
+#line 3477 "CollectionPage.c"
 			default:
 			{
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
-#line 424 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4231 "CollectionPage.c"
+#line 3484 "CollectionPage.c"
 			}
 		}
 	} else {
-#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 4237 "CollectionPage.c"
+#line 3490 "CollectionPage.c"
 			default:
 			{
-#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				handled = FALSE;
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 376 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4244 "CollectionPage.c"
+#line 3497 "CollectionPage.c"
 			}
 		}
 	}
-#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = handled;
-#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_) {
-#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = TRUE;
-#line 4254 "CollectionPage.c"
+#line 3507 "CollectionPage.c"
 	} else {
 		GdkEventKey* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = event;
-#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = PAGE_CLASS (collection_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp10_);
-#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp11_;
-#line 4264 "CollectionPage.c"
+#line 3517 "CollectionPage.c"
 	}
-#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4270 "CollectionPage.c"
+#line 3523 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_export_completed ((CollectionPage*) self);
-#line 4277 "CollectionPage.c"
+#line 3530 "CollectionPage.c"
 }
 
 
@@ -4329,233 +3582,233 @@ static void collection_page_real_on_export (MediaPage* base) {
 	ExporterUI* _tmp90_ = NULL;
 	ExporterUI* _tmp91_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = self->priv->exporter;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp0_ != NULL) {
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4341 "CollectionPage.c"
+#line 3594 "CollectionPage.c"
 	}
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _tmp1_;
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_list = _tmp4_;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = export_list;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = gee_collection_get_size (_tmp5_);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp7_ == 0) {
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4367 "CollectionPage.c"
+#line 3620 "CollectionPage.c"
 	}
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = collection_page_selection_has_photo (self);
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_some_photos = _tmp8_;
-#line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_selection_has_video (self);
-#line 444 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_some_videos = _tmp9_;
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = has_some_photos;
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp11_) {
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = TRUE;
-#line 4383 "CollectionPage.c"
+#line 3636 "CollectionPage.c"
 	} else {
 		gboolean _tmp12_ = FALSE;
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = has_some_videos;
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp12_;
-#line 4390 "CollectionPage.c"
+#line 3643 "CollectionPage.c"
 	}
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_assert (_tmp10_, "has_some_photos || has_some_videos");
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = has_some_photos;
-#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp13_) {
-#line 4398 "CollectionPage.c"
+#line 3651 "CollectionPage.c"
 		GeeCollection* _tmp14_ = NULL;
 		ExporterUI* _tmp15_ = NULL;
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = export_list;
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = video_export_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection), _collection_page_on_export_completed_exporter_completion_callback, self, FALSE);
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		self->priv->exporter = _tmp15_;
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4413 "CollectionPage.c"
+#line 3666 "CollectionPage.c"
 	}
-#line 454 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	title = NULL;
-#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp16_ = has_some_videos;
-#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 4421 "CollectionPage.c"
+#line 3674 "CollectionPage.c"
 		const gchar* _tmp17_ = NULL;
 		GeeCollection* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
 		gchar* _tmp23_ = NULL;
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = export_list;
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = gee_collection_get_size (_tmp18_);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = _tmp19_;
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp20_ == 1) {
-#line 4435 "CollectionPage.c"
+#line 3688 "CollectionPage.c"
 			const gchar* _tmp21_ = NULL;
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = _ ("Export Photo/Video");
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp21_;
-#line 4441 "CollectionPage.c"
+#line 3694 "CollectionPage.c"
 		} else {
 			const gchar* _tmp22_ = NULL;
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _ ("Export Photos/Videos");
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp22_;
-#line 4448 "CollectionPage.c"
+#line 3701 "CollectionPage.c"
 		}
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = g_strdup (_tmp17_);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		title = _tmp23_;
-#line 4456 "CollectionPage.c"
+#line 3709 "CollectionPage.c"
 	} else {
 		const gchar* _tmp24_ = NULL;
 		GeeCollection* _tmp25_ = NULL;
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
 		gchar* _tmp30_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = export_list;
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp26_ = gee_collection_get_size (_tmp25_);
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp27_ = _tmp26_;
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp27_ == 1) {
-#line 4471 "CollectionPage.c"
+#line 3724 "CollectionPage.c"
 			const gchar* _tmp28_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp28_ = _ ("Export Photo");
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = _tmp28_;
-#line 4477 "CollectionPage.c"
+#line 3730 "CollectionPage.c"
 		} else {
 			const gchar* _tmp29_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp29_ = _ ("Export Photos");
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = _tmp29_;
-#line 4484 "CollectionPage.c"
+#line 3737 "CollectionPage.c"
 		}
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = g_strdup (_tmp24_);
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		title = _tmp30_;
-#line 4492 "CollectionPage.c"
+#line 3745 "CollectionPage.c"
 	}
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = title;
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = export_dialog_new (_tmp31_);
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp32_);
-#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_dialog = _tmp32_;
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = has_some_videos;
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp34_) {
-#line 4506 "CollectionPage.c"
+#line 3759 "CollectionPage.c"
 		ExportFormatParameters _tmp35_ = {0};
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		export_format_parameters_current (&_tmp35_);
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp33_ = _tmp35_;
-#line 4512 "CollectionPage.c"
+#line 3765 "CollectionPage.c"
 	} else {
 		ExportFormatParameters _tmp36_ = {0};
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		export_format_parameters_last (&_tmp36_);
-#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp33_ = _tmp36_;
-#line 4519 "CollectionPage.c"
+#line 3772 "CollectionPage.c"
 	}
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_params = _tmp33_;
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp37_ = export_dialog;
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp40_ = export_dialog_execute (_tmp37_, &_tmp38_, &_tmp39_, &export_params);
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scale = _tmp38_;
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	constraint = _tmp39_;
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp40_) {
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4541 "CollectionPage.c"
+#line 3794 "CollectionPage.c"
 	}
-#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp41_ = constraint;
-#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp42_ = scale;
-#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scaling_for_constraint (_tmp41_, _tmp42_, FALSE, &_tmp43_);
-#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 425 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scaling = _tmp43_;
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp44_ = export_list;
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp45_ = gee_collection_get_size (_tmp44_);
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp46_ = _tmp45_;
-#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp46_ == 1) {
-#line 4559 "CollectionPage.c"
+#line 3812 "CollectionPage.c"
 		LibraryPhoto* photo = NULL;
 		GFile* save_as = NULL;
 		LibraryPhoto* _tmp55_ = NULL;
@@ -4565,22 +3818,22 @@ static void collection_page_real_on_export (MediaPage* base) {
 		GFile* _tmp59_ = NULL;
 		GFile* _tmp60_ = NULL;
 		GFile* _tmp61_ = NULL;
-#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo = NULL;
-#line 4571 "CollectionPage.c"
+#line 3824 "CollectionPage.c"
 		{
 			GeeIterator* _p_it = NULL;
 			GeeCollection* _tmp47_ = NULL;
 			GeeIterator* _tmp48_ = NULL;
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp47_ = export_list;
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp48_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable));
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_p_it = _tmp48_;
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 4584 "CollectionPage.c"
+#line 3837 "CollectionPage.c"
 				GeeIterator* _tmp49_ = NULL;
 				gboolean _tmp50_ = FALSE;
 				LibraryPhoto* p = NULL;
@@ -4588,73 +3841,73 @@ static void collection_page_real_on_export (MediaPage* base) {
 				gpointer _tmp52_ = NULL;
 				LibraryPhoto* _tmp53_ = NULL;
 				LibraryPhoto* _tmp54_ = NULL;
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp49_ = _p_it;
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp50_ = gee_iterator_next (_tmp49_);
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (!_tmp50_) {
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 4600 "CollectionPage.c"
+#line 3853 "CollectionPage.c"
 				}
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp51_ = _p_it;
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp52_ = gee_iterator_get (_tmp51_);
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				p = (LibraryPhoto*) _tmp52_;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp53_ = p;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp54_ = _g_object_ref0 (_tmp53_);
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				photo = _tmp54_;
-#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (p);
-#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4620 "CollectionPage.c"
+#line 3873 "CollectionPage.c"
 			}
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_p_it);
-#line 4624 "CollectionPage.c"
+#line 3877 "CollectionPage.c"
 		}
-#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp55_ = photo;
-#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp56_ = export_params;
-#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp57_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo), &_tmp56_);
-#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp58_ = _tmp57_;
-#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp59_ = export_ui_choose_file (_tmp58_);
-#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp60_ = _tmp59_;
-#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp58_);
-#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		save_as = _tmp60_;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp61_ = save_as;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp61_ == NULL) {
-#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
-#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_dialog);
-#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_free0 (title);
-#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_list);
-#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4658 "CollectionPage.c"
+#line 3911 "CollectionPage.c"
 		}
 		{
 			AppWindow* _tmp62_ = NULL;
@@ -4673,191 +3926,191 @@ static void collection_page_real_on_export (MediaPage* base) {
 			gboolean _tmp75_ = FALSE;
 			AppWindow* _tmp76_ = NULL;
 			AppWindow* _tmp77_ = NULL;
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp62_ = app_window_get_instance ();
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp63_ = _tmp62_;
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PAGE_WINDOW, PageWindow));
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp63_);
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp64_ = photo;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp65_ = save_as;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp66_ = scaling;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp67_ = export_params;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp68_ = _tmp67_.quality;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp69_ = photo;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp70_ = export_params;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp71_ = photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_PHOTO, Photo), &_tmp70_);
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp72_ = export_params;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp73_ = _tmp72_.mode;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp74_ = export_params;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp75_ = _tmp74_.export_metadata;
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PHOTO, Photo), _tmp65_, &_tmp66_, _tmp68_, _tmp71_, _tmp73_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp75_, &_inner_error_);
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4713 "CollectionPage.c"
-				goto __catch233_g_error;
+#line 3966 "CollectionPage.c"
+				goto __catch230_g_error;
 			}
-#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp76_ = app_window_get_instance ();
-#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp77_ = _tmp76_;
-#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_PAGE_WINDOW, PageWindow));
-#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp77_);
-#line 4724 "CollectionPage.c"
+#line 3977 "CollectionPage.c"
 		}
-		goto __finally233;
-		__catch233_g_error:
+		goto __finally230;
+		__catch230_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp78_ = NULL;
 			AppWindow* _tmp79_ = NULL;
 			GFile* _tmp80_ = NULL;
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			err = _inner_error_;
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_inner_error_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp78_ = app_window_get_instance ();
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp79_ = _tmp78_;
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_PAGE_WINDOW, PageWindow));
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp79_);
-#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp80_ = save_as;
-#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			export_error_dialog (_tmp80_, FALSE);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_error_free0 (err);
-#line 4751 "CollectionPage.c"
+#line 4004 "CollectionPage.c"
 		}
-		__finally233:
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		__finally230:
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_dialog);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_free0 (title);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_list);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			g_clear_error (&_inner_error_);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4772 "CollectionPage.c"
+#line 4025 "CollectionPage.c"
 		}
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (save_as);
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4786 "CollectionPage.c"
+#line 4039 "CollectionPage.c"
 	}
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp81_ = title;
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp82_ = export_ui_choose_dir (_tmp81_);
-#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_dir = _tmp82_;
-#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp83_ = export_dir;
-#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp83_ == NULL) {
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dir);
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4808 "CollectionPage.c"
+#line 4061 "CollectionPage.c"
 	}
-#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp84_ = export_list;
-#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp85_ = export_dir;
-#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp86_ = scaling;
-#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp87_ = export_params;
-#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp88_ = exporter_new (_tmp84_, _tmp85_, &_tmp86_, &_tmp87_, FALSE);
-#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp89_ = _tmp88_;
-#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp90_ = exporter_ui_new (_tmp89_);
-#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->exporter = _tmp90_;
-#line 511 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp89_);
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp91_ = self->priv->exporter;
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	exporter_ui_export (_tmp91_, _collection_page_on_export_completed_exporter_completion_callback, self);
-#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dir);
-#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_free0 (title);
-#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_list);
-#line 4842 "CollectionPage.c"
+#line 4095 "CollectionPage.c"
 }
 
 
 static void collection_page_on_export_completed (CollectionPage* self) {
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 463 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->exporter = NULL;
-#line 4853 "CollectionPage.c"
+#line 4106 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 	gboolean result = FALSE;
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4861 "CollectionPage.c"
+#line 4114 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -4869,31 +4122,31 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _source_index = 0;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp0_;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_list = _tmp3_;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _source_list;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_size = _tmp6_;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_index = -1;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4897 "CollectionPage.c"
+#line 4150 "CollectionPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -4906,107 +4159,107 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 			LibraryPhoto* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
 			LibraryPhoto* _tmp16_ = NULL;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_source_index = _tmp7_ + 1;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _source_index;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = _source_size;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4922 "CollectionPage.c"
+#line 4175 "CollectionPage.c"
 			}
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _source_index;
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			source = (DataSource*) _tmp12_;
-#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = source;
-#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp13_) : NULL);
-#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp14_;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photo;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4942 "CollectionPage.c"
+#line 4195 "CollectionPage.c"
 				gboolean _tmp17_ = FALSE;
 				LibraryPhoto* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp19_ = photo_has_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo));
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (_tmp19_) {
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = TRUE;
-#line 4954 "CollectionPage.c"
+#line 4207 "CollectionPage.c"
 				} else {
 					LibraryPhoto* _tmp20_ = NULL;
 					gboolean _tmp21_ = FALSE;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp20_ = photo;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp21_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = _tmp21_;
-#line 4964 "CollectionPage.c"
+#line 4217 "CollectionPage.c"
 				}
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp17_;
-#line 4968 "CollectionPage.c"
+#line 4221 "CollectionPage.c"
 			} else {
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4972 "CollectionPage.c"
+#line 4225 "CollectionPage.c"
 			}
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
-#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				result = TRUE;
-#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (source);
-#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_source_list);
-#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4986 "CollectionPage.c"
+#line 4239 "CollectionPage.c"
 			}
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4992 "CollectionPage.c"
+#line 4245 "CollectionPage.c"
 		}
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4996 "CollectionPage.c"
+#line 4249 "CollectionPage.c"
 	}
-#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
-#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 5002 "CollectionPage.c"
+#line 4255 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_can_revert_editable_selected (CollectionPage* self) {
 	gboolean result = FALSE;
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 477 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 5010 "CollectionPage.c"
+#line 4263 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -5018,31 +4271,31 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _source_index = 0;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp0_;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_list = _tmp3_;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _source_list;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_size = _tmp6_;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_index = -1;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 5046 "CollectionPage.c"
+#line 4299 "CollectionPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -5055,82 +4308,82 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 			LibraryPhoto* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
 			LibraryPhoto* _tmp16_ = NULL;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_source_index = _tmp7_ + 1;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _source_index;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = _source_size;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 5071 "CollectionPage.c"
+#line 4324 "CollectionPage.c"
 			}
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _source_index;
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			source = (DataSource*) _tmp12_;
-#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = source;
-#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp13_) : NULL);
-#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp14_;
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photo;
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 5091 "CollectionPage.c"
+#line 4344 "CollectionPage.c"
 				LibraryPhoto* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = photo;
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo));
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp18_;
-#line 5100 "CollectionPage.c"
+#line 4353 "CollectionPage.c"
 			} else {
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 5104 "CollectionPage.c"
+#line 4357 "CollectionPage.c"
 			}
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
-#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				result = TRUE;
-#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (source);
-#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_source_list);
-#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 5118 "CollectionPage.c"
+#line 4371 "CollectionPage.c"
 			}
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 5124 "CollectionPage.c"
+#line 4377 "CollectionPage.c"
 		}
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 5128 "CollectionPage.c"
+#line 4381 "CollectionPage.c"
 	}
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
-#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 5134 "CollectionPage.c"
+#line 4387 "CollectionPage.c"
 }
 
 
@@ -5151,59 +4404,59 @@ static void collection_page_on_rotate_clockwise (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5171 "CollectionPage.c"
+#line 4424 "CollectionPage.c"
 	}
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Rotating");
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Rotate");
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP, _tmp8_, _tmp9_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5207 "CollectionPage.c"
+#line 4460 "CollectionPage.c"
 }
 
 
@@ -5212,40 +4465,40 @@ static void collection_page_on_publish (CollectionPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 550 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 5230 "CollectionPage.c"
+#line 4483 "CollectionPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
 		GeeCollection* _tmp7_ = NULL;
-#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		publishing_ui_publishing_dialog_go (_tmp7_);
-#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5249 "CollectionPage.c"
+#line 4502 "CollectionPage.c"
 	}
 }
 
@@ -5267,59 +4520,59 @@ static void collection_page_on_rotate_counterclockwise (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5287 "CollectionPage.c"
+#line 4540 "CollectionPage.c"
 	}
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Rotating");
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Rotate");
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP, _tmp8_, _tmp9_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 507 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5323 "CollectionPage.c"
+#line 4576 "CollectionPage.c"
 }
 
 
@@ -5340,59 +4593,59 @@ static void collection_page_on_flip_horizontally (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5360 "CollectionPage.c"
+#line 4613 "CollectionPage.c"
 	}
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Flipping Horizontally");
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Flip Horizontally");
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _tmp8_, _tmp9_);
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5396 "CollectionPage.c"
+#line 4649 "CollectionPage.c"
 }
 
 
@@ -5413,59 +4666,59 @@ static void collection_page_on_flip_vertically (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5433 "CollectionPage.c"
+#line 4686 "CollectionPage.c"
 	}
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Flipping Vertically");
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Flip Vertically");
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _tmp8_, _tmp9_);
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5469 "CollectionPage.c"
+#line 4722 "CollectionPage.c"
 }
 
 
@@ -5485,29 +4738,29 @@ static void collection_page_on_revert (CollectionPage* self) {
 	CommandManager* _tmp33_ = NULL;
 	CommandManager* _tmp34_ = NULL;
 	RevertMultipleCommand* _tmp35_ = NULL;
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5505 "CollectionPage.c"
+#line 4758 "CollectionPage.c"
 	}
-#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 537 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = collection_page_can_revert_editable_selected (self);
-#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 537 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp4_) {
-#line 5511 "CollectionPage.c"
+#line 4764 "CollectionPage.c"
 		AppWindow* _tmp5_ = NULL;
 		AppWindow* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -5516,33 +4769,33 @@ static void collection_page_on_revert (CollectionPage* self) {
 		GeeCollection* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		gboolean _tmp12_ = FALSE;
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp7_;
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = view_collection_get_selected_sources (_tmp8_);
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp10_);
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = !_tmp11_;
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp12_) {
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 5546 "CollectionPage.c"
+#line 4799 "CollectionPage.c"
 		}
 		{
 			GeeList* _object_list = NULL;
@@ -5555,31 +4808,31 @@ static void collection_page_on_revert (CollectionPage* self) {
 			gint _tmp18_ = 0;
 			gint _tmp19_ = 0;
 			gint _object_index = 0;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _tmp13_;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = view_collection_get_selected_sources (_tmp14_);
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = _tmp15_;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_data_collection_unref0 (_tmp14_);
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_list = _tmp16_;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _object_list;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = _tmp18_;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_size = _tmp19_;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_index = -1;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 5583 "CollectionPage.c"
+#line 4836 "CollectionPage.c"
 				gint _tmp20_ = 0;
 				gint _tmp21_ = 0;
 				gint _tmp22_ = 0;
@@ -5588,72 +4841,72 @@ static void collection_page_on_revert (CollectionPage* self) {
 				gint _tmp24_ = 0;
 				gpointer _tmp25_ = NULL;
 				DataObject* _tmp26_ = NULL;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = _object_index;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_object_index = _tmp20_ + 1;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp21_ = _object_index;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp22_ = _object_size;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (!(_tmp21_ < _tmp22_)) {
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 5604 "CollectionPage.c"
+#line 4857 "CollectionPage.c"
 				}
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = _object_list;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _object_index;
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = gee_list_get (_tmp23_, _tmp24_);
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				object = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp25_, TYPE_DATA_OBJECT, DataObject);
-#line 596 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp26_ = object;
-#line 596 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo), TRUE);
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 5620 "CollectionPage.c"
+#line 4873 "CollectionPage.c"
 			}
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_object_list);
-#line 5624 "CollectionPage.c"
+#line 4877 "CollectionPage.c"
 		}
 	}
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = _tmp27_;
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = view_collection_get_selected (_tmp28_);
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = _tmp29_;
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = revert_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = _tmp31_;
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp30_);
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp28_);
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 547 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp32_;
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = command;
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_COMMAND, Command));
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp34_);
-#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 533 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5657 "CollectionPage.c"
+#line 4910 "CollectionPage.c"
 }
 
 
@@ -5672,57 +4925,57 @@ void collection_page_on_copy_adjustments (CollectionPage* self) {
 	Photo* _tmp10_ = NULL;
 	PixelTransformationBundle* _tmp11_ = NULL;
 	PixelTransformationBundle* _tmp12_ = NULL;
-#line 603 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5692 "CollectionPage.c"
+#line 4945 "CollectionPage.c"
 	}
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = photo_get_color_adjustments (_tmp10_);
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = _tmp11_;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	pixel_transformation_bundle_set_copied_color_adjustments (_tmp12_);
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (_tmp12_);
-#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
-#line 603 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5726 "CollectionPage.c"
+#line 4979 "CollectionPage.c"
 }
 
 
@@ -5745,78 +4998,78 @@ void collection_page_on_paste_adjustments (CollectionPage* self) {
 	CommandManager* _tmp14_ = NULL;
 	CommandManager* _tmp15_ = NULL;
 	AdjustColorsMultipleCommand* _tmp16_ = NULL;
-#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = pixel_transformation_bundle_get_copied_color_adjustments ();
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	copied_adjustments = _tmp0_;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_ == 0;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_) {
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = TRUE;
-#line 5769 "CollectionPage.c"
+#line 5022 "CollectionPage.c"
 	} else {
 		PixelTransformationBundle* _tmp6_ = NULL;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = copied_adjustments;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp6_ == NULL;
-#line 5776 "CollectionPage.c"
+#line 5029 "CollectionPage.c"
 	}
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp1_) {
-#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5784 "CollectionPage.c"
+#line 5037 "CollectionPage.c"
 	}
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = view_collection_get_selected (_tmp8_);
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = _tmp9_;
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = copied_adjustments;
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = adjust_colors_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable), _tmp11_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP);
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp13_;
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _tmp14_;
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp16_ = command;
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp15_);
-#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 5820 "CollectionPage.c"
+#line 5073 "CollectionPage.c"
 }
 
 
@@ -5835,55 +5088,55 @@ static void collection_page_on_enhance (CollectionPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	EnhanceMultipleCommand* _tmp12_ = NULL;
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5855 "CollectionPage.c"
+#line 5108 "CollectionPage.c"
 	}
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = enhance_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5887 "CollectionPage.c"
+#line 5140 "CollectionPage.c"
 }
 
 
@@ -5902,55 +5155,55 @@ static void collection_page_on_duplicate_photo (CollectionPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	DuplicateMultiplePhotosCommand* _tmp12_ = NULL;
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5922 "CollectionPage.c"
+#line 5175 "CollectionPage.c"
 	}
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = duplicate_multiple_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5954 "CollectionPage.c"
+#line 5207 "CollectionPage.c"
 }
 
 
@@ -5985,29 +5238,29 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 	gboolean _tmp37_ = FALSE;
 	gboolean _tmp38_ = FALSE;
 	gboolean _tmp39_ = FALSE;
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6005 "CollectionPage.c"
+#line 5258 "CollectionPage.c"
 	}
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_has_videos = FALSE;
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	only_videos_selected = TRUE;
-#line 6011 "CollectionPage.c"
+#line 5264 "CollectionPage.c"
 	{
 		GeeList* _dv_list = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -6019,31 +5272,31 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 		gint _dv_index = 0;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_list = _tmp7_;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _dv_list;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp9_;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_size = _tmp10_;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_index = -1;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 6047 "CollectionPage.c"
+#line 5300 "CollectionPage.c"
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
@@ -6055,109 +5308,109 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 			DataSource* _tmp18_ = NULL;
 			DataSource* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _dv_index;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_dv_index = _tmp11_ + 1;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = _dv_index;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = _dv_size;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp12_ < _tmp13_)) {
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 6071 "CollectionPage.c"
+#line 5324 "CollectionPage.c"
 			}
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _dv_list;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = _dv_index;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = gee_list_get (_tmp14_, _tmp15_);
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			dv = (DataView*) _tmp16_;
-#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = dv;
-#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = data_view_get_source (_tmp17_);
-#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = _tmp18_;
-#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO);
-#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				selected_has_videos = TRUE;
-#line 6095 "CollectionPage.c"
+#line 5348 "CollectionPage.c"
 			} else {
-#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				only_videos_selected = FALSE;
-#line 6099 "CollectionPage.c"
+#line 5352 "CollectionPage.c"
 			}
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (dv);
-#line 6103 "CollectionPage.c"
+#line 5356 "CollectionPage.c"
 		}
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_dv_list);
-#line 6107 "CollectionPage.c"
+#line 5360 "CollectionPage.c"
 	}
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = _tmp21_;
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp23_ = view_collection_get_selected_at (_tmp22_, 0);
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = _tmp23_;
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp25_ = data_view_get_source (_tmp24_);
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATEABLE, Dateable);
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp24_);
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo_source = _tmp26_;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = photo_source;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = _tmp28_;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = view_collection_get_selected_count (_tmp29_);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = selected_has_videos;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = only_videos_selected;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = adjust_date_time_dialog_new (_tmp27_, _tmp30_, TRUE, _tmp31_, _tmp32_);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp33_);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	dialog = _tmp34_;
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = dialog;
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp39_ = adjust_date_time_dialog_execute (_tmp35_, &_tmp36_, &_tmp37_, &_tmp38_);
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	time_shift = _tmp36_;
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	keep_relativity = _tmp37_;
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	modify_originals = _tmp38_;
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp39_) {
-#line 6161 "CollectionPage.c"
+#line 5414 "CollectionPage.c"
 		AdjustDateTimePhotosCommand* command = NULL;
 		ViewCollection* _tmp40_ = NULL;
 		ViewCollection* _tmp41_ = NULL;
@@ -6171,49 +5424,49 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		CommandManager* _tmp49_ = NULL;
 		CommandManager* _tmp50_ = NULL;
 		AdjustDateTimePhotosCommand* _tmp51_ = NULL;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp41_ = _tmp40_;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp42_ = view_collection_get_selected (_tmp41_);
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp43_ = _tmp42_;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp44_ = time_shift;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp45_ = keep_relativity;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp46_ = modify_originals;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp47_ = adjust_date_time_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ITERABLE, GeeIterable), _tmp44_, _tmp45_, _tmp46_);
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp48_ = _tmp47_;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp43_);
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp41_);
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		command = _tmp48_;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp49_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = _tmp49_;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp51_ = command;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		command_manager_execute (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command));
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_command_manager_unref0 (_tmp50_);
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (command);
-#line 6211 "CollectionPage.c"
+#line 5464 "CollectionPage.c"
 	}
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (dialog);
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo_source);
-#line 6217 "CollectionPage.c"
+#line 5470 "CollectionPage.c"
 }
 
 
@@ -6230,122 +5483,122 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 	DataSource* _tmp8_ = NULL;
 	Photo* _tmp9_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6250 "CollectionPage.c"
+#line 5503 "CollectionPage.c"
 	}
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 6270 "CollectionPage.c"
+#line 5523 "CollectionPage.c"
 	{
 		AppWindow* _tmp10_ = NULL;
 		AppWindow* _tmp11_ = NULL;
 		Photo* _tmp12_ = NULL;
 		AppWindow* _tmp13_ = NULL;
 		AppWindow* _tmp14_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = app_window_get_instance ();
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = _tmp10_;
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow));
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = photo;
-#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo_open_with_external_editor (_tmp12_, &_inner_error_);
-#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6291 "CollectionPage.c"
-			goto __catch234_g_error;
+#line 5544 "CollectionPage.c"
+			goto __catch231_g_error;
 		}
-#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = app_window_get_instance ();
-#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = _tmp13_;
-#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow));
-#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 6302 "CollectionPage.c"
+#line 5555 "CollectionPage.c"
 	}
-	goto __finally234;
-	__catch234_g_error:
+	goto __finally231;
+	__catch231_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp15_ = NULL;
 		AppWindow* _tmp16_ = NULL;
 		GError* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_inner_error_ = NULL;
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp15_;
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
-#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp17_ = err;
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = photo;
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		open_external_editor_error_dialog (_tmp17_, _tmp18_);
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 6332 "CollectionPage.c"
+#line 5585 "CollectionPage.c"
 	}
-	__finally234:
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	__finally231:
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_clear_error (&_inner_error_);
-#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6345 "CollectionPage.c"
+#line 5598 "CollectionPage.c"
 	}
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 6349 "CollectionPage.c"
+#line 5602 "CollectionPage.c"
 }
 
 
@@ -6364,53 +5617,53 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 	Photo* _tmp10_ = NULL;
 	PhotoFileFormat _tmp11_ = 0;
 	GError * _inner_error_ = NULL;
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6384 "CollectionPage.c"
+#line 5637 "CollectionPage.c"
 	}
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = photo_get_master_file_format (_tmp10_);
-#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp11_ != PHOTO_FILE_FORMAT_RAW) {
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6414 "CollectionPage.c"
+#line 5667 "CollectionPage.c"
 	}
 	{
 		AppWindow* _tmp12_ = NULL;
@@ -6418,35 +5671,35 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		Photo* _tmp14_ = NULL;
 		AppWindow* _tmp15_ = NULL;
 		AppWindow* _tmp16_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = app_window_get_instance ();
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = photo;
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo_open_with_raw_external_editor (_tmp14_, &_inner_error_);
-#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6436 "CollectionPage.c"
-			goto __catch235_g_error;
+#line 5689 "CollectionPage.c"
+			goto __catch232_g_error;
 		}
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp15_;
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 6447 "CollectionPage.c"
+#line 5700 "CollectionPage.c"
 	}
-	goto __finally235;
-	__catch235_g_error:
+	goto __finally232;
+	__catch232_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp17_ = NULL;
@@ -6454,48 +5707,48 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		GError* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_inner_error_ = NULL;
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp17_ = app_window_get_instance ();
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = _tmp17_;
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PAGE_WINDOW, PageWindow));
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = err;
-#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = resources_launch_editor_failed (_tmp19_);
-#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp21_ = _tmp20_;
-#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		app_window_error_message (_tmp21_, NULL);
-#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp21_);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 6482 "CollectionPage.c"
+#line 5735 "CollectionPage.c"
 	}
-	__finally235:
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	__finally232:
+#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_clear_error (&_inner_error_);
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6495 "CollectionPage.c"
+#line 5748 "CollectionPage.c"
 	}
-#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 6499 "CollectionPage.c"
+#line 5752 "CollectionPage.c"
 }
 
 
@@ -6512,58 +5765,58 @@ void collection_page_on_set_background (CollectionPage* self) {
 	GeeArrayList* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 699 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photos = _tmp0_;
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _tmp1_;
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = photos;
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	media_source_collection_filter_media (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), NULL);
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = photos;
-#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
-#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == 1) {
-#line 6546 "CollectionPage.c"
+#line 5799 "CollectionPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp9_ = NULL;
 		SetBackgroundPhotoDialog* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		gboolean _tmp12_ = FALSE;
 		gboolean _tmp13_ = FALSE;
-#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = set_background_photo_dialog_new ();
-#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		dialog = _tmp9_;
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = dialog;
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = set_background_photo_dialog_execute (_tmp10_, &_tmp11_, &_tmp12_);
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		desktop = _tmp11_;
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		screensaver = _tmp12_;
-#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp13_) {
-#line 6567 "CollectionPage.c"
+#line 5820 "CollectionPage.c"
 			AppWindow* _tmp14_ = NULL;
 			AppWindow* _tmp15_ = NULL;
 			GeeArrayList* _tmp16_ = NULL;
@@ -6573,54 +5826,54 @@ void collection_page_on_set_background (CollectionPage* self) {
 			gboolean _tmp20_ = FALSE;
 			AppWindow* _tmp21_ = NULL;
 			AppWindow* _tmp22_ = NULL;
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = app_window_get_instance ();
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = _tmp14_;
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow));
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photos;
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = (LibraryPhoto*) _tmp17_;
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = desktop;
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = screensaver;
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			desktop_integration_set_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo), _tmp19_, _tmp20_);
-#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp18_);
-#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = app_window_get_instance ();
-#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_;
-#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE_WINDOW, PageWindow));
-#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp22_);
-#line 6607 "CollectionPage.c"
+#line 5860 "CollectionPage.c"
 		}
-#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_set_background_dialog_unref0 (dialog);
-#line 6611 "CollectionPage.c"
+#line 5864 "CollectionPage.c"
 	} else {
 		GeeArrayList* _tmp23_ = NULL;
 		gint _tmp24_ = 0;
 		gint _tmp25_ = 0;
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = photos;
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = _tmp24_;
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp25_ > 1) {
-#line 6624 "CollectionPage.c"
+#line 5877 "CollectionPage.c"
 			SetBackgroundSlideshowDialog* dialog = NULL;
 			SetBackgroundSlideshowDialog* _tmp26_ = NULL;
 			gint delay = 0;
@@ -6629,23 +5882,23 @@ void collection_page_on_set_background (CollectionPage* self) {
 			gboolean _tmp29_ = FALSE;
 			gboolean _tmp30_ = FALSE;
 			gboolean _tmp31_ = FALSE;
-#line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = set_background_slideshow_dialog_new ();
-#line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			dialog = _tmp26_;
-#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp27_ = dialog;
-#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp31_ = set_background_slideshow_dialog_execute (_tmp27_, &_tmp28_, &_tmp29_, &_tmp30_);
-#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			delay = _tmp28_;
-#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			desktop = _tmp29_;
-#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			screensaver = _tmp30_;
-#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp31_) {
-#line 6649 "CollectionPage.c"
+#line 5902 "CollectionPage.c"
 				AppWindow* _tmp32_ = NULL;
 				AppWindow* _tmp33_ = NULL;
 				GeeArrayList* _tmp34_ = NULL;
@@ -6654,42 +5907,42 @@ void collection_page_on_set_background (CollectionPage* self) {
 				gboolean _tmp37_ = FALSE;
 				AppWindow* _tmp38_ = NULL;
 				AppWindow* _tmp39_ = NULL;
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp32_ = app_window_get_instance ();
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp33_ = _tmp32_;
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PAGE_WINDOW, PageWindow));
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp33_);
-#line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp34_ = photos;
-#line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp35_ = delay;
-#line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp36_ = desktop;
-#line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp37_ = screensaver;
-#line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				desktop_integration_set_background_slideshow (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_COLLECTION, GeeCollection), (gdouble) _tmp35_, COLLECTION_PAGE_DESKTOP_SLIDESHOW_TRANSITION_SEC, _tmp36_, _tmp37_);
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp38_ = app_window_get_instance ();
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp39_ = _tmp38_;
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PAGE_WINDOW, PageWindow));
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp39_);
-#line 6684 "CollectionPage.c"
+#line 5937 "CollectionPage.c"
 			}
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_set_background_dialog_unref0 (dialog);
-#line 6688 "CollectionPage.c"
+#line 5941 "CollectionPage.c"
 		}
 	}
-#line 699 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photos);
-#line 6693 "CollectionPage.c"
+#line 5946 "CollectionPage.c"
 }
 
 
@@ -6729,205 +5982,205 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 	LibraryPhoto* _tmp38_ = NULL;
 	SlideshowPage* _tmp39_ = NULL;
 	SlideshowPage* _tmp40_ = NULL;
-#line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 726 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6749 "CollectionPage.c"
+#line 6002 "CollectionPage.c"
 	}
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = _tmp5_;
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = view_collection_get_selected_count (_tmp6_);
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_ > 0;
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_) {
-#line 6763 "CollectionPage.c"
+#line 6016 "CollectionPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
 		GeeList* _tmp11_ = NULL;
-#line 730 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 730 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp9_;
-#line 730 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = view_collection_get_selected_sources_of_type (_tmp10_, TYPE_LIBRARY_PHOTO);
-#line 730 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 730 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _tmp11_;
-#line 730 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 6779 "CollectionPage.c"
+#line 6032 "CollectionPage.c"
 	} else {
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		GeeList* _tmp14_ = NULL;
-#line 731 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 731 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 731 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = view_collection_get_sources_of_type (_tmp13_, TYPE_LIBRARY_PHOTO);
-#line 731 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 731 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _tmp14_;
-#line 731 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 6796 "CollectionPage.c"
+#line 6049 "CollectionPage.c"
 	}
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _g_object_ref0 (_tmp4_);
-#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	sources = _tmp15_;
-#line 732 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp17_ = sources;
-#line 732 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp17_ == NULL) {
-#line 732 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = TRUE;
-#line 6808 "CollectionPage.c"
+#line 6061 "CollectionPage.c"
 	} else {
 		GeeList* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
-#line 732 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = sources;
-#line 732 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 732 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = _tmp19_;
-#line 732 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp20_ == 0;
-#line 6821 "CollectionPage.c"
+#line 6074 "CollectionPage.c"
 	}
-#line 732 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 733 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 733 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 733 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6831 "CollectionPage.c"
+#line 6084 "CollectionPage.c"
 	}
-#line 735 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 735 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = _tmp21_;
-#line 735 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp23_ = sources;
-#line 735 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = gee_list_get (_tmp23_, 0);
-#line 735 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp25_ = (DataSource*) _tmp24_;
-#line 735 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp26_ = view_collection_get_view_for_source (_tmp22_, _tmp25_);
-#line 735 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_THUMBNAIL, Thumbnail);
-#line 735 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp25_);
-#line 735 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 735 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	thumbnail = _tmp27_;
-#line 736 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = thumbnail;
-#line 736 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp28_ == NULL) {
-#line 737 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 737 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 737 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 737 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6865 "CollectionPage.c"
+#line 6118 "CollectionPage.c"
 	}
-#line 739 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = thumbnail;
-#line 739 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = thumbnail_get_media_source (_tmp29_);
-#line 739 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp30_) : NULL;
-#line 739 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp31_ == NULL) {
-#line 739 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp30_);
-#line 6877 "CollectionPage.c"
+#line 6130 "CollectionPage.c"
 	}
-#line 739 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp31_;
-#line 740 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = photo;
-#line 740 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp32_ == NULL) {
-#line 741 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 741 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 741 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 741 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 741 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6895 "CollectionPage.c"
+#line 6148 "CollectionPage.c"
 	}
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = app_window_get_instance ();
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = library_photo_global;
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp37_ = _tmp36_;
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp38_ = photo;
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp39_ = slideshow_page_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PHOTO, Photo));
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp39_);
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp40_ = _tmp39_;
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	app_window_go_fullscreen (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PAGE, Page));
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp40_);
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp37_);
-#line 743 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp34_);
-#line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (sources);
-#line 724 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6931 "CollectionPage.c"
+#line 6184 "CollectionPage.c"
 }
 
 
@@ -6935,53 +6188,55 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
 	CollectionPage * self;
 	gboolean result = FALSE;
 	GtkToolButton* rotate_button = NULL;
-	GtkUIManager* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_ = NULL;
+	GObject* _tmp1_ = NULL;
 	GtkToolButton* _tmp2_ = NULL;
 	GtkToolButton* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 747 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 748 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->ui;
-#line 748 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp1_ = gtk_ui_manager_get_widget (_tmp0_, "/CollectionToolbar/ToolRotate");
-#line 748 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp1_ = gtk_builder_get_object (_tmp0_, "ToolRotate");
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_tool_button_get_type ()) ? ((GtkToolButton*) _tmp1_) : NULL);
-#line 748 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	rotate_button = _tmp2_;
-#line 750 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = rotate_button;
-#line 750 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6959 "CollectionPage.c"
+#line 6212 "CollectionPage.c"
 		GtkToolButton* _tmp4_ = NULL;
-		GtkAction* _tmp5_ = NULL;
-		GtkAction* _tmp6_ = NULL;
-#line 751 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		GtkToolButton* _tmp5_ = NULL;
+		GtkToolButton* _tmp6_ = NULL;
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
-#line 751 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp5_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
-#line 751 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp6_ = _tmp5_;
-#line 751 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		gtk_activatable_set_related_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_ACTIVATABLE, GtkActivatable), _tmp6_);
-#line 751 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp6_);
-#line 6973 "CollectionPage.c"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.RotateCounterclockwise");
+#line 699 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp5_ = rotate_button;
+#line 699 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		gtk_tool_button_set_icon_name (_tmp5_, "object-rotate-left");
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp6_ = rotate_button;
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CCW_TOOLTIP);
+#line 6228 "CollectionPage.c"
 	}
-#line 753 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
-#line 753 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = PAGE_CLASS (collection_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp7_);
-#line 753 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 753 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (rotate_button);
-#line 753 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6985 "CollectionPage.c"
+#line 6240 "CollectionPage.c"
 }
 
 
@@ -6989,60 +6244,62 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
 	CollectionPage * self;
 	gboolean result = FALSE;
 	GtkToolButton* rotate_button = NULL;
-	GtkUIManager* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
+	GtkBuilder* _tmp0_ = NULL;
+	GObject* _tmp1_ = NULL;
 	GtkToolButton* _tmp2_ = NULL;
 	GtkToolButton* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 756 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 757 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->ui;
-#line 757 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp1_ = gtk_ui_manager_get_widget (_tmp0_, "/CollectionToolbar/ToolRotate");
-#line 757 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp1_ = gtk_builder_get_object (_tmp0_, "ToolRotate");
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_tool_button_get_type ()) ? ((GtkToolButton*) _tmp1_) : NULL);
-#line 757 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	rotate_button = _tmp2_;
-#line 759 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = rotate_button;
-#line 759 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 7013 "CollectionPage.c"
+#line 6268 "CollectionPage.c"
 		GtkToolButton* _tmp4_ = NULL;
-		GtkAction* _tmp5_ = NULL;
-		GtkAction* _tmp6_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		GtkToolButton* _tmp5_ = NULL;
+		GtkToolButton* _tmp6_ = NULL;
+#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
-#line 760 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp5_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 760 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_tmp6_ = _tmp5_;
-#line 760 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		gtk_activatable_set_related_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_ACTIVATABLE, GtkActivatable), _tmp6_);
-#line 760 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		_g_object_unref0 (_tmp6_);
-#line 7027 "CollectionPage.c"
+#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.RotateClockwise");
+#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp5_ = rotate_button;
+#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		gtk_tool_button_set_icon_name (_tmp5_, "object-rotate-right");
+#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp6_ = rotate_button;
+#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP);
+#line 6284 "CollectionPage.c"
 	}
-#line 762 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
-#line 762 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = PAGE_CLASS (collection_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp7_);
-#line 762 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 762 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (rotate_button);
-#line 762 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 7039 "CollectionPage.c"
+#line 6296 "CollectionPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 766 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 7046 "CollectionPage.c"
+#line 6303 "CollectionPage.c"
 }
 
 
@@ -7051,17 +6308,17 @@ static SearchViewFilter* collection_page_real_get_search_view_filter (Checkerboa
 	SearchViewFilter* result = NULL;
 	CollectionPageCollectionSearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 766 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 766 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 766 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp1_;
-#line 766 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 7065 "CollectionPage.c"
+#line 6322 "CollectionPage.c"
 }
 
 
@@ -7074,7 +6331,7 @@ static guint collection_page_collection_search_view_filter_real_get_criteria (Se
 	result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 24 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 7078 "CollectionPage.c"
+#line 6335 "CollectionPage.c"
 }
 
 
@@ -7084,14 +6341,14 @@ CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view
 	self = (CollectionPageCollectionSearchViewFilter*) default_search_view_filter_construct (object_type);
 #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self;
-#line 7088 "CollectionPage.c"
+#line 6345 "CollectionPage.c"
 }
 
 
 CollectionPageCollectionSearchViewFilter* collection_page_collection_search_view_filter_new (void) {
 #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return collection_page_collection_search_view_filter_construct (COLLECTION_PAGE_TYPE_COLLECTION_SEARCH_VIEW_FILTER);
-#line 7095 "CollectionPage.c"
+#line 6352 "CollectionPage.c"
 }
 
 
@@ -7100,7 +6357,7 @@ static void collection_page_collection_search_view_filter_class_init (Collection
 	collection_page_collection_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = collection_page_collection_search_view_filter_real_get_criteria;
-#line 7104 "CollectionPage.c"
+#line 6361 "CollectionPage.c"
 }
 
 
@@ -7130,7 +6387,7 @@ static void collection_page_class_init (CollectionPageClass * klass) {
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = collection_page_real_init_collect_ui_filenames;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	((PageClass *) klass)->init_collect_action_entries = collection_page_real_init_collect_action_entries;
+	((PageClass *) klass)->add_actions = collection_page_real_add_actions;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	((PageClass *) klass)->init_collect_injection_groups = collection_page_real_init_collect_injection_groups;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -7151,7 +6408,7 @@ static void collection_page_class_init (CollectionPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = collection_page_real_get_search_view_filter;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = collection_page_finalize;
-#line 7155 "CollectionPage.c"
+#line 6412 "CollectionPage.c"
 }
 
 
@@ -7165,7 +6422,7 @@ static void collection_page_instance_init (CollectionPage * self) {
 	_tmp0_ = collection_page_collection_search_view_filter_new ();
 #line 30 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 7169 "CollectionPage.c"
+#line 6426 "CollectionPage.c"
 }
 
 
@@ -7179,7 +6436,7 @@ static void collection_page_finalize (GObject* obj) {
 	_view_filter_unref0 (self->priv->search_filter);
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	G_OBJECT_CLASS (collection_page_parent_class)->finalize (obj);
-#line 7183 "CollectionPage.c"
+#line 6440 "CollectionPage.c"
 }
 
 
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index 953f9b5..ba9e1ac 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -34,8 +34,8 @@ public abstract class CollectionPage : MediaPage {
         
         get_view().items_altered.connect(on_photos_altered);
         
-        init_item_context_menu("/CollectionContextMenu");
-        init_toolbar("/CollectionToolbar");
+        init_item_context_menu("CollectionContextMenu");
+        init_toolbar("CollectionToolbar");
         
         show_all();
 
@@ -46,7 +46,7 @@ public abstract class CollectionPage : MediaPage {
     public override Gtk.Toolbar get_toolbar() {
         if (toolbar == null) {
             base.get_toolbar();
-            
+
             // separator to force slider to right side of toolbar
             Gtk.SeparatorToolItem separator = new Gtk.SeparatorToolItem();
             separator.set_expand(true);
@@ -69,66 +69,78 @@ public abstract class CollectionPage : MediaPage {
     }
     
     private static InjectionGroup create_file_menu_injectables() {
-        InjectionGroup group = new InjectionGroup("/MenuBar/FileMenu/FileExtrasPlaceholder");
+        InjectionGroup group = new InjectionGroup("FileExtrasPlaceholder");
         
-        group.add_menu_item("Print");
+        group.add_menu_item(_("_Print"), "Print", "<Primary>p");
         group.add_separator();
-        group.add_menu_item("Publish");
-        group.add_menu_item("SendTo");
-        group.add_menu_item("SetBackground");
+        group.add_menu_item(_("_Publish"), "Publish", "<Primary><Shift>p");
+        group.add_menu_item(_("Send _To…"), "SendTo");
+        group.add_menu_item(_("Set as _Desktop Background"), "SetBackground");
         
         return group;
     }
     
     private static InjectionGroup create_edit_menu_injectables() {
-        InjectionGroup group = new InjectionGroup("/MenuBar/EditMenu/EditExtrasPlaceholder");
+        InjectionGroup group = new InjectionGroup("EditExtrasPlaceholder");
         
-        group.add_menu_item("Duplicate");
+        group.add_menu_item(_("_Duplicate"), "Duplicate", "<Primary>D");
 
         return group;
     }
 
     private static InjectionGroup create_view_menu_fullscreen_injectables() {
-        InjectionGroup group = new InjectionGroup("/MenuBar/ViewMenu/ViewExtrasFullscreenSlideshowPlaceholder");
+        InjectionGroup group = new InjectionGroup("ViewExtrasFullscreenSlideshowPlaceholder");
         
-        group.add_menu_item("Fullscreen", "CommonFullscreen");
+        group.add_menu_item(_("Fullscreen"), "CommonFullscreen", "F11");
         group.add_separator();
-        group.add_menu_item("Slideshow");
+        group.add_menu_item(_("S_lideshow"), "Slideshow", "F5");
         
         return group;
     }
 
     private static InjectionGroup create_photos_menu_edits_injectables() {
-        InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasEditsPlaceholder");
-        
-        group.add_menu_item("RotateClockwise");
-        group.add_menu_item("RotateCounterclockwise");
-        group.add_menu_item("FlipHorizontally");
-        group.add_menu_item("FlipVertically");
+        InjectionGroup group = new InjectionGroup("PhotosExtrasEditsPlaceholder");
+        
+        group.add_menu_item(_("Rotate _Right"),
+                            "RotateClockwise",
+                            "<Primary>r");
+        group.add_menu_item(_("Rotate _Left"),
+                            "RotateCounterclockwise",
+                            "<Primary><Shift>r");
+        group.add_menu_item(_("Flip Hori_zontally"), "FlipHorizontally");
+        group.add_menu_item(_("Flip Verti_cally"), "FlipVertically");
         group.add_separator();
-        group.add_menu_item("Enhance");
-        group.add_menu_item("Revert");
+        group.add_menu_item(_("_Enhance"), "Enhance");
+        group.add_menu_item(_("Re_vert to Original"), "Revert");
         group.add_separator();
-        group.add_menu_item("CopyColorAdjustments");
-        group.add_menu_item("PasteColorAdjustments");
+        group.add_menu_item(_("_Copy Color Adjustments"),
+                            "CopyColorAdjustments",
+                            "<Primary><Shift>c");
+        group.add_menu_item(_("_Paste Color Adjustments"),
+                            "PasteColorAdjustments",
+                            "<Primary><Shift>v");
         
         return group;
     }
   
     private static InjectionGroup create_photos_menu_date_injectables() {
-        InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasDateTimePlaceholder");
+        InjectionGroup group = new InjectionGroup("PhotosExtrasDateTimePlaceholder");
         
-        group.add_menu_item("AdjustDateTime");
+        group.add_menu_item(_("Adjust Date and Time…"), "AdjustDateTime");
         
         return group;
     }
 
     private static InjectionGroup create_photos_menu_externals_injectables() {
-        InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasExternalsPlaceholder");
+        InjectionGroup group = new InjectionGroup("PhotosExtrasExternalsPlaceholder");
         
-        group.add_menu_item("ExternalEdit");
-        group.add_menu_item("ExternalEditRAW");
-        group.add_menu_item("PlayVideo");
+        group.add_menu_item(_("Open With E_xternal Editor"),
+                            "ExternalEdit",
+                            "<Primary>Return");
+        group.add_menu_item(_("Open With RA_W Editor"),
+                            "ExternalEditRAW",
+                            "<Primary><Shift>Return");
+        group.add_menu_item(_("_Play"), "PlayVideo", "<Primary>Y");
         
         return group;
     }
@@ -138,102 +150,32 @@ public abstract class CollectionPage : MediaPage {
         
         ui_filenames.add("collection.ui");
     }
-    
-    protected override Gtk.ActionEntry[] init_collect_action_entries() {
-        Gtk.ActionEntry[] actions = base.init_collect_action_entries();
 
-        Gtk.ActionEntry print = { "Print", Resources.PRINT_LABEL, TRANSLATABLE, "<Ctrl>P",
-            TRANSLATABLE, on_print };
-        print.label = Resources.PRINT_MENU;
-        actions += print;
-        
-        Gtk.ActionEntry publish = { "Publish", Resources.PUBLISH, TRANSLATABLE, "<Ctrl><Shift>P",
-            TRANSLATABLE, on_publish };
-        publish.label = Resources.PUBLISH_MENU;
-        publish.tooltip = Resources.PUBLISH_TOOLTIP;
-        actions += publish;
-  
-        Gtk.ActionEntry rotate_right = { "RotateClockwise", Resources.CLOCKWISE,
-            TRANSLATABLE, "<Ctrl>R", TRANSLATABLE, on_rotate_clockwise };
-        rotate_right.label = Resources.ROTATE_CW_MENU;
-        rotate_right.tooltip = Resources.ROTATE_CW_TOOLTIP;
-        actions += rotate_right;
-
-        Gtk.ActionEntry rotate_left = { "RotateCounterclockwise", Resources.COUNTERCLOCKWISE,
-            TRANSLATABLE, "<Ctrl><Shift>R", TRANSLATABLE, on_rotate_counterclockwise };
-        rotate_left.label = Resources.ROTATE_CCW_MENU;
-        rotate_left.tooltip = Resources.ROTATE_CCW_TOOLTIP;
-        actions += rotate_left;
-
-        Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, TRANSLATABLE, null,
-            TRANSLATABLE, on_flip_horizontally };
-        hflip.label = Resources.HFLIP_MENU;
-        actions += hflip;
-        
-        Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, TRANSLATABLE, null,
-            TRANSLATABLE, on_flip_vertically };
-        vflip.label = Resources.VFLIP_MENU;
-        actions += vflip;
-
-        Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, TRANSLATABLE, "<Ctrl>E",
-            TRANSLATABLE, on_enhance };
-        enhance.label = Resources.ENHANCE_MENU;
-        enhance.tooltip = Resources.ENHANCE_TOOLTIP;
-        actions += enhance;
-
-        Gtk.ActionEntry copy_adjustments = { "CopyColorAdjustments", null, TRANSLATABLE,
-            "<Ctrl><Shift>C", TRANSLATABLE, on_copy_adjustments};
-        copy_adjustments.label = Resources.COPY_ADJUSTMENTS_MENU;
-        copy_adjustments.tooltip = Resources.COPY_ADJUSTMENTS_TOOLTIP;
-        actions += copy_adjustments;
-
-        Gtk.ActionEntry paste_adjustments = { "PasteColorAdjustments", null, TRANSLATABLE,
-            "<Ctrl><Shift>V", TRANSLATABLE, on_paste_adjustments};
-        paste_adjustments.label = Resources.PASTE_ADJUSTMENTS_MENU;
-        paste_adjustments.tooltip = Resources.PASTE_ADJUSTMENTS_TOOLTIP;
-        actions += paste_adjustments;
-
-        Gtk.ActionEntry revert = { "Revert", null, TRANSLATABLE, null,
-            TRANSLATABLE, on_revert };
-        revert.label = Resources.REVERT_MENU;
-        actions += revert;
-        
-        Gtk.ActionEntry set_background = { "SetBackground", null, TRANSLATABLE, "<Ctrl>B",
-            TRANSLATABLE, on_set_background };
-        set_background.label = Resources.SET_BACKGROUND_MENU;
-        set_background.tooltip = Resources.SET_BACKGROUND_TOOLTIP;
-        actions += set_background;
-
-        Gtk.ActionEntry duplicate = { "Duplicate", null, TRANSLATABLE, "<Ctrl>D", TRANSLATABLE,
-            on_duplicate_photo };
-        duplicate.label = Resources.DUPLICATE_PHOTO_MENU;
-        duplicate.tooltip = Resources.DUPLICATE_PHOTO_TOOLTIP;
-        actions += duplicate;
-
-        Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, TRANSLATABLE, null,
-            TRANSLATABLE, on_adjust_date_time };
-        adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
-        actions += adjust_date_time;
-        
-        Gtk.ActionEntry external_edit = { "ExternalEdit", Resources.EDIT_LABEL, TRANSLATABLE, "<Ctrl>Return",
-            TRANSLATABLE, on_external_edit };
-        external_edit.label = Resources.EXTERNAL_EDIT_MENU;
-        actions += external_edit;
-        
-        Gtk.ActionEntry edit_raw = { "ExternalEditRAW", null, TRANSLATABLE, "<Ctrl><Shift>Return", 
-            TRANSLATABLE, on_external_edit_raw };
-        edit_raw.label = Resources.EXTERNAL_EDIT_RAW_MENU;
-        actions += edit_raw;
-        
-        Gtk.ActionEntry slideshow = { "Slideshow", null, TRANSLATABLE, "F5", TRANSLATABLE,
-            on_slideshow };
-        slideshow.label = _("S_lideshow");
-        slideshow.tooltip = _("Play a slideshow");
-        actions += slideshow;
-        
-        return actions;
+    private const GLib.ActionEntry[] entries = {
+        { "Print", on_print },
+        { "Publish", on_publish },
+        { "RotateClockwise", on_rotate_clockwise },
+        { "RotateCounterclockwise", on_rotate_counterclockwise },
+        { "FlipHorizontally", on_flip_horizontally },
+        { "FlipVertically", on_flip_vertically },
+        { "Enhance", on_enhance },
+        { "CopyColorAdjustments", on_copy_adjustments },
+        { "PasteColorAdjustments", on_paste_adjustments },
+        { "Revert", on_revert },
+        { "SetBackground", on_set_background },
+        { "Duplicate", on_duplicate_photo },
+        { "AdjustDateTime", on_adjust_date_time },
+        { "ExternalEdit", on_external_edit },
+        { "ExternalEditRAW", on_external_edit_raw },
+        { "Slideshow", on_slideshow }
+    };
+
+    protected override void add_actions () {
+        base.add_actions ();
+
+        AppWindow.get_instance ().add_action_entries (entries, this);
     }
-    
+
     protected override InjectionGroup[] init_collect_injection_groups() {
         InjectionGroup[] groups = base.init_collect_injection_groups();
         
@@ -273,6 +215,11 @@ public abstract class CollectionPage : MediaPage {
     }
     
     protected override void update_actions(int selected_count, int count) {
+        //FIXME: Hack. Otherwise it will disable actions that just have been enabled by photo page
+        if (AppWindow.get_instance().get_current_page() != this) {
+            return;
+        }
+
         base.update_actions(selected_count, count);
 
         bool one_selected = selected_count == 1;
@@ -321,12 +268,13 @@ public abstract class CollectionPage : MediaPage {
         
         set_action_sensitive("SetBackground", (!selection_has_videos) && has_selected );
         if (has_selected) {
-            Gtk.Action? set_background = get_action("SetBackground");
+            debug ("Setting action label for SetBackground...");
+/*            Gtk.Action? set_background = get_action("SetBackground");
             if (set_background != null) {
                 set_background.label = one_selected
                     ? Resources.SET_BACKGROUND_MENU
                     : Resources.SET_BACKGROUND_SLIDESHOW_MENU;
-            }
+            } */
         }
     }
 
@@ -745,20 +693,24 @@ public abstract class CollectionPage : MediaPage {
     }
     
     protected override bool on_ctrl_pressed(Gdk.EventKey? event) {
-        Gtk.ToolButton? rotate_button = ui.get_widget("/CollectionToolbar/ToolRotate")
-            as Gtk.ToolButton;
-        if (rotate_button != null)
-            rotate_button.set_related_action(get_action("RotateCounterclockwise"));
-        
+        Gtk.ToolButton? rotate_button = this.builder.get_object ("ToolRotate") as Gtk.ToolButton;
+        if (rotate_button != null) {
+            rotate_button.set_action_name ("win.RotateCounterclockwise");
+            rotate_button.set_icon_name ("object-rotate-left");
+            rotate_button.set_tooltip_text (Resources.ROTATE_CCW_TOOLTIP);
+        }
+
         return base.on_ctrl_pressed(event);
     }
     
     protected override bool on_ctrl_released(Gdk.EventKey? event) {
-        Gtk.ToolButton? rotate_button = ui.get_widget("/CollectionToolbar/ToolRotate")
-            as Gtk.ToolButton;
-        if (rotate_button != null)
-            rotate_button.set_related_action(get_action("RotateClockwise"));
-        
+        Gtk.ToolButton? rotate_button = this.builder.get_object ("ToolRotate") as Gtk.ToolButton;
+        if (rotate_button != null) {
+            rotate_button.set_action_name ("win.RotateClockwise");
+            rotate_button.set_icon_name ("object-rotate-right");
+            rotate_button.set_tooltip_text (Resources.ROTATE_CW_TOOLTIP);
+        }
+
         return base.on_ctrl_released(event);
     }
     
diff --git a/src/Commands.c b/src/Commands.c
index 117eab4..c0a4447 100644
--- a/src/Commands.c
+++ b/src/Commands.c
@@ -5446,7 +5446,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 #line 448 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5449 "Commands.c"
-				goto __catch457_database_error;
+				goto __catch454_database_error;
 			}
 			{
 				AppWindow* _tmp7_ = NULL;
@@ -5470,8 +5470,8 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 #line 5471 "Commands.c"
 		}
 	}
-	goto __finally457;
-	__catch457_database_error:
+	goto __finally454;
+	__catch454_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -5487,7 +5487,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 		_g_error_free0 (err);
 #line 5489 "Commands.c"
 	}
-	__finally457:
+	__finally454:
 	{
 		AppWindow* _tmp10_ = NULL;
 		AppWindow* _tmp11_ = NULL;
@@ -5583,7 +5583,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 #line 468 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5586 "Commands.c"
-				goto __catch458_database_error;
+				goto __catch455_database_error;
 			}
 			{
 				AppWindow* _tmp7_ = NULL;
@@ -5607,8 +5607,8 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 #line 5608 "Commands.c"
 		}
 	}
-	goto __finally458;
-	__catch458_database_error:
+	goto __finally455;
+	__catch455_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -5624,7 +5624,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 		_g_error_free0 (err);
 #line 5626 "Commands.c"
 	}
-	__finally458:
+	__finally455:
 	{
 		AppWindow* _tmp10_ = NULL;
 		AppWindow* _tmp11_ = NULL;
@@ -10094,7 +10094,7 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 #line 1118 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10097 "Commands.c"
-			goto __catch459_g_error;
+			goto __catch456_g_error;
 		}
 #line 1119 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->dupes;
@@ -10104,8 +10104,8 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		_g_object_unref0 (dupe);
 #line 10106 "Commands.c"
 	}
-	goto __finally459;
-	__catch459_g_error:
+	goto __finally456;
+	__catch456_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp4_ = NULL;
@@ -10145,7 +10145,7 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		_g_error_free0 (err);
 #line 10147 "Commands.c"
 	}
-	__finally459:
+	__finally456:
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11543,11 +11543,11 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 #line 1345 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 11546 "Commands.c"
-				goto __catch460_g_error;
+				goto __catch457_g_error;
 			}
 		}
-		goto __finally460;
-		__catch460_g_error:
+		goto __finally457;
+		__catch457_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp5_ = NULL;
@@ -11563,7 +11563,7 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 			_g_error_free0 (err);
 #line 11565 "Commands.c"
 		}
-		__finally460:
+		__finally457:
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12149,11 +12149,11 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 #line 1435 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12152 "Commands.c"
-				goto __catch461_g_error;
+				goto __catch458_g_error;
 			}
 		}
-		goto __finally461;
-		__catch461_g_error:
+		goto __finally458;
+		__catch458_g_error:
 		{
 			GError* err = NULL;
 			GeeArrayList* _tmp5_ = NULL;
@@ -12172,7 +12172,7 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 			_g_error_free0 (err);
 #line 12174 "Commands.c"
 		}
-		__finally461:
+		__finally458:
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14608,7 +14608,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 14611 "Commands.c"
-				goto __catch462_g_regex_error;
+				goto __catch459_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -14633,7 +14633,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 14636 "Commands.c"
-				goto __catch462_g_regex_error;
+				goto __catch459_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -14659,8 +14659,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 14661 "Commands.c"
 	}
-	goto __finally462;
-	__catch462_g_regex_error:
+	goto __finally459;
+	__catch459_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -14673,7 +14673,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 14675 "Commands.c"
 	}
-	__finally462:
+	__finally459:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
diff --git a/src/Debug.c b/src/Debug.c
index 0f90aef..5ce4ad8 100644
--- a/src/Debug.c
+++ b/src/Debug.c
@@ -198,7 +198,7 @@ void debug_init (const gchar* app_version_prefix) {
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 201 "Debug.c"
-					goto __catch434_g_error;
+					goto __catch431_g_error;
 				}
 #line 42 "/home/jens/Source/shotwell/src/Debug.vala"
 				if (!_tmp13_) {
@@ -225,8 +225,8 @@ void debug_init (const gchar* app_version_prefix) {
 				}
 			}
 		}
-		goto __finally434;
-		__catch434_g_error:
+		goto __finally431;
+		__catch431_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp20_ = NULL;
@@ -250,7 +250,7 @@ void debug_init (const gchar* app_version_prefix) {
 			_g_error_free0 (err);
 #line 252 "Debug.c"
 		}
-		__finally434:
+		__finally431:
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 40 "/home/jens/Source/shotwell/src/Debug.vala"
diff --git a/src/DesktopIntegration.c b/src/DesktopIntegration.c
index d22b1ca..b82e24c 100644
--- a/src/DesktopIntegration.c
+++ b/src/DesktopIntegration.c
@@ -1173,7 +1173,7 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 #line 110 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1176 "DesktopIntegration.c"
-			goto __catch567_g_error;
+			goto __catch564_g_error;
 		}
 #line 118 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp21_ = app_window_get_instance ();
@@ -1185,8 +1185,8 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 		_g_object_unref0 (_tmp22_);
 #line 1187 "DesktopIntegration.c"
 	}
-	goto __finally567;
-	__catch567_g_error:
+	goto __finally564;
+	__catch564_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp23_ = NULL;
@@ -1226,7 +1226,7 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 		_g_error_free0 (err);
 #line 1228 "DesktopIntegration.c"
 	}
-	__finally567:
+	__finally564:
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1568,11 +1568,11 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1571 "DesktopIntegration.c"
-			goto __catch568_g_error;
+			goto __catch565_g_error;
 		}
 	}
-	goto __finally568;
-	__catch568_g_error:
+	goto __finally565;
+	__catch565_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp27_ = NULL;
@@ -1617,7 +1617,7 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 		return;
 #line 1619 "DesktopIntegration.c"
 	}
-	__finally568:
+	__finally565:
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2588,11 +2588,11 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 #line 278 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2591 "DesktopIntegration.c"
-			goto __catch569_g_error;
+			goto __catch566_g_error;
 		}
 	}
-	goto __finally569;
-	__catch569_g_error:
+	goto __finally566;
+	__catch566_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp8_ = NULL;
@@ -2612,7 +2612,7 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 		_g_error_free0 (err);
 #line 2613 "DesktopIntegration.c"
 	}
-	__finally569:
+	__finally566:
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2747,7 +2747,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 #line 304 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2749 "DesktopIntegration.c"
-			goto __catch570_g_error;
+			goto __catch567_g_error;
 		}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp10_ = exporter;
@@ -2789,7 +2789,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 						file_collection = (_vala_array_free (file_collection, file_collection_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 2791 "DesktopIntegration.c"
-						goto __catch570_g_error;
+						goto __catch567_g_error;
 					}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 					_g_object_unref0 (file);
@@ -2809,7 +2809,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2811 "DesktopIntegration.c"
-			goto __catch570_g_error;
+			goto __catch567_g_error;
 		}
 #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp19_ = _tmp16_;
@@ -2823,8 +2823,8 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		_g_object_unref0 (_tmp16_);
 #line 2824 "DesktopIntegration.c"
 	}
-	goto __finally570;
-	__catch570_g_error:
+	goto __finally567;
+	__catch567_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp20_ = NULL;
@@ -2860,7 +2860,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		return;
 #line 2861 "DesktopIntegration.c"
 	}
-	__finally570:
+	__finally567:
 #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 303 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
diff --git a/src/Dialogs.c b/src/Dialogs.c
index d3805b9..36504c7 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -882,7 +882,6 @@ struct _TextEntryDialogPrivate {
 	GtkBuilder* builder;
 	GtkButton* button1;
 	GtkButton* button2;
-	GtkButtonBox* action_area_box;
 };
 
 struct _MultiTextEntryDialog {
@@ -901,7 +900,6 @@ struct _MultiTextEntryDialogPrivate {
 	GtkBuilder* builder;
 	GtkButton* button1;
 	GtkButton* button2;
-	GtkButtonBox* action_area_box;
 };
 
 struct _EventRenameDialog {
@@ -1575,13 +1573,13 @@ GFile* app_dirs_get_import_dir (void);
 static void welcome_dialog_install_import_content (WelcomeDialog* self);
 void spit_data_imports_welcome_import_meta_host_start (SpitDataImportsWelcomeImportMetaHost* self);
 void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEntry* entry);
-static void _vala_array_add275 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value);
-static void _vala_array_add276 (GtkCheckButton*** array, int* length, int* size, GtkCheckButton* value);
+static void _vala_array_add109 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value);
+static void _vala_array_add110 (GtkCheckButton*** array, int* length, int* size, GtkCheckButton* value);
 static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp);
 gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** selected_import_entries, int* selected_import_entries_length1, gboolean* do_system_pictures_import);
 static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
-static void _vala_array_add277 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value);
-static WelcomeServiceEntry** _vala_array_dup30 (WelcomeServiceEntry** self, int length);
+static void _vala_array_add111 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value);
+static WelcomeServiceEntry** _vala_array_dup29 (WelcomeServiceEntry** self, int length);
 static void welcome_dialog_finalize (GObject* obj);
 gpointer preferences_dialog_ref (gpointer instance);
 void preferences_dialog_unref (gpointer instance);
@@ -1752,7 +1750,7 @@ gboolean dialogs_confirm_delete_tag (Tag* tag) {
 		result = TRUE;
 #line 14 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 1756 "Dialogs.c"
+#line 1754 "Dialogs.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = count;
@@ -1788,7 +1786,7 @@ gboolean dialogs_confirm_delete_tag (Tag* tag) {
 	_g_free0 (msg);
 #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1792 "Dialogs.c"
+#line 1790 "Dialogs.c"
 }
 
 
@@ -1834,7 +1832,7 @@ gboolean dialogs_confirm_delete_saved_search (SavedSearch* search) {
 	_g_free0 (msg);
 #line 28 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1838 "Dialogs.c"
+#line 1836 "Dialogs.c"
 }
 
 
@@ -1888,7 +1886,7 @@ gboolean dialogs_confirm_warn_developer_changed (gint number) {
 	_g_object_unref0 (dialog);
 #line 46 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1890 "Dialogs.c"
+#line 1888 "Dialogs.c"
 }
 
 
@@ -1924,7 +1922,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp0_ = export_ui_current_export_dir;
 #line 55 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 1926 "Dialogs.c"
+#line 1924 "Dialogs.c"
 		const gchar* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -1935,7 +1933,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp2_;
-#line 1937 "Dialogs.c"
+#line 1935 "Dialogs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = current_file_basename;
@@ -1943,20 +1941,20 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp5_ = video_reader_is_supported_video_filename (_tmp4_);
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 1945 "Dialogs.c"
+#line 1943 "Dialogs.c"
 		const gchar* _tmp6_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _ ("Export Video");
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp6_;
-#line 1951 "Dialogs.c"
+#line 1949 "Dialogs.c"
 	} else {
 		const gchar* _tmp7_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _ ("Export Photo");
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp7_;
-#line 1958 "Dialogs.c"
+#line 1956 "Dialogs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = g_strdup (_tmp3_);
@@ -2012,7 +2010,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp23_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog));
 #line 70 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2014 "Dialogs.c"
+#line 2012 "Dialogs.c"
 		GtkFileChooserDialog* _tmp24_ = NULL;
 		gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
@@ -2041,7 +2039,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp29_;
-#line 2043 "Dialogs.c"
+#line 2041 "Dialogs.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = chooser;
@@ -2055,14 +2053,14 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_g_free0 (file_chooser_title);
 #line 76 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2057 "Dialogs.c"
+#line 2055 "Dialogs.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2064 "Dialogs.c"
+#line 2062 "Dialogs.c"
 }
 
 
@@ -2089,7 +2087,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	_tmp0_ = export_ui_current_export_dir;
 #line 80 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 2091 "Dialogs.c"
+#line 2089 "Dialogs.c"
 		const gchar* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2100,19 +2098,19 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp2_;
-#line 2102 "Dialogs.c"
+#line 2100 "Dialogs.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = user_title;
 #line 83 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == NULL) {
-#line 2108 "Dialogs.c"
+#line 2106 "Dialogs.c"
 		const gchar* _tmp4_ = NULL;
 #line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _ ("Export Photos");
 #line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		user_title = _tmp4_;
-#line 2114 "Dialogs.c"
+#line 2112 "Dialogs.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = user_title;
@@ -2154,7 +2152,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	_tmp16_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_dialog_get_type (), GtkDialog));
 #line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2156 "Dialogs.c"
+#line 2154 "Dialogs.c"
 		GtkFileChooserDialog* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
@@ -2183,7 +2181,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp22_;
-#line 2185 "Dialogs.c"
+#line 2183 "Dialogs.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = chooser;
@@ -2195,7 +2193,7 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	_g_object_unref0 (chooser);
 #line 100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2197 "Dialogs.c"
+#line 2195 "Dialogs.c"
 }
 
 
@@ -2210,18 +2208,18 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 	if (g_error_matches (_tmp1_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) {
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 2212 "Dialogs.c"
+#line 2210 "Dialogs.c"
 	} else {
 		GError* _tmp2_ = NULL;
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = err;
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = g_error_matches (_tmp2_, G_FILE_ERROR, G_FILE_ERROR_PERM);
-#line 2219 "Dialogs.c"
+#line 2217 "Dialogs.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 2223 "Dialogs.c"
+#line 2221 "Dialogs.c"
 		const gchar* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
@@ -2263,7 +2261,7 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 		_g_object_unref0 (_tmp8_);
 #line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2264 "Dialogs.c"
+#line 2262 "Dialogs.c"
 	} else {
 		GError* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
@@ -2278,7 +2276,7 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 		app_window_error_message (_tmp15_, NULL);
 #line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp15_);
-#line 2279 "Dialogs.c"
+#line 2277 "Dialogs.c"
 	}
 }
 
@@ -2318,7 +2316,7 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 	_tmp6_ = photos_remaining;
 #line 126 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_) {
-#line 2319 "Dialogs.c"
+#line 2317 "Dialogs.c"
 		const gchar* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -2343,14 +2341,14 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 		_tmp12_ = app_window_affirm_cancel_question (_tmp10_, _tmp11_, NULL, NULL);
 #line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		response = _tmp12_;
-#line 2344 "Dialogs.c"
+#line 2342 "Dialogs.c"
 	} else {
 		const gchar* _tmp13_ = NULL;
 #line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = message;
 #line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		app_window_error_message (_tmp13_, NULL);
-#line 2351 "Dialogs.c"
+#line 2349 "Dialogs.c"
 	}
 #line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = response;
@@ -2358,42 +2356,42 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 	_g_free0 (message);
 #line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2359 "Dialogs.c"
+#line 2357 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_constraint_changed ((ExportDialog*) self);
-#line 2366 "Dialogs.c"
+#line 2364 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_format_changed ((ExportDialog*) self);
-#line 2373 "Dialogs.c"
+#line 2371 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
 #line 216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_pixels_changed ((ExportDialog*) self);
-#line 2380 "Dialogs.c"
+#line 2378 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
 #line 217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_pixels_insert_text ((ExportDialog*) self, new_text, new_text_length, position);
-#line 2387 "Dialogs.c"
+#line 2385 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self) {
 #line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_activate ((ExportDialog*) self);
-#line 2394 "Dialogs.c"
+#line 2392 "Dialogs.c"
 }
 
 
@@ -2477,11 +2475,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	if (_tmp2_) {
 #line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 2478 "Dialogs.c"
+#line 2476 "Dialogs.c"
 	} else {
 #line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 2482 "Dialogs.c"
+#line 2480 "Dialogs.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ExportDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
@@ -2541,7 +2539,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	self->priv->quality_combo = _tmp17_;
 #line 185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ctr = 0;
-#line 2542 "Dialogs.c"
+#line 2540 "Dialogs.c"
 	{
 		JpegQuality* quality_collection = NULL;
 		gint quality_collection_length1 = 0;
@@ -2553,11 +2551,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		quality_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY);
 #line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (quality_it = 0; quality_it < G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY); quality_it = quality_it + 1) {
-#line 2554 "Dialogs.c"
+#line 2552 "Dialogs.c"
 			JpegQuality quality = 0;
 #line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			quality = quality_collection[quality_it];
-#line 2558 "Dialogs.c"
+#line 2556 "Dialogs.c"
 			{
 				GtkComboBoxText* _tmp18_ = NULL;
 				JpegQuality _tmp19_ = 0;
@@ -2587,7 +2585,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 				_tmp24_ = _tmp23_.quality;
 #line 188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp22_ == _tmp24_) {
-#line 2588 "Dialogs.c"
+#line 2586 "Dialogs.c"
 					GtkComboBoxText* _tmp25_ = NULL;
 					gint _tmp26_ = 0;
 #line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2596,13 +2594,13 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 					_tmp26_ = ctr;
 #line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), _tmp26_);
-#line 2597 "Dialogs.c"
+#line 2595 "Dialogs.c"
 				}
 #line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = ctr;
 #line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				ctr = _tmp27_ + 1;
-#line 2603 "Dialogs.c"
+#line 2601 "Dialogs.c"
 			}
 		}
 	}
@@ -2616,7 +2614,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	self->priv->constraint_combo = _tmp28_;
 #line 194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ctr = 0;
-#line 2617 "Dialogs.c"
+#line 2615 "Dialogs.c"
 	{
 		ScaleConstraint* constraint_collection = NULL;
 		gint constraint_collection_length1 = 0;
@@ -2628,11 +2626,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		constraint_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY);
 #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (constraint_it = 0; constraint_it < G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY); constraint_it = constraint_it + 1) {
-#line 2629 "Dialogs.c"
+#line 2627 "Dialogs.c"
 			ScaleConstraint constraint = 0;
 #line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			constraint = constraint_collection[constraint_it];
-#line 2633 "Dialogs.c"
+#line 2631 "Dialogs.c"
 			{
 				GtkComboBoxText* _tmp29_ = NULL;
 				ScaleConstraint _tmp30_ = 0;
@@ -2659,7 +2657,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 				_tmp34_ = export_dialog_current_constraint;
 #line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp33_ == _tmp34_) {
-#line 2660 "Dialogs.c"
+#line 2658 "Dialogs.c"
 					GtkComboBoxText* _tmp35_ = NULL;
 					gint _tmp36_ = 0;
 #line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2668,13 +2666,13 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 					_tmp36_ = ctr;
 #line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), _tmp36_);
-#line 2669 "Dialogs.c"
+#line 2667 "Dialogs.c"
 				}
 #line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp37_ = ctr;
 #line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				ctr = _tmp37_ + 1;
-#line 2675 "Dialogs.c"
+#line 2673 "Dialogs.c"
 			}
 		}
 	}
@@ -2692,7 +2690,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	export_dialog_format_add_option (self, EXPORT_DIALOG_CURRENT_FORMAT_LABEL);
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = photo_file_format_get_writeable (&_tmp39_);
-#line 2693 "Dialogs.c"
+#line 2691 "Dialogs.c"
 	{
 		PhotoFileFormat* format_collection = NULL;
 		gint format_collection_length1 = 0;
@@ -2704,11 +2702,11 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		format_collection_length1 = _tmp39_;
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (format_it = 0; format_it < _tmp39_; format_it = format_it + 1) {
-#line 2705 "Dialogs.c"
+#line 2703 "Dialogs.c"
 			PhotoFileFormat format = 0;
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			format = format_collection[format_it];
-#line 2709 "Dialogs.c"
+#line 2707 "Dialogs.c"
 			{
 				PhotoFileFormat _tmp41_ = 0;
 				PhotoFileFormatProperties* _tmp42_ = NULL;
@@ -2731,12 +2729,12 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 				_g_free0 (_tmp45_);
 #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_photo_file_format_properties_unref0 (_tmp43_);
-#line 2732 "Dialogs.c"
+#line 2730 "Dialogs.c"
 			}
 		}
 #line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		format_collection = (g_free (format_collection), NULL);
-#line 2737 "Dialogs.c"
+#line 2735 "Dialogs.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = (GtkEntry*) gtk_entry_new ();
@@ -2894,7 +2892,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	_tmp85_ = export_dialog_current_constraint;
 #line 254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp85_ == SCALE_CONSTRAINT_ORIGINAL) {
-#line 2895 "Dialogs.c"
+#line 2893 "Dialogs.c"
 		GtkEntry* _tmp86_ = NULL;
 		GtkComboBoxText* _tmp87_ = NULL;
 #line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -2905,7 +2903,7 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 		_tmp87_ = self->priv->quality_combo;
 #line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2906 "Dialogs.c"
+#line 2904 "Dialogs.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = self->priv->ok_button;
@@ -2915,14 +2913,14 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	_g_object_unref0 (config);
 #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 2916 "Dialogs.c"
+#line 2914 "Dialogs.c"
 }
 
 
 ExportDialog* export_dialog_new (const gchar* title) {
 #line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return export_dialog_construct (TYPE_EXPORT_DIALOG, title);
-#line 2923 "Dialogs.c"
+#line 2921 "Dialogs.c"
 }
 
 
@@ -2947,7 +2945,7 @@ static void export_dialog_format_add_option (ExportDialog* self, const gchar* fo
 	_tmp3_ = format_name;
 #line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp2_, _tmp3_);
-#line 2948 "Dialogs.c"
+#line 2946 "Dialogs.c"
 }
 
 
@@ -2960,7 +2958,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 	g_return_if_fail (text != NULL);
 #line 268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	selection_ticker = 0;
-#line 2961 "Dialogs.c"
+#line 2959 "Dialogs.c"
 	{
 		GeeArrayList* _current_text_list = NULL;
 		GeeArrayList* _tmp0_ = NULL;
@@ -2988,7 +2986,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 		_current_text_index = -1;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 2989 "Dialogs.c"
+#line 2987 "Dialogs.c"
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
 			gint _tmp7_ = 0;
@@ -3011,7 +3009,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			if (!(_tmp6_ < _tmp7_)) {
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 3012 "Dialogs.c"
+#line 3010 "Dialogs.c"
 			}
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _current_text_list;
@@ -3027,7 +3025,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			_tmp12_ = text;
 #line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (g_strcmp0 (_tmp11_, _tmp12_) == 0) {
-#line 3028 "Dialogs.c"
+#line 3026 "Dialogs.c"
 				GtkComboBoxText* _tmp13_ = NULL;
 				gint _tmp14_ = 0;
 #line 272 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3042,7 +3040,7 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 				_g_object_unref0 (_current_text_list);
 #line 273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return;
-#line 3043 "Dialogs.c"
+#line 3041 "Dialogs.c"
 			}
 #line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = selection_ticker;
@@ -3050,17 +3048,17 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			selection_ticker = _tmp15_ + 1;
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (current_text);
-#line 3051 "Dialogs.c"
+#line 3049 "Dialogs.c"
 		}
 #line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_text_list);
-#line 3055 "Dialogs.c"
+#line 3053 "Dialogs.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = text;
 #line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_error ("Dialogs.vala:278: format_set_active_text: text '%s' isn't in combo box", _tmp16_);
-#line 3061 "Dialogs.c"
+#line 3059 "Dialogs.c"
 }
 
 
@@ -3092,7 +3090,7 @@ static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
 	if (_tmp2_ < EXPORT_DIALOG_NUM_SPECIAL_FORMATS) {
 #line 284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		index = EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
-#line 3093 "Dialogs.c"
+#line 3091 "Dialogs.c"
 	}
 #line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = index;
@@ -3116,7 +3114,7 @@ static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
 	writeable_formats = (g_free (writeable_formats), NULL);
 #line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 3117 "Dialogs.c"
+#line 3115 "Dialogs.c"
 }
 
 
@@ -3136,7 +3134,7 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 	switch (_tmp1_) {
 #line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 3137 "Dialogs.c"
+#line 3135 "Dialogs.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3145,11 +3143,11 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 			result = _tmp2_;
 #line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3146 "Dialogs.c"
+#line 3144 "Dialogs.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 3150 "Dialogs.c"
+#line 3148 "Dialogs.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3158,11 +3156,11 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 			result = _tmp3_;
 #line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3159 "Dialogs.c"
+#line 3157 "Dialogs.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 3163 "Dialogs.c"
+#line 3161 "Dialogs.c"
 		{
 			ExportFormatParameters _tmp4_ = {0};
 			PhotoFileFormat _tmp5_ = 0;
@@ -3188,14 +3186,14 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 			result = _tmp9_;
 #line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3189 "Dialogs.c"
+#line 3187 "Dialogs.c"
 		}
 		default:
 		{
 #line 303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_error ("Dialogs.vala:303: get_label_for_parameters: unrecognized export format" \
 " mode");
-#line 3195 "Dialogs.c"
+#line 3193 "Dialogs.c"
 		}
 	}
 }
@@ -3227,7 +3225,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	_tmp1_ = _tmp0_.mode;
 #line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ != EXPORT_FORMAT_MODE_LAST) {
-#line 3227 "Dialogs.c"
+#line 3225 "Dialogs.c"
 		ScaleConstraint _tmp2_ = 0;
 		GtkComboBoxText* _tmp3_ = NULL;
 #line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3240,7 +3238,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp3_ = self->priv->constraint_combo;
 #line 318 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 3240 "Dialogs.c"
+#line 3238 "Dialogs.c"
 	}
 #line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = *parameters;
@@ -3248,13 +3246,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	_tmp5_ = _tmp4_.mode;
 #line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ == EXPORT_FORMAT_MODE_LAST) {
-#line 3248 "Dialogs.c"
+#line 3246 "Dialogs.c"
 		ExportFormatParameters _tmp6_ = {0};
 #line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = export_dialog_current_parameters;
 #line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*parameters = _tmp6_;
-#line 3254 "Dialogs.c"
+#line 3252 "Dialogs.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
 		ExportFormatParameters _tmp8_ = {0};
@@ -3265,7 +3263,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp9_ = _tmp8_.mode;
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_ == EXPORT_FORMAT_MODE_SPECIFIED) {
-#line 3265 "Dialogs.c"
+#line 3263 "Dialogs.c"
 			ExportFormatParameters _tmp10_ = {0};
 			PhotoFileFormat _tmp11_ = 0;
 			gboolean _tmp12_ = FALSE;
@@ -3277,21 +3275,21 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_tmp12_ = photo_file_format_can_write (_tmp11_);
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = !_tmp12_;
-#line 3277 "Dialogs.c"
+#line 3275 "Dialogs.c"
 		} else {
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = FALSE;
-#line 3281 "Dialogs.c"
+#line 3279 "Dialogs.c"
 		}
 #line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp7_) {
-#line 3285 "Dialogs.c"
+#line 3283 "Dialogs.c"
 			PhotoFileFormat _tmp13_ = 0;
 #line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = photo_file_format_get_system_default_format ();
 #line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			(*parameters).specified_format = _tmp13_;
-#line 3291 "Dialogs.c"
+#line 3289 "Dialogs.c"
 		}
 	}
 #line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3314,7 +3312,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	_tmp18_ = ok;
 #line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp18_) {
-#line 3314 "Dialogs.c"
+#line 3312 "Dialogs.c"
 		gint index = 0;
 		GtkComboBoxText* _tmp19_ = NULL;
 		gint _tmp20_ = 0;
@@ -3385,13 +3383,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp28_ = _vala_constraint;
 #line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp28_ != SCALE_CONSTRAINT_ORIGINAL) {
-#line 3385 "Dialogs.c"
+#line 3383 "Dialogs.c"
 			gint _tmp29_ = 0;
 #line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = _vala_scale;
 #line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_assert (_tmp29_ > 0, "scale > 0");
-#line 3391 "Dialogs.c"
+#line 3389 "Dialogs.c"
 		}
 #line 339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = _vala_scale;
@@ -3405,7 +3403,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_tmp34_ = _tmp33_;
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp34_) {
-#line 3405 "Dialogs.c"
+#line 3403 "Dialogs.c"
 			GtkSwitch* _tmp35_ = NULL;
 			gboolean _tmp36_ = FALSE;
 			gboolean _tmp37_ = FALSE;
@@ -3417,11 +3415,11 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_tmp37_ = _tmp36_;
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = _tmp37_;
-#line 3417 "Dialogs.c"
+#line 3415 "Dialogs.c"
 		} else {
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = FALSE;
-#line 3421 "Dialogs.c"
+#line 3419 "Dialogs.c"
 		}
 #line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		(*parameters).export_metadata = _tmp31_;
@@ -3437,7 +3435,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		_g_free0 (_tmp40_);
 #line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp41_) {
-#line 3437 "Dialogs.c"
+#line 3435 "Dialogs.c"
 			ExportFormatMode _tmp42_ = 0;
 #line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_UNMODIFIED;
@@ -3445,7 +3443,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_tmp42_ = export_dialog_current_parameters.mode;
 #line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			(*parameters).mode = _tmp42_;
-#line 3445 "Dialogs.c"
+#line 3443 "Dialogs.c"
 		} else {
 			GtkComboBoxText* _tmp43_ = NULL;
 			gchar* _tmp44_ = NULL;
@@ -3463,7 +3461,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 			_g_free0 (_tmp45_);
 #line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp46_) {
-#line 3463 "Dialogs.c"
+#line 3461 "Dialogs.c"
 				ExportFormatMode _tmp47_ = 0;
 #line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_CURRENT;
@@ -3471,7 +3469,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 				_tmp47_ = export_dialog_current_parameters.mode;
 #line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				(*parameters).mode = _tmp47_;
-#line 3471 "Dialogs.c"
+#line 3469 "Dialogs.c"
 			} else {
 				ExportFormatMode _tmp48_ = 0;
 				PhotoFileFormat _tmp49_ = 0;
@@ -3498,7 +3496,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 				_tmp52_ = _tmp51_.specified_format;
 #line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp52_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 3498 "Dialogs.c"
+#line 3496 "Dialogs.c"
 					GtkComboBoxText* _tmp53_ = NULL;
 					gint _tmp54_ = 0;
 					JpegQuality _tmp55_ = 0;
@@ -3515,7 +3513,7 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 					_tmp56_ = export_dialog_current_parameters.quality;
 #line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					(*parameters).quality = _tmp56_;
-#line 3515 "Dialogs.c"
+#line 3513 "Dialogs.c"
 				}
 			}
 		}
@@ -3569,13 +3567,13 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		configuration_facade_set_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp73_);
 #line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (config);
-#line 3569 "Dialogs.c"
+#line 3567 "Dialogs.c"
 	} else {
 #line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_scale = 0;
 #line 364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_constraint = SCALE_CONSTRAINT_ORIGINAL;
-#line 3575 "Dialogs.c"
+#line 3573 "Dialogs.c"
 	}
 #line 367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -3585,17 +3583,17 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	if (scale) {
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*scale = _vala_scale;
-#line 3585 "Dialogs.c"
+#line 3583 "Dialogs.c"
 	}
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (constraint) {
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*constraint = _vala_constraint;
-#line 3591 "Dialogs.c"
+#line 3589 "Dialogs.c"
 	}
 #line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 3595 "Dialogs.c"
+#line 3593 "Dialogs.c"
 }
 
 
@@ -3641,7 +3639,7 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint
 	_tmp5_ = widget;
 #line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 3641 "Dialogs.c"
+#line 3639 "Dialogs.c"
 		GtkLabel* _tmp6_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
 #line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -3650,7 +3648,7 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint
 		_tmp7_ = widget;
 #line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_mnemonic_widget (_tmp6_, _tmp7_);
-#line 3650 "Dialogs.c"
+#line 3648 "Dialogs.c"
 	}
 #line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->table;
@@ -3664,7 +3662,7 @@ static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint
 	gtk_grid_attach (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_, _tmp11_, 1, 1);
 #line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (new_label);
-#line 3664 "Dialogs.c"
+#line 3662 "Dialogs.c"
 }
 
 
@@ -3707,7 +3705,7 @@ static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gi
 	_tmp7_ = y;
 #line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_grid_attach (_tmp4_, _tmp5_, _tmp6_, _tmp7_, 1, 1);
-#line 3707 "Dialogs.c"
+#line 3705 "Dialogs.c"
 }
 
 
@@ -3775,17 +3773,17 @@ static void export_dialog_on_constraint_changed (ExportDialog* self) {
 	_tmp14_ = original;
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp14_) {
-#line 3775 "Dialogs.c"
+#line 3773 "Dialogs.c"
 		gboolean _tmp15_ = FALSE;
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = jpeg;
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp15_;
-#line 3781 "Dialogs.c"
+#line 3779 "Dialogs.c"
 	} else {
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = FALSE;
-#line 3785 "Dialogs.c"
+#line 3783 "Dialogs.c"
 	}
 #line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->quality_combo;
@@ -3795,17 +3793,17 @@ static void export_dialog_on_constraint_changed (ExportDialog* self) {
 	_tmp17_ = original;
 #line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp17_) {
-#line 3795 "Dialogs.c"
+#line 3793 "Dialogs.c"
 		GtkWidget* _tmp18_ = NULL;
 #line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->ok_button;
 #line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (_tmp18_, TRUE);
-#line 3801 "Dialogs.c"
+#line 3799 "Dialogs.c"
 	} else {
 #line 402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_dialog_on_pixels_changed (self);
-#line 3805 "Dialogs.c"
+#line 3803 "Dialogs.c"
 	}
 }
 
@@ -3841,7 +3839,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 	_g_free0 (_tmp5_);
 #line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_) {
-#line 3841 "Dialogs.c"
+#line 3839 "Dialogs.c"
 		GtkComboBoxText* _tmp7_ = NULL;
 		GtkComboBoxText* _tmp8_ = NULL;
 		GtkComboBoxText* _tmp9_ = NULL;
@@ -3872,7 +3870,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 		_tmp12_ = self->priv->export_metadata;
 #line 418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3872 "Dialogs.c"
+#line 3870 "Dialogs.c"
 	} else {
 		GtkComboBoxText* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
@@ -3890,7 +3888,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 		_g_free0 (_tmp15_);
 #line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp16_) {
-#line 3890 "Dialogs.c"
+#line 3888 "Dialogs.c"
 			GtkComboBoxText* _tmp17_ = NULL;
 			GtkComboBoxText* _tmp18_ = NULL;
 			GtkEntry* _tmp19_ = NULL;
@@ -3914,7 +3912,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			_tmp21_ = self->priv->export_metadata;
 #line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3914 "Dialogs.c"
+#line 3912 "Dialogs.c"
 		} else {
 			GtkComboBoxText* _tmp22_ = NULL;
 			gboolean jpeg = FALSE;
@@ -3935,17 +3933,17 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			_tmp25_ = original;
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp25_) {
-#line 3935 "Dialogs.c"
+#line 3933 "Dialogs.c"
 				gboolean _tmp26_ = FALSE;
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = jpeg;
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = _tmp26_;
-#line 3941 "Dialogs.c"
+#line 3939 "Dialogs.c"
 			} else {
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = FALSE;
-#line 3945 "Dialogs.c"
+#line 3943 "Dialogs.c"
 			}
 #line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = self->priv->quality_combo;
@@ -3955,7 +3953,7 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			_tmp28_ = self->priv->export_metadata;
 #line 437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3955 "Dialogs.c"
+#line 3953 "Dialogs.c"
 		}
 	}
 }
@@ -3966,7 +3964,7 @@ static void export_dialog_on_activate (ExportDialog* self) {
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
 #line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 3966 "Dialogs.c"
+#line 3964 "Dialogs.c"
 }
 
 
@@ -3983,7 +3981,7 @@ static void export_dialog_on_pixels_changed (ExportDialog* self) {
 	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (((gint) _tmp2_) > 0) {
-#line 3983 "Dialogs.c"
+#line 3981 "Dialogs.c"
 		GtkEntry* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
@@ -3995,17 +3993,17 @@ static void export_dialog_on_pixels_changed (ExportDialog* self) {
 		_tmp5_ = atoi (_tmp4_);
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp5_ > 0;
-#line 3995 "Dialogs.c"
+#line 3993 "Dialogs.c"
 	} else {
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 3999 "Dialogs.c"
+#line 3997 "Dialogs.c"
 	}
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = self->priv->ok_button;
 #line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (_tmp6_, _tmp0_);
-#line 4005 "Dialogs.c"
+#line 4003 "Dialogs.c"
 }
 
 
@@ -4023,7 +4021,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 4023 "Dialogs.c"
+#line 4021 "Dialogs.c"
 }
 
 
@@ -4046,7 +4044,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	if (_tmp0_) {
 #line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 4046 "Dialogs.c"
+#line 4044 "Dialogs.c"
 	}
 #line 454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->in_insert = TRUE;
@@ -4054,7 +4052,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	_tmp1_ = length;
 #line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == -1) {
-#line 4054 "Dialogs.c"
+#line 4052 "Dialogs.c"
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
@@ -4066,25 +4064,25 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 		_tmp4_ = _tmp3_;
 #line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		length = (gint) _tmp4_;
-#line 4066 "Dialogs.c"
+#line 4064 "Dialogs.c"
 	}
 #line 460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_strdup ("");
 #line 460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	new_text = _tmp5_;
-#line 4072 "Dialogs.c"
+#line 4070 "Dialogs.c"
 	{
 		gint ctr = 0;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ctr = 0;
-#line 4077 "Dialogs.c"
+#line 4075 "Dialogs.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = TRUE;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 4084 "Dialogs.c"
+#line 4082 "Dialogs.c"
 				gint _tmp8_ = 0;
 				gint _tmp9_ = 0;
 				const gchar* _tmp10_ = NULL;
@@ -4093,13 +4091,13 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 				gboolean _tmp13_ = FALSE;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
-#line 4093 "Dialogs.c"
+#line 4091 "Dialogs.c"
 					gint _tmp7_ = 0;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = ctr;
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					ctr = _tmp7_ + 1;
-#line 4099 "Dialogs.c"
+#line 4097 "Dialogs.c"
 				}
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
@@ -4111,7 +4109,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 				if (!(_tmp8_ < _tmp9_)) {
 #line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 4111 "Dialogs.c"
+#line 4109 "Dialogs.c"
 				}
 #line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = text;
@@ -4123,7 +4121,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 				_tmp13_ = g_ascii_isdigit (_tmp12_);
 #line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_) {
-#line 4123 "Dialogs.c"
+#line 4121 "Dialogs.c"
 					const gchar* _tmp14_ = NULL;
 					const gchar* _tmp15_ = NULL;
 					gint _tmp16_ = 0;
@@ -4151,7 +4149,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 					new_text = _tmp20_;
 #line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_free0 (_tmp19_);
-#line 4151 "Dialogs.c"
+#line 4149 "Dialogs.c"
 				}
 			}
 		}
@@ -4164,7 +4162,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	_tmp23_ = _tmp22_;
 #line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ > 0) {
-#line 4164 "Dialogs.c"
+#line 4162 "Dialogs.c"
 		GtkEntry* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
@@ -4182,7 +4180,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 		_tmp28_ = _tmp27_;
 #line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 4182 "Dialogs.c"
+#line 4180 "Dialogs.c"
 	}
 #line 470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->pixels_entry;
@@ -4192,7 +4190,7 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	self->priv->in_insert = FALSE;
 #line 449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (new_text);
-#line 4192 "Dialogs.c"
+#line 4190 "Dialogs.c"
 }
 
 
@@ -4210,7 +4208,7 @@ static void export_dialog_class_init (ExportDialogClass * klass) {
 	export_dialog_current_parameters = _tmp0_;
 #line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_current_scale = EXPORT_DIALOG_DEFAULT_SCALE;
-#line 4210 "Dialogs.c"
+#line 4208 "Dialogs.c"
 }
 
 
@@ -4231,7 +4229,7 @@ static void export_dialog_instance_init (ExportDialog * self) {
 	self->priv->format_options = _tmp1_;
 #line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->in_insert = FALSE;
-#line 4231 "Dialogs.c"
+#line 4229 "Dialogs.c"
 }
 
 
@@ -4257,7 +4255,7 @@ static void export_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->ok_button);
 #line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (export_dialog_parent_class)->finalize (obj);
-#line 4257 "Dialogs.c"
+#line 4255 "Dialogs.c"
 }
 
 
@@ -4299,25 +4297,25 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 		result = NULL;
 #line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 4299 "Dialogs.c"
+#line 4297 "Dialogs.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup ("");
 #line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	list = _tmp3_;
-#line 4305 "Dialogs.c"
+#line 4303 "Dialogs.c"
 	{
 		gint ctr = 0;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ctr = 0;
-#line 4310 "Dialogs.c"
+#line 4308 "Dialogs.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = TRUE;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 4317 "Dialogs.c"
+#line 4315 "Dialogs.c"
 				gboolean _tmp6_ = FALSE;
 				gint _tmp7_ = 0;
 				const gchar* _tmp12_ = NULL;
@@ -4328,13 +4326,13 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				gchar* _tmp27_ = NULL;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp4_) {
-#line 4328 "Dialogs.c"
+#line 4326 "Dialogs.c"
 					gint _tmp5_ = 0;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp5_ = ctr;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					ctr = _tmp5_ + 1;
-#line 4334 "Dialogs.c"
+#line 4332 "Dialogs.c"
 				}
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp4_ = FALSE;
@@ -4342,7 +4340,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				_tmp7_ = ctr;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp7_ < IMPORT_UI_REPORT_FAILURE_COUNT) {
-#line 4342 "Dialogs.c"
+#line 4340 "Dialogs.c"
 					gint _tmp8_ = 0;
 					GeeList* _tmp9_ = NULL;
 					gint _tmp10_ = 0;
@@ -4357,23 +4355,23 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 					_tmp11_ = _tmp10_;
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = _tmp8_ < _tmp11_;
-#line 4357 "Dialogs.c"
+#line 4355 "Dialogs.c"
 				} else {
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = FALSE;
-#line 4361 "Dialogs.c"
+#line 4359 "Dialogs.c"
 				}
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
 #line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 4367 "Dialogs.c"
+#line 4365 "Dialogs.c"
 				}
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = show_dest_id;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_) {
-#line 4373 "Dialogs.c"
+#line 4371 "Dialogs.c"
 					GeeList* _tmp14_ = NULL;
 					gint _tmp15_ = 0;
 					gpointer _tmp16_ = NULL;
@@ -4393,7 +4391,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 					_tmp12_ = _tmp18_;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_batch_import_result_unref0 (_tmp17_);
-#line 4393 "Dialogs.c"
+#line 4391 "Dialogs.c"
 				} else {
 					GeeList* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
@@ -4414,7 +4412,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 					_tmp12_ = _tmp23_;
 #line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_batch_import_result_unref0 (_tmp22_);
-#line 4414 "Dialogs.c"
+#line 4412 "Dialogs.c"
 				}
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = list;
@@ -4430,7 +4428,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				list = _tmp27_;
 #line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp26_);
-#line 4430 "Dialogs.c"
+#line 4428 "Dialogs.c"
 			}
 		}
 	}
@@ -4446,7 +4444,7 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 	_tmp31_ = remaining;
 #line 493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp31_ > 0) {
-#line 4446 "Dialogs.c"
+#line 4444 "Dialogs.c"
 		const gchar* _tmp32_ = NULL;
 		const gchar* _tmp33_ = NULL;
 		gint _tmp34_ = 0;
@@ -4471,13 +4469,13 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 		list = _tmp37_;
 #line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp36_);
-#line 4471 "Dialogs.c"
+#line 4469 "Dialogs.c"
 	}
 #line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = list;
 #line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4477 "Dialogs.c"
+#line 4475 "Dialogs.c"
 }
 
 
@@ -4523,21 +4521,21 @@ ImportUIQuestionParams* import_ui_question_params_construct (GType object_type,
 	self->no_button = _tmp5_;
 #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 4523 "Dialogs.c"
+#line 4521 "Dialogs.c"
 }
 
 
 ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, const gchar* yes_button, const gchar* no_button) {
 #line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return import_ui_question_params_construct (IMPORT_UI_TYPE_QUESTION_PARAMS, question, yes_button, no_button);
-#line 4530 "Dialogs.c"
+#line 4528 "Dialogs.c"
 }
 
 
 static void import_ui_value_question_params_init (GValue* value) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 4537 "Dialogs.c"
+#line 4535 "Dialogs.c"
 }
 
 
@@ -4546,7 +4544,7 @@ static void import_ui_value_question_params_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (value->data[0].v_pointer);
-#line 4546 "Dialogs.c"
+#line 4544 "Dialogs.c"
 	}
 }
 
@@ -4556,11 +4554,11 @@ static void import_ui_value_question_params_copy_value (const GValue* src_value,
 	if (src_value->data[0].v_pointer) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = import_ui_question_params_ref (src_value->data[0].v_pointer);
-#line 4556 "Dialogs.c"
+#line 4554 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4560 "Dialogs.c"
+#line 4558 "Dialogs.c"
 	}
 }
 
@@ -4568,37 +4566,37 @@ static void import_ui_value_question_params_copy_value (const GValue* src_value,
 static gpointer import_ui_value_question_params_peek_pointer (const GValue* value) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 4568 "Dialogs.c"
+#line 4566 "Dialogs.c"
 }
 
 
 static gchar* import_ui_value_question_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 4575 "Dialogs.c"
+#line 4573 "Dialogs.c"
 		ImportUIQuestionParams* object;
 		object = collect_values[0].v_pointer;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4582 "Dialogs.c"
+#line 4580 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4586 "Dialogs.c"
+#line 4584 "Dialogs.c"
 		}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = import_ui_question_params_ref (object);
-#line 4590 "Dialogs.c"
+#line 4588 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4594 "Dialogs.c"
+#line 4592 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 4598 "Dialogs.c"
+#line 4596 "Dialogs.c"
 }
 
 
@@ -4609,25 +4607,25 @@ static gchar* import_ui_value_question_params_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4609 "Dialogs.c"
+#line 4607 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 4615 "Dialogs.c"
+#line 4613 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4619 "Dialogs.c"
+#line 4617 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = import_ui_question_params_ref (value->data[0].v_pointer);
-#line 4623 "Dialogs.c"
+#line 4621 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 4627 "Dialogs.c"
+#line 4625 "Dialogs.c"
 }
 
 
@@ -4641,7 +4639,7 @@ GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 4641 "Dialogs.c"
+#line 4639 "Dialogs.c"
 }
 
 
@@ -4650,7 +4648,7 @@ gpointer import_ui_value_get_question_params (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS), NULL);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 4650 "Dialogs.c"
+#line 4648 "Dialogs.c"
 }
 
 
@@ -4670,17 +4668,17 @@ void import_ui_value_set_question_params (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_ref (value->data[0].v_pointer);
-#line 4670 "Dialogs.c"
+#line 4668 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4674 "Dialogs.c"
+#line 4672 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (old);
-#line 4680 "Dialogs.c"
+#line 4678 "Dialogs.c"
 	}
 }
 
@@ -4699,17 +4697,17 @@ void import_ui_value_take_question_params (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 4699 "Dialogs.c"
+#line 4697 "Dialogs.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4703 "Dialogs.c"
+#line 4701 "Dialogs.c"
 	}
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (old);
-#line 4709 "Dialogs.c"
+#line 4707 "Dialogs.c"
 	}
 }
 
@@ -4719,14 +4717,14 @@ static void import_ui_question_params_class_init (ImportUIQuestionParamsClass *
 	import_ui_question_params_parent_class = g_type_class_peek_parent (klass);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((ImportUIQuestionParamsClass *) klass)->finalize = import_ui_question_params_finalize;
-#line 4719 "Dialogs.c"
+#line 4717 "Dialogs.c"
 }
 
 
 static void import_ui_question_params_instance_init (ImportUIQuestionParams * self) {
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 4726 "Dialogs.c"
+#line 4724 "Dialogs.c"
 }
 
 
@@ -4742,7 +4740,7 @@ static void import_ui_question_params_finalize (ImportUIQuestionParams* obj) {
 	_g_free0 (self->yes_button);
 #line 502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->no_button);
-#line 4742 "Dialogs.c"
+#line 4740 "Dialogs.c"
 }
 
 
@@ -4767,7 +4765,7 @@ gpointer import_ui_question_params_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 4767 "Dialogs.c"
+#line 4765 "Dialogs.c"
 }
 
 
@@ -4780,7 +4778,7 @@ void import_ui_question_params_unref (gpointer instance) {
 		IMPORT_UI_QUESTION_PARAMS_GET_CLASS (self)->finalize (self);
 #line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4780 "Dialogs.c"
+#line 4778 "Dialogs.c"
 	}
 }
 
@@ -4789,7 +4787,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 	gboolean result = FALSE;
 #line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE);
-#line 4789 "Dialogs.c"
+#line 4787 "Dialogs.c"
 	{
 		GeeIterator* _current_result_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -4802,7 +4800,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 		_current_result_it = _tmp1_;
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 4802 "Dialogs.c"
+#line 4800 "Dialogs.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			BatchImportResult* current_result = NULL;
@@ -4819,7 +4817,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 			if (!_tmp3_) {
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 4819 "Dialogs.c"
+#line 4817 "Dialogs.c"
 			}
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _current_result_it;
@@ -4833,7 +4831,7 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 			_tmp8_ = _tmp7_->file;
 #line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp8_ != NULL) {
-#line 4833 "Dialogs.c"
+#line 4831 "Dialogs.c"
 				BatchImportResult* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
 				PhotoFileFormat _tmp11_ = 0;
@@ -4845,11 +4843,11 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 				_tmp11_ = photo_file_format_get_by_file_extension (_tmp10_);
 #line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = _tmp11_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 4845 "Dialogs.c"
+#line 4843 "Dialogs.c"
 			} else {
 #line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 4849 "Dialogs.c"
+#line 4847 "Dialogs.c"
 			}
 #line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp6_) {
@@ -4861,21 +4859,21 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 				_g_object_unref0 (_current_result_it);
 #line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4861 "Dialogs.c"
+#line 4859 "Dialogs.c"
 			}
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_batch_import_result_unref0 (current_result);
-#line 4865 "Dialogs.c"
+#line 4863 "Dialogs.c"
 		}
 #line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_result_it);
-#line 4869 "Dialogs.c"
+#line 4867 "Dialogs.c"
 	}
 #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
 #line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4875 "Dialogs.c"
+#line 4873 "Dialogs.c"
 }
 
 
@@ -4883,7 +4881,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 	gboolean result = FALSE;
 #line 521 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE);
-#line 4883 "Dialogs.c"
+#line 4881 "Dialogs.c"
 	{
 		GeeIterator* _current_result_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -4896,7 +4894,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 		_current_result_it = _tmp1_;
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 4896 "Dialogs.c"
+#line 4894 "Dialogs.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			BatchImportResult* current_result = NULL;
@@ -4913,7 +4911,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 			if (!_tmp3_) {
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 4913 "Dialogs.c"
+#line 4911 "Dialogs.c"
 			}
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _current_result_it;
@@ -4927,7 +4925,7 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 			_tmp8_ = _tmp7_->file;
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp8_ != NULL) {
-#line 4927 "Dialogs.c"
+#line 4925 "Dialogs.c"
 				BatchImportResult* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
@@ -4939,11 +4937,11 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 				_tmp11_ = video_reader_is_supported_video_file (_tmp10_);
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = _tmp11_;
-#line 4939 "Dialogs.c"
+#line 4937 "Dialogs.c"
 			} else {
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 4943 "Dialogs.c"
+#line 4941 "Dialogs.c"
 			}
 #line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp6_) {
@@ -4955,21 +4953,21 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 				_g_object_unref0 (_current_result_it);
 #line 524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4955 "Dialogs.c"
+#line 4953 "Dialogs.c"
 			}
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_batch_import_result_unref0 (current_result);
-#line 4959 "Dialogs.c"
+#line 4957 "Dialogs.c"
 		}
 #line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_result_it);
-#line 4963 "Dialogs.c"
+#line 4961 "Dialogs.c"
 	}
 #line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
 #line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4969 "Dialogs.c"
+#line 4967 "Dialogs.c"
 }
 
 
@@ -5009,21 +5007,21 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 	_tmp5_ = has_photos;
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 5009 "Dialogs.c"
+#line 5007 "Dialogs.c"
 		gboolean _tmp6_ = FALSE;
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = has_videos;
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp6_;
-#line 5015 "Dialogs.c"
+#line 5013 "Dialogs.c"
 	} else {
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = FALSE;
-#line 5019 "Dialogs.c"
+#line 5017 "Dialogs.c"
 	}
 #line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 5023 "Dialogs.c"
+#line 5021 "Dialogs.c"
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 #line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5034,14 +5032,14 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 		result = _tmp8_;
 #line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 5034 "Dialogs.c"
+#line 5032 "Dialogs.c"
 	} else {
 		gboolean _tmp9_ = FALSE;
 #line 536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = has_photos;
 #line 536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_) {
-#line 5041 "Dialogs.c"
+#line 5039 "Dialogs.c"
 			const gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
 #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5052,14 +5050,14 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 			result = _tmp11_;
 #line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 5052 "Dialogs.c"
+#line 5050 "Dialogs.c"
 		} else {
 			gboolean _tmp12_ = FALSE;
 #line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = has_videos;
 #line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp12_) {
-#line 5059 "Dialogs.c"
+#line 5057 "Dialogs.c"
 				const gchar* _tmp13_ = NULL;
 				gchar* _tmp14_ = NULL;
 #line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5070,7 +5068,7 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 				result = _tmp14_;
 #line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 5070 "Dialogs.c"
+#line 5068 "Dialogs.c"
 			} else {
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
@@ -5082,7 +5080,7 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 				result = _tmp16_;
 #line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 5082 "Dialogs.c"
+#line 5080 "Dialogs.c"
 			}
 		}
 	}
@@ -5315,7 +5313,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp50_ = _tmp49_;
 #line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp50_ > 0) {
-#line 5315 "Dialogs.c"
+#line 5313 "Dialogs.c"
 		GString* _tmp51_ = NULL;
 		const gchar* _tmp52_ = NULL;
 		gchar* _tmp53_ = NULL;
@@ -5332,7 +5330,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp51_, _tmp54_);
 #line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp54_);
-#line 5332 "Dialogs.c"
+#line 5330 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp55_ = NULL;
@@ -5363,7 +5361,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5363 "Dialogs.c"
+#line 5361 "Dialogs.c"
 				gint _tmp61_ = 0;
 				gint _tmp62_ = 0;
 				gint _tmp63_ = 0;
@@ -5403,7 +5401,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp62_ < _tmp63_)) {
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5403 "Dialogs.c"
+#line 5401 "Dialogs.c"
 				}
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp64_ = _result_list;
@@ -5473,11 +5471,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp85_, _tmp86_);
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5473 "Dialogs.c"
+#line 5471 "Dialogs.c"
 			}
 #line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5477 "Dialogs.c"
+#line 5475 "Dialogs.c"
 		}
 	}
 #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5490,7 +5488,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp90_ = _tmp89_;
 #line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp90_ > 0) {
-#line 5490 "Dialogs.c"
+#line 5488 "Dialogs.c"
 		GString* _tmp91_ = NULL;
 		const gchar* _tmp92_ = NULL;
 		gchar* _tmp93_ = NULL;
@@ -5507,7 +5505,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp91_, _tmp94_);
 #line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp94_);
-#line 5507 "Dialogs.c"
+#line 5505 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp95_ = NULL;
@@ -5538,7 +5536,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5538 "Dialogs.c"
+#line 5536 "Dialogs.c"
 				gint _tmp101_ = 0;
 				gint _tmp102_ = 0;
 				gint _tmp103_ = 0;
@@ -5574,7 +5572,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp102_ < _tmp103_)) {
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5574 "Dialogs.c"
+#line 5572 "Dialogs.c"
 				}
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp104_ = _result_list;
@@ -5632,11 +5630,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp121_, _tmp122_);
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5632 "Dialogs.c"
+#line 5630 "Dialogs.c"
 			}
 #line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5636 "Dialogs.c"
+#line 5634 "Dialogs.c"
 		}
 	}
 #line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5649,7 +5647,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp126_ = _tmp125_;
 #line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp126_ > 0) {
-#line 5649 "Dialogs.c"
+#line 5647 "Dialogs.c"
 		GString* _tmp127_ = NULL;
 		const gchar* _tmp128_ = NULL;
 		gchar* _tmp129_ = NULL;
@@ -5667,7 +5665,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp127_, _tmp130_);
 #line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp130_);
-#line 5666 "Dialogs.c"
+#line 5664 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp131_ = NULL;
@@ -5698,7 +5696,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5697 "Dialogs.c"
+#line 5695 "Dialogs.c"
 				gint _tmp137_ = 0;
 				gint _tmp138_ = 0;
 				gint _tmp139_ = 0;
@@ -5734,7 +5732,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp138_ < _tmp139_)) {
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5733 "Dialogs.c"
+#line 5731 "Dialogs.c"
 				}
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp140_ = _result_list;
@@ -5792,11 +5790,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp157_, _tmp158_);
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5791 "Dialogs.c"
+#line 5789 "Dialogs.c"
 			}
 #line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5795 "Dialogs.c"
+#line 5793 "Dialogs.c"
 		}
 	}
 #line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5809,7 +5807,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp162_ = _tmp161_;
 #line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp162_ > 0) {
-#line 5808 "Dialogs.c"
+#line 5806 "Dialogs.c"
 		GString* _tmp163_ = NULL;
 		const gchar* _tmp164_ = NULL;
 		gchar* _tmp165_ = NULL;
@@ -5827,7 +5825,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp163_, _tmp166_);
 #line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp166_);
-#line 5825 "Dialogs.c"
+#line 5823 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp167_ = NULL;
@@ -5858,7 +5856,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5856 "Dialogs.c"
+#line 5854 "Dialogs.c"
 				gint _tmp173_ = 0;
 				gint _tmp174_ = 0;
 				gint _tmp175_ = 0;
@@ -5894,7 +5892,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp174_ < _tmp175_)) {
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5892 "Dialogs.c"
+#line 5890 "Dialogs.c"
 				}
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp176_ = _result_list;
@@ -5952,11 +5950,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp193_, _tmp194_);
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5950 "Dialogs.c"
+#line 5948 "Dialogs.c"
 			}
 #line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5954 "Dialogs.c"
+#line 5952 "Dialogs.c"
 		}
 	}
 #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -5969,7 +5967,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp198_ = _tmp197_;
 #line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp198_ > 0) {
-#line 5967 "Dialogs.c"
+#line 5965 "Dialogs.c"
 		GString* _tmp199_ = NULL;
 		const gchar* _tmp200_ = NULL;
 		gchar* _tmp201_ = NULL;
@@ -5987,7 +5985,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp199_, _tmp202_);
 #line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp202_);
-#line 5984 "Dialogs.c"
+#line 5982 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp203_ = NULL;
@@ -6018,7 +6016,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6015 "Dialogs.c"
+#line 6013 "Dialogs.c"
 				gint _tmp209_ = 0;
 				gint _tmp210_ = 0;
 				gint _tmp211_ = 0;
@@ -6059,7 +6057,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp210_ < _tmp211_)) {
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6056 "Dialogs.c"
+#line 6054 "Dialogs.c"
 				}
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp212_ = _result_list;
@@ -6129,11 +6127,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp234_, _tmp235_);
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6126 "Dialogs.c"
+#line 6124 "Dialogs.c"
 			}
 #line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6130 "Dialogs.c"
+#line 6128 "Dialogs.c"
 		}
 	}
 #line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6146,7 +6144,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp239_ = _tmp238_;
 #line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp239_ > 0) {
-#line 6143 "Dialogs.c"
+#line 6141 "Dialogs.c"
 		GString* _tmp240_ = NULL;
 		const gchar* _tmp241_ = NULL;
 		gchar* _tmp242_ = NULL;
@@ -6163,7 +6161,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp240_, _tmp243_);
 #line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp243_);
-#line 6160 "Dialogs.c"
+#line 6158 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp244_ = NULL;
@@ -6194,7 +6192,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6191 "Dialogs.c"
+#line 6189 "Dialogs.c"
 				gint _tmp250_ = 0;
 				gint _tmp251_ = 0;
 				gint _tmp252_ = 0;
@@ -6230,7 +6228,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp251_ < _tmp252_)) {
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6227 "Dialogs.c"
+#line 6225 "Dialogs.c"
 				}
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp253_ = _result_list;
@@ -6288,11 +6286,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp270_, _tmp271_);
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6285 "Dialogs.c"
+#line 6283 "Dialogs.c"
 			}
 #line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6289 "Dialogs.c"
+#line 6287 "Dialogs.c"
 		}
 	}
 #line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6305,7 +6303,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_tmp275_ = _tmp274_;
 #line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp275_ > 0) {
-#line 6302 "Dialogs.c"
+#line 6300 "Dialogs.c"
 		GString* _tmp276_ = NULL;
 		const gchar* _tmp277_ = NULL;
 		gchar* _tmp278_ = NULL;
@@ -6322,7 +6320,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 		g_string_append (_tmp276_, _tmp279_);
 #line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp279_);
-#line 6319 "Dialogs.c"
+#line 6317 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp280_ = NULL;
@@ -6353,7 +6351,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			_result_index = -1;
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6350 "Dialogs.c"
+#line 6348 "Dialogs.c"
 				gint _tmp286_ = 0;
 				gint _tmp287_ = 0;
 				gint _tmp288_ = 0;
@@ -6389,7 +6387,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				if (!(_tmp287_ < _tmp288_)) {
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6386 "Dialogs.c"
+#line 6384 "Dialogs.c"
 				}
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp289_ = _result_list;
@@ -6447,11 +6445,11 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				g_string_append (_tmp306_, _tmp307_);
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6444 "Dialogs.c"
+#line 6442 "Dialogs.c"
 			}
 #line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6448 "Dialogs.c"
+#line 6446 "Dialogs.c"
 		}
 	}
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6472,7 +6470,7 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	_g_string_free0 (builder);
 #line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 6469 "Dialogs.c"
+#line 6467 "Dialogs.c"
 }
 
 
@@ -6581,7 +6579,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp4_ = _tmp3_;
 #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_ > 0) {
-#line 6578 "Dialogs.c"
+#line 6576 "Dialogs.c"
 		gchar* photos_message = NULL;
 		ImportManifest* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
@@ -6750,7 +6748,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 6747 "Dialogs.c"
+#line 6745 "Dialogs.c"
 	}
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = manifest;
@@ -6762,7 +6760,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp55_ = _tmp54_;
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp55_ > 0) {
-#line 6759 "Dialogs.c"
+#line 6757 "Dialogs.c"
 		const gchar* _tmp56_ = NULL;
 		gint _tmp57_ = 0;
 		gint _tmp58_ = 0;
@@ -6835,7 +6833,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp58_ = _tmp57_;
 #line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp58_ > 0) {
-#line 6832 "Dialogs.c"
+#line 6830 "Dialogs.c"
 			const gchar* _tmp59_ = NULL;
 			gchar* _tmp60_ = NULL;
 #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -6846,7 +6844,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp60_;
-#line 6843 "Dialogs.c"
+#line 6841 "Dialogs.c"
 		}
 #line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp61_ = manifest;
@@ -6990,7 +6988,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 6987 "Dialogs.c"
+#line 6985 "Dialogs.c"
 	}
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp118_ = manifest;
@@ -7002,7 +7000,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp121_ = _tmp120_;
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp121_ > 0) {
-#line 6999 "Dialogs.c"
+#line 6997 "Dialogs.c"
 		const gchar* _tmp122_ = NULL;
 		gint _tmp123_ = 0;
 		gint _tmp124_ = 0;
@@ -7075,7 +7073,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp124_ = _tmp123_;
 #line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp124_ > 0) {
-#line 7072 "Dialogs.c"
+#line 7070 "Dialogs.c"
 			const gchar* _tmp125_ = NULL;
 			gchar* _tmp126_ = NULL;
 #line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7086,7 +7084,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp126_;
-#line 7083 "Dialogs.c"
+#line 7081 "Dialogs.c"
 		}
 #line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp127_ = manifest;
@@ -7238,7 +7236,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7227 "Dialogs.c"
+#line 7225 "Dialogs.c"
 	}
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp184_ = manifest;
@@ -7250,7 +7248,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp187_ = _tmp186_;
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp187_ > 0) {
-#line 7239 "Dialogs.c"
+#line 7237 "Dialogs.c"
 		const gchar* _tmp188_ = NULL;
 		gint _tmp189_ = 0;
 		gint _tmp190_ = 0;
@@ -7323,7 +7321,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp190_ = _tmp189_;
 #line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp190_ > 0) {
-#line 7312 "Dialogs.c"
+#line 7310 "Dialogs.c"
 			const gchar* _tmp191_ = NULL;
 			gchar* _tmp192_ = NULL;
 #line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7334,7 +7332,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp192_;
-#line 7323 "Dialogs.c"
+#line 7321 "Dialogs.c"
 		}
 #line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp193_ = manifest;
@@ -7478,7 +7476,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7467 "Dialogs.c"
+#line 7465 "Dialogs.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp250_ = manifest;
@@ -7490,7 +7488,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp253_ = _tmp252_;
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp253_ > 0) {
-#line 7479 "Dialogs.c"
+#line 7477 "Dialogs.c"
 		const gchar* _tmp254_ = NULL;
 		gint _tmp255_ = 0;
 		gint _tmp256_ = 0;
@@ -7563,7 +7561,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp256_ = _tmp255_;
 #line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp256_ > 0) {
-#line 7552 "Dialogs.c"
+#line 7550 "Dialogs.c"
 			const gchar* _tmp257_ = NULL;
 			gchar* _tmp258_ = NULL;
 #line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7574,7 +7572,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp258_;
-#line 7563 "Dialogs.c"
+#line 7561 "Dialogs.c"
 		}
 #line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp259_ = manifest;
@@ -7718,7 +7716,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7707 "Dialogs.c"
+#line 7705 "Dialogs.c"
 	}
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp316_ = manifest;
@@ -7730,7 +7728,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp319_ = _tmp318_;
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp319_ > 0) {
-#line 7719 "Dialogs.c"
+#line 7717 "Dialogs.c"
 		const gchar* _tmp320_ = NULL;
 		gint _tmp321_ = 0;
 		gint _tmp322_ = 0;
@@ -7763,7 +7761,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp322_ = _tmp321_;
 #line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp322_ > 0) {
-#line 7752 "Dialogs.c"
+#line 7750 "Dialogs.c"
 			const gchar* _tmp323_ = NULL;
 			gchar* _tmp324_ = NULL;
 #line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7774,7 +7772,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp324_;
-#line 7763 "Dialogs.c"
+#line 7761 "Dialogs.c"
 		}
 #line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp325_ = manifest;
@@ -7830,7 +7828,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (_tmp343_);
 #line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (skipped_photos_message);
-#line 7819 "Dialogs.c"
+#line 7817 "Dialogs.c"
 	}
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp345_ = manifest;
@@ -7842,7 +7840,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp348_ = _tmp347_;
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp348_ > 0) {
-#line 7831 "Dialogs.c"
+#line 7829 "Dialogs.c"
 		const gchar* _tmp349_ = NULL;
 		gint _tmp350_ = 0;
 		gint _tmp351_ = 0;
@@ -7868,7 +7866,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp351_ = _tmp350_;
 #line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp351_ > 0) {
-#line 7857 "Dialogs.c"
+#line 7855 "Dialogs.c"
 			const gchar* _tmp352_ = NULL;
 			gchar* _tmp353_ = NULL;
 #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -7879,7 +7877,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp353_;
-#line 7868 "Dialogs.c"
+#line 7866 "Dialogs.c"
 		}
 #line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp354_ = manifest;
@@ -7915,7 +7913,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		message = _tmp366_;
 #line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (skipped_files_message);
-#line 7904 "Dialogs.c"
+#line 7902 "Dialogs.c"
 	}
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp367_ = manifest;
@@ -7927,7 +7925,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp370_ = _tmp369_;
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp370_ > 0) {
-#line 7916 "Dialogs.c"
+#line 7914 "Dialogs.c"
 		const gchar* _tmp371_ = NULL;
 		gint _tmp372_ = 0;
 		gint _tmp373_ = 0;
@@ -8000,7 +7998,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp373_ = _tmp372_;
 #line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp373_ > 0) {
-#line 7989 "Dialogs.c"
+#line 7987 "Dialogs.c"
 			const gchar* _tmp374_ = NULL;
 			gchar* _tmp375_ = NULL;
 #line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -8011,7 +8009,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp375_;
-#line 8000 "Dialogs.c"
+#line 7998 "Dialogs.c"
 		}
 #line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp376_ = manifest;
@@ -8155,7 +8153,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 8144 "Dialogs.c"
+#line 8142 "Dialogs.c"
 	}
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp433_ = manifest;
@@ -8167,7 +8165,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp436_ = _tmp435_;
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp436_ > 0) {
-#line 8156 "Dialogs.c"
+#line 8154 "Dialogs.c"
 		const gchar* _tmp437_ = NULL;
 		gint _tmp438_ = 0;
 		gint _tmp439_ = 0;
@@ -8221,7 +8219,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp439_ = _tmp438_;
 #line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp439_ > 0) {
-#line 8210 "Dialogs.c"
+#line 8208 "Dialogs.c"
 			const gchar* _tmp440_ = NULL;
 			gchar* _tmp441_ = NULL;
 #line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -8232,7 +8230,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_g_free0 (message);
 #line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp441_;
-#line 8221 "Dialogs.c"
+#line 8219 "Dialogs.c"
 		}
 #line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp442_ = manifest;
@@ -8330,7 +8328,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (videos_message);
 #line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 8319 "Dialogs.c"
+#line 8317 "Dialogs.c"
 	}
 #line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp481_ = manifest;
@@ -8422,7 +8420,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp522_ = total;
 #line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp522_ == 0) {
-#line 8411 "Dialogs.c"
+#line 8409 "Dialogs.c"
 		const gchar* _tmp523_ = NULL;
 		const gchar* _tmp524_ = NULL;
 		gchar* _tmp525_ = NULL;
@@ -8436,7 +8434,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_free0 (message);
 #line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp525_;
-#line 8425 "Dialogs.c"
+#line 8423 "Dialogs.c"
 	}
 #line 864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = NULL;
@@ -8446,7 +8444,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_tmp526_ = question;
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp526_ == NULL) {
-#line 8435 "Dialogs.c"
+#line 8433 "Dialogs.c"
 		AppWindow* _tmp527_ = NULL;
 		AppWindow* _tmp528_ = NULL;
 		const gchar* _tmp529_ = NULL;
@@ -8566,7 +8564,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_tmp556_ = dialog_response;
 #line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp556_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID) {
-#line 8555 "Dialogs.c"
+#line 8553 "Dialogs.c"
 			GtkWindow* _tmp557_ = NULL;
 			ImportManifest* _tmp558_ = NULL;
 			gchar* _tmp559_ = NULL;
@@ -8583,7 +8581,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			import_ui_save_import_results (_tmp557_, _tmp560_);
 #line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp560_);
-#line 8572 "Dialogs.c"
+#line 8570 "Dialogs.c"
 		}
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dialog_parent);
@@ -8591,7 +8589,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_object_unref0 (ok_button);
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (save_results_button);
-#line 8580 "Dialogs.c"
+#line 8578 "Dialogs.c"
 	} else {
 		const gchar* _tmp561_ = NULL;
 		ImportUIQuestionParams* _tmp562_ = NULL;
@@ -8735,7 +8733,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		dialog_response = _tmp596_;
 #line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 8724 "Dialogs.c"
+#line 8722 "Dialogs.c"
 			gint _tmp597_ = 0;
 			GtkMessageDialog* _tmp598_ = NULL;
 			ImportManifest* _tmp599_ = NULL;
@@ -8749,7 +8747,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			if (!(_tmp597_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID)) {
 #line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 8738 "Dialogs.c"
+#line 8736 "Dialogs.c"
 			}
 #line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp598_ = dialog;
@@ -8769,7 +8767,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			_tmp603_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp602_, gtk_dialog_get_type (), GtkDialog));
 #line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			dialog_response = _tmp603_;
-#line 8758 "Dialogs.c"
+#line 8756 "Dialogs.c"
 		}
 #line 902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp604_ = dialog;
@@ -8783,7 +8781,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		_g_object_unref0 (no_button);
 #line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (save_results_button);
-#line 8772 "Dialogs.c"
+#line 8770 "Dialogs.c"
 	}
 #line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp606_ = dialog_response;
@@ -8795,7 +8793,7 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	_g_free0 (message);
 #line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 8784 "Dialogs.c"
+#line 8782 "Dialogs.c"
 }
 
 
@@ -8839,13 +8837,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 8828 "Dialogs.c"
+#line 8826 "Dialogs.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 8834 "Dialogs.c"
+#line 8832 "Dialogs.c"
 }
 
 
@@ -8923,21 +8921,21 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 	_tmp14_ = dialog_result;
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 8912 "Dialogs.c"
+#line 8910 "Dialogs.c"
 		GFile* _tmp15_ = NULL;
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = chosen_file;
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp15_ != NULL;
-#line 8918 "Dialogs.c"
+#line 8916 "Dialogs.c"
 	} else {
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = FALSE;
-#line 8922 "Dialogs.c"
+#line 8920 "Dialogs.c"
 	}
 #line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp13_) {
-#line 8926 "Dialogs.c"
+#line 8924 "Dialogs.c"
 		{
 			GFileOutputStream* outstream = NULL;
 			GFile* _tmp16_ = NULL;
@@ -8957,8 +8955,8 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			outstream = _tmp17_;
 #line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8946 "Dialogs.c"
-				goto __catch424_g_error;
+#line 8944 "Dialogs.c"
+				goto __catch421_g_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = outstream;
@@ -8976,8 +8974,8 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
-#line 8965 "Dialogs.c"
-				goto __catch424_g_error;
+#line 8963 "Dialogs.c"
+				goto __catch421_g_error;
 			}
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = outstream;
@@ -8987,15 +8985,15 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
-#line 8976 "Dialogs.c"
-				goto __catch424_g_error;
+#line 8974 "Dialogs.c"
+				goto __catch421_g_error;
 			}
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (outstream);
-#line 8981 "Dialogs.c"
+#line 8979 "Dialogs.c"
 		}
-		goto __finally424;
-		__catch424_g_error:
+		goto __finally421;
+		__catch421_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp23_ = NULL;
@@ -9023,9 +9021,9 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			_g_free0 (_tmp25_);
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_error_free0 (err);
-#line 9012 "Dialogs.c"
+#line 9010 "Dialogs.c"
 		}
-		__finally424:
+		__finally421:
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -9038,14 +9036,14 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			g_clear_error (&_inner_error_);
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return;
-#line 9027 "Dialogs.c"
+#line 9025 "Dialogs.c"
 		}
 	}
 #line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chosen_file);
 #line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chooser_dialog);
-#line 9034 "Dialogs.c"
+#line 9032 "Dialogs.c"
 }
 
 
@@ -9054,7 +9052,7 @@ static gboolean _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog
 	result = text_entry_dialog_mediator_on_modify_validate ((TextEntryDialogMediator*) self, text);
 #line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9043 "Dialogs.c"
+#line 9041 "Dialogs.c"
 }
 
 
@@ -9123,7 +9121,7 @@ TextEntryDialogMediator* text_entry_dialog_mediator_construct (GType object_type
 	_g_object_unref0 (builder);
 #line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9112 "Dialogs.c"
+#line 9110 "Dialogs.c"
 }
 
 
@@ -9135,7 +9133,7 @@ static gboolean text_entry_dialog_mediator_real_on_modify_validate (TextEntryDia
 	result = TRUE;
 #line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9124 "Dialogs.c"
+#line 9122 "Dialogs.c"
 }
 
 
@@ -9144,7 +9142,7 @@ gboolean text_entry_dialog_mediator_on_modify_validate (TextEntryDialogMediator*
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE);
 #line 949 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text);
-#line 9133 "Dialogs.c"
+#line 9131 "Dialogs.c"
 }
 
 
@@ -9162,14 +9160,14 @@ gchar* _text_entry_dialog_mediator_execute (TextEntryDialogMediator* self) {
 	result = _tmp1_;
 #line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9151 "Dialogs.c"
+#line 9149 "Dialogs.c"
 }
 
 
 static void value_text_entry_dialog_mediator_init (GValue* value) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 9158 "Dialogs.c"
+#line 9156 "Dialogs.c"
 }
 
 
@@ -9178,7 +9176,7 @@ static void value_text_entry_dialog_mediator_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (value->data[0].v_pointer);
-#line 9167 "Dialogs.c"
+#line 9165 "Dialogs.c"
 	}
 }
 
@@ -9188,11 +9186,11 @@ static void value_text_entry_dialog_mediator_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = text_entry_dialog_mediator_ref (src_value->data[0].v_pointer);
-#line 9177 "Dialogs.c"
+#line 9175 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9181 "Dialogs.c"
+#line 9179 "Dialogs.c"
 	}
 }
 
@@ -9200,37 +9198,37 @@ static void value_text_entry_dialog_mediator_copy_value (const GValue* src_value
 static gpointer value_text_entry_dialog_mediator_peek_pointer (const GValue* value) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9189 "Dialogs.c"
+#line 9187 "Dialogs.c"
 }
 
 
 static gchar* value_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 9196 "Dialogs.c"
+#line 9194 "Dialogs.c"
 		TextEntryDialogMediator* object;
 		object = collect_values[0].v_pointer;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9203 "Dialogs.c"
+#line 9201 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9207 "Dialogs.c"
+#line 9205 "Dialogs.c"
 		}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = text_entry_dialog_mediator_ref (object);
-#line 9211 "Dialogs.c"
+#line 9209 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9215 "Dialogs.c"
+#line 9213 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9219 "Dialogs.c"
+#line 9217 "Dialogs.c"
 }
 
 
@@ -9241,25 +9239,25 @@ static gchar* value_text_entry_dialog_mediator_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9230 "Dialogs.c"
+#line 9228 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 9236 "Dialogs.c"
+#line 9234 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9240 "Dialogs.c"
+#line 9238 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9244 "Dialogs.c"
+#line 9242 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9248 "Dialogs.c"
+#line 9246 "Dialogs.c"
 }
 
 
@@ -9273,7 +9271,7 @@ GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 9262 "Dialogs.c"
+#line 9260 "Dialogs.c"
 }
 
 
@@ -9282,7 +9280,7 @@ gpointer value_get_text_entry_dialog_mediator (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9271 "Dialogs.c"
+#line 9269 "Dialogs.c"
 }
 
 
@@ -9302,17 +9300,17 @@ void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9291 "Dialogs.c"
+#line 9289 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9295 "Dialogs.c"
+#line 9293 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (old);
-#line 9301 "Dialogs.c"
+#line 9299 "Dialogs.c"
 	}
 }
 
@@ -9331,17 +9329,17 @@ void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 9320 "Dialogs.c"
+#line 9318 "Dialogs.c"
 	} else {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9324 "Dialogs.c"
+#line 9322 "Dialogs.c"
 	}
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (old);
-#line 9330 "Dialogs.c"
+#line 9328 "Dialogs.c"
 	}
 }
 
@@ -9355,7 +9353,7 @@ static void text_entry_dialog_mediator_class_init (TextEntryDialogMediatorClass
 	g_type_class_add_private (klass, sizeof (TextEntryDialogMediatorPrivate));
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = text_entry_dialog_mediator_real_on_modify_validate;
-#line 9344 "Dialogs.c"
+#line 9342 "Dialogs.c"
 }
 
 
@@ -9364,7 +9362,7 @@ static void text_entry_dialog_mediator_instance_init (TextEntryDialogMediator *
 	self->priv = TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 9353 "Dialogs.c"
+#line 9351 "Dialogs.c"
 }
 
 
@@ -9376,7 +9374,7 @@ static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator* obj) {
 	g_signal_handlers_destroy (self);
 #line 938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 9365 "Dialogs.c"
+#line 9363 "Dialogs.c"
 }
 
 
@@ -9401,7 +9399,7 @@ gpointer text_entry_dialog_mediator_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 9390 "Dialogs.c"
+#line 9388 "Dialogs.c"
 }
 
 
@@ -9414,7 +9412,7 @@ void text_entry_dialog_mediator_unref (gpointer instance) {
 		TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self);
 #line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9403 "Dialogs.c"
+#line 9401 "Dialogs.c"
 	}
 }
 
@@ -9424,7 +9422,7 @@ static gboolean _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_
 	result = multi_text_entry_dialog_mediator_on_modify_validate ((MultiTextEntryDialogMediator*) self, text);
 #line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9413 "Dialogs.c"
+#line 9411 "Dialogs.c"
 }
 
 
@@ -9485,7 +9483,7 @@ MultiTextEntryDialogMediator* multi_text_entry_dialog_mediator_construct (GType
 	_g_object_unref0 (builder);
 #line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9474 "Dialogs.c"
+#line 9472 "Dialogs.c"
 }
 
 
@@ -9497,7 +9495,7 @@ static gboolean multi_text_entry_dialog_mediator_real_on_modify_validate (MultiT
 	result = TRUE;
 #line 970 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9486 "Dialogs.c"
+#line 9484 "Dialogs.c"
 }
 
 
@@ -9506,7 +9504,7 @@ gboolean multi_text_entry_dialog_mediator_on_modify_validate (MultiTextEntryDial
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE);
 #line 969 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text);
-#line 9495 "Dialogs.c"
+#line 9493 "Dialogs.c"
 }
 
 
@@ -9524,14 +9522,14 @@ gchar* _multi_text_entry_dialog_mediator_execute (MultiTextEntryDialogMediator*
 	result = _tmp1_;
 #line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9513 "Dialogs.c"
+#line 9511 "Dialogs.c"
 }
 
 
 static void value_multi_text_entry_dialog_mediator_init (GValue* value) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 9520 "Dialogs.c"
+#line 9518 "Dialogs.c"
 }
 
 
@@ -9540,7 +9538,7 @@ static void value_multi_text_entry_dialog_mediator_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (value->data[0].v_pointer);
-#line 9529 "Dialogs.c"
+#line 9527 "Dialogs.c"
 	}
 }
 
@@ -9550,11 +9548,11 @@ static void value_multi_text_entry_dialog_mediator_copy_value (const GValue* src
 	if (src_value->data[0].v_pointer) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (src_value->data[0].v_pointer);
-#line 9539 "Dialogs.c"
+#line 9537 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9543 "Dialogs.c"
+#line 9541 "Dialogs.c"
 	}
 }
 
@@ -9562,37 +9560,37 @@ static void value_multi_text_entry_dialog_mediator_copy_value (const GValue* src
 static gpointer value_multi_text_entry_dialog_mediator_peek_pointer (const GValue* value) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9551 "Dialogs.c"
+#line 9549 "Dialogs.c"
 }
 
 
 static gchar* value_multi_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 9558 "Dialogs.c"
+#line 9556 "Dialogs.c"
 		MultiTextEntryDialogMediator* object;
 		object = collect_values[0].v_pointer;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9565 "Dialogs.c"
+#line 9563 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9569 "Dialogs.c"
+#line 9567 "Dialogs.c"
 		}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (object);
-#line 9573 "Dialogs.c"
+#line 9571 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9577 "Dialogs.c"
+#line 9575 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9581 "Dialogs.c"
+#line 9579 "Dialogs.c"
 }
 
 
@@ -9603,25 +9601,25 @@ static gchar* value_multi_text_entry_dialog_mediator_lcopy_value (const GValue*
 	if (!object_p) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9592 "Dialogs.c"
+#line 9590 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 9598 "Dialogs.c"
+#line 9596 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9602 "Dialogs.c"
+#line 9600 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9606 "Dialogs.c"
+#line 9604 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9610 "Dialogs.c"
+#line 9608 "Dialogs.c"
 }
 
 
@@ -9635,7 +9633,7 @@ GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 9624 "Dialogs.c"
+#line 9622 "Dialogs.c"
 }
 
 
@@ -9644,7 +9642,7 @@ gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9633 "Dialogs.c"
+#line 9631 "Dialogs.c"
 }
 
 
@@ -9664,17 +9662,17 @@ void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_objec
 		value->data[0].v_pointer = v_object;
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9653 "Dialogs.c"
+#line 9651 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9657 "Dialogs.c"
+#line 9655 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (old);
-#line 9663 "Dialogs.c"
+#line 9661 "Dialogs.c"
 	}
 }
 
@@ -9693,17 +9691,17 @@ void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_obje
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 9682 "Dialogs.c"
+#line 9680 "Dialogs.c"
 	} else {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9686 "Dialogs.c"
+#line 9684 "Dialogs.c"
 	}
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (old);
-#line 9692 "Dialogs.c"
+#line 9690 "Dialogs.c"
 	}
 }
 
@@ -9717,7 +9715,7 @@ static void multi_text_entry_dialog_mediator_class_init (MultiTextEntryDialogMed
 	g_type_class_add_private (klass, sizeof (MultiTextEntryDialogMediatorPrivate));
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = multi_text_entry_dialog_mediator_real_on_modify_validate;
-#line 9706 "Dialogs.c"
+#line 9704 "Dialogs.c"
 }
 
 
@@ -9726,7 +9724,7 @@ static void multi_text_entry_dialog_mediator_instance_init (MultiTextEntryDialog
 	self->priv = MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 9715 "Dialogs.c"
+#line 9713 "Dialogs.c"
 }
 
 
@@ -9738,7 +9736,7 @@ static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMedia
 	g_signal_handlers_destroy (self);
 #line 959 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 9727 "Dialogs.c"
+#line 9725 "Dialogs.c"
 }
 
 
@@ -9763,7 +9761,7 @@ gpointer multi_text_entry_dialog_mediator_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 9752 "Dialogs.c"
+#line 9750 "Dialogs.c"
 }
 
 
@@ -9776,7 +9774,7 @@ void multi_text_entry_dialog_mediator_unref (gpointer instance) {
 		MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self);
 #line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9765 "Dialogs.c"
+#line 9763 "Dialogs.c"
 	}
 }
 
@@ -9794,7 +9792,7 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 	_tmp0_ = should_escape;
 #line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 9783 "Dialogs.c"
+#line 9781 "Dialogs.c"
 		const gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -9827,7 +9825,7 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 		result = _tmp8_;
 #line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 9816 "Dialogs.c"
+#line 9814 "Dialogs.c"
 	}
 #line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = primary_text;
@@ -9847,7 +9845,7 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 	result = _tmp14_;
 #line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9836 "Dialogs.c"
+#line 9834 "Dialogs.c"
 }
 
 
@@ -9856,7 +9854,7 @@ static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_fu
 	result = entry_multi_completion_match_func ((EntryMultiCompletion*) self, completion, key, iter);
 #line 1003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9845 "Dialogs.c"
+#line 9843 "Dialogs.c"
 }
 
 
@@ -9879,7 +9877,7 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 	if (_tmp1_ == NULL) {
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 9868 "Dialogs.c"
+#line 9866 "Dialogs.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
@@ -9892,7 +9890,7 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 		_tmp4_ = _tmp3_;
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_ == 1;
-#line 9881 "Dialogs.c"
+#line 9879 "Dialogs.c"
 	}
 #line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_, "delimiter == null || delimiter.length == 1");
@@ -9920,14 +9918,14 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 	gtk_entry_completion_set_match_func (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), _entry_multi_completion_match_func_gtk_entry_completion_match_func, g_object_ref (self), g_object_unref);
 #line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9909 "Dialogs.c"
+#line 9907 "Dialogs.c"
 }
 
 
 EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter) {
 #line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return entry_multi_completion_construct (TYPE_ENTRY_MULTI_COMPLETION, completion_list, delimiter);
-#line 9916 "Dialogs.c"
+#line 9914 "Dialogs.c"
 }
 
 
@@ -9953,7 +9951,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 	completion_iter = _tmp2_;
 #line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	while (TRUE) {
-#line 9942 "Dialogs.c"
+#line 9940 "Dialogs.c"
 		GeeIterator* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
 		GtkListStore* _tmp5_ = NULL;
@@ -9971,7 +9969,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 		if (!_tmp4_) {
 #line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			break;
-#line 9960 "Dialogs.c"
+#line 9958 "Dialogs.c"
 		}
 #line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = completion_store;
@@ -9993,7 +9991,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 		gtk_list_store_set (_tmp7_, &_tmp8_, 0, _tmp11_, -1, -1);
 #line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp11_);
-#line 9982 "Dialogs.c"
+#line 9980 "Dialogs.c"
 	}
 #line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = completion_store;
@@ -10001,7 +9999,7 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 	_g_object_unref0 (completion_iter);
 #line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9990 "Dialogs.c"
+#line 9988 "Dialogs.c"
 }
 
 
@@ -10024,7 +10022,7 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 10013 "Dialogs.c"
+#line 10011 "Dialogs.c"
 }
 
 
@@ -10044,7 +10042,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 10033 "Dialogs.c"
+#line 10031 "Dialogs.c"
 }
 
 
@@ -10069,7 +10067,7 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	_tmp3_ = _result_;
 #line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 10058 "Dialogs.c"
+#line 10056 "Dialogs.c"
 		gchar* _tmp4_ = NULL;
 #line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
@@ -10077,13 +10075,13 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 		result = (gint) (_tmp4_ - ((gchar*) self));
 #line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 10066 "Dialogs.c"
+#line 10064 "Dialogs.c"
 	} else {
 #line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		result = -1;
 #line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 10072 "Dialogs.c"
+#line 10070 "Dialogs.c"
 	}
 }
 
@@ -10151,7 +10149,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 	_tmp11_ = self->priv->delimiter;
 #line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_ == NULL) {
-#line 10140 "Dialogs.c"
+#line 10138 "Dialogs.c"
 		const gchar* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
@@ -10182,7 +10180,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		_g_object_unref0 (model);
 #line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10171 "Dialogs.c"
+#line 10169 "Dialogs.c"
 	} else {
 		const gchar* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
@@ -10211,7 +10209,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		_tmp20_ = string_contains (_tmp18_, _tmp19_);
 #line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp20_) {
-#line 10200 "Dialogs.c"
+#line 10198 "Dialogs.c"
 			gint offset = 0;
 			const gchar* _tmp21_ = NULL;
 			const gchar* _tmp22_ = NULL;
@@ -10260,7 +10258,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 				_g_object_unref0 (model);
 #line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 10249 "Dialogs.c"
+#line 10247 "Dialogs.c"
 			}
 		}
 #line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10299,7 +10297,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 			_g_object_unref0 (model);
 #line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 10288 "Dialogs.c"
+#line 10286 "Dialogs.c"
 		}
 #line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp40_ = possible_match;
@@ -10327,7 +10325,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		_g_object_unref0 (model);
 #line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10316 "Dialogs.c"
+#line 10314 "Dialogs.c"
 	}
 #line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (normed_key);
@@ -10335,7 +10333,7 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 	_g_free0 (possible_match);
 #line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (model);
-#line 10324 "Dialogs.c"
+#line 10322 "Dialogs.c"
 }
 
 
@@ -10358,7 +10356,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 10347 "Dialogs.c"
+#line 10345 "Dialogs.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -10366,7 +10364,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 10355 "Dialogs.c"
+#line 10353 "Dialogs.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -10378,7 +10376,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 10367 "Dialogs.c"
+#line 10365 "Dialogs.c"
 	}
 }
 
@@ -10402,21 +10400,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 10391 "Dialogs.c"
+#line 10389 "Dialogs.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 10397 "Dialogs.c"
+#line 10395 "Dialogs.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 10401 "Dialogs.c"
+#line 10399 "Dialogs.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 10405 "Dialogs.c"
+#line 10403 "Dialogs.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -10428,7 +10426,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 10417 "Dialogs.c"
+#line 10415 "Dialogs.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -10438,13 +10436,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 10427 "Dialogs.c"
+#line 10425 "Dialogs.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 10433 "Dialogs.c"
+#line 10431 "Dialogs.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -10458,7 +10456,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 10447 "Dialogs.c"
+#line 10445 "Dialogs.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -10468,13 +10466,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 10457 "Dialogs.c"
+#line 10455 "Dialogs.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 10463 "Dialogs.c"
+#line 10461 "Dialogs.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -10483,7 +10481,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 10472 "Dialogs.c"
+#line 10470 "Dialogs.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -10503,7 +10501,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 10492 "Dialogs.c"
+#line 10490 "Dialogs.c"
 }
 
 
@@ -10573,7 +10571,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	_tmp9_ = _tmp8_;
 #line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ > 0) {
-#line 10562 "Dialogs.c"
+#line 10560 "Dialogs.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
@@ -10585,7 +10583,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 		_tmp12_ = string_contains (_tmp10_, _tmp11_);
 #line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp12_) {
-#line 10574 "Dialogs.c"
+#line 10572 "Dialogs.c"
 			const gchar* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
 			const gchar* _tmp15_ = NULL;
@@ -10602,11 +10600,11 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 			if (g_strcmp0 (_tmp14_, " ") != 0) {
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = " ";
-#line 10591 "Dialogs.c"
+#line 10589 "Dialogs.c"
 			} else {
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = "";
-#line 10595 "Dialogs.c"
+#line 10593 "Dialogs.c"
 			}
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = old_text;
@@ -10630,7 +10628,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 			old_text = _tmp22_;
 #line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp21_);
-#line 10619 "Dialogs.c"
+#line 10617 "Dialogs.c"
 		} else {
 			gchar* _tmp23_ = NULL;
 #line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10639,7 +10637,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 			_g_free0 (old_text);
 #line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			old_text = _tmp23_;
-#line 10628 "Dialogs.c"
+#line 10626 "Dialogs.c"
 		}
 	}
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10648,11 +10646,11 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	if (g_strcmp0 (_tmp25_, " ") != 0) {
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = " ";
-#line 10637 "Dialogs.c"
+#line 10635 "Dialogs.c"
 	} else {
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = "";
-#line 10641 "Dialogs.c"
+#line 10639 "Dialogs.c"
 	}
 #line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = old_text;
@@ -10702,7 +10700,7 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	_g_free0 (match);
 #line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 10691 "Dialogs.c"
+#line 10689 "Dialogs.c"
 }
 
 
@@ -10740,7 +10738,7 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 	_tmp5__length1 = split_length1;
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 10729 "Dialogs.c"
+#line 10727 "Dialogs.c"
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
 		const gchar* _tmp7_ = NULL;
@@ -10752,15 +10750,15 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 		_tmp7_ = _tmp6_[0];
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp7_ != NULL;
-#line 10741 "Dialogs.c"
+#line 10739 "Dialogs.c"
 	} else {
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = FALSE;
-#line 10745 "Dialogs.c"
+#line 10743 "Dialogs.c"
 	}
 #line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 10749 "Dialogs.c"
+#line 10747 "Dialogs.c"
 		gchar** _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
 		gchar** _tmp9_ = NULL;
@@ -10785,7 +10783,7 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
 #line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10774 "Dialogs.c"
+#line 10772 "Dialogs.c"
 	} else {
 		gchar* _tmp12_ = NULL;
 #line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -10796,11 +10794,11 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
 #line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10785 "Dialogs.c"
+#line 10783 "Dialogs.c"
 	}
 #line 1072 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 10789 "Dialogs.c"
+#line 10787 "Dialogs.c"
 }
 
 
@@ -10813,14 +10811,14 @@ static void entry_multi_completion_class_init (EntryMultiCompletionClass * klass
 	((GtkEntryCompletionClass *) klass)->match_selected = entry_multi_completion_real_match_selected;
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = entry_multi_completion_finalize;
-#line 10802 "Dialogs.c"
+#line 10800 "Dialogs.c"
 }
 
 
 static void entry_multi_completion_instance_init (EntryMultiCompletion * self) {
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = ENTRY_MULTI_COMPLETION_GET_PRIVATE (self);
-#line 10809 "Dialogs.c"
+#line 10807 "Dialogs.c"
 }
 
 
@@ -10832,7 +10830,7 @@ static void entry_multi_completion_finalize (GObject* obj) {
 	_g_free0 (self->priv->delimiter);
 #line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (entry_multi_completion_parent_class)->finalize (obj);
-#line 10821 "Dialogs.c"
+#line 10819 "Dialogs.c"
 }
 
 
@@ -10851,7 +10849,7 @@ GType entry_multi_completion_get_type (void) {
 static void _set_background_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
 #line 1102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_dialog_on_checkbox_clicked ((SetBackgroundDialog*) self);
-#line 10840 "Dialogs.c"
+#line 10838 "Dialogs.c"
 }
 
 
@@ -10980,7 +10978,7 @@ SetBackgroundDialog* set_background_dialog_construct (GType object_type, GtkBuil
 	self->ok_button = _tmp26_;
 #line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 10969 "Dialogs.c"
+#line 10967 "Dialogs.c"
 }
 
 
@@ -11015,34 +11013,34 @@ void set_background_dialog_on_checkbox_clicked (SetBackgroundDialog* self) {
 	_tmp7_ = self->desktop;
 #line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp7_) {
-#line 11004 "Dialogs.c"
+#line 11002 "Dialogs.c"
 		gboolean _tmp8_ = FALSE;
 #line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->screensaver;
 #line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = !_tmp8_;
-#line 11010 "Dialogs.c"
+#line 11008 "Dialogs.c"
 	} else {
 #line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = FALSE;
-#line 11014 "Dialogs.c"
+#line 11012 "Dialogs.c"
 	}
 #line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_) {
-#line 11018 "Dialogs.c"
+#line 11016 "Dialogs.c"
 		GtkButton* _tmp9_ = NULL;
 #line 1115 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->ok_button;
 #line 1115 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 11024 "Dialogs.c"
+#line 11022 "Dialogs.c"
 	} else {
 		GtkButton* _tmp10_ = NULL;
 #line 1117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->ok_button;
 #line 1117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 11031 "Dialogs.c"
+#line 11029 "Dialogs.c"
 	}
 }
 
@@ -11074,14 +11072,14 @@ gboolean set_background_dialog_execute_base (SetBackgroundDialog* self) {
 	result = _result_;
 #line 1126 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11063 "Dialogs.c"
+#line 11061 "Dialogs.c"
 }
 
 
 static void value_set_background_dialog_init (GValue* value) {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 11070 "Dialogs.c"
+#line 11068 "Dialogs.c"
 }
 
 
@@ -11090,7 +11088,7 @@ static void value_set_background_dialog_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		set_background_dialog_unref (value->data[0].v_pointer);
-#line 11079 "Dialogs.c"
+#line 11077 "Dialogs.c"
 	}
 }
 
@@ -11100,11 +11098,11 @@ static void value_set_background_dialog_copy_value (const GValue* src_value, GVa
 	if (src_value->data[0].v_pointer) {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = set_background_dialog_ref (src_value->data[0].v_pointer);
-#line 11089 "Dialogs.c"
+#line 11087 "Dialogs.c"
 	} else {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 11093 "Dialogs.c"
+#line 11091 "Dialogs.c"
 	}
 }
 
@@ -11112,37 +11110,37 @@ static void value_set_background_dialog_copy_value (const GValue* src_value, GVa
 static gpointer value_set_background_dialog_peek_pointer (const GValue* value) {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 11101 "Dialogs.c"
+#line 11099 "Dialogs.c"
 }
 
 
 static gchar* value_set_background_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 11108 "Dialogs.c"
+#line 11106 "Dialogs.c"
 		SetBackgroundDialog* object;
 		object = collect_values[0].v_pointer;
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11115 "Dialogs.c"
+#line 11113 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11119 "Dialogs.c"
+#line 11117 "Dialogs.c"
 		}
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = set_background_dialog_ref (object);
-#line 11123 "Dialogs.c"
+#line 11121 "Dialogs.c"
 	} else {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 11127 "Dialogs.c"
+#line 11125 "Dialogs.c"
 	}
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 11131 "Dialogs.c"
+#line 11129 "Dialogs.c"
 }
 
 
@@ -11153,25 +11151,25 @@ static gchar* value_set_background_dialog_lcopy_value (const GValue* value, guin
 	if (!object_p) {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11142 "Dialogs.c"
+#line 11140 "Dialogs.c"
 	}
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 11148 "Dialogs.c"
+#line 11146 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11152 "Dialogs.c"
+#line 11150 "Dialogs.c"
 	} else {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = set_background_dialog_ref (value->data[0].v_pointer);
-#line 11156 "Dialogs.c"
+#line 11154 "Dialogs.c"
 	}
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 11160 "Dialogs.c"
+#line 11158 "Dialogs.c"
 }
 
 
@@ -11185,7 +11183,7 @@ GParamSpec* param_spec_set_background_dialog (const gchar* name, const gchar* ni
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 11174 "Dialogs.c"
+#line 11172 "Dialogs.c"
 }
 
 
@@ -11194,7 +11192,7 @@ gpointer value_get_set_background_dialog (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SET_BACKGROUND_DIALOG), NULL);
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 11183 "Dialogs.c"
+#line 11181 "Dialogs.c"
 }
 
 
@@ -11214,17 +11212,17 @@ void value_set_set_background_dialog (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		set_background_dialog_ref (value->data[0].v_pointer);
-#line 11203 "Dialogs.c"
+#line 11201 "Dialogs.c"
 	} else {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 11207 "Dialogs.c"
+#line 11205 "Dialogs.c"
 	}
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		set_background_dialog_unref (old);
-#line 11213 "Dialogs.c"
+#line 11211 "Dialogs.c"
 	}
 }
 
@@ -11243,17 +11241,17 @@ void value_take_set_background_dialog (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 11232 "Dialogs.c"
+#line 11230 "Dialogs.c"
 	} else {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 11236 "Dialogs.c"
+#line 11234 "Dialogs.c"
 	}
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		set_background_dialog_unref (old);
-#line 11242 "Dialogs.c"
+#line 11240 "Dialogs.c"
 	}
 }
 
@@ -11263,7 +11261,7 @@ static void set_background_dialog_class_init (SetBackgroundDialogClass * klass)
 	set_background_dialog_parent_class = g_type_class_peek_parent (klass);
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((SetBackgroundDialogClass *) klass)->finalize = set_background_dialog_finalize;
-#line 11252 "Dialogs.c"
+#line 11250 "Dialogs.c"
 }
 
 
@@ -11274,7 +11272,7 @@ static void set_background_dialog_instance_init (SetBackgroundDialog * self) {
 	self->screensaver = FALSE;
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 11263 "Dialogs.c"
+#line 11261 "Dialogs.c"
 }
 
 
@@ -11292,7 +11290,7 @@ static void set_background_dialog_finalize (SetBackgroundDialog* obj) {
 	_g_object_unref0 (self->screensaver_button);
 #line 1087 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->ok_button);
-#line 11281 "Dialogs.c"
+#line 11279 "Dialogs.c"
 }
 
 
@@ -11317,7 +11315,7 @@ gpointer set_background_dialog_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 11306 "Dialogs.c"
+#line 11304 "Dialogs.c"
 }
 
 
@@ -11330,7 +11328,7 @@ void set_background_dialog_unref (gpointer instance) {
 		SET_BACKGROUND_DIALOG_GET_CLASS (self)->finalize (self);
 #line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11319 "Dialogs.c"
+#line 11317 "Dialogs.c"
 	}
 }
 
@@ -11349,14 +11347,14 @@ SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_ty
 	_g_object_unref0 (builder);
 #line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11338 "Dialogs.c"
+#line 11336 "Dialogs.c"
 }
 
 
 SetBackgroundPhotoDialog* set_background_photo_dialog_new (void) {
 #line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return set_background_photo_dialog_construct (TYPE_SET_BACKGROUND_PHOTO_DIALOG);
-#line 11345 "Dialogs.c"
+#line 11343 "Dialogs.c"
 }
 
 
@@ -11388,24 +11386,24 @@ gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gb
 	if (desktop_background) {
 #line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*desktop_background = _vala_desktop_background;
-#line 11377 "Dialogs.c"
+#line 11375 "Dialogs.c"
 	}
 #line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (screensaver) {
 #line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*screensaver = _vala_screensaver;
-#line 11383 "Dialogs.c"
+#line 11381 "Dialogs.c"
 	}
 #line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11387 "Dialogs.c"
+#line 11385 "Dialogs.c"
 }
 
 
 static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClass * klass) {
 #line 1130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_photo_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 11394 "Dialogs.c"
+#line 11392 "Dialogs.c"
 }
 
 
@@ -11428,7 +11426,7 @@ GType set_background_photo_dialog_get_type (void) {
 static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_slideshow_dialog_on_delay_scale_value_changed ((SetBackgroundSlideshowDialog*) self);
-#line 11417 "Dialogs.c"
+#line 11415 "Dialogs.c"
 }
 
 
@@ -11482,14 +11480,14 @@ SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType o
 	_g_object_unref0 (builder);
 #line 1152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11471 "Dialogs.c"
+#line 11469 "Dialogs.c"
 }
 
 
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void) {
 #line 1152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return set_background_slideshow_dialog_construct (TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG);
-#line 11478 "Dialogs.c"
+#line 11476 "Dialogs.c"
 }
 
 
@@ -11533,7 +11531,7 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 	_tmp8_ = self->priv->delay_value;
 #line 1173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ < 60) {
-#line 11522 "Dialogs.c"
+#line 11520 "Dialogs.c"
 		gint _tmp9_ = 0;
 		const gchar* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
@@ -11550,14 +11548,14 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 		_g_free0 (text);
 #line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp12_;
-#line 11539 "Dialogs.c"
+#line 11537 "Dialogs.c"
 	} else {
 		gint _tmp13_ = 0;
 #line 1175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->delay_value;
 #line 1175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp13_ < (60 * 60)) {
-#line 11546 "Dialogs.c"
+#line 11544 "Dialogs.c"
 			gint minutes = 0;
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
@@ -11585,14 +11583,14 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 			_tmp19_ = minutes;
 #line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			self->priv->delay_value = _tmp19_ * 60;
-#line 11574 "Dialogs.c"
+#line 11572 "Dialogs.c"
 		} else {
 			gint _tmp20_ = 0;
 #line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = self->priv->delay_value;
 #line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp20_ < ((60 * 60) * 24)) {
-#line 11581 "Dialogs.c"
+#line 11579 "Dialogs.c"
 				gint hours = 0;
 				gint _tmp21_ = 0;
 				gint _tmp22_ = 0;
@@ -11620,7 +11618,7 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 				_tmp26_ = hours;
 #line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				self->priv->delay_value = _tmp26_ * (60 * 60);
-#line 11609 "Dialogs.c"
+#line 11607 "Dialogs.c"
 			} else {
 				const gchar* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
@@ -11634,7 +11632,7 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 				text = _tmp28_;
 #line 1185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				self->priv->delay_value = (60 * 60) * 24;
-#line 11623 "Dialogs.c"
+#line 11621 "Dialogs.c"
 			}
 		}
 	}
@@ -11646,7 +11644,7 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 	gtk_label_set_label (_tmp29_, _tmp30_);
 #line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 11635 "Dialogs.c"
+#line 11633 "Dialogs.c"
 }
 
 
@@ -11684,23 +11682,23 @@ gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog*
 	if (delay_value) {
 #line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*delay_value = _vala_delay_value;
-#line 11673 "Dialogs.c"
+#line 11671 "Dialogs.c"
 	}
 #line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (desktop_background) {
 #line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*desktop_background = _vala_desktop_background;
-#line 11679 "Dialogs.c"
+#line 11677 "Dialogs.c"
 	}
 #line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (screensaver) {
 #line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*screensaver = _vala_screensaver;
-#line 11685 "Dialogs.c"
+#line 11683 "Dialogs.c"
 	}
 #line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11689 "Dialogs.c"
+#line 11687 "Dialogs.c"
 }
 
 
@@ -11711,7 +11709,7 @@ static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDi
 	((SetBackgroundDialogClass *) klass)->finalize = set_background_slideshow_dialog_finalize;
 #line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (SetBackgroundSlideshowDialogPrivate));
-#line 11700 "Dialogs.c"
+#line 11698 "Dialogs.c"
 }
 
 
@@ -11720,7 +11718,7 @@ static void set_background_slideshow_dialog_instance_init (SetBackgroundSlidesho
 	self->priv = SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE (self);
 #line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->delay_value = 0;
-#line 11709 "Dialogs.c"
+#line 11707 "Dialogs.c"
 }
 
 
@@ -11734,7 +11732,7 @@ static void set_background_slideshow_dialog_finalize (SetBackgroundDialog* obj)
 	_g_object_unref0 (self->priv->delay_scale);
 #line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	SET_BACKGROUND_DIALOG_CLASS (set_background_slideshow_dialog_parent_class)->finalize (obj);
-#line 11723 "Dialogs.c"
+#line 11721 "Dialogs.c"
 }
 
 
@@ -11756,60 +11754,60 @@ TextEntryDialog* text_entry_dialog_construct (GType object_type) {
 	GtkSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_header;
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 11755 "Dialogs.c"
+#line 11753 "Dialogs.c"
 	} else {
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 11759 "Dialogs.c"
+#line 11757 "Dialogs.c"
 	}
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (TextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 1212 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11765 "Dialogs.c"
+#line 11763 "Dialogs.c"
 }
 
 
 TextEntryDialog* text_entry_dialog_new (void) {
-#line 1212 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return text_entry_dialog_construct (TYPE_TEXT_ENTRY_DIALOG);
-#line 11772 "Dialogs.c"
+#line 11770 "Dialogs.c"
 }
 
 
 void text_entry_dialog_set_builder (TextEntryDialog* self, GtkBuilder* builder) {
 	GtkBuilder* _tmp0_ = NULL;
 	GtkBuilder* _tmp1_ = NULL;
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_BUILDER (builder));
-#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = builder;
-#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp1_;
-#line 11791 "Dialogs.c"
+#line 11789 "Dialogs.c"
 }
 
 
 static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1236 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_entry_dialog_on_entry_changed ((TextEntryDialog*) self);
-#line 11798 "Dialogs.c"
+#line 11796 "Dialogs.c"
 }
 
 
@@ -11837,171 +11835,154 @@ void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyVali
 	GtkEntry* _tmp19_ = NULL;
 	GtkEntry* _tmp20_ = NULL;
 	GtkWidget* _tmp21_ = NULL;
-	GtkButtonBox* _tmp22_ = NULL;
-	GtkButtonBox* _tmp23_ = NULL;
-	GtkWidget* _tmp24_ = NULL;
-	GtkButton* _tmp25_ = NULL;
-	GtkWidget* _tmp26_ = NULL;
-	GtkButton* _tmp27_ = NULL;
-	GeeCollection* _tmp28_ = NULL;
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	GtkButton* _tmp22_ = NULL;
+	GtkWidget* _tmp23_ = NULL;
+	GtkButton* _tmp24_ = NULL;
+	GeeCollection* _tmp25_ = NULL;
+#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (label != NULL);
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail ((completion_list == NULL) || GEE_IS_COLLECTION (completion_list));
-#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = modify_validate;
-#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__target = modify_validate_target;
-#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate = _tmp6_;
-#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate_target = _tmp6__target;
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->builder;
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "label");
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	name_label = _tmp9_;
-#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = name_label;
-#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = label;
-#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_text (_tmp10_, _tmp11_);
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = self->priv->builder;
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = gtk_builder_get_object (_tmp12_, "entry");
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp13_) : NULL);
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->entry = _tmp14_;
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = initial_text;
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ != NULL) {
-#line 11901 "Dialogs.c"
+#line 11896 "Dialogs.c"
 		const gchar* _tmp17_ = NULL;
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = initial_text;
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp17_;
-#line 11907 "Dialogs.c"
+#line 11902 "Dialogs.c"
 	} else {
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = "";
-#line 11911 "Dialogs.c"
+#line 11906 "Dialogs.c"
 	}
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->entry;
-#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_text (_tmp18_, _tmp15_);
-#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->entry;
-#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 1236 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->entry;
-#line 1236 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self, 0);
+#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp21_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
+#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_get_type (), GtkButton));
+#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->button1);
+#line 1237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->button1 = _tmp22_;
 #line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = gtk_dialog_get_action_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp23_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_SAVE_LABEL, (gint) GTK_RESPONSE_OK);
 #line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_box_get_type (), GtkButtonBox));
+	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
 #line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->action_area_box);
+	_g_object_unref0 (self->priv->button2);
 #line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->action_area_box = _tmp22_;
+	self->priv->button2 = _tmp24_;
 #line 1239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = self->priv->action_area_box;
-#line 1239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_button_box_set_layout (_tmp23_, GTK_BUTTONBOX_END);
-#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
-#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_button_get_type (), GtkButton));
+	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
 #line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->button1);
+	_tmp25_ = completion_list;
 #line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->button1 = _tmp25_;
+	if (_tmp25_ != NULL) {
+#line 11942 "Dialogs.c"
+		EntryMultiCompletion* completion = NULL;
+		GeeCollection* _tmp26_ = NULL;
+		const gchar* _tmp27_ = NULL;
+		EntryMultiCompletion* _tmp28_ = NULL;
+		GtkEntry* _tmp29_ = NULL;
+		EntryMultiCompletion* _tmp30_ = NULL;
 #line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_SAVE_LABEL, (gint) GTK_RESPONSE_OK);
+		_tmp26_ = completion_list;
 #line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_button_get_type (), GtkButton));
+		_tmp27_ = completion_delimiter;
 #line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->button2);
+		_tmp28_ = entry_multi_completion_new (_tmp26_, _tmp27_);
 #line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->button2 = _tmp27_;
-#line 1243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1245 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp28_ = completion_list;
-#line 1245 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp28_ != NULL) {
-#line 11959 "Dialogs.c"
-		EntryMultiCompletion* completion = NULL;
-		GeeCollection* _tmp29_ = NULL;
-		const gchar* _tmp30_ = NULL;
-		EntryMultiCompletion* _tmp31_ = NULL;
-		GtkEntry* _tmp32_ = NULL;
-		EntryMultiCompletion* _tmp33_ = NULL;
-#line 1246 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp29_ = completion_list;
-#line 1246 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp30_ = completion_delimiter;
-#line 1246 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp31_ = entry_multi_completion_new (_tmp29_, _tmp30_);
-#line 1246 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		completion = _tmp31_;
-#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp32_ = self->priv->entry;
-#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp33_ = completion;
-#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_entry_set_completion (_tmp32_, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_entry_completion_get_type (), GtkEntryCompletion));
-#line 1245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		completion = _tmp28_;
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp29_ = self->priv->entry;
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp30_ = completion;
+#line 1244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		gtk_entry_set_completion (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_entry_completion_get_type (), GtkEntryCompletion));
+#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (completion);
-#line 11982 "Dialogs.c"
+#line 11965 "Dialogs.c"
 	}
-#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1252 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_has_resize_grip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (name_label);
-#line 11990 "Dialogs.c"
+#line 11971 "Dialogs.c"
 }
 
 
@@ -12016,57 +11997,57 @@ gchar* text_entry_dialog_execute (TextEntryDialog* self) {
 	gint _tmp4_ = 0;
 	GtkEntry* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
-#line 1255 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG (self), NULL);
-#line 1256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->on_modify_validate;
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0__target = self->priv->on_modify_validate_target;
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->entry;
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
-#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) {
-#line 12027 "Dialogs.c"
+#line 12008 "Dialogs.c"
 		GtkEntry* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->entry;
-#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = gtk_entry_get_text (_tmp5_);
-#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp7_;
-#line 12041 "Dialogs.c"
+#line 12022 "Dialogs.c"
 	}
-#line 1266 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->entry;
-#line 1266 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp9_, NULL, FALSE);
-#line 1266 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self);
-#line 1267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1269 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 1269 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12055 "Dialogs.c"
+#line 12036 "Dialogs.c"
 }
 
 
@@ -12076,21 +12057,21 @@ void text_entry_dialog_on_entry_changed (TextEntryDialog* self) {
 	GtkEntry* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->on_modify_validate;
-#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0__target = self->priv->on_modify_validate_target;
-#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->entry;
-#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
-#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
-#line 12079 "Dialogs.c"
+#line 12060 "Dialogs.c"
 }
 
 
@@ -12101,14 +12082,14 @@ static void text_entry_dialog_class_init (TextEntryDialogClass * klass) {
 	g_type_class_add_private (klass, sizeof (TextEntryDialogPrivate));
 #line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = text_entry_dialog_finalize;
-#line 12090 "Dialogs.c"
+#line 12071 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_instance_init (TextEntryDialog * self) {
 #line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
-#line 12097 "Dialogs.c"
+#line 12078 "Dialogs.c"
 }
 
 
@@ -12124,11 +12105,9 @@ static void text_entry_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->button1);
 #line 1209 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1210 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->action_area_box);
 #line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (text_entry_dialog_parent_class)->finalize (obj);
-#line 12117 "Dialogs.c"
+#line 12096 "Dialogs.c"
 }
 
 
@@ -12150,53 +12129,53 @@ MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type) {
 	GtkSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
-#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_header;
-#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 12149 "Dialogs.c"
+#line 12128 "Dialogs.c"
 	} else {
-#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 12153 "Dialogs.c"
+#line 12132 "Dialogs.c"
 	}
-#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (MultiTextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12159 "Dialogs.c"
+#line 12138 "Dialogs.c"
 }
 
 
 MultiTextEntryDialog* multi_text_entry_dialog_new (void) {
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return multi_text_entry_dialog_construct (TYPE_MULTI_TEXT_ENTRY_DIALOG);
-#line 12166 "Dialogs.c"
+#line 12145 "Dialogs.c"
 }
 
 
 void multi_text_entry_dialog_set_builder (MultiTextEntryDialog* self, GtkBuilder* builder) {
 	GtkBuilder* _tmp0_ = NULL;
 	GtkBuilder* _tmp1_ = NULL;
-#line 1293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
-#line 1293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_BUILDER (builder));
-#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = builder;
-#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp1_;
-#line 12185 "Dialogs.c"
+#line 12164 "Dialogs.c"
 }
 
 
@@ -12223,137 +12202,120 @@ void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDi
 	GtkTextBuffer* _tmp19_ = NULL;
 	GtkTextView* _tmp20_ = NULL;
 	GtkWidget* _tmp21_ = NULL;
-	GtkButtonBox* _tmp22_ = NULL;
-	GtkButtonBox* _tmp23_ = NULL;
-	GtkWidget* _tmp24_ = NULL;
-	GtkButton* _tmp25_ = NULL;
-	GtkWidget* _tmp26_ = NULL;
-	GtkButton* _tmp27_ = NULL;
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	GtkButton* _tmp22_ = NULL;
+	GtkWidget* _tmp23_ = NULL;
+	GtkButton* _tmp24_ = NULL;
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (label != NULL);
-#line 1298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), 500, 300);
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = modify_validate;
-#line 1303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__target = modify_validate_target;
-#line 1303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate = _tmp6_;
-#line 1303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate_target = _tmp6__target;
-#line 1305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->builder;
-#line 1305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "textview1");
-#line 1305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_text_view_get_type ()) ? ((GtkTextView*) _tmp8_) : NULL);
-#line 1305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->entry = _tmp9_;
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = self->priv->entry;
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_text_view_set_wrap_mode (_tmp10_, GTK_WRAP_WORD);
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->entry;
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = gtk_text_buffer_new (NULL);
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_text_view_set_buffer (_tmp11_, _tmp13_);
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp13_);
-#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = initial_text;
-#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp15_ != NULL) {
-#line 12286 "Dialogs.c"
+#line 12262 "Dialogs.c"
 		const gchar* _tmp16_ = NULL;
-#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = initial_text;
-#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _tmp16_;
-#line 12292 "Dialogs.c"
+#line 12268 "Dialogs.c"
 	} else {
-#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = "";
-#line 12296 "Dialogs.c"
+#line 12272 "Dialogs.c"
 	}
-#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->entry;
-#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = gtk_text_view_get_buffer (_tmp17_);
-#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = _tmp18_;
-#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_set (_tmp19_, "text", _tmp14_, NULL);
-#line 1310 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->entry;
-#line 1310 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = gtk_dialog_get_action_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_box_get_type (), GtkButtonBox));
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->action_area_box);
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->action_area_box = _tmp22_;
-#line 1313 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = self->priv->action_area_box;
-#line 1313 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_button_box_set_layout (_tmp23_, GTK_BUTTONBOX_END);
-#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
-#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_button_get_type (), GtkButton));
-#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp21_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
+#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_get_type (), GtkButton));
+#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->button1 = _tmp25_;
-#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_SAVE_LABEL, (gint) GTK_RESPONSE_OK);
-#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_button_get_type (), GtkButton));
-#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->button1 = _tmp22_;
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp23_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_SAVE_LABEL, (gint) GTK_RESPONSE_OK);
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_button_get_type (), GtkButton));
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->button2 = _tmp27_;
-#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->button2 = _tmp24_;
+#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1319 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_has_resize_grip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 12342 "Dialogs.c"
+#line 12304 "Dialogs.c"
 }
 
 
@@ -12361,83 +12323,81 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
 	gchar* result = NULL;
 	gchar* text = NULL;
 	gint _tmp0_ = 0;
-#line 1322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self), NULL);
-#line 1323 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 12360 "Dialogs.c"
+#line 12322 "Dialogs.c"
 		GtkTextView* _tmp1_ = NULL;
 		GtkTextBuffer* _tmp2_ = NULL;
 		GtkTextBuffer* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->entry;
-#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = gtk_text_view_get_buffer (_tmp1_);
-#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp2_;
-#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_get (_tmp3_, "text", &_tmp4_, NULL);
-#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp4_;
-#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp5_;
-#line 12380 "Dialogs.c"
+#line 12342 "Dialogs.c"
 	}
-#line 1330 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 1332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12388 "Dialogs.c"
+#line 12350 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klass) {
-#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	multi_text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (MultiTextEntryDialogPrivate));
-#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = multi_text_entry_dialog_finalize;
-#line 12399 "Dialogs.c"
+#line 12361 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_instance_init (MultiTextEntryDialog * self) {
-#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
-#line 12406 "Dialogs.c"
+#line 12368 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_finalize (GObject* obj) {
 	MultiTextEntryDialog * self;
-#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialog);
-#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1282 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1283 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->action_area_box);
-#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (multi_text_entry_dialog_parent_class)->finalize (obj);
-#line 12426 "Dialogs.c"
+#line 12386 "Dialogs.c"
 }
 
 
@@ -12458,24 +12418,24 @@ EventRenameDialog* event_rename_dialog_construct (GType object_type, const gchar
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Rename Event");
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _ ("Name:");
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event_name;
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EventRenameDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, NULL, NULL);
-#line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12457 "Dialogs.c"
+#line 12417 "Dialogs.c"
 }
 
 
 EventRenameDialog* event_rename_dialog_new (const gchar* event_name) {
-#line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return event_rename_dialog_construct (TYPE_EVENT_RENAME_DIALOG, event_name);
-#line 12464 "Dialogs.c"
+#line 12424 "Dialogs.c"
 }
 
 
@@ -12485,39 +12445,39 @@ static gchar* event_rename_dialog_real_execute (EventRenameDialog* self) {
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event_prep_event_name (_tmp1_);
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12488 "Dialogs.c"
+#line 12448 "Dialogs.c"
 }
 
 
 gchar* event_rename_dialog_execute (EventRenameDialog* self) {
-#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EVENT_RENAME_DIALOG (self), NULL);
-#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EVENT_RENAME_DIALOG_GET_CLASS (self)->execute (self);
-#line 12497 "Dialogs.c"
+#line 12457 "Dialogs.c"
 }
 
 
 static void event_rename_dialog_class_init (EventRenameDialogClass * klass) {
-#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	event_rename_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EventRenameDialogClass *) klass)->execute = event_rename_dialog_real_execute;
-#line 12506 "Dialogs.c"
+#line 12466 "Dialogs.c"
 }
 
 
@@ -12542,24 +12502,24 @@ EditTitleDialog* edit_title_dialog_construct (GType object_type, const gchar* ph
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = C_ ("Dialog Title", "Edit Title");
-#line 1349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _ ("Title:");
-#line 1349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = photo_title;
-#line 1349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EditTitleDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, NULL, NULL);
-#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12541 "Dialogs.c"
+#line 12501 "Dialogs.c"
 }
 
 
 EditTitleDialog* edit_title_dialog_new (const gchar* photo_title) {
-#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return edit_title_dialog_construct (TYPE_EDIT_TITLE_DIALOG, photo_title);
-#line 12548 "Dialogs.c"
+#line 12508 "Dialogs.c"
 }
 
 
@@ -12569,56 +12529,56 @@ static gchar* edit_title_dialog_real_execute (EditTitleDialog* self) {
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = media_source_prep_title (_tmp1_);
-#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12572 "Dialogs.c"
+#line 12532 "Dialogs.c"
 }
 
 
 gchar* edit_title_dialog_execute (EditTitleDialog* self) {
-#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EDIT_TITLE_DIALOG (self), NULL);
-#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EDIT_TITLE_DIALOG_GET_CLASS (self)->execute (self);
-#line 12581 "Dialogs.c"
+#line 12541 "Dialogs.c"
 }
 
 
 static gboolean edit_title_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text) {
 	EditTitleDialog * self;
 	gboolean result = FALSE;
-#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_TITLE_DIALOG, EditTitleDialog);
-#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 1358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12596 "Dialogs.c"
+#line 12556 "Dialogs.c"
 }
 
 
 static void edit_title_dialog_class_init (EditTitleDialogClass * klass) {
-#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	edit_title_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EditTitleDialogClass *) klass)->execute = edit_title_dialog_real_execute;
-#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1335 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = edit_title_dialog_real_on_modify_validate;
-#line 12607 "Dialogs.c"
+#line 12567 "Dialogs.c"
 }
 
 
@@ -12646,47 +12606,47 @@ EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar
 	gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
-#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = is_event;
-#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 12639 "Dialogs.c"
+#line 12599 "Dialogs.c"
 		const gchar* _tmp2_ = NULL;
-#line 1366 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = _ ("Edit Event Comment");
-#line 1366 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp2_;
-#line 12645 "Dialogs.c"
+#line 12605 "Dialogs.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
-#line 1367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _ ("Edit Photo/Video Comment");
-#line 1367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp3_;
-#line 12652 "Dialogs.c"
+#line 12612 "Dialogs.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_strdup (_tmp0_);
-#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	title_tmp = _tmp4_;
-#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _ ("Comment:");
-#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = comment;
-#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EditCommentDialog*) multi_text_entry_dialog_mediator_construct (object_type, title_tmp, _tmp5_, _tmp6_);
-#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1352 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (title_tmp);
-#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1352 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12668 "Dialogs.c"
+#line 12628 "Dialogs.c"
 }
 
 
 EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event) {
-#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1352 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return edit_comment_dialog_construct (TYPE_EDIT_COMMENT_DIALOG, comment, is_event);
-#line 12675 "Dialogs.c"
+#line 12635 "Dialogs.c"
 }
 
 
@@ -12696,56 +12656,56 @@ static gchar* edit_comment_dialog_real_execute (EditCommentDialog* self) {
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _multi_text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR, MultiTextEntryDialogMediator));
-#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = media_source_prep_comment (_tmp1_);
-#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12699 "Dialogs.c"
+#line 12659 "Dialogs.c"
 }
 
 
 gchar* edit_comment_dialog_execute (EditCommentDialog* self) {
-#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EDIT_COMMENT_DIALOG (self), NULL);
-#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EDIT_COMMENT_DIALOG_GET_CLASS (self)->execute (self);
-#line 12708 "Dialogs.c"
+#line 12668 "Dialogs.c"
 }
 
 
 static gboolean edit_comment_dialog_real_on_modify_validate (MultiTextEntryDialogMediator* base, const gchar* text) {
 	EditCommentDialog * self;
 	gboolean result = FALSE;
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_COMMENT_DIALOG, EditCommentDialog);
-#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 1376 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1376 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12723 "Dialogs.c"
+#line 12683 "Dialogs.c"
 }
 
 
 static void edit_comment_dialog_class_init (EditCommentDialogClass * klass) {
-#line 1362 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	edit_comment_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1362 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EditCommentDialogClass *) klass)->execute = edit_comment_dialog_real_execute;
-#line 1362 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = edit_comment_dialog_real_on_modify_validate;
-#line 12734 "Dialogs.c"
+#line 12694 "Dialogs.c"
 }
 
 
@@ -12782,63 +12742,63 @@ GtkResponseType remove_from_library_dialog (GtkWindow* owner, const gchar* title
 	gchar* _tmp10_ = NULL;
 	GtkResponseType _result_ = 0;
 	gint _tmp11_ = 0;
-#line 1382 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), 0);
-#line 1382 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, 0);
-#line 1382 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (user_message != NULL, 0);
-#line 1384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = count;
-#line 1384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = ngettext ("Remove and _Trash File", "Remove and _Trash Files", (gulong) _tmp0_);
-#line 1384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	trash_action = _tmp2_;
-#line 1386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = owner;
-#line 1386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = user_message;
-#line 1386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp3_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, "%s", _tmp4_);
-#line 1386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp5_);
-#line 1386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp5_;
-#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("_Remove From Library");
-#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp6_, (gint) GTK_RESPONSE_NO);
-#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), trash_action, (gint) GTK_RESPONSE_YES);
-#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = title;
-#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = user_message;
-#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = build_alert_body_text (_tmp7_, _tmp8_, TRUE);
-#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp10_);
-#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 1396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp11_;
-#line 1398 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1387 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (trash_action);
-#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12827 "Dialogs.c"
+#line 12787 "Dialogs.c"
 }
 
 
@@ -12856,57 +12816,57 @@ GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* ti
 	gchar* _tmp8_ = NULL;
 	GtkResponseType _result_ = 0;
 	gint _tmp9_ = 0;
-#line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), 0);
-#line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, 0);
-#line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (user_message != NULL, 0);
-#line 1406 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = owner;
-#line 1406 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = user_message;
-#line 1406 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp1_);
-#line 1406 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1406 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp2_;
-#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _ ("_Keep");
-#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp3_, (gint) GTK_RESPONSE_NO);
-#line 1409 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _ ("_Delete");
-#line 1409 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp4_, (gint) GTK_RESPONSE_YES);
-#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_NO);
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = title;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = user_message;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp8_);
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp8_);
-#line 1414 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1414 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp9_;
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12895 "Dialogs.c"
+#line 12855 "Dialogs.c"
 }
 
 
@@ -12945,26 +12905,26 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 	gint _tmp37_ = 0;
 	GtkMessageDialog* _tmp38_ = NULL;
 	GtkResponseType _tmp39_ = 0;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE);
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (photos), FALSE);
-#line 1422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	count = 0;
-#line 12940 "Dialogs.c"
+#line 12900 "Dialogs.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = photos;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_photo_it = _tmp1_;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 12953 "Dialogs.c"
+#line 12913 "Dialogs.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			Photo* photo = NULL;
@@ -12972,171 +12932,171 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 			gpointer _tmp5_ = NULL;
 			Photo* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = _photo_it;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp3_) {
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 12969 "Dialogs.c"
+#line 12929 "Dialogs.c"
 			}
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _photo_it;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			photo = (Photo*) _tmp5_;
-#line 1424 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = photo;
-#line 1424 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = photo_has_editable (_tmp6_);
-#line 1424 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1413 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp7_) {
-#line 12983 "Dialogs.c"
+#line 12943 "Dialogs.c"
 				gint _tmp8_ = 0;
-#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp8_ = count;
-#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				count = _tmp8_ + 1;
-#line 12989 "Dialogs.c"
+#line 12949 "Dialogs.c"
 			}
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (photo);
-#line 12993 "Dialogs.c"
+#line 12953 "Dialogs.c"
 		}
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_photo_it);
-#line 12997 "Dialogs.c"
+#line 12957 "Dialogs.c"
 	}
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = count;
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ == 0) {
-#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 13007 "Dialogs.c"
+#line 12967 "Dialogs.c"
 	}
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = count;
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_ == 1) {
-#line 13013 "Dialogs.c"
+#line 12973 "Dialogs.c"
 		const gchar* _tmp12_ = NULL;
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _ ("Revert External Edit?");
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp12_;
-#line 13019 "Dialogs.c"
+#line 12979 "Dialogs.c"
 	} else {
 		const gchar* _tmp13_ = NULL;
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _ ("Revert External Edits?");
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp13_;
-#line 13026 "Dialogs.c"
+#line 12986 "Dialogs.c"
 	}
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = g_strdup (_tmp10_);
-#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	headline = _tmp14_;
-#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = count;
-#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = ngettext ("This will destroy all changes made to the external file. Continue?", "This will destroy all changes made to %d external files. Continue?", (gulong) _tmp15_);
-#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = count;
-#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
-#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp18_;
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = count;
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp20_ == 1) {
-#line 13046 "Dialogs.c"
+#line 13006 "Dialogs.c"
 		const gchar* _tmp21_ = NULL;
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _ ("Re_vert External Edit");
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp21_;
-#line 13052 "Dialogs.c"
+#line 13012 "Dialogs.c"
 	} else {
 		const gchar* _tmp22_ = NULL;
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = _ ("Re_vert External Edits");
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp22_;
-#line 13059 "Dialogs.c"
+#line 13019 "Dialogs.c"
 	}
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = g_strdup (_tmp19_);
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	action = _tmp23_;
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = owner;
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = msg;
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp24_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp25_);
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp26_);
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp26_;
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = dialog;
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = _ ("_Cancel");
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_dialog_get_type (), GtkDialog), _tmp28_, (gint) GTK_RESPONSE_CANCEL);
-#line 1442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = dialog;
-#line 1442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = action;
-#line 1442 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_dialog_get_type (), GtkDialog), _tmp30_, (gint) GTK_RESPONSE_YES);
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = dialog;
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = headline;
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = msg;
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = build_alert_body_text (_tmp32_, _tmp33_, TRUE);
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = _tmp34_;
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (_tmp31_, _tmp35_);
-#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp35_);
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = dialog;
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_dialog_get_type (), GtkDialog));
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp37_;
-#line 1448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = dialog;
-#line 1448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = _result_;
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp39_ == GTK_RESPONSE_YES;
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (action);
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (headline);
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13125 "Dialogs.c"
+#line 13085 "Dialogs.c"
 }
 
 
@@ -13164,110 +13124,110 @@ gboolean remove_offline_dialog (GtkWindow* owner, gint count) {
 	gint _tmp18_ = 0;
 	GtkMessageDialog* _tmp19_ = NULL;
 	GtkResponseType _tmp20_ = 0;
-#line 1453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE);
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = count;
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == 0) {
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 13163 "Dialogs.c"
+#line 13123 "Dialogs.c"
 	}
-#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = count;
-#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = ngettext ("This will remove the photo from the library. Continue?", "This will remove %d photos from the library. Continue?", (gulong) _tmp1_);
-#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = count;
-#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_strdup_printf (_tmp2_, _tmp3_);
-#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp4_;
-#line 1462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = owner;
-#line 1462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = msg;
-#line 1462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp5_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp6_);
-#line 1462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp7_);
-#line 1462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp7_;
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = dialog;
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _ ("_Cancel");
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_dialog_get_type (), GtkDialog), _tmp9_, (gint) GTK_RESPONSE_CANCEL);
-#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = dialog;
-#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _ ("_Remove");
-#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog), _tmp11_, (gint) GTK_RESPONSE_OK);
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = count;
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp13_ == 1) {
-#line 13201 "Dialogs.c"
+#line 13161 "Dialogs.c"
 		const gchar* _tmp14_ = NULL;
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _ ("Remove Photo From Library");
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp14_;
-#line 13207 "Dialogs.c"
+#line 13167 "Dialogs.c"
 	} else {
 		const gchar* _tmp15_ = NULL;
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _ ("Remove Photos From Library");
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp15_;
-#line 13214 "Dialogs.c"
+#line 13174 "Dialogs.c"
 	}
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = dialog;
-#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_window_get_type (), GtkWindow), _tmp12_);
-#line 1468 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = dialog;
-#line 1468 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog));
-#line 1468 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp18_;
-#line 1470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = dialog;
-#line 1470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = _result_;
-#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp20_ == GTK_RESPONSE_OK;
-#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13240 "Dialogs.c"
+#line 13200 "Dialogs.c"
 }
 
 
 static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1505 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_on_cancel ((ProgressDialog*) self);
-#line 13247 "Dialogs.c"
+#line 13207 "Dialogs.c"
 }
 
 
 static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = progress_dialog_on_window_closed ((ProgressDialog*) self);
-#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13256 "Dialogs.c"
+#line 13216 "Dialogs.c"
 }
 
 
@@ -13297,204 +13257,208 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner,
 	GtkBox* vbox = NULL;
 	GtkBox* _tmp23_ = NULL;
 	GtkBox* _tmp24_ = NULL;
-	GtkAlignment* alignment = NULL;
-	GtkAlignment* _tmp25_ = NULL;
-	gulong _tmp26_ = 0UL;
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gulong _tmp25_ = 0UL;
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((owner == NULL) || GTK_IS_WINDOW (owner), NULL);
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), NULL);
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ProgressDialog*) g_object_new (object_type, NULL);
-#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = cancellable;
-#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->cancellable = _tmp1_;
-#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = text;
-#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp2_);
-#line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 1492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = owner;
-#line 1492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ != NULL) {
-#line 13315 "Dialogs.c"
+#line 13273 "Dialogs.c"
 		GtkWindow* _tmp4_ = NULL;
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = owner;
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 13321 "Dialogs.c"
+#line 13279 "Dialogs.c"
 	}
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 1497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->progress_bar;
-#line 1497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 300, -1);
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = self->priv->progress_bar;
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_show_text (_tmp6_, TRUE);
-#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp7_);
-#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	vbox_bar = _tmp7_;
-#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = vbox_bar;
-#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->progress_bar;
-#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = cancellable;
-#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp10_ != NULL) {
-#line 13351 "Dialogs.c"
+#line 13309 "Dialogs.c"
 		GtkButton* _tmp11_ = NULL;
 		GtkButton* _tmp12_ = NULL;
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp11_);
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->cancel_button);
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->cancel_button = _tmp11_;
-#line 1505 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->cancel_button;
-#line 1505 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_signal_connect_object (_tmp12_, "clicked", (GCallback) _progress_dialog_on_cancel_gtk_button_clicked, self, 0);
-#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _progress_dialog_on_window_closed_gtk_widget_delete_event, self, 0);
-#line 13368 "Dialogs.c"
+#line 13326 "Dialogs.c"
 	}
-#line 1509 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 1509 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp13_);
-#line 1509 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hbox = _tmp13_;
-#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = hbox;
-#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = vbox_bar;
-#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->cancel_button;
-#line 1511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ != NULL) {
-#line 13386 "Dialogs.c"
+#line 13344 "Dialogs.c"
 		GtkBox* _tmp17_ = NULL;
 		GtkButton* _tmp18_ = NULL;
-#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = hbox;
-#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->cancel_button;
-#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_end (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 13395 "Dialogs.c"
+#line 13353 "Dialogs.c"
 	}
-#line 1514 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = (GtkLabel*) gtk_label_new ("");
-#line 1514 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp19_);
-#line 1514 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	primary_text_label = _tmp19_;
-#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = text;
-#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = g_strdup_printf ("<span weight=\"bold\">%s</span>", _tmp20_);
-#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (primary_text_label, _tmp22_);
-#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp22_);
-#line 1516 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (primary_text_label, gtk_misc_get_type (), GtkMisc), (gfloat) 0, 0.5f);
-#line 1518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1505 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_xalign (primary_text_label, 0.0f);
+#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_yalign (primary_text_label, 0.5f);
+#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-#line 1518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp23_);
-#line 1518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	vbox = _tmp23_;
-#line 1519 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (primary_text_label, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = hbox;
-#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+#line 1511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 1513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1514 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
+#line 1516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
+#line 1517 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
+#line 1518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget), 12);
+#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget));
 #line 1522 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = (GtkAlignment*) gtk_alignment_new (0.5f, 0.5f, 1.0f, 1.0f);
-#line 1522 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp25_);
+	_tmp25_ = now_ms ();
 #line 1522 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	alignment = _tmp25_;
-#line 1523 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_alignment_set_padding (alignment, (guint) 12, (guint) 12, (guint) 12, (guint) 12);
-#line 1524 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (alignment, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget));
-#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (alignment, gtk_widget_get_type (), GtkWidget));
-#line 1528 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = now_ms ();
-#line 1528 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->time_started = _tmp26_;
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (alignment);
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->time_started = _tmp25_;
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (vbox);
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (primary_text_label);
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (hbox);
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (vbox_bar);
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 13455 "Dialogs.c"
+#line 13419 "Dialogs.c"
 }
 
 
 ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable) {
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return progress_dialog_construct (TYPE_PROGRESS_DIALOG, owner, text, cancellable);
-#line 13462 "Dialogs.c"
+#line 13426 "Dialogs.c"
 }
 
 
 static void progress_dialog_real_realize (GtkWidget* base) {
 	ProgressDialog * self;
 	GCancellable* _tmp0_ = NULL;
-#line 1531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PROGRESS_DIALOG, ProgressDialog);
-#line 1532 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	GTK_WIDGET_CLASS (progress_dialog_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
-#line 1535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->cancellable;
-#line 1535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 13477 "Dialogs.c"
+#line 13441 "Dialogs.c"
 		GdkWindow* _tmp1_ = NULL;
-#line 1536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gdk_window_set_functions (_tmp1_, GDK_FUNC_MOVE);
-#line 13483 "Dialogs.c"
+#line 13447 "Dialogs.c"
 	}
 }
 
@@ -13502,44 +13466,44 @@ static void progress_dialog_real_realize (GtkWidget* base) {
 void progress_dialog_update_display_every (ProgressDialog* self, gint update_every) {
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 1539 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = update_every;
-#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_ >= 1, "update_every >= 1");
-#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = update_every;
-#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->update_every = _tmp1_;
-#line 13501 "Dialogs.c"
+#line 13465 "Dialogs.c"
 }
 
 
 void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec) {
 	gint _tmp0_ = 0;
-#line 1545 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = minimum_on_screen_time_msec;
-#line 1546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minimum_on_screen_time_msec = _tmp0_;
-#line 13513 "Dialogs.c"
+#line 13477 "Dialogs.c"
 }
 
 
 void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total) {
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 1549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1544 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = current;
-#line 1550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1544 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = total;
-#line 1550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1544 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_set_percentage (self, ((gdouble) _tmp0_) / ((gdouble) _tmp1_));
-#line 13528 "Dialogs.c"
+#line 13492 "Dialogs.c"
 }
 
 
@@ -13554,58 +13518,58 @@ void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct) {
 	gdouble _tmp7_ = 0.0;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = pct;
-#line 1554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = CLAMP (_tmp0_, 0.0, 1.0);
-#line 1554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pct = _tmp1_;
-#line 1556 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = pct;
-#line 1556 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_maybe_show_all (self, _tmp2_);
-#line 1558 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->progress_bar;
-#line 1558 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = pct;
-#line 1558 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_fraction (_tmp3_, _tmp4_);
-#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->progress_bar;
-#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("%d%%");
-#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = pct;
-#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = g_strdup_printf (_tmp6_, (gint) (_tmp7_ * 100.0));
-#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_text (_tmp5_, _tmp9_);
-#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp9_);
-#line 13575 "Dialogs.c"
+#line 13539 "Dialogs.c"
 }
 
 
 void progress_dialog_set_status (ProgressDialog* self, const gchar* text) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (text != NULL);
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->progress_bar;
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 1574 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 13594 "Dialogs.c"
+#line 13558 "Dialogs.c"
 }
 
 
@@ -13617,131 +13581,131 @@ gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 t
 	GCancellable* _tmp9_ = NULL;
 	gboolean keep_going = FALSE;
 	gboolean _tmp12_ = FALSE;
-#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
-#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->last_count;
-#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == G_MAXUINT64) {
-#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 13614 "Dialogs.c"
+#line 13578 "Dialogs.c"
 	} else {
 		guint64 _tmp2_ = 0ULL;
 		guint64 _tmp3_ = 0ULL;
 		gint _tmp4_ = 0;
-#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = count;
-#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->last_count;
-#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->update_every;
-#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = (_tmp2_ - _tmp3_) >= ((guint64) _tmp4_);
-#line 13627 "Dialogs.c"
+#line 13591 "Dialogs.c"
 	}
-#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 13631 "Dialogs.c"
+#line 13595 "Dialogs.c"
 		guint64 _tmp5_ = 0ULL;
 		guint64 _tmp6_ = 0ULL;
 		guint64 _tmp7_ = 0ULL;
-#line 1580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = count;
-#line 1580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = total;
-#line 1580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress_dialog_set_percentage (self, ((gdouble) _tmp5_) / ((gdouble) _tmp6_));
-#line 1581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = count;
-#line 1581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->last_count = _tmp7_;
-#line 13645 "Dialogs.c"
+#line 13609 "Dialogs.c"
 	}
-#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->cancellable;
-#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ != NULL) {
-#line 13651 "Dialogs.c"
+#line 13615 "Dialogs.c"
 		GCancellable* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->cancellable;
-#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = g_cancellable_is_cancelled (_tmp10_);
-#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = !_tmp11_;
-#line 13660 "Dialogs.c"
+#line 13624 "Dialogs.c"
 	} else {
-#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = TRUE;
-#line 13664 "Dialogs.c"
+#line 13628 "Dialogs.c"
 	}
-#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	keep_going = _tmp8_;
-#line 1592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = do_event_loop;
-#line 1592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp12_) {
-#line 1593 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		spin_event_loop ();
-#line 13674 "Dialogs.c"
+#line 13638 "Dialogs.c"
 	}
-#line 1595 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = keep_going;
-#line 1595 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13680 "Dialogs.c"
+#line 13644 "Dialogs.c"
 }
 
 
 void progress_dialog_close (ProgressDialog* self) {
-#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1604 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 13691 "Dialogs.c"
+#line 13655 "Dialogs.c"
 }
 
 
 static gboolean progress_dialog_on_window_closed (ProgressDialog* self) {
 	gboolean result = FALSE;
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
-#line 1608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_on_cancel (self);
-#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
-#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13705 "Dialogs.c"
+#line 13669 "Dialogs.c"
 }
 
 
 static void progress_dialog_on_cancel (ProgressDialog* self) {
 	GCancellable* _tmp0_ = NULL;
 	GtkButton* _tmp2_ = NULL;
-#line 1613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->cancellable;
-#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ != NULL) {
-#line 13718 "Dialogs.c"
+#line 13682 "Dialogs.c"
 		GCancellable* _tmp1_ = NULL;
-#line 1615 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->cancellable;
-#line 1615 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_cancellable_cancel (_tmp1_);
-#line 13724 "Dialogs.c"
+#line 13688 "Dialogs.c"
 	}
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->cancel_button;
-#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 13730 "Dialogs.c"
+#line 13694 "Dialogs.c"
 }
 
 
@@ -13749,35 +13713,35 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1620 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp2_) {
-#line 13746 "Dialogs.c"
+#line 13710 "Dialogs.c"
 		gulong _tmp3_ = 0UL;
 		gulong _tmp4_ = 0UL;
 		gint _tmp5_ = 0;
-#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = now_ms ();
-#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->time_started;
-#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->minimum_on_screen_time_msec;
-#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = (_tmp3_ - _tmp4_) > ((gulong) _tmp5_);
-#line 13758 "Dialogs.c"
+#line 13722 "Dialogs.c"
 	} else {
-#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 13762 "Dialogs.c"
+#line 13726 "Dialogs.c"
 	}
-#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 13766 "Dialogs.c"
+#line 13730 "Dialogs.c"
 		gdouble pps = 0.0;
 		gdouble _tmp6_ = 0.0;
 		gint _tmp7_ = 0;
@@ -13785,80 +13749,80 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
 		gdouble _tmp8_ = 0.0;
 		gdouble _tmp9_ = 0.0;
 		gint _tmp10_ = 0;
-#line 1625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = pct;
-#line 1625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->minimum_on_screen_time_msec;
-#line 1625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		pps = (_tmp6_ * 100.0) / _tmp7_;
-#line 1627 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = pps;
-#line 1627 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ttc = 100.0 / _tmp8_;
-#line 1630 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = ttc;
-#line 1630 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->minimum_on_screen_time_msec;
-#line 1630 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_ > ((gdouble) _tmp10_)) {
-#line 1635 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			spin_event_loop ();
-#line 13794 "Dialogs.c"
+#line 13758 "Dialogs.c"
 		}
 	}
 }
 
 
 static void progress_dialog_class_init (ProgressDialogClass * klass) {
-#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (ProgressDialogPrivate));
-#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((GtkWidgetClass *) klass)->realize = progress_dialog_real_realize;
-#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_dialog_finalize;
-#line 13809 "Dialogs.c"
+#line 13773 "Dialogs.c"
 }
 
 
 static void progress_dialog_instance_init (ProgressDialog * self) {
 	GtkProgressBar* _tmp0_ = NULL;
-#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = PROGRESS_DIALOG_GET_PRIVATE (self);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->progress_bar = _tmp0_;
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->cancel_button = NULL;
-#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->last_count = G_MAXUINT64;
-#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->update_every = 1;
-#line 1481 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minimum_on_screen_time_msec = 500;
-#line 13831 "Dialogs.c"
+#line 13795 "Dialogs.c"
 }
 
 
 static void progress_dialog_finalize (GObject* obj) {
 	ProgressDialog * self;
-#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_DIALOG, ProgressDialog);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->progress_bar);
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->cancel_button);
-#line 1478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (progress_dialog_parent_class)->finalize (obj);
-#line 13847 "Dialogs.c"
+#line 13811 "Dialogs.c"
 }
 
 
@@ -13887,53 +13851,53 @@ static GType adjust_date_time_dialog_time_system_get_type (void) {
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13878 "Dialogs.c"
+#line 13842 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self) {
-#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13885 "Dialogs.c"
+#line 13849 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self) {
-#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13892 "Dialogs.c"
+#line 13856 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self) {
-#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13899 "Dialogs.c"
+#line 13863 "Dialogs.c"
 }
 
 
 static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self) {
 	gboolean result;
 	result = adjust_date_time_dialog_on_spin_button_output ((AdjustDateTimeDialog*) self, _sender);
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13908 "Dialogs.c"
+#line 13872 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_system_changed ((AdjustDateTimeDialog*) self);
-#line 13915 "Dialogs.c"
+#line 13879 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13922 "Dialogs.c"
+#line 13886 "Dialogs.c"
 }
 
 
@@ -13948,7 +13912,7 @@ static void g_time_local (time_t time, struct tm* result) {
 	*result = _result_;
 #line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
-#line 13937 "Dialogs.c"
+#line 13901 "Dialogs.c"
 }
 
 
@@ -14064,812 +14028,806 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 	GtkBox* _tmp137_ = NULL;
 	GtkBox* _tmp138_ = NULL;
 	GtkBox* _tmp139_ = NULL;
-	GtkAlignment* hbox_alignment = NULL;
-	GtkAlignment* _tmp140_ = NULL;
-	GtkAlignment* _tmp141_ = NULL;
+	GtkBox* _tmp140_ = NULL;
+	GtkBox* _tmp141_ = NULL;
 	GtkBox* _tmp142_ = NULL;
 	GtkBox* _tmp143_ = NULL;
-	GtkAlignment* _tmp144_ = NULL;
-	GtkLabel* _tmp145_ = NULL;
+	GtkBox* _tmp144_ = NULL;
+	GtkBox* _tmp145_ = NULL;
 	GtkLabel* _tmp146_ = NULL;
 	GtkLabel* _tmp147_ = NULL;
-	GtkBox* _tmp148_ = NULL;
-	GtkLabel* _tmp149_ = NULL;
-	Dateable* _tmp150_ = NULL;
-	time_t _tmp151_ = 0;
+	GtkLabel* _tmp148_ = NULL;
+	GtkBox* _tmp149_ = NULL;
+	GtkLabel* _tmp150_ = NULL;
+	Dateable* _tmp151_ = NULL;
 	time_t _tmp152_ = 0;
-	time_t _tmp154_ = 0;
-	struct tm _tmp155_ = {0};
-	ConfigFacade* _tmp156_ = NULL;
+	time_t _tmp153_ = 0;
+	time_t _tmp155_ = 0;
+	struct tm _tmp156_ = {0};
 	ConfigFacade* _tmp157_ = NULL;
-	gboolean _tmp158_ = FALSE;
+	ConfigFacade* _tmp158_ = NULL;
+	gboolean _tmp159_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_DATEABLE (source), NULL);
-#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1667 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = source;
-#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1667 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_ != NULL, "source != null");
-#line 1676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_settings_get_default ();
-#line 1676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = use_header;
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_) {
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = 1;
-#line 14089 "Dialogs.c"
+#line 14053 "Dialogs.c"
 	} else {
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = 0;
-#line 14093 "Dialogs.c"
+#line 14057 "Dialogs.c"
 	}
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (AdjustDateTimeDialog*) g_object_new (object_type, "use-header-bar", _tmp2_, NULL);
-#line 1679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 1685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_ADJUST_DATE_TIME_LABEL);
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkCalendar*) gtk_calendar_new ();
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->calendar);
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->calendar = _tmp6_;
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->calendar;
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp7_, "day-selected", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected, self, 0);
-#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->calendar;
-#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp8_, "month-changed", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed, self, 0);
-#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->calendar;
-#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp9_, "next-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year, self, 0);
-#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = self->priv->calendar;
-#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp10_, "prev-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year, self, 0);
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = config_facade_get_instance ();
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp12_);
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_) {
-#line 14149 "Dialogs.c"
+#line 14113 "Dialogs.c"
 		GtkSpinButton* _tmp15_ = NULL;
-#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 23, (gdouble) 1);
-#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp15_);
-#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->hour);
-#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->hour = _tmp15_;
-#line 14159 "Dialogs.c"
+#line 14123 "Dialogs.c"
 	} else {
 		GtkSpinButton* _tmp16_ = NULL;
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 1, (gdouble) 12, (gdouble) 1);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp16_);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->hour);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->hour = _tmp16_;
-#line 14170 "Dialogs.c"
+#line 14134 "Dialogs.c"
 	}
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->hour;
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp17_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->hour;
-#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->hour;
-#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp20_);
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->minute);
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minute = _tmp20_;
-#line 1703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = self->priv->minute;
-#line 1703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->minute;
-#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = self->priv->minute;
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp23_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp24_);
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->second);
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->second = _tmp24_;
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = self->priv->second;
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = self->priv->second;
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = self->priv->second;
-#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp27_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp28_);
-#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->system);
-#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->system = _tmp28_;
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->system;
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = _ ("AM");
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp29_, _tmp30_);
-#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = self->priv->system;
-#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = _ ("PM");
-#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp31_, _tmp32_);
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = self->priv->system;
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = _ ("24 Hr");
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp33_, _tmp34_);
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = self->priv->system;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed, self, 0);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp36_);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	clock = _tmp36_;
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = clock;
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = self->priv->hour;
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = clock;
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = (GtkLabel*) gtk_label_new (":");
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp40_);
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = _tmp40_;
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp41_);
-#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = clock;
-#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = self->priv->minute;
-#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = clock;
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = (GtkLabel*) gtk_label_new (":");
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp45_);
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = _tmp45_;
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp46_);
-#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = clock;
-#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp48_ = self->priv->second;
-#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = clock;
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = self->priv->system;
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp51_ = _ ("_Shift photos/videos by the same amount");
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (NULL, _tmp51_);
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp52_);
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->relativity_radio_button);
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->relativity_radio_button = _tmp52_;
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp53_ = self->priv->relativity_radio_button;
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = config_facade_get_instance ();
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = _tmp54_;
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp56_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp56_);
-#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp55_);
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp58_ = display_options;
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp58_) {
-#line 14336 "Dialogs.c"
+#line 14300 "Dialogs.c"
 		gint _tmp59_ = 0;
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp59_ = photo_count;
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = _tmp59_ > 1;
-#line 14342 "Dialogs.c"
+#line 14306 "Dialogs.c"
 	} else {
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = FALSE;
-#line 14346 "Dialogs.c"
+#line 14310 "Dialogs.c"
 	}
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp60_ = self->priv->relativity_radio_button;
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), _tmp57_);
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp61_ = self->priv->relativity_radio_button;
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp62_ = gtk_radio_button_get_group (_tmp61_);
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp63_ = _ ("Set _all photos/videos to this time");
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp64_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (_tmp62_, _tmp63_);
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp64_);
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->batch_radio_button);
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->batch_radio_button = _tmp64_;
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp65_ = self->priv->batch_radio_button;
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp66_ = config_facade_get_instance ();
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = _tmp66_;
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_toggle_button_get_type (), GtkToggleButton), !_tmp68_);
-#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp67_);
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70_ = display_options;
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp70_) {
-#line 14382 "Dialogs.c"
+#line 14346 "Dialogs.c"
 		gint _tmp71_ = 0;
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = photo_count;
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = _tmp71_ > 1;
-#line 14388 "Dialogs.c"
+#line 14352 "Dialogs.c"
 	} else {
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = FALSE;
-#line 14392 "Dialogs.c"
+#line 14356 "Dialogs.c"
 	}
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72_ = self->priv->batch_radio_button;
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), _tmp69_);
-#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = self->priv->batch_radio_button;
-#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled, self, 0);
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = contains_video;
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp74_) {
-#line 14406 "Dialogs.c"
-		const gchar* _tmp75_ = NULL;
-		gint _tmp76_ = 0;
+#line 14370 "Dialogs.c"
+		gchar* text = NULL;
+		gint _tmp75_ = 0;
+		const gchar* _tmp76_ = NULL;
+		gchar* _tmp77_ = NULL;
+		const gchar* _tmp78_ = NULL;
 		GtkCheckButton* _tmp79_ = NULL;
-#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp76_ = photo_count;
-#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp76_ == 1) {
-#line 14414 "Dialogs.c"
-			const gchar* _tmp77_ = NULL;
-#line 1742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp77_ = _ ("_Modify original photo file");
-#line 1742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp75_ = _tmp77_;
-#line 14420 "Dialogs.c"
-		} else {
-			const gchar* _tmp78_ = NULL;
-#line 1742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp78_ = _ ("_Modify original photo files");
-#line 1742 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp75_ = _tmp78_;
-#line 14427 "Dialogs.c"
-		}
-#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp79_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp75_);
-#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp75_ = photo_count;
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp76_ = ngettext ("_Modify original photo file", "_Modify original photo files", (gulong) _tmp75_);
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp77_ = g_strdup (_tmp76_);
+#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		text = _tmp77_;
+#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp78_ = text;
+#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp79_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp78_);
+#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp79_);
-#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->modify_originals_check_button = _tmp79_;
-#line 14437 "Dialogs.c"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_g_free0 (text);
+#line 14397 "Dialogs.c"
 	} else {
-		const gchar* _tmp80_ = NULL;
-		gint _tmp81_ = 0;
+		gchar* text = NULL;
+		gint _tmp80_ = 0;
+		const gchar* _tmp81_ = NULL;
+		gchar* _tmp82_ = NULL;
+		const gchar* _tmp83_ = NULL;
 		GtkCheckButton* _tmp84_ = NULL;
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp81_ = photo_count;
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		if (_tmp81_ == 1) {
-#line 14446 "Dialogs.c"
-			const gchar* _tmp82_ = NULL;
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp82_ = _ ("_Modify original file");
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp80_ = _tmp82_;
-#line 14452 "Dialogs.c"
-		} else {
-			const gchar* _tmp83_ = NULL;
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp83_ = _ ("_Modify original files");
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp80_ = _tmp83_;
-#line 14459 "Dialogs.c"
-		}
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp84_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp80_);
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp80_ = photo_count;
+#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp81_ = ngettext ("_Modify original file", "_Modify original files", (gulong) _tmp80_);
+#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp82_ = g_strdup (_tmp81_);
+#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		text = _tmp82_;
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp83_ = text;
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp84_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp83_);
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp84_);
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->modify_originals_check_button = _tmp84_;
-#line 14469 "Dialogs.c"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_g_free0 (text);
+#line 14425 "Dialogs.c"
 	}
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp86_ = config_facade_get_instance ();
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp87_ = _tmp86_;
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp89_ = _tmp88_;
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp87_);
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp89_) {
-#line 14483 "Dialogs.c"
+#line 14439 "Dialogs.c"
 		gboolean _tmp90_ = FALSE;
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp90_ = display_options;
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = _tmp90_;
-#line 14489 "Dialogs.c"
+#line 14445 "Dialogs.c"
 	} else {
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = FALSE;
-#line 14493 "Dialogs.c"
+#line 14449 "Dialogs.c"
 	}
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp91_ = self->priv->modify_originals_check_button;
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp85_);
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp93_ = only_video;
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp93_) {
-#line 14503 "Dialogs.c"
+#line 14459 "Dialogs.c"
 		gboolean _tmp94_ = FALSE;
 		ConfigFacade* _tmp95_ = NULL;
 		ConfigFacade* _tmp96_ = NULL;
 		gboolean _tmp97_ = FALSE;
 		gboolean _tmp98_ = FALSE;
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp95_ = config_facade_get_instance ();
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp96_ = _tmp95_;
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp97_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp98_ = !_tmp97_;
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp96_);
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp98_) {
-#line 14521 "Dialogs.c"
+#line 14477 "Dialogs.c"
 			gboolean _tmp99_ = FALSE;
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp99_ = display_options;
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp94_ = _tmp99_;
-#line 14527 "Dialogs.c"
+#line 14483 "Dialogs.c"
 		} else {
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp94_ = FALSE;
-#line 14531 "Dialogs.c"
+#line 14487 "Dialogs.c"
 		}
-#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = _tmp94_;
-#line 14535 "Dialogs.c"
+#line 14491 "Dialogs.c"
 	} else {
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = FALSE;
-#line 14539 "Dialogs.c"
+#line 14495 "Dialogs.c"
 	}
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp100_ = self->priv->modify_originals_check_button;
-#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget), _tmp92_);
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp101_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp101_);
-#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time_content = _tmp101_;
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp102_ = time_content;
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp103_ = self->priv->calendar;
-#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp102_, G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp104_ = time_content;
-#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp105_ = clock;
-#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp104_, G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp106_ = display_options;
-#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp106_) {
-#line 14567 "Dialogs.c"
+#line 14523 "Dialogs.c"
 		GtkBox* _tmp107_ = NULL;
 		GtkRadioButton* _tmp108_ = NULL;
 		GtkBox* _tmp109_ = NULL;
 		GtkRadioButton* _tmp110_ = NULL;
 		GtkBox* _tmp111_ = NULL;
 		GtkCheckButton* _tmp112_ = NULL;
-#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp107_ = time_content;
-#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp108_ = self->priv->relativity_radio_button;
-#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_start (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp109_ = time_content;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp110_ = self->priv->batch_radio_button;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_start (_tmp109_, G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp111_ = time_content;
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp112_ = self->priv->modify_originals_check_button;
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_start (_tmp111_, G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 14592 "Dialogs.c"
+#line 14548 "Dialogs.c"
 	}
-#line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preview = NULL;
-#line 14596 "Dialogs.c"
+#line 14552 "Dialogs.c"
 	{
 		GdkPixbuf* _tmp113_ = NULL;
 		Dateable* _tmp114_ = NULL;
 		GdkPixbuf* _tmp115_ = NULL;
 		GdkPixbuf* _tmp116_ = NULL;
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp114_ = source;
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp115_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE, &_inner_error_);
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp113_ = _tmp115_;
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14610 "Dialogs.c"
-			goto __catch425_g_error;
+#line 14566 "Dialogs.c"
+			goto __catch422_g_error;
 		}
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp116_ = _tmp113_;
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp113_ = NULL;
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (preview);
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preview = _tmp116_;
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp113_);
-#line 14623 "Dialogs.c"
+#line 14579 "Dialogs.c"
 	}
-	goto __finally425;
-	__catch425_g_error:
+	goto __finally422;
+	__catch422_g_error:
 	{
 		GError* err = NULL;
 		Dateable* _tmp117_ = NULL;
 		gchar* _tmp118_ = NULL;
 		gchar* _tmp119_ = NULL;
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		err = _inner_error_;
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp117_ = source;
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp118_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_DATA_OBJECT, DataObject));
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp119_ = _tmp118_;
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_warning ("Dialogs.vala:1770: Unable to fetch preview for %s", _tmp119_);
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp119_);
 #line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		g_warning ("Dialogs.vala:1765: Unable to fetch preview for %s", _tmp119_);
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_g_free0 (_tmp119_);
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (err);
-#line 14648 "Dialogs.c"
+#line 14604 "Dialogs.c"
 	}
-	__finally425:
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	__finally422:
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (preview);
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (time_content);
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (clock);
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_clear_error (&_inner_error_);
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return NULL;
-#line 14665 "Dialogs.c"
+#line 14621 "Dialogs.c"
 	}
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp120_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp120_);
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	image_content = _tmp120_;
-#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp121_ = image_content;
-#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp122_ = image_content;
-#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_set_homogeneous (_tmp122_, TRUE);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp124_ = preview;
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp124_ != NULL) {
-#line 14685 "Dialogs.c"
+#line 14641 "Dialogs.c"
 		GdkPixbuf* _tmp125_ = NULL;
 		GtkImage* _tmp126_ = NULL;
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp125_ = preview;
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp126_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp125_);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp126_);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp123_);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = _tmp126_;
-#line 14698 "Dialogs.c"
+#line 14654 "Dialogs.c"
 	} else {
 		GtkImage* _tmp127_ = NULL;
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp127_ = (GtkImage*) gtk_image_new ();
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp127_);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp123_);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = _tmp127_;
-#line 14709 "Dialogs.c"
+#line 14665 "Dialogs.c"
 	}
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp128_ = _g_object_ref0 (_tmp123_);
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	image = _tmp128_;
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp129_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp129_);
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->original_time_label);
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->original_time_label = _tmp129_;
-#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp130_ = image_content;
-#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp131_ = image;
-#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp130_, G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp132_ = image_content;
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp133_ = self->priv->original_time_label;
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp132_, G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp134_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp134_);
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hbox = _tmp134_;
-#line 1782 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp135_ = hbox;
-#line 1782 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_container_get_type (), GtkContainer), (guint) 3);
-#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp136_ = hbox;
-#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp137_ = image_content;
-#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp136_, G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp138_ = hbox;
-#line 1784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp139_ = time_content;
-#line 1784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp138_, G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp140_ = (GtkAlignment*) gtk_alignment_new (0.5f, 0.5f, (gfloat) 0, (gfloat) 0);
-#line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp140_);
-#line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	hbox_alignment = _tmp140_;
+#line 1780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp140_ = hbox;
+#line 1780 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp140_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp141_ = hbox;
+#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 1782 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp142_ = hbox;
+#line 1782 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp143_ = hbox;
+#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp144_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp145_ = hbox;
+#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp145_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
 #line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp141_ = hbox_alignment;
+	_tmp146_ = (GtkLabel*) gtk_label_new ("");
 #line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp142_ = hbox;
+	g_object_ref_sink (_tmp146_);
 #line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_widget_get_type (), GtkWidget));
-#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp143_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_g_object_unref0 (self->priv->notification);
+#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->notification = _tmp146_;
+#line 1788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp147_ = self->priv->notification;
+#line 1788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_line_wrap (_tmp147_, TRUE);
 #line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp144_ = hbox_alignment;
+	_tmp148_ = self->priv->notification;
 #line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
+	gtk_label_set_justify (_tmp148_, GTK_JUSTIFY_CENTER);
 #line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp145_ = (GtkLabel*) gtk_label_new ("");
+	_tmp149_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp145_);
+	_tmp150_ = self->priv->notification;
 #line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->notification);
-#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->notification = _tmp145_;
-#line 1792 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp146_ = self->priv->notification;
-#line 1792 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_line_wrap (_tmp146_, TRUE);
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp149_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp150_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp147_ = self->priv->notification;
+	_tmp151_ = source;
 #line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_justify (_tmp147_, GTK_JUSTIFY_CENTER);
-#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp148_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp152_ = dateable_get_exposure_time (_tmp151_);
+#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->original_time = _tmp152_;
 #line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp149_ = self->priv->notification;
+	_tmp153_ = self->priv->original_time;
 #line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp149_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	if (_tmp153_ == ((time_t) 0)) {
+#line 14767 "Dialogs.c"
+		time_t _tmp154_ = 0;
+#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp154_ = time (NULL);
+#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		self->priv->original_time = _tmp154_;
 #line 1797 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp150_ = source;
-#line 1797 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp151_ = dateable_get_exposure_time (_tmp150_);
-#line 1797 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->original_time = _tmp151_;
-#line 1799 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp152_ = self->priv->original_time;
-#line 1799 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp152_ == ((time_t) 0)) {
-#line 14807 "Dialogs.c"
-		time_t _tmp153_ = 0;
+		self->priv->no_original_time = TRUE;
+#line 14775 "Dialogs.c"
+	}
+#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp155_ = self->priv->original_time;
 #line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp153_ = time (NULL);
+	g_time_local (_tmp155_, &_tmp156_);
 #line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->original_time = _tmp153_;
+	adjust_date_time_dialog_set_time (self, &_tmp156_);
 #line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->no_original_time = TRUE;
-#line 14815 "Dialogs.c"
-	}
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp154_ = self->priv->original_time;
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_time_local (_tmp154_, &_tmp155_);
-#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_set_time (self, &_tmp155_);
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp156_ = config_facade_get_instance ();
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp157_ = _tmp156_;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp158_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp157_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	adjust_date_time_dialog_set_original_time_label (self, _tmp158_);
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp157_);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (hbox_alignment);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp157_ = config_facade_get_instance ();
+#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp158_ = _tmp157_;
+#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp159_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	adjust_date_time_dialog_set_original_time_label (self, _tmp159_);
+#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (_tmp158_);
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (hbox);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp123_);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image_content);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (preview);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (time_content);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (clock);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 14851 "Dialogs.c"
+#line 14809 "Dialogs.c"
 }
 
 
 AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) {
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return adjust_date_time_dialog_construct (TYPE_ADJUST_DATE_TIME_DIALOG, source, photo_count, display_options, contains_video, only_video);
-#line 14858 "Dialogs.c"
+#line 14816 "Dialogs.c"
 }
 
 
@@ -14894,60 +14852,60 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 	gint _tmp31_ = 0;
 	GtkComboBoxText* _tmp32_ = NULL;
 	gint _tmp33_ = 0;
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (time != NULL);
-#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->calendar;
-#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = *time;
-#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_.tm_mon;
-#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = *time;
-#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_.tm_year;
-#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_calendar_select_month (_tmp0_, (guint) _tmp2_, (guint) (_tmp4_ + ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET));
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->calendar;
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = *time;
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_.tm_mday;
-#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_calendar_select_day (_tmp5_, (guint) _tmp7_);
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp9_);
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_) {
-#line 14919 "Dialogs.c"
+#line 14877 "Dialogs.c"
 		GtkComboBoxText* _tmp12_ = NULL;
 		GtkSpinButton* _tmp13_ = NULL;
 		struct tm _tmp14_ = {0};
 		gint _tmp15_ = 0;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->system;
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), (gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->hour;
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = *time;
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp14_.tm_hour;
-#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp13_, (gdouble) _tmp15_);
-#line 14936 "Dialogs.c"
+#line 14894 "Dialogs.c"
 	} else {
 		gint AMPM_hour = 0;
 		struct tm _tmp16_ = {0};
@@ -14959,74 +14917,74 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 		struct tm _tmp23_ = {0};
 		gint _tmp24_ = 0;
 		GtkComboBoxText* _tmp25_ = NULL;
-#line 1816 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = *time;
-#line 1816 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_.tm_hour;
-#line 1816 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		AMPM_hour = _tmp17_ % 12;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = AMPM_hour;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp19_ == 0) {
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = 12;
-#line 14960 "Dialogs.c"
+#line 14918 "Dialogs.c"
 		} else {
 			gint _tmp20_ = 0;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = AMPM_hour;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = _tmp20_;
-#line 14967 "Dialogs.c"
+#line 14925 "Dialogs.c"
 		}
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->hour;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp21_, (gdouble) _tmp18_);
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = *time;
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = _tmp23_.tm_hour;
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp24_ >= 12) {
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM;
-#line 14981 "Dialogs.c"
+#line 14939 "Dialogs.c"
 		} else {
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM;
-#line 14985 "Dialogs.c"
+#line 14943 "Dialogs.c"
 		}
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = self->priv->system;
-#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp22_);
-#line 14991 "Dialogs.c"
+#line 14949 "Dialogs.c"
 	}
-#line 1821 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = self->priv->minute;
-#line 1821 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = *time;
-#line 1821 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = _tmp27_.tm_min;
-#line 1821 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp28_);
-#line 1822 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->second;
-#line 1822 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = *time;
-#line 1822 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = _tmp30_.tm_sec;
-#line 1822 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_spin_button_set_value (_tmp29_, (gdouble) _tmp31_);
-#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = self->priv->system;
-#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp33_;
-#line 15015 "Dialogs.c"
+#line 14973 "Dialogs.c"
 }
 
 
@@ -15072,7 +15030,7 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	buffer = (g_free (buffer), NULL);
 #line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 15061 "Dialogs.c"
+#line 15019 "Dialogs.c"
 }
 
 
@@ -15088,58 +15046,58 @@ static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialo
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
 	gchar* _tmp12_ = NULL;
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->no_original_time;
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 15085 "Dialogs.c"
+#line 15043 "Dialogs.c"
 	}
-#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_24_hr_format;
-#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 15091 "Dialogs.c"
+#line 15049 "Dialogs.c"
 		const gchar* _tmp3_ = NULL;
-#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _ ("%m/%d/%Y, %H:%M:%S");
-#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp3_;
-#line 15097 "Dialogs.c"
+#line 15055 "Dialogs.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
-#line 1833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _ ("%m/%d/%Y, %I:%M:%S %p");
-#line 1833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp4_;
-#line 15104 "Dialogs.c"
+#line 15062 "Dialogs.c"
 	}
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->original_time_label;
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("Original: ");
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->original_time;
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_time_local (_tmp7_, &_tmp8_);
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_time_format (&_tmp8_, _tmp1_);
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = g_strconcat (_tmp6_, _tmp10_, NULL);
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_text (_tmp5_, _tmp12_);
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp12_);
-#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 15128 "Dialogs.c"
+#line 15086 "Dialogs.c"
 }
 
 
@@ -15168,105 +15126,105 @@ static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
 	guint _tmp18_ = 0U;
 	guint _tmp19_ = 0U;
 	time_t _tmp20_ = 0;
-#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), 0);
-#line 1837 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	memset (&time, 0, sizeof (struct tm));
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->second;
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_spin_button_get_value (_tmp0_);
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_sec = (gint) _tmp1_;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->minute;
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_spin_button_get_value (_tmp2_);
-#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_min = (gint) _tmp3_;
-#line 1843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = self->priv->hour;
-#line 1843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = gtk_spin_button_get_value (_tmp4_);
-#line 1843 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hour = (gint) _tmp5_;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = hour;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ == 12) {
-#line 15183 "Dialogs.c"
+#line 15141 "Dialogs.c"
 		GtkComboBoxText* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->system;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp10_ != ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
-#line 15192 "Dialogs.c"
+#line 15150 "Dialogs.c"
 	} else {
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = FALSE;
-#line 15196 "Dialogs.c"
+#line 15154 "Dialogs.c"
 	}
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp7_) {
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = 0;
-#line 15202 "Dialogs.c"
+#line 15160 "Dialogs.c"
 	} else {
 		gint _tmp11_ = 0;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = hour;
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _tmp11_;
-#line 15209 "Dialogs.c"
+#line 15167 "Dialogs.c"
 	}
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_hour = _tmp6_;
-#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = self->priv->system;
-#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM)) {
-#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = 12;
-#line 15221 "Dialogs.c"
+#line 15179 "Dialogs.c"
 	} else {
-#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = 0;
-#line 15225 "Dialogs.c"
+#line 15183 "Dialogs.c"
 	}
-#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = time.tm_hour;
-#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_hour = _tmp15_ + _tmp12_;
-#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->calendar;
-#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_calendar_get_date (_tmp16_, &_tmp17_, &_tmp18_, &_tmp19_);
-#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	year = _tmp17_;
-#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	month = _tmp18_;
-#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	day = _tmp19_;
-#line 1849 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_year = ((gint) year) - ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET;
-#line 1850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_mon = (gint) month;
-#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_mday = (gint) day;
-#line 1853 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_isdst = -1;
-#line 1855 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = mktime (&time);
-#line 1855 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp20_;
-#line 1855 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15255 "Dialogs.c"
+#line 15213 "Dialogs.c"
 }
 
 
@@ -15277,17 +15235,17 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 	gboolean result = FALSE;
 	gboolean response = FALSE;
 	gint _tmp0_ = 0;
-#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
-#line 1860 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	response = FALSE;
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 15276 "Dialogs.c"
+#line 15234 "Dialogs.c"
 		gboolean _tmp1_ = FALSE;
 		GtkRadioButton* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
@@ -15299,125 +15257,125 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 		GtkCheckButton* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_ = FALSE;
-#line 1865 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->no_original_time;
-#line 1865 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp1_) {
-#line 15292 "Dialogs.c"
+#line 15250 "Dialogs.c"
 			time_t _tmp2_ = 0;
-#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = adjust_date_time_dialog_get_time (self);
-#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_time_shift = (gint64) _tmp2_;
-#line 15298 "Dialogs.c"
+#line 15256 "Dialogs.c"
 		} else {
 			time_t _tmp3_ = 0;
 			time_t _tmp4_ = 0;
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = adjust_date_time_dialog_get_time (self);
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = self->priv->original_time;
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_time_shift = (gint64) (_tmp3_ - _tmp4_);
-#line 15308 "Dialogs.c"
+#line 15266 "Dialogs.c"
 		}
-#line 1870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->relativity_radio_button;
-#line 1870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_keep_relativity = _tmp6_;
-#line 1872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->relativity_radio_button;
-#line 1872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 1872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = _tmp8_;
-#line 1872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_) {
-#line 15324 "Dialogs.c"
+#line 15282 "Dialogs.c"
 			ConfigFacade* _tmp10_ = NULL;
 			ConfigFacade* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = config_facade_get_instance ();
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = _tmp10_;
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = _vala_keep_relativity;
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			configuration_facade_set_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_tmp11_);
-#line 15338 "Dialogs.c"
+#line 15296 "Dialogs.c"
 		}
-#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1871 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->modify_originals_check_button;
-#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1871 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1871 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_modify_originals = _tmp14_;
-#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->modify_originals_check_button;
-#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
-#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_;
-#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp17_) {
-#line 15354 "Dialogs.c"
+#line 15312 "Dialogs.c"
 			ConfigFacade* _tmp18_ = NULL;
 			ConfigFacade* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = config_facade_get_instance ();
-#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp19_ = _tmp18_;
-#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = _vala_modify_originals;
-#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			configuration_facade_set_modify_originals (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp20_);
-#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_tmp19_);
-#line 15368 "Dialogs.c"
+#line 15326 "Dialogs.c"
 		}
-#line 1880 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1876 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		response = TRUE;
-#line 15372 "Dialogs.c"
+#line 15330 "Dialogs.c"
 	} else {
-#line 1882 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_time_shift = (gint64) 0;
-#line 1883 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_keep_relativity = TRUE;
-#line 1884 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_modify_originals = FALSE;
-#line 15380 "Dialogs.c"
+#line 15338 "Dialogs.c"
 	}
-#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = response;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (time_shift) {
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*time_shift = _vala_time_shift;
-#line 15390 "Dialogs.c"
+#line 15348 "Dialogs.c"
 	}
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (keep_relativity) {
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*keep_relativity = _vala_keep_relativity;
-#line 15396 "Dialogs.c"
+#line 15354 "Dialogs.c"
 	}
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (modify_originals) {
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*modify_originals = _vala_modify_originals;
-#line 15402 "Dialogs.c"
+#line 15360 "Dialogs.c"
 	}
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15406 "Dialogs.c"
+#line 15364 "Dialogs.c"
 }
 
 
@@ -15428,31 +15386,31 @@ static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDia
 	gdouble _tmp2_ = 0.0;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1888 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
-#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1888 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (button), FALSE);
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = button;
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = button;
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_spin_button_get_value (_tmp1_);
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup_printf ("%02d", (gint) _tmp2_);
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry), _tmp4_);
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp4_);
-#line 1895 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed (self);
-#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15441 "Dialogs.c"
+#line 15399 "Dialogs.c"
 }
 
 
@@ -15465,81 +15423,81 @@ static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self)
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
 	gint64 _tmp6_ = 0LL;
-#line 1900 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = adjust_date_time_dialog_get_time (self);
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->original_time;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time_shift = ((gint64) _tmp0_) - ((gint64) _tmp1_);
-#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->system;
-#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp3_;
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = time_shift;
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_ == ((gint64) 0)) {
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = TRUE;
-#line 15474 "Dialogs.c"
+#line 15432 "Dialogs.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->no_original_time;
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp7_;
-#line 15481 "Dialogs.c"
+#line 15439 "Dialogs.c"
 	}
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = TRUE;
-#line 15487 "Dialogs.c"
+#line 15445 "Dialogs.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
 		GtkRadioButton* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->batch_radio_button;
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp10_) {
-#line 15498 "Dialogs.c"
+#line 15456 "Dialogs.c"
 			GtkRadioButton* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			gboolean _tmp13_ = FALSE;
-#line 1906 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = self->priv->batch_radio_button;
-#line 1906 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 1906 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = _tmp12_;
-#line 1906 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _tmp13_;
-#line 15510 "Dialogs.c"
+#line 15468 "Dialogs.c"
 		} else {
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = FALSE;
-#line 15514 "Dialogs.c"
+#line 15472 "Dialogs.c"
 		}
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp8_;
-#line 15518 "Dialogs.c"
+#line 15476 "Dialogs.c"
 	}
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 15522 "Dialogs.c"
+#line 15480 "Dialogs.c"
 		GtkLabel* _tmp14_ = NULL;
-#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = self->priv->notification;
-#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 15528 "Dialogs.c"
+#line 15486 "Dialogs.c"
 	} else {
 		gboolean forward = FALSE;
 		gint64 _tmp15_ = 0LL;
@@ -15576,108 +15534,108 @@ static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self)
 		gchar* _tmp43_ = NULL;
 		gchar* _tmp44_ = NULL;
 		GtkLabel* _tmp45_ = NULL;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = time_shift;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		forward = _tmp15_ > ((gint64) 0);
-#line 1912 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = time_shift;
-#line 1912 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = llabs (_tmp16_);
-#line 1912 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time_shift = _tmp17_;
-#line 1914 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = time_shift;
-#line 1914 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		days = (gint) (_tmp18_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY);
-#line 1915 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = time_shift;
-#line 1915 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time_shift = _tmp19_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY;
-#line 1916 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = time_shift;
-#line 1916 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		hours = (gint) (_tmp20_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR);
-#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = time_shift;
-#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time_shift = _tmp21_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR;
-#line 1918 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = time_shift;
-#line 1918 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		minutes = (gint) (_tmp22_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
-#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1915 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = time_shift;
-#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1915 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		seconds = (gint) (_tmp23_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = forward;
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp25_) {
-#line 15603 "Dialogs.c"
+#line 15561 "Dialogs.c"
 			const gchar* _tmp26_ = NULL;
-#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = _ ("Exposure time will be shifted forward by\n" \
 "%d %s, %d %s, %d %s, and %d %s.");
-#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = _tmp26_;
-#line 15609 "Dialogs.c"
+#line 15567 "Dialogs.c"
 		} else {
 			const gchar* _tmp27_ = NULL;
-#line 1923 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = _ ("Exposure time will be shifted backward by\n" \
 "%d %s, %d %s, %d %s, and %d %s.");
-#line 1923 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = _tmp27_;
-#line 15616 "Dialogs.c"
+#line 15574 "Dialogs.c"
 		}
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = g_strdup (_tmp24_);
-#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		shift_status = _tmp28_;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = self->priv->notification;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = shift_status;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = days;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = days;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = ngettext ("day", "days", (gulong) _tmp32_);
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = hours;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = hours;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = ngettext ("hour", "hours", (gulong) _tmp35_);
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp37_ = minutes;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp38_ = minutes;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp39_ = ngettext ("minute", "minutes", (gulong) _tmp38_);
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp40_ = seconds;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp41_ = seconds;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp42_ = ngettext ("second", "seconds", (gulong) _tmp41_);
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp43_ = g_strdup_printf (_tmp30_, _tmp31_, _tmp33_, _tmp34_, _tmp36_, _tmp37_, _tmp39_, _tmp40_, _tmp42_);
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp44_ = _tmp43_;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_text (_tmp29_, _tmp44_);
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp44_);
-#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp45_ = self->priv->notification;
-#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (shift_status);
-#line 15664 "Dialogs.c"
+#line 15622 "Dialogs.c"
 	}
 }
 
@@ -15692,39 +15650,39 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 	gint _tmp6_ = 0;
 	GtkComboBoxText* _tmp7_ = NULL;
 	gint _tmp8_ = 0;
-#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->previous_time_system;
-#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->system;
-#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == _tmp2_) {
-#line 1936 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1932 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 15691 "Dialogs.c"
+#line 15649 "Dialogs.c"
 	}
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = config_facade_get_instance ();
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->system;
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR));
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->system;
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)) {
-#line 15711 "Dialogs.c"
+#line 15669 "Dialogs.c"
 		gint _tmp9_ = 0;
 		GtkSpinButton* _tmp10_ = NULL;
 		gdouble _tmp11_ = 0.0;
@@ -15735,57 +15693,57 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 		GtkSpinButton* _tmp17_ = NULL;
 		GtkSpinButton* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
-#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->hour;
-#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = gtk_spin_button_get_value (_tmp10_);
-#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp11_ == 12.0) {
-#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = 0;
-#line 15730 "Dialogs.c"
+#line 15688 "Dialogs.c"
 		} else {
 			GtkSpinButton* _tmp12_ = NULL;
 			gdouble _tmp13_ = 0.0;
-#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = self->priv->hour;
-#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = gtk_spin_button_get_value (_tmp12_);
-#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = (gint) _tmp13_;
-#line 15740 "Dialogs.c"
+#line 15698 "Dialogs.c"
 		}
-#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time = _tmp9_;
-#line 1942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->previous_time_system;
-#line 1942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp15_ == ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM) {
-#line 1942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = 12;
-#line 15750 "Dialogs.c"
+#line 15708 "Dialogs.c"
 		} else {
-#line 1942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = 0;
-#line 15754 "Dialogs.c"
+#line 15712 "Dialogs.c"
 		}
-#line 1942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = time;
-#line 1942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time = _tmp16_ + _tmp14_;
-#line 1944 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = self->priv->hour;
-#line 1944 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_range (_tmp17_, (gdouble) 0, (gdouble) 23);
-#line 1945 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		adjust_date_time_dialog_set_original_time_label (self, TRUE);
-#line 1947 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->hour;
-#line 1947 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = time;
-#line 1947 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp18_, (gdouble) _tmp19_);
-#line 15772 "Dialogs.c"
+#line 15730 "Dialogs.c"
 	} else {
 		gint AMPM_hour = 0;
 		GtkSpinButton* _tmp20_ = NULL;
@@ -15794,92 +15752,92 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
 		GtkSpinButton* _tmp26_ = NULL;
-#line 1949 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1945 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = self->priv->hour;
-#line 1949 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1945 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = gtk_spin_button_get_value (_tmp20_);
-#line 1949 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1945 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		AMPM_hour = ((gint) _tmp21_) % 12;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = self->priv->hour;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_range (_tmp22_, (gdouble) 1, (gdouble) 12);
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		adjust_date_time_dialog_set_original_time_label (self, FALSE);
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = AMPM_hour;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp24_ == 0) {
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = 12;
-#line 15799 "Dialogs.c"
+#line 15757 "Dialogs.c"
 		} else {
 			gint _tmp25_ = 0;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = AMPM_hour;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = _tmp25_;
-#line 15806 "Dialogs.c"
+#line 15764 "Dialogs.c"
 		}
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = self->priv->hour;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp23_);
-#line 15812 "Dialogs.c"
+#line 15770 "Dialogs.c"
 	}
-#line 1957 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed (self);
-#line 15816 "Dialogs.c"
+#line 15774 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_class_init (AdjustDateTimeDialogClass * klass) {
-#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (AdjustDateTimeDialogPrivate));
-#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_dialog_finalize;
-#line 15827 "Dialogs.c"
+#line 15785 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_instance_init (AdjustDateTimeDialog * self) {
-#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = ADJUST_DATE_TIME_DIALOG_GET_PRIVATE (self);
-#line 1647 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->no_original_time = FALSE;
-#line 15836 "Dialogs.c"
+#line 15794 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_finalize (GObject* obj) {
 	AdjustDateTimeDialog * self;
-#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialog);
-#line 1652 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->original_time_label);
-#line 1653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->calendar);
-#line 1654 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hour);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->minute);
-#line 1656 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->second);
-#line 1657 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1651 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->system);
-#line 1658 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->relativity_radio_button);
-#line 1659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->batch_radio_button);
-#line 1660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->notification);
-#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (adjust_date_time_dialog_parent_class)->finalize (obj);
-#line 15866 "Dialogs.c"
+#line 15824 "Dialogs.c"
 }
 
 
@@ -15911,31 +15869,31 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 	GtkMessageDialog* _tmp34_ = NULL;
 	GtkMessageDialog* _tmp35_ = NULL;
 	const gchar* _tmp36_ = NULL;
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_ARRAY_LIST (objects));
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (message != NULL);
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = message;
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strconcat (_tmp0_, "\n", NULL);
-#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog_message = _tmp1_;
-#line 15910 "Dialogs.c"
+#line 15868 "Dialogs.c"
 	{
 		gint i = 0;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 15915 "Dialogs.c"
+#line 15873 "Dialogs.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = TRUE;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 15922 "Dialogs.c"
+#line 15880 "Dialogs.c"
 				gboolean _tmp4_ = FALSE;
 				gint _tmp5_ = 0;
 				const gchar* _tmp10_ = NULL;
@@ -15948,96 +15906,96 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 				gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
 				gchar* _tmp19_ = NULL;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp2_) {
-#line 15937 "Dialogs.c"
+#line 15895 "Dialogs.c"
 					gint _tmp3_ = 0;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp3_ = i;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					i = _tmp3_ + 1;
-#line 15943 "Dialogs.c"
+#line 15901 "Dialogs.c"
 				}
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp2_ = FALSE;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp5_ = i;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp5_ < MAX_OBJECTS_DISPLAYED) {
-#line 15951 "Dialogs.c"
+#line 15909 "Dialogs.c"
 					GeeArrayList* _tmp6_ = NULL;
 					gint _tmp7_ = 0;
 					gint _tmp8_ = 0;
 					gint _tmp9_ = 0;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = objects;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp8_ = _tmp7_;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp9_ = i;
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp4_ = _tmp8_ > _tmp9_;
-#line 15966 "Dialogs.c"
+#line 15924 "Dialogs.c"
 				} else {
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp4_ = FALSE;
-#line 15970 "Dialogs.c"
+#line 15928 "Dialogs.c"
 				}
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp4_) {
-#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 15976 "Dialogs.c"
+#line 15934 "Dialogs.c"
 				}
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = dialog_message;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = objects;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = i;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp12_);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp14_ = (DataObject*) _tmp13_;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp15_ = data_object_to_string (_tmp14_);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp16_ = _tmp15_;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp17_ = g_strconcat ("\n", _tmp16_, NULL);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp18_ = _tmp17_;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp19_ = g_strconcat (_tmp10_, _tmp18_, NULL);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (dialog_message);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				dialog_message = _tmp19_;
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp18_);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp16_);
-#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp14_);
-#line 16008 "Dialogs.c"
+#line 15966 "Dialogs.c"
 			}
 		}
 	}
-#line 1970 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = objects;
-#line 1970 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1970 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 1970 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remainder = _tmp22_ - MAX_OBJECTS_DISPLAYED;
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = remainder;
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ > 0) {
-#line 16024 "Dialogs.c"
+#line 15982 "Dialogs.c"
 		const gchar* _tmp24_ = NULL;
 		gint _tmp25_ = 0;
 		const gchar* _tmp26_ = NULL;
@@ -16045,57 +16003,57 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 		gchar* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = dialog_message;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = remainder;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = ngettext ("\n\nAnd %d other.", "\n\nAnd %d others.", (gulong) _tmp25_);
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = remainder;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = g_strdup_printf (_tmp26_, _tmp27_);
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = _tmp28_;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = g_strconcat (_tmp24_, _tmp29_, NULL);
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (dialog_message);
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog_message = _tmp30_;
-#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp29_);
-#line 16052 "Dialogs.c"
+#line 16010 "Dialogs.c"
 	}
-#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = app_window_get_instance ();
-#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = _tmp31_;
-#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = dialog_message;
-#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp33_);
-#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp34_);
-#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = _tmp34_;
-#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp32_);
-#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp35_;
-#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = title;
-#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp36_);
-#line 1981 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1977 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (dialog_message);
-#line 16082 "Dialogs.c"
+#line 16040 "Dialogs.c"
 }
 
 
@@ -16108,40 +16066,40 @@ TagsDialog* tags_dialog_construct (GType object_type, const gchar* title, const
 	HierarchicalTagIndex* _tmp4_ = NULL;
 	GeeCollection* _tmp5_ = NULL;
 	GeeCollection* _tmp6_ = NULL;
-#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (label != NULL, NULL);
-#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = label;
-#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = initial_text;
-#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = hierarchical_tag_index_get_global_index ();
-#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = hierarchical_tag_index_get_all_tags (_tmp4_);
-#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (TagsDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp6_, ",");
-#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_hierarchical_tag_index_unref0 (_tmp4_);
-#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 16121 "Dialogs.c"
+#line 16079 "Dialogs.c"
 }
 
 
 static void tags_dialog_class_init (TagsDialogClass * klass) {
-#line 1985 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 16128 "Dialogs.c"
+#line 16086 "Dialogs.c"
 }
 
 
@@ -16167,28 +16125,28 @@ AddTagsDialog* add_tags_dialog_construct (GType object_type) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1994 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_dpgettext2 (NULL, "Dialog Title", RESOURCES_ADD_TAGS_TITLE);
-#line 1994 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1994 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	title = _tmp1_;
-#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _ ("Tags (separated by commas):");
-#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (AddTagsDialog*) tags_dialog_construct (object_type, title, _tmp2_, NULL);
-#line 1993 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1989 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (title);
-#line 1993 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1989 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 16168 "Dialogs.c"
+#line 16126 "Dialogs.c"
 }
 
 
 AddTagsDialog* add_tags_dialog_new (void) {
-#line 1993 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1989 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return add_tags_dialog_construct (TYPE_ADD_TAGS_DIALOG);
-#line 16175 "Dialogs.c"
+#line 16133 "Dialogs.c"
 }
 
 
@@ -16208,70 +16166,70 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) {
 	gint _tmp9__length1 = 0;
 	gchar** _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADD_TAGS_DIALOG (self), NULL);
-#line 2000 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 2000 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = _tmp0_;
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == NULL) {
-#line 16205 "Dialogs.c"
+#line 16163 "Dialogs.c"
 		gchar** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = NULL;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2__length1 = 0;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (result_length1) {
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			*result_length1 = _tmp2__length1;
-#line 16216 "Dialogs.c"
+#line 16174 "Dialogs.c"
 		}
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp2_;
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16224 "Dialogs.c"
+#line 16182 "Dialogs.c"
 	}
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = text;
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ",", 0);
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__length1 = _vala_array_length (_tmp4_);
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = tag_prep_tag_names (_tmp6_, _vala_array_length (_tmp4_), &_tmp7_);
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9__length1 = _tmp7_;
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10__length1 = _tmp9__length1;
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (result_length1) {
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*result_length1 = _tmp10__length1;
-#line 16250 "Dialogs.c"
+#line 16208 "Dialogs.c"
 	}
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp10_;
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16258 "Dialogs.c"
+#line 16216 "Dialogs.c"
 }
 
 
@@ -16294,64 +16252,64 @@ static gboolean add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator
 	gint _names_size_ = 0;
 	gchar** _tmp9_ = NULL;
 	gint _tmp9__length1 = 0;
-#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2005 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_DIALOG, AddTagsDialog);
-#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2005 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 2010 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = text;
-#line 2010 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = string_contains (_tmp0_, TAG_PATH_SEPARATOR_STRING);
-#line 2010 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16295 "Dialogs.c"
+#line 16253 "Dialogs.c"
 	}
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = text;
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_ = g_strsplit (_tmp2_, ",", 0);
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5__length1 = _vala_array_length (_tmp3_);
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = tag_prep_tag_names (_tmp5_, _vala_array_length (_tmp3_), &_tmp6_);
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8__length1 = _tmp6_;
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) g_free), NULL);
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names = _tmp8_;
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names_length1 = _tmp8__length1;
-#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_names_size_ = names_length1;
-#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = names;
-#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9__length1 = names_length1;
-#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp9__length1 > 0;
-#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16329 "Dialogs.c"
+#line 16287 "Dialogs.c"
 }
 
 
 static void add_tags_dialog_class_init (AddTagsDialogClass * klass) {
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	add_tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = add_tags_dialog_real_on_modify_validate;
-#line 16338 "Dialogs.c"
+#line 16296 "Dialogs.c"
 }
 
 
@@ -16377,30 +16335,30 @@ ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, MediaSource*
 	MediaSource* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Tags (separated by commas):");
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = source;
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = modify_tags_dialog_get_initial_text (_tmp1_);
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ModifyTagsDialog*) tags_dialog_construct (object_type, RESOURCES_MODIFY_TAGS_LABEL, _tmp0_, _tmp3_);
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp3_);
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 16380 "Dialogs.c"
+#line 16338 "Dialogs.c"
 }
 
 
 ModifyTagsDialog* modify_tags_dialog_new (MediaSource* source) {
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return modify_tags_dialog_construct (TYPE_MODIFY_TAGS_DIALOG, source);
-#line 16387 "Dialogs.c"
+#line 16345 "Dialogs.c"
 }
 
 
@@ -16417,52 +16375,52 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 	GeeSortedSet* tag_basenames = NULL;
 	GeeTreeSet* _tmp6_ = NULL;
 	gchar* text = NULL;
-#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = tag_global;
-#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = source;
-#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = tag_source_collection_fetch_for_source (_tmp0_, _tmp1_);
-#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	source_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = source_tags;
-#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == NULL) {
-#line 2030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = NULL;
-#line 2030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (source_tags);
-#line 2030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2026 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16424 "Dialogs.c"
+#line 16382 "Dialogs.c"
 	}
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = source_tags;
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = tag_get_terminal_tags (_tmp4_);
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	terminal_tags = _tmp5_;
-#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_basenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 16436 "Dialogs.c"
+#line 16394 "Dialogs.c"
 	{
 		GeeIterator* _tag_it = NULL;
 		GeeCollection* _tmp7_ = NULL;
 		GeeIterator* _tmp8_ = NULL;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = terminal_tags;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tag_it = _tmp8_;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 16449 "Dialogs.c"
+#line 16407 "Dialogs.c"
 			GeeIterator* _tmp9_ = NULL;
 			gboolean _tmp10_ = FALSE;
 			Tag* tag = NULL;
@@ -16474,64 +16432,64 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _tag_it;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = gee_iterator_next (_tmp9_);
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp10_) {
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 16469 "Dialogs.c"
+#line 16427 "Dialogs.c"
 			}
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = _tag_it;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = gee_iterator_get (_tmp11_);
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			tag = (Tag*) _tmp12_;
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = tag_basenames;
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = tag;
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = tag_get_path (_tmp14_);
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp16_ = _tmp15_;
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = hierarchical_tag_utilities_get_basename (_tmp16_);
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = _tmp17_;
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_);
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp18_);
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp16_);
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (tag);
-#line 16497 "Dialogs.c"
+#line 16455 "Dialogs.c"
 		}
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tag_it);
-#line 16501 "Dialogs.c"
+#line 16459 "Dialogs.c"
 	}
-#line 2038 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 16505 "Dialogs.c"
+#line 16463 "Dialogs.c"
 	{
 		GeeIterator* _name_it = NULL;
 		GeeSortedSet* _tmp19_ = NULL;
 		GeeIterator* _tmp20_ = NULL;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = tag_basenames;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_name_it = _tmp20_;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 16518 "Dialogs.c"
+#line 16476 "Dialogs.c"
 			GeeIterator* _tmp21_ = NULL;
 			gboolean _tmp22_ = FALSE;
 			gchar* name = NULL;
@@ -16541,77 +16499,77 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			const gchar* _tmp29_ = NULL;
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = _name_it;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = gee_iterator_next (_tmp21_);
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp22_) {
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 16536 "Dialogs.c"
+#line 16494 "Dialogs.c"
 			}
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = _name_it;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = gee_iterator_get (_tmp23_);
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			name = (gchar*) _tmp24_;
-#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = text;
-#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp25_ == NULL) {
-#line 16548 "Dialogs.c"
+#line 16506 "Dialogs.c"
 				gchar* _tmp26_ = NULL;
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = g_strdup ("");
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp26_;
-#line 16556 "Dialogs.c"
+#line 16514 "Dialogs.c"
 			} else {
 				const gchar* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
-#line 2043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = text;
-#line 2043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp28_ = g_strconcat (_tmp27_, ", ", NULL);
-#line 2043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 2043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp28_;
-#line 16568 "Dialogs.c"
+#line 16526 "Dialogs.c"
 			}
-#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = text;
-#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = name;
-#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = g_strconcat (_tmp29_, _tmp30_, NULL);
-#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (text);
-#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			text = _tmp31_;
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (name);
-#line 16582 "Dialogs.c"
+#line 16540 "Dialogs.c"
 		}
-#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_name_it);
-#line 16586 "Dialogs.c"
+#line 16544 "Dialogs.c"
 	}
-#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (tag_basenames);
-#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (terminal_tags);
-#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (source_tags);
-#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16598 "Dialogs.c"
+#line 16556 "Dialogs.c"
 }
 
 
@@ -16644,140 +16602,140 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 	gchar** _tmp16_ = NULL;
 	gchar** _tmp17_ = NULL;
 	gint _tmp17__length1 = 0;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MODIFY_TAGS_DIALOG (self), NULL);
-#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = _tmp0_;
-#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == NULL) {
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = NULL;
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16647 "Dialogs.c"
+#line 16605 "Dialogs.c"
 	}
-#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	new_tags = _tmp2_;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = text;
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = is_string_empty (_tmp3_);
-#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = new_tags;
-#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16665 "Dialogs.c"
+#line 16623 "Dialogs.c"
 	}
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = text;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_ = g_strsplit (_tmp5_, ",", 0);
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8__length1 = _vala_array_length (_tmp6_);
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = tag_prep_tag_names (_tmp8_, _vala_array_length (_tmp6_), &_tmp9_);
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11__length1 = _tmp9_;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL);
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = _tmp11_;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names_length1 = _tmp11__length1;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tag_names_size_ = tag_names_length1;
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = hierarchical_tag_index_get_global_index ();
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = tag_names;
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14__length1 = tag_names_length1;
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = hierarchical_tag_index_get_paths_for_names_array (_tmp13_, _tmp14_, _tmp14__length1, &_tmp15_);
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = (_vala_array_free (tag_names, tag_names_length1, (GDestroyNotify) g_free), NULL);
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = _tmp16_;
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names_length1 = _tmp15_;
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tag_names_size_ = tag_names_length1;
-#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_hierarchical_tag_index_unref0 (_tmp13_);
-#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = tag_names;
-#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17__length1 = tag_names_length1;
-#line 16713 "Dialogs.c"
+#line 16671 "Dialogs.c"
 	{
 		gchar** name_collection = NULL;
 		gint name_collection_length1 = 0;
 		gint _name_collection_size_ = 0;
 		gint name_it = 0;
-#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		name_collection = _tmp17_;
-#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		name_collection_length1 = _tmp17__length1;
-#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (name_it = 0; name_it < _tmp17__length1; name_it = name_it + 1) {
-#line 16725 "Dialogs.c"
+#line 16683 "Dialogs.c"
 			gchar* _tmp18_ = NULL;
 			gchar* name = NULL;
-#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = g_strdup (name_collection[name_it]);
-#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			name = _tmp18_;
-#line 16732 "Dialogs.c"
+#line 16690 "Dialogs.c"
 			{
 				GeeArrayList* _tmp19_ = NULL;
 				const gchar* _tmp20_ = NULL;
 				Tag* _tmp21_ = NULL;
 				Tag* _tmp22_ = NULL;
-#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp19_ = new_tags;
-#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp20_ = name;
-#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = tag_for_path (_tmp20_);
-#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp22_ = _tmp21_;
-#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp22_);
-#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (name);
-#line 16752 "Dialogs.c"
+#line 16710 "Dialogs.c"
 			}
 		}
 	}
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = new_tags;
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = (_vala_array_free (tag_names, tag_names_length1, (GDestroyNotify) g_free), NULL);
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16764 "Dialogs.c"
+#line 16722 "Dialogs.c"
 }
 
 
@@ -16786,28 +16744,28 @@ static gboolean modify_tags_dialog_real_on_modify_validate (TextEntryDialogMedia
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_DIALOG, ModifyTagsDialog);
-#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = text;
-#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = string_contains (_tmp0_, TAG_PATH_SEPARATOR_STRING);
-#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = !_tmp1_;
-#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16785 "Dialogs.c"
+#line 16743 "Dialogs.c"
 }
 
 
 static void modify_tags_dialog_class_init (ModifyTagsDialogClass * klass) {
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	modify_tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = modify_tags_dialog_real_on_modify_validate;
-#line 16794 "Dialogs.c"
+#line 16752 "Dialogs.c"
 }
 
 
@@ -16828,31 +16786,31 @@ GType modify_tags_dialog_get_type (void) {
 
 
 gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self) {
-#line 2080 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_WELCOME_SERVICE_ENTRY (self), NULL);
-#line 2080 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->get_service_name (self);
-#line 16819 "Dialogs.c"
+#line 16777 "Dialogs.c"
 }
 
 
 void welcome_service_entry_execute (WelcomeServiceEntry* self) {
-#line 2082 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (self));
-#line 2082 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->execute (self);
-#line 16828 "Dialogs.c"
+#line 16786 "Dialogs.c"
 }
 
 
 static void welcome_service_entry_base_init (WelcomeServiceEntryIface * iface) {
-#line 2079 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	static gboolean initialized = FALSE;
-#line 2079 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!initialized) {
-#line 2079 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		initialized = TRUE;
-#line 16839 "Dialogs.c"
+#line 16797 "Dialogs.c"
 	}
 }
 
@@ -16889,485 +16847,505 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
 	GtkLabel* _tmp11_ = NULL;
 	GtkLabel* _tmp12_ = NULL;
 	GtkLabel* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
+	GtkLabel* _tmp14_ = NULL;
+	const gchar* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
-	GtkLabel* _tmp17_ = NULL;
+	gchar* _tmp17_ = NULL;
+	GtkLabel* _tmp18_ = NULL;
+	GtkLabel* _tmp19_ = NULL;
 	GtkImage* image = NULL;
-	GtkImage* _tmp18_ = NULL;
+	GtkImage* _tmp20_ = NULL;
 	GtkBox* header_text = NULL;
-	GtkBox* _tmp19_ = NULL;
-	GtkBox* _tmp20_ = NULL;
-	GtkLabel* _tmp21_ = NULL;
+	GtkBox* _tmp21_ = NULL;
 	GtkBox* _tmp22_ = NULL;
 	GtkLabel* _tmp23_ = NULL;
-	GtkBox* header_content = NULL;
 	GtkBox* _tmp24_ = NULL;
-	GtkBox* _tmp25_ = NULL;
-	GtkImage* _tmp26_ = NULL;
+	GtkLabel* _tmp25_ = NULL;
+	GtkBox* header_content = NULL;
+	GtkBox* _tmp26_ = NULL;
 	GtkBox* _tmp27_ = NULL;
-	GtkBox* _tmp28_ = NULL;
+	GtkImage* _tmp28_ = NULL;
+	GtkBox* _tmp29_ = NULL;
+	GtkBox* _tmp30_ = NULL;
 	GtkLabel* instructions = NULL;
-	GtkLabel* _tmp29_ = NULL;
+	GtkLabel* _tmp31_ = NULL;
 	gchar* indent_prefix = NULL;
-	gchar* _tmp30_ = NULL;
-	const gchar* _tmp31_ = NULL;
-	GtkTextDirection _tmp32_ = 0;
+	gchar* _tmp32_ = NULL;
+	const gchar* _tmp33_ = NULL;
+	GtkTextDirection _tmp34_ = 0;
 	gchar* arrow_glyph = NULL;
-	gchar* _tmp33_ = NULL;
-	GtkLabel* _tmp34_ = NULL;
-	const gchar* _tmp35_ = NULL;
-	gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
-	const gchar* _tmp38_ = NULL;
+	gchar* _tmp35_ = NULL;
+	GtkLabel* _tmp36_ = NULL;
+	const gchar* _tmp37_ = NULL;
+	gchar* _tmp38_ = NULL;
 	gchar* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
+	const gchar* _tmp40_ = NULL;
 	gchar* _tmp41_ = NULL;
 	gchar* _tmp42_ = NULL;
-	const gchar* _tmp43_ = NULL;
+	gchar* _tmp43_ = NULL;
 	gchar* _tmp44_ = NULL;
-	gchar* _tmp45_ = NULL;
+	const gchar* _tmp45_ = NULL;
 	gchar* _tmp46_ = NULL;
 	gchar* _tmp47_ = NULL;
-	const gchar* _tmp48_ = NULL;
-	const gchar* _tmp49_ = NULL;
-	gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	const gchar* _tmp52_ = NULL;
-	const gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	GtkLabel* _tmp56_ = NULL;
-	GtkBox* _tmp57_ = NULL;
-	GtkBox* _tmp58_ = NULL;
-	GtkBox* _tmp59_ = NULL;
+	gchar* _tmp48_ = NULL;
+	gchar* _tmp49_ = NULL;
+	const gchar* _tmp50_ = NULL;
+	const gchar* _tmp51_ = NULL;
+	gchar* _tmp52_ = NULL;
+	gchar* _tmp53_ = NULL;
+	const gchar* _tmp54_ = NULL;
+	const gchar* _tmp55_ = NULL;
+	gchar* _tmp56_ = NULL;
+	gchar* _tmp57_ = NULL;
+	GtkLabel* _tmp58_ = NULL;
+	GtkLabel* _tmp59_ = NULL;
 	GtkBox* _tmp60_ = NULL;
-	gboolean _tmp61_ = FALSE;
-	const gchar* _tmp73_ = NULL;
-	GtkLabel* _tmp74_ = NULL;
-	GtkLabel* _tmp75_ = NULL;
-	GtkLabel* _tmp76_ = NULL;
+	GtkBox* _tmp61_ = NULL;
+	GtkBox* _tmp62_ = NULL;
+	GtkBox* _tmp63_ = NULL;
+	gboolean _tmp64_ = FALSE;
+	const gchar* _tmp76_ = NULL;
+	GtkLabel* _tmp77_ = NULL;
+	GtkLabel* _tmp78_ = NULL;
+	GtkLabel* _tmp79_ = NULL;
+	GtkLabel* _tmp80_ = NULL;
 	GtkBox* content = NULL;
-	GtkBox* _tmp77_ = NULL;
-	GtkBox* _tmp78_ = NULL;
-	GtkBox* _tmp79_ = NULL;
-	GtkBox* _tmp80_ = NULL;
-	GtkLabel* _tmp81_ = NULL;
-	const gchar* _tmp82_ = NULL;
-	GtkCheckButton* _tmp83_ = NULL;
-	GtkCheckButton* _tmp84_ = NULL;
-	GtkCheckButton* _tmp85_ = NULL;
-	GtkAlignment* alignment = NULL;
-	GtkAlignment* _tmp86_ = NULL;
-	GtkBox* _tmp87_ = NULL;
-	GtkWidget* _tmp88_ = NULL;
-	SpitDataImportsWelcomeImportMetaHost* _tmp89_ = NULL;
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	GtkBox* _tmp81_ = NULL;
+	GtkBox* _tmp82_ = NULL;
+	GtkBox* _tmp83_ = NULL;
+	GtkBox* _tmp84_ = NULL;
+	GtkLabel* _tmp85_ = NULL;
+	const gchar* _tmp86_ = NULL;
+	GtkCheckButton* _tmp87_ = NULL;
+	GtkCheckButton* _tmp88_ = NULL;
+	GtkCheckButton* _tmp89_ = NULL;
+	GtkBox* _tmp90_ = NULL;
+	GtkWidget* _tmp91_ = NULL;
+	SpitDataImportsWelcomeImportMetaHost* _tmp92_ = NULL;
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (WelcomeDialog*) g_object_new (object_type, NULL);
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = spit_data_imports_welcome_import_meta_host_new (self);
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_meta_host);
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_meta_host = _tmp0_;
-#line 2101 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = welcome_dialog_is_system_pictures_import_possible ();
-#line 2101 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	show_system_pictures_import = _tmp1_;
-#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
-#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ok_button = _tmp3_;
-#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _ ("Welcome!");
-#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = owner;
-#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp5_);
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkLabel*) gtk_label_new ("");
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	primary_text = _tmp6_;
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = primary_text;
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _ ("Welcome to Shotwell!");
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_strdup_printf ("<span size=\"large\" weight=\"bold\">%s</span>", _tmp8_);
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (_tmp7_, _tmp10_);
-#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = primary_text;
-#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_misc_get_type (), GtkMisc), (gfloat) 0, 0.5f);
-#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = (GtkLabel*) gtk_label_new ("");
-#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp12_);
-#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_xalign (_tmp11_, 0.0f);
+#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp12_ = primary_text;
+#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_yalign (_tmp12_, 0.5f);
+#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp13_ = (GtkLabel*) gtk_label_new ("");
+#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_ref_sink (_tmp13_);
+#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->secondary_text);
+#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->secondary_text = _tmp13_;
+#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp14_ = self->priv->secondary_text;
+#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp15_ = _ ("To get started, import photos in any of these ways:");
+#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp16_ = g_strdup_printf ("<span weight=\"normal\">%s</span>", _tmp15_);
+#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp17_ = _tmp16_;
+#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_markup (_tmp14_, _tmp17_);
+#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_free0 (_tmp17_);
 #line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->secondary_text = _tmp12_;
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp13_ = self->priv->secondary_text;
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp14_ = _ ("To get started, import photos in any of these ways:");
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = g_strdup_printf ("<span weight=\"normal\">%s</span>", _tmp14_);
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = _tmp15_;
+	_tmp18_ = self->priv->secondary_text;
+#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_xalign (_tmp18_, 0.0f);
 #line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_markup (_tmp13_, _tmp16_);
+	_tmp19_ = self->priv->secondary_text;
 #line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp16_);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = self->priv->secondary_text;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_misc_get_type (), GtkMisc), (gfloat) 0, 0.5f);
+	gtk_label_set_yalign (_tmp19_, 0.5f);
+#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp20_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", GTK_ICON_SIZE_DIALOG);
+#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_ref_sink (_tmp20_);
+#line 2114 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	image = _tmp20_;
 #line 2116 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", GTK_ICON_SIZE_DIALOG);
+	_tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 2116 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp18_);
+	g_object_ref_sink (_tmp21_);
 #line 2116 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	image = _tmp18_;
+	header_text = _tmp21_;
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp22_ = header_text;
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp23_ = primary_text;
+#line 2117 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5);
 #line 2118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+	_tmp24_ = header_text;
 #line 2118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp19_);
+	_tmp25_ = self->priv->secondary_text;
 #line 2118 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	header_text = _tmp19_;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = header_text;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = primary_text;
-#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5);
+	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = header_text;
+	_tmp26_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 #line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = self->priv->secondary_text;
+	g_object_ref_sink (_tmp26_);
 #line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	header_content = _tmp26_;
+#line 2121 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp27_ = header_content;
+#line 2121 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp28_ = image;
+#line 2121 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_box_pack_start (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+	_tmp29_ = header_content;
 #line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp24_);
+	_tmp30_ = header_text;
 #line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	header_content = _tmp24_;
-#line 2123 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = header_content;
-#line 2123 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp26_ = image;
-#line 2123 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = header_content;
+	_tmp31_ = (GtkLabel*) gtk_label_new ("");
 #line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp28_ = header_text;
+	g_object_ref_sink (_tmp31_);
 #line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2126 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp29_ = (GtkLabel*) gtk_label_new ("");
-#line 2126 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp29_);
-#line 2126 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	instructions = _tmp29_;
+	instructions = _tmp31_;
+#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp32_ = g_strdup ("   ");
+#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	indent_prefix = _tmp32_;
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp34_ = gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = g_strdup ("   ");
+	if (_tmp34_ == GTK_TEXT_DIR_RTL) {
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp33_ = "◂";
+#line 17053 "Dialogs.c"
+	} else {
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp33_ = "▸";
+#line 17057 "Dialogs.c"
+	}
 #line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	indent_prefix = _tmp30_;
+	_tmp35_ = g_strdup (_tmp33_);
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	arrow_glyph = _tmp35_;
 #line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+	_tmp36_ = instructions;
 #line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp32_ == GTK_TEXT_DIR_RTL) {
+	_tmp37_ = indent_prefix;
 #line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp31_ = "◂";
-#line 17085 "Dialogs.c"
-	} else {
+	_tmp38_ = g_strconcat (_tmp37_, "&#8226; %s\n", NULL);
 #line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp31_ = "▸";
-#line 17089 "Dialogs.c"
-	}
+	_tmp39_ = _tmp38_;
 #line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp33_ = g_strdup (_tmp31_);
+	_tmp40_ = indent_prefix;
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp41_ = g_strconcat (_tmp40_, "&#8226; %s\n", NULL);
 #line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	arrow_glyph = _tmp33_;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp34_ = instructions;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp35_ = indent_prefix;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp36_ = g_strconcat (_tmp35_, "&#8226; %s\n", NULL);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp37_ = _tmp36_;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp38_ = indent_prefix;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp39_ = g_strconcat (_tmp38_, "&#8226; %s\n", NULL);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp40_ = _tmp39_;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp41_ = g_strconcat (_tmp37_, _tmp40_, NULL);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = _tmp41_;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp43_ = indent_prefix;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp44_ = g_strconcat (_tmp43_, "&#8226; %s", NULL);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp45_ = _tmp44_;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp46_ = g_strconcat (_tmp42_, _tmp45_, NULL);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp43_ = g_strconcat (_tmp39_, _tmp42_, NULL);
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp44_ = _tmp43_;
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp45_ = indent_prefix;
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp46_ = g_strconcat (_tmp45_, "&#8226; %s", NULL);
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = _tmp46_;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp48_ = _ ("Choose <span weight=\"bold\">File %s Import From Folder</span>");
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp49_ = arrow_glyph;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp50_ = g_strdup_printf (_tmp48_, _tmp49_);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp51_ = _tmp50_;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp52_ = _ ("Drag and drop photos onto the Shotwell window");
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp53_ = _ ("Connect a camera to your computer and import");
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp54_ = g_strdup_printf (_tmp47_, _tmp51_, _tmp52_, _tmp53_);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp55_ = _tmp54_;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_markup (_tmp34_, _tmp55_);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp55_);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp51_);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp48_ = g_strconcat (_tmp44_, _tmp47_, NULL);
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp49_ = _tmp48_;
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp50_ = _ ("Choose <span weight=\"bold\">File %s Import From Folder</span>");
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp51_ = arrow_glyph;
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp52_ = g_strdup_printf (_tmp50_, _tmp51_);
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp53_ = _tmp52_;
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp54_ = _ ("Drag and drop photos onto the Shotwell window");
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp55_ = _ ("Connect a camera to your computer and import");
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp56_ = g_strdup_printf (_tmp49_, _tmp53_, _tmp54_, _tmp55_);
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp57_ = _tmp56_;
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_markup (_tmp36_, _tmp57_);
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_free0 (_tmp57_);
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_free0 (_tmp53_);
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_free0 (_tmp49_);
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp47_);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp45_);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_free0 (_tmp44_);
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp42_);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp40_);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp37_);
-#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp56_ = instructions;
-#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_misc_get_type (), GtkMisc), (gfloat) 0, 0.5f);
-#line 2138 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp57_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2138 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp57_);
-#line 2138 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_free0 (_tmp39_);
+#line 2134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp58_ = instructions;
+#line 2134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_xalign (_tmp58_, 0.0f);
+#line 2135 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp59_ = instructions;
+#line 2135 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_yalign (_tmp59_, 0.5f);
+#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp60_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_ref_sink (_tmp60_);
+#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_action_checkbox_packer);
-#line 2138 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->import_action_checkbox_packer = _tmp57_;
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp58_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->import_action_checkbox_packer = _tmp60_;
+#line 2139 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp61_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+#line 2139 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_ref_sink (_tmp61_);
+#line 2139 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
+#line 2139 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->external_import_action_checkbox_packer = _tmp61_;
 #line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp58_);
+	_tmp62_ = self->priv->import_action_checkbox_packer;
 #line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
+	_tmp63_ = self->priv->external_import_action_checkbox_packer;
 #line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->external_import_action_checkbox_packer = _tmp58_;
-#line 2141 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp59_ = self->priv->import_action_checkbox_packer;
-#line 2141 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp60_ = self->priv->external_import_action_checkbox_packer;
-#line 2141 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget));
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp61_ = show_system_pictures_import;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp61_) {
-#line 17185 "Dialogs.c"
-		const gchar* _tmp62_ = NULL;
-		GFile* _tmp63_ = NULL;
-		GFile* _tmp64_ = NULL;
-		gchar* _tmp65_ = NULL;
-		gchar* _tmp66_ = NULL;
-		gchar* _tmp67_ = NULL;
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget));
+#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp64_ = show_system_pictures_import;
+#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	if (_tmp64_) {
+#line 17157 "Dialogs.c"
+		const gchar* _tmp65_ = NULL;
+		GFile* _tmp66_ = NULL;
+		GFile* _tmp67_ = NULL;
 		gchar* _tmp68_ = NULL;
-		GtkCheckButton* _tmp69_ = NULL;
-		GtkBox* _tmp70_ = NULL;
-		GtkCheckButton* _tmp71_ = NULL;
+		gchar* _tmp69_ = NULL;
+		gchar* _tmp70_ = NULL;
+		gchar* _tmp71_ = NULL;
 		GtkCheckButton* _tmp72_ = NULL;
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp62_ = _ ("_Import photos from your %s folder");
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp63_ = app_dirs_get_import_dir ();
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp64_ = _tmp63_;
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp65_ = get_display_pathname (_tmp64_);
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp66_ = _tmp65_;
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp67_ = g_strdup_printf (_tmp62_, _tmp66_);
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp68_ = _tmp67_;
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp69_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp68_);
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_object_ref_sink (_tmp69_);
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		GtkBox* _tmp73_ = NULL;
+		GtkCheckButton* _tmp74_ = NULL;
+		GtkCheckButton* _tmp75_ = NULL;
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp65_ = _ ("_Import photos from your %s folder");
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp66_ = app_dirs_get_import_dir ();
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp67_ = _tmp66_;
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp68_ = get_display_pathname (_tmp67_);
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp69_ = _tmp68_;
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp70_ = g_strdup_printf (_tmp65_, _tmp69_);
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp71_ = _tmp70_;
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp72_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp71_);
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		g_object_ref_sink (_tmp72_);
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->system_pictures_import_check);
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		self->priv->system_pictures_import_check = _tmp69_;
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp68_);
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp66_);
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_object_unref0 (_tmp64_);
-#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp70_ = self->priv->import_action_checkbox_packer;
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		self->priv->system_pictures_import_check = _tmp72_;
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_g_free0 (_tmp71_);
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_g_free0 (_tmp69_);
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_g_object_unref0 (_tmp67_);
+#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp73_ = self->priv->import_action_checkbox_packer;
+#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp74_ = self->priv->system_pictures_import_check;
+#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
 #line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp71_ = self->priv->system_pictures_import_check;
+		_tmp75_ = self->priv->system_pictures_import_check;
 #line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget));
-#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp72_ = self->priv->system_pictures_import_check;
-#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 17235 "Dialogs.c"
-	}
-#line 2151 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp73_ = _ ("You can also import photos in any of these ways:");
-#line 2151 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp74_ = (GtkLabel*) gtk_label_new (_tmp73_);
-#line 2151 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp74_);
-#line 2151 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 17207 "Dialogs.c"
+	}
+#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp76_ = _ ("You can also import photos in any of these ways:");
+#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp77_ = (GtkLabel*) gtk_label_new (_tmp76_);
+#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_ref_sink (_tmp77_);
+#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->instruction_header);
-#line 2151 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->instruction_header = _tmp74_;
+#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->instruction_header = _tmp77_;
+#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp78_ = self->priv->instruction_header;
+#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_xalign (_tmp78_, 0.0f);
 #line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp75_ = self->priv->instruction_header;
+	_tmp79_ = self->priv->instruction_header;
 #line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
+	gtk_label_set_yalign (_tmp79_, 0.5f);
 #line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp76_ = self->priv->instruction_header;
+	_tmp80_ = self->priv->instruction_header;
 #line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget), 20);
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), 20);
 #line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp77_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16);
+	_tmp81_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16);
 #line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp77_);
+	g_object_ref_sink (_tmp81_);
 #line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	content = _tmp77_;
+	content = _tmp81_;
 #line 2157 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp78_ = header_content;
+	_tmp82_ = header_content;
 #line 2157 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp79_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+	_tmp83_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
 #line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp79_);
+	g_object_ref_sink (_tmp83_);
 #line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_content);
 #line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->import_content = _tmp79_;
+	self->priv->import_content = _tmp83_;
 #line 2159 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp80_ = self->priv->import_content;
+	_tmp84_ = self->priv->import_content;
 #line 2159 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_widget_get_type (), GtkWidget));
 #line 2160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp81_ = instructions;
+	_tmp85_ = instructions;
 #line 2160 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp82_ = _ ("_Don’t show this message again");
+	_tmp86_ = _ ("_Don’t show this message again");
 #line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp83_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp82_);
+	_tmp87_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp86_);
 #line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp83_);
+	g_object_ref_sink (_tmp87_);
 #line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hide_button);
 #line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->hide_button = _tmp83_;
+	self->priv->hide_button = _tmp87_;
 #line 2163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp84_ = self->priv->hide_button;
+	_tmp88_ = self->priv->hide_button;
 #line 2163 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp85_ = self->priv->hide_button;
+	_tmp89_ = self->priv->hide_button;
 #line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
-#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp86_ = (GtkAlignment*) gtk_alignment_new ((gfloat) 0, (gfloat) 0, (gfloat) 0, (gfloat) 0);
+	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp89_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
+#line 2165 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp86_);
-#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	alignment = _tmp86_;
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 2167 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_alignment_set_padding (alignment, (guint) 12, (guint) 0, (guint) 12, (guint) 12);
+	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 2168 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (alignment, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget));
-#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp87_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 2169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
 #line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (alignment, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 0);
+#line 2171 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
 #line 2172 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_has_resize_grip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), 12);
 #line 2174 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp88_ = ok_button;
+	_tmp90_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 2174 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_grab_focus (_tmp88_);
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	welcome_dialog_install_import_content (self);
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp89_ = self->priv->import_meta_host;
+	_tmp91_ = ok_button;
+#line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_grab_focus (_tmp91_);
 #line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	spit_data_imports_welcome_import_meta_host_start (_tmp89_);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (alignment);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	welcome_dialog_install_import_content (self);
+#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp92_ = self->priv->import_meta_host;
+#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	spit_data_imports_welcome_import_meta_host_start (_tmp92_);
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (content);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (arrow_glyph);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (indent_prefix);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (instructions);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (header_content);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (header_text);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (primary_text);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (ok_button);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 17347 "Dialogs.c"
+#line 17325 "Dialogs.c"
 }
 
 
 WelcomeDialog* welcome_dialog_new (GtkWindow* owner) {
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return welcome_dialog_construct (TYPE_WELCOME_DIALOG, owner);
-#line 17354 "Dialogs.c"
+#line 17332 "Dialogs.c"
 }
 
 
@@ -17376,101 +17354,101 @@ static void welcome_dialog_install_import_content (WelcomeDialog* self) {
 	gboolean _tmp1_ = FALSE;
 	GtkCheckButton** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 2181 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_return_if_fail (IS_WELCOME_DIALOG (self));
 #line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_return_if_fail (IS_WELCOME_DIALOG (self));
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->external_import_checks;
-#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2__length1 = self->priv->external_import_checks_length1;
-#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2__length1 > 0) {
-#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = TRUE;
-#line 17373 "Dialogs.c"
+#line 17351 "Dialogs.c"
 	} else {
 		GtkCheckButton* _tmp3_ = NULL;
-#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->system_pictures_import_check;
-#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 17380 "Dialogs.c"
+#line 17358 "Dialogs.c"
 	}
-#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 17384 "Dialogs.c"
+#line 17362 "Dialogs.c"
 		gboolean _tmp4_ = FALSE;
-#line 2184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->import_content_already_installed;
-#line 2184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_ == FALSE;
-#line 17390 "Dialogs.c"
+#line 17368 "Dialogs.c"
 	} else {
-#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 17394 "Dialogs.c"
+#line 17372 "Dialogs.c"
 	}
-#line 2182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 17398 "Dialogs.c"
+#line 17376 "Dialogs.c"
 		GtkLabel* _tmp5_ = NULL;
 		GtkBox* _tmp6_ = NULL;
 		GtkBox* _tmp7_ = NULL;
 		GtkBox* _tmp8_ = NULL;
 		GtkLabel* _tmp9_ = NULL;
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->secondary_text;
-#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_markup (_tmp5_, "");
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->import_content;
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->import_action_checkbox_packer;
-#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->import_content;
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->instruction_header;
-#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2189 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->import_content_already_installed = TRUE;
-#line 17422 "Dialogs.c"
+#line 17400 "Dialogs.c"
 	}
 }
 
 
-static void _vala_array_add275 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value) {
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+static void _vala_array_add109 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value) {
+#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 17434 "Dialogs.c"
+#line 17412 "Dialogs.c"
 	}
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17440 "Dialogs.c"
+#line 17418 "Dialogs.c"
 }
 
 
-static void _vala_array_add276 (GtkCheckButton*** array, int* length, int* size, GtkCheckButton* value) {
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+static void _vala_array_add110 (GtkCheckButton*** array, int* length, int* size, GtkCheckButton* value) {
+#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (GtkCheckButton*, *array, (*size) + 1);
-#line 17451 "Dialogs.c"
+#line 17429 "Dialogs.c"
 	}
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17457 "Dialogs.c"
+#line 17435 "Dialogs.c"
 }
 
 
@@ -17497,79 +17475,79 @@ void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEn
 	gint _tmp16__length1 = 0;
 	GtkCheckButton* _tmp17_ = NULL;
 	GtkBox* _tmp18_ = NULL;
-#line 2193 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2193 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (entry));
-#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = entry;
-#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = welcome_service_entry_get_service_name (_tmp0_);
-#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup_printf ("WelcomeDialog: Installing service entry for %s", _tmp2_);
-#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2194: %s", _tmp4_);
-#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_debug ("Dialogs.vala:2196: %s", _tmp4_);
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp4_);
-#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp2_);
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->external_import_entries;
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5__length1 = self->priv->external_import_entries_length1;
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = entry;
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_array_add275 (&self->priv->external_import_entries, &self->priv->external_import_entries_length1, &self->priv->_external_import_entries_size_, _tmp7_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_vala_array_add109 (&self->priv->external_import_entries, &self->priv->external_import_entries_length1, &self->priv->_external_import_entries_size_, _tmp7_);
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _ ("Import photos from your %s library");
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = entry;
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = welcome_service_entry_get_service_name (_tmp9_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = g_strdup_printf (_tmp8_, _tmp11_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp13_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp14_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = _tmp14_;
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp13_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp11_);
-#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	entry_check = _tmp15_;
 #line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	entry_check = _tmp15_;
+#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->external_import_checks;
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16__length1 = self->priv->external_import_checks_length1;
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = _g_object_ref0 (entry_check);
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_array_add276 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp17_);
-#line 2199 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
 #line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_vala_array_add110 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp17_);
+#line 2201 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
+#line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->external_import_action_checkbox_packer;
-#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_widget_get_type (), GtkWidget));
-#line 2201 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2203 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_install_import_content (self);
-#line 2193 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (entry_check);
-#line 17556 "Dialogs.c"
+#line 17534 "Dialogs.c"
 }
 
 
@@ -17580,66 +17558,66 @@ void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEn
      */
 static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp) {
 	gint _tmp0_ = 0;
-#line 2209 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2210 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = resp;
-#line 2210 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 2211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->ok_clicked = TRUE;
-#line 17575 "Dialogs.c"
+#line 17553 "Dialogs.c"
 	}
-#line 2213 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_main_quit ();
-#line 17581 "Dialogs.c"
+#line 17559 "Dialogs.c"
 }
 
 
 static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 2220 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_on_dismiss ((WelcomeDialog*) self, response_id);
-#line 17588 "Dialogs.c"
+#line 17566 "Dialogs.c"
 }
 
 
-static void _vala_array_add277 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value) {
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+static void _vala_array_add111 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value) {
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 17599 "Dialogs.c"
+#line 17577 "Dialogs.c"
 	}
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17605 "Dialogs.c"
+#line 17583 "Dialogs.c"
 }
 
 
-static WelcomeServiceEntry** _vala_array_dup30 (WelcomeServiceEntry** self, int length) {
+static WelcomeServiceEntry** _vala_array_dup29 (WelcomeServiceEntry** self, int length) {
 	WelcomeServiceEntry** result;
 	int i;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = g_new0 (WelcomeServiceEntry*, length + 1);
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	for (i = 0; i < length; i++) {
-#line 17616 "Dialogs.c"
+#line 17594 "Dialogs.c"
 		WelcomeServiceEntry* _tmp0_ = NULL;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result[i] = _tmp0_;
-#line 17622 "Dialogs.c"
+#line 17600 "Dialogs.c"
 	}
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17626 "Dialogs.c"
+#line 17604 "Dialogs.c"
 }
 
 
@@ -17663,62 +17641,62 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 	gint _tmp20__length1 = 0;
 	gboolean _tmp21_ = FALSE;
 	GtkCheckButton* _tmp22_ = NULL;
-#line 2217 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_WELCOME_DIALOG (self), FALSE);
-#line 2220 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), "response", (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self, 0);
-#line 2221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2224 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_main ();
-#line 2231 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_parse_name ("response", gtk_dialog_get_type (), &_tmp0_, NULL, FALSE);
-#line 2231 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self);
 #line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self);
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->ok_clicked;
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ok = _tmp1_;
-#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	show_dialog = TRUE;
 #line 2236 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	show_dialog = TRUE;
+#line 2238 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = ok;
-#line 2236 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2238 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 17674 "Dialogs.c"
+#line 17652 "Dialogs.c"
 		GtkCheckButton* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->hide_button;
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		show_dialog = !_tmp4_;
-#line 17683 "Dialogs.c"
+#line 17661 "Dialogs.c"
 	}
-#line 2240 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
-#line 2240 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = _tmp5_;
-#line 2240 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result__length1 = 0;
-#line 2240 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	__result__size_ = _result__length1;
-#line 17693 "Dialogs.c"
+#line 17671 "Dialogs.c"
 	{
 		gint i = 0;
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 17698 "Dialogs.c"
+#line 17676 "Dialogs.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = TRUE;
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 17705 "Dialogs.c"
+#line 17683 "Dialogs.c"
 				gint _tmp8_ = 0;
 				WelcomeServiceEntry** _tmp9_ = NULL;
 				gint _tmp9__length1 = 0;
@@ -17727,43 +17705,43 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 				gint _tmp11_ = 0;
 				GtkCheckButton* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
-#line 17716 "Dialogs.c"
+#line 17694 "Dialogs.c"
 					gint _tmp7_ = 0;
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = i;
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					i = _tmp7_ + 1;
-#line 17722 "Dialogs.c"
+#line 17700 "Dialogs.c"
 				}
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp8_ = i;
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9_ = self->priv->external_import_entries;
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9__length1 = self->priv->external_import_entries_length1;
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp8_ < _tmp9__length1)) {
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 17736 "Dialogs.c"
+#line 17714 "Dialogs.c"
 				}
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = self->priv->external_import_checks;
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10__length1 = self->priv->external_import_checks_length1;
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = i;
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = _tmp10_[_tmp11_];
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_ == TRUE) {
-#line 17750 "Dialogs.c"
+#line 17728 "Dialogs.c"
 					WelcomeServiceEntry** _tmp14_ = NULL;
 					gint _tmp14__length1 = 0;
 					WelcomeServiceEntry** _tmp15_ = NULL;
@@ -17771,93 +17749,93 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 					gint _tmp16_ = 0;
 					WelcomeServiceEntry* _tmp17_ = NULL;
 					WelcomeServiceEntry* _tmp18_ = NULL;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14_ = _result_;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14__length1 = _result__length1;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp15_ = self->priv->external_import_entries;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp15__length1 = self->priv->external_import_entries_length1;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp16_ = i;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp17_ = _tmp15_[_tmp16_];
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp18_ = _g_object_ref0 (_tmp17_);
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_vala_array_add277 (&_result_, &_result__length1, &__result__size_, _tmp18_);
-#line 17774 "Dialogs.c"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+					_vala_array_add111 (&_result_, &_result__length1, &__result__size_, _tmp18_);
+#line 17752 "Dialogs.c"
 				}
 			}
 		}
 	}
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = _result_;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19__length1 = _result__length1;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup30 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_);
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup29 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_);
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20__length1 = _tmp19__length1;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_selected_import_entries = _tmp20_;
-#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_vala_selected_import_entries_length1 = _tmp20__length1;
 #line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_vala_selected_import_entries_length1 = _tmp20__length1;
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->system_pictures_import_check;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp22_ != NULL) {
-#line 17797 "Dialogs.c"
+#line 17775 "Dialogs.c"
 		GtkCheckButton* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = self->priv->system_pictures_import_check;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _tmp24_;
-#line 17806 "Dialogs.c"
+#line 17784 "Dialogs.c"
 	} else {
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = FALSE;
-#line 17810 "Dialogs.c"
+#line 17788 "Dialogs.c"
 	}
-#line 2246 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_do_system_pictures_import = _tmp21_;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
+#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = show_dialog;
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (selected_import_entries) {
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*selected_import_entries = _vala_selected_import_entries;
-#line 17824 "Dialogs.c"
+#line 17802 "Dialogs.c"
 	} else {
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 17828 "Dialogs.c"
+#line 17806 "Dialogs.c"
 	}
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (selected_import_entries_length1) {
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*selected_import_entries_length1 = _vala_selected_import_entries_length1;
-#line 17834 "Dialogs.c"
+#line 17812 "Dialogs.c"
 	}
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (do_system_pictures_import) {
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*do_system_pictures_import = _vala_do_system_pictures_import;
-#line 17840 "Dialogs.c"
+#line 17818 "Dialogs.c"
 	}
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17844 "Dialogs.c"
+#line 17822 "Dialogs.c"
 }
 
 
@@ -17870,37 +17848,37 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 	GFile* _tmp3_ = NULL;
 	GFileType _tmp4_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_dirs_get_import_dir ();
-#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	system_pictures = _tmp0_;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = system_pictures;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = g_file_query_exists (_tmp1_, NULL);
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp2_) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17873 "Dialogs.c"
+#line 17851 "Dialogs.c"
 	}
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = system_pictures;
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_file_query_file_type (_tmp3_, G_FILE_QUERY_INFO_NONE, NULL);
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!(_tmp4_ == G_FILE_TYPE_DIRECTORY)) {
-#line 2260 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2260 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2260 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17887 "Dialogs.c"
+#line 17865 "Dialogs.c"
 	}
 	{
 		GFileEnumerator* syspics_child_enum = NULL;
@@ -17912,152 +17890,152 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		GFileInfo* _tmp10_ = NULL;
 		GFileInfo* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
-#line 2263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = system_pictures;
-#line 2263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = g_file_enumerate_children (_tmp5_, "standard::*", G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
-#line 2263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		syspics_child_enum = _tmp6_;
-#line 2263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17907 "Dialogs.c"
-			goto __catch426_g_error;
+#line 17885 "Dialogs.c"
+			goto __catch423_g_error;
 		}
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = syspics_child_enum;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = g_file_enumerator_next_file (_tmp8_, NULL, &_inner_error_);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp9_;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (syspics_child_enum);
-#line 17920 "Dialogs.c"
-			goto __catch426_g_error;
+#line 17898 "Dialogs.c"
+			goto __catch423_g_error;
 		}
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp7_;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = NULL;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = _tmp10_;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp11_ != NULL;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp11_);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp12_;
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (syspics_child_enum);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17943 "Dialogs.c"
+#line 17921 "Dialogs.c"
 	}
-	goto __finally426;
-	__catch426_g_error:
+	goto __finally423;
+	__catch423_g_error:
 	{
 		GError* e = NULL;
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		e = _inner_error_;
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (e);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17961 "Dialogs.c"
+#line 17939 "Dialogs.c"
 	}
-	__finally426:
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	__finally423:
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (system_pictures);
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_clear_error (&_inner_error_);
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return FALSE;
-#line 17972 "Dialogs.c"
+#line 17950 "Dialogs.c"
 }
 
 
 static void welcome_dialog_class_init (WelcomeDialogClass * klass) {
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (WelcomeDialogPrivate));
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = welcome_dialog_finalize;
-#line 17983 "Dialogs.c"
+#line 17961 "Dialogs.c"
 }
 
 
 static void welcome_dialog_instance_init (WelcomeDialog * self) {
 	GtkCheckButton** _tmp0_ = NULL;
 	WelcomeServiceEntry** _tmp1_ = NULL;
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = WELCOME_DIALOG_GET_PRIVATE (self);
-#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->system_pictures_import_check = NULL;
-#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_new0 (GtkCheckButton*, 0 + 1);
-#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_checks = _tmp0_;
-#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_checks_length1 = 0;
-#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->_external_import_checks_size_ = self->priv->external_import_checks_length1;
-#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
-#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_entries = _tmp1_;
-#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_entries_length1 = 0;
-#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->_external_import_entries_size_ = self->priv->external_import_entries_length1;
-#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_content_already_installed = FALSE;
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2093 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->ok_clicked = FALSE;
-#line 18014 "Dialogs.c"
+#line 17992 "Dialogs.c"
 }
 
 
 static void welcome_dialog_finalize (GObject* obj) {
 	WelcomeDialog * self;
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WELCOME_DIALOG, WelcomeDialog);
-#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hide_button);
-#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->system_pictures_import_check);
-#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_checks = (_vala_array_free (self->priv->external_import_checks, self->priv->external_import_checks_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_entries = (_vala_array_free (self->priv->external_import_entries, self->priv->external_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2090 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->secondary_text);
-#line 2091 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->instruction_header);
-#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_content);
-#line 2093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_action_checkbox_packer);
-#line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_meta_host);
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (welcome_dialog_parent_class)->finalize (obj);
-#line 18044 "Dialogs.c"
+#line 18022 "Dialogs.c"
 }
 
 
@@ -18076,92 +18054,92 @@ GType welcome_dialog_get_type (void) {
 static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_on_delete ((PreferencesDialog*) self);
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18065 "Dialogs.c"
+#line 18043 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_close ((PreferencesDialog*) self);
-#line 18072 "Dialogs.c"
+#line 18050 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 2323 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_value_changed ((PreferencesDialog*) self);
-#line 18079 "Dialogs.c"
+#line 18057 "Dialogs.c"
 }
 
 
 static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_on_bg_color_reset ((PreferencesDialog*) self, event);
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18088 "Dialogs.c"
+#line 18066 "Dialogs.c"
 }
 
 
 static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_on_local_pattern_help ((PreferencesDialog*) self, uri);
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18097 "Dialogs.c"
+#line 18075 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_combo_changed ((PreferencesDialog*) self);
-#line 18104 "Dialogs.c"
+#line 18082 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 2366 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_entry_changed ((PreferencesDialog*) self);
-#line 18111 "Dialogs.c"
+#line 18089 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_lowercase_toggled ((PreferencesDialog*) self);
-#line 18118 "Dialogs.c"
+#line 18096 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_photo_editor_changed ((PreferencesDialog*) self);
-#line 18125 "Dialogs.c"
+#line 18103 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_raw_editor_changed ((PreferencesDialog*) self);
-#line 18132 "Dialogs.c"
+#line 18110 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2391 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_default_raw_developer_changed ((PreferencesDialog*) self);
-#line 18139 "Dialogs.c"
+#line 18117 "Dialogs.c"
 }
 
 
 static gboolean _preferences_dialog_map_event_gtk_widget_map_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_map_event ((PreferencesDialog*) self);
-#line 2393 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18148 "Dialogs.c"
+#line 18126 "Dialogs.c"
 }
 
 
@@ -18183,50 +18161,49 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 	AppWindow* _tmp14_ = NULL;
 	GtkDialog* _tmp15_ = NULL;
 	GtkDialog* _tmp16_ = NULL;
-	GtkDialog* _tmp17_ = NULL;
-	GtkBuilder* _tmp18_ = NULL;
-	GObject* _tmp19_ = NULL;
+	GtkBuilder* _tmp17_ = NULL;
+	GObject* _tmp18_ = NULL;
+	GtkAdjustment* _tmp19_ = NULL;
 	GtkAdjustment* _tmp20_ = NULL;
 	GtkAdjustment* _tmp21_ = NULL;
-	GtkAdjustment* _tmp22_ = NULL;
-	gdouble _tmp23_ = 0.0;
+	gdouble _tmp22_ = 0.0;
+	ConfigFacade* _tmp23_ = NULL;
 	ConfigFacade* _tmp24_ = NULL;
-	ConfigFacade* _tmp25_ = NULL;
-	GdkRGBA _tmp26_ = {0};
-	gdouble _tmp27_ = 0.0;
-	GtkAdjustment* _tmp28_ = NULL;
-	GtkBuilder* _tmp29_ = NULL;
-	GObject* _tmp30_ = NULL;
+	GdkRGBA _tmp25_ = {0};
+	gdouble _tmp26_ = 0.0;
+	GtkAdjustment* _tmp27_ = NULL;
+	GtkBuilder* _tmp28_ = NULL;
+	GObject* _tmp29_ = NULL;
+	GtkScale* _tmp30_ = NULL;
 	GtkScale* _tmp31_ = NULL;
-	GtkScale* _tmp32_ = NULL;
-	GtkBuilder* _tmp33_ = NULL;
-	GObject* _tmp34_ = NULL;
-	GtkFileChooserButton* _tmp35_ = NULL;
-	GtkBuilder* _tmp36_ = NULL;
-	GObject* _tmp37_ = NULL;
-	GtkComboBox* _tmp38_ = NULL;
-	GtkBuilder* _tmp39_ = NULL;
-	GObject* _tmp40_ = NULL;
-	GtkComboBox* _tmp41_ = NULL;
+	GtkBuilder* _tmp32_ = NULL;
+	GObject* _tmp33_ = NULL;
+	GtkFileChooserButton* _tmp34_ = NULL;
+	GtkBuilder* _tmp35_ = NULL;
+	GObject* _tmp36_ = NULL;
+	GtkComboBox* _tmp37_ = NULL;
+	GtkBuilder* _tmp38_ = NULL;
+	GObject* _tmp39_ = NULL;
+	GtkComboBox* _tmp40_ = NULL;
 	GtkLabel* pattern_help = NULL;
-	GtkBuilder* _tmp42_ = NULL;
-	GObject* _tmp43_ = NULL;
-	GtkLabel* _tmp44_ = NULL;
+	GtkBuilder* _tmp41_ = NULL;
+	GObject* _tmp42_ = NULL;
+	GtkLabel* _tmp43_ = NULL;
 	gchar* help_path = NULL;
-	gchar* _tmp45_ = NULL;
-	const gchar* _tmp46_ = NULL;
-	GtkComboBoxText* _tmp60_ = NULL;
-	GtkAlignment* dir_choser_align = NULL;
-	GtkBuilder* _tmp61_ = NULL;
-	GObject* _tmp62_ = NULL;
-	GtkAlignment* _tmp63_ = NULL;
-	GtkComboBoxText* _tmp64_ = NULL;
+	gchar* _tmp44_ = NULL;
+	const gchar* _tmp45_ = NULL;
+	GtkBuilder* _tmp59_ = NULL;
+	GObject* _tmp60_ = NULL;
+	GtkComboBoxText* _tmp61_ = NULL;
+	GtkBuilder* _tmp62_ = NULL;
+	GObject* _tmp63_ = NULL;
+	GtkEntry* _tmp64_ = NULL;
 	GtkBuilder* _tmp65_ = NULL;
 	GObject* _tmp66_ = NULL;
-	GtkEntry* _tmp67_ = NULL;
-	GtkBuilder* _tmp68_ = NULL;
-	GObject* _tmp69_ = NULL;
-	GtkLabel* _tmp70_ = NULL;
+	GtkLabel* _tmp67_ = NULL;
+	const gchar* _tmp68_ = NULL;
+	gchar* _tmp69_ = NULL;
+	gchar* _tmp70_ = NULL;
 	const gchar* _tmp71_ = NULL;
 	gchar* _tmp72_ = NULL;
 	gchar* _tmp73_ = NULL;
@@ -18234,522 +18211,506 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 	gchar* _tmp75_ = NULL;
 	gchar* _tmp76_ = NULL;
 	const gchar* _tmp77_ = NULL;
-	gchar* _tmp78_ = NULL;
-	gchar* _tmp79_ = NULL;
-	const gchar* _tmp80_ = NULL;
-	const gchar* _tmp81_ = NULL;
-	GtkComboBoxText* _tmp82_ = NULL;
-	GtkEntry* _tmp83_ = NULL;
+	const gchar* _tmp78_ = NULL;
+	GtkComboBoxText* _tmp79_ = NULL;
+	GtkEntry* _tmp80_ = NULL;
+	GtkBuilder* _tmp81_ = NULL;
+	GObject* _tmp82_ = NULL;
+	GtkComboBoxText* _tmp83_ = NULL;
 	GtkBuilder* _tmp84_ = NULL;
 	GObject* _tmp85_ = NULL;
-	GtkComboBoxText* _tmp86_ = NULL;
-	GtkBuilder* _tmp87_ = NULL;
-	GObject* _tmp88_ = NULL;
-	GtkCheckButton* _tmp89_ = NULL;
-	GtkCheckButton* _tmp90_ = NULL;
-	GtkBin* plugin_manifest_container = NULL;
-	GtkBuilder* _tmp91_ = NULL;
-	GObject* _tmp92_ = NULL;
-	GtkBin* _tmp93_ = NULL;
-	PluginsManifestWidgetMediator* _tmp94_ = NULL;
-	GtkWidget* _tmp95_ = NULL;
-	GtkWidget* _tmp96_ = NULL;
-	GtkComboBox* _tmp97_ = NULL;
-	GtkComboBox* _tmp98_ = NULL;
+	GtkCheckButton* _tmp86_ = NULL;
+	GtkCheckButton* _tmp87_ = NULL;
+	GtkNotebook* notebook = NULL;
+	GtkBuilder* _tmp88_ = NULL;
+	GObject* _tmp89_ = NULL;
+	GtkNotebook* _tmp90_ = NULL;
+	GtkWidget* _tmp91_ = NULL;
+	PluginsManifestWidgetMediator* _tmp92_ = NULL;
+	GtkWidget* _tmp93_ = NULL;
+	GtkWidget* _tmp94_ = NULL;
+	GtkComboBox* _tmp95_ = NULL;
+	GtkComboBox* _tmp96_ = NULL;
 	GtkCheckButton* auto_import_button = NULL;
-	GtkBuilder* _tmp99_ = NULL;
-	GObject* _tmp100_ = NULL;
-	GtkCheckButton* _tmp101_ = NULL;
-	ConfigFacade* _tmp102_ = NULL;
-	ConfigFacade* _tmp103_ = NULL;
-	gboolean _tmp104_ = FALSE;
+	GtkBuilder* _tmp97_ = NULL;
+	GObject* _tmp98_ = NULL;
+	GtkCheckButton* _tmp99_ = NULL;
+	ConfigFacade* _tmp100_ = NULL;
+	ConfigFacade* _tmp101_ = NULL;
+	gboolean _tmp102_ = FALSE;
 	GtkCheckButton* commit_metadata_button = NULL;
-	GtkBuilder* _tmp105_ = NULL;
-	GObject* _tmp106_ = NULL;
-	GtkCheckButton* _tmp107_ = NULL;
-	ConfigFacade* _tmp108_ = NULL;
-	ConfigFacade* _tmp109_ = NULL;
-	gboolean _tmp110_ = FALSE;
-	GtkBuilder* _tmp111_ = NULL;
-	GObject* _tmp112_ = NULL;
-	GtkComboBoxText* _tmp113_ = NULL;
-	GtkComboBoxText* _tmp114_ = NULL;
-	gchar* _tmp115_ = NULL;
+	GtkBuilder* _tmp103_ = NULL;
+	GObject* _tmp104_ = NULL;
+	GtkCheckButton* _tmp105_ = NULL;
+	ConfigFacade* _tmp106_ = NULL;
+	ConfigFacade* _tmp107_ = NULL;
+	gboolean _tmp108_ = FALSE;
+	GtkBuilder* _tmp109_ = NULL;
+	GObject* _tmp110_ = NULL;
+	GtkComboBoxText* _tmp111_ = NULL;
+	GtkComboBoxText* _tmp112_ = NULL;
+	gchar* _tmp113_ = NULL;
+	gchar* _tmp114_ = NULL;
+	GtkComboBoxText* _tmp115_ = NULL;
 	gchar* _tmp116_ = NULL;
-	GtkComboBoxText* _tmp117_ = NULL;
-	gchar* _tmp118_ = NULL;
-	gchar* _tmp119_ = NULL;
-	ConfigFacade* _tmp120_ = NULL;
-	ConfigFacade* _tmp121_ = NULL;
-	RawDeveloper _tmp122_ = 0;
-	GtkComboBoxText* _tmp123_ = NULL;
-	GtkDialog* _tmp124_ = NULL;
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gchar* _tmp117_ = NULL;
+	ConfigFacade* _tmp118_ = NULL;
+	ConfigFacade* _tmp119_ = NULL;
+	RawDeveloper _tmp120_ = 0;
+	GtkComboBoxText* _tmp121_ = NULL;
+	GtkDialog* _tmp122_ = NULL;
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (PreferencesDialog*) g_type_create_instance (object_type);
-#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->builder = _tmp0_;
 #line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->builder = _tmp0_;
+#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->builder;
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_builder_get_object (_tmp1_, "preferences_dialog");
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_dialog_get_type ()) ? ((GtkDialog*) _tmp2_) : NULL);
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dialog = _tmp3_;
 #line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->dialog = _tmp3_;
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_settings_get_default ();
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 2310 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = use_header;
-#line 2310 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp5_) {
-#line 18297 "Dialogs.c"
+#line 18272 "Dialogs.c"
 		GtkWidget* null_titlebar = NULL;
 		GtkDialog* _tmp6_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
-#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2313 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		null_titlebar = NULL;
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->dialog;
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = null_titlebar;
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_titlebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp7_);
-#line 2310 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (null_titlebar);
-#line 18311 "Dialogs.c"
+#line 18286 "Dialogs.c"
 	}
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->dialog;
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = app_window_get_instance ();
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp10_);
-#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = self->priv->dialog;
-#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = app_window_get_instance ();
-#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = self->priv->dialog;
-#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _preferences_dialog_on_delete_gtk_widget_delete_event, self);
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->dialog;
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp16_, "response", (GCallback) _preferences_dialog_on_close_gtk_dialog_response, self);
-#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp17_ = self->priv->dialog;
-#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_has_resize_grip (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2320 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp18_ = self->priv->builder;
-#line 2320 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp19_ = gtk_builder_get_object (_tmp18_, "bg_color_adjustment");
-#line 2320 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_adjustment_get_type ()) ? ((GtkAdjustment*) _tmp19_) : NULL);
-#line 2320 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->bg_color_adjustment);
-#line 2320 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->bg_color_adjustment = _tmp20_;
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp21_ = self->priv->bg_color_adjustment;
 #line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp22_ = self->priv->bg_color_adjustment;
+	_tmp17_ = self->priv->builder;
 #line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp23_ = gtk_adjustment_get_upper (_tmp22_);
+	_tmp18_ = gtk_builder_get_object (_tmp17_, "bg_color_adjustment");
 #line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp24_ = config_facade_get_instance ();
+	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_adjustment_get_type ()) ? ((GtkAdjustment*) _tmp18_) : NULL);
 #line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = _tmp24_;
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	config_facade_get_bg_color (_tmp25_, &_tmp26_);
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = _tmp26_.red;
-#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_adjustment_set_value (_tmp21_, _tmp23_ - (_tmp27_ * 65535.0));
+	_g_object_unref0 (self->priv->bg_color_adjustment);
 #line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp25_);
-#line 2323 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp28_ = self->priv->bg_color_adjustment;
-#line 2323 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (_tmp28_, "value-changed", (GCallback) _preferences_dialog_on_value_changed_gtk_adjustment_value_changed, self);
-#line 2325 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp29_ = self->priv->builder;
-#line 2325 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = gtk_builder_get_object (_tmp29_, "bg_color_slider");
-#line 2325 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp30_) : NULL);
-#line 2325 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->bg_color_slider);
-#line 2325 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->bg_color_slider = _tmp31_;
+	self->priv->bg_color_adjustment = _tmp19_;
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp20_ = self->priv->bg_color_adjustment;
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp21_ = self->priv->bg_color_adjustment;
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp22_ = gtk_adjustment_get_upper (_tmp21_);
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp23_ = config_facade_get_instance ();
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp24_ = _tmp23_;
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	config_facade_get_bg_color (_tmp24_, &_tmp25_);
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp26_ = _tmp25_.red;
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_adjustment_set_value (_tmp20_, _tmp22_ - (_tmp26_ * 65535.0));
+#line 2322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (_tmp24_);
+#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp27_ = self->priv->bg_color_adjustment;
+#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_signal_connect (_tmp27_, "value-changed", (GCallback) _preferences_dialog_on_value_changed_gtk_adjustment_value_changed, self);
 #line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp32_ = self->priv->bg_color_slider;
+	_tmp28_ = self->priv->builder;
 #line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event, self);
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp33_ = self->priv->builder;
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp34_ = gtk_builder_get_object (_tmp33_, "library_dir_button");
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, gtk_file_chooser_button_get_type ()) ? ((GtkFileChooserButton*) _tmp34_) : NULL);
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp29_ = gtk_builder_get_object (_tmp28_, "bg_color_slider");
+#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp29_) : NULL);
+#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->bg_color_slider);
+#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->bg_color_slider = _tmp30_;
+#line 2327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp31_ = self->priv->bg_color_slider;
+#line 2327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event, self);
+#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp32_ = self->priv->builder;
+#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp33_ = gtk_builder_get_object (_tmp32_, "library_dir_button");
+#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp33_, gtk_file_chooser_button_get_type ()) ? ((GtkFileChooserButton*) _tmp33_) : NULL);
+#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->library_dir_button);
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->library_dir_button = _tmp35_;
-#line 2330 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp36_ = self->priv->builder;
-#line 2330 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp37_ = gtk_builder_get_object (_tmp36_, "external_photo_editor_combo");
-#line 2330 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp37_) : NULL);
-#line 2330 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->photo_editor_combo);
-#line 2330 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->photo_editor_combo = _tmp38_;
+#line 2329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->library_dir_button = _tmp34_;
 #line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp39_ = self->priv->builder;
+	_tmp35_ = self->priv->builder;
 #line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp40_ = gtk_builder_get_object (_tmp39_, "external_raw_editor_combo");
+	_tmp36_ = gtk_builder_get_object (_tmp35_, "external_photo_editor_combo");
 #line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp40_) : NULL);
+	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp36_) : NULL);
 #line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->raw_editor_combo);
+	_g_object_unref0 (self->priv->photo_editor_combo);
 #line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->raw_editor_combo = _tmp41_;
-#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp42_ = self->priv->builder;
-#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp43_ = gtk_builder_get_object (_tmp42_, "pattern_help");
-#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp43_) : NULL);
-#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	pattern_help = _tmp44_;
-#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp45_ = resources_get_help_path ();
-#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	help_path = _tmp45_;
-#line 2342 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp46_ = help_path;
-#line 2342 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp46_ == NULL) {
-#line 18439 "Dialogs.c"
-		GtkLabel* _tmp47_ = NULL;
-		const gchar* _tmp48_ = NULL;
+	self->priv->photo_editor_combo = _tmp37_;
+#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp38_ = self->priv->builder;
+#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp39_ = gtk_builder_get_object (_tmp38_, "external_raw_editor_combo");
+#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp39_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp39_) : NULL);
+#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->raw_editor_combo);
+#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->raw_editor_combo = _tmp40_;
+#line 2334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp41_ = self->priv->builder;
+#line 2334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp42_ = gtk_builder_get_object (_tmp41_, "pattern_help");
+#line 2334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp42_) : NULL);
+#line 2334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	pattern_help = _tmp43_;
+#line 2341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp44_ = resources_get_help_path ();
+#line 2341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	help_path = _tmp44_;
+#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp45_ = help_path;
+#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	if (_tmp45_ == NULL) {
+#line 18410 "Dialogs.c"
+		GtkLabel* _tmp46_ = NULL;
+		const gchar* _tmp47_ = NULL;
+		gchar* _tmp48_ = NULL;
 		gchar* _tmp49_ = NULL;
 		gchar* _tmp50_ = NULL;
 		gchar* _tmp51_ = NULL;
-		gchar* _tmp52_ = NULL;
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp47_ = pattern_help;
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp48_ = _ ("(Help)");
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp49_ = g_strconcat ("<a href=\"" RESOURCES_DIR_PATTERN_URI_SYSWIDE "\">", _tmp48_, NULL);
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp50_ = _tmp49_;
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp51_ = g_strconcat (_tmp50_, "</a>", NULL);
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp52_ = _tmp51_;
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_markup (_tmp47_, _tmp52_);
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp52_);
-#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp50_);
-#line 18464 "Dialogs.c"
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp46_ = pattern_help;
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp47_ = _ ("(Help)");
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp48_ = g_strconcat ("<a href=\"" RESOURCES_DIR_PATTERN_URI_SYSWIDE "\">", _tmp47_, NULL);
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp49_ = _tmp48_;
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp50_ = g_strconcat (_tmp49_, "</a>", NULL);
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp51_ = _tmp50_;
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		gtk_label_set_markup (_tmp46_, _tmp51_);
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_g_free0 (_tmp51_);
+#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_g_free0 (_tmp49_);
+#line 18435 "Dialogs.c"
 	} else {
-		GtkLabel* _tmp53_ = NULL;
-		const gchar* _tmp54_ = NULL;
+		GtkLabel* _tmp52_ = NULL;
+		const gchar* _tmp53_ = NULL;
+		gchar* _tmp54_ = NULL;
 		gchar* _tmp55_ = NULL;
 		gchar* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
-		gchar* _tmp58_ = NULL;
-		GtkLabel* _tmp59_ = NULL;
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp53_ = pattern_help;
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp54_ = _ ("(Help)");
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp55_ = g_strconcat ("<a href=\"dummy:\">", _tmp54_, NULL);
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp56_ = _tmp55_;
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp57_ = g_strconcat (_tmp56_, "</a>", NULL);
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp58_ = _tmp57_;
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_markup (_tmp53_, _tmp58_);
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp58_);
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_g_free0 (_tmp56_);
+		GtkLabel* _tmp58_ = NULL;
+#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp52_ = pattern_help;
+#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp53_ = _ ("(Help)");
 #line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp59_ = pattern_help;
+		_tmp54_ = g_strconcat ("<a href=\"dummy:\">", _tmp53_, NULL);
 #line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_signal_connect (_tmp59_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self);
-#line 18495 "Dialogs.c"
+		_tmp55_ = _tmp54_;
+#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp56_ = g_strconcat (_tmp55_, "</a>", NULL);
+#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp57_ = _tmp56_;
+#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		gtk_label_set_markup (_tmp52_, _tmp57_);
+#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_g_free0 (_tmp57_);
+#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_g_free0 (_tmp55_);
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp58_ = pattern_help;
+#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		g_signal_connect (_tmp58_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self);
+#line 18466 "Dialogs.c"
 	}
-#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp60_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp60_);
-#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->dir_pattern_combo);
-#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dir_pattern_combo = _tmp60_;
 #line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp61_ = self->priv->builder;
+	_tmp59_ = self->priv->builder;
 #line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp62_ = gtk_builder_get_object (_tmp61_, "dir choser");
+	_tmp60_ = gtk_builder_get_object (_tmp59_, "dir choser");
 #line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp63_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp62_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp62_) : NULL);
+	_tmp61_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp60_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp60_) : NULL);
 #line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	dir_choser_align = _tmp63_;
+	_g_object_unref0 (self->priv->dir_pattern_combo);
+#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->dir_pattern_combo = _tmp61_;
+#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp62_ = self->priv->builder;
+#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp63_ = gtk_builder_get_object (_tmp62_, "dir_pattern_entry");
 #line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp64_ = self->priv->dir_pattern_combo;
+	_tmp64_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp63_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp63_) : NULL);
 #line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (dir_choser_align, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
+	_g_object_unref0 (self->priv->dir_pattern_entry);
+#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->dir_pattern_entry = _tmp64_;
 #line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp65_ = self->priv->builder;
 #line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp66_ = gtk_builder_get_object (_tmp65_, "dir_pattern_entry");
+	_tmp66_ = gtk_builder_get_object (_tmp65_, "dynamic example");
 #line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp67_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp66_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp66_) : NULL);
+	_tmp67_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp66_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp66_) : NULL);
 #line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->dir_pattern_entry);
+	_g_object_unref0 (self->priv->dir_pattern_example);
 #line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dir_pattern_entry = _tmp67_;
+	self->priv->dir_pattern_example = _tmp67_;
 #line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp68_ = self->priv->builder;
+	_tmp68_ = _ ("Year%sMonth%sDay");
 #line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp69_ = gtk_builder_get_object (_tmp68_, "dynamic example");
+	_tmp69_ = g_strdup_printf (_tmp68_, G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);
 #line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp70_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp69_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp69_) : NULL);
+	_tmp70_ = _tmp69_;
 #line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->dir_pattern_example);
+	preferences_dialog_add_to_dir_formats (self, _tmp70_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
 #line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->dir_pattern_example = _tmp70_;
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp71_ = _ ("Year%sMonth%sDay");
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp72_ = g_strdup_printf (_tmp71_, G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_free0 (_tmp70_);
+#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp71_ = _ ("Year%sMonth");
+#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp72_ = g_strdup_printf (_tmp71_, G_DIR_SEPARATOR_S);
+#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = _tmp72_;
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp73_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	preferences_dialog_add_to_dir_formats (self, _tmp73_, "%Y" G_DIR_SEPARATOR_S "%m");
+#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp73_);
-#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp74_ = _ ("Year%sMonth");
-#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp74_ = _ ("Year%sMonth-Day");
+#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75_ = g_strdup_printf (_tmp74_, G_DIR_SEPARATOR_S);
-#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp76_ = _tmp75_;
-#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp76_, "%Y" G_DIR_SEPARATOR_S "%m");
-#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	preferences_dialog_add_to_dir_formats (self, _tmp76_, "%Y" G_DIR_SEPARATOR_S "%m-%d");
+#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp76_);
-#line 2361 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp77_ = _ ("Year%sMonth-Day");
-#line 2361 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp78_ = g_strdup_printf (_tmp77_, G_DIR_SEPARATOR_S);
-#line 2361 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp79_ = _tmp78_;
-#line 2361 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp79_, "%Y" G_DIR_SEPARATOR_S "%m-%d");
-#line 2361 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp79_);
+#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp77_ = _ ("Year-Month-Day");
+#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	preferences_dialog_add_to_dir_formats (self, _tmp77_, "%Y-%m-%d");
 #line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp80_ = _ ("Year-Month-Day");
+	_tmp78_ = _ ("Custom");
 #line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp80_, "%Y-%m-%d");
+	preferences_dialog_add_to_dir_formats (self, _tmp78_, NULL);
 #line 2364 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp81_ = _ ("Custom");
+	_tmp79_ = self->priv->dir_pattern_combo;
 #line 2364 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_add_to_dir_formats (self, _tmp81_, NULL);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self);
 #line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp82_ = self->priv->dir_pattern_combo;
+	_tmp80_ = self->priv->dir_pattern_entry;
 #line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self);
-#line 2366 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp83_ = self->priv->dir_pattern_entry;
-#line 2366 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self);
-#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self);
+#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp81_ = self->priv->builder;
+#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp82_ = gtk_builder_get_object (_tmp81_, "dir_structure_label");
+#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp83_ = self->priv->dir_pattern_combo;
+#line 2367 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_mnemonic_widget (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp82_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_widget_get_type (), GtkWidget));
+#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp84_ = self->priv->builder;
-#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp85_ = gtk_builder_get_object (_tmp84_, "dir_structure_label");
-#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp86_ = self->priv->dir_pattern_combo;
-#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_mnemonic_widget (G_TYPE_CHECK_INSTANCE_TYPE (_tmp85_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp85_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget));
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp87_ = self->priv->builder;
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp88_ = gtk_builder_get_object (_tmp87_, "lowercase");
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp89_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp88_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp88_) : NULL);
-#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp85_ = gtk_builder_get_object (_tmp84_, "lowercase");
+#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp86_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp85_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp85_) : NULL);
+#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->lowercase);
+#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->lowercase = _tmp86_;
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp87_ = self->priv->lowercase;
 #line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->lowercase = _tmp89_;
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp90_ = self->priv->lowercase;
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self);
+#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp88_ = self->priv->builder;
+#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp89_ = gtk_builder_get_object (_tmp88_, "preferences-notebook");
+#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp90_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp89_, gtk_notebook_get_type ()) ? ((GtkNotebook*) _tmp89_) : NULL);
+#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	notebook = _tmp90_;
 #line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp91_ = self->priv->builder;
+	_tmp91_ = gtk_notebook_get_nth_page (notebook, 2);
 #line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp92_ = gtk_builder_get_object (_tmp91_, "plugin-manifest-bin");
+	_tmp92_ = self->priv->plugins_mediator;
 #line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp93_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, gtk_bin_get_type ()) ? ((GtkBin*) _tmp92_) : NULL);
+	_tmp93_ = plugins_manifest_widget_mediator_get_widget (_tmp92_);
 #line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	plugin_manifest_container = _tmp93_;
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp94_ = self->priv->plugins_mediator;
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp95_ = plugins_manifest_widget_mediator_get_widget (_tmp94_);
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp96_ = _tmp95_;
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (plugin_manifest_container, gtk_container_get_type (), GtkContainer), _tmp96_);
-#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp94_ = _tmp93_;
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_TYPE (_tmp91_, gtk_container_get_type ()) ? ((GtkContainer*) _tmp91_) : NULL, _tmp94_);
+#line 2375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_preference_options (self);
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp95_ = self->priv->photo_editor_combo;
+#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_signal_connect (_tmp95_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self);
 #line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp97_ = self->priv->photo_editor_combo;
+	_tmp96_ = self->priv->raw_editor_combo;
 #line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (_tmp97_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self);
-#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp98_ = self->priv->raw_editor_combo;
-#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (_tmp98_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self);
+	g_signal_connect (_tmp96_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self);
+#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp97_ = self->priv->builder;
+#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp98_ = gtk_builder_get_object (_tmp97_, "autoimport");
+#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp99_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp98_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp98_) : NULL);
+#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	auto_import_button = _tmp99_;
+#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp100_ = config_facade_get_instance ();
 #line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp99_ = self->priv->builder;
+	_tmp101_ = _tmp100_;
 #line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp100_ = gtk_builder_get_object (_tmp99_, "autoimport");
+	_tmp102_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp101_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp100_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp100_) : NULL);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (auto_import_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp102_);
 #line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	auto_import_button = _tmp101_;
-#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp102_ = config_facade_get_instance ();
-#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp103_ = _tmp102_;
-#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp104_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (auto_import_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp104_);
-#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp103_);
+	_g_object_unref0 (_tmp101_);
+#line 2383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp103_ = self->priv->builder;
+#line 2383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp104_ = gtk_builder_get_object (_tmp103_, "write_metadata");
+#line 2383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp105_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp104_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp104_) : NULL);
+#line 2383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	commit_metadata_button = _tmp105_;
 #line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp105_ = self->priv->builder;
+	_tmp106_ = config_facade_get_instance ();
 #line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp106_ = gtk_builder_get_object (_tmp105_, "write_metadata");
+	_tmp107_ = _tmp106_;
 #line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp107_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp106_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp106_) : NULL);
+	_tmp108_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	commit_metadata_button = _tmp107_;
-#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp108_ = config_facade_get_instance ();
-#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp109_ = _tmp108_;
-#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp110_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (commit_metadata_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp110_);
-#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp109_);
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (commit_metadata_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp108_);
+#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (_tmp107_);
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp109_ = self->priv->builder;
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp110_ = gtk_builder_get_object (_tmp109_, "default_raw_developer");
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp111_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp110_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp110_) : NULL);
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->default_raw_developer_combo);
+#line 2386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->default_raw_developer_combo = _tmp111_;
 #line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp111_ = self->priv->builder;
+	_tmp112_ = self->priv->default_raw_developer_combo;
 #line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp112_ = gtk_builder_get_object (_tmp111_, "default_raw_developer");
+	_tmp113_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA);
 #line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp113_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp112_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp112_) : NULL);
+	_tmp114_ = _tmp113_;
 #line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->default_raw_developer_combo);
+	gtk_combo_box_text_append_text (_tmp112_, _tmp114_);
 #line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->default_raw_developer_combo = _tmp113_;
+	_g_free0 (_tmp114_);
 #line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp114_ = self->priv->default_raw_developer_combo;
+	_tmp115_ = self->priv->default_raw_developer_combo;
 #line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp115_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA);
+	_tmp116_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL);
 #line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp116_ = _tmp115_;
+	_tmp117_ = _tmp116_;
 #line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp114_, _tmp116_);
+	gtk_combo_box_text_append_text (_tmp115_, _tmp117_);
 #line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp116_);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp117_ = self->priv->default_raw_developer_combo;
+	_g_free0 (_tmp117_);
 #line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp118_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL);
+	_tmp118_ = config_facade_get_instance ();
 #line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp119_ = _tmp118_;
 #line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_combo_box_text_append_text (_tmp117_, _tmp119_);
+	_tmp120_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp119_);
-#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp120_ = config_facade_get_instance ();
-#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp121_ = _tmp120_;
-#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp122_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	preferences_dialog_set_raw_developer_combo (self, _tmp120_);
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (_tmp119_);
 #line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	preferences_dialog_set_raw_developer_combo (self, _tmp122_);
+	_tmp121_ = self->priv->default_raw_developer_combo;
 #line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (_tmp121_);
-#line 2391 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp123_ = self->priv->default_raw_developer_combo;
-#line 2391 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self);
-#line 2393 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp124_ = self->priv->dialog;
-#line 2393 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget), "map-event", (GCallback) _preferences_dialog_map_event_gtk_widget_map_event, self);
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self);
+#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp122_ = self->priv->dialog;
+#line 2392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp122_, gtk_widget_get_type (), GtkWidget), "map-event", (GCallback) _preferences_dialog_map_event_gtk_widget_map_event, self);
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (commit_metadata_button);
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (auto_import_button);
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (plugin_manifest_container);
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (dir_choser_align);
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (notebook);
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (help_path);
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (pattern_help);
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 18729 "Dialogs.c"
+#line 18690 "Dialogs.c"
 }
 
 
 static PreferencesDialog* preferences_dialog_new (void) {
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return preferences_dialog_construct (TYPE_PREFERENCES_DIALOG);
-#line 18736 "Dialogs.c"
+#line 18697 "Dialogs.c"
 }
 
 
@@ -18780,150 +18741,150 @@ void preferences_dialog_populate_preference_options (PreferencesDialog* self) {
 	ConfigFacade* _tmp21_ = NULL;
 	ConfigFacade* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->photo_editor_combo;
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = photo_file_format_get_editable_mime_types (&_tmp1_);
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3__length1 = _tmp1_;
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_;
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_app_combo_box (self, _tmp0_, _tmp3_, _tmp1_, _tmp7_, &_tmp8_);
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_photo_apps);
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_photo_apps = _tmp8_;
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp7_);
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_free), NULL);
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->raw_editor_combo;
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = photo_file_format_get_mime_types (PHOTO_FILE_FORMAT_RAW, &_tmp10_);
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12__length1 = _tmp10_;
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = config_facade_get_instance ();
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = _tmp15_;
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_app_combo_box (self, _tmp9_, _tmp12_, _tmp10_, _tmp16_, &_tmp17_);
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_raw_apps);
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_raw_apps = _tmp17_;
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp16_);
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL);
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->dir_pattern_combo;
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->dir_pattern_entry;
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_setup_dir_pattern (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), _tmp19_);
-#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->lowercase;
-#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = config_facade_get_instance ();
-#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp23_);
-#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp22_);
-#line 18843 "Dialogs.c"
+#line 18804 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, const gchar* ignore) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (ignore != NULL, FALSE);
-#line 18854 "Dialogs.c"
+#line 18815 "Dialogs.c"
 	{
 		AppWindow* _tmp0_ = NULL;
 		AppWindow* _tmp1_ = NULL;
 		GdkScreen* _tmp2_ = NULL;
-#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = app_window_get_instance ();
-#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp0_;
-#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
-#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		resources_launch_help (_tmp2_, "other-files.page", &_inner_error_);
-#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp1_);
-#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18871 "Dialogs.c"
-			goto __catch427_g_error;
+#line 18832 "Dialogs.c"
+			goto __catch424_g_error;
 		}
 	}
-	goto __finally427;
-	__catch427_g_error:
+	goto __finally424;
+	__catch424_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		e = _inner_error_;
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
-#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = e;
-#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp3_->message;
-#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_message ("Dialogs.vala:2414: Unable to launch help: %s", _tmp4_);
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		g_message ("Dialogs.vala:2413: Unable to launch help: %s", _tmp4_);
+#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (e);
-#line 18893 "Dialogs.c"
+#line 18854 "Dialogs.c"
 	}
-	__finally427:
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	__finally424:
+#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_clear_error (&_inner_error_);
-#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return FALSE;
-#line 18904 "Dialogs.c"
+#line 18865 "Dialogs.c"
 	}
-#line 2416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 2416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18910 "Dialogs.c"
+#line 18871 "Dialogs.c"
 }
 
 
@@ -18958,110 +18919,110 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 	GtkListStore* _tmp68_ = NULL;
 	gint _tmp69_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (current_app_executable != NULL);
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = mime_types;
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0__length1 = mime_types_length1;
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0__length1 != 0, "mime_types.length != 0");
-#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = mime_types;
-#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1__length1 = mime_types_length1;
-#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = desktop_integration_get_apps_for_mime_types (_tmp1_, _tmp1__length1);
-#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_vala_external_apps);
-#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_external_apps = _tmp2_;
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _vala_external_apps;
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ == 0) {
-#line 2426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (external_apps) {
-#line 2426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			*external_apps = _vala_external_apps;
-#line 18979 "Dialogs.c"
+#line 18940 "Dialogs.c"
 		} else {
-#line 2426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_vala_external_apps);
-#line 18983 "Dialogs.c"
+#line 18944 "Dialogs.c"
 		}
-#line 2426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 18987 "Dialogs.c"
+#line 18948 "Dialogs.c"
 	}
-#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
-#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pixbuf_renderer = _tmp6_;
-#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp7_);
-#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_renderer = _tmp7_;
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = combo_box;
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout));
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = combo_box;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = pixbuf_renderer;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = combo_box;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = text_renderer;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = combo_box;
-#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = pixbuf_renderer;
-#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
-#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = combo_box;
-#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = text_renderer;
-#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
-#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	combo_store = _tmp17_;
-#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2440 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	current_app = -1;
-#line 19035 "Dialogs.c"
+#line 18996 "Dialogs.c"
 	{
 		GeeIterator* _app_it = NULL;
 		SortedList* _tmp18_ = NULL;
 		GeeIterator* _tmp19_ = NULL;
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = _vala_external_apps;
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_app_it = _tmp19_;
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 19048 "Dialogs.c"
+#line 19009 "Dialogs.c"
 			GeeIterator* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			GAppInfo* app = NULL;
@@ -19081,44 +19042,44 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 			GAppInfo* _tmp61_ = NULL;
 			const gchar* _tmp62_ = NULL;
 			const gchar* _tmp63_ = NULL;
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = _app_it;
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp21_) {
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 19076 "Dialogs.c"
+#line 19037 "Dialogs.c"
 			}
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = _app_it;
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			app = (GAppInfo*) _tmp23_;
-#line 2444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = combo_store;
-#line 2444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_list_store_append (_tmp24_, &_tmp25_);
-#line 2444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			iter = _tmp25_;
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = app;
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = g_app_info_get_icon (_tmp26_);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			app_icon = _tmp28_;
-#line 19098 "Dialogs.c"
+#line 19059 "Dialogs.c"
 			{
 				GIcon* _tmp29_ = NULL;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp29_ = app_icon;
-#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, g_file_icon_get_type ())) {
-#line 19105 "Dialogs.c"
+#line 19066 "Dialogs.c"
 					GdkPixbuf* _tmp30_ = NULL;
 					GIcon* _tmp31_ = NULL;
 					GFile* _tmp32_ = NULL;
@@ -19130,51 +19091,51 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 					GtkTreeIter _tmp38_ = {0};
 					GdkPixbuf* _tmp39_ = NULL;
 					GValue _tmp40_ = {0};
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp31_ = app_icon;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp32_ = g_file_icon_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_file_icon_get_type (), GFileIcon));
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp33_ = g_file_get_path (_tmp32_);
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp34_ = _tmp33_;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp35_ = gdk_pixbuf_new_from_file (_tmp34_, &_inner_error_);
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp36_ = _tmp35_;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_free0 (_tmp34_);
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp30_ = _tmp36_;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19135 "Dialogs.c"
-						goto __catch428_g_error;
+#line 19096 "Dialogs.c"
+						goto __catch425_g_error;
 					}
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp37_ = combo_store;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp38_ = iter;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp39_ = scale_pixbuf (_tmp30_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE);
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					g_value_init (&_tmp40_, gdk_pixbuf_get_type ());
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					g_value_take_object (&_tmp40_, _tmp39_);
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_list_store_set_value (_tmp37_, &_tmp38_, 0, &_tmp40_);
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					G_IS_VALUE (&_tmp40_) ? (g_value_unset (&_tmp40_), NULL) : NULL;
 #line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+					G_IS_VALUE (&_tmp40_) ? (g_value_unset (&_tmp40_), NULL) : NULL;
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_object_unref0 (_tmp30_);
-#line 19154 "Dialogs.c"
+#line 19115 "Dialogs.c"
 				} else {
 					GIcon* _tmp41_ = NULL;
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp41_ = app_icon;
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_themed_icon_get_type ())) {
-#line 19161 "Dialogs.c"
+#line 19122 "Dialogs.c"
 						GdkPixbuf* icon_pixbuf = NULL;
 						GtkIconTheme* _tmp42_ = NULL;
 						GIcon* _tmp43_ = NULL;
@@ -19186,178 +19147,178 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 						GtkTreeIter _tmp49_ = {0};
 						GdkPixbuf* _tmp50_ = NULL;
 						GValue _tmp51_ = {0};
-#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp42_ = gtk_icon_theme_get_default ();
-#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp43_ = app_icon;
-#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp45_ = _tmp44_ = g_themed_icon_get_names (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, g_themed_icon_get_type (), GThemedIcon));
-#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp46_ = _tmp45_[0];
-#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp47_ = gtk_icon_theme_load_icon (_tmp42_, _tmp46_, RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE, &_inner_error_);
-#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						icon_pixbuf = _tmp47_;
-#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19187 "Dialogs.c"
-							goto __catch428_g_error;
+#line 19148 "Dialogs.c"
+							goto __catch425_g_error;
 						}
-#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp48_ = combo_store;
-#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp49_ = iter;
-#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp50_ = icon_pixbuf;
-#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						g_value_init (&_tmp51_, gdk_pixbuf_get_type ());
-#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						g_value_set_object (&_tmp51_, _tmp50_);
-#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						gtk_list_store_set_value (_tmp48_, &_tmp49_, 0, &_tmp51_);
-#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL;
-#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_g_object_unref0 (icon_pixbuf);
-#line 19206 "Dialogs.c"
+#line 19167 "Dialogs.c"
 					}
 				}
 			}
-			goto __finally428;
-			__catch428_g_error:
+			goto __finally425;
+			__catch425_g_error:
 			{
 				GError* _error_ = NULL;
 				GError* _tmp52_ = NULL;
 				const gchar* _tmp53_ = NULL;
 				gchar* _tmp54_ = NULL;
 				gchar* _tmp55_ = NULL;
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_error_ = _inner_error_;
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_inner_error_ = NULL;
-#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp52_ = _error_;
-#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp53_ = _tmp52_->message;
-#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp54_ = g_strconcat ("Error loading icon pixbuf: ", _tmp53_, NULL);
-#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp55_ = _tmp54_;
-#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_warning ("Dialogs.vala:2460: %s", _tmp55_);
-#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				g_warning ("Dialogs.vala:2459: %s", _tmp55_);
+#line 2459 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp55_);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_error_free0 (_error_);
-#line 19236 "Dialogs.c"
+#line 19197 "Dialogs.c"
 			}
-			__finally428:
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			__finally425:
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (app_icon);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (app);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_app_it);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (combo_store);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (text_renderer);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (pixbuf_renderer);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_clear_error (&_inner_error_);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return;
-#line 19259 "Dialogs.c"
+#line 19220 "Dialogs.c"
 			}
-#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp56_ = combo_store;
-#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp57_ = iter;
-#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp58_ = app;
-#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp59_ = g_app_info_get_name (_tmp58_);
-#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_value_init (&_tmp60_, G_TYPE_STRING);
-#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_value_set_string (&_tmp60_, _tmp59_);
-#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_list_store_set_value (_tmp56_, &_tmp57_, 1, &_tmp60_);
-#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			G_IS_VALUE (&_tmp60_) ? (g_value_unset (&_tmp60_), NULL) : NULL;
-#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp61_ = app;
-#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp62_ = g_app_info_get_commandline (_tmp61_);
-#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp63_ = current_app_executable;
-#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (g_strcmp0 (_tmp62_, _tmp63_) == 0) {
-#line 19285 "Dialogs.c"
+#line 19246 "Dialogs.c"
 				SortedList* _tmp64_ = NULL;
 				GAppInfo* _tmp65_ = NULL;
 				gint _tmp66_ = 0;
-#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp64_ = _vala_external_apps;
-#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp65_ = app;
-#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp66_ = sorted_list_index_of (_tmp64_, _tmp65_);
-#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_app = _tmp66_;
-#line 19297 "Dialogs.c"
+#line 19258 "Dialogs.c"
 			}
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (app_icon);
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (app);
-#line 19303 "Dialogs.c"
+#line 19264 "Dialogs.c"
 		}
-#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_app_it);
-#line 19307 "Dialogs.c"
+#line 19268 "Dialogs.c"
 	}
-#line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = combo_box;
-#line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = combo_store;
-#line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_set_model (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp69_ = current_app;
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp69_ != -1) {
-#line 19319 "Dialogs.c"
+#line 19280 "Dialogs.c"
 		GtkComboBox* _tmp70_ = NULL;
 		gint _tmp71_ = 0;
-#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp70_ = combo_box;
-#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = current_app;
-#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (_tmp70_, _tmp71_);
-#line 19328 "Dialogs.c"
+#line 19289 "Dialogs.c"
 	}
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (combo_store);
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (text_renderer);
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (pixbuf_renderer);
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (external_apps) {
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*external_apps = _vala_external_apps;
-#line 19340 "Dialogs.c"
+#line 19301 "Dialogs.c"
 	} else {
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_vala_external_apps);
-#line 19344 "Dialogs.c"
+#line 19305 "Dialogs.c"
 	}
 }
 
@@ -19371,35 +19332,35 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 	gboolean found = FALSE;
 	const gchar* _tmp4_ = NULL;
 	gboolean _tmp32_ = FALSE;
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_ENTRY (entry));
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = configuration_facade_get_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pattern = _tmp3_;
-#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	found = FALSE;
-#line 2480 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = pattern;
-#line 2480 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL != _tmp4_) {
-#line 19382 "Dialogs.c"
+#line 19343 "Dialogs.c"
 		gint i = 0;
-#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 19386 "Dialogs.c"
+#line 19347 "Dialogs.c"
 		{
 			GeeArrayList* _pf_list = NULL;
 			GeeArrayList* _tmp5_ = NULL;
@@ -19409,25 +19370,25 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
 			gint _pf_index = 0;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = self->priv->path_formats;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = _g_object_ref0 (_tmp5_);
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_pf_list = _tmp6_;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = _pf_list;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _tmp8_;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_pf_size = _tmp9_;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_pf_index = -1;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 19414 "Dialogs.c"
+#line 19375 "Dialogs.c"
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				gint _tmp12_ = 0;
@@ -19439,64 +19400,64 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 				const gchar* _tmp17_ = NULL;
 				const gchar* _tmp18_ = NULL;
 				gint _tmp21_ = 0;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = _pf_index;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_pf_index = _tmp10_ + 1;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = _pf_index;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = _pf_size;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp11_ < _tmp12_)) {
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 19438 "Dialogs.c"
+#line 19399 "Dialogs.c"
 				}
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = _pf_list;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp14_ = _pf_index;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_);
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				pf = (PreferencesDialogPathFormat*) _tmp15_;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp16_ = pf;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp17_ = _tmp16_->pattern;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp18_ = pattern;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 19456 "Dialogs.c"
+#line 19417 "Dialogs.c"
 					GtkComboBox* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
-#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp19_ = combo_box;
-#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp20_ = i;
-#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_combo_box_set_active (_tmp19_, _tmp20_);
-#line 2486 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					found = TRUE;
-#line 2487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_preferences_dialog_path_format_unref0 (pf);
-#line 2487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 19471 "Dialogs.c"
+#line 19432 "Dialogs.c"
 				}
-#line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = i;
-#line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				i = _tmp21_ + 1;
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_preferences_dialog_path_format_unref0 (pf);
-#line 19479 "Dialogs.c"
+#line 19440 "Dialogs.c"
 			}
-#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_pf_list);
-#line 19483 "Dialogs.c"
+#line 19444 "Dialogs.c"
 		}
 	} else {
 		gchar* s = NULL;
@@ -19506,64 +19467,64 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 		gchar* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
 		gboolean _tmp27_ = FALSE;
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = config_facade_get_instance ();
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = _tmp22_;
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = _tmp24_;
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp23_);
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		s = _tmp25_;
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = s;
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = is_string_empty (_tmp26_);
-#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (!_tmp27_) {
-#line 19511 "Dialogs.c"
+#line 19472 "Dialogs.c"
 			GtkComboBox* _tmp28_ = NULL;
 			GeeArrayList* _tmp29_ = NULL;
 			gint _tmp30_ = 0;
 			gint _tmp31_ = 0;
-#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = combo_box;
-#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = self->priv->path_formats;
-#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = _tmp30_;
-#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_combo_box_set_active (_tmp28_, _tmp31_ - 1);
-#line 2496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			found = TRUE;
-#line 19528 "Dialogs.c"
+#line 19489 "Dialogs.c"
 		}
-#line 2480 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (s);
-#line 19532 "Dialogs.c"
+#line 19493 "Dialogs.c"
 	}
-#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = found;
-#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp32_) {
-#line 19538 "Dialogs.c"
+#line 19499 "Dialogs.c"
 		GtkComboBox* _tmp33_ = NULL;
-#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = combo_box;
-#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (_tmp33_, 0);
-#line 19544 "Dialogs.c"
+#line 19505 "Dialogs.c"
 	}
-#line 2504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2503 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_combo_changed (self);
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (pattern);
-#line 19550 "Dialogs.c"
+#line 19511 "Dialogs.c"
 }
 
 
@@ -19580,55 +19541,55 @@ void preferences_dialog_show (void) {
 	gchar* _tmp10_ = NULL;
 	PreferencesDialog* _tmp11_ = NULL;
 	GtkDialog* _tmp12_ = NULL;
-#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_preferences_dialog;
-#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 19571 "Dialogs.c"
+#line 19532 "Dialogs.c"
 		PreferencesDialog* _tmp1_ = NULL;
-#line 2509 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = preferences_dialog_new ();
-#line 2509 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_preferences_dialog_unref0 (preferences_dialog_preferences_dialog);
-#line 2509 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_preferences_dialog = _tmp1_;
-#line 19579 "Dialogs.c"
+#line 19540 "Dialogs.c"
 	}
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2510 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_preferences_dialog;
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2510 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_preference_options (_tmp2_);
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = preferences_dialog_preferences_dialog;
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_->priv->dialog;
-#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = preferences_dialog_preferences_dialog;
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_->priv->library_dir_button;
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = app_dirs_get_import_dir ();
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_file_get_path (_tmp8_);
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp10_);
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp8_);
-#line 2517 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = preferences_dialog_preferences_dialog;
-#line 2517 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_->priv->dialog;
-#line 2517 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow));
-#line 19615 "Dialogs.c"
+#line 19576 "Dialogs.c"
 }
 
 
@@ -19653,113 +19614,113 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 	gpointer _tmp25_ = NULL;
 	PreferencesDialogPathFormat* _tmp26_ = NULL;
 	const gchar* _tmp27_ = NULL;
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	config_facade_commit_bg_color (_tmp1_);
-#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->builder;
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_builder_get_object (_tmp2_, "autoimport");
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp3_) : NULL);
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	autoimport = _tmp4_;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = autoimport;
-#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 19662 "Dialogs.c"
+#line 19623 "Dialogs.c"
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		GtkCheckButton* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_;
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = autoimport;
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
-#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 19682 "Dialogs.c"
+#line 19643 "Dialogs.c"
 	}
-#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->builder;
-#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = gtk_builder_get_object (_tmp11_, "write_metadata");
-#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp12_) : NULL);
-#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	commit_metadata = _tmp13_;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = commit_metadata;
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ != NULL) {
-#line 19696 "Dialogs.c"
+#line 19657 "Dialogs.c"
 		ConfigFacade* _tmp15_ = NULL;
 		ConfigFacade* _tmp16_ = NULL;
 		GtkCheckButton* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
 		gboolean _tmp19_ = FALSE;
-#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = config_facade_get_instance ();
-#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = _tmp15_;
-#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = commit_metadata;
-#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp18_;
-#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp19_);
-#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp16_);
-#line 19716 "Dialogs.c"
+#line 19677 "Dialogs.c"
 	}
-#line 2533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2532 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->lib_dir;
-#line 2533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2532 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp20_ != NULL) {
-#line 19722 "Dialogs.c"
+#line 19683 "Dialogs.c"
 		const gchar* _tmp21_ = NULL;
-#line 2534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->lib_dir;
-#line 2534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		app_dirs_set_import_dir (_tmp21_);
-#line 19728 "Dialogs.c"
+#line 19689 "Dialogs.c"
 	}
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->path_formats;
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = self->priv->dir_pattern_combo;
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp24_);
-#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pf = (PreferencesDialogPathFormat*) _tmp25_;
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = pf;
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = _tmp26_->pattern;
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL == _tmp27_) {
-#line 19746 "Dialogs.c"
+#line 19707 "Dialogs.c"
 		ConfigFacade* _tmp28_ = NULL;
 		ConfigFacade* _tmp29_ = NULL;
 		GtkEntry* _tmp30_ = NULL;
@@ -19767,55 +19728,55 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 		const gchar* _tmp32_ = NULL;
 		ConfigFacade* _tmp33_ = NULL;
 		ConfigFacade* _tmp34_ = NULL;
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = config_facade_get_instance ();
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = _tmp28_;
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = self->priv->dir_pattern_entry;
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = gtk_entry_get_text (_tmp30_);
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = _tmp31_;
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp32_);
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp29_);
-#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = config_facade_get_instance ();
-#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = _tmp33_;
-#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), NULL);
-#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp34_);
-#line 19776 "Dialogs.c"
+#line 19737 "Dialogs.c"
 	} else {
 		ConfigFacade* _tmp35_ = NULL;
 		ConfigFacade* _tmp36_ = NULL;
 		PreferencesDialogPathFormat* _tmp37_ = NULL;
 		const gchar* _tmp38_ = NULL;
-#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = config_facade_get_instance ();
-#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = _tmp35_;
-#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp37_ = pf;
-#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp38_ = _tmp37_->pattern;
-#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp38_);
-#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp36_);
-#line 19794 "Dialogs.c"
+#line 19755 "Dialogs.c"
 	}
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (commit_metadata);
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (autoimport);
-#line 19802 "Dialogs.c"
+#line 19763 "Dialogs.c"
 }
 
 
@@ -19824,52 +19785,52 @@ static gboolean preferences_dialog_on_delete (PreferencesDialog* self) {
 	gboolean _tmp0_ = FALSE;
 	GtkDialog* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2545 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_get_allow_closing (self);
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp0_) {
-#line 2547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = TRUE;
-#line 2547 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 19821 "Dialogs.c"
+#line 19782 "Dialogs.c"
 	}
-#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2548 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_commit_on_close (self);
-#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dialog;
-#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_widget_hide_on_delete (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp2_;
-#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19833 "Dialogs.c"
+#line 19794 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_close (PreferencesDialog* self) {
 	gboolean _tmp0_ = FALSE;
 	GtkDialog* _tmp1_ = NULL;
-#line 2553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_get_allow_closing (self);
-#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp0_) {
-#line 2555 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 19848 "Dialogs.c"
+#line 19809 "Dialogs.c"
 	}
-#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dialog;
-#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2558 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_commit_on_close (self);
-#line 19856 "Dialogs.c"
+#line 19817 "Dialogs.c"
 }
 
 
@@ -19878,19 +19839,19 @@ static void preferences_dialog_on_value_changed (PreferencesDialog* self) {
 	gdouble _tmp1_ = 0.0;
 	GtkAdjustment* _tmp2_ = NULL;
 	gdouble _tmp3_ = 0.0;
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2560 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2562 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->bg_color_adjustment;
-#line 2562 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_adjustment_get_upper (_tmp0_);
-#line 2562 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->bg_color_adjustment;
-#line 2562 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_adjustment_get_value (_tmp2_);
-#line 2562 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_set_background_color (self, ((gdouble) (_tmp1_ - _tmp3_)) / 65535.0);
-#line 19877 "Dialogs.c"
+#line 19838 "Dialogs.c"
 }
 
 
@@ -19900,84 +19861,84 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G
 	gboolean _tmp1_ = FALSE;
 	GdkEventButton* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event;
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_->button;
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == ((guint) 1)) {
-#line 19897 "Dialogs.c"
+#line 19858 "Dialogs.c"
 		GdkEventButton* _tmp4_ = NULL;
 		GdkEventType _tmp5_ = 0;
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = event;
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp4_->type;
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp5_ == GDK_BUTTON_PRESS;
-#line 19906 "Dialogs.c"
+#line 19867 "Dialogs.c"
 	} else {
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = FALSE;
-#line 19910 "Dialogs.c"
+#line 19871 "Dialogs.c"
 	}
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 19914 "Dialogs.c"
+#line 19875 "Dialogs.c"
 		GdkEventButton* _tmp6_ = NULL;
 		GdkModifierType _tmp7_ = 0;
 		gboolean _tmp8_ = FALSE;
-#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = event;
-#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_->state;
-#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = has_only_key_modifier (_tmp7_, GDK_CONTROL_MASK);
-#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp8_;
-#line 19926 "Dialogs.c"
+#line 19887 "Dialogs.c"
 	} else {
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 19930 "Dialogs.c"
+#line 19891 "Dialogs.c"
 	}
-#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 19934 "Dialogs.c"
+#line 19895 "Dialogs.c"
 		GtkScale* _tmp9_ = NULL;
 		GtkAdjustment* _tmp10_ = NULL;
 		gdouble _tmp11_ = 0.0;
 		GdkRGBA _tmp12_ = {0};
 		gdouble _tmp13_ = 0.0;
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->bg_color_slider;
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->bg_color_adjustment;
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = gtk_adjustment_get_upper (_tmp10_);
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		parse_color (CONFIG_FACADE_DEFAULT_BG_COLOR, &_tmp12_);
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp12_.red;
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp11_ - (_tmp13_ * 65536.0f));
-#line 2572 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_on_value_changed (self);
-#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = TRUE;
-#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 19958 "Dialogs.c"
+#line 19919 "Dialogs.c"
 	}
-#line 2577 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
-#line 2577 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19964 "Dialogs.c"
+#line 19925 "Dialogs.c"
 }
 
 
@@ -19989,25 +19950,25 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 	gpointer _tmp3_ = NULL;
 	PreferencesDialogPathFormat* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->path_formats;
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dir_pattern_combo;
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp2_);
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pf = (PreferencesDialogPathFormat*) _tmp3_;
-#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = pf;
-#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_->pattern;
-#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL == _tmp5_) {
-#line 19994 "Dialogs.c"
+#line 19955 "Dialogs.c"
 		gchar* dir_pattern = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
@@ -20019,78 +19980,78 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 		const gchar* _tmp14_ = NULL;
 		GtkEntry* _tmp15_ = NULL;
 		GtkEntry* _tmp16_ = NULL;
-#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_;
-#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = _tmp8_;
-#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dir_pattern = _tmp9_;
-#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = dir_pattern;
-#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = is_string_empty (_tmp10_);
-#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp11_) {
-#line 20024 "Dialogs.c"
+#line 19985 "Dialogs.c"
 			gchar* _tmp12_ = NULL;
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = g_strdup ("");
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (dir_pattern);
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			dir_pattern = _tmp12_;
-#line 20032 "Dialogs.c"
+#line 19993 "Dialogs.c"
 		}
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->dir_pattern_entry;
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = dir_pattern;
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_text (_tmp13_, _tmp14_);
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->dir_pattern_entry;
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_set (_tmp15_, "editable", TRUE, NULL);
-#line 2589 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = self->priv->dir_pattern_entry;
-#line 2589 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (dir_pattern);
-#line 20050 "Dialogs.c"
+#line 20011 "Dialogs.c"
 	} else {
 		GtkEntry* _tmp17_ = NULL;
 		PreferencesDialogPathFormat* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
 		GtkEntry* _tmp20_ = NULL;
 		GtkEntry* _tmp21_ = NULL;
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = self->priv->dir_pattern_entry;
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = pf;
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp18_->pattern;
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_text (_tmp17_, _tmp19_);
-#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = self->priv->dir_pattern_entry;
-#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_set (_tmp20_, "editable", FALSE, NULL);
-#line 2593 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->dir_pattern_entry;
-#line 2593 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 20073 "Dialogs.c"
+#line 20034 "Dialogs.c"
 	}
-#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 20077 "Dialogs.c"
+#line 20038 "Dialogs.c"
 }
 
 
@@ -20104,92 +20065,92 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog*
 	gboolean _tmp5_ = FALSE;
 	const gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->example_date;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dir_pattern_entry;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_date_time_format (_tmp0_, _tmp3_);
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	example = _tmp4_;
-#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = example;
-#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = is_string_empty (_tmp6_);
-#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp7_) {
-#line 20111 "Dialogs.c"
+#line 20072 "Dialogs.c"
 		GtkEntry* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->dir_pattern_entry;
-#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gtk_entry_get_text (_tmp8_);
-#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = is_string_empty (_tmp10_);
-#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = !_tmp11_;
-#line 20126 "Dialogs.c"
+#line 20087 "Dialogs.c"
 	} else {
-#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = FALSE;
-#line 20130 "Dialogs.c"
+#line 20091 "Dialogs.c"
 	}
-#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 20134 "Dialogs.c"
+#line 20095 "Dialogs.c"
 		GtkLabel* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		GtkEntry* _tmp14_ = NULL;
 		GtkEntry* _tmp15_ = NULL;
-#line 2601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2600 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->dir_pattern_example;
-#line 2601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2600 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _ ("Invalid pattern");
-#line 2601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2600 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_text (_tmp12_, _tmp13_);
-#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = self->priv->dir_pattern_entry;
-#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_icon_from_icon_name (_tmp14_, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
-#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->dir_pattern_entry;
-#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_icon_activatable (_tmp15_, GTK_ENTRY_ICON_SECONDARY, FALSE);
-#line 2604 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_set_allow_closing (self, FALSE);
-#line 20155 "Dialogs.c"
+#line 20116 "Dialogs.c"
 	} else {
 		GtkLabel* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
 		GtkEntry* _tmp18_ = NULL;
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = self->priv->dir_pattern_example;
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = example;
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2606 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_text (_tmp16_, _tmp17_);
-#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->dir_pattern_entry;
-#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_icon_from_icon_name (_tmp18_, GTK_ENTRY_ICON_SECONDARY, NULL);
-#line 2609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_set_allow_closing (self, TRUE);
-#line 20172 "Dialogs.c"
+#line 20133 "Dialogs.c"
 	}
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (example);
-#line 20176 "Dialogs.c"
+#line 20137 "Dialogs.c"
 }
 
 
@@ -20197,34 +20158,34 @@ static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gbool
 	GtkDialog* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->dialog;
-#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = allow;
-#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_deletable (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_window_get_type (), GtkWindow), _tmp1_);
-#line 2615 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = allow;
-#line 2615 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->allow_closing = _tmp2_;
-#line 20196 "Dialogs.c"
+#line 20157 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2619 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->allow_closing;
-#line 2619 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp0_;
-#line 2619 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20211 "Dialogs.c"
+#line 20172 "Dialogs.c"
 }
 
 
@@ -20233,21 +20194,21 @@ static void preferences_dialog_set_background_color (PreferencesDialog* self, gd
 	ConfigFacade* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
 	GdkRGBA _tmp3_ = {0};
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = bg_color_value;
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_to_grayscale (self, _tmp2_, &_tmp3_);
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	config_facade_set_bg_color (_tmp1_, &_tmp3_);
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20234 "Dialogs.c"
+#line 20195 "Dialogs.c"
 }
 
 
@@ -20256,29 +20217,29 @@ static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble co
 	gdouble _tmp0_ = 0.0;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	memset (&color, 0, sizeof (GdkRGBA));
-#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = color_value;
-#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.red = _tmp0_;
-#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = color_value;
-#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.green = _tmp1_;
-#line 2631 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = color_value;
-#line 2631 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.blue = _tmp2_;
-#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.alpha = 1.0;
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	*result = color;
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return;
-#line 20265 "Dialogs.c"
+#line 20226 "Dialogs.c"
 }
 
 
@@ -20299,77 +20260,77 @@ static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self)
 	gchar* _tmp16_ = NULL;
 	gchar* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2636 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->photo_editor_combo;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->external_photo_apps;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ < _tmp5_) {
-#line 20300 "Dialogs.c"
+#line 20261 "Dialogs.c"
 		GtkComboBox* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->photo_editor_combo;
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp7_;
-#line 20309 "Dialogs.c"
+#line 20270 "Dialogs.c"
 	} else {
 		SortedList* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->external_photo_apps;
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp10_;
-#line 20322 "Dialogs.c"
+#line 20283 "Dialogs.c"
 	}
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	photo_app_choice_index = _tmp0_;
-#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->external_photo_apps;
-#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = sorted_list_get_at (_tmp11_, photo_app_choice_index);
-#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	app = (GAppInfo*) _tmp12_;
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = config_facade_get_instance ();
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = desktop_integration_get_app_open_command (app);
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = _tmp15_;
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp16_);
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp16_);
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = desktop_integration_get_app_open_command (app);
-#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = _tmp17_;
-#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2645: setting external photo editor to: %s", _tmp18_);
-#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_debug ("Dialogs.vala:2644: setting external photo editor to: %s", _tmp18_);
+#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp18_);
-#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2636 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (app);
-#line 20356 "Dialogs.c"
+#line 20317 "Dialogs.c"
 }
 
 
@@ -20388,69 +20349,69 @@ static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) {
 	ConfigFacade* _tmp14_ = NULL;
 	const gchar* _tmp15_ = NULL;
 	const gchar* _tmp16_ = NULL;
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2647 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->raw_editor_combo;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->external_raw_apps;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ < _tmp5_) {
-#line 20389 "Dialogs.c"
+#line 20350 "Dialogs.c"
 		GtkComboBox* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->raw_editor_combo;
-#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
-#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp7_;
-#line 20398 "Dialogs.c"
+#line 20359 "Dialogs.c"
 	} else {
 		SortedList* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->external_raw_apps;
-#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp10_;
-#line 20411 "Dialogs.c"
+#line 20372 "Dialogs.c"
 	}
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	raw_app_choice_index = _tmp0_;
-#line 2652 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->external_raw_apps;
-#line 2652 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = sorted_list_get_at (_tmp11_, raw_app_choice_index);
-#line 2652 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	app = (GAppInfo*) _tmp12_;
-#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = config_facade_get_instance ();
-#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = g_app_info_get_commandline (app);
-#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_);
-#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = g_app_info_get_commandline (app);
-#line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2656: setting external raw editor to: %s", _tmp16_);
-#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_debug ("Dialogs.vala:2655: setting external raw editor to: %s", _tmp16_);
+#line 2647 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (app);
-#line 20437 "Dialogs.c"
+#line 20398 "Dialogs.c"
 }
 
 
@@ -20458,50 +20419,50 @@ static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDial
 	RawDeveloper result = 0;
 	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 2659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), 0);
-#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->default_raw_developer_combo;
-#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == 0) {
-#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = RAW_DEVELOPER_CAMERA;
-#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 20457 "Dialogs.c"
+#line 20418 "Dialogs.c"
 	}
-#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = RAW_DEVELOPER_SHOTWELL;
-#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20463 "Dialogs.c"
+#line 20424 "Dialogs.c"
 }
 
 
 static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d) {
 	RawDeveloper _tmp0_ = 0;
-#line 2665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = d;
-#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == RAW_DEVELOPER_CAMERA) {
-#line 20475 "Dialogs.c"
+#line 20436 "Dialogs.c"
 		GtkComboBoxText* _tmp1_ = NULL;
-#line 2667 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->default_raw_developer_combo;
-#line 2667 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 20481 "Dialogs.c"
+#line 20442 "Dialogs.c"
 	} else {
 		GtkComboBoxText* _tmp2_ = NULL;
-#line 2669 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = self->priv->default_raw_developer_combo;
-#line 2669 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2668 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), 1);
-#line 20488 "Dialogs.c"
+#line 20449 "Dialogs.c"
 	}
 }
 
@@ -20510,60 +20471,60 @@ static void preferences_dialog_on_default_raw_developer_changed (PreferencesDial
 	ConfigFacade* _tmp0_ = NULL;
 	ConfigFacade* _tmp1_ = NULL;
 	RawDeveloper _tmp2_ = 0;
-#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_raw_developer_from_combo (self);
-#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
-#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20509 "Dialogs.c"
+#line 20470 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self) {
 	GtkFileChooserButton* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->library_dir_button;
-#line 2677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 2677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->priv->lib_dir);
-#line 2677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lib_dir = _tmp1_;
-#line 20526 "Dialogs.c"
+#line 20487 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self) {
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_current_folder_changed ((PreferencesDialog*) self);
-#line 20533 "Dialogs.c"
+#line 20494 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_map_event (PreferencesDialog* self) {
 	gboolean result = FALSE;
 	GtkFileChooserButton* _tmp0_ = NULL;
-#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->library_dir_button;
-#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "current-folder-changed", (GCallback) _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed, self);
-#line 2686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 2686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20550 "Dialogs.c"
+#line 20511 "Dialogs.c"
 }
 
 
@@ -20575,31 +20536,31 @@ static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, cons
 	GeeArrayList* _tmp3_ = NULL;
 	GtkComboBoxText* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (name != NULL);
-#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = name;
-#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = pattern;
-#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_path_format_new (_tmp0_, _tmp1_);
-#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pf = _tmp2_;
-#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->path_formats;
-#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), pf);
-#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = self->priv->dir_pattern_combo;
-#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = name;
-#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _tmp5_);
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 20586 "Dialogs.c"
+#line 20547 "Dialogs.c"
 }
 
 
@@ -20608,21 +20569,21 @@ static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) {
 	ConfigFacade* _tmp1_ = NULL;
 	GtkCheckButton* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->lowercase;
-#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
-#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20609 "Dialogs.c"
+#line 20570 "Dialogs.c"
 }
 
 
@@ -20632,246 +20593,246 @@ static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GT
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (PreferencesDialogPathFormat*) g_type_create_instance (object_type);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = name;
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->name);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->name = _tmp1_;
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = pattern;
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->pattern);
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->pattern = _tmp3_;
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 20641 "Dialogs.c"
+#line 20602 "Dialogs.c"
 }
 
 
 static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern) {
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return preferences_dialog_path_format_construct (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, name, pattern);
-#line 20648 "Dialogs.c"
+#line 20609 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_path_format_init (GValue* value) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 20655 "Dialogs.c"
+#line 20616 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_path_format_free_value (GValue* value) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (value->data[0].v_pointer);
-#line 20664 "Dialogs.c"
+#line 20625 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_value_path_format_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = preferences_dialog_path_format_ref (src_value->data[0].v_pointer);
-#line 20674 "Dialogs.c"
+#line 20635 "Dialogs.c"
 	} else {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 20678 "Dialogs.c"
+#line 20639 "Dialogs.c"
 	}
 }
 
 
 static gpointer preferences_dialog_value_path_format_peek_pointer (const GValue* value) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20686 "Dialogs.c"
+#line 20647 "Dialogs.c"
 }
 
 
 static gchar* preferences_dialog_value_path_format_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 20693 "Dialogs.c"
+#line 20654 "Dialogs.c"
 		PreferencesDialogPathFormat* object;
 		object = collect_values[0].v_pointer;
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20700 "Dialogs.c"
+#line 20661 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20704 "Dialogs.c"
+#line 20665 "Dialogs.c"
 		}
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = preferences_dialog_path_format_ref (object);
-#line 20708 "Dialogs.c"
+#line 20669 "Dialogs.c"
 	} else {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20712 "Dialogs.c"
+#line 20673 "Dialogs.c"
 	}
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20716 "Dialogs.c"
+#line 20677 "Dialogs.c"
 }
 
 
 static gchar* preferences_dialog_value_path_format_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PreferencesDialogPathFormat** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 20727 "Dialogs.c"
+#line 20688 "Dialogs.c"
 	}
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 20733 "Dialogs.c"
+#line 20694 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 20737 "Dialogs.c"
+#line 20698 "Dialogs.c"
 	} else {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 20741 "Dialogs.c"
+#line 20702 "Dialogs.c"
 	}
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20745 "Dialogs.c"
+#line 20706 "Dialogs.c"
 }
 
 
 static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PreferencesDialogParamSpecPathFormat* spec;
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 20759 "Dialogs.c"
+#line 20720 "Dialogs.c"
 }
 
 
 static gpointer preferences_dialog_value_get_path_format (const GValue* value) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20768 "Dialogs.c"
+#line 20729 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) {
 	PreferencesDialogPathFormat* old;
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 20788 "Dialogs.c"
+#line 20749 "Dialogs.c"
 	} else {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20792 "Dialogs.c"
+#line 20753 "Dialogs.c"
 	}
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (old);
-#line 20798 "Dialogs.c"
+#line 20759 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) {
 	PreferencesDialogPathFormat* old;
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 20817 "Dialogs.c"
+#line 20778 "Dialogs.c"
 	} else {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20821 "Dialogs.c"
+#line 20782 "Dialogs.c"
 	}
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (old);
-#line 20827 "Dialogs.c"
+#line 20788 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_path_format_class_init (PreferencesDialogPathFormatClass * klass) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_path_format_parent_class = g_type_class_peek_parent (klass);
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((PreferencesDialogPathFormatClass *) klass)->finalize = preferences_dialog_path_format_finalize;
-#line 20837 "Dialogs.c"
+#line 20798 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_instance_init (PreferencesDialogPathFormat * self) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 20844 "Dialogs.c"
+#line 20805 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat* obj) {
 	PreferencesDialogPathFormat * self;
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormat);
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->name);
-#line 2279 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->pattern);
-#line 20858 "Dialogs.c"
+#line 20819 "Dialogs.c"
 }
 
 
@@ -20892,216 +20853,216 @@ static GType preferences_dialog_path_format_get_type (void) {
 static gpointer preferences_dialog_path_format_ref (gpointer instance) {
 	PreferencesDialogPathFormat* self;
 	self = instance;
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 20883 "Dialogs.c"
+#line 20844 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_unref (gpointer instance) {
 	PreferencesDialogPathFormat* self;
 	self = instance;
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		PREFERENCES_DIALOG_PATH_FORMAT_GET_CLASS (self)->finalize (self);
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 20896 "Dialogs.c"
+#line 20857 "Dialogs.c"
 	}
 }
 
 
 static void value_preferences_dialog_init (GValue* value) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 20904 "Dialogs.c"
+#line 20865 "Dialogs.c"
 }
 
 
 static void value_preferences_dialog_free_value (GValue* value) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (value->data[0].v_pointer);
-#line 20913 "Dialogs.c"
+#line 20874 "Dialogs.c"
 	}
 }
 
 
 static void value_preferences_dialog_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = preferences_dialog_ref (src_value->data[0].v_pointer);
-#line 20923 "Dialogs.c"
+#line 20884 "Dialogs.c"
 	} else {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 20927 "Dialogs.c"
+#line 20888 "Dialogs.c"
 	}
 }
 
 
 static gpointer value_preferences_dialog_peek_pointer (const GValue* value) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20935 "Dialogs.c"
+#line 20896 "Dialogs.c"
 }
 
 
 static gchar* value_preferences_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 20942 "Dialogs.c"
+#line 20903 "Dialogs.c"
 		PreferencesDialog* object;
 		object = collect_values[0].v_pointer;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20949 "Dialogs.c"
+#line 20910 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20953 "Dialogs.c"
+#line 20914 "Dialogs.c"
 		}
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = preferences_dialog_ref (object);
-#line 20957 "Dialogs.c"
+#line 20918 "Dialogs.c"
 	} else {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20961 "Dialogs.c"
+#line 20922 "Dialogs.c"
 	}
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20965 "Dialogs.c"
+#line 20926 "Dialogs.c"
 }
 
 
 static gchar* value_preferences_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PreferencesDialog** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 20976 "Dialogs.c"
+#line 20937 "Dialogs.c"
 	}
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 20982 "Dialogs.c"
+#line 20943 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 20986 "Dialogs.c"
+#line 20947 "Dialogs.c"
 	} else {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = preferences_dialog_ref (value->data[0].v_pointer);
-#line 20990 "Dialogs.c"
+#line 20951 "Dialogs.c"
 	}
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20994 "Dialogs.c"
+#line 20955 "Dialogs.c"
 }
 
 
 GParamSpec* param_spec_preferences_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPreferencesDialog* spec;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PREFERENCES_DIALOG), NULL);
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 21008 "Dialogs.c"
+#line 20969 "Dialogs.c"
 }
 
 
 gpointer value_get_preferences_dialog (const GValue* value) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG), NULL);
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 21017 "Dialogs.c"
+#line 20978 "Dialogs.c"
 }
 
 
 void value_set_preferences_dialog (GValue* value, gpointer v_object) {
 	PreferencesDialog* old;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG));
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREFERENCES_DIALOG));
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_ref (value->data[0].v_pointer);
-#line 21037 "Dialogs.c"
+#line 20998 "Dialogs.c"
 	} else {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 21041 "Dialogs.c"
+#line 21002 "Dialogs.c"
 	}
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (old);
-#line 21047 "Dialogs.c"
+#line 21008 "Dialogs.c"
 	}
 }
 
 
 void value_take_preferences_dialog (GValue* value, gpointer v_object) {
 	PreferencesDialog* old;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG));
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREFERENCES_DIALOG));
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 21066 "Dialogs.c"
+#line 21027 "Dialogs.c"
 	} else {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 21070 "Dialogs.c"
+#line 21031 "Dialogs.c"
 	}
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (old);
-#line 21076 "Dialogs.c"
+#line 21037 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_class_init (PreferencesDialogClass * klass) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((PreferencesDialogClass *) klass)->finalize = preferences_dialog_finalize;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (PreferencesDialogPrivate));
-#line 21088 "Dialogs.c"
+#line 21049 "Dialogs.c"
 }
 
 
@@ -21109,73 +21070,73 @@ static void preferences_dialog_instance_init (PreferencesDialog * self) {
 	GeeArrayList* _tmp0_ = NULL;
 	GDateTime* _tmp1_ = NULL;
 	PluginsManifestWidgetMediator* _tmp2_ = NULL;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = PREFERENCES_DIALOG_GET_PRIVATE (self);
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->allow_closing = FALSE;
-#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lib_dir = NULL;
-#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gee_array_list_new (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, (GBoxedCopyFunc) preferences_dialog_path_format_ref, preferences_dialog_path_format_unref, NULL, NULL, NULL);
-#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->path_formats = _tmp0_;
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_date_time_new_local (2009, 3, 10, 18, 16, (gdouble) 11);
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->example_date = _tmp1_;
 #line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->example_date = _tmp1_;
+#line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = plugins_manifest_widget_mediator_new ();
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->plugins_mediator = _tmp2_;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 21116 "Dialogs.c"
+#line 21077 "Dialogs.c"
 }
 
 
 static void preferences_dialog_finalize (PreferencesDialog* obj) {
 	PreferencesDialog * self;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREFERENCES_DIALOG, PreferencesDialog);
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 2284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 2285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 2286 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_adjustment);
-#line 2287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_slider);
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->photo_editor_combo);
-#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->raw_editor_combo);
-#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_raw_apps);
-#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_photo_apps);
-#line 2292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->library_dir_button);
-#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_combo);
-#line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_entry);
-#line 2295 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->dir_pattern_example);
 #line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->dir_pattern_example);
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->priv->lib_dir);
-#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->path_formats);
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_date_time_unref0 (self->priv->example_date);
-#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->lowercase);
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_plugins_manifest_widget_mediator_unref0 (self->priv->plugins_mediator);
-#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->default_raw_developer_combo);
-#line 21162 "Dialogs.c"
+#line 21123 "Dialogs.c"
 }
 
 
@@ -21196,24 +21157,24 @@ GType preferences_dialog_get_type (void) {
 gpointer preferences_dialog_ref (gpointer instance) {
 	PreferencesDialog* self;
 	self = instance;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 21187 "Dialogs.c"
+#line 21148 "Dialogs.c"
 }
 
 
 void preferences_dialog_unref (gpointer instance) {
 	PreferencesDialog* self;
 	self = instance;
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		PREFERENCES_DIALOG_GET_CLASS (self)->finalize (self);
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 21200 "Dialogs.c"
+#line 21161 "Dialogs.c"
 	}
 }
 
@@ -21233,54 +21194,54 @@ GtkResponseType copy_files_dialog (void) {
 	const gchar* _tmp8_ = NULL;
 	GtkResponseType _result_ = 0;
 	gint _tmp9_ = 0;
-#line 2703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Shotwell can copy the photos into your library folder or it can import" \
 " them without copying.");
-#line 2703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp1_;
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", msg);
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp4_);
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp5_;
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("Co_py Photos");
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp6_, (gint) GTK_RESPONSE_ACCEPT);
-#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _ ("_Import in Place");
-#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp7_, (gint) GTK_RESPONSE_REJECT);
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _ ("Import to Library");
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp8_);
-#line 2712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2711 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 2712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2711 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp9_;
-#line 2714 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 21266 "Dialogs.c"
+#line 21227 "Dialogs.c"
 }
 
 
@@ -21291,47 +21252,47 @@ void remove_photos_from_library (GeeCollection* photos) {
 	gint _tmp3_ = 0;
 	GeeCollection* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (photos));
-#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = photos;
-#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gee_collection_get_size (_tmp1_);
-#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == 1) {
-#line 21287 "Dialogs.c"
+#line 21248 "Dialogs.c"
 		const gchar* _tmp4_ = NULL;
-#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _ ("Removing Photo From Library");
-#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_;
-#line 21293 "Dialogs.c"
+#line 21254 "Dialogs.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
-#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _ ("Removing Photos From Library");
-#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp5_;
-#line 21300 "Dialogs.c"
+#line 21261 "Dialogs.c"
 	}
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = photos;
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _ ("Remove From Library");
-#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remove_from_app (_tmp6_, _tmp7_, _tmp0_);
-#line 21308 "Dialogs.c"
+#line 21269 "Dialogs.c"
 }
 
 
 static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
 	gboolean result;
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 21317 "Dialogs.c"
+#line 21278 "Dialogs.c"
 }
 
 
@@ -21402,71 +21363,71 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 	ProgressDialog* _tmp122_ = NULL;
 	AppWindow* _tmp124_ = NULL;
 	AppWindow* _tmp125_ = NULL;
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (dialog_title != NULL);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (progress_dialog_text != NULL);
-#line 2726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = sources;
-#line 2726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 2726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 2726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ == 0) {
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 21404 "Dialogs.c"
+#line 21365 "Dialogs.c"
 	}
-#line 2729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	photos = _tmp3_;
-#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	videos = _tmp4_;
-#line 2731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = sources;
-#line 2731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = photos;
-#line 2731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = videos;
-#line 2731 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_filter_media (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	user_message = NULL;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = photos;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp11_) {
-#line 21432 "Dialogs.c"
+#line 21393 "Dialogs.c"
 		GeeArrayList* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = videos;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _tmp13_;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = !_tmp14_;
-#line 21444 "Dialogs.c"
+#line 21405 "Dialogs.c"
 	} else {
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = FALSE;
-#line 21448 "Dialogs.c"
+#line 21409 "Dialogs.c"
 	}
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_) {
-#line 21452 "Dialogs.c"
+#line 21413 "Dialogs.c"
 		GeeCollection* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
 		gint _tmp17_ = 0;
@@ -21475,13 +21436,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		gint _tmp20_ = 0;
 		gint _tmp21_ = 0;
 		gchar* _tmp22_ = NULL;
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = sources;
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = gee_collection_get_size (_tmp15_);
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_;
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = ngettext ("This will remove the photo/video from your Shotwell library. Would you" \
 " also like to move the file to your desktop trash?\n" \
 "\n" \
@@ -21489,32 +21450,32 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 "u also like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp17_);
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = sources;
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = gee_collection_get_size (_tmp19_);
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _tmp20_;
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = g_strdup_printf (_tmp18_, _tmp21_);
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (user_message);
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		user_message = _tmp22_;
-#line 21481 "Dialogs.c"
+#line 21442 "Dialogs.c"
 	} else {
 		GeeArrayList* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
 		gboolean _tmp25_ = FALSE;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = videos;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = _tmp24_;
-#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (!_tmp25_) {
-#line 21494 "Dialogs.c"
+#line 21455 "Dialogs.c"
 			GeeCollection* _tmp26_ = NULL;
 			gint _tmp27_ = 0;
 			gint _tmp28_ = 0;
@@ -21523,13 +21484,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp31_ = 0;
 			gint _tmp32_ = 0;
 			gchar* _tmp33_ = NULL;
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = sources;
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = gee_collection_get_size (_tmp26_);
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = _tmp27_;
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = ngettext ("This will remove the video from your Shotwell library. Would you also " \
 "like to move the file to your desktop trash?\n" \
 "\n" \
@@ -21537,19 +21498,19 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 "like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp28_);
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = sources;
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = gee_collection_get_size (_tmp30_);
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp32_ = _tmp31_;
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp33_ = g_strdup_printf (_tmp29_, _tmp32_);
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (user_message);
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			user_message = _tmp33_;
-#line 21523 "Dialogs.c"
+#line 21484 "Dialogs.c"
 		} else {
 			GeeCollection* _tmp34_ = NULL;
 			gint _tmp35_ = 0;
@@ -21559,13 +21520,13 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp39_ = 0;
 			gint _tmp40_ = 0;
 			gchar* _tmp41_ = NULL;
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp34_ = sources;
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp35_ = gee_collection_get_size (_tmp34_);
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp36_ = _tmp35_;
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp37_ = ngettext ("This will remove the photo from your Shotwell library. Would you also " \
 "like to move the file to your desktop trash?\n" \
 "\n" \
@@ -21573,208 +21534,208 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 "like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp36_);
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp38_ = sources;
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp39_ = gee_collection_get_size (_tmp38_);
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp40_ = _tmp39_;
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp41_ = g_strdup_printf (_tmp37_, _tmp40_);
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (user_message);
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			user_message = _tmp41_;
-#line 21553 "Dialogs.c"
+#line 21514 "Dialogs.c"
 		}
 	}
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = app_window_get_instance ();
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = _tmp42_;
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = dialog_title;
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = user_message;
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = sources;
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = gee_collection_get_size (_tmp46_);
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp48_ = _tmp47_;
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = remove_from_library_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_window_get_type (), GtkWindow), _tmp44_, _tmp45_, _tmp48_);
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = _tmp49_;
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp43_);
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2747 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = _tmp50_;
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = _result_;
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp52_ != GTK_RESPONSE_YES) {
-#line 21582 "Dialogs.c"
+#line 21543 "Dialogs.c"
 		GtkResponseType _tmp53_ = 0;
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp53_ = _result_;
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = _tmp53_ != GTK_RESPONSE_NO;
-#line 21588 "Dialogs.c"
+#line 21549 "Dialogs.c"
 	} else {
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = FALSE;
-#line 21592 "Dialogs.c"
+#line 21553 "Dialogs.c"
 	}
-#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp51_) {
-#line 2751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (user_message);
-#line 2751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (videos);
-#line 2751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (photos);
-#line 2751 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 21604 "Dialogs.c"
+#line 21565 "Dialogs.c"
 	}
-#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = _result_;
-#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	delete_backing = _tmp54_ == GTK_RESPONSE_YES;
-#line 2755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = app_window_get_instance ();
-#line 2755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp56_ = _tmp55_;
-#line 2755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2754 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp56_);
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress = NULL;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor = NULL;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target = NULL;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target_destroy_notify = NULL;
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp57_ = sources;
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp58_ = gee_collection_get_size (_tmp57_);
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp59_ = _tmp58_;
-#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp59_ >= 20) {
-#line 21634 "Dialogs.c"
+#line 21595 "Dialogs.c"
 		AppWindow* _tmp60_ = NULL;
 		AppWindow* _tmp61_ = NULL;
 		const gchar* _tmp62_ = NULL;
 		ProgressDialog* _tmp63_ = NULL;
 		ProgressDialog* _tmp64_ = NULL;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp60_ = app_window_get_instance ();
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp61_ = _tmp60_;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp62_ = progress_dialog_text;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp63_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_window_get_type (), GtkWindow), _tmp62_, NULL);
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp63_);
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (progress);
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress = _tmp63_;
-#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp61_);
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp64_ = progress;
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor = NULL;
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target = NULL;
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target_destroy_notify = NULL;
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor = _progress_dialog_monitor_progress_monitor;
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target = g_object_ref (_tmp64_);
-#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 21672 "Dialogs.c"
+#line 21633 "Dialogs.c"
 	}
-#line 2764 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp65_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2764 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	not_removed_photos = _tmp65_;
-#line 2765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2764 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp66_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2764 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	not_removed_videos = _tmp66_;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = library_photo_global;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = photos;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp69_ = delete_backing;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70_ = monitor;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70__target = monitor_target;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp71_ = not_removed_photos;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection), _tmp69_, _tmp70_, _tmp70__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_LIST, GeeList));
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72_ = video_global;
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = videos;
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = delete_backing;
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75_ = monitor;
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75__target = monitor_target;
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp76_ = not_removed_videos;
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_COLLECTION, GeeCollection), _tmp74_, _tmp75_, _tmp75__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_LIST, GeeList));
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp77_ = not_removed_photos;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp78_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp79_ = _tmp78_;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp80_ = not_removed_videos;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp81_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp82_ = _tmp81_;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	num_not_removed = _tmp79_ + _tmp82_;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp84_ = delete_backing;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp84_) {
-#line 21728 "Dialogs.c"
+#line 21689 "Dialogs.c"
 		gint _tmp85_ = 0;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = num_not_removed;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = _tmp85_ > 0;
-#line 21734 "Dialogs.c"
+#line 21695 "Dialogs.c"
 	} else {
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = FALSE;
-#line 21738 "Dialogs.c"
+#line 21699 "Dialogs.c"
 	}
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp83_) {
-#line 21742 "Dialogs.c"
+#line 21703 "Dialogs.c"
 		gchar* not_deleted_message = NULL;
 		gint _tmp86_ = 0;
 		const gchar* _tmp87_ = NULL;
@@ -21788,39 +21749,39 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		GtkResponseType _tmp94_ = 0;
 		GtkResponseType _tmp95_ = 0;
 		GtkResponseType _tmp96_ = 0;
-#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp86_ = num_not_removed;
-#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp87_ = ngettext ("The photo or video cannot be moved to your desktop trash. Delete this " \
 "file?", "%d photos/videos cannot be moved to your desktop trash. Delete these f" \
 "iles?", (gulong) _tmp86_);
-#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp88_ = num_not_removed;
-#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp89_ = g_strdup_printf (_tmp87_, _tmp88_);
-#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		not_deleted_message = _tmp89_;
-#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp90_ = app_window_get_instance ();
-#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp91_ = _tmp90_;
-#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = dialog_title;
-#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp93_ = not_deleted_message;
-#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp94_ = remove_from_filesystem_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_window_get_type (), GtkWindow), _tmp92_, _tmp93_);
-#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp95_ = _tmp94_;
-#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp91_);
-#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result_delete = _tmp95_;
-#line 2781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp96_ = result_delete;
-#line 2781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (GTK_RESPONSE_YES == _tmp96_) {
-#line 21786 "Dialogs.c"
+#line 21747 "Dialogs.c"
 			GeeArrayList* not_deleted_photos = NULL;
 			GeeArrayList* _tmp97_ = NULL;
 			GeeArrayList* not_deleted_videos = NULL;
@@ -21843,57 +21804,57 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp111_ = 0;
 			gint _tmp112_ = 0;
 			gint _tmp113_ = 0;
-#line 2783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2782 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp97_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2782 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			not_deleted_photos = _tmp97_;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp98_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			not_deleted_videos = _tmp98_;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp99_ = library_photo_global;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp100_ = not_removed_photos;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp101_ = monitor;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp101__target = monitor_target;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp102_ = not_deleted_photos;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection), _tmp101_, _tmp101__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GEE_TYPE_LIST, GeeList));
-#line 2786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp103_ = video_global;
-#line 2786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp104_ = not_removed_videos;
-#line 2786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp105_ = monitor;
-#line 2786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp105__target = monitor_target;
-#line 2786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp106_ = not_deleted_videos;
-#line 2786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_COLLECTION, GeeCollection), _tmp105_, _tmp105__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_LIST, GeeList));
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp107_ = not_deleted_photos;
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp109_ = _tmp108_;
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp110_ = not_deleted_videos;
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp111_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp112_ = _tmp111_;
-#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			num_not_deleted = _tmp109_ + _tmp112_;
-#line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp113_ = num_not_deleted;
-#line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp113_ > 0) {
-#line 21859 "Dialogs.c"
+#line 21820 "Dialogs.c"
 				gchar* delete_failed_message = NULL;
 				gint _tmp114_ = 0;
 				const gchar* _tmp115_ = NULL;
@@ -21903,83 +21864,83 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 				const gchar* _tmp119_ = NULL;
 				AppWindow* _tmp120_ = NULL;
 				AppWindow* _tmp121_ = NULL;
-#line 2791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp114_ = num_not_deleted;
-#line 2791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp115_ = ngettext ("The photo or video cannot be deleted.", "%d photos/videos cannot be deleted.", (gulong) _tmp114_);
-#line 2791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp116_ = num_not_deleted;
-#line 2791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp117_ = g_strdup_printf (_tmp115_, _tmp116_);
-#line 2791 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				delete_failed_message = _tmp117_;
-#line 2795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp118_ = dialog_title;
-#line 2795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp119_ = delete_failed_message;
-#line 2795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp120_ = app_window_get_instance ();
-#line 2795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp121_ = _tmp120_;
-#line 2795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				app_window_error_message_with_title (_tmp118_, _tmp119_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_window_get_type (), GtkWindow), TRUE);
-#line 2795 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp121_);
-#line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (delete_failed_message);
-#line 21893 "Dialogs.c"
+#line 21854 "Dialogs.c"
 			}
-#line 2781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (not_deleted_videos);
-#line 2781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2780 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (not_deleted_photos);
-#line 21899 "Dialogs.c"
+#line 21860 "Dialogs.c"
 		}
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (not_deleted_message);
-#line 21903 "Dialogs.c"
+#line 21864 "Dialogs.c"
 	}
-#line 2800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2799 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp122_ = progress;
-#line 2800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2799 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp122_ != NULL) {
-#line 21909 "Dialogs.c"
+#line 21870 "Dialogs.c"
 		ProgressDialog* _tmp123_ = NULL;
-#line 2801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = progress;
-#line 2801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress_dialog_close (_tmp123_);
-#line 21915 "Dialogs.c"
+#line 21876 "Dialogs.c"
 	}
-#line 2803 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp124_ = app_window_get_instance ();
-#line 2803 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp125_ = _tmp124_;
-#line 2803 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2803 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp125_);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (not_removed_videos);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (not_removed_photos);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor = NULL;
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target = NULL;
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target_destroy_notify = NULL;
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (progress);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (user_message);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (videos);
-#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (photos);
-#line 21945 "Dialogs.c"
+#line 21906 "Dialogs.c"
 }
 
 
diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index 01caced..ffeb9d5 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -1207,7 +1207,6 @@ public class TextEntryDialog : Gtk.Dialog {
     private Gtk.Builder builder;
     private Gtk.Button button1;
     private Gtk.Button button2;
-    private Gtk.ButtonBox action_area_box;
     
     public TextEntryDialog() {
         bool use_header;
@@ -1235,9 +1234,6 @@ public class TextEntryDialog : Gtk.Dialog {
         entry.grab_focus();
         entry.changed.connect(on_entry_changed);
         
-        action_area_box = (Gtk.ButtonBox) get_action_area();
-        action_area_box.set_layout(Gtk.ButtonBoxStyle.END);
-        
         button1 = (Gtk.Button) add_button(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
         button2 = (Gtk.Button) add_button(Resources.SAVE_LABEL, Gtk.ResponseType.OK);
         set_default_response(Gtk.ResponseType.OK);
@@ -1249,7 +1245,6 @@ public class TextEntryDialog : Gtk.Dialog {
         }
         
         set_default_response(Gtk.ResponseType.OK);
-        set_has_resize_grip(false);
     }
 
     public string? execute() {
@@ -1282,7 +1277,6 @@ public class MultiTextEntryDialog : Gtk.Dialog {
     private Gtk.Builder builder;
     private Gtk.Button button1;
     private Gtk.Button button2;
-    private Gtk.ButtonBox action_area_box;
     
     public MultiTextEntryDialog() {
         bool use_header;
@@ -1309,14 +1303,9 @@ public class MultiTextEntryDialog : Gtk.Dialog {
         
         entry.grab_focus();
         
-        action_area_box = (Gtk.ButtonBox) get_action_area();
-        action_area_box.set_layout(Gtk.ButtonBoxStyle.END);
-        
         button1 = (Gtk.Button) add_button(Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL);
         button2 = (Gtk.Button) add_button(Resources.SAVE_LABEL, Gtk.ResponseType.OK);
         set_default_response(Gtk.ResponseType.OK);
-        
-        set_has_resize_grip(true);
     }
         
     public string? execute() {
@@ -1513,18 +1502,23 @@ public class ProgressDialog : Gtk.Window {
         
         Gtk.Label primary_text_label = new Gtk.Label("");
         primary_text_label.set_markup("<span weight=\"bold\">%s</span>".printf(text));
-        primary_text_label.set_alignment(0, 0.5f);
+        primary_text_label.xalign = 0.0f;
+        primary_text_label.yalign = 0.5f;
 
         Gtk.Box vbox = new Gtk.Box(Gtk.Orientation.VERTICAL, 12);
         vbox.pack_start(primary_text_label, false, false, 0);
         vbox.pack_start(hbox, true, false, 0);
+        vbox.halign = Gtk.Align.CENTER;
+        vbox.valign = Gtk.Align.CENTER;
+        vbox.hexpand = true;
+        vbox.vexpand = true;
+        vbox.margin_start = 12;
+        vbox.margin_end = 12;
+        vbox.margin_top = 12;
+        vbox.margin_bottom = 12;
+
+        add(vbox);
 
-        Gtk.Alignment alignment = new Gtk.Alignment(0.5f, 0.5f, 1.0f, 1.0f);
-        alignment.set_padding(12, 12, 12, 12);
-        alignment.add(vbox);
-        
-        add(alignment);
-        
         time_started = now_ms();
     }
     
@@ -1738,11 +1732,12 @@ public class AdjustDateTimeDialog : Gtk.Dialog {
         batch_radio_button.toggled.connect(on_time_changed);
 
         if (contains_video) {
-            modify_originals_check_button = new Gtk.CheckButton.with_mnemonic((photo_count == 1) ?
-                _("_Modify original photo file") : _("_Modify original photo files"));
+            var text = ngettext ("_Modify original photo file", "_Modify original photo files",
+                                 photo_count);
+            modify_originals_check_button = new Gtk.CheckButton.with_mnemonic(text);
         } else {
-            modify_originals_check_button = new Gtk.CheckButton.with_mnemonic((photo_count == 1) ?
-                _("_Modify original file") : _("_Modify original files"));
+            var text = ngettext ("_Modify original file", "_Modify original files", photo_count);
+            modify_originals_check_button = new Gtk.CheckButton.with_mnemonic(text);
         }
 
         modify_originals_check_button.set_active(Config.Facade.get_instance().get_commit_metadata_to_masters() &&
@@ -1782,11 +1777,12 @@ public class AdjustDateTimeDialog : Gtk.Dialog {
         hbox.set_border_width(3);
         hbox.pack_start(image_content, true, false, 0);
         hbox.pack_start(time_content, true, false, 0);
+        hbox.halign = Gtk.Align.CENTER;
+        hbox.valign = Gtk.Align.CENTER;
+        hbox.hexpand = false;
+        hbox.vexpand = false;
 
-        Gtk.Alignment hbox_alignment = new Gtk.Alignment(0.5f, 0.5f, 0, 0);
-        hbox_alignment.add(hbox);
-
-        ((Gtk.Box) get_content_area()).pack_start(hbox_alignment, true, false, 0);
+        ((Gtk.Box) get_content_area()).pack_start(hbox, true, false, 0);
 
         notification = new Gtk.Label("");
         notification.set_line_wrap(true);
@@ -2108,11 +2104,13 @@ public class WelcomeDialog : Gtk.Dialog {
         Gtk.Label primary_text = new Gtk.Label("");
         primary_text.set_markup(
             "<span size=\"large\" weight=\"bold\">%s</span>".printf(_("Welcome to Shotwell!")));
-        primary_text.set_alignment(0, 0.5f);
+        primary_text.xalign = 0.0f;
+        primary_text.yalign = 0.5f;
         secondary_text = new Gtk.Label("");
         secondary_text.set_markup("<span weight=\"normal\">%s</span>".printf(
             _("To get started, import photos in any of these ways:")));
-        secondary_text.set_alignment(0, 0.5f);
+        secondary_text.xalign = 0.0f;
+        secondary_text.yalign = 0.5f;
         var image = new Gtk.Image.from_icon_name ("shotwell", Gtk.IconSize.DIALOG);
         
         Gtk.Box header_text = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
@@ -2133,7 +2131,8 @@ public class WelcomeDialog : Gtk.Dialog {
             _("Choose <span weight=\"bold\">File %s Import From Folder</span>").printf(arrow_glyph),
             _("Drag and drop photos onto the Shotwell window"),
             _("Connect a camera to your computer and import")));
-        instructions.set_alignment(0, 0.5f);
+        instructions.xalign = 0.0f;
+        instructions.yalign = 0.5f;
         
         import_action_checkbox_packer = new Gtk.Box(Gtk.Orientation.VERTICAL, 2);
         
@@ -2150,7 +2149,8 @@ public class WelcomeDialog : Gtk.Dialog {
         
         instruction_header = new Gtk.Label(
             _("You can also import photos in any of these ways:"));
-        instruction_header.set_alignment(0.0f, 0.5f);
+        instruction_header.xalign = 0.0f;
+        instruction_header.yalign = 0.5f;
         instruction_header.set_margin_top(20);
         
         Gtk.Box content = new Gtk.Box(Gtk.Orientation.VERTICAL, 16);
@@ -2162,19 +2162,21 @@ public class WelcomeDialog : Gtk.Dialog {
         hide_button = new Gtk.CheckButton.with_mnemonic(_("_Don’t show this message again"));
         hide_button.set_active(true);
         content.pack_start(hide_button, false, false, 6);
-        
-        Gtk.Alignment alignment = new Gtk.Alignment(0, 0, 0, 0);
-        alignment.set_padding(12, 0, 12, 12);
-        alignment.add(content);
+        content.halign = Gtk.Align.FILL;
+        content.valign = Gtk.Align.FILL;
+        content.hexpand = false;
+        content.vexpand = false;
+        content.margin_top = 12;
+        content.margin_bottom = 0;
+        content.margin_start = 12;
+        content.margin_end = 12;
 
-        ((Gtk.Box) get_content_area()).pack_start(alignment, false, false, 0);
+        ((Gtk.Box) get_content_area()).pack_start(content, false, false, 0);
 
-        set_has_resize_grip(false);
-        
         ok_button.grab_focus();
-        
+
         install_import_content();
-        
+
         import_meta_host.start();
     }
 
@@ -2315,7 +2317,6 @@ public class PreferencesDialog {
         dialog.set_transient_for(AppWindow.get_instance());
         dialog.delete_event.connect(on_delete);
         dialog.response.connect(on_close);
-        dialog.set_has_resize_grip(false);
         
         bg_color_adjustment = builder.get_object("bg_color_adjustment") as Gtk.Adjustment;
         bg_color_adjustment.set_value(bg_color_adjustment.get_upper() - 
@@ -2349,9 +2350,7 @@ public class PreferencesDialog {
             pattern_help.activate_link.connect(on_local_pattern_help);
         }
         
-        dir_pattern_combo = new Gtk.ComboBoxText();
-        Gtk.Alignment dir_choser_align = builder.get_object("dir choser") as Gtk.Alignment;
-        dir_choser_align.add(dir_pattern_combo);
+        dir_pattern_combo = builder.get_object("dir choser") as Gtk.ComboBoxText;
         dir_pattern_entry = builder.get_object("dir_pattern_entry") as Gtk.Entry;
         dir_pattern_example = builder.get_object("dynamic example") as Gtk.Label;
         add_to_dir_formats(_("Year%sMonth%sDay").printf(Path.DIR_SEPARATOR_S, Path.DIR_SEPARATOR_S), 
@@ -2370,9 +2369,9 @@ public class PreferencesDialog {
         lowercase = builder.get_object("lowercase") as Gtk.CheckButton;
         lowercase.toggled.connect(on_lowercase_toggled);
         
-        Gtk.Bin plugin_manifest_container = builder.get_object("plugin-manifest-bin") as Gtk.Bin;
-        plugin_manifest_container.add(plugins_mediator.widget);
-        
+        var notebook = builder.get_object("preferences-notebook") as Gtk.Notebook;
+        (notebook.get_nth_page (2) as Gtk.Container).add (plugins_mediator.widget);
+
         populate_preference_options();
 
         photo_editor_combo.changed.connect(on_photo_editor_changed);
diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c
index f145214..de6ff94 100644
--- a/src/DirectoryMonitor.c
+++ b/src/DirectoryMonitor.c
@@ -3785,7 +3785,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 3784 "DirectoryMonitor.c"
-				goto __catch482_g_error;
+				goto __catch479_g_error;
 			}
 #line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp15_ = NULL;
@@ -3801,8 +3801,8 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 			_g_object_unref0 (_data_->_tmp11_);
 #line 3799 "DirectoryMonitor.c"
 		}
-		goto __finally482;
-		__catch482_g_error:
+		goto __finally479;
+		__catch479_g_error:
 		{
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->err = _data_->_inner_error_;
@@ -3858,7 +3858,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 			return FALSE;
 #line 3856 "DirectoryMonitor.c"
 		}
-		__finally482:
+		__finally479:
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4089,7 +4089,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 4088 "DirectoryMonitor.c"
-			goto __catch483_g_error;
+			goto __catch480_g_error;
 		}
 		{
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4129,7 +4129,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_g_object_unref0 (_data_->enumerator);
 #line 4128 "DirectoryMonitor.c"
-					goto __catch483_g_error;
+					goto __catch480_g_error;
 				}
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp55_ = NULL;
@@ -4371,8 +4371,8 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 		_g_object_unref0 (_data_->enumerator);
 #line 4369 "DirectoryMonitor.c"
 	}
-	goto __finally483;
-	__catch483_g_error:
+	goto __finally480;
+	__catch480_g_error:
 	{
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->err2 = _data_->_inner_error_;
@@ -4432,7 +4432,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 		return FALSE;
 #line 4430 "DirectoryMonitor.c"
 	}
-	__finally483:
+	__finally480:
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5058,7 +5058,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 #line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5057 "DirectoryMonitor.c"
-			goto __catch484_g_error;
+			goto __catch481_g_error;
 		}
 #line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp12_ = _tmp9_;
@@ -5072,8 +5072,8 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		_g_object_unref0 (_tmp9_);
 #line 5070 "DirectoryMonitor.c"
 	}
-	goto __finally484;
-	__catch484_g_error:
+	goto __finally481;
+	__catch481_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp13_ = NULL;
@@ -5111,7 +5111,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		return result;
 #line 5109 "DirectoryMonitor.c"
 	}
-	__finally484:
+	__finally481:
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7557,7 +7557,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7554 "DirectoryMonitor.c"
-			goto __catch485_g_error;
+			goto __catch482_g_error;
 		}
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp5_ = _tmp2_;
@@ -7571,8 +7571,8 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		_g_object_unref0 (_tmp2_);
 #line 7567 "DirectoryMonitor.c"
 	}
-	goto __finally485;
-	__catch485_g_error:
+	goto __finally482;
+	__catch482_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -7593,7 +7593,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		_g_error_free0 (err);
 #line 7589 "DirectoryMonitor.c"
 	}
-	__finally485:
+	__finally482:
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8696,7 +8696,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 #line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8693 "DirectoryMonitor.c"
-			goto __catch486_g_error;
+			goto __catch483_g_error;
 		}
 #line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp7_ = _tmp3_;
@@ -8710,8 +8710,8 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		_g_object_unref0 (_tmp3_);
 #line 8706 "DirectoryMonitor.c"
 	}
-	goto __finally486;
-	__catch486_g_error:
+	goto __finally483;
+	__catch483_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp8_ = NULL;
@@ -8747,7 +8747,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		return result;
 #line 8743 "DirectoryMonitor.c"
 	}
-	__finally486:
+	__finally483:
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
diff --git a/src/Event.c b/src/Event.c
index 53cab01..b83831b 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -3752,7 +3752,7 @@ Event* event_create_empty_event (MediaSource* source) {
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3755 "Event.c"
-				goto __catch437_database_error;
+				goto __catch434_database_error;
 			}
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3790,8 +3790,8 @@ Event* event_create_empty_event (MediaSource* source) {
 		return result;
 #line 3792 "Event.c"
 	}
-	goto __finally437;
-	__catch437_database_error:
+	goto __finally434;
+	__catch434_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp14_ = NULL;
@@ -3811,7 +3811,7 @@ Event* event_create_empty_event (MediaSource* source) {
 		return result;
 #line 3813 "Event.c"
 	}
-	__finally437:
+	__finally434:
 #line 475 "/home/jens/Source/shotwell/src/Event.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 475 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4020,11 +4020,11 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 #line 526 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4023 "Event.c"
-			goto __catch438_g_error;
+			goto __catch435_g_error;
 		}
 	}
-	goto __finally438;
-	__catch438_g_error:
+	goto __finally435;
+	__catch435_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -4051,7 +4051,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		_g_error_free0 (err);
 #line 4053 "Event.c"
 	}
-	__finally438:
+	__finally435:
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4081,11 +4081,11 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 #line 532 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4084 "Event.c"
-			goto __catch439_g_error;
+			goto __catch436_g_error;
 		}
 	}
-	goto __finally439;
-	__catch439_g_error:
+	goto __finally436;
+	__catch436_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
@@ -4112,7 +4112,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		_g_error_free0 (err);
 #line 4114 "Event.c"
 	}
-	__finally439:
+	__finally436:
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4198,11 +4198,11 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 #line 556 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4201 "Event.c"
-			goto __catch440_g_error;
+			goto __catch437_g_error;
 		}
 	}
-	goto __finally440;
-	__catch440_g_error:
+	goto __finally437;
+	__catch437_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -4229,7 +4229,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		_g_error_free0 (err);
 #line 4231 "Event.c"
 	}
-	__finally440:
+	__finally437:
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4259,11 +4259,11 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 #line 562 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4262 "Event.c"
-			goto __catch441_g_error;
+			goto __catch438_g_error;
 		}
 	}
-	goto __finally441;
-	__catch441_g_error:
+	goto __finally438;
+	__catch438_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
@@ -4290,7 +4290,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		_g_error_free0 (err);
 #line 4292 "Event.c"
 	}
-	__finally441:
+	__finally438:
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5324,7 +5324,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 #line 658 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5326 "Event.c"
-				goto __catch442_database_error;
+				goto __catch439_database_error;
 			}
 #line 658 "/home/jens/Source/shotwell/src/Event.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5381,8 +5381,8 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		return result;
 #line 5382 "Event.c"
 	}
-	goto __finally442;
-	__catch442_database_error:
+	goto __finally439;
+	__catch439_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp49_ = NULL;
@@ -5398,7 +5398,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		_g_error_free0 (err);
 #line 5399 "Event.c"
 	}
-	__finally442:
+	__finally439:
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6904,7 +6904,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 #line 903 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6906 "Event.c"
-			goto __catch443_g_error;
+			goto __catch440_g_error;
 		}
 #line 903 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp6_ = _tmp0_;
@@ -6918,8 +6918,8 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 		return result;
 #line 6919 "Event.c"
 	}
-	goto __finally443;
-	__catch443_g_error:
+	goto __finally440;
+	__catch440_g_error:
 	{
 		GError* err = NULL;
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6934,7 +6934,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 		return result;
 #line 6935 "Event.c"
 	}
-	__finally443:
+	__finally440:
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6976,7 +6976,7 @@ static void event_real_destroy (DataSource* base) {
 #line 915 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6978 "Event.c"
-				goto __catch444_database_error;
+				goto __catch441_database_error;
 			}
 #line 915 "/home/jens/Source/shotwell/src/Event.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6987,8 +6987,8 @@ static void event_real_destroy (DataSource* base) {
 #line 6987 "Event.c"
 		}
 	}
-	goto __finally444;
-	__catch444_database_error:
+	goto __finally441;
+	__catch441_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7004,7 +7004,7 @@ static void event_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 7005 "Event.c"
 	}
-	__finally444:
+	__finally441:
 #line 914 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 914 "/home/jens/Source/shotwell/src/Event.vala"
diff --git a/src/Exporter.c b/src/Exporter.c
index e889635..bba2455 100644
--- a/src/Exporter.c
+++ b/src/Exporter.c
@@ -442,10 +442,10 @@ GType background_job_get_type (void) G_GNUC_CONST;
 static void exporter_on_exported (Exporter* self, BackgroundJob* j);
 static GType exporter_export_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType background_job_job_priority_get_type (void) G_GNUC_CONST;
-static void _vala_array_add294 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add128 (GFile*** array, int* length, int* size, GFile* value);
 static void exporter_on_export_cancelled (Exporter* self, BackgroundJob* j);
 GFile** exporter_get_exported_files (Exporter* self, int* result_length1);
-static GFile** _vala_array_dup31 (GFile** self, int length);
+static GFile** _vala_array_dup30 (GFile** self, int length);
 GType photo_source_get_type (void) G_GNUC_CONST;
 GType photo_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params);
@@ -453,7 +453,7 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 GType video_source_get_type (void) G_GNUC_CONST;
 GType video_get_type (void) G_GNUC_CONST;
 gchar* media_source_get_basename (MediaSource* self);
-static void _vala_array_add295 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add129 (GFile*** array, int* length, int* size, GFile* value);
 GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error);
 GFile* app_dirs_get_temp_dir (void);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
@@ -879,7 +879,7 @@ static gpointer _background_job_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add294 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add128 (GFile*** array, int* length, int* size, GFile* value) {
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if ((*length) == (*size)) {
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1084,7 +1084,7 @@ static void exporter_on_exported (Exporter* self, BackgroundJob* j) {
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
 			_tmp35_ = _g_object_ref0 (_tmp34_);
 #line 177 "/home/jens/Source/shotwell/src/Exporter.vala"
-			_vala_array_add294 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp35_);
+			_vala_array_add128 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp35_);
 #line 1089 "Exporter.c"
 		}
 	}
@@ -1133,7 +1133,7 @@ static void exporter_on_export_cancelled (Exporter* self, BackgroundJob* j) {
 }
 
 
-static GFile** _vala_array_dup31 (GFile** self, int length) {
+static GFile** _vala_array_dup30 (GFile** self, int length) {
 	GFile** result;
 	int i;
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1169,7 +1169,7 @@ GFile** exporter_get_exported_files (Exporter* self, int* result_length1) {
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp0__length1 = self->priv->exported_files_length1;
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup31 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
+	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup30 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp1__length1 = _tmp0__length1;
 #line 191 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1190,7 +1190,7 @@ GFile** exporter_get_exported_files (Exporter* self, int* result_length1) {
 }
 
 
-static void _vala_array_add295 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add129 (GFile*** array, int* length, int* size, GFile* value) {
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if ((*length) == (*size)) {
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1372,7 +1372,7 @@ static gboolean exporter_process_queue (Exporter* self) {
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
 				_tmp23_ = _g_object_ref0 (_tmp22_);
 #line 210 "/home/jens/Source/shotwell/src/Exporter.vala"
-				_vala_array_add295 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp23_);
+				_vala_array_add129 (&self->priv->exported_files, &self->priv->exported_files_length1, &self->priv->_exported_files_size_, _tmp23_);
 #line 212 "/home/jens/Source/shotwell/src/Exporter.vala"
 				_tmp24_ = self->priv->completed_count;
 #line 212 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -1480,7 +1480,7 @@ static gboolean exporter_process_queue (Exporter* self) {
 #line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1483 "Exporter.c"
-						goto __catch480_g_error;
+						goto __catch477_g_error;
 					}
 #line 230 "/home/jens/Source/shotwell/src/Exporter.vala"
 					_tmp43_ = _tmp36_;
@@ -1494,8 +1494,8 @@ static gboolean exporter_process_queue (Exporter* self) {
 					_g_object_unref0 (_tmp36_);
 #line 1496 "Exporter.c"
 				}
-				goto __finally480;
-				__catch480_g_error:
+				goto __finally477;
+				__catch477_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp44_ = NULL;
@@ -1556,7 +1556,7 @@ static gboolean exporter_process_queue (Exporter* self) {
 					break;
 #line 1558 "Exporter.c"
 				}
-				__finally480:
+				__finally477:
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2054,7 +2054,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 #line 97 "/home/jens/Source/shotwell/src/Exporter.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2057 "Exporter.c"
-				goto __catch481_g_error;
+				goto __catch478_g_error;
 			}
 		} else {
 			MediaSource* _tmp9_ = NULL;
@@ -2074,13 +2074,13 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 #line 99 "/home/jens/Source/shotwell/src/Exporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2077 "Exporter.c"
-					goto __catch481_g_error;
+					goto __catch478_g_error;
 				}
 			}
 		}
 	}
-	goto __finally481;
-	__catch481_g_error:
+	goto __finally478;
+	__catch478_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp12_ = NULL;
@@ -2101,7 +2101,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2103 "Exporter.c"
 	}
-	__finally481:
+	__finally478:
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
diff --git a/src/LibraryFiles.c b/src/LibraryFiles.c
index f8acc4e..a9602ad 100644
--- a/src/LibraryFiles.c
+++ b/src/LibraryFiles.c
@@ -282,11 +282,11 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 #line 30 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 285 "LibraryFiles.c"
-			goto __catch464_g_error;
+			goto __catch461_g_error;
 		}
 	}
-	goto __finally464;
-	__catch464_g_error:
+	goto __finally461;
+	__catch461_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp12_ = NULL;
@@ -310,13 +310,13 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 #line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_error_free0 (err);
 #line 313 "LibraryFiles.c"
-			goto __finally464;
+			goto __finally461;
 		}
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
 #line 318 "LibraryFiles.c"
 	}
-	__finally464:
+	__finally461:
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -441,14 +441,14 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 444 "LibraryFiles.c"
-			goto __catch465_g_error;
+			goto __catch462_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		timestamp = _tmp0_;
 #line 449 "LibraryFiles.c"
 	}
-	goto __finally465;
-	__catch465_g_error:
+	goto __finally462;
+	__catch462_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp3_ = NULL;
@@ -478,7 +478,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		_g_error_free0 (err);
 #line 480 "LibraryFiles.c"
 	}
-	__finally465:
+	__finally462:
 #line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -520,7 +520,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 523 "LibraryFiles.c"
-				goto __catch466_g_error;
+				goto __catch463_g_error;
 			}
 #line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp15_ = _tmp12_;
@@ -534,8 +534,8 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 			_media_metadata_unref0 (_tmp12_);
 #line 536 "LibraryFiles.c"
 		}
-		goto __finally466;
-		__catch466_g_error:
+		goto __finally463;
+		__catch463_g_error:
 		{
 			GError* err = NULL;
 #line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -546,7 +546,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 			_g_error_free0 (err);
 #line 548 "LibraryFiles.c"
 		}
-		__finally466:
+		__finally463:
 #line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -604,7 +604,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 607 "LibraryFiles.c"
-				goto __catch467_g_error;
+				goto __catch464_g_error;
 			}
 #line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp26_ = _tmp23_;
@@ -618,8 +618,8 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 			_media_metadata_unref0 (_tmp23_);
 #line 620 "LibraryFiles.c"
 		}
-		goto __finally467;
-		__catch467_g_error:
+		goto __finally464;
+		__catch464_g_error:
 		{
 			GError* err = NULL;
 #line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -630,7 +630,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 			_g_error_free0 (err);
 #line 632 "LibraryFiles.c"
 		}
-		__finally467:
+		__finally464:
 #line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -728,7 +728,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 731 "LibraryFiles.c"
-			goto __catch468_g_error;
+			goto __catch465_g_error;
 		}
 #line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp42_ = blacklist;
@@ -743,8 +743,8 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 744 "LibraryFiles.c"
 		}
 	}
-	goto __finally468;
-	__catch468_g_error:
+	goto __finally465;
+	__catch465_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp44_ = NULL;
@@ -798,7 +798,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_error_free0 (err);
 #line 801 "LibraryFiles.c"
-				goto __finally468;
+				goto __finally465;
 			}
 #line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp55_ = dest;
@@ -813,7 +813,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_error_free0 (err);
 #line 816 "LibraryFiles.c"
-				goto __finally468;
+				goto __finally465;
 			}
 #line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp57_ = _tmp51_;
@@ -857,7 +857,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		_g_error_free0 (err);
 #line 859 "LibraryFiles.c"
 	}
-	__finally468:
+	__finally465:
 #line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -890,7 +890,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 893 "LibraryFiles.c"
-			goto __catch469_g_error;
+			goto __catch466_g_error;
 		}
 #line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp64_ = info;
@@ -911,7 +911,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_object_unref0 (info);
 #line 914 "LibraryFiles.c"
-			goto __catch469_g_error;
+			goto __catch466_g_error;
 		}
 #line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (!_tmp66_) {
@@ -923,8 +923,8 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		_g_object_unref0 (info);
 #line 925 "LibraryFiles.c"
 	}
-	goto __finally469;
-	__catch469_g_error:
+	goto __finally466;
+	__catch466_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp70_ = NULL;
@@ -943,7 +943,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		_g_error_free0 (err);
 #line 945 "LibraryFiles.c"
 	}
-	__finally469:
+	__finally466:
 #line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c
index dc9683f..b3b33d6 100644
--- a/src/LibraryMonitor.c
+++ b/src/LibraryMonitor.c
@@ -1065,7 +1065,7 @@ static void library_monitor_verify_monitorable_data_free (gpointer _data);
 static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonitorableData* _data_);
 GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable);
 GFile** media_monitor_get_auxilliary_backing_files (MediaMonitor* self, Monitorable* monitorable, int* result_length1);
-static void _vala_array_add296 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add130 (GFile*** array, int* length, int* size, GFile* value);
 #define UTIL_FILE_ATTRIBUTES "standard::*,time::*,id::file,id::filesystem,etag::value"
 #define DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES UTIL_FILE_ATTRIBUTES
 #define DIRECTORY_MONITOR_FILE_INFO_FLAGS G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS
@@ -3829,7 +3829,7 @@ static void library_monitor_verify_monitorable_finish (LibraryMonitor* self, GAs
 }
 
 
-static void _vala_array_add296 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add130 (GFile*** array, int* length, int* size, GFile* value) {
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if ((*length) == (*size)) {
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -4011,7 +4011,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_data_->_tmp15_ = _g_object_ref0 (_data_->_tmp14_);
 #line 500 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
-					_vala_array_add296 (&_data_->files, &_data_->files_length1, &_data_->_files_size_, _data_->_tmp15_);
+					_vala_array_add130 (&_data_->files, &_data_->files_length1, &_data_->_files_size_, _data_->_tmp15_);
 #line 499 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					_g_object_unref0 (_data_->aux_file);
 #line 4018 "LibraryMonitor.c"
@@ -4123,7 +4123,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 4126 "LibraryMonitor.c"
-							goto __catch487_g_error;
+							goto __catch484_g_error;
 						}
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp31_ = NULL;
@@ -4139,8 +4139,8 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_g_object_unref0 (_data_->_tmp27_);
 #line 4141 "LibraryMonitor.c"
 					}
-					goto __finally487;
-					__catch487_g_error:
+					goto __finally484;
+					__catch484_g_error:
 					{
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->err = _data_->_inner_error_;
@@ -4150,7 +4150,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_g_error_free0 (_data_->err);
 #line 4152 "LibraryMonitor.c"
 					}
-					__finally487:
+					__finally484:
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5384,7 +5384,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5387 "LibraryMonitor.c"
-					goto __catch488_database_error;
+					goto __catch485_database_error;
 				}
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (to_tombstone);
@@ -5397,8 +5397,8 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 #line 5398 "LibraryMonitor.c"
 			}
 		}
-		goto __finally488;
-		__catch488_database_error:
+		goto __finally485;
+		__catch485_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp58_ = NULL;
@@ -5414,7 +5414,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			_g_error_free0 (err);
 #line 5416 "LibraryMonitor.c"
 		}
-		__finally488:
+		__finally485:
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5502,7 +5502,7 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) {
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
 #line 5504 "LibraryMonitor.c"
 		}
-		__finally489:
+		__finally486:
 		{
 			GeeHashSet* _tmp9_ = NULL;
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5582,7 +5582,7 @@ void library_monitor_unblacklist_file (GFile* file) {
 #line 5583 "LibraryMonitor.c"
 			}
 		}
-		__finally490:
+		__finally487:
 		{
 			GeeHashSet* _tmp10_ = NULL;
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5632,7 +5632,7 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 			removed = _tmp3_;
 #line 5634 "LibraryMonitor.c"
 		}
-		__finally491:
+		__finally488:
 		{
 			GeeHashSet* _tmp4_ = NULL;
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5734,7 +5734,7 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
 			return result;
 #line 5736 "LibraryMonitor.c"
 		}
-		__finally492:
+		__finally489:
 		{
 			GeeHashSet* _tmp5_ = NULL;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7858,7 +7858,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7860 "LibraryMonitor.c"
-			goto __catch493_g_error;
+			goto __catch490_g_error;
 		}
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp18_ = _tmp15_;
@@ -7872,8 +7872,8 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_g_free0 (_tmp15_);
 #line 7873 "LibraryMonitor.c"
 	}
-	goto __finally493;
-	__catch493_g_error:
+	goto __finally490;
+	__catch490_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
@@ -7900,7 +7900,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		return;
 #line 7901 "LibraryMonitor.c"
 	}
-	__finally493:
+	__finally490:
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8212,7 +8212,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8213 "LibraryMonitor.c"
-			goto __catch494_g_error;
+			goto __catch491_g_error;
 		}
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp3_ = _tmp0_;
@@ -8226,8 +8226,8 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		_g_free0 (_tmp0_);
 #line 8226 "LibraryMonitor.c"
 	}
-	goto __finally494;
-	__catch494_g_error:
+	goto __finally491;
+	__catch491_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -8252,7 +8252,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		return;
 #line 8252 "LibraryMonitor.c"
 	}
-	__finally494:
+	__finally491:
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c
index d380875..66be0bd 100644
--- a/src/MediaDataRepresentation.c
+++ b/src/MediaDataRepresentation.c
@@ -2081,14 +2081,14 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2084 "MediaDataRepresentation.c"
-			goto __catch562_g_error;
+			goto __catch559_g_error;
 		}
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		ret = _tmp1_;
 #line 2089 "MediaDataRepresentation.c"
 	}
-	goto __finally562;
-	__catch562_g_error:
+	goto __finally559;
+	__catch559_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp4_ = NULL;
@@ -2119,7 +2119,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 		_g_error_free0 (err);
 #line 2120 "MediaDataRepresentation.c"
 	}
-	__finally562:
+	__finally559:
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2239,7 +2239,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2241 "MediaDataRepresentation.c"
-					goto __catch563_g_error;
+					goto __catch560_g_error;
 				}
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (!_tmp29_) {
@@ -2248,8 +2248,8 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 2248 "MediaDataRepresentation.c"
 				}
 			}
-			goto __finally563;
-			__catch563_g_error:
+			goto __finally560;
+			__catch560_g_error:
 			{
 				GError* err = NULL;
 				GFile* _tmp32_ = NULL;
@@ -2281,7 +2281,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				break;
 #line 2282 "MediaDataRepresentation.c"
 			}
-			__finally563:
+			__finally560:
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2308,7 +2308,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2310 "MediaDataRepresentation.c"
-					goto __catch564_g_error;
+					goto __catch561_g_error;
 				}
 #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp38_ = parent;
@@ -2322,8 +2322,8 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				_g_free0 (_tmp40_);
 #line 2323 "MediaDataRepresentation.c"
 			}
-			goto __finally564;
-			__catch564_g_error:
+			goto __finally561;
+			__catch561_g_error:
 			{
 				GError* err = NULL;
 				GFile* _tmp41_ = NULL;
@@ -2354,7 +2354,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				_g_error_free0 (err);
 #line 2354 "MediaDataRepresentation.c"
 			}
-			__finally564:
+			__finally561:
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6399,7 +6399,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6400 "MediaDataRepresentation.c"
-					goto __catch565_database_error;
+					goto __catch562_database_error;
 				}
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_aggregate_progress_monitor_unref0 (agg_monitor);
@@ -6422,8 +6422,8 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 #line 6421 "MediaDataRepresentation.c"
 			}
 		}
-		goto __finally565;
-		__catch565_database_error:
+		goto __finally562;
+		__catch562_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp78_ = NULL;
@@ -6439,7 +6439,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 			_g_error_free0 (err);
 #line 6439 "MediaDataRepresentation.c"
 		}
-		__finally565:
+		__finally562:
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6564,11 +6564,11 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6565 "MediaDataRepresentation.c"
-					goto __catch566_g_error;
+					goto __catch563_g_error;
 				}
 			}
-			goto __finally566;
-			__catch566_g_error:
+			goto __finally563;
+			__catch563_g_error:
 			{
 				GError* err = NULL;
 				GFile* _tmp12_ = NULL;
@@ -6598,7 +6598,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 				_g_error_free0 (err);
 #line 6598 "MediaDataRepresentation.c"
 			}
-			__finally566:
+			__finally563:
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index 0174523..019cddc 100644
--- a/src/MediaInterfaces.c
+++ b/src/MediaInterfaces.c
@@ -293,11 +293,11 @@ void transaction_controller_begin (TransactionController* self) {
 #line 69 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 296 "MediaInterfaces.c"
-					goto __catch573_g_error;
+					goto __catch570_g_error;
 				}
 			}
-			goto __finally573;
-			__catch573_g_error:
+			goto __finally570;
+			__catch570_g_error:
 			{
 				GError* err = NULL;
 				gint _tmp3_ = 0;
@@ -344,7 +344,7 @@ void transaction_controller_begin (TransactionController* self) {
 				_g_error_free0 (err);
 #line 346 "MediaInterfaces.c"
 			}
-			__finally573:
+			__finally570:
 #line 68 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 351 "MediaInterfaces.c"
@@ -365,7 +365,7 @@ void transaction_controller_begin (TransactionController* self) {
 #line 366 "MediaInterfaces.c"
 			}
 		}
-		__finally572:
+		__finally569:
 		{
 			gint _tmp11_ = 0;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -453,11 +453,11 @@ void transaction_controller_commit (TransactionController* self) {
 #line 93 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 456 "MediaInterfaces.c"
-					goto __catch575_g_error;
+					goto __catch572_g_error;
 				}
 			}
-			goto __finally575;
-			__catch575_g_error:
+			goto __finally572;
+			__catch572_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp5_ = NULL;
@@ -499,7 +499,7 @@ void transaction_controller_commit (TransactionController* self) {
 				_g_error_free0 (err);
 #line 501 "MediaInterfaces.c"
 			}
-			__finally575:
+			__finally572:
 #line 92 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 506 "MediaInterfaces.c"
@@ -520,7 +520,7 @@ void transaction_controller_commit (TransactionController* self) {
 #line 521 "MediaInterfaces.c"
 			}
 		}
-		__finally574:
+		__finally571:
 		{
 			gint _tmp12_ = 0;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -792,7 +792,7 @@ static void transaction_controller_finalize (TransactionController* obj) {
 			_vala_assert (_tmp1_ == 0, "count == 0");
 #line 794 "MediaInterfaces.c"
 		}
-		__finally571:
+		__finally568:
 		{
 			gint _tmp2_ = 0;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index e937870..2cf2d28 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -2853,7 +2853,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2856 "MediaMonitor.c"
-				goto __catch584_g_error;
+				goto __catch581_g_error;
 			}
 #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp39_ = controller;
@@ -2861,8 +2861,8 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			transaction_controller_commit (_tmp39_);
 #line 2863 "MediaMonitor.c"
 		}
-		goto __finally584;
-		__catch584_g_error:
+		goto __finally581;
+		__catch581_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp40_ = NULL;
@@ -2907,7 +2907,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			_g_error_free0 (err);
 #line 2909 "MediaMonitor.c"
 		}
-		__finally584:
+		__finally581:
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
diff --git a/src/MediaPage.c b/src/MediaPage.c
index 17bb81c..ef9658a 100644
--- a/src/MediaPage.c
+++ b/src/MediaPage.c
@@ -19,8 +19,8 @@
 #include <pango/pango.h>
 #include <gtk/gtk.h>
 #include <gee.h>
-#include <glib/gi18n-lib.h>
 #include <gio/gio.h>
+#include <glib/gi18n-lib.h>
 
 
 #define TYPE_DATA_OBJECT (data_object_get_type ())
@@ -302,6 +302,17 @@ typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
 typedef struct _ConfigFacade ConfigFacade;
 typedef struct _ConfigFacadeClass ConfigFacadeClass;
 
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
+
 #define TYPE_MEDIA_SOURCE (media_source_get_type ())
 #define MEDIA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE, MediaSource))
 #define MEDIA_SOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE, MediaSourceClass))
@@ -364,14 +375,6 @@ typedef struct _Thumbnail Thumbnail;
 typedef struct _ThumbnailClass ThumbnailClass;
 
 #define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
-
-#define TYPE_FLAGGABLE (flaggable_get_type ())
-#define FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FLAGGABLE, Flaggable))
-#define IS_FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FLAGGABLE))
-#define FLAGGABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_FLAGGABLE, FlaggableIface))
-
-typedef struct _Flaggable Flaggable;
-typedef struct _FlaggableIface FlaggableIface;
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define TYPE_RATING_FILTER (rating_filter_get_type ())
@@ -520,6 +523,14 @@ typedef struct _MovePhotosCommandClass MovePhotosCommandClass;
 typedef struct _NewEventCommand NewEventCommand;
 typedef struct _NewEventCommandClass NewEventCommandClass;
 
+#define TYPE_FLAGGABLE (flaggable_get_type ())
+#define FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FLAGGABLE, Flaggable))
+#define IS_FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FLAGGABLE))
+#define FLAGGABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TYPE_FLAGGABLE, FlaggableIface))
+
+typedef struct _Flaggable Flaggable;
+typedef struct _FlaggableIface FlaggableIface;
+
 #define TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND (multiple_data_source_at_once_command_get_type ())
 #define MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommand))
 #define MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MULTIPLE_DATA_SOURCE_AT_ONCE_COMMAND, MultipleDataSourceAtOnceCommandClass))
@@ -749,7 +760,7 @@ typedef enum  {
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -759,8 +770,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -768,10 +777,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -883,13 +890,13 @@ struct _MediaPageClass {
 	void (*on_move_to_trash) (MediaPage* self);
 	void (*on_edit_title) (MediaPage* self);
 	void (*on_edit_comment) (MediaPage* self);
-	void (*on_display_titles) (MediaPage* self, GtkAction* action);
-	void (*on_display_comments) (MediaPage* self, GtkAction* action);
-	void (*on_display_ratings) (MediaPage* self, GtkAction* action);
-	void (*on_display_tags) (MediaPage* self, GtkAction* action);
+	void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by);
 	void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by);
-	void (*on_sort_changed) (MediaPage* self);
+	void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*developer_changed) (MediaPage* self, RawDeveloper rd);
 	DataView* (*create_thumbnail) (MediaPage* self, DataSource* source);
 };
@@ -919,13 +926,6 @@ typedef enum  {
 	PHOTO_FILE_FORMAT_UNKNOWN
 } PhotoFileFormat;
 
-struct _FlaggableIface {
-	GTypeInterface parent_iface;
-	gboolean (*is_flagged) (Flaggable* self);
-	void (*mark_flagged) (Flaggable* self);
-	void (*mark_unflagged) (Flaggable* self);
-};
-
 typedef enum  {
 	RATING_FILTER_NO_FILTER = 0,
 	RATING_FILTER_REJECTED_OR_HIGHER = 1,
@@ -944,6 +944,13 @@ typedef enum  {
 	RATING_FILTER_FIVE_ONLY = 14
 } RatingFilter;
 
+struct _FlaggableIface {
+	GTypeInterface parent_iface;
+	gboolean (*is_flagged) (Flaggable* self);
+	void (*mark_flagged) (Flaggable* self);
+	void (*mark_unflagged) (Flaggable* self);
+};
+
 typedef gint64 (*Comparator) (void* a, void* b, void* user_data);
 typedef gboolean (*ComparatorPredicate) (DataObject* object, Alteration* alteration, void* user_data);
 struct _MediaPageZoomSliderAssembly {
@@ -1068,6 +1075,66 @@ GType media_page_sort_by_get_type (void) G_GNUC_CONST;
 #define MEDIA_PAGE_SORT_ORDER_DESCENDING 1
 #define MEDIA_PAGE_MANUAL_STEPPING 16
 #define MEDIA_PAGE_SLIDER_STEPPING 4
+void media_page_on_export (MediaPage* self);
+static void _media_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void media_page_on_send_to (MediaPage* self);
+static void _media_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void media_page_on_remove_from_library (MediaPage* self);
+static void _media_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_move_to_trash (MediaPage* self);
+static void _media_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void media_page_on_new_event (MediaPage* self);
+static void _media_page_on_new_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void media_page_on_add_tags (MediaPage* self);
+static void _media_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void media_page_on_modify_tags (MediaPage* self);
+static void _media_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_increase_size (MediaPage* self);
+static void _media_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_decrease_size (MediaPage* self);
+static void _media_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void media_page_on_flag_unflag (MediaPage* self);
+static void _media_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_increase_rating (MediaPage* self);
+static void _media_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_decrease_rating (MediaPage* self);
+static void _media_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_rate_rejected (MediaPage* self);
+static void _media_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_rate_unrated (MediaPage* self);
+static void _media_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_rate_one (MediaPage* self);
+static void _media_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_rate_two (MediaPage* self);
+static void _media_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_rate_three (MediaPage* self);
+static void _media_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_rate_four (MediaPage* self);
+static void _media_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_rate_five (MediaPage* self);
+static void _media_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_edit_title (MediaPage* self);
+static void _media_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_edit_comment (MediaPage* self);
+static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_play_video (MediaPage* self);
+static void _media_page_on_play_video_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void page_on_action_toggle (Page* self, GAction* action, GVariant* value);
+static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value);
+static void _media_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+void media_page_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value);
+static void _media_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+void media_page_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value);
+static void _media_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+void media_page_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value);
+static void _media_page_on_display_tags_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+void page_on_action_radio (Page* self, GAction* action, GVariant* value);
+static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value);
+static void _media_page_on_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction* action, GVariant* value);
+static void _media_page_on_raw_developer_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
 MediaPage* media_page_construct (GType object_type, const gchar* page_name);
 CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name);
 GType view_collection_get_type (void) G_GNUC_CONST;
@@ -1101,139 +1168,20 @@ gint thumbnail_get_MAX_SCALE (void);
 static gint media_page_compute_zoom_scale_decrease (gint current_scale);
 static void media_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static GtkActionEntry* media_page_real_init_collect_action_entries (Page* base, int* result_length1);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-#define RESOURCES_SAVE_AS_LABEL _ ("Save _As")
-#define TRANSLATABLE "translatable"
-void media_page_on_export (MediaPage* self);
-static void _media_page_on_export_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EXPORT_MENU _ ("_Export…")
-static void _vala_array_add297 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void media_page_on_send_to (MediaPage* self);
-static void _media_page_on_send_to_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_SEND_TO_MENU _ ("Send _To…")
-static void _vala_array_add298 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_SEND_TO_CONTEXT_MENU _ ("Send T_o…")
-static void _vala_array_add299 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_REMOVE_LABEL _ ("_Remove")
-static void media_page_on_remove_from_library (MediaPage* self);
-static void _media_page_on_remove_from_library_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_REMOVE_FROM_LIBRARY_MENU _ ("R_emove From Library")
-static void _vala_array_add300 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_move_to_trash (MediaPage* self);
-static void _media_page_on_move_to_trash_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_MOVE_TO_TRASH_MENU _ ("_Move to Trash")
-static void _vala_array_add301 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_NEW_LABEL _ ("_New")
-static void media_page_on_new_event (MediaPage* self);
-static void _media_page_on_new_event_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_NEW_EVENT_MENU _ ("_New Event")
-static void _vala_array_add302 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void media_page_on_add_tags (MediaPage* self);
-static void _media_page_on_add_tags_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADD_TAGS_MENU _ ("Add _Tags…")
-static void _vala_array_add303 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ADD_TAGS_CONTEXT_MENU _ ("_Add Tags…")
-static void _vala_array_add304 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void media_page_on_modify_tags (MediaPage* self);
-static void _media_page_on_modify_tags_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_MODIFY_TAGS_MENU _ ("Modif_y Tags…")
-static void _vala_array_add305 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ZOOM_IN_LABEL _ ("Zoom _In")
-void media_page_on_increase_size (MediaPage* self);
-static void _media_page_on_increase_size_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add306 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ZOOM_OUT_LABEL _ ("Zoom _Out")
-void media_page_on_decrease_size (MediaPage* self);
-static void _media_page_on_decrease_size_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add307 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void media_page_on_flag_unflag (MediaPage* self);
-static void _media_page_on_flag_unflag_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_FLAG_MENU _ ("_Flag")
-static void _vala_array_add308 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_RATING_MENU _ ("_Set Rating")
-static void _vala_array_add309 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_increase_rating (MediaPage* self);
-static void _media_page_on_increase_rating_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_INCREASE_RATING_MENU _ ("_Increase")
-static void _vala_array_add310 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_decrease_rating (MediaPage* self);
-static void _media_page_on_decrease_rating_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_DECREASE_RATING_MENU _ ("_Decrease")
-static void _vala_array_add311 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_rate_rejected (MediaPage* self);
-static void _media_page_on_rate_rejected_gtk_action_callback (GtkAction* action, gpointer self);
-const gchar* resources_rating_menu (Rating rating);
-static void _vala_array_add312 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_rate_unrated (MediaPage* self);
-static void _media_page_on_rate_unrated_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add313 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_rate_one (MediaPage* self);
-static void _media_page_on_rate_one_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add314 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_rate_two (MediaPage* self);
-static void _media_page_on_rate_two_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add315 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_rate_three (MediaPage* self);
-static void _media_page_on_rate_three_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add316 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_rate_four (MediaPage* self);
-static void _media_page_on_rate_four_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add317 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_rate_five (MediaPage* self);
-static void _media_page_on_rate_five_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add318 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_edit_title (MediaPage* self);
-static void _media_page_on_edit_title_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EDIT_TITLE_MENU _ ("Edit _Title…")
-static void _vala_array_add319 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_edit_comment (MediaPage* self);
-static void _media_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment…")
-static void _vala_array_add320 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add321 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_FILTER_PHOTOS_MENU _ ("_Filter Photos")
-static void _vala_array_add322 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_PLAY_LABEL _ ("_Play")
-void media_page_on_play_video (MediaPage* self);
-static void _media_page_on_play_video_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add323 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add324 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_raw_developer_shotwell (MediaPage* self, GtkAction* action);
-static void _media_page_on_raw_developer_shotwell_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add325 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-void media_page_on_raw_developer_camera (MediaPage* self, GtkAction* action);
-static void _media_page_on_raw_developer_camera_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add326 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static GtkToggleActionEntry* media_page_real_init_collect_toggle_action_entries (Page* base, int* result_length1);
-GtkToggleActionEntry* page_init_collect_toggle_action_entries (Page* self, int* result_length1);
-void media_page_on_display_titles (MediaPage* self, GtkAction* action);
-static void _media_page_on_display_titles_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add327 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-void media_page_on_display_comments (MediaPage* self, GtkAction* action);
-static void _media_page_on_display_comments_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add328 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-void media_page_on_display_ratings (MediaPage* self, GtkAction* action);
-static void _media_page_on_display_ratings_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_VIEW_RATINGS_MENU _ ("_Ratings")
-#define RESOURCES_VIEW_RATINGS_TOOLTIP _ ("Display each photo’s rating")
-static void _vala_array_add329 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-void media_page_on_display_tags (MediaPage* self, GtkAction* action);
-static void _media_page_on_display_tags_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add330 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-static void media_page_real_register_radio_actions (Page* base, GtkActionGroup* action_group);
+static void media_page_real_add_actions (Page* base);
+void page_add_actions (Page* self);
 void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by);
-static void _vala_array_add331 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-static void _vala_array_add332 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-static void _vala_array_add333 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-static void _vala_array_add334 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-void media_page_on_sort_changed (MediaPage* self);
-static void _media_page_on_sort_changed_gtk_radio_action_callback (GtkAction* action, GtkAction* current, gpointer self);
-#define RESOURCES_SORT_ASCENDING_LABEL _ ("Sort _Ascending")
-static void _vala_array_add335 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-#define RESOURCES_SORT_DESCENDING_LABEL _ ("Sort _Descending")
-static void _vala_array_add336 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-void page_register_radio_actions (Page* self, GtkActionGroup* action_group);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
+GAction* page_get_action (Page* self, const gchar* name);
+static GVariant* _variant_new19 (gboolean value);
+static GVariant* _variant_new20 (gboolean value);
+static GVariant* _variant_new21 (gboolean value);
+static GVariant* _variant_new22 (gboolean value);
+static GVariant* _variant_new23 (gchar* value);
+static GVariant* _variant_new24 (const gchar* value);
+RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
+static GVariant* _variant_new25 (const gchar* value);
 static void media_page_real_update_actions (Page* base, gint selected_count, gint count);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 gboolean desktop_integration_is_send_to_installed (void);
@@ -1258,14 +1206,9 @@ GType thumbnail_get_type (void) G_GNUC_CONST;
 MediaSource* thumbnail_get_media_source (Thumbnail* self);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_get_master_file_format (Photo* self);
-gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d);
-GeeList* view_collection_get_selected_sources (ViewCollection* self);
-GType flaggable_get_type (void) G_GNUC_CONST;
-gboolean flaggable_is_flagged (Flaggable* self);
-#define RESOURCES_UNFLAG_MENU _ ("Un_flag")
-GtkAction* page_get_action (Page* self, const gchar* name);
 static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base);
 void media_page_set_display_ratings (MediaPage* self, gboolean display);
+void page_set_action_active (Page* self, const gchar* name, gboolean active);
 Rating media_source_get_rating (MediaSource* self);
 gboolean rating_can_increase (Rating self);
 gboolean rating_can_decrease (Rating self);
@@ -1279,6 +1222,7 @@ static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll*
 void media_page_decrease_zoom_level (MediaPage* self);
 gboolean page_on_mousewheel_down (Page* self, GdkEventScroll* event);
 void desktop_integration_send_to (GeeCollection* media);
+GeeList* view_collection_get_selected_sources (ViewCollection* self);
 DataView* view_collection_get_selected_at (ViewCollection* self, gint index);
 DataSource* data_view_get_source (DataView* self);
 GFile* media_source_get_file (MediaSource* self);
@@ -1363,6 +1307,8 @@ NewEventCommand* new_event_command_construct (GType object_type, GeeIterable* it
 GType move_photos_command_get_type (void) G_GNUC_CONST;
 GType new_event_command_get_type (void) G_GNUC_CONST;
 GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
+GType flaggable_get_type (void) G_GNUC_CONST;
+gboolean flaggable_is_flagged (Flaggable* self);
 FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag);
 FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollection* sources, gboolean flag);
 GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST;
@@ -1418,22 +1364,24 @@ gchar* edit_comment_dialog_execute (EditCommentDialog* self);
 EditMultipleCommentsCommand* edit_multiple_comments_command_new (GeeCollection* media_sources, const gchar* new_comment);
 EditMultipleCommentsCommand* edit_multiple_comments_command_construct (GType object_type, GeeCollection* media_sources, const gchar* new_comment);
 GType edit_multiple_comments_command_get_type (void) G_GNUC_CONST;
-static void media_page_real_on_display_titles (MediaPage* self, GtkAction* action);
+static void media_page_real_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value);
 void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, gboolean display);
-static void media_page_real_on_display_comments (MediaPage* self, GtkAction* action);
+static void media_page_real_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value);
 void configuration_facade_set_display_photo_comments (ConfigurationFacade* self, gboolean display);
-static void media_page_real_on_display_ratings (MediaPage* self, GtkAction* action);
+static void media_page_real_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value);
 void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display);
-static void media_page_real_on_display_tags (MediaPage* self, GtkAction* action);
+static void media_page_real_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value);
 void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, gboolean display);
 static void media_page_real_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by);
 void media_page_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by);
 static void media_page_real_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by);
-static void media_page_real_on_sort_changed (MediaPage* self);
+static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value);
 gint media_page_get_menu_sort_by (MediaPage* self);
 gboolean media_page_get_menu_sort_order (MediaPage* self);
 static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gboolean ascending);
+void media_page_on_raw_developer_shotwell (MediaPage* self);
 void media_page_developer_changed (MediaPage* self, RawDeveloper rd);
+void media_page_on_raw_developer_camera (MediaPage* self);
 static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd);
 gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d);
 RawDeveloper photo_get_raw_developer (Photo* self);
@@ -1444,10 +1392,12 @@ SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDev
 SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, GeeIterable* iter, RawDeveloper developer);
 static void media_page_real_set_display_titles (CheckerboardPage* base, gboolean display);
 static void media_page_real_set_display_comments (CheckerboardPage* base, gboolean display);
-static GtkRadioAction* media_page_sort_by_title_action (MediaPage* self);
-static GtkRadioAction* media_page_sort_ascending_action (MediaPage* self);
+static GAction* media_page_sort_by_title_action (MediaPage* self);
+static GAction* media_page_sort_ascending_action (MediaPage* self);
 void media_page_set_menu_sort_by (MediaPage* self, gint val);
+static GVariant* _variant_new26 (const gchar* value);
 void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending);
+static GVariant* _variant_new27 (const gchar* value);
 gint64 thumbnail_title_ascending_comparator (void* a, void* b);
 static gint64 _thumbnail_title_ascending_comparator_comparator (void* a, void* b, gpointer self);
 gint64 thumbnail_title_descending_comparator (void* a, void* b);
@@ -1473,7 +1423,6 @@ static gint64 _thumbnail_filename_descending_comparator_comparator (void* a, voi
 gboolean thumbnail_filename_comparator_predicate (DataObject* object, Alteration* alteration);
 static gboolean _thumbnail_filename_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self);
 void data_collection_set_comparator (DataCollection* self, Comparator comparator, void* comparator_target, ComparatorPredicate predicate, void* predicate_target);
-gchar* media_page_get_sortby_path (MediaPage* self, gint sort_by);
 static void media_page_real_destroy (GtkWidget* base);
 void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly* self);
 void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly* self);
@@ -1508,6 +1457,7 @@ static void media_page_finalize (GObject* obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
+static const GActionEntry MEDIA_PAGE_entries[31] = {{"Export", _media_page_on_export_gsimple_action_activate_callback}, {"SendTo", _media_page_on_send_to_gsimple_action_activate_callback}, {"SendToContextMenu", _media_page_on_send_to_gsimple_action_activate_callback}, {"RemoveFromLibrary", _media_page_on_remove_from_library_gsimple_action_activate_callback}, {"MoveToTrash", _media_page_on_move_to_trash_gsimple_action_activate_callback}, {"NewEvent", _media_page_on_new_event_gsimple_action_activate_callback}, {"AddTags", _media_page_on_add_tags_gsimple_action_activate_callback}, {"AddTagsContextMenu", _media_page_on_add_tags_gsimple_action_activate_callback}, {"ModifyTags", _media_page_on_modify_tags_gsimple_action_activate_callback}, {"IncreaseSize", _media_page_on_increase_size_gsimple_action_activate_callback}, {"DecreaseSize", _media_page_on_decrease_size_gsimple_action_activate_callback}, {"Flag", _media_page_on_flag_unflag_gsimple_action_activate_callback}, {"IncreaseRating", _media_page_on_increase_rating_gsimple_action_activate_callback}, {"DecreaseRating", _media_page_on_decrease_rating_gsimple_action_activate_callback}, {"RateRejected", _media_page_on_rate_rejected_gsimple_action_activate_callback}, {"RateUnrated", _media_page_on_rate_unrated_gsimple_action_activate_callback}, {"RateOne", _media_page_on_rate_one_gsimple_action_activate_callback}, {"RateTwo", _media_page_on_rate_two_gsimple_action_activate_callback}, {"RateThree", _media_page_on_rate_three_gsimple_action_activate_callback}, {"RateFour", _media_page_on_rate_four_gsimple_action_activate_callback}, {"RateFive", _media_page_on_rate_five_gsimple_action_activate_callback}, {"EditTitle", _media_page_on_edit_title_gsimple_action_activate_callback}, {"EditComment", _media_page_on_edit_comment_gsimple_action_activate_callback}, {"PlayVideo", _media_page_on_play_video_gsimple_action_activate_callback}, {"ViewTitle", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _media_page_on_display_titles_gsimple_action_change_state_callback}, {"ViewComment", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _media_page_on_display_comments_gsimple_action_change_state_callback}, {"ViewRatings", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _media_page_on_display_ratings_gsimple_action_change_state_callback}, {"ViewTags", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _media_page_on_display_tags_gsimple_action_change_state_callback}, {"SortBy", _page_on_action_radio_gsimple_action_activate_callback, "s", "'1'", _media_page_on_sort_changed_gsimple_action_change_state_callback}, {"Sort", _page_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _media_page_on_sort_changed_gsimple_action_change_state_callback}, {"RawDeveloper", _page_on_action_radio_gsimple_action_activate_callback, "s", "'Shotwell'", _media_page_on_raw_developer_changed_gsimple_action_change_state_callback}};
 
 MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment) {
 	MediaSourceItem * self = NULL;
@@ -1542,7 +1492,7 @@ MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource
 	_tmp6_ = media_source_item_basis_sprocket_pixbuf;
 #line 19 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp6_ == NULL) {
-#line 1546 "MediaPage.c"
+#line 1496 "MediaPage.c"
 		GdkPixbuf* _tmp7_ = NULL;
 #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = resources_load_icon ("sprocket.png", 0);
@@ -1550,18 +1500,18 @@ MediaSourceItem* media_source_item_construct (GType object_type, ThumbnailSource
 		_g_object_unref0 (media_source_item_basis_sprocket_pixbuf);
 #line 20 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_source_item_basis_sprocket_pixbuf = _tmp7_;
-#line 1554 "MediaPage.c"
+#line 1504 "MediaPage.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self;
-#line 1558 "MediaPage.c"
+#line 1508 "MediaPage.c"
 }
 
 
 MediaSourceItem* media_source_item_new (ThumbnailSource* source, Dimensions* initial_pixbuf_dim, const gchar* title, const gchar* comment, gboolean marked_up, PangoAlignment alignment) {
 #line 16 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return media_source_item_construct (TYPE_MEDIA_SOURCE_ITEM, source, initial_pixbuf_dim, title, comment, marked_up, alignment);
-#line 1565 "MediaPage.c"
+#line 1515 "MediaPage.c"
 }
 
 
@@ -1595,7 +1545,7 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 	if (!_tmp2_) {
 #line 31 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_item_set_horizontal_trinket_offset (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), 0);
-#line 1599 "MediaPage.c"
+#line 1549 "MediaPage.c"
 	} else {
 		gdouble reduction_factor = 0.0;
 		gint _tmp3_ = 0;
@@ -1629,7 +1579,7 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 		if (_tmp9_ == NULL) {
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = TRUE;
-#line 1633 "MediaPage.c"
+#line 1583 "MediaPage.c"
 		} else {
 			gint _tmp10_ = 0;
 			GdkPixbuf* _tmp11_ = NULL;
@@ -1645,11 +1595,11 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 			_tmp13_ = _tmp12_;
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _tmp10_ != _tmp13_;
-#line 1649 "MediaPage.c"
+#line 1599 "MediaPage.c"
 		}
 #line 37 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (_tmp8_) {
-#line 1653 "MediaPage.c"
+#line 1603 "MediaPage.c"
 			GdkPixbuf* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
@@ -1666,7 +1616,7 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 			_g_object_unref0 (media_source_item_current_sprocket_pixbuf);
 #line 38 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			media_source_item_current_sprocket_pixbuf = _tmp17_;
-#line 1670 "MediaPage.c"
+#line 1620 "MediaPage.c"
 		}
 #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = media_source_item_current_sprocket_pixbuf;
@@ -1676,7 +1626,7 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 		_tmp20_ = _tmp19_;
 #line 42 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_item_set_horizontal_trinket_offset (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp20_);
-#line 1680 "MediaPage.c"
+#line 1630 "MediaPage.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = ctx;
@@ -1690,7 +1640,7 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 	_tmp24_ = self->priv->enable_sprockets;
 #line 47 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp24_) {
-#line 1694 "MediaPage.c"
+#line 1644 "MediaPage.c"
 		cairo_t* _tmp25_ = NULL;
 		GdkPoint _tmp26_ = {0};
 		Dimensions _tmp27_ = {0};
@@ -1702,7 +1652,7 @@ static void media_source_item_real_paint_image (CheckerboardItem* base, cairo_t*
 		_tmp27_ = pixbuf_dim;
 #line 48 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_source_item_paint_sprockets (self, _tmp25_, &_tmp26_, &_tmp27_);
-#line 1706 "MediaPage.c"
+#line 1656 "MediaPage.c"
 	}
 }
 
@@ -1749,7 +1699,7 @@ void media_source_item_paint_one_sprocket (MediaSourceItem* self, cairo_t* ctx,
 	_tmp8_ = ctx;
 #line 56 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	cairo_restore (_tmp8_);
-#line 1753 "MediaPage.c"
+#line 1703 "MediaPage.c"
 }
 
 
@@ -1819,19 +1769,19 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 	_tmp12_ = _tmp11_;
 #line 65 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	right_paint_location.x = _tmp7_ + (_tmp9_ - _tmp12_);
-#line 1823 "MediaPage.c"
+#line 1773 "MediaPage.c"
 	{
 		gint i = 0;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		i = 0;
-#line 1828 "MediaPage.c"
+#line 1778 "MediaPage.c"
 		{
 			gboolean _tmp13_ = FALSE;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = TRUE;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			while (TRUE) {
-#line 1835 "MediaPage.c"
+#line 1785 "MediaPage.c"
 				gint _tmp15_ = 0;
 				gint _tmp16_ = 0;
 				cairo_t* _tmp17_ = NULL;
@@ -1848,13 +1798,13 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 				gint _tmp28_ = 0;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (!_tmp13_) {
-#line 1852 "MediaPage.c"
+#line 1802 "MediaPage.c"
 					gint _tmp14_ = 0;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp14_ = i;
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					i = _tmp14_ + 1;
-#line 1858 "MediaPage.c"
+#line 1808 "MediaPage.c"
 				}
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp13_ = FALSE;
@@ -1866,7 +1816,7 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 				if (!(_tmp15_ < _tmp16_)) {
 #line 66 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					break;
-#line 1870 "MediaPage.c"
+#line 1820 "MediaPage.c"
 				}
 #line 67 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp17_ = ctx;
@@ -1900,7 +1850,7 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 				_tmp28_ = _tmp27_;
 #line 71 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				right_paint_location.y = _tmp25_ + _tmp28_;
-#line 1904 "MediaPage.c"
+#line 1854 "MediaPage.c"
 			}
 		}
 	}
@@ -1920,7 +1870,7 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 	_tmp34_ = straggler_pixels;
 #line 75 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp34_ > 0) {
-#line 1924 "MediaPage.c"
+#line 1874 "MediaPage.c"
 		cairo_t* _tmp35_ = NULL;
 		cairo_t* _tmp36_ = NULL;
 		GdkPixbuf* _tmp37_ = NULL;
@@ -2033,7 +1983,7 @@ void media_source_item_paint_sprockets (MediaSourceItem* self, cairo_t* ctx, Gdk
 		_tmp66_ = ctx;
 #line 90 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		cairo_restore (_tmp66_);
-#line 2037 "MediaPage.c"
+#line 1987 "MediaPage.c"
 	}
 }
 
@@ -2046,7 +1996,7 @@ void media_source_item_set_enable_sprockets (MediaSourceItem* self, gboolean ena
 	_tmp0_ = enable_sprockets;
 #line 95 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->enable_sprockets = _tmp0_;
-#line 2050 "MediaPage.c"
+#line 2000 "MediaPage.c"
 }
 
 
@@ -2070,7 +2020,7 @@ void media_source_item_set_title (MediaSourceItem* self, const gchar* text, gboo
 	_g_free0 (self->priv->natural_collation_key);
 #line 101 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->natural_collation_key = NULL;
-#line 2074 "MediaPage.c"
+#line 2024 "MediaPage.c"
 }
 
 
@@ -2085,7 +2035,7 @@ gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) {
 	_tmp0_ = self->priv->natural_collation_key;
 #line 105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ == NULL) {
-#line 2089 "MediaPage.c"
+#line 2039 "MediaPage.c"
 		gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 #line 106 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -2096,7 +2046,7 @@ gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) {
 		_g_free0 (self->priv->natural_collation_key);
 #line 106 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		self->priv->natural_collation_key = _tmp2_;
-#line 2100 "MediaPage.c"
+#line 2050 "MediaPage.c"
 	}
 #line 108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = self->priv->natural_collation_key;
@@ -2106,7 +2056,7 @@ gchar* media_source_item_get_natural_collation_key (MediaSourceItem* self) {
 	result = _tmp4_;
 #line 108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 2110 "MediaPage.c"
+#line 2060 "MediaPage.c"
 }
 
 
@@ -2119,7 +2069,7 @@ static void media_source_item_class_init (MediaSourceItemClass * klass) {
 	((CheckerboardItemClass *) klass)->paint_image = media_source_item_real_paint_image;
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_source_item_finalize;
-#line 2123 "MediaPage.c"
+#line 2073 "MediaPage.c"
 }
 
 
@@ -2130,7 +2080,7 @@ static void media_source_item_instance_init (MediaSourceItem * self) {
 	self->priv->enable_sprockets = FALSE;
 #line 12 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->natural_collation_key = NULL;
-#line 2134 "MediaPage.c"
+#line 2084 "MediaPage.c"
 }
 
 
@@ -2142,7 +2092,7 @@ static void media_source_item_finalize (GObject* obj) {
 	_g_free0 (self->priv->natural_collation_key);
 #line 7 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (media_source_item_parent_class)->finalize (obj);
-#line 2146 "MediaPage.c"
+#line 2096 "MediaPage.c"
 }
 
 
@@ -2170,10 +2120,220 @@ GType media_page_sort_by_get_type (void) {
 }
 
 
+static void _media_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_export ((MediaPage*) self);
+#line 2127 "MediaPage.c"
+}
+
+
+static void _media_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_send_to ((MediaPage*) self);
+#line 2134 "MediaPage.c"
+}
+
+
+static void _media_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_remove_from_library ((MediaPage*) self);
+#line 2141 "MediaPage.c"
+}
+
+
+static void _media_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_move_to_trash ((MediaPage*) self);
+#line 2148 "MediaPage.c"
+}
+
+
+static void _media_page_on_new_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_new_event ((MediaPage*) self);
+#line 2155 "MediaPage.c"
+}
+
+
+static void _media_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_add_tags ((MediaPage*) self);
+#line 2162 "MediaPage.c"
+}
+
+
+static void _media_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_modify_tags ((MediaPage*) self);
+#line 2169 "MediaPage.c"
+}
+
+
+static void _media_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_increase_size ((MediaPage*) self);
+#line 2176 "MediaPage.c"
+}
+
+
+static void _media_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_decrease_size ((MediaPage*) self);
+#line 2183 "MediaPage.c"
+}
+
+
+static void _media_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_flag_unflag ((MediaPage*) self);
+#line 2190 "MediaPage.c"
+}
+
+
+static void _media_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_increase_rating ((MediaPage*) self);
+#line 2197 "MediaPage.c"
+}
+
+
+static void _media_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_decrease_rating ((MediaPage*) self);
+#line 2204 "MediaPage.c"
+}
+
+
+static void _media_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_rate_rejected ((MediaPage*) self);
+#line 2211 "MediaPage.c"
+}
+
+
+static void _media_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_rate_unrated ((MediaPage*) self);
+#line 2218 "MediaPage.c"
+}
+
+
+static void _media_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_rate_one ((MediaPage*) self);
+#line 2225 "MediaPage.c"
+}
+
+
+static void _media_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_rate_two ((MediaPage*) self);
+#line 2232 "MediaPage.c"
+}
+
+
+static void _media_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_rate_three ((MediaPage*) self);
+#line 2239 "MediaPage.c"
+}
+
+
+static void _media_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_rate_four ((MediaPage*) self);
+#line 2246 "MediaPage.c"
+}
+
+
+static void _media_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_rate_five ((MediaPage*) self);
+#line 2253 "MediaPage.c"
+}
+
+
+static void _media_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_edit_title ((MediaPage*) self);
+#line 2260 "MediaPage.c"
+}
+
+
+static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_edit_comment ((MediaPage*) self);
+#line 2267 "MediaPage.c"
+}
+
+
+static void _media_page_on_play_video_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_play_video ((MediaPage*) self);
+#line 2274 "MediaPage.c"
+}
+
+
+static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	page_on_action_toggle ((Page*) self, action, parameter);
+#line 2281 "MediaPage.c"
+}
+
+
+static void _media_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_display_titles ((MediaPage*) self, action, value);
+#line 2288 "MediaPage.c"
+}
+
+
+static void _media_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_display_comments ((MediaPage*) self, action, value);
+#line 2295 "MediaPage.c"
+}
+
+
+static void _media_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_display_ratings ((MediaPage*) self, action, value);
+#line 2302 "MediaPage.c"
+}
+
+
+static void _media_page_on_display_tags_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_display_tags ((MediaPage*) self, action, value);
+#line 2309 "MediaPage.c"
+}
+
+
+static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	page_on_action_radio ((Page*) self, action, parameter);
+#line 2316 "MediaPage.c"
+}
+
+
+static void _media_page_on_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_sort_changed ((MediaPage*) self, action, value);
+#line 2323 "MediaPage.c"
+}
+
+
+static void _media_page_on_raw_developer_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_on_raw_developer_changed ((MediaPage*) self, action, value);
+#line 2330 "MediaPage.c"
+}
+
+
 static void _media_page_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 252 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_media_altered ((MediaPage*) self, items);
-#line 2177 "MediaPage.c"
+#line 2337 "MediaPage.c"
 }
 
 
@@ -2372,7 +2532,7 @@ MediaPage* media_page_construct (GType object_type, const gchar* page_name) {
 	self->priv->dnd_handler = _tmp38_;
 #line 247 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self;
-#line 2376 "MediaPage.c"
+#line 2536 "MediaPage.c"
 }
 
 
@@ -2403,7 +2563,7 @@ static gint media_page_compute_zoom_scale_increase (gint current_scale) {
 	result = _tmp5_;
 #line 272 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 2407 "MediaPage.c"
+#line 2567 "MediaPage.c"
 }
 
 
@@ -2434,7 +2594,7 @@ static gint media_page_compute_zoom_scale_decrease (gint current_scale) {
 	result = _tmp5_;
 #line 277 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 2438 "MediaPage.c"
+#line 2598 "MediaPage.c"
 }
 
 
@@ -2454,2333 +2614,357 @@ static void media_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f
 	_tmp1_ = ui_filenames;
 #line 283 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "media.ui");
-#line 2458 "MediaPage.c"
-}
-
-
-static void _media_page_on_export_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 289 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_export ((MediaPage*) self);
-#line 2465 "MediaPage.c"
-}
-
-
-static void _vala_array_add297 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 292 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 292 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 292 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2476 "MediaPage.c"
-	}
-#line 292 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2480 "MediaPage.c"
-}
-
-
-static void _media_page_on_send_to_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 294 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_send_to ((MediaPage*) self);
-#line 2487 "MediaPage.c"
-}
-
-
-static void _vala_array_add298 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 297 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 297 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 297 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2498 "MediaPage.c"
-	}
-#line 297 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2502 "MediaPage.c"
-}
-
-
-static void _vala_array_add299 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 304 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 304 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 304 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2513 "MediaPage.c"
-	}
-#line 304 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2517 "MediaPage.c"
-}
-
-
-static void _media_page_on_remove_from_library_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 306 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_remove_from_library ((MediaPage*) self);
-#line 2524 "MediaPage.c"
-}
-
-
-static void _vala_array_add300 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 309 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 309 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 309 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2535 "MediaPage.c"
-	}
-#line 309 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2539 "MediaPage.c"
-}
-
-
-static void _media_page_on_move_to_trash_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 311 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_move_to_trash ((MediaPage*) self);
-#line 2546 "MediaPage.c"
-}
-
-
-static void _vala_array_add301 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 314 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 314 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 314 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2557 "MediaPage.c"
-	}
-#line 314 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2561 "MediaPage.c"
-}
-
-
-static void _media_page_on_new_event_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 316 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_new_event ((MediaPage*) self);
-#line 2568 "MediaPage.c"
-}
-
-
-static void _vala_array_add302 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 319 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 319 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 319 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2579 "MediaPage.c"
-	}
-#line 319 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2583 "MediaPage.c"
+#line 2618 "MediaPage.c"
 }
 
 
-static void _media_page_on_add_tags_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 321 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_add_tags ((MediaPage*) self);
-#line 2590 "MediaPage.c"
+static GVariant* _variant_new19 (gboolean value) {
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 2625 "MediaPage.c"
 }
 
 
-static void _vala_array_add303 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2601 "MediaPage.c"
-	}
-#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2605 "MediaPage.c"
+static GVariant* _variant_new20 (gboolean value) {
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 2632 "MediaPage.c"
 }
 
 
-static void _vala_array_add304 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2616 "MediaPage.c"
-	}
-#line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2620 "MediaPage.c"
+static GVariant* _variant_new21 (gboolean value) {
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 2639 "MediaPage.c"
 }
 
 
-static void _media_page_on_modify_tags_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_modify_tags ((MediaPage*) self);
-#line 2627 "MediaPage.c"
+static GVariant* _variant_new22 (gboolean value) {
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 2646 "MediaPage.c"
 }
 
 
-static void _vala_array_add305 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2638 "MediaPage.c"
-	}
+static GVariant* _variant_new23 (gchar* value) {
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2642 "MediaPage.c"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 2653 "MediaPage.c"
 }
 
 
-static void _media_page_on_increase_size_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_increase_size ((MediaPage*) self);
-#line 2649 "MediaPage.c"
-}
-
-
-static void _vala_array_add306 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 342 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 342 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 342 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
+static GVariant* _variant_new24 (const gchar* value) {
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
 #line 2660 "MediaPage.c"
-	}
-#line 342 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2664 "MediaPage.c"
-}
-
-
-static void _media_page_on_decrease_size_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 344 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_decrease_size ((MediaPage*) self);
-#line 2671 "MediaPage.c"
-}
-
-
-static void _vala_array_add307 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2682 "MediaPage.c"
-	}
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2686 "MediaPage.c"
-}
-
-
-static void _media_page_on_flag_unflag_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 350 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_flag_unflag ((MediaPage*) self);
-#line 2693 "MediaPage.c"
-}
-
-
-static void _vala_array_add308 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2704 "MediaPage.c"
-	}
-#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2708 "MediaPage.c"
-}
-
-
-static void _vala_array_add309 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2719 "MediaPage.c"
-	}
-#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2723 "MediaPage.c"
-}
-
-
-static void _media_page_on_increase_rating_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_increase_rating ((MediaPage*) self);
-#line 2730 "MediaPage.c"
-}
-
-
-static void _vala_array_add310 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 361 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 361 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 361 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2741 "MediaPage.c"
-	}
-#line 361 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2745 "MediaPage.c"
-}
-
-
-static void _media_page_on_decrease_rating_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_decrease_rating ((MediaPage*) self);
-#line 2752 "MediaPage.c"
-}
-
-
-static void _vala_array_add311 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 366 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 366 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 366 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2763 "MediaPage.c"
-	}
-#line 366 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2767 "MediaPage.c"
 }
 
 
-static void _media_page_on_rate_rejected_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 368 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_rate_rejected ((MediaPage*) self);
-#line 2774 "MediaPage.c"
-}
-
-
-static void _vala_array_add312 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2785 "MediaPage.c"
-	}
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2789 "MediaPage.c"
-}
-
-
-static void _media_page_on_rate_unrated_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_rate_unrated ((MediaPage*) self);
-#line 2796 "MediaPage.c"
-}
-
-
-static void _vala_array_add313 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2807 "MediaPage.c"
-	}
-#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2811 "MediaPage.c"
-}
-
-
-static void _media_page_on_rate_one_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 378 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_rate_one ((MediaPage*) self);
-#line 2818 "MediaPage.c"
-}
-
-
-static void _vala_array_add314 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2829 "MediaPage.c"
-	}
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2833 "MediaPage.c"
-}
-
-
-static void _media_page_on_rate_two_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_rate_two ((MediaPage*) self);
-#line 2840 "MediaPage.c"
-}
-
-
-static void _vala_array_add315 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 386 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 386 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 386 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2851 "MediaPage.c"
-	}
-#line 386 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2855 "MediaPage.c"
-}
-
-
-static void _media_page_on_rate_three_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 388 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_rate_three ((MediaPage*) self);
-#line 2862 "MediaPage.c"
-}
-
-
-static void _vala_array_add316 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2873 "MediaPage.c"
-	}
-#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2877 "MediaPage.c"
-}
-
-
-static void _media_page_on_rate_four_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_rate_four ((MediaPage*) self);
-#line 2884 "MediaPage.c"
-}
-
-
-static void _vala_array_add317 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2895 "MediaPage.c"
-	}
-#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2899 "MediaPage.c"
-}
-
-
-static void _media_page_on_rate_five_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_rate_five ((MediaPage*) self);
-#line 2906 "MediaPage.c"
-}
-
-
-static void _vala_array_add318 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2917 "MediaPage.c"
-	}
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2921 "MediaPage.c"
-}
-
-
-static void _media_page_on_edit_title_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_edit_title ((MediaPage*) self);
-#line 2928 "MediaPage.c"
-}
-
-
-static void _vala_array_add319 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 406 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 406 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 406 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2939 "MediaPage.c"
-	}
-#line 406 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2943 "MediaPage.c"
-}
-
-
-static void _media_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 408 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_edit_comment ((MediaPage*) self);
-#line 2950 "MediaPage.c"
-}
-
-
-static void _vala_array_add320 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2961 "MediaPage.c"
-	}
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2965 "MediaPage.c"
-}
-
-
-static void _vala_array_add321 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2976 "MediaPage.c"
-	}
-#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2980 "MediaPage.c"
-}
-
-
-static void _vala_array_add322 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 419 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 419 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 419 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2991 "MediaPage.c"
-	}
-#line 419 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 2995 "MediaPage.c"
-}
-
-
-static void _media_page_on_play_video_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 421 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_play_video ((MediaPage*) self);
-#line 3002 "MediaPage.c"
-}
-
-
-static void _vala_array_add323 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 425 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 425 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 425 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 3013 "MediaPage.c"
-	}
-#line 425 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 3017 "MediaPage.c"
-}
-
-
-static void _vala_array_add324 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 429 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 429 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 429 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 3028 "MediaPage.c"
-	}
-#line 429 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 3032 "MediaPage.c"
-}
-
-
-static void _media_page_on_raw_developer_shotwell_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_raw_developer_shotwell ((MediaPage*) self, action);
-#line 3039 "MediaPage.c"
-}
-
-
-static void _vala_array_add325 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 3050 "MediaPage.c"
-	}
-#line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 3054 "MediaPage.c"
-}
-
-
-static void _media_page_on_raw_developer_camera_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_raw_developer_camera ((MediaPage*) self, action);
-#line 3061 "MediaPage.c"
-}
-
-
-static void _vala_array_add326 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 3072 "MediaPage.c"
-	}
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 3076 "MediaPage.c"
+static GVariant* _variant_new25 (const gchar* value) {
+#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 2667 "MediaPage.c"
 }
 
 
-static GtkActionEntry* media_page_real_init_collect_action_entries (Page* base, int* result_length1) {
+static void media_page_real_add_actions (Page* base) {
 	MediaPage * self;
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	gint _tmp0_ = 0;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry export = {0};
-	GtkActionEntry _tmp2_ = {0};
-	GtkActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkActionEntry _tmp4_ = {0};
-	GtkActionEntry send_to = {0};
-	GtkActionEntry _tmp5_ = {0};
-	GtkActionEntry* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	GtkActionEntry _tmp7_ = {0};
-	GtkActionEntry send_to_context_menu = {0};
-	GtkActionEntry _tmp8_ = {0};
-	GtkActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkActionEntry _tmp10_ = {0};
-	GtkActionEntry remove_from_library = {0};
-	GtkActionEntry _tmp11_ = {0};
-	GtkActionEntry* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	GtkActionEntry _tmp13_ = {0};
-	GtkActionEntry move_to_trash = {0};
-	GtkActionEntry _tmp14_ = {0};
-	GtkActionEntry* _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	GtkActionEntry _tmp16_ = {0};
-	GtkActionEntry new_event = {0};
-	GtkActionEntry _tmp17_ = {0};
-	GtkActionEntry* _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
-	GtkActionEntry _tmp19_ = {0};
-	GtkActionEntry add_tags = {0};
-	GtkActionEntry _tmp20_ = {0};
-	GtkActionEntry* _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
-	GtkActionEntry _tmp22_ = {0};
-	GtkActionEntry add_tags_context_menu = {0};
-	GtkActionEntry _tmp23_ = {0};
-	GtkActionEntry* _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
-	GtkActionEntry _tmp25_ = {0};
-	GtkActionEntry modify_tags = {0};
-	GtkActionEntry _tmp26_ = {0};
-	GtkActionEntry* _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-	GtkActionEntry _tmp28_ = {0};
-	GtkActionEntry increase_size = {0};
-	GtkActionEntry _tmp29_ = {0};
-	const gchar* _tmp30_ = NULL;
-	const gchar* _tmp31_ = NULL;
-	GtkActionEntry* _tmp32_ = NULL;
-	gint _tmp32__length1 = 0;
-	GtkActionEntry _tmp33_ = {0};
-	GtkActionEntry decrease_size = {0};
-	GtkActionEntry _tmp34_ = {0};
-	const gchar* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
-	GtkActionEntry* _tmp37_ = NULL;
-	gint _tmp37__length1 = 0;
-	GtkActionEntry _tmp38_ = {0};
-	GtkActionEntry flag = {0};
-	GtkActionEntry _tmp39_ = {0};
-	GtkActionEntry* _tmp40_ = NULL;
-	gint _tmp40__length1 = 0;
-	GtkActionEntry _tmp41_ = {0};
-	GtkActionEntry set_rating = {0};
-	GtkActionEntry _tmp42_ = {0};
-	GtkActionEntry* _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	GtkActionEntry _tmp44_ = {0};
-	GtkActionEntry increase_rating = {0};
-	GtkActionEntry _tmp45_ = {0};
-	GtkActionEntry* _tmp46_ = NULL;
-	gint _tmp46__length1 = 0;
-	GtkActionEntry _tmp47_ = {0};
-	GtkActionEntry decrease_rating = {0};
-	GtkActionEntry _tmp48_ = {0};
-	GtkActionEntry* _tmp49_ = NULL;
-	gint _tmp49__length1 = 0;
-	GtkActionEntry _tmp50_ = {0};
-	GtkActionEntry rate_rejected = {0};
-	GtkActionEntry _tmp51_ = {0};
-	const gchar* _tmp52_ = NULL;
-	GtkActionEntry* _tmp53_ = NULL;
-	gint _tmp53__length1 = 0;
-	GtkActionEntry _tmp54_ = {0};
-	GtkActionEntry rate_unrated = {0};
-	GtkActionEntry _tmp55_ = {0};
-	const gchar* _tmp56_ = NULL;
-	GtkActionEntry* _tmp57_ = NULL;
-	gint _tmp57__length1 = 0;
-	GtkActionEntry _tmp58_ = {0};
-	GtkActionEntry rate_one = {0};
-	GtkActionEntry _tmp59_ = {0};
-	const gchar* _tmp60_ = NULL;
-	GtkActionEntry* _tmp61_ = NULL;
-	gint _tmp61__length1 = 0;
-	GtkActionEntry _tmp62_ = {0};
-	GtkActionEntry rate_two = {0};
-	GtkActionEntry _tmp63_ = {0};
-	const gchar* _tmp64_ = NULL;
-	GtkActionEntry* _tmp65_ = NULL;
-	gint _tmp65__length1 = 0;
-	GtkActionEntry _tmp66_ = {0};
-	GtkActionEntry rate_three = {0};
-	GtkActionEntry _tmp67_ = {0};
-	const gchar* _tmp68_ = NULL;
-	GtkActionEntry* _tmp69_ = NULL;
-	gint _tmp69__length1 = 0;
-	GtkActionEntry _tmp70_ = {0};
-	GtkActionEntry rate_four = {0};
-	GtkActionEntry _tmp71_ = {0};
-	const gchar* _tmp72_ = NULL;
-	GtkActionEntry* _tmp73_ = NULL;
-	gint _tmp73__length1 = 0;
-	GtkActionEntry _tmp74_ = {0};
-	GtkActionEntry rate_five = {0};
-	GtkActionEntry _tmp75_ = {0};
-	const gchar* _tmp76_ = NULL;
-	GtkActionEntry* _tmp77_ = NULL;
-	gint _tmp77__length1 = 0;
-	GtkActionEntry _tmp78_ = {0};
-	GtkActionEntry edit_title = {0};
-	GtkActionEntry _tmp79_ = {0};
-	GtkActionEntry* _tmp80_ = NULL;
-	gint _tmp80__length1 = 0;
-	GtkActionEntry _tmp81_ = {0};
-	GtkActionEntry edit_comment = {0};
-	GtkActionEntry _tmp82_ = {0};
-	GtkActionEntry* _tmp83_ = NULL;
-	gint _tmp83__length1 = 0;
-	GtkActionEntry _tmp84_ = {0};
-	GtkActionEntry sort_photos = {0};
-	GtkActionEntry _tmp85_ = {0};
-	const gchar* _tmp86_ = NULL;
-	GtkActionEntry* _tmp87_ = NULL;
-	gint _tmp87__length1 = 0;
-	GtkActionEntry _tmp88_ = {0};
-	GtkActionEntry filter_photos = {0};
-	GtkActionEntry _tmp89_ = {0};
-	GtkActionEntry* _tmp90_ = NULL;
-	gint _tmp90__length1 = 0;
-	GtkActionEntry _tmp91_ = {0};
-	GtkActionEntry play = {0};
-	GtkActionEntry _tmp92_ = {0};
-	const gchar* _tmp93_ = NULL;
-	const gchar* _tmp94_ = NULL;
-	GtkActionEntry* _tmp95_ = NULL;
-	gint _tmp95__length1 = 0;
-	GtkActionEntry _tmp96_ = {0};
-	GtkActionEntry raw_developer = {0};
-	GtkActionEntry _tmp97_ = {0};
-	const gchar* _tmp98_ = NULL;
-	GtkActionEntry* _tmp99_ = NULL;
-	gint _tmp99__length1 = 0;
-	GtkActionEntry _tmp100_ = {0};
-	GtkActionEntry dev_shotwell = {0};
-	GtkActionEntry _tmp101_ = {0};
-	const gchar* _tmp102_ = NULL;
-	GtkActionEntry* _tmp103_ = NULL;
-	gint _tmp103__length1 = 0;
-	GtkActionEntry _tmp104_ = {0};
-	GtkActionEntry dev_camera = {0};
-	GtkActionEntry _tmp105_ = {0};
-	const gchar* _tmp106_ = NULL;
-	GtkActionEntry* _tmp107_ = NULL;
-	gint _tmp107__length1 = 0;
-	GtkActionEntry _tmp108_ = {0};
-	GtkActionEntry* _tmp109_ = NULL;
-	gint _tmp109__length1 = 0;
-#line 286 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 287 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = PAGE_CLASS (media_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), &_tmp0_);
-#line 287 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	actions = _tmp1_;
-#line 287 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	actions_length1 = _tmp0_;
-#line 287 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_actions_size_ = actions_length1;
-#line 289 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_.name = "Export";
-#line 289 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_.stock_id = RESOURCES_SAVE_AS_LABEL;
-#line 289 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 289 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_.accelerator = "<Ctrl><Shift>E";
-#line 289 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_.tooltip = TRANSLATABLE;
-#line 289 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_.callback = (GCallback) _media_page_on_export_gtk_action_callback;
-#line 289 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	export = _tmp2_;
-#line 291 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	export.label = RESOURCES_EXPORT_MENU;
-#line 292 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = actions;
-#line 292 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3__length1 = actions_length1;
-#line 292 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = export;
-#line 292 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add297 (&actions, &actions_length1, &_actions_size_, &_tmp4_);
-#line 294 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.name = "SendTo";
-#line 294 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.stock_id = "document-send";
-#line 294 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 294 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.accelerator = NULL;
-#line 294 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.tooltip = TRANSLATABLE;
-#line 294 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.callback = (GCallback) _media_page_on_send_to_gtk_action_callback;
-#line 294 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	send_to = _tmp5_;
-#line 296 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	send_to.label = RESOURCES_SEND_TO_MENU;
-#line 297 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = actions;
-#line 297 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6__length1 = actions_length1;
-#line 297 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = send_to;
-#line 297 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add298 (&actions, &actions_length1, &_actions_size_, &_tmp7_);
-#line 301 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_.name = "SendToContextMenu";
-#line 301 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_.stock_id = "document-send";
-#line 301 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_.label = TRANSLATABLE;
-#line 301 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_.accelerator = NULL;
-#line 301 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_.tooltip = TRANSLATABLE;
-#line 301 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_.callback = (GCallback) _media_page_on_send_to_gtk_action_callback;
-#line 301 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	send_to_context_menu = _tmp8_;
-#line 303 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	send_to_context_menu.label = RESOURCES_SEND_TO_CONTEXT_MENU;
-#line 304 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = actions;
-#line 304 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9__length1 = actions_length1;
-#line 304 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = send_to_context_menu;
-#line 304 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add299 (&actions, &actions_length1, &_actions_size_, &_tmp10_);
-#line 306 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_.name = "RemoveFromLibrary";
-#line 306 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_.stock_id = RESOURCES_REMOVE_LABEL;
-#line 306 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_.label = TRANSLATABLE;
-#line 306 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_.accelerator = "<Shift>Delete";
-#line 306 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_.tooltip = TRANSLATABLE;
-#line 306 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_.callback = (GCallback) _media_page_on_remove_from_library_gtk_action_callback;
-#line 306 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	remove_from_library = _tmp11_;
-#line 308 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	remove_from_library.label = RESOURCES_REMOVE_FROM_LIBRARY_MENU;
-#line 309 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = actions;
-#line 309 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12__length1 = actions_length1;
-#line 309 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_ = remove_from_library;
-#line 309 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add300 (&actions, &actions_length1, &_actions_size_, &_tmp13_);
-#line 311 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.name = "MoveToTrash";
-#line 311 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.stock_id = "user-trash-full";
-#line 311 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.label = TRANSLATABLE;
-#line 311 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.accelerator = "Delete";
-#line 311 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.tooltip = TRANSLATABLE;
-#line 311 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.callback = (GCallback) _media_page_on_move_to_trash_gtk_action_callback;
-#line 311 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	move_to_trash = _tmp14_;
-#line 313 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	move_to_trash.label = RESOURCES_MOVE_TO_TRASH_MENU;
-#line 314 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = actions;
-#line 314 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15__length1 = actions_length1;
-#line 314 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16_ = move_to_trash;
-#line 314 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add301 (&actions, &actions_length1, &_actions_size_, &_tmp16_);
-#line 316 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_.name = "NewEvent";
-#line 316 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_.stock_id = RESOURCES_NEW_LABEL;
-#line 316 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_.label = TRANSLATABLE;
-#line 316 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_.accelerator = "<Ctrl>N";
-#line 316 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_.tooltip = TRANSLATABLE;
-#line 316 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_.callback = (GCallback) _media_page_on_new_event_gtk_action_callback;
-#line 316 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	new_event = _tmp17_;
-#line 318 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	new_event.label = RESOURCES_NEW_EVENT_MENU;
-#line 319 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_ = actions;
-#line 319 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18__length1 = actions_length1;
-#line 319 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp19_ = new_event;
-#line 319 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add302 (&actions, &actions_length1, &_actions_size_, &_tmp19_);
-#line 321 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_.name = "AddTags";
-#line 321 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_.stock_id = NULL;
-#line 321 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_.label = TRANSLATABLE;
-#line 321 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_.accelerator = "<Ctrl>T";
-#line 321 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_.tooltip = TRANSLATABLE;
-#line 321 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_.callback = (GCallback) _media_page_on_add_tags_gtk_action_callback;
-#line 321 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	add_tags = _tmp20_;
-#line 323 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	add_tags.label = RESOURCES_ADD_TAGS_MENU;
-#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21_ = actions;
-#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21__length1 = actions_length1;
-#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp22_ = add_tags;
+	gboolean sort_order = FALSE;
+	gint sort_by = 0;
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_ = 0;
+	AppWindow* _tmp2_ = NULL;
+	AppWindow* _tmp3_ = NULL;
+	GAction* _tmp4_ = NULL;
+	GSimpleAction* _tmp5_ = NULL;
+	GSimpleAction* _tmp6_ = NULL;
+	ConfigFacade* _tmp7_ = NULL;
+	ConfigFacade* _tmp8_ = NULL;
+	gboolean _tmp9_ = FALSE;
+	GVariant* _tmp10_ = NULL;
+	GAction* _tmp11_ = NULL;
+	GSimpleAction* _tmp12_ = NULL;
+	GSimpleAction* _tmp13_ = NULL;
+	ConfigFacade* _tmp14_ = NULL;
+	ConfigFacade* _tmp15_ = NULL;
+	gboolean _tmp16_ = FALSE;
+	GVariant* _tmp17_ = NULL;
+	GAction* _tmp18_ = NULL;
+	GSimpleAction* _tmp19_ = NULL;
+	GSimpleAction* _tmp20_ = NULL;
+	ConfigFacade* _tmp21_ = NULL;
+	ConfigFacade* _tmp22_ = NULL;
+	gboolean _tmp23_ = FALSE;
+	GVariant* _tmp24_ = NULL;
+	GAction* _tmp25_ = NULL;
+	GSimpleAction* _tmp26_ = NULL;
+	GSimpleAction* _tmp27_ = NULL;
+	ConfigFacade* _tmp28_ = NULL;
+	ConfigFacade* _tmp29_ = NULL;
+	gboolean _tmp30_ = FALSE;
+	GVariant* _tmp31_ = NULL;
+	GAction* _tmp32_ = NULL;
+	GSimpleAction* _tmp33_ = NULL;
+	GSimpleAction* _tmp34_ = NULL;
+	gint _tmp35_ = 0;
+	gchar* _tmp36_ = NULL;
+	gchar* _tmp37_ = NULL;
+	GVariant* _tmp38_ = NULL;
+	const gchar* _tmp39_ = NULL;
+	gboolean _tmp40_ = FALSE;
+	GAction* _tmp41_ = NULL;
+	GSimpleAction* _tmp42_ = NULL;
+	GSimpleAction* _tmp43_ = NULL;
+	GVariant* _tmp44_ = NULL;
+	RawDeveloper d = 0;
+	ConfigFacade* _tmp45_ = NULL;
+	ConfigFacade* _tmp46_ = NULL;
+	RawDeveloper _tmp47_ = 0;
+	RawDeveloper _tmp48_ = 0;
+	GSimpleAction* action = NULL;
+	GAction* _tmp49_ = NULL;
+	GSimpleAction* _tmp50_ = NULL;
+	const gchar* _tmp51_ = NULL;
+	RawDeveloper _tmp52_ = 0;
+	GSimpleAction* _tmp53_ = NULL;
+	GVariant* _tmp54_ = NULL;
 #line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add303 (&actions, &actions_length1, &_actions_size_, &_tmp22_);
-#line 328 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.name = "AddTagsContextMenu";
-#line 328 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.stock_id = NULL;
-#line 328 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.label = TRANSLATABLE;
-#line 328 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.accelerator = "<Ctrl>A";
-#line 328 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.tooltip = TRANSLATABLE;
-#line 328 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.callback = (GCallback) _media_page_on_add_tags_gtk_action_callback;
-#line 328 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	add_tags_context_menu = _tmp23_;
-#line 330 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	add_tags_context_menu.label = RESOURCES_ADD_TAGS_CONTEXT_MENU;
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
+#line 325 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	PAGE_CLASS (media_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
+#line 329 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_get_config_photos_sort (self, &_tmp0_, &_tmp1_);
+#line 329 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	sort_order = _tmp0_;
+#line 329 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	sort_by = _tmp1_;
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24_ = actions;
+	_tmp2_ = app_window_get_instance ();
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24__length1 = actions_length1;
+	_tmp3_ = _tmp2_;
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp25_ = add_tags_context_menu;
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_action_map_get_type (), GActionMap), MEDIA_PAGE_entries, G_N_ELEMENTS (MEDIA_PAGE_entries), self);
 #line 331 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add304 (&actions, &actions_length1, &_actions_size_, &_tmp25_);
+	_g_object_unref0 (_tmp3_);
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp4_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp4_) : NULL;
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp5_ == NULL) {
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_g_object_unref0 (_tmp4_);
+#line 2758 "MediaPage.c"
+	}
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp6_ = _tmp5_;
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp7_ = config_facade_get_instance ();
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp8_ = _tmp7_;
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp9_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp10_ = _variant_new19 (_tmp9_);
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp6_, _tmp10_);
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp10_);
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp8_);
+#line 332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp6_);
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_.name = "ModifyTags";
+	_tmp11_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_.stock_id = NULL;
+	_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp11_) : NULL;
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_.label = TRANSLATABLE;
+	if (_tmp12_ == NULL) {
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_.accelerator = "<Ctrl>M";
+		_g_object_unref0 (_tmp11_);
+#line 2786 "MediaPage.c"
+	}
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_.tooltip = TRANSLATABLE;
+	_tmp13_ = _tmp12_;
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_.callback = (GCallback) _media_page_on_modify_tags_gtk_action_callback;
+	_tmp14_ = config_facade_get_instance ();
 #line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	modify_tags = _tmp26_;
+	_tmp15_ = _tmp14_;
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp16_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp17_ = _variant_new20 (_tmp16_);
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp13_, _tmp17_);
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp17_);
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp15_);
+#line 333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp13_);
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp18_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp19_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp18_) : NULL;
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp19_ == NULL) {
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_g_object_unref0 (_tmp18_);
+#line 2814 "MediaPage.c"
+	}
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp20_ = _tmp19_;
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp21_ = config_facade_get_instance ();
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp22_ = _tmp21_;
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp23_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp24_ = _variant_new21 (_tmp23_);
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp20_, _tmp24_);
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp24_);
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp22_);
+#line 334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp20_);
 #line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	modify_tags.label = RESOURCES_MODIFY_TAGS_MENU;
+	_tmp25_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags");
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp26_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp25_) : NULL;
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp26_ == NULL) {
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_g_object_unref0 (_tmp25_);
+#line 2842 "MediaPage.c"
+	}
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp27_ = _tmp26_;
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp28_ = config_facade_get_instance ();
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp29_ = _tmp28_;
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp30_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp31_ = _variant_new22 (_tmp30_);
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp27_, _tmp31_);
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp31_);
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp29_);
+#line 335 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp27_);
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_ = actions;
+	_tmp32_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy");
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27__length1 = actions_length1;
+	_tmp33_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp32_) : NULL;
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp28_ = modify_tags;
+	if (_tmp33_ == NULL) {
 #line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add305 (&actions, &actions_length1, &_actions_size_, &_tmp28_);
-#line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp29_.name = "IncreaseSize";
+		_g_object_unref0 (_tmp32_);
+#line 2870 "MediaPage.c"
+	}
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp34_ = _tmp33_;
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp35_ = sort_by;
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp36_ = g_strdup_printf ("%d", _tmp35_);
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp37_ = _tmp36_;
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp38_ = _variant_new23 (_tmp37_);
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp34_, _tmp38_);
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp38_);
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_free0 (_tmp37_);
+#line 336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp34_);
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp40_ = sort_order;
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp40_) {
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp39_ = "'ascending'";
+#line 2896 "MediaPage.c"
+	} else {
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp39_ = "'descending'";
+#line 2900 "MediaPage.c"
+	}
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp41_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort");
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp42_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp41_) : NULL;
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp42_ == NULL) {
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_g_object_unref0 (_tmp41_);
+#line 2910 "MediaPage.c"
+	}
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp43_ = _tmp42_;
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp44_ = _variant_new24 (_tmp39_);
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp43_, _tmp44_);
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp44_);
+#line 337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp43_);
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp29_.stock_id = RESOURCES_ZOOM_IN_LABEL;
+	_tmp45_ = config_facade_get_instance ();
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp29_.label = TRANSLATABLE;
+	_tmp46_ = _tmp45_;
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp29_.accelerator = "<Ctrl>plus";
+	_tmp47_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp29_.tooltip = TRANSLATABLE;
+	_tmp48_ = _tmp47_;
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp29_.callback = (GCallback) _media_page_on_increase_size_gtk_action_callback;
+	_g_object_unref0 (_tmp46_);
 #line 338 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	increase_size = _tmp29_;
+	d = _tmp48_;
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp49_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp50_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp49_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp49_) : NULL;
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp50_ == NULL) {
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_g_object_unref0 (_tmp49_);
+#line 2942 "MediaPage.c"
+	}
+#line 339 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	action = _tmp50_;
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_ = _ ("Zoom _In");
+	_tmp52_ = d;
 #line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	increase_size.label = _tmp30_;
-#line 341 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp31_ = _ ("Increase the magnification of the thumbnails");
-#line 341 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	increase_size.tooltip = _tmp31_;
-#line 342 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_ = actions;
-#line 342 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32__length1 = actions_length1;
-#line 342 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp33_ = increase_size;
-#line 342 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add306 (&actions, &actions_length1, &_actions_size_, &_tmp33_);
-#line 344 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp34_.name = "DecreaseSize";
-#line 344 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp34_.stock_id = RESOURCES_ZOOM_OUT_LABEL;
-#line 344 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp34_.label = TRANSLATABLE;
-#line 344 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp34_.accelerator = "<Ctrl>minus";
-#line 344 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp34_.tooltip = TRANSLATABLE;
-#line 344 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp34_.callback = (GCallback) _media_page_on_decrease_size_gtk_action_callback;
-#line 344 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	decrease_size = _tmp34_;
-#line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp35_ = _ ("Zoom _Out");
-#line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	decrease_size.label = _tmp35_;
-#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp36_ = _ ("Decrease the magnification of the thumbnails");
-#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	decrease_size.tooltip = _tmp36_;
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp37_ = actions;
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp37__length1 = actions_length1;
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp38_ = decrease_size;
-#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add307 (&actions, &actions_length1, &_actions_size_, &_tmp38_);
-#line 350 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp39_.name = "Flag";
-#line 350 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp39_.stock_id = NULL;
-#line 350 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp39_.label = TRANSLATABLE;
-#line 350 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp39_.accelerator = "<Ctrl>G";
-#line 350 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp39_.tooltip = TRANSLATABLE;
-#line 350 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp39_.callback = (GCallback) _media_page_on_flag_unflag_gtk_action_callback;
-#line 350 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	flag = _tmp39_;
-#line 351 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	flag.label = RESOURCES_FLAG_MENU;
-#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp40_ = actions;
-#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp40__length1 = actions_length1;
-#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp41_ = flag;
-#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add308 (&actions, &actions_length1, &_actions_size_, &_tmp41_);
-#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp42_.name = "Rate";
-#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp42_.stock_id = NULL;
-#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp42_.label = TRANSLATABLE;
-#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp42_.accelerator = NULL;
-#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp42_.tooltip = NULL;
-#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp42_.callback = (GCallback) NULL;
-#line 354 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	set_rating = _tmp42_;
-#line 355 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	set_rating.label = RESOURCES_RATING_MENU;
-#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp43_ = actions;
-#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp43__length1 = actions_length1;
-#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp44_ = set_rating;
-#line 356 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add309 (&actions, &actions_length1, &_actions_size_, &_tmp44_);
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp45_.name = "IncreaseRating";
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp45_.stock_id = NULL;
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp45_.label = TRANSLATABLE;
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp45_.accelerator = "greater";
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp45_.tooltip = TRANSLATABLE;
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp45_.callback = (GCallback) _media_page_on_increase_rating_gtk_action_callback;
-#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	increase_rating = _tmp45_;
-#line 360 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	increase_rating.label = RESOURCES_INCREASE_RATING_MENU;
-#line 361 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp46_ = actions;
-#line 361 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp46__length1 = actions_length1;
-#line 361 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp47_ = increase_rating;
-#line 361 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add310 (&actions, &actions_length1, &_actions_size_, &_tmp47_);
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp48_.name = "DecreaseRating";
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp48_.stock_id = NULL;
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp48_.label = TRANSLATABLE;
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp48_.accelerator = "less";
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp48_.tooltip = TRANSLATABLE;
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp48_.callback = (GCallback) _media_page_on_decrease_rating_gtk_action_callback;
-#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	decrease_rating = _tmp48_;
-#line 365 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	decrease_rating.label = RESOURCES_DECREASE_RATING_MENU;
-#line 366 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp49_ = actions;
-#line 366 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp49__length1 = actions_length1;
-#line 366 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp50_ = decrease_rating;
-#line 366 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add311 (&actions, &actions_length1, &_actions_size_, &_tmp50_);
-#line 368 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp51_.name = "RateRejected";
-#line 368 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp51_.stock_id = NULL;
-#line 368 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp51_.label = TRANSLATABLE;
-#line 368 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp51_.accelerator = "9";
-#line 368 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp51_.tooltip = TRANSLATABLE;
-#line 368 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp51_.callback = (GCallback) _media_page_on_rate_rejected_gtk_action_callback;
-#line 368 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_rejected = _tmp51_;
-#line 370 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp52_ = resources_rating_menu (RATING_REJECTED);
-#line 370 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_rejected.label = _tmp52_;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp53_ = actions;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp53__length1 = actions_length1;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp54_ = rate_rejected;
-#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add312 (&actions, &actions_length1, &_actions_size_, &_tmp54_);
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp55_.name = "RateUnrated";
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp55_.stock_id = NULL;
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp55_.label = TRANSLATABLE;
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp55_.accelerator = "0";
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp55_.tooltip = TRANSLATABLE;
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp55_.callback = (GCallback) _media_page_on_rate_unrated_gtk_action_callback;
-#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_unrated = _tmp55_;
-#line 375 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp56_ = resources_rating_menu (RATING_UNRATED);
-#line 375 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_unrated.label = _tmp56_;
-#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp57_ = actions;
-#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp57__length1 = actions_length1;
-#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp58_ = rate_unrated;
-#line 376 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add313 (&actions, &actions_length1, &_actions_size_, &_tmp58_);
-#line 378 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp59_.name = "RateOne";
-#line 378 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp59_.stock_id = NULL;
-#line 378 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp59_.label = TRANSLATABLE;
-#line 378 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp59_.accelerator = "1";
-#line 378 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp59_.tooltip = TRANSLATABLE;
-#line 378 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp59_.callback = (GCallback) _media_page_on_rate_one_gtk_action_callback;
-#line 378 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_one = _tmp59_;
-#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp60_ = resources_rating_menu (RATING_ONE);
-#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_one.label = _tmp60_;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp61_ = actions;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp61__length1 = actions_length1;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp62_ = rate_one;
-#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add314 (&actions, &actions_length1, &_actions_size_, &_tmp62_);
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp63_.name = "RateTwo";
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp63_.stock_id = NULL;
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp63_.label = TRANSLATABLE;
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp63_.accelerator = "2";
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp63_.tooltip = TRANSLATABLE;
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp63_.callback = (GCallback) _media_page_on_rate_two_gtk_action_callback;
-#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_two = _tmp63_;
-#line 385 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp64_ = resources_rating_menu (RATING_TWO);
-#line 385 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_two.label = _tmp64_;
-#line 386 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp65_ = actions;
-#line 386 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp65__length1 = actions_length1;
-#line 386 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp66_ = rate_two;
-#line 386 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add315 (&actions, &actions_length1, &_actions_size_, &_tmp66_);
-#line 388 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp67_.name = "RateThree";
-#line 388 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp67_.stock_id = NULL;
-#line 388 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp67_.label = TRANSLATABLE;
-#line 388 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp67_.accelerator = "3";
-#line 388 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp67_.tooltip = TRANSLATABLE;
-#line 388 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp67_.callback = (GCallback) _media_page_on_rate_three_gtk_action_callback;
-#line 388 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_three = _tmp67_;
-#line 390 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp68_ = resources_rating_menu (RATING_THREE);
-#line 390 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_three.label = _tmp68_;
-#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp69_ = actions;
-#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp69__length1 = actions_length1;
-#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp70_ = rate_three;
-#line 391 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add316 (&actions, &actions_length1, &_actions_size_, &_tmp70_);
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp71_.name = "RateFour";
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp71_.stock_id = NULL;
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp71_.label = TRANSLATABLE;
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp71_.accelerator = "4";
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp71_.tooltip = TRANSLATABLE;
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp71_.callback = (GCallback) _media_page_on_rate_four_gtk_action_callback;
-#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_four = _tmp71_;
-#line 395 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp72_ = resources_rating_menu (RATING_FOUR);
-#line 395 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_four.label = _tmp72_;
-#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp73_ = actions;
-#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp73__length1 = actions_length1;
-#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp74_ = rate_four;
-#line 396 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add317 (&actions, &actions_length1, &_actions_size_, &_tmp74_);
-#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp75_.name = "RateFive";
-#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp75_.stock_id = NULL;
-#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp75_.label = TRANSLATABLE;
-#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp75_.accelerator = "5";
-#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp75_.tooltip = TRANSLATABLE;
-#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp75_.callback = (GCallback) _media_page_on_rate_five_gtk_action_callback;
-#line 398 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_five = _tmp75_;
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp76_ = resources_rating_menu (RATING_FIVE);
-#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	rate_five.label = _tmp76_;
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp77_ = actions;
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp77__length1 = actions_length1;
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp78_ = rate_five;
-#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add318 (&actions, &actions_length1, &_actions_size_, &_tmp78_);
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp79_.name = "EditTitle";
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp79_.stock_id = NULL;
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp79_.label = TRANSLATABLE;
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp79_.accelerator = "F2";
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp79_.tooltip = TRANSLATABLE;
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp79_.callback = (GCallback) _media_page_on_edit_title_gtk_action_callback;
-#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	edit_title = _tmp79_;
-#line 405 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	edit_title.label = RESOURCES_EDIT_TITLE_MENU;
-#line 406 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp80_ = actions;
-#line 406 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp80__length1 = actions_length1;
-#line 406 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp81_ = edit_title;
-#line 406 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add319 (&actions, &actions_length1, &_actions_size_, &_tmp81_);
-#line 408 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp82_.name = "EditComment";
-#line 408 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp82_.stock_id = NULL;
-#line 408 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp82_.label = TRANSLATABLE;
-#line 408 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp82_.accelerator = "F3";
-#line 408 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp82_.tooltip = TRANSLATABLE;
-#line 408 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp82_.callback = (GCallback) _media_page_on_edit_comment_gtk_action_callback;
-#line 408 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	edit_comment = _tmp82_;
-#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	edit_comment.label = RESOURCES_EDIT_COMMENT_MENU;
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp83_ = actions;
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp83__length1 = actions_length1;
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp84_ = edit_comment;
-#line 411 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add320 (&actions, &actions_length1, &_actions_size_, &_tmp84_);
-#line 413 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp85_.name = "SortPhotos";
-#line 413 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp85_.stock_id = NULL;
-#line 413 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp85_.label = TRANSLATABLE;
-#line 413 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp85_.accelerator = NULL;
-#line 413 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp85_.tooltip = NULL;
-#line 413 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp85_.callback = (GCallback) NULL;
-#line 413 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_photos = _tmp85_;
-#line 414 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp86_ = _ ("Sort _Photos");
-#line 414 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_photos.label = _tmp86_;
-#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp87_ = actions;
-#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp87__length1 = actions_length1;
-#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp88_ = sort_photos;
-#line 415 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add321 (&actions, &actions_length1, &_actions_size_, &_tmp88_);
-#line 417 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp89_.name = "FilterPhotos";
-#line 417 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp89_.stock_id = NULL;
-#line 417 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp89_.label = TRANSLATABLE;
-#line 417 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp89_.accelerator = NULL;
-#line 417 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp89_.tooltip = NULL;
-#line 417 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp89_.callback = (GCallback) NULL;
-#line 417 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	filter_photos = _tmp89_;
-#line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	filter_photos.label = RESOURCES_FILTER_PHOTOS_MENU;
-#line 419 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp90_ = actions;
-#line 419 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp90__length1 = actions_length1;
-#line 419 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp91_ = filter_photos;
-#line 419 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add322 (&actions, &actions_length1, &_actions_size_, &_tmp91_);
-#line 421 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp92_.name = "PlayVideo";
-#line 421 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp92_.stock_id = RESOURCES_PLAY_LABEL;
-#line 421 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp92_.label = TRANSLATABLE;
-#line 421 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp92_.accelerator = "<Ctrl>Y";
-#line 421 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp92_.tooltip = TRANSLATABLE;
-#line 421 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp92_.callback = (GCallback) _media_page_on_play_video_gtk_action_callback;
-#line 421 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	play = _tmp92_;
-#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp93_ = _ ("_Play Video");
-#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	play.label = _tmp93_;
-#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp94_ = _ ("Open the selected videos in the system video player");
-#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	play.tooltip = _tmp94_;
-#line 425 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp95_ = actions;
-#line 425 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp95__length1 = actions_length1;
-#line 425 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp96_ = play;
-#line 425 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add323 (&actions, &actions_length1, &_actions_size_, &_tmp96_);
-#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp97_.name = "RawDeveloper";
-#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp97_.stock_id = NULL;
-#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp97_.label = TRANSLATABLE;
-#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp97_.accelerator = NULL;
-#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp97_.tooltip = NULL;
-#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp97_.callback = (GCallback) NULL;
-#line 427 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	raw_developer = _tmp97_;
-#line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp98_ = _ ("_Developer");
-#line 428 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	raw_developer.label = _tmp98_;
-#line 429 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp99_ = actions;
-#line 429 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp99__length1 = actions_length1;
-#line 429 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp100_ = raw_developer;
-#line 429 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add324 (&actions, &actions_length1, &_actions_size_, &_tmp100_);
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp101_.name = "RawDeveloperShotwell";
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp101_.stock_id = NULL;
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp101_.label = TRANSLATABLE;
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp101_.accelerator = NULL;
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp101_.tooltip = TRANSLATABLE;
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp101_.callback = (GCallback) _media_page_on_raw_developer_shotwell_gtk_action_callback;
-#line 433 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	dev_shotwell = _tmp101_;
-#line 435 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp102_ = _ ("Shotwell");
-#line 435 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	dev_shotwell.label = _tmp102_;
-#line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp103_ = actions;
-#line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp103__length1 = actions_length1;
-#line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp104_ = dev_shotwell;
-#line 436 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add325 (&actions, &actions_length1, &_actions_size_, &_tmp104_);
-#line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp105_.name = "RawDeveloperCamera";
-#line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp105_.stock_id = NULL;
-#line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp105_.label = TRANSLATABLE;
-#line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp105_.accelerator = NULL;
-#line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp105_.tooltip = TRANSLATABLE;
-#line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp105_.callback = (GCallback) _media_page_on_raw_developer_camera_gtk_action_callback;
-#line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	dev_camera = _tmp105_;
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp106_ = _ ("Camera");
-#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	dev_camera.label = _tmp106_;
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp107_ = actions;
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp107__length1 = actions_length1;
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp108_ = dev_camera;
-#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add326 (&actions, &actions_length1, &_actions_size_, &_tmp108_);
-#line 443 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp109_ = actions;
-#line 443 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp109__length1 = actions_length1;
-#line 443 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (result_length1) {
-#line 443 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*result_length1 = _tmp109__length1;
-#line 4035 "MediaPage.c"
-	}
-#line 443 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = _tmp109_;
-#line 443 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	return result;
-#line 4041 "MediaPage.c"
-}
-
-
-static void _media_page_on_display_titles_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_display_titles ((MediaPage*) self, action);
-#line 4048 "MediaPage.c"
-}
-
-
-static void _vala_array_add327 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 4059 "MediaPage.c"
-	}
-#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 4063 "MediaPage.c"
-}
-
-
-static void _media_page_on_display_comments_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_display_comments ((MediaPage*) self, action);
-#line 4070 "MediaPage.c"
-}
-
-
-static void _vala_array_add328 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 4081 "MediaPage.c"
-	}
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 4085 "MediaPage.c"
-}
-
-
-static void _media_page_on_display_ratings_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_display_ratings ((MediaPage*) self, action);
-#line 4092 "MediaPage.c"
-}
-
-
-static void _vala_array_add329 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 4103 "MediaPage.c"
-	}
-#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 4107 "MediaPage.c"
-}
-
-
-static void _media_page_on_display_tags_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_display_tags ((MediaPage*) self, action);
-#line 4114 "MediaPage.c"
-}
-
-
-static void _vala_array_add330 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 4125 "MediaPage.c"
-	}
-#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 4129 "MediaPage.c"
-}
-
-
-static GtkToggleActionEntry* media_page_real_init_collect_toggle_action_entries (Page* base, int* result_length1) {
-	MediaPage * self;
-	GtkToggleActionEntry* result = NULL;
-	GtkToggleActionEntry* toggle_actions = NULL;
-	gint _tmp0_ = 0;
-	GtkToggleActionEntry* _tmp1_ = NULL;
-	gint toggle_actions_length1 = 0;
-	gint _toggle_actions_size_ = 0;
-	GtkToggleActionEntry titles = {0};
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	GtkToggleActionEntry _tmp5_ = {0};
-	GtkToggleActionEntry _tmp6_ = {0};
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkToggleActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkToggleActionEntry _tmp10_ = {0};
-	GtkToggleActionEntry comments = {0};
-	ConfigFacade* _tmp11_ = NULL;
-	ConfigFacade* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	GtkToggleActionEntry _tmp14_ = {0};
-	GtkToggleActionEntry _tmp15_ = {0};
-	const gchar* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	GtkToggleActionEntry* _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
-	GtkToggleActionEntry _tmp19_ = {0};
-	GtkToggleActionEntry ratings = {0};
-	ConfigFacade* _tmp20_ = NULL;
-	ConfigFacade* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	GtkToggleActionEntry _tmp23_ = {0};
-	GtkToggleActionEntry _tmp24_ = {0};
-	GtkToggleActionEntry* _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	GtkToggleActionEntry _tmp26_ = {0};
-	GtkToggleActionEntry tags = {0};
-	ConfigFacade* _tmp27_ = NULL;
-	ConfigFacade* _tmp28_ = NULL;
-	gboolean _tmp29_ = FALSE;
-	GtkToggleActionEntry _tmp30_ = {0};
-	GtkToggleActionEntry _tmp31_ = {0};
-	const gchar* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-	GtkToggleActionEntry* _tmp34_ = NULL;
-	gint _tmp34__length1 = 0;
-	GtkToggleActionEntry _tmp35_ = {0};
-	GtkToggleActionEntry* _tmp36_ = NULL;
-	gint _tmp36__length1 = 0;
-#line 446 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 447 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = PAGE_CLASS (media_page_parent_class)->init_collect_toggle_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), &_tmp0_);
-#line 447 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	toggle_actions = _tmp1_;
-#line 447 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	toggle_actions_length1 = _tmp0_;
-#line 447 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_toggle_actions_size_ = toggle_actions_length1;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = config_facade_get_instance ();
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.name = "ViewTitle";
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.stock_id = NULL;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.accelerator = "<Ctrl><Shift>T";
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.tooltip = TRANSLATABLE;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.callback = (GCallback) _media_page_on_display_titles_gtk_action_callback;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_.is_active = _tmp4_;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = _tmp5_;
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp3_);
-#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	titles = _tmp6_;
-#line 451 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = _ ("_Titles");
-#line 451 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	titles.label = _tmp7_;
-#line 452 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = _ ("Display the title of each photo");
-#line 452 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	titles.tooltip = _tmp8_;
-#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = toggle_actions;
-#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9__length1 = toggle_actions_length1;
-#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = titles;
-#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add327 (&toggle_actions, &toggle_actions_length1, &_toggle_actions_size_, &_tmp10_);
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = config_facade_get_instance ();
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = _tmp11_;
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.name = "ViewComment";
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.stock_id = NULL;
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.label = TRANSLATABLE;
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.accelerator = "<Ctrl><Shift>C";
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.tooltip = TRANSLATABLE;
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.callback = (GCallback) _media_page_on_display_comments_gtk_action_callback;
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_.is_active = _tmp13_;
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = _tmp14_;
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp12_);
-#line 455 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	comments = _tmp15_;
-#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16_ = _ ("_Comments");
-#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	comments.label = _tmp16_;
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_ = _ ("Display the comment of each photo");
-#line 458 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	comments.tooltip = _tmp17_;
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_ = toggle_actions;
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18__length1 = toggle_actions_length1;
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp19_ = comments;
-#line 459 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add328 (&toggle_actions, &toggle_actions_length1, &_toggle_actions_size_, &_tmp19_);
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_ = config_facade_get_instance ();
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21_ = _tmp20_;
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp22_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.name = "ViewRatings";
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.stock_id = NULL;
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.label = TRANSLATABLE;
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.accelerator = "<Ctrl><Shift>N";
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.tooltip = TRANSLATABLE;
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.callback = (GCallback) _media_page_on_display_ratings_gtk_action_callback;
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_.is_active = _tmp22_;
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24_ = _tmp23_;
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp21_);
-#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	ratings = _tmp24_;
-#line 463 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	ratings.label = RESOURCES_VIEW_RATINGS_MENU;
-#line 464 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	ratings.tooltip = RESOURCES_VIEW_RATINGS_TOOLTIP;
-#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp25_ = toggle_actions;
-#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp25__length1 = toggle_actions_length1;
-#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_ = ratings;
-#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add329 (&toggle_actions, &toggle_actions_length1, &_toggle_actions_size_, &_tmp26_);
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_ = config_facade_get_instance ();
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp28_ = _tmp27_;
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp29_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_.name = "ViewTags";
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_.stock_id = NULL;
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_.label = TRANSLATABLE;
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_.accelerator = "<Ctrl><Shift>G";
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_.tooltip = TRANSLATABLE;
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_.callback = (GCallback) _media_page_on_display_tags_gtk_action_callback;
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_.is_active = _tmp29_;
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp31_ = _tmp30_;
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp28_);
-#line 467 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	tags = _tmp31_;
-#line 469 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_ = _ ("Ta_gs");
-#line 469 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	tags.label = _tmp32_;
-#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp33_ = _ ("Display each photo’s tags");
-#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	tags.tooltip = _tmp33_;
-#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp34_ = toggle_actions;
-#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp34__length1 = toggle_actions_length1;
-#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp35_ = tags;
-#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add330 (&toggle_actions, &toggle_actions_length1, &_toggle_actions_size_, &_tmp35_);
-#line 473 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp36_ = toggle_actions;
-#line 473 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp36__length1 = toggle_actions_length1;
-#line 473 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (result_length1) {
-#line 473 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*result_length1 = _tmp36__length1;
-#line 4367 "MediaPage.c"
-	}
-#line 473 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = _tmp36_;
-#line 473 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	return result;
-#line 4373 "MediaPage.c"
-}
-
-
-static void _vala_array_add331 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4384 "MediaPage.c"
-	}
-#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 4388 "MediaPage.c"
-}
-
-
-static void _vala_array_add332 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 494 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 494 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 494 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4399 "MediaPage.c"
-	}
-#line 494 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 4403 "MediaPage.c"
-}
-
-
-static void _vala_array_add333 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4414 "MediaPage.c"
-	}
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 4418 "MediaPage.c"
-}
-
-
-static void _vala_array_add334 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 506 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 506 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 506 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4429 "MediaPage.c"
-	}
-#line 506 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 4433 "MediaPage.c"
-}
-
-
-static void _media_page_on_sort_changed_gtk_radio_action_callback (GtkAction* action, GtkAction* current, gpointer self) {
-#line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_on_sort_changed ((MediaPage*) self);
-#line 4440 "MediaPage.c"
-}
-
-
-static void _vala_array_add335 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 517 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 517 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 517 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4451 "MediaPage.c"
-	}
-#line 517 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 4455 "MediaPage.c"
-}
-
-
-static void _vala_array_add336 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if ((*length) == (*size)) {
-#line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4466 "MediaPage.c"
-	}
-#line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	(*array)[(*length)++] = *value;
-#line 4470 "MediaPage.c"
-}
-
-
-static void media_page_real_register_radio_actions (Page* base, GtkActionGroup* action_group) {
-	MediaPage * self;
-	gboolean sort_order = FALSE;
-	gint sort_by = 0;
-	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
-	GtkRadioActionEntry* sort_crit_actions = NULL;
-	GtkRadioActionEntry* _tmp2_ = NULL;
-	gint sort_crit_actions_length1 = 0;
-	gint _sort_crit_actions_size_ = 0;
-	GtkRadioActionEntry by_title = {0};
-	GtkRadioActionEntry _tmp3_ = {0};
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GtkRadioActionEntry* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	GtkRadioActionEntry _tmp7_ = {0};
-	GtkRadioActionEntry by_date = {0};
-	GtkRadioActionEntry _tmp8_ = {0};
-	const gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	GtkRadioActionEntry* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	GtkRadioActionEntry _tmp12_ = {0};
-	GtkRadioActionEntry by_rating = {0};
-	GtkRadioActionEntry _tmp13_ = {0};
-	const gchar* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	GtkRadioActionEntry* _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	GtkRadioActionEntry _tmp17_ = {0};
-	GtkRadioActionEntry by_filename = {0};
-	GtkRadioActionEntry _tmp18_ = {0};
-	const gchar* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	GtkRadioActionEntry* _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
-	GtkRadioActionEntry _tmp22_ = {0};
-	GtkActionGroup* _tmp23_ = NULL;
-	GtkRadioActionEntry* _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
-	gint _tmp25_ = 0;
-	GtkRadioActionEntry* sort_order_actions = NULL;
-	GtkRadioActionEntry* _tmp26_ = NULL;
-	gint sort_order_actions_length1 = 0;
-	gint _sort_order_actions_size_ = 0;
-	GtkRadioActionEntry ascending = {0};
-	GtkRadioActionEntry _tmp27_ = {0};
-	const gchar* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
-	GtkRadioActionEntry* _tmp30_ = NULL;
-	gint _tmp30__length1 = 0;
-	GtkRadioActionEntry _tmp31_ = {0};
-	GtkRadioActionEntry descending = {0};
-	GtkRadioActionEntry _tmp32_ = {0};
-	const gchar* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	GtkRadioActionEntry* _tmp35_ = NULL;
-	gint _tmp35__length1 = 0;
-	GtkRadioActionEntry _tmp36_ = {0};
-	gint _tmp37_ = 0;
-	gboolean _tmp38_ = FALSE;
-	GtkActionGroup* _tmp39_ = NULL;
-	GtkRadioActionEntry* _tmp40_ = NULL;
-	gint _tmp40__length1 = 0;
-	GtkActionGroup* _tmp41_ = NULL;
-#line 476 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 476 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	media_page_get_config_photos_sort (self, &_tmp0_, &_tmp1_);
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_order = _tmp0_;
-#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_by = _tmp1_;
-#line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = g_new0 (GtkRadioActionEntry, 0);
-#line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_crit_actions = _tmp2_;
-#line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_crit_actions_length1 = 0;
-#line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_sort_crit_actions_size_ = sort_crit_actions_length1;
-#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_.name = "SortByTitle";
-#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_.stock_id = NULL;
-#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_.label = TRANSLATABLE;
-#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_.accelerator = NULL;
-#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_.tooltip = TRANSLATABLE;
-#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_.value = (gint) MEDIA_PAGE_SORT_BY_TITLE;
-#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	by_title = _tmp3_;
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp4_ = _ ("By _Title");
-#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	by_title.label = _tmp4_;
-#line 487 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp5_ = _ ("Sort photos by title");
-#line 487 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	by_title.tooltip = _tmp5_;
-#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6_ = sort_crit_actions;
-#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp6__length1 = sort_crit_actions_length1;
-#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp7_ = by_title;
-#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add331 (&sort_crit_actions, &sort_crit_actions_length1, &_sort_crit_actions_size_, &_tmp7_);
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_.name = "SortByExposureDate";
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_.stock_id = NULL;
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_.label = TRANSLATABLE;
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_.accelerator = NULL;
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_.tooltip = TRANSLATABLE;
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_.value = (gint) MEDIA_PAGE_SORT_BY_EXPOSURE_DATE;
-#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	by_date = _tmp8_;
-#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = _ ("By Exposure _Date");
-#line 492 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	by_date.label = _tmp9_;
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = _ ("Sort photos by exposure date");
-#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	by_date.tooltip = _tmp10_;
-#line 494 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11_ = sort_crit_actions;
-#line 494 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp11__length1 = sort_crit_actions_length1;
-#line 494 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp12_ = by_date;
-#line 494 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add332 (&sort_crit_actions, &sort_crit_actions_length1, &_sort_crit_actions_size_, &_tmp12_);
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_.name = "SortByRating";
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_.stock_id = NULL;
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_.label = TRANSLATABLE;
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_.accelerator = NULL;
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_.tooltip = TRANSLATABLE;
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp13_.value = (gint) MEDIA_PAGE_SORT_BY_RATING;
-#line 496 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	by_rating = _tmp13_;
-#line 498 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp14_ = _ ("By _Rating");
-#line 498 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	by_rating.label = _tmp14_;
-#line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp15_ = _ ("Sort photos by rating");
-#line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	by_rating.tooltip = _tmp15_;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16_ = sort_crit_actions;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp16__length1 = sort_crit_actions_length1;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp17_ = by_rating;
-#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add333 (&sort_crit_actions, &sort_crit_actions_length1, &_sort_crit_actions_size_, &_tmp17_);
-#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_.name = "SortByFilename";
-#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_.stock_id = NULL;
-#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_.label = TRANSLATABLE;
-#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_.accelerator = NULL;
-#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_.tooltip = TRANSLATABLE;
-#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp18_.value = (gint) MEDIA_PAGE_SORT_BY_FILENAME;
-#line 502 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	by_filename = _tmp18_;
-#line 504 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp19_ = _ ("By _Filename");
-#line 504 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	by_filename.label = _tmp19_;
-#line 505 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp20_ = _ ("Sort photos by filename");
-#line 505 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	by_filename.tooltip = _tmp20_;
-#line 506 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21_ = sort_crit_actions;
-#line 506 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp21__length1 = sort_crit_actions_length1;
-#line 506 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp22_ = by_filename;
-#line 506 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add334 (&sort_crit_actions, &sort_crit_actions_length1, &_sort_crit_actions_size_, &_tmp22_);
-#line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp23_ = action_group;
-#line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24_ = sort_crit_actions;
-#line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24__length1 = sort_crit_actions_length1;
-#line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp25_ = sort_by;
-#line 508 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_action_group_add_radio_actions (_tmp23_, _tmp24_, _tmp24__length1, _tmp25_, (GCallback) _media_page_on_sort_changed_gtk_radio_action_callback, self);
-#line 511 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp26_ = g_new0 (GtkRadioActionEntry, 0);
-#line 511 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_order_actions = _tmp26_;
-#line 511 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_order_actions_length1 = 0;
-#line 511 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_sort_order_actions_size_ = sort_order_actions_length1;
-#line 513 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_.name = "SortAscending";
-#line 513 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_.stock_id = RESOURCES_SORT_ASCENDING_LABEL;
-#line 513 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_.label = TRANSLATABLE;
-#line 513 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_.accelerator = NULL;
-#line 513 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_.tooltip = TRANSLATABLE;
-#line 513 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp27_.value = MEDIA_PAGE_SORT_ORDER_ASCENDING;
-#line 513 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	ascending = _tmp27_;
-#line 515 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp28_ = _ ("_Ascending");
-#line 515 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	ascending.label = _tmp28_;
-#line 516 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp29_ = _ ("Sort photos in an ascending order");
-#line 516 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	ascending.tooltip = _tmp29_;
-#line 517 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30_ = sort_order_actions;
-#line 517 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp30__length1 = sort_order_actions_length1;
-#line 517 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp31_ = ascending;
-#line 517 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add335 (&sort_order_actions, &sort_order_actions_length1, &_sort_order_actions_size_, &_tmp31_);
-#line 519 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_.name = "SortDescending";
-#line 519 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_.stock_id = RESOURCES_SORT_DESCENDING_LABEL;
-#line 519 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_.label = TRANSLATABLE;
-#line 519 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_.accelerator = NULL;
-#line 519 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_.tooltip = TRANSLATABLE;
-#line 519 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp32_.value = MEDIA_PAGE_SORT_ORDER_DESCENDING;
-#line 519 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	descending = _tmp32_;
-#line 521 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp33_ = _ ("D_escending");
-#line 521 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	descending.label = _tmp33_;
-#line 522 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp34_ = _ ("Sort photos in a descending order");
-#line 522 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	descending.tooltip = _tmp34_;
-#line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp35_ = sort_order_actions;
-#line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp35__length1 = sort_order_actions_length1;
-#line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp36_ = descending;
-#line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_vala_array_add336 (&sort_order_actions, &sort_order_actions_length1, &_sort_order_actions_size_, &_tmp36_);
-#line 526 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp38_ = sort_order;
-#line 526 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp38_) {
-#line 526 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp37_ = MEDIA_PAGE_SORT_ORDER_ASCENDING;
-#line 4762 "MediaPage.c"
+	if (_tmp52_ == RAW_DEVELOPER_SHOTWELL) {
+#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp51_ = "'Shotwell'";
+#line 2952 "MediaPage.c"
 	} else {
-#line 526 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp37_ = MEDIA_PAGE_SORT_ORDER_DESCENDING;
-#line 4766 "MediaPage.c"
+#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp51_ = "'Camera'";
+#line 2956 "MediaPage.c"
 	}
-#line 525 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp39_ = action_group;
-#line 525 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp40_ = sort_order_actions;
-#line 525 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp40__length1 = sort_order_actions_length1;
-#line 525 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_action_group_add_radio_actions (_tmp39_, _tmp40_, _tmp40__length1, _tmp37_, (GCallback) _media_page_on_sort_changed_gtk_radio_action_callback, self);
-#line 528 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp41_ = action_group;
-#line 528 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	PAGE_CLASS (media_page_parent_class)->register_radio_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp41_);
-#line 476 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_order_actions = (g_free (sort_order_actions), NULL);
-#line 476 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	sort_crit_actions = (g_free (sort_crit_actions), NULL);
-#line 4784 "MediaPage.c"
+#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp53_ = action;
+#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp54_ = _variant_new25 (_tmp51_);
+#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp53_, _tmp54_);
+#line 340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp54_);
+#line 324 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (action);
+#line 2968 "MediaPage.c"
 }
 
 
@@ -4804,119 +2988,119 @@ static void media_page_real_update_actions (Page* base, gint selected_count, gin
 	gint _tmp20_ = 0;
 	gint _tmp21_ = 0;
 	gint _tmp22_ = 0;
-#line 531 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 532 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = selected_count;
-#line 532 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Export", _tmp0_ > 0);
-#line 533 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = selected_count;
-#line 533 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditTitle", _tmp1_ > 0);
-#line 534 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = selected_count;
-#line 534 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", _tmp2_ > 0);
-#line 535 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = media_page_get_thumb_size (self);
-#line 535 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = thumbnail_get_MAX_SCALE ();
-#line 535 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 535 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp3_ < _tmp5_);
-#line 536 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = media_page_get_thumb_size (self);
-#line 536 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = thumbnail_get_MIN_SCALE ();
-#line 536 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = _tmp7_;
-#line 536 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp6_ > _tmp8_);
-#line 537 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = selected_count;
-#line 537 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 349 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", _tmp9_ > 0);
-#line 538 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = selected_count;
-#line 538 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash", _tmp10_ > 0);
-#line 540 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = desktop_integration_is_send_to_installed ();
-#line 540 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp11_) {
-#line 4850 "MediaPage.c"
+#line 3034 "MediaPage.c"
 		gint _tmp12_ = 0;
-#line 541 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = selected_count;
-#line 541 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp12_ > 0);
-#line 4856 "MediaPage.c"
+#line 3040 "MediaPage.c"
 	} else {
-#line 543 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 355 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", FALSE);
-#line 4860 "MediaPage.c"
+#line 3044 "MediaPage.c"
 	}
-#line 545 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = selected_count;
-#line 545 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", _tmp13_ > 0);
-#line 546 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
-#line 548 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 360 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_development_menu_item_sensitivity (self);
-#line 550 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = selected_count;
-#line 550 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp15_ == 1) {
-#line 4874 "MediaPage.c"
+#line 3058 "MediaPage.c"
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		DataSource* _tmp18_ = NULL;
 		DataSource* _tmp19_ = NULL;
-#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp17_ = _tmp16_;
-#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = view_collection_get_selected_source_at (_tmp17_, 0);
-#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = _tmp18_;
-#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO);
-#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 4893 "MediaPage.c"
+#line 3077 "MediaPage.c"
 	} else {
-#line 550 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = FALSE;
-#line 4897 "MediaPage.c"
+#line 3081 "MediaPage.c"
 	}
-#line 550 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PlayVideo", _tmp14_);
-#line 553 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = selected_count;
-#line 553 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_flag_action (self, _tmp20_);
-#line 555 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = selected_count;
-#line 555 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp22_ = count;
-#line 555 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 367 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	PAGE_CLASS (media_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp21_, _tmp22_);
-#line 4911 "MediaPage.c"
+#line 3095 "MediaPage.c"
 }
 
 
 static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
-#line 558 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 558 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 4920 "MediaPage.c"
+#line 3104 "MediaPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -4925,25 +3109,25 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 		GeeSet* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = altered;
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = _tmp1_;
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = _tmp2_;
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = _tmp4_;
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_object_it = _tmp5_;
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 4947 "MediaPage.c"
+#line 3131 "MediaPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -4955,65 +3139,65 @@ static void media_page_on_media_altered (MediaPage* self, GeeMap* altered) {
 			Alteration* _tmp13_ = NULL;
 			gboolean _tmp14_ = FALSE;
 			gboolean _tmp15_ = FALSE;
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp6_ = _object_it;
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!_tmp7_) {
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 4967 "MediaPage.c"
+#line 3151 "MediaPage.c"
 			}
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _object_it;
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			object = (DataObject*) _tmp9_;
-#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = altered;
-#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = object;
-#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = gee_map_get (_tmp10_, _tmp11_);
-#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = (Alteration*) _tmp12_;
-#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = alteration_has_detail (_tmp13_, "metadata", "flagged");
-#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
-#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_alteration_unref0 (_tmp13_);
-#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp15_) {
-#line 4991 "MediaPage.c"
+#line 3175 "MediaPage.c"
 				ViewCollection* _tmp16_ = NULL;
 				ViewCollection* _tmp17_ = NULL;
 				gint _tmp18_ = 0;
-#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp17_ = _tmp16_;
-#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp18_ = view_collection_get_selected_count (_tmp17_);
-#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				media_page_update_flag_action (self, _tmp18_);
-#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_data_collection_unref0 (_tmp17_);
-#line 563 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (object);
-#line 563 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5009 "MediaPage.c"
+#line 3193 "MediaPage.c"
 			}
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (object);
-#line 5013 "MediaPage.c"
+#line 3197 "MediaPage.c"
 		}
-#line 559 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_object_it);
-#line 5017 "MediaPage.c"
+#line 3201 "MediaPage.c"
 	}
 }
 
@@ -5028,45 +3212,45 @@ static void media_page_update_rating_sensitivities (MediaPage* self) {
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-#line 568 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 569 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_can_rate_selected (self, RATING_REJECTED);
-#line 569 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 381 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", _tmp0_);
-#line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = media_page_can_rate_selected (self, RATING_UNRATED);
-#line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", _tmp1_);
-#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_can_rate_selected (self, RATING_ONE);
-#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", _tmp2_);
-#line 572 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = media_page_can_rate_selected (self, RATING_TWO);
-#line 572 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 384 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", _tmp3_);
-#line 573 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = media_page_can_rate_selected (self, RATING_THREE);
-#line 573 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 385 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", _tmp4_);
-#line 574 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = media_page_can_rate_selected (self, RATING_FOUR);
-#line 574 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", _tmp5_);
-#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = media_page_can_rate_selected (self, RATING_FIVE);
-#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", _tmp6_);
-#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = media_page_can_increase_selected_rating (self);
-#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", _tmp7_);
-#line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = media_page_can_decrease_selected_rating (self);
-#line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp8_);
-#line 5070 "MediaPage.c"
+#line 3254 "MediaPage.c"
 }
 
 
@@ -5078,46 +3262,39 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 	gint _tmp4_ = 0;
 	gint _tmp5_ = 0;
 	gboolean _tmp6_ = FALSE;
-	gboolean avail_shotwell = FALSE;
-	gboolean avail_camera = FALSE;
 	gboolean is_raw = FALSE;
-	gboolean _tmp41_ = FALSE;
-	gboolean _tmp42_ = FALSE;
-#line 580 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	gboolean _tmp27_ = FALSE;
+#line 392 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = _tmp5_ == 0;
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp6_) {
-#line 582 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", FALSE);
-#line 583 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 5113 "MediaPage.c"
+#line 3294 "MediaPage.c"
 	}
-#line 587 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	avail_shotwell = FALSE;
-#line 588 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	avail_camera = FALSE;
-#line 589 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	is_raw = FALSE;
-#line 5121 "MediaPage.c"
+#line 3298 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -5129,31 +3306,31 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 		gint _tmp12_ = 0;
 		gint _tmp13_ = 0;
 		gint _view_index = 0;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = _tmp7_;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = view_collection_get_selected (_tmp8_);
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = _tmp9_;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp10_;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = _view_list;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13_ = _tmp12_;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp13_;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 5157 "MediaPage.c"
+#line 3334 "MediaPage.c"
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
@@ -5167,398 +3344,107 @@ static void media_page_update_development_menu_item_sensitivity (MediaPage* self
 			Photo* _tmp22_ = NULL;
 			gboolean _tmp23_ = FALSE;
 			Photo* _tmp24_ = NULL;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = _view_index;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp14_ + 1;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _view_index;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = _view_size;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp15_ < _tmp16_)) {
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5183 "MediaPage.c"
+#line 3360 "MediaPage.c"
 			}
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = _view_list;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = _view_index;
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp19_ = gee_list_get (_tmp17_, _tmp18_);
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp19_;
-#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp20_ = view;
-#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp21_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_THUMBNAIL, Thumbnail));
-#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_PHOTO) ? ((Photo*) _tmp21_) : NULL;
-#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp22_ == NULL) {
-#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 5203 "MediaPage.c"
+#line 3380 "MediaPage.c"
 			}
-#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			photo = _tmp22_;
-#line 592 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp24_ = photo;
-#line 592 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp24_ != NULL) {
-#line 5211 "MediaPage.c"
+#line 3388 "MediaPage.c"
 				Photo* _tmp25_ = NULL;
 				PhotoFileFormat _tmp26_ = 0;
-#line 592 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp25_ = photo;
-#line 592 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp26_ = photo_get_master_file_format (_tmp25_);
-#line 592 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = _tmp26_ == PHOTO_FILE_FORMAT_RAW;
-#line 5220 "MediaPage.c"
+#line 3397 "MediaPage.c"
 			} else {
-#line 592 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = FALSE;
-#line 5224 "MediaPage.c"
+#line 3401 "MediaPage.c"
 			}
-#line 592 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp23_) {
-#line 5228 "MediaPage.c"
-				gboolean _tmp27_ = FALSE;
-				gboolean _tmp28_ = FALSE;
-				gboolean _tmp31_ = FALSE;
-				gboolean _tmp32_ = FALSE;
-				gboolean _tmp38_ = FALSE;
-				gboolean _tmp39_ = FALSE;
-#line 593 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				is_raw = TRUE;
-#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp28_ = avail_shotwell;
-#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (!_tmp28_) {
-#line 5241 "MediaPage.c"
-					Photo* _tmp29_ = NULL;
-					gboolean _tmp30_ = FALSE;
-#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp29_ = photo;
-#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp30_ = photo_is_raw_developer_available (_tmp29_, RAW_DEVELOPER_SHOTWELL);
-#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp27_ = _tmp30_;
-#line 5250 "MediaPage.c"
-				} else {
-#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp27_ = FALSE;
-#line 5254 "MediaPage.c"
-				}
-#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp27_) {
-#line 596 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					avail_shotwell = TRUE;
-#line 5260 "MediaPage.c"
-				}
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp32_ = avail_camera;
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (!_tmp32_) {
-#line 5266 "MediaPage.c"
-					gboolean _tmp33_ = FALSE;
-					Photo* _tmp34_ = NULL;
-					gboolean _tmp35_ = FALSE;
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp34_ = photo;
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp35_ = photo_is_raw_developer_available (_tmp34_, RAW_DEVELOPER_CAMERA);
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					if (_tmp35_) {
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
-						_tmp33_ = TRUE;
-#line 5278 "MediaPage.c"
-					} else {
-						Photo* _tmp36_ = NULL;
-						gboolean _tmp37_ = FALSE;
-#line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
-						_tmp36_ = photo;
-#line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
-						_tmp37_ = photo_is_raw_developer_available (_tmp36_, RAW_DEVELOPER_EMBEDDED);
-#line 599 "/home/jens/Source/shotwell/src/MediaPage.vala"
-						_tmp33_ = _tmp37_;
-#line 5288 "MediaPage.c"
-					}
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp31_ = _tmp33_;
-#line 5292 "MediaPage.c"
-				} else {
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp31_ = FALSE;
-#line 5296 "MediaPage.c"
-				}
-#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp31_) {
-#line 600 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					avail_camera = TRUE;
-#line 5302 "MediaPage.c"
-				}
-#line 602 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp39_ = avail_shotwell;
-#line 602 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp39_) {
-#line 5308 "MediaPage.c"
-					gboolean _tmp40_ = FALSE;
-#line 602 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp40_ = avail_camera;
-#line 602 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp38_ = _tmp40_;
-#line 5314 "MediaPage.c"
-				} else {
-#line 602 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp38_ = FALSE;
-#line 5318 "MediaPage.c"
-				}
-#line 602 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp38_) {
-#line 603 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_g_object_unref0 (photo);
-#line 603 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_g_object_unref0 (view);
-#line 603 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					break;
-#line 5328 "MediaPage.c"
-				}
+#line 405 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				_g_object_unref0 (photo);
+#line 405 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				_g_object_unref0 (view);
+#line 405 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				break;
+#line 3413 "MediaPage.c"
 			}
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (photo);
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 5335 "MediaPage.c"
+#line 3419 "MediaPage.c"
 		}
-#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 5339 "MediaPage.c"
+#line 3423 "MediaPage.c"
 	}
-#line 609 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp41_ = is_raw;
-#line 609 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp41_);
-#line 611 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp42_ = is_raw;
-#line 611 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp42_) {
-#line 5349 "MediaPage.c"
-		gboolean _tmp43_ = FALSE;
-		gboolean _tmp44_ = FALSE;
-#line 613 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp43_ = avail_shotwell;
-#line 613 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloperShotwell", _tmp43_);
-#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp44_ = avail_camera;
-#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloperCamera", _tmp44_);
-#line 5360 "MediaPage.c"
-	}
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 5368 "MediaPage.c"
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp27_ = is_raw;
+#line 410 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp27_);
+#line 3429 "MediaPage.c"
 }
 
 
 static void media_page_update_flag_action (MediaPage* self, gint selected_count) {
 	gint _tmp0_ = 0;
-	gchar* flag_label = NULL;
-	gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	GtkAction* flag_action = NULL;
-	GtkAction* _tmp24_ = NULL;
-	GtkAction* _tmp25_ = NULL;
-#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 619 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = selected_count;
-#line 619 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_ > 0);
-#line 621 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = g_strdup (RESOURCES_FLAG_MENU);
-#line 621 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	flag_label = _tmp1_;
-#line 623 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = selected_count;
-#line 623 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp2_ > 0) {
-#line 5394 "MediaPage.c"
-		gboolean all_flagged = FALSE;
-		gboolean _tmp22_ = FALSE;
-#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		all_flagged = TRUE;
-#line 5399 "MediaPage.c"
-		{
-			GeeList* _source_list = NULL;
-			ViewCollection* _tmp3_ = NULL;
-			ViewCollection* _tmp4_ = NULL;
-			GeeList* _tmp5_ = NULL;
-			GeeList* _tmp6_ = NULL;
-			gint _source_size = 0;
-			GeeList* _tmp7_ = NULL;
-			gint _tmp8_ = 0;
-			gint _tmp9_ = 0;
-			gint _source_index = 0;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp4_ = _tmp3_;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp5_ = view_collection_get_selected_sources (_tmp4_);
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp6_ = _tmp5_;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_data_collection_unref0 (_tmp4_);
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_source_list = _tmp6_;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp7_ = _source_list;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp9_ = _tmp8_;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_source_size = _tmp9_;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_source_index = -1;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			while (TRUE) {
-#line 5435 "MediaPage.c"
-				gint _tmp10_ = 0;
-				gint _tmp11_ = 0;
-				gint _tmp12_ = 0;
-				DataSource* source = NULL;
-				GeeList* _tmp13_ = NULL;
-				gint _tmp14_ = 0;
-				gpointer _tmp15_ = NULL;
-				Flaggable* flaggable = NULL;
-				DataSource* _tmp16_ = NULL;
-				Flaggable* _tmp17_ = NULL;
-				gboolean _tmp18_ = FALSE;
-				Flaggable* _tmp19_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp10_ = _source_index;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_source_index = _tmp10_ + 1;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp11_ = _source_index;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp12_ = _source_size;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (!(_tmp11_ < _tmp12_)) {
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					break;
-#line 5460 "MediaPage.c"
-				}
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp13_ = _source_list;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp14_ = _source_index;
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp15_ = gee_list_get (_tmp13_, _tmp14_);
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				source = (DataSource*) _tmp15_;
-#line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp16_ = source;
-#line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp16_) : NULL);
-#line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				flaggable = _tmp17_;
-#line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_tmp19_ = flaggable;
-#line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp19_ != NULL) {
-#line 5480 "MediaPage.c"
-					Flaggable* _tmp20_ = NULL;
-					gboolean _tmp21_ = FALSE;
-#line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp20_ = flaggable;
-#line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp21_ = flaggable_is_flagged (_tmp20_);
-#line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp18_ = !_tmp21_;
-#line 5489 "MediaPage.c"
-				} else {
-#line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_tmp18_ = FALSE;
-#line 5493 "MediaPage.c"
-				}
-#line 627 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				if (_tmp18_) {
-#line 628 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					all_flagged = FALSE;
-#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_g_object_unref0 (flaggable);
-#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					_g_object_unref0 (source);
-#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
-					break;
-#line 5505 "MediaPage.c"
-				}
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_g_object_unref0 (flaggable);
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-				_g_object_unref0 (source);
-#line 5511 "MediaPage.c"
-			}
-#line 625 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_g_object_unref0 (_source_list);
-#line 5515 "MediaPage.c"
-		}
-#line 634 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp22_ = all_flagged;
-#line 634 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		if (_tmp22_) {
-#line 5521 "MediaPage.c"
-			gchar* _tmp23_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp23_ = g_strdup (RESOURCES_UNFLAG_MENU);
-#line 635 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_g_free0 (flag_label);
-#line 635 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			flag_label = _tmp23_;
-#line 5529 "MediaPage.c"
-		}
-	}
-#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp24_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
-#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	flag_action = _tmp24_;
-#line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp25_ = flag_action;
-#line 640 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp25_ != NULL) {
-#line 5540 "MediaPage.c"
-		GtkAction* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
-#line 641 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp26_ = flag_action;
-#line 641 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp27_ = flag_label;
-#line 641 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		gtk_action_set_label (_tmp26_, _tmp27_);
-#line 5549 "MediaPage.c"
-	}
-#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (flag_action);
-#line 618 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_free0 (flag_label);
-#line 5555 "MediaPage.c"
+#line 3441 "MediaPage.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
-#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 5562 "MediaPage.c"
+#line 3448 "MediaPage.c"
 }
 
 
@@ -5567,17 +3453,17 @@ static CoreViewTracker* media_page_real_get_view_tracker (CheckerboardPage* base
 	CoreViewTracker* result = NULL;
 	MediaViewTracker* _tmp0_ = NULL;
 	CoreViewTracker* _tmp1_ = NULL;
-#line 645 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->tracker;
-#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker));
-#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp1_;
-#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 5581 "MediaPage.c"
+#line 3467 "MediaPage.c"
 }
 
 
@@ -5590,82 +3476,54 @@ void media_page_set_display_ratings (MediaPage* self, gboolean display) {
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
-	GtkToggleAction* action = NULL;
-	GtkAction* _tmp8_ = NULL;
-	GtkToggleAction* _tmp9_ = NULL;
-	GtkToggleAction* _tmp10_ = NULL;
-#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	gboolean _tmp8_ = FALSE;
+#line 421 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 650 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 650 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 650 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 650 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = display;
-#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_RATINGS, &_tmp5_, NULL, NULL);
-#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 651 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 652 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 652 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 652 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 652 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
-#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp8_) : NULL;
-#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp9_ == NULL) {
-#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp8_);
-#line 5640 "MediaPage.c"
-	}
-#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	action = _tmp9_;
-#line 655 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = action;
-#line 655 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp10_ != NULL) {
-#line 5648 "MediaPage.c"
-		GtkToggleAction* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
-#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp11_ = action;
-#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp12_ = display;
-#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		gtk_toggle_action_set_active (_tmp11_, _tmp12_);
-#line 5657 "MediaPage.c"
-	}
-#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (action);
-#line 5661 "MediaPage.c"
+#line 426 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp8_ = display;
+#line 426 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings", _tmp8_);
+#line 3519 "MediaPage.c"
 }
 
 
 static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 	gboolean result = FALSE;
-#line 659 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 429 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 5669 "MediaPage.c"
+#line 3527 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -5677,31 +3535,31 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _view_index = 0;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = _tmp0_;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = _tmp2_;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp3_;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = _view_list;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = _tmp5_;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp6_;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 5705 "MediaPage.c"
+#line 3563 "MediaPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -5715,75 +3573,75 @@ static gboolean media_page_can_rate_selected (MediaPage* self, Rating rating) {
 			Rating _tmp16_ = 0;
 			Rating _tmp17_ = 0;
 			gboolean _tmp18_ = FALSE;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp7_ + 1;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _view_index;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp9_ = _view_size;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5731 "MediaPage.c"
+#line 3589 "MediaPage.c"
 			}
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = _view_index;
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp12_;
-#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = view;
-#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_THUMBNAIL, Thumbnail));
-#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
-#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = media_source_get_rating (_tmp15_);
-#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = rating;
-#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = _tmp16_ != _tmp17_;
-#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp18_) {
-#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				result = TRUE;
-#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (view);
-#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_view_list);
-#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 5765 "MediaPage.c"
+#line 3623 "MediaPage.c"
 			}
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 5769 "MediaPage.c"
+#line 3627 "MediaPage.c"
 		}
-#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 5773 "MediaPage.c"
+#line 3631 "MediaPage.c"
 	}
-#line 665 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
-#line 665 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 5779 "MediaPage.c"
+#line 3637 "MediaPage.c"
 }
 
 
 static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 	gboolean result = FALSE;
-#line 668 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 5787 "MediaPage.c"
+#line 3645 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -5795,31 +3653,31 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _view_index = 0;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = _tmp0_;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = _tmp2_;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp3_;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = _view_list;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = _tmp5_;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp6_;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 5823 "MediaPage.c"
+#line 3681 "MediaPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -5833,75 +3691,75 @@ static gboolean media_page_can_increase_selected_rating (MediaPage* self) {
 			Rating _tmp16_ = 0;
 			gboolean _tmp17_ = FALSE;
 			gboolean _tmp18_ = FALSE;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp7_ + 1;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _view_index;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp9_ = _view_size;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5849 "MediaPage.c"
+#line 3707 "MediaPage.c"
 			}
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = _view_index;
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp12_;
-#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = view;
-#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_THUMBNAIL, Thumbnail));
-#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
-#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = media_source_get_rating (_tmp15_);
-#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = rating_can_increase (_tmp16_);
-#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = _tmp17_;
-#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp18_) {
-#line 671 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				result = TRUE;
-#line 671 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (view);
-#line 671 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_view_list);
-#line 671 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 5883 "MediaPage.c"
+#line 3741 "MediaPage.c"
 			}
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 5887 "MediaPage.c"
+#line 3745 "MediaPage.c"
 		}
-#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 5891 "MediaPage.c"
+#line 3749 "MediaPage.c"
 	}
-#line 674 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
-#line 674 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 5897 "MediaPage.c"
+#line 3755 "MediaPage.c"
 }
 
 
 static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 	gboolean result = FALSE;
-#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 447 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 5905 "MediaPage.c"
+#line 3763 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -5913,31 +3771,31 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _view_index = 0;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = _tmp0_;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = _tmp2_;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp3_;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = _view_list;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = _tmp5_;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp6_;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 5941 "MediaPage.c"
+#line 3799 "MediaPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -5951,84 +3809,84 @@ static gboolean media_page_can_decrease_selected_rating (MediaPage* self) {
 			Rating _tmp16_ = 0;
 			gboolean _tmp17_ = FALSE;
 			gboolean _tmp18_ = FALSE;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _view_index;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp7_ + 1;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp8_ = _view_index;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp9_ = _view_size;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 5967 "MediaPage.c"
+#line 3825 "MediaPage.c"
 			}
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _view_list;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = _view_index;
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp12_;
-#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = view;
-#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = thumbnail_get_media_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_THUMBNAIL, Thumbnail));
-#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _tmp14_;
-#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = media_source_get_rating (_tmp15_);
-#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = rating_can_decrease (_tmp16_);
-#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = _tmp17_;
-#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp18_) {
-#line 680 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				result = TRUE;
-#line 680 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (view);
-#line 680 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_view_list);
-#line 680 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 450 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				return result;
-#line 6001 "MediaPage.c"
+#line 3859 "MediaPage.c"
 			}
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 6005 "MediaPage.c"
+#line 3863 "MediaPage.c"
 		}
-#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 6009 "MediaPage.c"
+#line 3867 "MediaPage.c"
 	}
-#line 683 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = FALSE;
-#line 683 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6015 "MediaPage.c"
+#line 3873 "MediaPage.c"
 }
 
 
 MediaPageZoomSliderAssembly* media_page_create_zoom_slider_assembly (MediaPage* self) {
 	MediaPageZoomSliderAssembly* result = NULL;
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-#line 686 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_zoom_slider_assembly_new ();
-#line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_object_ref_sink (_tmp0_);
-#line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp0_;
-#line 687 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6032 "MediaPage.c"
+#line 3890 "MediaPage.c"
 }
 
 
@@ -6037,35 +3895,35 @@ static gboolean media_page_real_on_mousewheel_up (Page* base, GdkEventScroll* ev
 	gboolean result = FALSE;
 	GdkEventScroll* _tmp0_ = NULL;
 	GdkModifierType _tmp1_ = 0;
-#line 690 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 690 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 460 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = event;
-#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_->state;
-#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if ((_tmp1_ & GDK_CONTROL_MASK) != 0) {
-#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_increase_zoom_level (self);
-#line 693 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 463 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = TRUE;
-#line 693 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 463 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 6057 "MediaPage.c"
+#line 3915 "MediaPage.c"
 	} else {
 		GdkEventScroll* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = event;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = PAGE_CLASS (media_page_parent_class)->on_mousewheel_up (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp2_);
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = _tmp3_;
-#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 6069 "MediaPage.c"
+#line 3927 "MediaPage.c"
 	}
 }
 
@@ -6075,35 +3933,35 @@ static gboolean media_page_real_on_mousewheel_down (Page* base, GdkEventScroll*
 	gboolean result = FALSE;
 	GdkEventScroll* _tmp0_ = NULL;
 	GdkModifierType _tmp1_ = 0;
-#line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 699 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 700 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = event;
-#line 700 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_->state;
-#line 700 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if ((_tmp1_ & GDK_CONTROL_MASK) != 0) {
-#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_decrease_zoom_level (self);
-#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = TRUE;
-#line 702 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 472 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 6095 "MediaPage.c"
+#line 3953 "MediaPage.c"
 	} else {
 		GdkEventScroll* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 704 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = event;
-#line 704 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = PAGE_CLASS (media_page_parent_class)->on_mousewheel_down (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp2_);
-#line 704 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		result = _tmp3_;
-#line 704 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return result;
-#line 6107 "MediaPage.c"
+#line 3965 "MediaPage.c"
 	}
 }
 
@@ -6113,23 +3971,23 @@ static void media_page_on_send_to (MediaPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
 	GeeCollection* _tmp3_ = NULL;
-#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	desktop_integration_send_to (_tmp3_);
-#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 6133 "MediaPage.c"
+#line 3991 "MediaPage.c"
 }
 
 
@@ -6148,59 +4006,59 @@ void media_page_on_play_video (MediaPage* self) {
 	Video* _tmp10_ = NULL;
 	Video* _tmp11_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 712 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 713 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 714 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6168 "MediaPage.c"
+#line 4026 "MediaPage.c"
 	}
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_VIDEO) ? ((Video*) _tmp8_) : NULL;
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp9_ == NULL) {
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 6186 "MediaPage.c"
+#line 4044 "MediaPage.c"
 	}
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = _tmp9_;
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	video = _tmp10_;
-#line 717 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = video;
-#line 717 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp11_ == NULL) {
-#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (video);
-#line 718 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6204 "MediaPage.c"
+#line 4062 "MediaPage.c"
 	}
 	{
 		Video* _tmp12_ = NULL;
@@ -6208,30 +4066,30 @@ void media_page_on_play_video (MediaPage* self) {
 		GFile* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
-#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = video;
-#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = _tmp13_;
-#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp15_ = g_file_get_uri (_tmp14_);
-#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = _tmp15_;
-#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		g_app_info_launch_default_for_uri (_tmp16_, NULL, &_inner_error_);
-#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_free0 (_tmp16_);
-#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6230 "MediaPage.c"
-			goto __catch561_g_error;
+#line 4088 "MediaPage.c"
+			goto __catch558_g_error;
 		}
 	}
-	goto __finally561;
-	__catch561_g_error:
+	goto __finally558;
+	__catch558_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -6239,44 +4097,44 @@ void media_page_on_play_video (MediaPage* self) {
 		const gchar* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		e = _inner_error_;
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_inner_error_ = NULL;
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp17_ = _ ("Shotwell was unable to play the selected video:\n%s");
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = e;
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = _tmp18_->message;
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = g_strdup_printf (_tmp17_, _tmp19_);
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = _tmp20_;
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		app_window_error_message (_tmp21_, NULL);
-#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 493 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_free0 (_tmp21_);
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_error_free0 (e);
-#line 6263 "MediaPage.c"
+#line 4121 "MediaPage.c"
 	}
-	__finally561:
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	__finally558:
+#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (video);
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		g_clear_error (&_inner_error_);
-#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6276 "MediaPage.c"
+#line 4134 "MediaPage.c"
 	}
-#line 712 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (video);
-#line 6280 "MediaPage.c"
+#line 4138 "MediaPage.c"
 }
 
 
@@ -6289,499 +4147,499 @@ static gboolean media_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label4 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label5 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label6 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label7 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label8 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label9 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label10 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label11 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label12 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label13 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label14 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label15 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label16 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label17 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label18 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label19 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label20 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label21 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label22 = 0;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	static GQuark _tmp4_label23 = 0;
-#line 6341 "MediaPage.c"
+#line 4199 "MediaPage.c"
 	gboolean _tmp30_ = FALSE;
 	gboolean _tmp31_ = FALSE;
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	handled = TRUE;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = event;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6364 "MediaPage.c"
+#line 4222 "MediaPage.c"
 			default:
 			{
-#line 734 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
-#line 735 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6371 "MediaPage.c"
+#line 4229 "MediaPage.c"
 			}
 		}
 	} else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6377 "MediaPage.c"
+#line 4235 "MediaPage.c"
 			default:
 			{
-#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
-#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 511 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6384 "MediaPage.c"
+#line 4242 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("period")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6390 "MediaPage.c"
+#line 4248 "MediaPage.c"
 			default:
 			{
-#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
-#line 745 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6397 "MediaPage.c"
+#line 4255 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("comma")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6403 "MediaPage.c"
+#line 4261 "MediaPage.c"
 			default:
 			{
-#line 748 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
-#line 749 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 519 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6410 "MediaPage.c"
+#line 4268 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("KP_1")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6416 "MediaPage.c"
+#line 4274 "MediaPage.c"
 			default:
 			{
-#line 752 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 522 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
-#line 753 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 523 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6423 "MediaPage.c"
+#line 4281 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("KP_2")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6429 "MediaPage.c"
+#line 4287 "MediaPage.c"
 			default:
 			{
-#line 756 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 526 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
-#line 757 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 527 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6436 "MediaPage.c"
+#line 4294 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label10) ? _tmp4_label10 : (_tmp4_label10 = g_quark_from_static_string ("KP_3")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6442 "MediaPage.c"
+#line 4300 "MediaPage.c"
 			default:
 			{
-#line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 530 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
-#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6449 "MediaPage.c"
+#line 4307 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label11) ? _tmp4_label11 : (_tmp4_label11 = g_quark_from_static_string ("KP_4")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6455 "MediaPage.c"
+#line 4313 "MediaPage.c"
 			default:
 			{
-#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 534 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
-#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6462 "MediaPage.c"
+#line 4320 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label12) ? _tmp4_label12 : (_tmp4_label12 = g_quark_from_static_string ("KP_5")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6468 "MediaPage.c"
+#line 4326 "MediaPage.c"
 			default:
 			{
-#line 768 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
-#line 769 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 539 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6475 "MediaPage.c"
+#line 4333 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label13) ? _tmp4_label13 : (_tmp4_label13 = g_quark_from_static_string ("KP_0")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6481 "MediaPage.c"
+#line 4339 "MediaPage.c"
 			default:
 			{
-#line 772 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 542 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
-#line 773 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6488 "MediaPage.c"
+#line 4346 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label14) ? _tmp4_label14 : (_tmp4_label14 = g_quark_from_static_string ("KP_9")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6494 "MediaPage.c"
+#line 4352 "MediaPage.c"
 			default:
 			{
-#line 776 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 546 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
-#line 777 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 547 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6501 "MediaPage.c"
+#line 4359 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label15) ? _tmp4_label15 : (_tmp4_label15 = g_quark_from_static_string ("exclam")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6507 "MediaPage.c"
+#line 4365 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp6_ = FALSE;
-#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 780 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp6_) {
-#line 6515 "MediaPage.c"
+#line 4373 "MediaPage.c"
 					SearchViewFilter* _tmp7_ = NULL;
 					SearchViewFilter* _tmp8_ = NULL;
-#line 781 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp7_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 781 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp8_ = _tmp7_;
-#line 781 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp8_, RATING_FILTER_ONE_OR_HIGHER);
-#line 781 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp8_);
-#line 6526 "MediaPage.c"
+#line 4384 "MediaPage.c"
 				}
-#line 782 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 552 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6530 "MediaPage.c"
+#line 4388 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label16) ? _tmp4_label16 : (_tmp4_label16 = g_quark_from_static_string ("at")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6536 "MediaPage.c"
+#line 4394 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp9_ = FALSE;
-#line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp9_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 785 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp9_) {
-#line 6544 "MediaPage.c"
+#line 4402 "MediaPage.c"
 					SearchViewFilter* _tmp10_ = NULL;
 					SearchViewFilter* _tmp11_ = NULL;
-#line 786 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp10_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 786 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp11_ = _tmp10_;
-#line 786 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp11_, RATING_FILTER_TWO_OR_HIGHER);
-#line 786 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 556 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp11_);
-#line 6555 "MediaPage.c"
+#line 4413 "MediaPage.c"
 				}
-#line 787 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6559 "MediaPage.c"
+#line 4417 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label17) ? _tmp4_label17 : (_tmp4_label17 = g_quark_from_static_string ("numbersign")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6565 "MediaPage.c"
+#line 4423 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp12_ = FALSE;
-#line 790 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp12_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 790 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp12_) {
-#line 6573 "MediaPage.c"
+#line 4431 "MediaPage.c"
 					SearchViewFilter* _tmp13_ = NULL;
 					SearchViewFilter* _tmp14_ = NULL;
-#line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp13_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp14_ = _tmp13_;
-#line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp14_, RATING_FILTER_THREE_OR_HIGHER);
-#line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp14_);
-#line 6584 "MediaPage.c"
+#line 4442 "MediaPage.c"
 				}
-#line 792 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6588 "MediaPage.c"
+#line 4446 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label18) ? _tmp4_label18 : (_tmp4_label18 = g_quark_from_static_string ("dollar")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6594 "MediaPage.c"
+#line 4452 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
-#line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp15_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp15_) {
-#line 6602 "MediaPage.c"
+#line 4460 "MediaPage.c"
 					SearchViewFilter* _tmp16_ = NULL;
 					SearchViewFilter* _tmp17_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp16_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 796 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp17_ = _tmp16_;
-#line 796 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp17_, RATING_FILTER_FOUR_OR_HIGHER);
-#line 796 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp17_);
-#line 6613 "MediaPage.c"
+#line 4471 "MediaPage.c"
 				}
-#line 797 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 567 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6617 "MediaPage.c"
+#line 4475 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label19) ? _tmp4_label19 : (_tmp4_label19 = g_quark_from_static_string ("percent")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6623 "MediaPage.c"
+#line 4481 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp18_ = FALSE;
-#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp18_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 800 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp18_) {
-#line 6631 "MediaPage.c"
+#line 4489 "MediaPage.c"
 					SearchViewFilter* _tmp19_ = NULL;
 					SearchViewFilter* _tmp20_ = NULL;
-#line 801 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp19_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 801 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp20_ = _tmp19_;
-#line 801 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp20_, RATING_FILTER_FIVE_OR_HIGHER);
-#line 801 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp20_);
-#line 6642 "MediaPage.c"
+#line 4500 "MediaPage.c"
 				}
-#line 802 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6646 "MediaPage.c"
+#line 4504 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label20) ? _tmp4_label20 : (_tmp4_label20 = g_quark_from_static_string ("parenright")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6652 "MediaPage.c"
+#line 4510 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp21_ = FALSE;
-#line 805 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 805 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp21_) {
-#line 6660 "MediaPage.c"
+#line 4518 "MediaPage.c"
 					SearchViewFilter* _tmp22_ = NULL;
 					SearchViewFilter* _tmp23_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp22_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp23_ = _tmp22_;
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp23_, RATING_FILTER_UNRATED_OR_HIGHER);
-#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 576 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp23_);
-#line 6671 "MediaPage.c"
+#line 4529 "MediaPage.c"
 				}
-#line 807 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6675 "MediaPage.c"
+#line 4533 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label21) ? _tmp4_label21 : (_tmp4_label21 = g_quark_from_static_string ("parenleft")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6681 "MediaPage.c"
+#line 4539 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp24_ = FALSE;
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp24_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp24_) {
-#line 6689 "MediaPage.c"
+#line 4547 "MediaPage.c"
 					SearchViewFilter* _tmp25_ = NULL;
 					SearchViewFilter* _tmp26_ = NULL;
-#line 811 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp25_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 811 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp26_ = _tmp25_;
-#line 811 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp26_, RATING_FILTER_REJECTED_OR_HIGHER);
-#line 811 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp26_);
-#line 6700 "MediaPage.c"
+#line 4558 "MediaPage.c"
 				}
-#line 812 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6704 "MediaPage.c"
+#line 4562 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label22) ? _tmp4_label22 : (_tmp4_label22 = g_quark_from_static_string ("asterisk")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6710 "MediaPage.c"
+#line 4568 "MediaPage.c"
 			default:
 			{
 				gboolean _tmp27_ = FALSE;
-#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp27_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp27_) {
-#line 6718 "MediaPage.c"
+#line 4576 "MediaPage.c"
 					SearchViewFilter* _tmp28_ = NULL;
 					SearchViewFilter* _tmp29_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp28_ = checkerboard_page_get_search_view_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_tmp29_ = _tmp28_;
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					search_view_filter_set_rating_filter (_tmp29_, RATING_FILTER_REJECTED_ONLY);
-#line 816 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					_view_filter_unref0 (_tmp29_);
-#line 6729 "MediaPage.c"
+#line 4587 "MediaPage.c"
 				}
-#line 817 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6733 "MediaPage.c"
+#line 4591 "MediaPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label23) ? _tmp4_label23 : (_tmp4_label23 = g_quark_from_static_string ("slash")))) {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6739 "MediaPage.c"
+#line 4597 "MediaPage.c"
 			default:
 			{
-#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
-#line 821 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 591 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6746 "MediaPage.c"
+#line 4604 "MediaPage.c"
 			}
 		}
 	} else {
-#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		switch (0) {
-#line 6752 "MediaPage.c"
+#line 4610 "MediaPage.c"
 			default:
 			{
-#line 824 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				handled = FALSE;
-#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 595 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 6759 "MediaPage.c"
+#line 4617 "MediaPage.c"
 			}
 		}
 	}
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp31_ = handled;
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp31_) {
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp30_ = TRUE;
-#line 6769 "MediaPage.c"
+#line 4627 "MediaPage.c"
 	} else {
 		GdkEventKey* _tmp32_ = NULL;
 		gboolean _tmp33_ = FALSE;
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp32_ = event;
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp33_ = PAGE_CLASS (media_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp32_);
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp30_ = _tmp33_;
-#line 6779 "MediaPage.c"
+#line 4637 "MediaPage.c"
 	}
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp30_;
-#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 6785 "MediaPage.c"
+#line 4643 "MediaPage.c"
 }
 
 
@@ -6807,135 +4665,142 @@ static void media_page_real_switched_to (Page* base) {
 	ViewCollection* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	gboolean _tmp19_ = FALSE;
-#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 601 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	PAGE_CLASS (media_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp4_);
-#line 836 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = _tmp5_;
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = configuration_facade_get_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp7_);
-#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_ratings (self, _tmp10_);
-#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 609 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = config_facade_get_instance ();
-#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 609 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 609 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = configuration_facade_get_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 609 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_tags (self, _tmp13_);
-#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 609 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = _tmp14_;
-#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_COLLECTION, DataCollection));
-#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp15_);
-#line 844 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 844 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = _tmp16_;
-#line 844 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp18_ = view_collection_get_selected_count (_tmp17_);
-#line 844 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = _tmp18_ > 0;
-#line 844 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp17_);
-#line 844 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp19_) {
-#line 6883 "MediaPage.c"
+#line 4741 "MediaPage.c"
 		CheckerboardItem* selected = NULL;
 		ViewCollection* _tmp20_ = NULL;
 		ViewCollection* _tmp21_ = NULL;
 		DataView* _tmp22_ = NULL;
 		CheckerboardItem* _tmp23_ = NULL;
 		CheckerboardItem* _tmp24_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = _tmp20_;
-#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp22_ = view_collection_get_selected_at (_tmp21_, 0);
-#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp21_);
-#line 845 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		selected = _tmp23_;
-#line 846 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp24_ = selected;
-#line 846 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (_tmp24_ != NULL) {
-#line 6906 "MediaPage.c"
+#line 4764 "MediaPage.c"
 			CheckerboardItem* _tmp25_ = NULL;
-#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp25_ = selected;
-#line 847 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			checkerboard_page_cursor_to_item (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp25_);
-#line 6912 "MediaPage.c"
+#line 4770 "MediaPage.c"
 		}
-#line 844 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (selected);
-#line 6916 "MediaPage.c"
+#line 4774 "MediaPage.c"
 	}
-#line 850 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_sync_sort (self);
-#line 6920 "MediaPage.c"
+#line 4778 "MediaPage.c"
 }
 
 
 static void media_page_real_switching_from (Page* base) {
 	MediaPage * self;
-#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 854 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_disconnect_slider (self);
-#line 856 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	PAGE_CLASS (media_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
-#line 6932 "MediaPage.c"
+#line 4790 "MediaPage.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 4797 "MediaPage.c"
 }
 
 
 static void _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed (MediaPageZoomSliderAssembly* _sender, gpointer self) {
-#line 861 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_zoom_changed ((MediaPage*) self);
-#line 6939 "MediaPage.c"
+#line 4804 "MediaPage.c"
 }
 
 
@@ -6943,25 +4808,25 @@ void media_page_connect_slider (MediaPage* self, MediaPageZoomSliderAssembly* sl
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
 	MediaPageZoomSliderAssembly* _tmp1_ = NULL;
 	MediaPageZoomSliderAssembly* _tmp2_ = NULL;
-#line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 859 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (slider));
-#line 860 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = slider;
-#line 860 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 860 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (self->priv->connected_slider);
-#line 860 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->connected_slider = _tmp1_;
-#line 861 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = self->priv->connected_slider;
-#line 861 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_signal_connect_object (_tmp2_, "zoom-changed", (GCallback) _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed, self, 0);
-#line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 632 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_load_persistent_thumbnail_scale (self);
-#line 6965 "MediaPage.c"
+#line 4830 "MediaPage.c"
 }
 
 
@@ -6971,29 +4836,29 @@ static void media_page_save_persistent_thumbnail_scale (MediaPage* self) {
 	ConfigFacade* _tmp2_ = NULL;
 	MediaPageZoomSliderAssembly* _tmp3_ = NULL;
 	gint _tmp4_ = 0;
-#line 865 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 866 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 866 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ == NULL) {
-#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 6983 "MediaPage.c"
+#line 4848 "MediaPage.c"
 	}
-#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = config_facade_get_instance ();
-#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = _tmp1_;
-#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = self->priv->connected_slider;
-#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = media_page_zoom_slider_assembly_get_scale (_tmp3_);
-#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	configuration_facade_set_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
-#line 869 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 639 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 6997 "MediaPage.c"
+#line 4862 "MediaPage.c"
 }
 
 
@@ -7007,39 +4872,39 @@ static void media_page_load_persistent_thumbnail_scale (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 872 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 873 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 873 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ == NULL) {
-#line 874 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7019 "MediaPage.c"
+#line 4884 "MediaPage.c"
 	}
-#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = config_facade_get_instance ();
-#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = _tmp1_;
-#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = configuration_facade_get_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = _tmp3_;
-#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	persistent_scale = _tmp4_;
-#line 878 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = self->priv->connected_slider;
-#line 878 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = persistent_scale;
-#line 878 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_zoom_slider_assembly_set_scale (_tmp5_, _tmp6_);
-#line 879 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = persistent_scale;
-#line 879 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_thumb_size (self, _tmp7_);
-#line 7043 "MediaPage.c"
+#line 4908 "MediaPage.c"
 }
 
 
@@ -7047,109 +4912,109 @@ void media_page_disconnect_slider (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
 	MediaPageZoomSliderAssembly* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
-#line 882 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 883 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 883 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ == NULL) {
-#line 884 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7059 "MediaPage.c"
+#line 4924 "MediaPage.c"
 	}
-#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = self->priv->connected_slider;
-#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_signal_parse_name ("zoom-changed", MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, &_tmp2_, NULL, FALSE);
-#line 886 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _media_page_on_zoom_changed_media_page_zoom_slider_assembly_zoom_changed, self);
-#line 887 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (self->priv->connected_slider);
-#line 887 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->connected_slider = NULL;
-#line 7071 "MediaPage.c"
+#line 4936 "MediaPage.c"
 }
 
 
 static void media_page_real_on_zoom_changed (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-#line 891 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 891 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 7081 "MediaPage.c"
+#line 4946 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 892 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
-#line 892 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_zoom_slider_assembly_get_scale (_tmp1_);
-#line 892 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 662 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp2_);
-#line 7090 "MediaPage.c"
+#line 4955 "MediaPage.c"
 	}
-#line 894 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_save_persistent_thumbnail_scale (self);
-#line 7094 "MediaPage.c"
+#line 4959 "MediaPage.c"
 }
 
 
 void media_page_on_zoom_changed (MediaPage* self) {
-#line 890 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 890 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_zoom_changed (self);
-#line 7103 "MediaPage.c"
+#line 4968 "MediaPage.c"
 }
 
 
 static void media_page_real_on_export (MediaPage* self) {
-#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_page_on_export'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 7112 "MediaPage.c"
+#line 4977 "MediaPage.c"
 }
 
 
 void media_page_on_export (MediaPage* self) {
-#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_export (self);
-#line 7121 "MediaPage.c"
+#line 4986 "MediaPage.c"
 }
 
 
 static void media_page_real_on_increase_size (MediaPage* self) {
-#line 900 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_increase_zoom_level (self);
-#line 7128 "MediaPage.c"
+#line 4993 "MediaPage.c"
 }
 
 
 void media_page_on_increase_size (MediaPage* self) {
-#line 899 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 899 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 7137 "MediaPage.c"
+#line 5002 "MediaPage.c"
 }
 
 
 static void media_page_real_on_decrease_size (MediaPage* self) {
-#line 904 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_decrease_zoom_level (self);
-#line 7144 "MediaPage.c"
+#line 5009 "MediaPage.c"
 }
 
 
 void media_page_on_decrease_size (MediaPage* self) {
-#line 903 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 903 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 7153 "MediaPage.c"
+#line 5018 "MediaPage.c"
 }
 
 
@@ -7168,45 +5033,45 @@ static void media_page_on_add_tags (MediaPage* self) {
 	gint _names_size_ = 0;
 	gchar** _tmp8_ = NULL;
 	gint _tmp8__length1 = 0;
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 909 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7188 "MediaPage.c"
+#line 5053 "MediaPage.c"
 	}
-#line 911 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = add_tags_dialog_new ();
-#line 911 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 681 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	dialog = _tmp4_;
-#line 912 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = dialog;
-#line 912 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = add_tags_dialog_execute (_tmp5_, &_tmp6_);
-#line 912 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	names = _tmp7_;
-#line 912 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	names_length1 = _tmp6_;
-#line 912 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_names_size_ = names_length1;
-#line 914 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = names;
-#line 914 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8__length1 = names_length1;
-#line 914 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp8_ != NULL) {
-#line 7210 "MediaPage.c"
+#line 5075 "MediaPage.c"
 		CommandManager* _tmp9_ = NULL;
 		CommandManager* _tmp10_ = NULL;
 		HierarchicalTagIndex* _tmp11_ = NULL;
@@ -7223,57 +5088,57 @@ static void media_page_on_add_tags (MediaPage* self) {
 		GeeCollection* _tmp20_ = NULL;
 		AddTagsCommand* _tmp21_ = NULL;
 		AddTagsCommand* _tmp22_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = _tmp9_;
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = hierarchical_tag_index_get_global_index ();
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = _tmp11_;
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13_ = names;
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13__length1 = names_length1;
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp15_ = hierarchical_tag_index_get_paths_for_names_array (_tmp12_, _tmp13_, _tmp13__length1, &_tmp14_);
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = _tmp15_;
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16__length1 = _tmp14_;
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = _tmp17_;
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = view_collection_get_selected_sources (_tmp18_);
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = add_tags_command_new (_tmp16_, _tmp14_, _tmp20_);
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp22_ = _tmp21_;
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command));
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp22_);
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp18_);
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = (_vala_array_free (_tmp16_, _tmp16__length1, (GDestroyNotify) g_free), NULL);
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_hierarchical_tag_index_unref0 (_tmp12_);
-#line 915 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp10_);
-#line 7271 "MediaPage.c"
+#line 5136 "MediaPage.c"
 	}
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 7277 "MediaPage.c"
+#line 5142 "MediaPage.c"
 }
 
 
@@ -7302,93 +5167,93 @@ static void media_page_on_modify_tags (MediaPage* self) {
 	GeeArrayList* _tmp18_ = NULL;
 	ModifyTagsCommand* _tmp19_ = NULL;
 	ModifyTagsCommand* _tmp20_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 923 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7322 "MediaPage.c"
+#line 5187 "MediaPage.c"
 	}
-#line 925 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 925 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 925 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 925 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 925 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 925 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 925 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 925 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 925 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media = _tmp9_;
-#line 927 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = media;
-#line 927 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = modify_tags_dialog_new (_tmp10_);
-#line 927 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	dialog = _tmp11_;
-#line 928 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = dialog;
-#line 928 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = modify_tags_dialog_execute (_tmp12_);
-#line 928 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_tags = _tmp13_;
-#line 930 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = new_tags;
-#line 930 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp14_ == NULL) {
-#line 931 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (new_tags);
-#line 931 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_text_entry_dialog_mediator_unref0 (dialog);
-#line 931 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (media);
-#line 931 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7366 "MediaPage.c"
+#line 5231 "MediaPage.c"
 	}
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = _tmp15_;
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = media;
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp18_ = new_tags;
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = modify_tags_command_new (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = _tmp19_;
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_COMMAND, Command));
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp20_);
-#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp16_);
-#line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (new_tags);
-#line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media);
-#line 7392 "MediaPage.c"
+#line 5257 "MediaPage.c"
 }
 
 
@@ -7401,74 +5266,46 @@ static void media_page_set_display_tags (MediaPage* self, gboolean display) {
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
-	GtkToggleAction* action = NULL;
-	GtkAction* _tmp8_ = NULL;
-	GtkToggleAction* _tmp9_ = NULL;
-	GtkToggleAction* _tmp10_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	gboolean _tmp8_ = FALSE;
+#line 706 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 938 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 938 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 938 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = display;
-#line 938 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 938 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 938 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SHOW_TAGS, &_tmp5_, NULL, NULL);
-#line 938 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 938 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 939 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 939 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 939 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 939 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp8_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags");
-#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp8_) : NULL;
-#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp9_ == NULL) {
-#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp8_);
-#line 7451 "MediaPage.c"
-	}
-#line 941 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	action = _tmp9_;
-#line 942 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp10_ = action;
-#line 942 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp10_ != NULL) {
-#line 7459 "MediaPage.c"
-		GtkToggleAction* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp11_ = action;
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp12_ = display;
-#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		gtk_toggle_action_set_active (_tmp11_, _tmp12_);
-#line 7468 "MediaPage.c"
-	}
-#line 936 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (action);
-#line 7472 "MediaPage.c"
+#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp8_ = display;
+#line 711 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTags", _tmp8_);
+#line 5309 "MediaPage.c"
 }
 
 
@@ -7477,21 +5314,21 @@ static void media_page_on_new_event (MediaPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 946 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 7495 "MediaPage.c"
+#line 5332 "MediaPage.c"
 		CommandManager* _tmp4_ = NULL;
 		CommandManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -7500,33 +5337,33 @@ static void media_page_on_new_event (MediaPage* self) {
 		GeeList* _tmp9_ = NULL;
 		NewEventCommand* _tmp10_ = NULL;
 		NewEventCommand* _tmp11_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = _tmp4_;
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = _tmp6_;
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = view_collection_get_selected (_tmp7_);
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = _tmp8_;
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = new_event_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = _tmp10_;
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 948 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 716 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 7530 "MediaPage.c"
+#line 5367 "MediaPage.c"
 	}
 }
 
@@ -7548,52 +5385,52 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 	gboolean _tmp23_ = FALSE;
 	FlagUnflagCommand* _tmp24_ = NULL;
 	FlagUnflagCommand* _tmp25_ = NULL;
-#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 952 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 952 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 952 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 952 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 952 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 952 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 953 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7568 "MediaPage.c"
+#line 5405 "MediaPage.c"
 	}
-#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_MEDIA_SOURCE);
-#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 955 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sources = _tmp7_;
-#line 959 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 727 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	flag = FALSE;
-#line 7584 "MediaPage.c"
+#line 5421 "MediaPage.c"
 	{
 		GeeIterator* _source_it = NULL;
 		GeeCollection* _tmp8_ = NULL;
 		GeeIterator* _tmp9_ = NULL;
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = sources;
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_source_it = _tmp9_;
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 7597 "MediaPage.c"
+#line 5434 "MediaPage.c"
 			GeeIterator* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
 			MediaSource* source = NULL;
@@ -7604,90 +5441,90 @@ static void media_page_on_flag_unflag (MediaPage* self) {
 			Flaggable* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
 			Flaggable* _tmp17_ = NULL;
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp10_ = _source_it;
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!_tmp11_) {
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 7616 "MediaPage.c"
+#line 5453 "MediaPage.c"
 			}
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = _source_it;
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			source = (MediaSource*) _tmp13_;
-#line 961 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = source;
-#line 961 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_FLAGGABLE) ? ((Flaggable*) _tmp14_) : NULL);
-#line 961 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			flaggable = _tmp15_;
-#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = flaggable;
-#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp17_ != NULL) {
-#line 7634 "MediaPage.c"
+#line 5471 "MediaPage.c"
 				Flaggable* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp18_ = flaggable;
-#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp19_ = flaggable_is_flagged (_tmp18_);
-#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = !_tmp19_;
-#line 7643 "MediaPage.c"
+#line 5480 "MediaPage.c"
 			} else {
-#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp16_ = FALSE;
-#line 7647 "MediaPage.c"
+#line 5484 "MediaPage.c"
 			}
-#line 962 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp16_) {
-#line 963 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 731 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				flag = TRUE;
-#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (flaggable);
-#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (source);
-#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 7659 "MediaPage.c"
+#line 5496 "MediaPage.c"
 			}
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (flaggable);
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (source);
-#line 7665 "MediaPage.c"
+#line 5502 "MediaPage.c"
 		}
-#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_source_it);
-#line 7669 "MediaPage.c"
+#line 5506 "MediaPage.c"
 	}
-#line 969 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 969 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = _tmp20_;
-#line 969 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp22_ = sources;
-#line 969 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp23_ = flag;
-#line 969 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp24_ = flag_unflag_command_new (_tmp22_, _tmp23_);
-#line 969 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp25_ = _tmp24_;
-#line 969 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_COMMAND, Command));
-#line 969 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp25_);
-#line 969 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp21_);
-#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (sources);
-#line 7691 "MediaPage.c"
+#line 5528 "MediaPage.c"
 }
 
 
@@ -7706,64 +5543,64 @@ static void media_page_real_on_increase_rating (MediaPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	SetRatingCommand* _tmp12_ = NULL;
-#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 973 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 974 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7724 "MediaPage.c"
+#line 5561 "MediaPage.c"
 	}
-#line 976 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 976 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 976 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 976 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 976 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = set_rating_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), TRUE);
-#line 976 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 976 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 976 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 976 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 744 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command = _tmp9_;
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = _tmp10_;
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = command;
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 979 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
-#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 7758 "MediaPage.c"
+#line 5595 "MediaPage.c"
 }
 
 
 void media_page_on_increase_rating (MediaPage* self) {
-#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_increase_rating (self);
-#line 7767 "MediaPage.c"
+#line 5604 "MediaPage.c"
 }
 
 
@@ -7782,64 +5619,64 @@ static void media_page_real_on_decrease_rating (MediaPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	SetRatingCommand* _tmp12_ = NULL;
-#line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 983 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 984 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 752 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7800 "MediaPage.c"
+#line 5637 "MediaPage.c"
 	}
-#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = set_rating_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), FALSE);
-#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 986 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command = _tmp9_;
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = _tmp10_;
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = command;
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 989 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 757 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 7834 "MediaPage.c"
+#line 5671 "MediaPage.c"
 }
 
 
 void media_page_on_decrease_rating (MediaPage* self) {
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_decrease_rating (self);
-#line 7843 "MediaPage.c"
+#line 5680 "MediaPage.c"
 }
 
 
@@ -7859,178 +5696,178 @@ static void media_page_real_on_set_rating (MediaPage* self, Rating rating) {
 	CommandManager* _tmp11_ = NULL;
 	CommandManager* _tmp12_ = NULL;
 	SetRatingCommand* _tmp13_ = NULL;
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 993 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 994 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 762 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 7877 "MediaPage.c"
+#line 5714 "MediaPage.c"
 	}
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = rating;
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = set_rating_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), _tmp8_);
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = _tmp9_;
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 996 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 764 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command = _tmp10_;
-#line 997 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 997 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 997 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = command;
-#line 997 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command));
-#line 997 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_update_rating_sensitivities (self);
-#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (command);
-#line 7913 "MediaPage.c"
+#line 5750 "MediaPage.c"
 }
 
 
 void media_page_on_set_rating (MediaPage* self, Rating rating) {
-#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 760 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_set_rating (self, rating);
-#line 7922 "MediaPage.c"
+#line 5759 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_rejected (MediaPage* self) {
-#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_REJECTED);
-#line 7929 "MediaPage.c"
+#line 5766 "MediaPage.c"
 }
 
 
 void media_page_on_rate_rejected (MediaPage* self) {
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 770 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 770 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_rejected (self);
-#line 7938 "MediaPage.c"
+#line 5775 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_unrated (MediaPage* self) {
-#line 1007 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_UNRATED);
-#line 7945 "MediaPage.c"
+#line 5782 "MediaPage.c"
 }
 
 
 void media_page_on_rate_unrated (MediaPage* self) {
-#line 1006 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1006 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_unrated (self);
-#line 7954 "MediaPage.c"
+#line 5791 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_one (MediaPage* self) {
-#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_ONE);
-#line 7961 "MediaPage.c"
+#line 5798 "MediaPage.c"
 }
 
 
 void media_page_on_rate_one (MediaPage* self) {
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_one (self);
-#line 7970 "MediaPage.c"
+#line 5807 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_two (MediaPage* self) {
-#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_TWO);
-#line 7977 "MediaPage.c"
+#line 5814 "MediaPage.c"
 }
 
 
 void media_page_on_rate_two (MediaPage* self) {
-#line 1014 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1014 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_two (self);
-#line 7986 "MediaPage.c"
+#line 5823 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_three (MediaPage* self) {
-#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_THREE);
-#line 7993 "MediaPage.c"
+#line 5830 "MediaPage.c"
 }
 
 
 void media_page_on_rate_three (MediaPage* self) {
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_three (self);
-#line 8002 "MediaPage.c"
+#line 5839 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_four (MediaPage* self) {
-#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 791 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_FOUR);
-#line 8009 "MediaPage.c"
+#line 5846 "MediaPage.c"
 }
 
 
 void media_page_on_rate_four (MediaPage* self) {
-#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_four (self);
-#line 8018 "MediaPage.c"
+#line 5855 "MediaPage.c"
 }
 
 
 static void media_page_real_on_rate_five (MediaPage* self) {
-#line 1027 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_on_set_rating (self, RATING_FIVE);
-#line 8025 "MediaPage.c"
+#line 5862 "MediaPage.c"
 }
 
 
 void media_page_on_rate_five (MediaPage* self) {
-#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 794 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 794 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_rate_five (self);
-#line 8034 "MediaPage.c"
+#line 5871 "MediaPage.c"
 }
 
 
@@ -8039,23 +5876,23 @@ static void media_page_on_remove_from_library (MediaPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
 	GeeCollection* _tmp3_ = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	remove_photos_from_library (_tmp3_);
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 799 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 8059 "MediaPage.c"
+#line 5896 "MediaPage.c"
 }
 
 
@@ -8068,55 +5905,55 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp18_ = FALSE;
 	CheckerboardItem* _tmp19_ = NULL;
-#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 803 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	restore_point = NULL;
-#line 1037 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)->cursor;
-#line 1037 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 8078 "MediaPage.c"
+#line 5915 "MediaPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		CheckerboardItem* _tmp3_ = NULL;
 		DataView* _tmp4_ = NULL;
 		CheckerboardItem* _tmp5_ = NULL;
-#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = _tmp1_;
-#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage)->cursor;
-#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = view_collection_get_next (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_VIEW, DataView));
-#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_CHECKERBOARD_ITEM) ? ((CheckerboardItem*) _tmp4_) : NULL;
-#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (_tmp5_ == NULL) {
-#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 8098 "MediaPage.c"
+#line 5935 "MediaPage.c"
 		}
-#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (restore_point);
-#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		restore_point = _tmp5_;
-#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 8106 "MediaPage.c"
+#line 5943 "MediaPage.c"
 	}
-#line 1041 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1041 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1041 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 1041 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_ > 0;
-#line 1041 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 1041 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp9_) {
-#line 8120 "MediaPage.c"
+#line 5957 "MediaPage.c"
 		CommandManager* _tmp10_ = NULL;
 		CommandManager* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
@@ -8125,83 +5962,83 @@ static void media_page_real_on_move_to_trash (MediaPage* self) {
 		GeeCollection* _tmp15_ = NULL;
 		TrashUntrashPhotosCommand* _tmp16_ = NULL;
 		TrashUntrashPhotosCommand* _tmp17_ = NULL;
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = _tmp10_;
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp13_ = _tmp12_;
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp14_ = view_collection_get_selected_sources (_tmp13_);
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp16_ = trash_untrash_photos_command_new (_tmp15_, TRUE);
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp17_ = _tmp16_;
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_COMMAND, Command));
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 1042 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp11_);
-#line 8155 "MediaPage.c"
+#line 5992 "MediaPage.c"
 	}
-#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = restore_point;
-#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp19_ != NULL) {
-#line 8161 "MediaPage.c"
+#line 5998 "MediaPage.c"
 		ViewCollection* _tmp20_ = NULL;
 		ViewCollection* _tmp21_ = NULL;
 		CheckerboardItem* _tmp22_ = NULL;
 		gboolean _tmp23_ = FALSE;
-#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = _tmp20_;
-#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp22_ = restore_point;
-#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp23_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
-#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = _tmp23_;
-#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp21_);
-#line 8178 "MediaPage.c"
+#line 6015 "MediaPage.c"
 	} else {
-#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = FALSE;
-#line 8182 "MediaPage.c"
+#line 6019 "MediaPage.c"
 	}
-#line 1046 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp18_) {
-#line 8186 "MediaPage.c"
+#line 6023 "MediaPage.c"
 		CheckerboardItem* _tmp24_ = NULL;
-#line 1047 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp24_ = restore_point;
-#line 1047 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_page_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp24_);
-#line 8192 "MediaPage.c"
+#line 6029 "MediaPage.c"
 	}
-#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 802 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (restore_point);
-#line 8196 "MediaPage.c"
+#line 6033 "MediaPage.c"
 }
 
 
 void media_page_on_move_to_trash (MediaPage* self) {
-#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 802 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1034 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 802 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_move_to_trash (self);
-#line 8205 "MediaPage.c"
+#line 6042 "MediaPage.c"
 }
 
 
@@ -8227,107 +6064,107 @@ static void media_page_real_on_edit_title (MediaPage* self) {
 	EditTitleDialog* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
 	const gchar* _tmp17_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1052 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 1053 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8245 "MediaPage.c"
+#line 6082 "MediaPage.c"
 	}
-#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList);
-#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 823 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_sources = _tmp7_;
-#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = media_sources;
-#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = gee_list_get (_tmp8_, 0);
-#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = (MediaSource*) _tmp9_;
-#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = media_source_get_title (_tmp10_);
-#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = edit_title_dialog_new (_tmp12_);
-#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = _tmp13_;
-#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (_tmp12_);
-#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	edit_title_dialog = _tmp14_;
-#line 1058 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = edit_title_dialog;
-#line 1058 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = edit_title_dialog_execute (_tmp15_);
-#line 1058 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_title = _tmp16_;
-#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = new_title;
-#line 1059 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp17_ != NULL) {
-#line 8289 "MediaPage.c"
+#line 6126 "MediaPage.c"
 		CommandManager* _tmp18_ = NULL;
 		CommandManager* _tmp19_ = NULL;
 		GeeList* _tmp20_ = NULL;
 		const gchar* _tmp21_ = NULL;
 		EditMultipleTitlesCommand* _tmp22_ = NULL;
 		EditMultipleTitlesCommand* _tmp23_ = NULL;
-#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = media_sources;
-#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = new_title;
-#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp22_ = edit_multiple_titles_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_);
-#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp23_ = _tmp22_;
-#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp23_);
-#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp19_);
-#line 8314 "MediaPage.c"
+#line 6151 "MediaPage.c"
 	}
-#line 1051 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (new_title);
-#line 1051 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
-#line 1051 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media_sources);
-#line 8322 "MediaPage.c"
+#line 6159 "MediaPage.c"
 }
 
 
 void media_page_on_edit_title (MediaPage* self) {
-#line 1051 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1051 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_edit_title (self);
-#line 8331 "MediaPage.c"
+#line 6168 "MediaPage.c"
 }
 
 
@@ -8353,343 +6190,462 @@ static void media_page_real_on_edit_comment (MediaPage* self) {
 	EditCommentDialog* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
 	const gchar* _tmp17_ = NULL;
-#line 1064 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1064 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1064 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 1064 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 1064 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1064 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 1065 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8371 "MediaPage.c"
+#line 6208 "MediaPage.c"
 	}
-#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList);
-#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 1067 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_sources = _tmp7_;
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = media_sources;
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = gee_list_get (_tmp8_, 0);
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = (MediaSource*) _tmp9_;
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = media_source_get_comment (_tmp10_);
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = edit_comment_dialog_new (_tmp12_, FALSE);
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = _tmp13_;
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (_tmp12_);
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	edit_comment_dialog = _tmp14_;
-#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = edit_comment_dialog;
-#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = edit_comment_dialog_execute (_tmp15_);
-#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 838 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_comment = _tmp16_;
-#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = new_comment;
-#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 839 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp17_ != NULL) {
-#line 8415 "MediaPage.c"
+#line 6252 "MediaPage.c"
 		CommandManager* _tmp18_ = NULL;
 		CommandManager* _tmp19_ = NULL;
 		GeeList* _tmp20_ = NULL;
 		const gchar* _tmp21_ = NULL;
 		EditMultipleCommentsCommand* _tmp22_ = NULL;
 		EditMultipleCommentsCommand* _tmp23_ = NULL;
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp20_ = media_sources;
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp21_ = new_comment;
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp22_ = edit_multiple_comments_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_);
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp23_ = _tmp22_;
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp23_);
-#line 1072 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 840 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp19_);
-#line 8440 "MediaPage.c"
+#line 6277 "MediaPage.c"
 	}
-#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_free0 (new_comment);
-#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (media_sources);
-#line 8448 "MediaPage.c"
+#line 6285 "MediaPage.c"
 }
 
 
 void media_page_on_edit_comment (MediaPage* self) {
-#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->on_edit_comment (self);
-#line 8457 "MediaPage.c"
+#line 6294 "MediaPage.c"
 }
 
 
-static void media_page_real_on_display_titles (MediaPage* self, GtkAction* action) {
+static void media_page_real_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GtkAction* _tmp0_ = NULL;
+	GVariant* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
-#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = action;
-#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 1076 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	GSimpleAction* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 844 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp0_ = value;
+#line 844 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp1_ = g_variant_get_boolean (_tmp0_);
+#line 844 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	display = _tmp1_;
-#line 1078 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
-#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	configuration_facade_set_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
-#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 848 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 8485 "MediaPage.c"
+#line 849 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp4_ = action;
+#line 849 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp5_ = value;
+#line 849 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp4_, _tmp5_);
+#line 6330 "MediaPage.c"
 }
 
 
-void media_page_on_display_titles (MediaPage* self, GtkAction* action) {
-#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
+void media_page_on_display_titles (MediaPage* self, GSimpleAction* action, GVariant* value) {
+#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	MEDIA_PAGE_GET_CLASS (self)->on_display_titles (self, action);
-#line 8494 "MediaPage.c"
+#line 843 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	MEDIA_PAGE_GET_CLASS (self)->on_display_titles (self, action, value);
+#line 6339 "MediaPage.c"
 }
 
 
-static void media_page_real_on_display_comments (MediaPage* self, GtkAction* action) {
+static void media_page_real_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GtkAction* _tmp0_ = NULL;
+	GVariant* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
-#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = action;
-#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	GSimpleAction* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+#line 852 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp0_ = value;
+#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp1_ = g_variant_get_boolean (_tmp0_);
+#line 853 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	display = _tmp1_;
-#line 1086 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 855 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
-#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 857 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 857 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 857 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	configuration_facade_set_display_photo_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
-#line 1088 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 857 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 8522 "MediaPage.c"
+#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp4_ = action;
+#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp5_ = value;
+#line 858 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp4_, _tmp5_);
+#line 6375 "MediaPage.c"
 }
 
 
-void media_page_on_display_comments (MediaPage* self, GtkAction* action) {
-#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala"
+void media_page_on_display_comments (MediaPage* self, GSimpleAction* action, GVariant* value) {
+#line 852 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	MEDIA_PAGE_GET_CLASS (self)->on_display_comments (self, action);
-#line 8531 "MediaPage.c"
+#line 852 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	MEDIA_PAGE_GET_CLASS (self)->on_display_comments (self, action, value);
+#line 6384 "MediaPage.c"
 }
 
 
-static void media_page_real_on_display_ratings (MediaPage* self, GtkAction* action) {
+static void media_page_real_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GtkAction* _tmp0_ = NULL;
+	GVariant* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
-#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 1092 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = action;
-#line 1092 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 1092 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	GSimpleAction* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+#line 861 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp0_ = value;
+#line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp1_ = g_variant_get_boolean (_tmp0_);
+#line 862 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	display = _tmp1_;
-#line 1094 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 864 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_ratings (self, display);
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
-#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 866 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 8559 "MediaPage.c"
+#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp4_ = action;
+#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp5_ = value;
+#line 867 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp4_, _tmp5_);
+#line 6420 "MediaPage.c"
 }
 
 
-void media_page_on_display_ratings (MediaPage* self, GtkAction* action) {
-#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
+void media_page_on_display_ratings (MediaPage* self, GSimpleAction* action, GVariant* value) {
+#line 861 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1091 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	MEDIA_PAGE_GET_CLASS (self)->on_display_ratings (self, action);
-#line 8568 "MediaPage.c"
+#line 861 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	MEDIA_PAGE_GET_CLASS (self)->on_display_ratings (self, action, value);
+#line 6429 "MediaPage.c"
 }
 
 
-static void media_page_real_on_display_tags (MediaPage* self, GtkAction* action) {
+static void media_page_real_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GtkAction* _tmp0_ = NULL;
+	GVariant* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = action;
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	GSimpleAction* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+#line 870 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp0_ = value;
+#line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp1_ = g_variant_get_boolean (_tmp0_);
+#line 871 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	display = _tmp1_;
-#line 1102 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 873 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_display_tags (self, display);
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 875 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 875 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 875 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	configuration_facade_set_display_photo_tags (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
-#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 875 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 8596 "MediaPage.c"
+#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp4_ = action;
+#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp5_ = value;
+#line 876 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp4_, _tmp5_);
+#line 6465 "MediaPage.c"
 }
 
 
-void media_page_on_display_tags (MediaPage* self, GtkAction* action) {
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
+void media_page_on_display_tags (MediaPage* self, GSimpleAction* action, GVariant* value) {
+#line 870 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	MEDIA_PAGE_GET_CLASS (self)->on_display_tags (self, action);
-#line 8605 "MediaPage.c"
+#line 870 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	MEDIA_PAGE_GET_CLASS (self)->on_display_tags (self, action, value);
+#line 6474 "MediaPage.c"
 }
 
 
 static void media_page_real_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by) {
-#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 879 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_page_get_config_photos_sort'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 879 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 8614 "MediaPage.c"
+#line 6483 "MediaPage.c"
 }
 
 
 void media_page_get_config_photos_sort (MediaPage* self, gboolean* sort_order, gint* sort_by) {
-#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 879 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 879 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->get_config_photos_sort (self, sort_order, sort_by);
-#line 8623 "MediaPage.c"
+#line 6492 "MediaPage.c"
 }
 
 
 static void media_page_real_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by) {
-#line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_critical ("Type `%s' does not implement abstract method `media_page_set_config_photos_sort'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return;
-#line 8632 "MediaPage.c"
+#line 6501 "MediaPage.c"
 }
 
 
 void media_page_set_config_photos_sort (MediaPage* self, gboolean sort_order, gint sort_by) {
-#line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1109 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 881 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->set_config_photos_sort (self, sort_order, sort_by);
-#line 8641 "MediaPage.c"
+#line 6510 "MediaPage.c"
 }
 
 
-static void media_page_real_on_sort_changed (MediaPage* self) {
+static void media_page_real_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value) {
 	gint sort_by = 0;
 	gint _tmp0_ = 0;
 	gboolean sort_order = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	GSimpleAction* _tmp2_ = NULL;
+	GVariant* _tmp3_ = NULL;
+#line 883 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 884 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_get_menu_sort_by (self);
-#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_by = _tmp0_;
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = media_page_get_menu_sort_order (self);
-#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_order = _tmp1_;
-#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_view_comparator (self, sort_by, sort_order);
-#line 1116 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_config_photos_sort (self, sort_order, sort_by);
-#line 8662 "MediaPage.c"
+#line 890 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp2_ = action;
+#line 890 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp3_ = value;
+#line 890 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp2_, _tmp3_);
+#line 6541 "MediaPage.c"
 }
 
 
-void media_page_on_sort_changed (MediaPage* self) {
-#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
+void media_page_on_sort_changed (MediaPage* self, GSimpleAction* action, GVariant* value) {
+#line 883 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	MEDIA_PAGE_GET_CLASS (self)->on_sort_changed (self);
-#line 8671 "MediaPage.c"
+#line 883 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	MEDIA_PAGE_GET_CLASS (self)->on_sort_changed (self, action, value);
+#line 6550 "MediaPage.c"
 }
 
 
-void media_page_on_raw_developer_shotwell (MediaPage* self, GtkAction* action) {
-#line 1119 "/home/jens/Source/shotwell/src/MediaPage.vala"
+void media_page_on_raw_developer_shotwell (MediaPage* self) {
+#line 893 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1119 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 1120 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_developer_changed (self, RAW_DEVELOPER_SHOTWELL);
-#line 8682 "MediaPage.c"
+#line 6559 "MediaPage.c"
 }
 
 
-void media_page_on_raw_developer_camera (MediaPage* self, GtkAction* action) {
-#line 1123 "/home/jens/Source/shotwell/src/MediaPage.vala"
+void media_page_on_raw_developer_camera (MediaPage* self) {
+#line 897 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1123 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 1124 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_developer_changed (self, RAW_DEVELOPER_CAMERA);
-#line 8693 "MediaPage.c"
+#line 6568 "MediaPage.c"
+}
+
+
+static void media_page_on_raw_developer_changed (MediaPage* self, GSimpleAction* action, GVariant* value) {
+	RawDeveloper developer = 0;
+	GVariant* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	GQuark _tmp4_ = 0U;
+#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	static GQuark _tmp3_label0 = 0;
+#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	static GQuark _tmp3_label1 = 0;
+#line 6582 "MediaPage.c"
+	RawDeveloper _tmp5_ = 0;
+	GSimpleAction* _tmp6_ = NULL;
+	GVariant* _tmp7_ = NULL;
+#line 901 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_return_if_fail (IS_MEDIA_PAGE (self));
+#line 901 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 903 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	developer = RAW_DEVELOPER_SHOTWELL;
+#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp0_ = value;
+#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp1_ = g_variant_get_string (_tmp0_, NULL);
+#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp2_ = _tmp1_;
+#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
+#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) {
+#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		switch (0) {
+#line 6604 "MediaPage.c"
+			default:
+			{
+#line 907 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				developer = RAW_DEVELOPER_SHOTWELL;
+#line 908 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				break;
+#line 6611 "MediaPage.c"
+			}
+		}
+	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
+#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		switch (0) {
+#line 6617 "MediaPage.c"
+			default:
+			{
+#line 910 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				developer = RAW_DEVELOPER_CAMERA;
+#line 911 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				break;
+#line 6624 "MediaPage.c"
+			}
+		}
+	} else {
+#line 905 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		switch (0) {
+#line 6630 "MediaPage.c"
+			default:
+			{
+#line 913 "/home/jens/Source/shotwell/src/MediaPage.vala"
+				break;
+#line 6635 "MediaPage.c"
+			}
+		}
+	}
+#line 916 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp5_ = developer;
+#line 916 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	media_page_developer_changed (self, _tmp5_);
+#line 918 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp6_ = action;
+#line 918 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp7_ = value;
+#line 918 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp6_, _tmp7_);
+#line 6649 "MediaPage.c"
 }
 
 
@@ -8703,29 +6659,29 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 	GeeArrayList* _tmp4_ = NULL;
 	gboolean _tmp31_ = FALSE;
 	gboolean _tmp32_ = FALSE;
-#line 1128 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1128 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1128 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 1128 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 1128 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1128 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 922 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 1129 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 8721 "MediaPage.c"
+#line 6677 "MediaPage.c"
 	}
-#line 1134 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 928 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	need_warn = FALSE;
-#line 1137 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 931 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = gee_array_list_new (TYPE_DATA_VIEW, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1137 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 931 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	to_set = _tmp4_;
-#line 8729 "MediaPage.c"
+#line 6685 "MediaPage.c"
 	{
 		GeeList* _view_list = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -8737,31 +6693,31 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
 		gint _view_index = 0;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = _tmp5_;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = view_collection_get_selected (_tmp6_);
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = _tmp7_;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_list = _tmp8_;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp9_ = _view_list;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp11_ = _tmp10_;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_size = _tmp11_;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_view_index = -1;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		while (TRUE) {
-#line 8765 "MediaPage.c"
+#line 6721 "MediaPage.c"
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
@@ -8775,128 +6731,128 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 			Photo* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			Photo* _tmp22_ = NULL;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp12_ = _view_index;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_view_index = _tmp12_ + 1;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp13_ = _view_index;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp14_ = _view_size;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (!(_tmp13_ < _tmp14_)) {
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				break;
-#line 8791 "MediaPage.c"
+#line 6747 "MediaPage.c"
 			}
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp15_ = _view_list;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp16_ = _view_index;
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			view = (DataView*) _tmp17_;
-#line 1139 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp18_ = view;
-#line 1139 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp19_ = data_view_get_source (_tmp18_);
-#line 1139 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO) ? ((Photo*) _tmp19_) : NULL;
-#line 1139 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp20_ == NULL) {
-#line 1139 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_g_object_unref0 (_tmp19_);
-#line 8811 "MediaPage.c"
+#line 6767 "MediaPage.c"
 			}
-#line 1139 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			p = _tmp20_;
-#line 1140 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp22_ = p;
-#line 1140 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp22_ != NULL) {
-#line 8819 "MediaPage.c"
+#line 6775 "MediaPage.c"
 				RawDeveloper _tmp23_ = 0;
 				Photo* _tmp24_ = NULL;
 				RawDeveloper _tmp25_ = 0;
 				gboolean _tmp26_ = FALSE;
-#line 1140 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp23_ = rd;
-#line 1140 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp24_ = p;
-#line 1140 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp25_ = photo_get_raw_developer (_tmp24_);
-#line 1140 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp26_ = raw_developer_is_equivalent (_tmp23_, _tmp25_);
-#line 1140 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = !_tmp26_;
-#line 8834 "MediaPage.c"
+#line 6790 "MediaPage.c"
 			} else {
-#line 1140 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp21_ = FALSE;
-#line 8838 "MediaPage.c"
+#line 6794 "MediaPage.c"
 			}
-#line 1140 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp21_) {
-#line 8842 "MediaPage.c"
+#line 6798 "MediaPage.c"
 				GeeArrayList* _tmp27_ = NULL;
 				DataView* _tmp28_ = NULL;
 				Photo* _tmp29_ = NULL;
 				gboolean _tmp30_ = FALSE;
-#line 1141 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp27_ = to_set;
-#line 1141 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp28_ = view;
-#line 1141 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp28_);
-#line 1143 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp29_ = p;
-#line 1143 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				_tmp30_ = photo_has_transformations (_tmp29_);
-#line 1143 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				if (_tmp30_) {
-#line 1144 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 938 "/home/jens/Source/shotwell/src/MediaPage.vala"
 					need_warn = TRUE;
-#line 8861 "MediaPage.c"
+#line 6817 "MediaPage.c"
 				}
 			}
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (p);
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_object_unref0 (view);
-#line 8868 "MediaPage.c"
+#line 6824 "MediaPage.c"
 		}
-#line 1138 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 932 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_view_list);
-#line 8872 "MediaPage.c"
+#line 6828 "MediaPage.c"
 	}
-#line 1149 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp32_ = need_warn;
-#line 1149 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (!_tmp32_) {
-#line 1149 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp31_ = TRUE;
-#line 8880 "MediaPage.c"
+#line 6836 "MediaPage.c"
 	} else {
 		GeeArrayList* _tmp33_ = NULL;
 		gint _tmp34_ = 0;
 		gint _tmp35_ = 0;
 		gboolean _tmp36_ = FALSE;
-#line 1149 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp33_ = to_set;
-#line 1149 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1149 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp35_ = _tmp34_;
-#line 1149 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp36_ = dialogs_confirm_warn_developer_changed (_tmp35_);
-#line 1149 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp31_ = _tmp36_;
-#line 8896 "MediaPage.c"
+#line 6852 "MediaPage.c"
 	}
-#line 1149 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp31_) {
-#line 8900 "MediaPage.c"
+#line 6856 "MediaPage.c"
 		SetRawDeveloperCommand* command = NULL;
 		GeeArrayList* _tmp37_ = NULL;
 		RawDeveloper _tmp38_ = 0;
@@ -8904,385 +6860,398 @@ static void media_page_real_developer_changed (MediaPage* self, RawDeveloper rd)
 		CommandManager* _tmp40_ = NULL;
 		CommandManager* _tmp41_ = NULL;
 		SetRawDeveloperCommand* _tmp42_ = NULL;
-#line 1150 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp37_ = to_set;
-#line 1150 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp38_ = rd;
-#line 1150 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp39_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ITERABLE, GeeIterable), _tmp38_);
-#line 1150 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command = _tmp39_;
-#line 1151 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp40_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1151 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp41_ = _tmp40_;
-#line 1151 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp42_ = command;
-#line 1151 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		command_manager_execute (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_COMMAND, Command));
-#line 1151 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_command_manager_unref0 (_tmp41_);
-#line 1153 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 947 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_update_development_menu_item_sensitivity (self);
-#line 1149 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (command);
-#line 8930 "MediaPage.c"
+#line 6886 "MediaPage.c"
 	}
-#line 1127 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (to_set);
-#line 8934 "MediaPage.c"
+#line 6890 "MediaPage.c"
 }
 
 
 void media_page_developer_changed (MediaPage* self, RawDeveloper rd) {
-#line 1127 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1127 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	MEDIA_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 8943 "MediaPage.c"
+#line 6899 "MediaPage.c"
 }
 
 
 static void media_page_real_set_display_titles (CheckerboardPage* base, gboolean display) {
 	MediaPage * self;
 	gboolean _tmp0_ = FALSE;
-	GtkToggleAction* action = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkToggleAction* _tmp2_ = NULL;
-	GtkToggleAction* _tmp3_ = NULL;
-#line 1157 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	gboolean _tmp1_ = FALSE;
+#line 951 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 1158 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = display;
-#line 1158 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 952 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	CHECKERBOARD_PAGE_CLASS (media_page_parent_class)->set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp0_);
-#line 1160 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
-#line 1160 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp1_) : NULL;
-#line 1160 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp2_ == NULL) {
-#line 1160 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp1_);
-#line 8968 "MediaPage.c"
-	}
-#line 1160 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	action = _tmp2_;
-#line 1161 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = action;
-#line 1161 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_ != NULL) {
-#line 8976 "MediaPage.c"
-		GtkToggleAction* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-#line 1162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp4_ = action;
-#line 1162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp5_ = display;
-#line 1162 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		gtk_toggle_action_set_active (_tmp4_, _tmp5_);
-#line 8985 "MediaPage.c"
-	}
-#line 1157 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (action);
-#line 8989 "MediaPage.c"
+#line 954 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp1_ = display;
+#line 954 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
+#line 6917 "MediaPage.c"
 }
 
 
 static void media_page_real_set_display_comments (CheckerboardPage* base, gboolean display) {
 	MediaPage * self;
 	gboolean _tmp0_ = FALSE;
-	GtkToggleAction* action = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkToggleAction* _tmp2_ = NULL;
-	GtkToggleAction* _tmp3_ = NULL;
-#line 1165 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	gboolean _tmp1_ = FALSE;
+#line 957 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 1166 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = display;
-#line 1166 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	CHECKERBOARD_PAGE_CLASS (media_page_parent_class)->set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp0_);
-#line 1168 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
-#line 1168 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp1_) : NULL;
-#line 1168 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp2_ == NULL) {
-#line 1168 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_g_object_unref0 (_tmp1_);
-#line 9014 "MediaPage.c"
-	}
-#line 1168 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	action = _tmp2_;
-#line 1169 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = action;
-#line 1169 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	if (_tmp3_ != NULL) {
-#line 9022 "MediaPage.c"
-		GtkToggleAction* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-#line 1170 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp4_ = action;
-#line 1170 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp5_ = display;
-#line 1170 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		gtk_toggle_action_set_active (_tmp4_, _tmp5_);
-#line 9031 "MediaPage.c"
-	}
-#line 1165 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (action);
-#line 9035 "MediaPage.c"
+#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp1_ = display;
+#line 960 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment", _tmp1_);
+#line 6935 "MediaPage.c"
 }
 
 
-static GtkRadioAction* media_page_sort_by_title_action (MediaPage* self) {
-	GtkRadioAction* result = NULL;
-	GtkRadioAction* action = NULL;
-	GtkAction* _tmp0_ = NULL;
-#line 1173 "/home/jens/Source/shotwell/src/MediaPage.vala"
+static GAction* media_page_sort_by_title_action (MediaPage* self) {
+	GAction* result = NULL;
+	GAction* action = NULL;
+	GAction* _tmp0_ = NULL;
+#line 963 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 1174 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortByTitle");
-#line 1174 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	action = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_radio_action_get_type (), GtkRadioAction);
-#line 1175 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 964 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortBy");
+#line 964 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	action = _tmp0_;
+#line 965 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_vala_assert (action != NULL, "action != null");
-#line 1176 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = action;
-#line 1176 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9055 "MediaPage.c"
+#line 6955 "MediaPage.c"
 }
 
 
-static GtkRadioAction* media_page_sort_ascending_action (MediaPage* self) {
-	GtkRadioAction* result = NULL;
-	GtkRadioAction* action = NULL;
-	GtkAction* _tmp0_ = NULL;
-#line 1179 "/home/jens/Source/shotwell/src/MediaPage.vala"
+static GAction* media_page_sort_ascending_action (MediaPage* self) {
+	GAction* result = NULL;
+	GAction* action = NULL;
+	GAction* _tmp0_ = NULL;
+#line 969 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 1180 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SortAscending");
-#line 1180 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	action = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_radio_action_get_type (), GtkRadioAction);
-#line 1181 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Sort");
+#line 970 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	action = _tmp0_;
+#line 971 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_vala_assert (action != NULL, "action != null");
-#line 1182 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = action;
-#line 1182 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9075 "MediaPage.c"
+#line 6975 "MediaPage.c"
 }
 
 
 gint media_page_get_menu_sort_by (MediaPage* self) {
 	gint result = 0;
-	GtkRadioAction* _tmp0_ = NULL;
-	GtkRadioAction* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-#line 1185 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	GAction* _tmp0_ = NULL;
+	GAction* _tmp1_ = NULL;
+	GVariant* _tmp2_ = NULL;
+	GVariant* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	gint _tmp6_ = 0;
+#line 975 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), 0);
-#line 1187 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_sort_by_title_action (self);
-#line 1187 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1187 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = gtk_radio_action_get_current_value (_tmp1_);
-#line 1187 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp2_ = g_action_get_state (_tmp1_);
+#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1187 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp4_ = g_variant_get_string (_tmp3_, NULL);
+#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp5_ = atoi (_tmp4_);
+#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp6_ = _tmp5_;
+#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp3_);
+#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1187 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = _tmp3_;
-#line 1187 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	result = _tmp6_;
+#line 977 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9101 "MediaPage.c"
+#line 7012 "MediaPage.c"
+}
+
+
+static GVariant* _variant_new26 (const gchar* value) {
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 7019 "MediaPage.c"
 }
 
 
 void media_page_set_menu_sort_by (MediaPage* self, gint val) {
-	GtkRadioAction* _tmp0_ = NULL;
-	GtkRadioAction* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-#line 1190 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	gchar* sort = NULL;
+	gint _tmp0_ = 0;
+	gchar* _tmp1_ = NULL;
+	GAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+	GSimpleAction* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+#line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1191 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = media_page_sort_by_title_action (self);
-#line 1191 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp1_ = _tmp0_;
-#line 1191 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = val;
-#line 1191 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_radio_action_set_current_value (_tmp1_, _tmp2_);
-#line 1191 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp1_);
-#line 9121 "MediaPage.c"
+#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp0_ = val;
+#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp1_ = g_strdup_printf ("%d", _tmp0_);
+#line 981 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	sort = _tmp1_;
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp2_ = media_page_sort_by_title_action (self);
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp3_ == NULL) {
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_g_object_unref0 (_tmp2_);
+#line 7047 "MediaPage.c"
+	}
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp4_ = _tmp3_;
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp5_ = _variant_new26 (sort);
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp4_, _tmp5_);
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp5_);
+#line 982 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp4_);
+#line 980 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_free0 (sort);
+#line 7061 "MediaPage.c"
 }
 
 
 gboolean media_page_get_menu_sort_order (MediaPage* self) {
 	gboolean result = FALSE;
-	GtkRadioAction* _tmp0_ = NULL;
-	GtkRadioAction* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
-#line 1194 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	GAction* _tmp0_ = NULL;
+	GAction* _tmp1_ = NULL;
+	GVariant* _tmp2_ = NULL;
+	GVariant* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	gboolean _tmp5_ = FALSE;
+#line 985 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), FALSE);
-#line 1196 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = media_page_sort_ascending_action (self);
-#line 1196 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1196 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp2_ = gtk_radio_action_get_current_value (_tmp1_);
-#line 1196 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_ == MEDIA_PAGE_SORT_ORDER_ASCENDING;
-#line 1196 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp2_ = g_action_get_state (_tmp1_);
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp3_ = _tmp2_;
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp4_ = g_variant_get_string (_tmp3_, NULL);
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp5_ = g_strcmp0 (_tmp4_, "ascending") == 0;
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp3_);
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1196 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	result = _tmp3_;
-#line 1196 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	result = _tmp5_;
+#line 987 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9147 "MediaPage.c"
+#line 7095 "MediaPage.c"
+}
+
+
+static GVariant* _variant_new27 (const gchar* value) {
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 7102 "MediaPage.c"
 }
 
 
 void media_page_set_menu_sort_order (MediaPage* self, gboolean ascending) {
-	gint _tmp0_ = 0;
+	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-	GtkRadioAction* _tmp2_ = NULL;
-	GtkRadioAction* _tmp3_ = NULL;
-#line 1199 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	GAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+	GSimpleAction* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+#line 990 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1201 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = ascending;
-#line 1201 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp1_) {
-#line 1201 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp0_ = MEDIA_PAGE_SORT_ORDER_ASCENDING;
-#line 9164 "MediaPage.c"
+#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp0_ = "'ascending'";
+#line 7121 "MediaPage.c"
 	} else {
-#line 1201 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		_tmp0_ = MEDIA_PAGE_SORT_ORDER_DESCENDING;
-#line 9168 "MediaPage.c"
+#line 992 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_tmp0_ = "'descending'";
+#line 7125 "MediaPage.c"
 	}
-#line 1200 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = media_page_sort_ascending_action (self);
-#line 1200 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp3_ = _tmp2_;
-#line 1200 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	gtk_radio_action_set_current_value (_tmp3_, _tmp0_);
-#line 1200 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_g_object_unref0 (_tmp3_);
-#line 9178 "MediaPage.c"
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	if (_tmp3_ == NULL) {
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+		_g_object_unref0 (_tmp2_);
+#line 7135 "MediaPage.c"
+	}
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp4_ = _tmp3_;
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_tmp5_ = _variant_new27 (_tmp0_);
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	g_simple_action_set_state (_tmp4_, _tmp5_);
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_variant_unref0 (_tmp5_);
+#line 991 "/home/jens/Source/shotwell/src/MediaPage.vala"
+	_g_object_unref0 (_tmp4_);
+#line 7147 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_title_ascending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_title_ascending_comparator (a, b);
-#line 1211 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9187 "MediaPage.c"
+#line 7156 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_title_descending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_title_descending_comparator (a, b);
-#line 1212 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9196 "MediaPage.c"
+#line 7165 "MediaPage.c"
 }
 
 
 static gboolean _thumbnail_title_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = thumbnail_title_comparator_predicate (object, alteration);
-#line 1213 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9205 "MediaPage.c"
+#line 7174 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_exposure_time_ascending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_exposure_time_ascending_comparator (a, b);
-#line 1218 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9214 "MediaPage.c"
+#line 7183 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_exposure_time_desending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_exposure_time_desending_comparator (a, b);
-#line 1219 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9223 "MediaPage.c"
+#line 7192 "MediaPage.c"
 }
 
 
 static gboolean _thumbnail_exposure_time_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = thumbnail_exposure_time_comparator_predicate (object, alteration);
-#line 1220 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9232 "MediaPage.c"
+#line 7201 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_rating_ascending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_rating_ascending_comparator (a, b);
-#line 1225 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9241 "MediaPage.c"
+#line 7210 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_rating_descending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_rating_descending_comparator (a, b);
-#line 1226 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9250 "MediaPage.c"
+#line 7219 "MediaPage.c"
 }
 
 
 static gboolean _thumbnail_rating_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = thumbnail_rating_comparator_predicate (object, alteration);
-#line 1227 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9259 "MediaPage.c"
+#line 7228 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_filename_ascending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_filename_ascending_comparator (a, b);
-#line 1232 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9268 "MediaPage.c"
+#line 7237 "MediaPage.c"
 }
 
 
 static gint64 _thumbnail_filename_descending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = thumbnail_filename_descending_comparator (a, b);
-#line 1233 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9277 "MediaPage.c"
+#line 7246 "MediaPage.c"
 }
 
 
 static gboolean _thumbnail_filename_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = thumbnail_filename_comparator_predicate (object, alteration);
-#line 1234 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9286 "MediaPage.c"
+#line 7255 "MediaPage.c"
 }
 
 
@@ -9300,410 +7269,329 @@ static void media_page_set_view_comparator (MediaPage* self, gint sort_by, gbool
 	void* _tmp10__target = NULL;
 	ComparatorPredicate _tmp11_ = NULL;
 	void* _tmp11__target = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1208 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = sort_by;
-#line 1208 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	switch (_tmp0_) {
-#line 1208 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_TITLE:
-#line 9312 "MediaPage.c"
+#line 7281 "MediaPage.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 1210 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp1_ = ascending;
-#line 1210 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp1_) {
-#line 1211 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1211 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1211 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1211 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1211 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_title_ascending_comparator_comparator;
-#line 1211 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1211 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1002 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 9333 "MediaPage.c"
+#line 7302 "MediaPage.c"
 			} else {
-#line 1212 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1212 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1212 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1212 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1212 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_title_descending_comparator_comparator;
-#line 1212 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1212 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 9349 "MediaPage.c"
+#line 7318 "MediaPage.c"
 			}
-#line 1213 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1213 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1213 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1213 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1213 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_title_comparator_predicate_comparator_predicate;
-#line 1213 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1213 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1214 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 9367 "MediaPage.c"
+#line 7336 "MediaPage.c"
 		}
-#line 1208 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_EXPOSURE_DATE:
-#line 9371 "MediaPage.c"
+#line 7340 "MediaPage.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1217 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp2_ = ascending;
-#line 1217 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp2_) {
-#line 1218 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1218 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1218 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1218 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1218 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_exposure_time_ascending_comparator_comparator;
-#line 1218 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1218 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 9392 "MediaPage.c"
+#line 7361 "MediaPage.c"
 			} else {
-#line 1219 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1219 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1219 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1219 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1219 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_exposure_time_desending_comparator_comparator;
-#line 1219 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1219 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 9408 "MediaPage.c"
+#line 7377 "MediaPage.c"
 			}
-#line 1220 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1220 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1220 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1220 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1220 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_exposure_time_comparator_predicate_comparator_predicate;
-#line 1220 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1220 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1221 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 9426 "MediaPage.c"
+#line 7395 "MediaPage.c"
 		}
-#line 1208 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_RATING:
-#line 9430 "MediaPage.c"
+#line 7399 "MediaPage.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 1224 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp3_ = ascending;
-#line 1224 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp3_) {
-#line 1225 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1225 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1225 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1225 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1225 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_rating_ascending_comparator_comparator;
-#line 1225 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1225 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 9451 "MediaPage.c"
+#line 7420 "MediaPage.c"
 			} else {
-#line 1226 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1226 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1226 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1226 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1226 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_rating_descending_comparator_comparator;
-#line 1226 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1226 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 9467 "MediaPage.c"
+#line 7436 "MediaPage.c"
 			}
-#line 1227 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1227 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1227 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1227 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1227 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_rating_comparator_predicate_comparator_predicate;
-#line 1227 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1227 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1228 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 9485 "MediaPage.c"
+#line 7454 "MediaPage.c"
 		}
-#line 1208 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		case MEDIA_PAGE_SORT_BY_FILENAME:
-#line 9489 "MediaPage.c"
+#line 7458 "MediaPage.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 1231 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp4_ = ascending;
-#line 1231 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			if (_tmp4_) {
-#line 1232 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1232 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1232 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1232 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1232 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_filename_ascending_comparator_comparator;
-#line 1232 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1232 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 9510 "MediaPage.c"
+#line 7479 "MediaPage.c"
 			} else {
-#line 1233 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1233 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = NULL;
-#line 1233 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1233 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 1233 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator = _thumbnail_filename_descending_comparator_comparator;
-#line 1233 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target = NULL;
-#line 1233 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1024 "/home/jens/Source/shotwell/src/MediaPage.vala"
 				comparator_target_destroy_notify = NULL;
-#line 9526 "MediaPage.c"
+#line 7495 "MediaPage.c"
 			}
-#line 1234 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1234 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1234 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1234 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1234 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_filename_comparator_predicate_comparator_predicate;
-#line 1234 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1234 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1235 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 9544 "MediaPage.c"
+#line 7513 "MediaPage.c"
 		}
 		default:
 		{
 			gint _tmp5_ = 0;
 			gchar* _tmp6_ = NULL;
 			gchar* _tmp7_ = NULL;
-#line 1238 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp5_ = media_page_get_menu_sort_by (self);
-#line 1238 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp6_ = g_strdup_printf ("%i", _tmp5_);
-#line 1238 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_tmp7_ = _tmp6_;
-#line 1238 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			g_debug ("MediaPage.vala:1238: Unknown sort criteria: %s", _tmp7_);
-#line 1238 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
+			g_debug ("MediaPage.vala:1029: Unknown sort criteria: %s", _tmp7_);
+#line 1029 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			_g_free0 (_tmp7_);
-#line 1239 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1239 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator = NULL;
-#line 1239 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target = NULL;
-#line 1239 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target_destroy_notify = NULL;
-#line 1239 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator = _thumbnail_title_descending_comparator_comparator;
-#line 1239 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target = NULL;
-#line 1239 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			comparator_target_destroy_notify = NULL;
-#line 1240 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1240 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = NULL;
-#line 1240 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1240 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1240 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate = _thumbnail_title_comparator_predicate_comparator_predicate;
-#line 1240 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target = NULL;
-#line 1240 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			predicate_target_destroy_notify = NULL;
-#line 1241 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/MediaPage.vala"
 			break;
-#line 9591 "MediaPage.c"
+#line 7560 "MediaPage.c"
 		}
 	}
-#line 1244 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1244 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1244 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = comparator;
-#line 1244 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10__target = comparator_target;
-#line 1244 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = predicate;
-#line 1244 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11__target = predicate_target;
-#line 1244 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection), _tmp10_, _tmp10__target, _tmp11_, _tmp11__target);
-#line 1244 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp9_);
-#line 1204 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	(predicate_target_destroy_notify == NULL) ? NULL : (predicate_target_destroy_notify (predicate_target), NULL);
-#line 1204 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	predicate = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	predicate_target = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	predicate_target_destroy_notify = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	(comparator_target_destroy_notify == NULL) ? NULL : (comparator_target_destroy_notify (comparator_target), NULL);
-#line 1204 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator_target = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 995 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	comparator_target_destroy_notify = NULL;
-#line 9626 "MediaPage.c"
-}
-
-
-gchar* media_page_get_sortby_path (MediaPage* self, gint sort_by) {
-	gchar* result = NULL;
-	gint _tmp0_ = 0;
-#line 1247 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 1248 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp0_ = sort_by;
-#line 1248 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	switch (_tmp0_) {
-#line 1248 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		case MEDIA_PAGE_SORT_BY_TITLE:
-#line 9641 "MediaPage.c"
-		{
-			gchar* _tmp1_ = NULL;
-#line 1250 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp1_ = g_strdup ("/MenuBar/ViewMenu/SortPhotos/SortByTitle");
-#line 1250 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			result = _tmp1_;
-#line 1250 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			return result;
-#line 9650 "MediaPage.c"
-		}
-#line 1248 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		case MEDIA_PAGE_SORT_BY_EXPOSURE_DATE:
-#line 9654 "MediaPage.c"
-		{
-			gchar* _tmp2_ = NULL;
-#line 1253 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp2_ = g_strdup ("/MenuBar/ViewMenu/SortPhotos/SortByExposureDate");
-#line 1253 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			result = _tmp2_;
-#line 1253 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			return result;
-#line 9663 "MediaPage.c"
-		}
-#line 1248 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		case MEDIA_PAGE_SORT_BY_RATING:
-#line 9667 "MediaPage.c"
-		{
-			gchar* _tmp3_ = NULL;
-#line 1256 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp3_ = g_strdup ("/MenuBar/ViewMenu/SortPhotos/SortByRating");
-#line 1256 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			result = _tmp3_;
-#line 1256 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			return result;
-#line 9676 "MediaPage.c"
-		}
-#line 1248 "/home/jens/Source/shotwell/src/MediaPage.vala"
-		case MEDIA_PAGE_SORT_BY_FILENAME:
-#line 9680 "MediaPage.c"
-		{
-			gchar* _tmp4_ = NULL;
-#line 1259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp4_ = g_strdup ("/MenuBar/ViewMenu/SortPhotos/SortByFilename");
-#line 1259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			result = _tmp4_;
-#line 1259 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			return result;
-#line 9689 "MediaPage.c"
-		}
-		default:
-		{
-			gint _tmp5_ = 0;
-			gchar* _tmp6_ = NULL;
-#line 1262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp5_ = sort_by;
-#line 1262 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			g_debug ("MediaPage.vala:1262: Unknown sort criteria: %d", _tmp5_);
-#line 1263 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			_tmp6_ = g_strdup ("/MenuBar/ViewMenu/SortPhotos/SortByTitle");
-#line 1263 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			result = _tmp6_;
-#line 1263 "/home/jens/Source/shotwell/src/MediaPage.vala"
-			return result;
-#line 9705 "MediaPage.c"
-		}
-	}
+#line 7595 "MediaPage.c"
 }
 
 
@@ -9712,106 +7600,106 @@ void media_page_sync_sort (MediaPage* self) {
 	gint sort_by = 0;
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_ = 0;
-#line 1267 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1284 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_get_config_photos_sort (self, &_tmp0_, &_tmp1_);
-#line 1284 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_ascending = _tmp0_;
-#line 1284 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	sort_by = _tmp1_;
-#line 1286 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1057 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_menu_sort_by (self, sort_by);
-#line 1287 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1058 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_menu_sort_order (self, sort_ascending);
-#line 1289 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1060 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_set_view_comparator (self, sort_by, sort_ascending);
-#line 9730 "MediaPage.c"
+#line 7618 "MediaPage.c"
 }
 
 
 static void media_page_real_destroy (GtkWidget* base) {
 	MediaPage * self;
-#line 1292 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MEDIA_PAGE, MediaPage);
-#line 1293 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1064 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_disconnect_slider (self);
-#line 1295 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	GTK_WIDGET_CLASS (media_page_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), gtk_widget_get_type (), GtkWidget));
-#line 9742 "MediaPage.c"
+#line 7630 "MediaPage.c"
 }
 
 
 void media_page_increase_zoom_level (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-#line 1298 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1069 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1299 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 1299 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1070 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 9754 "MediaPage.c"
+#line 7642 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_ = NULL;
-#line 1300 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
-#line 1300 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_zoom_slider_assembly_increase_step (_tmp1_);
-#line 9760 "MediaPage.c"
+#line 7648 "MediaPage.c"
 	} else {
 		gint new_scale = 0;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1302 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1073 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_get_thumb_size (self);
-#line 1302 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1073 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = media_page_compute_zoom_scale_increase (_tmp2_);
-#line 1302 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1073 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		new_scale = _tmp3_;
-#line 1303 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_save_persistent_thumbnail_scale (self);
-#line 1304 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = new_scale;
-#line 1304 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp4_);
-#line 9778 "MediaPage.c"
+#line 7666 "MediaPage.c"
 	}
 }
 
 
 void media_page_decrease_zoom_level (MediaPage* self) {
 	MediaPageZoomSliderAssembly* _tmp0_ = NULL;
-#line 1308 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1309 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = self->priv->connected_slider;
-#line 1309 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_ != NULL) {
-#line 9791 "MediaPage.c"
+#line 7679 "MediaPage.c"
 		MediaPageZoomSliderAssembly* _tmp1_ = NULL;
-#line 1310 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp1_ = self->priv->connected_slider;
-#line 1310 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_zoom_slider_assembly_decrease_step (_tmp1_);
-#line 9797 "MediaPage.c"
+#line 7685 "MediaPage.c"
 	} else {
 		gint new_scale = 0;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1312 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp2_ = media_page_get_thumb_size (self);
-#line 1312 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = media_page_compute_zoom_scale_decrease (_tmp2_);
-#line 1312 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		new_scale = _tmp3_;
-#line 1313 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_save_persistent_thumbnail_scale (self);
-#line 1314 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1085 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = new_scale;
-#line 1314 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1085 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		media_page_set_thumb_size (self, _tmp4_);
-#line 9815 "MediaPage.c"
+#line 7703 "MediaPage.c"
 	}
 }
 
@@ -9821,28 +7709,28 @@ static DataView* media_page_real_create_thumbnail (MediaPage* self, DataSource*
 	DataSource* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	Thumbnail* _tmp2_ = NULL;
-#line 1318 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
-#line 1319 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = source;
-#line 1319 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = media_page_get_thumb_size (self);
-#line 1319 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = thumbnail_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), _tmp1_);
-#line 1319 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_VIEW, DataView);
-#line 1319 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 9837 "MediaPage.c"
+#line 7725 "MediaPage.c"
 }
 
 
 DataView* media_page_create_thumbnail (MediaPage* self, DataSource* source) {
-#line 1318 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), NULL);
-#line 1318 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return MEDIA_PAGE_GET_CLASS (self)->create_thumbnail (self, source);
-#line 9846 "MediaPage.c"
+#line 7734 "MediaPage.c"
 }
 
 
@@ -9873,104 +7761,104 @@ void media_page_set_thumb_size (MediaPage* self, gint new_scale) {
 	gint _tmp24_ = 0;
 	gint _tmp25_ = 0;
 	gint _tmp26_ = 0;
-#line 1324 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_if_fail (IS_MEDIA_PAGE (self));
-#line 1325 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = media_page_get_thumb_size (self);
-#line 1325 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = new_scale;
-#line 1325 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp1_ == _tmp2_) {
-#line 1325 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = TRUE;
-#line 9887 "MediaPage.c"
+#line 7775 "MediaPage.c"
 	} else {
 		gboolean _tmp3_ = FALSE;
-#line 1325 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp3_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1325 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 9894 "MediaPage.c"
+#line 7782 "MediaPage.c"
 	}
-#line 1325 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1096 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp0_) {
-#line 1326 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 9900 "MediaPage.c"
+#line 7788 "MediaPage.c"
 	}
-#line 1328 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = new_scale;
-#line 1328 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp5_ = thumbnail_get_MIN_SCALE ();
-#line 1328 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1328 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp7_ = thumbnail_get_MAX_SCALE ();
-#line 1328 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp8_ = _tmp7_;
-#line 1328 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = CLAMP (_tmp4_, _tmp6_, _tmp8_);
-#line 1328 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1099 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	new_scale = _tmp9_;
-#line 1329 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1329 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = _tmp10_;
-#line 1329 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = new_scale;
-#line 1329 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	checkerboard_layout_set_scale (_tmp11_, _tmp12_);
-#line 1329 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1100 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp11_);
-#line 1332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp14_ = _tmp13_;
-#line 1332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1332 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 1333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp16_ = _tmp15_;
-#line 1333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp17_ = new_scale;
-#line 1333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_init (&_tmp18_, G_TYPE_INT);
-#line 1333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_value_set_int (&_tmp18_, _tmp17_);
-#line 1333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_COLLECTION, DataCollection), THUMBNAIL_PROP_SIZE, &_tmp18_, NULL, NULL);
-#line 1333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_IS_VALUE (&_tmp18_) ? (g_value_unset (&_tmp18_), NULL) : NULL;
-#line 1333 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 1334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp20_ = _tmp19_;
-#line 1334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1334 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 1336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp21_ = new_scale;
-#line 1336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp22_ = thumbnail_get_MAX_SCALE ();
-#line 1336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp23_ = _tmp22_;
-#line 1336 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1107 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp21_ < _tmp23_);
-#line 1337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp24_ = new_scale;
-#line 1337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp25_ = thumbnail_get_MIN_SCALE ();
-#line 1337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp26_ = _tmp25_;
-#line 1337 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp24_ > _tmp26_);
-#line 9974 "MediaPage.c"
+#line 7862 "MediaPage.c"
 }
 
 
@@ -9984,59 +7872,59 @@ gint media_page_get_thumb_size (MediaPage* self) {
 	CheckerboardLayout* _tmp10_ = NULL;
 	gint _tmp11_ = 0;
 	gint _tmp12_ = 0;
-#line 1340 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_return_val_if_fail (IS_MEDIA_PAGE (self), 0);
-#line 1341 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp0_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1341 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1341 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = checkerboard_layout_get_scale (_tmp1_);
-#line 1341 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp3_ = _tmp2_ <= 0;
-#line 1341 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1341 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (_tmp3_) {
-#line 10002 "MediaPage.c"
+#line 7890 "MediaPage.c"
 		CheckerboardLayout* _tmp4_ = NULL;
 		CheckerboardLayout* _tmp5_ = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 1342 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp4_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1342 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp5_ = _tmp4_;
-#line 1342 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 1342 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp7_ = _tmp6_;
-#line 1342 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_tmp8_ = configuration_facade_get_photo_thumbnail_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1342 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		checkerboard_layout_set_scale (_tmp5_, _tmp8_);
-#line 1342 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1342 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 10024 "MediaPage.c"
+#line 7912 "MediaPage.c"
 	}
-#line 1344 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp9_ = checkerboard_page_get_checkerboard_layout (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1344 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp10_ = _tmp9_;
-#line 1344 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp11_ = checkerboard_layout_get_scale (_tmp10_);
-#line 1344 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp12_ = _tmp11_;
-#line 1344 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 1344 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	result = _tmp12_;
-#line 1344 "/home/jens/Source/shotwell/src/MediaPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 10040 "MediaPage.c"
+#line 7928 "MediaPage.c"
 }
 
 
@@ -10045,14 +7933,14 @@ static gboolean _media_page_zoom_slider_assembly_on_zoom_out_pressed_gtk_widget_
 	result = media_page_zoom_slider_assembly_on_zoom_out_pressed ((MediaPageZoomSliderAssembly*) self, event);
 #line 144 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 10049 "MediaPage.c"
+#line 7937 "MediaPage.c"
 }
 
 
 static void _media_page_zoom_slider_assembly_on_slider_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
 #line 155 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	media_page_zoom_slider_assembly_on_slider_changed ((MediaPageZoomSliderAssembly*) self);
-#line 10056 "MediaPage.c"
+#line 7944 "MediaPage.c"
 }
 
 
@@ -10061,7 +7949,7 @@ static gboolean _media_page_zoom_slider_assembly_on_zoom_in_pressed_gtk_widget_b
 	result = media_page_zoom_slider_assembly_on_zoom_in_pressed ((MediaPageZoomSliderAssembly*) self, event);
 #line 168 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 10065 "MediaPage.c"
+#line 7953 "MediaPage.c"
 }
 
 
@@ -10243,14 +8131,14 @@ MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_construct (GType ob
 	_g_object_unref0 (zoom_group);
 #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return self;
-#line 10247 "MediaPage.c"
+#line 8135 "MediaPage.c"
 }
 
 
 MediaPageZoomSliderAssembly* media_page_zoom_slider_assembly_new (void) {
 #line 135 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return media_page_zoom_slider_assembly_construct (MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY);
-#line 10254 "MediaPage.c"
+#line 8142 "MediaPage.c"
 }
 
 
@@ -10291,7 +8179,7 @@ gdouble media_page_zoom_slider_assembly_scale_to_slider (gint value) {
 	result = (gdouble) ((_tmp6_ - _tmp8_) / MEDIA_PAGE_SLIDER_STEPPING);
 #line 179 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 10295 "MediaPage.c"
+#line 8183 "MediaPage.c"
 }
 
 
@@ -10329,7 +8217,7 @@ gint media_page_zoom_slider_assembly_slider_to_scale (gdouble value) {
 	result = res;
 #line 188 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 10333 "MediaPage.c"
+#line 8221 "MediaPage.c"
 }
 
 
@@ -10345,7 +8233,7 @@ static gboolean media_page_zoom_slider_assembly_on_zoom_out_pressed (MediaPageZo
 	result = TRUE;
 #line 193 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 10349 "MediaPage.c"
+#line 8237 "MediaPage.c"
 }
 
 
@@ -10361,7 +8249,7 @@ static gboolean media_page_zoom_slider_assembly_on_zoom_in_pressed (MediaPageZoo
 	result = TRUE;
 #line 198 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 10365 "MediaPage.c"
+#line 8253 "MediaPage.c"
 }
 
 
@@ -10370,7 +8258,7 @@ static void media_page_zoom_slider_assembly_on_slider_changed (MediaPageZoomSlid
 	g_return_if_fail (MEDIA_PAGE_IS_ZOOM_SLIDER_ASSEMBLY (self));
 #line 202 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_signal_emit_by_name (self, "zoom-changed");
-#line 10374 "MediaPage.c"
+#line 8262 "MediaPage.c"
 }
 
 
@@ -10391,7 +8279,7 @@ void media_page_zoom_slider_assembly_snap_to_min (MediaPageZoomSliderAssembly* s
 	_tmp3_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp2_);
 #line 206 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp3_);
-#line 10395 "MediaPage.c"
+#line 8283 "MediaPage.c"
 }
 
 
@@ -10412,7 +8300,7 @@ void media_page_zoom_slider_assembly_snap_to_max (MediaPageZoomSliderAssembly* s
 	_tmp3_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp2_);
 #line 210 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp3_);
-#line 10416 "MediaPage.c"
+#line 8304 "MediaPage.c"
 }
 
 
@@ -10441,7 +8329,7 @@ void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly*
 	if (_tmp2_ == _tmp3_) {
 #line 217 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 10445 "MediaPage.c"
+#line 8333 "MediaPage.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = self->priv->slider;
@@ -10451,7 +8339,7 @@ void media_page_zoom_slider_assembly_increase_step (MediaPageZoomSliderAssembly*
 	_tmp6_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp5_);
 #line 219 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), _tmp6_);
-#line 10455 "MediaPage.c"
+#line 8343 "MediaPage.c"
 }
 
 
@@ -10480,7 +8368,7 @@ void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly*
 	if (_tmp2_ == _tmp3_) {
 #line 226 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 10484 "MediaPage.c"
+#line 8372 "MediaPage.c"
 	}
 #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp4_ = self->priv->slider;
@@ -10490,7 +8378,7 @@ void media_page_zoom_slider_assembly_decrease_step (MediaPageZoomSliderAssembly*
 	_tmp6_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp5_);
 #line 228 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), _tmp6_);
-#line 10494 "MediaPage.c"
+#line 8382 "MediaPage.c"
 }
 
 
@@ -10511,7 +8399,7 @@ gint media_page_zoom_slider_assembly_get_scale (MediaPageZoomSliderAssembly* sel
 	result = _tmp2_;
 #line 232 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	return result;
-#line 10515 "MediaPage.c"
+#line 8403 "MediaPage.c"
 }
 
 
@@ -10531,7 +8419,7 @@ void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* sel
 	if (_tmp0_ == _tmp1_) {
 #line 237 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		return;
-#line 10535 "MediaPage.c"
+#line 8423 "MediaPage.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	_tmp2_ = self->priv->slider;
@@ -10541,7 +8429,7 @@ void media_page_zoom_slider_assembly_set_scale (MediaPageZoomSliderAssembly* sel
 	_tmp4_ = media_page_zoom_slider_assembly_scale_to_slider (_tmp3_);
 #line 239 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), _tmp4_);
-#line 10545 "MediaPage.c"
+#line 8433 "MediaPage.c"
 }
 
 
@@ -10554,14 +8442,14 @@ static void media_page_zoom_slider_assembly_class_init (MediaPageZoomSliderAssem
 	G_OBJECT_CLASS (klass)->finalize = media_page_zoom_slider_assembly_finalize;
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	g_signal_new ("zoom_changed", MEDIA_PAGE_TYPE_ZOOM_SLIDER_ASSEMBLY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 10558 "MediaPage.c"
+#line 8446 "MediaPage.c"
 }
 
 
 static void media_page_zoom_slider_assembly_instance_init (MediaPageZoomSliderAssembly * self) {
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv = MEDIA_PAGE_ZOOM_SLIDER_ASSEMBLY_GET_PRIVATE (self);
-#line 10565 "MediaPage.c"
+#line 8453 "MediaPage.c"
 }
 
 
@@ -10575,7 +8463,7 @@ static void media_page_zoom_slider_assembly_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->adjustment);
 #line 129 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (media_page_zoom_slider_assembly_parent_class)->finalize (obj);
-#line 10579 "MediaPage.c"
+#line 8467 "MediaPage.c"
 }
 
 
@@ -10599,11 +8487,7 @@ static void media_page_class_init (MediaPageClass * klass) {
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = media_page_real_init_collect_ui_filenames;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((PageClass *) klass)->init_collect_action_entries = media_page_real_init_collect_action_entries;
-#line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((PageClass *) klass)->init_collect_toggle_action_entries = media_page_real_init_collect_toggle_action_entries;
-#line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	((PageClass *) klass)->register_radio_actions = media_page_real_register_radio_actions;
+	((PageClass *) klass)->add_actions = media_page_real_add_actions;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	((PageClass *) klass)->update_actions = media_page_real_update_actions;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -10678,7 +8562,7 @@ static void media_page_class_init (MediaPageClass * klass) {
 	((MediaPageClass *) klass)->create_thumbnail = media_page_real_create_thumbnail;
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = media_page_finalize;
-#line 10682 "MediaPage.c"
+#line 8566 "MediaPage.c"
 }
 
 
@@ -10689,7 +8573,7 @@ static void media_page_instance_init (MediaPage * self) {
 	self->priv->connected_slider = NULL;
 #line 244 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	self->priv->dnd_handler = NULL;
-#line 10693 "MediaPage.c"
+#line 8577 "MediaPage.c"
 }
 
 
@@ -10705,7 +8589,7 @@ static void media_page_finalize (GObject* obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 112 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	G_OBJECT_CLASS (media_page_parent_class)->finalize (obj);
-#line 10709 "MediaPage.c"
+#line 8593 "MediaPage.c"
 }
 
 
diff --git a/src/MediaPage.vala b/src/MediaPage.vala
index 89aa2fc..c9b23b8 100644
--- a/src/MediaPage.vala
+++ b/src/MediaPage.vala
@@ -282,250 +282,62 @@ public abstract class MediaPage : CheckerboardPage {
         
         ui_filenames.add("media.ui");
     }
-    
-    protected override Gtk.ActionEntry[] init_collect_action_entries() {
-        Gtk.ActionEntry[] actions = base.init_collect_action_entries();
-        
-        Gtk.ActionEntry export = { "Export", Resources.SAVE_AS_LABEL, TRANSLATABLE, "<Ctrl><Shift>E",
-            TRANSLATABLE, on_export };
-        export.label = Resources.EXPORT_MENU;
-        actions += export;
-
-        Gtk.ActionEntry send_to = { "SendTo", "document-send", TRANSLATABLE, null, 
-            TRANSLATABLE, on_send_to };
-        send_to.label = Resources.SEND_TO_MENU;
-        actions += send_to;
-
-        // This is identical to the above action, except that it has different 
-        // mnemonics and is _only_ for use in the context menu.
-        Gtk.ActionEntry send_to_context_menu = { "SendToContextMenu", "document-send", TRANSLATABLE, null,
-            TRANSLATABLE, on_send_to };
-        send_to_context_menu.label = Resources.SEND_TO_CONTEXT_MENU;
-        actions += send_to_context_menu;
-        
-        Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Resources.REMOVE_LABEL, TRANSLATABLE,
-            "<Shift>Delete", TRANSLATABLE, on_remove_from_library };
-        remove_from_library.label = Resources.REMOVE_FROM_LIBRARY_MENU;
-        actions += remove_from_library;
-        
-        Gtk.ActionEntry move_to_trash = { "MoveToTrash", "user-trash-full", TRANSLATABLE, "Delete",
-            TRANSLATABLE, on_move_to_trash };
-        move_to_trash.label = Resources.MOVE_TO_TRASH_MENU;
-        actions += move_to_trash;
-        
-        Gtk.ActionEntry new_event = { "NewEvent", Resources.NEW_LABEL, TRANSLATABLE, "<Ctrl>N",
-            TRANSLATABLE, on_new_event };
-        new_event.label = Resources.NEW_EVENT_MENU;
-        actions += new_event;
-
-        Gtk.ActionEntry add_tags = { "AddTags", null, TRANSLATABLE, "<Ctrl>T", TRANSLATABLE, 
-            on_add_tags };
-        add_tags.label = Resources.ADD_TAGS_MENU;
-        actions += add_tags;
-
-        // This is identical to the above action, except that it has different 
-        // mnemonics and is _only_ for use in the context menu.
-        Gtk.ActionEntry add_tags_context_menu = { "AddTagsContextMenu", null, TRANSLATABLE, "<Ctrl>A", TRANSLATABLE,
-            on_add_tags };
-        add_tags_context_menu.label = Resources.ADD_TAGS_CONTEXT_MENU;
-        actions += add_tags_context_menu;
-
-        Gtk.ActionEntry modify_tags = { "ModifyTags", null, TRANSLATABLE, "<Ctrl>M", TRANSLATABLE, 
-            on_modify_tags };
-        modify_tags.label = Resources.MODIFY_TAGS_MENU;
-        actions += modify_tags;
-
-        Gtk.ActionEntry increase_size = { "IncreaseSize", Resources.ZOOM_IN_LABEL, TRANSLATABLE,
-            "<Ctrl>plus", TRANSLATABLE, on_increase_size };
-        increase_size.label = _("Zoom _In");
-        increase_size.tooltip = _("Increase the magnification of the thumbnails");
-        actions += increase_size;
-
-        Gtk.ActionEntry decrease_size = { "DecreaseSize", Resources.ZOOM_OUT_LABEL, TRANSLATABLE,
-            "<Ctrl>minus", TRANSLATABLE, on_decrease_size };
-        decrease_size.label = _("Zoom _Out");
-        decrease_size.tooltip = _("Decrease the magnification of the thumbnails");
-        actions += decrease_size;
-        
-        Gtk.ActionEntry flag = { "Flag", null, TRANSLATABLE, "<Ctrl>G", TRANSLATABLE, on_flag_unflag };
-        flag.label = Resources.FLAG_MENU;
-        actions += flag;
-        
-        Gtk.ActionEntry set_rating = { "Rate", null, TRANSLATABLE, null, null, null };
-        set_rating.label = Resources.RATING_MENU;
-        actions += set_rating;
-
-        Gtk.ActionEntry increase_rating = { "IncreaseRating", null, TRANSLATABLE, 
-            "greater", TRANSLATABLE, on_increase_rating };
-        increase_rating.label = Resources.INCREASE_RATING_MENU;
-        actions += increase_rating;
-
-        Gtk.ActionEntry decrease_rating = { "DecreaseRating", null, TRANSLATABLE, 
-            "less", TRANSLATABLE, on_decrease_rating };
-        decrease_rating.label = Resources.DECREASE_RATING_MENU;
-        actions += decrease_rating;
-
-        Gtk.ActionEntry rate_rejected = { "RateRejected", null, TRANSLATABLE, 
-            "9", TRANSLATABLE, on_rate_rejected };
-        rate_rejected.label = Resources.rating_menu(Rating.REJECTED);
-        actions += rate_rejected;
-
-        Gtk.ActionEntry rate_unrated = { "RateUnrated", null, TRANSLATABLE, 
-            "0", TRANSLATABLE, on_rate_unrated };
-        rate_unrated.label = Resources.rating_menu(Rating.UNRATED);
-        actions += rate_unrated;
-
-        Gtk.ActionEntry rate_one = { "RateOne", null, TRANSLATABLE, 
-            "1", TRANSLATABLE, on_rate_one };
-        rate_one.label = Resources.rating_menu(Rating.ONE);
-        actions += rate_one;
-
-        Gtk.ActionEntry rate_two = { "RateTwo", null, TRANSLATABLE, 
-            "2", TRANSLATABLE, on_rate_two };
-        rate_two.label = Resources.rating_menu(Rating.TWO);
-        actions += rate_two;
-
-        Gtk.ActionEntry rate_three = { "RateThree", null, TRANSLATABLE, 
-            "3", TRANSLATABLE, on_rate_three };
-        rate_three.label = Resources.rating_menu(Rating.THREE);
-        actions += rate_three;
-
-        Gtk.ActionEntry rate_four = { "RateFour", null, TRANSLATABLE, 
-            "4", TRANSLATABLE, on_rate_four };
-        rate_four.label = Resources.rating_menu(Rating.FOUR);
-        actions += rate_four;
-
-        Gtk.ActionEntry rate_five = { "RateFive", null, TRANSLATABLE, 
-            "5", TRANSLATABLE, on_rate_five };
-        rate_five.label = Resources.rating_menu(Rating.FIVE);
-        actions += rate_five;
-
-        Gtk.ActionEntry edit_title = { "EditTitle", null, TRANSLATABLE, "F2", TRANSLATABLE,
-            on_edit_title };
-        edit_title.label = Resources.EDIT_TITLE_MENU;
-        actions += edit_title;
-
-        Gtk.ActionEntry edit_comment = { "EditComment", null, TRANSLATABLE, "F3", TRANSLATABLE,
-            on_edit_comment };
-        edit_comment.label = Resources.EDIT_COMMENT_MENU;
-        actions += edit_comment;
-
-        Gtk.ActionEntry sort_photos = { "SortPhotos", null, TRANSLATABLE, null, null, null };
-        sort_photos.label = _("Sort _Photos");
-        actions += sort_photos;
-
-        Gtk.ActionEntry filter_photos = { "FilterPhotos", null, TRANSLATABLE, null, null, null };
-        filter_photos.label = Resources.FILTER_PHOTOS_MENU;
-        actions += filter_photos;
-        
-        Gtk.ActionEntry play = { "PlayVideo", Resources.PLAY_LABEL, TRANSLATABLE, "<Ctrl>Y",
-            TRANSLATABLE, on_play_video };
-        play.label = _("_Play Video");
-        play.tooltip = _("Open the selected videos in the system video player");
-        actions += play;
-        
-        Gtk.ActionEntry raw_developer = { "RawDeveloper", null, TRANSLATABLE, null, null, null };
-        raw_developer.label = _("_Developer");
-        actions += raw_developer;
-        
-        // RAW developers.
-        
-        Gtk.ActionEntry dev_shotwell = { "RawDeveloperShotwell", null, TRANSLATABLE, null, TRANSLATABLE,
-            on_raw_developer_shotwell };
-        dev_shotwell.label = _("Shotwell");
-        actions += dev_shotwell;
-        
-        Gtk.ActionEntry dev_camera = { "RawDeveloperCamera", null, TRANSLATABLE, null, TRANSLATABLE,
-            on_raw_developer_camera };
-        dev_camera.label = _("Camera");
-        actions += dev_camera;
 
-        return actions;
-    }
-    
-    protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries() {
-        Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries();
-        
-        Gtk.ToggleActionEntry titles = { "ViewTitle", null, TRANSLATABLE, "<Ctrl><Shift>T",
-            TRANSLATABLE, on_display_titles, Config.Facade.get_instance().get_display_photo_titles() };
-        titles.label = _("_Titles");
-        titles.tooltip = _("Display the title of each photo");
-        toggle_actions += titles;
-        
-        Gtk.ToggleActionEntry comments = { "ViewComment", null, TRANSLATABLE, "<Ctrl><Shift>C",
-            TRANSLATABLE, on_display_comments, Config.Facade.get_instance().get_display_photo_comments() };
-        comments.label = _("_Comments");
-        comments.tooltip = _("Display the comment of each photo");
-        toggle_actions += comments;
-        
-        Gtk.ToggleActionEntry ratings = { "ViewRatings", null, TRANSLATABLE, "<Ctrl><Shift>N",
-            TRANSLATABLE, on_display_ratings, Config.Facade.get_instance().get_display_photo_ratings() };
-        ratings.label = Resources.VIEW_RATINGS_MENU;
-        ratings.tooltip = Resources.VIEW_RATINGS_TOOLTIP;
-        toggle_actions += ratings;
-
-        Gtk.ToggleActionEntry tags = { "ViewTags", null, TRANSLATABLE, "<Ctrl><Shift>G",
-            TRANSLATABLE, on_display_tags, Config.Facade.get_instance().get_display_photo_tags() };
-        tags.label = _("Ta_gs");
-        tags.tooltip = _("Display each photo’s tags");
-        toggle_actions += tags;
-        
-        return toggle_actions;
-    }
-    
-    protected override void register_radio_actions(Gtk.ActionGroup action_group) {
+    private const GLib.ActionEntry[] entries = {
+        { "Export", on_export },
+        { "SendTo", on_send_to },
+        { "SendToContextMenu", on_send_to },
+        { "RemoveFromLibrary", on_remove_from_library },
+        { "MoveToTrash", on_move_to_trash },
+        { "NewEvent", on_new_event },
+        { "AddTags", on_add_tags },
+        { "AddTagsContextMenu", on_add_tags },
+        { "ModifyTags", on_modify_tags },
+        { "IncreaseSize", on_increase_size },
+        { "DecreaseSize", on_decrease_size },
+        { "Flag", on_flag_unflag },
+        { "IncreaseRating", on_increase_rating },
+        { "DecreaseRating", on_decrease_rating },
+        { "RateRejected", on_rate_rejected },
+        { "RateUnrated", on_rate_unrated },
+        { "RateOne", on_rate_one },
+        { "RateTwo", on_rate_two },
+        { "RateThree", on_rate_three },
+        { "RateFour", on_rate_four },
+        { "RateFive", on_rate_five },
+        { "EditTitle", on_edit_title },
+        { "EditComment", on_edit_comment },
+        { "PlayVideo", on_play_video },
+
+        // Toggle actions
+        { "ViewTitle", on_action_toggle, null, "false", on_display_titles },
+        { "ViewComment", on_action_toggle, null, "false", on_display_comments },
+        { "ViewRatings", on_action_toggle, null, "false", on_display_ratings },
+        { "ViewTags", on_action_toggle, null, "false", on_display_tags },
+
+        // Radio actions
+        { "SortBy", on_action_radio, "s", "'1'", on_sort_changed },
+        { "Sort", on_action_radio, "s", "'ascending'", on_sort_changed },
+        { "RawDeveloper", on_action_radio, "s", "'Shotwell'", on_raw_developer_changed }
+    };
+
+    protected override void add_actions () {
+        base.add_actions ();
+
         bool sort_order;
         int sort_by;
         get_config_photos_sort(out sort_order, out sort_by);
-        
-        // Sort criteria.
-        Gtk.RadioActionEntry[] sort_crit_actions = new Gtk.RadioActionEntry[0];
-        
-        Gtk.RadioActionEntry by_title = { "SortByTitle", null, TRANSLATABLE, null, TRANSLATABLE,
-            SortBy.TITLE };
-        by_title.label = _("By _Title");
-        by_title.tooltip = _("Sort photos by title");
-        sort_crit_actions += by_title;
-        
-        Gtk.RadioActionEntry by_date = { "SortByExposureDate", null, TRANSLATABLE, null,
-            TRANSLATABLE, SortBy.EXPOSURE_DATE };
-        by_date.label = _("By Exposure _Date");
-        by_date.tooltip = _("Sort photos by exposure date");
-        sort_crit_actions += by_date;
-        
-        Gtk.RadioActionEntry by_rating = { "SortByRating", null, TRANSLATABLE, null,
-            TRANSLATABLE, SortBy.RATING };
-        by_rating.label = _("By _Rating");
-        by_rating.tooltip = _("Sort photos by rating");
-        sort_crit_actions += by_rating;
-        
-        Gtk.RadioActionEntry by_filename = { "SortByFilename", null, TRANSLATABLE, null,
-            TRANSLATABLE, SortBy.FILENAME };
-        by_filename.label = _("By _Filename");
-        by_filename.tooltip = _("Sort photos by filename");
-        sort_crit_actions += by_filename;
 
-        action_group.add_radio_actions(sort_crit_actions, sort_by, on_sort_changed);
-        
-        // Sort order.
-        Gtk.RadioActionEntry[] sort_order_actions = new Gtk.RadioActionEntry[0];
-        
-        Gtk.RadioActionEntry ascending = { "SortAscending", Resources.SORT_ASCENDING_LABEL,
-            TRANSLATABLE, null, TRANSLATABLE, SORT_ORDER_ASCENDING };
-        ascending.label = _("_Ascending");
-        ascending.tooltip = _("Sort photos in an ascending order");
-        sort_order_actions += ascending;
-        
-        Gtk.RadioActionEntry descending = { "SortDescending", Resources.SORT_DESCENDING_LABEL,
-            TRANSLATABLE, null, TRANSLATABLE, SORT_ORDER_DESCENDING };
-        descending.label = _("D_escending");
-        descending.tooltip = _("Sort photos in a descending order");
-        sort_order_actions += descending;
-        
-        action_group.add_radio_actions(sort_order_actions,
-            sort_order ? SORT_ORDER_ASCENDING : SORT_ORDER_DESCENDING, on_sort_changed);
-        
-        base.register_radio_actions(action_group);
+        AppWindow.get_instance ().add_action_entries (entries, this);
+        (get_action ("ViewTitle") as GLib.SimpleAction).set_state (Config.Facade.get_instance ().get_display_photo_titles ());
+        (get_action ("ViewComment") as GLib.SimpleAction).set_state (Config.Facade.get_instance ().get_display_photo_comments ());
+        (get_action ("ViewRatings") as GLib.SimpleAction).set_state (Config.Facade.get_instance ().get_display_photo_ratings ());
+        (get_action ("ViewTags") as GLib.SimpleAction).set_state (Config.Facade.get_instance ().get_display_photo_tags ());
+        (get_action ("SortBy") as GLib.SimpleAction).set_state ("%d".printf (sort_by));
+        (get_action ("Sort") as GLib.SimpleAction).set_state (sort_order ? "'ascending'" : "'descending'");
+        var d = Config.Facade.get_instance().get_default_raw_developer();
+        var action = get_action ("RawDeveloper") as GLib.SimpleAction;
+        action.set_state (d == RawDeveloper.SHOTWELL ? "'Shotwell'" : "'Camera'");
     }
     
     protected override void update_actions(int selected_count, int count) {
@@ -584,76 +396,34 @@ public abstract class MediaPage : CheckerboardPage {
         }
         
         // Collect some stats about what's selected.
-        bool avail_shotwell = false; // True if Shotwell developer is available.
-        bool avail_camera = false;   // True if camera developer is available.
         bool is_raw = false;    // True if any RAW photos are selected
         foreach (DataView view in get_view().get_selected()) {
             Photo? photo = ((Thumbnail) view).get_media_source() as Photo;
             if (photo != null && photo.get_master_file_format() == PhotoFileFormat.RAW) {
                 is_raw = true;
-                
-                if (!avail_shotwell && photo.is_raw_developer_available(RawDeveloper.SHOTWELL))
-                    avail_shotwell = true;
-                
-                if (!avail_camera && (photo.is_raw_developer_available(RawDeveloper.CAMERA) ||
-                    photo.is_raw_developer_available(RawDeveloper.EMBEDDED)))
-                    avail_camera = true;
-                
-                if (avail_shotwell && avail_camera)
-                    break; // optimization: break out of loop when all options available
-                
+
+                break;
             }
         }
         
         // Enable/disable menu.
         set_action_sensitive("RawDeveloper", is_raw);
-        
-        if (is_raw) {
-            // Set which developers are available.
-            set_action_sensitive("RawDeveloperShotwell", avail_shotwell);
-            set_action_sensitive("RawDeveloperCamera", avail_camera);
-        }
     }
     
     private void update_flag_action(int selected_count) {
         set_action_sensitive("Flag", selected_count > 0);
-        
-        string flag_label = Resources.FLAG_MENU;
-
-        if (selected_count > 0) {
-            bool all_flagged = true;
-            foreach (DataSource source in get_view().get_selected_sources()) {
-                Flaggable? flaggable = source as Flaggable;
-                if (flaggable != null && !flaggable.is_flagged()) {
-                    all_flagged = false;
-                    
-                    break;
-                }
-            }
-            
-            if (all_flagged) {
-                flag_label = Resources.UNFLAG_MENU;
-            }
-        }
-        
-        Gtk.Action? flag_action = get_action("Flag");
-        if (flag_action != null) {
-            flag_action.label = flag_label;
-        }
     }
     
     public override Core.ViewTracker? get_view_tracker() {
         return tracker;
     }
-    
+
     public void set_display_ratings(bool display) {
         get_view().freeze_notifications();
         get_view().set_property(Thumbnail.PROP_SHOW_RATINGS, display);
         get_view().thaw_notifications();
-        
-        Gtk.ToggleAction? action = get_action("ViewRatings") as Gtk.ToggleAction;
-        if (action != null)
-            action.set_active(display);
+
+        this.set_action_active ("ViewRatings", display);
     }
 
     private bool can_rate_selected(Rating rating) {
@@ -937,10 +707,8 @@ public abstract class MediaPage : CheckerboardPage {
         get_view().freeze_notifications();
         get_view().set_property(Thumbnail.PROP_SHOW_TAGS, display);
         get_view().thaw_notifications();
-        
-        Gtk.ToggleAction? action = get_action("ViewTags") as Gtk.ToggleAction;
-        if (action != null)
-            action.set_active(display);
+
+        this.set_action_active ("ViewTags", display);
     }
 
     private void on_new_event() {
@@ -1072,58 +840,84 @@ public abstract class MediaPage : CheckerboardPage {
             get_command_manager().execute(new EditMultipleCommentsCommand(media_sources, new_comment));
     }
 
-    protected virtual void on_display_titles(Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active();
+    protected virtual void on_display_titles(GLib.SimpleAction action, Variant? value) {
+        bool display = value.get_boolean ();
         
         set_display_titles(display);
         
         Config.Facade.get_instance().set_display_photo_titles(display);
+        action.set_state (value);
     }
 
-    protected virtual void on_display_comments(Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active();
+    protected virtual void on_display_comments(GLib.SimpleAction action, Variant? value) {
+        bool display = value.get_boolean ();
         
         set_display_comments(display);
         
         Config.Facade.get_instance().set_display_photo_comments(display);
+        action.set_state (value);
     }
 
-    protected virtual void on_display_ratings(Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active();
+    protected virtual void on_display_ratings(GLib.SimpleAction action, Variant? value) {
+        bool display = value.get_boolean ();
         
         set_display_ratings(display);
         
         Config.Facade.get_instance().set_display_photo_ratings(display);
+        action.set_state (value);
     }
 
-    protected virtual void on_display_tags(Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active();
+    protected virtual void on_display_tags(GLib.SimpleAction action, Variant? value) {
+        bool display = value.get_boolean ();
         
         set_display_tags(display);
         
         Config.Facade.get_instance().set_display_photo_tags(display);
+        action.set_state (value);
     }
 
     protected abstract void get_config_photos_sort(out bool sort_order, out int sort_by);
 
     protected abstract void set_config_photos_sort(bool sort_order, int sort_by);
 
-    public virtual void on_sort_changed() {
+    public virtual void on_sort_changed(GLib.SimpleAction action, Variant? value) {
         int sort_by = get_menu_sort_by();
         bool sort_order = get_menu_sort_order();
         
         set_view_comparator(sort_by, sort_order);
         set_config_photos_sort(sort_order, sort_by);
+
+        action.set_state (value);
     }
     
-    public void on_raw_developer_shotwell(Gtk.Action action) {
+    public void on_raw_developer_shotwell() {
         developer_changed(RawDeveloper.SHOTWELL);
     }
     
-    public void on_raw_developer_camera(Gtk.Action action) {
+    public void on_raw_developer_camera() {
         developer_changed(RawDeveloper.CAMERA);
     }
-    
+
+    private void on_raw_developer_changed(GLib.SimpleAction action,
+                                          Variant? value) {
+        RawDeveloper developer = RawDeveloper.SHOTWELL;
+
+        switch (value.get_string ()) {
+            case "Shotwell":
+                developer = RawDeveloper.SHOTWELL;
+                break;
+            case "Camera":
+                developer = RawDeveloper.CAMERA;
+                break;
+            default:
+                break;
+        }
+
+        developer_changed(developer);
+
+        action.set_state (value);
+    }
+
     protected virtual void developer_changed(RawDeveloper rd) {
         if (get_view().get_selected_count() == 0)
             return;
@@ -1156,49 +950,46 @@ public abstract class MediaPage : CheckerboardPage {
 
     protected override void set_display_titles(bool display) {
         base.set_display_titles(display);
-    
-        Gtk.ToggleAction? action = get_action("ViewTitle") as Gtk.ToggleAction;
-        if (action != null)
-            action.set_active(display);
+
+        this.set_action_active ("ViewTitle", display);
     }
 
     protected override void set_display_comments(bool display) {
         base.set_display_comments(display);
     
-        Gtk.ToggleAction? action = get_action("ViewComment") as Gtk.ToggleAction;
-        if (action != null)
-            action.set_active(display);
+        this.set_action_active ("ViewComment", display);
     }
 
-    private Gtk.RadioAction sort_by_title_action() {
-        Gtk.RadioAction action = (Gtk.RadioAction) get_action("SortByTitle");
+    private GLib.Action sort_by_title_action() {
+        var action = get_action ("SortBy");
         assert(action != null);
         return action;
     }
 
-    private Gtk.RadioAction sort_ascending_action() {
-        Gtk.RadioAction action = (Gtk.RadioAction) get_action("SortAscending");
+    private GLib.Action sort_ascending_action() {
+        var action = get_action ("Sort");
         assert(action != null);
         return action;
     }
 
     protected int get_menu_sort_by() {
         // any member of the group knows the current value
-        return sort_by_title_action().get_current_value();
+        return int.parse (sort_by_title_action().get_state().get_string ());
     }
     
     protected void set_menu_sort_by(int val) {
-        sort_by_title_action().set_current_value(val);
+        var sort = "%d".printf (val);
+        (sort_by_title_action() as GLib.SimpleAction).set_state (sort);
     }
     
     protected bool get_menu_sort_order() {
         // any member of the group knows the current value
-        return sort_ascending_action().get_current_value() == SORT_ORDER_ASCENDING;
+        return sort_ascending_action().get_state ().get_string () == "ascending";
     }
     
     protected void set_menu_sort_order(bool ascending) {
-        sort_ascending_action().set_current_value(
-            ascending ? SORT_ORDER_ASCENDING : SORT_ORDER_DESCENDING);
+        (sort_ascending_action() as GLib.SimpleAction).set_state (
+            ascending ? "'ascending'" : "'descending'");
     }
     
     void set_view_comparator(int sort_by, bool ascending) {
@@ -1244,26 +1035,6 @@ public abstract class MediaPage : CheckerboardPage {
         get_view().set_comparator(comparator, predicate);
     }
 
-    protected string get_sortby_path(int sort_by) {
-        switch(sort_by) {
-            case SortBy.TITLE:
-                return "/MenuBar/ViewMenu/SortPhotos/SortByTitle";
-            
-            case SortBy.EXPOSURE_DATE:
-                return "/MenuBar/ViewMenu/SortPhotos/SortByExposureDate";
-            
-            case SortBy.RATING:
-                return "/MenuBar/ViewMenu/SortPhotos/SortByRating";
-
-            case SortBy.FILENAME:
-                return "/MenuBar/ViewMenu/SortPhotos/SortByFilename";
-            
-            default:
-                debug("Unknown sort criteria: %d", sort_by);
-                return "/MenuBar/ViewMenu/SortPhotos/SortByTitle";
-        }
-    }
-
     protected void sync_sort() {
         // It used to be that the config and UI could both agree on what 
         // sort order and criteria were selected, but the sorting wouldn't
diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c
index 06e98f4..259175f 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -2958,7 +2958,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 #line 538 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						_g_object_unref0 (_photo_it);
 #line 2961 "MetadataWriter.c"
-						goto __catch554_g_error;
+						goto __catch551_g_error;
 					}
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_object_unref0 (photo);
@@ -2978,8 +2978,8 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			transaction_controller_commit (_tmp23_);
 #line 2980 "MetadataWriter.c"
 		}
-		goto __finally554;
-		__catch554_g_error:
+		goto __finally551;
+		__catch551_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp24_ = NULL;
@@ -3013,7 +3013,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			_g_error_free0 (err);
 #line 3015 "MetadataWriter.c"
 		}
-		__finally554:
+		__finally551:
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3796,7 +3796,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3799 "MetadataWriter.c"
-						goto __catch555_database_error;
+						goto __catch552_database_error;
 					}
 					{
 						LibraryPhoto* _tmp67_ = NULL;
@@ -3853,7 +3853,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3856 "MetadataWriter.c"
-						goto __catch555_database_error;
+						goto __catch552_database_error;
 					}
 					{
 						LibraryPhoto* _tmp76_ = NULL;
@@ -3885,8 +3885,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 				}
 			}
 		}
-		goto __finally555;
-		__catch555_database_error:
+		goto __finally552;
+		__catch552_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp79_ = NULL;
@@ -3902,7 +3902,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 			_g_error_free0 (err);
 #line 3904 "MetadataWriter.c"
 		}
-		__finally555:
+		__finally552:
 		{
 			LibraryPhoto* _tmp80_ = NULL;
 			MetadataWriterCommitJob* _tmp81_ = NULL;
@@ -3949,7 +3949,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3952 "MetadataWriter.c"
-				goto __catch556_database_error;
+				goto __catch553_database_error;
 			}
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_background_job_unref0 (job);
@@ -3962,8 +3962,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 3963 "MetadataWriter.c"
 		}
 	}
-	goto __finally556;
-	__catch556_database_error:
+	goto __finally553;
+	__catch553_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp85_ = NULL;
@@ -3979,7 +3979,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 		_g_error_free0 (err);
 #line 3981 "MetadataWriter.c"
 	}
-	__finally556:
+	__finally553:
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4157,18 +4157,18 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
 #line 38 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4160 "MetadataWriter.c"
-			goto __catch557_g_error;
+			goto __catch554_g_error;
 		}
 #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_commit_job_commit_editable (self, &_inner_error_);
 #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4167 "MetadataWriter.c"
-			goto __catch557_g_error;
+			goto __catch554_g_error;
 		}
 	}
-	goto __finally557;
-	__catch557_g_error:
+	goto __finally554;
+	__catch554_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp0_ = NULL;
@@ -4189,7 +4189,7 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 4191 "MetadataWriter.c"
 	}
-	__finally557:
+	__finally554:
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4291,10 +4291,10 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s
 #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4294 "MetadataWriter.c"
-				goto __finally558;
+				goto __finally555;
 			}
 		}
-		__finally558:
+		__finally555:
 		{
 			LibraryPhoto* _tmp16_ = NULL;
 			GFile* _tmp17_ = NULL;
@@ -4433,10 +4433,10 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob*
 #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4436 "MetadataWriter.c"
-				goto __finally559;
+				goto __finally556;
 			}
 		}
-		__finally559:
+		__finally556:
 		{
 			LibraryPhoto* _tmp18_ = NULL;
 			GFile* _tmp19_ = NULL;
diff --git a/src/Page.c b/src/Page.c
index eda0c75..dc32295 100644
--- a/src/Page.c
+++ b/src/Page.c
@@ -48,6 +48,8 @@ typedef struct _InjectionGroupElement InjectionGroupElement;
 typedef struct _InjectionGroupElementClass InjectionGroupElementClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define INJECTION_GROUP_ELEMENT_TYPE_ITEM_TYPE (injection_group_element_item_type_get_type ())
 #define _injection_group_element_unref0(var) ((var == NULL) ? NULL : (var = (injection_group_element_unref (var), NULL)))
 typedef struct _InjectionGroupElementPrivate InjectionGroupElementPrivate;
 typedef struct _InjectionGroupParamSpecElement InjectionGroupParamSpecElement;
@@ -115,6 +117,7 @@ typedef struct _OneShotScheduler OneShotScheduler;
 typedef struct _OneShotSchedulerClass OneShotSchedulerClass;
 #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL)))
 #define _one_shot_scheduler_unref0(var) ((var == NULL) ? NULL : (var = (one_shot_scheduler_unref (var), NULL)))
+#define _injection_group_unref0(var) ((var == NULL) ? NULL : (var = (injection_group_unref (var), NULL)))
 
 #define TYPE_APP_WINDOW (app_window_get_type ())
 #define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
@@ -125,6 +128,7 @@ typedef struct _OneShotSchedulerClass OneShotSchedulerClass;
 
 typedef struct _AppWindow AppWindow;
 typedef struct _AppWindowClass AppWindowClass;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
 
 #define TYPE_COMMAND_MANAGER (command_manager_get_type ())
 #define COMMAND_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND_MANAGER, CommandManager))
@@ -135,7 +139,6 @@ typedef struct _AppWindowClass AppWindowClass;
 
 typedef struct _CommandManager CommandManager;
 typedef struct _CommandManagerClass CommandManagerClass;
-#define _injection_group_unref0(var) ((var == NULL) ? NULL : (var = (injection_group_unref (var), NULL)))
 
 #define TYPE_DATA_OBJECT (data_object_get_type ())
 #define DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_OBJECT, DataObject))
@@ -457,13 +460,20 @@ struct _InjectionGroupPrivate {
 	gint separator_id;
 };
 
+typedef enum  {
+	INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM,
+	INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENU,
+	INJECTION_GROUP_ELEMENT_ITEM_TYPE_SEPARATOR
+} InjectionGroupElementItemType;
+
 struct _InjectionGroupElement {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
 	InjectionGroupElementPrivate * priv;
 	gchar* name;
 	gchar* action;
-	GtkUIManagerItemType kind;
+	gchar* accellerator;
+	InjectionGroupElementItemType kind;
 };
 
 struct _InjectionGroupElementClass {
@@ -482,7 +492,7 @@ struct _ParamSpecInjectionGroup {
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -492,8 +502,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -501,10 +509,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -568,13 +574,7 @@ struct _PagePrivate {
 	gint cursor_hide_time_cached;
 	gboolean are_actions_attached;
 	OneShotScheduler* update_actions_scheduler;
-	GtkActionGroup* action_group;
-	GtkActionGroup** common_action_groups;
-	gint common_action_groups_length1;
-	gint _common_action_groups_size_;
-	guint* merge_ids;
-	gint merge_ids_length1;
-	gint _merge_ids_size_;
+	gboolean menubar_injected;
 };
 
 typedef void (*OneShotCallback) (void* user_data);
@@ -619,6 +619,8 @@ struct _CheckerboardPagePrivate {
 	gboolean autoscroll_scheduled;
 	CheckerboardItem* activated_item;
 	GeeArrayList* previously_selected;
+	GtkMenu* item_context_menu;
+	GtkMenu* page_context_menu;
 };
 
 typedef enum  {
@@ -891,9 +893,10 @@ InjectionGroup* injection_group_new (const gchar* path);
 InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
 gchar* injection_group_get_path (InjectionGroup* self);
 GeeList* injection_group_get_elements (InjectionGroup* self);
-void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action);
-InjectionGroupElement* injection_group_element_new (const gchar* name, const gchar* action, GtkUIManagerItemType kind);
-InjectionGroupElement* injection_group_element_construct (GType object_type, const gchar* name, const gchar* action, GtkUIManagerItemType kind);
+void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
+GType injection_group_element_item_type_get_type (void) G_GNUC_CONST;
+InjectionGroupElement* injection_group_element_new (const gchar* name, const gchar* action, const gchar* accellerator, InjectionGroupElementItemType kind);
+InjectionGroupElement* injection_group_element_construct (GType object_type, const gchar* name, const gchar* action, const gchar* accellerator, InjectionGroupElementItemType kind);
 void injection_group_add_menu (InjectionGroup* self, const gchar* name, const gchar* action);
 void injection_group_add_separator (InjectionGroup* self);
 enum  {
@@ -946,7 +949,6 @@ ViewCollection* page_get_view (Page* self);
 GtkWindow* page_get_container (Page* self);
 void page_set_container (Page* self, GtkWindow* container);
 static void page_real_set_container (Page* self, GtkWindow* container);
-GtkUIManager* page_window_get_ui_manager (PageWindow* self);
 static void page_real_clear_container (Page* self);
 void page_set_event_source (Page* self, GtkWidget* event_source);
 static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* event);
@@ -963,17 +965,15 @@ void page_on_event_source_realize (Page* self);
 static void _page_on_event_source_realize_gtk_widget_realize (GtkWidget* _sender, gpointer self);
 void page_disable_drag_source (Page* self);
 GtkWidget* page_get_event_source (Page* self);
-GtkMenuBar* page_get_menubar (Page* self);
-static GtkMenuBar* page_real_get_menubar (Page* self);
-GtkWidget* page_get_page_ui_widget (Page* self, const gchar* path);
-static GtkWidget* page_real_get_page_ui_widget (Page* self, const gchar* path);
+GMenuModel* page_get_menubar (Page* self);
+InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1);
+GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gchar* extension_point);
 GtkToolbar* page_get_toolbar (Page* self);
 static GtkToolbar* page_real_get_toolbar (Page* self);
 GtkMenu* page_get_page_context_menu (Page* self);
 static GtkMenu* page_real_get_page_context_menu (Page* self);
 void page_switching_from (Page* self);
 static void page_real_switching_from (Page* self);
-static void page_remove_ui (Page* self);
 void page_switched_to (Page* self);
 static void page_real_switched_to (Page* self);
 static void page_add_ui (Page* self);
@@ -985,14 +985,17 @@ void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw);
 static void page_real_switching_to_fullscreen (Page* self, FullscreenWindow* fsw);
 void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw);
 static void page_real_returning_from_fullscreen (Page* self, FullscreenWindow* fsw);
-GtkAction* page_get_action (Page* self, const gchar* name);
-GtkAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning);
+GAction* page_get_action (Page* self, const gchar* name);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 void page_set_action_important (Page* self, const gchar* name, gboolean important);
 void page_set_action_visible (Page* self, const gchar* name, gboolean visible);
 void page_set_action_short_label (Page* self, const gchar* name, const gchar* short_label);
 void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive);
+void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label);
 void page_activate_action (Page* self, const gchar* name);
+GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning);
 void page_set_common_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 void page_set_common_action_label (Page* self, const gchar* name, const gchar* label);
 void page_set_common_action_important (Page* self, const gchar* name, gboolean important);
@@ -1001,9 +1004,9 @@ gboolean page_get_ctrl_pressed (Page* self);
 gboolean page_get_alt_pressed (Page* self);
 gboolean page_get_shift_pressed (Page* self);
 gboolean page_get_super_pressed (Page* self);
+void page_set_action_active (Page* self, const gchar* name, gboolean active);
+static GVariant* _variant_new16 (gboolean value);
 static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, gboolean* shift, gboolean* super);
-GType app_window_get_type (void) G_GNUC_CONST;
-AppWindow* app_window_get_instance (void);
 gboolean page_on_ctrl_released (Page* self, GdkEventKey* event);
 gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event);
 gboolean page_on_alt_released (Page* self, GdkEventKey* event);
@@ -1022,15 +1025,14 @@ gpointer value_get_command_manager (const GValue* value);
 GType command_manager_get_type (void) G_GNUC_CONST;
 CommandManager* page_get_command_manager (Page* self);
 CommandManager* app_window_get_command_manager (void);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-GtkToggleActionEntry* page_init_collect_toggle_action_entries (Page* self, int* result_length1);
-void page_register_radio_actions (Page* self, GtkActionGroup* action_group);
-GtkActionGroup** app_window_get_common_action_groups (AppWindow* self, int* result_length1);
+void page_add_actions (Page* self);
+static void page_real_add_actions (Page* self);
+void page_on_action_toggle (Page* self, GAction* action, GVariant* value);
+static gboolean _variant_get17 (GVariant* value);
+static GVariant* _variant_new18 (gboolean value);
+void page_on_action_radio (Page* self, GAction* action, GVariant* value);
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
 static void page_init_load_ui (Page* self, const gchar* ui_filename);
-InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1);
-static void _vala_array_add249 (guint** array, int* length, int* size, guint value);
-void app_window_replace_common_placeholders (AppWindow* self, GtkUIManager* ui);
 void page_init_toolbar (Page* self, const gchar* path);
 gint view_collection_get_selected_count (ViewCollection* self);
 gint data_collection_get_count (DataCollection* self);
@@ -1049,7 +1051,6 @@ OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback cal
 OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target);
 void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority);
 GFile* resources_get_ui (const gchar* filename);
-static void _vala_array_add250 (guint** array, int* length, int* size, guint value);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
@@ -1061,9 +1062,6 @@ GType application_get_type (void) G_GNUC_CONST;
 Application* application_get_instance (void);
 void application_panic (Application* self);
 static void page_real_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static GtkActionEntry* page_real_init_collect_action_entries (Page* self, int* result_length1);
-static GtkToggleActionEntry* page_real_init_collect_toggle_action_entries (Page* self, int* result_length1);
-static void page_real_register_radio_actions (Page* self, GtkActionGroup* action_group);
 static InjectionGroup** page_real_init_collect_injection_groups (Page* self, int* result_length1);
 static void page_real_init_actions (Page* self, gint selected_count, gint count);
 static void page_real_update_actions (Page* self, gint selected_count, gint count);
@@ -1491,28 +1489,28 @@ InjectionGroup* injection_group_construct (GType object_type, const gchar* path)
 	InjectionGroup* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 24 "/home/jens/Source/shotwell/src/Page.vala"
+#line 31 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (path != NULL, NULL);
-#line 24 "/home/jens/Source/shotwell/src/Page.vala"
+#line 31 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (InjectionGroup*) g_type_create_instance (object_type);
-#line 25 "/home/jens/Source/shotwell/src/Page.vala"
+#line 32 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 25 "/home/jens/Source/shotwell/src/Page.vala"
+#line 32 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 25 "/home/jens/Source/shotwell/src/Page.vala"
+#line 32 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->path);
-#line 25 "/home/jens/Source/shotwell/src/Page.vala"
+#line 32 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->path = _tmp1_;
-#line 24 "/home/jens/Source/shotwell/src/Page.vala"
+#line 31 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 1509 "Page.c"
+#line 1507 "Page.c"
 }
 
 
 InjectionGroup* injection_group_new (const gchar* path) {
-#line 24 "/home/jens/Source/shotwell/src/Page.vala"
+#line 31 "/home/jens/Source/shotwell/src/Page.vala"
 	return injection_group_construct (TYPE_INJECTION_GROUP, path);
-#line 1516 "Page.c"
+#line 1514 "Page.c"
 }
 
 
@@ -1520,24 +1518,24 @@ gchar* injection_group_get_path (InjectionGroup* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 28 "/home/jens/Source/shotwell/src/Page.vala"
+#line 35 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_INJECTION_GROUP (self), NULL);
-#line 29 "/home/jens/Source/shotwell/src/Page.vala"
+#line 36 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->path;
-#line 29 "/home/jens/Source/shotwell/src/Page.vala"
+#line 36 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 29 "/home/jens/Source/shotwell/src/Page.vala"
+#line 36 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 29 "/home/jens/Source/shotwell/src/Page.vala"
+#line 36 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 1534 "Page.c"
+#line 1532 "Page.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 33 "/home/jens/Source/shotwell/src/Page.vala"
+#line 40 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1541 "Page.c"
+#line 1539 "Page.c"
 }
 
 
@@ -1545,45 +1543,48 @@ GeeList* injection_group_get_elements (InjectionGroup* self) {
 	GeeList* result = NULL;
 	GeeArrayList* _tmp0_ = NULL;
 	GeeList* _tmp1_ = NULL;
-#line 32 "/home/jens/Source/shotwell/src/Page.vala"
+#line 39 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_INJECTION_GROUP (self), NULL);
-#line 33 "/home/jens/Source/shotwell/src/Page.vala"
+#line 40 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->elements;
-#line 33 "/home/jens/Source/shotwell/src/Page.vala"
+#line 40 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList));
-#line 33 "/home/jens/Source/shotwell/src/Page.vala"
+#line 40 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 33 "/home/jens/Source/shotwell/src/Page.vala"
+#line 40 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 1559 "Page.c"
+#line 1557 "Page.c"
 }
 
 
-void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action) {
+void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator) {
 	GeeArrayList* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-	InjectionGroupElement* _tmp3_ = NULL;
+	const gchar* _tmp3_ = NULL;
 	InjectionGroupElement* _tmp4_ = NULL;
-#line 36 "/home/jens/Source/shotwell/src/Page.vala"
+	InjectionGroupElement* _tmp5_ = NULL;
+#line 43 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_INJECTION_GROUP (self));
-#line 36 "/home/jens/Source/shotwell/src/Page.vala"
+#line 43 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 37 "/home/jens/Source/shotwell/src/Page.vala"
+#line 45 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->elements;
-#line 37 "/home/jens/Source/shotwell/src/Page.vala"
+#line 45 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = name;
-#line 37 "/home/jens/Source/shotwell/src/Page.vala"
+#line 45 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 37 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = injection_group_element_new (_tmp1_, _tmp2_, GTK_UI_MANAGER_MENUITEM);
-#line 37 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp4_ = _tmp3_;
-#line 37 "/home/jens/Source/shotwell/src/Page.vala"
-	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
-#line 37 "/home/jens/Source/shotwell/src/Page.vala"
-	_injection_group_element_unref0 (_tmp4_);
-#line 1587 "Page.c"
+#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = accellerator;
+#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp4_ = injection_group_element_new (_tmp1_, _tmp2_, _tmp3_, INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM);
+#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp5_ = _tmp4_;
+#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_);
+#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+	_injection_group_element_unref0 (_tmp5_);
+#line 1588 "Page.c"
 }
 
 
@@ -1593,25 +1594,25 @@ void injection_group_add_menu (InjectionGroup* self, const gchar* name, const gc
 	const gchar* _tmp2_ = NULL;
 	InjectionGroupElement* _tmp3_ = NULL;
 	InjectionGroupElement* _tmp4_ = NULL;
-#line 40 "/home/jens/Source/shotwell/src/Page.vala"
+#line 48 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_INJECTION_GROUP (self));
-#line 40 "/home/jens/Source/shotwell/src/Page.vala"
+#line 48 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 41 "/home/jens/Source/shotwell/src/Page.vala"
+#line 49 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->elements;
-#line 41 "/home/jens/Source/shotwell/src/Page.vala"
+#line 49 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = name;
-#line 41 "/home/jens/Source/shotwell/src/Page.vala"
+#line 49 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 41 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = injection_group_element_new (_tmp1_, _tmp2_, GTK_UI_MANAGER_MENU);
-#line 41 "/home/jens/Source/shotwell/src/Page.vala"
+#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = injection_group_element_new (_tmp1_, _tmp2_, NULL, INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENU);
+#line 49 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 41 "/home/jens/Source/shotwell/src/Page.vala"
+#line 49 "/home/jens/Source/shotwell/src/Page.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
-#line 41 "/home/jens/Source/shotwell/src/Page.vala"
+#line 49 "/home/jens/Source/shotwell/src/Page.vala"
 	_injection_group_element_unref0 (_tmp4_);
-#line 1615 "Page.c"
+#line 1616 "Page.c"
 }
 
 
@@ -1622,98 +1623,120 @@ void injection_group_add_separator (InjectionGroup* self) {
 	gchar* _tmp3_ = NULL;
 	InjectionGroupElement* _tmp4_ = NULL;
 	InjectionGroupElement* _tmp5_ = NULL;
-#line 44 "/home/jens/Source/shotwell/src/Page.vala"
+#line 52 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_INJECTION_GROUP (self));
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 53 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->elements;
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 53 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->separator_id;
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 53 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->separator_id = _tmp1_ + 1;
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 53 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = g_strdup_printf ("%d-separator", _tmp1_);
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 53 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp4_ = injection_group_element_new (_tmp3_, NULL, GTK_UI_MANAGER_SEPARATOR);
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 53 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp4_ = injection_group_element_new (_tmp3_, NULL, NULL, INJECTION_GROUP_ELEMENT_ITEM_TYPE_SEPARATOR);
+#line 53 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 53 "/home/jens/Source/shotwell/src/Page.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp5_);
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 53 "/home/jens/Source/shotwell/src/Page.vala"
 	_injection_group_element_unref0 (_tmp5_);
-#line 45 "/home/jens/Source/shotwell/src/Page.vala"
+#line 53 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp3_);
-#line 1648 "Page.c"
+#line 1649 "Page.c"
+}
+
+
+GType injection_group_element_item_type_get_type (void) {
+	static volatile gsize injection_group_element_item_type_type_id__volatile = 0;
+	if (g_once_init_enter (&injection_group_element_item_type_type_id__volatile)) {
+		static const GEnumValue values[] = {{INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM, "INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM", "menuitem"}, {INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENU, "INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENU", "menu"}, {INJECTION_GROUP_ELEMENT_ITEM_TYPE_SEPARATOR, "INJECTION_GROUP_ELEMENT_ITEM_TYPE_SEPARATOR", "separator"}, {0, NULL, NULL}};
+		GType injection_group_element_item_type_type_id;
+		injection_group_element_item_type_type_id = g_enum_register_static ("InjectionGroupElementItemType", values);
+		g_once_init_leave (&injection_group_element_item_type_type_id__volatile, injection_group_element_item_type_type_id);
+	}
+	return injection_group_element_item_type_type_id__volatile;
 }
 
 
-InjectionGroupElement* injection_group_element_construct (GType object_type, const gchar* name, const gchar* action, GtkUIManagerItemType kind) {
+InjectionGroupElement* injection_group_element_construct (GType object_type, const gchar* name, const gchar* action, const gchar* accellerator, InjectionGroupElementItemType kind) {
 	InjectionGroupElement* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	gchar* _tmp6_ = NULL;
-	GtkUIManagerItemType _tmp7_ = 0;
-#line 13 "/home/jens/Source/shotwell/src/Page.vala"
+	const gchar* _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+	InjectionGroupElementItemType _tmp9_ = 0;
+#line 19 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 13 "/home/jens/Source/shotwell/src/Page.vala"
+#line 19 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (InjectionGroupElement*) g_type_create_instance (object_type);
-#line 14 "/home/jens/Source/shotwell/src/Page.vala"
+#line 20 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 14 "/home/jens/Source/shotwell/src/Page.vala"
+#line 20 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 14 "/home/jens/Source/shotwell/src/Page.vala"
+#line 20 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->name);
-#line 14 "/home/jens/Source/shotwell/src/Page.vala"
+#line 20 "/home/jens/Source/shotwell/src/Page.vala"
 	self->name = _tmp1_;
-#line 15 "/home/jens/Source/shotwell/src/Page.vala"
+#line 21 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 15 "/home/jens/Source/shotwell/src/Page.vala"
+#line 21 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 1676 "Page.c"
+#line 1691 "Page.c"
 		const gchar* _tmp4_ = NULL;
-#line 15 "/home/jens/Source/shotwell/src/Page.vala"
+#line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 15 "/home/jens/Source/shotwell/src/Page.vala"
+#line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp4_;
-#line 1682 "Page.c"
+#line 1697 "Page.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
-#line 15 "/home/jens/Source/shotwell/src/Page.vala"
+#line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = name;
-#line 15 "/home/jens/Source/shotwell/src/Page.vala"
+#line 21 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp5_;
-#line 1689 "Page.c"
+#line 1704 "Page.c"
 	}
-#line 15 "/home/jens/Source/shotwell/src/Page.vala"
+#line 21 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = g_strdup (_tmp2_);
-#line 15 "/home/jens/Source/shotwell/src/Page.vala"
+#line 21 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->action);
-#line 15 "/home/jens/Source/shotwell/src/Page.vala"
+#line 21 "/home/jens/Source/shotwell/src/Page.vala"
 	self->action = _tmp6_;
-#line 16 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp7_ = kind;
-#line 16 "/home/jens/Source/shotwell/src/Page.vala"
-	self->kind = _tmp7_;
-#line 13 "/home/jens/Source/shotwell/src/Page.vala"
+#line 22 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp7_ = accellerator;
+#line 22 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp8_ = g_strdup (_tmp7_);
+#line 22 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_free0 (self->accellerator);
+#line 22 "/home/jens/Source/shotwell/src/Page.vala"
+	self->accellerator = _tmp8_;
+#line 23 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp9_ = kind;
+#line 23 "/home/jens/Source/shotwell/src/Page.vala"
+	self->kind = _tmp9_;
+#line 19 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 1703 "Page.c"
+#line 1726 "Page.c"
 }
 
 
-InjectionGroupElement* injection_group_element_new (const gchar* name, const gchar* action, GtkUIManagerItemType kind) {
-#line 13 "/home/jens/Source/shotwell/src/Page.vala"
-	return injection_group_element_construct (INJECTION_GROUP_TYPE_ELEMENT, name, action, kind);
-#line 1710 "Page.c"
+InjectionGroupElement* injection_group_element_new (const gchar* name, const gchar* action, const gchar* accellerator, InjectionGroupElementItemType kind) {
+#line 19 "/home/jens/Source/shotwell/src/Page.vala"
+	return injection_group_element_construct (INJECTION_GROUP_TYPE_ELEMENT, name, action, accellerator, kind);
+#line 1733 "Page.c"
 }
 
 
 static void injection_group_value_element_init (GValue* value) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	value->data[0].v_pointer = NULL;
-#line 1717 "Page.c"
+#line 1740 "Page.c"
 }
 
 
@@ -1722,7 +1745,7 @@ static void injection_group_value_element_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_element_unref (value->data[0].v_pointer);
-#line 1726 "Page.c"
+#line 1749 "Page.c"
 	}
 }
 
@@ -1732,11 +1755,11 @@ static void injection_group_value_element_copy_value (const GValue* src_value, G
 	if (src_value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = injection_group_element_ref (src_value->data[0].v_pointer);
-#line 1736 "Page.c"
+#line 1759 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1740 "Page.c"
+#line 1763 "Page.c"
 	}
 }
 
@@ -1744,37 +1767,37 @@ static void injection_group_value_element_copy_value (const GValue* src_value, G
 static gpointer injection_group_value_element_peek_pointer (const GValue* value) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 1748 "Page.c"
+#line 1771 "Page.c"
 }
 
 
 static gchar* injection_group_value_element_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
-#line 1755 "Page.c"
+#line 1778 "Page.c"
 		InjectionGroupElement* object;
 		object = collect_values[0].v_pointer;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1762 "Page.c"
+#line 1785 "Page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1766 "Page.c"
+#line 1789 "Page.c"
 		}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = injection_group_element_ref (object);
-#line 1770 "Page.c"
+#line 1793 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 1774 "Page.c"
+#line 1797 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 1778 "Page.c"
+#line 1801 "Page.c"
 }
 
 
@@ -1785,25 +1808,25 @@ static gchar* injection_group_value_element_lcopy_value (const GValue* value, gu
 	if (!object_p) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1789 "Page.c"
+#line 1812 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = NULL;
-#line 1795 "Page.c"
+#line 1818 "Page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1799 "Page.c"
+#line 1822 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = injection_group_element_ref (value->data[0].v_pointer);
-#line 1803 "Page.c"
+#line 1826 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 1807 "Page.c"
+#line 1830 "Page.c"
 }
 
 
@@ -1817,7 +1840,7 @@ GParamSpec* injection_group_param_spec_element (const gchar* name, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return G_PARAM_SPEC (spec);
-#line 1821 "Page.c"
+#line 1844 "Page.c"
 }
 
 
@@ -1826,7 +1849,7 @@ gpointer injection_group_value_get_element (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, INJECTION_GROUP_TYPE_ELEMENT), NULL);
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 1830 "Page.c"
+#line 1853 "Page.c"
 }
 
 
@@ -1846,17 +1869,17 @@ void injection_group_value_set_element (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_element_ref (value->data[0].v_pointer);
-#line 1850 "Page.c"
+#line 1873 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 1854 "Page.c"
+#line 1877 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_element_unref (old);
-#line 1860 "Page.c"
+#line 1883 "Page.c"
 	}
 }
 
@@ -1875,17 +1898,17 @@ void injection_group_value_take_element (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 1879 "Page.c"
+#line 1902 "Page.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 1883 "Page.c"
+#line 1906 "Page.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_element_unref (old);
-#line 1889 "Page.c"
+#line 1912 "Page.c"
 	}
 }
 
@@ -1895,14 +1918,14 @@ static void injection_group_element_class_init (InjectionGroupElementClass * kla
 	injection_group_element_parent_class = g_type_class_peek_parent (klass);
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	((InjectionGroupElementClass *) klass)->finalize = injection_group_element_finalize;
-#line 1899 "Page.c"
+#line 1922 "Page.c"
 }
 
 
 static void injection_group_element_instance_init (InjectionGroupElement * self) {
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	self->ref_count = 1;
-#line 1906 "Page.c"
+#line 1929 "Page.c"
 }
 
 
@@ -1912,11 +1935,13 @@ static void injection_group_element_finalize (InjectionGroupElement* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, INJECTION_GROUP_TYPE_ELEMENT, InjectionGroupElement);
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_destroy (self);
-#line 9 "/home/jens/Source/shotwell/src/Page.vala"
+#line 14 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->name);
-#line 10 "/home/jens/Source/shotwell/src/Page.vala"
+#line 15 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->action);
-#line 1920 "Page.c"
+#line 16 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_free0 (self->accellerator);
+#line 1945 "Page.c"
 }
 
 
@@ -1941,7 +1966,7 @@ gpointer injection_group_element_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 	return instance;
-#line 1945 "Page.c"
+#line 1970 "Page.c"
 }
 
 
@@ -1954,7 +1979,7 @@ void injection_group_element_unref (gpointer instance) {
 		INJECTION_GROUP_ELEMENT_GET_CLASS (self)->finalize (self);
 #line 8 "/home/jens/Source/shotwell/src/Page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1958 "Page.c"
+#line 1983 "Page.c"
 	}
 }
 
@@ -1962,7 +1987,7 @@ void injection_group_element_unref (gpointer instance) {
 static void value_injection_group_init (GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	value->data[0].v_pointer = NULL;
-#line 1966 "Page.c"
+#line 1991 "Page.c"
 }
 
 
@@ -1971,7 +1996,7 @@ static void value_injection_group_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_unref (value->data[0].v_pointer);
-#line 1975 "Page.c"
+#line 2000 "Page.c"
 	}
 }
 
@@ -1981,11 +2006,11 @@ static void value_injection_group_copy_value (const GValue* src_value, GValue* d
 	if (src_value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = injection_group_ref (src_value->data[0].v_pointer);
-#line 1985 "Page.c"
+#line 2010 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1989 "Page.c"
+#line 2014 "Page.c"
 	}
 }
 
@@ -1993,37 +2018,37 @@ static void value_injection_group_copy_value (const GValue* src_value, GValue* d
 static gpointer value_injection_group_peek_pointer (const GValue* value) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 1997 "Page.c"
+#line 2022 "Page.c"
 }
 
 
 static gchar* value_injection_group_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
-#line 2004 "Page.c"
+#line 2029 "Page.c"
 		InjectionGroup* object;
 		object = collect_values[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2011 "Page.c"
+#line 2036 "Page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2015 "Page.c"
+#line 2040 "Page.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = injection_group_ref (object);
-#line 2019 "Page.c"
+#line 2044 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 2023 "Page.c"
+#line 2048 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 2027 "Page.c"
+#line 2052 "Page.c"
 }
 
 
@@ -2034,25 +2059,25 @@ static gchar* value_injection_group_lcopy_value (const GValue* value, guint n_co
 	if (!object_p) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2038 "Page.c"
+#line 2063 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!value->data[0].v_pointer) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = NULL;
-#line 2044 "Page.c"
+#line 2069 "Page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2048 "Page.c"
+#line 2073 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = injection_group_ref (value->data[0].v_pointer);
-#line 2052 "Page.c"
+#line 2077 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 2056 "Page.c"
+#line 2081 "Page.c"
 }
 
 
@@ -2066,7 +2091,7 @@ GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return G_PARAM_SPEC (spec);
-#line 2070 "Page.c"
+#line 2095 "Page.c"
 }
 
 
@@ -2075,7 +2100,7 @@ gpointer value_get_injection_group (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INJECTION_GROUP), NULL);
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 2079 "Page.c"
+#line 2104 "Page.c"
 }
 
 
@@ -2095,17 +2120,17 @@ void value_set_injection_group (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_ref (value->data[0].v_pointer);
-#line 2099 "Page.c"
+#line 2124 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 2103 "Page.c"
+#line 2128 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_unref (old);
-#line 2109 "Page.c"
+#line 2134 "Page.c"
 	}
 }
 
@@ -2124,17 +2149,17 @@ void value_take_injection_group (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 2128 "Page.c"
+#line 2153 "Page.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 2132 "Page.c"
+#line 2157 "Page.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		injection_group_unref (old);
-#line 2138 "Page.c"
+#line 2163 "Page.c"
 	}
 }
 
@@ -2146,7 +2171,7 @@ static void injection_group_class_init (InjectionGroupClass * klass) {
 	((InjectionGroupClass *) klass)->finalize = injection_group_finalize;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (InjectionGroupPrivate));
-#line 2150 "Page.c"
+#line 2175 "Page.c"
 }
 
 
@@ -2154,15 +2179,15 @@ static void injection_group_instance_init (InjectionGroup * self) {
 	GeeArrayList* _tmp0_ = NULL;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = INJECTION_GROUP_GET_PRIVATE (self);
-#line 21 "/home/jens/Source/shotwell/src/Page.vala"
+#line 28 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gee_array_list_new (INJECTION_GROUP_TYPE_ELEMENT, (GBoxedCopyFunc) injection_group_element_ref, injection_group_element_unref, NULL, NULL, NULL);
-#line 21 "/home/jens/Source/shotwell/src/Page.vala"
+#line 28 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->elements = _tmp0_;
-#line 22 "/home/jens/Source/shotwell/src/Page.vala"
+#line 29 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->separator_id = 0;
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	self->ref_count = 1;
-#line 2166 "Page.c"
+#line 2191 "Page.c"
 }
 
 
@@ -2172,11 +2197,11 @@ static void injection_group_finalize (InjectionGroup* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_INJECTION_GROUP, InjectionGroup);
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_destroy (self);
-#line 20 "/home/jens/Source/shotwell/src/Page.vala"
+#line 27 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->path);
-#line 21 "/home/jens/Source/shotwell/src/Page.vala"
+#line 28 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->elements);
-#line 2180 "Page.c"
+#line 2205 "Page.c"
 }
 
 
@@ -2201,7 +2226,7 @@ gpointer injection_group_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 	return instance;
-#line 2205 "Page.c"
+#line 2230 "Page.c"
 }
 
 
@@ -2214,7 +2239,7 @@ void injection_group_unref (gpointer instance) {
 		INJECTION_GROUP_GET_CLASS (self)->finalize (self);
 #line 7 "/home/jens/Source/shotwell/src/Page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2218 "Page.c"
+#line 2243 "Page.c"
 	}
 }
 
@@ -2222,16 +2247,16 @@ void injection_group_unref (gpointer instance) {
 static gboolean _page_on_context_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self) {
 	gboolean result;
 	result = page_on_context_keypress ((Page*) self);
-#line 93 "/home/jens/Source/shotwell/src/Page.vala"
+#line 99 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2228 "Page.c"
+#line 2253 "Page.c"
 }
 
 
 static void _page_attach_view_signals_gtk_widget_realize (GtkWidget* _sender, gpointer self) {
-#line 97 "/home/jens/Source/shotwell/src/Page.vala"
+#line 103 "/home/jens/Source/shotwell/src/Page.vala"
 	page_attach_view_signals ((Page*) self);
-#line 2235 "Page.c"
+#line 2260 "Page.c"
 }
 
 
@@ -2244,49 +2269,49 @@ Page* page_construct (GType object_type, const gchar* page_name) {
 	gchar* _tmp4_ = NULL;
 	ViewCollection* _tmp5_ = NULL;
 	GdkPoint _tmp6_ = {0};
-#line 84 "/home/jens/Source/shotwell/src/Page.vala"
+#line 90 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 84 "/home/jens/Source/shotwell/src/Page.vala"
+#line 90 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (Page*) g_object_new (object_type, NULL);
-#line 85 "/home/jens/Source/shotwell/src/Page.vala"
+#line 91 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 85 "/home/jens/Source/shotwell/src/Page.vala"
+#line 91 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 85 "/home/jens/Source/shotwell/src/Page.vala"
+#line 91 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_name);
-#line 85 "/home/jens/Source/shotwell/src/Page.vala"
+#line 91 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_name = _tmp1_;
-#line 87 "/home/jens/Source/shotwell/src/Page.vala"
+#line 93 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_name;
-#line 87 "/home/jens/Source/shotwell/src/Page.vala"
+#line 93 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = g_strdup_printf ("ViewCollection for Page %s", _tmp2_);
-#line 87 "/home/jens/Source/shotwell/src/Page.vala"
+#line 93 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 87 "/home/jens/Source/shotwell/src/Page.vala"
+#line 93 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = view_collection_new (_tmp4_);
-#line 87 "/home/jens/Source/shotwell/src/Page.vala"
+#line 93 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (self->priv->view);
-#line 87 "/home/jens/Source/shotwell/src/Page.vala"
+#line 93 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->view = _tmp5_;
-#line 87 "/home/jens/Source/shotwell/src/Page.vala"
+#line 93 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp4_);
-#line 89 "/home/jens/Source/shotwell/src/Page.vala"
+#line 95 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_.x = -1;
-#line 89 "/home/jens/Source/shotwell/src/Page.vala"
+#line 95 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_.y = -1;
-#line 89 "/home/jens/Source/shotwell/src/Page.vala"
+#line 95 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_down = _tmp6_;
-#line 91 "/home/jens/Source/shotwell/src/Page.vala"
+#line 97 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 93 "/home/jens/Source/shotwell/src/Page.vala"
+#line 99 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "popup-menu", (GCallback) _page_on_context_keypress_gtk_widget_popup_menu, self, 0);
-#line 95 "/home/jens/Source/shotwell/src/Page.vala"
+#line 101 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_ui (self);
-#line 97 "/home/jens/Source/shotwell/src/Page.vala"
+#line 103 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "realize", (GCallback) _page_attach_view_signals_gtk_widget_realize, self, 0);
-#line 84 "/home/jens/Source/shotwell/src/Page.vala"
+#line 90 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 2290 "Page.c"
+#line 2315 "Page.c"
 }
 
 
@@ -2298,63 +2323,63 @@ static void page_real_destroy (GtkWidget* base) {
 	OneShotScheduler* _tmp4_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 114 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PAGE, Page);
-#line 109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 115 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 115 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 116 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 2310 "Page.c"
+#line 2335 "Page.c"
 	}
-#line 113 "/home/jens/Source/shotwell/src/Page.vala"
+#line 119 "/home/jens/Source/shotwell/src/Page.vala"
 	page_detach_event_source (self);
-#line 114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 120 "/home/jens/Source/shotwell/src/Page.vala"
 	page_detach_view_signals (self);
-#line 115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 121 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->view;
-#line 115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 121 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 124 "/home/jens/Source/shotwell/src/Page.vala"
 	page_clear_container (self);
-#line 120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 126 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->toolbar;
-#line 120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 126 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 2326 "Page.c"
+#line 2351 "Page.c"
 		GtkToolbar* _tmp3_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 127 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->toolbar;
-#line 121 "/home/jens/Source/shotwell/src/Page.vala"
+#line 127 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 2332 "Page.c"
+#line 2357 "Page.c"
 	}
-#line 124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 130 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->update_actions_scheduler;
-#line 124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 130 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 2338 "Page.c"
+#line 2363 "Page.c"
 		OneShotScheduler* _tmp5_ = NULL;
-#line 125 "/home/jens/Source/shotwell/src/Page.vala"
+#line 131 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->update_actions_scheduler;
-#line 125 "/home/jens/Source/shotwell/src/Page.vala"
+#line 131 "/home/jens/Source/shotwell/src/Page.vala"
 		one_shot_scheduler_cancel (_tmp5_);
-#line 2344 "Page.c"
+#line 2369 "Page.c"
 	}
-#line 127 "/home/jens/Source/shotwell/src/Page.vala"
+#line 133 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->is_destroyed = TRUE;
-#line 129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 135 "/home/jens/Source/shotwell/src/Page.vala"
 	GTK_WIDGET_CLASS (page_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), gtk_widget_get_type (), GtkWidget));
-#line 131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 137 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_page_name (self);
-#line 131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 137 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 131 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:131: Page %s Destroyed", _tmp7_);
-#line 131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 137 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:137: Page %s Destroyed", _tmp7_);
+#line 137 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp7_);
-#line 2358 "Page.c"
+#line 2383 "Page.c"
 }
 
 
@@ -2362,43 +2387,43 @@ gchar* page_get_page_name (Page* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 140 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 141 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page_name;
-#line 135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 141 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 141 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 141 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2376 "Page.c"
+#line 2401 "Page.c"
 }
 
 
 static void page_real_set_page_name (Page* self, const gchar* page_name) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 144 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (page_name != NULL);
-#line 139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 145 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 145 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 145 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_name);
-#line 139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 145 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_name = _tmp1_;
-#line 2393 "Page.c"
+#line 2418 "Page.c"
 }
 
 
 void page_set_page_name (Page* self, const gchar* page_name) {
-#line 138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 144 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 144 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_page_name (self, page_name);
-#line 2402 "Page.c"
+#line 2427 "Page.c"
 }
 
 
@@ -2406,24 +2431,24 @@ gchar* page_to_string (Page* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 148 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 149 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page_name;
-#line 143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 149 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 149 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 149 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2420 "Page.c"
+#line 2445 "Page.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
-#line 147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 153 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 2427 "Page.c"
+#line 2452 "Page.c"
 }
 
 
@@ -2431,17 +2456,17 @@ ViewCollection* page_get_view (Page* self) {
 	ViewCollection* result = NULL;
 	ViewCollection* _tmp0_ = NULL;
 	ViewCollection* _tmp1_ = NULL;
-#line 146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 152 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 153 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->view;
-#line 147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 153 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _data_collection_ref0 (_tmp0_);
-#line 147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 153 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 153 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2445 "Page.c"
+#line 2470 "Page.c"
 }
 
 
@@ -2449,17 +2474,17 @@ GtkWindow* page_get_container (Page* self) {
 	GtkWindow* result = NULL;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 156 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 157 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->container;
-#line 151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 157 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 157 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 157 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2463 "Page.c"
+#line 2488 "Page.c"
 }
 
 
@@ -2467,110 +2492,100 @@ static void page_real_set_container (Page* self, GtkWindow* container) {
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
 	GtkWindow* _tmp2_ = NULL;
-	GtkWindow* _tmp3_ = NULL;
-	GtkUIManager* _tmp4_ = NULL;
-#line 154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 160 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 161 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->container;
-#line 155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 161 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ == NULL, "this.container == null");
-#line 157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 163 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = container;
-#line 157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 163 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 163 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->container);
-#line 157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 163 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->container = _tmp2_;
-#line 158 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = container;
-#line 158 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp4_ = page_window_get_ui_manager (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE_WINDOW, PageWindow));
-#line 158 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (self->ui);
-#line 158 "/home/jens/Source/shotwell/src/Page.vala"
-	self->ui = _tmp4_;
-#line 2495 "Page.c"
+#line 2510 "Page.c"
 }
 
 
 void page_set_container (Page* self, GtkWindow* container) {
-#line 154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 160 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 160 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_container (self, container);
-#line 2504 "Page.c"
+#line 2519 "Page.c"
 }
 
 
 static void page_real_clear_container (Page* self) {
-#line 162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 167 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->container);
-#line 162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 167 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->container = NULL;
-#line 2513 "Page.c"
+#line 2528 "Page.c"
 }
 
 
 void page_clear_container (Page* self) {
-#line 161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 166 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 166 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->clear_container (self);
-#line 2522 "Page.c"
+#line 2537 "Page.c"
 }
 
 
 static gboolean _page_on_button_pressed_internal_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = page_on_button_pressed_internal ((Page*) self, event);
-#line 176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 181 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2531 "Page.c"
+#line 2546 "Page.c"
 }
 
 
 static gboolean _page_on_button_released_internal_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = page_on_button_released_internal ((Page*) self, event);
-#line 177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 182 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2540 "Page.c"
+#line 2555 "Page.c"
 }
 
 
 static gboolean _page_on_motion_internal_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) {
 	gboolean result;
 	result = page_on_motion_internal ((Page*) self, event);
-#line 178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 183 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2549 "Page.c"
+#line 2564 "Page.c"
 }
 
 
 static gboolean _page_on_leave_notify_event_gtk_widget_leave_notify_event (GtkWidget* _sender, GdkEventCrossing* event, gpointer self) {
 	gboolean result;
 	result = page_on_leave_notify_event ((Page*) self);
-#line 179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 184 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2558 "Page.c"
+#line 2573 "Page.c"
 }
 
 
 static gboolean _page_on_mousewheel_internal_gtk_widget_scroll_event (GtkWidget* _sender, GdkEventScroll* event, gpointer self) {
 	gboolean result;
 	result = page_on_mousewheel_internal ((Page*) self, event);
-#line 180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 185 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2567 "Page.c"
+#line 2582 "Page.c"
 }
 
 
 static void _page_on_event_source_realize_gtk_widget_realize (GtkWidget* _sender, gpointer self) {
-#line 181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 186 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_event_source_realize ((Page*) self);
-#line 2574 "Page.c"
+#line 2589 "Page.c"
 }
 
 
@@ -2586,55 +2601,55 @@ void page_set_event_source (Page* self, GtkWidget* event_source) {
 	GtkWidget* _tmp8_ = NULL;
 	GtkWidget* _tmp9_ = NULL;
 	GtkWidget* _tmp10_ = NULL;
-#line 165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 170 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 170 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WIDGET (event_source));
-#line 166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 171 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 171 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ == NULL, "this.event_source == null");
-#line 168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 173 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = event_source;
-#line 168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 173 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 173 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 173 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = _tmp2_;
-#line 169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 174 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event_source;
-#line 169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 174 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_set_can_focus (_tmp3_, TRUE);
-#line 172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 177 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event_source;
-#line 172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 177 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_add_events (_tmp4_, (gint) ((((((GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK) | GDK_POINTER_MOTION_MASK) | GDK_POINTER_MOTION_HINT_MASK) | GDK_BUTTON_MOTION_MASK) | GDK_LEAVE_NOTIFY_MASK) | GDK_SCROLL_MASK));
-#line 176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 181 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event_source;
-#line 176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 181 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp5_, "button-press-event", (GCallback) _page_on_button_pressed_internal_gtk_widget_button_press_event, self, 0);
-#line 177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 182 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = event_source;
-#line 177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 182 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp6_, "button-release-event", (GCallback) _page_on_button_released_internal_gtk_widget_button_release_event, self, 0);
-#line 178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 183 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = event_source;
-#line 178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 183 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp7_, "motion-notify-event", (GCallback) _page_on_motion_internal_gtk_widget_motion_notify_event, self, 0);
-#line 179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 184 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = event_source;
-#line 179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 184 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp8_, "leave-notify-event", (GCallback) _page_on_leave_notify_event_gtk_widget_leave_notify_event, self, 0);
-#line 180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 185 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = event_source;
-#line 180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 185 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp9_, "scroll-event", (GCallback) _page_on_mousewheel_internal_gtk_widget_scroll_event, self, 0);
-#line 181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 186 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = event_source;
-#line 181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 186 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp10_, "realize", (GCallback) _page_on_event_source_realize_gtk_widget_realize, self, 0);
-#line 2638 "Page.c"
+#line 2653 "Page.c"
 }
 
 
@@ -2650,53 +2665,53 @@ static void page_detach_event_source (Page* self) {
 	guint _tmp8_ = 0U;
 	GtkWidget* _tmp9_ = NULL;
 	guint _tmp10_ = 0U;
-#line 184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 189 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 190 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 190 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 191 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 2662 "Page.c"
+#line 2677 "Page.c"
 	}
-#line 188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 193 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 193 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp2_, NULL, FALSE);
-#line 188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 193 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _page_on_button_pressed_internal_gtk_widget_button_press_event, self);
-#line 189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 194 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->event_source;
-#line 189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 194 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("button-release-event", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 194 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _page_on_button_released_internal_gtk_widget_button_release_event, self);
-#line 190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 195 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->event_source;
-#line 190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 195 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("motion-notify-event", gtk_widget_get_type (), &_tmp6_, NULL, FALSE);
-#line 190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 195 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _page_on_motion_internal_gtk_widget_motion_notify_event, self);
-#line 191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 196 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->event_source;
-#line 191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 196 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("leave-notify-event", gtk_widget_get_type (), &_tmp8_, NULL, FALSE);
-#line 191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 196 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _page_on_leave_notify_event_gtk_widget_leave_notify_event, self);
-#line 192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 197 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 197 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("scroll-event", gtk_widget_get_type (), &_tmp10_, NULL, FALSE);
-#line 192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 197 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _page_on_mousewheel_internal_gtk_widget_scroll_event, self);
-#line 194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 199 "/home/jens/Source/shotwell/src/Page.vala"
 	page_disable_drag_source (self);
-#line 196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 201 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 196 "/home/jens/Source/shotwell/src/Page.vala"
+#line 201 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
-#line 2700 "Page.c"
+#line 2715 "Page.c"
 }
 
 
@@ -2704,80 +2719,368 @@ GtkWidget* page_get_event_source (Page* self) {
 	GtkWidget* result = NULL;
 	GtkWidget* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 204 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 205 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 205 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 205 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 200 "/home/jens/Source/shotwell/src/Page.vala"
-	return result;
-#line 2718 "Page.c"
-}
-
-
-static GtkMenuBar* page_real_get_menubar (Page* self) {
-	GtkMenuBar* result = NULL;
-	GtkMenuBar* menubar = NULL;
-	GtkUIManager* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-	GtkMenuBar* _tmp2_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = self->ui;
-#line 204 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = gtk_ui_manager_get_widget (_tmp0_, "/MenuBar");
-#line 204 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_menu_bar_get_type ()) ? ((GtkMenuBar*) _tmp1_) : NULL);
-#line 204 "/home/jens/Source/shotwell/src/Page.vala"
-	menubar = _tmp2_;
 #line 205 "/home/jens/Source/shotwell/src/Page.vala"
-	_vala_assert (menubar != NULL, "menubar != null");
-#line 207 "/home/jens/Source/shotwell/src/Page.vala"
-	result = menubar;
-#line 207 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2742 "Page.c"
+#line 2733 "Page.c"
 }
 
 
-GtkMenuBar* page_get_menubar (Page* self) {
-#line 203 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 203 "/home/jens/Source/shotwell/src/Page.vala"
-	return PAGE_GET_CLASS (self)->get_menubar (self);
-#line 2751 "Page.c"
+static gpointer _injection_group_ref0 (gpointer self) {
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+	return self ? injection_group_ref (self) : NULL;
+#line 2740 "Page.c"
 }
 
 
-static GtkWidget* page_real_get_page_ui_widget (Page* self, const gchar* path) {
-	GtkWidget* result = NULL;
-	GtkUIManager* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
+GMenuModel* page_get_menubar (Page* self) {
+	GMenuModel* result = NULL;
+	GMenu* model = NULL;
+	GtkBuilder* _tmp0_ = NULL;
+	GObject* _tmp1_ = NULL;
+	GMenu* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+#line 209 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_val_if_fail (IS_PAGE (self), NULL);
 #line 210 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_val_if_fail (path != NULL, NULL);
-#line 211 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = self->ui;
-#line 211 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = path;
-#line 211 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = gtk_ui_manager_get_widget (_tmp0_, _tmp1_);
-#line 211 "/home/jens/Source/shotwell/src/Page.vala"
-	result = _tmp2_;
-#line 211 "/home/jens/Source/shotwell/src/Page.vala"
-	return result;
-#line 2772 "Page.c"
-}
-
-
-GtkWidget* page_get_page_ui_widget (Page* self, const gchar* path) {
+	_tmp0_ = self->builder;
 #line 210 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_val_if_fail (IS_PAGE (self), NULL);
+	_tmp1_ = gtk_builder_get_object (_tmp0_, "MenuBar");
+#line 210 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_menu_get_type ()) ? ((GMenu*) _tmp1_) : NULL);
 #line 210 "/home/jens/Source/shotwell/src/Page.vala"
-	return PAGE_GET_CLASS (self)->get_page_ui_widget (self, path);
-#line 2781 "Page.c"
+	model = _tmp2_;
+#line 212 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = self->priv->menubar_injected;
+#line 212 "/home/jens/Source/shotwell/src/Page.vala"
+	if (!_tmp3_) {
+#line 2765 "Page.c"
+		InjectionGroup** injection_groups = NULL;
+		gint _tmp4_ = 0;
+		InjectionGroup** _tmp5_ = NULL;
+		gint injection_groups_length1 = 0;
+		gint _injection_groups_size_ = 0;
+		InjectionGroup** _tmp6_ = NULL;
+		gint _tmp6__length1 = 0;
+#line 214 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = page_init_collect_injection_groups (self, &_tmp4_);
+#line 214 "/home/jens/Source/shotwell/src/Page.vala"
+		injection_groups = _tmp5_;
+#line 214 "/home/jens/Source/shotwell/src/Page.vala"
+		injection_groups_length1 = _tmp4_;
+#line 214 "/home/jens/Source/shotwell/src/Page.vala"
+		_injection_groups_size_ = injection_groups_length1;
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6_ = injection_groups;
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6__length1 = injection_groups_length1;
+#line 2785 "Page.c"
+		{
+			InjectionGroup** group_collection = NULL;
+			gint group_collection_length1 = 0;
+			gint _group_collection_size_ = 0;
+			gint group_it = 0;
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+			group_collection = _tmp6_;
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+			group_collection_length1 = _tmp6__length1;
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+			for (group_it = 0; group_it < _tmp6__length1; group_it = group_it + 1) {
+#line 2797 "Page.c"
+				InjectionGroup* _tmp7_ = NULL;
+				InjectionGroup* group = NULL;
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp7_ = _injection_group_ref0 (group_collection[group_it]);
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+				group = _tmp7_;
+#line 2804 "Page.c"
+				{
+					gint items = 0;
+					GMenu* _tmp8_ = NULL;
+					gint _tmp9_ = 0;
+#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp8_ = model;
+#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp9_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_menu_model_get_type (), GMenuModel));
+#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+					items = _tmp9_;
+#line 2815 "Page.c"
+					{
+						gint i = 0;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+						i = 0;
+#line 2820 "Page.c"
+						{
+							gboolean _tmp10_ = FALSE;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp10_ = TRUE;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+							while (TRUE) {
+#line 2827 "Page.c"
+								gint _tmp12_ = 0;
+								gint _tmp13_ = 0;
+								GMenuModel* submenu = NULL;
+								GMenu* _tmp14_ = NULL;
+								gint _tmp15_ = 0;
+								GMenuModel* _tmp16_ = NULL;
+								GMenuModel* section = NULL;
+								GMenuModel* _tmp17_ = NULL;
+								InjectionGroup* _tmp18_ = NULL;
+								gchar* _tmp19_ = NULL;
+								gchar* _tmp20_ = NULL;
+								GMenuModel* _tmp21_ = NULL;
+								GMenuModel* _tmp22_ = NULL;
+								GMenuModel* _tmp23_ = NULL;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+								if (!_tmp10_) {
+#line 2844 "Page.c"
+									gint _tmp11_ = 0;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp11_ = i;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+									i = _tmp11_ + 1;
+#line 2850 "Page.c"
+								}
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp10_ = FALSE;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp12_ = i;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp13_ = items;
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+								if (!(_tmp12_ < _tmp13_)) {
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+									break;
+#line 2862 "Page.c"
+								}
+#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp14_ = model;
+#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp15_ = i;
+#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp16_ = g_menu_model_get_item_link (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, g_menu_model_get_type (), GMenuModel), _tmp15_, G_MENU_LINK_SUBMENU);
+#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+								submenu = _tmp16_;
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp17_ = submenu;
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp18_ = group;
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp19_ = injection_group_get_path (_tmp18_);
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp20_ = _tmp19_;
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp21_ = page_find_extension_point (self, _tmp17_, _tmp20_);
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp22_ = _tmp21_;
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
+								_g_free0 (_tmp20_);
+#line 220 "/home/jens/Source/shotwell/src/Page.vala"
+								section = _tmp22_;
+#line 223 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp23_ = section;
+#line 223 "/home/jens/Source/shotwell/src/Page.vala"
+								if (_tmp23_ == NULL) {
+#line 224 "/home/jens/Source/shotwell/src/Page.vala"
+									_g_object_unref0 (section);
+#line 224 "/home/jens/Source/shotwell/src/Page.vala"
+									_g_object_unref0 (submenu);
+#line 224 "/home/jens/Source/shotwell/src/Page.vala"
+									continue;
+#line 2898 "Page.c"
+								}
+								{
+									GeeList* _element_list = NULL;
+									InjectionGroup* _tmp24_ = NULL;
+									GeeList* _tmp25_ = NULL;
+									gint _element_size = 0;
+									GeeList* _tmp26_ = NULL;
+									gint _tmp27_ = 0;
+									gint _tmp28_ = 0;
+									gint _element_index = 0;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp24_ = group;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp25_ = injection_group_get_elements (_tmp24_);
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+									_element_list = _tmp25_;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp26_ = _element_list;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp28_ = _tmp27_;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+									_element_size = _tmp28_;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+									_element_index = -1;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+									while (TRUE) {
+#line 2927 "Page.c"
+										gint _tmp29_ = 0;
+										gint _tmp30_ = 0;
+										gint _tmp31_ = 0;
+										InjectionGroupElement* element = NULL;
+										GeeList* _tmp32_ = NULL;
+										gint _tmp33_ = 0;
+										gpointer _tmp34_ = NULL;
+										GMenu* menu = NULL;
+										GMenuModel* _tmp35_ = NULL;
+										GMenu* _tmp36_ = NULL;
+										InjectionGroupElement* _tmp37_ = NULL;
+										InjectionGroupElementItemType _tmp38_ = 0;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp29_ = _element_index;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+										_element_index = _tmp29_ + 1;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp30_ = _element_index;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp31_ = _element_size;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+										if (!(_tmp30_ < _tmp31_)) {
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+											break;
+#line 2952 "Page.c"
+										}
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp32_ = _element_list;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp33_ = _element_index;
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp34_ = gee_list_get (_tmp32_, _tmp33_);
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+										element = (InjectionGroupElement*) _tmp34_;
+#line 228 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp35_ = section;
+#line 228 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp36_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp35_, g_menu_get_type ()) ? ((GMenu*) _tmp35_) : NULL);
+#line 228 "/home/jens/Source/shotwell/src/Page.vala"
+										menu = _tmp36_;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp37_ = element;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp38_ = _tmp37_->kind;
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+										switch (_tmp38_) {
+#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+											case INJECTION_GROUP_ELEMENT_ITEM_TYPE_MENUITEM:
+#line 2976 "Page.c"
+											{
+												GMenuItem* item = NULL;
+												InjectionGroupElement* _tmp39_ = NULL;
+												const gchar* _tmp40_ = NULL;
+												InjectionGroupElement* _tmp41_ = NULL;
+												const gchar* _tmp42_ = NULL;
+												gchar* _tmp43_ = NULL;
+												gchar* _tmp44_ = NULL;
+												GMenuItem* _tmp45_ = NULL;
+												GMenuItem* _tmp46_ = NULL;
+												InjectionGroupElement* _tmp47_ = NULL;
+												const gchar* _tmp48_ = NULL;
+												GMenu* _tmp52_ = NULL;
+												GMenuItem* _tmp53_ = NULL;
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp39_ = element;
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp40_ = _tmp39_->name;
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp41_ = element;
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp42_ = _tmp41_->action;
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp43_ = g_strconcat ("win.", _tmp42_, NULL);
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp44_ = _tmp43_;
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp45_ = g_menu_item_new (_tmp40_, _tmp44_);
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp46_ = _tmp45_;
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+												_g_free0 (_tmp44_);
+#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+												item = _tmp46_;
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp47_ = element;
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp48_ = _tmp47_->accellerator;
+#line 233 "/home/jens/Source/shotwell/src/Page.vala"
+												if (_tmp48_ != NULL) {
+#line 3017 "Page.c"
+													GMenuItem* _tmp49_ = NULL;
+													InjectionGroupElement* _tmp50_ = NULL;
+													const gchar* _tmp51_ = NULL;
+#line 234 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp49_ = item;
+#line 234 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp50_ = element;
+#line 234 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp51_ = _tmp50_->accellerator;
+#line 234 "/home/jens/Source/shotwell/src/Page.vala"
+													g_menu_item_set_attribute (_tmp49_, "accel", "s", _tmp51_, NULL);
+#line 3029 "Page.c"
+												}
+#line 239 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp52_ = menu;
+#line 239 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp53_ = item;
+#line 239 "/home/jens/Source/shotwell/src/Page.vala"
+												g_menu_append_item (_tmp52_, _tmp53_);
+#line 240 "/home/jens/Source/shotwell/src/Page.vala"
+												_g_object_unref0 (item);
+#line 240 "/home/jens/Source/shotwell/src/Page.vala"
+												break;
+#line 3041 "Page.c"
+											}
+											default:
+											{
+#line 242 "/home/jens/Source/shotwell/src/Page.vala"
+												break;
+#line 3047 "Page.c"
+											}
+										}
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+										_g_object_unref0 (menu);
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+										_injection_group_element_unref0 (element);
+#line 3054 "Page.c"
+									}
+#line 227 "/home/jens/Source/shotwell/src/Page.vala"
+									_g_object_unref0 (_element_list);
+#line 3058 "Page.c"
+								}
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+								_g_object_unref0 (section);
+#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+								_g_object_unref0 (submenu);
+#line 3064 "Page.c"
+							}
+						}
+					}
+#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+					_injection_group_unref0 (group);
+#line 3070 "Page.c"
+				}
+			}
+		}
+#line 248 "/home/jens/Source/shotwell/src/Page.vala"
+		self->priv->menubar_injected = TRUE;
+#line 212 "/home/jens/Source/shotwell/src/Page.vala"
+		injection_groups = (_vala_array_free (injection_groups, injection_groups_length1, (GDestroyNotify) injection_group_unref), NULL);
+#line 3078 "Page.c"
+	}
+#line 251 "/home/jens/Source/shotwell/src/Page.vala"
+	result = G_TYPE_CHECK_INSTANCE_CAST (model, g_menu_model_get_type (), GMenuModel);
+#line 251 "/home/jens/Source/shotwell/src/Page.vala"
+	return result;
+#line 3084 "Page.c"
 }
 
 
@@ -2786,156 +3089,154 @@ static GtkToolbar* page_real_get_toolbar (Page* self) {
 	GtkToolbar* _tmp0_ = NULL;
 	GtkToolbar* _tmp12_ = NULL;
 	GtkToolbar* _tmp13_ = NULL;
-#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 255 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->toolbar;
-#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 255 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 2794 "Page.c"
+#line 3097 "Page.c"
 		GtkToolbar* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		GtkToolbar* _tmp8_ = NULL;
 		GtkToolbar* _tmp9_ = NULL;
 		GtkStyleContext* _tmp10_ = NULL;
 		GtkToolbar* _tmp11_ = NULL;
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->toolbar_path;
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp2_ == NULL) {
-#line 2805 "Page.c"
+#line 3108 "Page.c"
 			GtkToolbar* _tmp3_ = NULL;
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = (GtkToolbar*) gtk_toolbar_new ();
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 			g_object_ref_sink (_tmp3_);
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp1_);
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp1_ = _tmp3_;
-#line 2815 "Page.c"
+#line 3118 "Page.c"
 		} else {
-			GtkUIManager* _tmp4_ = NULL;
+			GtkBuilder* _tmp4_ = NULL;
 			const gchar* _tmp5_ = NULL;
-			GtkWidget* _tmp6_ = NULL;
+			GObject* _tmp6_ = NULL;
 			GtkToolbar* _tmp7_ = NULL;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
-			_tmp4_ = self->ui;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
+			_tmp4_ = self->builder;
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = self->priv->toolbar_path;
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
-			_tmp6_ = gtk_ui_manager_get_widget (_tmp4_, _tmp5_);
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
+			_tmp6_ = gtk_builder_get_object (_tmp4_, _tmp5_);
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_toolbar_get_type ()) ? ((GtkToolbar*) _tmp6_) : NULL);
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp1_);
-#line 217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 257 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp1_ = _tmp7_;
-#line 2833 "Page.c"
+#line 3136 "Page.c"
 		}
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _g_object_ref0 (_tmp1_);
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->toolbar);
-#line 216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 256 "/home/jens/Source/shotwell/src/Page.vala"
 		self->toolbar = _tmp8_;
-#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 259 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->toolbar;
-#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 259 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 259 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_style_context_add_class (_tmp10_, "bottom-toolbar");
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 260 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->toolbar;
-#line 219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 260 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_toolbar_set_icon_size (_tmp11_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 255 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 2853 "Page.c"
+#line 3156 "Page.c"
 	}
-#line 221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 262 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->toolbar;
-#line 221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 262 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 262 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp13_;
-#line 221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 262 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2863 "Page.c"
+#line 3166 "Page.c"
 }
 
 
 GtkToolbar* page_get_toolbar (Page* self) {
-#line 214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 254 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 254 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->get_toolbar (self);
-#line 2872 "Page.c"
+#line 3175 "Page.c"
 }
 
 
 static GtkMenu* page_real_get_page_context_menu (Page* self) {
 	GtkMenu* result = NULL;
-#line 225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 266 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 266 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2882 "Page.c"
+#line 3185 "Page.c"
 }
 
 
 GtkMenu* page_get_page_context_menu (Page* self) {
-#line 224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 265 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 265 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->get_page_context_menu (self);
-#line 2891 "Page.c"
+#line 3194 "Page.c"
 }
 
 
 static void page_real_switching_from (Page* self) {
 	const gchar* _tmp0_ = NULL;
-#line 229 "/home/jens/Source/shotwell/src/Page.vala"
+#line 270 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = FALSE;
-#line 230 "/home/jens/Source/shotwell/src/Page.vala"
-	page_remove_ui (self);
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 271 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->toolbar_path;
-#line 231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 271 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 272 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->toolbar);
-#line 232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 272 "/home/jens/Source/shotwell/src/Page.vala"
 		self->toolbar = NULL;
-#line 2909 "Page.c"
+#line 3210 "Page.c"
 	}
 }
 
 
 void page_switching_from (Page* self) {
-#line 228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 269 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 269 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switching_from (self);
-#line 2919 "Page.c"
+#line 3220 "Page.c"
 }
 
 
 static void page_real_switched_to (Page* self) {
-#line 236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 276 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = TRUE;
-#line 237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 277 "/home/jens/Source/shotwell/src/Page.vala"
 	page_add_ui (self);
-#line 238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 278 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_modifiers (self);
-#line 2930 "Page.c"
+#line 3231 "Page.c"
 }
 
 
 void page_switched_to (Page* self) {
-#line 235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 275 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 275 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switched_to (self);
-#line 2939 "Page.c"
+#line 3240 "Page.c"
 }
 
 
@@ -2944,713 +3245,589 @@ static void page_real_ready (Page* self) {
 
 
 void page_ready (Page* self) {
-#line 241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 281 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 281 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->ready (self);
-#line 2952 "Page.c"
+#line 3253 "Page.c"
 }
 
 
 gboolean page_is_in_view (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 284 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->in_view;
-#line 245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 285 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 285 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 2967 "Page.c"
+#line 3268 "Page.c"
 }
 
 
 static void page_real_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 2974 "Page.c"
+#line 3275 "Page.c"
 }
 
 
 void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switching_to_fullscreen (self, fsw);
-#line 2983 "Page.c"
+#line 3284 "Page.c"
 }
 
 
 static void page_real_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 291 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 2990 "Page.c"
+#line 3291 "Page.c"
 }
 
 
 void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 291 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 291 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->returning_from_fullscreen (self, fsw);
-#line 2999 "Page.c"
+#line 3300 "Page.c"
 }
 
 
-GtkAction* page_get_action (Page* self, const gchar* name) {
-	GtkAction* result = NULL;
-	GtkActionGroup* _tmp0_ = NULL;
-	GtkAction* action = NULL;
-	GtkActionGroup* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	GtkAction* _tmp3_ = NULL;
-	GtkAction* _tmp4_ = NULL;
-	GtkAction* _tmp5_ = NULL;
-	GtkAction* _tmp8_ = NULL;
-#line 254 "/home/jens/Source/shotwell/src/Page.vala"
+GAction* page_get_action (Page* self, const gchar* name) {
+	GAction* result = NULL;
+	AppWindow* aw = NULL;
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
+#line 294 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 294 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 255 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = self->priv->action_group;
-#line 255 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp0_ == NULL) {
-#line 256 "/home/jens/Source/shotwell/src/Page.vala"
-		result = NULL;
-#line 256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 295 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = app_window_get_instance ();
+#line 295 "/home/jens/Source/shotwell/src/Page.vala"
+	aw = _tmp0_;
+#line 297 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = aw;
+#line 297 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp1_ != NULL) {
+#line 3321 "Page.c"
+		AppWindow* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+		GAction* _tmp4_ = NULL;
+		GAction* _tmp5_ = NULL;
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp2_ = aw;
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp3_ = name;
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_action_map_get_type (), GActionMap), _tmp3_);
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = _g_object_ref0 (_tmp4_);
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+		result = _tmp5_;
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (aw);
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3025 "Page.c"
+#line 3340 "Page.c"
 	}
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = self->priv->action_group;
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = name;
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = gtk_action_group_get_action (_tmp1_, _tmp2_);
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 258 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp4_;
-#line 259 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp5_ = action;
-#line 259 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp5_ == NULL) {
-#line 3041 "Page.c"
-		const gchar* _tmp6_ = NULL;
-		GtkAction* _tmp7_ = NULL;
-#line 260 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp6_ = name;
-#line 260 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp7_ = page_get_common_action (self, _tmp6_, FALSE);
-#line 260 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_object_unref0 (action);
-#line 260 "/home/jens/Source/shotwell/src/Page.vala"
-		action = _tmp7_;
-#line 3052 "Page.c"
-	}
-#line 262 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp8_ = action;
-#line 262 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp8_ == NULL) {
-#line 3058 "Page.c"
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-#line 263 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp9_ = page_get_page_name (self);
-#line 263 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp10_ = _tmp9_;
-#line 263 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp11_ = name;
-#line 263 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:263: Page %s: Unable to locate action %s", _tmp10_, _tmp11_);
-#line 263 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_free0 (_tmp10_);
-#line 3072 "Page.c"
-	}
-#line 265 "/home/jens/Source/shotwell/src/Page.vala"
-	result = action;
-#line 265 "/home/jens/Source/shotwell/src/Page.vala"
+#line 301 "/home/jens/Source/shotwell/src/Page.vala"
+	result = NULL;
+#line 301 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (aw);
+#line 301 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3078 "Page.c"
+#line 3348 "Page.c"
 }
 
 
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive) {
-	GtkAction* action = NULL;
+	GSimpleAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-#line 268 "/home/jens/Source/shotwell/src/Page.vala"
+	GAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+#line 304 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 304 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 269 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp1_;
-#line 270 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = action;
-#line 270 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp2_ != NULL) {
-#line 3101 "Page.c"
-		GtkAction* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = action;
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = sensitive;
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_action_set_sensitive (_tmp3_, _tmp4_);
-#line 3110 "Page.c"
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp2_ == NULL) {
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (_tmp1_);
+#line 3372 "Page.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+	action = _tmp2_;
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = action;
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp3_ != NULL) {
+#line 3380 "Page.c"
+		GSimpleAction* _tmp4_ = NULL;
+		gboolean _tmp5_ = FALSE;
+#line 307 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = action;
+#line 307 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = sensitive;
+#line 307 "/home/jens/Source/shotwell/src/Page.vala"
+		g_simple_action_set_enabled (_tmp4_, _tmp5_);
+#line 3389 "Page.c"
+	}
+#line 304 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3114 "Page.c"
+#line 3393 "Page.c"
 }
 
 
 void page_set_action_important (Page* self, const gchar* name, gboolean important) {
-	GtkAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-#line 274 "/home/jens/Source/shotwell/src/Page.vala"
+	gboolean _tmp1_ = FALSE;
+#line 310 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 310 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 275 "/home/jens/Source/shotwell/src/Page.vala"
+#line 311 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 275 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = page_get_action (self, _tmp0_);
-#line 275 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp1_;
-#line 276 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = action;
-#line 276 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp2_ != NULL) {
-#line 3137 "Page.c"
-		GtkAction* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-#line 277 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = action;
-#line 277 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = important;
-#line 277 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_action_set_is_important (_tmp3_, _tmp4_);
-#line 3146 "Page.c"
-	}
-#line 274 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (action);
-#line 3150 "Page.c"
+#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = important;
+#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+	page_set_action_sensitive (self, _tmp0_, _tmp1_);
+#line 3410 "Page.c"
 }
 
 
 void page_set_action_visible (Page* self, const gchar* name, gboolean visible) {
-	GtkAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-	GtkAction* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	GtkAction* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
+	gboolean _tmp1_ = FALSE;
+#line 314 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 314 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = page_get_action (self, _tmp0_);
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp1_;
-#line 282 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = action;
-#line 282 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp2_ == NULL) {
-#line 283 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_object_unref0 (action);
-#line 283 "/home/jens/Source/shotwell/src/Page.vala"
-		return;
-#line 3181 "Page.c"
-	}
-#line 285 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = action;
-#line 285 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp4_ = visible;
-#line 285 "/home/jens/Source/shotwell/src/Page.vala"
-	gtk_action_set_visible (_tmp3_, _tmp4_);
-#line 286 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp5_ = action;
-#line 286 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp6_ = visible;
-#line 286 "/home/jens/Source/shotwell/src/Page.vala"
-	gtk_action_set_sensitive (_tmp5_, _tmp6_);
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (action);
-#line 3197 "Page.c"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = visible;
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+	page_set_action_sensitive (self, _tmp0_, _tmp1_);
+#line 3427 "Page.c"
 }
 
 
 void page_set_action_short_label (Page* self, const gchar* name, const gchar* short_label) {
-	GtkAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-#line 289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (short_label != NULL);
-#line 290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 290 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = page_get_action (self, _tmp0_);
-#line 290 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp1_;
-#line 291 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = action;
-#line 291 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp2_ != NULL) {
-#line 3222 "Page.c"
-		GtkAction* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-#line 292 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = action;
-#line 292 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = short_label;
-#line 292 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_action_set_short_label (_tmp3_, _tmp4_);
-#line 3231 "Page.c"
-	}
-#line 289 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (action);
-#line 3235 "Page.c"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:319: => Set action short_label called for %s", _tmp0_);
+#line 3443 "Page.c"
 }
 
 
 void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive) {
-	GtkAction* action = NULL;
+	GSimpleAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	GtkAction* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-#line 295 "/home/jens/Source/shotwell/src/Page.vala"
+	GAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	GSimpleAction* _tmp7_ = NULL;
+	gboolean _tmp8_ = FALSE;
+#line 322 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 322 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 323 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 323 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 296 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp1_;
-#line 297 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = action;
-#line 297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 323 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
+#line 323 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 323 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (_tmp1_);
+#line 3470 "Page.c"
+	}
+#line 323 "/home/jens/Source/shotwell/src/Page.vala"
+	action = _tmp2_;
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = action;
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp3_ == NULL) {
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (action);
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 3266 "Page.c"
+#line 3482 "Page.c"
 	}
-#line 300 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = label;
-#line 300 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp3_ != NULL) {
-#line 3272 "Page.c"
-		GtkAction* _tmp4_ = NULL;
+#line 328 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp4_ = label;
+#line 328 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp4_ != NULL) {
+#line 3488 "Page.c"
 		const gchar* _tmp5_ = NULL;
-#line 301 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = action;
-#line 301 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp5_ = label;
-#line 301 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_action_set_label (_tmp4_, _tmp5_);
-#line 3281 "Page.c"
-	}
-#line 303 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp6_ = tooltip;
-#line 303 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp6_ != NULL) {
-#line 3287 "Page.c"
-		GtkAction* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-#line 304 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp7_ = action;
-#line 304 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp8_ = tooltip;
-#line 304 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_action_set_tooltip (_tmp7_, _tmp8_);
-#line 3296 "Page.c"
+		const gchar* _tmp6_ = NULL;
+#line 329 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = name;
+#line 329 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6_ = label;
+#line 329 "/home/jens/Source/shotwell/src/Page.vala"
+		page_update_menu_item_label (self, _tmp5_, _tmp6_);
+#line 3497 "Page.c"
 	}
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp9_ = action;
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp10_ = sensitive;
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
-	gtk_action_set_sensitive (_tmp9_, _tmp10_);
-#line 295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp7_ = action;
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp8_ = sensitive;
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
+	g_simple_action_set_enabled (_tmp7_, _tmp8_);
+#line 322 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3306 "Page.c"
+#line 3507 "Page.c"
 }
 
 
 void page_activate_action (Page* self, const gchar* name) {
-	GtkAction* action = NULL;
+	GAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-#line 309 "/home/jens/Source/shotwell/src/Page.vala"
+	GAction* _tmp1_ = NULL;
+	GAction* _tmp2_ = NULL;
+#line 334 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 334 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 310 "/home/jens/Source/shotwell/src/Page.vala"
+#line 335 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 310 "/home/jens/Source/shotwell/src/Page.vala"
+#line 335 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 310 "/home/jens/Source/shotwell/src/Page.vala"
+#line 335 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp1_;
-#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 337 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 337 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 3329 "Page.c"
-		GtkAction* _tmp3_ = NULL;
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 3530 "Page.c"
+		GAction* _tmp3_ = NULL;
+#line 338 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = action;
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_action_activate (_tmp3_);
-#line 3335 "Page.c"
+#line 338 "/home/jens/Source/shotwell/src/Page.vala"
+		g_action_activate (_tmp3_, NULL);
+#line 3536 "Page.c"
 	}
-#line 309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 334 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3339 "Page.c"
+#line 3540 "Page.c"
 }
 
 
-GtkAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning) {
-	GtkAction* result = NULL;
-	GtkActionGroup** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	GtkActionGroup** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gboolean _tmp8_ = FALSE;
-#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning) {
+	GAction* result = NULL;
+	GAction* action = NULL;
+	const gchar* _tmp0_ = NULL;
+	GAction* _tmp1_ = NULL;
+	GAction* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+#line 341 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 341 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 316 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = self->priv->common_action_groups;
-#line 316 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0__length1 = self->priv->common_action_groups_length1;
-#line 316 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp0_ == NULL) {
-#line 317 "/home/jens/Source/shotwell/src/Page.vala"
-		result = NULL;
-#line 317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 342 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = name;
+#line 342 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = page_get_action (self, _tmp0_);
+#line 342 "/home/jens/Source/shotwell/src/Page.vala"
+	action = _tmp1_;
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = action;
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp2_ != NULL) {
+#line 345 "/home/jens/Source/shotwell/src/Page.vala"
+		result = action;
+#line 345 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3364 "Page.c"
+#line 3569 "Page.c"
 	}
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = self->priv->common_action_groups;
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1__length1 = self->priv->common_action_groups_length1;
-#line 3370 "Page.c"
-	{
-		GtkActionGroup** group_collection = NULL;
-		gint group_collection_length1 = 0;
-		gint _group_collection_size_ = 0;
-		gint group_it = 0;
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
-		group_collection = _tmp1_;
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
-		group_collection_length1 = _tmp1__length1;
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
-		for (group_it = 0; group_it < _tmp1__length1; group_it = group_it + 1) {
-#line 3382 "Page.c"
-			GtkActionGroup* _tmp2_ = NULL;
-			GtkActionGroup* group = NULL;
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
-			_tmp2_ = _g_object_ref0 (group_collection[group_it]);
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
-			group = _tmp2_;
-#line 3389 "Page.c"
-			{
-				GtkAction* action = NULL;
-				GtkActionGroup* _tmp3_ = NULL;
-				const gchar* _tmp4_ = NULL;
-				GtkAction* _tmp5_ = NULL;
-				GtkAction* _tmp6_ = NULL;
-				GtkAction* _tmp7_ = NULL;
-#line 320 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp3_ = group;
-#line 320 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp4_ = name;
-#line 320 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp5_ = gtk_action_group_get_action (_tmp3_, _tmp4_);
-#line 320 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp6_ = _g_object_ref0 (_tmp5_);
-#line 320 "/home/jens/Source/shotwell/src/Page.vala"
-				action = _tmp6_;
-#line 321 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp7_ = action;
-#line 321 "/home/jens/Source/shotwell/src/Page.vala"
-				if (_tmp7_ != NULL) {
-#line 322 "/home/jens/Source/shotwell/src/Page.vala"
-					result = action;
-#line 322 "/home/jens/Source/shotwell/src/Page.vala"
-					_g_object_unref0 (group);
-#line 322 "/home/jens/Source/shotwell/src/Page.vala"
-					return result;
-#line 3417 "Page.c"
-				}
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
-				_g_object_unref0 (action);
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
-				_g_object_unref0 (group);
-#line 3423 "Page.c"
-			}
-		}
-	}
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp8_ = log_warning;
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp8_) {
-#line 3431 "Page.c"
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-#line 326 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp9_ = page_get_page_name (self);
-#line 326 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp10_ = _tmp9_;
-#line 326 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp11_ = name;
-#line 326 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:326: Page %s: Unable to locate common action %s", _tmp10_, _tmp11_);
-#line 326 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_free0 (_tmp10_);
-#line 3445 "Page.c"
+#line 347 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = log_warning;
+#line 347 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp3_) {
+#line 3575 "Page.c"
+		gchar* _tmp4_ = NULL;
+		gchar* _tmp5_ = NULL;
+		const gchar* _tmp6_ = NULL;
+#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = page_get_page_name (self);
+#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = _tmp4_;
+#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6_ = name;
+#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+		g_warning ("Page.vala:348: Page %s: Unable to locate common action %s", _tmp5_, _tmp6_);
+#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_free0 (_tmp5_);
+#line 3589 "Page.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (action);
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3451 "Page.c"
+#line 3597 "Page.c"
 }
 
 
 void page_set_common_action_sensitive (Page* self, const gchar* name, gboolean sensitive) {
-	GtkAction* action = NULL;
+	GSimpleAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-#line 331 "/home/jens/Source/shotwell/src/Page.vala"
+	GAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+#line 353 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 353 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 354 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 354 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_common_action (self, _tmp0_, TRUE);
-#line 332 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp1_;
-#line 333 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = action;
-#line 333 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp2_ != NULL) {
-#line 3474 "Page.c"
-		GtkAction* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-#line 334 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = action;
-#line 334 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = sensitive;
-#line 334 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_action_set_sensitive (_tmp3_, _tmp4_);
-#line 3483 "Page.c"
+#line 354 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
+#line 354 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp2_ == NULL) {
+#line 354 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (_tmp1_);
+#line 3621 "Page.c"
 	}
-#line 331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 354 "/home/jens/Source/shotwell/src/Page.vala"
+	action = _tmp2_;
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = action;
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp3_ != NULL) {
+#line 3629 "Page.c"
+		GSimpleAction* _tmp4_ = NULL;
+		gboolean _tmp5_ = FALSE;
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = action;
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = sensitive;
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+		g_simple_action_set_enabled (_tmp4_, _tmp5_);
+#line 3638 "Page.c"
+	}
+#line 353 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3487 "Page.c"
+#line 3642 "Page.c"
 }
 
 
 void page_set_common_action_label (Page* self, const gchar* name, const gchar* label) {
-	GtkAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 359 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 359 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 359 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (label != NULL);
-#line 338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 360 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 338 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = page_get_common_action (self, _tmp0_, TRUE);
-#line 338 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp1_;
-#line 339 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = action;
-#line 339 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp2_ != NULL) {
-#line 3512 "Page.c"
-		GtkAction* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-#line 340 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = action;
-#line 340 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = label;
-#line 340 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_action_set_label (_tmp3_, _tmp4_);
-#line 3521 "Page.c"
-	}
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (action);
-#line 3525 "Page.c"
+#line 360 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:360: Trying to set common action label for %s", _tmp0_);
+#line 3658 "Page.c"
 }
 
 
 void page_set_common_action_important (Page* self, const gchar* name, gboolean important) {
-	GtkAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 364 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = page_get_common_action (self, _tmp0_, TRUE);
-#line 344 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp1_;
-#line 345 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = action;
-#line 345 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp2_ != NULL) {
-#line 3548 "Page.c"
-		GtkAction* _tmp3_ = NULL;
-		gboolean _tmp4_ = FALSE;
-#line 346 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = action;
-#line 346 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = important;
-#line 346 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_action_set_is_important (_tmp3_, _tmp4_);
-#line 3557 "Page.c"
-	}
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (action);
-#line 3561 "Page.c"
+#line 364 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:364: Setting action to important: %s", _tmp0_);
+#line 3672 "Page.c"
 }
 
 
 void page_activate_common_action (Page* self, const gchar* name) {
-	GtkAction* action = NULL;
+	GSimpleAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+	GAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+#line 367 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 367 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_common_action (self, _tmp0_, TRUE);
-#line 350 "/home/jens/Source/shotwell/src/Page.vala"
-	action = _tmp1_;
-#line 351 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = action;
-#line 351 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp2_ != NULL) {
-#line 3584 "Page.c"
-		GtkAction* _tmp3_ = NULL;
-#line 352 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = action;
-#line 352 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_action_activate (_tmp3_);
-#line 3590 "Page.c"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp2_ == NULL) {
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (_tmp1_);
+#line 3696 "Page.c"
+	}
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+	action = _tmp2_;
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = action;
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp3_ != NULL) {
+#line 3704 "Page.c"
+		GSimpleAction* _tmp4_ = NULL;
+#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = action;
+#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+		g_signal_emit_by_name (_tmp4_, "activate", NULL);
+#line 3710 "Page.c"
 	}
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 367 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3594 "Page.c"
+#line 3714 "Page.c"
 }
 
 
 gboolean page_get_ctrl_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 373 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 374 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->ctrl_pressed;
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 374 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 374 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3609 "Page.c"
+#line 3729 "Page.c"
 }
 
 
 gboolean page_get_alt_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 378 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->alt_pressed;
-#line 360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 378 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 378 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3624 "Page.c"
+#line 3744 "Page.c"
 }
 
 
 gboolean page_get_shift_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 381 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 382 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->shift_pressed;
-#line 364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 382 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 382 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3639 "Page.c"
+#line 3759 "Page.c"
 }
 
 
 gboolean page_get_super_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 385 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 386 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->super_pressed;
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 386 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 386 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3654 "Page.c"
+#line 3774 "Page.c"
+}
+
+
+static GVariant* _variant_new16 (gboolean value) {
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 3781 "Page.c"
+}
+
+
+void page_set_action_active (Page* self, const gchar* name, gboolean active) {
+	GSimpleAction* action = NULL;
+	const gchar* _tmp0_ = NULL;
+	GAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (IS_PAGE (self));
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (name != NULL);
+#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = name;
+#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = page_get_action (self, _tmp0_);
+#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
+#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp2_ == NULL) {
+#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (_tmp1_);
+#line 3805 "Page.c"
+	}
+#line 390 "/home/jens/Source/shotwell/src/Page.vala"
+	action = _tmp2_;
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = action;
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp3_ != NULL) {
+#line 3813 "Page.c"
+		GSimpleAction* _tmp4_ = NULL;
+		gboolean _tmp5_ = FALSE;
+		GVariant* _tmp6_ = NULL;
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = action;
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = active;
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6_ = _variant_new16 (_tmp5_);
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+		g_simple_action_set_state (_tmp4_, _tmp6_);
+#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_variant_unref0 (_tmp6_);
+#line 3827 "Page.c"
+	}
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (action);
+#line 3831 "Page.c"
 }
 
 
@@ -3680,125 +3857,125 @@ static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, g
 	GdkModifierType _tmp14_ = 0;
 	GdkModifierType _tmp15_ = 0;
 	GdkModifierType _tmp16_ = 0;
-#line 371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 396 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 397 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 397 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 397 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 397 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == NULL;
-#line 372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 397 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 397 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 398 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_ctrl = FALSE;
-#line 374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_alt = FALSE;
-#line 375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 400 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_shift = FALSE;
-#line 376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 401 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_super = FALSE;
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 		if (ctrl) {
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 			*ctrl = _vala_ctrl;
-#line 3712 "Page.c"
+#line 3889 "Page.c"
 		}
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 		if (alt) {
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 			*alt = _vala_alt;
-#line 3718 "Page.c"
+#line 3895 "Page.c"
 		}
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 		if (shift) {
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 			*shift = _vala_shift;
-#line 3724 "Page.c"
+#line 3901 "Page.c"
 		}
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 		if (super) {
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 			*super = _vala_super;
-#line 3730 "Page.c"
+#line 3907 "Page.c"
 		}
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3734 "Page.c"
+#line 3911 "Page.c"
 	}
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 408 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 408 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 408 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 408 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = gdk_display_get_default ();
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 408 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gdk_display_get_device_manager (_tmp7_);
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 408 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = gdk_device_manager_get_client_pointer (_tmp8_);
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 408 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_window_get_device_position (_tmp6_, _tmp9_, &_tmp10_, &_tmp11_, &_tmp12_);
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 408 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp10_;
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 408 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp11_;
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 408 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp12_;
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 408 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp5_);
-#line 386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = mask;
-#line 386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_ctrl = (_tmp13_ & GDK_CONTROL_MASK) != 0;
-#line 387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = mask;
-#line 387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_alt = (_tmp14_ & GDK_MOD1_MASK) != 0;
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = mask;
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_shift = (_tmp15_ & GDK_SHIFT_MASK) != 0;
-#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 414 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = mask;
-#line 389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 414 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_super = (_tmp16_ & GDK_MOD4_MASK) != 0;
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 416 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 416 "/home/jens/Source/shotwell/src/Page.vala"
 	if (ctrl) {
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 416 "/home/jens/Source/shotwell/src/Page.vala"
 		*ctrl = _vala_ctrl;
-#line 3780 "Page.c"
+#line 3957 "Page.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 416 "/home/jens/Source/shotwell/src/Page.vala"
 	if (alt) {
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 416 "/home/jens/Source/shotwell/src/Page.vala"
 		*alt = _vala_alt;
-#line 3786 "Page.c"
+#line 3963 "Page.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 416 "/home/jens/Source/shotwell/src/Page.vala"
 	if (shift) {
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 416 "/home/jens/Source/shotwell/src/Page.vala"
 		*shift = _vala_shift;
-#line 3792 "Page.c"
+#line 3969 "Page.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 416 "/home/jens/Source/shotwell/src/Page.vala"
 	if (super) {
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 416 "/home/jens/Source/shotwell/src/Page.vala"
 		*super = _vala_super;
-#line 3798 "Page.c"
+#line 3975 "Page.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 416 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3802 "Page.c"
+#line 3979 "Page.c"
 }
 
 
@@ -3824,229 +4001,229 @@ static void page_update_modifiers (Page* self) {
 	gboolean _tmp30_ = FALSE;
 	gboolean _tmp31_ = FALSE;
 	gboolean _tmp32_ = FALSE;
-#line 394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 419 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp4_) {
-#line 399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 3844 "Page.c"
+#line 4021 "Page.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 427 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->ctrl_pressed;
-#line 402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 427 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 3850 "Page.c"
+#line 4027 "Page.c"
 		gboolean _tmp7_ = FALSE;
-#line 402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 427 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ctrl_currently_pressed;
-#line 402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 427 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = !_tmp7_;
-#line 3856 "Page.c"
+#line 4033 "Page.c"
 	} else {
-#line 402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 427 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 3860 "Page.c"
+#line 4037 "Page.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 427 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 428 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_ctrl_released (self, NULL);
-#line 3866 "Page.c"
+#line 4043 "Page.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->ctrl_pressed;
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp9_) {
-#line 3874 "Page.c"
+#line 4051 "Page.c"
 			gboolean _tmp10_ = FALSE;
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = ctrl_currently_pressed;
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp10_;
-#line 3880 "Page.c"
+#line 4057 "Page.c"
 		} else {
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = FALSE;
-#line 3884 "Page.c"
+#line 4061 "Page.c"
 		}
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp8_) {
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 430 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_ctrl_pressed (self, NULL);
-#line 3890 "Page.c"
+#line 4067 "Page.c"
 		}
 	}
-#line 407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 432 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->alt_pressed;
-#line 407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 432 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_) {
-#line 3897 "Page.c"
+#line 4074 "Page.c"
 		gboolean _tmp13_ = FALSE;
-#line 407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 432 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = alt_currently_pressed;
-#line 407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 432 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = !_tmp13_;
-#line 3903 "Page.c"
+#line 4080 "Page.c"
 	} else {
-#line 407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 432 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = FALSE;
-#line 3907 "Page.c"
+#line 4084 "Page.c"
 	}
-#line 407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 432 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 433 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_alt_released (self, NULL);
-#line 3913 "Page.c"
+#line 4090 "Page.c"
 	} else {
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_ = FALSE;
-#line 409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = self->priv->alt_pressed;
-#line 409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp15_) {
-#line 3921 "Page.c"
+#line 4098 "Page.c"
 			gboolean _tmp16_ = FALSE;
-#line 409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = alt_currently_pressed;
-#line 409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = _tmp16_;
-#line 3927 "Page.c"
+#line 4104 "Page.c"
 		} else {
-#line 409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = FALSE;
-#line 3931 "Page.c"
+#line 4108 "Page.c"
 		}
-#line 409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp14_) {
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 435 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_alt_pressed (self, NULL);
-#line 3937 "Page.c"
+#line 4114 "Page.c"
 		}
 	}
-#line 412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->shift_pressed;
-#line 412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 3944 "Page.c"
+#line 4121 "Page.c"
 		gboolean _tmp19_ = FALSE;
-#line 412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = shift_currently_pressed;
-#line 412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = !_tmp19_;
-#line 3950 "Page.c"
+#line 4127 "Page.c"
 	} else {
-#line 412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = FALSE;
-#line 3954 "Page.c"
+#line 4131 "Page.c"
 	}
-#line 412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_) {
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 438 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_shift_released (self, NULL);
-#line 3960 "Page.c"
+#line 4137 "Page.c"
 	} else {
 		gboolean _tmp20_ = FALSE;
 		gboolean _tmp21_ = FALSE;
-#line 414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = self->priv->shift_pressed;
-#line 414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp21_) {
-#line 3968 "Page.c"
+#line 4145 "Page.c"
 			gboolean _tmp22_ = FALSE;
-#line 414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = shift_currently_pressed;
-#line 414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = _tmp22_;
-#line 3974 "Page.c"
+#line 4151 "Page.c"
 		} else {
-#line 414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = FALSE;
-#line 3978 "Page.c"
+#line 4155 "Page.c"
 		}
-#line 414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 439 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp20_) {
-#line 415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 440 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_shift_pressed (self, NULL);
-#line 3984 "Page.c"
+#line 4161 "Page.c"
 		}
 	}
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 442 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = self->priv->super_pressed;
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 442 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp24_) {
-#line 3991 "Page.c"
+#line 4168 "Page.c"
 		gboolean _tmp25_ = FALSE;
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 442 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = super_currently_pressed;
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 442 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = !_tmp25_;
-#line 3997 "Page.c"
+#line 4174 "Page.c"
 	} else {
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 442 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = FALSE;
-#line 4001 "Page.c"
+#line 4178 "Page.c"
 	}
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 442 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp23_) {
-#line 418 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_super_released (self, NULL);
-#line 4007 "Page.c"
+#line 4184 "Page.c"
 	} else {
 		gboolean _tmp26_ = FALSE;
 		gboolean _tmp27_ = FALSE;
-#line 419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = self->priv->super_pressed;
-#line 419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp27_) {
-#line 4015 "Page.c"
+#line 4192 "Page.c"
 			gboolean _tmp28_ = FALSE;
-#line 419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = super_currently_pressed;
-#line 419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = _tmp28_;
-#line 4021 "Page.c"
+#line 4198 "Page.c"
 		} else {
-#line 419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = FALSE;
-#line 4025 "Page.c"
+#line 4202 "Page.c"
 		}
-#line 419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 444 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp26_) {
-#line 420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 445 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_super_pressed (self, NULL);
-#line 4031 "Page.c"
+#line 4208 "Page.c"
 		}
 	}
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 447 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = ctrl_currently_pressed;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 447 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->ctrl_pressed = _tmp29_;
-#line 423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = alt_currently_pressed;
-#line 423 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->alt_pressed = _tmp30_;
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 449 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = shift_currently_pressed;
-#line 424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 449 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->shift_pressed = _tmp31_;
-#line 425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp32_ = super_currently_pressed;
-#line 425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->super_pressed = _tmp32_;
-#line 4050 "Page.c"
+#line 4227 "Page.c"
 }
 
 
@@ -4056,223 +4233,180 @@ PageWindow* page_get_page_window (Page* self) {
 	GtkContainer* _tmp0_ = NULL;
 	GtkContainer* _tmp1_ = NULL;
 	GtkWidget* _tmp2_ = NULL;
-#line 428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 454 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 454 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 454 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 454 "/home/jens/Source/shotwell/src/Page.vala"
 	p = _tmp2_;
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 	while (TRUE) {
-#line 4072 "Page.c"
+#line 4249 "Page.c"
 		GtkWidget* _tmp3_ = NULL;
 		GtkWidget* _tmp4_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
 		GtkContainer* _tmp8_ = NULL;
 		GtkContainer* _tmp9_ = NULL;
 		GtkWidget* _tmp10_ = NULL;
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = p;
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!(_tmp3_ != NULL)) {
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 4085 "Page.c"
+#line 4262 "Page.c"
 		}
-#line 431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = p;
-#line 431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PAGE_WINDOW)) {
-#line 4091 "Page.c"
+#line 4268 "Page.c"
 			GtkWidget* _tmp5_ = NULL;
 			PageWindow* _tmp6_ = NULL;
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 457 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = p;
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 457 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow));
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 457 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp6_;
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 457 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (p);
-#line 432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 457 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 4104 "Page.c"
+#line 4281 "Page.c"
 		}
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = p;
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gtk_widget_get_parent (_tmp7_);
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (p);
-#line 434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 		p = _tmp10_;
-#line 4118 "Page.c"
+#line 4295 "Page.c"
 	}
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 462 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 462 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (p);
-#line 437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 462 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4126 "Page.c"
+#line 4303 "Page.c"
 }
 
 
 CommandManager* page_get_command_manager (Page* self) {
 	CommandManager* result = NULL;
 	CommandManager* _tmp0_ = NULL;
-#line 440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 466 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 466 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 466 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4141 "Page.c"
+#line 4318 "Page.c"
 }
 
 
-static void page_init_ui (Page* self) {
-	GtkActionGroup* _tmp0_ = NULL;
-	GtkActionEntry* action_entries = NULL;
-	gint _tmp1_ = 0;
-	GtkActionEntry* _tmp2_ = NULL;
-	gint action_entries_length1 = 0;
-	gint _action_entries_size_ = 0;
-	GtkActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkToggleActionEntry* toggle_entries = NULL;
-	gint _tmp6_ = 0;
-	GtkToggleActionEntry* _tmp7_ = NULL;
-	gint toggle_entries_length1 = 0;
-	gint _toggle_entries_size_ = 0;
-	GtkToggleActionEntry* _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	GtkActionGroup* _tmp11_ = NULL;
-	AppWindow* _tmp12_ = NULL;
-	AppWindow* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	GtkActionGroup** _tmp15_ = NULL;
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+static void page_real_add_actions (Page* self) {
+}
+
+
+void page_add_actions (Page* self) {
+#line 469 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 445 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = gtk_action_group_new ("PageActionGroup");
-#line 445 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (self->priv->action_group);
-#line 445 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->action_group = _tmp0_;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = page_init_collect_action_entries (self, &_tmp1_);
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
-	action_entries = _tmp2_;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
-	action_entries_length1 = _tmp1_;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
-	_action_entries_size_ = action_entries_length1;
-#line 449 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = action_entries;
-#line 449 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3__length1 = action_entries_length1;
-#line 449 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp3__length1 > 0) {
-#line 4188 "Page.c"
-		GtkActionGroup* _tmp4_ = NULL;
-		GtkActionEntry* _tmp5_ = NULL;
-		gint _tmp5__length1 = 0;
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = self->priv->action_group;
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp5_ = action_entries;
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp5__length1 = action_entries_length1;
-#line 450 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_action_group_add_actions (_tmp4_, _tmp5_, _tmp5__length1, self);
-#line 4200 "Page.c"
-	}
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp7_ = page_init_collect_toggle_action_entries (self, &_tmp6_);
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
-	toggle_entries = _tmp7_;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
-	toggle_entries_length1 = _tmp6_;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
-	_toggle_entries_size_ = toggle_entries_length1;
-#line 454 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp8_ = toggle_entries;
-#line 454 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp8__length1 = toggle_entries_length1;
-#line 454 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp8__length1 > 0) {
-#line 4216 "Page.c"
-		GtkActionGroup* _tmp9_ = NULL;
-		GtkToggleActionEntry* _tmp10_ = NULL;
-		gint _tmp10__length1 = 0;
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp9_ = self->priv->action_group;
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp10_ = toggle_entries;
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp10__length1 = toggle_entries_length1;
-#line 455 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_action_group_add_toggle_actions (_tmp9_, _tmp10_, _tmp10__length1, self);
-#line 4228 "Page.c"
-	}
-#line 460 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp11_ = self->priv->action_group;
-#line 460 "/home/jens/Source/shotwell/src/Page.vala"
-	page_register_radio_actions (self, _tmp11_);
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp12_ = app_window_get_instance ();
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp13_ = _tmp12_;
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp15_ = app_window_get_common_action_groups (_tmp13_, &_tmp14_);
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->common_action_groups = (_vala_array_free (self->priv->common_action_groups, self->priv->common_action_groups_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->common_action_groups = _tmp15_;
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->common_action_groups_length1 = _tmp14_;
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->_common_action_groups_size_ = self->priv->common_action_groups_length1;
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (_tmp13_);
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
-	toggle_entries = (g_free (toggle_entries), NULL);
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
-	action_entries = (g_free (action_entries), NULL);
-#line 4254 "Page.c"
+#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+	PAGE_GET_CLASS (self)->add_actions (self);
+#line 4331 "Page.c"
 }
 
 
-static gpointer _injection_group_ref0 (gpointer self) {
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
-	return self ? injection_group_ref (self) : NULL;
-#line 4261 "Page.c"
+static gboolean _variant_get17 (GVariant* value) {
+#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+	return g_variant_get_boolean (value);
+#line 4338 "Page.c"
 }
 
 
-static void _vala_array_add249 (guint** array, int* length, int* size, guint value) {
-#line 485 "/home/jens/Source/shotwell/src/Page.vala"
-	if ((*length) == (*size)) {
-#line 485 "/home/jens/Source/shotwell/src/Page.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 485 "/home/jens/Source/shotwell/src/Page.vala"
-		*array = g_renew (guint, *array, *size);
-#line 4272 "Page.c"
-	}
-#line 485 "/home/jens/Source/shotwell/src/Page.vala"
-	(*array)[(*length)++] = value;
-#line 4276 "Page.c"
+static GVariant* _variant_new18 (gboolean value) {
+#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 4345 "Page.c"
+}
+
+
+void page_on_action_toggle (Page* self, GAction* action, GVariant* value) {
+	GVariant* new_state = NULL;
+	GAction* _tmp0_ = NULL;
+	GVariant* _tmp1_ = NULL;
+	GVariant* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	GVariant* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+	GAction* _tmp6_ = NULL;
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (IS_PAGE (self));
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (G_IS_ACTION (action));
+#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = action;
+#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = g_action_get_state (_tmp0_);
+#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = _tmp1_;
+#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = _variant_get17 (_tmp2_);
+#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp4_ = _variant_new18 (!_tmp3_);
+#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp5_ = _tmp4_;
+#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_variant_unref0 (_tmp2_);
+#line 472 "/home/jens/Source/shotwell/src/Page.vala"
+	new_state = _tmp5_;
+#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp6_ = action;
+#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+	g_action_change_state (_tmp6_, new_state);
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_variant_unref0 (new_state);
+#line 4384 "Page.c"
+}
+
+
+void page_on_action_radio (Page* self, GAction* action, GVariant* value) {
+	GAction* _tmp0_ = NULL;
+	GVariant* _tmp1_ = NULL;
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (IS_PAGE (self));
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (G_IS_ACTION (action));
+#line 477 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = action;
+#line 477 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = value;
+#line 477 "/home/jens/Source/shotwell/src/Page.vala"
+	g_action_change_state (_tmp0_, _tmp1_);
+#line 4401 "Page.c"
+}
+
+
+static void page_init_ui (Page* self) {
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (IS_PAGE (self));
+#line 481 "/home/jens/Source/shotwell/src/Page.vala"
+	page_add_actions (self);
+#line 4410 "Page.c"
 }
 
 
@@ -4283,49 +4417,36 @@ static void page_add_ui (Page* self) {
 	GeeList* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
-	GtkUIManager* _tmp19_ = NULL;
-	GtkActionGroup* _tmp20_ = NULL;
-	InjectionGroup** injection_groups = NULL;
-	gint _tmp21_ = 0;
-	InjectionGroup** _tmp22_ = NULL;
-	gint injection_groups_length1 = 0;
-	gint _injection_groups_size_ = 0;
-	InjectionGroup** _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-	AppWindow* _tmp51_ = NULL;
-	AppWindow* _tmp52_ = NULL;
-	GtkUIManager* _tmp53_ = NULL;
-	GtkUIManager* _tmp54_ = NULL;
-#line 466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 484 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 486 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 486 "/home/jens/Source/shotwell/src/Page.vala"
 	ui_filenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = ui_filenames;
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_collect_ui_filenames (self, _tmp1_);
-#line 470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 488 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = ui_filenames;
-#line 470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 488 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 488 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 488 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == 0) {
-#line 4318 "Page.c"
+#line 4439 "Page.c"
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 489 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_page_name (self);
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 489 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
-		g_message ("Page.vala:471: No UI file specified for %s", _tmp6_);
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 489 "/home/jens/Source/shotwell/src/Page.vala"
+		g_message ("Page.vala:489: No UI file specified for %s", _tmp6_);
+#line 489 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp6_);
-#line 4329 "Page.c"
+#line 4450 "Page.c"
 	}
 	{
 		GeeList* _ui_filename_list = NULL;
@@ -4336,25 +4457,25 @@ static void page_add_ui (Page* self) {
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
 		gint _ui_filename_index = 0;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ui_filenames;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_list = _tmp8_;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _ui_filename_list;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_size = _tmp11_;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_index = -1;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 4358 "Page.c"
+#line 4479 "Page.c"
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
@@ -4363,365 +4484,90 @@ static void page_add_ui (Page* self) {
 			gint _tmp16_ = 0;
 			gpointer _tmp17_ = NULL;
 			const gchar* _tmp18_ = NULL;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _ui_filename_index;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 			_ui_filename_index = _tmp12_ + 1;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _ui_filename_index;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = _ui_filename_size;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp13_ < _tmp14_)) {
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 4379 "Page.c"
+#line 4500 "Page.c"
 			}
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _ui_filename_list;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = _ui_filename_index;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 			ui_filename = (gchar*) _tmp17_;
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 492 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ui_filename;
-#line 474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 492 "/home/jens/Source/shotwell/src/Page.vala"
 			page_init_load_ui (self, _tmp18_);
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (ui_filename);
-#line 4395 "Page.c"
+#line 4516 "Page.c"
 		}
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_ui_filename_list);
-#line 4399 "Page.c"
-	}
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp19_ = self->ui;
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp20_ = self->priv->action_group;
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
-	gtk_ui_manager_insert_action_group (_tmp19_, _tmp20_, 0);
-#line 479 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp22_ = page_init_collect_injection_groups (self, &_tmp21_);
-#line 479 "/home/jens/Source/shotwell/src/Page.vala"
-	injection_groups = _tmp22_;
-#line 479 "/home/jens/Source/shotwell/src/Page.vala"
-	injection_groups_length1 = _tmp21_;
-#line 479 "/home/jens/Source/shotwell/src/Page.vala"
-	_injection_groups_size_ = injection_groups_length1;
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp23_ = injection_groups;
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp23__length1 = injection_groups_length1;
-#line 4419 "Page.c"
-	{
-		InjectionGroup** group_collection = NULL;
-		gint group_collection_length1 = 0;
-		gint _group_collection_size_ = 0;
-		gint group_it = 0;
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
-		group_collection = _tmp23_;
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
-		group_collection_length1 = _tmp23__length1;
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
-		for (group_it = 0; group_it < _tmp23__length1; group_it = group_it + 1) {
-#line 4431 "Page.c"
-			InjectionGroup* _tmp24_ = NULL;
-			InjectionGroup* group = NULL;
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
-			_tmp24_ = _injection_group_ref0 (group_collection[group_it]);
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
-			group = _tmp24_;
-#line 4438 "Page.c"
-			{
-				{
-					GeeList* _element_list = NULL;
-					InjectionGroup* _tmp25_ = NULL;
-					GeeList* _tmp26_ = NULL;
-					gint _element_size = 0;
-					GeeList* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-					gint _element_index = 0;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-					_tmp25_ = group;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-					_tmp26_ = injection_group_get_elements (_tmp25_);
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-					_element_list = _tmp26_;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-					_tmp27_ = _element_list;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-					_tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-					_tmp29_ = _tmp28_;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-					_element_size = _tmp29_;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-					_element_index = -1;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-					while (TRUE) {
-#line 4467 "Page.c"
-						gint _tmp30_ = 0;
-						gint _tmp31_ = 0;
-						gint _tmp32_ = 0;
-						InjectionGroupElement* element = NULL;
-						GeeList* _tmp33_ = NULL;
-						gint _tmp34_ = 0;
-						gpointer _tmp35_ = NULL;
-						guint merge_id = 0U;
-						GtkUIManager* _tmp36_ = NULL;
-						guint _tmp37_ = 0U;
-						GtkUIManager* _tmp38_ = NULL;
-						guint _tmp39_ = 0U;
-						InjectionGroup* _tmp40_ = NULL;
-						gchar* _tmp41_ = NULL;
-						gchar* _tmp42_ = NULL;
-						InjectionGroupElement* _tmp43_ = NULL;
-						const gchar* _tmp44_ = NULL;
-						InjectionGroupElement* _tmp45_ = NULL;
-						const gchar* _tmp46_ = NULL;
-						InjectionGroupElement* _tmp47_ = NULL;
-						GtkUIManagerItemType _tmp48_ = 0;
-						guint* _tmp49_ = NULL;
-						gint _tmp49__length1 = 0;
-						guint _tmp50_ = 0U;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp30_ = _element_index;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-						_element_index = _tmp30_ + 1;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp31_ = _element_index;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp32_ = _element_size;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-						if (!(_tmp31_ < _tmp32_)) {
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-							break;
-#line 4504 "Page.c"
-						}
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp33_ = _element_list;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp34_ = _element_index;
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp35_ = gee_list_get (_tmp33_, _tmp34_);
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-						element = (InjectionGroupElement*) _tmp35_;
-#line 482 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp36_ = self->ui;
-#line 482 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp37_ = gtk_ui_manager_new_merge_id (_tmp36_);
-#line 482 "/home/jens/Source/shotwell/src/Page.vala"
-						merge_id = _tmp37_;
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp38_ = self->ui;
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp39_ = merge_id;
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp40_ = group;
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp41_ = injection_group_get_path (_tmp40_);
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp42_ = _tmp41_;
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp43_ = element;
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp44_ = _tmp43_->name;
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp45_ = element;
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp46_ = _tmp45_->action;
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp47_ = element;
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp48_ = _tmp47_->kind;
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						gtk_ui_manager_add_ui (_tmp38_, _tmp39_, _tmp42_, _tmp44_, _tmp46_, _tmp48_, FALSE);
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
-						_g_free0 (_tmp42_);
-#line 485 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp49_ = self->priv->merge_ids;
-#line 485 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp49__length1 = self->priv->merge_ids_length1;
-#line 485 "/home/jens/Source/shotwell/src/Page.vala"
-						_tmp50_ = merge_id;
-#line 485 "/home/jens/Source/shotwell/src/Page.vala"
-						_vala_array_add249 (&self->priv->merge_ids, &self->priv->merge_ids_length1, &self->priv->_merge_ids_size_, _tmp50_);
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-						_injection_group_element_unref0 (element);
-#line 4556 "Page.c"
-					}
-#line 481 "/home/jens/Source/shotwell/src/Page.vala"
-					_g_object_unref0 (_element_list);
-#line 4560 "Page.c"
-				}
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
-				_injection_group_unref0 (group);
-#line 4564 "Page.c"
-			}
-		}
+#line 4520 "Page.c"
 	}
-#line 489 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp51_ = app_window_get_instance ();
-#line 489 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp52_ = _tmp51_;
-#line 489 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp53_ = self->ui;
-#line 489 "/home/jens/Source/shotwell/src/Page.vala"
-	app_window_replace_common_placeholders (_tmp52_, _tmp53_);
-#line 489 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (_tmp52_);
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp54_ = self->ui;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
-	gtk_ui_manager_ensure_update (_tmp54_);
-#line 466 "/home/jens/Source/shotwell/src/Page.vala"
-	injection_groups = (_vala_array_free (injection_groups, injection_groups_length1, (GDestroyNotify) injection_group_unref), NULL);
-#line 466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 484 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (ui_filenames);
-#line 4586 "Page.c"
-}
-
-
-static void page_remove_ui (Page* self) {
-	GtkUIManager* _tmp8_ = NULL;
-	GtkActionGroup* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	GtkUIManager* _tmp11_ = NULL;
-#line 494 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (IS_PAGE (self));
-#line 4597 "Page.c"
-	{
-		gint i = 0;
-		guint* _tmp0_ = NULL;
-		gint _tmp0__length1 = 0;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp0_ = self->priv->merge_ids;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp0__length1 = self->priv->merge_ids_length1;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
-		i = _tmp0__length1 - 1;
-#line 4608 "Page.c"
-		{
-			gboolean _tmp1_ = FALSE;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
-			_tmp1_ = TRUE;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
-			while (TRUE) {
-#line 4615 "Page.c"
-				gint _tmp3_ = 0;
-				GtkUIManager* _tmp4_ = NULL;
-				guint* _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gint _tmp6_ = 0;
-				guint _tmp7_ = 0U;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
-				if (!_tmp1_) {
-#line 4624 "Page.c"
-					gint _tmp2_ = 0;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
-					_tmp2_ = i;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
-					i = _tmp2_ - 1;
-#line 4630 "Page.c"
-				}
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp1_ = FALSE;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp3_ = i;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
-				if (!(_tmp3_ >= 0)) {
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
-					break;
-#line 4640 "Page.c"
-				}
-#line 496 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp4_ = self->ui;
-#line 496 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp5_ = self->priv->merge_ids;
-#line 496 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp5__length1 = self->priv->merge_ids_length1;
-#line 496 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp6_ = i;
-#line 496 "/home/jens/Source/shotwell/src/Page.vala"
-				_tmp7_ = _tmp5_[_tmp6_];
-#line 496 "/home/jens/Source/shotwell/src/Page.vala"
-				gtk_ui_manager_remove_ui (_tmp4_, _tmp7_);
-#line 4654 "Page.c"
-			}
-		}
-	}
-#line 497 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp8_ = self->ui;
-#line 497 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp9_ = self->priv->action_group;
-#line 497 "/home/jens/Source/shotwell/src/Page.vala"
-	gtk_ui_manager_remove_action_group (_tmp8_, _tmp9_);
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp10_ = 0;
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->merge_ids = g_renew (guint, self->priv->merge_ids, 0);
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
-	(_tmp10_ > self->priv->merge_ids_length1) ? memset (self->priv->merge_ids + self->priv->merge_ids_length1, 0, sizeof (guint) * (_tmp10_ - self->priv->merge_ids_length1)) : NULL;
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->merge_ids_length1 = _tmp10_;
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->_merge_ids_size_ = _tmp10_;
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp11_ = self->ui;
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
-	gtk_ui_manager_ensure_update (_tmp11_);
-#line 4678 "Page.c"
+#line 4524 "Page.c"
 }
 
 
 void page_init_toolbar (Page* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 497 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 498 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 498 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 498 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->toolbar_path);
-#line 504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 498 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->toolbar_path = _tmp1_;
-#line 4697 "Page.c"
+#line 4543 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 513 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4704 "Page.c"
+#line 4550 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4711 "Page.c"
+#line 4557 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4718 "Page.c"
+#line 4564 "Page.c"
 }
 
 
 static void _page_on_update_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4725 "Page.c"
+#line 4571 "Page.c"
 }
 
 
@@ -4749,87 +4595,87 @@ static void page_attach_view_signals (Page* self) {
 	ViewCollection* _tmp18_ = NULL;
 	ViewCollection* _tmp19_ = NULL;
 	ViewCollection* _tmp20_ = NULL;
-#line 508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 503 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->are_actions_attached;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 503 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 504 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4761 "Page.c"
+#line 4607 "Page.c"
 	}
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 507 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 507 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 507 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 507 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 507 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 507 "/home/jens/Source/shotwell/src/Page.vala"
 	selected_count = _tmp4_;
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 508 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (self);
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 508 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 508 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 508 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 508 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 508 "/home/jens/Source/shotwell/src/Page.vala"
 	count = _tmp8_;
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = selected_count;
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = count;
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_actions (self, _tmp9_, _tmp10_);
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = selected_count;
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = count;
-#line 516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, _tmp11_, _tmp12_);
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 513 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = page_get_view (self);
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 513 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = _tmp13_;
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 513 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp14_, "items-state-changed", (GCallback) _page_on_update_actions_view_collection_items_state_changed, self, 0);
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 513 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (self);
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp16_, "selection-group-altered", (GCallback) _page_on_update_actions_view_collection_selection_group_altered, self, 0);
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 514 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (self);
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp18_, "items-visibility-changed", (GCallback) _page_on_update_actions_view_collection_items_visibility_changed, self, 0);
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (self);
-#line 522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _page_on_update_actions_data_collection_contents_altered, self, 0);
-#line 522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 518 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = TRUE;
-#line 4833 "Page.c"
+#line 4679 "Page.c"
 }
 
 
@@ -4847,109 +4693,109 @@ static void page_detach_view_signals (Page* self) {
 	ViewCollection* _tmp10_ = NULL;
 	ViewCollection* _tmp11_ = NULL;
 	guint _tmp12_ = 0U;
-#line 528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 522 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 523 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->are_actions_attached;
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 523 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 524 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4859 "Page.c"
+#line 4705 "Page.c"
 	}
-#line 532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _page_on_update_actions_view_collection_items_state_changed, self);
-#line 532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (self);
-#line 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _page_on_update_actions_view_collection_selection_group_altered, self);
-#line 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_view (self);
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp9_, NULL, FALSE);
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _page_on_update_actions_view_collection_items_visibility_changed, self);
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = page_get_view (self);
-#line 535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_;
-#line 535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp12_, NULL, FALSE);
-#line 535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _page_on_update_actions_data_collection_contents_altered, self);
-#line 535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 529 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp11_);
-#line 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = FALSE;
-#line 4903 "Page.c"
+#line 4749 "Page.c"
 }
 
 
 static void _page_on_update_actions_on_idle_one_shot_callback (gpointer self) {
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions_on_idle ((Page*) self);
-#line 4910 "Page.c"
+#line 4756 "Page.c"
 }
 
 
 static void page_on_update_actions (Page* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp6_ = NULL;
-#line 540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 535 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->update_actions_scheduler;
-#line 541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 535 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 4923 "Page.c"
+#line 4769 "Page.c"
 		gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		OneShotScheduler* _tmp5_ = NULL;
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = page_get_page_name (self);
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp1_;
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = g_strdup_printf ("Update actions scheduler for %s", _tmp2_);
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_;
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = one_shot_scheduler_new (_tmp4_, _page_on_update_actions_on_idle_one_shot_callback, self);
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 		_one_shot_scheduler_unref0 (self->priv->update_actions_scheduler);
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->update_actions_scheduler = _tmp5_;
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp4_);
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp2_);
-#line 4947 "Page.c"
+#line 4793 "Page.c"
 	}
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 541 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->update_actions_scheduler;
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 541 "/home/jens/Source/shotwell/src/Page.vala"
 	one_shot_scheduler_at_priority_idle (_tmp6_, G_PRIORITY_LOW);
-#line 4953 "Page.c"
+#line 4799 "Page.c"
 }
 
 
@@ -4961,50 +4807,35 @@ static void page_on_update_actions_on_idle (Page* self) {
 	ViewCollection* _tmp4_ = NULL;
 	ViewCollection* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
-#line 550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 544 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4973 "Page.c"
+#line 4819 "Page.c"
 	}
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 548 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 548 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 548 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 548 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (self);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 548 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 548 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 548 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, _tmp3_, _tmp6_);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 548 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 554 "/home/jens/Source/shotwell/src/Page.vala"
+#line 548 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 4993 "Page.c"
-}
-
-
-static void _vala_array_add250 (guint** array, int* length, int* size, guint value) {
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-	if ((*length) == (*size)) {
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-		*array = g_renew (guint, *array, *size);
-#line 5004 "Page.c"
-	}
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-	(*array)[(*length)++] = value;
-#line 5008 "Page.c"
+#line 4839 "Page.c"
 }
 
 
@@ -5013,215 +4844,115 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 	const gchar* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 551 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 551 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ui_filename != NULL);
-#line 558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 552 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = ui_filename;
-#line 558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 552 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = resources_get_ui (_tmp0_);
-#line 558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 552 "/home/jens/Source/shotwell/src/Page.vala"
 	ui_file = _tmp1_;
-#line 5027 "Page.c"
+#line 4858 "Page.c"
 	{
-		guint _tmp2_ = 0U;
-		GtkUIManager* _tmp3_ = NULL;
+		GtkBuilder* _tmp2_ = NULL;
+		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		guint _tmp6_ = 0U;
-		guint _tmp7_ = 0U;
-		guint* _tmp8_ = NULL;
-		gint _tmp8__length1 = 0;
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = self->ui;
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = g_file_get_path (ui_file);
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp5_ = _tmp4_;
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp6_ = gtk_ui_manager_add_ui_from_file (_tmp3_, _tmp5_, &_inner_error_);
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp7_ = _tmp6_;
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_free0 (_tmp5_);
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp2_ = _tmp7_;
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp2_ = self->builder;
+#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp3_ = g_file_get_path (ui_file);
+#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = _tmp3_;
+#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+		gtk_builder_add_from_file (_tmp2_, _tmp4_, &_inner_error_);
+#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_free0 (_tmp4_);
+#line 555 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5053 "Page.c"
-			goto __catch254_g_error;
+#line 4875 "Page.c"
+			goto __catch251_g_error;
 		}
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp8_ = self->priv->merge_ids;
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp8__length1 = self->priv->merge_ids_length1;
-#line 561 "/home/jens/Source/shotwell/src/Page.vala"
-		_vala_array_add250 (&self->priv->merge_ids, &self->priv->merge_ids_length1, &self->priv->_merge_ids_size_, _tmp2_);
-#line 5062 "Page.c"
-	}
-	goto __finally254;
-	__catch254_g_error:
+	}
+	goto __finally251;
+	__catch251_g_error:
 	{
 		GError* err = NULL;
+		gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+		GError* _tmp7_ = NULL;
+		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
-		const gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		Application* _tmp15_ = NULL;
-		Application* _tmp16_ = NULL;
-#line 560 "/home/jens/Source/shotwell/src/Page.vala"
+		Application* _tmp11_ = NULL;
+		Application* _tmp12_ = NULL;
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 563 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp9_ = g_file_get_path (ui_file);
-#line 563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = g_file_get_path (ui_file);
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6_ = _tmp5_;
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp7_ = err;
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp8_ = _tmp7_->message;
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp9_ = g_strdup_printf ("Error loading UI file %s: %s", _tmp6_, _tmp8_);
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_;
-#line 563 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp11_ = err;
-#line 563 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp12_ = _tmp11_->message;
-#line 563 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp13_ = g_strdup_printf ("Error loading UI file %s: %s", _tmp10_, _tmp12_);
-#line 563 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp14_ = _tmp13_;
-#line 563 "/home/jens/Source/shotwell/src/Page.vala"
-		app_window_error_message (_tmp14_, NULL);
-#line 563 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_free0 (_tmp14_);
-#line 563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+		app_window_error_message (_tmp10_, NULL);
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp10_);
-#line 565 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp15_ = application_get_instance ();
-#line 565 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp16_ = _tmp15_;
-#line 565 "/home/jens/Source/shotwell/src/Page.vala"
-		application_panic (_tmp16_);
-#line 565 "/home/jens/Source/shotwell/src/Page.vala"
-		_application_unref0 (_tmp16_);
-#line 560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_free0 (_tmp6_);
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp11_ = application_get_instance ();
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp12_ = _tmp11_;
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+		application_panic (_tmp12_);
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+		_application_unref0 (_tmp12_);
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 5108 "Page.c"
+#line 4923 "Page.c"
 	}
-	__finally254:
-#line 560 "/home/jens/Source/shotwell/src/Page.vala"
+	__finally251:
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (ui_file);
-#line 560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5121 "Page.c"
+#line 4936 "Page.c"
 	}
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 551 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (ui_file);
-#line 5125 "Page.c"
+#line 4940 "Page.c"
 }
 
 
 static void page_real_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 5132 "Page.c"
+#line 4947 "Page.c"
 }
 
 
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->init_collect_ui_filenames (self, ui_filenames);
-#line 5141 "Page.c"
-}
-
-
-static GtkActionEntry* page_real_init_collect_action_entries (Page* self, int* result_length1) {
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* _tmp0_ = NULL;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-#line 577 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = g_new0 (GtkActionEntry, 0);
-#line 577 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = _tmp0_;
-#line 577 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1__length1 = 0;
-#line 577 "/home/jens/Source/shotwell/src/Page.vala"
-	if (result_length1) {
-#line 577 "/home/jens/Source/shotwell/src/Page.vala"
-		*result_length1 = _tmp1__length1;
-#line 5160 "Page.c"
-	}
-#line 577 "/home/jens/Source/shotwell/src/Page.vala"
-	result = _tmp1_;
-#line 577 "/home/jens/Source/shotwell/src/Page.vala"
-	return result;
-#line 5166 "Page.c"
-}
-
-
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1) {
-#line 576 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 576 "/home/jens/Source/shotwell/src/Page.vala"
-	return PAGE_GET_CLASS (self)->init_collect_action_entries (self, result_length1);
-#line 5175 "Page.c"
-}
-
-
-static GtkToggleActionEntry* page_real_init_collect_toggle_action_entries (Page* self, int* result_length1) {
-	GtkToggleActionEntry* result = NULL;
-	GtkToggleActionEntry* _tmp0_ = NULL;
-	GtkToggleActionEntry* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-#line 582 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = g_new0 (GtkToggleActionEntry, 0);
-#line 582 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = _tmp0_;
-#line 582 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1__length1 = 0;
-#line 582 "/home/jens/Source/shotwell/src/Page.vala"
-	if (result_length1) {
-#line 582 "/home/jens/Source/shotwell/src/Page.vala"
-		*result_length1 = _tmp1__length1;
-#line 5194 "Page.c"
-	}
-#line 582 "/home/jens/Source/shotwell/src/Page.vala"
-	result = _tmp1_;
-#line 582 "/home/jens/Source/shotwell/src/Page.vala"
-	return result;
-#line 5200 "Page.c"
-}
-
-
-GtkToggleActionEntry* page_init_collect_toggle_action_entries (Page* self, int* result_length1) {
-#line 581 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 581 "/home/jens/Source/shotwell/src/Page.vala"
-	return PAGE_GET_CLASS (self)->init_collect_toggle_action_entries (self, result_length1);
-#line 5209 "Page.c"
-}
-
-
-static void page_real_register_radio_actions (Page* self, GtkActionGroup* action_group) {
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
-#line 5216 "Page.c"
-}
-
-
-void page_register_radio_actions (Page* self, GtkActionGroup* action_group) {
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
-	g_return_if_fail (IS_PAGE (self));
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
-	PAGE_GET_CLASS (self)->register_radio_actions (self, action_group);
-#line 5225 "Page.c"
+#line 4956 "Page.c"
 }
 
 
@@ -5230,32 +4961,32 @@ static InjectionGroup** page_real_init_collect_injection_groups (Page* self, int
 	InjectionGroup** _tmp0_ = NULL;
 	InjectionGroup** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = g_new0 (InjectionGroup*, 0 + 1);
-#line 592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1__length1 = 0;
-#line 592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
 	if (result_length1) {
-#line 592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
 		*result_length1 = _tmp1__length1;
-#line 5244 "Page.c"
+#line 4975 "Page.c"
 	}
-#line 592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5250 "Page.c"
+#line 4981 "Page.c"
 }
 
 
 InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1) {
-#line 591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 571 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 571 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->init_collect_injection_groups (self, result_length1);
-#line 5259 "Page.c"
+#line 4990 "Page.c"
 }
 
 
@@ -5264,11 +4995,11 @@ static void page_real_init_actions (Page* self, gint selected_count, gint count)
 
 
 void page_init_actions (Page* self, gint selected_count, gint count) {
-#line 597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->init_actions (self, selected_count, count);
-#line 5272 "Page.c"
+#line 5003 "Page.c"
 }
 
 
@@ -5277,48 +5008,48 @@ static void page_real_update_actions (Page* self, gint selected_count, gint coun
 
 
 void page_update_actions (Page* self, gint selected_count, gint count) {
-#line 603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 583 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 583 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->update_actions (self, selected_count, count);
-#line 5285 "Page.c"
+#line 5016 "Page.c"
 }
 
 
 static void _page_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 598 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_begin ((Page*) self, context);
-#line 5292 "Page.c"
+#line 5023 "Page.c"
 }
 
 
 static void _page_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time_, gpointer self) {
-#line 619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 599 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_data_get ((Page*) self, context, selection_data, info, time_);
-#line 5299 "Page.c"
+#line 5030 "Page.c"
 }
 
 
 static void _page_on_drag_data_delete_gtk_widget_drag_data_delete (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 600 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_data_delete ((Page*) self, context);
-#line 5306 "Page.c"
+#line 5037 "Page.c"
 }
 
 
 static void _page_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 601 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_end ((Page*) self, context);
-#line 5313 "Page.c"
+#line 5044 "Page.c"
 }
 
 
 static gboolean _page_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, GdkDragContext* context, GtkDragResult _result_, gpointer self) {
 	gboolean result;
 	result = page_on_drag_failed ((Page*) self, context, _result_);
-#line 622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 602 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5322 "Page.c"
+#line 5053 "Page.c"
 }
 
 
@@ -5334,53 +5065,53 @@ void page_enable_drag_source (Page* self, GdkDragAction actions, GtkTargetEntry*
 	GtkWidget* _tmp7_ = NULL;
 	GtkWidget* _tmp8_ = NULL;
 	GtkWidget* _tmp9_ = NULL;
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 588 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 589 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 589 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 590 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5346 "Page.c"
+#line 5077 "Page.c"
 	}
-#line 612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source != null");
-#line 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 594 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 594 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = source_target_entries;
-#line 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 594 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3__length1 = source_target_entries_length1;
-#line 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 594 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = actions;
-#line 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 594 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_set (_tmp2_, GDK_BUTTON1_MASK, _tmp3_, _tmp3__length1, _tmp4_);
-#line 618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 598 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->event_source;
-#line 618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 598 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp5_, "drag-begin", (GCallback) _page_on_drag_begin_gtk_widget_drag_begin, self, 0);
-#line 619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 599 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->event_source;
-#line 619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 599 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp6_, "drag-data-get", (GCallback) _page_on_drag_data_get_gtk_widget_drag_data_get, self, 0);
-#line 620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 600 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->event_source;
-#line 620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 600 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp7_, "drag-data-delete", (GCallback) _page_on_drag_data_delete_gtk_widget_drag_data_delete, self, 0);
-#line 621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 601 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->event_source;
-#line 621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 601 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp8_, "drag-end", (GCallback) _page_on_drag_end_gtk_widget_drag_end, self, 0);
-#line 622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 602 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 602 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp9_, "drag-failed", (GCallback) _page_on_drag_failed_gtk_widget_drag_failed, self, 0);
-#line 624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 604 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = TRUE;
-#line 5384 "Page.c"
+#line 5115 "Page.c"
 }
 
 
@@ -5398,86 +5129,86 @@ void page_disable_drag_source (Page* self) {
 	GtkWidget* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
 	GtkWidget* _tmp12_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 607 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 608 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 608 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 609 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5410 "Page.c"
+#line 5141 "Page.c"
 	}
-#line 631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 611 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source != null");
-#line 633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 613 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 613 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp3_, NULL, FALSE);
-#line 633 "/home/jens/Source/shotwell/src/Page.vala"
+#line 613 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _page_on_drag_begin_gtk_widget_drag_begin, self);
-#line 634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp5_, NULL, FALSE);
-#line 634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _page_on_drag_data_get_gtk_widget_drag_data_get, self);
-#line 635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 615 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->event_source;
-#line 635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 615 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-data-delete", gtk_widget_get_type (), &_tmp7_, NULL, FALSE);
-#line 635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 615 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _page_on_drag_data_delete_gtk_widget_drag_data_delete, self);
-#line 636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 616 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->event_source;
-#line 636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 616 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp9_, NULL, FALSE);
-#line 636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 616 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _page_on_drag_end_gtk_widget_drag_end, self);
-#line 637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->event_source;
-#line 637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 617 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 617 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _page_on_drag_failed_gtk_widget_drag_failed, self);
-#line 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->event_source;
-#line 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_unset (_tmp12_);
-#line 640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 620 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = FALSE;
-#line 5452 "Page.c"
+#line 5183 "Page.c"
 }
 
 
 gboolean page_is_dnd_enabled (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 643 "/home/jens/Source/shotwell/src/Page.vala"
+#line 623 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 624 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 624 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 624 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5467 "Page.c"
+#line 5198 "Page.c"
 }
 
 
 static void page_on_drag_begin (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 627 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 627 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 628 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 628 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-begin", _tmp0_);
-#line 5481 "Page.c"
+#line 5212 "Page.c"
 }
 
 
@@ -5486,72 +5217,72 @@ static void page_on_drag_data_get (Page* self, GdkDragContext* context, GtkSelec
 	GtkSelectionData* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
-#line 651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 631 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 631 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 631 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = selection_data;
-#line 653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = info;
-#line 653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = time;
-#line 653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-data-get", _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 5506 "Page.c"
+#line 5237 "Page.c"
 }
 
 
 static void page_on_drag_data_delete (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 656 "/home/jens/Source/shotwell/src/Page.vala"
+#line 636 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 656 "/home/jens/Source/shotwell/src/Page.vala"
+#line 636 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 637 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-data-delete", _tmp0_);
-#line 5520 "Page.c"
+#line 5251 "Page.c"
 }
 
 
 static void page_on_drag_end (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 640 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 640 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 641 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 641 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-end", _tmp0_);
-#line 5534 "Page.c"
+#line 5265 "Page.c"
 }
 
 
 static gboolean page_real_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
 	gboolean result = FALSE;
-#line 668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 648 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 649 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 669 "/home/jens/Source/shotwell/src/Page.vala"
+#line 649 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5546 "Page.c"
+#line 5277 "Page.c"
 }
 
 
 gboolean page_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
-#line 668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 648 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 648 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->source_drag_failed (self, context, drag_result);
-#line 5555 "Page.c"
+#line 5286 "Page.c"
 }
 
 
@@ -5560,21 +5291,21 @@ static gboolean page_on_drag_failed (Page* self, GdkDragContext* context, GtkDra
 	GdkDragContext* _tmp0_ = NULL;
 	GtkDragResult _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 652 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 652 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = drag_result;
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_source_drag_failed (self, _tmp0_, _tmp1_);
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp2_;
-#line 673 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5578 "Page.c"
+#line 5309 "Page.c"
 }
 
 
@@ -5603,291 +5334,291 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie
 	GdkPoint _tmp20_ = {0};
 	gint _tmp21_ = 0;
 	gint _tmp22_ = 0;
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 660 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 661 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 661 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 662 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_x = 0;
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 663 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_y = 0;
-#line 684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 664 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_mask = 0;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 666 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 666 "/home/jens/Source/shotwell/src/Page.vala"
 		if (x) {
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 666 "/home/jens/Source/shotwell/src/Page.vala"
 			*x = _vala_x;
-#line 5625 "Page.c"
+#line 5356 "Page.c"
 		}
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 666 "/home/jens/Source/shotwell/src/Page.vala"
 		if (y) {
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 666 "/home/jens/Source/shotwell/src/Page.vala"
 			*y = _vala_y;
-#line 5631 "Page.c"
+#line 5362 "Page.c"
 		}
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 666 "/home/jens/Source/shotwell/src/Page.vala"
 		if (mask) {
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 666 "/home/jens/Source/shotwell/src/Page.vala"
 			*mask = _vala_mask;
-#line 5637 "Page.c"
+#line 5368 "Page.c"
 		}
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 666 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 5641 "Page.c"
+#line 5372 "Page.c"
 	}
-#line 689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (_tmp1_);
-#line 689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gdk_display_get_default ();
-#line 689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_display_get_device_manager (_tmp3_);
-#line 689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_device_manager_get_client_pointer (_tmp4_);
-#line 689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_window_get_device_position (_tmp2_, _tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_x = _tmp6_;
-#line 689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_y = _tmp7_;
-#line 689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_mask = _tmp8_;
-#line 692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->last_down;
-#line 692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_.x;
-#line 692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_ < 0) {
-#line 692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = TRUE;
-#line 5669 "Page.c"
+#line 5400 "Page.c"
 	} else {
 		GdkPoint _tmp12_ = {0};
 		gint _tmp13_ = 0;
-#line 692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->last_down;
-#line 692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_.y;
-#line 692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp13_ < 0;
-#line 5679 "Page.c"
+#line 5410 "Page.c"
 	}
-#line 692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_) {
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 		if (x) {
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 			*x = _vala_x;
-#line 5689 "Page.c"
+#line 5420 "Page.c"
 		}
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 		if (y) {
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 			*y = _vala_y;
-#line 5695 "Page.c"
+#line 5426 "Page.c"
 		}
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 		if (mask) {
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 			*mask = _vala_mask;
-#line 5701 "Page.c"
+#line 5432 "Page.c"
 		}
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 5705 "Page.c"
+#line 5436 "Page.c"
 	}
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 679 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = _vala_x;
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 679 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->last_down;
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 679 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_.x;
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 679 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = abs (_tmp14_ - _tmp16_);
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 679 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_ >= 0x7FFF) {
-#line 5717 "Page.c"
+#line 5448 "Page.c"
 		gint _tmp18_ = 0;
-#line 700 "/home/jens/Source/shotwell/src/Page.vala"
+#line 680 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _vala_x;
-#line 700 "/home/jens/Source/shotwell/src/Page.vala"
+#line 680 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_x = _tmp18_ + 0xFFFF;
-#line 5723 "Page.c"
+#line 5454 "Page.c"
 	}
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _vala_y;
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->last_down;
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = _tmp20_.y;
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = abs (_tmp19_ - _tmp21_);
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp22_ >= 0x7FFF) {
-#line 5735 "Page.c"
+#line 5466 "Page.c"
 		gint _tmp23_ = 0;
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _vala_y;
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_y = _tmp23_ + 0xFFFF;
-#line 5741 "Page.c"
+#line 5472 "Page.c"
 	}
-#line 705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 685 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 685 "/home/jens/Source/shotwell/src/Page.vala"
 	if (x) {
-#line 705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 685 "/home/jens/Source/shotwell/src/Page.vala"
 		*x = _vala_x;
-#line 5749 "Page.c"
+#line 5480 "Page.c"
 	}
-#line 705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 685 "/home/jens/Source/shotwell/src/Page.vala"
 	if (y) {
-#line 705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 685 "/home/jens/Source/shotwell/src/Page.vala"
 		*y = _vala_y;
-#line 5755 "Page.c"
+#line 5486 "Page.c"
 	}
-#line 705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 685 "/home/jens/Source/shotwell/src/Page.vala"
 	if (mask) {
-#line 705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 685 "/home/jens/Source/shotwell/src/Page.vala"
 		*mask = _vala_mask;
-#line 5761 "Page.c"
+#line 5492 "Page.c"
 	}
-#line 705 "/home/jens/Source/shotwell/src/Page.vala"
+#line 685 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5765 "Page.c"
+#line 5496 "Page.c"
 }
 
 
 static gboolean page_real_on_left_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 688 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5777 "Page.c"
+#line 5508 "Page.c"
 }
 
 
 gboolean page_on_left_click (Page* self, GdkEventButton* event) {
-#line 708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 688 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 688 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_left_click (self, event);
-#line 5786 "Page.c"
+#line 5517 "Page.c"
 }
 
 
 static gboolean page_real_on_middle_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 712 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5798 "Page.c"
+#line 5529 "Page.c"
 }
 
 
 gboolean page_on_middle_click (Page* self, GdkEventButton* event) {
-#line 712 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 712 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_middle_click (self, event);
-#line 5807 "Page.c"
+#line 5538 "Page.c"
 }
 
 
 static gboolean page_real_on_right_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 716 "/home/jens/Source/shotwell/src/Page.vala"
+#line 696 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 697 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 697 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5819 "Page.c"
+#line 5550 "Page.c"
 }
 
 
 gboolean page_on_right_click (Page* self, GdkEventButton* event) {
-#line 716 "/home/jens/Source/shotwell/src/Page.vala"
+#line 696 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 716 "/home/jens/Source/shotwell/src/Page.vala"
+#line 696 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_right_click (self, event);
-#line 5828 "Page.c"
+#line 5559 "Page.c"
 }
 
 
 static gboolean page_real_on_left_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 700 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 701 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 721 "/home/jens/Source/shotwell/src/Page.vala"
+#line 701 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5840 "Page.c"
+#line 5571 "Page.c"
 }
 
 
 gboolean page_on_left_released (Page* self, GdkEventButton* event) {
-#line 720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 700 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 700 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_left_released (self, event);
-#line 5849 "Page.c"
+#line 5580 "Page.c"
 }
 
 
 static gboolean page_real_on_middle_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 704 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5861 "Page.c"
+#line 5592 "Page.c"
 }
 
 
 gboolean page_on_middle_released (Page* self, GdkEventButton* event) {
-#line 724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 704 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 704 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_middle_released (self, event);
-#line 5870 "Page.c"
+#line 5601 "Page.c"
 }
 
 
 static gboolean page_real_on_right_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 728 "/home/jens/Source/shotwell/src/Page.vala"
+#line 708 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 709 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 709 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5882 "Page.c"
+#line 5613 "Page.c"
 }
 
 
 gboolean page_on_right_released (Page* self, GdkEventButton* event) {
-#line 728 "/home/jens/Source/shotwell/src/Page.vala"
+#line 708 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 728 "/home/jens/Source/shotwell/src/Page.vala"
+#line 708 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_right_released (self, event);
-#line 5891 "Page.c"
+#line 5622 "Page.c"
 }
 
 
@@ -5895,19 +5626,19 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 712 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 732 "/home/jens/Source/shotwell/src/Page.vala"
+#line 712 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->button;
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 		case 1:
-#line 5911 "Page.c"
+#line 5642 "Page.c"
 		{
 			GtkWidget* _tmp2_ = NULL;
 			GdkEventButton* _tmp4_ = NULL;
@@ -5916,79 +5647,79 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 			gdouble _tmp7_ = 0.0;
 			GdkEventButton* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 715 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = self->priv->event_source;
-#line 735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 715 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp2_ != NULL) {
-#line 5924 "Page.c"
+#line 5655 "Page.c"
 				GtkWidget* _tmp3_ = NULL;
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 716 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp3_ = self->priv->event_source;
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 716 "/home/jens/Source/shotwell/src/Page.vala"
 				gtk_widget_grab_focus (_tmp3_);
-#line 5930 "Page.c"
+#line 5661 "Page.c"
 			}
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 719 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 719 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp4_->x;
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 719 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down.x = (gint) _tmp5_;
-#line 740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 720 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
-#line 740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 720 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _tmp6_->y;
-#line 740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 720 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down.y = (gint) _tmp7_;
-#line 742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
-#line 742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = page_on_left_click (self, _tmp8_);
-#line 742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp9_;
-#line 742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 722 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5952 "Page.c"
+#line 5683 "Page.c"
 		}
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 		case 2:
-#line 5956 "Page.c"
+#line 5687 "Page.c"
 		{
 			GdkEventButton* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
-#line 745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 725 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = event;
-#line 745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 725 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = page_on_middle_click (self, _tmp10_);
-#line 745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 725 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp11_;
-#line 745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 725 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5968 "Page.c"
+#line 5699 "Page.c"
 		}
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 		case 3:
-#line 5972 "Page.c"
+#line 5703 "Page.c"
 		{
 			GdkEventButton* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
-#line 748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = event;
-#line 748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = page_on_right_click (self, _tmp12_);
-#line 748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp13_;
-#line 748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5984 "Page.c"
+#line 5715 "Page.c"
 		}
 		default:
 		{
-#line 751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 731 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 751 "/home/jens/Source/shotwell/src/Page.vala"
+#line 731 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5992 "Page.c"
+#line 5723 "Page.c"
 		}
 	}
 }
@@ -5998,78 +5729,78 @@ static gboolean page_on_button_released_internal (Page* self, GdkEventButton* ev
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 735 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 735 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->button;
-#line 756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 		case 1:
-#line 6014 "Page.c"
+#line 5745 "Page.c"
 		{
 			GdkPoint _tmp2_ = {0};
 			GdkEventButton* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.x = -1;
-#line 759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.y = -1;
-#line 759 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down = _tmp2_;
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 741 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = event;
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 741 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = page_on_left_released (self, _tmp3_);
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 741 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp4_;
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 741 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 6033 "Page.c"
+#line 5764 "Page.c"
 		}
-#line 756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 		case 2:
-#line 6037 "Page.c"
+#line 5768 "Page.c"
 		{
 			GdkEventButton* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 744 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = event;
-#line 764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 744 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = page_on_middle_released (self, _tmp5_);
-#line 764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 744 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp6_;
-#line 764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 744 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 6049 "Page.c"
+#line 5780 "Page.c"
 		}
-#line 756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 		case 3:
-#line 6053 "Page.c"
+#line 5784 "Page.c"
 		{
 			GdkEventButton* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
-#line 767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 747 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = event;
-#line 767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 747 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = page_on_right_released (self, _tmp7_);
-#line 767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 747 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp8_;
-#line 767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 747 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 6065 "Page.c"
+#line 5796 "Page.c"
 		}
 		default:
 		{
-#line 770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 750 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 750 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 6073 "Page.c"
+#line 5804 "Page.c"
 		}
 	}
 }
@@ -6077,195 +5808,195 @@ static gboolean page_on_button_released_internal (Page* self, GdkEventButton* ev
 
 static gboolean page_real_on_ctrl_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 755 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 775 "/home/jens/Source/shotwell/src/Page.vala"
+#line 755 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6085 "Page.c"
+#line 5816 "Page.c"
 }
 
 
 gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event) {
-#line 774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 754 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 754 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_ctrl_pressed (self, event);
-#line 6094 "Page.c"
+#line 5825 "Page.c"
 }
 
 
 static gboolean page_real_on_ctrl_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 759 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 759 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6104 "Page.c"
+#line 5835 "Page.c"
 }
 
 
 gboolean page_on_ctrl_released (Page* self, GdkEventKey* event) {
-#line 778 "/home/jens/Source/shotwell/src/Page.vala"
+#line 758 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 778 "/home/jens/Source/shotwell/src/Page.vala"
+#line 758 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_ctrl_released (self, event);
-#line 6113 "Page.c"
+#line 5844 "Page.c"
 }
 
 
 static gboolean page_real_on_alt_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 763 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 783 "/home/jens/Source/shotwell/src/Page.vala"
+#line 763 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6123 "Page.c"
+#line 5854 "Page.c"
 }
 
 
 gboolean page_on_alt_pressed (Page* self, GdkEventKey* event) {
-#line 782 "/home/jens/Source/shotwell/src/Page.vala"
+#line 762 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 782 "/home/jens/Source/shotwell/src/Page.vala"
+#line 762 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_alt_pressed (self, event);
-#line 6132 "Page.c"
+#line 5863 "Page.c"
 }
 
 
 static gboolean page_real_on_alt_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 767 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 767 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6142 "Page.c"
+#line 5873 "Page.c"
 }
 
 
 gboolean page_on_alt_released (Page* self, GdkEventKey* event) {
-#line 786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 766 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 766 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_alt_released (self, event);
-#line 6151 "Page.c"
+#line 5882 "Page.c"
 }
 
 
 static gboolean page_real_on_shift_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 771 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 791 "/home/jens/Source/shotwell/src/Page.vala"
+#line 771 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6161 "Page.c"
+#line 5892 "Page.c"
 }
 
 
 gboolean page_on_shift_pressed (Page* self, GdkEventKey* event) {
-#line 790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 770 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 770 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_shift_pressed (self, event);
-#line 6170 "Page.c"
+#line 5901 "Page.c"
 }
 
 
 static gboolean page_real_on_shift_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 775 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 775 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6180 "Page.c"
+#line 5911 "Page.c"
 }
 
 
 gboolean page_on_shift_released (Page* self, GdkEventKey* event) {
-#line 794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 774 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 774 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_shift_released (self, event);
-#line 6189 "Page.c"
+#line 5920 "Page.c"
 }
 
 
 static gboolean page_real_on_super_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 779 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 779 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6199 "Page.c"
+#line 5930 "Page.c"
 }
 
 
 gboolean page_on_super_pressed (Page* self, GdkEventKey* event) {
-#line 798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 778 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 778 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_super_pressed (self, event);
-#line 6208 "Page.c"
+#line 5939 "Page.c"
 }
 
 
 static gboolean page_real_on_super_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 783 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 783 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6218 "Page.c"
+#line 5949 "Page.c"
 }
 
 
 gboolean page_on_super_released (Page* self, GdkEventKey* event) {
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 782 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 782 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_super_released (self, event);
-#line 6227 "Page.c"
+#line 5958 "Page.c"
 }
 
 
 static gboolean page_real_on_app_key_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 786 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 787 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 787 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6239 "Page.c"
+#line 5970 "Page.c"
 }
 
 
 gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event) {
-#line 806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 786 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 786 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_app_key_pressed (self, event);
-#line 6248 "Page.c"
+#line 5979 "Page.c"
 }
 
 
 static gboolean page_real_on_app_key_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 790 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 791 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 791 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6260 "Page.c"
+#line 5991 "Page.c"
 }
 
 
 gboolean page_on_app_key_released (Page* self, GdkEventKey* event) {
-#line 810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 790 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 790 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_app_key_released (self, event);
-#line 6269 "Page.c"
+#line 6000 "Page.c"
 }
 
 
@@ -6284,248 +6015,248 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	GQuark _tmp9_ = 0U;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label1 = 0;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label2 = 0;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label3 = 0;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label4 = 0;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label5 = 0;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label6 = 0;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label7 = 0;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label8 = 0;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
-#line 6308 "Page.c"
+#line 6039 "Page.c"
 	GdkEventKey* _tmp30_ = NULL;
 	gboolean _tmp31_ = FALSE;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 794 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 794 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 797 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 797 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 797 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 797 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 797 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->keyval;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gdk_keyval_name (_tmp5_);
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_);
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp9_ == ((0 != _tmp8_label0) ? _tmp8_label0 : (_tmp8_label0 = g_quark_from_static_string ("Control_L")))) || (_tmp9_ == ((0 != _tmp8_label1) ? _tmp8_label1 : (_tmp8_label1 = g_quark_from_static_string ("Control_R"))))) {
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6339 "Page.c"
+#line 6070 "Page.c"
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
 				gboolean _tmp11_ = FALSE;
 				GdkEventKey* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
-#line 823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 803 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
-#line 823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 803 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp11_) {
-#line 823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 803 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = TRUE;
-#line 6352 "Page.c"
+#line 6083 "Page.c"
 				} else {
 					gboolean _tmp12_ = FALSE;
-#line 823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 803 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
-#line 823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 803 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = _tmp12_;
-#line 6359 "Page.c"
+#line 6090 "Page.c"
 				}
-#line 823 "/home/jens/Source/shotwell/src/Page.vala"
+#line 803 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp10_) {
-#line 824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 804 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 824 "/home/jens/Source/shotwell/src/Page.vala"
+#line 804 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6367 "Page.c"
+#line 6098 "Page.c"
 				}
-#line 826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->ctrl_pressed = TRUE;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 808 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = event;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 808 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = page_on_ctrl_pressed (self, _tmp13_);
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 808 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp14_;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 808 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6379 "Page.c"
+#line 6110 "Page.c"
 			}
 		}
 	} else if ((((_tmp9_ == ((0 != _tmp8_label2) ? _tmp8_label2 : (_tmp8_label2 = g_quark_from_static_string ("Meta_L")))) || (_tmp9_ == ((0 != _tmp8_label3) ? _tmp8_label3 : (_tmp8_label3 = g_quark_from_static_string ("Meta_R"))))) || (_tmp9_ == ((0 != _tmp8_label4) ? _tmp8_label4 : (_tmp8_label4 = g_quark_from_static_string ("Alt_L"))))) || (_tmp9_ == ((0 != _tmp8_label5) ? _tmp8_label5 : (_tmp8_label5 = g_quark_from_static_string ("Alt_R"))))) {
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6385 "Page.c"
+#line 6116 "Page.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
 				gboolean _tmp16_ = FALSE;
 				GdkEventKey* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
-#line 834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp16_) {
-#line 834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = TRUE;
-#line 6398 "Page.c"
+#line 6129 "Page.c"
 				} else {
 					gboolean _tmp17_ = FALSE;
-#line 834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
-#line 834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = _tmp17_;
-#line 6405 "Page.c"
+#line 6136 "Page.c"
 				}
-#line 834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp15_) {
-#line 835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 815 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 815 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6413 "Page.c"
+#line 6144 "Page.c"
 				}
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->alt_pressed = TRUE;
-#line 839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 819 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = event;
-#line 839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 819 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_on_alt_pressed (self, _tmp18_);
-#line 839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 819 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp19_;
-#line 839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 819 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6425 "Page.c"
+#line 6156 "Page.c"
 			}
 		}
 	} else if ((_tmp9_ == ((0 != _tmp8_label6) ? _tmp8_label6 : (_tmp8_label6 = g_quark_from_static_string ("Shift_L")))) || (_tmp9_ == ((0 != _tmp8_label7) ? _tmp8_label7 : (_tmp8_label7 = g_quark_from_static_string ("Shift_R"))))) {
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6431 "Page.c"
+#line 6162 "Page.c"
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_ = FALSE;
 				GdkEventKey* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
-#line 843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp21_) {
-#line 843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = TRUE;
-#line 6444 "Page.c"
+#line 6175 "Page.c"
 				} else {
 					gboolean _tmp22_ = FALSE;
-#line 843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
-#line 843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = _tmp22_;
-#line 6451 "Page.c"
+#line 6182 "Page.c"
 				}
-#line 843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp20_) {
-#line 844 "/home/jens/Source/shotwell/src/Page.vala"
+#line 824 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 844 "/home/jens/Source/shotwell/src/Page.vala"
+#line 824 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6459 "Page.c"
+#line 6190 "Page.c"
 				}
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 826 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->shift_pressed = TRUE;
-#line 848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = event;
-#line 848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = page_on_shift_pressed (self, _tmp23_);
-#line 848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp24_;
-#line 848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6471 "Page.c"
+#line 6202 "Page.c"
 			}
 		}
 	} else if ((_tmp9_ == ((0 != _tmp8_label8) ? _tmp8_label8 : (_tmp8_label8 = g_quark_from_static_string ("Super_L")))) || (_tmp9_ == ((0 != _tmp8_label9) ? _tmp8_label9 : (_tmp8_label9 = g_quark_from_static_string ("Super_R"))))) {
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 800 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6477 "Page.c"
+#line 6208 "Page.c"
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp26_ = FALSE;
 				GdkEventKey* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
-#line 852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 832 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
-#line 852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 832 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp26_) {
-#line 852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 832 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = TRUE;
-#line 6490 "Page.c"
+#line 6221 "Page.c"
 				} else {
 					gboolean _tmp27_ = FALSE;
-#line 852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 832 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
-#line 852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 832 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = _tmp27_;
-#line 6497 "Page.c"
+#line 6228 "Page.c"
 				}
-#line 852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 832 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp25_) {
-#line 853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 833 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 833 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6505 "Page.c"
+#line 6236 "Page.c"
 				}
-#line 855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 835 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->super_pressed = TRUE;
-#line 857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = event;
-#line 857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = page_on_super_pressed (self, _tmp28_);
-#line 857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp29_;
-#line 857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6517 "Page.c"
+#line 6248 "Page.c"
 			}
 		}
 	}
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = event;
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = page_on_app_key_pressed (self, _tmp30_);
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 840 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp31_;
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 840 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6529 "Page.c"
+#line 6260 "Page.c"
 }
 
 
@@ -6544,406 +6275,406 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	GQuark _tmp9_ = 0U;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label1 = 0;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label2 = 0;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label3 = 0;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label4 = 0;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label5 = 0;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label6 = 0;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label7 = 0;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label8 = 0;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
-#line 6568 "Page.c"
+#line 6299 "Page.c"
 	GdkEventKey* _tmp30_ = NULL;
 	gboolean _tmp31_ = FALSE;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->keyval;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gdk_keyval_name (_tmp5_);
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_);
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp9_ == ((0 != _tmp8_label0) ? _tmp8_label0 : (_tmp8_label0 = g_quark_from_static_string ("Control_L")))) || (_tmp9_ == ((0 != _tmp8_label1) ? _tmp8_label1 : (_tmp8_label1 = g_quark_from_static_string ("Control_R"))))) {
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6599 "Page.c"
+#line 6330 "Page.c"
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
 				gboolean _tmp11_ = FALSE;
 				GdkEventKey* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
-#line 872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
-#line 872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp11_) {
-#line 872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = TRUE;
-#line 6612 "Page.c"
+#line 6343 "Page.c"
 				} else {
 					gboolean _tmp12_ = FALSE;
-#line 872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
-#line 872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = !_tmp12_;
-#line 6619 "Page.c"
+#line 6350 "Page.c"
 				}
-#line 872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp10_) {
-#line 873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 853 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 853 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6627 "Page.c"
+#line 6358 "Page.c"
 				}
-#line 875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 855 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->ctrl_pressed = FALSE;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = event;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = page_on_ctrl_released (self, _tmp13_);
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp14_;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6639 "Page.c"
+#line 6370 "Page.c"
 			}
 		}
 	} else if ((((_tmp9_ == ((0 != _tmp8_label2) ? _tmp8_label2 : (_tmp8_label2 = g_quark_from_static_string ("Meta_L")))) || (_tmp9_ == ((0 != _tmp8_label3) ? _tmp8_label3 : (_tmp8_label3 = g_quark_from_static_string ("Meta_R"))))) || (_tmp9_ == ((0 != _tmp8_label4) ? _tmp8_label4 : (_tmp8_label4 = g_quark_from_static_string ("Alt_L"))))) || (_tmp9_ == ((0 != _tmp8_label5) ? _tmp8_label5 : (_tmp8_label5 = g_quark_from_static_string ("Alt_R"))))) {
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6645 "Page.c"
+#line 6376 "Page.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
 				gboolean _tmp16_ = FALSE;
 				GdkEventKey* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
-#line 883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_) {
-#line 883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = TRUE;
-#line 6658 "Page.c"
+#line 6389 "Page.c"
 				} else {
 					gboolean _tmp17_ = FALSE;
-#line 883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
-#line 883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = !_tmp17_;
-#line 6665 "Page.c"
+#line 6396 "Page.c"
 				}
-#line 883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp15_) {
-#line 884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 864 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 884 "/home/jens/Source/shotwell/src/Page.vala"
+#line 864 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6673 "Page.c"
+#line 6404 "Page.c"
 				}
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->alt_pressed = FALSE;
-#line 888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 868 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = event;
-#line 888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 868 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_on_alt_released (self, _tmp18_);
-#line 888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 868 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp19_;
-#line 888 "/home/jens/Source/shotwell/src/Page.vala"
+#line 868 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6685 "Page.c"
+#line 6416 "Page.c"
 			}
 		}
 	} else if ((_tmp9_ == ((0 != _tmp8_label6) ? _tmp8_label6 : (_tmp8_label6 = g_quark_from_static_string ("Shift_L")))) || (_tmp9_ == ((0 != _tmp8_label7) ? _tmp8_label7 : (_tmp8_label7 = g_quark_from_static_string ("Shift_R"))))) {
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6691 "Page.c"
+#line 6422 "Page.c"
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_ = FALSE;
 				GdkEventKey* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
-#line 892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp21_) {
-#line 892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = TRUE;
-#line 6704 "Page.c"
+#line 6435 "Page.c"
 				} else {
 					gboolean _tmp22_ = FALSE;
-#line 892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
-#line 892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = !_tmp22_;
-#line 6711 "Page.c"
+#line 6442 "Page.c"
 				}
-#line 892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp20_) {
-#line 893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 873 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 893 "/home/jens/Source/shotwell/src/Page.vala"
+#line 873 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6719 "Page.c"
+#line 6450 "Page.c"
 				}
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 875 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->shift_pressed = FALSE;
-#line 897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = event;
-#line 897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = page_on_shift_released (self, _tmp23_);
-#line 897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp24_;
-#line 897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6731 "Page.c"
+#line 6462 "Page.c"
 			}
 		}
 	} else if ((_tmp9_ == ((0 != _tmp8_label8) ? _tmp8_label8 : (_tmp8_label8 = g_quark_from_static_string ("Super_L")))) || (_tmp9_ == ((0 != _tmp8_label9) ? _tmp8_label9 : (_tmp8_label9 = g_quark_from_static_string ("Super_R"))))) {
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 849 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6737 "Page.c"
+#line 6468 "Page.c"
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp26_ = FALSE;
 				GdkEventKey* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
-#line 901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 881 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
-#line 901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 881 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp26_) {
-#line 901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 881 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = TRUE;
-#line 6750 "Page.c"
+#line 6481 "Page.c"
 				} else {
 					gboolean _tmp27_ = FALSE;
-#line 901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 881 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
-#line 901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 881 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = !_tmp27_;
-#line 6757 "Page.c"
+#line 6488 "Page.c"
 				}
-#line 901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 881 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp25_) {
-#line 902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 882 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 882 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6765 "Page.c"
+#line 6496 "Page.c"
 				}
-#line 904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 884 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->super_pressed = FALSE;
-#line 906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = event;
-#line 906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = page_on_super_released (self, _tmp28_);
-#line 906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp29_;
-#line 906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6777 "Page.c"
+#line 6508 "Page.c"
 			}
 		}
 	}
-#line 909 "/home/jens/Source/shotwell/src/Page.vala"
+#line 889 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = event;
-#line 909 "/home/jens/Source/shotwell/src/Page.vala"
+#line 889 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = page_on_app_key_released (self, _tmp30_);
-#line 909 "/home/jens/Source/shotwell/src/Page.vala"
+#line 889 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp31_;
-#line 909 "/home/jens/Source/shotwell/src/Page.vala"
+#line 889 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6789 "Page.c"
+#line 6520 "Page.c"
 }
 
 
 gboolean page_notify_app_focus_in (Page* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 893 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_modifiers (self);
-#line 915 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 915 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6805 "Page.c"
+#line 6536 "Page.c"
 }
 
 
 gboolean page_notify_app_focus_out (Page* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 898 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 898 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 899 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 899 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6819 "Page.c"
+#line 6550 "Page.c"
 }
 
 
 static void page_real_on_move (Page* self, GdkRectangle* rect) {
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 902 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6826 "Page.c"
+#line 6557 "Page.c"
 }
 
 
 void page_on_move (Page* self, GdkRectangle* rect) {
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 902 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 902 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move (self, rect);
-#line 6835 "Page.c"
+#line 6566 "Page.c"
 }
 
 
 static void page_real_on_move_start (Page* self, GdkRectangle* rect) {
-#line 925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 905 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6842 "Page.c"
+#line 6573 "Page.c"
 }
 
 
 void page_on_move_start (Page* self, GdkRectangle* rect) {
-#line 925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 905 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 905 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move_start (self, rect);
-#line 6851 "Page.c"
+#line 6582 "Page.c"
 }
 
 
 static void page_real_on_move_finished (Page* self, GdkRectangle* rect) {
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 908 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6858 "Page.c"
+#line 6589 "Page.c"
 }
 
 
 void page_on_move_finished (Page* self, GdkRectangle* rect) {
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 908 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 908 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move_finished (self, rect);
-#line 6867 "Page.c"
+#line 6598 "Page.c"
 }
 
 
 static void page_real_on_resize (Page* self, GdkRectangle* rect) {
-#line 931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 911 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6874 "Page.c"
+#line 6605 "Page.c"
 }
 
 
 void page_on_resize (Page* self, GdkRectangle* rect) {
-#line 931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 911 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 911 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize (self, rect);
-#line 6883 "Page.c"
+#line 6614 "Page.c"
 }
 
 
 static void page_real_on_resize_start (Page* self, GdkRectangle* rect) {
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 914 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6890 "Page.c"
+#line 6621 "Page.c"
 }
 
 
 void page_on_resize_start (Page* self, GdkRectangle* rect) {
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 914 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 914 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize_start (self, rect);
-#line 6899 "Page.c"
+#line 6630 "Page.c"
 }
 
 
 static void page_real_on_resize_finished (Page* self, GdkRectangle* rect) {
-#line 937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 917 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6906 "Page.c"
+#line 6637 "Page.c"
 }
 
 
 void page_on_resize_finished (Page* self, GdkRectangle* rect) {
-#line 937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 917 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 917 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize_finished (self, rect);
-#line 6915 "Page.c"
+#line 6646 "Page.c"
 }
 
 
 static gboolean page_real_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) {
 	gboolean result = FALSE;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 920 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 920 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (rect != NULL, FALSE);
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 921 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 921 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6929 "Page.c"
+#line 6660 "Page.c"
 }
 
 
 gboolean page_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) {
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 920 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 920 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_configure (self, event, rect);
-#line 6938 "Page.c"
+#line 6669 "Page.c"
 }
 
 
 static gboolean _page_check_configure_halted_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_check_configure_halted ((Page*) self);
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 945 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6947 "Page.c"
+#line 6678 "Page.c"
 }
 
 
@@ -6974,41 +6705,41 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 	GdkEventConfigure* _tmp51_ = NULL;
 	GdkRectangle _tmp52_ = {0};
 	gboolean _tmp53_ = FALSE;
-#line 944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 924 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 924 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 945 "/home/jens/Source/shotwell/src/Page.vala"
+#line 925 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&rect, 0, sizeof (GdkRectangle));
-#line 946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->x;
-#line 946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 926 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.x = _tmp1_;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 927 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 927 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->y;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 927 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.y = _tmp3_;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->width;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.width = _tmp5_;
-#line 949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 929 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = event;
-#line 949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 929 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_->height;
-#line 949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 929 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.height = _tmp7_;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 932 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->last_configure_ms;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 932 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ == ((gulong) 0)) {
-#line 7012 "Page.c"
+#line 6743 "Page.c"
 		gboolean _tmp9_ = FALSE;
 		GdkRectangle _tmp10_ = {0};
 		gint _tmp11_ = 0;
@@ -7019,193 +6750,193 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 		gint _tmp21_ = 0;
 		GdkRectangle _tmp22_ = {0};
 		gint _tmp23_ = 0;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->last_position;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_.x;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = rect;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_.x;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != _tmp13_) {
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = TRUE;
-#line 7035 "Page.c"
+#line 6766 "Page.c"
 		} else {
 			GdkRectangle _tmp14_ = {0};
 			gint _tmp15_ = 0;
 			GdkRectangle _tmp16_ = {0};
 			gint _tmp17_ = 0;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->priv->last_position;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_.y;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = rect;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = _tmp16_.y;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = _tmp15_ != _tmp17_;
-#line 7051 "Page.c"
+#line 6782 "Page.c"
 		}
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 933 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp9_) {
-#line 7055 "Page.c"
+#line 6786 "Page.c"
 			GdkRectangle _tmp18_ = {0};
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = rect;
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_move_start (self, &_tmp18_);
-#line 955 "/home/jens/Source/shotwell/src/Page.vala"
+#line 935 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->report_move_finished = TRUE;
-#line 7063 "Page.c"
+#line 6794 "Page.c"
 		}
-#line 958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->last_position;
-#line 958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp20_.width;
-#line 958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = rect;
-#line 958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.width;
-#line 958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_ != _tmp23_) {
-#line 958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = TRUE;
-#line 7077 "Page.c"
+#line 6808 "Page.c"
 		} else {
 			GdkRectangle _tmp24_ = {0};
 			gint _tmp25_ = 0;
 			GdkRectangle _tmp26_ = {0};
 			gint _tmp27_ = 0;
-#line 958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = self->priv->last_position;
-#line 958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = rect;
-#line 958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = _tmp26_.height;
-#line 958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _tmp25_ != _tmp27_;
-#line 7093 "Page.c"
+#line 6824 "Page.c"
 		}
-#line 958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 938 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp19_) {
-#line 7097 "Page.c"
+#line 6828 "Page.c"
 			GdkRectangle _tmp28_ = {0};
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 939 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = rect;
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 939 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_resize_start (self, &_tmp28_);
-#line 960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->report_resize_finished = TRUE;
-#line 7105 "Page.c"
+#line 6836 "Page.c"
 		}
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 945 "/home/jens/Source/shotwell/src/Page.vala"
 		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) (PAGE_CONSIDER_CONFIGURE_HALTED_MSEC / 8), _page_check_configure_halted_gsource_func, g_object_ref (self), g_object_unref);
-#line 7109 "Page.c"
+#line 6840 "Page.c"
 	}
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = self->priv->last_position;
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = _tmp30_.x;
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp32_ = rect;
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp33_ = _tmp32_.x;
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp31_ != _tmp33_) {
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = TRUE;
-#line 7123 "Page.c"
+#line 6854 "Page.c"
 	} else {
 		GdkRectangle _tmp34_ = {0};
 		gint _tmp35_ = 0;
 		GdkRectangle _tmp36_ = {0};
 		gint _tmp37_ = 0;
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = self->priv->last_position;
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp35_ = _tmp34_.y;
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = rect;
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = _tmp36_.y;
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp35_ != _tmp37_;
-#line 7139 "Page.c"
+#line 6870 "Page.c"
 	}
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 7143 "Page.c"
+#line 6874 "Page.c"
 		GdkRectangle _tmp38_ = {0};
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 949 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = rect;
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 949 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_move (self, &_tmp38_);
-#line 7149 "Page.c"
+#line 6880 "Page.c"
 	}
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = self->priv->last_position;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = _tmp40_.width;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = rect;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = _tmp42_.width;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp41_ != _tmp43_) {
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp39_ = TRUE;
-#line 7163 "Page.c"
+#line 6894 "Page.c"
 	} else {
 		GdkRectangle _tmp44_ = {0};
 		gint _tmp45_ = 0;
 		GdkRectangle _tmp46_ = {0};
 		gint _tmp47_ = 0;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = self->priv->last_position;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_.height;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = rect;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = _tmp46_.height;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp39_ = _tmp45_ != _tmp47_;
-#line 7179 "Page.c"
+#line 6910 "Page.c"
 	}
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 951 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp39_) {
-#line 7183 "Page.c"
+#line 6914 "Page.c"
 		GdkRectangle _tmp48_ = {0};
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = rect;
-#line 972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_resize (self, &_tmp48_);
-#line 7189 "Page.c"
+#line 6920 "Page.c"
 	}
-#line 974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 954 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = rect;
-#line 974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 954 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_position = _tmp49_;
-#line 975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 955 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = now_ms ();
-#line 975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 955 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = _tmp50_;
-#line 977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp51_ = event;
-#line 977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp52_ = rect;
-#line 977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = page_on_configure (self, _tmp51_, &_tmp52_);
-#line 977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp53_;
-#line 977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 957 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7209 "Page.c"
+#line 6940 "Page.c"
 }
 
 
@@ -7218,117 +6949,117 @@ static gboolean page_check_configure_halted (Page* self) {
 	GtkAllocation _tmp3_ = {0};
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 980 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 981 "/home/jens/Source/shotwell/src/Page.vala"
+#line 961 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 981 "/home/jens/Source/shotwell/src/Page.vala"
+#line 961 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 962 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7232 "Page.c"
+#line 6963 "Page.c"
 	}
-#line 984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 964 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = now_ms ();
-#line 984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 964 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_configure_ms;
-#line 984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 964 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp1_ - _tmp2_) < ((gulong) PAGE_CONSIDER_CONFIGURE_HALTED_MSEC)) {
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7244 "Page.c"
+#line 6975 "Page.c"
 	}
-#line 988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp3_);
-#line 988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	allocation = _tmp3_;
-#line 990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 970 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->report_move_finished;
-#line 990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 970 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 7254 "Page.c"
+#line 6985 "Page.c"
 		GtkAllocation _tmp5_ = {0};
 		GdkRectangle _tmp6_ = {0};
-#line 991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = allocation;
-#line 991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GdkRectangle) _tmp5_;
-#line 991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_move_finished (self, &_tmp6_);
-#line 7263 "Page.c"
+#line 6994 "Page.c"
 	}
-#line 993 "/home/jens/Source/shotwell/src/Page.vala"
+#line 973 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->report_resize_finished;
-#line 993 "/home/jens/Source/shotwell/src/Page.vala"
+#line 973 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_) {
-#line 7269 "Page.c"
+#line 7000 "Page.c"
 		GtkAllocation _tmp8_ = {0};
 		GdkRectangle _tmp9_ = {0};
-#line 994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 974 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = allocation;
-#line 994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 974 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = (GdkRectangle) _tmp8_;
-#line 994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 974 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_resize_finished (self, &_tmp9_);
-#line 7278 "Page.c"
+#line 7009 "Page.c"
 	}
-#line 996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 976 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = (gulong) 0;
-#line 997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_move_finished = FALSE;
-#line 998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 978 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_resize_finished = FALSE;
-#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 980 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 980 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7290 "Page.c"
+#line 7021 "Page.c"
 }
 
 
 static gboolean page_real_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
 	gboolean result = FALSE;
-#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 983 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 984 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 986 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 986 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7304 "Page.c"
+#line 7035 "Page.c"
 }
 
 
 gboolean page_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
-#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 983 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 983 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_motion (self, event, x, y, mask);
-#line 7313 "Page.c"
+#line 7044 "Page.c"
 }
 
 
 static gboolean page_real_on_leave_notify_event (Page* self) {
 	gboolean result = FALSE;
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 990 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 990 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7323 "Page.c"
+#line 7054 "Page.c"
 }
 
 
 gboolean page_on_leave_notify_event (Page* self) {
-#line 1009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 989 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 989 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_leave_notify_event (self);
-#line 7332 "Page.c"
+#line 7063 "Page.c"
 }
 
 
@@ -7344,29 +7075,29 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 	gint _tmp13_ = 0;
 	GdkModifierType _tmp14_ = 0;
 	gboolean _tmp15_ = FALSE;
-#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 993 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 993 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
+#line 996 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
+#line 996 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->is_hint;
-#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
+#line 996 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gint) _tmp1_) == 1) {
-#line 7358 "Page.c"
+#line 7089 "Page.c"
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		GdkModifierType _tmp4_ = 0;
-#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 997 "/home/jens/Source/shotwell/src/Page.vala"
 		page_get_event_source_pointer (self, &_tmp2_, &_tmp3_, &_tmp4_);
-#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 997 "/home/jens/Source/shotwell/src/Page.vala"
 		x = _tmp2_;
-#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 997 "/home/jens/Source/shotwell/src/Page.vala"
 		y = _tmp3_;
-#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 997 "/home/jens/Source/shotwell/src/Page.vala"
 		mask = _tmp4_;
-#line 7370 "Page.c"
+#line 7101 "Page.c"
 	} else {
 		GdkEventMotion* _tmp5_ = NULL;
 		gdouble _tmp6_ = 0.0;
@@ -7374,41 +7105,41 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 		gdouble _tmp8_ = 0.0;
 		GdkEventMotion* _tmp9_ = NULL;
 		GdkModifierType _tmp10_ = 0;
-#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
+#line 999 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = event;
-#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
+#line 999 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_->x;
-#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
+#line 999 "/home/jens/Source/shotwell/src/Page.vala"
 		x = (gint) _tmp6_;
-#line 1020 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1020 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->y;
-#line 1020 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
 		y = (gint) _tmp8_;
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->state;
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Page.vala"
 		mask = _tmp10_;
-#line 7396 "Page.c"
+#line 7127 "Page.c"
 	}
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = event;
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = mask;
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_on_motion (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp15_;
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7412 "Page.c"
+#line 7143 "Page.c"
 }
 
 
@@ -7416,87 +7147,87 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 	gboolean result = FALSE;
 	GdkEventScroll* _tmp0_ = NULL;
 	GdkScrollDirection _tmp1_ = 0;
-#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->direction;
-#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_UP:
-#line 7432 "Page.c"
+#line 7163 "Page.c"
 		{
 			GdkEventScroll* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = event;
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = page_on_mousewheel_up (self, _tmp2_);
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp3_;
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7444 "Page.c"
+#line 7175 "Page.c"
 		}
-#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_DOWN:
-#line 7448 "Page.c"
+#line 7179 "Page.c"
 		{
 			GdkEventScroll* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = page_on_mousewheel_down (self, _tmp4_);
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp5_;
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7460 "Page.c"
+#line 7191 "Page.c"
 		}
-#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_LEFT:
-#line 7464 "Page.c"
+#line 7195 "Page.c"
 		{
 			GdkEventScroll* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
-#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
-#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = page_on_mousewheel_left (self, _tmp6_);
-#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp7_;
-#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7476 "Page.c"
+#line 7207 "Page.c"
 		}
-#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_RIGHT:
-#line 7480 "Page.c"
+#line 7211 "Page.c"
 		{
 			GdkEventScroll* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
-#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = page_on_mousewheel_right (self, _tmp8_);
-#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp9_;
-#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7492 "Page.c"
+#line 7223 "Page.c"
 		}
 		default:
 		{
-#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7500 "Page.c"
+#line 7231 "Page.c"
 		}
 	}
 }
@@ -7504,144 +7235,144 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 
 static gboolean page_real_on_mousewheel_up (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7514 "Page.c"
+#line 7245 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_up (Page* self, GdkEventScroll* event) {
-#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_up (self, event);
-#line 7523 "Page.c"
+#line 7254 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_down (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7535 "Page.c"
+#line 7266 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_down (Page* self, GdkEventScroll* event) {
-#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_down (self, event);
-#line 7544 "Page.c"
+#line 7275 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_left (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7556 "Page.c"
+#line 7287 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_left (Page* self, GdkEventScroll* event) {
-#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_left (self, event);
-#line 7565 "Page.c"
+#line 7296 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_right (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7577 "Page.c"
+#line 7308 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_right (Page* self, GdkEventScroll* event) {
-#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_right (self, event);
-#line 7586 "Page.c"
+#line 7317 "Page.c"
 }
 
 
 static gboolean page_real_on_context_keypress (Page* self) {
 	gboolean result = FALSE;
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7596 "Page.c"
+#line 7327 "Page.c"
 }
 
 
 gboolean page_on_context_keypress (Page* self) {
-#line 1062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_keypress (self);
-#line 7605 "Page.c"
+#line 7336 "Page.c"
 }
 
 
 static gboolean page_real_on_context_buttonpress (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 1066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7617 "Page.c"
+#line 7348 "Page.c"
 }
 
 
 gboolean page_on_context_buttonpress (Page* self, GdkEventButton* event) {
-#line 1066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_buttonpress (self, event);
-#line 7626 "Page.c"
+#line 7357 "Page.c"
 }
 
 
 static gboolean page_real_on_context_invoked (Page* self) {
 	gboolean result = FALSE;
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7636 "Page.c"
+#line 7367 "Page.c"
 }
 
 
 gboolean page_on_context_invoked (Page* self) {
-#line 1070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_invoked (self);
-#line 7645 "Page.c"
+#line 7376 "Page.c"
 }
 
 
@@ -7650,72 +7381,72 @@ gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventBut
 	gboolean _tmp0_ = FALSE;
 	GtkMenu* _tmp1_ = NULL;
 	GdkEventButton* _tmp3_ = NULL;
-#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((context_menu == NULL) || GTK_IS_MENU (context_menu), FALSE);
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = context_menu;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 7664 "Page.c"
+#line 7395 "Page.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = page_on_context_invoked (self);
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 7671 "Page.c"
+#line 7402 "Page.c"
 	}
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7679 "Page.c"
+#line 7410 "Page.c"
 	}
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 7685 "Page.c"
+#line 7416 "Page.c"
 		GtkMenu* _tmp4_ = NULL;
 		guint32 _tmp5_ = 0U;
-#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = context_menu;
-#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_get_current_event_time ();
-#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp4_, NULL, NULL, NULL, NULL, (guint) 0, _tmp5_);
-#line 7694 "Page.c"
+#line 7425 "Page.c"
 	} else {
 		GtkMenu* _tmp6_ = NULL;
 		GdkEventButton* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
 		GdkEventButton* _tmp9_ = NULL;
 		guint32 _tmp10_ = 0U;
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = context_menu;
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->button;
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->time;
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp6_, NULL, NULL, NULL, NULL, _tmp8_, _tmp10_);
-#line 7713 "Page.c"
+#line 7444 "Page.c"
 	}
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7719 "Page.c"
+#line 7450 "Page.c"
 }
 
 
@@ -7730,166 +7461,166 @@ void page_on_event_source_realize (Page* self) {
 	GdkWindow* _tmp10_ = NULL;
 	GdkWindow* _tmp11_ = NULL;
 	GdkWindow* _tmp20_ = NULL;
-#line 1088 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (_tmp0_);
-#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source.get_window() != null");
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gtk_widget_get_window (_tmp2_);
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_window_get_cursor (_tmp3_);
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 7750 "Page.c"
+#line 7481 "Page.c"
 		GtkWidget* _tmp5_ = NULL;
 		GdkWindow* _tmp6_ = NULL;
 		GdkCursor* _tmp7_ = NULL;
 		GdkCursorType _tmp8_ = 0;
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_window_get_cursor (_tmp6_);
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_get_cursor_type (_tmp7_);
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp8_;
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 7767 "Page.c"
+#line 7498 "Page.c"
 	}
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = gtk_widget_get_window (_tmp9_);
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	parent_window = _tmp11_;
-#line 7777 "Page.c"
+#line 7508 "Page.c"
 	{
 		gboolean _tmp12_ = FALSE;
-#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = TRUE;
-#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 7784 "Page.c"
+#line 7515 "Page.c"
 			GdkWindow* _tmp17_ = NULL;
 			GdkWindow* _tmp18_ = NULL;
 			GdkWindow* _tmp19_ = NULL;
-#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp12_) {
-#line 7790 "Page.c"
+#line 7521 "Page.c"
 				gboolean _tmp13_ = FALSE;
 				GdkWindow* _tmp14_ = NULL;
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = parent_window;
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp14_ != NULL) {
-#line 7797 "Page.c"
+#line 7528 "Page.c"
 					GdkWindow* _tmp15_ = NULL;
 					GdkCursor* _tmp16_ = NULL;
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = parent_window;
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = gdk_window_get_cursor (_tmp15_);
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = _tmp16_ == NULL;
-#line 7806 "Page.c"
+#line 7537 "Page.c"
 				} else {
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = FALSE;
-#line 7810 "Page.c"
+#line 7541 "Page.c"
 				}
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp13_) {
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 7816 "Page.c"
+#line 7547 "Page.c"
 				}
 			}
-#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = FALSE;
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = parent_window;
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = gdk_window_get_parent (_tmp17_);
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (parent_window);
-#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
 			parent_window = _tmp19_;
-#line 7831 "Page.c"
+#line 7562 "Page.c"
 		}
 	}
-#line 1102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = parent_window;
-#line 1102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != NULL) {
-#line 7838 "Page.c"
+#line 7569 "Page.c"
 		GdkWindow* _tmp21_ = NULL;
 		GdkCursor* _tmp22_ = NULL;
 		GdkCursorType _tmp23_ = 0;
-#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = parent_window;
-#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = gdk_window_get_cursor (_tmp21_);
-#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = gdk_cursor_get_cursor_type (_tmp22_);
-#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp23_;
-#line 7850 "Page.c"
+#line 7581 "Page.c"
 	}
-#line 1088 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (parent_window);
-#line 7854 "Page.c"
+#line 7585 "Page.c"
 }
 
 
 void page_set_cursor_hide_time (Page* self, gint hide_time) {
 	gint _tmp0_ = 0;
-#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = hide_time;
-#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 7866 "Page.c"
+#line 7597 "Page.c"
 }
 
 
 void page_start_cursor_hiding (Page* self) {
-#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1090 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1111 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7875 "Page.c"
+#line 7606 "Page.c"
 }
 
 
 void page_stop_cursor_hiding (Page* self) {
 	guint _tmp0_ = 0U;
-#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->last_timeout_id;
-#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 7887 "Page.c"
+#line 7618 "Page.c"
 		guint _tmp1_ = 0U;
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_timeout_id;
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp1_);
-#line 7893 "Page.c"
+#line 7624 "Page.c"
 	}
 }
 
@@ -7897,41 +7628,41 @@ void page_stop_cursor_hiding (Page* self) {
 void page_suspend_cursor_hiding (Page* self) {
 	gint _tmp0_ = 0;
 	guint _tmp1_ = 0U;
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_msec;
-#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_time_cached = _tmp0_;
-#line 1122 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->last_timeout_id;
-#line 1122 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != ((guint) 0)) {
-#line 7911 "Page.c"
+#line 7642 "Page.c"
 		guint _tmp2_ = 0U;
-#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->last_timeout_id;
-#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp2_);
-#line 7917 "Page.c"
+#line 7648 "Page.c"
 	}
-#line 1125 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = 0;
-#line 7921 "Page.c"
+#line 7652 "Page.c"
 }
 
 
 void page_restore_cursor_hiding (Page* self) {
 	gint _tmp0_ = 0;
-#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1108 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_time_cached;
-#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 1130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7935 "Page.c"
+#line 7666 "Page.c"
 }
 
 
@@ -7939,117 +7670,137 @@ static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) {
 	GdkCursorType _tmp0_ = 0;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = cursor_type;
-#line 1135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_cursor = _tmp0_;
-#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hidden;
-#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp2_) {
-#line 7951 "Page.c"
+#line 7682 "Page.c"
 		GtkWidget* _tmp3_ = NULL;
-#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 7957 "Page.c"
+#line 7688 "Page.c"
 	} else {
-#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = FALSE;
-#line 7961 "Page.c"
+#line 7692 "Page.c"
 	}
-#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 7965 "Page.c"
+#line 7696 "Page.c"
+		GdkDisplay* display = NULL;
 		GtkWidget* _tmp4_ = NULL;
 		GdkWindow* _tmp5_ = NULL;
-		GdkCursorType _tmp6_ = 0;
-		GdkCursor* _tmp7_ = NULL;
-		GdkCursor* _tmp8_ = NULL;
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+		GdkDisplay* _tmp6_ = NULL;
+		GdkDisplay* _tmp7_ = NULL;
+		GtkWidget* _tmp8_ = NULL;
+		GdkWindow* _tmp9_ = NULL;
+		GdkDisplay* _tmp10_ = NULL;
+		GdkCursorType _tmp11_ = 0;
+		GdkCursor* _tmp12_ = NULL;
+		GdkCursor* _tmp13_ = NULL;
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = self->priv->event_source;
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_widget_get_window (_tmp4_);
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp6_ = cursor_type;
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp7_ = gdk_cursor_new (_tmp6_);
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp8_ = _tmp7_;
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
-		gdk_window_set_cursor (_tmp5_, _tmp8_);
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_object_unref0 (_tmp8_);
-#line 7985 "Page.c"
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6_ = gdk_window_get_display (_tmp5_);
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp7_ = _g_object_ref0 (_tmp6_);
+#line 1118 "/home/jens/Source/shotwell/src/Page.vala"
+		display = _tmp7_;
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp8_ = self->priv->event_source;
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp9_ = gtk_widget_get_window (_tmp8_);
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp10_ = display;
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp11_ = cursor_type;
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp12_ = gdk_cursor_new_for_display (_tmp10_, _tmp11_);
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp13_ = _tmp12_;
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+		gdk_window_set_cursor (_tmp9_, _tmp13_);
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (_tmp13_);
+#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (display);
+#line 7736 "Page.c"
 	}
 }
 
 
 void page_set_page_cursor (Page* self, GdkCursorType cursor_type) {
-#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_page_cursor (self, cursor_type);
-#line 7995 "Page.c"
+#line 7746 "Page.c"
 }
 
 
 static gboolean _page_on_hide_cursor_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_on_hide_cursor ((Page*) self);
-#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8004 "Page.c"
+#line 7755 "Page.c"
 }
 
 
 static void page_check_cursor_hiding (Page* self) {
 	gboolean _tmp0_ = FALSE;
 	gint _tmp2_ = 0;
-#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1124 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hidden;
-#line 1142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1124 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 8017 "Page.c"
+#line 7768 "Page.c"
 		GdkCursorType _tmp1_ = 0;
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->cursor_hidden = FALSE;
-#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1126 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_cursor;
-#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1126 "/home/jens/Source/shotwell/src/Page.vala"
 		page_set_page_cursor (self, _tmp1_);
-#line 8025 "Page.c"
+#line 7776 "Page.c"
 	}
-#line 1147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hide_msec;
-#line 1147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != 0) {
-#line 8031 "Page.c"
+#line 7782 "Page.c"
 		guint _tmp3_ = 0U;
 		gint _tmp5_ = 0;
 		guint _tmp6_ = 0U;
-#line 1148 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->last_timeout_id;
-#line 1148 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp3_ != ((guint) 0)) {
-#line 8039 "Page.c"
+#line 7790 "Page.c"
 			guint _tmp4_ = 0U;
-#line 1149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = self->priv->last_timeout_id;
-#line 1149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
 			g_source_remove (_tmp4_);
-#line 8045 "Page.c"
+#line 7796 "Page.c"
 		}
-#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->cursor_hide_msec;
-#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) _tmp5_, _page_on_hide_cursor_gsource_func, g_object_ref (self), g_object_unref);
-#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_timeout_id = _tmp6_;
-#line 8053 "Page.c"
+#line 7804 "Page.c"
 	}
 }
 
@@ -8057,259 +7808,868 @@ static void page_check_cursor_hiding (Page* self) {
 static gboolean page_on_hide_cursor (Page* self) {
 	gboolean result = FALSE;
 	GtkWidget* _tmp0_ = NULL;
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1136 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hidden = TRUE;
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 8069 "Page.c"
+#line 7820 "Page.c"
+		GdkDisplay* display = NULL;
 		GtkWidget* _tmp1_ = NULL;
 		GdkWindow* _tmp2_ = NULL;
-		GdkCursor* _tmp3_ = NULL;
-		GdkCursor* _tmp4_ = NULL;
-#line 1158 "/home/jens/Source/shotwell/src/Page.vala"
+		GdkDisplay* _tmp3_ = NULL;
+		GdkDisplay* _tmp4_ = NULL;
+		GtkWidget* _tmp5_ = NULL;
+		GdkWindow* _tmp6_ = NULL;
+		GdkDisplay* _tmp7_ = NULL;
+		GdkCursor* _tmp8_ = NULL;
+		GdkCursor* _tmp9_ = NULL;
+#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 1158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = gtk_widget_get_window (_tmp1_);
+#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp3_ = gdk_window_get_display (_tmp2_);
+#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = _g_object_ref0 (_tmp3_);
+#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+		display = _tmp4_;
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = self->priv->event_source;
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6_ = gtk_widget_get_window (_tmp5_);
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp7_ = display;
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp8_ = gdk_cursor_new_for_display (_tmp7_, GDK_BLANK_CURSOR);
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp9_ = _tmp8_;
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+		gdk_window_set_cursor (_tmp6_, _tmp9_);
+#line 1141 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (_tmp9_);
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (display);
+#line 7857 "Page.c"
+	}
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
+	self->priv->last_timeout_id = (guint) 0;
+#line 1147 "/home/jens/Source/shotwell/src/Page.vala"
+	result = FALSE;
+#line 1147 "/home/jens/Source/shotwell/src/Page.vala"
+	return result;
+#line 7865 "Page.c"
+}
+
+
+void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label) {
+	GMenu* bar = NULL;
+	GtkBuilder* _tmp0_ = NULL;
+	GObject* _tmp1_ = NULL;
+	GMenu* _tmp2_ = NULL;
+	GMenu* _tmp3_ = NULL;
+	gint items = 0;
+	GMenu* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (IS_PAGE (self));
+#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (id != NULL);
+#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_if_fail (new_label != NULL);
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = self->builder;
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = gtk_builder_get_object (_tmp0_, "MenuBar");
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_menu_get_type ()) ? ((GMenu*) _tmp1_) : NULL);
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
+	bar = _tmp2_;
+#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp3_ = bar;
+#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp3_ == NULL) {
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (bar);
+#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+		return;
+#line 7900 "Page.c"
+	}
 #line 1158 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = gdk_cursor_new (GDK_BLANK_CURSOR);
-#line 1158 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = _tmp3_;
+	_tmp4_ = bar;
 #line 1158 "/home/jens/Source/shotwell/src/Page.vala"
-		gdk_window_set_cursor (_tmp2_, _tmp4_);
+	_tmp5_ = g_menu_model_get_n_items (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_menu_model_get_type (), GMenuModel));
 #line 1158 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_object_unref0 (_tmp4_);
-#line 8086 "Page.c"
-	}
+	items = _tmp5_;
+#line 7908 "Page.c"
+	{
+		gint i = 0;
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+		i = 0;
+#line 7913 "Page.c"
+		{
+			gboolean _tmp6_ = FALSE;
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+			_tmp6_ = TRUE;
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+			while (TRUE) {
+#line 7920 "Page.c"
+				gint _tmp8_ = 0;
+				gint _tmp9_ = 0;
+				GMenuModel* model = NULL;
+				GMenu* _tmp10_ = NULL;
+				gint _tmp11_ = 0;
+				GMenuModel* _tmp12_ = NULL;
+				GMenu* _tmp13_ = NULL;
+				gint model_items = 0;
+				GMenuModel* _tmp14_ = NULL;
+				gint _tmp15_ = 0;
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+				if (!_tmp6_) {
+#line 7933 "Page.c"
+					gint _tmp7_ = 0;
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp7_ = i;
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+					i = _tmp7_ + 1;
+#line 7939 "Page.c"
+				}
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp6_ = FALSE;
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp8_ = i;
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp9_ = items;
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+				if (!(_tmp8_ < _tmp9_)) {
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+					break;
+#line 7951 "Page.c"
+				}
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp10_ = bar;
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp11_ = i;
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp12_ = g_menu_model_get_item_link (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_menu_model_get_type (), GMenuModel), _tmp11_, G_MENU_LINK_SUBMENU);
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
+				model = _tmp12_;
 #line 1161 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->last_timeout_id = (guint) 0;
-#line 1163 "/home/jens/Source/shotwell/src/Page.vala"
-	result = FALSE;
-#line 1163 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp13_ = bar;
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
+				if (_tmp13_ == NULL) {
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+					_g_object_unref0 (model);
+#line 1162 "/home/jens/Source/shotwell/src/Page.vala"
+					continue;
+#line 7969 "Page.c"
+				}
+#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp14_ = model;
+#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp15_ = g_menu_model_get_n_items (_tmp14_);
+#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
+				model_items = _tmp15_;
+#line 7977 "Page.c"
+				{
+					gint j = 0;
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+					j = 0;
+#line 7982 "Page.c"
+					{
+						gboolean _tmp16_ = FALSE;
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+						_tmp16_ = TRUE;
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+						while (TRUE) {
+#line 7989 "Page.c"
+							gint _tmp18_ = 0;
+							gint _tmp19_ = 0;
+							GMenuModel* subsection = NULL;
+							GMenuModel* _tmp20_ = NULL;
+							gint _tmp21_ = 0;
+							GMenuModel* _tmp22_ = NULL;
+							GMenuModel* _tmp23_ = NULL;
+							gint sub_items = 0;
+							GMenuModel* _tmp24_ = NULL;
+							gint _tmp25_ = 0;
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+							if (!_tmp16_) {
+#line 8002 "Page.c"
+								gint _tmp17_ = 0;
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp17_ = j;
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+								j = _tmp17_ + 1;
+#line 8008 "Page.c"
+							}
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp16_ = FALSE;
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp18_ = j;
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp19_ = model_items;
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+							if (!(_tmp18_ < _tmp19_)) {
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+								break;
+#line 8020 "Page.c"
+							}
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp20_ = model;
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp21_ = j;
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp22_ = g_menu_model_get_item_link (_tmp20_, _tmp21_, G_MENU_LINK_SECTION);
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+							subsection = _tmp22_;
+#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp23_ = subsection;
+#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
+							if (_tmp23_ == NULL) {
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
+								_g_object_unref0 (subsection);
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
+								continue;
+#line 8038 "Page.c"
+							}
+#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp24_ = subsection;
+#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp25_ = g_menu_model_get_n_items (_tmp24_);
+#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
+							sub_items = _tmp25_;
+#line 8046 "Page.c"
+							{
+								gint k = 0;
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+								k = 0;
+#line 8051 "Page.c"
+								{
+									gboolean _tmp26_ = FALSE;
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp26_ = TRUE;
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+									while (TRUE) {
+#line 8058 "Page.c"
+										gint _tmp28_ = 0;
+										gint _tmp29_ = 0;
+										GMenuAttributeIter* it = NULL;
+										GMenuModel* _tmp30_ = NULL;
+										gint _tmp31_ = 0;
+										GMenuAttributeIter* _tmp32_ = NULL;
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+										if (!_tmp26_) {
+#line 8067 "Page.c"
+											gint _tmp27_ = 0;
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+											_tmp27_ = k;
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+											k = _tmp27_ + 1;
+#line 8073 "Page.c"
+										}
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp26_ = FALSE;
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp28_ = k;
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp29_ = sub_items;
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+										if (!(_tmp28_ < _tmp29_)) {
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+											break;
+#line 8085 "Page.c"
+										}
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp30_ = subsection;
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp31_ = k;
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+										_tmp32_ = g_menu_model_iterate_item_attributes (_tmp30_, _tmp31_);
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+										it = _tmp32_;
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+										while (TRUE) {
+#line 8097 "Page.c"
+											GMenuAttributeIter* _tmp33_ = NULL;
+											gboolean _tmp34_ = FALSE;
+											GMenuAttributeIter* _tmp35_ = NULL;
+											const gchar* _tmp36_ = NULL;
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+											_tmp33_ = it;
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+											_tmp34_ = g_menu_attribute_iter_next (_tmp33_);
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+											if (!_tmp34_) {
+#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+												break;
+#line 8110 "Page.c"
+											}
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+											_tmp35_ = it;
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+											_tmp36_ = g_menu_attribute_iter_get_name (_tmp35_);
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+											if (g_strcmp0 (_tmp36_, "id") == 0) {
+#line 8118 "Page.c"
+												GMenuAttributeIter* _tmp37_ = NULL;
+												GVariant* _tmp38_ = NULL;
+												GVariant* _tmp39_ = NULL;
+												const gchar* _tmp40_ = NULL;
+												const gchar* _tmp41_ = NULL;
+												gboolean _tmp42_ = FALSE;
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp37_ = it;
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp38_ = g_menu_attribute_iter_get_value (_tmp37_);
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp39_ = _tmp38_;
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp40_ = g_variant_get_string (_tmp39_, NULL);
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp41_ = id;
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+												_tmp42_ = g_strcmp0 (_tmp40_, _tmp41_) == 0;
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+												_g_variant_unref0 (_tmp39_);
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+												if (_tmp42_) {
+#line 8141 "Page.c"
+													GMenu* md = NULL;
+													GMenuModel* _tmp43_ = NULL;
+													GMenu* _tmp44_ = NULL;
+													GMenuItem* m = NULL;
+													GMenuModel* _tmp45_ = NULL;
+													gint _tmp46_ = 0;
+													GMenuItem* _tmp47_ = NULL;
+													GMenuItem* _tmp48_ = NULL;
+													const gchar* _tmp49_ = NULL;
+													GMenu* _tmp50_ = NULL;
+													gint _tmp51_ = 0;
+													GMenu* _tmp52_ = NULL;
+													gint _tmp53_ = 0;
+													GMenuItem* _tmp54_ = NULL;
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp43_ = subsection;
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, g_menu_get_type ()) ? ((GMenu*) _tmp43_) : NULL);
+#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+													md = _tmp44_;
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp45_ = subsection;
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp46_ = k;
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp47_ = g_menu_item_new_from_model (_tmp45_, _tmp46_);
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+													m = _tmp47_;
+#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp48_ = m;
+#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp49_ = new_label;
+#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
+													g_menu_item_set_label (_tmp48_, _tmp49_);
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp50_ = md;
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp51_ = k;
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+													g_menu_remove (_tmp50_, _tmp51_);
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp52_ = md;
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp53_ = k;
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
+													_tmp54_ = m;
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
+													g_menu_insert_item (_tmp52_, _tmp53_, _tmp54_);
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+													_g_object_unref0 (m);
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+													_g_object_unref0 (md);
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+													_g_object_unref0 (it);
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+													_g_object_unref0 (subsection);
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+													_g_object_unref0 (model);
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+													_g_object_unref0 (bar);
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+													return;
+#line 8204 "Page.c"
+												}
+											}
+										}
+#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+										_g_object_unref0 (it);
+#line 8210 "Page.c"
+									}
+								}
+							}
+#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+							_g_object_unref0 (subsection);
+#line 8216 "Page.c"
+						}
+					}
+				}
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+				_g_object_unref0 (model);
+#line 8222 "Page.c"
+			}
+		}
+	}
+#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (bar);
+#line 8228 "Page.c"
+}
+
+
+GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gchar* extension_point) {
+	GMenuModel* result = NULL;
+	gint items = 0;
+	GMenuModel* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	GMenuModel* section = NULL;
+#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_val_if_fail (IS_PAGE (self), NULL);
+#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL);
+#line 1195 "/home/jens/Source/shotwell/src/Page.vala"
+	g_return_val_if_fail (extension_point != NULL, NULL);
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = model;
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = g_menu_model_get_n_items (_tmp0_);
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
+	items = _tmp1_;
+#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+	section = NULL;
+#line 8252 "Page.c"
+	{
+		gint i = 0;
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+		i = 0;
+#line 8257 "Page.c"
+		{
+			gboolean _tmp2_ = FALSE;
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+			_tmp2_ = TRUE;
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+			while (TRUE) {
+#line 8264 "Page.c"
+				gboolean _tmp4_ = FALSE;
+				gint _tmp5_ = 0;
+				gint _tmp6_ = 0;
+				gchar* name = NULL;
+				GMenuModel* _tmp8_ = NULL;
+				gint _tmp9_ = 0;
+				const gchar* _tmp10_ = NULL;
+				const gchar* _tmp11_ = NULL;
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+				if (!_tmp2_) {
+#line 8275 "Page.c"
+					gint _tmp3_ = 0;
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp3_ = i;
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+					i = _tmp3_ + 1;
+#line 8281 "Page.c"
+				}
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp2_ = FALSE;
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp5_ = i;
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp6_ = items;
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+				if (_tmp5_ < _tmp6_) {
+#line 8291 "Page.c"
+					GMenuModel* _tmp7_ = NULL;
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp7_ = section;
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp4_ = _tmp7_ == NULL;
+#line 8297 "Page.c"
+				} else {
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp4_ = FALSE;
+#line 8301 "Page.c"
+				}
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+				if (!_tmp4_) {
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+					break;
+#line 8307 "Page.c"
+				}
+#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
+				name = NULL;
+#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp8_ = model;
+#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp9_ = i;
+#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+				g_menu_model_get_item_attribute (_tmp8_, _tmp9_, "id", "s", &name, NULL);
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp10_ = name;
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+				_tmp11_ = extension_point;
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
+#line 8323 "Page.c"
+					GMenuModel* _tmp12_ = NULL;
+					gint _tmp13_ = 0;
+					GMenuModel* _tmp14_ = NULL;
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp12_ = model;
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp13_ = i;
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp14_ = g_menu_model_get_item_link (_tmp12_, _tmp13_, G_MENU_LINK_SECTION);
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+					_g_object_unref0 (section);
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+					section = _tmp14_;
+#line 8337 "Page.c"
+				} else {
+					GMenuModel* subsection = NULL;
+					GMenuModel* _tmp15_ = NULL;
+					gint _tmp16_ = 0;
+					GMenuModel* _tmp17_ = NULL;
+					GMenuModel* _tmp18_ = NULL;
+					gint sub_items = 0;
+					GMenuModel* _tmp19_ = NULL;
+					gint _tmp20_ = 0;
+#line 1206 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp15_ = model;
+#line 1206 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp16_ = i;
+#line 1206 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp17_ = g_menu_model_get_item_link (_tmp15_, _tmp16_, G_MENU_LINK_SECTION);
+#line 1206 "/home/jens/Source/shotwell/src/Page.vala"
+					subsection = _tmp17_;
+#line 1208 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp18_ = subsection;
+#line 1208 "/home/jens/Source/shotwell/src/Page.vala"
+					if (_tmp18_ == NULL) {
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
+						_g_object_unref0 (subsection);
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
+						_g_free0 (name);
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
+						continue;
+#line 8365 "Page.c"
+					}
+#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp19_ = subsection;
+#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+					_tmp20_ = g_menu_model_get_n_items (_tmp19_);
+#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+					sub_items = _tmp20_;
+#line 8373 "Page.c"
+					{
+						gint j = 0;
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+						j = 0;
+#line 8378 "Page.c"
+						{
+							gboolean _tmp21_ = FALSE;
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+							_tmp21_ = TRUE;
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+							while (TRUE) {
+#line 8385 "Page.c"
+								gboolean _tmp23_ = FALSE;
+								gint _tmp24_ = 0;
+								gint _tmp25_ = 0;
+								GMenuModel* submenu = NULL;
+								GMenuModel* _tmp27_ = NULL;
+								gint _tmp28_ = 0;
+								GMenuModel* _tmp29_ = NULL;
+								GMenuModel* _tmp30_ = NULL;
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+								if (!_tmp21_) {
+#line 8396 "Page.c"
+									gint _tmp22_ = 0;
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp22_ = j;
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+									j = _tmp22_ + 1;
+#line 8402 "Page.c"
+								}
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp21_ = FALSE;
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp24_ = j;
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp25_ = sub_items;
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+								if (_tmp24_ < _tmp25_) {
+#line 8412 "Page.c"
+									GMenuModel* _tmp26_ = NULL;
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp26_ = section;
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp23_ = _tmp26_ == NULL;
+#line 8418 "Page.c"
+								} else {
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp23_ = FALSE;
+#line 8422 "Page.c"
+								}
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+								if (!_tmp23_) {
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+									break;
+#line 8428 "Page.c"
+								}
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp27_ = subsection;
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp28_ = j;
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp29_ = g_menu_model_get_item_link (_tmp27_, _tmp28_, G_MENU_LINK_SUBMENU);
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+								submenu = _tmp29_;
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+								_tmp30_ = submenu;
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+								if (_tmp30_ != NULL) {
+#line 8442 "Page.c"
+									GMenuModel* _tmp31_ = NULL;
+									const gchar* _tmp32_ = NULL;
+									GMenuModel* _tmp33_ = NULL;
+#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp31_ = submenu;
+#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp32_ = extension_point;
+#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+									_tmp33_ = page_find_extension_point (self, _tmp31_, _tmp32_);
+#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+									_g_object_unref0 (section);
+#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
+									section = _tmp33_;
+#line 8456 "Page.c"
+								}
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+								_g_object_unref0 (submenu);
+#line 8460 "Page.c"
+							}
+						}
+					}
+#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+					_g_object_unref0 (subsection);
+#line 8466 "Page.c"
+				}
+#line 1200 "/home/jens/Source/shotwell/src/Page.vala"
+				_g_free0 (name);
+#line 8470 "Page.c"
+			}
+		}
+	}
+#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
+	result = section;
+#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8094 "Page.c"
+#line 8478 "Page.c"
 }
 
 
 static void page_class_init (PageClass * klass) {
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	page_parent_class = g_type_class_peek_parent (klass);
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (PagePrivate));
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->destroy = page_real_destroy;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_page_name = page_real_set_page_name;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_container = page_real_set_container;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->clear_container = page_real_clear_container;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->get_menubar = page_real_get_menubar;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->get_page_ui_widget = page_real_get_page_ui_widget;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->get_toolbar = page_real_get_toolbar;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->get_page_context_menu = page_real_get_page_context_menu;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switching_from = page_real_switching_from;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = page_real_switched_to;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->ready = page_real_ready;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switching_to_fullscreen = page_real_switching_to_fullscreen;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->returning_from_fullscreen = page_real_returning_from_fullscreen;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+	((PageClass *) klass)->add_actions = page_real_add_actions;
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = page_real_init_collect_ui_filenames;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->init_collect_action_entries = page_real_init_collect_action_entries;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->init_collect_toggle_action_entries = page_real_init_collect_toggle_action_entries;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
-	((PageClass *) klass)->register_radio_actions = page_real_register_radio_actions;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->init_collect_injection_groups = page_real_init_collect_injection_groups;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->init_actions = page_real_init_actions;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->update_actions = page_real_update_actions;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->source_drag_failed = page_real_source_drag_failed;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_click = page_real_on_left_click;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_middle_click = page_real_on_middle_click;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_right_click = page_real_on_right_click;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_released = page_real_on_left_released;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_middle_released = page_real_on_middle_released;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_right_released = page_real_on_right_released;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_ctrl_pressed = page_real_on_ctrl_pressed;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_ctrl_released = page_real_on_ctrl_released;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_alt_pressed = page_real_on_alt_pressed;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_alt_released = page_real_on_alt_released;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_shift_pressed = page_real_on_shift_pressed;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_shift_released = page_real_on_shift_released;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_super_pressed = page_real_on_super_pressed;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_super_released = page_real_on_super_released;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_app_key_pressed = page_real_on_app_key_pressed;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_app_key_released = page_real_on_app_key_released;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_move = page_real_on_move;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_move_start = page_real_on_move_start;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_move_finished = page_real_on_move_finished;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_resize = page_real_on_resize;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_resize_start = page_real_on_resize_start;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_resize_finished = page_real_on_resize_finished;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_configure = page_real_on_configure;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_motion = page_real_on_motion;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_leave_notify_event = page_real_on_leave_notify_event;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_mousewheel_up = page_real_on_mousewheel_up;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_mousewheel_down = page_real_on_mousewheel_down;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_mousewheel_left = page_real_on_mousewheel_left;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_mousewheel_right = page_real_on_mousewheel_right;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = page_real_on_context_keypress;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_buttonpress = page_real_on_context_buttonpress;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_invoked = page_real_on_context_invoked;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_page_cursor = page_real_set_page_cursor;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_finalize;
-#line 8213 "Page.c"
+#line 8589 "Page.c"
 }
 
 
 static void page_instance_init (Page * self) {
-	guint* _tmp0_ = NULL;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkBuilder* _tmp0_ = NULL;
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = PAGE_GET_PRIVATE (self);
-#line 54 "/home/jens/Source/shotwell/src/Page.vala"
+#line 62 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = gtk_builder_new ();
+#line 62 "/home/jens/Source/shotwell/src/Page.vala"
+	self->builder = _tmp0_;
+#line 64 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = FALSE;
-#line 57 "/home/jens/Source/shotwell/src/Page.vala"
+#line 67 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->view = NULL;
-#line 58 "/home/jens/Source/shotwell/src/Page.vala"
+#line 68 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->container = NULL;
-#line 60 "/home/jens/Source/shotwell/src/Page.vala"
+#line 70 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&self->priv->last_position, 0, sizeof (GdkRectangle));
-#line 61 "/home/jens/Source/shotwell/src/Page.vala"
+#line 71 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
-#line 62 "/home/jens/Source/shotwell/src/Page.vala"
+#line 72 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = FALSE;
-#line 63 "/home/jens/Source/shotwell/src/Page.vala"
+#line 73 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = (gulong) 0;
-#line 64 "/home/jens/Source/shotwell/src/Page.vala"
+#line 74 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_move_finished = FALSE;
-#line 65 "/home/jens/Source/shotwell/src/Page.vala"
+#line 75 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_resize_finished = FALSE;
-#line 66 "/home/jens/Source/shotwell/src/Page.vala"
+#line 76 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&self->priv->last_down, 0, sizeof (GdkPoint));
-#line 67 "/home/jens/Source/shotwell/src/Page.vala"
+#line 77 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->is_destroyed = FALSE;
-#line 68 "/home/jens/Source/shotwell/src/Page.vala"
+#line 78 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->ctrl_pressed = FALSE;
-#line 69 "/home/jens/Source/shotwell/src/Page.vala"
+#line 79 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->alt_pressed = FALSE;
-#line 70 "/home/jens/Source/shotwell/src/Page.vala"
+#line 80 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->shift_pressed = FALSE;
-#line 71 "/home/jens/Source/shotwell/src/Page.vala"
+#line 81 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->super_pressed = FALSE;
-#line 72 "/home/jens/Source/shotwell/src/Page.vala"
+#line 82 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_cursor = GDK_LEFT_PTR;
-#line 73 "/home/jens/Source/shotwell/src/Page.vala"
+#line 83 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hidden = FALSE;
-#line 74 "/home/jens/Source/shotwell/src/Page.vala"
+#line 84 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = 0;
-#line 75 "/home/jens/Source/shotwell/src/Page.vala"
+#line 85 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_timeout_id = (guint) 0;
-#line 76 "/home/jens/Source/shotwell/src/Page.vala"
+#line 86 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_time_cached = 0;
-#line 77 "/home/jens/Source/shotwell/src/Page.vala"
+#line 87 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = FALSE;
-#line 78 "/home/jens/Source/shotwell/src/Page.vala"
+#line 88 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->update_actions_scheduler = NULL;
-#line 79 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->action_group = NULL;
-#line 80 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->common_action_groups = NULL;
-#line 80 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->common_action_groups_length1 = 0;
-#line 80 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->_common_action_groups_size_ = self->priv->common_action_groups_length1;
-#line 82 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = g_new0 (guint, 0);
-#line 82 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->merge_ids = _tmp0_;
-#line 82 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->merge_ids_length1 = 0;
-#line 82 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->_merge_ids_size_ = self->priv->merge_ids_length1;
-#line 8281 "Page.c"
+#line 208 "/home/jens/Source/shotwell/src/Page.vala"
+	self->priv->menubar_injected = FALSE;
+#line 8647 "Page.c"
 }
 
 
 static void page_finalize (GObject* obj) {
 	Page * self;
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE, Page);
-#line 52 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (self->ui);
-#line 53 "/home/jens/Source/shotwell/src/Page.vala"
+#line 62 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (self->builder);
+#line 63 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->toolbar);
-#line 56 "/home/jens/Source/shotwell/src/Page.vala"
+#line 66 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_name);
-#line 57 "/home/jens/Source/shotwell/src/Page.vala"
+#line 67 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (self->priv->view);
-#line 58 "/home/jens/Source/shotwell/src/Page.vala"
+#line 68 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->container);
-#line 59 "/home/jens/Source/shotwell/src/Page.vala"
+#line 69 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->toolbar_path);
-#line 61 "/home/jens/Source/shotwell/src/Page.vala"
+#line 71 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 78 "/home/jens/Source/shotwell/src/Page.vala"
+#line 88 "/home/jens/Source/shotwell/src/Page.vala"
 	_one_shot_scheduler_unref0 (self->priv->update_actions_scheduler);
-#line 79 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (self->priv->action_group);
-#line 80 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->common_action_groups = (_vala_array_free (self->priv->common_action_groups, self->priv->common_action_groups_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 82 "/home/jens/Source/shotwell/src/Page.vala"
-	self->priv->merge_ids = (g_free (self->priv->merge_ids), NULL);
-#line 49 "/home/jens/Source/shotwell/src/Page.vala"
+#line 59 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (page_parent_class)->finalize (obj);
-#line 8313 "Page.c"
+#line 8673 "Page.c"
 }
 
 
@@ -8338,30 +8698,30 @@ GType checkerboard_page_activator_get_type (void) {
 
 
 static void _checkerboard_page_on_items_hidden_view_collection_items_hidden (ViewCollection* _sender, GeeCollection* hidden, gpointer self) {
-#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_hidden ((CheckerboardPage*) self, hidden);
-#line 8344 "Page.c"
+#line 8704 "Page.c"
 }
 
 
 static void _checkerboard_page_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_contents_altered ((CheckerboardPage*) self, added, removed);
-#line 8351 "Page.c"
+#line 8711 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_state_changed ((CheckerboardPage*) self, changed);
-#line 8358 "Page.c"
+#line 8718 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_visibility_changed ((CheckerboardPage*) self, changed);
-#line 8365 "Page.c"
+#line 8725 "Page.c"
 }
 
 
@@ -8390,141 +8750,141 @@ CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* p
 	ViewCollection* _tmp20_ = NULL;
 	ViewCollection* _tmp21_ = NULL;
 	ViewCollection* _tmp22_ = NULL;
-#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 1202 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (CheckerboardPage*) page_construct (object_type, _tmp0_);
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_new (_tmp2_);
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->layout = _tmp3_;
-#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->layout;
-#line 1205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_name;
-#line 1205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp4_, _tmp5_);
-#line 1207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->layout;
-#line 1207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_event_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1271 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_scrolled_window_set_shadow_type (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_SHADOW_NONE);
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->viewport;
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->viewport;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp8_, GTK_SHADOW_NONE);
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->viewport;
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->layout;
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 1219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = gtk_scrolled_window_get_hadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1219 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_adjustments (_tmp11_, _tmp12_, _tmp13_);
-#line 1221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->viewport;
-#line 1221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp16_, "items-hidden", (GCallback) _checkerboard_page_on_items_hidden_view_collection_items_hidden, self, 0);
-#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _checkerboard_page_on_contents_altered_data_collection_contents_altered, self, 0);
-#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp20_, "items-state-changed", (GCallback) _checkerboard_page_on_items_state_changed_view_collection_items_state_changed, self, 0);
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = _tmp21_;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (_tmp22_, "items-visibility-changed", (GCallback) _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed, self, 0);
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 1230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_scrolled_window_set_policy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 1201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 8490 "Page.c"
+#line 8850 "Page.c"
 }
 
 
 void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = _tmp1_;
-#line 8509 "Page.c"
+#line 8869 "Page.c"
 }
 
 
 void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = _tmp1_;
-#line 8528 "Page.c"
+#line 8888 "Page.c"
 }
 
 
@@ -8535,124 +8895,172 @@ GtkMenu* checkerboard_page_get_context_menu (CheckerboardPage* self) {
 	ViewCollection* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
-#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != 0;
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 8553 "Page.c"
+#line 8913 "Page.c"
 		GtkMenu* _tmp5_ = NULL;
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = checkerboard_page_get_item_context_menu (self);
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp5_;
-#line 8561 "Page.c"
+#line 8921 "Page.c"
 	} else {
 		GtkMenu* _tmp6_ = NULL;
-#line 1244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp6_;
-#line 8570 "Page.c"
+#line 8930 "Page.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8576 "Page.c"
+#line 8936 "Page.c"
 }
 
 
 static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage* self) {
 	GtkMenu* result = NULL;
-	GtkMenu* menu = NULL;
-	GtkUIManager* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkWidget* _tmp2_ = NULL;
-	GtkMenu* _tmp3_ = NULL;
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->ui;
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = self->priv->item_context_menu_path;
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = gtk_ui_manager_get_widget (_tmp0_, _tmp1_);
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_menu_get_type (), GtkMenu));
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
-	menu = _tmp3_;
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
-	_vala_assert (menu != NULL, "menu != null");
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
-	result = menu;
-#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkMenu* _tmp0_ = NULL;
+	GtkMenu* _tmp8_ = NULL;
+	GtkMenu* _tmp9_ = NULL;
+#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = self->priv->item_context_menu;
+#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp0_ == NULL) {
+#line 8949 "Page.c"
+		GMenuModel* model = NULL;
+		GtkBuilder* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+		GObject* _tmp3_ = NULL;
+		GMenuModel* _tmp4_ = NULL;
+		GMenuModel* _tmp5_ = NULL;
+		GtkMenu* _tmp6_ = NULL;
+		GtkMenu* _tmp7_ = NULL;
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp2_ = self->priv->item_context_menu_path;
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
+#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+		model = _tmp4_;
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = model;
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+		g_object_ref_sink (_tmp6_);
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (self->priv->item_context_menu);
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+		self->priv->item_context_menu = _tmp6_;
+#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp7_ = self->priv->item_context_menu;
+#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+		gtk_menu_attach_to_widget (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
+#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (model);
+#line 8984 "Page.c"
+	}
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp8_ = self->priv->item_context_menu;
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp9_ = _g_object_ref0 (_tmp8_);
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+	result = _tmp9_;
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8603 "Page.c"
+#line 8994 "Page.c"
 }
 
 
 GtkMenu* checkerboard_page_get_item_context_menu (CheckerboardPage* self) {
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_item_context_menu (self);
-#line 8612 "Page.c"
+#line 9003 "Page.c"
 }
 
 
 static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) {
 	CheckerboardPage * self;
 	GtkMenu* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	GtkMenu* menu = NULL;
-	GtkUIManager* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	GtkWidget* _tmp3_ = NULL;
-	GtkMenu* _tmp4_ = NULL;
-	GtkMenu* _tmp5_ = NULL;
-#line 1253 "/home/jens/Source/shotwell/src/Page.vala"
+	GtkMenu* _tmp0_ = NULL;
+	GtkMenu* _tmp8_ = NULL;
+	GtkMenu* _tmp9_ = NULL;
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1254 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = self->priv->page_context_menu_path;
-#line 1254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = self->priv->page_context_menu;
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
-		result = NULL;
-#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
-		return result;
-#line 8636 "Page.c"
-	}
-#line 1256 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->ui;
-#line 1256 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = self->priv->page_context_menu_path;
-#line 1256 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = gtk_ui_manager_get_widget (_tmp1_, _tmp2_);
-#line 1256 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_menu_get_type (), GtkMenu));
-#line 1256 "/home/jens/Source/shotwell/src/Page.vala"
-	menu = _tmp4_;
-#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp5_ = menu;
-#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
-	_vala_assert (_tmp5_ != NULL, "menu != null");
-#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
-	result = menu;
-#line 1258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 9019 "Page.c"
+		GMenuModel* model = NULL;
+		GtkBuilder* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+		GObject* _tmp3_ = NULL;
+		GMenuModel* _tmp4_ = NULL;
+		GMenuModel* _tmp5_ = NULL;
+		GtkMenu* _tmp6_ = NULL;
+		GtkMenu* _tmp7_ = NULL;
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp2_ = self->priv->page_context_menu_path;
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
+#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+		model = _tmp4_;
+#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = model;
+#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
+#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+		g_object_ref_sink (_tmp6_);
+#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (self->priv->page_context_menu);
+#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+		self->priv->page_context_menu = _tmp6_;
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp7_ = self->priv->page_context_menu;
+#line 1327 "/home/jens/Source/shotwell/src/Page.vala"
+		gtk_menu_attach_to_widget (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
+#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (model);
+#line 9054 "Page.c"
+	}
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp8_ = self->priv->page_context_menu;
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp9_ = _g_object_ref0 (_tmp8_);
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+	result = _tmp9_;
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8656 "Page.c"
+#line 9064 "Page.c"
 }
 
 
@@ -8663,23 +9071,23 @@ static gboolean checkerboard_page_real_on_context_keypress (Page* base) {
 	GtkMenu* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1333 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = checkerboard_page_get_context_menu (self);
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8683 "Page.c"
+#line 9091 "Page.c"
 }
 
 
@@ -8687,24 +9095,24 @@ static gchar* checkerboard_page_real_get_view_empty_message (CheckerboardPage* s
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = _ ("No photos/videos");
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8699 "Page.c"
+#line 9107 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_view_empty_message (CheckerboardPage* self) {
-#line 1265 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1265 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_empty_message (self);
-#line 8708 "Page.c"
+#line 9116 "Page.c"
 }
 
 
@@ -8712,42 +9120,42 @@ static gchar* checkerboard_page_real_get_filter_no_match_message (CheckerboardPa
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = _ ("No photos/videos found which match the current filter");
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8724 "Page.c"
+#line 9132 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_filter_no_match_message (CheckerboardPage* self) {
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_filter_no_match_message (self);
-#line 8733 "Page.c"
+#line 9141 "Page.c"
 }
 
 
 static void checkerboard_page_real_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 8742 "Page.c"
+#line 9150 "Page.c"
 }
 
 
 void checkerboard_page_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->on_item_activated (self, item, activator, modifiers);
-#line 8751 "Page.c"
+#line 9159 "Page.c"
 }
 
 
@@ -8755,61 +9163,61 @@ CheckerboardLayout* checkerboard_page_get_checkerboard_layout (CheckerboardPage*
 	CheckerboardLayout* result = NULL;
 	CheckerboardLayout* _tmp0_ = NULL;
 	CheckerboardLayout* _tmp1_ = NULL;
-#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8769 "Page.c"
+#line 9177 "Page.c"
 }
 
 
 static SearchViewFilter* checkerboard_page_real_get_search_view_filter (CheckerboardPage* self) {
-#line 1282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 	g_critical ("Type `%s' does not implement abstract method `checkerboard_page_get_search_view_filter'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 8778 "Page.c"
+#line 9186 "Page.c"
 }
 
 
 SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self) {
-#line 1282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_search_view_filter (self);
-#line 8787 "Page.c"
+#line 9195 "Page.c"
 }
 
 
 static CoreViewTracker* checkerboard_page_real_get_view_tracker (CheckerboardPage* self) {
 	CoreViewTracker* result = NULL;
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8797 "Page.c"
+#line 9205 "Page.c"
 }
 
 
 CoreViewTracker* checkerboard_page_get_view_tracker (CheckerboardPage* self) {
-#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_tracker (self);
-#line 8806 "Page.c"
+#line 9214 "Page.c"
 }
 
 
 static void _checkerboard_page_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self) {
-#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh ((CheckerboardPage*) self);
-#line 8813 "Page.c"
+#line 9221 "Page.c"
 }
 
 
@@ -8821,33 +9229,33 @@ static void checkerboard_page_real_switching_from (Page* base) {
 	guint _tmp3_ = 0U;
 	ViewCollection* _tmp4_ = NULL;
 	ViewCollection* _tmp5_ = NULL;
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, FALSE);
-#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp3_, NULL, FALSE);
-#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIEW_FILTER, ViewFilter), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _checkerboard_page_on_view_filter_refresh_view_filter_refresh, self);
-#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_all (_tmp5_);
-#line 1293 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (checkerboard_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 8851 "Page.c"
+#line 9259 "Page.c"
 }
 
 
@@ -8860,35 +9268,35 @@ static void checkerboard_page_real_switched_to (Page* base) {
 	ViewCollection* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
 	gboolean _tmp6_ = FALSE;
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1371 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1371 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, TRUE);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIEW_FILTER, ViewFilter), "refresh", (GCallback) _checkerboard_page_on_view_filter_refresh_view_filter_refresh, self, 0);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh (self);
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_ > 0;
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp4_);
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 8892 "Page.c"
+#line 9300 "Page.c"
 		CheckerboardItem* item = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
@@ -8903,37 +9311,37 @@ static void checkerboard_page_real_switched_to (Page* base) {
 		GdkRectangle _tmp16_ = {0};
 		gint _tmp17_ = 0;
 		AdjustmentRelation _tmp18_ = 0;
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_at (_tmp8_, 0);
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp10_;
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
 		vadj = _tmp12_;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = vadj;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = item;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->allocation;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = _tmp16_.y;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp14_, _tmp17_);
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp18_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 8937 "Page.c"
+#line 9345 "Page.c"
 			GtkAdjustment* _tmp19_ = NULL;
 			CheckerboardItem* _tmp20_ = NULL;
 			GdkRectangle _tmp21_ = {0};
@@ -8942,33 +9350,33 @@ static void checkerboard_page_real_switched_to (Page* base) {
 			GdkRectangle _tmp24_ = {0};
 			gint _tmp25_ = 0;
 			AdjustmentRelation _tmp26_ = 0;
-#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = vadj;
-#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = item;
-#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_->allocation;
-#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = _tmp21_.y;
-#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = item;
-#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = _tmp23_->allocation;
-#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = get_adjustment_relation (_tmp19_, _tmp22_ + _tmp25_);
-#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp26_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 8964 "Page.c"
+#line 9372 "Page.c"
 		} else {
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = FALSE;
-#line 8968 "Page.c"
+#line 9376 "Page.c"
 		}
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp13_) {
-#line 8972 "Page.c"
+#line 9380 "Page.c"
 			gint top = 0;
 			CheckerboardItem* _tmp27_ = NULL;
 			GdkRectangle _tmp28_ = {0};
@@ -8977,38 +9385,38 @@ static void checkerboard_page_real_switched_to (Page* base) {
 			gdouble _tmp31_ = 0.0;
 			GtkAdjustment* _tmp45_ = NULL;
 			gint _tmp46_ = 0;
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Page.vala"
 			top = 0;
-#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = item;
-#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_->allocation;
-#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _tmp28_.y;
-#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = vadj;
-#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = gtk_adjustment_get_value (_tmp30_);
-#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 			if (((gdouble) _tmp29_) < _tmp31_) {
-#line 8995 "Page.c"
+#line 9403 "Page.c"
 				CheckerboardItem* _tmp32_ = NULL;
 				GdkRectangle _tmp33_ = {0};
 				gint _tmp34_ = 0;
 				gint _tmp35_ = 0;
-#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = item;
-#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp33_ = _tmp32_->allocation;
-#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = _tmp33_.y;
-#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp34_;
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = top;
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp35_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9012 "Page.c"
+#line 9420 "Page.c"
 			} else {
 				CheckerboardItem* _tmp36_ = NULL;
 				GdkRectangle _tmp37_ = {0};
@@ -9019,91 +9427,91 @@ static void checkerboard_page_real_switched_to (Page* base) {
 				GtkAdjustment* _tmp42_ = NULL;
 				gdouble _tmp43_ = 0.0;
 				gint _tmp44_ = 0;
-#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = item;
-#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = _tmp36_->allocation;
-#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_.y;
-#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = item;
-#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = _tmp39_->allocation;
-#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_.height;
-#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = vadj;
-#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = gtk_adjustment_get_page_size (_tmp42_);
-#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
 				top = (_tmp38_ + _tmp41_) - ((gint) _tmp43_);
-#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = top;
-#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp44_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9045 "Page.c"
+#line 9453 "Page.c"
 			}
-#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = vadj;
-#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = top;
-#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_adjustment_set_value (_tmp45_, (gdouble) _tmp46_);
-#line 9053 "Page.c"
+#line 9461 "Page.c"
 		}
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 9059 "Page.c"
+#line 9467 "Page.c"
 	}
-#line 1326 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1398 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (checkerboard_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 9063 "Page.c"
+#line 9471 "Page.c"
 }
 
 
 static void checkerboard_page_on_view_filter_refresh (CheckerboardPage* self) {
-#line 1329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9072 "Page.c"
+#line 9480 "Page.c"
 }
 
 
 static void checkerboard_page_on_contents_altered (CheckerboardPage* self, GeeIterable* added, GeeIterable* removed) {
-#line 1333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1407 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9085 "Page.c"
+#line 9493 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_state_changed (CheckerboardPage* self, GeeIterable* changed) {
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (changed));
-#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9096 "Page.c"
+#line 9504 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_visibility_changed (CheckerboardPage* self, GeeCollection* changed) {
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (changed));
-#line 1343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9107 "Page.c"
+#line 9515 "Page.c"
 }
 
 
@@ -9113,87 +9521,87 @@ static void checkerboard_page_update_view_filter_message (CheckerboardPage* self
 	ViewCollection* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_are_items_filtered_out (_tmp2_);
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 9131 "Page.c"
+#line 9539 "Page.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_ == 0;
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 9145 "Page.c"
+#line 9553 "Page.c"
 	} else {
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 9149 "Page.c"
+#line 9557 "Page.c"
 	}
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 9153 "Page.c"
+#line 9561 "Page.c"
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_page_get_filter_no_match_message (self);
-#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_set_page_message (self, _tmp9_);
-#line 1348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp9_);
-#line 9164 "Page.c"
+#line 9572 "Page.c"
 	} else {
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		gboolean _tmp13_ = FALSE;
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_ == 0;
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp13_) {
-#line 9182 "Page.c"
+#line 9590 "Page.c"
 			gchar* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = checkerboard_page_get_view_empty_message (self);
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_;
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_set_page_message (self, _tmp15_);
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp15_);
-#line 9193 "Page.c"
+#line 9601 "Page.c"
 		} else {
-#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_unset_page_message (self);
-#line 9197 "Page.c"
+#line 9605 "Page.c"
 		}
 	}
 }
@@ -9203,27 +9611,27 @@ void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* me
 	CheckerboardLayout* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (message != NULL);
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = message;
-#line 1357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_message (_tmp0_, _tmp1_);
-#line 1358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_) {
-#line 9221 "Page.c"
+#line 9629 "Page.c"
 		CheckerboardLayout* _tmp3_ = NULL;
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->layout;
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 9227 "Page.c"
+#line 9635 "Page.c"
 	}
 }
 
@@ -9231,23 +9639,23 @@ void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* me
 void checkerboard_page_unset_page_message (CheckerboardPage* self) {
 	CheckerboardLayout* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_unset_message (_tmp0_);
-#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 9245 "Page.c"
+#line 9653 "Page.c"
 		CheckerboardLayout* _tmp2_ = NULL;
-#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 9251 "Page.c"
+#line 9659 "Page.c"
 	}
 }
 
@@ -9257,21 +9665,21 @@ static void checkerboard_page_real_set_page_name (Page* base, const gchar* name)
 	const gchar* _tmp0_ = NULL;
 	CheckerboardLayout* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (checkerboard_page_parent_class)->set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_);
-#line 1371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->layout;
-#line 1371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = name;
-#line 1371 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp1_, _tmp2_);
-#line 9275 "Page.c"
+#line 9683 "Page.c"
 }
 
 
@@ -9281,43 +9689,43 @@ CheckerboardItem* checkerboard_page_get_item_at_pixel (CheckerboardPage* self, g
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	CheckerboardItem* _tmp3_ = NULL;
-#line 1374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_get_item_at_pixel (_tmp0_, _tmp1_, _tmp2_);
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9299 "Page.c"
+#line 9707 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterable* hidden) {
-#line 1378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (hidden));
-#line 9308 "Page.c"
+#line 9716 "Page.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = hidden;
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		_view_it = _tmp1_;
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 9321 "Page.c"
+#line 9729 "Page.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			DataView* view = NULL;
@@ -9332,73 +9740,73 @@ static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterab
 			CheckerboardItem* _tmp11_ = NULL;
 			CheckerboardItem* _tmp12_ = NULL;
 			CheckerboardItem* _tmp13_ = NULL;
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = _view_it;
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp3_) {
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9344 "Page.c"
+#line 9752 "Page.c"
 			}
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = _view_it;
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 			view = (DataView*) _tmp5_;
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = view;
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp7_;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = self->anchor;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = item;
-#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp8_ == _tmp9_) {
-#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = NULL;
-#line 9368 "Page.c"
+#line 9776 "Page.c"
 			}
-#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1457 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = self->cursor;
-#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1457 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = item;
-#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1457 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = NULL;
-#line 9380 "Page.c"
+#line 9788 "Page.c"
 			}
-#line 1388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = self->priv->highlighted;
-#line 1388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = item;
-#line 1388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp12_ == _tmp13_) {
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->highlighted);
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->highlighted = NULL;
-#line 9392 "Page.c"
+#line 9800 "Page.c"
 			}
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (view);
-#line 9398 "Page.c"
+#line 9806 "Page.c"
 		}
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_view_it);
-#line 9402 "Page.c"
+#line 9810 "Page.c"
 	}
 }
 
@@ -9415,138 +9823,138 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	GQuark _tmp7_ = 0U;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label0 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label1 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label2 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label3 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label4 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label5 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label6 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label7 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label8 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label9 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label10 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label12 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label13 = 0;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label14 = 0;
-#line 9449 "Page.c"
+#line 9857 "Page.c"
 	gboolean _tmp45_ = FALSE;
 	gboolean _tmp46_ = FALSE;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 1397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->state;
-#line 1397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1469 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp1_ & GDK_SHIFT_MASK);
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_);
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("Up")))) || (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("KP_Up"))))) {
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9478 "Page.c"
+#line 9886 "Page.c"
 			default:
 			{
 				guint _tmp8_ = 0U;
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_NORTH);
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = state;
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp8_);
-#line 1404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9490 "Page.c"
+#line 9898 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label2) ? _tmp6_label2 : (_tmp6_label2 = g_quark_from_static_string ("Down")))) || (_tmp7_ == ((0 != _tmp6_label3) ? _tmp6_label3 : (_tmp6_label3 = g_quark_from_static_string ("KP_Down"))))) {
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9496 "Page.c"
+#line 9904 "Page.c"
 			default:
 			{
 				guint _tmp9_ = 0U;
-#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_SOUTH);
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = state;
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp9_);
-#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9508 "Page.c"
+#line 9916 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label4) ? _tmp6_label4 : (_tmp6_label4 = g_quark_from_static_string ("Left")))) || (_tmp7_ == ((0 != _tmp6_label5) ? _tmp6_label5 : (_tmp6_label5 = g_quark_from_static_string ("KP_Left"))))) {
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9514 "Page.c"
+#line 9922 "Page.c"
 			default:
 			{
 				guint _tmp10_ = 0U;
-#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_WEST);
-#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = state;
-#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp10_);
-#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9526 "Page.c"
+#line 9934 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label6) ? _tmp6_label6 : (_tmp6_label6 = g_quark_from_static_string ("Right")))) || (_tmp7_ == ((0 != _tmp6_label7) ? _tmp6_label7 : (_tmp6_label7 = g_quark_from_static_string ("KP_Right"))))) {
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9532 "Page.c"
+#line 9940 "Page.c"
 			default:
 			{
 				guint _tmp11_ = 0U;
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1492 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_EAST);
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = state;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp11_);
-#line 1422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9544 "Page.c"
+#line 9952 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label8) ? _tmp6_label8 : (_tmp6_label8 = g_quark_from_static_string ("Home")))) || (_tmp7_ == ((0 != _tmp6_label9) ? _tmp6_label9 : (_tmp6_label9 = g_quark_from_static_string ("KP_Home"))))) {
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9550 "Page.c"
+#line 9958 "Page.c"
 			default:
 			{
 				CheckerboardItem* first = NULL;
@@ -9556,45 +9964,45 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				CheckerboardItem* _tmp15_ = NULL;
 				CheckerboardItem* _tmp16_ = NULL;
 				guint _tmp18_ = 0U;
-#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = _tmp12_;
-#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = view_collection_get_first (_tmp13_);
-#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp13_);
-#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
 				first = _tmp15_;
-#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = first;
-#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_ != NULL) {
-#line 9576 "Page.c"
+#line 9984 "Page.c"
 					CheckerboardItem* _tmp17_ = NULL;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = first;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp17_);
-#line 9582 "Page.c"
+#line 9990 "Page.c"
 				}
-#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = state;
-#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp18_);
-#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (first);
-#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9592 "Page.c"
+#line 10000 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label10) ? _tmp6_label10 : (_tmp6_label10 = g_quark_from_static_string ("End")))) || (_tmp7_ == ((0 != _tmp6_label11) ? _tmp6_label11 : (_tmp6_label11 = g_quark_from_static_string ("KP_End"))))) {
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9598 "Page.c"
+#line 10006 "Page.c"
 			default:
 			{
 				CheckerboardItem* last = NULL;
@@ -9604,100 +10012,100 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				CheckerboardItem* _tmp22_ = NULL;
 				CheckerboardItem* _tmp23_ = NULL;
 				guint _tmp25_ = 0U;
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp19_;
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = view_collection_get_last (_tmp20_);
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp20_);
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
 				last = _tmp22_;
-#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = last;
-#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp23_ != NULL) {
-#line 9624 "Page.c"
+#line 10032 "Page.c"
 					CheckerboardItem* _tmp24_ = NULL;
-#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = last;
-#line 1436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp24_);
-#line 9630 "Page.c"
+#line 10038 "Page.c"
 				}
-#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = state;
-#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp25_);
-#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (last);
-#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9640 "Page.c"
+#line 10048 "Page.c"
 			}
 		}
 	} else if ((_tmp7_ == ((0 != _tmp6_label12) ? _tmp6_label12 : (_tmp6_label12 = g_quark_from_static_string ("Return")))) || (_tmp7_ == ((0 != _tmp6_label13) ? _tmp6_label13 : (_tmp6_label13 = g_quark_from_static_string ("KP_Enter"))))) {
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9646 "Page.c"
+#line 10054 "Page.c"
 			default:
 			{
 				ViewCollection* _tmp26_ = NULL;
 				ViewCollection* _tmp27_ = NULL;
 				gint _tmp28_ = 0;
 				gboolean _tmp29_ = FALSE;
-#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = view_collection_get_selected_count (_tmp27_);
-#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_ == 1;
-#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp27_);
-#line 1442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp29_) {
-#line 9665 "Page.c"
+#line 10073 "Page.c"
 					ViewCollection* _tmp30_ = NULL;
 					ViewCollection* _tmp31_ = NULL;
 					DataView* _tmp32_ = NULL;
 					CheckerboardItem* _tmp33_ = NULL;
 					CheckerboardPageKeyboardModifiers _tmp34_ = {0};
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = _tmp30_;
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = view_collection_get_selected_at (_tmp31_, 0);
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_keyboard_modifiers_init (&_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_on_item_activated (self, _tmp33_, CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD, &_tmp34_);
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp33_);
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp31_);
-#line 9687 "Page.c"
+#line 10095 "Page.c"
 				} else {
-#line 1446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1518 "/home/jens/Source/shotwell/src/Page.vala"
 					handled = FALSE;
-#line 9691 "Page.c"
+#line 10099 "Page.c"
 				}
-#line 1447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9695 "Page.c"
+#line 10103 "Page.c"
 			}
 		}
 	} else if (_tmp7_ == ((0 != _tmp6_label14) ? _tmp6_label14 : (_tmp6_label14 = g_quark_from_static_string ("space")))) {
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9701 "Page.c"
+#line 10109 "Page.c"
 			default:
 			{
 				Marker* marker = NULL;
@@ -9711,89 +10119,89 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				ViewCollection* _tmp42_ = NULL;
 				ViewCollection* _tmp43_ = NULL;
 				Marker* _tmp44_ = NULL;
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = _tmp35_;
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = self->priv->layout;
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = checkerboard_layout_get_cursor (_tmp37_);
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = _tmp38_;
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_OBJECT, DataObject));
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_;
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp39_);
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp36_);
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp41_;
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _tmp42_;
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = marker;
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp43_, _tmp44_);
-#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp43_);
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9749 "Page.c"
+#line 10157 "Page.c"
 			}
 		}
 	} else {
-#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9755 "Page.c"
+#line 10163 "Page.c"
 			default:
 			{
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9762 "Page.c"
+#line 10170 "Page.c"
 			}
 		}
 	}
-#line 1459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = handled;
-#line 1459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp45_) {
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 9774 "Page.c"
+#line 10182 "Page.c"
 	}
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event != NULL) {
-#line 9778 "Page.c"
+#line 10186 "Page.c"
 		GdkEventKey* _tmp47_ = NULL;
 		gboolean _tmp48_ = FALSE;
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = event;
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), gtk_widget_get_type (), GtkWidget), _tmp47_);
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp48_;
-#line 9787 "Page.c"
+#line 10195 "Page.c"
 	} else {
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = TRUE;
-#line 9791 "Page.c"
+#line 10199 "Page.c"
 	}
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp46_;
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9797 "Page.c"
+#line 10205 "Page.c"
 }
 
 
@@ -9817,62 +10225,62 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 	ViewCollection* _tmp107_ = NULL;
 	gint _tmp108_ = 0;
 	gboolean _tmp109_ = FALSE;
-#line 1465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = event;
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_->type;
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != GDK_BUTTON_PRESS) {
-#line 9831 "Page.c"
+#line 10239 "Page.c"
 		GdkEventButton* _tmp3_ = NULL;
 		GdkEventType _tmp4_ = 0;
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = event;
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_->type;
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp4_ != GDK_2BUTTON_PRESS;
-#line 9840 "Page.c"
+#line 10248 "Page.c"
 	} else {
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 9844 "Page.c"
+#line 10252 "Page.c"
 	}
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 9852 "Page.c"
+#line 10260 "Page.c"
 	}
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK));
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = event;
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_->x;
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = event;
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_->y;
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = checkerboard_page_get_item_at_pixel (self, _tmp8_, _tmp10_);
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp11_;
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ != NULL) {
-#line 9876 "Page.c"
+#line 10284 "Page.c"
 		CheckerboardLayout* _tmp13_ = NULL;
 		CheckerboardItem* _tmp14_ = NULL;
 		GdkEventButton* _tmp15_ = NULL;
@@ -9885,41 +10293,41 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 		guint _tmp22_ = 0U;
 		CheckerboardLayout* _tmp80_ = NULL;
 		CheckerboardItem* _tmp81_ = NULL;
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = self->priv->layout;
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = item;
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = event;
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->x;
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp17_->y;
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = event;
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_->state;
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = checkerboard_layout_handle_left_click (_tmp13_, _tmp14_, _tmp16_, _tmp18_, _tmp20_);
-#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 			result = TRUE;
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 9915 "Page.c"
+#line 10323 "Page.c"
 		}
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = state;
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp22_) {
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 9923 "Page.c"
+#line 10331 "Page.c"
 			{
 				Marker* marker = NULL;
 				ViewCollection* _tmp23_ = NULL;
@@ -9932,68 +10340,68 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				Marker* _tmp30_ = NULL;
 				CheckerboardItem* _tmp31_ = NULL;
 				gboolean _tmp32_ = FALSE;
-#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = _tmp23_;
-#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = item;
-#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject));
-#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp24_);
-#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp27_;
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_;
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = marker;
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp29_, _tmp30_);
-#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp29_);
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = item;
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_VIEW, DataView));
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp32_) {
-#line 9966 "Page.c"
+#line 10374 "Page.c"
 					CheckerboardItem* _tmp33_ = NULL;
 					CheckerboardItem* _tmp34_ = NULL;
 					CheckerboardItem* _tmp35_ = NULL;
 					CheckerboardItem* _tmp36_ = NULL;
-#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = item;
-#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp34_;
-#line 1491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp35_ = item;
-#line 1491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _g_object_ref0 (_tmp35_);
-#line 1491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->cursor);
-#line 1491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 					self->cursor = _tmp36_;
-#line 9987 "Page.c"
+#line 10395 "Page.c"
 				}
-#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1565 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9993 "Page.c"
+#line 10401 "Page.c"
 			}
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 9997 "Page.c"
+#line 10405 "Page.c"
 			{
 				ViewCollection* _tmp37_ = NULL;
 				ViewCollection* _tmp38_ = NULL;
@@ -10002,92 +10410,92 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				CheckerboardItem* _tmp43_ = NULL;
 				CheckerboardItem* _tmp44_ = NULL;
 				CheckerboardItem* _tmp45_ = NULL;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_unselect_all (_tmp38_);
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp38_);
-#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = self->anchor;
-#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp39_ == NULL) {
-#line 10018 "Page.c"
+#line 10426 "Page.c"
 					CheckerboardItem* _tmp40_ = NULL;
 					CheckerboardItem* _tmp41_ = NULL;
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp40_ = item;
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp41_ = _g_object_ref0 (_tmp40_);
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1571 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp41_;
-#line 10029 "Page.c"
+#line 10437 "Page.c"
 				}
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = self->anchor;
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = item;
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp42_, _tmp43_);
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = item;
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp45_ = _g_object_ref0 (_tmp44_);
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp45_;
-#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1576 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10047 "Page.c"
+#line 10455 "Page.c"
 			}
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 10051 "Page.c"
+#line 10459 "Page.c"
 			{
 				CheckerboardItem* _tmp46_ = NULL;
 				CheckerboardItem* _tmp49_ = NULL;
 				CheckerboardItem* _tmp50_ = NULL;
 				CheckerboardItem* _tmp51_ = NULL;
 				CheckerboardItem* _tmp52_ = NULL;
-#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp46_ = self->anchor;
-#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp46_ == NULL) {
-#line 10062 "Page.c"
+#line 10470 "Page.c"
 					CheckerboardItem* _tmp47_ = NULL;
 					CheckerboardItem* _tmp48_ = NULL;
-#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp47_ = item;
-#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp48_ = _g_object_ref0 (_tmp47_);
-#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1584 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp48_;
-#line 10073 "Page.c"
+#line 10481 "Page.c"
 				}
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp49_ = self->anchor;
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp50_ = item;
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp49_, _tmp50_);
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp51_ = item;
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp52_ = _g_object_ref0 (_tmp51_);
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp52_;
-#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10091 "Page.c"
+#line 10499 "Page.c"
 			}
 			default:
 			{
@@ -10097,34 +10505,34 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				CheckerboardItem* _tmp77_ = NULL;
 				CheckerboardItem* _tmp78_ = NULL;
 				CheckerboardItem* _tmp79_ = NULL;
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp53_ = event;
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp54_ = _tmp53_->type;
-#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp54_ == GDK_2BUTTON_PRESS) {
-#line 10107 "Page.c"
+#line 10515 "Page.c"
 					CheckerboardItem* _tmp55_ = NULL;
 					CheckerboardItem* _tmp56_ = NULL;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp55_ = item;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp56_ = _g_object_ref0 (_tmp55_);
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->priv->activated_item);
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->activated_item = _tmp56_;
-#line 10118 "Page.c"
+#line 10526 "Page.c"
 				} else {
 					CheckerboardItem* _tmp57_ = NULL;
 					gboolean _tmp58_ = FALSE;
-#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp57_ = item;
-#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp58_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_DATA_VIEW, DataView));
-#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 					if (!_tmp58_) {
-#line 10128 "Page.c"
+#line 10536 "Page.c"
 						Marker* all = NULL;
 						ViewCollection* _tmp59_ = NULL;
 						ViewCollection* _tmp60_ = NULL;
@@ -10143,91 +10551,91 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 						CheckerboardItem* _tmp73_ = NULL;
 						Marker* _tmp74_ = NULL;
 						Marker* _tmp75_ = NULL;
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp59_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp60_ = _tmp59_;
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp62_ = _tmp61_;
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp60_);
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 						all = _tmp62_;
-#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp63_ = all;
-#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp64_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp65_ = _tmp64_;
-#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp66_ = view_collection_get_selected (_tmp65_);
-#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp67_ = _tmp66_;
-#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						marker_mark_many (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp67_);
-#line 1529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp65_);
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp68_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp69_ = _tmp68_;
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp70_ = all;
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp71_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp72_ = _tmp71_;
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp73_ = item;
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp74_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_DATA_OBJECT, DataObject));
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp75_ = _tmp74_;
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 						view_collection_unselect_and_select_marked (_tmp69_, _tmp70_, _tmp75_);
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp75_);
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp72_);
-#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp69_);
-#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (all);
-#line 10201 "Page.c"
+#line 10609 "Page.c"
 					}
 				}
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp76_ = item;
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp77_ = _g_object_ref0 (_tmp76_);
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = _tmp77_;
-#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp78_ = item;
-#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp79_ = _g_object_ref0 (_tmp78_);
-#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp79_;
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10222 "Page.c"
+#line 10630 "Page.c"
 			}
 		}
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = self->priv->layout;
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = item;
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_cursor (_tmp80_, _tmp81_);
-#line 10231 "Page.c"
+#line 10639 "Page.c"
 	} else {
 		guint _tmp82_ = 0U;
 		GeeArrayList* _tmp85_ = NULL;
@@ -10236,30 +10644,30 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 		gdouble _tmp103_ = 0.0;
 		GdkEventButton* _tmp104_ = NULL;
 		gdouble _tmp105_ = 0.0;
-#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1615 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp82_ = state;
-#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1615 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp82_ != ((guint) GDK_CONTROL_MASK)) {
-#line 10244 "Page.c"
+#line 10652 "Page.c"
 			ViewCollection* _tmp83_ = NULL;
 			ViewCollection* _tmp84_ = NULL;
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp83_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp84_ = _tmp83_;
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all (_tmp84_);
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp84_);
-#line 10255 "Page.c"
+#line 10663 "Page.c"
 		}
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp85_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->previously_selected);
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->previously_selected = _tmp85_;
-#line 10263 "Page.c"
+#line 10671 "Page.c"
 		{
 			GeeList* _view_list = NULL;
 			ViewCollection* _tmp86_ = NULL;
@@ -10271,31 +10679,31 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 			gint _tmp91_ = 0;
 			gint _tmp92_ = 0;
 			gint _view_index = 0;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp86_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp87_ = _tmp86_;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp88_ = view_collection_get_selected (_tmp87_);
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp89_ = _tmp88_;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp87_);
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_list = _tmp89_;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp90_ = _view_list;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp91_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp92_ = _tmp91_;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_size = _tmp92_;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_index = -1;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 10299 "Page.c"
+#line 10707 "Page.c"
 				gint _tmp93_ = 0;
 				gint _tmp94_ = 0;
 				gint _tmp95_ = 0;
@@ -10305,79 +10713,79 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				gpointer _tmp98_ = NULL;
 				GeeArrayList* _tmp99_ = NULL;
 				DataView* _tmp100_ = NULL;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp93_ = _view_index;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 				_view_index = _tmp93_ + 1;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp94_ = _view_index;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp95_ = _view_size;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!(_tmp94_ < _tmp95_)) {
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 10321 "Page.c"
+#line 10729 "Page.c"
 				}
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp96_ = _view_list;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp97_ = _view_index;
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp98_ = gee_list_get (_tmp96_, _tmp97_);
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 				view = (DataView*) _tmp98_;
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp99_ = self->priv->previously_selected;
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp100_ = view;
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (view);
-#line 10339 "Page.c"
+#line 10747 "Page.c"
 			}
-#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_view_list);
-#line 10343 "Page.c"
+#line 10751 "Page.c"
 		}
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp101_ = self->priv->layout;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp102_ = event;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp103_ = _tmp102_->x;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp104_ = event;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp105_ = _tmp104_->y;
-#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_drag_select_origin (_tmp101_, (gint) _tmp103_, (gint) _tmp105_);
-#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10363 "Page.c"
+#line 10771 "Page.c"
 	}
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp106_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp107_ = _tmp106_;
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp108_ = view_collection_get_selected_count (_tmp107_);
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp109_ = _tmp108_ == 0;
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp107_);
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp109_;
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10381 "Page.c"
+#line 10789 "Page.c"
 }
 
 
@@ -10398,152 +10806,152 @@ static gboolean checkerboard_page_real_on_left_released (Page* base, GdkEventBut
 	CheckerboardItem* _tmp15_ = NULL;
 	CheckerboardItem* _tmp16_ = NULL;
 	CheckerboardItem* _tmp17_ = NULL;
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 10416 "Page.c"
+#line 10824 "Page.c"
 		CheckerboardLayout* _tmp2_ = NULL;
 		CheckerboardItem* _tmp3_ = NULL;
 		CheckerboardItem* _tmp4_ = NULL;
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_clear_drag_select (_tmp2_);
-#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->cursor;
-#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp4_;
-#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10436 "Page.c"
+#line 10844 "Page.c"
 	}
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0) {
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10448 "Page.c"
+#line 10856 "Page.c"
 	}
-#line 1578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->activated_item;
-#line 1578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10454 "Page.c"
+#line 10862 "Page.c"
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardPageKeyboardModifiers _tmp9_ = {0};
-#line 1579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->activated_item;
-#line 1579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_keyboard_modifiers_init (&_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_on_item_activated (self, _tmp8_, CHECKERBOARD_PAGE_ACTIVATOR_MOUSE, &_tmp9_);
-#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->activated_item);
-#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->activated_item = NULL;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1654 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10471 "Page.c"
+#line 10879 "Page.c"
 	}
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = event;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_->x;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = event;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_->y;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = checkerboard_page_get_item_at_pixel (self, _tmp11_, _tmp13_);
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp14_;
-#line 1586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = item;
-#line 1586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_ == NULL) {
-#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10495 "Page.c"
+#line 10903 "Page.c"
 	}
-#line 1591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1663 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->cursor;
-#line 1591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1663 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = item;
-#line 1591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1663 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp16_ != _tmp17_) {
-#line 10503 "Page.c"
+#line 10911 "Page.c"
 		ViewCollection* _tmp18_ = NULL;
 		ViewCollection* _tmp19_ = NULL;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = _tmp18_;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp19_);
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp19_);
-#line 10514 "Page.c"
+#line 10922 "Page.c"
 	} else {
 		CheckerboardItem* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = item;
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_VIEW, DataView));
-#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 10524 "Page.c"
+#line 10932 "Page.c"
 			ViewCollection* _tmp22_ = NULL;
 			ViewCollection* _tmp23_ = NULL;
 			CheckerboardItem* _tmp24_ = NULL;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = item;
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all_but (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_VIEW, DataView));
-#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp23_);
-#line 10538 "Page.c"
+#line 10946 "Page.c"
 		}
 	}
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1676 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1676 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1676 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10547 "Page.c"
+#line 10955 "Page.c"
 }
 
 
@@ -10564,50 +10972,50 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 	GtkMenu* _tmp40_ = NULL;
 	GdkEventButton* _tmp41_ = NULL;
 	gboolean _tmp42_ = FALSE;
-#line 1607 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1607 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->type;
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != GDK_BUTTON_PRESS) {
-#line 1610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1610 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10582 "Page.c"
+#line 10990 "Page.c"
 	}
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->x;
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->y;
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = checkerboard_page_get_item_at_pixel (self, _tmp3_, _tmp5_);
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp6_;
-#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10600 "Page.c"
+#line 11008 "Page.c"
 		GdkEventButton* _tmp8_ = NULL;
 		GdkModifierType _tmp9_ = 0;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = event;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_->state;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp9_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 10611 "Page.c"
+#line 11019 "Page.c"
 			{
 				Marker* marker = NULL;
 				ViewCollection* _tmp10_ = NULL;
@@ -10618,63 +11026,63 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 				ViewCollection* _tmp15_ = NULL;
 				ViewCollection* _tmp16_ = NULL;
 				Marker* _tmp17_ = NULL;
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = _tmp10_;
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = item;
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = _tmp13_;
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp11_);
-#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp14_;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = _tmp15_;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp17_ = marker;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp16_, _tmp17_);
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp16_);
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10650 "Page.c"
+#line 11058 "Page.c"
 			}
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 10654 "Page.c"
+#line 11062 "Page.c"
 			{
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10658 "Page.c"
+#line 11066 "Page.c"
 			}
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 10662 "Page.c"
+#line 11070 "Page.c"
 			{
-#line 1629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10666 "Page.c"
+#line 11074 "Page.c"
 			}
 			default:
 			{
 				CheckerboardItem* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = item;
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_VIEW, DataView));
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp19_) {
-#line 10678 "Page.c"
+#line 11086 "Page.c"
 					Marker* all = NULL;
 					ViewCollection* _tmp20_ = NULL;
 					ViewCollection* _tmp21_ = NULL;
@@ -10693,99 +11101,99 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 					CheckerboardItem* _tmp34_ = NULL;
 					Marker* _tmp35_ = NULL;
 					Marker* _tmp36_ = NULL;
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp21_ = _tmp20_;
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp23_ = _tmp22_;
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp21_);
-#line 1635 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
 					all = _tmp23_;
-#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = all;
-#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp26_ = _tmp25_;
-#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = view_collection_get_selected (_tmp26_);
-#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp28_ = _tmp27_;
-#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					marker_mark_many (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp28_);
-#line 1636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp26_);
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = _tmp29_;
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = all;
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = _tmp32_;
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = item;
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp35_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_DATA_OBJECT, DataObject));
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _tmp35_;
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 					view_collection_unselect_and_select_marked (_tmp30_, _tmp31_, _tmp36_);
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp36_);
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp33_);
-#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp30_);
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (all);
-#line 10751 "Page.c"
+#line 11159 "Page.c"
 				}
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10755 "Page.c"
+#line 11163 "Page.c"
 			}
 		}
 	} else {
 		ViewCollection* _tmp37_ = NULL;
 		ViewCollection* _tmp38_ = NULL;
-#line 1644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = _tmp37_;
-#line 1644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp38_);
-#line 1644 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 10769 "Page.c"
+#line 11177 "Page.c"
 	}
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = checkerboard_page_get_context_menu (self);
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
 	context_menu = _tmp39_;
-#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = context_menu;
-#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = event;
-#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp40_, _tmp41_);
-#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp42_;
-#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (context_menu);
-#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1648 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10789 "Page.c"
+#line 11197 "Page.c"
 }
 
 
@@ -10799,105 +11207,105 @@ static gboolean checkerboard_page_real_on_mouse_over (CheckerboardPage* self, Ch
 	CheckerboardItem* _tmp11_ = NULL;
 	CheckerboardItem* _tmp12_ = NULL;
 	CheckerboardItem* _tmp13_ = NULL;
-#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((item == NULL) || IS_CHECKERBOARD_ITEM (item), FALSE);
-#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = item;
-#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 10809 "Page.c"
+#line 11217 "Page.c"
 		CheckerboardLayout* _tmp1_ = NULL;
 		CheckerboardItem* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		GdkModifierType _tmp5_ = 0;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->layout;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = item;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = x;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = y;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = mask;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_handle_mouse_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 10827 "Page.c"
+#line 11235 "Page.c"
 	}
-#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = item;
-#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->highlighted;
-#line 1657 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == _tmp7_) {
-#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1658 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10839 "Page.c"
+#line 11247 "Page.c"
 	}
-#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->highlighted;
-#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ != NULL) {
-#line 10845 "Page.c"
+#line 11253 "Page.c"
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->highlighted;
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_item_unbrighten (_tmp9_);
-#line 1663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->highlighted);
-#line 1663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->highlighted = NULL;
-#line 10855 "Page.c"
+#line 11263 "Page.c"
 	}
-#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = item;
-#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp10_ == NULL) {
-#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10865 "Page.c"
+#line 11273 "Page.c"
 	}
-#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = item;
-#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1743 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_item_brighten (_tmp11_);
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = _tmp13_;
-#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10883 "Page.c"
+#line 11291 "Page.c"
 }
 
 
 gboolean checkerboard_page_on_mouse_over (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask) {
-#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->on_mouse_over (self, item, x, y, mask);
-#line 10892 "Page.c"
+#line 11300 "Page.c"
 }
 
 
 static gboolean _checkerboard_page_selection_autoscroll_gsource_func (gpointer self) {
 	gboolean result;
 	result = checkerboard_page_selection_autoscroll ((CheckerboardPage*) self);
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10901 "Page.c"
+#line 11309 "Page.c"
 }
 
 
@@ -10920,95 +11328,95 @@ static gboolean checkerboard_page_real_on_motion (Page* base, GdkEventMotion* ev
 	gint _tmp13_ = 0;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp15_ = FALSE;
-#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = checkerboard_page_get_item_at_pixel (self, (gdouble) _tmp0_, (gdouble) _tmp1_);
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = x;
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = y;
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = mask;
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = checkerboard_page_on_mouse_over (self, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = !_tmp7_;
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1679 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_) {
-#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10954 "Page.c"
+#line 11362 "Page.c"
 	}
-#line 1683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->layout;
-#line 1683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = checkerboard_layout_is_drag_select_active (_tmp9_);
-#line 1683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp10_) {
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10966 "Page.c"
+#line 11374 "Page.c"
 	}
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_drag_select_endpoint (_tmp11_, _tmp12_, _tmp13_);
-#line 1689 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->autoscroll_scheduled;
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp15_) {
-#line 10982 "Page.c"
+#line 11390 "Page.c"
 		GtkAdjustment* _tmp16_ = NULL;
 		gint _tmp17_ = 0;
 		AdjustmentRelation _tmp18_ = 0;
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = y;
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp16_, _tmp17_);
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp18_ != ADJUSTMENT_RELATION_IN_RANGE;
-#line 10994 "Page.c"
+#line 11402 "Page.c"
 	} else {
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = FALSE;
-#line 10998 "Page.c"
+#line 11406 "Page.c"
 	}
-#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp14_) {
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) CHECKERBOARD_PAGE_AUTOSCROLL_TICKS_MSEC, _checkerboard_page_selection_autoscroll_gsource_func, g_object_ref (self), g_object_unref);
-#line 1695 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = TRUE;
-#line 11006 "Page.c"
+#line 11414 "Page.c"
 	}
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11012 "Page.c"
+#line 11420 "Page.c"
 }
 
 
@@ -11045,91 +11453,91 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 	ViewCollection* _tmp47_ = NULL;
 	ViewCollection* _tmp48_ = NULL;
 	Marker* _tmp49_ = NULL;
-#line 1702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_, "layout.is_drag_select_active()");
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->layout;
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_items_in_selection_band (_tmp2_);
-#line 1706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
 	intersection = _tmp3_;
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = intersection;
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (intersection);
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11071 "Page.c"
+#line 11479 "Page.c"
 	}
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
 	to_unselect = _tmp8_;
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_;
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = _tmp11_;
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 1711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 	to_select = _tmp12_;
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = to_unselect;
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = view_collection_get_selected (_tmp15_);
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = _tmp16_;
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp17_);
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp15_);
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->previously_selected;
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp18_ != NULL, "previously_selected != null");
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = to_unselect;
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->previously_selected;
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_unmark_many (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = to_select;
-#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = self->priv->previously_selected;
-#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 11133 "Page.c"
+#line 11541 "Page.c"
 	{
 		GeeList* _item_list = NULL;
 		GeeList* _tmp23_ = NULL;
@@ -11139,25 +11547,25 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
 		gint _item_index = 0;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = intersection;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_list = _tmp24_;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = _item_list;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = _tmp26_;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_size = _tmp27_;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_index = -1;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 11161 "Page.c"
+#line 11569 "Page.c"
 			gint _tmp28_ = 0;
 			gint _tmp29_ = 0;
 			gint _tmp30_ = 0;
@@ -11169,109 +11577,109 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 			CheckerboardItem* _tmp35_ = NULL;
 			gboolean _tmp36_ = FALSE;
 			CheckerboardItem* _tmp41_ = NULL;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _item_index;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 			_item_index = _tmp28_ + 1;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _item_index;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _item_size;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp29_ < _tmp30_)) {
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11185 "Page.c"
+#line 11593 "Page.c"
 			}
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = _item_list;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp32_ = _item_index;
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = gee_list_get (_tmp31_, _tmp32_);
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 			item = (CheckerboardItem*) _tmp33_;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = to_select;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = item;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp36_ = marker_toggle (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_DATA_OBJECT, DataObject));
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp36_) {
-#line 11203 "Page.c"
+#line 11611 "Page.c"
 				Marker* _tmp37_ = NULL;
 				CheckerboardItem* _tmp38_ = NULL;
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = to_unselect;
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = item;
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_unmark (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject));
-#line 11212 "Page.c"
+#line 11620 "Page.c"
 			} else {
 				Marker* _tmp39_ = NULL;
 				CheckerboardItem* _tmp40_ = NULL;
-#line 1728 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = to_unselect;
-#line 1728 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = item;
-#line 1728 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_mark (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_OBJECT, DataObject));
-#line 11222 "Page.c"
+#line 11630 "Page.c"
 			}
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->cursor;
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ == NULL) {
-#line 11228 "Page.c"
+#line 11636 "Page.c"
 				CheckerboardItem* _tmp42_ = NULL;
 				CheckerboardItem* _tmp43_ = NULL;
-#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = item;
-#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _g_object_ref0 (_tmp42_);
-#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp43_;
-#line 11239 "Page.c"
+#line 11647 "Page.c"
 			}
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 11243 "Page.c"
+#line 11651 "Page.c"
 		}
-#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_item_list);
-#line 11247 "Page.c"
+#line 11655 "Page.c"
 	}
-#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = _tmp44_;
-#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = to_select;
-#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp45_, _tmp46_);
-#line 1734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp45_);
-#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = _tmp47_;
-#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = to_unselect;
-#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_marked (_tmp48_, _tmp49_);
-#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp48_);
-#line 1702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_select);
-#line 1702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_unselect);
-#line 1702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (intersection);
-#line 11275 "Page.c"
+#line 11683 "Page.c"
 }
 
 
@@ -11303,77 +11711,77 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 	GtkAdjustment* _tmp28_ = NULL;
 	gdouble _tmp29_ = 0.0;
 	gint _tmp30_ = 0;
-#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp1_) {
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = FALSE;
-#line 1742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11321 "Page.c"
+#line 11729 "Page.c"
 	}
-#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp3_;
-#line 1750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_event_source_pointer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), &_tmp4_, &_tmp5_, &_tmp6_);
-#line 1750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp4_;
-#line 1750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp5_;
-#line 1750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp6_;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = vadj;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gtk_adjustment_get_value (_tmp7_);
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 	new_value = (gint) _tmp8_;
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = vadj;
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = y;
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = get_adjustment_relation (_tmp9_, _tmp10_);
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp11_) {
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_BELOW:
-#line 11353 "Page.c"
+#line 11761 "Page.c"
 		{
 			gint _tmp12_ = 0;
 			CheckerboardLayout* _tmp13_ = NULL;
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = new_value;
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp12_ - CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = self->priv->layout;
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = x;
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = new_value;
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp13_, _tmp14_, _tmp15_);
-#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11373 "Page.c"
+#line 11781 "Page.c"
 		}
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_ABOVE:
-#line 11377 "Page.c"
+#line 11785 "Page.c"
 		{
 			gint _tmp16_ = 0;
 			CheckerboardLayout* _tmp17_ = NULL;
@@ -11381,78 +11789,78 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 			gint _tmp19_ = 0;
 			GtkAdjustment* _tmp20_ = NULL;
 			gdouble _tmp21_ = 0.0;
-#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = new_value;
-#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp16_ + CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = self->priv->layout;
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = x;
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = new_value;
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = vadj;
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = gtk_adjustment_get_page_size (_tmp20_);
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp17_, _tmp18_, _tmp19_ + ((gint) _tmp21_));
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11403 "Page.c"
+#line 11811 "Page.c"
 		}
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_IN_RANGE:
-#line 11407 "Page.c"
+#line 11815 "Page.c"
 		{
-#line 1767 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->autoscroll_scheduled = FALSE;
-#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (vadj);
-#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 11417 "Page.c"
+#line 11825 "Page.c"
 		}
 		default:
 		{
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Page.vala"
 			g_warn_if_reached ();
-#line 1773 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11425 "Page.c"
+#line 11833 "Page.c"
 		}
 	}
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = new_value;
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = vadj;
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = gtk_adjustment_get_lower (_tmp24_);
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = vadj;
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = gtk_adjustment_get_upper (_tmp26_);
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = vadj;
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = gtk_adjustment_get_page_size (_tmp28_);
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = CLAMP (_tmp23_, (gint) _tmp25_, ((gint) _tmp27_) - ((gint) _tmp29_));
-#line 1779 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp22_, (gdouble) _tmp30_);
-#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11456 "Page.c"
+#line 11864 "Page.c"
 }
 
 
@@ -11483,35 +11891,35 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 	gdouble _tmp39_ = 0.0;
 	GtkAdjustment* _tmp53_ = NULL;
 	gint _tmp54_ = 0;
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_, "get_view().contains(item)");
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = item;
-#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp5_;
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp6_) {
-#line 11515 "Page.c"
+#line 11923 "Page.c"
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		Marker* marker = NULL;
@@ -11523,67 +11931,67 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		ViewCollection* _tmp14_ = NULL;
 		ViewCollection* _tmp15_ = NULL;
 		Marker* _tmp16_ = NULL;
-#line 1793 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1793 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1793 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp8_);
-#line 1793 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_;
-#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = item;
-#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject));
-#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
 		marker = _tmp13_;
-#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _tmp14_;
-#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = marker;
-#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_select_marked (_tmp15_, _tmp16_);
-#line 1795 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp15_);
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (marker);
-#line 11561 "Page.c"
+#line 11969 "Page.c"
 	}
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->layout;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = item;
-#line 1797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1869 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_cursor (_tmp17_, _tmp18_);
-#line 1800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = gtk_scrolled_window_get_vadjustment (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow));
-#line 1800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp20_;
-#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = item;
-#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = _tmp23_->allocation;
-#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = _tmp24_.y;
-#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = get_adjustment_relation (_tmp22_, _tmp25_);
-#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp26_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 11587 "Page.c"
+#line 11995 "Page.c"
 		GtkAdjustment* _tmp27_ = NULL;
 		CheckerboardItem* _tmp28_ = NULL;
 		GdkRectangle _tmp29_ = {0};
@@ -11592,70 +12000,70 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		GdkRectangle _tmp32_ = {0};
 		gint _tmp33_ = 0;
 		AdjustmentRelation _tmp34_ = 0;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = vadj;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = item;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_->allocation;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.y;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = item;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_->allocation;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = _tmp32_.height;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = get_adjustment_relation (_tmp27_, _tmp30_ + _tmp33_);
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp34_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 11614 "Page.c"
+#line 12022 "Page.c"
 	} else {
-#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = FALSE;
-#line 11618 "Page.c"
+#line 12026 "Page.c"
 	}
-#line 1801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_) {
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11626 "Page.c"
+#line 12034 "Page.c"
 	}
-#line 1806 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 	top = 0;
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = item;
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_->allocation;
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = _tmp36_.y;
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = vadj;
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = gtk_adjustment_get_value (_tmp38_);
-#line 1807 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gdouble) _tmp37_) < _tmp39_) {
-#line 11642 "Page.c"
+#line 12050 "Page.c"
 		CheckerboardItem* _tmp40_ = NULL;
 		GdkRectangle _tmp41_ = {0};
 		gint _tmp42_ = 0;
 		gint _tmp43_ = 0;
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp40_ = item;
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp41_ = _tmp40_->allocation;
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp42_ = _tmp41_.y;
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp42_;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp43_ = top;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp43_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 11659 "Page.c"
+#line 12067 "Page.c"
 	} else {
 		CheckerboardItem* _tmp44_ = NULL;
 		GdkRectangle _tmp45_ = {0};
@@ -11666,39 +12074,39 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		GtkAdjustment* _tmp50_ = NULL;
 		gdouble _tmp51_ = 0.0;
 		gint _tmp52_ = 0;
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = item;
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_->allocation;
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp45_.y;
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = item;
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = _tmp47_->allocation;
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.height;
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = vadj;
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = gtk_adjustment_get_page_size (_tmp50_);
-#line 1811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		top = (_tmp46_ + _tmp49_) - ((gint) _tmp51_);
-#line 1812 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = top;
-#line 1812 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp52_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 11692 "Page.c"
+#line 12100 "Page.c"
 	}
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = vadj;
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp54_ = top;
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp53_, (gdouble) _tmp54_);
-#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 11702 "Page.c"
+#line 12110 "Page.c"
 }
 
 
@@ -11717,171 +12125,171 @@ void checkerboard_page_move_cursor (CheckerboardPage* self, CompassPoint point)
 	CompassPoint _tmp27_ = 0;
 	CheckerboardItem* _tmp28_ = NULL;
 	CheckerboardItem* _tmp29_ = NULL;
-#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 1820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11737 "Page.c"
+#line 12145 "Page.c"
 	}
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->cursor;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 11743 "Page.c"
+#line 12151 "Page.c"
 		CheckerboardLayout* _tmp7_ = NULL;
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->layout;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_layout_get_cursor (_tmp7_);
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp9_ == NULL;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 11757 "Page.c"
+#line 12165 "Page.c"
 	} else {
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 11761 "Page.c"
+#line 12169 "Page.c"
 	}
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 11767 "Page.c"
+#line 12175 "Page.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
 		CheckerboardItem* _tmp11_ = NULL;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->cursor;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != NULL) {
-#line 11775 "Page.c"
+#line 12183 "Page.c"
 			ViewCollection* _tmp12_ = NULL;
 			ViewCollection* _tmp13_ = NULL;
 			CheckerboardItem* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp12_;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->cursor;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = data_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = !_tmp15_;
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp13_);
-#line 11792 "Page.c"
+#line 12200 "Page.c"
 		} else {
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = FALSE;
-#line 11796 "Page.c"
+#line 12204 "Page.c"
 		}
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp10_;
-#line 11800 "Page.c"
+#line 12208 "Page.c"
 	}
-#line 1826 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 11804 "Page.c"
+#line 12212 "Page.c"
 		CheckerboardItem* item = NULL;
 		CheckerboardLayout* _tmp16_ = NULL;
 		CheckerboardItem* _tmp17_ = NULL;
 		CheckerboardItem* _tmp18_ = NULL;
 		CheckerboardItem* _tmp19_ = NULL;
 		CheckerboardItem* _tmp20_ = NULL;
-#line 1827 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->layout;
-#line 1827 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = checkerboard_layout_get_item_at_coordinate (_tmp16_, 0, 0);
-#line 1827 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp17_;
-#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = item;
-#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp18_);
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = item;
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp20_;
-#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11833 "Page.c"
+#line 12241 "Page.c"
 	}
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = self->cursor;
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_ == NULL) {
-#line 11839 "Page.c"
+#line 12247 "Page.c"
 		CheckerboardLayout* _tmp22_ = NULL;
 		CheckerboardItem* _tmp23_ = NULL;
 		CheckerboardItem* _tmp24_ = NULL;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->layout;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = checkerboard_layout_get_cursor (_tmp22_);
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_CHECKERBOARD_ITEM) ? ((CheckerboardItem*) _tmp23_) : NULL;
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp24_ == NULL) {
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp23_);
-#line 11853 "Page.c"
+#line 12261 "Page.c"
 		}
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->cursor);
-#line 1835 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 		self->cursor = _tmp24_;
-#line 11859 "Page.c"
+#line 12267 "Page.c"
 	}
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->layout;
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = self->cursor;
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = point;
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = checkerboard_layout_get_item_relative_to (_tmp25_, _tmp26_, _tmp27_);
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp28_;
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = item;
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_ != NULL) {
-#line 11875 "Page.c"
+#line 12283 "Page.c"
 		CheckerboardItem* _tmp30_ = NULL;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = item;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp30_);
-#line 11881 "Page.c"
+#line 12289 "Page.c"
 	}
-#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 11885 "Page.c"
+#line 12293 "Page.c"
 }
 
 
@@ -11898,51 +12306,51 @@ void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* ite
 	CheckerboardItem* _tmp8_ = NULL;
 	CheckerboardItem* _tmp9_ = NULL;
 	CheckerboardItem* _tmp10_ = NULL;
-#line 1844 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1844 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp4_;
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp6_, marker);
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp8_;
-#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = item;
-#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = _tmp10_;
-#line 1844 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 11946 "Page.c"
+#line 12354 "Page.c"
 }
 
 
@@ -11957,29 +12365,29 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 	ViewCollection* _tmp28_ = NULL;
 	ViewCollection* _tmp29_ = NULL;
 	Marker* _tmp30_ = NULL;
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_start));
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_end));
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp3_;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_start = FALSE;
-#line 1856 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_end = FALSE;
-#line 11983 "Page.c"
+#line 12391 "Page.c"
 	{
 		GeeIterator* _object_it = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -11988,27 +12396,27 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 		GeeCollection* _tmp7_ = NULL;
 		GeeIterator* _tmp8_ = NULL;
 		GeeIterator* _tmp9_ = NULL;
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_object_it = _tmp9_;
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 12012 "Page.c"
+#line 12420 "Page.c"
 			GeeIterator* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
 			DataObject* object = NULL;
@@ -12025,125 +12433,125 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 			gboolean _tmp21_ = FALSE;
 			gboolean _tmp25_ = FALSE;
 			gboolean _tmp26_ = FALSE;
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = _object_it;
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp11_) {
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12037 "Page.c"
+#line 12445 "Page.c"
 			}
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _object_it;
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 			object = (DataObject*) _tmp13_;
-#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = object;
-#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp15_;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = item_start;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = item;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp16_ == _tmp17_) {
-#line 1862 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_start = TRUE;
-#line 12059 "Page.c"
+#line 12467 "Page.c"
 			}
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = item_end;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = item;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp18_ == _tmp19_) {
-#line 1865 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_end = TRUE;
-#line 12069 "Page.c"
+#line 12477 "Page.c"
 			}
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = passed_start;
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = TRUE;
-#line 12077 "Page.c"
+#line 12485 "Page.c"
 			} else {
 				gboolean _tmp22_ = FALSE;
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = passed_end;
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp22_;
-#line 12084 "Page.c"
+#line 12492 "Page.c"
 			}
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp20_) {
-#line 12088 "Page.c"
+#line 12496 "Page.c"
 				Marker* _tmp23_ = NULL;
 				DataObject* _tmp24_ = NULL;
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = marker;
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = object;
-#line 1868 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_VIEW, DataView), TYPE_DATA_OBJECT, DataObject));
-#line 12097 "Page.c"
+#line 12505 "Page.c"
 			}
-#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = passed_start;
-#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp26_) {
-#line 12103 "Page.c"
+#line 12511 "Page.c"
 				gboolean _tmp27_ = FALSE;
-#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = passed_end;
-#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = _tmp27_;
-#line 12109 "Page.c"
+#line 12517 "Page.c"
 			} else {
-#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = FALSE;
-#line 12113 "Page.c"
+#line 12521 "Page.c"
 			}
-#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp25_) {
-#line 1871 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (item);
-#line 1871 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (object);
-#line 1871 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12123 "Page.c"
+#line 12531 "Page.c"
 			}
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (object);
-#line 12129 "Page.c"
+#line 12537 "Page.c"
 		}
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_object_it);
-#line 12133 "Page.c"
+#line 12541 "Page.c"
 	}
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = _tmp28_;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = marker;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp29_, _tmp30_);
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12147 "Page.c"
+#line 12555 "Page.c"
 }
 
 
@@ -12151,65 +12559,65 @@ void checkerboard_page_select_anchor_to_cursor (CheckerboardPage* self, guint st
 	gboolean _tmp0_ = FALSE;
 	CheckerboardItem* _tmp1_ = NULL;
 	guint _tmp3_ = 0U;
-#line 1877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->cursor;
-#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 12163 "Page.c"
+#line 12571 "Page.c"
 	} else {
 		CheckerboardItem* _tmp2_ = NULL;
-#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->anchor;
-#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 12170 "Page.c"
+#line 12578 "Page.c"
 	}
-#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12176 "Page.c"
+#line 12584 "Page.c"
 	}
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = state;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == ((guint) GDK_SHIFT_MASK)) {
-#line 12182 "Page.c"
+#line 12590 "Page.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		CheckerboardItem* _tmp6_ = NULL;
 		CheckerboardItem* _tmp7_ = NULL;
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 1882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->anchor;
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->cursor;
-#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1955 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_select_between_items (self, _tmp6_, _tmp7_);
-#line 12201 "Page.c"
+#line 12609 "Page.c"
 	} else {
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->cursor;
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp9_;
-#line 12213 "Page.c"
+#line 12621 "Page.c"
 	}
 }
 
@@ -12223,48 +12631,48 @@ static void checkerboard_page_real_set_display_titles (CheckerboardPage* self, g
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_TITLES, &_tmp5_, NULL, NULL);
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12259 "Page.c"
+#line 12667 "Page.c"
 }
 
 
 void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display) {
-#line 1889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_titles (self, display);
-#line 12268 "Page.c"
+#line 12676 "Page.c"
 }
 
 
@@ -12277,48 +12685,48 @@ static void checkerboard_page_real_set_display_comments (CheckerboardPage* self,
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
-#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_COMMENTS, &_tmp5_, NULL, NULL);
-#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12313 "Page.c"
+#line 12721 "Page.c"
 }
 
 
 void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display) {
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_comments (self, display);
-#line 12322 "Page.c"
+#line 12730 "Page.c"
 }
 
 
@@ -12331,54 +12739,54 @@ void checkerboard_page_keyboard_modifiers_init (CheckerboardPageKeyboardModifier
 	gboolean _tmp5_ = FALSE;
 	Page* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (self, 0, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_ctrl_pressed (_tmp0_);
-#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).ctrl_pressed = _tmp1_;
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page;
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_alt_pressed (_tmp2_);
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).alt_pressed = _tmp3_;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1253 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1253 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_shift_pressed (_tmp4_);
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1253 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).shift_pressed = _tmp5_;
-#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page;
-#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_super_pressed (_tmp6_);
-#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).super_pressed = _tmp7_;
-#line 12363 "Page.c"
+#line 12771 "Page.c"
 }
 
 
 CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (const CheckerboardPageKeyboardModifiers* self) {
 	CheckerboardPageKeyboardModifiers* dup;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (CheckerboardPageKeyboardModifiers, 1);
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 12375 "Page.c"
+#line 12783 "Page.c"
 }
 
 
 void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self) {
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	g_free (self);
-#line 12382 "Page.c"
+#line 12790 "Page.c"
 }
 
 
@@ -12394,109 +12802,113 @@ GType checkerboard_page_keyboard_modifiers_get_type (void) {
 
 
 static void checkerboard_page_class_init (CheckerboardPageClass * klass) {
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_parent_class = g_type_class_peek_parent (klass);
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardPagePrivate));
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_item_context_menu = checkerboard_page_real_get_item_context_menu;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->get_page_context_menu = checkerboard_page_real_get_page_context_menu;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = checkerboard_page_real_on_context_keypress;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_view_empty_message = checkerboard_page_real_get_view_empty_message;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_filter_no_match_message = checkerboard_page_real_get_filter_no_match_message;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->on_item_activated = checkerboard_page_real_on_item_activated;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_search_view_filter = checkerboard_page_real_get_search_view_filter;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_view_tracker = checkerboard_page_real_get_view_tracker;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switching_from = checkerboard_page_real_switching_from;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = checkerboard_page_real_switched_to;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_page_name = checkerboard_page_real_set_page_name;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->key_press_event = checkerboard_page_real_key_press_event;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_click = checkerboard_page_real_on_left_click;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_released = checkerboard_page_real_on_left_released;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_right_click = checkerboard_page_real_on_right_click;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->on_mouse_over = checkerboard_page_real_on_mouse_over;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_motion = checkerboard_page_real_on_motion;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->set_display_titles = checkerboard_page_real_set_display_titles;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->set_display_comments = checkerboard_page_real_set_display_comments;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_page_finalize;
-#line 12442 "Page.c"
+#line 12850 "Page.c"
 }
 
 
 static void checkerboard_page_instance_init (CheckerboardPage * self) {
 	GtkViewport* _tmp0_ = NULL;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = CHECKERBOARD_PAGE_GET_PRIVATE (self);
-#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = NULL;
-#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->viewport = _tmp0_;
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = NULL;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = NULL;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->autoscroll_scheduled = FALSE;
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->activated_item = NULL;
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 12472 "Page.c"
+#line 12880 "Page.c"
 }
 
 
 static void checkerboard_page_finalize (GObject* obj) {
 	CheckerboardPage * self;
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->viewport);
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->activated_item);
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1309 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (self->priv->item_context_menu);
+#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (self->priv->page_context_menu);
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (checkerboard_page_parent_class)->finalize (obj);
-#line 12500 "Page.c"
+#line 12912 "Page.c"
 }
 
 
@@ -12525,18 +12937,18 @@ GType single_photo_page_update_reason_get_type (void) {
 
 
 static void _single_photo_page_on_viewport_resize_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) {
-#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_on_viewport_resize ((SinglePhotoPage*) self);
-#line 12531 "Page.c"
+#line 12943 "Page.c"
 }
 
 
 static gboolean _single_photo_page_on_canvas_exposed_gtk_widget_draw (GtkWidget* _sender, cairo_t* cr, gpointer self) {
 	gboolean result;
 	result = single_photo_page_on_canvas_exposed ((SinglePhotoPage*) self, cr);
-#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12540 "Page.c"
+#line 12952 "Page.c"
 }
 
 
@@ -12556,71 +12968,71 @@ SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* pa
 	GtkViewport* _tmp11_ = NULL;
 	GtkDrawingArea* _tmp12_ = NULL;
 	GtkDrawingArea* _tmp13_ = NULL;
-#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (SinglePhotoPage*) page_construct (object_type, _tmp0_);
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = scale_up_to_viewport;
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scale_up_to_viewport = _tmp1_;
-#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = transition_effects_manager_get_instance ();
-#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = transition_effects_manager_create_null_transition_clock (_tmp3_);
-#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp4_;
-#line 1939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp3_);
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_scrolled_window_set_policy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 1945 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 1946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_scrolled_window_set_shadow_type (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_SHADOW_NONE);
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp5_, GTK_SHADOW_NONE);
-#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->viewport;
-#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->viewport;
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->canvas;
-#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->viewport;
-#line 1952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2026 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->canvas;
-#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2026 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), (gint) ((GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK) | GDK_SUBSTRUCTURE_MASK));
-#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->viewport;
-#line 1957 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _single_photo_page_on_viewport_resize_gtk_widget_size_allocate, self, 0);
-#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->canvas;
-#line 1958 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), "draw", (GCallback) _single_photo_page_on_canvas_exposed_gtk_widget_draw, self, 0);
-#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->canvas;
-#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_event_source (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
-#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 12624 "Page.c"
+#line 13036 "Page.c"
 }
 
 
@@ -12628,38 +13040,38 @@ gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self) {
 	gboolean result = FALSE;
 	TransitionClock* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12642 "Page.c"
+#line 13054 "Page.c"
 }
 
 
 void single_photo_page_cancel_transition (SinglePhotoPage* self) {
 	TransitionClock* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 12657 "Page.c"
+#line 13069 "Page.c"
 		TransitionClock* _tmp2_ = NULL;
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->transition_clock;
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		transition_clock_cancel (_tmp2_);
-#line 12663 "Page.c"
+#line 13075 "Page.c"
 	}
 }
 
@@ -12671,53 +13083,53 @@ void single_photo_page_set_transition (SinglePhotoPage* self, const gchar* effec
 	TransitionClock* _tmp3_ = NULL;
 	TransitionClock* _tmp4_ = NULL;
 	gint _tmp8_ = 0;
-#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (effect_id != NULL);
-#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = transition_effects_manager_get_instance ();
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = effect_id;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = transition_effects_manager_create_transition_clock (_tmp1_, _tmp2_);
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp3_;
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp1_);
-#line 1976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->transition_clock;
-#line 1976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 12699 "Page.c"
+#line 13111 "Page.c"
 		TransitionEffectsManager* _tmp5_ = NULL;
 		TransitionEffectsManager* _tmp6_ = NULL;
 		TransitionClock* _tmp7_ = NULL;
-#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = transition_effects_manager_get_instance ();
-#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = transition_effects_manager_create_null_transition_clock (_tmp6_);
-#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_clock_unref0 (self->priv->transition_clock);
-#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->transition_clock = _tmp7_;
-#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_effects_manager_unref0 (_tmp6_);
-#line 12715 "Page.c"
+#line 13127 "Page.c"
 	}
-#line 1979 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = duration_msec;
-#line 1979 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = _tmp8_;
-#line 12721 "Page.c"
+#line 13133 "Page.c"
 }
 
 
@@ -12749,86 +13161,86 @@ static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, Zo
 	gint _tmp49_ = 0;
 	gint _tmp50_ = 0;
 	cairo_t* _tmp51_ = NULL;
-#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 1984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 1984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp1_);
-#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	view_rect = _tmp1_;
-#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = single_photo_page_get_zoom_buffer (self);
-#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != NULL;
-#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 12775 "Page.c"
+#line 13187 "Page.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 		GdkPixbuf* _tmp15_ = NULL;
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->zoom_high_quality;
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp6_) {
-#line 12783 "Page.c"
+#line 13195 "Page.c"
 			ZoomBuffer* _tmp7_ = NULL;
 			ZoomBuffer* _tmp8_ = NULL;
 			ZoomState _tmp9_ = {0};
 			GdkPixbuf* _tmp10_ = NULL;
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = single_photo_page_get_zoom_buffer (self);
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp7_;
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = *zoom_state;
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = zoom_buffer_get_zoomed_image (_tmp8_, &_tmp9_);
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp10_;
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp8_);
-#line 12802 "Page.c"
+#line 13214 "Page.c"
 		} else {
 			ZoomBuffer* _tmp11_ = NULL;
 			ZoomBuffer* _tmp12_ = NULL;
 			ZoomState _tmp13_ = {0};
 			GdkPixbuf* _tmp14_ = NULL;
-#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = single_photo_page_get_zoom_buffer (self);
-#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _tmp11_;
-#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = *zoom_state;
-#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = zoom_buffer_get_zoom_preview_image (_tmp12_, &_tmp13_);
-#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp14_;
-#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp12_);
-#line 12822 "Page.c"
+#line 13234 "Page.c"
 		}
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _g_object_ref0 (_tmp5_);
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp15_;
-#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 12832 "Page.c"
+#line 13244 "Page.c"
 	} else {
 		GdkRectangle view_rect_proj = {0};
 		GdkPixbuf* _tmp16_ = NULL;
@@ -12850,113 +13262,113 @@ static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, Zo
 		GdkRectangle _tmp31_ = {0};
 		gint _tmp32_ = 0;
 		GdkPixbuf* _tmp33_ = NULL;
-#line 1993 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->unscaled;
-#line 1993 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewing_rectangle_projection (zoom_state, _tmp16_, &_tmp17_);
-#line 1993 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
 		view_rect_proj = _tmp17_;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = self->priv->unscaled;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = view_rect_proj;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_.x;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = view_rect_proj;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_.y;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_rect_proj;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_.width;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = view_rect_proj;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_.height;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = gdk_pixbuf_new_subpixbuf (_tmp18_, _tmp20_, _tmp22_, _tmp24_, _tmp26_);
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Page.vala"
 		proj_subpixbuf = _tmp27_;
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = proj_subpixbuf;
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = view_rect;
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.width;
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = view_rect;
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_.height;
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = gdk_pixbuf_scale_simple (_tmp28_, _tmp30_, _tmp32_, GDK_INTERP_BILINEAR);
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp33_;
-#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (proj_subpixbuf);
-#line 12900 "Page.c"
+#line 13312 "Page.c"
 	}
-#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp34_ = zoomed;
-#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp34_ == NULL) {
-#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12910 "Page.c"
+#line 13322 "Page.c"
 	}
-#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = self->priv->pixmap_dim;
-#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_.width;
-#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = view_rect;
-#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = _tmp37_.width;
-#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = (_tmp36_ - _tmp38_) / 2;
-#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = draw_x;
-#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = CLAMP (_tmp39_, 0, G_MAXINT);
-#line 2007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = _tmp40_;
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = self->priv->pixmap_dim;
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = _tmp41_.height;
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = view_rect;
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = _tmp43_.height;
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = (_tmp42_ - _tmp44_) / 2;
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = draw_y;
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = CLAMP (_tmp45_, 0, G_MAXINT);
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = _tmp46_;
-#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = self->priv->pixmap_ctx;
-#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = zoomed;
-#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = draw_x;
-#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = draw_y;
-#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_cairo_set_source_pixbuf (_tmp47_, _tmp48_, (gdouble) _tmp49_, (gdouble) _tmp50_);
-#line 2013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp51_ = self->priv->pixmap_ctx;
-#line 2013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp51_);
-#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (zoomed);
-#line 12960 "Page.c"
+#line 13372 "Page.c"
 }
 
 
@@ -12968,39 +13380,39 @@ void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, ZoomState* in
 	gboolean _tmp3_ = FALSE;
 	ZoomState _tmp4_ = {0};
 	GtkDrawingArea* _tmp5_ = NULL;
-#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2017 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2019 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2019 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2092 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2092 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = FALSE;
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13004 "Page.c"
+#line 13416 "Page.c"
 }
 
 
@@ -13012,230 +13424,230 @@ void single_photo_page_on_interactive_pan (SinglePhotoPage* self, ZoomState* int
 	gboolean _tmp3_ = FALSE;
 	ZoomState _tmp4_ = {0};
 	GtkDrawingArea* _tmp5_ = NULL;
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2031 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2031 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2105 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2105 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2034 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2034 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 2038 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2038 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13048 "Page.c"
+#line 13460 "Page.c"
 }
 
 
 static gboolean single_photo_page_real_is_zoom_supported (SinglePhotoPage* self) {
 	gboolean result = FALSE;
-#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13058 "Page.c"
+#line 13470 "Page.c"
 }
 
 
 gboolean single_photo_page_is_zoom_supported (SinglePhotoPage* self) {
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->is_zoom_supported (self);
-#line 13067 "Page.c"
+#line 13479 "Page.c"
 }
 
 
 static void single_photo_page_real_cancel_zoom (SinglePhotoPage* self) {
 	cairo_surface_t* _tmp0_ = NULL;
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 13077 "Page.c"
+#line 13489 "Page.c"
 		cairo_t* _tmp1_ = NULL;
 		cairo_t* _tmp2_ = NULL;
-#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->pixmap_ctx;
-#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp1_, "#000");
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap_ctx;
-#line 2051 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_paint (_tmp2_);
-#line 13088 "Page.c"
+#line 13500 "Page.c"
 	}
 }
 
 
 void single_photo_page_cancel_zoom (SinglePhotoPage* self) {
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->cancel_zoom (self);
-#line 13098 "Page.c"
+#line 13510 "Page.c"
 }
 
 
 static void single_photo_page_real_save_zoom_state (SinglePhotoPage* self) {
 	ZoomState _tmp0_ = {0};
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->static_zoom_state;
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->saved_zoom_state = _tmp0_;
-#line 2057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = TRUE;
-#line 13110 "Page.c"
+#line 13522 "Page.c"
 }
 
 
 void single_photo_page_save_zoom_state (SinglePhotoPage* self) {
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->save_zoom_state (self);
-#line 13119 "Page.c"
+#line 13531 "Page.c"
 }
 
 
 static void single_photo_page_real_restore_zoom_state (SinglePhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->has_saved_zoom_state;
-#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2133 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2134 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13132 "Page.c"
+#line 13544 "Page.c"
 	}
-#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->saved_zoom_state;
-#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 13142 "Page.c"
+#line 13554 "Page.c"
 }
 
 
 void single_photo_page_restore_zoom_state (SinglePhotoPage* self) {
-#line 2060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->restore_zoom_state (self);
-#line 13151 "Page.c"
+#line 13563 "Page.c"
 }
 
 
 static ZoomBuffer* single_photo_page_real_get_zoom_buffer (SinglePhotoPage* self) {
 	ZoomBuffer* result = NULL;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13161 "Page.c"
+#line 13573 "Page.c"
 }
 
 
 ZoomBuffer* single_photo_page_get_zoom_buffer (SinglePhotoPage* self) {
-#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->get_zoom_buffer (self);
-#line 13170 "Page.c"
+#line 13582 "Page.c"
 }
 
 
 void single_photo_page_get_saved_zoom_state (SinglePhotoPage* self, ZoomState* result) {
 	ZoomState _tmp0_ = {0};
-#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2145 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2146 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->saved_zoom_state;
-#line 2074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2146 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2146 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13184 "Page.c"
+#line 13596 "Page.c"
 }
 
 
 void single_photo_page_set_zoom_state (SinglePhotoPage* self, ZoomState* zoom_state) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2078 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = *zoom_state;
-#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 13203 "Page.c"
+#line 13615 "Page.c"
 }
 
 
 void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2155 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->static_zoom_state;
-#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp1_;
-#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13222 "Page.c"
+#line 13634 "Page.c"
 }
 
 
 static void single_photo_page_real_switched_to (Page* base) {
 	SinglePhotoPage * self;
 	GdkPixbuf* _tmp0_ = NULL;
-#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (single_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 2093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint (self, NULL);
-#line 13239 "Page.c"
+#line 13651 "Page.c"
 	}
 }
 
@@ -13244,21 +13656,21 @@ static void single_photo_page_real_set_container (Page* base, GtkWindow* contain
 	SinglePhotoPage * self;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = container;
-#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (single_photo_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_);
-#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2173 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = container;
-#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2173 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_scrolled_window_set_policy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_scrolled_window_get_type (), GtkScrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 13262 "Page.c"
+#line 13674 "Page.c"
 	}
 }
 
@@ -13275,92 +13687,92 @@ void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, D
 	GdkPixbuf* _tmp8_ = NULL;
 	GtkDrawingArea* _tmp9_ = NULL;
 	Direction* _tmp10_ = NULL;
-#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (unscaled));
-#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (max_dim != NULL);
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *max_dim;
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_dim;
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp3_);
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_init (&self->priv->static_zoom_state, &_tmp0_, &_tmp1_, _tmp2_, &_tmp3_);
-#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = unscaled;
-#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = _tmp5_;
-#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = *max_dim;
-#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->max_dim = _tmp6_;
-#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->scaled;
-#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = _tmp8_;
-#line 2119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->canvas;
-#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = direction;
-#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, _tmp10_);
-#line 13329 "Page.c"
+#line 13741 "Page.c"
 }
 
 
 void single_photo_page_blank_display (SinglePhotoPage* self) {
 	GtkDrawingArea* _tmp0_ = NULL;
-#line 2127 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2202 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2202 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2203 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2203 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 2134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2134 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 13357 "Page.c"
+#line 13769 "Page.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 13364 "Page.c"
+#line 13776 "Page.c"
 }
 
 
@@ -13368,38 +13780,38 @@ cairo_surface_t* single_photo_page_get_surface (SinglePhotoPage* self) {
 	cairo_surface_t* result = NULL;
 	cairo_surface_t* _tmp0_ = NULL;
 	cairo_surface_t* _tmp1_ = NULL;
-#line 2140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2212 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_surface_reference0 (_tmp0_);
-#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13382 "Page.c"
+#line 13794 "Page.c"
 }
 
 
 void single_photo_page_get_surface_dim (SinglePhotoPage* self, Dimensions* result) {
 	Dimensions _tmp0_ = {0};
-#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2216 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_dim;
-#line 2145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13396 "Page.c"
+#line 13808 "Page.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 13403 "Page.c"
+#line 13815 "Page.c"
 }
 
 
@@ -13407,17 +13819,17 @@ cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self) {
 	cairo_t* result = NULL;
 	cairo_t* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
-#line 2148 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2220 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_reference0 (_tmp0_);
-#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13421 "Page.c"
+#line 13833 "Page.c"
 }
 
 
@@ -13427,25 +13839,25 @@ void single_photo_page_paint_text (SinglePhotoPage* self, PangoLayout* pango_lay
 	gint _tmp2_ = 0;
 	cairo_t* _tmp3_ = NULL;
 	PangoLayout* _tmp4_ = NULL;
-#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2152 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (PANGO_IS_LAYOUT (pango_layout));
-#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->text_ctx;
-#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_move_to (_tmp0_, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 2154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->text_ctx;
-#line 2154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = pango_layout;
-#line 2154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
 	pango_cairo_show_layout (_tmp3_, _tmp4_);
-#line 13449 "Page.c"
+#line 13861 "Page.c"
 }
 
 
@@ -13454,55 +13866,55 @@ void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* resul
 	GtkWindow* _tmp1_ = NULL;
 	GtkWindow* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 2157 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2229 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_FULLSCREEN_WINDOW);
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 13470 "Page.c"
+#line 13882 "Page.c"
 		GtkWindow* _tmp4_ = NULL;
 		GtkWindow* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 		Scaling _tmp7_ = {0};
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->scale_up_to_viewport;
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_screen (_tmp5_, _tmp6_, &_tmp7_);
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_;
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 13487 "Page.c"
+#line 13899 "Page.c"
 	} else {
 		GtkViewport* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		Scaling _tmp10_ = {0};
-#line 2159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->viewport;
-#line 2159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->scale_up_to_viewport;
-#line 2159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp9_, &_tmp10_);
-#line 2159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp10_;
-#line 13500 "Page.c"
+#line 13912 "Page.c"
 	}
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2158 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13506 "Page.c"
+#line 13918 "Page.c"
 }
 
 
@@ -13510,17 +13922,17 @@ GdkPixbuf* single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13524 "Page.c"
+#line 13936 "Page.c"
 }
 
 
@@ -13528,31 +13940,31 @@ GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 2166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled;
-#line 2167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2167 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13542 "Page.c"
+#line 13954 "Page.c"
 }
 
 
 void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, GdkRectangle* result) {
 	GdkRectangle _tmp0_ = {0};
-#line 2171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled_pos;
-#line 2172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13556 "Page.c"
+#line 13968 "Page.c"
 }
 
 
@@ -13562,50 +13974,50 @@ gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, gint x, gint
 	gint _tmp1_ = 0;
 	GdkRectangle _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->scaled_pos;
-#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = coord_in_rectangle (_tmp0_, _tmp1_, &_tmp2_);
-#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13580 "Page.c"
+#line 13992 "Page.c"
 }
 
 
 void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GdkWindow* _tmp1_ = NULL;
-#line 2179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2179 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 13597 "Page.c"
+#line 14009 "Page.c"
 		GtkDrawingArea* _tmp2_ = NULL;
 		GdkWindow* _tmp3_ = NULL;
 		GdkRectangle _tmp4_ = {0};
-#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = *rect;
-#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, &_tmp4_, FALSE);
-#line 13609 "Page.c"
+#line 14021 "Page.c"
 	}
 }
 
@@ -13613,51 +14025,51 @@ void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) {
 void single_photo_page_invalidate_all (SinglePhotoPage* self) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GdkWindow* _tmp1_ = NULL;
-#line 2184 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2185 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 13625 "Page.c"
+#line 14037 "Page.c"
 		GtkDrawingArea* _tmp2_ = NULL;
 		GdkWindow* _tmp3_ = NULL;
-#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, NULL, FALSE);
-#line 13634 "Page.c"
+#line 14046 "Page.c"
 	}
 }
 
 
 static void single_photo_page_on_viewport_resize (SinglePhotoPage* self) {
-#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2263 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, TRUE, NULL);
-#line 13644 "Page.c"
+#line 14056 "Page.c"
 }
 
 
 static void single_photo_page_real_on_resize_finished (Page* base, GdkRectangle* rect) {
 	SinglePhotoPage * self;
 	GdkRectangle _tmp0_ = {0};
-#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *rect;
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_CLASS (single_photo_page_parent_class)->on_resize_finished (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), &_tmp0_);
-#line 2198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 13661 "Page.c"
+#line 14073 "Page.c"
 }
 
 
@@ -13668,114 +14080,114 @@ static gboolean single_photo_page_on_canvas_exposed (SinglePhotoPage* self, cair
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	cairo_t* _tmp7_ = NULL;
-#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (exposed_ctx != NULL, FALSE);
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 13680 "Page.c"
+#line 14092 "Page.c"
 		cairo_t* _tmp1_ = NULL;
 		cairo_surface_t* _tmp2_ = NULL;
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = exposed_ctx;
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap;
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_set_source_surface (_tmp1_, _tmp2_, (gdouble) 0, (gdouble) 0);
-#line 13689 "Page.c"
+#line 14101 "Page.c"
 	} else {
 		cairo_t* _tmp3_ = NULL;
-#line 2207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = exposed_ctx;
-#line 2207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 13696 "Page.c"
+#line 14108 "Page.c"
 	}
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = exposed_ctx;
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gtk_widget_get_allocated_width (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gtk_widget_get_allocated_height (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_);
-#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = exposed_ctx;
-#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp7_);
-#line 2212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 2212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13714 "Page.c"
+#line 14126 "Page.c"
 }
 
 
 static void single_photo_page_real_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 13723 "Page.c"
+#line 14135 "Page.c"
 }
 
 
 void single_photo_page_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->new_surface (self, ctx, ctx_dim);
-#line 13732 "Page.c"
+#line 14144 "Page.c"
 }
 
 
 static void single_photo_page_real_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 13741 "Page.c"
+#line 14153 "Page.c"
 }
 
 
 void single_photo_page_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->updated_pixbuf (self, pixbuf, reason, old_dim);
-#line 13750 "Page.c"
+#line 14162 "Page.c"
 }
 
 
 static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = single_photo_page_is_zoom_supported (self);
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 13765 "Page.c"
+#line 14177 "Page.c"
 		gboolean _tmp2_ = FALSE;
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = zoom_state_is_default (&self->priv->static_zoom_state);
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 13771 "Page.c"
+#line 14183 "Page.c"
 	} else {
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 13775 "Page.c"
+#line 14187 "Page.c"
 	}
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 13779 "Page.c"
+#line 14191 "Page.c"
 		cairo_t* _tmp3_ = NULL;
 		cairo_t* _tmp4_ = NULL;
 		Dimensions _tmp5_ = {0};
@@ -13784,31 +14196,31 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 		gint _tmp8_ = 0;
 		cairo_t* _tmp9_ = NULL;
 		ZoomState _tmp10_ = {0};
-#line 2223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = ctx;
-#line 2223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = ctx;
-#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->pixmap_dim;
-#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_.width;
-#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->pixmap_dim;
-#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_.height;
-#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp6_, (gdouble) _tmp8_);
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = ctx;
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_fill (_tmp9_);
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->static_zoom_state;
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_render_zoomed_to_pixmap (self, &_tmp10_);
-#line 13812 "Page.c"
+#line 14224 "Page.c"
 	} else {
 		TransitionClock* _tmp11_ = NULL;
 		cairo_t* _tmp12_ = NULL;
@@ -13817,23 +14229,23 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 		Dimensions _tmp15_ = {0};
 		gint _tmp16_ = 0;
 		gboolean _tmp17_ = FALSE;
-#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->transition_clock;
-#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = ctx;
-#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = *ctx_dim;
-#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = *ctx_dim;
-#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_.height;
-#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = transition_clock_paint (_tmp11_, _tmp12_, _tmp14_, _tmp16_);
-#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp17_) {
-#line 13837 "Page.c"
+#line 14249 "Page.c"
 			cairo_t* _tmp18_ = NULL;
 			cairo_t* _tmp19_ = NULL;
 			Dimensions _tmp20_ = {0};
@@ -13848,56 +14260,56 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 			GdkRectangle _tmp29_ = {0};
 			gint _tmp30_ = 0;
 			cairo_t* _tmp31_ = NULL;
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ctx;
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
 			set_source_color_from_string (_tmp18_, "#000");
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = ctx;
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = self->priv->pixmap_dim;
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_.width;
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = self->priv->pixmap_dim;
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_.height;
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_rectangle (_tmp19_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp21_, (gdouble) _tmp23_);
-#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = ctx;
-#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_fill (_tmp24_);
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = ctx;
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = self->priv->scaled;
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = self->priv->scaled_pos;
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_.x;
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = self->priv->scaled_pos;
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _tmp29_.y;
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 			gdk_cairo_set_source_pixbuf (_tmp25_, _tmp26_, (gdouble) _tmp28_, (gdouble) _tmp30_);
-#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = ctx;
-#line 2236 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_paint (_tmp31_);
-#line 13890 "Page.c"
+#line 14302 "Page.c"
 		}
 	}
 }
 
 
 void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->paint (self, ctx, ctx_dim);
-#line 13901 "Page.c"
+#line 14313 "Page.c"
 }
 
 
@@ -13905,44 +14317,44 @@ static void single_photo_page_repaint_pixmap (SinglePhotoPage* self) {
 	cairo_t* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
 	Dimensions _tmp2_ = {0};
-#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2313 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2313 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 2242 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13917 "Page.c"
+#line 14329 "Page.c"
 	}
-#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_dim;
-#line 2244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_paint (self, _tmp1_, &_tmp2_);
-#line 2245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 13927 "Page.c"
+#line 14339 "Page.c"
 }
 
 
 void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction) {
 	Direction* _tmp0_ = NULL;
-#line 2248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = direction;
-#line 2249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, FALSE, _tmp0_);
-#line 13939 "Page.c"
+#line 14351 "Page.c"
 }
 
 
 static void _single_photo_page_repaint_pixmap_transition_clock_repaint_callback (gpointer self) {
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint_pixmap ((SinglePhotoPage*) self);
-#line 13946 "Page.c"
+#line 14358 "Page.c"
 }
 
 
@@ -13985,171 +14397,171 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 	Direction* _tmp84_ = NULL;
 	TransitionClock* _tmp98_ = NULL;
 	gboolean _tmp99_ = FALSE;
-#line 2252 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2254 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = NULL;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2330 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14005 "Page.c"
+#line 14417 "Page.c"
 	}
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->unscaled;
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = TRUE;
-#line 14013 "Page.c"
+#line 14425 "Page.c"
 	} else {
 		GtkDrawingArea* _tmp3_ = NULL;
 		GdkWindow* _tmp4_ = NULL;
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->canvas;
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp4_ == NULL;
-#line 14023 "Page.c"
+#line 14435 "Page.c"
 	}
-#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 2263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2335 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14029 "Page.c"
+#line 14441 "Page.c"
 	}
-#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), &_tmp6_);
-#line 2266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
 	allocation = _tmp6_;
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = allocation;
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_.width;
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
 	width = _tmp8_;
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = allocation;
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_.height;
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
 	height = _tmp10_;
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = width;
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ <= 0) {
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = TRUE;
-#line 14055 "Page.c"
+#line 14467 "Page.c"
 	} else {
 		gint _tmp13_ = 0;
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = height;
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp13_ <= 0;
-#line 14062 "Page.c"
+#line 14474 "Page.c"
 	}
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 2272 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14068 "Page.c"
+#line 14480 "Page.c"
 	}
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->scaled;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixbuf = _tmp14_ == NULL;
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->scaled_pos;
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_for_rectangle (&_tmp15_, &_tmp16_);
-#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_dim = _tmp16_;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->scaled_pos;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_pos = _tmp17_;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->pixmap_dim;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_.width;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = width;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != _tmp21_) {
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = TRUE;
-#line 14094 "Page.c"
+#line 14506 "Page.c"
 	} else {
 		Dimensions _tmp22_ = {0};
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->pixmap_dim;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.height;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = height;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp23_ != _tmp24_;
-#line 14107 "Page.c"
+#line 14519 "Page.c"
 	}
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 14115 "Page.c"
+#line 14527 "Page.c"
 	}
-#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixmap = FALSE;
-#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->pixmap;
-#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp25_ == NULL) {
-#line 14123 "Page.c"
+#line 14535 "Page.c"
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
-#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = width;
-#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = height;
-#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_init_pixmap (self, _tmp26_, _tmp27_);
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		new_pixmap = TRUE;
-#line 14134 "Page.c"
+#line 14546 "Page.c"
 	}
-#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = new_pixbuf;
-#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = TRUE;
-#line 14142 "Page.c"
+#line 14554 "Page.c"
 	} else {
 		gboolean _tmp30_ = FALSE;
-#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = new_pixmap;
-#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = _tmp30_;
-#line 14149 "Page.c"
+#line 14561 "Page.c"
 	}
-#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp28_) {
-#line 14153 "Page.c"
+#line 14565 "Page.c"
 		Dimensions unscaled_dim = {0};
 		GdkPixbuf* _tmp31_ = NULL;
 		Dimensions _tmp32_ = {0};
@@ -14174,155 +14586,155 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		gint _tmp60_ = 0;
 		Dimensions _tmp61_ = {0};
 		gint _tmp62_ = 0;
-#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->unscaled;
-#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_pixbuf (_tmp31_, &_tmp32_);
-#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 		unscaled_dim = _tmp32_;
-#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_init (&scaled_dim, 0, 0);
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = self->priv->scale_up_to_viewport;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp36_) {
-#line 14190 "Page.c"
+#line 14602 "Page.c"
 			gboolean _tmp37_ = FALSE;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = dimensions_has_area (&self->priv->max_dim);
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = _tmp37_;
-#line 14196 "Page.c"
+#line 14608 "Page.c"
 		} else {
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = FALSE;
-#line 14200 "Page.c"
+#line 14612 "Page.c"
 		}
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp35_) {
-#line 14204 "Page.c"
+#line 14616 "Page.c"
 			Dimensions _tmp38_ = {0};
 			gint _tmp39_ = 0;
 			gint _tmp40_ = 0;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = self->priv->max_dim;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_.width;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp40_ = width;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = _tmp39_ < _tmp40_;
-#line 14216 "Page.c"
+#line 14628 "Page.c"
 		} else {
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = FALSE;
-#line 14220 "Page.c"
+#line 14632 "Page.c"
 		}
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp34_) {
-#line 14224 "Page.c"
+#line 14636 "Page.c"
 			Dimensions _tmp41_ = {0};
 			gint _tmp42_ = 0;
 			gint _tmp43_ = 0;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->max_dim;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = _tmp41_.height;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = height;
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = _tmp42_ < _tmp43_;
-#line 14236 "Page.c"
+#line 14648 "Page.c"
 		} else {
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = FALSE;
-#line 14240 "Page.c"
+#line 14652 "Page.c"
 		}
-#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp33_) {
-#line 14244 "Page.c"
+#line 14656 "Page.c"
 			Dimensions _tmp44_ = {0};
-#line 2298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp44_ = self->priv->max_dim;
-#line 2298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp44_;
-#line 14250 "Page.c"
+#line 14662 "Page.c"
 		} else {
 			Dimensions _tmp45_ = {0};
 			Dimensions _tmp46_ = {0};
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = self->priv->pixmap_dim;
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
 			dimensions_get_scaled_proportional (&unscaled_dim, &_tmp45_, &_tmp46_);
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp46_;
-#line 14260 "Page.c"
+#line 14672 "Page.c"
 		}
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = width;
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = scaled_dim;
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.width;
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp47_ >= _tmp49_, "width >= scaled_dim.width");
-#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = height;
-#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = scaled_dim;
-#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = _tmp51_.height;
-#line 2303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2375 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp50_ >= _tmp52_, "height >= scaled_dim.height");
-#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp53_ = width;
-#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp54_ = scaled_dim;
-#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp55_ = _tmp54_.width;
-#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.x = (_tmp53_ - _tmp55_) / 2;
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp56_ = height;
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp57_ = scaled_dim;
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp58_ = _tmp57_.height;
-#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.y = (_tmp56_ - _tmp58_) / 2;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp59_ = scaled_dim;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp60_ = _tmp59_.width;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.width = _tmp60_;
-#line 2309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp61_ = scaled_dim;
-#line 2309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp62_ = _tmp61_.height;
-#line 2309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.height = _tmp62_;
-#line 14306 "Page.c"
+#line 14718 "Page.c"
 	}
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp64_ = fast;
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp64_) {
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_FAST_INTERP;
-#line 14314 "Page.c"
+#line 14726 "Page.c"
 	} else {
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14318 "Page.c"
+#line 14730 "Page.c"
 	}
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Page.vala"
 	interp = _tmp63_;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp65_ = self->priv->scaled;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp65_ == NULL) {
-#line 14326 "Page.c"
+#line 14738 "Page.c"
 		GdkPixbuf* _tmp66_ = NULL;
 		GdkRectangle _tmp67_ = {0};
 		Dimensions _tmp68_ = {0};
@@ -14337,101 +14749,101 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		GdkPixbuf* _tmp79_ = NULL;
 		SinglePhotoPageUpdateReason _tmp80_ = 0;
 		Dimensions _tmp81_ = {0};
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp66_ = self->priv->unscaled;
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp67_ = self->priv->scaled_pos;
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_rectangle (&_tmp67_, &_tmp68_);
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp69_ = interp;
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp70_ = resize_pixbuf (_tmp66_, &_tmp68_, _tmp69_);
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = _tmp70_;
-#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Page.vala"
 		reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_RESIZED_CANVAS;
-#line 2319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp71_ = new_pixbuf;
-#line 2319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp71_) {
-#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
 			reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_NEW_PIXBUF;
-#line 14363 "Page.c"
+#line 14775 "Page.c"
 		} else {
 			gboolean _tmp72_ = FALSE;
 			gboolean _tmp73_ = FALSE;
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp73_ = new_pixmap;
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp73_) {
-#line 14371 "Page.c"
+#line 14783 "Page.c"
 				GdkInterpType _tmp74_ = 0;
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp74_ = interp;
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = _tmp74_ == SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14377 "Page.c"
+#line 14789 "Page.c"
 			} else {
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = FALSE;
-#line 14381 "Page.c"
+#line 14793 "Page.c"
 			}
-#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp72_) {
-#line 2322 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 				reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 14387 "Page.c"
+#line 14799 "Page.c"
 			}
 		}
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp75_ = self->priv->max_dim;
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp76_ = self->priv->pixmap_dim;
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp77_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp78_);
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_init (&self->priv->static_zoom_state, &_tmp75_, &_tmp76_, _tmp77_, &_tmp78_);
-#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp79_ = self->priv->scaled;
-#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = reason;
-#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = old_scaled_dim;
-#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_updated_pixbuf (self, _tmp79_, _tmp80_, &_tmp81_);
-#line 14408 "Page.c"
+#line 14820 "Page.c"
 	}
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp82_ = fast;
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = !_tmp82_;
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp84_ = direction;
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp84_ != NULL) {
-#line 14418 "Page.c"
+#line 14830 "Page.c"
 		TransitionClock* _tmp85_ = NULL;
 		gboolean _tmp86_ = FALSE;
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp85_ = self->priv->transition_clock;
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp86_ = transition_clock_is_in_progress (_tmp85_);
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = !_tmp86_;
-#line 14427 "Page.c"
+#line 14839 "Page.c"
 	} else {
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = FALSE;
-#line 14431 "Page.c"
+#line 14843 "Page.c"
 	}
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp83_) {
-#line 14435 "Page.c"
+#line 14847 "Page.c"
 		SpitTransitionsVisuals* visuals = NULL;
 		GdkPixbuf* _tmp87_ = NULL;
 		GdkRectangle _tmp88_ = {0};
@@ -14444,45 +14856,45 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		Direction* _tmp95_ = NULL;
 		SpitTransitionsDirection _tmp96_ = 0;
 		gint _tmp97_ = 0;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp87_ = self->priv->old_scaled;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp88_ = old_scaled_pos;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp89_ = self->priv->scaled;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp90_ = self->priv->scaled_pos;
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 		parse_color ("#000", &_tmp91_);
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp92_ = spit_transitions_visuals_new (_tmp87_, &_tmp88_, _tmp89_, &_tmp90_, &_tmp91_);
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 		visuals = _tmp92_;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp93_ = self->priv->transition_clock;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp94_ = visuals;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp95_ = direction;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp96_ = direction_to_transition_direction (*_tmp95_);
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp97_ = self->priv->transition_duration_msec;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 		transition_clock_start (_tmp93_, _tmp94_, _tmp96_, _tmp97_, _single_photo_page_repaint_pixmap_transition_clock_repaint_callback, self);
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (visuals);
-#line 14476 "Page.c"
+#line 14888 "Page.c"
 	}
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp98_ = self->priv->transition_clock;
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp99_ = transition_clock_is_in_progress (_tmp98_);
-#line 2341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp99_) {
-#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint_pixmap (self);
-#line 14486 "Page.c"
+#line 14898 "Page.c"
 	}
 }
 
@@ -14503,65 +14915,65 @@ static void single_photo_page_init_pixmap (SinglePhotoPage* self, gint width, gi
 	cairo_t* _tmp12_ = NULL;
 	cairo_t* _tmp13_ = NULL;
 	Dimensions _tmp14_ = {0};
-#line 2345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2417 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ != NULL, "unscaled != null");
-#line 2347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->canvas;
-#line 2347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp2_ != NULL, "canvas.get_window() != null");
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = width;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = height;
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp3_, _tmp4_);
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = _tmp5_;
-#line 2351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = width;
-#line 2351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = height;
-#line 2351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, _tmp6_, _tmp7_);
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->pixmap;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = cairo_create (_tmp8_);
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = _tmp9_;
-#line 2357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2357 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->pixmap;
-#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = cairo_create (_tmp10_);
-#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = _tmp11_;
-#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->text_ctx;
-#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp12_, "#fff");
-#line 2366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->pixmap_ctx;
-#line 2366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->pixmap_dim;
-#line 2366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_new_surface (self, _tmp13_, &_tmp14_);
-#line 14565 "Page.c"
+#line 14977 "Page.c"
 }
 
 
@@ -14572,23 +14984,23 @@ static gboolean single_photo_page_real_on_context_keypress (Page* base) {
 	GtkMenu* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 2369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2441 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14592 "Page.c"
+#line 15004 "Page.c"
 }
 
 
@@ -14597,11 +15009,11 @@ static void single_photo_page_real_on_previous_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_previous_photo (SinglePhotoPage* self) {
-#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_previous_photo (self);
-#line 14605 "Page.c"
+#line 15017 "Page.c"
 }
 
 
@@ -14610,11 +15022,11 @@ static void single_photo_page_real_on_next_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_next_photo (SinglePhotoPage* self) {
-#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_next_photo (self);
-#line 14618 "Page.c"
+#line 15030 "Page.c"
 }
 
 
@@ -14631,266 +15043,266 @@ static gboolean single_photo_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	GQuark _tmp8_ = 0U;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label0 = 0;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label1 = 0;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label2 = 0;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label3 = 0;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label4 = 0;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label5 = 0;
-#line 14647 "Page.c"
+#line 15059 "Page.c"
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->time;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_nav_key;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
 	nav_ok = (_tmp1_ - _tmp2_) > ((guint32) SINGLE_PHOTO_PAGE_KEY_REPEAT_INTERVAL_MSEC);
-#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_->keyval;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_keyval_name (_tmp4_);
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Left")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("BackSpace"))))) {
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14678 "Page.c"
+#line 15090 "Page.c"
 			default:
 			{
 				gboolean _tmp9_ = FALSE;
-#line 2390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = nav_ok;
-#line 2390 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp9_) {
-#line 14686 "Page.c"
+#line 15098 "Page.c"
 					GdkEventKey* _tmp10_ = NULL;
 					guint32 _tmp11_ = 0U;
-#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_previous_photo (self);
-#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = event;
-#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp11_ = _tmp10_->time;
-#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp11_;
-#line 14697 "Page.c"
+#line 15109 "Page.c"
 				}
-#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14701 "Page.c"
+#line 15113 "Page.c"
 			}
 		}
 	} else if (((_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Right")))) || (_tmp8_ == ((0 != _tmp7_label4) ? _tmp7_label4 : (_tmp7_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp8_ == ((0 != _tmp7_label5) ? _tmp7_label5 : (_tmp7_label5 = g_quark_from_static_string ("space"))))) {
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14707 "Page.c"
+#line 15119 "Page.c"
 			default:
 			{
 				gboolean _tmp12_ = FALSE;
-#line 2399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = nav_ok;
-#line 2399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp12_) {
-#line 14715 "Page.c"
+#line 15127 "Page.c"
 					GdkEventKey* _tmp13_ = NULL;
 					guint32 _tmp14_ = 0U;
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_next_photo (self);
-#line 2401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = event;
-#line 2401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = _tmp13_->time;
-#line 2401 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp14_;
-#line 14726 "Page.c"
+#line 15138 "Page.c"
 				}
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14730 "Page.c"
+#line 15142 "Page.c"
 			}
 		}
 	} else {
-#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14736 "Page.c"
+#line 15148 "Page.c"
 			default:
 			{
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14743 "Page.c"
+#line 15155 "Page.c"
 			}
 		}
 	}
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = handled;
-#line 2410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_) {
-#line 2411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 2411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 14755 "Page.c"
+#line 15167 "Page.c"
 	}
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event != NULL) {
-#line 14759 "Page.c"
+#line 15171 "Page.c"
 		GdkEventKey* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), gtk_widget_get_type (), GtkWidget), _tmp17_);
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp18_;
-#line 14768 "Page.c"
+#line 15180 "Page.c"
 	} else {
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = TRUE;
-#line 14772 "Page.c"
+#line 15184 "Page.c"
 	}
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp16_;
-#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14778 "Page.c"
+#line 15190 "Page.c"
 }
 
 
 static void single_photo_page_class_init (SinglePhotoPageClass * klass) {
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (SinglePhotoPagePrivate));
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->is_zoom_supported = single_photo_page_real_is_zoom_supported;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->cancel_zoom = single_photo_page_real_cancel_zoom;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->save_zoom_state = single_photo_page_real_save_zoom_state;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->restore_zoom_state = single_photo_page_real_restore_zoom_state;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->get_zoom_buffer = single_photo_page_real_get_zoom_buffer;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = single_photo_page_real_switched_to;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_container = single_photo_page_real_set_container;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_resize_finished = single_photo_page_real_on_resize_finished;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->new_surface = single_photo_page_real_new_surface;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->updated_pixbuf = single_photo_page_real_updated_pixbuf;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->paint = single_photo_page_real_paint;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = single_photo_page_real_on_context_keypress;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->on_previous_photo = single_photo_page_real_on_previous_photo;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->on_next_photo = single_photo_page_real_on_next_photo;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->key_press_event = single_photo_page_real_key_press_event;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_photo_page_finalize;
-#line 14819 "Page.c"
+#line 15231 "Page.c"
 }
 
 
 static void single_photo_page_instance_init (SinglePhotoPage * self) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GtkViewport* _tmp1_ = NULL;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = SINGLE_PHOTO_PAGE_GET_PRIVATE (self);
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkDrawingArea*) gtk_drawing_area_new ();
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
 	self->canvas = _tmp0_;
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	self->viewport = _tmp1_;
-#line 1918 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1990 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = 0;
-#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = NULL;
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1993 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = NULL;
-#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, 0, 0);
-#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1997 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = NULL;
-#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&self->priv->scaled_pos, 0, sizeof (GdkRectangle));
-#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 1932 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_nav_key = (guint32) 0;
-#line 14866 "Page.c"
+#line 15278 "Page.c"
 }
 
 
 static void single_photo_page_finalize (GObject* obj) {
 	SinglePhotoPage * self;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->canvas);
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->viewport);
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 1921 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1993 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1997 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (single_photo_page_parent_class)->finalize (obj);
-#line 14894 "Page.c"
+#line 15306 "Page.c"
 }
 
 
@@ -14907,32 +15319,32 @@ GType single_photo_page_get_type (void) {
 
 
 static void _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 2472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_begin ((DragAndDropHandler*) self, context);
-#line 14913 "Page.c"
+#line 15325 "Page.c"
 }
 
 
 static void _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get (GtkWidget* _sender, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time_, gpointer self) {
-#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_data_get ((DragAndDropHandler*) self, context, selection_data, info, time_);
-#line 14920 "Page.c"
+#line 15332 "Page.c"
 }
 
 
 static void _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_end ((DragAndDropHandler*) self);
-#line 14927 "Page.c"
+#line 15339 "Page.c"
 }
 
 
 static gboolean _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed (GtkWidget* _sender, GdkDragContext* context, GtkDragResult _result_, gpointer self) {
 	gboolean result;
 	result = drag_and_drop_handler_on_drag_failed ((DragAndDropHandler*) self, context, _result_);
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14936 "Page.c"
+#line 15348 "Page.c"
 }
 
 
@@ -14950,20 +15362,20 @@ static GType drag_and_drop_handler_target_type_get_type (void) {
 
 static GdkAtom* _gdk_atom_dup (GdkAtom* self) {
 	GdkAtom* dup;
-#line 2450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (GdkAtom, 1);
-#line 2450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (GdkAtom));
-#line 2450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 14960 "Page.c"
+#line 15372 "Page.c"
 }
 
 
 static gpointer __gdk_atom_dup0 (gpointer self) {
-#line 2450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? _gdk_atom_dup (self) : NULL;
-#line 14967 "Page.c"
+#line 15379 "Page.c"
 }
 
 
@@ -14984,117 +15396,117 @@ DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* pa
 	GtkWidget* _tmp17_ = NULL;
 	GtkWidget* _tmp18_ = NULL;
 	GtkWidget* _tmp19_ = NULL;
-#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (page), NULL);
-#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (DragAndDropHandler*) g_type_create_instance (object_type);
-#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = _tmp0_;
-#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page;
-#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_event_source (_tmp1_);
-#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = _tmp2_;
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->event_source;
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_ != NULL, "event_source != null");
-#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gtk_widget_get_has_window (_tmp4_);
-#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp5_, "event_source.get_has_window()");
-#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = drag_and_drop_handler_XDS_ATOM;
-#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 15018 "Page.c"
+#line 15430 "Page.c"
 		GdkAtom _tmp7_ = 0U;
 		GdkAtom* _tmp8_ = NULL;
-#line 2450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_atom_intern_static_string ("XdndDirectSave0");
-#line 2450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = __gdk_atom_dup0 (&_tmp7_);
-#line 2450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_XDS_ATOM);
-#line 2450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_ATOM = _tmp8_;
-#line 15029 "Page.c"
+#line 15441 "Page.c"
 	}
-#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_ == NULL) {
-#line 15035 "Page.c"
+#line 15447 "Page.c"
 		GdkAtom _tmp10_ = 0U;
 		GdkAtom* _tmp11_ = NULL;
-#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gdk_atom_intern_static_string ("text/plain");
-#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = __gdk_atom_dup0 (&_tmp10_);
-#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_TEXT_ATOM);
-#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_TEXT_ATOM = _tmp11_;
-#line 15046 "Page.c"
+#line 15458 "Page.c"
 	}
-#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ == NULL) {
-#line 15054 "Page.c"
+#line 15466 "Page.c"
 		gint _tmp13_ = 0;
 		guchar* _tmp14_ = NULL;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = string_to_uchar_array ("shotwell.txt", &_tmp13_);
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET = (g_free (drag_and_drop_handler_XDS_FAKE_TARGET), NULL);
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET = _tmp14_;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET_length1 = _tmp13_;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
 		_drag_and_drop_handler_XDS_FAKE_TARGET_size_ = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 15067 "Page.c"
+#line 15479 "Page.c"
 	}
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->event_source;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_set (_tmp15_, GDK_BUTTON1_MASK, DRAG_AND_DROP_HANDLER_SOURCE_TARGET_ENTRIES, G_N_ELEMENTS (DRAG_AND_DROP_HANDLER_SOURCE_TARGET_ENTRIES), GDK_ACTION_COPY);
-#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->event_source;
-#line 2464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect (_tmp16_, "drag-begin", (GCallback) _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin, self);
-#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->event_source;
-#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect (_tmp17_, "drag-data-get", (GCallback) _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get, self);
-#line 2466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->event_source;
-#line 2466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect (_tmp18_, "drag-end", (GCallback) _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end, self);
-#line 2467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->event_source;
-#line 2467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_connect (_tmp19_, "drag-failed", (GCallback) _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed, self);
-#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 15091 "Page.c"
+#line 15503 "Page.c"
 }
 
 
 DragAndDropHandler* drag_and_drop_handler_new (Page* page) {
-#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Page.vala"
 	return drag_and_drop_handler_construct (TYPE_DRAG_AND_DROP_HANDLER, page);
-#line 15098 "Page.c"
+#line 15510 "Page.c"
 }
 
 
@@ -15120,119 +15532,119 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 	guint8* _tmp31_ = NULL;
 	gint _tmp31__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 2482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2554 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2554 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2483: on_drag_begin (%s)", _tmp2_);
-#line 2483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2555: on_drag_begin (%s)", _tmp2_);
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->page;
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_ == NULL) {
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 15144 "Page.c"
+#line 15556 "Page.c"
 	} else {
 		Page* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->page;
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (_tmp6_);
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_count (_tmp8_);
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp9_ == 0;
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 15162 "Page.c"
+#line 15574 "Page.c"
 	}
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15168 "Page.c"
+#line 15580 "Page.c"
 	} else {
 		ExporterUI* _tmp10_ = NULL;
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->exporter;
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp10_ != NULL;
-#line 15175 "Page.c"
+#line 15587 "Page.c"
 	}
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15181 "Page.c"
+#line 15593 "Page.c"
 	}
-#line 2488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->page;
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = page_get_view (_tmp11_);
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_;
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = view_collection_get_selected_at (_tmp13_, 0);
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = data_view_get_source (_tmp15_);
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource);
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp15_);
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp13_);
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	thumb = _tmp17_;
-#line 15207 "Page.c"
+#line 15619 "Page.c"
 	{
 		GdkPixbuf* icon = NULL;
 		ThumbnailSource* _tmp18_ = NULL;
 		GdkPixbuf* _tmp19_ = NULL;
 		GtkWidget* _tmp20_ = NULL;
 		GdkPixbuf* _tmp21_ = NULL;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = thumb;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = thumbnail_source_get_thumbnail (_tmp18_, APP_WINDOW_DND_ICON_SCALE, &_inner_error_);
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 		icon = _tmp19_;
-#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15222 "Page.c"
-			goto __catch255_g_error;
+#line 15634 "Page.c"
+			goto __catch252_g_error;
 		}
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->event_source;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = icon;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_drag_source_set_icon_pixbuf (_tmp20_, _tmp21_);
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (icon);
-#line 15233 "Page.c"
+#line 15645 "Page.c"
 	}
-	goto __finally255;
-	__catch255_g_error:
+	goto __finally252;
+	__catch252_g_error:
 	{
 		GError* err = NULL;
 		ThumbnailSource* _tmp22_ = NULL;
@@ -15240,58 +15652,58 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 		gchar* _tmp24_ = NULL;
 		GError* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = thumb;
-#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
-#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_;
-#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = err;
-#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_->message;
-#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:2497: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
-#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
+		g_warning ("Page.vala:2569: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
+#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp24_);
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 15264 "Page.c"
+#line 15676 "Page.c"
 	}
-	__finally255:
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+	__finally252:
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (thumb);
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 2493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15277 "Page.c"
+#line 15689 "Page.c"
 	}
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = context;
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = gdk_drag_context_get_source_window (_tmp27_);
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = drag_and_drop_handler_XDS_ATOM;
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_property_change (_tmp28_, *_tmp29_, *_tmp30_, 8, GDK_PROP_MODE_REPLACE, (const guchar*) _tmp31_, 1);
-#line 2482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2554 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (thumb);
-#line 15295 "Page.c"
+#line 15707 "Page.c"
 }
 
 
@@ -15302,61 +15714,61 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 	gboolean _tmp3_ = FALSE;
 	Page* _tmp4_ = NULL;
 	guint _tmp9_ = 0U;
-#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2513: on_drag_data_get (%s)", _tmp2_);
-#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2585: on_drag_data_get (%s)", _tmp2_);
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15328 "Page.c"
+#line 15740 "Page.c"
 	} else {
 		Page* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->page;
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_view (_tmp5_);
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp8_ == 0;
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 15346 "Page.c"
+#line 15758 "Page.c"
 	}
-#line 2515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15352 "Page.c"
+#line 15764 "Page.c"
 	}
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = target_type;
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp9_) {
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_XDS:
-#line 15360 "Page.c"
+#line 15772 "Page.c"
 		{
 			guchar* data = NULL;
 			guchar* _tmp10_ = NULL;
@@ -15392,83 +15804,83 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			guchar* _tmp45_ = NULL;
 			guchar* _tmp46_ = NULL;
 			gint _tmp46__length1 = 0;
-#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = g_new0 (guchar, 4096);
-#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp10_;
-#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = 4096;
-#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2595 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = 0;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = context;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = gdk_drag_context_get_source_window (_tmp11_);
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = drag_and_drop_handler_XDS_ATOM;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = data;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15__length1 = data_length1;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = gdk_property_get (_tmp12_, *_tmp13_, *_tmp14_, (gulong) 0, (gulong) _tmp15__length1, 0, &_tmp16_, &_tmp17_, &_tmp19_, &_tmp18_);
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_type = _tmp16_;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = _tmp17_;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp18_;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = _tmp19_;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2596 "/home/jens/Source/shotwell/src/Page.vala"
 			fetched = _tmp20_;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = fetched;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp23_) {
-#line 15438 "Page.c"
+#line 15850 "Page.c"
 				guchar* _tmp24_ = NULL;
 				gint _tmp24__length1 = 0;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = data;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24__length1 = data_length1;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = _tmp24_ != NULL;
-#line 15447 "Page.c"
+#line 15859 "Page.c"
 			} else {
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = FALSE;
-#line 15451 "Page.c"
+#line 15863 "Page.c"
 			}
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp22_) {
-#line 15455 "Page.c"
+#line 15867 "Page.c"
 				guchar* _tmp25_ = NULL;
 				gint _tmp25__length1 = 0;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = data;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25__length1 = data_length1;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = _tmp25__length1 > 0;
-#line 15464 "Page.c"
+#line 15876 "Page.c"
 			} else {
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = FALSE;
-#line 15468 "Page.c"
+#line 15880 "Page.c"
 			}
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 15472 "Page.c"
+#line 15884 "Page.c"
 				guchar* _tmp26_ = NULL;
 				gint _tmp26__length1 = 0;
 				gchar* _tmp27_ = NULL;
@@ -15476,103 +15888,103 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 				GFile* _tmp29_ = NULL;
 				GFile* _tmp30_ = NULL;
 				GFile* _tmp31_ = NULL;
-#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = data;
-#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26__length1 = data_length1;
-#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = uchar_array_to_string (_tmp26_, _tmp26__length1, -1);
-#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = _tmp27_;
-#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = g_file_new_for_uri (_tmp28_);
-#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = _tmp29_;
-#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = g_file_get_parent (_tmp30_);
-#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->drag_destination);
-#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->drag_destination = _tmp31_;
-#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp30_);
-#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp28_);
-#line 15502 "Page.c"
+#line 15914 "Page.c"
 			}
-#line 2533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = self->priv->drag_destination;
-#line 2533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp33_ != NULL) {
-#line 15508 "Page.c"
+#line 15920 "Page.c"
 				GFile* _tmp34_ = NULL;
 				gchar* _tmp35_ = NULL;
-#line 2533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = self->priv->drag_destination;
-#line 2533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = g_file_get_path (_tmp34_);
-#line 2533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp35_;
-#line 15519 "Page.c"
+#line 15931 "Page.c"
 			} else {
 				gchar* _tmp36_ = NULL;
-#line 2533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = g_strdup ("(no path)");
-#line 2533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp36_;
-#line 15528 "Page.c"
+#line 15940 "Page.c"
 			}
-#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = self->priv->page;
-#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = page_get_page_name (_tmp37_);
-#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_;
-#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
-			g_debug ("Page.vala:2532: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
-#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+			g_debug ("Page.vala:2604: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
+#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp39_);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->drag_destination;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ != NULL) {
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "S";
-#line 15546 "Page.c"
+#line 15958 "Page.c"
 			} else {
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "E";
-#line 15550 "Page.c"
+#line 15962 "Page.c"
 			}
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = selection_data;
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = drag_and_drop_handler_XDS_ATOM;
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = string_to_uchar_array (_tmp40_, &_tmp44_);
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = _tmp45_;
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46__length1 = _tmp44_;
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp42_, *_tmp43_, 8, _tmp46_, _tmp44_);
-#line 2536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = (g_free (_tmp46_), NULL);
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp32_);
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15572 "Page.c"
+#line 15984 "Page.c"
 		}
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_MEDIA_LIST:
-#line 15576 "Page.c"
+#line 15988 "Page.c"
 		{
 			GeeCollection* sources = NULL;
 			Page* _tmp47_ = NULL;
@@ -15587,41 +15999,41 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			guchar* _tmp56_ = NULL;
 			guchar* _tmp57_ = NULL;
 			gint _tmp57__length1 = 0;
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp47_ = self->priv->page;
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp48_ = page_get_view (_tmp47_);
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp49_ = _tmp48_;
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp50_ = view_collection_get_selected_sources (_tmp49_);
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp51_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp49_);
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 			sources = _tmp51_;
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp52_ = selection_data;
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp53_ = gdk_atom_intern_static_string ("SourceIDAtom");
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp54_ = sources;
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp56_ = serialize_media_sources (_tmp54_, &_tmp55_);
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = _tmp56_;
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57__length1 = _tmp55_;
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp52_, _tmp53_, (gint) sizeof (GdkAtom), _tmp57_, _tmp55_);
-#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = (g_free (_tmp57_), NULL);
-#line 2548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (sources);
-#line 2548 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15625 "Page.c"
+#line 16037 "Page.c"
 		}
 		default:
 		{
@@ -15629,30 +16041,30 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			gchar* _tmp59_ = NULL;
 			gchar* _tmp60_ = NULL;
 			guint _tmp61_ = 0U;
-#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp58_ = self->priv->page;
-#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp59_ = page_get_page_name (_tmp58_);
-#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp60_ = _tmp59_;
-#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp61_ = target_type;
-#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
-			g_warning ("Page.vala:2551: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
-#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
+			g_warning ("Page.vala:2623: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp60_);
-#line 2553 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2625 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15647 "Page.c"
+#line 16059 "Page.c"
 		}
 	}
 }
 
 
 static void _drag_and_drop_handler_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 2574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2646 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_export_completed ((DragAndDropHandler*) self);
-#line 15656 "Page.c"
+#line 16068 "Page.c"
 }
 
 
@@ -15671,99 +16083,99 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
 	gchar* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
 	gboolean _tmp19_ = FALSE;
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2558: on_drag_end (%s)", _tmp2_);
-#line 2558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2630: on_drag_end (%s)", _tmp2_);
+#line 2630 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->page;
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = TRUE;
-#line 15693 "Page.c"
+#line 16105 "Page.c"
 	} else {
 		Page* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->page;
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = view_collection_get_selected_count (_tmp9_);
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp10_ == 0;
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 15711 "Page.c"
+#line 16123 "Page.c"
 	}
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 15717 "Page.c"
+#line 16129 "Page.c"
 	} else {
 		GFile* _tmp11_ = NULL;
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->drag_destination;
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp11_ == NULL;
-#line 15724 "Page.c"
+#line 16136 "Page.c"
 	}
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15730 "Page.c"
+#line 16142 "Page.c"
 	} else {
 		ExporterUI* _tmp12_ = NULL;
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->exporter;
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp12_ != NULL;
-#line 15737 "Page.c"
+#line 16149 "Page.c"
 	}
-#line 2560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15743 "Page.c"
+#line 16155 "Page.c"
 	}
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->drag_destination;
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = g_file_get_path (_tmp13_);
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2565: Exporting to %s", _tmp15_);
-#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2637: Exporting to %s", _tmp15_);
+#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp15_);
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->drag_destination;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = g_file_get_path (_tmp16_);
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _tmp18_ != NULL;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp18_);
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp19_) {
-#line 15767 "Page.c"
+#line 16179 "Page.c"
 		Page* _tmp20_ = NULL;
 		ViewCollection* _tmp21_ = NULL;
 		ViewCollection* _tmp22_ = NULL;
@@ -15776,56 +16188,56 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
 		Exporter* _tmp29_ = NULL;
 		ExporterUI* _tmp30_ = NULL;
 		ExporterUI* _tmp31_ = NULL;
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->page;
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = page_get_view (_tmp20_);
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_;
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_collection_get_selected_sources (_tmp22_);
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = self->priv->drag_destination;
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_original (&_tmp26_);
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		export_format_parameters_current (&_tmp27_);
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = exporter_new (_tmp24_, _tmp25_, &_tmp26_, &_tmp27_, FALSE);
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_;
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = exporter_ui_new (_tmp29_);
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->exporter = _tmp30_;
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp29_);
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp24_);
-#line 2571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp22_);
-#line 2574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2646 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->exporter;
-#line 2574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2646 "/home/jens/Source/shotwell/src/Page.vala"
 		exporter_ui_export (_tmp31_, _drag_and_drop_handler_on_export_completed_exporter_completion_callback, self);
-#line 15816 "Page.c"
+#line 16228 "Page.c"
 	} else {
 		const gchar* _tmp32_ = NULL;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2648 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _ ("Photos cannot be exported to this directory.");
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2648 "/home/jens/Source/shotwell/src/Page.vala"
 		app_window_error_message (_tmp32_, NULL);
-#line 15823 "Page.c"
+#line 16235 "Page.c"
 	}
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2651 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 15829 "Page.c"
+#line 16241 "Page.c"
 }
 
 
@@ -15836,271 +16248,271 @@ static gboolean drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self,
 	gchar* _tmp2_ = NULL;
 	GtkDragResult _tmp3_ = 0;
 	Page* _tmp4_ = NULL;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2654 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_DRAG_AND_DROP_HANDLER (self), FALSE);
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2654 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = drag_result;
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2583: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2655: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
+#line 2655 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2657 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2657 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2658 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 2586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2658 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 15864 "Page.c"
+#line 16276 "Page.c"
 	}
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2660 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2660 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 15874 "Page.c"
+#line 16286 "Page.c"
 }
 
 
 static void drag_and_drop_handler_on_export_completed (DragAndDropHandler* self) {
-#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2665 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 15885 "Page.c"
+#line 16297 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_init (GValue* value) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	value->data[0].v_pointer = NULL;
-#line 15892 "Page.c"
+#line 16304 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_free_value (GValue* value) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	if (value->data[0].v_pointer) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (value->data[0].v_pointer);
-#line 15901 "Page.c"
+#line 16313 "Page.c"
 	}
 }
 
 
 static void value_drag_and_drop_handler_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = drag_and_drop_handler_ref (src_value->data[0].v_pointer);
-#line 15911 "Page.c"
+#line 16323 "Page.c"
 	} else {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 15915 "Page.c"
+#line 16327 "Page.c"
 	}
 }
 
 
 static gpointer value_drag_and_drop_handler_peek_pointer (const GValue* value) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 15923 "Page.c"
+#line 16335 "Page.c"
 }
 
 
 static gchar* value_drag_and_drop_handler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
-#line 15930 "Page.c"
+#line 16342 "Page.c"
 		DragAndDropHandler* object;
 		object = collect_values[0].v_pointer;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 15937 "Page.c"
+#line 16349 "Page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 15941 "Page.c"
+#line 16353 "Page.c"
 		}
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = drag_and_drop_handler_ref (object);
-#line 15945 "Page.c"
+#line 16357 "Page.c"
 	} else {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 15949 "Page.c"
+#line 16361 "Page.c"
 	}
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 15953 "Page.c"
+#line 16365 "Page.c"
 }
 
 
 static gchar* value_drag_and_drop_handler_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	DragAndDropHandler** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!object_p) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 15964 "Page.c"
+#line 16376 "Page.c"
 	}
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!value->data[0].v_pointer) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = NULL;
-#line 15970 "Page.c"
+#line 16382 "Page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 15974 "Page.c"
+#line 16386 "Page.c"
 	} else {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 15978 "Page.c"
+#line 16390 "Page.c"
 	}
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 15982 "Page.c"
+#line 16394 "Page.c"
 }
 
 
 GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecDragAndDropHandler* spec;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_DRAG_AND_DROP_HANDLER), NULL);
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	return G_PARAM_SPEC (spec);
-#line 15996 "Page.c"
+#line 16408 "Page.c"
 }
 
 
 gpointer value_get_drag_and_drop_handler (const GValue* value) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER), NULL);
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16005 "Page.c"
+#line 16417 "Page.c"
 }
 
 
 void value_set_drag_and_drop_handler (GValue* value, gpointer v_object) {
 	DragAndDropHandler* old;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16025 "Page.c"
+#line 16437 "Page.c"
 	} else {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16029 "Page.c"
+#line 16441 "Page.c"
 	}
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16035 "Page.c"
+#line 16447 "Page.c"
 	}
 }
 
 
 void value_take_drag_and_drop_handler (GValue* value, gpointer v_object) {
 	DragAndDropHandler* old;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 16054 "Page.c"
+#line 16466 "Page.c"
 	} else {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16058 "Page.c"
+#line 16470 "Page.c"
 	}
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16064 "Page.c"
+#line 16476 "Page.c"
 	}
 }
 
 
 static void drag_and_drop_handler_class_init (DragAndDropHandlerClass * klass) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_parent_class = g_type_class_peek_parent (klass);
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	((DragAndDropHandlerClass *) klass)->finalize = drag_and_drop_handler_finalize;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (DragAndDropHandlerPrivate));
-#line 16076 "Page.c"
+#line 16488 "Page.c"
 }
 
 
 static void drag_and_drop_handler_instance_init (DragAndDropHandler * self) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = DRAG_AND_DROP_HANDLER_GET_PRIVATE (self);
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	self->ref_count = 1;
-#line 16089 "Page.c"
+#line 16501 "Page.c"
 }
 
 
 static void drag_and_drop_handler_finalize (DragAndDropHandler* obj) {
 	DragAndDropHandler * self;
 	GtkWidget* _tmp0_ = NULL;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DRAG_AND_DROP_HANDLER, DragAndDropHandler);
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_destroy (self);
-#line 2471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 2471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 16104 "Page.c"
+#line 16516 "Page.c"
 		GtkWidget* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		GtkWidget* _tmp3_ = NULL;
@@ -16109,45 +16521,45 @@ static void drag_and_drop_handler_finalize (DragAndDropHandler* obj) {
 		guint _tmp6_ = 0U;
 		GtkWidget* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
-#line 2472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 2472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp2_, NULL, FALSE);
-#line 2472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_begin_gtk_widget_drag_begin, self);
-#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 2473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_data_get_gtk_widget_drag_data_get, self);
-#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp6_, NULL, FALSE);
-#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end, self);
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->event_source;
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp8_, NULL, FALSE);
-#line 2475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _drag_and_drop_handler_on_drag_failed_gtk_widget_drag_failed, self);
-#line 16137 "Page.c"
+#line 16549 "Page.c"
 	}
-#line 2478 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = NULL;
-#line 2479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
-#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2510 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 16151 "Page.c"
+#line 16563 "Page.c"
 }
 
 
@@ -16168,24 +16580,24 @@ GType drag_and_drop_handler_get_type (void) {
 gpointer drag_and_drop_handler_ref (gpointer instance) {
 	DragAndDropHandler* self;
 	self = instance;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	return instance;
-#line 16176 "Page.c"
+#line 16588 "Page.c"
 }
 
 
 void drag_and_drop_handler_unref (gpointer instance) {
 	DragAndDropHandler* self;
 	self = instance;
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		DRAG_AND_DROP_HANDLER_GET_CLASS (self)->finalize (self);
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 16189 "Page.c"
+#line 16601 "Page.c"
 	}
 }
 
diff --git a/src/Page.vala b/src/Page.vala
index 4877a47..13caae6 100644
--- a/src/Page.vala
+++ b/src/Page.vala
@@ -6,50 +6,60 @@
 
 public class InjectionGroup {
     public class Element {
+        public enum ItemType {
+            MENUITEM,
+            MENU,
+            SEPARATOR
+        }
         public string name;
         public string action;
-        public Gtk.UIManagerItemType kind;
-        
-        public Element(string name, string? action, Gtk.UIManagerItemType kind) {
+        public string? accellerator;
+        public ItemType kind;
+
+        public Element(string name, string? action, string? accellerator, ItemType kind) {
             this.name = name;
             this.action = action != null ? action : name;
+            this.accellerator = accellerator;
             this.kind = kind;
         }
     }
-    
+
     private string path;
     private Gee.ArrayList<Element?> elements = new Gee.ArrayList<Element?>();
     private int separator_id = 0;
-    
+
     public InjectionGroup(string path) {
         this.path = path;
     }
-    
+
     public string get_path() {
         return path;
     }
-    
+
     public Gee.List<Element?> get_elements() {
         return elements;
     }
-    
-    public void add_menu_item(string name, string? action = null) {
-        elements.add(new Element(name, action, Gtk.UIManagerItemType.MENUITEM));
+
+    public void add_menu_item(string name, string? action = null, string?
+            accellerator = null) {
+        elements.add(new Element(name, action, accellerator, Element.ItemType.MENUITEM));
     }
-    
+
     public void add_menu(string name, string? action = null) {
-        elements.add(new Element(name, action, Gtk.UIManagerItemType.MENU));
+        elements.add(new Element(name, action, null, Element.ItemType.MENU));
     }
-    
+
     public void add_separator() {
-        elements.add(new Element("%d-separator".printf(separator_id++), null, Gtk.UIManagerItemType.SEPARATOR));
+        elements.add(new Element("%d-separator".printf(separator_id++), null,
+                    null,
+                    Element.ItemType.SEPARATOR));
     }
 }
 
 public abstract class Page : Gtk.ScrolledWindow {
     private const int CONSIDER_CONFIGURE_HALTED_MSEC = 400;
     
-    protected Gtk.UIManager ui;
+    protected Gtk.Builder builder = new Gtk.Builder ();
     protected Gtk.Toolbar toolbar;
     protected bool in_view = false;
     
@@ -76,10 +86,6 @@ public abstract class Page : Gtk.ScrolledWindow {
     private int cursor_hide_time_cached = 0;
     private bool are_actions_attached = false;
     private OneShotScheduler? update_actions_scheduler = null;
-    private Gtk.ActionGroup? action_group = null;
-    private Gtk.ActionGroup[]? common_action_groups = null;
-    
-    private uint[] merge_ids = new uint[0];
     
     protected Page(string page_name) {
         this.page_name = page_name;
@@ -155,7 +161,6 @@ public abstract class Page : Gtk.ScrolledWindow {
         assert(this.container == null);
         
         this.container = container;
-        ui = ((PageWindow) container).get_ui_manager();
     }
     
     public virtual void clear_container() {
@@ -199,22 +204,58 @@ public abstract class Page : Gtk.ScrolledWindow {
     public Gtk.Widget? get_event_source() {
         return event_source;
     }
-    
-    public virtual Gtk.MenuBar get_menubar() {
-        Gtk.MenuBar? menubar = ui.get_widget("/MenuBar") as Gtk.MenuBar;
-        assert(menubar != null);
-        
-        return menubar;
-    }
 
-    public virtual unowned Gtk.Widget get_page_ui_widget(string path) {
-        return ui.get_widget(path);
+    private bool menubar_injected = false;
+    public GLib.MenuModel get_menubar() {
+        var model = builder.get_object ("MenuBar") as GLib.Menu;
+
+        if (!menubar_injected) {
+            // Collect injected UI elements and add them to the UI manager
+            InjectionGroup[] injection_groups = init_collect_injection_groups();
+            foreach (InjectionGroup group in injection_groups) {
+                var items = model.get_n_items ();
+                for (int i = 0; i < items; i++) {
+                    var submenu = model.get_item_link (i, GLib.Menu.LINK_SUBMENU);
+
+                    var section = this.find_extension_point (submenu,
+                                                             group.get_path ());
+
+                    if (section == null) {
+                        continue;
+                    }
+
+                    foreach (var element in group.get_elements ()) {
+                        var menu = section as GLib.Menu;
+                        switch (element.kind) {
+                            case InjectionGroup.Element.ItemType.MENUITEM:
+                                var item = new GLib.MenuItem (element.name,
+                                                              "win." + element.action);
+                                if (element.accellerator != null) {
+                                    item.set_attribute ("accel",
+                                                        "s",
+                                                        element.accellerator);
+                                }
+
+                                menu.append_item (item);
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                }
+            }
+
+            this.menubar_injected = true;
+        }
+
+        return model;
     }
 
     public virtual Gtk.Toolbar get_toolbar() {
         if (toolbar == null) {
             toolbar = toolbar_path == null ? new Gtk.Toolbar() :
-                                             ui.get_widget(toolbar_path) as Gtk.Toolbar;
+                                             builder.get_object (toolbar_path)
+                                             as Gtk.Toolbar;
             toolbar.get_style_context().add_class("bottom-toolbar");  // for elementary theme
             toolbar.set_icon_size(Gtk.IconSize.SMALL_TOOLBAR);
         }
@@ -227,7 +268,6 @@ public abstract class Page : Gtk.ScrolledWindow {
     
     public virtual void switching_from() {
         in_view = false;
-        remove_ui();
         if (toolbar_path != null)
             toolbar = null;
     }
@@ -250,77 +290,59 @@ public abstract class Page : Gtk.ScrolledWindow {
     
     public virtual void returning_from_fullscreen(FullscreenWindow fsw) {
     }
-    
-    public Gtk.Action? get_action(string name) {
-        if (action_group == null)
-            return null;
-        
-        Gtk.Action? action = action_group.get_action(name);
-        if (action == null)
-            action = get_common_action(name, false);
-        
-        if (action == null)
-            warning("Page %s: Unable to locate action %s", get_page_name(), name);
-        
-        return action;
+
+    public GLib.Action? get_action (string name) {
+        var aw = AppWindow.get_instance ();
+
+        if (aw != null) {
+            return aw.lookup_action (name);
+        }
+
+        return null;
     }
     
     public void set_action_sensitive(string name, bool sensitive) {
-        Gtk.Action? action = get_action(name);
+        GLib.SimpleAction? action = get_action(name) as GLib.SimpleAction;
         if (action != null)
-            action.sensitive = sensitive;
+            action.set_enabled (sensitive);
     }
     
     public void set_action_important(string name, bool important) {
-        Gtk.Action? action = get_action(name);
-        if (action != null)
-            action.is_important = important;
+        set_action_sensitive (name, important);
     }
     
     public void set_action_visible(string name, bool visible) {
-        Gtk.Action? action = get_action(name);
-        if (action == null)
-            return;
-        
-        action.visible = visible;
-        action.sensitive = visible;
+        set_action_sensitive (name, visible);
     }
     
     public void set_action_short_label(string name, string short_label) {
-        Gtk.Action? action = get_action(name);
-        if (action != null)
-            action.short_label = short_label;
+        debug ("=> Set action short_label called for %s", name);
     }
     
     public void set_action_details(string name, string? label, string? tooltip, bool sensitive) {
-        Gtk.Action? action = get_action(name);
+        GLib.SimpleAction? action = get_action(name) as GLib.SimpleAction;
+
         if (action == null)
             return;
-        
+
         if (label != null)
-            action.label = label;
-        
-        if (tooltip != null)
-            action.tooltip = tooltip;
-        
-        action.sensitive = sensitive;
+            this.update_menu_item_label (name, label);
+
+        action.set_enabled (sensitive);
     }
     
     public void activate_action(string name) {
-        Gtk.Action? action = get_action(name);
+        var action = get_action(name);
+
         if (action != null)
-            action.activate();
+            action.activate (null);
     }
     
-    public Gtk.Action? get_common_action(string name, bool log_warning = true) {
-        if (common_action_groups == null)
-            return null;
-        
-        foreach (Gtk.ActionGroup group in common_action_groups) {
-            Gtk.Action? action = group.get_action(name);
-            if (action != null)
-                return action;
-        }
+    public GLib.Action? get_common_action(string name, bool log_warning = true) {
+        var action = get_action (name);
+
+        if (action != null)
+            return action;
         
         if (log_warning)
             warning("Page %s: Unable to locate common action %s", get_page_name(), name);
@@ -329,27 +351,23 @@ public abstract class Page : Gtk.ScrolledWindow {
     }
     
     public void set_common_action_sensitive(string name, bool sensitive) {
-        Gtk.Action? action = get_common_action(name);
+        var action = get_common_action(name) as GLib.SimpleAction;
         if (action != null)
-            action.sensitive = sensitive;
+            action.set_enabled (sensitive);
     }
 
     public void set_common_action_label(string name, string label) {
-        Gtk.Action? action = get_common_action(name);
-        if (action != null)
-            action.set_label(label);
+        debug ("Trying to set common action label for %s", name);
     }
     
     public void set_common_action_important(string name, bool important) {
-        Gtk.Action? action = get_common_action(name);
-        if (action != null)
-            action.is_important = important;
+        debug ("Setting action to important: %s", name);
     }
     
     public void activate_common_action(string name) {
-        Gtk.Action? action = get_common_action(name);
+        var action = get_common_action(name) as GLib.SimpleAction;
         if (action != null)
-            action.activate();
+            action.activate(null);
     }
     
     public bool get_ctrl_pressed() {
@@ -367,7 +385,14 @@ public abstract class Page : Gtk.ScrolledWindow {
     public bool get_super_pressed() {
         return super_pressed;
     }
-    
+
+     protected void set_action_active (string name, bool active) {
+        var action = get_action (name) as GLib.SimpleAction;
+        if (action != null) {
+            action.set_state (active);
+        }
+    }
+
     private bool get_modifiers(out bool ctrl, out bool alt, out bool shift, out bool super) {
         if (AppWindow.get_instance().get_window() == null) {
             ctrl = false;
@@ -440,27 +465,20 @@ public abstract class Page : Gtk.ScrolledWindow {
     public CommandManager get_command_manager() {
         return AppWindow.get_command_manager();
     }
-    
+
+    protected virtual void add_actions () { }
+
+    protected void on_action_toggle (GLib.Action action, Variant? value) {
+        Variant new_state = ! (bool) action.get_state ();
+        action.change_state (new_state);
+    }
+
+    protected void on_action_radio (GLib.Action action, Variant? value) {
+        action.change_state (value);
+    }
+
     private void init_ui() {
-        action_group = new Gtk.ActionGroup("PageActionGroup");
-        
-        // Collect all Gtk.Actions and add them to the Page's Gtk.ActionGroup
-        Gtk.ActionEntry[] action_entries = init_collect_action_entries();
-        if (action_entries.length > 0)
-            action_group.add_actions(action_entries, this);
-        
-        // Collect all Gtk.ToggleActionEntries and add them to the Gtk.ActionGroup
-        Gtk.ToggleActionEntry[] toggle_entries = init_collect_toggle_action_entries();
-        if (toggle_entries.length > 0)
-            action_group.add_toggle_actions(toggle_entries, this);
-        
-        // Collect all Gtk.RadioActionEntries and add them to the Gtk.ActionGroup
-        // (Would use a similar collection scheme as the other calls, but there is a binding
-        // problem with Gtk.RadioActionCallback that doesn't allow it to be stored in a struct)
-        register_radio_actions(action_group);
-        
-        // Get global (common) action groups from the application window
-        common_action_groups = AppWindow.get_instance().get_common_action_groups();
+        add_actions ();
     }
     
     private void add_ui() {
@@ -472,34 +490,10 @@ public abstract class Page : Gtk.ScrolledWindow {
         
         foreach (string ui_filename in ui_filenames)
             init_load_ui(ui_filename);
-            
-        ui.insert_action_group(action_group, 0);
-
-        // Collect injected UI elements and add them to the UI manager
-        InjectionGroup[] injection_groups = init_collect_injection_groups();
-        foreach (InjectionGroup group in injection_groups) {
-            foreach (InjectionGroup.Element element in group.get_elements()) {
-                uint merge_id = ui.new_merge_id();
-                ui.add_ui(merge_id, group.get_path(), element.name, element.action,
-                    element.kind, false);
-                merge_ids += merge_id;
-            }
-        }
-        
-        AppWindow.get_instance().replace_common_placeholders(ui);
-        
-        ui.ensure_update();
-    }
-    
-    private void remove_ui() {
-        for (int i = merge_ids.length - 1 ; i >= 0 ; --i)
-            ui.remove_ui(merge_ids[i]);
-        ui.remove_action_group(action_group);
-        merge_ids.resize(0);
-        
-        ui.ensure_update();
+
+        //ui.insert_action_group(action_group, 0);
     }
-    
+
     public void init_toolbar(string path) {
         toolbar_path = path;
     }
@@ -558,7 +552,7 @@ public abstract class Page : Gtk.ScrolledWindow {
         File ui_file = Resources.get_ui(ui_filename);
         
         try {
-            merge_ids += ui.add_ui_from_file(ui_file.get_path());
+            builder.add_from_file(ui_file.get_path());
         } catch (Error err) {
             AppWindow.error_message("Error loading UI file %s: %s".printf(
                 ui_file.get_path(), err.message));
@@ -571,21 +565,7 @@ public abstract class Page : Gtk.ScrolledWindow {
     // classes' filename.
     protected virtual void init_collect_ui_filenames(Gee.List<string> ui_filenames) {
     }
-    
-    // This is called during init_ui() to collect all Gtk.ActionEntries for the page.
-    protected virtual Gtk.ActionEntry[] init_collect_action_entries() {
-        return new Gtk.ActionEntry[0];
-    }
-    
-    // This is called during init_ui() to collect all Gtk.ToggleActionEntries for the page
-    protected virtual Gtk.ToggleActionEntry[] init_collect_toggle_action_entries() {
-        return new Gtk.ToggleActionEntry[0];
-    }
-    
-    // This is called during init_ui() to collect all Gtk.RadioActionEntries for the page
-    protected virtual void register_radio_actions(Gtk.ActionGroup action_group) {
-    }
-    
+
     // This is called during init_ui() to collect all Page.InjectedUIElements for the page.  They
     // should be added to the MultiSet using the injection path as the key.
     protected virtual InjectionGroup[] init_collect_injection_groups() {
@@ -1134,8 +1114,10 @@ public abstract class Page : Gtk.ScrolledWindow {
     protected virtual void set_page_cursor(Gdk.CursorType cursor_type) {
         last_cursor = cursor_type;
 
-        if (!cursor_hidden && event_source != null)
-            event_source.get_window().set_cursor(new Gdk.Cursor(cursor_type));
+        if (!cursor_hidden && event_source != null) {
+            var display = event_source.get_window ().get_display ();
+            event_source.get_window().set_cursor(new Gdk.Cursor.for_display(display, cursor_type));
+        }
     }
 
     private void check_cursor_hiding() {
@@ -1154,14 +1136,94 @@ public abstract class Page : Gtk.ScrolledWindow {
     private bool on_hide_cursor() {
         cursor_hidden = true;
 
-        if (event_source != null)
-            event_source.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.BLANK_CURSOR));
+        if (event_source != null) {
+            var display = event_source.get_window().get_display ();
+            event_source.get_window().set_cursor(new Gdk.Cursor.for_display(display, Gdk.CursorType.BLANK_CURSOR));
+        }
 
         // We remove the timeout so reset the id
         last_timeout_id = 0;
 
         return false;
     }
+
+    protected void update_menu_item_label (string id,
+                                           string new_label) {
+        var bar = this.builder.get_object ("MenuBar") as GLib.Menu;
+
+        if (bar == null) {
+            return;
+        }
+
+        var items = bar.get_n_items ();
+        for (var i = 0; i< items; i++) {
+            var model = bar.get_item_link (i, GLib.Menu.LINK_SUBMENU);
+            if (bar == null) {
+                continue;
+            }
+
+            var model_items = model.get_n_items ();
+            for (var j = 0; j < model_items; j++) {
+                var subsection = model.get_item_link (j, GLib.Menu.LINK_SECTION);
+
+                if (subsection == null)
+                    continue;
+
+                // Recurse into submenus
+                var sub_items = subsection.get_n_items ();
+                for (var k = 0; k < sub_items; k++) {
+                    var it = subsection.iterate_item_attributes (k);
+                    while (it.next ()) {
+                        if (it.get_name () == "id") {
+                            if (it.get_value ().get_string () == id) {
+                                var md = subsection as GLib.Menu;
+                                var m = new GLib.MenuItem.from_model
+                                    (subsection, k);
+                                m.set_label (new_label);
+                                md.remove (k);
+                                md.insert_item (k, m);
+
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    protected GLib.MenuModel? find_extension_point (GLib.MenuModel model,
+                                                    string extension_point) {
+        var items = model.get_n_items ();
+        GLib.MenuModel? section = null;
+
+        for (int i = 0; i < items && section == null; i++) {
+            string? name = null;
+            model.get_item_attribute (i, "id", "s", out name);
+            if (name == extension_point) {
+                section = model.get_item_link (i, GLib.Menu.LINK_SECTION);
+            } else {
+                var subsection = model.get_item_link (i, GLib.Menu.LINK_SECTION);
+
+                if (subsection == null)
+                    continue;
+
+                // Recurse into submenus
+                var sub_items = subsection.get_n_items ();
+                for (int j = 0; j < sub_items && section == null; j++) {
+                    var submenu = subsection.get_item_link
+                                                (j, GLib.Menu.LINK_SUBMENU);
+                    if (submenu != null) {
+                        section = this.find_extension_point (submenu,
+                                                             extension_point);
+                    }
+                }
+            }
+        }
+
+        return section;
+    }
+
 }
 
 public abstract class CheckerboardPage : Page {
@@ -1244,18 +1306,28 @@ public abstract class CheckerboardPage : Page {
             get_page_context_menu();
     }
     
+    private Gtk.Menu item_context_menu;
     public virtual Gtk.Menu? get_item_context_menu() {
-        Gtk.Menu menu = (Gtk.Menu) ui.get_widget(item_context_menu_path);
-        assert(menu != null);
-        return menu;
+        if (item_context_menu == null) {
+            var model = this.builder.get_object (item_context_menu_path)
+                as GLib.MenuModel;
+            item_context_menu = new Gtk.Menu.from_model (model);
+            item_context_menu.attach_to_widget (this, null);
+        }
+
+        return item_context_menu;
     }
     
+    private Gtk.Menu page_context_menu;
     public override Gtk.Menu? get_page_context_menu() {
-        if (page_context_menu_path == null)
-            return null;
-        Gtk.Menu menu = (Gtk.Menu) ui.get_widget(page_context_menu_path);
-        assert(menu != null);
-        return menu;
+        if (page_context_menu == null) {
+            var model = this.builder.get_object (page_context_menu_path)
+                as GLib.MenuModel;
+            page_context_menu = new Gtk.Menu.from_model (model);
+            page_context_menu.attach_to_widget (this, null);
+        }
+
+        return page_context_menu;
     }
     
     protected override bool on_context_keypress() {
@@ -2593,4 +2665,6 @@ public class DragAndDropHandler {
     private void on_export_completed() {
         exporter = null;
     }
+
+
 }
diff --git a/src/Photo.c b/src/Photo.c
index f2f519f..19c1911 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -2080,12 +2080,12 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d);
 static BackingFileState** photo_real_get_backing_files_state (MediaSource* base, int* result_length1);
 BackingFileState* backing_file_state_new_from_photo_row (BackingPhotoRow* photo_row, const gchar* md5);
 BackingFileState* backing_file_state_construct_from_photo_row (GType object_type, BackingPhotoRow* photo_row, const gchar* md5);
-static void _vala_array_add251 (BackingFileState*** array, int* length, int* size, BackingFileState* value);
+static void _vala_array_add85 (BackingFileState*** array, int* length, int* size, BackingFileState* value);
 gboolean photo_has_editable (Photo* self);
-static void _vala_array_add252 (BackingFileState*** array, int* length, int* size, BackingFileState* value);
+static void _vala_array_add86 (BackingFileState*** array, int* length, int* size, BackingFileState* value);
 gboolean photo_is_developed (Photo* self);
 GeeCollection* photo_get_raw_development_photo_rows (Photo* self);
-static void _vala_array_add253 (BackingFileState*** array, int* length, int* size, BackingFileState* value);
+static void _vala_array_add87 (BackingFileState*** array, int* length, int* size, BackingFileState* value);
 static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode);
 static PhotoFileReader* photo_get_master_reader (Photo* self);
 static PhotoFileReader* photo_get_baseline_reader (Photo* self);
@@ -2151,12 +2151,12 @@ void photo_value_take_reimport_master_state (GValue* value, gpointer v_object);
 gpointer photo_value_get_reimport_master_state (const GValue* value);
 GType photo_reimport_master_state_get_type (void) G_GNUC_CONST;
 gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterState** reimport_state, GError** error);
-static void _vala_array_add254 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add255 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add256 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add257 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add258 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add259 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add88 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add89 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add90 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add91 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add92 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add93 (gchar*** array, int* length, int* size, gchar* value);
 static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1);
 static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct (GType object_type, PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1);
 static GType photo_reimport_master_state_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
@@ -2165,8 +2165,8 @@ static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetad
 void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state, GError** error);
 void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error);
 void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from);
-static void _vala_array_add260 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add261 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add94 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add95 (gchar*** array, int* length, int* size, gchar* value);
 Alteration* alteration_new_from_array (gchar** array, int array_length1);
 Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1);
 static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, BackingPhotoRow** backing, DetectedPhotoInformation** detected, GError** error);
@@ -2245,15 +2245,15 @@ static GFile* photo_real_get_file (MediaSource* base);
 void photo_set_master_file (Photo* self, GFile* file);
 void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar* filepath, GError** error);
 void media_source_notify_master_replaced (MediaSource* self, GFile* old_file, GFile* new_file);
-static void _vala_array_add262 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add263 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add264 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add265 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add96 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add97 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add98 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add99 (gchar*** array, int* length, int* size, gchar* value);
 void photo_set_editable_file (Photo* self, GFile* file);
 void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID* id, const gchar* filepath, GError** error);
-static void _vala_array_add266 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add267 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add268 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add100 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add101 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add102 (gchar*** array, int* length, int* size, gchar* value);
 void photo_set_many_editable_file (GeeMap* map, GError** error);
 GFile* photo_get_actual_file (Photo* self);
 static GFile* photo_real_get_master_file (MediaSource* base);
@@ -2506,12 +2506,12 @@ static void photo_update_editable_attributes (Photo* self, GError** error);
 void photo_reimport_editable (Photo* self, GError** error);
 void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoID* editable_id, GError** error);
 void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhotoID* id, time_t timestamp, gint64 filesize, GError** error);
-static void _vala_array_add269 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add270 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add271 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add272 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add273 (gchar*** array, int* length, int* size, gchar* value);
-static void _vala_array_add274 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add103 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add104 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add105 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add106 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add107 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add108 (gchar*** array, int* length, int* size, gchar* value);
 void backing_photo_id_init (BackingPhotoID *self, gint64 id);
 const gchar* g_file_monitor_event_to_string (GFileMonitorEvent self);
 static void photo_on_reimport_editable (Photo* self);
@@ -2569,7 +2569,7 @@ static void photo_reimport_master_state_finalize (PhotoReimportMasterState* obj)
 enum  {
 	PHOTO_REIMPORT_MASTER_STATE_IMPL_DUMMY_PROPERTY
 };
-static gchar** _vala_array_dup29 (gchar** self, int length);
+static gchar** _vala_array_dup28 (gchar** self, int length);
 static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState* obj);
 enum  {
 	PHOTO_REIMPORT_EDITABLE_STATE_DUMMY_PROPERTY
@@ -3965,7 +3965,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3968 "Photo.c"
-						goto __catch256_database_error;
+						goto __catch253_database_error;
 					}
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (e);
@@ -3980,8 +3980,8 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 #line 3981 "Photo.c"
 				}
 			}
-			goto __finally256;
-			__catch256_database_error:
+			goto __finally253;
+			__catch253_database_error:
 			{
 				GError* err = NULL;
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3992,7 +3992,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 				_g_error_free0 (err);
 #line 3994 "Photo.c"
 			}
-			__finally256:
+			__finally253:
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4530,7 +4530,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 #line 4531 "Photo.c"
 			}
 		}
-		__finally257:
+		__finally254:
 		{
 			PhotoBackingReaders* _tmp6_ = NULL;
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4610,14 +4610,14 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4613 "Photo.c"
-				goto __catch258_g_error;
+				goto __catch255_g_error;
 			}
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			ret = _tmp12_;
 #line 4618 "Photo.c"
 		}
-		goto __finally258;
-		__catch258_g_error:
+		goto __finally255;
+		__catch255_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp15_ = NULL;
@@ -4657,7 +4657,7 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_g_error_free0 (err);
 #line 4659 "Photo.c"
 		}
-		__finally258:
+		__finally255:
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4760,7 +4760,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 4763 "Photo.c"
-				goto __catch259_database_error;
+				goto __catch256_database_error;
 			}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing_row);
@@ -4784,8 +4784,8 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		_backing_photo_row_unref0 (_tmp2_);
 #line 4786 "Photo.c"
 	}
-	goto __finally259;
-	__catch259_database_error:
+	goto __finally256;
+	__catch256_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
@@ -4812,7 +4812,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 		_g_error_free0 (err);
 #line 4814 "Photo.c"
 	}
-	__finally259:
+	__finally256:
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4849,7 +4849,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 4852 "Photo.c"
-					goto __catch260_database_error;
+					goto __catch257_database_error;
 				}
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing_row);
@@ -4862,8 +4862,8 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 #line 4863 "Photo.c"
 			}
 		}
-		goto __finally260;
-		__catch260_database_error:
+		goto __finally257;
+		__catch257_database_error:
 		{
 			GError* err = NULL;
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4874,7 +4874,7 @@ static BackingPhotoRow* photo_get_backing_row (Photo* self, BackingPhotoID* id)
 			_g_error_free0 (err);
 #line 4876 "Photo.c"
 		}
-		__finally260:
+		__finally257:
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4973,7 +4973,7 @@ gboolean photo_is_raw_developer_complete (Photo* self, RawDeveloper d) {
 			return result;
 #line 4975 "Photo.c"
 		}
-		__finally261:
+		__finally258:
 		{
 			GeeHashMap* _tmp12_ = NULL;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5035,7 +5035,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 #line 5036 "Photo.c"
 			}
 		}
-		__finally262:
+		__finally259:
 		{
 			GeeHashMap* _tmp5_ = NULL;
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5097,7 +5097,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 #line 595 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5100 "Photo.c"
-					goto __catch263_g_error;
+					goto __catch260_g_error;
 				}
 #line 596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = meta;
@@ -5218,8 +5218,8 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				return result;
 #line 5220 "Photo.c"
 			}
-			goto __finally263;
-			__catch263_g_error:
+			goto __finally260;
+			__catch260_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp27_ = NULL;
@@ -5238,7 +5238,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				_g_error_free0 (e);
 #line 5240 "Photo.c"
 			}
-			__finally263:
+			__finally260:
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5313,7 +5313,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 			gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp5_), _tmp6_);
 #line 5315 "Photo.c"
 		}
-		__finally264:
+		__finally261:
 		{
 			GeeHashMap* _tmp7_ = NULL;
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5662,7 +5662,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5665 "Photo.c"
-					goto __catch265_g_error;
+					goto __catch262_g_error;
 				}
 #line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp1_;
@@ -5696,7 +5696,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 685 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5699 "Photo.c"
-							goto __finally266;
+							goto __finally263;
 						}
 #line 685 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp12_ = _tmp9_;
@@ -5710,7 +5710,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						_g_object_unref0 (_tmp9_);
 #line 5712 "Photo.c"
 					}
-					__finally266:
+					__finally263:
 					{
 						PhotoBackingReaders* _tmp13_ = NULL;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5726,7 +5726,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						_backing_photo_row_unref0 (_tmp1_);
 #line 5729 "Photo.c"
-						goto __catch265_g_error;
+						goto __catch262_g_error;
 					}
 				}
 #line 688 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5759,14 +5759,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5762 "Photo.c"
-									goto __catch267_g_error;
+									goto __catch264_g_error;
 								}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
 #line 5767 "Photo.c"
 							}
-							goto __finally267;
-							__catch267_g_error:
+							goto __finally264;
+							__catch264_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp18_ = NULL;
@@ -5785,11 +5785,11 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								_g_error_free0 (e);
 #line 5787 "Photo.c"
 							}
-							__finally267:
+							__finally264:
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5792 "Photo.c"
-								goto __catch265_g_error;
+								goto __catch262_g_error;
 							}
 						}
 					}
@@ -5814,7 +5814,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 694 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
 #line 5817 "Photo.c"
-					goto __catch265_g_error;
+					goto __catch262_g_error;
 				}
 #line 695 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = writer;
@@ -5831,7 +5831,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 695 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
 #line 5834 "Photo.c"
-					goto __catch265_g_error;
+					goto __catch262_g_error;
 				}
 #line 703 "/home/jens/Source/shotwell/src/Photo.vala"
 				wrote_img_to_disk = TRUE;
@@ -5848,7 +5848,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 708 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
 #line 5851 "Photo.c"
-					goto __catch265_g_error;
+					goto __catch262_g_error;
 				}
 #line 709 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = bps;
@@ -5869,7 +5869,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 709 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
 #line 5872 "Photo.c"
-					goto __catch265_g_error;
+					goto __catch262_g_error;
 				}
 #line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = mwriter;
@@ -5890,7 +5890,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
 #line 5893 "Photo.c"
-					goto __catch265_g_error;
+					goto __catch262_g_error;
 				}
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (mwriter);
@@ -5904,8 +5904,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_backing_photo_row_unref0 (_tmp1_);
 #line 5906 "Photo.c"
 			}
-			goto __finally265;
-			__catch265_g_error:
+			goto __finally262;
+			__catch262_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp31_ = NULL;
@@ -5924,7 +5924,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_g_error_free0 (err);
 #line 5926 "Photo.c"
 			}
-			__finally265:
+			__finally262:
 			{
 				gboolean _tmp33_ = FALSE;
 #line 714 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5944,14 +5944,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5947 "Photo.c"
-							goto __catch268_g_error;
+							goto __catch265_g_error;
 						}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
 #line 5952 "Photo.c"
 					}
-					goto __finally268;
-					__catch268_g_error:
+					goto __finally265;
+					__catch265_g_error:
 					{
 						GError* e = NULL;
 						GError* _tmp36_ = NULL;
@@ -5970,7 +5970,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						_g_error_free0 (e);
 #line 5972 "Photo.c"
 					}
-					__finally268:
+					__finally265:
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6055,7 +6055,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6058 "Photo.c"
-					goto __catch269_g_error;
+					goto __catch266_g_error;
 				}
 #line 737 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = meta;
@@ -6089,14 +6089,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6092 "Photo.c"
-									goto __catch270_g_error;
+									goto __catch267_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
 #line 6097 "Photo.c"
 							}
-							goto __finally270;
-							__catch270_g_error:
+							goto __finally267;
+							__catch267_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp45_ = NULL;
@@ -6115,11 +6115,11 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								_g_error_free0 (e);
 #line 6117 "Photo.c"
 							}
-							__finally270:
+							__finally267:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6122 "Photo.c"
-								goto __catch269_g_error;
+								goto __catch266_g_error;
 							}
 						}
 					}
@@ -6167,14 +6167,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6170 "Photo.c"
-									goto __catch271_g_error;
+									goto __catch268_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
 #line 6175 "Photo.c"
 							}
-							goto __finally271;
-							__catch271_g_error:
+							goto __finally268;
+							__catch268_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp54_ = NULL;
@@ -6193,11 +6193,11 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								_g_error_free0 (e);
 #line 6195 "Photo.c"
 							}
-							__finally271:
+							__finally268:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6200 "Photo.c"
-								goto __catch269_g_error;
+								goto __catch266_g_error;
 							}
 						}
 					}
@@ -6220,7 +6220,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 746 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
 #line 6223 "Photo.c"
-					goto __catch269_g_error;
+					goto __catch266_g_error;
 				}
 #line 747 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = pix;
@@ -6254,14 +6254,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6257 "Photo.c"
-									goto __catch272_g_error;
+									goto __catch269_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
 #line 6262 "Photo.c"
 							}
-							goto __finally272;
-							__catch272_g_error:
+							goto __finally269;
+							__catch269_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp62_ = NULL;
@@ -6280,11 +6280,11 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								_g_error_free0 (e);
 #line 6282 "Photo.c"
 							}
-							__finally272:
+							__finally269:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6287 "Photo.c"
-								goto __catch269_g_error;
+								goto __catch266_g_error;
 							}
 						}
 					}
@@ -6315,7 +6315,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
 #line 6318 "Photo.c"
-					goto __catch269_g_error;
+					goto __catch266_g_error;
 				}
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp70_ = _tmp64_;
@@ -6344,7 +6344,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 754 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
 #line 6347 "Photo.c"
-					goto __catch269_g_error;
+					goto __catch266_g_error;
 				}
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = writer;
@@ -6365,7 +6365,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
 #line 6368 "Photo.c"
-					goto __catch269_g_error;
+					goto __catch266_g_error;
 				}
 #line 759 "/home/jens/Source/shotwell/src/Photo.vala"
 				wrote_img_to_disk = TRUE;
@@ -6390,7 +6390,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 762 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
 #line 6393 "Photo.c"
-					goto __catch269_g_error;
+					goto __catch266_g_error;
 				}
 #line 763 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp79_ = mwriter;
@@ -6413,7 +6413,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 763 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
 #line 6416 "Photo.c"
-					goto __catch269_g_error;
+					goto __catch266_g_error;
 				}
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (mwriter);
@@ -6429,8 +6429,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_media_metadata_unref0 (meta);
 #line 6431 "Photo.c"
 			}
-			goto __finally269;
-			__catch269_g_error:
+			goto __finally266;
+			__catch266_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp81_ = NULL;
@@ -6467,14 +6467,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6470 "Photo.c"
-								goto __catch273_g_error;
+								goto __catch270_g_error;
 							}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_notify_raw_development_modified (self);
 #line 6475 "Photo.c"
 						}
-						goto __finally273;
-						__catch273_g_error:
+						goto __finally270;
+						__catch270_g_error:
 						{
 							GError* e = NULL;
 							GError* _tmp86_ = NULL;
@@ -6493,7 +6493,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 							_g_error_free0 (e);
 #line 6495 "Photo.c"
 						}
-						__finally273:
+						__finally270:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6508,7 +6508,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				return;
 #line 6510 "Photo.c"
 			}
-			__finally269:
+			__finally266:
 			{
 				gboolean _tmp88_ = FALSE;
 #line 768 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6528,14 +6528,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6531 "Photo.c"
-							goto __catch274_g_error;
+							goto __catch271_g_error;
 						}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
 #line 6536 "Photo.c"
 					}
-					goto __finally274;
-					__catch274_g_error:
+					goto __finally271;
+					__catch271_g_error:
 					{
 						GError* e = NULL;
 						GError* _tmp91_ = NULL;
@@ -6554,7 +6554,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						_g_error_free0 (e);
 #line 6556 "Photo.c"
 					}
-					__finally274:
+					__finally271:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6621,7 +6621,7 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp1_->developer = _tmp2_;
 #line 6623 "Photo.c"
 		}
-		__finally275:
+		__finally272:
 		{
 			PhotoRow* _tmp3_ = NULL;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6754,11 +6754,11 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 #line 817 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6757 "Photo.c"
-						goto __catch277_g_error;
+						goto __catch274_g_error;
 					}
 				}
-				goto __finally277;
-				__catch277_g_error:
+				goto __finally274;
+				__catch274_g_error:
 				{
 					GError* e = NULL;
 #line 816 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6780,7 +6780,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 					return;
 #line 6782 "Photo.c"
 				}
-				__finally277:
+				__finally274:
 #line 816 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6787 "Photo.c"
@@ -6889,11 +6889,11 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 #line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6892 "Photo.c"
-					goto __catch278_g_error;
+					goto __catch275_g_error;
 				}
 			}
-			goto __finally278;
-			__catch278_g_error:
+			goto __finally275;
+			__catch275_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp38_ = NULL;
@@ -6912,7 +6912,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				_g_error_free0 (e);
 #line 6914 "Photo.c"
 			}
-			__finally278:
+			__finally275:
 #line 836 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6919 "Photo.c"
@@ -6965,7 +6965,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 #line 6966 "Photo.c"
 			}
 		}
-		__finally276:
+		__finally273:
 		{
 			GeeHashMap* _tmp47_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7133,7 +7133,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 #line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7136 "Photo.c"
-							goto __catch280_g_error;
+							goto __catch277_g_error;
 						}
 					} else {
 						GFile* _tmp20_ = NULL;
@@ -7144,12 +7144,12 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 #line 884 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7147 "Photo.c"
-							goto __catch280_g_error;
+							goto __catch277_g_error;
 						}
 					}
 				}
-				goto __finally280;
-				__catch280_g_error:
+				goto __finally277;
+				__catch277_g_error:
 				{
 					GError* e = NULL;
 					BackingPhotoRow* _tmp21_ = NULL;
@@ -7174,7 +7174,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 					_g_error_free0 (e);
 #line 7176 "Photo.c"
 				}
-				__finally280:
+				__finally277:
 #line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 880 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7230,7 +7230,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7233 "Photo.c"
-					goto __catch281_g_error;
+					goto __catch278_g_error;
 				}
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = backing_photo_table_get_instance ();
@@ -7247,11 +7247,11 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7250 "Photo.c"
-					goto __catch281_g_error;
+					goto __catch278_g_error;
 				}
 			}
-			goto __finally281;
-			__catch281_g_error:
+			goto __finally278;
+			__catch278_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp34_ = NULL;
@@ -7270,7 +7270,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				_g_error_free0 (e);
 #line 7272 "Photo.c"
 			}
-			__finally281:
+			__finally278:
 #line 891 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 891 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7306,7 +7306,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			_backing_photo_row_unref0 (bpr);
 #line 7308 "Photo.c"
 		}
-		__finally279:
+		__finally276:
 		{
 			GeeHashMap* _tmp40_ = NULL;
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7376,7 +7376,7 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 			photo_set_raw_developer (self, _tmp4_);
 #line 7378 "Photo.c"
 		}
-		__finally282:
+		__finally279:
 		{
 			GeeHashMap* _tmp5_ = NULL;
 #line 907 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7399,7 +7399,7 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 }
 
 
-static void _vala_array_add251 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
+static void _vala_array_add85 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7416,7 +7416,7 @@ static void _vala_array_add251 (BackingFileState*** array, int* length, int* siz
 }
 
 
-static void _vala_array_add252 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
+static void _vala_array_add86 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
 #line 922 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 922 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7433,7 +7433,7 @@ static void _vala_array_add252 (BackingFileState*** array, int* length, int* siz
 }
 
 
-static void _vala_array_add253 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
+static void _vala_array_add87 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
 #line 929 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 929 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7503,7 +7503,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = backing_file_state_new_from_photo_row (_tmp4_, _tmp6_);
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add251 (&backing, &backing_length1, &_backing_size_, _tmp7_);
+			_vala_array_add85 (&backing, &backing_length1, &_backing_size_, _tmp7_);
 #line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = photo_has_editable (self);
 #line 921 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7522,7 +7522,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 #line 922 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = backing_file_state_new_from_photo_row (_tmp10_, NULL);
 #line 922 "/home/jens/Source/shotwell/src/Photo.vala"
-				_vala_array_add252 (&backing, &backing_length1, &_backing_size_, _tmp11_);
+				_vala_array_add86 (&backing, &backing_length1, &_backing_size_, _tmp11_);
 #line 7527 "Photo.c"
 			}
 #line 924 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7597,7 +7597,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 #line 929 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = backing_file_state_new_from_photo_row (_tmp24_, NULL);
 #line 929 "/home/jens/Source/shotwell/src/Photo.vala"
-							_vala_array_add253 (&backing, &backing_length1, &_backing_size_, _tmp25_);
+							_vala_array_add87 (&backing, &backing_length1, &_backing_size_, _tmp25_);
 #line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (r);
 #line 7604 "Photo.c"
@@ -7612,7 +7612,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 #line 7613 "Photo.c"
 			}
 		}
-		__finally283:
+		__finally280:
 		{
 			PhotoRow* _tmp26_ = NULL;
 #line 919 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7790,7 +7790,7 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
 			return result;
 #line 7792 "Photo.c"
 		}
-		__finally284:
+		__finally281:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
 #line 961 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7848,7 +7848,7 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
 			return result;
 #line 7850 "Photo.c"
 		}
-		__finally285:
+		__finally282:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
 #line 967 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7972,7 +7972,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 			return result;
 #line 7974 "Photo.c"
 		}
-		__finally286:
+		__finally283:
 		{
 			PhotoBackingReaders* _tmp17_ = NULL;
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8096,7 +8096,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 			return result;
 #line 8098 "Photo.c"
 		}
-		__finally287:
+		__finally284:
 		{
 			PhotoBackingReaders* _tmp17_ = NULL;
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8154,7 +8154,7 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 			return result;
 #line 8156 "Photo.c"
 		}
-		__finally288:
+		__finally285:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
 #line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8209,7 +8209,7 @@ gboolean photo_is_developed (Photo* self) {
 			return result;
 #line 8211 "Photo.c"
 		}
-		__finally289:
+		__finally286:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
 #line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8264,7 +8264,7 @@ gboolean photo_has_editable (Photo* self) {
 			return result;
 #line 8266 "Photo.c"
 		}
-		__finally290:
+		__finally287:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
 #line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8322,7 +8322,7 @@ gboolean photo_does_master_exist (Photo* self) {
 			return result;
 #line 8324 "Photo.c"
 		}
-		__finally291:
+		__finally288:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
 #line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8398,7 +8398,7 @@ gboolean photo_does_editable_exist (Photo* self) {
 			return result;
 #line 8400 "Photo.c"
 		}
-		__finally292:
+		__finally289:
 		{
 			PhotoBackingReaders* _tmp8_ = NULL;
 #line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8453,7 +8453,7 @@ gboolean photo_is_master_baseline (Photo* self) {
 			return result;
 #line 8455 "Photo.c"
 		}
-		__finally293:
+		__finally290:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
 #line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8523,7 +8523,7 @@ gboolean photo_is_editable_baseline (Photo* self) {
 			return result;
 #line 8525 "Photo.c"
 		}
-		__finally294:
+		__finally291:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
 #line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8596,7 +8596,7 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 			return result;
 #line 8598 "Photo.c"
 		}
-		__finally295:
+		__finally292:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8676,7 +8676,7 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 #line 8677 "Photo.c"
 			}
 		}
-		__finally296:
+		__finally293:
 		{
 			PhotoRow* _tmp7_ = NULL;
 #line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8753,7 +8753,7 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 			return result;
 #line 8755 "Photo.c"
 		}
-		__finally297:
+		__finally294:
 		{
 			PhotoRow* _tmp7_ = NULL;
 #line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8830,7 +8830,7 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
 			return result;
 #line 8832 "Photo.c"
 		}
-		__finally298:
+		__finally295:
 		{
 			PhotoRow* _tmp7_ = NULL;
 #line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9225,7 +9225,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 #line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9226 "Photo.c"
-			goto __catch299_g_error;
+			goto __catch296_g_error;
 		}
 #line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp3_;
@@ -9239,8 +9239,8 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (_tmp3_);
 #line 9239 "Photo.c"
 	}
-	goto __finally299;
-	__catch299_g_error:
+	goto __finally296;
+	__catch296_g_error:
 	{
 		GError* err = NULL;
 #line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9259,7 +9259,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		return result;
 #line 9259 "Photo.c"
 	}
-	__finally299:
+	__finally296:
 #line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9430,11 +9430,11 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 #line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9431 "Photo.c"
-			goto __catch300_g_error;
+			goto __catch297_g_error;
 		}
 	}
-	goto __finally300;
-	__catch300_g_error:
+	goto __finally297;
+	__catch297_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp37_ = NULL;
@@ -9474,7 +9474,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		return result;
 #line 9474 "Photo.c"
 	}
-	__finally300:
+	__finally297:
 #line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10071,11 +10071,11 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 #line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10072 "Photo.c"
-				goto __catch301_g_error;
+				goto __catch298_g_error;
 			}
 		}
-		goto __finally301;
-		__catch301_g_error:
+		goto __finally298;
+		__catch298_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp197_ = NULL;
@@ -10110,7 +10110,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 			return result;
 #line 10110 "Photo.c"
 		}
-		__finally301:
+		__finally298:
 #line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10406,7 +10406,7 @@ void photo_create_pre_import (PhotoImportParams* params) {
 #line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10407 "Photo.c"
-			goto __catch302_g_error;
+			goto __catch299_g_error;
 		}
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = photo_file_interrogator_get_detected_photo_information (interrogator);
@@ -10471,8 +10471,8 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		_detected_photo_information_unref0 (detected);
 #line 10471 "Photo.c"
 	}
-	goto __finally302;
-	__catch302_g_error:
+	goto __finally299;
+	__catch299_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp69_ = NULL;
@@ -10499,7 +10499,7 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		_g_error_free0 (err);
 #line 10499 "Photo.c"
 	}
-	__finally302:
+	__finally299:
 #line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10589,7 +10589,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 #line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10590 "Photo.c"
-			goto __catch303_g_error;
+			goto __catch300_g_error;
 		}
 #line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp1_;
@@ -10603,8 +10603,8 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		_g_object_unref0 (_tmp1_);
 #line 10603 "Photo.c"
 	}
-	goto __finally303;
-	__catch303_g_error:
+	goto __finally300;
+	__catch300_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp5_ = NULL;
@@ -10652,7 +10652,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		return result;
 #line 10652 "Photo.c"
 	}
-	__finally303:
+	__finally300:
 #line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10850,7 +10850,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 }
 
 
-static void _vala_array_add254 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add88 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10867,7 +10867,7 @@ static void _vala_array_add254 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add255 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add89 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10884,7 +10884,7 @@ static void _vala_array_add255 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add256 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add90 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10901,7 +10901,7 @@ static void _vala_array_add256 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add257 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add91 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10918,7 +10918,7 @@ static void _vala_array_add257 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add258 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add92 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10935,7 +10935,7 @@ static void _vala_array_add258 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add259 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add93 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11197,7 +11197,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			updated_row = _tmp25_;
 #line 11197 "Photo.c"
 		}
-		__finally304:
+		__finally301:
 		{
 			PhotoRow* _tmp26_ = NULL;
 #line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11252,7 +11252,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 #line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = g_strdup ("metadata:md5");
 #line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add254 (&list, &list_length1, &_list_size_, _tmp33_);
+		_vala_array_add88 (&list, &list_length1, &_list_size_, _tmp33_);
 #line 11255 "Photo.c"
 	}
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11282,7 +11282,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 #line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = g_strdup ("image:orientation");
 #line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add255 (&list, &list_length1, &_list_size_, _tmp40_);
+		_vala_array_add89 (&list, &list_length1, &_list_size_, _tmp40_);
 #line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = updated_row;
 #line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11373,7 +11373,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp57_ = g_strdup ("metadata:exposure-time");
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add256 (&list, &list_length1, &_list_size_, _tmp57_);
+			_vala_array_add90 (&list, &list_length1, &_list_size_, _tmp57_);
 #line 11376 "Photo.c"
 		}
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11405,7 +11405,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 #line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_ = g_strdup ("metadata:name");
 #line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add257 (&list, &list_length1, &_list_size_, _tmp66_);
+			_vala_array_add91 (&list, &list_length1, &_list_size_, _tmp66_);
 #line 11408 "Photo.c"
 		}
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11437,7 +11437,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 #line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = g_strdup ("metadata:comment");
 #line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add258 (&list, &list_length1, &_list_size_, _tmp75_);
+			_vala_array_add92 (&list, &list_length1, &_list_size_, _tmp75_);
 #line 11440 "Photo.c"
 		}
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11463,7 +11463,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 #line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp82_ = g_strdup ("metadata:rating");
 #line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add259 (&list, &list_length1, &_list_size_, _tmp82_);
+			_vala_array_add93 (&list, &list_length1, &_list_size_, _tmp82_);
 #line 11466 "Photo.c"
 		}
 #line 1448 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11688,7 +11688,7 @@ static gpointer _photo_reimport_master_state_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add260 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add94 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11705,7 +11705,7 @@ static void _vala_array_add260 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add261 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add95 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11850,7 +11850,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			_backing_photo_row_unref0 (original_master);
 #line 11850 "Photo.c"
 		}
-		__finally305:
+		__finally302:
 		{
 			PhotoRow* _tmp19_ = NULL;
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11911,7 +11911,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 #line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = g_strdup ("image:master");
 #line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add260 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp24_);
+		_vala_array_add94 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp24_);
 #line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = photo_is_master_baseline (self);
 #line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11927,7 +11927,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = g_strdup ("image:baseline");
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add261 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_);
+			_vala_array_add95 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_);
 #line 11930 "Photo.c"
 		}
 	}
@@ -12449,7 +12449,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 				photo_internal_remove_all_transformations (self, FALSE);
 #line 12449 "Photo.c"
 			}
-			__finally306:
+			__finally303:
 			{
 				PhotoRow* _tmp17_ = NULL;
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13058,7 +13058,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 #line 13057 "Photo.c"
 						}
 					}
-					__finally307:
+					__finally304:
 					{
 						PhotoRow* _tmp31_ = NULL;
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13301,7 +13301,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 #line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 13302 "Photo.c"
-					goto __finally309;
+					goto __finally306;
 				}
 #line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->row;
@@ -13315,7 +13315,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				_tmp16_->timestamp = (time_t) _tmp18_;
 #line 13315 "Photo.c"
 			}
-			__finally309:
+			__finally306:
 			{
 				PhotoRow* _tmp19_ = NULL;
 #line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13329,7 +13329,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 #line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 13330 "Photo.c"
-					goto __catch308_database_error;
+					goto __catch305_database_error;
 				}
 #line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -13341,8 +13341,8 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 			}
 		}
 	}
-	goto __finally308;
-	__catch308_database_error:
+	goto __finally305;
+	__catch305_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
@@ -13360,7 +13360,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 		return;
 #line 13360 "Photo.c"
 	}
-	__finally308:
+	__finally305:
 #line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13492,7 +13492,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 #line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 13493 "Photo.c"
-					goto __finally310;
+					goto __finally307;
 				}
 #line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->editable;
@@ -13507,7 +13507,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 #line 13506 "Photo.c"
 			}
 		}
-		__finally310:
+		__finally307:
 		{
 			PhotoRow* _tmp19_ = NULL;
 #line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14061,7 +14061,7 @@ static GFile* photo_real_get_file (MediaSource* base) {
 }
 
 
-static void _vala_array_add262 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add96 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14078,7 +14078,7 @@ static void _vala_array_add262 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add263 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add97 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14095,7 +14095,7 @@ static void _vala_array_add263 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add264 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add98 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14112,7 +14112,7 @@ static void _vala_array_add264 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add265 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add99 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14240,7 +14240,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 #line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 14241 "Photo.c"
-								goto __finally313;
+								goto __finally310;
 							}
 #line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp14_ = self->row;
@@ -14332,7 +14332,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 #line 14331 "Photo.c"
 						}
 					}
-					__finally313:
+					__finally310:
 					{
 						PhotoBackingReaders* _tmp38_ = NULL;
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14344,11 +14344,11 @@ void photo_set_master_file (Photo* self, GFile* file) {
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 14345 "Photo.c"
-						goto __finally312;
+						goto __finally309;
 					}
 				}
 			}
-			__finally312:
+			__finally309:
 			{
 				PhotoRow* _tmp39_ = NULL;
 #line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14362,7 +14362,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 #line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 14363 "Photo.c"
-					goto __catch311_database_error;
+					goto __catch308_database_error;
 				}
 #line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (old_file);
@@ -14378,8 +14378,8 @@ void photo_set_master_file (Photo* self, GFile* file) {
 			}
 		}
 	}
-	goto __finally311;
-	__catch311_database_error:
+	goto __finally308;
+	__catch308_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp40_ = NULL;
@@ -14395,7 +14395,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		_g_error_free0 (err);
 #line 14395 "Photo.c"
 	}
-	__finally311:
+	__finally308:
 #line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14461,7 +14461,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 #line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = g_strdup ("backing:master");
 #line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add262 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_);
+		_vala_array_add96 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_);
 #line 1853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = name_changed;
 #line 1853 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14477,7 +14477,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 #line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = g_strdup ("metadata:name");
 #line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add263 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_);
+			_vala_array_add97 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_);
 #line 14480 "Photo.c"
 		}
 #line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14495,7 +14495,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 #line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = g_strdup ("backing:source");
 #line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add264 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_);
+			_vala_array_add98 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_);
 #line 14498 "Photo.c"
 		}
 #line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14513,7 +14513,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 #line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = g_strdup ("backing:baseline");
 #line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add265 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_);
+			_vala_array_add99 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_);
 #line 14516 "Photo.c"
 		}
 #line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14540,7 +14540,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 }
 
 
-static void _vala_array_add266 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add100 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14557,7 +14557,7 @@ static void _vala_array_add266 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add267 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add101 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14574,7 +14574,7 @@ static void _vala_array_add267 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add268 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add102 (gchar*** array, int* length, int* size, gchar* value) {
 #line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14736,7 +14736,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_object_unref0 (_tmp4_);
 #line 14737 "Photo.c"
-								goto __finally316;
+								goto __finally313;
 							}
 #line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = self->priv->editable;
@@ -14778,7 +14778,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 						_g_object_unref0 (_tmp4_);
 #line 14778 "Photo.c"
 					}
-					__finally316:
+					__finally313:
 					{
 						PhotoBackingReaders* _tmp31_ = NULL;
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14790,11 +14790,11 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 14791 "Photo.c"
-						goto __finally315;
+						goto __finally312;
 					}
 				}
 			}
-			__finally315:
+			__finally312:
 			{
 				PhotoRow* _tmp32_ = NULL;
 #line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14808,7 +14808,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 #line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 14809 "Photo.c"
-					goto __catch314_database_error;
+					goto __catch311_database_error;
 				}
 #line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (old_file);
@@ -14824,8 +14824,8 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 			}
 		}
 	}
-	goto __finally314;
-	__catch314_database_error:
+	goto __finally311;
+	__catch311_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp33_ = NULL;
@@ -14841,7 +14841,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		_g_error_free0 (err);
 #line 14841 "Photo.c"
 	}
-	__finally314:
+	__finally311:
 #line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14906,7 +14906,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 #line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = g_strdup ("backing:editable");
 #line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add266 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_);
+		_vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_);
 #line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = is_baseline;
 #line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14922,7 +14922,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 #line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = g_strdup ("backing:baseline");
 #line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add267 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_);
+			_vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_);
 #line 14925 "Photo.c"
 		}
 #line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14940,7 +14940,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 #line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp46_ = g_strdup ("backing:source");
 #line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add268 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_);
+			_vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_);
 #line 14943 "Photo.c"
 		}
 #line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15259,7 +15259,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 #line 15258 "Photo.c"
 			}
 		}
-		__finally317:
+		__finally314:
 		{
 			PhotoRow* _tmp18_ = NULL;
 #line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15350,7 +15350,7 @@ PhotoFileFormat photo_get_file_format (Photo* self) {
 			return result;
 #line 15350 "Photo.c"
 		}
-		__finally318:
+		__finally315:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15442,7 +15442,7 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) {
 			return result;
 #line 15442 "Photo.c"
 		}
-		__finally319:
+		__finally316:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15498,7 +15498,7 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
 			return result;
 #line 15498 "Photo.c"
 		}
-		__finally320:
+		__finally317:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15552,7 +15552,7 @@ void photo_get_photo_id (Photo* self, PhotoID* result) {
 			return;
 #line 15552 "Photo.c"
 		}
-		__finally321:
+		__finally318:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15646,7 +15646,7 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
 			return;
 #line 15646 "Photo.c"
 		}
-		__finally322:
+		__finally319:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15700,7 +15700,7 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
 			return;
 #line 15700 "Photo.c"
 		}
-		__finally323:
+		__finally320:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15759,7 +15759,7 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 			return result;
 #line 15759 "Photo.c"
 		}
-		__finally324:
+		__finally321:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15814,7 +15814,7 @@ guint64 photo_get_flags (Photo* self) {
 			return result;
 #line 15814 "Photo.c"
 		}
-		__finally325:
+		__finally322:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15932,7 +15932,7 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 #line 15931 "Photo.c"
 			}
 		}
-		__finally326:
+		__finally323:
 		{
 			PhotoRow* _tmp9_ = NULL;
 #line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16015,7 +16015,7 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) {
 			return result;
 #line 16015 "Photo.c"
 		}
-		__finally327:
+		__finally324:
 		{
 			PhotoRow* _tmp6_ = NULL;
 #line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16121,7 +16121,7 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 				}
 			}
 		}
-		__finally328:
+		__finally325:
 		{
 			PhotoRow* _tmp16_ = NULL;
 #line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16247,7 +16247,7 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 				}
 			}
 		}
-		__finally329:
+		__finally326:
 		{
 			PhotoRow* _tmp16_ = NULL;
 #line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16373,7 +16373,7 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 				}
 			}
 		}
-		__finally330:
+		__finally327:
 		{
 			PhotoRow* _tmp16_ = NULL;
 #line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16652,7 +16652,7 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 				}
 			}
 		}
-		__finally331:
+		__finally328:
 		{
 			PhotoRow* _tmp15_ = NULL;
 #line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16727,7 +16727,7 @@ gboolean photo_is_master_metadata_dirty (Photo* self) {
 			return result;
 #line 16727 "Photo.c"
 		}
-		__finally332:
+		__finally329:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16797,7 +16797,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 #line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 16798 "Photo.c"
-					goto __finally333;
+					goto __finally330;
 				}
 #line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
@@ -16810,7 +16810,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 #line 16809 "Photo.c"
 			}
 		}
-		__finally333:
+		__finally330:
 		{
 			PhotoRow* _tmp10_ = NULL;
 #line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16895,7 +16895,7 @@ static Rating photo_real_get_rating (MediaSource* base) {
 			return result;
 #line 16895 "Photo.c"
 		}
-		__finally334:
+		__finally331:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17000,7 +17000,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 				}
 			}
 		}
-		__finally335:
+		__finally332:
 		{
 			PhotoRow* _tmp15_ = NULL;
 #line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17067,7 +17067,7 @@ static void photo_real_increase_rating (MediaSource* base) {
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
 #line 17067 "Photo.c"
 		}
-		__finally336:
+		__finally333:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17117,7 +17117,7 @@ static void photo_real_decrease_rating (MediaSource* base) {
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
 #line 17117 "Photo.c"
 		}
-		__finally337:
+		__finally334:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17170,7 +17170,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 #line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 17171 "Photo.c"
-				goto __catch338_database_error;
+				goto __catch335_database_error;
 			}
 #line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -17203,7 +17203,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				_tmp5_->backlinks = _tmp7_;
 #line 17203 "Photo.c"
 			}
-			__finally339:
+			__finally336:
 			{
 				PhotoRow* _tmp8_ = NULL;
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17217,7 +17217,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 17218 "Photo.c"
-					goto __catch338_database_error;
+					goto __catch335_database_error;
 				}
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -17229,8 +17229,8 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 			}
 		}
 	}
-	goto __finally338;
-	__catch338_database_error:
+	goto __finally335;
+	__catch335_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
@@ -17257,7 +17257,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		_g_error_free0 (err);
 #line 17257 "Photo.c"
 	}
-	__finally338:
+	__finally335:
 #line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17345,7 +17345,7 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 			return result;
 #line 17345 "Photo.c"
 		}
-		__finally340:
+		__finally337:
 		{
 			PhotoRow* _tmp12_ = NULL;
 #line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17595,7 +17595,7 @@ static void photo_file_exif_updated (Photo* self) {
 #line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 17596 "Photo.c"
-			goto __catch341_g_error;
+			goto __catch338_g_error;
 		}
 #line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp1_;
@@ -17609,8 +17609,8 @@ static void photo_file_exif_updated (Photo* self) {
 		_g_object_unref0 (_tmp1_);
 #line 17609 "Photo.c"
 	}
-	goto __finally341;
-	__catch341_g_error:
+	goto __finally338;
+	__catch338_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_ = NULL;
@@ -17634,7 +17634,7 @@ static void photo_file_exif_updated (Photo* self) {
 		_g_error_free0 (err);
 #line 17634 "Photo.c"
 	}
-	__finally341:
+	__finally338:
 #line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17666,11 +17666,11 @@ static void photo_file_exif_updated (Photo* self) {
 #line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 17667 "Photo.c"
-			goto __catch342_g_error;
+			goto __catch339_g_error;
 		}
 	}
-	goto __finally342;
-	__catch342_g_error:
+	goto __finally339;
+	__catch339_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp10_ = NULL;
@@ -17697,7 +17697,7 @@ static void photo_file_exif_updated (Photo* self) {
 		_g_error_free0 (err);
 #line 17697 "Photo.c"
 	}
-	__finally342:
+	__finally339:
 #line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17817,7 +17817,7 @@ static void photo_file_exif_updated (Photo* self) {
 			_database_table_unref0 (_tmp22_);
 #line 17817 "Photo.c"
 		}
-		__finally343:
+		__finally340:
 		{
 			PhotoRow* _tmp36_ = NULL;
 #line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17910,7 +17910,7 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
 			return result;
 #line 17910 "Photo.c"
 		}
-		__finally344:
+		__finally341:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17969,7 +17969,7 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 			return result;
 #line 17969 "Photo.c"
 		}
-		__finally345:
+		__finally342:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18024,7 +18024,7 @@ guint64 photo_get_editable_filesize (Photo* self) {
 			return result;
 #line 18024 "Photo.c"
 		}
-		__finally346:
+		__finally343:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18096,7 +18096,7 @@ static gchar* photo_real_get_basename (MediaSource* base) {
 			return result;
 #line 18096 "Photo.c"
 		}
-		__finally347:
+		__finally344:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18155,7 +18155,7 @@ static gchar* photo_real_get_title (MediaSource* base) {
 			return result;
 #line 18155 "Photo.c"
 		}
-		__finally348:
+		__finally345:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18214,7 +18214,7 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 			return result;
 #line 18214 "Photo.c"
 		}
-		__finally349:
+		__finally346:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18331,7 +18331,7 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 #line 18330 "Photo.c"
 			}
 		}
-		__finally350:
+		__finally347:
 		{
 			PhotoRow* _tmp17_ = NULL;
 #line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18476,7 +18476,7 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 #line 18475 "Photo.c"
 			}
 		}
-		__finally351:
+		__finally348:
 		{
 			PhotoRow* _tmp17_ = NULL;
 #line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18578,7 +18578,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 18579 "Photo.c"
-						goto __catch353_database_error;
+						goto __catch350_database_error;
 					}
 					{
 						PhotoRow* _tmp6_ = NULL;
@@ -18606,8 +18606,8 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				_tmp7_->import_id = _tmp8_;
 #line 18606 "Photo.c"
 			}
-			goto __finally353;
-			__catch353_database_error:
+			goto __finally350;
+			__catch350_database_error:
 			{
 				GError* err = NULL;
 				GError* _tmp9_ = NULL;
@@ -18628,7 +18628,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				_g_error_free0 (err);
 #line 18628 "Photo.c"
 			}
-			__finally353:
+			__finally350:
 #line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 18633 "Photo.c"
@@ -18651,7 +18651,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 #line 18650 "Photo.c"
 			}
 		}
-		__finally352:
+		__finally349:
 		{
 			PhotoRow* _tmp12_ = NULL;
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18835,10 +18835,10 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 #line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 18836 "Photo.c"
-			goto __finally354;
+			goto __finally351;
 		}
 	}
-	__finally354:
+	__finally351:
 	{
 		PhotoFileReader* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
@@ -19006,10 +19006,10 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 #line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 19007 "Photo.c"
-			goto __finally355;
+			goto __finally352;
 		}
 	}
-	__finally355:
+	__finally352:
 	{
 		PhotoFileReader* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
@@ -19116,7 +19116,7 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 #line 19115 "Photo.c"
 			}
 		}
-		__finally356:
+		__finally353:
 		{
 			PhotoRow* _tmp11_ = NULL;
 #line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19285,10 +19285,10 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 #line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 19286 "Photo.c"
-			goto __finally357;
+			goto __finally354;
 		}
 	}
-	__finally357:
+	__finally354:
 	{
 		PhotoFileReader* _tmp21_ = NULL;
 		GFile* _tmp22_ = NULL;
@@ -19613,7 +19613,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 			return result;
 #line 19613 "Photo.c"
 		}
-		__finally358:
+		__finally355:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19677,7 +19677,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 			return result;
 #line 19677 "Photo.c"
 		}
-		__finally359:
+		__finally356:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19786,7 +19786,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 				self->priv->transformer = NULL;
 #line 19786 "Photo.c"
 			}
-			__finally360:
+			__finally357:
 			{
 				PhotoRow* _tmp4_ = NULL;
 #line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19984,7 +19984,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 			committed = _tmp37_;
 #line 19984 "Photo.c"
 		}
-		__finally361:
+		__finally358:
 		{
 			PhotoRow* _tmp38_ = NULL;
 #line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20058,7 +20058,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 #line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 20059 "Photo.c"
-			goto __catch362_g_error;
+			goto __catch359_g_error;
 		}
 #line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp0_;
@@ -20072,8 +20072,8 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		return result;
 #line 20072 "Photo.c"
 	}
-	goto __finally362;
-	__catch362_g_error:
+	goto __finally359;
+	__catch359_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -20096,7 +20096,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		return result;
 #line 20096 "Photo.c"
 	}
-	__finally362:
+	__finally359:
 #line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20662,7 +20662,7 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 			return;
 #line 20662 "Photo.c"
 		}
-		__finally363:
+		__finally360:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20740,7 +20740,7 @@ gboolean photo_has_transformations (Photo* self) {
 			return result;
 #line 20740 "Photo.c"
 		}
-		__finally364:
+		__finally361:
 		{
 			PhotoRow* _tmp9_ = NULL;
 #line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20887,7 +20887,7 @@ gboolean photo_only_metadata_changed (Photo* self) {
 			return result;
 #line 20887 "Photo.c"
 		}
-		__finally365:
+		__finally362:
 		{
 			PhotoRow* _tmp20_ = NULL;
 #line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21026,7 +21026,7 @@ gboolean photo_has_alterations (Photo* self) {
 #line 21025 "Photo.c"
 				}
 			}
-			__finally366:
+			__finally363:
 			{
 				PhotoRow* _tmp15_ = NULL;
 #line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21197,7 +21197,7 @@ gboolean photo_has_alterations (Photo* self) {
 			return result;
 #line 21197 "Photo.c"
 		}
-		__finally367:
+		__finally364:
 		{
 			PhotoRow* _tmp40_ = NULL;
 #line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21332,7 +21332,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 			return result;
 #line 21332 "Photo.c"
 		}
-		__finally368:
+		__finally365:
 		{
 			PhotoRow* _tmp15_ = NULL;
 #line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21517,7 +21517,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 #line 21516 "Photo.c"
 			}
 		}
-		__finally369:
+		__finally366:
 		{
 			PhotoRow* _tmp29_ = NULL;
 #line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21692,7 +21692,7 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 #line 21691 "Photo.c"
 			}
 		}
-		__finally370:
+		__finally367:
 		{
 			PhotoRow* _tmp20_ = NULL;
 #line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21781,7 +21781,7 @@ Orientation photo_get_original_orientation (Photo* self) {
 			return result;
 #line 21781 "Photo.c"
 		}
-		__finally371:
+		__finally368:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21836,7 +21836,7 @@ Orientation photo_get_orientation (Photo* self) {
 			return result;
 #line 21836 "Photo.c"
 		}
-		__finally372:
+		__finally369:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21926,7 +21926,7 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 				}
 			}
 		}
-		__finally373:
+		__finally370:
 		{
 			PhotoRow* _tmp13_ = NULL;
 #line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22009,7 +22009,7 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
 			photo_set_orientation (self, _tmp3_);
 #line 22009 "Photo.c"
 		}
-		__finally374:
+		__finally371:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22102,7 +22102,7 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 			return result;
 #line 22102 "Photo.c"
 		}
-		__finally375:
+		__finally372:
 		{
 			PhotoRow* _tmp9_ = NULL;
 #line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22186,7 +22186,7 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 				}
 			}
 		}
-		__finally376:
+		__finally373:
 		{
 			PhotoRow* _tmp10_ = NULL;
 #line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22313,7 +22313,7 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 			return result;
 #line 22313 "Photo.c"
 		}
-		__finally377:
+		__finally374:
 		{
 			PhotoRow* _tmp19_ = NULL;
 #line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22429,7 +22429,7 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 			_database_table_unref0 (_tmp13_);
 #line 22429 "Photo.c"
 		}
-		__finally378:
+		__finally375:
 		{
 			PhotoRow* _tmp18_ = NULL;
 #line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23310,7 +23310,7 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
 			return result;
 #line 23310 "Photo.c"
 		}
-		__finally379:
+		__finally376:
 		{
 			PhotoRow* _tmp7_ = NULL;
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24018,7 +24018,7 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 			original_orientation = _tmp4_;
 #line 24018 "Photo.c"
 		}
-		__finally380:
+		__finally377:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24387,7 +24387,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (found);
 #line 24388 "Photo.c"
-					goto __finally381;
+					goto __finally378;
 				}
 #line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = locate;
@@ -24581,7 +24581,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 			return result;
 #line 24581 "Photo.c"
 		}
-		__finally381:
+		__finally378:
 		{
 			GeeLinkedList* _tmp75_ = NULL;
 #line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24614,11 +24614,11 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 #line 3330 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 24615 "Photo.c"
-			goto __catch382_g_error;
+			goto __catch379_g_error;
 		}
 	}
-	goto __finally382;
-	__catch382_g_error:
+	goto __finally379;
+	__catch379_g_error:
 	{
 		GError* err = NULL;
 #line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24629,7 +24629,7 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 		_g_error_free0 (err);
 #line 24629 "Photo.c"
 	}
-	__finally382:
+	__finally379:
 #line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24718,11 +24718,11 @@ void photo_discard_prefetched (Photo* self) {
 #line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 24719 "Photo.c"
-			goto __catch383_g_error;
+			goto __catch380_g_error;
 		}
 	}
-	goto __finally383;
-	__catch383_g_error:
+	goto __finally380;
+	__catch380_g_error:
 	{
 		GError* err = NULL;
 #line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24733,7 +24733,7 @@ void photo_discard_prefetched (Photo* self) {
 		_g_error_free0 (err);
 #line 24733 "Photo.c"
 	}
-	__finally383:
+	__finally380:
 #line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24988,7 +24988,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			orientation = _tmp31_;
 #line 24988 "Photo.c"
 		}
-		__finally384:
+		__finally381:
 		{
 			PhotoRow* _tmp32_ = NULL;
 #line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25730,7 +25730,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 				}
 			}
 		}
-		__finally385:
+		__finally382:
 		{
 			PhotoBackingReaders* _tmp28_ = NULL;
 #line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26879,7 +26879,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 			backing = _tmp2_;
 #line 26878 "Photo.c"
 		}
-		__finally386:
+		__finally383:
 		{
 			PhotoRow* _tmp3_ = NULL;
 #line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27174,7 +27174,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 #line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 27174 "Photo.c"
-			goto __catch387_g_error;
+			goto __catch384_g_error;
 		}
 #line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp11_;
@@ -27188,8 +27188,8 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_g_object_unref0 (_tmp11_);
 #line 27187 "Photo.c"
 	}
-	goto __finally387;
-	__catch387_g_error:
+	goto __finally384;
+	__catch384_g_error:
 	{
 		GError* er = NULL;
 #line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27204,7 +27204,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_g_error_free0 (er);
 #line 27203 "Photo.c"
 	}
-	__finally387:
+	__finally384:
 #line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27456,7 +27456,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 #line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 27456 "Photo.c"
-					goto __finally388;
+					goto __finally385;
 				}
 #line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp7_;
@@ -27484,7 +27484,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 #line 27482 "Photo.c"
 			}
 		}
-		__finally388:
+		__finally385:
 		{
 			PhotoBackingReaders* _tmp14_ = NULL;
 #line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27612,11 +27612,11 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 #line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 27612 "Photo.c"
-				goto __catch389_g_error;
+				goto __catch386_g_error;
 			}
 		}
-		goto __finally389;
-		__catch389_g_error:
+		goto __finally386;
+		__catch386_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp38_ = NULL;
@@ -27635,11 +27635,11 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 #line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 27635 "Photo.c"
-					goto __catch390_g_error;
+					goto __catch387_g_error;
 				}
 			}
-			goto __finally390;
-			__catch390_g_error:
+			goto __finally387;
+			__catch387_g_error:
 			{
 				GError* delete_err = NULL;
 				GFile* _tmp33_ = NULL;
@@ -27670,7 +27670,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				_g_error_free0 (delete_err);
 #line 27668 "Photo.c"
 			}
-			__finally390:
+			__finally387:
 #line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27698,9 +27698,9 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 #line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
 #line 27697 "Photo.c"
-			goto __finally389;
+			goto __finally386;
 		}
-		__finally389:
+		__finally386:
 #line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27994,7 +27994,7 @@ void photo_reimport_editable (Photo* self, GError** error) {
 }
 
 
-static void _vala_array_add269 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add103 (gchar*** array, int* length, int* size, gchar* value) {
 #line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28011,7 +28011,7 @@ static void _vala_array_add269 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add270 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add104 (gchar*** array, int* length, int* size, gchar* value) {
 #line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28028,7 +28028,7 @@ static void _vala_array_add270 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add271 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add105 (gchar*** array, int* length, int* size, gchar* value) {
 #line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28045,7 +28045,7 @@ static void _vala_array_add271 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add272 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add106 (gchar*** array, int* length, int* size, gchar* value) {
 #line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28062,7 +28062,7 @@ static void _vala_array_add272 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add273 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add107 (gchar*** array, int* length, int* size, gchar* value) {
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28079,7 +28079,7 @@ static void _vala_array_add273 (gchar*** array, int* length, int* size, gchar* v
 }
 
 
-static void _vala_array_add274 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add108 (gchar*** array, int* length, int* size, gchar* value) {
 #line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
 #line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28330,7 +28330,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 #line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 28329 "Photo.c"
-						goto __finally391;
+						goto __finally388;
 					}
 #line 3937 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = backing;
@@ -28356,7 +28356,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					photo_set_orientation (self, _tmp33_);
 #line 28354 "Photo.c"
 				}
-				__finally391:
+				__finally388:
 				{
 					PhotoRow* _tmp34_ = NULL;
 #line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28425,7 +28425,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 #line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 28424 "Photo.c"
-				goto __catch392_g_error;
+				goto __catch389_g_error;
 			}
 #line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = _tmp37_;
@@ -28439,8 +28439,8 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_g_object_unref0 (_tmp37_);
 #line 28437 "Photo.c"
 		}
-		goto __finally392;
-		__catch392_g_error:
+		goto __finally389;
+		__catch389_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp41_ = NULL;
@@ -28483,7 +28483,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			return;
 #line 28481 "Photo.c"
 		}
-		__finally392:
+		__finally389:
 #line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28608,7 +28608,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_tmp66_->filesize = _tmp68_;
 #line 28606 "Photo.c"
 			}
-			__finally393:
+			__finally390:
 			{
 				PhotoRow* _tmp69_ = NULL;
 #line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28768,7 +28768,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					photo_set_orientation (self, _tmp92_);
 #line 28766 "Photo.c"
 				}
-				__finally394:
+				__finally391:
 				{
 					PhotoRow* _tmp93_ = NULL;
 #line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28826,7 +28826,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_tmp96_->editable = _tmp98_;
 #line 28824 "Photo.c"
 			}
-			__finally395:
+			__finally392:
 			{
 				PhotoBackingReaders* _tmp99_ = NULL;
 #line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28964,7 +28964,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 #line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp115_ = g_strdup ("metadata:editable-timestamp");
 #line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add269 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp115_);
+		_vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp115_);
 #line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp116_ = alteration_list;
 #line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28972,7 +28972,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 #line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp117_ = g_strdup ("metadata:baseline-timestamp");
 #line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add270 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp117_);
+		_vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp117_);
 #line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp118_ = photo_is_editable_source (self);
 #line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28988,7 +28988,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 #line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp120_ = g_strdup ("metadata:source-timestamp");
 #line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add271 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_);
+			_vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_);
 #line 28989 "Photo.c"
 		}
 	}
@@ -29024,7 +29024,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 #line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp125_ = g_strdup ("image:editable");
 #line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add272 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp125_);
+		_vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp125_);
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp126_ = alteration_list;
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29032,7 +29032,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp127_ = g_strdup ("image:baseline");
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add273 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp127_);
+		_vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp127_);
 #line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp128_ = photo_is_editable_source (self);
 #line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29048,7 +29048,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 #line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp130_ = g_strdup ("image:source");
 #line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add274 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_);
+			_vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_);
 #line 29049 "Photo.c"
 		}
 	}
@@ -29156,7 +29156,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 #line 29153 "Photo.c"
 			}
 		}
-		__finally396:
+		__finally393:
 		{
 			PhotoBackingReaders* _tmp7_ = NULL;
 #line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29229,7 +29229,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 #line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 29228 "Photo.c"
-							goto __finally398;
+							goto __finally395;
 						}
 					}
 #line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29244,7 +29244,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					self->backing_photo_row = _tmp18_;
 #line 29242 "Photo.c"
 				}
-				__finally398:
+				__finally395:
 				{
 					PhotoRow* _tmp19_ = NULL;
 #line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29258,7 +29258,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 #line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 29257 "Photo.c"
-						goto __catch397_database_error;
+						goto __catch394_database_error;
 					}
 #line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (editable_file);
@@ -29272,8 +29272,8 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 				}
 			}
 		}
-		goto __finally397;
-		__catch397_database_error:
+		goto __finally394;
+		__catch394_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp20_ = NULL;
@@ -29292,7 +29292,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			_g_error_free0 (err);
 #line 29290 "Photo.c"
 		}
-		__finally397:
+		__finally394:
 #line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29330,7 +29330,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 #line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 29329 "Photo.c"
-						goto __catch399_database_error;
+						goto __catch396_database_error;
 					}
 #line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (editable_file);
@@ -29344,8 +29344,8 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 				}
 			}
 		}
-		goto __finally399;
-		__catch399_database_error:
+		goto __finally396;
+		__catch396_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp26_ = NULL;
@@ -29364,7 +29364,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			_g_error_free0 (err);
 #line 29362 "Photo.c"
 		}
-		__finally399:
+		__finally396:
 #line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29428,11 +29428,11 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 #line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 29427 "Photo.c"
-				goto __catch400_g_error;
+				goto __catch397_g_error;
 			}
 		}
-		goto __finally400;
-		__catch400_g_error:
+		goto __finally397;
+		__catch397_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp35_ = NULL;
@@ -29470,7 +29470,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			_g_error_free0 (err);
 #line 29468 "Photo.c"
 		}
-		__finally400:
+		__finally397:
 #line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29625,7 +29625,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 #line 29622 "Photo.c"
 			}
 		}
-		__finally401:
+		__finally398:
 		{
 			PhotoBackingReaders* _tmp11_ = NULL;
 #line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29788,11 +29788,11 @@ static void photo_on_reimport_editable (Photo* self) {
 #line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 29787 "Photo.c"
-			goto __catch402_g_error;
+			goto __catch399_g_error;
 		}
 	}
-	goto __finally402;
-	__catch402_g_error:
+	goto __finally399;
+	__catch399_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp2_ = NULL;
@@ -29820,7 +29820,7 @@ static void photo_on_reimport_editable (Photo* self) {
 		_g_error_free0 (err);
 #line 29817 "Photo.c"
 	}
-	__finally402:
+	__finally399:
 #line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29855,11 +29855,11 @@ static void photo_on_update_editable_attributes (Photo* self) {
 #line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 29853 "Photo.c"
-			goto __catch403_g_error;
+			goto __catch400_g_error;
 		}
 	}
-	goto __finally403;
-	__catch403_g_error:
+	goto __finally400;
+	__catch400_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -29878,7 +29878,7 @@ static void photo_on_update_editable_attributes (Photo* self) {
 		_g_error_free0 (err);
 #line 29875 "Photo.c"
 	}
-	__finally403:
+	__finally400:
 #line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31502,7 +31502,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 #line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 31500 "Photo.c"
-			goto __catch404_g_error;
+			goto __catch401_g_error;
 		}
 #line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp0_;
@@ -31516,8 +31516,8 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 		_g_object_unref0 (_tmp0_);
 #line 31513 "Photo.c"
 	}
-	goto __finally404;
-	__catch404_g_error:
+	goto __finally401;
+	__catch401_g_error:
 	{
 		GError* e = NULL;
 #line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31536,7 +31536,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 		return result;
 #line 31533 "Photo.c"
 	}
-	__finally404:
+	__finally401:
 #line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31604,7 +31604,7 @@ gboolean photo_enhance (Photo* self) {
 			photo_set_color_adjustments (self, _tmp3_);
 #line 31601 "Photo.c"
 		}
-		__finally405:
+		__finally402:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -32962,7 +32962,7 @@ void photo_reimport_master_state_unref (gpointer instance) {
 }
 
 
-static gchar** _vala_array_dup29 (gchar** self, int length) {
+static gchar** _vala_array_dup28 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -33020,7 +33020,7 @@ static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct
 #line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4__length1 = alterations_length1;
 #line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup29 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_);
+	_tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup28 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_);
 #line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5__length1 = _tmp4__length1;
 #line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38999,7 +38999,7 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 #line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 38997 "Photo.c"
-				goto __catch406_database_error;
+				goto __catch403_database_error;
 			}
 #line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -39010,8 +39010,8 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 #line 39006 "Photo.c"
 		}
 	}
-	goto __finally406;
-	__catch406_database_error:
+	goto __finally403;
+	__catch403_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -39027,7 +39027,7 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 		_g_error_free0 (err);
 #line 39024 "Photo.c"
 	}
-	__finally406:
+	__finally403:
 #line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39144,11 +39144,11 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) {
 #line 5078 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 39142 "Photo.c"
-			goto __catch407_g_error;
+			goto __catch404_g_error;
 		}
 	}
-	goto __finally407;
-	__catch407_g_error:
+	goto __finally404;
+	__catch404_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp0_ = NULL;
@@ -39175,7 +39175,7 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) {
 		_g_error_free0 (err);
 #line 39172 "Photo.c"
 	}
-	__finally407:
+	__finally404:
 #line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39326,11 +39326,11 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 #line 5122 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 39324 "Photo.c"
-			goto __catch408_g_error;
+			goto __catch405_g_error;
 		}
 	}
-	goto __finally408;
-	__catch408_g_error:
+	goto __finally405;
+	__catch405_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp2_ = NULL;
@@ -39357,7 +39357,7 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 		_g_error_free0 (err);
 #line 39354 "Photo.c"
 	}
-	__finally408:
+	__finally405:
 #line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40159,7 +40159,7 @@ static void library_photo_real_destroy (DataSource* base) {
 #line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 40157 "Photo.c"
-				goto __catch409_database_error;
+				goto __catch406_database_error;
 			}
 #line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -40170,8 +40170,8 @@ static void library_photo_real_destroy (DataSource* base) {
 #line 40166 "Photo.c"
 		}
 	}
-	goto __finally409;
-	__catch409_database_error:
+	goto __finally406;
+	__catch406_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -40187,7 +40187,7 @@ static void library_photo_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 40184 "Photo.c"
 	}
-	__finally409:
+	__finally406:
 #line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index 084d735..a307aae 100644
--- a/src/PhotoMonitor.c
+++ b/src/PhotoMonitor.c
@@ -724,10 +724,10 @@ void photo_monitor_update_raw_development_file (PhotoMonitor* self, LibraryPhoto
 static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* base, Monitorable* monitorable, int* result_length1);
 gboolean photo_has_editable (Photo* self);
 GFile* photo_get_editable_file (Photo* self);
-static void _vala_array_add337 (GFile*** array, int* length, int* size, GFile* value);
+static void _vala_array_add131 (GFile*** array, int* length, int* size, GFile* value);
 GeeCollection* photo_get_raw_developer_files (Photo* self);
-static void _vala_array_add338 (GFile*** array, int* length, int* size, GFile* value);
-static GFile** _vala_array_dup32 (GFile** self, int length);
+static void _vala_array_add132 (GFile*** array, int* length, int* size, GFile* value);
+static GFile** _vala_array_dup31 (GFile** self, int length);
 static void photo_monitor_real_update_backing_file_info (MediaMonitor* base, Monitorable* monitorable, GFile* file, GFileInfo* info);
 GFile* media_monitor_get_master_file (MediaMonitor* self, Monitorable* monitorable);
 static void photo_monitor_check_for_master_changes (PhotoMonitor* self, LibraryPhoto* photo, GFileInfo* info);
@@ -2618,7 +2618,7 @@ static GeeCollection* photo_monitor_real_candidates_for_unknown_file (MediaMonit
 }
 
 
-static void _vala_array_add337 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add131 (GFile*** array, int* length, int* size, GFile* value) {
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if ((*length) == (*size)) {
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2635,7 +2635,7 @@ static void _vala_array_add337 (GFile*** array, int* length, int* size, GFile* v
 }
 
 
-static void _vala_array_add338 (GFile*** array, int* length, int* size, GFile* value) {
+static void _vala_array_add132 (GFile*** array, int* length, int* size, GFile* value) {
 #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if ((*length) == (*size)) {
 #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2652,7 +2652,7 @@ static void _vala_array_add338 (GFile*** array, int* length, int* size, GFile* v
 }
 
 
-static GFile** _vala_array_dup32 (GFile** self, int length) {
+static GFile** _vala_array_dup31 (GFile** self, int length) {
 	GFile** result;
 	int i;
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2736,7 +2736,7 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		_tmp7_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PHOTO, Photo));
 #line 367 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-		_vala_array_add337 (&files, &files_length1, &_files_size_, _tmp7_);
+		_vala_array_add131 (&files, &files_length1, &_files_size_, _tmp7_);
 #line 2739 "PhotoMonitor.c"
 	}
 #line 370 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -2797,7 +2797,7 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
 #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_tmp19_ = _g_object_ref0 (_tmp18_);
 #line 373 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-				_vala_array_add338 (&files, &files_length1, &_files_size_, _tmp19_);
+				_vala_array_add132 (&files, &files_length1, &_files_size_, _tmp19_);
 #line 372 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_g_object_unref0 (f);
 #line 2802 "PhotoMonitor.c"
@@ -2837,7 +2837,7 @@ static GFile** photo_monitor_real_get_auxilliary_backing_files (MediaMonitor* ba
 #line 2836 "PhotoMonitor.c"
 	}
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
-	_tmp23_ = (_tmp20_ != NULL) ? _vala_array_dup32 (_tmp20_, _tmp20__length1) : ((gpointer) _tmp20_);
+	_tmp23_ = (_tmp20_ != NULL) ? _vala_array_dup31 (_tmp20_, _tmp20__length1) : ((gpointer) _tmp20_);
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	_tmp23__length1 = _tmp20__length1;
 #line 376 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6616,7 +6616,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6617 "PhotoMonitor.c"
-					goto __catch585_database_error;
+					goto __catch582_database_error;
 				}
 #line 997 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_g_object_unref0 (reimport_raw_developments);
@@ -6641,8 +6641,8 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6640 "PhotoMonitor.c"
 			}
 		}
-		goto __finally585;
-		__catch585_database_error:
+		goto __finally582;
+		__catch582_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp97_ = NULL;
@@ -6658,7 +6658,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 			_g_error_free0 (err);
 #line 6658 "PhotoMonitor.c"
 		}
-		__finally585:
+		__finally582:
 #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 996 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -6718,7 +6718,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6719 "PhotoMonitor.c"
-					goto __catch586_database_error;
+					goto __catch583_database_error;
 				}
 #line 1007 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 				_g_object_unref0 (reimport_raw_developments);
@@ -6743,8 +6743,8 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 #line 6742 "PhotoMonitor.c"
 			}
 		}
-		goto __finally586;
-		__catch586_database_error:
+		goto __finally583;
+		__catch583_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp105_ = NULL;
@@ -6760,7 +6760,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 			_g_error_free0 (err);
 #line 6760 "PhotoMonitor.c"
 		}
-		__finally586:
+		__finally583:
 #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1006 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7437,7 +7437,7 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7437 "PhotoMonitor.c"
-				goto __catch587_database_error;
+				goto __catch584_database_error;
 			}
 #line 1085 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_background_job_unref0 (job);
@@ -7450,8 +7450,8 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 #line 7448 "PhotoMonitor.c"
 		}
 	}
-	goto __finally587;
-	__catch587_database_error:
+	goto __finally584;
+	__catch584_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp26_ = NULL;
@@ -7467,7 +7467,7 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 		_g_error_free0 (err);
 #line 7466 "PhotoMonitor.c"
 	}
-	__finally587:
+	__finally584:
 #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1084 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7650,7 +7650,7 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7650 "PhotoMonitor.c"
-				goto __catch588_database_error;
+				goto __catch585_database_error;
 			}
 #line 1116 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_background_job_unref0 (job);
@@ -7663,8 +7663,8 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 #line 7661 "PhotoMonitor.c"
 		}
 	}
-	goto __finally588;
-	__catch588_database_error:
+	goto __finally585;
+	__catch585_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
@@ -7680,7 +7680,7 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 		_g_error_free0 (err);
 #line 7679 "PhotoMonitor.c"
 	}
-	__finally588:
+	__finally585:
 #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1115 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -7844,7 +7844,7 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7844 "PhotoMonitor.c"
-				goto __catch589_database_error;
+				goto __catch586_database_error;
 			}
 #line 1143 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 			_background_job_unref0 (job);
@@ -7857,8 +7857,8 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 #line 7855 "PhotoMonitor.c"
 		}
 	}
-	goto __finally589;
-	__catch589_database_error:
+	goto __finally586;
+	__catch586_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
@@ -7874,7 +7874,7 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 		_g_error_free0 (err);
 #line 7873 "PhotoMonitor.c"
 	}
-	__finally589:
+	__finally586:
 #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1142 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8030,14 +8030,14 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base)
 #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8030 "PhotoMonitor.c"
-			goto __catch590_g_error;
+			goto __catch587_g_error;
 		}
 #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->mark_online = _tmp0_;
 #line 8035 "PhotoMonitor.c"
 	}
-	goto __finally590;
-	__catch590_g_error:
+	goto __finally587;
+	__catch587_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -8058,7 +8058,7 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base)
 		_g_error_free0 (err);
 #line 8057 "PhotoMonitor.c"
 	}
-	__finally590:
+	__finally587:
 #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 175 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8208,14 +8208,14 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8208 "PhotoMonitor.c"
-			goto __catch591_g_error;
+			goto __catch588_g_error;
 		}
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8213 "PhotoMonitor.c"
 	}
-	goto __finally591;
-	__catch591_g_error:
+	goto __finally588;
+	__catch588_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -8236,7 +8236,7 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas
 		_g_error_free0 (err);
 #line 8235 "PhotoMonitor.c"
 	}
-	__finally591:
+	__finally588:
 #line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 197 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
@@ -8386,14 +8386,14 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8386 "PhotoMonitor.c"
-			goto __catch592_g_error;
+			goto __catch589_g_error;
 		}
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8391 "PhotoMonitor.c"
 	}
-	goto __finally592;
-	__catch592_g_error:
+	goto __finally589;
+	__catch589_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -8414,7 +8414,7 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ
 		_g_error_free0 (err);
 #line 8413 "PhotoMonitor.c"
 	}
-	__finally592:
+	__finally589:
 #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 219 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
diff --git a/src/PhotoPage.c b/src/PhotoPage.c
index 01ce089..1fe61d0 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -810,8 +810,7 @@ typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
 typedef struct _ConfigFacade ConfigFacade;
 typedef struct _ConfigFacadeClass ConfigFacadeClass;
 #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL)))
-
-#define TYPE_RATING (rating_get_type ())
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
 #define _injection_group_unref0(var) ((var == NULL) ? NULL : (var = (injection_group_unref (var), NULL)))
 
 #define TYPE_MULTIPLE_DATA_SOURCE_COMMAND (multiple_data_source_command_get_type ())
@@ -834,6 +833,8 @@ typedef struct _MultipleDataSourceCommandClass MultipleDataSourceCommandClass;
 typedef struct _SetRawDeveloperCommand SetRawDeveloperCommand;
 typedef struct _SetRawDeveloperCommandClass SetRawDeveloperCommandClass;
 
+#define TYPE_RATING (rating_get_type ())
+
 #define TYPE_FLAGGABLE (flaggable_get_type ())
 #define FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FLAGGABLE, Flaggable))
 #define IS_FLAGGABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_FLAGGABLE))
@@ -1158,7 +1159,7 @@ struct _ZoomBufferTransformationJobPrivate {
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -1168,8 +1169,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -1177,10 +1176,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -1423,6 +1420,7 @@ struct _LibraryPhotoPagePrivate {
 	CollectionPage* return_page;
 	gboolean return_to_collection_on_release;
 	LibraryPhotoPageLibraryPhotoPageViewFilter* filter;
+	GtkMenu* context_menu;
 };
 
 typedef enum  {
@@ -1670,22 +1668,19 @@ SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* pa
 static void editing_host_page_on_viewport_resized (EditingHostPage* self);
 static void _editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self);
 GtkToolbar* page_get_toolbar (Page* self);
-#define RESOURCES_CLOCKWISE "object-rotate-right"
 #define RESOURCES_ROTATE_CW_LABEL _ ("Rotate")
+#define RESOURCES_CLOCKWISE "object-rotate-right"
 #define RESOURCES_ROTATE_CW_TOOLTIP _ ("Rotate the photos right (press Ctrl to rotate left)")
 void editing_host_page_on_rotate_clockwise (EditingHostPage* self);
 static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self);
-#define RESOURCES_CROP "shotwell-crop"
 #define RESOURCES_CROP_LABEL _ ("Crop")
 #define RESOURCES_CROP_TOOLTIP _ ("Crop the photo’s size")
 static void editing_host_page_on_crop_toggled (EditingHostPage* self);
 static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self);
-#define RESOURCES_STRAIGHTEN "shotwell-straighten"
 #define RESOURCES_STRAIGHTEN_LABEL _ ("Straighten")
 #define RESOURCES_STRAIGHTEN_TOOLTIP _ ("Straighten the photo")
 static void editing_host_page_on_straighten_toggled (EditingHostPage* self);
 static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self);
-#define RESOURCES_REDEYE "shotwell-redeye"
 #define RESOURCES_RED_EYE_LABEL _ ("Red-eye")
 #define RESOURCES_RED_EYE_TOOLTIP _ ("Reduce or eliminate any red-eye effects in the photo")
 static void editing_host_page_on_redeye_toggled (EditingHostPage* self);
@@ -2167,215 +2162,109 @@ static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self);
 static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self);
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void);
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_construct (GType object_type);
-LibraryPhotoPage* library_photo_page_new (void);
-LibraryPhotoPage* library_photo_page_construct (GType object_type);
-static void library_photo_page_on_photos_altered (LibraryPhotoPage* self);
-static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
-void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f);
-static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking);
-static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self);
-static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked);
-static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self);
-gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view);
-gboolean media_source_is_trashed (MediaSource* self);
-static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static GtkActionEntry* library_photo_page_real_init_collect_action_entries (Page* base, int* result_length1);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-#define RESOURCES_SAVE_AS_LABEL _ ("Save _As")
-#define TRANSLATABLE "translatable"
 static void library_photo_page_on_export (LibraryPhotoPage* self);
-static void _library_photo_page_on_export_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EXPORT_MENU _ ("_Export…")
-static void _vala_array_add193 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_PRINT_LABEL _ ("_Print")
+static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_print (LibraryPhotoPage* self);
-static void _library_photo_page_on_print_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PRINT_MENU _ ("_Print…")
-static void _vala_array_add194 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_PUBLISH "applications-internet"
+static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_publish (LibraryPhotoPage* self);
-static void _library_photo_page_on_publish_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PUBLISH_MENU _ ("Pu_blish…")
-#define RESOURCES_PUBLISH_TOOLTIP _ ("Publish to various websites")
-static void _vala_array_add195 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_REMOVE_LABEL _ ("_Remove")
+static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self);
-static void _library_photo_page_on_remove_from_library_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_REMOVE_FROM_LIBRARY_MENU _ ("R_emove From Library")
-static void _vala_array_add196 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self);
-static void _library_photo_page_on_move_to_trash_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_MOVE_TO_TRASH_MENU _ ("_Move to Trash")
-static void _vala_array_add197 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void library_photo_page_on_view_menu (LibraryPhotoPage* self);
-static void _library_photo_page_on_view_menu_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add198 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add199 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _single_photo_page_on_previous_photo_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add200 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _single_photo_page_on_next_photo_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add201 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_on_rotate_clockwise_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ROTATE_CW_MENU _ ("Rotate _Right")
-static void _vala_array_add202 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_on_rotate_counterclockwise_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ROTATE_CCW_MENU _ ("Rotate _Left")
-static void _vala_array_add203 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_HFLIP "object-flip-horizontal"
-static void _editing_host_page_on_flip_horizontally_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_HFLIP_MENU _ ("Flip Hori_zontally")
-static void _vala_array_add204 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_VFLIP "object-flip-vertical"
-static void _editing_host_page_on_flip_vertically_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_VFLIP_MENU _ ("Flip Verti_cally")
-static void _vala_array_add205 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_on_enhance_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ENHANCE_MENU _ ("_Enhance")
-static void _vala_array_add206 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_on_copy_adjustments_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_COPY_ADJUSTMENTS_MENU _ ("_Copy Color Adjustments")
-#define RESOURCES_COPY_ADJUSTMENTS_TOOLTIP _ ("Copy the color adjustments applied to the photo")
-static void _vala_array_add207 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_on_paste_adjustments_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PASTE_ADJUSTMENTS_MENU _ ("_Paste Color Adjustments")
-static void _vala_array_add208 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_toggle_crop_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_CROP_MENU _ ("_Crop")
-static void _vala_array_add209 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_REFRESH_LABEL _ ("_Refresh")
-static void _editing_host_page_toggle_straighten_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_STRAIGHTEN_MENU _ ("_Straighten")
-static void _vala_array_add210 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_toggle_redeye_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_RED_EYE_MENU _ ("_Red-eye")
-static void _vala_array_add211 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_toggle_adjust_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADJUST_MENU _ ("_Adjust")
-static void _vala_array_add212 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_REVERT_TO_SAVED_LABEL _ ("_Revert")
-static void _editing_host_page_on_revert_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_REVERT_MENU _ ("Re_vert to Original")
-static void _vala_array_add213 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_on_edit_title_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EDIT_TITLE_MENU _ ("Edit _Title…")
-static void _vala_array_add214 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment…")
-static void _vala_array_add215 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_on_adjust_date_time_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time…")
-static void _vala_array_add216 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_EDIT_LABEL _ ("_Edit")
+static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_external_edit (LibraryPhotoPage* self);
-static void _library_photo_page_on_external_edit_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EXTERNAL_EDIT_MENU _ ("Open With E_xternal Editor")
-static void _vala_array_add217 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self);
-static void _library_photo_page_on_external_edit_raw_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EXTERNAL_EDIT_RAW_MENU _ ("Open With RA_W Editor")
-static void _vala_array_add218 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_send_to (LibraryPhotoPage* self);
-static void _library_photo_page_on_send_to_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_SEND_TO_MENU _ ("Send _To…")
-static void _vala_array_add219 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_on_set_background_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_SET_BACKGROUND_MENU _ ("Set as _Desktop Background")
-#define RESOURCES_SET_BACKGROUND_TOOLTIP _ ("Set selected image to be the new desktop background")
-static void _vala_array_add220 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self);
-static void _library_photo_page_on_flag_unflag_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_FLAG_MENU _ ("_Flag")
-static void _vala_array_add221 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_RATING_MENU _ ("_Set Rating")
-static void _vala_array_add222 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_increase_rating (LibraryPhotoPage* self);
-static void _library_photo_page_on_increase_rating_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_INCREASE_RATING_MENU _ ("_Increase")
-static void _vala_array_add223 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self);
-static void _library_photo_page_on_decrease_rating_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_DECREASE_RATING_MENU _ ("_Decrease")
-static void _vala_array_add224 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_rejected_gtk_action_callback (GtkAction* action, gpointer self);
-GType rating_get_type (void) G_GNUC_CONST;
-const gchar* resources_rating_menu (Rating rating);
-static void _vala_array_add225 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_unrated_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add226 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_rate_one (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_one_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add227 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_rate_two (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_two_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add228 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_rate_three (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_three_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add229 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_rate_four (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_four_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add230 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_rate_five (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_five_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add231 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ZOOM_IN_LABEL _ ("Zoom _In")
-static void _editing_host_page_on_increase_size_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add232 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ZOOM_OUT_LABEL _ ("Zoom _Out")
-static void _editing_host_page_on_decrease_size_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add233 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ZOOM_FIT_LABEL _ ("Best _Fit")
-static void _editing_host_page_snap_zoom_to_min_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add234 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ZOOM_100_LABEL _ ("_Normal Size")
-static void _editing_host_page_snap_zoom_to_isomorphic_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add235 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _editing_host_page_snap_zoom_to_max_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add236 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_add_tags (LibraryPhotoPage* self);
-static void _library_photo_page_on_add_tags_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADD_TAGS_MENU _ ("Add _Tags…")
-static void _vala_array_add237 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_modify_tags (LibraryPhotoPage* self);
-static void _library_photo_page_on_modify_tags_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_MODIFY_TAGS_MENU _ ("Modif_y Tags…")
-static void _vala_array_add238 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void library_photo_page_on_slideshow (LibraryPhotoPage* self);
-static void _library_photo_page_on_slideshow_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add239 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add240 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_SEND_TO_CONTEXT_MENU _ ("Send T_o…")
-static void _vala_array_add241 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ADD_TAGS_CONTEXT_MENU _ ("_Add Tags…")
-static void _vala_array_add242 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static GtkToggleActionEntry* library_photo_page_real_init_collect_toggle_action_entries (Page* base, int* result_length1);
-GtkToggleActionEntry* page_init_collect_toggle_action_entries (Page* self, int* result_length1);
-static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GtkAction* action);
-static void _library_photo_page_on_display_ratings_gtk_action_callback (GtkAction* action, gpointer self);
+static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void page_on_action_toggle (Page* self, GAction* action, GVariant* value);
+static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value);
+static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+void page_on_action_radio (Page* self, GAction* action, GVariant* value);
+static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value);
+static void _library_photo_page_on_raw_developer_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+LibraryPhotoPage* library_photo_page_new (void);
+LibraryPhotoPage* library_photo_page_construct (GType object_type);
+static void library_photo_page_on_photos_altered (LibraryPhotoPage* self);
+static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f);
+static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking);
+static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self);
+static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked);
+static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self);
+gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view);
+gboolean media_source_is_trashed (MediaSource* self);
+static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
+static void library_photo_page_real_add_actions (Page* base);
+void page_add_actions (Page* self);
+GAction* page_get_action (Page* self, const gchar* name);
 gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self);
-#define RESOURCES_VIEW_RATINGS_MENU _ ("_Ratings")
-#define RESOURCES_VIEW_RATINGS_TOOLTIP _ ("Display each photo’s rating")
-static void _vala_array_add243 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
+static GVariant* _variant_new12 (gboolean value);
+RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
+static GVariant* _variant_new13 (const gchar* value);
 static InjectionGroup** library_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1);
 InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1);
 InjectionGroup* injection_group_new (const gchar* path);
 InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
-void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action);
-static void _vala_array_add244 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add245 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add246 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void library_photo_page_real_register_radio_actions (Page* base, GtkActionGroup* action_group);
-gchar* raw_developer_get_label (RawDeveloper self);
-static void _vala_array_add247 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-static void _vala_array_add248 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GtkAction* action, GtkAction* current);
-static void _library_photo_page_on_raw_developer_changed_gtk_radio_action_callback (GtkAction* action, GtkAction* current, gpointer self);
-void page_register_radio_actions (Page* self, GtkActionGroup* action_group);
+void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
+static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
 static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display);
 void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display);
-GtkAction* page_get_action (Page* self, const gchar* name);
 static void library_photo_page_real_update_actions (Page* base, gint selected_count, gint count);
 PhotoFileFormat photo_get_master_file_format (Photo* self);
 gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self);
@@ -2395,9 +2284,6 @@ GType multiple_data_source_command_get_type (void) G_GNUC_CONST;
 GType set_raw_developer_command_get_type (void) G_GNUC_CONST;
 SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDeveloper developer);
 SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, GeeIterable* iter, RawDeveloper developer);
-GType flaggable_get_type (void) G_GNUC_CONST;
-gboolean flaggable_is_flagged (Flaggable* self);
-#define RESOURCES_UNFLAG_MENU _ ("Un_flag")
 void library_photo_page_display_for_collection (LibraryPhotoPage* self, CollectionPage* return_page, Photo* photo, ViewCollection* view);
 void library_photo_page_on_page_destroyed (LibraryPhotoPage* self);
 static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self);
@@ -2405,9 +2291,12 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self);
 static void library_photo_page_real_switched_to (Page* base);
 static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPage* self);
 static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPage* base, gint scale);
+GType rating_get_type (void) G_GNUC_CONST;
 GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale);
 Rating media_source_get_rating (MediaSource* self);
 static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage* base, gint scale);
+GType flaggable_get_type (void) G_GNUC_CONST;
+gboolean flaggable_is_flagged (Flaggable* self);
 GdkPixbuf* resources_get_icon (const gchar* name, gint scale);
 #define RESOURCES_ICON_FLAGGED_TRINKET "flag-trinket.png"
 #define RESOURCES_DEFAULT_ICON_SCALE 24
@@ -2489,7 +2378,8 @@ SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, Ratin
 SetRatingSingleCommand* set_rating_single_command_construct (GType object_type, DataSource* source, Rating rating);
 gboolean rating_can_increase (Rating self);
 gboolean rating_can_decrease (Rating self);
-gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d);
+static GVariant* _variant_new14 (const gchar* value);
+static GVariant* _variant_new15 (const gchar* value);
 gboolean alteration_has_subject (Alteration* self, const gchar* subject);
 GType tags_dialog_get_type (void) G_GNUC_CONST;
 GType add_tags_dialog_get_type (void) G_GNUC_CONST;
@@ -2525,6 +2415,7 @@ static void library_photo_page_finalize (GObject* obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
+static const GActionEntry LIBRARY_PHOTO_PAGE_entries[46] = {{"Export", _library_photo_page_on_export_gsimple_action_activate_callback}, {"Print", _library_photo_page_on_print_gsimple_action_activate_callback}, {"Publish", _library_photo_page_on_publish_gsimple_action_activate_callback}, {"RemoveFromLibrary", _library_photo_page_on_remove_from_library_gsimple_action_activate_callback}, {"MoveToTrash", _library_photo_page_on_move_to_trash_gsimple_action_activate_callback}, {"PrevPhoto", _single_photo_page_on_previous_photo_gsimple_action_activate_callback}, {"NextPhoto", _single_photo_page_on_next_photo_gsimple_action_activate_callback}, {"RotateClockwise", _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback}, {"RotateCounterclockwise", _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback}, {"FlipHorizontally", _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback}, {"FlipVertically", _editing_host_page_on_flip_vertically_gsimple_action_activate_callback}, {"Enhance", _editing_host_page_on_enhance_gsimple_action_activate_callback}, {"CopyColorAdjustments", _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback}, {"PasteColorAdjustments", _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback}, {"Crop", _editing_host_page_toggle_crop_gsimple_action_activate_callback}, {"Straighten", _editing_host_page_toggle_straighten_gsimple_action_activate_callback}, {"RedEye", _editing_host_page_toggle_redeye_gsimple_action_activate_callback}, {"Adjust", _editing_host_page_toggle_adjust_gsimple_action_activate_callback}, {"Revert", _editing_host_page_on_revert_gsimple_action_activate_callback}, {"EditTitle", _editing_host_page_on_edit_title_gsimple_action_activate_callback}, {"EditComment", _editing_host_page_on_edit_comment_gsimple_action_activate_callback}, {"AdjustDateTime", _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback}, {"ExternalEdit", _library_photo_page_on_external_edit_gsimple_action_activate_callback}, {"ExternalEditRAW", _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback}, {"SendTo", _library_photo_page_on_send_to_gsimple_action_activate_callback}, {"SetBackground", _editing_host_page_on_set_background_gsimple_action_activate_callback}, {"Flag", _library_photo_page_on_flag_unflag_gsimple_action_activate_callback}, {"IncreaseRating", _library_photo_page_on_increase_rating_gsimple_action_activate_callback}, {"DecreaseRating", _library_photo_page_on_decrease_rating_gsimple_action_activate_callback}, {"RateRejected", _library_photo_page_on_rate_rejected_gsimple_action_activate_callback}, {"RateUnrated", _library_photo_page_on_rate_unrated_gsimple_action_activate_callback}, {"RateOne", _library_photo_page_on_rate_one_gsimple_action_activate_callback}, {"RateTwo", _library_photo_page_on_rate_two_gsimple_action_activate_callback}, {"RateThree", _library_photo_page_on_rate_three_gsimple_action_activate_callback}, {"RateFour", _library_photo_page_on_rate_four_gsimple_action_activate_callback}, {"RateFive", _library_photo_page_on_rate_five_gsimple_action_activate_callback}, {"IncreaseSize", _editing_host_page_on_increase_size_gsimple_action_activate_callback}, {"DecreaseSize", _editing_host_page_on_decrease_size_gsimple_action_activate_callback}, {"ZoomFit", _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback}, {"Zoom100", _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback}, {"Zoom200", _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback}, {"AddTags", _library_photo_page_on_add_tags_gsimple_action_activate_callback}, {"ModifyTags", _library_photo_page_on_modify_tags_gsimple_action_activate_callback}, {"Slideshow", _library_photo_page_on_slideshow_gsimple_action_activate_callback}, {"ViewRatings", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_photo_page_on_display_ratings_gsimple_action_change_state_callback}, {"RawDeveloper", _page_on_action_radio_gsimple_action_activate_callback, "s", "'Shotwell'", _library_photo_page_on_raw_developer_changed_gsimple_action_change_state_callback}};
 
 static GType zoom_buffer_object_state_get_type (void) {
 	static volatile gsize zoom_buffer_object_state_type_id__volatile = 0;
@@ -2541,7 +2432,7 @@ static GType zoom_buffer_object_state_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2545 "PhotoPage.c"
+#line 2436 "PhotoPage.c"
 }
 
 
@@ -2594,28 +2485,28 @@ ZoomBuffer* zoom_buffer_construct (GType object_type, SinglePhotoPage* parent_pa
 	self->priv->workers = _tmp6_;
 #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 2598 "PhotoPage.c"
+#line 2489 "PhotoPage.c"
 }
 
 
 ZoomBuffer* zoom_buffer_new (SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image) {
 #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return zoom_buffer_construct (TYPE_ZOOM_BUFFER, parent_page, backing_photo, preview_image);
-#line 2605 "PhotoPage.c"
+#line 2496 "PhotoPage.c"
 }
 
 
 static gpointer _background_job_ref0 (gpointer self) {
 #line 93 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? background_job_ref (self) : NULL;
-#line 2612 "PhotoPage.c"
+#line 2503 "PhotoPage.c"
 }
 
 
 static void _zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job, gpointer self) {
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_buffer_on_iso_transformation_complete ((ZoomBuffer*) self, job);
-#line 2619 "PhotoPage.c"
+#line 2510 "PhotoPage.c"
 }
 
 
@@ -2669,7 +2560,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 		_background_job_unref0 (fetch_job);
 #line 96 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 2672 "PhotoPage.c"
+#line 2563 "PhotoPage.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = fetch_job;
@@ -2695,7 +2586,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 	_tmp12_ = _tmp11_;
 #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) {
-#line 2698 "PhotoPage.c"
+#line 2589 "PhotoPage.c"
 		GdkPixbuf* _tmp13_ = NULL;
 		GdkPixbuf* _tmp14_ = NULL;
 		gint _tmp15_ = 0;
@@ -2724,7 +2615,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 		_g_object_unref0 (self->priv->reduced_source_image);
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->reduced_source_image = _tmp20_;
-#line 2727 "PhotoPage.c"
+#line 2618 "PhotoPage.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED;
@@ -2732,13 +2623,13 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 	_tmp21_ = self->priv->is_interactive_redraw_in_progress;
 #line 106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp21_) {
-#line 2735 "PhotoPage.c"
+#line 2626 "PhotoPage.c"
 		SinglePhotoPage* _tmp22_ = NULL;
 #line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = self->priv->parent_page;
 #line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (_tmp22_, NULL);
-#line 2741 "PhotoPage.c"
+#line 2632 "PhotoPage.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = self->priv->iso_source_image;
@@ -2772,7 +2663,7 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 	_background_job_unref0 (transformation_job);
 #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_background_job_unref0 (fetch_job);
-#line 2775 "PhotoPage.c"
+#line 2666 "PhotoPage.c"
 }
 
 
@@ -2813,7 +2704,7 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr
 		_background_job_unref0 (transform_job);
 #line 120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 2816 "PhotoPage.c"
+#line 2707 "PhotoPage.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = transform_job;
@@ -2839,7 +2730,7 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr
 	_tmp12_ = _tmp11_;
 #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) {
-#line 2842 "PhotoPage.c"
+#line 2733 "PhotoPage.c"
 		GdkPixbuf* _tmp13_ = NULL;
 		GdkPixbuf* _tmp14_ = NULL;
 		gint _tmp15_ = 0;
@@ -2868,13 +2759,13 @@ static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, Backgr
 		_g_object_unref0 (self->priv->reduced_transformed_image);
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->reduced_transformed_image = _tmp20_;
-#line 2871 "PhotoPage.c"
+#line 2762 "PhotoPage.c"
 	}
 #line 129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY;
 #line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_background_job_unref0 (transform_job);
-#line 2877 "PhotoPage.c"
+#line 2768 "PhotoPage.c"
 }
 
 
@@ -2910,7 +2801,7 @@ static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, Backgrou
 		_background_job_unref0 (transform_job);
 #line 137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 2913 "PhotoPage.c"
+#line 2804 "PhotoPage.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = transform_job;
@@ -2932,7 +2823,7 @@ static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, Backgrou
 	single_photo_page_repaint (_tmp7_, NULL);
 #line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_background_job_unref0 (transform_job);
-#line 2935 "PhotoPage.c"
+#line 2826 "PhotoPage.c"
 }
 
 
@@ -3005,21 +2896,21 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
 	_tmp6_ = reduced_pixbuf;
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ != NULL) {
-#line 3008 "PhotoPage.c"
+#line 2899 "PhotoPage.c"
 		gdouble _tmp7_ = 0.0;
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = zoom_state_get_zoom_factor (zoom_state);
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp7_ < 0.5;
-#line 3014 "PhotoPage.c"
+#line 2905 "PhotoPage.c"
 	} else {
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 3018 "PhotoPage.c"
+#line 2909 "PhotoPage.c"
 	}
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 3022 "PhotoPage.c"
+#line 2913 "PhotoPage.c"
 		GdkPixbuf* _tmp8_ = NULL;
 		GdkPixbuf* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
@@ -3050,7 +2941,7 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
 		_tmp13_ = view_rect_proj.height;
 #line 161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_rect_proj.height = _tmp13_ / 2;
-#line 3053 "PhotoPage.c"
+#line 2944 "PhotoPage.c"
 	}
 #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = view_rect_proj;
@@ -3128,14 +3019,14 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
 	_g_object_unref0 (sample_source_pixbuf);
 #line 181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3131 "PhotoPage.c"
+#line 3022 "PhotoPage.c"
 }
 
 
 static void _zoom_buffer_on_demand_transform_complete_completion_callback (BackgroundJob* job, gpointer self) {
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_buffer_on_demand_transform_complete ((ZoomBuffer*) self, job);
-#line 3138 "PhotoPage.c"
+#line 3029 "PhotoPage.c"
 }
 
 
@@ -3154,7 +3045,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 	_tmp0_ = self->priv->demand_transform_cached_pixbuf;
 #line 185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 3157 "PhotoPage.c"
+#line 3048 "PhotoPage.c"
 		ZoomState _tmp1_ = {0};
 		gboolean _tmp2_ = FALSE;
 #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3163,7 +3054,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 		_tmp2_ = zoom_state_equals (zoom_state, &_tmp1_);
 #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp2_) {
-#line 3166 "PhotoPage.c"
+#line 3057 "PhotoPage.c"
 			GdkPixbuf* _tmp3_ = NULL;
 			GdkPixbuf* _tmp4_ = NULL;
 #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3174,7 +3065,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 			result = _tmp4_;
 #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3177 "PhotoPage.c"
+#line 3068 "PhotoPage.c"
 		} else {
 			gdouble _tmp5_ = 0.0;
 			gdouble _tmp6_ = 0.0;
@@ -3184,7 +3075,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 			_tmp6_ = zoom_state_get_zoom_factor (&self->priv->demand_transform_zoom_state);
 #line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp5_ == _tmp6_) {
-#line 3187 "PhotoPage.c"
+#line 3078 "PhotoPage.c"
 				GdkRectangle curr_rect = {0};
 				GdkRectangle _tmp7_ = {0};
 				GdkRectangle pre_rect = {0};
@@ -3504,7 +3395,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 				result = composited_result;
 #line 231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 3507 "PhotoPage.c"
+#line 3398 "PhotoPage.c"
 			}
 		}
 	}
@@ -3512,7 +3403,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 	_tmp97_ = self->priv->demand_transform_job;
 #line 242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp97_ != NULL) {
-#line 3515 "PhotoPage.c"
+#line 3406 "PhotoPage.c"
 		ZoomState _tmp98_ = {0};
 		gboolean _tmp99_ = FALSE;
 #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3521,7 +3412,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 		_tmp99_ = zoom_state_equals (zoom_state, &_tmp98_);
 #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp99_) {
-#line 3524 "PhotoPage.c"
+#line 3415 "PhotoPage.c"
 			ZoomState _tmp100_ = {0};
 			GdkPixbuf* _tmp101_ = NULL;
 #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3532,7 +3423,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 			result = _tmp101_;
 #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3535 "PhotoPage.c"
+#line 3426 "PhotoPage.c"
 		} else {
 			ZoomBufferTransformationJob* _tmp102_ = NULL;
 			GdkPixbuf* zoomed = NULL;
@@ -3612,14 +3503,14 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 			_g_object_unref0 (zoomed);
 #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3615 "PhotoPage.c"
+#line 3506 "PhotoPage.c"
 		}
 	}
 #line 263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp119_ = self->priv->demand_transform_job;
 #line 263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp119_ == NULL) {
-#line 3622 "PhotoPage.c"
+#line 3513 "PhotoPage.c"
 		GdkPixbuf* zoomed = NULL;
 		ZoomState _tmp120_ = {0};
 		GdkPixbuf* _tmp121_ = NULL;
@@ -3689,7 +3580,7 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 		_g_object_unref0 (zoomed);
 #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 3692 "PhotoPage.c"
+#line 3583 "PhotoPage.c"
 	}
 #line 283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_critical ("PhotoPage.vala:283: %s", "ZoomBuffer: get_zoomed_image( ): in SOURCE-NOT-TRANSFORMED but can't t" \
@@ -3702,14 +3593,14 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 	result = _tmp137_;
 #line 285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3704 "PhotoPage.c"
+#line 3595 "PhotoPage.c"
 }
 
 
 static void _zoom_buffer_on_iso_source_fetch_complete_completion_callback (BackgroundJob* job, gpointer self) {
 #line 290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_buffer_on_iso_source_fetch_complete ((ZoomBuffer*) self, job);
-#line 3711 "PhotoPage.c"
+#line 3602 "PhotoPage.c"
 }
 
 
@@ -3752,7 +3643,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
 	_tmp0_ = self->priv->object_state;
 #line 289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED) {
-#line 3754 "PhotoPage.c"
+#line 3645 "PhotoPage.c"
 		BackgroundJob* iso_source_fetch_job = NULL;
 		Photo* _tmp1_ = NULL;
 		ZoomBufferIsoSourceFetchJob* _tmp2_ = NULL;
@@ -3774,7 +3665,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
 		self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS;
 #line 289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_background_job_unref0 (iso_source_fetch_job);
-#line 3776 "PhotoPage.c"
+#line 3667 "PhotoPage.c"
 	}
 #line 296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp5_);
@@ -3842,7 +3733,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
 	_g_object_unref0 (proj_subpixbuf);
 #line 309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3844 "PhotoPage.c"
+#line 3735 "PhotoPage.c"
 }
 
 
@@ -3860,7 +3751,7 @@ Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) {
 	result = _tmp1_;
 #line 313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3862 "PhotoPage.c"
+#line 3753 "PhotoPage.c"
 }
 
 
@@ -3879,7 +3770,7 @@ void zoom_buffer_update_preview_image (ZoomBuffer* self, GdkPixbuf* preview_imag
 	_g_object_unref0 (self->priv->preview_image);
 #line 317 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->preview_image = _tmp1_;
-#line 3881 "PhotoPage.c"
+#line 3772 "PhotoPage.c"
 }
 
 
@@ -3895,7 +3786,7 @@ void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_s
 	_tmp0_ = initial_zoom_state;
 #line 324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 3897 "PhotoPage.c"
+#line 3788 "PhotoPage.c"
 		ZoomState* _tmp1_ = NULL;
 		ZoomState _tmp2_ = {0};
 		GdkPixbuf* _tmp3_ = NULL;
@@ -3910,7 +3801,7 @@ void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_s
 		_tmp4_ = _tmp3_;
 #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 3912 "PhotoPage.c"
+#line 3803 "PhotoPage.c"
 	}
 }
 
@@ -3929,7 +3820,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 	_tmp0_ = zoom_state_get_interpolation_factor (zoom_state);
 #line 333 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == 0.0) {
-#line 3931 "PhotoPage.c"
+#line 3822 "PhotoPage.c"
 		ZoomState _tmp1_ = {0};
 		GdkPixbuf* _tmp2_ = NULL;
 #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3940,7 +3831,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 		result = _tmp2_;
 #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 3942 "PhotoPage.c"
+#line 3833 "PhotoPage.c"
 	}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->object_state;
@@ -3950,7 +3841,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED:
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS:
-#line 3952 "PhotoPage.c"
+#line 3843 "PhotoPage.c"
 		{
 			ZoomState _tmp4_ = {0};
 			GdkPixbuf* _tmp5_ = NULL;
@@ -3962,11 +3853,11 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 			result = _tmp5_;
 #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3964 "PhotoPage.c"
+#line 3855 "PhotoPage.c"
 		}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED:
-#line 3968 "PhotoPage.c"
+#line 3859 "PhotoPage.c"
 		{
 			ZoomState _tmp6_ = {0};
 			GdkPixbuf* _tmp7_ = NULL;
@@ -3978,11 +3869,11 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 			result = _tmp7_;
 #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3980 "PhotoPage.c"
+#line 3871 "PhotoPage.c"
 		}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY:
-#line 3984 "PhotoPage.c"
+#line 3875 "PhotoPage.c"
 		{
 			ZoomState _tmp8_ = {0};
 			GdkPixbuf* _tmp9_ = NULL;
@@ -4000,7 +3891,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 			result = _tmp11_;
 #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 4002 "PhotoPage.c"
+#line 3893 "PhotoPage.c"
 		}
 		default:
 		{
@@ -4017,7 +3908,7 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 			result = _tmp13_;
 #line 353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 4018 "PhotoPage.c"
+#line 3909 "PhotoPage.c"
 		}
 	}
 }
@@ -4041,7 +3932,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom
 	result = _tmp1_;
 #line 360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4042 "PhotoPage.c"
+#line 3933 "PhotoPage.c"
 }
 
 
@@ -4074,14 +3965,14 @@ static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_construct (
 	self->priv->to_fetch = _tmp3_;
 #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 4075 "PhotoPage.c"
+#line 3966 "PhotoPage.c"
 }
 
 
 static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_new (ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target) {
 #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return zoom_buffer_iso_source_fetch_job_construct (ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, owner, to_fetch, completion_callback, completion_callback_target);
-#line 4082 "PhotoPage.c"
+#line 3973 "PhotoPage.c"
 }
 
 
@@ -4090,7 +3981,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 	GError * _inner_error_ = NULL;
 #line 27 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob);
-#line 4091 "PhotoPage.c"
+#line 3982 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_ = NULL;
@@ -4107,8 +3998,8 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		_tmp0_ = _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4108 "PhotoPage.c"
-			goto __catch243_g_error;
+#line 3999 "PhotoPage.c"
+			goto __catch240_g_error;
 		}
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp0_;
@@ -4120,10 +4011,10 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		self->fetched = _tmp4_;
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 4121 "PhotoPage.c"
+#line 4012 "PhotoPage.c"
 	}
-	goto __finally243;
-	__catch243_g_error:
+	goto __finally240;
+	__catch240_g_error:
 	{
 		GError* fetch_error = NULL;
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4135,9 +4026,9 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 "m backing photo");
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (fetch_error);
-#line 4135 "PhotoPage.c"
+#line 4026 "PhotoPage.c"
 	}
-	__finally243:
+	__finally240:
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4146,7 +4037,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		g_clear_error (&_inner_error_);
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 4146 "PhotoPage.c"
+#line 4037 "PhotoPage.c"
 	}
 }
 
@@ -4160,7 +4051,7 @@ static void zoom_buffer_iso_source_fetch_job_class_init (ZoomBufferIsoSourceFetc
 	g_type_class_add_private (klass, sizeof (ZoomBufferIsoSourceFetchJobPrivate));
 #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((BackgroundJobClass *) klass)->execute = zoom_buffer_iso_source_fetch_job_real_execute;
-#line 4160 "PhotoPage.c"
+#line 4051 "PhotoPage.c"
 }
 
 
@@ -4169,7 +4060,7 @@ static void zoom_buffer_iso_source_fetch_job_instance_init (ZoomBufferIsoSourceF
 	self->priv = ZOOM_BUFFER_ISO_SOURCE_FETCH_JOB_GET_PRIVATE (self);
 #line 18 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->fetched = NULL;
-#line 4169 "PhotoPage.c"
+#line 4060 "PhotoPage.c"
 }
 
 
@@ -4183,7 +4074,7 @@ static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob* obj) {
 	_g_object_unref0 (self->fetched);
 #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	BACKGROUND_JOB_CLASS (zoom_buffer_iso_source_fetch_job_parent_class)->finalize (obj);
-#line 4183 "PhotoPage.c"
+#line 4074 "PhotoPage.c"
 }
 
 
@@ -4202,7 +4093,7 @@ static GType zoom_buffer_iso_source_fetch_job_get_type (void) {
 static gpointer _pixel_transformer_ref0 (gpointer self) {
 #line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? pixel_transformer_ref (self) : NULL;
-#line 4202 "PhotoPage.c"
+#line 4093 "PhotoPage.c"
 }
 
 
@@ -4272,14 +4163,14 @@ static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GT
 	self->transformed = _tmp10_;
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 4272 "PhotoPage.c"
+#line 4163 "PhotoPage.c"
 }
 
 
 static ZoomBufferTransformationJob* zoom_buffer_transformation_job_new (ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable) {
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return zoom_buffer_transformation_job_construct (ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, owner, to_transform, transformer, completion_callback, completion_callback_target, cancellable);
-#line 4279 "PhotoPage.c"
+#line 4170 "PhotoPage.c"
 }
 
 
@@ -4292,7 +4183,7 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) {
 	_tmp0_ = self->priv->transformer;
 #line 60 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 4292 "PhotoPage.c"
+#line 4183 "PhotoPage.c"
 		PixelTransformer* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
 		GdkPixbuf* _tmp3_ = NULL;
@@ -4307,7 +4198,7 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) {
 		_tmp4_ = self->priv->cancellable;
 #line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixel_transformer_transform_to_other_pixbuf (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 4307 "PhotoPage.c"
+#line 4198 "PhotoPage.c"
 	}
 }
 
@@ -4321,7 +4212,7 @@ static void zoom_buffer_transformation_job_class_init (ZoomBufferTransformationJ
 	g_type_class_add_private (klass, sizeof (ZoomBufferTransformationJobPrivate));
 #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((BackgroundJobClass *) klass)->execute = zoom_buffer_transformation_job_real_execute;
-#line 4321 "PhotoPage.c"
+#line 4212 "PhotoPage.c"
 }
 
 
@@ -4330,7 +4221,7 @@ static void zoom_buffer_transformation_job_instance_init (ZoomBufferTransformati
 	self->priv = ZOOM_BUFFER_TRANSFORMATION_JOB_GET_PRIVATE (self);
 #line 47 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->transformed = NULL;
-#line 4330 "PhotoPage.c"
+#line 4221 "PhotoPage.c"
 }
 
 
@@ -4348,7 +4239,7 @@ static void zoom_buffer_transformation_job_finalize (BackgroundJob* obj) {
 	_g_object_unref0 (self->transformed);
 #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	BACKGROUND_JOB_CLASS (zoom_buffer_transformation_job_parent_class)->finalize (obj);
-#line 4348 "PhotoPage.c"
+#line 4239 "PhotoPage.c"
 }
 
 
@@ -4371,7 +4262,7 @@ static void zoom_buffer_class_init (ZoomBufferClass * klass) {
 	g_type_class_add_private (klass, sizeof (ZoomBufferPrivate));
 #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = zoom_buffer_finalize;
-#line 4371 "PhotoPage.c"
+#line 4262 "PhotoPage.c"
 }
 
 
@@ -4400,7 +4291,7 @@ static void zoom_buffer_instance_init (ZoomBuffer * self) {
 	self->priv->workers = NULL;
 #line 82 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->is_interactive_redraw_in_progress = FALSE;
-#line 4400 "PhotoPage.c"
+#line 4291 "PhotoPage.c"
 }
 
 
@@ -4430,7 +4321,7 @@ static void zoom_buffer_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->parent_page);
 #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (zoom_buffer_parent_class)->finalize (obj);
-#line 4430 "PhotoPage.c"
+#line 4321 "PhotoPage.c"
 }
 
 
@@ -4447,145 +4338,145 @@ GType zoom_buffer_get_type (void) {
 
 
 static void _editing_host_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_photos_altered ((EditingHostPage*) self, items);
-#line 4449 "PhotoPage.c"
+#line 4340 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
-#line 4456 "PhotoPage.c"
+#line 4347 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, gpointer self) {
-#line 549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
-#line 4463 "PhotoPage.c"
+#line 4354 "PhotoPage.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 4470 "PhotoPage.c"
+#line 4361 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) {
 #line 431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_viewport_resized ((EditingHostPage*) self);
-#line 4477 "PhotoPage.c"
+#line 4368 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
-#line 441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 4484 "PhotoPage.c"
+#line 4375 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
 #line 449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_crop_toggled ((EditingHostPage*) self);
-#line 4491 "PhotoPage.c"
+#line 4382 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
-#line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_straighten_toggled ((EditingHostPage*) self);
-#line 4498 "PhotoPage.c"
+#line 4389 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
-#line 465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_redeye_toggled ((EditingHostPage*) self);
-#line 4505 "PhotoPage.c"
+#line 4396 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
-#line 474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_toggled ((EditingHostPage*) self);
-#line 4512 "PhotoPage.c"
+#line 4403 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
-#line 482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 4519 "PhotoPage.c"
+#line 4410 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_out_pressed ((EditingHostPage*) self, event);
-#line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4528 "PhotoPage.c"
+#line 4419 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_zoom_slider_value_changed ((EditingHostPage*) self);
-#line 4535 "PhotoPage.c"
+#line 4426 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_slider_drag_begin ((EditingHostPage*) self, event);
-#line 510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4544 "PhotoPage.c"
+#line 4435 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_slider_drag_end ((EditingHostPage*) self, event);
-#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4553 "PhotoPage.c"
+#line 4444 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_slider_key_press ((EditingHostPage*) self, event);
-#line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4562 "PhotoPage.c"
+#line 4453 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_in_pressed ((EditingHostPage*) self, event);
-#line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4571 "PhotoPage.c"
+#line 4462 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
-#line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 4578 "PhotoPage.c"
+#line 4469 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
-#line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 4585 "PhotoPage.c"
+#line 4476 "PhotoPage.c"
 }
 
 
@@ -4608,7 +4499,7 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	GtkToolButton* _tmp13_ = NULL;
 	GtkToolButton* _tmp14_ = NULL;
 	GtkToolButton* _tmp15_ = NULL;
-	GtkToolButton* _tmp16_ = NULL;
+	GtkToggleToolButton* _tmp16_ = NULL;
 	GtkToggleToolButton* _tmp17_ = NULL;
 	GtkToggleToolButton* _tmp18_ = NULL;
 	GtkToggleToolButton* _tmp19_ = NULL;
@@ -4634,52 +4525,54 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	GtkToggleToolButton* _tmp39_ = NULL;
 	GtkToggleToolButton* _tmp40_ = NULL;
 	GtkToggleToolButton* _tmp41_ = NULL;
-	GtkToolButton* _tmp42_ = NULL;
-	GtkToolButton* _tmp43_ = NULL;
+	GtkToggleToolButton* _tmp42_ = NULL;
+	GtkToggleToolButton* _tmp43_ = NULL;
 	GtkToolButton* _tmp44_ = NULL;
 	GtkToolButton* _tmp45_ = NULL;
 	GtkToolButton* _tmp46_ = NULL;
 	GtkToolButton* _tmp47_ = NULL;
+	GtkToolButton* _tmp48_ = NULL;
+	GtkToolButton* _tmp49_ = NULL;
 	GtkSeparatorToolItem* separator = NULL;
-	GtkSeparatorToolItem* _tmp48_ = NULL;
+	GtkSeparatorToolItem* _tmp50_ = NULL;
 	GtkBox* zoom_group = NULL;
-	GtkBox* _tmp49_ = NULL;
+	GtkBox* _tmp51_ = NULL;
 	GtkImage* zoom_out = NULL;
-	GdkPixbuf* _tmp50_ = NULL;
-	GdkPixbuf* _tmp51_ = NULL;
-	GtkImage* _tmp52_ = NULL;
-	GtkImage* _tmp53_ = NULL;
+	GdkPixbuf* _tmp52_ = NULL;
+	GdkPixbuf* _tmp53_ = NULL;
+	GtkImage* _tmp54_ = NULL;
+	GtkImage* _tmp55_ = NULL;
 	GtkEventBox* zoom_out_box = NULL;
-	GtkEventBox* _tmp54_ = NULL;
-	GtkAdjustment* _tmp55_ = NULL;
-	GtkAdjustment* _tmp56_ = NULL;
-	GtkScale* _tmp57_ = NULL;
-	GtkScale* _tmp58_ = NULL;
+	GtkEventBox* _tmp56_ = NULL;
+	GtkAdjustment* _tmp57_ = NULL;
+	GtkAdjustment* _tmp58_ = NULL;
 	GtkScale* _tmp59_ = NULL;
 	GtkScale* _tmp60_ = NULL;
 	GtkScale* _tmp61_ = NULL;
 	GtkScale* _tmp62_ = NULL;
 	GtkScale* _tmp63_ = NULL;
 	GtkScale* _tmp64_ = NULL;
+	GtkScale* _tmp65_ = NULL;
+	GtkScale* _tmp66_ = NULL;
 	GtkImage* zoom_in = NULL;
-	GdkPixbuf* _tmp65_ = NULL;
-	GdkPixbuf* _tmp66_ = NULL;
-	GtkImage* _tmp67_ = NULL;
-	GtkImage* _tmp68_ = NULL;
+	GdkPixbuf* _tmp67_ = NULL;
+	GdkPixbuf* _tmp68_ = NULL;
+	GtkImage* _tmp69_ = NULL;
+	GtkImage* _tmp70_ = NULL;
 	GtkEventBox* zoom_in_box = NULL;
-	GtkEventBox* _tmp69_ = NULL;
+	GtkEventBox* _tmp71_ = NULL;
 	GtkToolItem* group_wrapper = NULL;
-	GtkToolItem* _tmp70_ = NULL;
-	GtkToolButton* _tmp71_ = NULL;
-	const gchar* _tmp72_ = NULL;
+	GtkToolItem* _tmp72_ = NULL;
 	GtkToolButton* _tmp73_ = NULL;
-	GtkToolButton* _tmp74_ = NULL;
+	const gchar* _tmp74_ = NULL;
 	GtkToolButton* _tmp75_ = NULL;
 	GtkToolButton* _tmp76_ = NULL;
-	const gchar* _tmp77_ = NULL;
+	GtkToolButton* _tmp77_ = NULL;
 	GtkToolButton* _tmp78_ = NULL;
-	GtkToolButton* _tmp79_ = NULL;
+	const gchar* _tmp79_ = NULL;
 	GtkToolButton* _tmp80_ = NULL;
+	GtkToolButton* _tmp81_ = NULL;
+	GtkToolButton* _tmp82_ = NULL;
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4725,7 +4618,7 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 #line 434 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	toolbar = _tmp9_;
 #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = (GtkToolButton*) gtk_tool_button_new_from_stock ("");
+	_tmp10_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ROTATE_CW_LABEL);
 #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp10_);
 #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4739,31 +4632,31 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 #line 439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = self->priv->rotate_button;
 #line 439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (_tmp12_, RESOURCES_ROTATE_CW_LABEL);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP);
 #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = self->priv->rotate_button;
 #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP);
+	g_signal_connect_object (_tmp13_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0);
 #line 441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = self->priv->rotate_button;
 #line 441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp14_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0);
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = self->priv->rotate_button;
 #line 442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
-#line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = self->priv->rotate_button;
-#line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new_from_stock (RESOURCES_CROP);
-#line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp17_);
-#line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp16_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp16_);
+#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->crop_button);
+#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->crop_button = _tmp16_;
 #line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->crop_button = _tmp17_;
+	_tmp17_ = self->priv->crop_button;
+#line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_button_get_type (), GtkToolButton), "crop");
 #line 447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->crop_button;
 #line 447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4785,7 +4678,7 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 #line 451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new_from_stock (RESOURCES_STRAIGHTEN);
+	_tmp23_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp23_);
 #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4795,279 +4688,287 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 #line 455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = self->priv->straighten_button;
 #line 455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_STRAIGHTEN_LABEL);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_button_get_type (), GtkToolButton), "straighten");
 #line 456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = self->priv->straighten_button;
 #line 456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_STRAIGHTEN_TOOLTIP);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_STRAIGHTEN_LABEL);
 #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = self->priv->straighten_button;
 #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp26_, "toggled", (GCallback) _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_STRAIGHTEN_TOOLTIP);
 #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->straighten_button;
 #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	g_signal_connect_object (_tmp27_, "toggled", (GCallback) _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled, self, 0);
 #line 459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->straighten_button;
 #line 459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp29_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new_from_stock (RESOURCES_REDEYE);
-#line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp29_);
-#line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->redeye_button);
-#line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->redeye_button = _tmp29_;
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+#line 460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp29_ = self->priv->straighten_button;
+#line 460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp30_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_ = self->priv->redeye_button;
+	g_object_ref_sink (_tmp30_);
+#line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (self->priv->redeye_button);
 #line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_RED_EYE_LABEL);
+	self->priv->redeye_button = _tmp30_;
 #line 464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp31_ = self->priv->redeye_button;
 #line 464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_RED_EYE_TOOLTIP);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_button_get_type (), GtkToolButton), "redeye");
 #line 465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp32_ = self->priv->redeye_button;
 #line 465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp32_, "toggled", (GCallback) _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_RED_EYE_LABEL);
 #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp33_ = self->priv->redeye_button;
 #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_RED_EYE_TOOLTIP);
 #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp34_ = self->priv->redeye_button;
 #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
-#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp35_);
-#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->adjust_button);
-#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->adjust_button = _tmp35_;
-#line 471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp36_ = self->priv->adjust_button;
-#line 471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST);
+	g_signal_connect_object (_tmp34_, "toggled", (GCallback) _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled, self, 0);
+#line 468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp35_ = self->priv->redeye_button;
+#line 468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+#line 469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp36_ = self->priv->redeye_button;
+#line 469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp37_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp37_ = self->priv->adjust_button;
+	g_object_ref_sink (_tmp37_);
+#line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (self->priv->adjust_button);
 #line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST_LABEL);
+	self->priv->adjust_button = _tmp37_;
 #line 473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp38_ = self->priv->adjust_button;
 #line 473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ADJUST_TOOLTIP);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST);
 #line 474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp39_ = self->priv->adjust_button;
 #line 474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp39_, "toggled", (GCallback) _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST_LABEL);
 #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp40_ = self->priv->adjust_button;
 #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ADJUST_TOOLTIP);
 #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp41_ = self->priv->adjust_button;
 #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp42_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ENHANCE_LABEL);
-#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp42_);
-#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->enhance_button);
-#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->enhance_button = _tmp42_;
-#line 480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp43_ = self->priv->enhance_button;
-#line 480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp43_, RESOURCES_ENHANCE);
+	g_signal_connect_object (_tmp41_, "toggled", (GCallback) _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled, self, 0);
+#line 477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp42_ = self->priv->adjust_button;
+#line 477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+#line 478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp43_ = self->priv->adjust_button;
+#line 478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp44_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ENHANCE_LABEL);
 #line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp44_ = self->priv->enhance_button;
+	g_object_ref_sink (_tmp44_);
 #line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ENHANCE_TOOLTIP);
+	_g_object_unref0 (self->priv->enhance_button);
+#line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->enhance_button = _tmp44_;
 #line 482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp45_ = self->priv->enhance_button;
 #line 482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp45_, "clicked", (GCallback) _editing_host_page_on_enhance_gtk_tool_button_clicked, self, 0);
+	gtk_tool_button_set_icon_name (_tmp45_, RESOURCES_ENHANCE);
 #line 483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = self->priv->enhance_button;
 #line 483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ENHANCE_TOOLTIP);
 #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp47_ = self->priv->enhance_button;
 #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp48_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp48_);
-#line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	separator = _tmp48_;
-#line 488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	g_signal_connect_object (_tmp47_, "clicked", (GCallback) _editing_host_page_on_enhance_gtk_tool_button_clicked, self, 0);
+#line 485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp48_ = self->priv->enhance_button;
+#line 485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+#line 486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp49_ = self->priv->enhance_button;
+#line 486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_separator_tool_item_set_draw (separator, FALSE);
+	_tmp50_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+#line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp50_);
+#line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	separator = _tmp50_;
 #line 490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp49_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-#line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp49_);
+	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+#line 491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_separator_tool_item_set_draw (separator, FALSE);
 #line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_group = _tmp49_;
-#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp50_ = resources_load_icon (RESOURCES_ICON_ZOOM_OUT, RESOURCES_ICON_ZOOM_SCALE);
-#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp51_ = _tmp50_;
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp52_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp51_);
+	_tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 #line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp52_);
+	g_object_ref_sink (_tmp51_);
 #line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_group = _tmp51_;
+#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp52_ = resources_load_icon (RESOURCES_ICON_ZOOM_OUT, RESOURCES_ICON_ZOOM_SCALE);
+#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp53_ = _tmp52_;
-#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp51_);
-#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_out = _tmp53_;
 #line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp54_ = (GtkEventBox*) gtk_event_box_new ();
+	_tmp54_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp53_);
 #line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp54_);
 #line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_out_box = _tmp54_;
-#line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_event_box_set_above_child (zoom_out_box, TRUE);
+	_tmp55_ = _tmp54_;
+#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp53_);
+#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_out = _tmp55_;
 #line 498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_event_box_set_visible_window (zoom_out_box, FALSE);
+	_tmp56_ = (GtkEventBox*) gtk_event_box_new ();
+#line 498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp56_);
+#line 498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_out_box = _tmp56_;
 #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_out, gtk_widget_get_type (), GtkWidget));
+	gtk_event_box_set_above_child (zoom_out_box, TRUE);
+#line 500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_event_box_set_visible_window (zoom_out_box, FALSE);
 #line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event, self, 0);
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_out, gtk_widget_get_type (), GtkWidget));
 #line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event, self, 0);
+#line 505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp55_ = gtk_adjustment_new (0.0, 0.0, 1.1, 0.1, 0.1, 0.1);
-#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp55_);
-#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp56_ = _tmp55_;
-#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp57_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp56_);
-#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp57_ = gtk_adjustment_new (0.0, 0.0, 1.1, 0.1, 0.1, 0.1);
+#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp57_);
-#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp58_ = _tmp57_;
+#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp59_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp58_);
+#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp59_);
+#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->zoom_slider);
-#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->zoom_slider = _tmp57_;
-#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp56_);
-#line 507 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp58_ = self->priv->zoom_slider;
-#line 507 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_scale_set_draw_value (_tmp58_, FALSE);
 #line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp59_ = self->priv->zoom_slider;
+	self->priv->zoom_slider = _tmp59_;
 #line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), 120, -1);
+	_g_object_unref0 (_tmp58_);
 #line 509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp60_ = self->priv->zoom_slider;
 #line 509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
+	gtk_scale_set_draw_value (_tmp60_, FALSE);
 #line 510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp61_ = self->priv->zoom_slider;
 #line 510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event, self, 0);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), 120, -1);
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp62_ = self->priv->zoom_slider;
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
 #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp63_ = self->priv->zoom_slider;
 #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event, self, 0);
-#line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event, self, 0);
+#line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp64_ = self->priv->zoom_slider;
+#line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event, self, 0);
 #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp65_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE);
-#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp66_ = _tmp65_;
-#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp67_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp66_);
+	_tmp65_ = self->priv->zoom_slider;
+#line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event, self, 0);
 #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp67_);
+	_tmp66_ = self->priv->zoom_slider;
 #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp67_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE);
+#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp68_ = _tmp67_;
-#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp66_);
-#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_in = _tmp68_;
 #line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp69_ = (GtkEventBox*) gtk_event_box_new ();
+	_tmp69_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp68_);
 #line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp69_);
 #line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_in_box = _tmp69_;
-#line 519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_event_box_set_above_child (zoom_in_box, TRUE);
+	_tmp70_ = _tmp69_;
+#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp68_);
+#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_in = _tmp70_;
 #line 520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_event_box_set_visible_window (zoom_in_box, FALSE);
+	_tmp71_ = (GtkEventBox*) gtk_event_box_new ();
+#line 520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp71_);
+#line 520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_in_box = _tmp71_;
 #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_in, gtk_widget_get_type (), GtkWidget));
+	gtk_event_box_set_above_child (zoom_in_box, TRUE);
+#line 522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_event_box_set_visible_window (zoom_in_box, FALSE);
 #line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event, self, 0);
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_in, gtk_widget_get_type (), GtkWidget));
 #line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp70_ = gtk_tool_item_new ();
-#line 527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp70_);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event, self, 0);
 #line 527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	group_wrapper = _tmp70_;
-#line 528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (group_wrapper, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_group, gtk_widget_get_type (), GtkWidget));
+	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp72_ = gtk_tool_item_new ();
+#line 529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp72_);
+#line 529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	group_wrapper = _tmp72_;
 #line 530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (group_wrapper, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_group, gtk_widget_get_type (), GtkWidget));
+#line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toolbar_insert (toolbar, group_wrapper, -1);
-#line 533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp71_ = self->priv->prev_button;
-#line 533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp72_ = _ ("Previous photo");
-#line 533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_tool_item_get_type (), GtkToolItem), _tmp72_);
-#line 534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp73_ = self->priv->prev_button;
-#line 534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp73_, "go-previous");
 #line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp74_ = self->priv->prev_button;
+	_tmp74_ = _ ("Previous photo");
 #line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp74_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_tool_item_get_type (), GtkToolItem), _tmp74_);
 #line 536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp75_ = self->priv->prev_button;
 #line 536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp76_ = self->priv->next_button;
-#line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp77_ = _ ("Next photo");
-#line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), _tmp77_);
-#line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_button_set_icon_name (_tmp75_, "go-previous");
+#line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp76_ = self->priv->prev_button;
+#line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp76_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
+#line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp77_ = self->priv->prev_button;
+#line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp78_ = self->priv->next_button;
-#line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp78_, "go-next");
 #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp79_ = self->priv->next_button;
+	_tmp79_ = _ ("Next photo");
 #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp79_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_tool_item_get_type (), GtkToolItem), _tmp79_);
 #line 542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp80_ = self->priv->next_button;
 #line 542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_tool_button_set_icon_name (_tmp80_, "go-next");
+#line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp81_ = self->priv->next_button;
+#line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp81_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
+#line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp82_ = self->priv->next_button;
+#line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (group_wrapper);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5086,7 +4987,7 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	_g_object_unref0 (toolbar);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 5086 "PhotoPage.c"
+#line 4987 "PhotoPage.c"
 }
 
 
@@ -5096,63 +4997,63 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 	GtkScale* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
 	gboolean _tmp3_ = FALSE;
-#line 552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
-#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_state_init_rescale (&new_zoom_state, &_tmp0_, _tmp2_);
 #line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_state_init_rescale (&new_zoom_state, &_tmp0_, _tmp2_);
+#line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->enable_interactive_zoom_refresh;
-#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 5110 "PhotoPage.c"
+#line 5011 "PhotoPage.c"
 		ZoomState _tmp4_ = {0};
 		gboolean _tmp5_ = FALSE;
-#line 556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = new_zoom_state;
-#line 556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_on_interactive_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_);
 #line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		single_photo_page_on_interactive_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_);
+#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = zoom_state_is_default (&new_zoom_state);
-#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 5121 "PhotoPage.c"
+#line 5022 "PhotoPage.c"
 			ZoomState _tmp6_ = {0};
-#line 559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = new_zoom_state;
-#line 559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_);
-#line 5127 "PhotoPage.c"
+#line 5028 "PhotoPage.c"
 		}
 	} else {
 		gboolean _tmp7_ = FALSE;
-#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = zoom_state_is_default (&new_zoom_state);
-#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp7_) {
-#line 562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 5137 "PhotoPage.c"
+#line 5038 "PhotoPage.c"
 		} else {
 			ZoomState _tmp8_ = {0};
-#line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = new_zoom_state;
-#line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 5144 "PhotoPage.c"
+#line 5045 "PhotoPage.c"
 		}
-#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 5148 "PhotoPage.c"
+#line 5049 "PhotoPage.c"
 	}
-#line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5152 "PhotoPage.c"
+#line 5053 "PhotoPage.c"
 }
 
 
@@ -5161,40 +5062,40 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 573 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->enable_interactive_zoom_refresh = TRUE;
 #line 575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->enable_interactive_zoom_refresh = TRUE;
+#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW);
-#line 575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5177 "PhotoPage.c"
+#line 5078 "PhotoPage.c"
 		GtkWindow* _tmp3_ = NULL;
 		FullscreenWindow* _tmp4_ = NULL;
-#line 576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_disable_toolbar_dismissal (_tmp4_);
-#line 576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5188 "PhotoPage.c"
+#line 5089 "PhotoPage.c"
 	}
-#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5194 "PhotoPage.c"
+#line 5095 "PhotoPage.c"
 }
 
 
@@ -5208,86 +5109,86 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	GtkScale* _tmp6_ = NULL;
 	gdouble _tmp7_ = 0.0;
 	ZoomState _tmp8_ = {0};
-#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->enable_interactive_zoom_refresh = FALSE;
 #line 584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->enable_interactive_zoom_refresh = FALSE;
+#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW);
-#line 584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5224 "PhotoPage.c"
+#line 5125 "PhotoPage.c"
 		GtkWindow* _tmp3_ = NULL;
 		FullscreenWindow* _tmp4_ = NULL;
-#line 585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_update_toolbar_dismissal (_tmp4_);
-#line 585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5235 "PhotoPage.c"
+#line 5136 "PhotoPage.c"
 	}
-#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->zoom_slider;
-#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange));
-#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_rescale (&zoom_state, &_tmp5_, _tmp7_);
-#line 588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = zoom_state;
-#line 588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
 #line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
+	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
 #line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
+#line 594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5255 "PhotoPage.c"
+#line 5156 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_min (self);
-#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5271 "PhotoPage.c"
+#line 5172 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_max (self);
-#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5287 "PhotoPage.c"
+#line 5188 "PhotoPage.c"
 }
 
 
@@ -5321,85 +5222,85 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd
 	GdkRectangle _tmp23_ = {0};
 	gint _tmp24_ = 0;
 	gint _tmp25_ = 0;
-#line 605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
-#line 606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_.x = 0;
-#line 606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_canvas = _tmp0_;
-#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_->x;
-#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_canvas.x = (gint) _tmp2_;
-#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = event;
-#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_->y;
-#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	cursor_wrt_canvas.y = (gint) _tmp4_;
 #line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	cursor_wrt_canvas.y = (gint) _tmp4_;
+#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewing_rectangle_wrt_screen (&_tmp5_, &_tmp6_);
-#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_wrt_canvas = _tmp6_;
-#line 611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_.x = 0;
-#line 611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_ = _tmp7_;
-#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = cursor_wrt_canvas;
-#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_.x;
-#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = viewport_wrt_canvas;
-#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = _tmp10_.x;
-#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_.x = _tmp9_ - _tmp11_;
-#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _result_;
-#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_.x;
-#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = viewport_wrt_canvas;
-#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = _tmp14_.width;
-#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = CLAMP (_tmp13_, 0, _tmp15_);
-#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_.x = _tmp16_;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = cursor_wrt_canvas;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = _tmp17_.y;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = viewport_wrt_canvas;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = _tmp19_.y;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_.y = _tmp18_ - _tmp20_;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = _result_;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = _tmp21_.y;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = viewport_wrt_canvas;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = _tmp23_.height;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = CLAMP (_tmp22_, 0, _tmp24_);
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_result_.y = _tmp25_;
 #line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_result_.y = _tmp25_;
+#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	*result = _result_;
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5399 "PhotoPage.c"
+#line 5300 "PhotoPage.c"
 }
 
 
@@ -5419,49 +5320,49 @@ static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* s
 	GdkPoint _tmp9_ = {0};
 	GdkPoint _tmp10_ = {0};
 	GdkPoint _tmp11_ = {0};
-#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
-#line 621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_get_cursor_wrt_viewport (self, _tmp0_, &_tmp1_);
-#line 621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_viewport = _tmp1_;
-#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_);
-#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewing_rectangle_wrt_screen (&_tmp2_, &_tmp3_);
-#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	viewport_wrt_canvas = _tmp3_;
 #line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	viewport_wrt_canvas = _tmp3_;
+#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_.x = 0;
-#line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_center = _tmp4_;
-#line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = viewport_wrt_canvas;
-#line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_.width;
-#line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_center.x = _tmp6_ / 2;
-#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = viewport_wrt_canvas;
-#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_.height;
-#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	viewport_center.y = _tmp8_ / 2;
 #line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	viewport_center.y = _tmp8_ / 2;
+#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = cursor_wrt_viewport;
-#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = viewport_center;
-#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	subtract_points (&_tmp9_, &_tmp10_, &_tmp11_);
-#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	*result = _tmp11_;
-#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5461 "PhotoPage.c"
+#line 5362 "PhotoPage.c"
 }
 
 
@@ -5481,45 +5382,45 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
 	GdkPoint _tmp10_ = {0};
 	GdkPoint _tmp11_ = {0};
 	GdkPoint _tmp12_ = {0};
-#line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
-#line 632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewport_center (&_tmp0_, &_tmp1_);
-#line 632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_);
-#line 632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = zoom_state_get_zoom_factor (&_tmp2_);
-#line 632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale_point (&_tmp1_, 1.0 / _tmp3_, &_tmp4_);
-#line 632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_center_iso = _tmp4_;
-#line 635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
-#line 635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_get_cursor_wrt_viewport_center (self, _tmp5_, &_tmp6_);
-#line 635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp7_);
-#line 635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = zoom_state_get_zoom_factor (&_tmp7_);
-#line 635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale_point (&_tmp6_, 1.0 / _tmp8_, &_tmp9_);
-#line 635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_center_iso = _tmp9_;
-#line 638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = viewport_center_iso;
-#line 638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = cursor_wrt_center_iso;
-#line 638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	add_points (&_tmp10_, &_tmp11_, &_tmp12_);
-#line 638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	*result = _tmp12_;
-#line 638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5519 "PhotoPage.c"
+#line 5420 "PhotoPage.c"
 }
 
 
@@ -5527,33 +5428,33 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 	gdouble result = 0.0;
 	gdouble _tmp0_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0);
-#line 642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = interp;
-#line 642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ < 0.03) {
-#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		interp = 0.0;
-#line 5535 "PhotoPage.c"
+#line 5436 "PhotoPage.c"
 	} else {
 		gdouble _tmp1_ = 0.0;
-#line 644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = interp;
-#line 644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp1_ > 0.97) {
-#line 645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			interp = 1.0;
-#line 5544 "PhotoPage.c"
+#line 5445 "PhotoPage.c"
 		}
 	}
-#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = interp;
-#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5553 "PhotoPage.c"
+#line 5454 "PhotoPage.c"
 }
 
 
@@ -5563,21 +5464,21 @@ static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* s
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	gdouble _tmp3_ = 0.0;
-#line 650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0);
-#line 651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = zoom_state_get_interpolation_factor (&_tmp0_);
-#line 651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = adjustment;
-#line 651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_snap_interpolation_factor (self, _tmp1_ + _tmp2_);
-#line 651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp3_;
-#line 651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5577 "PhotoPage.c"
+#line 5478 "PhotoPage.c"
 }
 
 
@@ -5612,127 +5513,127 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 	ZoomState _tmp21_ = {0};
 	GdkPoint _tmp22_ = {0};
 	ZoomState _tmp23_ = {0};
-#line 654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
-#line 655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5622 "PhotoPage.c"
+#line 5523 "PhotoPage.c"
 	}
-#line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_get_cursor_wrt_viewport_center (self, _tmp1_, &_tmp2_);
-#line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_viewport_center = _tmp2_;
-#line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = event;
-#line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_get_iso_pixel_under_cursor (self, _tmp3_, &_tmp4_);
-#line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	iso_pixel_under_cursor = _tmp4_;
 #line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	iso_pixel_under_cursor = _tmp4_;
+#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = zoom_increment;
-#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = editing_host_page_adjust_interpolation_factor (self, _tmp5_);
-#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	interp = _tmp6_;
-#line 662 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->zoom_slider;
-#line 662 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp8_, NULL, FALSE);
-#line 662 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
-#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = self->priv->zoom_slider;
-#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = interp;
-#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp10_);
-#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = self->priv->zoom_slider;
-#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
 #line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
+#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp12_);
-#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = interp;
-#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_state_init_rescale (&new_zoom_state, &_tmp12_, _tmp13_);
 #line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_state_init_rescale (&new_zoom_state, &_tmp12_, _tmp13_);
+#line 670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = zoom_state_is_min (&new_zoom_state);
-#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_update_cursor_for_zoom_context (self);
-#line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5676 "PhotoPage.c"
+#line 5577 "PhotoPage.c"
 	}
-#line 675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = iso_pixel_under_cursor;
-#line 675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = zoom_state_get_zoom_factor (&new_zoom_state);
-#line 675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale_point (&_tmp15_, _tmp16_, &_tmp17_);
-#line 675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	new_zoomed_old_cursor = _tmp17_;
 #line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	new_zoomed_old_cursor = _tmp17_;
+#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = new_zoomed_old_cursor;
-#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = cursor_wrt_viewport_center;
-#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	subtract_points (&_tmp18_, &_tmp19_, &_tmp20_);
-#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	desired_new_viewport_center = _tmp20_;
-#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = new_zoom_state;
-#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = desired_new_viewport_center;
-#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_state_init_pan (&new_zoom_state, &_tmp21_, &_tmp22_);
 #line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_state_init_pan (&new_zoom_state, &_tmp21_, &_tmp22_);
+#line 684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = new_zoom_state;
-#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp23_);
-#line 683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
 #line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
+#line 687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5708 "PhotoPage.c"
+#line 5609 "PhotoPage.c"
 }
 
 
 void editing_host_page_snap_zoom_to_min (EditingHostPage* self) {
 	GtkScale* _tmp0_ = NULL;
-#line 688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 689 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 689 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0);
-#line 5720 "PhotoPage.c"
+#line 5621 "PhotoPage.c"
 }
 
 
 void editing_host_page_snap_zoom_to_max (EditingHostPage* self) {
 	GtkScale* _tmp0_ = NULL;
-#line 692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 1.0);
-#line 5732 "PhotoPage.c"
+#line 5633 "PhotoPage.c"
 }
 
 
@@ -5741,19 +5642,19 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) {
 	ZoomState _tmp0_ = {0};
 	GtkScale* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
-#line 696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_rescale_to_isomorphic (&iso_state, &_tmp0_);
-#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
-#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_get_interpolation_factor (&iso_state);
-#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), _tmp2_);
-#line 5753 "PhotoPage.c"
+#line 5654 "PhotoPage.c"
 }
 
 
@@ -5764,154 +5665,154 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label4 = 0;
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label5 = 0;
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label6 = 0;
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label7 = 0;
-#line 701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) {
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5796 "PhotoPage.c"
+#line 5697 "PhotoPage.c"
 			default:
 			{
-#line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
-#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = TRUE;
-#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5805 "PhotoPage.c"
+#line 5706 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) {
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5811 "PhotoPage.c"
+#line 5712 "PhotoPage.c"
 			default:
 			{
-#line 712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
-#line 713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = TRUE;
-#line 713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5820 "PhotoPage.c"
+#line 5721 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("KP_Divide")))) {
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5826 "PhotoPage.c"
+#line 5727 "PhotoPage.c"
 			default:
 			{
-#line 716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100");
-#line 717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = TRUE;
-#line 717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5835 "PhotoPage.c"
+#line 5736 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Multiply")))) {
-#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5841 "PhotoPage.c"
+#line 5742 "PhotoPage.c"
 			default:
 			{
-#line 720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit");
-#line 721 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = TRUE;
-#line 721 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5850 "PhotoPage.c"
+#line 5751 "PhotoPage.c"
 			}
 		}
 	}
-#line 724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5858 "PhotoPage.c"
+#line 5759 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event) {
-#line 701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event);
-#line 5867 "PhotoPage.c"
+#line 5768 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_increase_size (EditingHostPage* self) {
 	GtkScale* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5880 "PhotoPage.c"
+#line 5781 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_increase_size (EditingHostPage* self) {
-#line 727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 5889 "PhotoPage.c"
+#line 5790 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_decrease_size (EditingHostPage* self) {
 	GtkScale* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5902 "PhotoPage.c"
+#line 5803 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_decrease_size (EditingHostPage* self) {
-#line 731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 5911 "PhotoPage.c"
+#line 5812 "PhotoPage.c"
 }
 
 
@@ -5919,17 +5820,17 @@ static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) {
 	EditingHostPage * self;
 	GtkScale* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
-#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->saved_slider_val = _tmp1_;
-#line 5929 "PhotoPage.c"
+#line 5830 "PhotoPage.c"
 }
 
 
@@ -5938,17 +5839,17 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base
 	ZoomBuffer* result = NULL;
 	ZoomBuffer* _tmp0_ = NULL;
 	ZoomBuffer* _tmp1_ = NULL;
-#line 740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_buffer;
-#line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5948 "PhotoPage.c"
+#line 5849 "PhotoPage.c"
 }
 
 
@@ -5959,47 +5860,47 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 	ZoomState _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	GdkEventScroll* _tmp5_ = NULL;
-#line 744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5971 "PhotoPage.c"
+#line 5872 "PhotoPage.c"
 	} else {
 		GtkScale* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->zoom_slider;
-#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5981 "PhotoPage.c"
+#line 5882 "PhotoPage.c"
 	}
-#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5989 "PhotoPage.c"
+#line 5890 "PhotoPage.c"
 	}
-#line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
-#line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_zoom_about_event_cursor_point (self, _tmp5_, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5999 "PhotoPage.c"
+#line 5900 "PhotoPage.c"
 }
 
 
@@ -6010,47 +5911,47 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 	ZoomState _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	GdkEventScroll* _tmp5_ = NULL;
-#line 752 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 752 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_is_min (&_tmp1_);
-#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 6022 "PhotoPage.c"
+#line 5923 "PhotoPage.c"
 	} else {
 		GtkScale* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->zoom_slider;
-#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 6032 "PhotoPage.c"
+#line 5933 "PhotoPage.c"
 	}
-#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 6040 "PhotoPage.c"
+#line 5941 "PhotoPage.c"
 	}
-#line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
-#line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_zoom_about_event_cursor_point (self, _tmp5_, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6050 "PhotoPage.c"
+#line 5951 "PhotoPage.c"
 }
 
 
@@ -6061,40 +5962,40 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) {
 	GtkScale* _tmp2_ = NULL;
 	gdouble _tmp3_ = 0.0;
 	GtkScale* _tmp4_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
+#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp1_, NULL, FALSE);
-#line 763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
-#line 764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->zoom_slider;
-#line 764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->saved_slider_val;
-#line 764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), _tmp3_);
-#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->zoom_slider;
-#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
-#line 6081 "PhotoPage.c"
+#line 5982 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-#line 768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 769 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 769 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6094 "PhotoPage.c"
+#line 5995 "PhotoPage.c"
 }
 
 
@@ -6102,27 +6003,27 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain
 	EditingHostPage * self;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = container;
-#line 773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
-#line 776 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = container;
-#line 776 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 6114 "PhotoPage.c"
+#line 6015 "PhotoPage.c"
 		DragAndDropHandler* _tmp2_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_drag_and_drop_handler_unref0 (self->priv->dnd_handler);
-#line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->dnd_handler = _tmp2_;
-#line 6122 "PhotoPage.c"
+#line 6023 "PhotoPage.c"
 	}
 }
 
@@ -6131,17 +6032,17 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) {
 	ViewCollection* result = NULL;
 	ViewCollection* _tmp0_ = NULL;
 	ViewCollection* _tmp1_ = NULL;
-#line 780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->parent_view;
-#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _data_collection_ref0 (_tmp0_);
-#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6141 "PhotoPage.c"
+#line 6042 "PhotoPage.c"
 }
 
 
@@ -6150,21 +6051,21 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) {
 	Photo* _tmp0_ = NULL;
 	Photo* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 784 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (self);
-#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_ != NULL;
-#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6164 "PhotoPage.c"
+#line 6065 "PhotoPage.c"
 }
 
 
@@ -6183,57 +6084,57 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
 	DataView* _tmp10_ = NULL;
 	DataSource* _tmp11_ = NULL;
 	Photo* _tmp12_ = NULL;
-#line 788 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
+#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 6201 "PhotoPage.c"
+#line 6102 "PhotoPage.c"
 	}
-#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp6_ == 1, "get_view().get_selected_count() == 1");
-#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = view_collection_get_selected_at (_tmp8_, 0);
-#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = data_view_get_source (_tmp10_);
-#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo);
-#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp12_;
-#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6233 "PhotoPage.c"
+#line 6134 "PhotoPage.c"
 }
 
 
@@ -6241,50 +6142,50 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
 	Photo* _tmp0_ = NULL;
 	PhotoFileFormat _tmp1_ = 0;
 	gboolean _tmp6_ = FALSE;
-#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (new_photo));
-#line 803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = new_photo;
-#line 803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo_get_file_format (_tmp0_);
-#line 803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
-#line 804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, FALSE);
-#line 6251 "PhotoPage.c"
+#line 6152 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = new_photo;
-#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = g_file_query_exists (_tmp4_, NULL);
-#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, !_tmp5_);
-#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6269 "PhotoPage.c"
+#line 6170 "PhotoPage.c"
 	}
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->photo_missing;
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_ui (self, _tmp6_);
-#line 6275 "PhotoPage.c"
+#line 6176 "PhotoPage.c"
 }
 
 
 void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo) {
-#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo);
-#line 6284 "PhotoPage.c"
+#line 6185 "PhotoPage.c"
 }
 
 
@@ -6313,148 +6214,148 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 	ViewCollection* _tmp19_ = NULL;
 	Marker* _tmp20_ = NULL;
 	ViewCollection* _tmp21_ = NULL;
-#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp1_, NULL, FALSE);
-#line 812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
-#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->zoom_slider;
-#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), 0.0);
-#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->zoom_slider;
-#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
 #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
+#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = photo;
-#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_photo_changing (self, _tmp4_);
-#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
-#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view = _tmp9_;
-#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = view;
-#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp10_ != NULL, "view != null");
-#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view_collection_unselect_all (_tmp12_);
-#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp12_);
-#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = view;
-#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject));
-#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	marker = _tmp17_;
-#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = marker;
-#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view_collection_select_marked (_tmp19_, _tmp20_);
-#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp19_);
-#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->parent_view;
-#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_ != NULL) {
-#line 6389 "PhotoPage.c"
+#line 6290 "PhotoPage.c"
 		ViewCollection* _tmp22_ = NULL;
 		DataView* view_in_parent = NULL;
 		ViewCollection* _tmp23_ = NULL;
 		Photo* _tmp24_ = NULL;
 		DataView* _tmp25_ = NULL;
 		DataView* _tmp26_ = NULL;
-#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = self->priv->parent_view;
-#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_collection_unselect_all (_tmp22_);
-#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = self->priv->parent_view;
-#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = photo;
-#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = view_collection_get_view_for_source_filtered (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_SOURCE, DataSource));
-#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_in_parent = _tmp25_;
-#line 830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = view_in_parent;
-#line 830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (NULL != _tmp26_) {
-#line 6412 "PhotoPage.c"
+#line 6313 "PhotoPage.c"
 			ViewCollection* _tmp27_ = NULL;
 			ViewCollection* _tmp28_ = NULL;
 			DataView* _tmp29_ = NULL;
 			Marker* _tmp30_ = NULL;
 			Marker* _tmp31_ = NULL;
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp27_ = self->priv->parent_view;
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp28_ = self->priv->parent_view;
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp29_ = view_in_parent;
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp30_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp31_ = _tmp30_;
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			view_collection_select_marked (_tmp27_, _tmp31_);
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp31_);
-#line 6432 "PhotoPage.c"
+#line 6333 "PhotoPage.c"
 		}
-#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (view_in_parent);
-#line 6436 "PhotoPage.c"
+#line 6337 "PhotoPage.c"
 	}
-#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (marker);
-#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (view);
-#line 6442 "PhotoPage.c"
+#line 6343 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_realize (GtkWidget* base) {
 	EditingHostPage * self;
-#line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	GTK_WIDGET_CLASS (editing_host_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget));
 #line 838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	GTK_WIDGET_CLASS (editing_host_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget));
+#line 840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "realize");
-#line 6454 "PhotoPage.c"
+#line 6355 "PhotoPage.c"
 }
 
 
@@ -6462,42 +6363,42 @@ static void editing_host_page_real_switched_to (Page* base) {
 	EditingHostPage * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (editing_host_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
 #line 844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	PAGE_CLASS (editing_host_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
+#line 846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "switched_to");
-#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (self);
-#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6472 "PhotoPage.c"
+#line 6373 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
-#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = self->priv->pixbuf_dirty;
-#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 6478 "PhotoPage.c"
+#line 6379 "PhotoPage.c"
 	} else {
-#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 6482 "PhotoPage.c"
+#line 6383 "PhotoPage.c"
 	}
-#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6486 "PhotoPage.c"
+#line 6387 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
-#line 848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (self);
-#line 848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_replace_photo (self, _tmp4_);
-#line 848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6497 "PhotoPage.c"
+#line 6398 "PhotoPage.c"
 	}
 }
 
@@ -6509,37 +6410,37 @@ static void editing_host_page_real_switching_from (Page* base) {
 	gboolean _tmp2_ = FALSE;
 	ViewCollection* _tmp13_ = NULL;
 	ViewCollection* _tmp14_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (editing_host_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
 #line 854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	PAGE_CLASS (editing_host_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
+#line 856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->is_pan_in_progress = FALSE;
 #line 857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->is_pan_in_progress = FALSE;
+#line 859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
-#line 864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 6525 "PhotoPage.c"
+#line 6426 "PhotoPage.c"
 		ViewCollection* _tmp3_ = NULL;
-#line 864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->parent_view;
-#line 864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6531 "PhotoPage.c"
+#line 6432 "PhotoPage.c"
 	} else {
-#line 864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6535 "PhotoPage.c"
+#line 6436 "PhotoPage.c"
 	}
-#line 864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6539 "PhotoPage.c"
+#line 6440 "PhotoPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -6549,54 +6450,54 @@ static void editing_host_page_real_switching_from (Page* base) {
 		DataView* _tmp10_ = NULL;
 		Marker* _tmp11_ = NULL;
 		Marker* _tmp12_ = NULL;
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = self->priv->parent_view;
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = self->priv->parent_view;
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = self->priv->parent_view;
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (self);
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource));
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_collection_select_marked (_tmp4_, _tmp12_);
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 6575 "PhotoPage.c"
+#line 6476 "PhotoPage.c"
 	}
-#line 868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->parent_view);
-#line 868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->parent_view = NULL;
-#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 6589 "PhotoPage.c"
+#line 6490 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) {
-#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_selection_changed ((EditingHostPage*) self, selected);
-#line 6596 "PhotoPage.c"
+#line 6497 "PhotoPage.c"
 }
 
 
@@ -6608,51 +6509,51 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre
 	FullscreenWindow* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = fsw;
-#line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (editing_host_page_parent_class)->switching_to_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
 #line 875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	PAGE_CLASS (editing_host_page_parent_class)->switching_to_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
+#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp1_, 0, 0);
-#line 875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
 #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
+#line 879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->is_pan_in_progress = FALSE;
 #line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->is_pan_in_progress = FALSE;
+#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = fsw;
-#line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow));
-#line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page = _tmp3_;
-#line 881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page;
-#line 881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 6634 "PhotoPage.c"
+#line 6535 "PhotoPage.c"
 		Page* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
-#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page;
-#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = page_get_view (_tmp5_);
-#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_connect_object (_tmp7_, "items-selected", (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self, 0);
-#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6648 "PhotoPage.c"
+#line 6549 "PhotoPage.c"
 	}
-#line 872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6652 "PhotoPage.c"
+#line 6553 "PhotoPage.c"
 }
 
 
@@ -6663,107 +6564,107 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc
 	FullscreenWindow* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
-#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = fsw;
-#line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (editing_host_page_parent_class)->returning_from_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
 #line 888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
+	PAGE_CLASS (editing_host_page_parent_class)->returning_from_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
 #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
+#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = fsw;
-#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow));
-#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page = _tmp2_;
-#line 891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = page;
-#line 891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6683 "PhotoPage.c"
+#line 6584 "PhotoPage.c"
 		Page* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		guint _tmp7_ = 0U;
-#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page;
-#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_view (_tmp4_);
-#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_parse_name ("items-selected", TYPE_VIEW_COLLECTION, &_tmp7_, NULL, FALSE);
-#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self);
-#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 6700 "PhotoPage.c"
+#line 6601 "PhotoPage.c"
 	}
-#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6704 "PhotoPage.c"
+#line 6605 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIterable* selected) {
-#line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (selected));
-#line 6713 "PhotoPage.c"
+#line 6614 "PhotoPage.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = selected;
-#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_view_it = _tmp1_;
-#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 6726 "PhotoPage.c"
+#line 6627 "PhotoPage.c"
 			gboolean _tmp2_ = FALSE;
 			DataView* view = NULL;
 			gpointer _tmp3_ = NULL;
 			DataView* _tmp4_ = NULL;
 			DataSource* _tmp5_ = NULL;
 			Photo* _tmp6_ = NULL;
-#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = gee_iterator_next (_view_it);
-#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp2_) {
-#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 6739 "PhotoPage.c"
+#line 6640 "PhotoPage.c"
 			}
-#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = gee_iterator_get (_view_it);
-#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			view = (DataView*) _tmp3_;
-#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = view;
-#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = data_view_get_source (_tmp4_);
-#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo);
-#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_replace_photo (self, _tmp6_);
-#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp6_);
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (view);
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 6759 "PhotoPage.c"
+#line 6660 "PhotoPage.c"
 		}
-#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_view_it);
-#line 6763 "PhotoPage.c"
+#line 6664 "PhotoPage.c"
 	}
 }
 
@@ -6771,31 +6672,31 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable) {
 	GtkToolButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->rotate_button;
-#line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = should_enable;
-#line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 6779 "PhotoPage.c"
+#line 6680 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self) {
-#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err);
-#line 6786 "PhotoPage.c"
+#line 6687 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter (Photo* photo, gpointer self) {
 	gboolean result;
 	result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo);
-#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6795 "PhotoPage.c"
+#line 6696 "PhotoPage.c"
 }
 
 
@@ -6816,118 +6717,118 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	Scaling _tmp19_ = {0};
 	PixbufCache* _tmp20_ = NULL;
 	const gchar* _tmp21_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (caller != NULL);
-#line 910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling = _tmp0_;
-#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->cache;
-#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 6828 "PhotoPage.c"
+#line 6729 "PhotoPage.c"
 		PixbufCache* _tmp3_ = NULL;
 		Scaling _tmp4_ = {0};
 		Scaling _tmp5_ = {0};
 		gboolean _tmp6_ = FALSE;
-#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->cache;
-#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_get_scaling (_tmp3_, &_tmp4_);
-#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = scaling;
-#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = scaling_equals (&_tmp4_, &_tmp5_);
-#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp6_;
-#line 6843 "PhotoPage.c"
+#line 6744 "PhotoPage.c"
 	} else {
-#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6847 "PhotoPage.c"
+#line 6748 "PhotoPage.c"
 	}
-#line 913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6853 "PhotoPage.c"
+#line 6754 "PhotoPage.c"
 	}
-#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = caller;
-#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = scaling_to_string (&scaling);
-#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_debug ("PhotoPage.vala:916: Rebuild pixbuf caches: %s (%s)", _tmp7_, _tmp9_);
-#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_debug ("PhotoPage.vala:918: Rebuild pixbuf caches: %s (%s)", _tmp7_, _tmp9_);
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp9_);
-#line 920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = self->priv->cache;
-#line 920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ != NULL) {
-#line 6869 "PhotoPage.c"
+#line 6770 "PhotoPage.c"
 		PixbufCache* _tmp11_ = NULL;
 		guint _tmp12_ = 0U;
 		PixbufCache* _tmp13_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = self->priv->cache;
-#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_parse_name ("fetched", TYPE_PIXBUF_CACHE, &_tmp12_, NULL, FALSE);
-#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self);
-#line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = self->priv->cache;
-#line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_cancel_all (_tmp13_);
-#line 6883 "PhotoPage.c"
+#line 6784 "PhotoPage.c"
 	}
-#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = self->priv->sources;
-#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = scaling;
-#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = pixbuf_cache_new (_tmp14_, PIXBUF_CACHE_PHOTO_TYPE_BASELINE, &_tmp15_, EDITING_HOST_PAGE_PIXBUF_CACHE_COUNT, NULL, NULL);
-#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cache);
-#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->cache = _tmp16_;
-#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = self->priv->cache;
-#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp17_, "fetched", (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self, 0);
 #line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp17_, "fetched", (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self, 0);
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->sources;
-#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = scaling;
-#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = pixbuf_cache_new (_tmp18_, PIXBUF_CACHE_PHOTO_TYPE_MASTER, &_tmp19_, EDITING_HOST_PAGE_ORIGINAL_PIXBUF_CACHE_COUNT, _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter, self);
-#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->master_cache);
-#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->master_cache = _tmp20_;
-#line 931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = caller;
-#line 931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, _tmp21_);
-#line 6913 "PhotoPage.c"
+#line 6814 "PhotoPage.c"
 }
 
 
 static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar* caller) {
 	gboolean _tmp0_ = FALSE;
-#line 935 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 935 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (caller != NULL);
-#line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6927 "PhotoPage.c"
+#line 6828 "PhotoPage.c"
 		const gchar* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
@@ -6937,45 +6838,45 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
 		ViewCollection* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Photo* _tmp9_ = NULL;
-#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = caller;
-#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (self);
-#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_debug ("PhotoPage.vala:937: Refresh pixbuf caches (%s): prefetching neighbors " \
+#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_debug ("PhotoPage.vala:939: Refresh pixbuf caches (%s): prefetching neighbors " \
 "of %s", _tmp1_, _tmp5_);
-#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp5_);
-#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp3_);
 #line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_g_object_unref0 (_tmp3_);
+#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_host_page_get_photo (self);
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp8_;
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_prefetch_neighbors (self, _tmp7_, _tmp9_);
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6967 "PhotoPage.c"
+#line 6868 "PhotoPage.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = caller;
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_debug ("PhotoPage.vala:941: Refresh pixbuf caches (%s): (no photo)", _tmp10_);
-#line 6974 "PhotoPage.c"
+#line 943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_debug ("PhotoPage.vala:943: Refresh pixbuf caches (%s): (no photo)", _tmp10_);
+#line 6875 "PhotoPage.c"
 	}
 }
 
@@ -6985,35 +6886,35 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph
 	gboolean _tmp0_ = FALSE;
 	Photo* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = photo_has_transformations (_tmp1_);
-#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 6996 "PhotoPage.c"
+#line 6897 "PhotoPage.c"
 	} else {
 		Photo* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = photo;
-#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = photo_has_editable (_tmp3_);
-#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_;
-#line 7006 "PhotoPage.c"
+#line 6907 "PhotoPage.c"
 	}
-#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_;
-#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7012 "PhotoPage.c"
+#line 6913 "PhotoPage.c"
 }
 
 
@@ -7025,35 +6926,35 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 	gboolean _tmp4_ = FALSE;
 	GdkPixbuf* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail ((pixbuf == NULL) || GDK_IS_PIXBUF (pixbuf));
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail ((pixbuf == NULL) || GDK_IS_PIXBUF (pixbuf));
+#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = photo;
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource));
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 7046 "PhotoPage.c"
+#line 6947 "PhotoPage.c"
 	}
-#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = pixbuf;
-#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 7052 "PhotoPage.c"
+#line 6953 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 		ZoomBuffer* _tmp7_ = NULL;
 		Dimensions max_dim = {0};
@@ -7063,62 +6964,62 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		GdkPixbuf* _tmp31_ = NULL;
 		Dimensions _tmp32_ = {0};
 		Photo* _tmp33_ = NULL;
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = self->priv->zoom_buffer;
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp7_ != NULL) {
-#line 7066 "PhotoPage.c"
+#line 6967 "PhotoPage.c"
 			ZoomBuffer* _tmp8_ = NULL;
 			Photo* _tmp9_ = NULL;
 			Photo* _tmp10_ = NULL;
 			Photo* _tmp11_ = NULL;
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = self->priv->zoom_buffer;
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = zoom_buffer_get_backing_photo (_tmp8_);
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _tmp9_;
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = photo;
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = _tmp10_ == _tmp11_;
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp10_);
-#line 7083 "PhotoPage.c"
+#line 6984 "PhotoPage.c"
 		} else {
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = FALSE;
-#line 7087 "PhotoPage.c"
+#line 6988 "PhotoPage.c"
 		}
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 7091 "PhotoPage.c"
+#line 6992 "PhotoPage.c"
 			Photo* _tmp12_ = NULL;
 			GdkPixbuf* _tmp13_ = NULL;
 			ZoomBuffer* _tmp14_ = NULL;
-#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = photo;
-#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = pixbuf;
-#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, _tmp13_);
-#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (self->priv->zoom_buffer);
-#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			self->priv->zoom_buffer = _tmp14_;
-#line 7105 "PhotoPage.c"
+#line 7006 "PhotoPage.c"
 		}
-#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = photo;
-#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp16_);
-#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		max_dim = _tmp16_;
-#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = self->priv->current_tool;
-#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_ != NULL) {
-#line 7117 "PhotoPage.c"
+#line 7018 "PhotoPage.c"
 			{
 				Dimensions tool_pixbuf_dim = {0};
 				GdkPixbuf* tool_pixbuf = NULL;
@@ -7128,46 +7029,46 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				Dimensions _tmp21_ = {0};
 				GdkPixbuf* _tmp22_ = NULL;
 				GdkPixbuf* _tmp23_ = NULL;
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp18_ = self->priv->current_tool;
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp19_);
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp20_ = photo;
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp22_ = editing_tools_editing_tool_get_display_pixbuf (_tmp18_, &_tmp19_, _tmp20_, &_tmp21_, &_inner_error_);
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				tool_pixbuf_dim = _tmp21_;
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				tool_pixbuf = _tmp22_;
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7141 "PhotoPage.c"
-					goto __catch244_g_error;
+#line 7042 "PhotoPage.c"
+					goto __catch241_g_error;
 				}
-#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp23_ = tool_pixbuf;
-#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (_tmp23_ != NULL) {
-#line 7148 "PhotoPage.c"
+#line 7049 "PhotoPage.c"
 					GdkPixbuf* _tmp24_ = NULL;
 					Dimensions _tmp25_ = {0};
-#line 969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					_tmp24_ = tool_pixbuf;
-#line 969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					pixbuf = _tmp24_;
-#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					_tmp25_ = tool_pixbuf_dim;
-#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					max_dim = _tmp25_;
-#line 7159 "PhotoPage.c"
+#line 7060 "PhotoPage.c"
 				}
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (tool_pixbuf);
-#line 7163 "PhotoPage.c"
+#line 7064 "PhotoPage.c"
 			}
-			goto __finally244;
-			__catch244_g_error:
+			goto __finally241;
+			__catch241_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp26_ = NULL;
@@ -7175,72 +7076,72 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				gchar* _tmp28_ = NULL;
 				GError* _tmp29_ = NULL;
 				const gchar* _tmp30_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				err = _inner_error_;
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_inner_error_ = NULL;
-#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp26_ = photo;
-#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_OBJECT, DataObject));
-#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp28_ = _tmp27_;
-#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp29_ = err;
-#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp30_ = _tmp29_->message;
-#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				g_warning ("PhotoPage.vala:973: Unable to fetch tool pixbuf for %s: %s", _tmp28_, _tmp30_);
-#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				g_warning ("PhotoPage.vala:975: Unable to fetch tool pixbuf for %s: %s", _tmp28_, _tmp30_);
+#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_free0 (_tmp28_);
-#line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				editing_host_page_set_photo_missing (self, TRUE);
 #line 976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				editing_host_page_set_photo_missing (self, TRUE);
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_error_free0 (err);
-#line 976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7198 "PhotoPage.c"
+#line 7099 "PhotoPage.c"
 			}
-			__finally244:
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			__finally241:
+#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_clear_error (&_inner_error_);
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7209 "PhotoPage.c"
+#line 7110 "PhotoPage.c"
 			}
 		}
-#line 980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = pixbuf;
-#line 980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = max_dim;
-#line 980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp31_, &_tmp32_, NULL);
-#line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		self->priv->pixbuf_dirty = FALSE;
 #line 983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		self->priv->pixbuf_dirty = FALSE;
+#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = photo;
-#line 983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO, Photo), FALSE);
-#line 7224 "PhotoPage.c"
+#line 7125 "PhotoPage.c"
 	} else {
 		GError* _tmp34_ = NULL;
-#line 984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = err;
-#line 984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp34_ != NULL) {
-#line 7231 "PhotoPage.c"
+#line 7132 "PhotoPage.c"
 			Photo* _tmp35_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_set_photo_missing (self, TRUE);
-#line 990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp35_ = photo;
-#line 990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo), TRUE);
-#line 7239 "PhotoPage.c"
+#line 7140 "PhotoPage.c"
 		}
 	}
 }
@@ -7272,73 +7173,73 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 	PixbufCachePixbufCacheBatch* _tmp40_ = NULL;
 	PixbufCache* _tmp41_ = NULL;
 	PixbufCachePixbufCacheBatch* _tmp42_ = NULL;
-#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (controller));
-#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = pixbuf_cache_pixbuf_cache_batch_new ();
-#line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	normal_batch = _tmp0_;
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = pixbuf_cache_pixbuf_cache_batch_new ();
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	master_batch = _tmp1_;
 #line 998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	master_batch = _tmp1_;
+#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = normal_batch;
-#line 998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo;
-#line 998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_HIGHEST), _tmp3_);
-#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = master_batch;
-#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = photo;
-#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOW), _tmp5_);
-#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = controller;
-#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = view_collection_get_immediate_neighbors (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource), &_tmp8_, &_tmp9_, PHOTO_TYPENAME);
-#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next_source);
-#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next_source = _tmp8_;
-#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (prev_source);
-#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	prev_source = _tmp9_;
-#line 1002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp10_) {
-#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (prev_source);
-#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (next_source);
-#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (master_batch);
-#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (normal_batch);
-#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 7323 "PhotoPage.c"
+#line 7224 "PhotoPage.c"
 	}
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = next_source;
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo));
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next = _tmp12_;
-#line 1006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = prev_source;
-#line 1006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo));
-#line 1006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	prev = _tmp14_;
-#line 7337 "PhotoPage.c"
+#line 7238 "PhotoPage.c"
 	{
 		GeeIterator* _neighbor_source_it = NULL;
 		ViewCollection* _tmp15_ = NULL;
@@ -7347,25 +7248,25 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 		GeeSet* _tmp18_ = NULL;
 		GeeIterator* _tmp19_ = NULL;
 		GeeIterator* _tmp20_ = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = controller;
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = photo;
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = view_collection_get_extended_neighbors (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_neighbor_source_it = _tmp20_;
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7364 "PhotoPage.c"
+#line 7265 "PhotoPage.c"
 			GeeIterator* _tmp21_ = NULL;
 			gboolean _tmp22_ = FALSE;
 			DataSource* neighbor_source = NULL;
@@ -7384,110 +7285,110 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			Photo* _tmp36_ = NULL;
 			PixbufCachePixbufCacheBatch* _tmp37_ = NULL;
 			Photo* _tmp38_ = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = _neighbor_source_it;
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = gee_iterator_next (_tmp21_);
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp22_) {
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7391 "PhotoPage.c"
+#line 7292 "PhotoPage.c"
 			}
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = _neighbor_source_it;
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = gee_iterator_get (_tmp23_);
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			neighbor_source = (DataSource*) _tmp24_;
-#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = neighbor_source;
-#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo));
-#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			neighbor = _tmp26_;
 #line 1012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			neighbor = _tmp26_;
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			priority = BACKGROUND_JOB_JOB_PRIORITY_NORMAL;
-#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp28_ = neighbor;
-#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp29_ = next;
-#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp30_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_SOURCE, DataSource));
-#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp30_) {
-#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = TRUE;
-#line 7417 "PhotoPage.c"
+#line 7318 "PhotoPage.c"
 			} else {
 				Photo* _tmp31_ = NULL;
 				Photo* _tmp32_ = NULL;
 				gboolean _tmp33_ = FALSE;
-#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp31_ = neighbor;
-#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp32_ = prev;
-#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp33_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_SOURCE, DataSource));
-#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = _tmp33_;
-#line 7430 "PhotoPage.c"
+#line 7331 "PhotoPage.c"
 			}
-#line 1013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp27_) {
-#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH;
-#line 7436 "PhotoPage.c"
+#line 7337 "PhotoPage.c"
 			}
-#line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp34_ = normal_batch;
-#line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp35_ = priority;
-#line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp36_ = neighbor;
-#line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) _tmp35_), _tmp36_);
-#line 1017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp37_ = master_batch;
-#line 1017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp38_ = neighbor;
-#line 1017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOWEST), _tmp38_);
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (neighbor);
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (neighbor_source);
-#line 7456 "PhotoPage.c"
+#line 7357 "PhotoPage.c"
 		}
-#line 1009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_neighbor_source_it);
-#line 7460 "PhotoPage.c"
+#line 7361 "PhotoPage.c"
 	}
-#line 1020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp39_ = self->priv->cache;
-#line 1020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp40_ = normal_batch;
-#line 1020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf_cache_prefetch_batch (_tmp39_, _tmp40_, FALSE);
-#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp41_ = self->priv->master_cache;
-#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp42_ = master_batch;
-#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf_cache_prefetch_batch (_tmp41_, _tmp42_, FALSE);
-#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (prev);
-#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next);
-#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (prev_source);
-#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next_source);
-#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (master_batch);
-#line 994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (normal_batch);
-#line 7486 "PhotoPage.c"
+#line 7387 "PhotoPage.c"
 }
 
 
@@ -7504,46 +7405,46 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 	GeeSet* _tmp24_ = NULL;
 	Photo* _tmp25_ = NULL;
 	gboolean _tmp26_ = FALSE;
-#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (old_controller));
-#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (old_photo));
-#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (new_controller));
-#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (IS_PHOTO (new_photo));
 #line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (IS_PHOTO (new_photo));
+#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = old_controller;
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = old_photo;
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_extended_neighbors (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	old_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet);
 #line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	old_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet);
+#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = new_controller;
-#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = new_photo;
-#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = view_collection_get_extended_neighbors (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
-#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet);
-#line 7529 "PhotoPage.c"
+#line 7430 "PhotoPage.c"
 	{
 		GeeIterator* _old_neighbor_it = NULL;
 		GeeSet* _tmp6_ = NULL;
 		GeeIterator* _tmp7_ = NULL;
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = old_neighbors;
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_old_neighbor_it = _tmp7_;
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7542 "PhotoPage.c"
+#line 7443 "PhotoPage.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			Photo* old_neighbor = NULL;
@@ -7553,129 +7454,129 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 			GeeSet* _tmp13_ = NULL;
 			Photo* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _old_neighbor_it;
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = gee_iterator_next (_tmp8_);
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp9_) {
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7560 "PhotoPage.c"
+#line 7461 "PhotoPage.c"
 			}
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _old_neighbor_it;
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = gee_iterator_get (_tmp10_);
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			old_neighbor = (Photo*) _tmp11_;
-#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = new_neighbors;
-#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = old_neighbor;
-#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp15_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_);
-#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp15_) {
-#line 7576 "PhotoPage.c"
+#line 7477 "PhotoPage.c"
 				Photo* _tmp16_ = NULL;
 				Photo* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
-#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp16_ = new_photo;
-#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp17_ = old_neighbor;
-#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource));
-#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = !_tmp18_;
-#line 7588 "PhotoPage.c"
+#line 7489 "PhotoPage.c"
 			} else {
-#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = FALSE;
-#line 7592 "PhotoPage.c"
+#line 7493 "PhotoPage.c"
 			}
-#line 1036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp12_) {
-#line 7596 "PhotoPage.c"
+#line 7497 "PhotoPage.c"
 				PixbufCache* _tmp19_ = NULL;
 				Photo* _tmp20_ = NULL;
 				PixbufCache* _tmp21_ = NULL;
 				Photo* _tmp22_ = NULL;
-#line 1037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp19_ = self->priv->cache;
-#line 1037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp20_ = old_neighbor;
-#line 1037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				pixbuf_cache_drop (_tmp19_, _tmp20_);
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp21_ = self->priv->master_cache;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp22_ = old_neighbor;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				pixbuf_cache_drop (_tmp21_, _tmp22_);
-#line 7613 "PhotoPage.c"
+#line 7514 "PhotoPage.c"
 			}
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (old_neighbor);
-#line 7617 "PhotoPage.c"
+#line 7518 "PhotoPage.c"
 		}
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_old_neighbor_it);
-#line 7621 "PhotoPage.c"
+#line 7522 "PhotoPage.c"
 	}
-#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = new_neighbors;
-#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = old_photo;
-#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
-#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 7631 "PhotoPage.c"
+#line 7532 "PhotoPage.c"
 		Photo* _tmp27_ = NULL;
 		Photo* _tmp28_ = NULL;
 		gboolean _tmp29_ = FALSE;
-#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = new_photo;
-#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = old_photo;
-#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource));
-#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = !_tmp29_;
-#line 7643 "PhotoPage.c"
+#line 7544 "PhotoPage.c"
 	} else {
-#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = FALSE;
-#line 7647 "PhotoPage.c"
+#line 7548 "PhotoPage.c"
 	}
-#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp23_) {
-#line 7651 "PhotoPage.c"
+#line 7552 "PhotoPage.c"
 		PixbufCache* _tmp30_ = NULL;
 		Photo* _tmp31_ = NULL;
 		PixbufCache* _tmp32_ = NULL;
 		Photo* _tmp33_ = NULL;
-#line 1044 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = self->priv->cache;
-#line 1044 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = old_photo;
-#line 1044 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_drop (_tmp30_, _tmp31_);
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = self->priv->master_cache;
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = old_photo;
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_drop (_tmp32_, _tmp33_);
-#line 7668 "PhotoPage.c"
+#line 7569 "PhotoPage.c"
 	}
-#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_neighbors);
-#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_neighbors);
-#line 7674 "PhotoPage.c"
+#line 7575 "PhotoPage.c"
 }
 
 
@@ -7683,61 +7584,61 @@ static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self
 	DataView* result = NULL;
 	DataSource* _tmp0_ = NULL;
 	PhotoView* _tmp1_ = NULL;
-#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
-#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = source;
-#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
-#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7692 "PhotoPage.c"
+#line 7593 "PhotoPage.c"
 }
 
 
 DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource* source) {
-#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source);
-#line 7701 "PhotoPage.c"
+#line 7602 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
-#line 1053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = source;
-#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE);
-#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7718 "PhotoPage.c"
+#line 7619 "PhotoPage.c"
 }
 
 
 static DataView* _editing_host_page_create_photo_view_create_view (DataSource* source, gpointer self) {
 	DataView* result;
 	result = editing_host_page_create_photo_view ((EditingHostPage*) self, source);
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7727 "PhotoPage.c"
+#line 7628 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* source, gpointer self) {
 	gboolean result;
 	result = editing_host_page_is_photo ((EditingHostPage*) self, source);
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7736 "PhotoPage.c"
+#line 7637 "PhotoPage.c"
 }
 
 
@@ -7752,54 +7653,54 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 	ViewCollection* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
 	Photo* _tmp18_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1057 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (controller));
-#line 1057 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (starting_photo));
-#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = controller;
-#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = starting_photo;
-#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
-#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp3_ != NULL, "controller.get_view_for_source(starting_photo) != null");
-#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp3_);
 #line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp3_);
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = controller;
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp5_ != _tmp7_;
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7781 "PhotoPage.c"
+#line 7682 "PhotoPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = controller;
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = self->priv->parent_view;
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7790 "PhotoPage.c"
+#line 7691 "PhotoPage.c"
 	} else {
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7794 "PhotoPage.c"
+#line 7695 "PhotoPage.c"
 	}
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7798 "PhotoPage.c"
+#line 7699 "PhotoPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
@@ -7807,39 +7708,39 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 		ViewCollection* _tmp15_ = NULL;
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
-#line 1061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 1061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = controller;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_collection_copy_into (_tmp14_, _tmp15_, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self);
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = controller;
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _data_collection_ref0 (_tmp16_);
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (self->priv->parent_view);
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7832 "PhotoPage.c"
+#line 7733 "PhotoPage.c"
 	}
-#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
-#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7838 "PhotoPage.c"
+#line 7739 "PhotoPage.c"
 }
 
 
@@ -7854,54 +7755,54 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 	ViewCollection* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
 	Photo* _tmp18_ = NULL;
-#line 1069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (controller));
-#line 1069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (starting_photo));
-#line 1070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = controller;
-#line 1070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = starting_photo;
-#line 1070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
-#line 1070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp3_ != NULL, "controller.get_view_for_source(starting_photo) != null");
-#line 1070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp3_);
 #line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp3_);
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = controller;
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp5_ != _tmp7_;
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7883 "PhotoPage.c"
+#line 7784 "PhotoPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = controller;
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = self->priv->parent_view;
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7892 "PhotoPage.c"
+#line 7793 "PhotoPage.c"
 	} else {
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7896 "PhotoPage.c"
+#line 7797 "PhotoPage.c"
 	}
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7900 "PhotoPage.c"
+#line 7801 "PhotoPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
@@ -7909,39 +7810,39 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 		ViewCollection* _tmp15_ = NULL;
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
-#line 1073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 1073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = controller;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_collection_mirror (_tmp14_, _tmp15_, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self);
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = controller;
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _data_collection_ref0 (_tmp16_);
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (self->priv->parent_view);
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7934 "PhotoPage.c"
+#line 7835 "PhotoPage.c"
 	}
-#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
-#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7940 "PhotoPage.c"
+#line 7841 "PhotoPage.c"
 }
 
 
@@ -7956,68 +7857,68 @@ static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean mi
 	GtkToolButton* _tmp6_ = NULL;
 	GtkScale* _tmp7_ = NULL;
 	Dimensions _tmp8_ = {0};
-#line 1082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 1082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	sensitivity = !_tmp0_;
 #line 1084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	sensitivity = !_tmp0_;
+#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->rotate_button;
-#line 1084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->crop_button;
-#line 1085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->straighten_button;
-#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->redeye_button;
-#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = self->priv->adjust_button;
-#line 1088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->enhance_button;
-#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->zoom_slider;
-#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), sensitivity);
 #line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), sensitivity);
+#line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp8_, 0, 0);
-#line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE);
-#line 7991 "PhotoPage.c"
+#line 7892 "PhotoPage.c"
 }
 
 
 void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) {
-#line 1081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing);
-#line 8000 "PhotoPage.c"
+#line 7901 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) {
-#line 1096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 8007 "PhotoPage.c"
+#line 7908 "PhotoPage.c"
 }
 
 
 void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) {
-#line 1096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing);
-#line 8016 "PhotoPage.c"
+#line 7917 "PhotoPage.c"
 }
 
 
@@ -8047,91 +7948,91 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	PangoLayout* _tmp18_ = NULL;
 	gint _tmp19_ = 0;
 	gint _tmp20_ = 0;
-#line 1099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (message != NULL);
 #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (message != NULL);
+#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = message;
-#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	pango_layout = _tmp1_;
 #line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	pango_layout = _tmp1_;
+#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = pango_layout;
-#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pango_layout_get_pixel_size (_tmp2_, &_tmp3_, &_tmp4_);
-#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	text_width = _tmp3_;
-#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	text_height = _tmp4_;
-#line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp5_);
-#line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	allocation = _tmp5_;
 #line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	allocation = _tmp5_;
+#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = allocation;
-#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_.width;
-#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = text_width;
-#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = _tmp7_ - _tmp8_;
-#line 1109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = x;
-#line 1109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ > 0) {
-#line 8080 "PhotoPage.c"
+#line 7981 "PhotoPage.c"
 		gint _tmp11_ = 0;
-#line 1109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = x;
-#line 1109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp11_ / 2;
-#line 8086 "PhotoPage.c"
+#line 7987 "PhotoPage.c"
 	} else {
-#line 1109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = 0;
-#line 8090 "PhotoPage.c"
+#line 7991 "PhotoPage.c"
 	}
-#line 1109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	x = _tmp9_;
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	x = _tmp9_;
+#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = allocation;
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_.height;
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = text_height;
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	y = _tmp13_ - _tmp14_;
-#line 1112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = y;
-#line 1112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_ > 0) {
-#line 8106 "PhotoPage.c"
+#line 8007 "PhotoPage.c"
 		gint _tmp17_ = 0;
-#line 1112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = y;
-#line 1112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp17_ / 2;
-#line 8112 "PhotoPage.c"
+#line 8013 "PhotoPage.c"
 	} else {
-#line 1112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = 0;
-#line 8116 "PhotoPage.c"
+#line 8017 "PhotoPage.c"
 	}
-#line 1112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	y = _tmp15_;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	y = _tmp15_;
+#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = pango_layout;
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = x;
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = y;
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_paint_text (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp18_, _tmp19_, _tmp20_);
-#line 1099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pango_layout);
-#line 8130 "PhotoPage.c"
+#line 8031 "PhotoPage.c"
 }
 
 
@@ -8145,45 +8046,45 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = missing;
-#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8154 "PhotoPage.c"
+#line 8055 "PhotoPage.c"
 	}
-#line 1122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = missing;
-#line 1122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->photo_missing = _tmp2_;
 #line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->photo_missing = _tmp2_;
+#line 1126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
-#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp3_;
-#line 1125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = photo;
-#line 1125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ == NULL) {
-#line 1126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8172 "PhotoPage.c"
+#line 8073 "PhotoPage.c"
 	}
-#line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = missing;
-#line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_update_ui (self, _tmp5_);
 #line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_update_ui (self, _tmp5_);
+#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->photo_missing;
-#line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8182 "PhotoPage.c"
+#line 8083 "PhotoPage.c"
 		{
 			GdkPixbuf* pixbuf = NULL;
 			Photo* _tmp7_ = NULL;
@@ -8198,49 +8099,49 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			GdkPixbuf* _tmp16_ = NULL;
 			Photo* _tmp17_ = NULL;
 			Dimensions _tmp18_ = {0};
-#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = photo;
-#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp8_, &_inner_error_);
-#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp9_;
-#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8207 "PhotoPage.c"
-				goto __catch245_g_error;
+#line 8108 "PhotoPage.c"
+				goto __catch242_g_error;
 			}
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = pixbuf;
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = pixbuf;
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = gdk_pixbuf_get_width (_tmp11_);
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = pixbuf;
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = gdk_pixbuf_get_height (_tmp13_);
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp15_ = gdk_pixbuf_composite_color_simple (_tmp10_, _tmp12_, _tmp14_, GDK_INTERP_NEAREST, 100, 2, (guint32) 0, (guint32) 0);
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp15_;
-#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp16_ = pixbuf;
-#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = photo;
-#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp18_);
-#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp16_, &_tmp18_, NULL);
-#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 8236 "PhotoPage.c"
+#line 8137 "PhotoPage.c"
 		}
-		goto __finally245;
-		__catch245_g_error:
+		goto __finally242;
+		__catch242_g_error:
 		{
 			GError* err = NULL;
 			GdkPixbuf* _tmp19_ = NULL;
@@ -8249,87 +8150,87 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			Dimensions _tmp22_ = {0};
 			GError* _tmp23_ = NULL;
 			const gchar* _tmp24_ = NULL;
-#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			err = _inner_error_;
-#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_inner_error_ = NULL;
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 1, 1);
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = _tmp19_;
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = photo;
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp22_);
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp20_, &_tmp22_, NULL);
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp20_);
-#line 1140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = err;
-#line 1140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = _tmp23_->message;
-#line 1140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			g_warning ("PhotoPage.vala:1140: %s", _tmp24_);
-#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			g_warning ("PhotoPage.vala:1142: %s", _tmp24_);
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8272 "PhotoPage.c"
+#line 8173 "PhotoPage.c"
 		}
-		__finally245:
-#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		__finally242:
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (photo);
-#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			g_clear_error (&_inner_error_);
-#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8285 "PhotoPage.c"
+#line 8186 "PhotoPage.c"
 		}
 	}
-#line 1118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 8290 "PhotoPage.c"
+#line 8191 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_get_photo_missing (EditingHostPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 1146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_;
-#line 1146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8305 "PhotoPage.c"
+#line 8206 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo) {
 	gboolean result = FALSE;
-#line 1149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail ((old_photo == NULL) || IS_PHOTO (old_photo), FALSE);
-#line 1149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (new_photo), FALSE);
-#line 1150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 1150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8319 "PhotoPage.c"
+#line 8220 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo) {
-#line 1149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->confirm_replace_photo (self, old_photo, new_photo);
-#line 8328 "PhotoPage.c"
+#line 8229 "PhotoPage.c"
 }
 
 
@@ -8342,121 +8243,121 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp11_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (new_photo), NULL);
-#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->cache;
-#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = new_photo;
-#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = pixbuf_cache_get_ready_pixbuf (_tmp0_, _tmp1_);
-#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = _tmp2_;
-#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = pixbuf;
-#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 8357 "PhotoPage.c"
+#line 8258 "PhotoPage.c"
 		{
 			GdkPixbuf* _tmp4_ = NULL;
 			Photo* _tmp5_ = NULL;
 			Scaling _tmp6_ = {0};
 			GdkPixbuf* _tmp7_ = NULL;
 			GdkPixbuf* _tmp8_ = NULL;
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = new_photo;
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_);
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp6_, &_inner_error_);
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = _tmp7_;
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8374 "PhotoPage.c"
-				goto __catch246_g_error;
+#line 8275 "PhotoPage.c"
+				goto __catch243_g_error;
 			}
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _tmp4_;
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = NULL;
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp8_;
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 8387 "PhotoPage.c"
+#line 8288 "PhotoPage.c"
 		}
-		goto __finally246;
-		__catch246_g_error:
+		goto __finally243;
+		__catch243_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			err = _inner_error_;
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_inner_error_ = NULL;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = err;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _tmp9_->message;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			g_warning ("PhotoPage.vala:1159: %s", _tmp10_);
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			g_warning ("PhotoPage.vala:1161: %s", _tmp10_);
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8407 "PhotoPage.c"
+#line 8308 "PhotoPage.c"
 		}
-		__finally246:
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		__finally243:
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			g_clear_error (&_inner_error_);
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return NULL;
-#line 8420 "PhotoPage.c"
+#line 8321 "PhotoPage.c"
 		}
 	}
-#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = pixbuf;
-#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 8427 "PhotoPage.c"
+#line 8328 "PhotoPage.c"
 		GdkPixbuf* _tmp12_ = NULL;
 		Scaling _tmp13_ = {0};
 		GdkPixbuf* _tmp14_ = NULL;
 		GdkPixbuf* _tmp15_ = NULL;
 		GdkPixbuf* _tmp16_ = NULL;
-#line 1163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = get_placeholder_pixbuf ();
-#line 1163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
-#line 1163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf = _tmp12_;
-#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp13_);
-#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = pixbuf;
-#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = scaling_perform_on_pixbuf (&_tmp13_, _tmp14_, GDK_INTERP_NEAREST, TRUE);
-#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 8449 "PhotoPage.c"
+#line 8350 "PhotoPage.c"
 	}
-#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = pixbuf;
-#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8455 "PhotoPage.c"
+#line 8356 "PhotoPage.c"
 }
 
 
@@ -8488,240 +8389,240 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	GdkPixbuf* _tmp45_ = NULL;
 	GdkPixbuf* _tmp46_ = NULL;
 	ZoomBuffer* _tmp47_ = NULL;
-#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (new_photo));
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = new_photo;
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource));
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8505 "PhotoPage.c"
+#line 8406 "PhotoPage.c"
 		gboolean _tmp7_ = FALSE;
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = self->priv->pixbuf_dirty;
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp7_;
-#line 8511 "PhotoPage.c"
+#line 8412 "PhotoPage.c"
 	} else {
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 8515 "PhotoPage.c"
+#line 8416 "PhotoPage.c"
 	}
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 8519 "PhotoPage.c"
+#line 8420 "PhotoPage.c"
 		gboolean _tmp8_ = FALSE;
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = self->priv->photo_missing;
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp8_;
-#line 8525 "PhotoPage.c"
+#line 8426 "PhotoPage.c"
 	} else {
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 8529 "PhotoPage.c"
+#line 8430 "PhotoPage.c"
 	}
-#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 8533 "PhotoPage.c"
+#line 8434 "PhotoPage.c"
 		Photo* _tmp9_ = NULL;
 		Photo* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
 		ZoomBuffer* _tmp13_ = NULL;
-#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = new_photo;
-#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = new_photo;
-#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = editing_host_page_get_zoom_pixbuf (self, _tmp10_);
-#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp9_, _tmp12_);
-#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->zoom_buffer);
-#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->zoom_buffer = _tmp13_;
-#line 1175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8557 "PhotoPage.c"
+#line 8458 "PhotoPage.c"
 	}
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = editing_host_page_has_photo (self);
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_) {
-#line 8563 "PhotoPage.c"
+#line 8464 "PhotoPage.c"
 		Photo* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
 		Photo* _tmp19_ = NULL;
 		gboolean _tmp20_ = FALSE;
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = new_photo;
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = editing_host_page_get_photo (self);
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_SOURCE, DataSource));
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = !_tmp20_;
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 8580 "PhotoPage.c"
+#line 8481 "PhotoPage.c"
 	} else {
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = FALSE;
-#line 8584 "PhotoPage.c"
+#line 8485 "PhotoPage.c"
 	}
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = editing_host_page_confirm_replace_photo != NULL;
-#line 8590 "PhotoPage.c"
+#line 8491 "PhotoPage.c"
 	} else {
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 8594 "PhotoPage.c"
+#line 8495 "PhotoPage.c"
 	}
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 8598 "PhotoPage.c"
+#line 8499 "PhotoPage.c"
 		Photo* _tmp21_ = NULL;
 		Photo* _tmp22_ = NULL;
 		Photo* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
 		gboolean _tmp25_ = FALSE;
-#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = editing_host_page_get_photo (self);
-#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = new_photo;
-#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = editing_host_page_confirm_replace_photo (self, _tmp22_, _tmp23_);
-#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = !_tmp24_;
-#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp22_);
-#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp25_) {
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8620 "PhotoPage.c"
+#line 8521 "PhotoPage.c"
 		}
 	}
-#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp26_, 0, 0);
-#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp26_, FALSE);
-#line 1188 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = editing_host_page_get_photo (self);
-#line 1188 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	old_photo = _tmp27_;
-#line 1189 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = new_photo;
-#line 1189 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo (self, _tmp28_);
-#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = new_photo;
-#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
-#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp31_ = _tmp30_;
-#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp31_);
-#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp31_);
-#line 1193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->swapped);
-#line 1193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->swapped = NULL;
-#line 1196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp32_ = new_photo;
-#line 1196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp33_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp34_ = _tmp33_;
-#line 1196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = g_file_query_exists (_tmp34_, NULL);
-#line 1196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, !_tmp35_);
-#line 1196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp34_);
-#line 1197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1199 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
-#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_rebuild_caches (self, "replace_photo");
 #line 1203 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_rebuild_caches (self, "replace_photo");
+#line 1205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp36_ = old_photo;
-#line 1203 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp36_ != NULL) {
-#line 8669 "PhotoPage.c"
+#line 8570 "PhotoPage.c"
 		ViewCollection* _tmp37_ = NULL;
 		ViewCollection* _tmp38_ = NULL;
 		Photo* _tmp39_ = NULL;
 		ViewCollection* _tmp40_ = NULL;
 		ViewCollection* _tmp41_ = NULL;
 		Photo* _tmp42_ = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = _tmp37_;
-#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = old_photo;
-#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp41_ = _tmp40_;
-#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp42_ = new_photo;
-#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_cancel_prefetch_neighbors (self, _tmp38_, _tmp39_, _tmp41_, _tmp42_);
-#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp41_);
-#line 1204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 8694 "PhotoPage.c"
+#line 8595 "PhotoPage.c"
 	}
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
+#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = new_photo;
-#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp44_ = new_photo;
-#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp45_ = editing_host_page_get_zoom_pixbuf (self, _tmp44_);
-#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = _tmp45_;
-#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp47_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp43_, _tmp46_);
-#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->zoom_buffer);
-#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->zoom_buffer = _tmp47_;
-#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp46_);
 #line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp46_);
+#line 1212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_quick_update_pixbuf (self);
-#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, "replace_photo");
-#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_photo);
-#line 8720 "PhotoPage.c"
+#line 8621 "PhotoPage.c"
 }
 
 
@@ -8736,84 +8637,84 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp12_ = FALSE;
 	GtkDrawingArea* _tmp13_ = NULL;
-#line 1216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 1219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
+#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 1219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp1_, NULL, FALSE);
-#line 1219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
-#line 1220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->zoom_slider;
-#line 1220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), 0.0);
-#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->zoom_slider;
-#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
 #line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
+#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (self);
-#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_ != NULL;
-#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8763 "PhotoPage.c"
+#line 8664 "PhotoPage.c"
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
 		Dimensions _tmp10_ = {0};
 		ZoomState _tmp11_ = {0};
-#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (self);
-#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_);
-#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
-#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_init (&_tmp11_, &_tmp9_, &_tmp10_, 0.0, NULL);
-#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_);
-#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8783 "PhotoPage.c"
+#line 8684 "PhotoPage.c"
 	}
-#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
-#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 8789 "PhotoPage.c"
+#line 8690 "PhotoPage.c"
 		GtkDrawingArea* _tmp14_ = NULL;
 		GdkWindow* _tmp15_ = NULL;
-#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
-#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp15_ != NULL;
-#line 8798 "PhotoPage.c"
+#line 8699 "PhotoPage.c"
 	} else {
-#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 8802 "PhotoPage.c"
+#line 8703 "PhotoPage.c"
 	}
-#line 1230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 1231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1233 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 8808 "PhotoPage.c"
+#line 8709 "PhotoPage.c"
 	}
-#line 1233 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 8812 "PhotoPage.c"
+#line 8713 "PhotoPage.c"
 }
 
 
@@ -8837,76 +8738,76 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	Photo* _tmp29_ = NULL;
 	Photo* _tmp30_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->cache;
-#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = pixbuf_cache_get_ready_pixbuf (_tmp0_, _tmp2_);
-#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1237 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = _tmp4_;
-#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = pixbuf;
-#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 8856 "PhotoPage.c"
+#line 8757 "PhotoPage.c"
 		GdkPixbuf* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = pixbuf;
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (self);
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_);
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp6_, &_tmp9_, NULL);
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		self->priv->pixbuf_dirty = FALSE;
 #line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		self->priv->pixbuf_dirty = FALSE;
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
-#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8879 "PhotoPage.c"
+#line 8780 "PhotoPage.c"
 	}
-#line 1245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
-#line 1245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scaling = _tmp10_;
 #line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	scaling = _tmp10_;
+#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = editing_host_page_get_photo (self);
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = scaling_to_string (&scaling);
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_debug ("PhotoPage.vala:1247: Using progressive load for %s (%s)", _tmp14_, _tmp16_);
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_debug ("PhotoPage.vala:1249: Using progressive load for %s (%s)", _tmp14_, _tmp16_);
+#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp16_);
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp14_);
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 8905 "PhotoPage.c"
+#line 8806 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
@@ -8917,87 +8818,87 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		Photo* _tmp23_ = NULL;
 		Photo* _tmp24_ = NULL;
 		Dimensions _tmp25_ = {0};
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = editing_host_page_get_photo (self);
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = scaling;
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp20_, &_inner_error_);
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _tmp22_;
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8932 "PhotoPage.c"
-			goto __catch247_g_error;
+#line 8833 "PhotoPage.c"
+			goto __catch244_g_error;
 		}
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = editing_host_page_get_photo (self);
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_;
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp25_);
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp17_, &_tmp25_, NULL);
-#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp24_);
-#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 8947 "PhotoPage.c"
+#line 8848 "PhotoPage.c"
 	}
-	goto __finally247;
-	__catch247_g_error:
+	goto __finally244;
+	__catch244_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp26_ = NULL;
 		const gchar* _tmp27_ = NULL;
-#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = err;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = _tmp26_->message;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_warning ("PhotoPage.vala:1254: %s", _tmp27_);
-#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_warning ("PhotoPage.vala:1256: %s", _tmp27_);
+#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 8967 "PhotoPage.c"
+#line 8868 "PhotoPage.c"
 	}
-	__finally247:
-#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally244:
+#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
-#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8980 "PhotoPage.c"
+#line 8881 "PhotoPage.c"
 	}
-#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->cache;
-#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = editing_host_page_get_photo (self);
-#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp30_ = _tmp29_;
-#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf_cache_prefetch (_tmp28_, _tmp30_, BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE);
-#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp30_);
-#line 1261 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = FALSE;
-#line 1236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 8996 "PhotoPage.c"
+#line 8897 "PhotoPage.c"
 }
 
 
@@ -9014,47 +8915,47 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	gboolean _tmp25_ = FALSE;
 	gboolean _tmp26_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1266 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (self);
-#line 1269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp0_;
-#line 1270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1272 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 1270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1272 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 9029 "PhotoPage.c"
+#line 8930 "PhotoPage.c"
 	}
-#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = NULL;
-#line 1274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = photo;
-#line 1274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
-#line 1274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp3_;
-#line 9039 "PhotoPage.c"
+#line 8940 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp4_ = {0};
 		EditingToolsEditingTool* _tmp5_ = NULL;
 		GdkPixbuf* _tmp13_ = NULL;
-#line 1277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_.width = 0;
-#line 1277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_pixbuf_dim = _tmp4_;
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = self->priv->current_tool;
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 9053 "PhotoPage.c"
+#line 8954 "PhotoPage.c"
 			GdkPixbuf* _tmp6_ = NULL;
 			EditingToolsEditingTool* _tmp7_ = NULL;
 			Scaling _tmp8_ = {0};
@@ -9062,214 +8963,214 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			Dimensions _tmp10_ = {0};
 			GdkPixbuf* _tmp11_ = NULL;
 			GdkPixbuf* _tmp12_ = NULL;
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = self->priv->current_tool;
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = photo;
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = editing_tools_editing_tool_get_display_pixbuf (_tmp7_, &_tmp8_, _tmp9_, &_tmp10_, &_inner_error_);
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			tool_pixbuf_dim = _tmp10_;
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = _tmp11_;
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9075 "PhotoPage.c"
-				goto __catch248_g_error;
+#line 8976 "PhotoPage.c"
+				goto __catch245_g_error;
 			}
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = _tmp6_;
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = NULL;
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp12_;
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp6_);
-#line 9088 "PhotoPage.c"
+#line 8989 "PhotoPage.c"
 		}
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = pixbuf;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp13_ != NULL) {
-#line 9094 "PhotoPage.c"
+#line 8995 "PhotoPage.c"
 			Dimensions _tmp14_ = {0};
-#line 1282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = tool_pixbuf_dim;
-#line 1282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp14_;
-#line 9100 "PhotoPage.c"
+#line 9001 "PhotoPage.c"
 		}
 	}
-	goto __finally248;
-	__catch248_g_error:
+	goto __finally245;
+	__catch245_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = err;
-#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_->message;
-#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_warning ("PhotoPage.vala:1284: %s", _tmp16_);
-#line 1285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_warning ("PhotoPage.vala:1286: %s", _tmp16_);
+#line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, TRUE);
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 9123 "PhotoPage.c"
+#line 9024 "PhotoPage.c"
 	}
-	__finally248:
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally245:
+#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return FALSE;
-#line 9138 "PhotoPage.c"
+#line 9039 "PhotoPage.c"
 	}
-#line 1288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = self->priv->photo_missing;
-#line 1288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp17_) {
-#line 9144 "PhotoPage.c"
+#line 9045 "PhotoPage.c"
 		GdkPixbuf* _tmp18_ = NULL;
 		GdkPixbuf* _tmp22_ = NULL;
-#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = pixbuf;
-#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp18_ == NULL) {
-#line 9151 "PhotoPage.c"
+#line 9052 "PhotoPage.c"
 			PixbufCache* _tmp19_ = NULL;
 			Photo* _tmp20_ = NULL;
 			GdkPixbuf* _tmp21_ = NULL;
-#line 1291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = self->priv->cache;
-#line 1291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = photo;
-#line 1291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = pixbuf_cache_get_ready_pixbuf (_tmp19_, _tmp20_);
-#line 1291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp21_;
-#line 9165 "PhotoPage.c"
+#line 9066 "PhotoPage.c"
 		}
-#line 1294 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = pixbuf;
-#line 1294 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp22_ == NULL) {
-#line 9171 "PhotoPage.c"
+#line 9072 "PhotoPage.c"
 			PixbufCache* _tmp23_ = NULL;
 			Photo* _tmp24_ = NULL;
-#line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = self->priv->cache;
-#line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = photo;
-#line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf_cache_prefetch (_tmp23_, _tmp24_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
-#line 9180 "PhotoPage.c"
+#line 9081 "PhotoPage.c"
 		}
 	}
-#line 1298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = self->priv->photo_missing;
-#line 1298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 9187 "PhotoPage.c"
+#line 9088 "PhotoPage.c"
 		GdkPixbuf* _tmp27_ = NULL;
-#line 1298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = pixbuf;
-#line 1298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = _tmp27_ != NULL;
-#line 9193 "PhotoPage.c"
+#line 9094 "PhotoPage.c"
 	} else {
-#line 1298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = FALSE;
-#line 9197 "PhotoPage.c"
+#line 9098 "PhotoPage.c"
 	}
-#line 1298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp25_) {
-#line 9201 "PhotoPage.c"
+#line 9102 "PhotoPage.c"
 		GdkPixbuf* _tmp28_ = NULL;
 		Dimensions _tmp29_ = {0};
-#line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = pixbuf;
-#line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = max_dim;
-#line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp28_, &_tmp29_, NULL);
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
-#line 9212 "PhotoPage.c"
+#line 9113 "PhotoPage.c"
 	}
-#line 1307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 1307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 1307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 1307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9222 "PhotoPage.c"
+#line 9123 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) {
 	EditingHostPage * self;
 	GdkRectangle _tmp0_ = {0};
-#line 1310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (rect != NULL);
-#line 1311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = *rect;
-#line 1311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (editing_host_page_parent_class)->on_resize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_);
 #line 1313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	PAGE_CLASS (editing_host_page_parent_class)->on_resize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_);
+#line 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_track_tool_window (self);
-#line 9239 "PhotoPage.c"
+#line 9140 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle* rect) {
 	EditingHostPage * self;
-#line 1316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (rect != NULL);
-#line 1320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "on_resize_finished");
-#line 1321 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->pixbuf_dirty = TRUE;
 #line 1323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->pixbuf_dirty = TRUE;
+#line 1325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9255 "PhotoPage.c"
+#line 9156 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_viewport_resized (EditingHostPage* self) {
-#line 1326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1329 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1331 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "on_viewport_resized");
-#line 1330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->pixbuf_dirty = TRUE;
 #line 1332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->pixbuf_dirty = TRUE;
+#line 1334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9268 "PhotoPage.c"
+#line 9169 "PhotoPage.c"
 }
 
 
@@ -9315,300 +9216,300 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	GtkToggleToolButton* _tmp58_ = NULL;
 	gint _tmp59_ = 0;
 	gint _tmp60_ = 0;
-#line 1335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_sources_of_type_count (_tmp1_, TYPE_PHOTO);
-#line 1336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 1;
-#line 1336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	multiple_photos = _tmp3_;
 #line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	multiple_photos = _tmp3_;
+#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->prev_button;
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = multiple_photos;
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 1339 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->next_button;
-#line 1339 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = multiple_photos;
-#line 1339 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_);
 #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_);
+#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = editing_host_page_get_photo (self);
-#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp8_;
-#line 1342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_);
-#line 1342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scaling = _tmp9_;
 #line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	scaling = _tmp9_;
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = photo;
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 9352 "PhotoPage.c"
+#line 9253 "PhotoPage.c"
 		gboolean _tmp14_ = FALSE;
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = self->priv->photo_missing;
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = !_tmp14_;
-#line 9358 "PhotoPage.c"
+#line 9259 "PhotoPage.c"
 	} else {
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 9362 "PhotoPage.c"
+#line 9263 "PhotoPage.c"
 	}
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 9366 "PhotoPage.c"
+#line 9267 "PhotoPage.c"
 		Photo* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = photo;
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = photo_check_can_rotate (_tmp15_);
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp16_;
-#line 9375 "PhotoPage.c"
+#line 9276 "PhotoPage.c"
 	} else {
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = FALSE;
-#line 9379 "PhotoPage.c"
+#line 9280 "PhotoPage.c"
 	}
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_) {
-#line 9383 "PhotoPage.c"
+#line 9284 "PhotoPage.c"
 		Photo* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 1345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = photo;
-#line 1345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_);
-#line 1345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp18_;
-#line 9392 "PhotoPage.c"
+#line 9293 "PhotoPage.c"
 	} else {
-#line 1345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 9396 "PhotoPage.c"
+#line 9297 "PhotoPage.c"
 	}
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = self->priv->rotate_button;
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), _tmp10_);
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), _tmp10_);
+#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = photo;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 9406 "PhotoPage.c"
+#line 9307 "PhotoPage.c"
 		gboolean _tmp23_ = FALSE;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = self->priv->photo_missing;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = !_tmp23_;
-#line 9412 "PhotoPage.c"
+#line 9313 "PhotoPage.c"
 	} else {
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = FALSE;
-#line 9416 "PhotoPage.c"
+#line 9317 "PhotoPage.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 9420 "PhotoPage.c"
+#line 9321 "PhotoPage.c"
 		Photo* _tmp24_ = NULL;
 		Scaling _tmp25_ = {0};
 		gboolean _tmp26_ = FALSE;
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = photo;
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = scaling;
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_);
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp26_;
-#line 9432 "PhotoPage.c"
+#line 9333 "PhotoPage.c"
 	} else {
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 9436 "PhotoPage.c"
+#line 9337 "PhotoPage.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->crop_button;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp20_);
 #line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp20_);
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp30_ = photo;
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_ != NULL) {
-#line 9446 "PhotoPage.c"
+#line 9347 "PhotoPage.c"
 		gboolean _tmp31_ = FALSE;
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = self->priv->photo_missing;
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = !_tmp31_;
-#line 9452 "PhotoPage.c"
+#line 9353 "PhotoPage.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = FALSE;
-#line 9456 "PhotoPage.c"
+#line 9357 "PhotoPage.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_) {
-#line 9460 "PhotoPage.c"
+#line 9361 "PhotoPage.c"
 		Photo* _tmp32_ = NULL;
 		Scaling _tmp33_ = {0};
 		gboolean _tmp34_ = FALSE;
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = photo;
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = scaling;
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_);
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = _tmp34_;
-#line 9472 "PhotoPage.c"
+#line 9373 "PhotoPage.c"
 	} else {
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = FALSE;
-#line 9476 "PhotoPage.c"
+#line 9377 "PhotoPage.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = self->priv->redeye_button;
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), _tmp28_);
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), _tmp28_);
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp38_ = photo;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp38_ != NULL) {
-#line 9486 "PhotoPage.c"
+#line 9387 "PhotoPage.c"
 		gboolean _tmp39_ = FALSE;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = self->priv->photo_missing;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = !_tmp39_;
-#line 9492 "PhotoPage.c"
+#line 9393 "PhotoPage.c"
 	} else {
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = FALSE;
-#line 9496 "PhotoPage.c"
+#line 9397 "PhotoPage.c"
 	}
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp37_) {
-#line 9500 "PhotoPage.c"
+#line 9401 "PhotoPage.c"
 		Photo* _tmp40_ = NULL;
 		Scaling _tmp41_ = {0};
 		gboolean _tmp42_ = FALSE;
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = photo;
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp41_ = scaling;
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_);
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = _tmp42_;
-#line 9512 "PhotoPage.c"
+#line 9413 "PhotoPage.c"
 	} else {
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = FALSE;
-#line 9516 "PhotoPage.c"
+#line 9417 "PhotoPage.c"
 	}
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = self->priv->adjust_button;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp36_);
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp36_);
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = photo;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_ != NULL) {
-#line 9526 "PhotoPage.c"
+#line 9427 "PhotoPage.c"
 		gboolean _tmp47_ = FALSE;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = self->priv->photo_missing;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = !_tmp47_;
-#line 9532 "PhotoPage.c"
+#line 9433 "PhotoPage.c"
 	} else {
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = FALSE;
-#line 9536 "PhotoPage.c"
+#line 9437 "PhotoPage.c"
 	}
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp45_) {
-#line 9540 "PhotoPage.c"
+#line 9441 "PhotoPage.c"
 		Photo* _tmp48_ = NULL;
 		gboolean _tmp49_ = FALSE;
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = photo;
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_);
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = _tmp49_;
-#line 9549 "PhotoPage.c"
+#line 9450 "PhotoPage.c"
 	} else {
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = FALSE;
-#line 9553 "PhotoPage.c"
+#line 9454 "PhotoPage.c"
 	}
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp50_ = self->priv->enhance_button;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), _tmp44_);
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), _tmp44_);
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp53_ = photo;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp53_ != NULL) {
-#line 9563 "PhotoPage.c"
+#line 9464 "PhotoPage.c"
 		gboolean _tmp54_ = FALSE;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp54_ = self->priv->photo_missing;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = !_tmp54_;
-#line 9569 "PhotoPage.c"
+#line 9470 "PhotoPage.c"
 	} else {
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = FALSE;
-#line 9573 "PhotoPage.c"
+#line 9474 "PhotoPage.c"
 	}
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp52_) {
-#line 9577 "PhotoPage.c"
+#line 9478 "PhotoPage.c"
 		Photo* _tmp55_ = NULL;
 		Scaling _tmp56_ = {0};
 		gboolean _tmp57_ = FALSE;
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = photo;
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp56_ = scaling;
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_);
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = _tmp57_;
-#line 9589 "PhotoPage.c"
+#line 9490 "PhotoPage.c"
 	} else {
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = FALSE;
-#line 9593 "PhotoPage.c"
+#line 9494 "PhotoPage.c"
 	}
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp58_ = self->priv->straighten_button;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), _tmp51_);
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp59_ = selected_count;
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp60_ = count;
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp59_, _tmp60_);
-#line 1335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 9607 "PhotoPage.c"
+#line 9508 "PhotoPage.c"
 }
 
 
@@ -9621,67 +9522,67 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
 	EditingToolsEditingTool* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 9626 "PhotoPage.c"
+#line 9527 "PhotoPage.c"
 		gboolean _tmp4_ = FALSE;
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = !_tmp4_;
-#line 9632 "PhotoPage.c"
+#line 9533 "PhotoPage.c"
 	} else {
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = FALSE;
-#line 9636 "PhotoPage.c"
+#line 9537 "PhotoPage.c"
 	}
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 9640 "PhotoPage.c"
+#line 9541 "PhotoPage.c"
 		gboolean _tmp5_ = FALSE;
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp5_;
-#line 9646 "PhotoPage.c"
+#line 9547 "PhotoPage.c"
 	} else {
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9650 "PhotoPage.c"
+#line 9551 "PhotoPage.c"
 	}
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9654 "PhotoPage.c"
+#line 9555 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_has_photo (self);
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp6_;
-#line 9660 "PhotoPage.c"
+#line 9561 "PhotoPage.c"
 	} else {
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9664 "PhotoPage.c"
+#line 9565 "PhotoPage.c"
 	}
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 1363 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9670 "PhotoPage.c"
+#line 9571 "PhotoPage.c"
 	}
-#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
-#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = PAGE_CLASS (editing_host_page_parent_class)->on_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp7_);
-#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp8_;
-#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9680 "PhotoPage.c"
+#line 9581 "PhotoPage.c"
 }
 
 
@@ -9691,25 +9592,25 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
 	EditingToolsEditingTool* _tmp0_ = NULL;
 	GdkEventKey* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1368 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9698 "PhotoPage.c"
+#line 9599 "PhotoPage.c"
 	}
-#line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = PAGE_CLASS (editing_host_page_parent_class)->on_shift_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_);
-#line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9708 "PhotoPage.c"
+#line 9609 "PhotoPage.c"
 }
 
 
@@ -9719,25 +9620,25 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
 	EditingToolsEditingTool* _tmp0_ = NULL;
 	GdkEventKey* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1375 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1376 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1376 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9726 "PhotoPage.c"
+#line 9627 "PhotoPage.c"
 	}
-#line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = PAGE_CLASS (editing_host_page_parent_class)->on_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_);
-#line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9736 "PhotoPage.c"
+#line 9637 "PhotoPage.c"
 }
 
 
@@ -9749,53 +9650,53 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
 	EditingToolsEditingTool* _tmp2_ = NULL;
 	GdkEventKey* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 1382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->current_tool;
-#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 9754 "PhotoPage.c"
+#line 9655 "PhotoPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_;
-#line 9760 "PhotoPage.c"
+#line 9661 "PhotoPage.c"
 	} else {
-#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9764 "PhotoPage.c"
+#line 9665 "PhotoPage.c"
 	}
-#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9768 "PhotoPage.c"
+#line 9669 "PhotoPage.c"
 		gboolean _tmp4_ = FALSE;
-#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 9774 "PhotoPage.c"
+#line 9675 "PhotoPage.c"
 	} else {
-#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9778 "PhotoPage.c"
+#line 9679 "PhotoPage.c"
 	}
-#line 1383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9784 "PhotoPage.c"
+#line 9685 "PhotoPage.c"
 	}
-#line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
-#line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = PAGE_CLASS (editing_host_page_parent_class)->on_alt_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp5_);
-#line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp6_;
-#line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9794 "PhotoPage.c"
+#line 9695 "PhotoPage.c"
 }
 
 
@@ -9809,9 +9710,9 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 	Photo* _tmp14_ = NULL;
 	Dimensions _tmp15_ = {0};
 	GError * _inner_error_ = NULL;
-#line 1389 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 9810 "PhotoPage.c"
+#line 9711 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_ = NULL;
@@ -9822,148 +9723,148 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		Photo* _tmp6_ = NULL;
 		Orientation _tmp7_ = 0;
 		GdkPixbuf* _tmp8_ = NULL;
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = editing_host_page_get_photo (self);
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = photo_get_prefetched_copy (_tmp2_, &_inner_error_);
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_;
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9835 "PhotoPage.c"
-			goto __catch249_g_error;
+#line 9736 "PhotoPage.c"
+			goto __catch246_g_error;
 		}
-#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_get_photo (self);
-#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = photo_get_original_orientation (_tmp6_);
-#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = orientation_rotate_pixbuf (_tmp7_, _tmp0_);
-#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (original);
-#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		original = _tmp8_;
-#line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 9854 "PhotoPage.c"
+#line 9755 "PhotoPage.c"
 	}
-	goto __finally249;
-	__catch249_g_error:
+	goto __finally246;
+	__catch246_g_error:
 	{
 		GError* err = NULL;
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (original);
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9870 "PhotoPage.c"
+#line 9771 "PhotoPage.c"
 	}
-	__finally249:
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally246:
+#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (original);
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9883 "PhotoPage.c"
+#line 9784 "PhotoPage.c"
 	}
-#line 1399 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1399 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->swapped);
-#line 1399 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->swapped = _tmp9_;
-#line 1403 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = self->priv->zoom_slider;
-#line 1403 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange));
-#line 1403 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ != 0.0) {
-#line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1406 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1407 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 9901 "PhotoPage.c"
+#line 9802 "PhotoPage.c"
 	}
-#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = original;
-#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = editing_host_page_get_photo (self);
-#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo_get_master_dimensions (_tmp14_, &_tmp15_);
-#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, &_tmp15_, NULL);
-#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp14_);
-#line 1389 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (original);
-#line 9917 "PhotoPage.c"
+#line 9818 "PhotoPage.c"
 }
 
 
 static void editing_host_page_swap_out_original (EditingHostPage* self) {
 	GdkPixbuf* _tmp0_ = NULL;
-#line 1411 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1412 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1414 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->swapped;
-#line 1412 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1414 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 9929 "PhotoPage.c"
+#line 9830 "PhotoPage.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
 		Dimensions _tmp4_ = {0};
-#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->swapped;
-#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (self);
-#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
-#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp1_, &_tmp4_, NULL);
-#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp3_);
 #line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_g_object_unref0 (_tmp3_);
+#line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1416 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_update_cursor_for_zoom_context (self);
-#line 1419 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->swapped);
-#line 1419 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->swapped = NULL;
-#line 9954 "PhotoPage.c"
+#line 9855 "PhotoPage.c"
 	}
 }
 
 
 static gpointer _editing_tools_editing_tool_ref0 (gpointer self) {
-#line 1463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? editing_tools_editing_tool_ref (self) : NULL;
-#line 9962 "PhotoPage.c"
+#line 9863 "PhotoPage.c"
 }
 
 
@@ -9984,37 +9885,37 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	EditingToolsEditingTool* _tmp28_ = NULL;
 	EditingToolsPhotoCanvas* _tmp29_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (tool));
-#line 1426 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1427 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1429 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1433 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 1431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1433 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 1434 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1434 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancel_editing_pixbuf);
-#line 1434 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->cancel_editing_pixbuf = _tmp1_;
-#line 1438 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
-#line 1438 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1438 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
-#line 1438 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1438 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1438 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp5_;
-#line 10013 "PhotoPage.c"
+#line 9914 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp6_ = {0};
@@ -10028,192 +9929,192 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		GdkPixbuf* _tmp14_ = NULL;
 		GdkPixbuf* _tmp15_ = NULL;
 		GdkPixbuf* _tmp16_ = NULL;
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_.width = 0;
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_pixbuf_dim = _tmp6_;
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = tool;
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_);
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = editing_host_page_get_photo (self);
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = editing_tools_editing_tool_get_display_pixbuf (_tmp8_, &_tmp9_, _tmp11_, &_tmp12_, &_inner_error_);
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_pixbuf_dim = _tmp12_;
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp14_;
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10051 "PhotoPage.c"
-			goto __catch250_g_error;
+#line 9952 "PhotoPage.c"
+			goto __catch247_g_error;
 		}
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp7_;
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = NULL;
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (unscaled);
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		unscaled = _tmp15_;
 #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		unscaled = _tmp15_;
+#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = unscaled;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp16_ != NULL) {
-#line 10066 "PhotoPage.c"
+#line 9967 "PhotoPage.c"
 			Dimensions _tmp17_ = {0};
-#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = tool_pixbuf_dim;
-#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp17_;
-#line 10072 "PhotoPage.c"
+#line 9973 "PhotoPage.c"
 		}
-#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 10076 "PhotoPage.c"
+#line 9977 "PhotoPage.c"
 	}
-	goto __finally250;
-	__catch250_g_error:
+	goto __finally247;
+	__catch247_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
 		GtkToggleToolButton* _tmp20_ = NULL;
 		GtkToggleToolButton* _tmp21_ = NULL;
-#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = err;
-#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_->message;
-#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_warning ("PhotoPage.vala:1446: %s", _tmp19_);
-#line 1447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_warning ("PhotoPage.vala:1448: %s", _tmp19_);
+#line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, TRUE);
-#line 1450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = self->priv->current_editing_toggle;
-#line 1450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_vala_assert (_tmp20_ != NULL, "current_editing_toggle != null");
-#line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = self->priv->current_editing_toggle;
-#line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gtk_toggle_tool_button_set_active (_tmp21_, FALSE);
 #line 1453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		gtk_toggle_tool_button_set_active (_tmp21_, FALSE);
+#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 1453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (unscaled);
-#line 1453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10112 "PhotoPage.c"
+#line 10013 "PhotoPage.c"
 	}
-	__finally250:
-#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally247:
+#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (unscaled);
-#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10125 "PhotoPage.c"
+#line 10026 "PhotoPage.c"
 	}
-#line 1456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = unscaled;
-#line 1456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 10131 "PhotoPage.c"
+#line 10032 "PhotoPage.c"
 		GdkPixbuf* _tmp23_ = NULL;
 		Dimensions _tmp24_ = {0};
-#line 1457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = unscaled;
-#line 1457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = max_dim;
-#line 1457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_, NULL);
-#line 10140 "PhotoPage.c"
+#line 10041 "PhotoPage.c"
 	}
-#line 1460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = editing_host_page_editing_host_canvas_new (self);
-#line 1460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo_canvas = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas);
-#line 1463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = tool;
-#line 1463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = _editing_tools_editing_tool_ref0 (_tmp26_);
-#line 1463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (self->priv->current_tool);
-#line 1463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->current_tool = _tmp27_;
-#line 1464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->current_tool;
-#line 1464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = photo_canvas;
-#line 1464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_tools_editing_tool_activate (_tmp28_, _tmp29_);
-#line 1467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_place_tool_window (self);
-#line 1470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 1423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_photo_canvas_unref0 (photo_canvas);
-#line 1423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (unscaled);
-#line 10168 "PhotoPage.c"
+#line 10069 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self) {
-#line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_activated ((EditingHostPage*) self);
-#line 10175 "PhotoPage.c"
+#line 10076 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
-#line 1495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_deactivated ((EditingHostPage*) self);
-#line 10182 "PhotoPage.c"
+#line 10083 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement, gpointer self) {
-#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_applied ((EditingHostPage*) self, command, new_pixbuf, new_max_dim, needs_improvement);
-#line 10189 "PhotoPage.c"
+#line 10090 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self) {
-#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_cancelled ((EditingHostPage*) self);
-#line 10196 "PhotoPage.c"
+#line 10097 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self) {
-#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_aborted ((EditingHostPage*) self);
-#line 10203 "PhotoPage.c"
+#line 10104 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) {
 	gboolean result;
 	result = editing_host_page_update_pixbuf ((EditingHostPage*) self);
-#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10212 "PhotoPage.c"
+#line 10113 "PhotoPage.c"
 }
 
 
@@ -10243,60 +10144,60 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	GdkPixbuf* _tmp43_ = NULL;
 	gboolean _tmp46_ = FALSE;
 	Command* _tmp47_ = NULL;
-#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((command == NULL) || IS_COMMAND (command));
-#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((new_pixbuf == NULL) || GDK_IS_PIXBUF (new_pixbuf));
-#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (new_max_dim != NULL);
 #line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (new_max_dim != NULL);
+#line 1477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 1476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10256 "PhotoPage.c"
+#line 10157 "PhotoPage.c"
 	}
-#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
-#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _editing_tools_editing_tool_ref0 (_tmp1_);
-#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool = _tmp2_;
-#line 1479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (self->priv->current_tool);
-#line 1479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->current_tool = NULL;
-#line 1482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = tool;
-#line 1482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_tools_editing_tool_get_tool_window (_tmp3_);
-#line 1482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool_window = _tmp4_;
-#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = tool_window;
-#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ != NULL) {
-#line 10278 "PhotoPage.c"
+#line 10179 "PhotoPage.c"
 		EditingToolsEditingToolWindow* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
-#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = tool_window;
-#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_);
-#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp8_;
-#line 10287 "PhotoPage.c"
+#line 10188 "PhotoPage.c"
 	} else {
-#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 10291 "PhotoPage.c"
+#line 10192 "PhotoPage.c"
 	}
-#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 10295 "PhotoPage.c"
+#line 10196 "PhotoPage.c"
 		gint last_location_x = 0;
 		gint last_location_y = 0;
 		EditingToolsEditingToolWindow* _tmp9_ = NULL;
@@ -10314,219 +10215,219 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gint _tmp23_ = 0;
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = tool_window;
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), &_tmp10_, &_tmp11_);
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		last_location_x = _tmp10_;
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		last_location_y = _tmp11_;
-#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = self->priv->last_locations;
-#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = tool;
-#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_->name;
-#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = g_strconcat (_tmp14_, "_x", NULL);
-#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = last_location_x;
-#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, (gpointer) ((gintptr) _tmp17_));
-#line 1486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp16_);
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = self->priv->last_locations;
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = tool;
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_->name;
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = g_strconcat (_tmp20_, "_y", NULL);
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = last_location_y;
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, (gpointer) ((gintptr) _tmp23_));
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp22_);
-#line 10353 "PhotoPage.c"
+#line 10254 "PhotoPage.c"
 	}
-#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = tool;
-#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_tools_editing_tool_deactivate (_tmp24_);
 #line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_tools_editing_tool_deactivate (_tmp24_);
+#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = tool;
-#line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp26_, NULL, FALSE);
-#line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self);
-#line 1495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = tool;
-#line 1495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp28_, NULL, FALSE);
-#line 1495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp27_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp28_, 0, NULL, (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self);
-#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = tool;
-#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp30_, NULL, FALSE);
-#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self);
-#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp31_ = tool;
-#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp32_, NULL, FALSE);
-#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self);
-#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp33_ = tool;
-#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp34_, NULL, FALSE);
-#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_handlers_disconnect_matched (_tmp33_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp34_, 0, NULL, (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self);
 #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_handlers_disconnect_matched (_tmp33_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp34_, 0, NULL, (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self);
+#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool = NULL;
-#line 1504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->current_editing_toggle);
-#line 1504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->current_editing_toggle = NULL;
-#line 1507 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	replacement = NULL;
-#line 1508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = new_pixbuf;
-#line 1508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_ != NULL) {
-#line 10403 "PhotoPage.c"
+#line 10304 "PhotoPage.c"
 		GdkPixbuf* _tmp36_ = NULL;
 		GdkPixbuf* _tmp37_ = NULL;
-#line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = new_pixbuf;
-#line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = _g_object_ref0 (_tmp36_);
-#line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (replacement);
-#line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		replacement = _tmp37_;
-#line 10414 "PhotoPage.c"
+#line 10315 "PhotoPage.c"
 	} else {
 		GdkPixbuf* _tmp38_ = NULL;
-#line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = self->priv->cancel_editing_pixbuf;
-#line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp38_ != NULL) {
-#line 10421 "PhotoPage.c"
+#line 10322 "PhotoPage.c"
 			GdkPixbuf* _tmp39_ = NULL;
 			GdkPixbuf* _tmp40_ = NULL;
 			GdkPixbuf* _tmp41_ = NULL;
 			Dimensions _tmp42_ = {0};
-#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp39_ = self->priv->cancel_editing_pixbuf;
-#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp40_ = _g_object_ref0 (_tmp39_);
-#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (replacement);
-#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			replacement = _tmp40_;
-#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp41_ = replacement;
-#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			dimensions_for_pixbuf (_tmp41_, &_tmp42_);
-#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			*new_max_dim = _tmp42_;
-#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = FALSE;
-#line 10442 "PhotoPage.c"
+#line 10343 "PhotoPage.c"
 		} else {
-#line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = TRUE;
-#line 10446 "PhotoPage.c"
+#line 10347 "PhotoPage.c"
 		}
 	}
-#line 1518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = replacement;
-#line 1518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp43_ != NULL) {
-#line 10453 "PhotoPage.c"
+#line 10354 "PhotoPage.c"
 		GdkPixbuf* _tmp44_ = NULL;
 		Dimensions _tmp45_ = {0};
-#line 1519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = replacement;
-#line 1519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = *new_max_dim;
-#line 1519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp44_, &_tmp45_, NULL);
-#line 10462 "PhotoPage.c"
+#line 10363 "PhotoPage.c"
 	}
-#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancel_editing_pixbuf);
-#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->cancel_editing_pixbuf = NULL;
-#line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = needs_improvement;
-#line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_) {
-#line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = TRUE;
-#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_update_pixbuf_gsource_func, g_object_ref (self), g_object_unref);
-#line 10476 "PhotoPage.c"
+#line 10377 "PhotoPage.c"
 	}
-#line 1529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp47_ = command;
-#line 1529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp47_ != NULL) {
-#line 10482 "PhotoPage.c"
+#line 10383 "PhotoPage.c"
 		CommandManager* _tmp48_ = NULL;
 		CommandManager* _tmp49_ = NULL;
 		Command* _tmp50_ = NULL;
-#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp49_ = _tmp48_;
-#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp50_ = command;
-#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp49_, _tmp50_);
-#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp49_);
-#line 10496 "PhotoPage.c"
+#line 10397 "PhotoPage.c"
 	}
-#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (replacement);
-#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (tool_window);
-#line 1473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 10504 "PhotoPage.c"
+#line 10405 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 1536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10516 "PhotoPage.c"
+#line 10417 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButton* event) {
-#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event);
-#line 10525 "PhotoPage.c"
+#line 10426 "PhotoPage.c"
 }
 
 
@@ -10550,141 +10451,141 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	EditingToolsEditingTool* _tmp22_ = NULL;
 	gint _tmp23_ = 0;
 	gint _tmp24_ = 0;
-#line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
 #line 1542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 1542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_->type;
-#line 1542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == GDK_2BUTTON_PRESS) {
-#line 10559 "PhotoPage.c"
+#line 10460 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		EditingToolsEditingTool* _tmp3_ = NULL;
-#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->current_tool;
-#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_ == NULL) {
-#line 10566 "PhotoPage.c"
+#line 10467 "PhotoPage.c"
 			GdkEventButton* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
-#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = event;
-#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = editing_host_page_on_double_click (self, _tmp4_);
-#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = _tmp5_;
-#line 10575 "PhotoPage.c"
+#line 10476 "PhotoPage.c"
 		} else {
-#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = FALSE;
-#line 10579 "PhotoPage.c"
+#line 10480 "PhotoPage.c"
 		}
-#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = _tmp2_;
-#line 1543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10585 "PhotoPage.c"
+#line 10486 "PhotoPage.c"
 	}
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = event;
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_->x;
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = (gint) _tmp7_;
-#line 1546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = event;
-#line 1546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_->y;
-#line 1546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	y = (gint) _tmp9_;
-#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = self->priv->current_tool;
-#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 10603 "PhotoPage.c"
+#line 10504 "PhotoPage.c"
 		GtkScale* _tmp12_ = NULL;
 		gdouble _tmp13_ = 0.0;
-#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = self->priv->zoom_slider;
-#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_range_get_type (), GtkRange));
-#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp13_ != 0.0;
-#line 10612 "PhotoPage.c"
+#line 10513 "PhotoPage.c"
 	} else {
-#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 10616 "PhotoPage.c"
+#line 10517 "PhotoPage.c"
 	}
-#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 10620 "PhotoPage.c"
+#line 10521 "PhotoPage.c"
 		GdkEventButton* _tmp14_ = NULL;
 		gdouble _tmp15_ = 0.0;
 		GdkEventButton* _tmp16_ = NULL;
 		gdouble _tmp17_ = 0.0;
-#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = event;
-#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp14_->x;
-#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->zoom_pan_start_point.x = (gint) _tmp15_;
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = event;
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _tmp16_->y;
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->zoom_pan_start_point.y = (gint) _tmp17_;
-#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->is_pan_in_progress = TRUE;
-#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10645 "PhotoPage.c"
+#line 10546 "PhotoPage.c"
 	}
-#line 1560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->current_tool;
-#line 1560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp18_ == NULL) {
-#line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10655 "PhotoPage.c"
+#line 10556 "PhotoPage.c"
 	}
-#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = x;
-#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = y;
-#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = single_photo_page_is_inside_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp19_, _tmp20_);
-#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp21_) {
-#line 1567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10669 "PhotoPage.c"
+#line 10570 "PhotoPage.c"
 	}
-#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
-#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = x;
-#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = y;
-#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_tools_editing_tool_on_left_click (_tmp22_, _tmp23_, _tmp24_);
-#line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10683 "PhotoPage.c"
+#line 10584 "PhotoPage.c"
 }
 
 
@@ -10702,15 +10603,15 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 	EditingToolsEditingToolWindow* _tmp28_ = NULL;
 	EditingToolsEditingToolWindow* _tmp29_ = NULL;
 	gboolean _tmp30_ = FALSE;
-#line 1575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->is_pan_in_progress;
-#line 1576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10709 "PhotoPage.c"
+#line 10610 "PhotoPage.c"
 		GdkPoint viewport_center = {0};
 		ZoomState _tmp1_ = {0};
 		GdkPoint _tmp2_ = {0};
@@ -10735,125 +10636,125 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		ZoomBuffer* _tmp18_ = NULL;
 		ZoomBuffer* _tmp19_ = NULL;
 		ZoomState _tmp20_ = {0};
-#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_get_viewport_center (&_tmp1_, &_tmp2_);
-#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center = _tmp2_;
-#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = event;
-#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_->x;
-#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = self->priv->zoom_pan_start_point;
-#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_.x;
-#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		delta_x = ((gint) _tmp4_) - _tmp6_;
-#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = event;
-#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_->y;
-#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = self->priv->zoom_pan_start_point;
-#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_.y;
-#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		delta_y = ((gint) _tmp8_) - _tmp10_;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = viewport_center.x;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = delta_x;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center.x = _tmp11_ - _tmp12_;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = viewport_center.y;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = delta_y;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		viewport_center.y = _tmp13_ - _tmp14_;
 #line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		viewport_center.y = _tmp13_ - _tmp14_;
+#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_);
-#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = viewport_center;
-#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_init_pan (&zoom_state, &_tmp15_, &_tmp16_);
-#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = zoom_state;
-#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp17_);
-#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = single_photo_page_get_zoom_buffer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = zoom_state;
-#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_buffer_flush_demand_cache (_tmp19_, &_tmp20_);
-#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp19_);
 #line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_g_object_unref0 (_tmp19_);
+#line 1589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->is_pan_in_progress = FALSE;
-#line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 10796 "PhotoPage.c"
+#line 10697 "PhotoPage.c"
 	}
-#line 1593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->current_tool;
-#line 1593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_ == NULL) {
-#line 1594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 1594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10806 "PhotoPage.c"
+#line 10707 "PhotoPage.c"
 	}
-#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
-#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = event;
-#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = _tmp23_->x;
-#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = event;
-#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_->y;
-#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_tools_editing_tool_on_left_released (_tmp22_, (gint) _tmp24_, (gint) _tmp26_);
 #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_tools_editing_tool_on_left_released (_tmp22_, (gint) _tmp24_, (gint) _tmp26_);
+#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->current_tool;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = editing_tools_editing_tool_get_tool_window (_tmp27_);
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = _tmp28_;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp30_ = _tmp29_ != NULL;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp29_);
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
-#line 10832 "PhotoPage.c"
+#line 10733 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp31_ = NULL;
 		EditingToolsEditingToolWindow* _tmp32_ = NULL;
 		EditingToolsEditingToolWindow* _tmp33_ = NULL;
-#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = self->priv->current_tool;
-#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = editing_tools_editing_tool_get_tool_window (_tmp31_);
-#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = _tmp32_;
-#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow));
-#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp33_);
-#line 10846 "PhotoPage.c"
+#line 10747 "PhotoPage.c"
 	}
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10852 "PhotoPage.c"
+#line 10753 "PhotoPage.c"
 }
 
 
@@ -10862,28 +10763,28 @@ static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButto
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 1605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = page_on_context_buttonpress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_);
-#line 1605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 1605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10873 "PhotoPage.c"
+#line 10774 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_fetch_original ((EditingHostPage*) self);
-#line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10882 "PhotoPage.c"
+#line 10783 "PhotoPage.c"
 }
 
 
@@ -10903,107 +10804,107 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	ViewCollection* _tmp12_ = NULL;
 	ViewCollection* _tmp13_ = NULL;
 	gint _tmp14_ = 0;
-#line 1608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = map;
-#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10922 "PhotoPage.c"
+#line 10823 "PhotoPage.c"
 	}
-#line 1612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
-#line 1616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = editing_host_page_get_photo (self);
-#line 1616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo_has_transformations (_tmp6_);
-#line 1616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 1616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_on_fetch_original_gsource_func, g_object_ref (self), g_object_unref);
-#line 10940 "PhotoPage.c"
+#line 10841 "PhotoPage.c"
 	}
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = view_collection_get_selected_count (_tmp10_);
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_;
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp11_, _tmp14_);
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp13_);
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 10960 "PhotoPage.c"
+#line 10861 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage* self) {
-#line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered");
-#line 10969 "PhotoPage.c"
+#line 10870 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 1627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10982 "PhotoPage.c"
+#line 10883 "PhotoPage.c"
 		PixbufCache* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
-#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->master_cache;
-#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (self);
-#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE);
-#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 10996 "PhotoPage.c"
+#line 10897 "PhotoPage.c"
 	}
-#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11002 "PhotoPage.c"
+#line 10903 "PhotoPage.c"
 }
 
 
@@ -11022,82 +10923,82 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 	gint _tmp8_ = 0;
 	Dimensions _tmp9_ = {0};
 	gint _tmp10_ = 0;
-#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_.width = 0;
-#line 1636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	content_dim = _tmp0_;
-#line 1637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 1637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_get_zoomed_width (&_tmp1_);
-#line 1637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	content_dim.width = _tmp2_;
-#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_);
-#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = zoom_state_get_zoomed_height (&_tmp3_);
-#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	content_dim.height = _tmp4_;
-#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	canvas_dim = _tmp5_;
 #line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	canvas_dim = _tmp5_;
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = canvas_dim;
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_.width;
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = content_dim;
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_.width;
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ >= _tmp10_) {
-#line 11053 "PhotoPage.c"
+#line 10954 "PhotoPage.c"
 		Dimensions _tmp11_ = {0};
 		gint _tmp12_ = 0;
 		Dimensions _tmp13_ = {0};
 		gint _tmp14_ = 0;
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = canvas_dim;
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_.height;
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = content_dim;
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_.height;
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp12_ >= _tmp14_;
-#line 11068 "PhotoPage.c"
+#line 10969 "PhotoPage.c"
 	} else {
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 11072 "PhotoPage.c"
+#line 10973 "PhotoPage.c"
 	}
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp6_;
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11078 "PhotoPage.c"
+#line 10979 "PhotoPage.c"
 }
 
 
 static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 1644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_is_panning_possible (self);
-#line 1645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_FLEUR);
-#line 11092 "PhotoPage.c"
+#line 10993 "PhotoPage.c"
 	} else {
-#line 1648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 11096 "PhotoPage.c"
+#line 10997 "PhotoPage.c"
 	}
 }
 
@@ -11112,47 +11013,47 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	gint _tmp26_ = 0;
 	GdkModifierType _tmp27_ = 0;
 	gboolean _tmp28_ = FALSE;
-#line 1652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11119 "PhotoPage.c"
+#line 11020 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		GdkModifierType _tmp4_ = 0;
 		GdkEventMotion* _tmp5_ = NULL;
-#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = x;
-#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = y;
-#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = mask;
-#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_editing_tool_on_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = event;
-#line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gdk_event_request_motions (_tmp5_);
 #line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		gdk_event_request_motions (_tmp5_);
+#line 1661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11143 "PhotoPage.c"
+#line 11044 "PhotoPage.c"
 	}
-#line 1662 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_update_cursor_for_zoom_context (self);
 #line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_update_cursor_for_zoom_context (self);
+#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->is_pan_in_progress;
-#line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 11151 "PhotoPage.c"
+#line 11052 "PhotoPage.c"
 		gint delta_x = 0;
 		GdkEventMotion* _tmp7_ = NULL;
 		gdouble _tmp8_ = 0.0;
@@ -11174,75 +11075,75 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 		ZoomState _tmp21_ = {0};
 		GdkPoint _tmp22_ = {0};
 		ZoomState _tmp23_ = {0};
-#line 1665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = event;
-#line 1665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_->x;
-#line 1665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = self->priv->zoom_pan_start_point;
-#line 1665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_.x;
-#line 1665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		delta_x = ((gint) _tmp8_) - _tmp10_;
-#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = event;
-#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_->y;
-#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = self->priv->zoom_pan_start_point;
-#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_.y;
-#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		delta_y = ((gint) _tmp12_) - _tmp14_;
 #line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		delta_y = ((gint) _tmp12_) - _tmp14_;
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_);
-#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_get_viewport_center (&_tmp15_, &_tmp16_);
-#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center = _tmp16_;
-#line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = viewport_center.x;
-#line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = delta_x;
-#line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center.x = _tmp17_ - _tmp18_;
-#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = viewport_center.y;
-#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = delta_y;
-#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		viewport_center.y = _tmp19_ - _tmp20_;
 #line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		viewport_center.y = _tmp19_ - _tmp20_;
+#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp21_);
-#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = viewport_center;
-#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		zoom_state_init_pan (&zoom_state, &_tmp21_, &_tmp22_);
 #line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		zoom_state_init_pan (&zoom_state, &_tmp21_, &_tmp22_);
+#line 1676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = zoom_state;
-#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_on_interactive_pan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp23_);
-#line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11225 "PhotoPage.c"
+#line 11126 "PhotoPage.c"
 	}
-#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = event;
-#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = x;
-#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = y;
-#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = mask;
-#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = PAGE_CLASS (editing_host_page_parent_class)->on_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp24_, _tmp25_, _tmp26_, _tmp27_);
-#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp28_;
-#line 1678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11241 "PhotoPage.c"
+#line 11142 "PhotoPage.c"
 }
 
 
@@ -11251,83 +11152,83 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 	gboolean result = FALSE;
 	EditingToolsEditingTool* _tmp0_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11256 "PhotoPage.c"
+#line 11157 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_tools_editing_tool_on_leave_notify_event (_tmp1_);
-#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = _tmp2_;
-#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11267 "PhotoPage.c"
+#line 11168 "PhotoPage.c"
 	}
-#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = PAGE_CLASS (editing_host_page_parent_class)->on_leave_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
-#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp3_;
-#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11275 "PhotoPage.c"
+#line 11176 "PhotoPage.c"
 }
 
 
 static void editing_host_page_track_tool_window (EditingHostPage* self) {
 	EditingToolsEditingTool* _tmp0_ = NULL;
-#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
+#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11287 "PhotoPage.c"
+#line 11188 "PhotoPage.c"
 		EditingToolsEditingToolWindow* tool_window = NULL;
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		EditingToolsEditingToolWindow* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		EditingToolsEditingToolWindow* _tmp4_ = NULL;
-#line 1691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_tools_editing_tool_get_tool_window (_tmp1_);
-#line 1691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_window = _tmp2_;
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = tool_window;
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ != NULL) {
-#line 11303 "PhotoPage.c"
+#line 11204 "PhotoPage.c"
 			EditingToolsEditingToolWindow* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = tool_window;
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_);
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = !_tmp6_;
-#line 11312 "PhotoPage.c"
+#line 11213 "PhotoPage.c"
 		} else {
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = FALSE;
-#line 11316 "PhotoPage.c"
+#line 11217 "PhotoPage.c"
 		}
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_) {
-#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_place_tool_window (self);
-#line 11322 "PhotoPage.c"
+#line 11223 "PhotoPage.c"
 		}
-#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (tool_window);
-#line 11326 "PhotoPage.c"
+#line 11227 "PhotoPage.c"
 	}
 }
 
@@ -11335,17 +11236,17 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) {
 	EditingHostPage * self;
 	GdkRectangle _tmp0_ = {0};
-#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (rect != NULL);
-#line 1698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_track_tool_window (self);
 #line 1700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_track_tool_window (self);
+#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = *rect;
-#line 1700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->on_move (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_);
-#line 11344 "PhotoPage.c"
+#line 11245 "PhotoPage.c"
 }
 
 
@@ -11353,19 +11254,19 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r
 	EditingHostPage * self;
 	GeeHashMap* _tmp0_ = NULL;
 	GdkRectangle _tmp1_ = {0};
-#line 1703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (rect != NULL);
-#line 1704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->last_locations;
-#line 1704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
 #line 1706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
+#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = *rect;
-#line 1706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->on_move_finished (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp1_);
-#line 11364 "PhotoPage.c"
+#line 11265 "PhotoPage.c"
 }
 
 
@@ -11380,153 +11281,153 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	const gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	GQuark _tmp7_ = 0U;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label0 = 0;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label1 = 0;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label2 = 0;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label3 = 0;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label4 = 0;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label5 = 0;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label6 = 0;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label7 = 0;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label8 = 0;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label9 = 0;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label10 = 0;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 11403 "PhotoPage.c"
+#line 11304 "PhotoPage.c"
 	ZoomState new_zoom_state = {0};
 	ZoomState _tmp12_ = {0};
 	GdkPoint _tmp13_ = {0};
 	ZoomState _tmp14_ = {0};
-#line 1709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1710 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 1710 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current_zoom_state = _tmp0_;
-#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewport_center (&current_zoom_state, &_tmp1_);
-#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	viewport_center = _tmp1_;
 #line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	viewport_center = _tmp1_;
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_);
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (((_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("Left")))) || (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp7_ == ((0 != _tmp6_label2) ? _tmp6_label2 : (_tmp6_label2 = g_quark_from_static_string ("KP_4"))))) {
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11434 "PhotoPage.c"
+#line 11335 "PhotoPage.c"
 			default:
 			{
 				gint _tmp8_ = 0;
-#line 1717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp8_ = viewport_center.x;
-#line 1717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
-#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11444 "PhotoPage.c"
+#line 11345 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp7_ == ((0 != _tmp6_label3) ? _tmp6_label3 : (_tmp6_label3 = g_quark_from_static_string ("Right")))) || (_tmp7_ == ((0 != _tmp6_label4) ? _tmp6_label4 : (_tmp6_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp7_ == ((0 != _tmp6_label5) ? _tmp6_label5 : (_tmp6_label5 = g_quark_from_static_string ("KP_6"))))) {
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11450 "PhotoPage.c"
+#line 11351 "PhotoPage.c"
 			default:
 			{
 				gint _tmp9_ = 0;
-#line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp9_ = viewport_center.x;
-#line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
-#line 1724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11460 "PhotoPage.c"
+#line 11361 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp7_ == ((0 != _tmp6_label6) ? _tmp6_label6 : (_tmp6_label6 = g_quark_from_static_string ("Down")))) || (_tmp7_ == ((0 != _tmp6_label7) ? _tmp6_label7 : (_tmp6_label7 = g_quark_from_static_string ("KP_Down"))))) || (_tmp7_ == ((0 != _tmp6_label8) ? _tmp6_label8 : (_tmp6_label8 = g_quark_from_static_string ("KP_2"))))) {
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11466 "PhotoPage.c"
+#line 11367 "PhotoPage.c"
 			default:
 			{
 				gint _tmp10_ = 0;
-#line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = viewport_center.y;
-#line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
-#line 1730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11476 "PhotoPage.c"
+#line 11377 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp7_ == ((0 != _tmp6_label9) ? _tmp6_label9 : (_tmp6_label9 = g_quark_from_static_string ("Up")))) || (_tmp7_ == ((0 != _tmp6_label10) ? _tmp6_label10 : (_tmp6_label10 = g_quark_from_static_string ("KP_Up"))))) || (_tmp7_ == ((0 != _tmp6_label11) ? _tmp6_label11 : (_tmp6_label11 = g_quark_from_static_string ("KP_8"))))) {
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11482 "PhotoPage.c"
+#line 11383 "PhotoPage.c"
 			default:
 			{
 				gint _tmp11_ = 0;
-#line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = viewport_center.y;
-#line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
-#line 1736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11492 "PhotoPage.c"
+#line 11393 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11498 "PhotoPage.c"
+#line 11399 "PhotoPage.c"
 			default:
 			{
-#line 1739 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = FALSE;
-#line 1739 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 11505 "PhotoPage.c"
+#line 11406 "PhotoPage.c"
 			}
 		}
 	}
-#line 1742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = current_zoom_state;
-#line 1742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = viewport_center;
-#line 1742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_pan (&new_zoom_state, &_tmp12_, &_tmp13_);
-#line 1743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_zoom_state;
-#line 1743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp14_);
-#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
 #line 1746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
+#line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 1746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11525 "PhotoPage.c"
+#line 11426 "PhotoPage.c"
 }
 
 
@@ -11543,212 +11444,212 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp11_ = NULL;
 	const gchar* _tmp12_ = NULL;
 	GQuark _tmp14_ = 0U;
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label0 = 0;
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label1 = 0;
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label2 = 0;
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label3 = 0;
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label4 = 0;
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label5 = 0;
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label6 = 0;
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label7 = 0;
-#line 11558 "PhotoPage.c"
+#line 11459 "PhotoPage.c"
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-#line 1749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
 #line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11569 "PhotoPage.c"
+#line 11470 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		GdkEventKey* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 1752 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1752 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = event;
-#line 1752 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_tools_editing_tool_on_keypress (_tmp1_, _tmp2_);
-#line 1752 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_) {
-#line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			result = TRUE;
-#line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11585 "PhotoPage.c"
+#line 11486 "PhotoPage.c"
 		}
 	}
-#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_is_panning_possible (self);
-#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11592 "PhotoPage.c"
+#line 11493 "PhotoPage.c"
 		GdkEventKey* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = event;
-#line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_on_keyboard_pan_event (self, _tmp5_);
-#line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			result = TRUE;
-#line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11605 "PhotoPage.c"
+#line 11506 "PhotoPage.c"
 		}
 	}
-#line 1765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
-#line 1765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = editing_host_page_on_zoom_slider_key_press (self, _tmp7_);
-#line 1765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 1766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11618 "PhotoPage.c"
+#line 11519 "PhotoPage.c"
 	}
-#line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	handled = TRUE;
 #line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	handled = TRUE;
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = event;
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_->keyval;
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = gdk_keyval_name (_tmp10_);
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = (NULL == _tmp12_) ? 0 : g_quark_from_string (_tmp12_);
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((_tmp14_ == ((0 != _tmp13_label0) ? _tmp13_label0 : (_tmp13_label0 = g_quark_from_static_string ("Down")))) || (_tmp14_ == ((0 != _tmp13_label1) ? _tmp13_label1 : (_tmp13_label1 = g_quark_from_static_string ("KP_Down"))))) {
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11636 "PhotoPage.c"
+#line 11537 "PhotoPage.c"
 			default:
 			{
-#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11641 "PhotoPage.c"
+#line 11542 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp14_ == ((0 != _tmp13_label2) ? _tmp13_label2 : (_tmp13_label2 = g_quark_from_static_string ("equal")))) || (_tmp14_ == ((0 != _tmp13_label3) ? _tmp13_label3 : (_tmp13_label3 = g_quark_from_static_string ("plus"))))) || (_tmp14_ == ((0 != _tmp13_label4) ? _tmp13_label4 : (_tmp13_label4 = g_quark_from_static_string ("KP_Add"))))) {
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11647 "PhotoPage.c"
+#line 11548 "PhotoPage.c"
 			default:
 			{
-#line 1780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
-#line 1781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11654 "PhotoPage.c"
+#line 11555 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp14_ == ((0 != _tmp13_label5) ? _tmp13_label5 : (_tmp13_label5 = g_quark_from_static_string ("minus")))) || (_tmp14_ == ((0 != _tmp13_label6) ? _tmp13_label6 : (_tmp13_label6 = g_quark_from_static_string ("underscore"))))) || (_tmp14_ == ((0 != _tmp13_label7) ? _tmp13_label7 : (_tmp13_label7 = g_quark_from_static_string ("KP_Subtract"))))) {
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11660 "PhotoPage.c"
+#line 11561 "PhotoPage.c"
 			default:
 			{
-#line 1787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1789 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
-#line 1788 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11667 "PhotoPage.c"
+#line 11568 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11673 "PhotoPage.c"
+#line 11574 "PhotoPage.c"
 			default:
 			{
-#line 1791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
-#line 1792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11680 "PhotoPage.c"
+#line 11581 "PhotoPage.c"
 			}
 		}
 	}
-#line 1795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = handled;
-#line 1795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 1796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11692 "PhotoPage.c"
+#line 11593 "PhotoPage.c"
 	}
-#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event != NULL) {
-#line 11696 "PhotoPage.c"
+#line 11597 "PhotoPage.c"
 		GdkEventKey* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = event;
-#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp17_);
-#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp18_;
-#line 11705 "PhotoPage.c"
+#line 11606 "PhotoPage.c"
 	} else {
-#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = TRUE;
-#line 11709 "PhotoPage.c"
+#line 11610 "PhotoPage.c"
 	}
-#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp16_;
-#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11715 "PhotoPage.c"
+#line 11616 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* default_ctx, Dimensions* dim) {
 	EditingHostPage * self;
 	EditingToolsEditingTool* _tmp0_ = NULL;
-#line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (default_ctx != NULL);
-#line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (dim != NULL);
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (dim != NULL);
+#line 1805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11732 "PhotoPage.c"
+#line 11633 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		EditingToolsPhotoCanvas* _tmp2_ = NULL;
 		cairo_t* _tmp3_ = NULL;
 		Dimensions _tmp4_ = {0};
-#line 1804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_->canvas;
-#line 1804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = default_ctx;
-#line 1804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = *dim;
-#line 1804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_);
-#line 11747 "PhotoPage.c"
+#line 11648 "PhotoPage.c"
 	}
 }
 
@@ -11757,130 +11658,130 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
 	EditingHostPage * self;
 	gboolean _tmp0_ = FALSE;
 	EditingToolsEditingTool* _tmp1_ = NULL;
-#line 1807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 1807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 1811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
-#line 1811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 11766 "PhotoPage.c"
+#line 11667 "PhotoPage.c"
 		SinglePhotoPageUpdateReason _tmp2_ = 0;
-#line 1811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = reason;
-#line 1811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 11772 "PhotoPage.c"
+#line 11673 "PhotoPage.c"
 	} else {
-#line 1811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 11776 "PhotoPage.c"
+#line 11677 "PhotoPage.c"
 	}
-#line 1811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 11780 "PhotoPage.c"
+#line 11681 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp3_ = NULL;
 		EditingToolsPhotoCanvas* _tmp4_ = NULL;
 		Dimensions _tmp5_ = {0};
 		GdkPixbuf* _tmp6_ = NULL;
 		GdkRectangle _tmp7_ = {0};
-#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->current_tool;
-#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_->canvas;
-#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = *old_dim;
-#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = pixbuf;
-#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp7_);
-#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_photo_canvas_resized_pixbuf (_tmp4_, &_tmp5_, _tmp6_, &_tmp7_);
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->cancel_editing_pixbuf);
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->cancel_editing_pixbuf = NULL;
-#line 11802 "PhotoPage.c"
+#line 11703 "PhotoPage.c"
 	}
 }
 
 
 static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPage* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
-#line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11813 "PhotoPage.c"
+#line 11714 "PhotoPage.c"
 }
 
 
 GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gint scale) {
-#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_left_trinket (self, scale);
-#line 11822 "PhotoPage.c"
+#line 11723 "PhotoPage.c"
 }
 
 
 static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
-#line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11832 "PhotoPage.c"
+#line 11733 "PhotoPage.c"
 }
 
 
 GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, gint scale) {
-#line 1821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_left_trinket (self, scale);
-#line 11841 "PhotoPage.c"
+#line 11742 "PhotoPage.c"
 }
 
 
 static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
-#line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11851 "PhotoPage.c"
+#line 11752 "PhotoPage.c"
 }
 
 
 GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint scale) {
-#line 1825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_right_trinket (self, scale);
-#line 11860 "PhotoPage.c"
+#line 11761 "PhotoPage.c"
 }
 
 
 static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPage* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
-#line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11870 "PhotoPage.c"
+#line 11771 "PhotoPage.c"
 }
 
 
 GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gint scale) {
-#line 1829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_right_trinket (self, scale);
-#line 11879 "PhotoPage.c"
+#line 11780 "PhotoPage.c"
 }
 
 
@@ -11904,48 +11805,48 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	GdkPixbuf* _tmp74_ = NULL;
 	GdkPixbuf* _tmp98_ = NULL;
 	GdkPixbuf* _tmp99_ = NULL;
-#line 1833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (ctx != NULL);
-#line 1833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11913 "PhotoPage.c"
+#line 11814 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		cairo_t* _tmp2_ = NULL;
-#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = ctx;
-#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_tools_editing_tool_paint (_tmp1_, _tmp2_);
 #line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		editing_tools_editing_tool_paint (_tmp1_, _tmp2_);
+#line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11924 "PhotoPage.c"
+#line 11825 "PhotoPage.c"
 	}
-#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->photo_missing;
-#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11930 "PhotoPage.c"
+#line 11831 "PhotoPage.c"
 		gboolean _tmp5_ = FALSE;
-#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_has_photo (self);
-#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp5_;
-#line 11936 "PhotoPage.c"
+#line 11837 "PhotoPage.c"
 	} else {
-#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = FALSE;
-#line 11940 "PhotoPage.c"
+#line 11841 "PhotoPage.c"
 	}
-#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 11944 "PhotoPage.c"
+#line 11845 "PhotoPage.c"
 		cairo_t* _tmp6_ = NULL;
 		cairo_t* _tmp7_ = NULL;
 		Dimensions _tmp8_ = {0};
@@ -11963,91 +11864,91 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
-#line 1841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = ctx;
-#line 1841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		set_source_color_from_string (_tmp6_, "#000");
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = ctx;
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp8_.width;
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_.height;
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp7_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp9_, (gdouble) _tmp11_);
-#line 1843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = ctx;
-#line 1843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp12_);
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = ctx;
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_paint (_tmp13_);
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _ ("Photo source file missing: %s");
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = editing_host_page_get_photo (self);
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = g_file_get_path (_tmp18_);
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = g_strdup_printf (_tmp14_, _tmp20_);
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_draw_message (self, _tmp22_);
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp22_);
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp20_);
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12016 "PhotoPage.c"
+#line 11917 "PhotoPage.c"
 	}
-#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = ctx;
-#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = *ctx_dim;
-#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_);
 #line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_);
+#line 1853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp25_);
-#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = zoom_state_is_default (&_tmp25_);
-#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 1852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12032 "PhotoPage.c"
+#line 11933 "PhotoPage.c"
 	}
-#line 1855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp27_);
-#line 1855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scaled_rect = _tmp27_;
 #line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	scaled_rect = _tmp27_;
+#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = editing_host_page_get_bottom_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
-#line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	trinket = _tmp28_;
-#line 1858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = trinket;
-#line 1858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_ != NULL) {
-#line 12046 "PhotoPage.c"
+#line 11947 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp30_ = {0};
 		gint _tmp31_ = 0;
@@ -12073,75 +11974,75 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gint _tmp50_ = 0;
 		gint _tmp51_ = 0;
 		cairo_t* _tmp52_ = NULL;
-#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = scaled_rect;
-#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = _tmp30_.x;
-#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = _tmp31_ + EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = scaled_rect;
-#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = _tmp32_.y;
-#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = scaled_rect;
-#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp35_ = _tmp34_.height;
-#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = trinket;
-#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = gdk_pixbuf_get_height (_tmp36_);
-#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = _tmp37_;
-#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = ((_tmp33_ + _tmp35_) - _tmp38_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = ctx;
-#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = trinket;
-#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp41_ = x;
-#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp42_ = y;
-#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_cairo_set_source_pixbuf (_tmp39_, _tmp40_, (gdouble) _tmp41_, (gdouble) _tmp42_);
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp43_ = ctx;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = x;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = y;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp46_ = trinket;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = gdk_pixbuf_get_width (_tmp46_);
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = _tmp47_;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp49_ = trinket;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp50_ = gdk_pixbuf_get_height (_tmp49_);
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = _tmp50_;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp43_, (gdouble) _tmp44_, (gdouble) _tmp45_, (gdouble) _tmp48_, (gdouble) _tmp51_);
-#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = ctx;
-#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp52_);
-#line 12128 "PhotoPage.c"
+#line 12029 "PhotoPage.c"
 	}
-#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp53_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
-#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	trinket = _tmp53_;
-#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp54_ = trinket;
-#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp54_ != NULL) {
-#line 12140 "PhotoPage.c"
+#line 12041 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp55_ = {0};
 		gint _tmp56_ = 0;
@@ -12162,65 +12063,65 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gint _tmp70_ = 0;
 		gint _tmp71_ = 0;
 		cairo_t* _tmp72_ = NULL;
-#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = scaled_rect;
-#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp56_ = _tmp55_.x;
-#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = _tmp56_ + EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp57_ = scaled_rect;
-#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp58_ = _tmp57_.y;
-#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = _tmp58_ + EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp59_ = ctx;
-#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp60_ = trinket;
-#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp61_ = x;
-#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp62_ = y;
-#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_cairo_set_source_pixbuf (_tmp59_, _tmp60_, (gdouble) _tmp61_, (gdouble) _tmp62_);
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp63_ = ctx;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp64_ = x;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp65_ = y;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp66_ = trinket;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp67_ = gdk_pixbuf_get_width (_tmp66_);
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp68_ = _tmp67_;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp69_ = trinket;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp70_ = gdk_pixbuf_get_height (_tmp69_);
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp71_ = _tmp70_;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp63_, (gdouble) _tmp64_, (gdouble) _tmp65_, (gdouble) _tmp68_, (gdouble) _tmp71_);
-#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp72_ = ctx;
-#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp72_);
-#line 12207 "PhotoPage.c"
+#line 12108 "PhotoPage.c"
 	}
-#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp73_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
-#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	trinket = _tmp73_;
-#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp74_ = trinket;
-#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp74_ != NULL) {
-#line 12219 "PhotoPage.c"
+#line 12120 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp75_ = {0};
 		gint _tmp76_ = 0;
@@ -12246,75 +12147,75 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gint _tmp95_ = 0;
 		gint _tmp96_ = 0;
 		cairo_t* _tmp97_ = NULL;
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp75_ = scaled_rect;
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp76_ = _tmp75_.x;
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp77_ = scaled_rect;
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp78_ = _tmp77_.width;
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp79_ = trinket;
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp80_ = gdk_pixbuf_get_width (_tmp79_);
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp81_ = _tmp80_;
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = ((_tmp76_ + _tmp78_) - _tmp81_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp82_ = scaled_rect;
-#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp83_ = _tmp82_.y;
-#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = _tmp83_ + EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp84_ = ctx;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp85_ = trinket;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp86_ = x;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp87_ = y;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_cairo_set_source_pixbuf (_tmp84_, _tmp85_, (gdouble) _tmp86_, (gdouble) _tmp87_);
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp88_ = ctx;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp89_ = x;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp90_ = y;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp91_ = trinket;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp92_ = gdk_pixbuf_get_width (_tmp91_);
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp93_ = _tmp92_;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp94_ = trinket;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp95_ = gdk_pixbuf_get_height (_tmp94_);
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp96_ = _tmp95_;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp93_, (gdouble) _tmp96_);
-#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp97_ = ctx;
-#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp97_);
-#line 12301 "PhotoPage.c"
+#line 12202 "PhotoPage.c"
 	}
-#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp98_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
-#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	trinket = _tmp98_;
-#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp99_ = trinket;
-#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp99_ != NULL) {
-#line 12313 "PhotoPage.c"
+#line 12214 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp100_ = {0};
 		gint _tmp101_ = 0;
@@ -12345,94 +12246,94 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gint _tmp125_ = 0;
 		gint _tmp126_ = 0;
 		cairo_t* _tmp127_ = NULL;
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp100_ = scaled_rect;
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp101_ = _tmp100_.x;
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp102_ = scaled_rect;
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp103_ = _tmp102_.width;
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp104_ = trinket;
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp105_ = gdk_pixbuf_get_width (_tmp104_);
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp106_ = _tmp105_;
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = ((_tmp101_ + _tmp103_) - _tmp106_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp107_ = scaled_rect;
-#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp108_ = _tmp107_.y;
-#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp109_ = scaled_rect;
-#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp110_ = _tmp109_.height;
-#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp111_ = trinket;
-#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp112_ = gdk_pixbuf_get_height (_tmp111_);
-#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp113_ = _tmp112_;
-#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = ((_tmp108_ + _tmp110_) - _tmp113_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp114_ = ctx;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp115_ = trinket;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp116_ = x;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp117_ = y;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_cairo_set_source_pixbuf (_tmp114_, _tmp115_, (gdouble) _tmp116_, (gdouble) _tmp117_);
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp118_ = ctx;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp119_ = x;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp120_ = y;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp121_ = trinket;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp122_ = gdk_pixbuf_get_width (_tmp121_);
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp123_ = _tmp122_;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp124_ = trinket;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp125_ = gdk_pixbuf_get_height (_tmp124_);
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp126_ = _tmp125_;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp118_, (gdouble) _tmp119_, (gdouble) _tmp120_, (gdouble) _tmp123_, (gdouble) _tmp126_);
-#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp127_ = ctx;
-#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp127_);
-#line 12410 "PhotoPage.c"
+#line 12311 "PhotoPage.c"
 	}
-#line 1833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 12414 "PhotoPage.c"
+#line 12315 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* photo) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp0_;
-#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 12431 "PhotoPage.c"
+#line 12332 "PhotoPage.c"
 }
 
 
@@ -12450,93 +12351,93 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 	CommandManager* _tmp9_ = NULL;
 	CommandManager* _tmp10_ = NULL;
 	RotateSingleCommand* _tmp11_ = NULL;
-#line 1898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (name != NULL);
-#line 1898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (description != NULL);
-#line 1899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 1901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
+#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 1901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
+#line 1905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (self);
-#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 1904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12467 "PhotoPage.c"
+#line 12368 "PhotoPage.c"
 	}
-#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
-#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = rotation;
-#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = name;
-#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = description;
-#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = rotate_single_command_new (_tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command = _tmp8_;
 #line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	command = _tmp8_;
+#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = command;
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp10_);
-#line 1898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12499 "PhotoPage.c"
+#line 12400 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_rotate_clockwise (EditingHostPage* self) {
-#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP);
-#line 12508 "PhotoPage.c"
+#line 12409 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) {
-#line 1915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 12517 "PhotoPage.c"
+#line 12418 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_flip_horizontally (EditingHostPage* self) {
-#line 1919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "");
-#line 12526 "PhotoPage.c"
+#line 12427 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_flip_vertically (EditingHostPage* self) {
-#line 1923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "");
-#line 12535 "PhotoPage.c"
+#line 12436 "PhotoPage.c"
 }
 
 
@@ -12556,41 +12457,41 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	CommandManager* _tmp21_ = NULL;
 	CommandManager* _tmp22_ = NULL;
 	RevertSingleCommand* _tmp23_ = NULL;
-#line 1927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 1928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12563 "PhotoPage.c"
+#line 12464 "PhotoPage.c"
 	}
-#line 1931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp1_, 0, 0);
-#line 1931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
 #line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
+#line 1935 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
-#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1935 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 1934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12575 "PhotoPage.c"
+#line 12476 "PhotoPage.c"
 	}
-#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
-#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = photo_has_editable (_tmp4_);
-#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 12589 "PhotoPage.c"
+#line 12490 "PhotoPage.c"
 		AppWindow* _tmp7_ = NULL;
 		AppWindow* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
@@ -12601,73 +12502,73 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 		gboolean _tmp14_ = FALSE;
 		Photo* _tmp15_ = NULL;
 		Photo* _tmp16_ = NULL;
-#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = app_window_get_instance ();
-#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = view_collection_get_sources (_tmp10_);
-#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp12_);
-#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = !_tmp13_;
-#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp14_) {
 #line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		if (_tmp14_) {
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 12626 "PhotoPage.c"
+#line 12527 "PhotoPage.c"
 		}
-#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = editing_host_page_get_photo (self);
-#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_revert_to_master (_tmp16_, TRUE);
-#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 12636 "PhotoPage.c"
+#line 12537 "PhotoPage.c"
 	}
-#line 1945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_set_photo_missing (self, FALSE);
+	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_set_photo_missing (self, FALSE);
+#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = editing_host_page_get_photo (self);
-#line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = _tmp17_;
-#line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = revert_single_command_new (_tmp18_);
-#line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = _tmp19_;
-#line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp18_);
-#line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp20_;
-#line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = _tmp21_;
-#line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = command;
-#line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp22_);
-#line 1927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12666 "PhotoPage.c"
+#line 12567 "PhotoPage.c"
 }
 
 
@@ -12693,104 +12594,104 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	CommandManager* _tmp16_ = NULL;
 	CommandManager* _tmp17_ = NULL;
 	EditTitleCommand* _tmp18_ = NULL;
-#line 1953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
+#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (self);
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_LIBRARY_PHOTO);
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12704 "PhotoPage.c"
+#line 12605 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		LibraryPhoto* _tmp4_ = NULL;
-#line 1956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (self);
-#line 1956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp3_) : NULL;
-#line 1956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ == NULL) {
-#line 1956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12715 "PhotoPage.c"
+#line 12616 "PhotoPage.c"
 		}
-#line 1956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12721 "PhotoPage.c"
+#line 12622 "PhotoPage.c"
 	} else {
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12727 "PhotoPage.c"
+#line 12628 "PhotoPage.c"
 	}
-#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
-#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = edit_title_dialog_new (_tmp7_);
-#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp7_);
-#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	edit_title_dialog = _tmp9_;
-#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = edit_title_dialog;
-#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = edit_title_dialog_execute (_tmp10_);
-#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_title = _tmp11_;
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = new_title;
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_ == NULL) {
-#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (new_title);
-#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_text_entry_dialog_mediator_unref0 (edit_title_dialog);
-#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12761 "PhotoPage.c"
+#line 12662 "PhotoPage.c"
 	}
-#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
-#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_title;
-#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = edit_title_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), _tmp14_);
-#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp15_;
-#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = command;
-#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command));
-#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp17_);
-#line 1953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 1953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (new_title);
-#line 1953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
-#line 1953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12789 "PhotoPage.c"
+#line 12690 "PhotoPage.c"
 }
 
 
@@ -12816,104 +12717,104 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	CommandManager* _tmp16_ = NULL;
 	CommandManager* _tmp17_ = NULL;
 	EditCommentCommand* _tmp18_ = NULL;
-#line 1969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
+#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (self);
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_LIBRARY_PHOTO);
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12827 "PhotoPage.c"
+#line 12728 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		LibraryPhoto* _tmp4_ = NULL;
-#line 1972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (self);
-#line 1972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp3_) : NULL;
-#line 1972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ == NULL) {
-#line 1972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12838 "PhotoPage.c"
+#line 12739 "PhotoPage.c"
 		}
-#line 1972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12844 "PhotoPage.c"
+#line 12745 "PhotoPage.c"
 	} else {
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12850 "PhotoPage.c"
+#line 12751 "PhotoPage.c"
 	}
-#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
-#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = edit_comment_dialog_new (_tmp7_, FALSE);
-#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp7_);
-#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	edit_comment_dialog = _tmp9_;
-#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = edit_comment_dialog;
-#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = edit_comment_dialog_execute (_tmp10_);
-#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_comment = _tmp11_;
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = new_comment;
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_ == NULL) {
-#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (new_comment);
-#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12884 "PhotoPage.c"
+#line 12785 "PhotoPage.c"
 	}
-#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
-#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_comment;
-#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = edit_comment_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), _tmp14_);
-#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp15_;
-#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = command;
-#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command));
-#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp17_);
-#line 1969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 1969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (new_comment);
-#line 1969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 1969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12912 "PhotoPage.c"
+#line 12813 "PhotoPage.c"
 }
 
 
@@ -12932,43 +12833,43 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
-#line 1985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12939 "PhotoPage.c"
+#line 12840 "PhotoPage.c"
 	}
-#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = adjust_date_time_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATEABLE, Dateable), 1, !G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE), FALSE, FALSE);
-#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp4_;
-#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = dialog;
-#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = adjust_date_time_dialog_execute (_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	time_shift = _tmp6_;
-#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	keep_relativity = _tmp7_;
-#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	modify_originals = _tmp8_;
-#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp9_) {
-#line 12967 "PhotoPage.c"
+#line 12868 "PhotoPage.c"
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		GeeList* _tmp12_ = NULL;
@@ -12983,63 +12884,63 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 		CommandManager* _tmp20_ = NULL;
 		CommandManager* _tmp21_ = NULL;
 		AdjustDateTimePhotoCommand* _tmp22_ = NULL;
-#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = view_collection_get_selected (_tmp11_);
-#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = _tmp12_;
-#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp11_);
 #line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_data_collection_unref0 (_tmp11_);
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = editing_host_page_get_photo (self);
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp14_;
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = time_shift;
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = modify_originals;
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = adjust_date_time_photo_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATEABLE, Dateable), _tmp16_, _tmp17_);
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		command = _tmp19_;
 #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		command = _tmp19_;
+#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = command;
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command));
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp21_);
-#line 1993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 13022 "PhotoPage.c"
+#line 12923 "PhotoPage.c"
 	}
-#line 1985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (dialog);
-#line 13026 "PhotoPage.c"
+#line 12927 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_set_background (EditingHostPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 13038 "PhotoPage.c"
+#line 12939 "PhotoPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp1_ = NULL;
 		gboolean desktop = FALSE;
@@ -13048,21 +12949,21 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
-#line 2004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = set_background_photo_dialog_new ();
-#line 2004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		dialog = _tmp1_;
 #line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		dialog = _tmp1_;
+#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = dialog;
-#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = set_background_photo_dialog_execute (_tmp2_, &_tmp3_, &_tmp4_);
-#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		desktop = _tmp3_;
-#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		screensaver = _tmp4_;
-#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 13061 "PhotoPage.c"
+#line 12962 "PhotoPage.c"
 			AppWindow* _tmp6_ = NULL;
 			AppWindow* _tmp7_ = NULL;
 			Photo* _tmp8_ = NULL;
@@ -13071,47 +12972,47 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 			gboolean _tmp11_ = FALSE;
 			AppWindow* _tmp12_ = NULL;
 			AppWindow* _tmp13_ = NULL;
-#line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = app_window_get_instance ();
-#line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = _tmp6_;
-#line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp7_);
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = editing_host_page_get_photo (self);
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = _tmp8_;
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = desktop;
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = screensaver;
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			desktop_integration_set_background (_tmp9_, _tmp10_, _tmp11_);
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp9_);
-#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = app_window_get_instance ();
-#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = _tmp12_;
-#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp13_);
-#line 13098 "PhotoPage.c"
+#line 12999 "PhotoPage.c"
 		}
-#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_set_background_dialog_unref0 (dialog);
-#line 13102 "PhotoPage.c"
+#line 13003 "PhotoPage.c"
 	}
 }
 
 
 static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
-#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 13110 "PhotoPage.c"
+#line 13011 "PhotoPage.c"
 }
 
 
@@ -13127,47 +13028,47 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	EditingToolsEditingTool* _tmp6_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 2015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->rotate_button;
-#line 2015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_button_set_icon_name (_tmp0_, RESOURCES_COUNTERCLOCKWISE);
-#line 2016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->rotate_button;
-#line 2016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_button_set_label (_tmp1_, RESOURCES_ROTATE_CCW_LABEL);
-#line 2017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->rotate_button;
-#line 2017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->rotate_button;
-#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("clicked", gtk_tool_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self);
-#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = self->priv->rotate_button;
-#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp5_, "clicked", (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked, self, 0);
 #line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp5_, "clicked", (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked, self, 0);
+#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->current_tool;
-#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ == NULL) {
-#line 2022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 13156 "PhotoPage.c"
+#line 13057 "PhotoPage.c"
 	}
-#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
-#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp7_);
-#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp8_;
-#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13166 "PhotoPage.c"
+#line 13067 "PhotoPage.c"
 }
 
 
@@ -13185,75 +13086,75 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	EditingToolsEditingTool* _tmp8_ = NULL;
 	GdkEventKey* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 2027 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 2028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->rotate_button;
-#line 2028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_button_set_icon_name (_tmp0_, RESOURCES_CLOCKWISE);
-#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->rotate_button;
-#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_button_set_label (_tmp1_, RESOURCES_ROTATE_CW_LABEL);
-#line 2030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->rotate_button;
-#line 2030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP);
-#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->rotate_button;
-#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("clicked", gtk_tool_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked, self);
-#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = self->priv->rotate_button;
-#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp5_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0);
 #line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp5_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0);
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = self->priv->current_tool;
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ == NULL) {
-#line 13212 "PhotoPage.c"
+#line 13113 "PhotoPage.c"
 		gboolean _tmp9_ = FALSE;
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp9_;
-#line 13218 "PhotoPage.c"
+#line 13119 "PhotoPage.c"
 	} else {
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = FALSE;
-#line 13222 "PhotoPage.c"
+#line 13123 "PhotoPage.c"
 	}
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp7_) {
-#line 13226 "PhotoPage.c"
+#line 13127 "PhotoPage.c"
 		gboolean _tmp10_ = FALSE;
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = !_tmp10_;
-#line 13232 "PhotoPage.c"
+#line 13133 "PhotoPage.c"
 	} else {
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 13236 "PhotoPage.c"
+#line 13137 "PhotoPage.c"
 	}
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 2035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 13242 "PhotoPage.c"
+#line 13143 "PhotoPage.c"
 	}
-#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = event;
-#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp11_);
-#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp12_;
-#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13252 "PhotoPage.c"
+#line 13153 "PhotoPage.c"
 }
 
 
@@ -13276,92 +13177,92 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 	EditingToolsEditingTool* _tmp15_ = NULL;
 	EditingToolsEditingTool* _tmp16_ = NULL;
 	EditingToolsEditingTool* _tmp17_ = NULL;
-#line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GTK_IS_TOGGLE_TOOL_BUTTON (toggle));
-#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = toggle;
-#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp3_) {
-#line 13287 "PhotoPage.c"
+#line 13188 "PhotoPage.c"
 		GtkToggleToolButton* _tmp4_ = NULL;
 		GtkToggleToolButton* _tmp5_ = NULL;
-#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = self->priv->current_editing_toggle;
-#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = toggle;
-#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_ == _tmp5_;
-#line 13296 "PhotoPage.c"
+#line 13197 "PhotoPage.c"
 	} else {
-#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 13300 "PhotoPage.c"
+#line 13201 "PhotoPage.c"
 	}
-#line 2043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	deactivating_only = _tmp0_;
-#line 2044 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp6_, 0, 0);
-#line 2044 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp6_, FALSE);
 #line 2046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp6_, FALSE);
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = deactivating_only;
-#line 2046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp7_) {
-#line 2047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13316 "PhotoPage.c"
+#line 13217 "PhotoPage.c"
 	}
-#line 2051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = toggle;
-#line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->current_editing_toggle);
-#line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->current_editing_toggle = _tmp9_;
-#line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = factory;
-#line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = _tmp10_ ();
-#line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool = _tmp11_;
-#line 2057 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = tool;
-#line 2057 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp12_, "activated", (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self, 0);
-#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = tool;
-#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp13_, "deactivated", (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self, 0);
-#line 2059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = tool;
-#line 2059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp14_, "applied", (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self, 0);
-#line 2060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = tool;
-#line 2060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp15_, "cancelled", (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self, 0);
-#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = tool;
-#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp16_, "aborted", (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self, 0);
 #line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp16_, "aborted", (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self, 0);
+#line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = tool;
-#line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_activate_tool (self, _tmp17_);
-#line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 13360 "PhotoPage.c"
+#line 13261 "PhotoPage.c"
 }
 
 
@@ -13369,21 +13270,21 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkScale* _tmp1_ = NULL;
 	GtkToggleToolButton* _tmp2_ = NULL;
-#line 2066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_editing_toggle;
-#line 2067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp0_ != NULL, "current_editing_toggle != null");
-#line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
-#line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->current_editing_toggle;
-#line 2069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, TRUE);
-#line 13382 "PhotoPage.c"
+#line 13283 "PhotoPage.c"
 }
 
 
@@ -13391,21 +13292,21 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkScale* _tmp1_ = NULL;
 	GtkToggleToolButton* _tmp2_ = NULL;
-#line 2072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_editing_toggle;
-#line 2073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp0_ != NULL, "current_editing_toggle != null");
-#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
-#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->current_editing_toggle;
-#line 2075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, FALSE);
-#line 13404 "PhotoPage.c"
+#line 13305 "PhotoPage.c"
 }
 
 
@@ -13414,55 +13315,55 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c
 	GdkPixbuf* _tmp1_ = NULL;
 	Dimensions _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((command == NULL) || IS_COMMAND (command));
-#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((new_pixbuf == NULL) || GDK_IS_PIXBUF (new_pixbuf));
-#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (new_max_dim != NULL);
 #line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (new_max_dim != NULL);
+#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = command;
-#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = new_pixbuf;
-#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = *new_max_dim;
-#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = needs_improvement;
-#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_);
-#line 13431 "PhotoPage.c"
+#line 13332 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_tool_cancelled (EditingHostPage* self) {
 	Dimensions _tmp0_ = {0};
-#line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 2084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 2086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
+#line 2088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 2087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 13447 "PhotoPage.c"
+#line 13348 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_tool_aborted (EditingHostPage* self) {
 	Dimensions _tmp0_ = {0};
-#line 2090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 2091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, TRUE);
-#line 13461 "PhotoPage.c"
+#line 13362 "PhotoPage.c"
 }
 
 
@@ -13470,17 +13371,17 @@ void editing_host_page_toggle_crop (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->crop_button;
-#line 2096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->crop_button;
-#line 2096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13479 "PhotoPage.c"
+#line 13380 "PhotoPage.c"
 }
 
 
@@ -13488,17 +13389,17 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->straighten_button;
-#line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->straighten_button;
-#line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13497 "PhotoPage.c"
+#line 13398 "PhotoPage.c"
 }
 
 
@@ -13506,17 +13407,17 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->redeye_button;
-#line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->redeye_button;
-#line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13515 "PhotoPage.c"
+#line 13416 "PhotoPage.c"
 }
 
 
@@ -13524,118 +13425,118 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->adjust_button;
-#line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->adjust_button;
-#line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13533 "PhotoPage.c"
+#line 13434 "PhotoPage.c"
 }
 
 
 static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory (void) {
 	EditingToolsEditingTool* result;
 	result = editing_tools_straighten_tool_factory ();
-#line 2112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13542 "PhotoPage.c"
+#line 13443 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_straighten_toggled (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
-#line 2111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->straighten_button;
-#line 2112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory);
-#line 13554 "PhotoPage.c"
+#line 13455 "PhotoPage.c"
 }
 
 
 static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory (void) {
 	EditingToolsEditingTool* result;
 	result = editing_tools_crop_tool_factory ();
-#line 2116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13563 "PhotoPage.c"
+#line 13464 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_crop_toggled (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
-#line 2115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->crop_button;
-#line 2116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory);
-#line 13575 "PhotoPage.c"
+#line 13476 "PhotoPage.c"
 }
 
 
 static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory (void) {
 	EditingToolsEditingTool* result;
 	result = editing_tools_redeye_tool_factory ();
-#line 2120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13584 "PhotoPage.c"
+#line 13485 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_redeye_toggled (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
-#line 2119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->redeye_button;
-#line 2120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory);
-#line 13596 "PhotoPage.c"
+#line 13497 "PhotoPage.c"
 }
 
 
 static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory (void) {
 	EditingToolsEditingTool* result;
 	result = editing_tools_adjust_tool_factory ();
-#line 2124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13605 "PhotoPage.c"
+#line 13506 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_adjust_toggled (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
-#line 2123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->adjust_button;
-#line 2124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory);
-#line 13617 "PhotoPage.c"
+#line 13518 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* photo) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 2127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 2128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 2128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp0_;
-#line 2128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13634 "PhotoPage.c"
+#line 13535 "PhotoPage.c"
 }
 
 
@@ -13654,79 +13555,79 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	CommandManager* _tmp11_ = NULL;
 	CommandManager* _tmp12_ = NULL;
 	EnhanceSingleCommand* _tmp13_ = NULL;
-#line 2131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 2135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 13659 "PhotoPage.c"
+#line 13560 "PhotoPage.c"
 		Dimensions _tmp1_ = {0};
-#line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		dimensions_init (&_tmp1_, 0, 0);
-#line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
 #line 2138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
+#line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 13667 "PhotoPage.c"
+#line 13568 "PhotoPage.c"
 	}
-#line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
-#line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 2142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13675 "PhotoPage.c"
+#line 13576 "PhotoPage.c"
 	}
-#line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
-#line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _editing_tools_editing_tool_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EDITING_TOOLS_TYPE_ADJUST_TOOL) ? ((EditingToolsAdjustTool*) _tmp3_) : NULL);
-#line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	adjust_tool = _tmp4_;
-#line 2145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = adjust_tool;
-#line 2145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 13687 "PhotoPage.c"
+#line 13588 "PhotoPage.c"
 		EditingToolsAdjustTool* _tmp6_ = NULL;
-#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = adjust_tool;
-#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_tools_adjust_tool_enhance (_tmp6_);
 #line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		editing_tools_adjust_tool_enhance (_tmp6_);
+#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_editing_tools_editing_tool_unref0 (adjust_tool);
-#line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13697 "PhotoPage.c"
+#line 13598 "PhotoPage.c"
 	}
-#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = editing_host_page_get_photo (self);
-#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = enhance_single_command_new (_tmp8_);
-#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp10_;
-#line 2152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = command;
-#line 2152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command));
-#line 2152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 2131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 2131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (adjust_tool);
-#line 13725 "PhotoPage.c"
+#line 13626 "PhotoPage.c"
 }
 
 
@@ -13736,33 +13637,33 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
 	Photo* _tmp2_ = NULL;
 	PixelTransformationBundle* _tmp3_ = NULL;
 	PixelTransformationBundle* _tmp4_ = NULL;
-#line 2155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13743 "PhotoPage.c"
+#line 13644 "PhotoPage.c"
 	}
-#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo_get_color_adjustments (_tmp2_);
-#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixel_transformation_bundle_set_copied_color_adjustments (_tmp4_);
-#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_pixel_transformation_bundle_unref0 (_tmp4_);
-#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
-#line 13761 "PhotoPage.c"
+#line 13662 "PhotoPage.c"
 }
 
 
@@ -13780,64 +13681,64 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	CommandManager* _tmp9_ = NULL;
 	CommandManager* _tmp10_ = NULL;
 	AdjustColorsSingleCommand* _tmp11_ = NULL;
-#line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = pixel_transformation_bundle_get_copied_color_adjustments ();
-#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	copied_adjustments = _tmp0_;
-#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
-#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 13791 "PhotoPage.c"
+#line 13692 "PhotoPage.c"
 	} else {
 		PixelTransformationBundle* _tmp3_ = NULL;
-#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = copied_adjustments;
-#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 13798 "PhotoPage.c"
+#line 13699 "PhotoPage.c"
 	}
-#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 2165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 2165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13806 "PhotoPage.c"
+#line 13707 "PhotoPage.c"
 	}
-#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (self);
-#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = copied_adjustments;
-#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = adjust_colors_single_command_new (_tmp5_, _tmp6_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP);
-#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command = _tmp8_;
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	command = _tmp8_;
+#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = command;
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp10_);
-#line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 13836 "PhotoPage.c"
+#line 13737 "PhotoPage.c"
 }
 
 
@@ -13884,65 +13785,65 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	gint _tmp103_ = 0;
 	EditingToolsEditingToolWindow* _tmp104_ = NULL;
 	EditingToolsEditingToolWindow* _tmp105_ = NULL;
-#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 2173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13891 "PhotoPage.c"
+#line 13792 "PhotoPage.c"
 	}
-#line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
-#line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_tools_editing_tool_get_tool_window (_tmp1_);
-#line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool_window = _tmp2_;
-#line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = tool_window;
-#line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (tool_window);
-#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13907 "PhotoPage.c"
+#line 13808 "PhotoPage.c"
 	}
-#line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = tool_window;
-#line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 2182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = tool_window;
-#line 2182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 2185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = tool_window;
-#line 2185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), &_tmp7_);
-#line 2185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool_alloc = _tmp7_;
-#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = self->priv->last_locations;
-#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = self->priv->current_tool;
-#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_->name;
-#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = g_strconcat (_tmp10_, "_x", NULL);
-#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_);
-#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp12_);
-#line 2189 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 13941 "PhotoPage.c"
+#line 13842 "PhotoPage.c"
 		GeeHashMap* _tmp15_ = NULL;
 		EditingToolsEditingTool* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -13955,62 +13856,62 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		gchar* _tmp24_ = NULL;
 		gchar* _tmp25_ = NULL;
 		gpointer _tmp26_ = NULL;
-#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = self->priv->last_locations;
-#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = self->priv->current_tool;
-#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _tmp16_->name;
-#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = g_strconcat (_tmp17_, "_x", NULL);
-#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_);
-#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = (gint) ((gintptr) _tmp20_);
-#line 2190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp19_);
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = self->priv->last_locations;
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = self->priv->current_tool;
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = _tmp22_->name;
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = g_strconcat (_tmp23_, "_y", NULL);
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = _tmp24_;
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp25_);
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = (gint) ((gintptr) _tmp26_);
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp25_);
-#line 13986 "PhotoPage.c"
+#line 13887 "PhotoPage.c"
 	} else {
 		GtkWindow* _tmp27_ = NULL;
 		GtkWindow* _tmp28_ = NULL;
 		AppWindow* _tmp29_ = NULL;
 		AppWindow* _tmp30_ = NULL;
 		gboolean _tmp31_ = FALSE;
-#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = _tmp27_;
-#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = app_window_get_instance ();
-#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = _tmp29_;
-#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = _tmp28_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_window_get_type (), GtkWindow);
-#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp30_);
-#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp28_);
-#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp31_) {
-#line 14009 "PhotoPage.c"
+#line 13910 "PhotoPage.c"
 			gint rx = 0;
 			gint ry = 0;
 			GtkWindow* _tmp32_ = NULL;
@@ -14039,100 +13940,100 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			gint _tmp58_ = 0;
 			GtkAllocation _tmp59_ = {0};
 			gint _tmp60_ = 0;
-#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp32_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp33_ = _tmp32_;
-#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp34_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
-#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			gdk_window_get_root_origin (_tmp34_, &_tmp35_, &_tmp36_);
-#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			rx = _tmp35_;
-#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			ry = _tmp36_;
-#line 2199 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp33_);
-#line 2202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport;
-#line 2202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), &_tmp38_);
-#line 2202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			viewport_allocation = _tmp38_;
-#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp39_ = viewport_allocation;
-#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp40_ = _tmp39_.x;
-#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			cx = _tmp40_;
-#line 2206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp41_ = viewport_allocation;
-#line 2206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp42_ = _tmp41_.y;
-#line 2206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			cy = _tmp42_;
-#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp43_ = viewport_allocation;
-#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp44_ = _tmp43_.width;
-#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			cwidth = _tmp44_;
-#line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp45_ = viewport_allocation;
-#line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp46_ = _tmp45_.height;
-#line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			cheight = _tmp46_;
-#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) {
-#line 14084 "PhotoPage.c"
+#line 13985 "PhotoPage.c"
 				gint _tmp48_ = 0;
 				gint _tmp49_ = 0;
 				gint _tmp50_ = 0;
 				GtkAllocation _tmp51_ = {0};
 				gint _tmp52_ = 0;
-#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp48_ = rx;
-#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp49_ = cx;
-#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp50_ = cwidth;
-#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp51_ = tool_alloc;
-#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp52_ = _tmp51_.width;
-#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp47_ = ((_tmp48_ + _tmp49_) + (_tmp50_ / 2)) - (_tmp52_ / 2);
-#line 14102 "PhotoPage.c"
+#line 14003 "PhotoPage.c"
 			} else {
 				gint _tmp53_ = 0;
 				gint _tmp54_ = 0;
 				gint _tmp55_ = 0;
-#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp53_ = rx;
-#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp54_ = cx;
-#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp55_ = cwidth;
-#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp47_ = (_tmp53_ + _tmp54_) + (_tmp55_ / 2);
-#line 14115 "PhotoPage.c"
+#line 14016 "PhotoPage.c"
 			}
-#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			x = _tmp47_;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			x = _tmp47_;
+#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp56_ = ry;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp57_ = cy;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp58_ = cheight;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp59_ = tool_alloc;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp60_ = _tmp59_.height;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			y = ((_tmp56_ + _tmp57_) + _tmp58_) - ((_tmp60_ / 4) * 3);
-#line 14131 "PhotoPage.c"
+#line 14032 "PhotoPage.c"
 		} else {
 			GtkWindow* _tmp61_ = NULL;
 			GtkWindow* _tmp62_ = NULL;
@@ -14155,151 +14056,151 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 			GtkAllocation _tmp77_ = {0};
 			gint _tmp78_ = 0;
 			EditingToolsEditingTool* _tmp79_ = NULL;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp61_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp62_ = _tmp61_;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp62_, TYPE_FULLSCREEN_WINDOW), "get_container() is FullscreenWindow");
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp62_);
-#line 2221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp63_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp64_ = _tmp63_;
-#line 2221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), &_tmp65_);
-#line 2221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			toolbar_alloc = _tmp65_;
-#line 2221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp64_);
 #line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_g_object_unref0 (_tmp64_);
+#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp66_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp67_ = _tmp66_;
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp68_ = gtk_window_get_screen (_tmp67_);
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp69_ = _g_object_ref0 (_tmp68_);
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp70_ = _tmp69_;
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp67_);
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			screen = _tmp70_;
-#line 2224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp71_ = screen;
-#line 2224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp72_ = gdk_screen_get_width (_tmp71_);
-#line 2224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			x = _tmp72_;
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp73_ = screen;
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp74_ = gdk_screen_get_height (_tmp73_);
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp75_ = toolbar_alloc;
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp76_ = _tmp75_.height;
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp77_ = tool_alloc;
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp78_ = _tmp77_.height;
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			y = ((_tmp74_ - _tmp76_) - _tmp78_) - EDITING_HOST_PAGE_TOOL_WINDOW_SEPARATOR;
-#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp79_ = self->priv->current_tool;
-#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 14210 "PhotoPage.c"
+#line 14111 "PhotoPage.c"
 				gint _tmp80_ = 0;
-#line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp80_ = x;
-#line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				x = (_tmp80_ * 3) / 4;
-#line 14216 "PhotoPage.c"
+#line 14117 "PhotoPage.c"
 			} else {
 				gint _tmp81_ = 0;
 				GtkAllocation _tmp82_ = {0};
 				gint _tmp83_ = 0;
-#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp81_ = x;
-#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp82_ = tool_alloc;
-#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp83_ = _tmp82_.width;
-#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				x = (_tmp81_ - _tmp83_) / 2;
-#line 14229 "PhotoPage.c"
+#line 14130 "PhotoPage.c"
 			}
-#line 2194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (screen);
-#line 14233 "PhotoPage.c"
+#line 14134 "PhotoPage.c"
 		}
 	}
-#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp84_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp85_ = _tmp84_;
-#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp86_ = gtk_window_get_screen (_tmp85_);
-#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp87_ = _g_object_ref0 (_tmp86_);
-#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp88_ = _tmp87_;
-#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp85_);
-#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	screen = _tmp88_;
-#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp89_ = x;
-#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp90_ = screen;
-#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp91_ = gdk_screen_get_width (_tmp90_);
-#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp92_ = tool_alloc;
-#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp93_ = _tmp92_.width;
-#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp94_ = CLAMP (_tmp89_, 0, _tmp91_ - _tmp93_);
-#line 2239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = _tmp94_;
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp95_ = y;
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp96_ = screen;
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp97_ = gdk_screen_get_height (_tmp96_);
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp98_ = tool_alloc;
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp99_ = _tmp98_.height;
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp100_ = CLAMP (_tmp95_, 0, _tmp97_ - _tmp99_);
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	y = _tmp100_;
 #line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	y = _tmp100_;
+#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp101_ = tool_window;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp102_ = x;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp103_ = y;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_window_get_type (), GtkWindow), _tmp102_, _tmp103_);
-#line 2243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp104_ = tool_window;
-#line 2243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_widget_get_type (), GtkWidget));
-#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp105_ = tool_window;
-#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_window_get_type (), GtkWindow));
-#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (screen);
-#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (tool_window);
-#line 14298 "PhotoPage.c"
+#line 14199 "PhotoPage.c"
 }
 
 
@@ -14321,72 +14222,72 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	DataView* next = NULL;
 	DataView* _tmp11_ = NULL;
 	DataView* _tmp12_ = NULL;
-#line 2247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
+#line 2252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (self);
-#line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2251 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14332 "PhotoPage.c"
+#line 14233 "PhotoPage.c"
 	}
-#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2255 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
-#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2255 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current_photo = _tmp2_;
-#line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = current_photo;
-#line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_assert (_tmp3_ != NULL, "current_photo != null");
 #line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_vala_assert (_tmp3_ != NULL, "current_photo != null");
+#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = editing_host_page_get_photo (self);
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current = _tmp9_;
-#line 2257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = current;
-#line 2257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ == NULL) {
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current);
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current_photo);
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14370 "PhotoPage.c"
+#line 14271 "PhotoPage.c"
 	}
-#line 2261 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
-#line 2261 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 2261 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next = _tmp12_;
-#line 14378 "PhotoPage.c"
+#line 14279 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
-#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14385 "PhotoPage.c"
+#line 14286 "PhotoPage.c"
 			ViewCollection* _tmp14_ = NULL;
 			ViewCollection* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
@@ -14400,88 +14301,88 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			Photo* _tmp23_ = NULL;
 			Photo* _tmp24_ = NULL;
 			Photo* _tmp25_ = NULL;
-#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14401 "PhotoPage.c"
+#line 14302 "PhotoPage.c"
 			}
-#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp15_ = _tmp14_;
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp16_ = next;
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = view_collection_get_next (_tmp15_, _tmp16_);
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (next);
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			next = _tmp17_;
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_data_collection_unref0 (_tmp15_);
-#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2266 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp18_ = next;
-#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2266 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp18_ == NULL) {
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14425 "PhotoPage.c"
+#line 14326 "PhotoPage.c"
 			}
-#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = next;
-#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = data_view_get_source (_tmp19_);
-#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO) ? ((Photo*) _tmp20_) : NULL;
-#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp21_ == NULL) {
-#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14437 "PhotoPage.c"
+#line 14338 "PhotoPage.c"
 			}
-#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			next_photo = _tmp21_;
-#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = next_photo;
-#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp22_ == NULL) {
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (next_photo);
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14449 "PhotoPage.c"
+#line 14350 "PhotoPage.c"
 			}
-#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = next_photo;
-#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = current_photo;
-#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp23_ == _tmp24_) {
-#line 2272 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (next_photo);
-#line 2272 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14461 "PhotoPage.c"
+#line 14362 "PhotoPage.c"
 			}
-#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = next_photo;
-#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			editing_host_page_replace_photo (self, _tmp25_);
 #line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			editing_host_page_replace_photo (self, _tmp25_);
+#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (next_photo);
-#line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14471 "PhotoPage.c"
+#line 14372 "PhotoPage.c"
 		}
 	}
-#line 2247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next);
-#line 2247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current);
-#line 2247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14480 "PhotoPage.c"
+#line 14381 "PhotoPage.c"
 }
 
 
@@ -14503,72 +14404,72 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	DataView* previous = NULL;
 	DataView* _tmp11_ = NULL;
 	DataView* _tmp12_ = NULL;
-#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 2281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 2281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 2283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
+#line 2285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (self);
-#line 2283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14514 "PhotoPage.c"
+#line 14415 "PhotoPage.c"
 	}
-#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
-#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current_photo = _tmp2_;
-#line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = current_photo;
-#line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_assert (_tmp3_ != NULL, "current_photo != null");
 #line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_vala_assert (_tmp3_ != NULL, "current_photo != null");
+#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = editing_host_page_get_photo (self);
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current = _tmp9_;
-#line 2290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = current;
-#line 2290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ == NULL) {
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current);
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current_photo);
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14552 "PhotoPage.c"
+#line 14453 "PhotoPage.c"
 	}
-#line 2294 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
-#line 2294 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 2294 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	previous = _tmp12_;
-#line 14560 "PhotoPage.c"
+#line 14461 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
-#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14567 "PhotoPage.c"
+#line 14468 "PhotoPage.c"
 			ViewCollection* _tmp14_ = NULL;
 			ViewCollection* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
@@ -14582,114 +14483,114 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			Photo* _tmp23_ = NULL;
 			Photo* _tmp24_ = NULL;
 			Photo* _tmp25_ = NULL;
-#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14583 "PhotoPage.c"
+#line 14484 "PhotoPage.c"
 			}
-#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp15_ = _tmp14_;
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp16_ = previous;
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = view_collection_get_previous (_tmp15_, _tmp16_);
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (previous);
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			previous = _tmp17_;
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_data_collection_unref0 (_tmp15_);
-#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp18_ = previous;
-#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp18_ == NULL) {
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14607 "PhotoPage.c"
+#line 14508 "PhotoPage.c"
 			}
-#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = previous;
-#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = data_view_get_source (_tmp19_);
-#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO) ? ((Photo*) _tmp20_) : NULL;
-#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp21_ == NULL) {
-#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14619 "PhotoPage.c"
+#line 14520 "PhotoPage.c"
 			}
-#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			previous_photo = _tmp21_;
-#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = previous_photo;
-#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp22_ == NULL) {
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (previous_photo);
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14631 "PhotoPage.c"
+#line 14532 "PhotoPage.c"
 			}
-#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = previous_photo;
-#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = current_photo;
-#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp23_ == _tmp24_) {
-#line 2305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (previous_photo);
-#line 2305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14643 "PhotoPage.c"
+#line 14544 "PhotoPage.c"
 			}
-#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = previous_photo;
-#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			editing_host_page_replace_photo (self, _tmp25_);
 #line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			editing_host_page_replace_photo (self, _tmp25_);
+#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (previous_photo);
-#line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14653 "PhotoPage.c"
+#line 14554 "PhotoPage.c"
 		}
 	}
-#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (previous);
-#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current);
-#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14662 "PhotoPage.c"
+#line 14563 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_has_current_tool (EditingHostPage* self) {
 	gboolean result = FALSE;
 	EditingToolsEditingTool* _tmp0_ = NULL;
-#line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 2314 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 2314 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_ != NULL;
-#line 2314 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 14677 "PhotoPage.c"
+#line 14578 "PhotoPage.c"
 }
 
 
 void editing_host_page_unset_view_collection (EditingHostPage* self) {
-#line 2317 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->parent_view);
-#line 2318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->parent_view = NULL;
-#line 14688 "PhotoPage.c"
+#line 14589 "PhotoPage.c"
 }
 
 
@@ -14776,14 +14677,14 @@ static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_c
 	self->priv->host_page = _tmp20_;
 #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 14775 "PhotoPage.c"
+#line 14676 "PhotoPage.c"
 }
 
 
 static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_new (EditingHostPage* host_page) {
 #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return editing_host_page_editing_host_canvas_construct (EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, host_page);
-#line 14782 "PhotoPage.c"
+#line 14683 "PhotoPage.c"
 }
 
 
@@ -14796,7 +14697,7 @@ static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhot
 	_tmp0_ = self->priv->host_page;
 #line 386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 14795 "PhotoPage.c"
+#line 14696 "PhotoPage.c"
 }
 
 
@@ -14809,14 +14710,14 @@ static void editing_host_page_editing_host_canvas_class_init (EditingHostPageEdi
 	g_type_class_add_private (klass, sizeof (EditingHostPageEditingHostCanvasPrivate));
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingToolsPhotoCanvasClass *) klass)->repaint = editing_host_page_editing_host_canvas_real_repaint;
-#line 14808 "PhotoPage.c"
+#line 14709 "PhotoPage.c"
 }
 
 
 static void editing_host_page_editing_host_canvas_instance_init (EditingHostPageEditingHostCanvas * self) {
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv = EDITING_HOST_PAGE_EDITING_HOST_CANVAS_GET_PRIVATE (self);
-#line 14815 "PhotoPage.c"
+#line 14716 "PhotoPage.c"
 }
 
 
@@ -14828,7 +14729,7 @@ static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCan
 	_g_object_unref0 (self->priv->host_page);
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_TOOLS_PHOTO_CANVAS_CLASS (editing_host_page_editing_host_canvas_parent_class)->finalize (obj);
-#line 14827 "PhotoPage.c"
+#line 14728 "PhotoPage.c"
 }
 
 
@@ -14947,7 +14848,7 @@ static void editing_host_page_class_init (EditingHostPageClass * klass) {
 	((SinglePhotoPageClass *) klass)->on_previous_photo = editing_host_page_real_on_previous_photo;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_host_page_finalize;
-#line 14946 "PhotoPage.c"
+#line 14847 "PhotoPage.c"
 }
 
 
@@ -15015,7 +14916,7 @@ static void editing_host_page_instance_init (EditingHostPage * self) {
 	_tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->last_locations = _tmp2_;
-#line 15014 "PhotoPage.c"
+#line 14915 "PhotoPage.c"
 }
 
 
@@ -15031,31 +14932,31 @@ static void editing_host_page_finalize (GObject* obj) {
 	guint _tmp7_ = 0U;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->sources;
-#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_photos_altered_data_collection_items_altered, self);
 #line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_photos_altered_data_collection_items_altered, self);
+#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
-#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered, self);
-#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("ordering-changed", TYPE_DATA_COLLECTION, &_tmp7_, NULL, FALSE);
-#line 549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed, self);
-#line 549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp6_);
 #line 390 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->sources);
@@ -15099,7 +15000,7 @@ static void editing_host_page_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->last_locations);
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (editing_host_page_parent_class)->finalize (obj);
-#line 15098 "PhotoPage.c"
+#line 14999 "PhotoPage.c"
 }
 
 
@@ -15116,3035 +15017,722 @@ GType editing_host_page_get_type (void) {
 
 
 static void _library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
-#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source);
-#line 15117 "PhotoPage.c"
+#line 15018 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items);
-#line 15124 "PhotoPage.c"
+#line 15025 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) {
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self);
-#line 15131 "PhotoPage.c"
+#line 15032 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_photos_altered ((LibraryPhotoPage*) self);
-#line 15138 "PhotoPage.c"
-}
-
-
-static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) {
-#line 2353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking);
-#line 15145 "PhotoPage.c"
-}
-
-
-static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) {
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked);
-#line 15152 "PhotoPage.c"
-}
-
-
-LibraryPhotoPage* library_photo_page_construct (GType object_type) {
-	LibraryPhotoPage * self = NULL;
-	LibraryPhotoSourceCollection* _tmp0_ = NULL;
-	ViewCollection* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	LibraryPhotoSourceCollection* _tmp3_ = NULL;
-	LibraryPhotoSourceCollection* _tmp4_ = NULL;
-	ConfigFacade* _tmp5_ = NULL;
-	ConfigFacade* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	ViewCollection* _tmp8_ = NULL;
-	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp9_ = NULL;
-	LibraryPhotoSourceCollection* _tmp10_ = NULL;
-	LibraryPhotoSourceCollection* _tmp11_ = NULL;
-#line 2339 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = library_photo_global;
-#line 2339 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self = (LibraryPhotoPage*) editing_host_page_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), "Photo");
-#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = _tmp1_;
-#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_photo_page_on_photos_altered_data_collection_items_altered, self, 0);
-#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp2_);
-#line 2345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = library_photo_global;
-#line 2345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _library_photo_page_on_photo_destroyed_source_collection_item_destroyed, self, 0);
-#line 2346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = library_photo_global;
-#line 2346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_photo_page_on_metadata_altered_data_collection_items_altered, self, 0);
-#line 2349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = config_facade_get_instance ();
-#line 2349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _tmp5_;
-#line 2349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "external-app-changed", (GCallback) _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed, self, 0);
-#line 2349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp6_);
-#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp7_;
-#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = self->priv->filter;
-#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view_collection_install_view_filter (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter));
-#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp8_);
-#line 2353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = library_photo_global;
-#line 2353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-unlinking", (GCallback) _library_photo_page_on_photo_unlinking_source_collection_items_unlinking, self, 0);
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = library_photo_global;
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-relinked", (GCallback) _library_photo_page_on_photo_relinked_source_collection_items_relinked, self, 0);
-#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	return self;
-#line 15218 "PhotoPage.c"
-}
-
-
-LibraryPhotoPage* library_photo_page_new (void) {
-#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE);
-#line 15225 "PhotoPage.c"
-}
-
-
-gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view) {
-	gboolean result = FALSE;
-	DataView* _tmp0_ = NULL;
-	DataSource* _tmp1_ = NULL;
-	MediaSource* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-#line 2363 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), FALSE);
-#line 2363 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = view;
-#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = data_view_get_source (_tmp0_);
-#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = media_source_is_trashed (_tmp2_);
-#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = !_tmp3_;
-#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp2_);
-#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp4_;
-#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	return result;
-#line 15256 "PhotoPage.c"
-}
-
-
-static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking) {
-	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
-#line 2367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (GEE_IS_COLLECTION (unlinking));
-#line 2368 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = self->priv->filter;
-#line 2368 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 15270 "PhotoPage.c"
-}
-
-
-static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked) {
-	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
-#line 2371 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2371 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (GEE_IS_COLLECTION (relinked));
-#line 2372 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = self->priv->filter;
-#line 2372 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 15284 "PhotoPage.c"
-}
-
-
-static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
-	LibraryPhotoPage * self;
-	GeeList* _tmp0_ = NULL;
-	GeeList* _tmp1_ = NULL;
-	GeeList* _tmp2_ = NULL;
-#line 2375 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2375 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 2376 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = ui_filenames;
-#line 2376 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (library_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = ui_filenames;
-#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
-#line 2379 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = ui_filenames;
-#line 2379 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui");
-#line 15309 "PhotoPage.c"
-}
-
-
-static void _library_photo_page_on_export_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_export ((LibraryPhotoPage*) self);
-#line 15316 "PhotoPage.c"
-}
-
-
-static void _vala_array_add193 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15327 "PhotoPage.c"
-	}
-#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15331 "PhotoPage.c"
+#line 15039 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_print_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_print ((LibraryPhotoPage*) self);
-#line 15338 "PhotoPage.c"
+#line 15046 "PhotoPage.c"
 }
 
 
-static void _vala_array_add194 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15349 "PhotoPage.c"
-	}
-#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15353 "PhotoPage.c"
-}
-
-
-static void _library_photo_page_on_publish_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_publish ((LibraryPhotoPage*) self);
-#line 15360 "PhotoPage.c"
+#line 15053 "PhotoPage.c"
 }
 
 
-static void _vala_array_add195 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15371 "PhotoPage.c"
-	}
-#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15375 "PhotoPage.c"
-}
-
-
-static void _library_photo_page_on_remove_from_library_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_remove_from_library ((LibraryPhotoPage*) self);
-#line 15382 "PhotoPage.c"
-}
-
-
-static void _vala_array_add196 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15393 "PhotoPage.c"
-	}
-#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15397 "PhotoPage.c"
+#line 15060 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_move_to_trash_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_move_to_trash ((LibraryPhotoPage*) self);
-#line 15404 "PhotoPage.c"
-}
-
-
-static void _vala_array_add197 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15415 "PhotoPage.c"
-	}
-#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15419 "PhotoPage.c"
+#line 15067 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_view_menu_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_view_menu ((LibraryPhotoPage*) self);
-#line 15426 "PhotoPage.c"
-}
-
-
-static void _vala_array_add198 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15437 "PhotoPage.c"
-	}
-#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15441 "PhotoPage.c"
-}
-
-
-static void _vala_array_add199 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15452 "PhotoPage.c"
-	}
-#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15456 "PhotoPage.c"
-}
-
-
-static void _single_photo_page_on_previous_photo_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 15463 "PhotoPage.c"
+#line 15074 "PhotoPage.c"
 }
 
 
-static void _vala_array_add200 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15474 "PhotoPage.c"
-	}
-#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15478 "PhotoPage.c"
-}
-
-
-static void _single_photo_page_on_next_photo_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 15485 "PhotoPage.c"
+#line 15081 "PhotoPage.c"
 }
 
 
-static void _vala_array_add201 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15496 "PhotoPage.c"
-	}
-#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15500 "PhotoPage.c"
-}
-
-
-static void _editing_host_page_on_rotate_clockwise_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 15507 "PhotoPage.c"
+#line 15088 "PhotoPage.c"
 }
 
 
-static void _vala_array_add202 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15518 "PhotoPage.c"
-	}
-#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15522 "PhotoPage.c"
-}
-
-
-static void _editing_host_page_on_rotate_counterclockwise_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 15529 "PhotoPage.c"
+#line 15095 "PhotoPage.c"
 }
 
 
-static void _vala_array_add203 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15540 "PhotoPage.c"
-	}
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15544 "PhotoPage.c"
-}
-
-
-static void _editing_host_page_on_flip_horizontally_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
-#line 15551 "PhotoPage.c"
+#line 15102 "PhotoPage.c"
 }
 
 
-static void _vala_array_add204 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15562 "PhotoPage.c"
-	}
-#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15566 "PhotoPage.c"
-}
-
-
-static void _editing_host_page_on_flip_vertically_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_vertically ((EditingHostPage*) self);
-#line 15573 "PhotoPage.c"
+#line 15109 "PhotoPage.c"
 }
 
 
-static void _vala_array_add205 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15584 "PhotoPage.c"
-	}
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15588 "PhotoPage.c"
-}
-
-
-static void _editing_host_page_on_enhance_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 15595 "PhotoPage.c"
+#line 15116 "PhotoPage.c"
 }
 
 
-static void _vala_array_add206 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15606 "PhotoPage.c"
-	}
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15610 "PhotoPage.c"
-}
-
-
-static void _editing_host_page_on_copy_adjustments_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_copy_adjustments ((EditingHostPage*) self);
-#line 15617 "PhotoPage.c"
+#line 15123 "PhotoPage.c"
 }
 
 
-static void _vala_array_add207 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15628 "PhotoPage.c"
-	}
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15632 "PhotoPage.c"
-}
-
-
-static void _editing_host_page_on_paste_adjustments_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_paste_adjustments ((EditingHostPage*) self);
-#line 15639 "PhotoPage.c"
+#line 15130 "PhotoPage.c"
 }
 
 
-static void _vala_array_add208 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15650 "PhotoPage.c"
-	}
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15654 "PhotoPage.c"
-}
-
-
-static void _editing_host_page_toggle_crop_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_crop ((EditingHostPage*) self);
-#line 15661 "PhotoPage.c"
-}
-
-
-static void _vala_array_add209 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15672 "PhotoPage.c"
-	}
-#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15676 "PhotoPage.c"
+#line 15137 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_toggle_straighten_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_straighten ((EditingHostPage*) self);
-#line 15683 "PhotoPage.c"
-}
-
-
-static void _vala_array_add210 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15694 "PhotoPage.c"
-	}
-#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15698 "PhotoPage.c"
+#line 15144 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_toggle_redeye_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_redeye ((EditingHostPage*) self);
-#line 15705 "PhotoPage.c"
-}
-
-
-static void _vala_array_add211 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15716 "PhotoPage.c"
-	}
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15720 "PhotoPage.c"
+#line 15151 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_toggle_adjust_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_adjust ((EditingHostPage*) self);
-#line 15727 "PhotoPage.c"
+#line 15158 "PhotoPage.c"
 }
 
 
-static void _vala_array_add212 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15738 "PhotoPage.c"
-	}
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15742 "PhotoPage.c"
-}
-
-
-static void _editing_host_page_on_revert_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_revert ((EditingHostPage*) self);
-#line 15749 "PhotoPage.c"
+#line 15165 "PhotoPage.c"
 }
 
 
-static void _vala_array_add213 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15760 "PhotoPage.c"
-	}
-#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15764 "PhotoPage.c"
-}
-
-
-static void _editing_host_page_on_edit_title_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_title ((EditingHostPage*) self);
-#line 15771 "PhotoPage.c"
+#line 15172 "PhotoPage.c"
 }
 
 
-static void _vala_array_add214 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15782 "PhotoPage.c"
-	}
-#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15786 "PhotoPage.c"
-}
-
-
-static void _editing_host_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_comment ((EditingHostPage*) self);
-#line 15793 "PhotoPage.c"
+#line 15179 "PhotoPage.c"
 }
 
 
-static void _vala_array_add215 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15804 "PhotoPage.c"
-	}
-#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15808 "PhotoPage.c"
-}
-
-
-static void _editing_host_page_on_adjust_date_time_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
-#line 15815 "PhotoPage.c"
-}
-
-
-static void _vala_array_add216 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15826 "PhotoPage.c"
-	}
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15830 "PhotoPage.c"
+#line 15186 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_external_edit_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit ((LibraryPhotoPage*) self);
-#line 15837 "PhotoPage.c"
+#line 15193 "PhotoPage.c"
 }
 
 
-static void _vala_array_add217 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15848 "PhotoPage.c"
-	}
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15852 "PhotoPage.c"
-}
-
-
-static void _library_photo_page_on_external_edit_raw_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit_raw ((LibraryPhotoPage*) self);
-#line 15859 "PhotoPage.c"
-}
-
-
-static void _vala_array_add218 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15870 "PhotoPage.c"
-	}
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15874 "PhotoPage.c"
+#line 15200 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_send_to_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_send_to ((LibraryPhotoPage*) self);
-#line 15881 "PhotoPage.c"
-}
-
-
-static void _vala_array_add219 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15892 "PhotoPage.c"
-	}
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15896 "PhotoPage.c"
+#line 15207 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_set_background_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_set_background ((EditingHostPage*) self);
-#line 15903 "PhotoPage.c"
+#line 15214 "PhotoPage.c"
 }
 
 
-static void _vala_array_add220 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15914 "PhotoPage.c"
-	}
-#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15918 "PhotoPage.c"
-}
-
-
-static void _library_photo_page_on_flag_unflag_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_flag_unflag ((LibraryPhotoPage*) self);
-#line 15925 "PhotoPage.c"
-}
-
-
-static void _vala_array_add221 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15936 "PhotoPage.c"
-	}
-#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15940 "PhotoPage.c"
-}
-
-
-static void _vala_array_add222 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15951 "PhotoPage.c"
-	}
-#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15955 "PhotoPage.c"
+#line 15221 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_increase_rating_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_increase_rating ((LibraryPhotoPage*) self);
-#line 15962 "PhotoPage.c"
-}
-
-
-static void _vala_array_add223 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15973 "PhotoPage.c"
-	}
-#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15977 "PhotoPage.c"
+#line 15228 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_decrease_rating_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_decrease_rating ((LibraryPhotoPage*) self);
-#line 15984 "PhotoPage.c"
+#line 15235 "PhotoPage.c"
 }
 
 
-static void _vala_array_add224 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 15995 "PhotoPage.c"
-	}
-#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 15999 "PhotoPage.c"
-}
-
-
-static void _library_photo_page_on_rate_rejected_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_rejected ((LibraryPhotoPage*) self);
-#line 16006 "PhotoPage.c"
+#line 15242 "PhotoPage.c"
 }
 
 
-static void _vala_array_add225 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16017 "PhotoPage.c"
-	}
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16021 "PhotoPage.c"
-}
-
-
-static void _library_photo_page_on_rate_unrated_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_unrated ((LibraryPhotoPage*) self);
-#line 16028 "PhotoPage.c"
+#line 15249 "PhotoPage.c"
 }
 
 
-static void _vala_array_add226 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16039 "PhotoPage.c"
-	}
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16043 "PhotoPage.c"
-}
-
-
-static void _library_photo_page_on_rate_one_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_one ((LibraryPhotoPage*) self);
-#line 16050 "PhotoPage.c"
-}
-
-
-static void _vala_array_add227 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16061 "PhotoPage.c"
-	}
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16065 "PhotoPage.c"
+#line 15256 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_rate_two_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_two ((LibraryPhotoPage*) self);
-#line 16072 "PhotoPage.c"
+#line 15263 "PhotoPage.c"
 }
 
 
-static void _vala_array_add228 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16083 "PhotoPage.c"
-	}
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16087 "PhotoPage.c"
+static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_on_rate_three ((LibraryPhotoPage*) self);
+#line 15270 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_rate_three_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_rate_three ((LibraryPhotoPage*) self);
-#line 16094 "PhotoPage.c"
+static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_on_rate_four ((LibraryPhotoPage*) self);
+#line 15277 "PhotoPage.c"
 }
 
 
-static void _vala_array_add229 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16105 "PhotoPage.c"
-	}
-#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16109 "PhotoPage.c"
+static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_on_rate_five ((LibraryPhotoPage*) self);
+#line 15284 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_rate_four_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_rate_four ((LibraryPhotoPage*) self);
-#line 16116 "PhotoPage.c"
+static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_on_increase_size ((EditingHostPage*) self);
+#line 15291 "PhotoPage.c"
 }
 
 
-static void _vala_array_add230 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16127 "PhotoPage.c"
-	}
-#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16131 "PhotoPage.c"
+static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_on_decrease_size ((EditingHostPage*) self);
+#line 15298 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_rate_five_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_rate_five ((LibraryPhotoPage*) self);
-#line 16138 "PhotoPage.c"
+static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
+#line 15305 "PhotoPage.c"
 }
 
 
-static void _vala_array_add231 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16149 "PhotoPage.c"
-	}
-#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16153 "PhotoPage.c"
+static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
+#line 15312 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_increase_size_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_on_increase_size ((EditingHostPage*) self);
-#line 16160 "PhotoPage.c"
+static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
+#line 15319 "PhotoPage.c"
 }
 
 
-static void _vala_array_add232 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16171 "PhotoPage.c"
-	}
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16175 "PhotoPage.c"
+static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_on_add_tags ((LibraryPhotoPage*) self);
+#line 15326 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_decrease_size_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_on_decrease_size ((EditingHostPage*) self);
-#line 16182 "PhotoPage.c"
+static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_on_modify_tags ((LibraryPhotoPage*) self);
+#line 15333 "PhotoPage.c"
 }
 
 
-static void _vala_array_add233 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16193 "PhotoPage.c"
-	}
-#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16197 "PhotoPage.c"
+static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_on_slideshow ((LibraryPhotoPage*) self);
+#line 15340 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_snap_zoom_to_min_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
-#line 16204 "PhotoPage.c"
+static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	page_on_action_toggle ((Page*) self, action, parameter);
+#line 15347 "PhotoPage.c"
 }
 
 
-static void _vala_array_add234 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16215 "PhotoPage.c"
-	}
-#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16219 "PhotoPage.c"
+static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action, value);
+#line 15354 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_snap_zoom_to_isomorphic_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
-#line 16226 "PhotoPage.c"
+static void _page_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	page_on_action_radio ((Page*) self, action, parameter);
+#line 15361 "PhotoPage.c"
 }
 
 
-static void _vala_array_add235 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16237 "PhotoPage.c"
-	}
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16241 "PhotoPage.c"
+static void _library_photo_page_on_raw_developer_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, action, value);
+#line 15368 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_snap_zoom_to_max_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
-#line 16248 "PhotoPage.c"
+static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_on_photos_altered ((LibraryPhotoPage*) self);
+#line 15375 "PhotoPage.c"
 }
 
 
-static void _vala_array_add236 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16259 "PhotoPage.c"
-	}
-#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16263 "PhotoPage.c"
+static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) {
+#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking);
+#line 15382 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_add_tags_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_add_tags ((LibraryPhotoPage*) self);
-#line 16270 "PhotoPage.c"
+static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) {
+#line 2356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked);
+#line 15389 "PhotoPage.c"
 }
 
 
-static void _vala_array_add237 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16281 "PhotoPage.c"
-	}
-#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16285 "PhotoPage.c"
+LibraryPhotoPage* library_photo_page_construct (GType object_type) {
+	LibraryPhotoPage * self = NULL;
+	LibraryPhotoSourceCollection* _tmp0_ = NULL;
+	ViewCollection* _tmp1_ = NULL;
+	ViewCollection* _tmp2_ = NULL;
+	LibraryPhotoSourceCollection* _tmp3_ = NULL;
+	LibraryPhotoSourceCollection* _tmp4_ = NULL;
+	ConfigFacade* _tmp5_ = NULL;
+	ConfigFacade* _tmp6_ = NULL;
+	ViewCollection* _tmp7_ = NULL;
+	ViewCollection* _tmp8_ = NULL;
+	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp9_ = NULL;
+	LibraryPhotoSourceCollection* _tmp10_ = NULL;
+	LibraryPhotoSourceCollection* _tmp11_ = NULL;
+#line 2341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp0_ = library_photo_global;
+#line 2341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self = (LibraryPhotoPage*) editing_host_page_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), "Photo");
+#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp2_ = _tmp1_;
+#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_photo_page_on_photos_altered_data_collection_items_altered, self, 0);
+#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_data_collection_unref0 (_tmp2_);
+#line 2347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp3_ = library_photo_global;
+#line 2347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _library_photo_page_on_photo_destroyed_source_collection_item_destroyed, self, 0);
+#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp4_ = library_photo_global;
+#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_photo_page_on_metadata_altered_data_collection_items_altered, self, 0);
+#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp5_ = config_facade_get_instance ();
+#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp6_ = _tmp5_;
+#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "external-app-changed", (GCallback) _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed, self, 0);
+#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp6_);
+#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp8_ = _tmp7_;
+#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp9_ = self->priv->filter;
+#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	view_collection_install_view_filter (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter));
+#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_data_collection_unref0 (_tmp8_);
+#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp10_ = library_photo_global;
+#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-unlinking", (GCallback) _library_photo_page_on_photo_unlinking_source_collection_items_unlinking, self, 0);
+#line 2356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp11_ = library_photo_global;
+#line 2356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-relinked", (GCallback) _library_photo_page_on_photo_relinked_source_collection_items_relinked, self, 0);
+#line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	return self;
+#line 15455 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_modify_tags_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_modify_tags ((LibraryPhotoPage*) self);
-#line 16292 "PhotoPage.c"
+LibraryPhotoPage* library_photo_page_new (void) {
+#line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE);
+#line 15462 "PhotoPage.c"
 }
 
 
-static void _vala_array_add238 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16303 "PhotoPage.c"
-	}
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16307 "PhotoPage.c"
+gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view) {
+	gboolean result = FALSE;
+	DataView* _tmp0_ = NULL;
+	DataSource* _tmp1_ = NULL;
+	MediaSource* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	gboolean _tmp4_ = FALSE;
+#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), FALSE);
+#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp0_ = view;
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp1_ = data_view_get_source (_tmp0_);
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource);
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp3_ = media_source_is_trashed (_tmp2_);
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp4_ = !_tmp3_;
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp2_);
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	result = _tmp4_;
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	return result;
+#line 15493 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_slideshow_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_slideshow ((LibraryPhotoPage*) self);
-#line 16314 "PhotoPage.c"
+static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking) {
+	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
+#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
+#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (GEE_IS_COLLECTION (unlinking));
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp0_ = self->priv->filter;
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
+#line 15507 "PhotoPage.c"
 }
 
 
-static void _vala_array_add239 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16325 "PhotoPage.c"
-	}
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16329 "PhotoPage.c"
+static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked) {
+	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
+#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
+#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (GEE_IS_COLLECTION (relinked));
+#line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp0_ = self->priv->filter;
+#line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
+#line 15521 "PhotoPage.c"
 }
 
 
-static void _vala_array_add240 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16340 "PhotoPage.c"
-	}
-#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16344 "PhotoPage.c"
+static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+	LibraryPhotoPage * self;
+	GeeList* _tmp0_ = NULL;
+	GeeList* _tmp1_ = NULL;
+	GeeList* _tmp2_ = NULL;
+#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
+#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (GEE_IS_LIST (ui_filenames));
+#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp0_ = ui_filenames;
+#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	PAGE_CLASS (library_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
+#line 2380 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp1_ = ui_filenames;
+#line 2380 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
+#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp2_ = ui_filenames;
+#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui");
+#line 15546 "PhotoPage.c"
 }
 
 
-static void _vala_array_add241 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16355 "PhotoPage.c"
-	}
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16359 "PhotoPage.c"
+static GVariant* _variant_new12 (gboolean value) {
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 15553 "PhotoPage.c"
 }
 
 
-static void _vala_array_add242 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 16370 "PhotoPage.c"
-	}
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 16374 "PhotoPage.c"
+static GVariant* _variant_new13 (const gchar* value) {
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 15560 "PhotoPage.c"
 }
 
 
-static GtkActionEntry* library_photo_page_real_init_collect_action_entries (Page* base, int* result_length1) {
+static void library_photo_page_real_add_actions (Page* base) {
 	LibraryPhotoPage * self;
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	gint _tmp0_ = 0;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry export = {0};
-	GtkActionEntry _tmp2_ = {0};
-	GtkActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkActionEntry _tmp4_ = {0};
-	GtkActionEntry print = {0};
-	GtkActionEntry _tmp5_ = {0};
-	GtkActionEntry* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	GtkActionEntry _tmp7_ = {0};
-	GtkActionEntry publish = {0};
-	GtkActionEntry _tmp8_ = {0};
-	GtkActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkActionEntry _tmp10_ = {0};
-	GtkActionEntry remove_from_library = {0};
-	GtkActionEntry _tmp11_ = {0};
-	GtkActionEntry* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	GtkActionEntry _tmp13_ = {0};
-	GtkActionEntry move_to_trash = {0};
-	GtkActionEntry _tmp14_ = {0};
-	GtkActionEntry* _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	GtkActionEntry _tmp16_ = {0};
-	GtkActionEntry view = {0};
-	GtkActionEntry _tmp17_ = {0};
-	const gchar* _tmp18_ = NULL;
-	GtkActionEntry* _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	GtkActionEntry _tmp20_ = {0};
-	GtkActionEntry tools = {0};
-	GtkActionEntry _tmp21_ = {0};
-	const gchar* _tmp22_ = NULL;
-	GtkActionEntry* _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-	GtkActionEntry _tmp24_ = {0};
-	GtkActionEntry prev = {0};
-	GtkActionEntry _tmp25_ = {0};
-	const gchar* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
-	GtkActionEntry* _tmp28_ = NULL;
-	gint _tmp28__length1 = 0;
-	GtkActionEntry _tmp29_ = {0};
-	GtkActionEntry next = {0};
-	GtkActionEntry _tmp30_ = {0};
-	const gchar* _tmp31_ = NULL;
-	const gchar* _tmp32_ = NULL;
-	GtkActionEntry* _tmp33_ = NULL;
-	gint _tmp33__length1 = 0;
-	GtkActionEntry _tmp34_ = {0};
-	GtkActionEntry rotate_right = {0};
-	GtkActionEntry _tmp35_ = {0};
-	GtkActionEntry* _tmp36_ = NULL;
-	gint _tmp36__length1 = 0;
-	GtkActionEntry _tmp37_ = {0};
-	GtkActionEntry rotate_left = {0};
-	GtkActionEntry _tmp38_ = {0};
-	GtkActionEntry* _tmp39_ = NULL;
-	gint _tmp39__length1 = 0;
-	GtkActionEntry _tmp40_ = {0};
-	GtkActionEntry hflip = {0};
-	GtkActionEntry _tmp41_ = {0};
-	GtkActionEntry* _tmp42_ = NULL;
-	gint _tmp42__length1 = 0;
-	GtkActionEntry _tmp43_ = {0};
-	GtkActionEntry vflip = {0};
-	GtkActionEntry _tmp44_ = {0};
-	GtkActionEntry* _tmp45_ = NULL;
-	gint _tmp45__length1 = 0;
-	GtkActionEntry _tmp46_ = {0};
-	GtkActionEntry enhance = {0};
-	GtkActionEntry _tmp47_ = {0};
-	GtkActionEntry* _tmp48_ = NULL;
-	gint _tmp48__length1 = 0;
-	GtkActionEntry _tmp49_ = {0};
-	GtkActionEntry copy_adjustments = {0};
-	GtkActionEntry _tmp50_ = {0};
-	GtkActionEntry* _tmp51_ = NULL;
-	gint _tmp51__length1 = 0;
-	GtkActionEntry _tmp52_ = {0};
-	GtkActionEntry paste_adjustments = {0};
-	GtkActionEntry _tmp53_ = {0};
-	GtkActionEntry* _tmp54_ = NULL;
-	gint _tmp54__length1 = 0;
-	GtkActionEntry _tmp55_ = {0};
-	GtkActionEntry crop = {0};
-	GtkActionEntry _tmp56_ = {0};
-	GtkActionEntry* _tmp57_ = NULL;
-	gint _tmp57__length1 = 0;
-	GtkActionEntry _tmp58_ = {0};
-	GtkActionEntry straighten = {0};
-	GtkActionEntry _tmp59_ = {0};
-	GtkActionEntry* _tmp60_ = NULL;
-	gint _tmp60__length1 = 0;
-	GtkActionEntry _tmp61_ = {0};
-	GtkActionEntry red_eye = {0};
-	GtkActionEntry _tmp62_ = {0};
-	GtkActionEntry* _tmp63_ = NULL;
-	gint _tmp63__length1 = 0;
-	GtkActionEntry _tmp64_ = {0};
-	GtkActionEntry adjust = {0};
-	GtkActionEntry _tmp65_ = {0};
-	GtkActionEntry* _tmp66_ = NULL;
-	gint _tmp66__length1 = 0;
-	GtkActionEntry _tmp67_ = {0};
-	GtkActionEntry revert = {0};
-	GtkActionEntry _tmp68_ = {0};
-	GtkActionEntry* _tmp69_ = NULL;
-	gint _tmp69__length1 = 0;
-	GtkActionEntry _tmp70_ = {0};
-	GtkActionEntry edit_title = {0};
-	GtkActionEntry _tmp71_ = {0};
-	GtkActionEntry* _tmp72_ = NULL;
-	gint _tmp72__length1 = 0;
-	GtkActionEntry _tmp73_ = {0};
-	GtkActionEntry edit_comment = {0};
-	GtkActionEntry _tmp74_ = {0};
-	GtkActionEntry* _tmp75_ = NULL;
-	gint _tmp75__length1 = 0;
-	GtkActionEntry _tmp76_ = {0};
-	GtkActionEntry adjust_date_time = {0};
-	GtkActionEntry _tmp77_ = {0};
-	GtkActionEntry* _tmp78_ = NULL;
-	gint _tmp78__length1 = 0;
-	GtkActionEntry _tmp79_ = {0};
-	GtkActionEntry external_edit = {0};
-	GtkActionEntry _tmp80_ = {0};
-	GtkActionEntry* _tmp81_ = NULL;
-	gint _tmp81__length1 = 0;
-	GtkActionEntry _tmp82_ = {0};
-	GtkActionEntry edit_raw = {0};
-	GtkActionEntry _tmp83_ = {0};
-	GtkActionEntry* _tmp84_ = NULL;
-	gint _tmp84__length1 = 0;
-	GtkActionEntry _tmp85_ = {0};
-	GtkActionEntry send_to = {0};
-	GtkActionEntry _tmp86_ = {0};
-	GtkActionEntry* _tmp87_ = NULL;
-	gint _tmp87__length1 = 0;
-	GtkActionEntry _tmp88_ = {0};
-	GtkActionEntry set_background = {0};
-	GtkActionEntry _tmp89_ = {0};
-	GtkActionEntry* _tmp90_ = NULL;
-	gint _tmp90__length1 = 0;
-	GtkActionEntry _tmp91_ = {0};
-	GtkActionEntry flag = {0};
-	GtkActionEntry _tmp92_ = {0};
-	GtkActionEntry* _tmp93_ = NULL;
-	gint _tmp93__length1 = 0;
-	GtkActionEntry _tmp94_ = {0};
-	GtkActionEntry set_rating = {0};
-	GtkActionEntry _tmp95_ = {0};
-	GtkActionEntry* _tmp96_ = NULL;
-	gint _tmp96__length1 = 0;
-	GtkActionEntry _tmp97_ = {0};
-	GtkActionEntry increase_rating = {0};
-	GtkActionEntry _tmp98_ = {0};
-	GtkActionEntry* _tmp99_ = NULL;
-	gint _tmp99__length1 = 0;
-	GtkActionEntry _tmp100_ = {0};
-	GtkActionEntry decrease_rating = {0};
-	GtkActionEntry _tmp101_ = {0};
-	GtkActionEntry* _tmp102_ = NULL;
-	gint _tmp102__length1 = 0;
-	GtkActionEntry _tmp103_ = {0};
-	GtkActionEntry rate_rejected = {0};
-	GtkActionEntry _tmp104_ = {0};
-	const gchar* _tmp105_ = NULL;
-	GtkActionEntry* _tmp106_ = NULL;
-	gint _tmp106__length1 = 0;
-	GtkActionEntry _tmp107_ = {0};
-	GtkActionEntry rate_unrated = {0};
-	GtkActionEntry _tmp108_ = {0};
-	const gchar* _tmp109_ = NULL;
-	GtkActionEntry* _tmp110_ = NULL;
-	gint _tmp110__length1 = 0;
-	GtkActionEntry _tmp111_ = {0};
-	GtkActionEntry rate_one = {0};
-	GtkActionEntry _tmp112_ = {0};
-	const gchar* _tmp113_ = NULL;
-	GtkActionEntry* _tmp114_ = NULL;
-	gint _tmp114__length1 = 0;
-	GtkActionEntry _tmp115_ = {0};
-	GtkActionEntry rate_two = {0};
-	GtkActionEntry _tmp116_ = {0};
-	const gchar* _tmp117_ = NULL;
-	GtkActionEntry* _tmp118_ = NULL;
-	gint _tmp118__length1 = 0;
-	GtkActionEntry _tmp119_ = {0};
-	GtkActionEntry rate_three = {0};
-	GtkActionEntry _tmp120_ = {0};
-	const gchar* _tmp121_ = NULL;
-	GtkActionEntry* _tmp122_ = NULL;
-	gint _tmp122__length1 = 0;
-	GtkActionEntry _tmp123_ = {0};
-	GtkActionEntry rate_four = {0};
-	GtkActionEntry _tmp124_ = {0};
-	const gchar* _tmp125_ = NULL;
-	GtkActionEntry* _tmp126_ = NULL;
-	gint _tmp126__length1 = 0;
-	GtkActionEntry _tmp127_ = {0};
-	GtkActionEntry rate_five = {0};
-	GtkActionEntry _tmp128_ = {0};
-	const gchar* _tmp129_ = NULL;
-	GtkActionEntry* _tmp130_ = NULL;
-	gint _tmp130__length1 = 0;
-	GtkActionEntry _tmp131_ = {0};
-	GtkActionEntry increase_size = {0};
-	GtkActionEntry _tmp132_ = {0};
-	const gchar* _tmp133_ = NULL;
-	const gchar* _tmp134_ = NULL;
-	GtkActionEntry* _tmp135_ = NULL;
-	gint _tmp135__length1 = 0;
-	GtkActionEntry _tmp136_ = {0};
-	GtkActionEntry decrease_size = {0};
-	GtkActionEntry _tmp137_ = {0};
-	const gchar* _tmp138_ = NULL;
-	const gchar* _tmp139_ = NULL;
-	GtkActionEntry* _tmp140_ = NULL;
-	gint _tmp140__length1 = 0;
-	GtkActionEntry _tmp141_ = {0};
-	GtkActionEntry best_fit = {0};
-	GtkActionEntry _tmp142_ = {0};
-	const gchar* _tmp143_ = NULL;
-	const gchar* _tmp144_ = NULL;
-	GtkActionEntry* _tmp145_ = NULL;
-	gint _tmp145__length1 = 0;
-	GtkActionEntry _tmp146_ = {0};
-	GtkActionEntry actual_size = {0};
-	GtkActionEntry _tmp147_ = {0};
-	const gchar* _tmp148_ = NULL;
-	const gchar* _tmp149_ = NULL;
-	GtkActionEntry* _tmp150_ = NULL;
-	gint _tmp150__length1 = 0;
-	GtkActionEntry _tmp151_ = {0};
-	GtkActionEntry max_size = {0};
-	GtkActionEntry _tmp152_ = {0};
-	const gchar* _tmp153_ = NULL;
-	const gchar* _tmp154_ = NULL;
-	GtkActionEntry* _tmp155_ = NULL;
-	gint _tmp155__length1 = 0;
-	GtkActionEntry _tmp156_ = {0};
-	GtkActionEntry add_tags = {0};
-	GtkActionEntry _tmp157_ = {0};
-	GtkActionEntry* _tmp158_ = NULL;
-	gint _tmp158__length1 = 0;
-	GtkActionEntry _tmp159_ = {0};
-	GtkActionEntry modify_tags = {0};
-	GtkActionEntry _tmp160_ = {0};
-	GtkActionEntry* _tmp161_ = NULL;
-	gint _tmp161__length1 = 0;
-	GtkActionEntry _tmp162_ = {0};
-	GtkActionEntry slideshow = {0};
-	GtkActionEntry _tmp163_ = {0};
-	const gchar* _tmp164_ = NULL;
-	const gchar* _tmp165_ = NULL;
-	GtkActionEntry* _tmp166_ = NULL;
-	gint _tmp166__length1 = 0;
-	GtkActionEntry _tmp167_ = {0};
-	GtkActionEntry raw_developer = {0};
-	GtkActionEntry _tmp168_ = {0};
-	const gchar* _tmp169_ = NULL;
-	GtkActionEntry* _tmp170_ = NULL;
-	gint _tmp170__length1 = 0;
-	GtkActionEntry _tmp171_ = {0};
-	GtkActionEntry send_to_context_menu = {0};
-	GtkActionEntry _tmp172_ = {0};
-	GtkActionEntry* _tmp173_ = NULL;
-	gint _tmp173__length1 = 0;
-	GtkActionEntry _tmp174_ = {0};
-	GtkActionEntry add_tags_context_menu = {0};
-	GtkActionEntry _tmp175_ = {0};
-	GtkActionEntry* _tmp176_ = NULL;
-	gint _tmp176__length1 = 0;
-	GtkActionEntry _tmp177_ = {0};
-	GtkActionEntry* _tmp178_ = NULL;
-	gint _tmp178__length1 = 0;
-#line 2382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = PAGE_CLASS (library_photo_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), &_tmp0_);
-#line 2383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	actions = _tmp1_;
-#line 2383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	actions_length1 = _tmp0_;
-#line 2383 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_actions_size_ = actions_length1;
-#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_.name = "Export";
-#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_.stock_id = RESOURCES_SAVE_AS_LABEL;
-#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_.accelerator = "<Ctrl><Shift>E";
-#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_.tooltip = TRANSLATABLE;
-#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_.callback = (GCallback) _library_photo_page_on_export_gtk_action_callback;
-#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	export = _tmp2_;
-#line 2387 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	export.label = RESOURCES_EXPORT_MENU;
-#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = actions;
-#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3__length1 = actions_length1;
-#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = export;
-#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add193 (&actions, &actions_length1, &_actions_size_, &_tmp4_);
-#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.name = "Print";
-#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.stock_id = RESOURCES_PRINT_LABEL;
-#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.accelerator = "<Ctrl>P";
-#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.tooltip = TRANSLATABLE;
-#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.callback = (GCallback) _library_photo_page_on_print_gtk_action_callback;
-#line 2390 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	print = _tmp5_;
-#line 2392 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	print.label = RESOURCES_PRINT_MENU;
-#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = actions;
-#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6__length1 = actions_length1;
-#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = print;
-#line 2393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add194 (&actions, &actions_length1, &_actions_size_, &_tmp7_);
-#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_.name = "Publish";
-#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_.stock_id = RESOURCES_PUBLISH;
-#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_.label = TRANSLATABLE;
-#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_.accelerator = "<Ctrl><Shift>P";
-#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_.tooltip = TRANSLATABLE;
-#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_.callback = (GCallback) _library_photo_page_on_publish_gtk_action_callback;
-#line 2395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	publish = _tmp8_;
-#line 2397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	publish.label = RESOURCES_PUBLISH_MENU;
-#line 2398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	publish.tooltip = RESOURCES_PUBLISH_TOOLTIP;
-#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = actions;
-#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9__length1 = actions_length1;
-#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = publish;
-#line 2399 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add195 (&actions, &actions_length1, &_actions_size_, &_tmp10_);
-#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_.name = "RemoveFromLibrary";
-#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_.stock_id = RESOURCES_REMOVE_LABEL;
-#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_.label = TRANSLATABLE;
-#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_.accelerator = "<Shift>Delete";
-#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_.tooltip = TRANSLATABLE;
-#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_.callback = (GCallback) _library_photo_page_on_remove_from_library_gtk_action_callback;
-#line 2401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	remove_from_library = _tmp11_;
-#line 2403 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	remove_from_library.label = RESOURCES_REMOVE_FROM_LIBRARY_MENU;
-#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = actions;
-#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12__length1 = actions_length1;
-#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = remove_from_library;
-#line 2404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add196 (&actions, &actions_length1, &_actions_size_, &_tmp13_);
-#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_.name = "MoveToTrash";
-#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_.stock_id = "user-trash-full";
-#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_.label = TRANSLATABLE;
-#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_.accelerator = "Delete";
-#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_.tooltip = TRANSLATABLE;
-#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_.callback = (GCallback) _library_photo_page_on_move_to_trash_gtk_action_callback;
-#line 2406 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	move_to_trash = _tmp14_;
-#line 2408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	move_to_trash.label = RESOURCES_MOVE_TO_TRASH_MENU;
-#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = actions;
-#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15__length1 = actions_length1;
-#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = move_to_trash;
-#line 2409 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add197 (&actions, &actions_length1, &_actions_size_, &_tmp16_);
-#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_.name = "ViewMenu";
-#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_.stock_id = NULL;
-#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_.label = TRANSLATABLE;
-#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_.accelerator = NULL;
-#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_.tooltip = NULL;
-#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_.callback = (GCallback) _library_photo_page_on_view_menu_gtk_action_callback;
-#line 2411 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view = _tmp17_;
-#line 2412 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = _ ("_View");
-#line 2412 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view.label = _tmp18_;
-#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = actions;
-#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19__length1 = actions_length1;
-#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = view;
-#line 2413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add198 (&actions, &actions_length1, &_actions_size_, &_tmp20_);
-#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_.name = "Tools";
-#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_.stock_id = NULL;
-#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_.label = TRANSLATABLE;
-#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_.accelerator = NULL;
-#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_.tooltip = NULL;
-#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_.callback = (GCallback) NULL;
-#line 2415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	tools = _tmp21_;
-#line 2416 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = _ ("T_ools");
-#line 2416 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	tools.label = _tmp22_;
-#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = actions;
-#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23__length1 = actions_length1;
-#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = tools;
-#line 2417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add199 (&actions, &actions_length1, &_actions_size_, &_tmp24_);
-#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_.name = "PrevPhoto";
-#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_.stock_id = RESOURCES_PREVIOUS_LABEL;
-#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_.label = TRANSLATABLE;
-#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_.accelerator = NULL;
-#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_.tooltip = TRANSLATABLE;
-#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_.callback = (GCallback) _single_photo_page_on_previous_photo_gtk_action_callback;
-#line 2419 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	prev = _tmp25_;
-#line 2421 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = _ ("_Previous Photo");
-#line 2421 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	prev.label = _tmp26_;
-#line 2422 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = _ ("Previous Photo");
-#line 2422 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	prev.tooltip = _tmp27_;
-#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = actions;
-#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28__length1 = actions_length1;
-#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp29_ = prev;
-#line 2423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add200 (&actions, &actions_length1, &_actions_size_, &_tmp29_);
-#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_.name = "NextPhoto";
-#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_.stock_id = RESOURCES_NEXT_LABEL;
-#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_.label = TRANSLATABLE;
-#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_.accelerator = NULL;
-#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_.tooltip = TRANSLATABLE;
-#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_.callback = (GCallback) _single_photo_page_on_next_photo_gtk_action_callback;
-#line 2425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	next = _tmp30_;
-#line 2427 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp31_ = _ ("_Next Photo");
-#line 2427 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	next.label = _tmp31_;
-#line 2428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp32_ = _ ("Next Photo");
-#line 2428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	next.tooltip = _tmp32_;
-#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp33_ = actions;
-#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp33__length1 = actions_length1;
-#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp34_ = next;
-#line 2429 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add201 (&actions, &actions_length1, &_actions_size_, &_tmp34_);
-#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_.name = "RotateClockwise";
-#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_.stock_id = RESOURCES_CLOCKWISE;
-#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_.label = TRANSLATABLE;
-#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_.accelerator = "<Ctrl>R";
-#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_.tooltip = TRANSLATABLE;
-#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_.callback = (GCallback) _editing_host_page_on_rotate_clockwise_gtk_action_callback;
-#line 2431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rotate_right = _tmp35_;
-#line 2433 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rotate_right.label = RESOURCES_ROTATE_CW_MENU;
-#line 2434 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rotate_right.tooltip = RESOURCES_ROTATE_CW_TOOLTIP;
-#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp36_ = actions;
-#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp36__length1 = actions_length1;
-#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp37_ = rotate_right;
-#line 2435 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add202 (&actions, &actions_length1, &_actions_size_, &_tmp37_);
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp38_.name = "RotateCounterclockwise";
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp38_.stock_id = RESOURCES_COUNTERCLOCKWISE;
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp38_.label = TRANSLATABLE;
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp38_.accelerator = "<Ctrl><Shift>R";
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp38_.tooltip = TRANSLATABLE;
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp38_.callback = (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_action_callback;
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
+	GAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+	GSimpleAction* _tmp4_ = NULL;
+	ConfigFacade* _tmp5_ = NULL;
+	ConfigFacade* _tmp6_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	GVariant* _tmp8_ = NULL;
+	RawDeveloper d = 0;
+	ConfigFacade* _tmp9_ = NULL;
+	ConfigFacade* _tmp10_ = NULL;
+	RawDeveloper _tmp11_ = 0;
+	RawDeveloper _tmp12_ = 0;
+	GSimpleAction* action = NULL;
+	GAction* _tmp13_ = NULL;
+	GSimpleAction* _tmp14_ = NULL;
+	const gchar* _tmp15_ = NULL;
+	RawDeveloper _tmp16_ = 0;
+	GSimpleAction* _tmp17_ = NULL;
+	GVariant* _tmp18_ = NULL;
 #line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rotate_left = _tmp38_;
-#line 2439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rotate_left.label = RESOURCES_ROTATE_CCW_MENU;
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
+#line 2438 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	PAGE_CLASS (library_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page));
 #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rotate_left.tooltip = RESOURCES_ROTATE_CCW_TOOLTIP;
+	_tmp0_ = app_window_get_instance ();
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp1_ = _tmp0_;
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), LIBRARY_PHOTO_PAGE_entries, G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries), self);
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp1_);
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp39_ = actions;
+	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp39__length1 = actions_length1;
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp40_ = rotate_left;
+	if (_tmp3_ == NULL) {
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add203 (&actions, &actions_length1, &_actions_size_, &_tmp40_);
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp41_.name = "FlipHorizontally";
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp41_.stock_id = RESOURCES_HFLIP;
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp41_.label = TRANSLATABLE;
+		_g_object_unref0 (_tmp2_);
+#line 15607 "PhotoPage.c"
+	}
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp4_ = _tmp3_;
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp5_ = config_facade_get_instance ();
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp6_ = _tmp5_;
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp7_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp8_ = _variant_new12 (_tmp7_);
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_simple_action_set_state (_tmp4_, _tmp8_);
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_variant_unref0 (_tmp8_);
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp6_);
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp4_);
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp9_ = config_facade_get_instance ();
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp10_ = _tmp9_;
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp11_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp12_ = _tmp11_;
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp10_);
+#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	d = _tmp12_;
 #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp41_.accelerator = NULL;
+	_tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
 #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp41_.tooltip = TRANSLATABLE;
+	_tmp14_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp13_) : NULL;
 #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp41_.callback = (GCallback) _editing_host_page_on_flip_horizontally_gtk_action_callback;
+	if (_tmp14_ == NULL) {
 #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	hflip = _tmp41_;
-#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	hflip.label = RESOURCES_HFLIP_MENU;
-#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp42_ = actions;
-#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp42__length1 = actions_length1;
-#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp43_ = hflip;
-#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add204 (&actions, &actions_length1, &_actions_size_, &_tmp43_);
-#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp44_.name = "FlipVertically";
-#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp44_.stock_id = RESOURCES_VFLIP;
-#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp44_.label = TRANSLATABLE;
-#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp44_.accelerator = NULL;
-#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp44_.tooltip = TRANSLATABLE;
-#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp44_.callback = (GCallback) _editing_host_page_on_flip_vertically_gtk_action_callback;
-#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	vflip = _tmp44_;
-#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	vflip.label = RESOURCES_VFLIP_MENU;
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp45_ = actions;
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp45__length1 = actions_length1;
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp46_ = vflip;
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add205 (&actions, &actions_length1, &_actions_size_, &_tmp46_);
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp47_.name = "Enhance";
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp47_.stock_id = RESOURCES_ENHANCE;
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp47_.label = TRANSLATABLE;
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp47_.accelerator = "<Ctrl>E";
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp47_.tooltip = TRANSLATABLE;
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp47_.callback = (GCallback) _editing_host_page_on_enhance_gtk_action_callback;
-#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	enhance = _tmp47_;
-#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	enhance.label = RESOURCES_ENHANCE_MENU;
-#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	enhance.tooltip = RESOURCES_ENHANCE_TOOLTIP;
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp48_ = actions;
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp48__length1 = actions_length1;
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp49_ = enhance;
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add206 (&actions, &actions_length1, &_actions_size_, &_tmp49_);
-#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp50_.name = "CopyColorAdjustments";
-#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp50_.stock_id = NULL;
-#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp50_.label = TRANSLATABLE;
-#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp50_.accelerator = "<Ctrl><Shift>C";
-#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp50_.tooltip = TRANSLATABLE;
-#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp50_.callback = (GCallback) _editing_host_page_on_copy_adjustments_gtk_action_callback;
-#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	copy_adjustments = _tmp50_;
-#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	copy_adjustments.label = RESOURCES_COPY_ADJUSTMENTS_MENU;
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	copy_adjustments.tooltip = RESOURCES_COPY_ADJUSTMENTS_TOOLTIP;
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp51_ = actions;
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp51__length1 = actions_length1;
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp52_ = copy_adjustments;
-#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add207 (&actions, &actions_length1, &_actions_size_, &_tmp52_);
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp53_.name = "PasteColorAdjustments";
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp53_.stock_id = NULL;
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp53_.label = TRANSLATABLE;
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp53_.accelerator = "<Ctrl><Shift>V";
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp53_.tooltip = TRANSLATABLE;
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp53_.callback = (GCallback) _editing_host_page_on_paste_adjustments_gtk_action_callback;
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	paste_adjustments = _tmp53_;
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	paste_adjustments.label = RESOURCES_PASTE_ADJUSTMENTS_MENU;
-#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	paste_adjustments.tooltip = RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP;
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp54_ = actions;
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp54__length1 = actions_length1;
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp55_ = paste_adjustments;
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add208 (&actions, &actions_length1, &_actions_size_, &_tmp55_);
-#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp56_.name = "Crop";
-#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp56_.stock_id = RESOURCES_CROP;
-#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp56_.label = TRANSLATABLE;
-#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp56_.accelerator = "<Ctrl>O";
-#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp56_.tooltip = TRANSLATABLE;
-#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp56_.callback = (GCallback) _editing_host_page_toggle_crop_gtk_action_callback;
-#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	crop = _tmp56_;
-#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	crop.label = RESOURCES_CROP_MENU;
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	crop.tooltip = RESOURCES_CROP_TOOLTIP;
-#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp57_ = actions;
-#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp57__length1 = actions_length1;
-#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp58_ = crop;
-#line 2475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add209 (&actions, &actions_length1, &_actions_size_, &_tmp58_);
-#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp59_.name = "Straighten";
-#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp59_.stock_id = RESOURCES_REFRESH_LABEL;
-#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp59_.label = TRANSLATABLE;
-#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp59_.accelerator = "<Ctrl>A";
-#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp59_.tooltip = TRANSLATABLE;
-#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp59_.callback = (GCallback) _editing_host_page_toggle_straighten_gtk_action_callback;
-#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	straighten = _tmp59_;
-#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	straighten.label = RESOURCES_STRAIGHTEN_MENU;
-#line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	straighten.tooltip = RESOURCES_STRAIGHTEN_TOOLTIP;
-#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp60_ = actions;
-#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp60__length1 = actions_length1;
-#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp61_ = straighten;
-#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add210 (&actions, &actions_length1, &_actions_size_, &_tmp61_);
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp62_.name = "RedEye";
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp62_.stock_id = RESOURCES_REDEYE;
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp62_.label = TRANSLATABLE;
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp62_.accelerator = "<Ctrl>Y";
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp62_.tooltip = TRANSLATABLE;
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp62_.callback = (GCallback) _editing_host_page_toggle_redeye_gtk_action_callback;
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	red_eye = _tmp62_;
-#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	red_eye.label = RESOURCES_RED_EYE_MENU;
-#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	red_eye.tooltip = RESOURCES_RED_EYE_TOOLTIP;
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp63_ = actions;
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp63__length1 = actions_length1;
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp64_ = red_eye;
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add211 (&actions, &actions_length1, &_actions_size_, &_tmp64_);
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp65_.name = "Adjust";
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp65_.stock_id = RESOURCES_ADJUST;
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp65_.label = TRANSLATABLE;
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp65_.accelerator = "<Ctrl>D";
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp65_.tooltip = TRANSLATABLE;
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp65_.callback = (GCallback) _editing_host_page_toggle_adjust_gtk_action_callback;
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	adjust = _tmp65_;
-#line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	adjust.label = RESOURCES_ADJUST_MENU;
-#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	adjust.tooltip = RESOURCES_ADJUST_TOOLTIP;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp66_ = actions;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp66__length1 = actions_length1;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp67_ = adjust;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add212 (&actions, &actions_length1, &_actions_size_, &_tmp67_);
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp68_.name = "Revert";
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp68_.stock_id = RESOURCES_REVERT_TO_SAVED_LABEL;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp68_.label = TRANSLATABLE;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp68_.accelerator = NULL;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp68_.tooltip = TRANSLATABLE;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp68_.callback = (GCallback) _editing_host_page_on_revert_gtk_action_callback;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	revert = _tmp68_;
-#line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	revert.label = RESOURCES_REVERT_MENU;
-#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp69_ = actions;
-#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp69__length1 = actions_length1;
-#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp70_ = revert;
-#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add213 (&actions, &actions_length1, &_actions_size_, &_tmp70_);
-#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp71_.name = "EditTitle";
-#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp71_.stock_id = NULL;
-#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp71_.label = TRANSLATABLE;
-#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp71_.accelerator = "F2";
-#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp71_.tooltip = TRANSLATABLE;
-#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp71_.callback = (GCallback) _editing_host_page_on_edit_title_gtk_action_callback;
-#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	edit_title = _tmp71_;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	edit_title.label = RESOURCES_EDIT_TITLE_MENU;
-#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp72_ = actions;
-#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp72__length1 = actions_length1;
-#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp73_ = edit_title;
-#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add214 (&actions, &actions_length1, &_actions_size_, &_tmp73_);
-#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp74_.name = "EditComment";
-#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp74_.stock_id = NULL;
-#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp74_.label = TRANSLATABLE;
-#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp74_.accelerator = "F3";
-#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp74_.tooltip = TRANSLATABLE;
-#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp74_.callback = (GCallback) _editing_host_page_on_edit_comment_gtk_action_callback;
-#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	edit_comment = _tmp74_;
-#line 2507 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	edit_comment.label = RESOURCES_EDIT_COMMENT_MENU;
-#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp75_ = actions;
-#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp75__length1 = actions_length1;
-#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp76_ = edit_comment;
-#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add215 (&actions, &actions_length1, &_actions_size_, &_tmp76_);
-#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp77_.name = "AdjustDateTime";
-#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp77_.stock_id = NULL;
-#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp77_.label = TRANSLATABLE;
-#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp77_.accelerator = NULL;
-#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp77_.tooltip = TRANSLATABLE;
-#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp77_.callback = (GCallback) _editing_host_page_on_adjust_date_time_gtk_action_callback;
-#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	adjust_date_time = _tmp77_;
-#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	adjust_date_time.label = RESOURCES_ADJUST_DATE_TIME_MENU;
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp78_ = actions;
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp78__length1 = actions_length1;
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp79_ = adjust_date_time;
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add216 (&actions, &actions_length1, &_actions_size_, &_tmp79_);
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp80_.name = "ExternalEdit";
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp80_.stock_id = RESOURCES_EDIT_LABEL;
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp80_.label = TRANSLATABLE;
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp80_.accelerator = "<Ctrl>Return";
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp80_.tooltip = TRANSLATABLE;
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp80_.callback = (GCallback) _library_photo_page_on_external_edit_gtk_action_callback;
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	external_edit = _tmp80_;
-#line 2517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	external_edit.label = RESOURCES_EXTERNAL_EDIT_MENU;
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp81_ = actions;
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp81__length1 = actions_length1;
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp82_ = external_edit;
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add217 (&actions, &actions_length1, &_actions_size_, &_tmp82_);
-#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp83_.name = "ExternalEditRAW";
-#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp83_.stock_id = NULL;
-#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp83_.label = TRANSLATABLE;
-#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp83_.accelerator = "<Ctrl><Shift>Return";
-#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp83_.tooltip = TRANSLATABLE;
-#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp83_.callback = (GCallback) _library_photo_page_on_external_edit_raw_gtk_action_callback;
-#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	edit_raw = _tmp83_;
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	edit_raw.label = RESOURCES_EXTERNAL_EDIT_RAW_MENU;
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp84_ = actions;
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp84__length1 = actions_length1;
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp85_ = edit_raw;
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add218 (&actions, &actions_length1, &_actions_size_, &_tmp85_);
-#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp86_.name = "SendTo";
-#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp86_.stock_id = "document-send";
-#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp86_.label = TRANSLATABLE;
-#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp86_.accelerator = NULL;
-#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp86_.tooltip = TRANSLATABLE;
-#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp86_.callback = (GCallback) _library_photo_page_on_send_to_gtk_action_callback;
-#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	send_to = _tmp86_;
-#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	send_to.label = RESOURCES_SEND_TO_MENU;
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp87_ = actions;
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp87__length1 = actions_length1;
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp88_ = send_to;
-#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add219 (&actions, &actions_length1, &_actions_size_, &_tmp88_);
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp89_.name = "SetBackground";
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp89_.stock_id = NULL;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp89_.label = TRANSLATABLE;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp89_.accelerator = "<Ctrl>B";
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp89_.tooltip = TRANSLATABLE;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp89_.callback = (GCallback) _editing_host_page_on_set_background_gtk_action_callback;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	set_background = _tmp89_;
-#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	set_background.label = RESOURCES_SET_BACKGROUND_MENU;
-#line 2533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	set_background.tooltip = RESOURCES_SET_BACKGROUND_TOOLTIP;
-#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp90_ = actions;
-#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp90__length1 = actions_length1;
-#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp91_ = set_background;
-#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add220 (&actions, &actions_length1, &_actions_size_, &_tmp91_);
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp92_.name = "Flag";
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp92_.stock_id = NULL;
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp92_.label = TRANSLATABLE;
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp92_.accelerator = "<Ctrl>G";
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp92_.tooltip = TRANSLATABLE;
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp92_.callback = (GCallback) _library_photo_page_on_flag_unflag_gtk_action_callback;
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	flag = _tmp92_;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	flag.label = RESOURCES_FLAG_MENU;
-#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp93_ = actions;
-#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp93__length1 = actions_length1;
-#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp94_ = flag;
-#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add221 (&actions, &actions_length1, &_actions_size_, &_tmp94_);
-#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp95_.name = "Rate";
-#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp95_.stock_id = NULL;
-#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp95_.label = TRANSLATABLE;
-#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp95_.accelerator = NULL;
-#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp95_.tooltip = NULL;
-#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp95_.callback = (GCallback) NULL;
-#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	set_rating = _tmp95_;
-#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	set_rating.label = RESOURCES_RATING_MENU;
-#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp96_ = actions;
-#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp96__length1 = actions_length1;
-#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp97_ = set_rating;
-#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add222 (&actions, &actions_length1, &_actions_size_, &_tmp97_);
-#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp98_.name = "IncreaseRating";
-#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp98_.stock_id = NULL;
-#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp98_.label = TRANSLATABLE;
-#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp98_.accelerator = "greater";
-#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp98_.tooltip = TRANSLATABLE;
-#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp98_.callback = (GCallback) _library_photo_page_on_increase_rating_gtk_action_callback;
-#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	increase_rating = _tmp98_;
-#line 2546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	increase_rating.label = RESOURCES_INCREASE_RATING_MENU;
-#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp99_ = actions;
-#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp99__length1 = actions_length1;
-#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp100_ = increase_rating;
-#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add223 (&actions, &actions_length1, &_actions_size_, &_tmp100_);
-#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp101_.name = "DecreaseRating";
-#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp101_.stock_id = NULL;
-#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp101_.label = TRANSLATABLE;
-#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp101_.accelerator = "less";
-#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp101_.tooltip = TRANSLATABLE;
-#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp101_.callback = (GCallback) _library_photo_page_on_decrease_rating_gtk_action_callback;
-#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	decrease_rating = _tmp101_;
-#line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	decrease_rating.label = RESOURCES_DECREASE_RATING_MENU;
-#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp102_ = actions;
-#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp102__length1 = actions_length1;
-#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp103_ = decrease_rating;
-#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add224 (&actions, &actions_length1, &_actions_size_, &_tmp103_);
-#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp104_.name = "RateRejected";
-#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp104_.stock_id = NULL;
-#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp104_.label = TRANSLATABLE;
-#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp104_.accelerator = "9";
-#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp104_.tooltip = TRANSLATABLE;
-#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp104_.callback = (GCallback) _library_photo_page_on_rate_rejected_gtk_action_callback;
-#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_rejected = _tmp104_;
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp105_ = resources_rating_menu (RATING_REJECTED);
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_rejected.label = _tmp105_;
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp106_ = actions;
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp106__length1 = actions_length1;
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp107_ = rate_rejected;
-#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add225 (&actions, &actions_length1, &_actions_size_, &_tmp107_);
-#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp108_.name = "RateUnrated";
-#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp108_.stock_id = NULL;
-#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp108_.label = TRANSLATABLE;
-#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp108_.accelerator = "0";
-#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp108_.tooltip = TRANSLATABLE;
-#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp108_.callback = (GCallback) _library_photo_page_on_rate_unrated_gtk_action_callback;
-#line 2559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_unrated = _tmp108_;
-#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp109_ = resources_rating_menu (RATING_UNRATED);
-#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_unrated.label = _tmp109_;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp110_ = actions;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp110__length1 = actions_length1;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp111_ = rate_unrated;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add226 (&actions, &actions_length1, &_actions_size_, &_tmp111_);
-#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp112_.name = "RateOne";
-#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp112_.stock_id = NULL;
-#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp112_.label = TRANSLATABLE;
-#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp112_.accelerator = "1";
-#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp112_.tooltip = TRANSLATABLE;
-#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp112_.callback = (GCallback) _library_photo_page_on_rate_one_gtk_action_callback;
-#line 2564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_one = _tmp112_;
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp113_ = resources_rating_menu (RATING_ONE);
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_one.label = _tmp113_;
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp114_ = actions;
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp114__length1 = actions_length1;
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp115_ = rate_one;
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add227 (&actions, &actions_length1, &_actions_size_, &_tmp115_);
-#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp116_.name = "RateTwo";
-#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp116_.stock_id = NULL;
-#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp116_.label = TRANSLATABLE;
-#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp116_.accelerator = "2";
-#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp116_.tooltip = TRANSLATABLE;
-#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp116_.callback = (GCallback) _library_photo_page_on_rate_two_gtk_action_callback;
-#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_two = _tmp116_;
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp117_ = resources_rating_menu (RATING_TWO);
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_two.label = _tmp117_;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp118_ = actions;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp118__length1 = actions_length1;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp119_ = rate_two;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add228 (&actions, &actions_length1, &_actions_size_, &_tmp119_);
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp120_.name = "RateThree";
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp120_.stock_id = NULL;
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp120_.label = TRANSLATABLE;
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp120_.accelerator = "3";
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp120_.tooltip = TRANSLATABLE;
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp120_.callback = (GCallback) _library_photo_page_on_rate_three_gtk_action_callback;
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_three = _tmp120_;
-#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp121_ = resources_rating_menu (RATING_THREE);
-#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_three.label = _tmp121_;
-#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp122_ = actions;
-#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp122__length1 = actions_length1;
-#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp123_ = rate_three;
-#line 2577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add229 (&actions, &actions_length1, &_actions_size_, &_tmp123_);
-#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp124_.name = "RateFour";
-#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp124_.stock_id = NULL;
-#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp124_.label = TRANSLATABLE;
-#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp124_.accelerator = "4";
-#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp124_.tooltip = TRANSLATABLE;
-#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp124_.callback = (GCallback) _library_photo_page_on_rate_four_gtk_action_callback;
-#line 2579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_four = _tmp124_;
-#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp125_ = resources_rating_menu (RATING_FOUR);
-#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_four.label = _tmp125_;
-#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp126_ = actions;
-#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp126__length1 = actions_length1;
-#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp127_ = rate_four;
-#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add230 (&actions, &actions_length1, &_actions_size_, &_tmp127_);
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp128_.name = "RateFive";
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp128_.stock_id = NULL;
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp128_.label = TRANSLATABLE;
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp128_.accelerator = "5";
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp128_.tooltip = TRANSLATABLE;
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp128_.callback = (GCallback) _library_photo_page_on_rate_five_gtk_action_callback;
-#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_five = _tmp128_;
-#line 2586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp129_ = resources_rating_menu (RATING_FIVE);
-#line 2586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rate_five.label = _tmp129_;
-#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp130_ = actions;
-#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp130__length1 = actions_length1;
-#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp131_ = rate_five;
-#line 2587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add231 (&actions, &actions_length1, &_actions_size_, &_tmp131_);
-#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp132_.name = "IncreaseSize";
-#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp132_.stock_id = RESOURCES_ZOOM_IN_LABEL;
-#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp132_.label = TRANSLATABLE;
-#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp132_.accelerator = "<Ctrl>plus";
-#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp132_.tooltip = TRANSLATABLE;
-#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp132_.callback = (GCallback) _editing_host_page_on_increase_size_gtk_action_callback;
-#line 2589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	increase_size = _tmp132_;
-#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp133_ = _ ("Zoom _In");
-#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	increase_size.label = _tmp133_;
-#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp134_ = _ ("Increase the magnification of the photo");
-#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	increase_size.tooltip = _tmp134_;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp135_ = actions;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp135__length1 = actions_length1;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp136_ = increase_size;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add232 (&actions, &actions_length1, &_actions_size_, &_tmp136_);
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp137_.name = "DecreaseSize";
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp137_.stock_id = RESOURCES_ZOOM_OUT_LABEL;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp137_.label = TRANSLATABLE;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp137_.accelerator = "<Ctrl>minus";
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp137_.tooltip = TRANSLATABLE;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp137_.callback = (GCallback) _editing_host_page_on_decrease_size_gtk_action_callback;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	decrease_size = _tmp137_;
-#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp138_ = _ ("Zoom _Out");
-#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	decrease_size.label = _tmp138_;
-#line 2598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp139_ = _ ("Decrease the magnification of the photo");
-#line 2598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	decrease_size.tooltip = _tmp139_;
-#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp140_ = actions;
-#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp140__length1 = actions_length1;
-#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp141_ = decrease_size;
-#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add233 (&actions, &actions_length1, &_actions_size_, &_tmp141_);
-#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp142_.name = "ZoomFit";
-#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp142_.stock_id = RESOURCES_ZOOM_FIT_LABEL;
-#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp142_.label = TRANSLATABLE;
-#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp142_.accelerator = "<Ctrl>0";
-#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp142_.tooltip = TRANSLATABLE;
-#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp142_.callback = (GCallback) _editing_host_page_snap_zoom_to_min_gtk_action_callback;
-#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	best_fit = _tmp142_;
-#line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp143_ = _ ("Fit to _Page");
-#line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	best_fit.label = _tmp143_;
-#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp144_ = _ ("Zoom the photo to fit on the screen");
-#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	best_fit.tooltip = _tmp144_;
-#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp145_ = actions;
-#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp145__length1 = actions_length1;
-#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp146_ = best_fit;
-#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add234 (&actions, &actions_length1, &_actions_size_, &_tmp146_);
-#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp147_.name = "Zoom100";
-#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp147_.stock_id = RESOURCES_ZOOM_100_LABEL;
-#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp147_.label = TRANSLATABLE;
-#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp147_.accelerator = "<Ctrl>1";
-#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp147_.tooltip = TRANSLATABLE;
-#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp147_.callback = (GCallback) _editing_host_page_snap_zoom_to_isomorphic_gtk_action_callback;
-#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	actual_size = _tmp147_;
-#line 2610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp148_ = _ ("Zoom _100%");
-#line 2610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	actual_size.label = _tmp148_;
-#line 2612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp149_ = _ ("Zoom the photo to 100% magnification");
-#line 2612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	actual_size.tooltip = _tmp149_;
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp150_ = actions;
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp150__length1 = actions_length1;
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp151_ = actual_size;
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add235 (&actions, &actions_length1, &_actions_size_, &_tmp151_);
-#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp152_.name = "Zoom200";
-#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp152_.stock_id = NULL;
-#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp152_.label = TRANSLATABLE;
-#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp152_.accelerator = "<Ctrl>2";
-#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp152_.tooltip = TRANSLATABLE;
-#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp152_.callback = (GCallback) _editing_host_page_snap_zoom_to_max_gtk_action_callback;
-#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	max_size = _tmp152_;
-#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp153_ = _ ("Zoom _200%");
-#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	max_size.label = _tmp153_;
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp154_ = _ ("Zoom the photo to 200% magnification");
-#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	max_size.tooltip = _tmp154_;
-#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp155_ = actions;
-#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp155__length1 = actions_length1;
-#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp156_ = max_size;
-#line 2621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add236 (&actions, &actions_length1, &_actions_size_, &_tmp156_);
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp157_.name = "AddTags";
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp157_.stock_id = NULL;
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp157_.label = TRANSLATABLE;
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp157_.accelerator = "<Ctrl>T";
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp157_.tooltip = TRANSLATABLE;
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp157_.callback = (GCallback) _library_photo_page_on_add_tags_gtk_action_callback;
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	add_tags = _tmp157_;
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	add_tags.label = RESOURCES_ADD_TAGS_MENU;
-#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp158_ = actions;
-#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp158__length1 = actions_length1;
-#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp159_ = add_tags;
-#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add237 (&actions, &actions_length1, &_actions_size_, &_tmp159_);
-#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp160_.name = "ModifyTags";
-#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp160_.stock_id = NULL;
-#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp160_.label = TRANSLATABLE;
-#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp160_.accelerator = "<Ctrl>M";
-#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp160_.tooltip = TRANSLATABLE;
-#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp160_.callback = (GCallback) _library_photo_page_on_modify_tags_gtk_action_callback;
-#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	modify_tags = _tmp160_;
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	modify_tags.label = RESOURCES_MODIFY_TAGS_MENU;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp161_ = actions;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp161__length1 = actions_length1;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp162_ = modify_tags;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add238 (&actions, &actions_length1, &_actions_size_, &_tmp162_);
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp163_.name = "Slideshow";
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp163_.stock_id = NULL;
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp163_.label = TRANSLATABLE;
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp163_.accelerator = "F5";
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp163_.tooltip = TRANSLATABLE;
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp163_.callback = (GCallback) _library_photo_page_on_slideshow_gtk_action_callback;
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	slideshow = _tmp163_;
-#line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp164_ = _ ("S_lideshow");
-#line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	slideshow.label = _tmp164_;
-#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp165_ = _ ("Play a slideshow");
-#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	slideshow.tooltip = _tmp165_;
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp166_ = actions;
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp166__length1 = actions_length1;
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp167_ = slideshow;
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add239 (&actions, &actions_length1, &_actions_size_, &_tmp167_);
-#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp168_.name = "RawDeveloper";
-#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp168_.stock_id = NULL;
-#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp168_.label = TRANSLATABLE;
-#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp168_.accelerator = NULL;
-#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp168_.tooltip = NULL;
-#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp168_.callback = (GCallback) NULL;
-#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	raw_developer = _tmp168_;
-#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp169_ = _ ("_Developer");
-#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	raw_developer.label = _tmp169_;
-#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp170_ = actions;
-#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp170__length1 = actions_length1;
-#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp171_ = raw_developer;
-#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add240 (&actions, &actions_length1, &_actions_size_, &_tmp171_);
-#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp172_.name = "SendToContextMenu";
-#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp172_.stock_id = "document-send";
-#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp172_.label = TRANSLATABLE;
-#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp172_.accelerator = NULL;
-#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp172_.tooltip = TRANSLATABLE;
-#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp172_.callback = (GCallback) _library_photo_page_on_send_to_gtk_action_callback;
-#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	send_to_context_menu = _tmp172_;
-#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	send_to_context_menu.label = RESOURCES_SEND_TO_CONTEXT_MENU;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp173_ = actions;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp173__length1 = actions_length1;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp174_ = send_to_context_menu;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add241 (&actions, &actions_length1, &_actions_size_, &_tmp174_);
-#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp175_.name = "AddTagsContextMenu";
-#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp175_.stock_id = NULL;
-#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp175_.label = TRANSLATABLE;
-#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp175_.accelerator = "<Ctrl>A";
-#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp175_.tooltip = TRANSLATABLE;
-#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp175_.callback = (GCallback) _library_photo_page_on_add_tags_gtk_action_callback;
-#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	add_tags_context_menu = _tmp175_;
-#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	add_tags_context_menu.label = RESOURCES_ADD_TAGS_CONTEXT_MENU;
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp176_ = actions;
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp176__length1 = actions_length1;
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp177_ = add_tags_context_menu;
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add242 (&actions, &actions_length1, &_actions_size_, &_tmp177_);
-#line 2655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp178_ = actions;
-#line 2655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp178__length1 = actions_length1;
-#line 2655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (result_length1) {
-#line 2655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*result_length1 = _tmp178__length1;
-#line 17972 "PhotoPage.c"
-	}
-#line 2655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp178_;
-#line 2655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	return result;
-#line 17978 "PhotoPage.c"
-}
-
-
-static void _library_photo_page_on_display_ratings_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action);
-#line 17985 "PhotoPage.c"
-}
-
-
-static void _vala_array_add243 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 17996 "PhotoPage.c"
+		_g_object_unref0 (_tmp13_);
+#line 15647 "PhotoPage.c"
 	}
-#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 18000 "PhotoPage.c"
-}
-
-
-static GtkToggleActionEntry* library_photo_page_real_init_collect_toggle_action_entries (Page* base, int* result_length1) {
-	LibraryPhotoPage * self;
-	GtkToggleActionEntry* result = NULL;
-	GtkToggleActionEntry* toggle_actions = NULL;
-	gint _tmp0_ = 0;
-	GtkToggleActionEntry* _tmp1_ = NULL;
-	gint toggle_actions_length1 = 0;
-	gint _toggle_actions_size_ = 0;
-	GtkToggleActionEntry ratings = {0};
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	GtkToggleActionEntry _tmp5_ = {0};
-	GtkToggleActionEntry _tmp6_ = {0};
-	GtkToggleActionEntry* _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	GtkToggleActionEntry _tmp8_ = {0};
-	GtkToggleActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = PAGE_CLASS (library_photo_page_parent_class)->init_collect_toggle_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), &_tmp0_);
-#line 2659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	toggle_actions = _tmp1_;
-#line 2659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	toggle_actions_length1 = _tmp0_;
-#line 2659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_toggle_actions_size_ = toggle_actions_length1;
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = config_facade_get_instance ();
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_;
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.name = "ViewRatings";
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.stock_id = NULL;
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.accelerator = "<Ctrl><Shift>N";
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.tooltip = TRANSLATABLE;
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.callback = (GCallback) _library_photo_page_on_display_ratings_gtk_action_callback;
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.is_active = _tmp4_;
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _tmp5_;
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp3_);
-#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	ratings = _tmp6_;
-#line 2663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	ratings.label = RESOURCES_VIEW_RATINGS_MENU;
-#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	ratings.tooltip = RESOURCES_VIEW_RATINGS_TOOLTIP;
-#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = toggle_actions;
-#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7__length1 = toggle_actions_length1;
-#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = ratings;
-#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add243 (&toggle_actions, &toggle_actions_length1, &_toggle_actions_size_, &_tmp8_);
-#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = toggle_actions;
-#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9__length1 = toggle_actions_length1;
-#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (result_length1) {
-#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*result_length1 = _tmp9__length1;
-#line 18079 "PhotoPage.c"
+#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	action = _tmp14_;
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp16_ = d;
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	if (_tmp16_ == RAW_DEVELOPER_SHOTWELL) {
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp15_ = "'Shotwell'";
+#line 15657 "PhotoPage.c"
+	} else {
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp15_ = "'Camera'";
+#line 15661 "PhotoPage.c"
 	}
-#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp9_;
-#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	return result;
-#line 18085 "PhotoPage.c"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp17_ = action;
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp18_ = _variant_new13 (_tmp15_);
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_simple_action_set_state (_tmp17_, _tmp18_);
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_variant_unref0 (_tmp18_);
+#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (action);
+#line 15673 "PhotoPage.c"
 }
 
 
 static gpointer _injection_group_ref0 (gpointer self) {
-#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 18092 "PhotoPage.c"
+#line 15680 "PhotoPage.c"
 }
 
 
-static void _vala_array_add244 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 18103 "PhotoPage.c"
+#line 15691 "PhotoPage.c"
 	}
-#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 18109 "PhotoPage.c"
+#line 15697 "PhotoPage.c"
 }
 
 
-static void _vala_array_add245 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 18120 "PhotoPage.c"
+#line 15708 "PhotoPage.c"
 	}
-#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 18126 "PhotoPage.c"
+#line 15714 "PhotoPage.c"
 }
 
 
-static void _vala_array_add246 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 18137 "PhotoPage.c"
+#line 15725 "PhotoPage.c"
 	}
-#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 18143 "PhotoPage.c"
+#line 15731 "PhotoPage.c"
 }
 
 
@@ -18158,317 +15746,181 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	gint _groups_size_ = 0;
 	InjectionGroup* print_group = NULL;
 	InjectionGroup* _tmp2_ = NULL;
-	InjectionGroup** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	InjectionGroup* _tmp4_ = NULL;
-	InjectionGroup* publish_group = NULL;
+	const gchar* _tmp3_ = NULL;
+	InjectionGroup** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
 	InjectionGroup* _tmp5_ = NULL;
-	InjectionGroup** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	InjectionGroup* _tmp7_ = NULL;
+	InjectionGroup* publish_group = NULL;
+	InjectionGroup* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	InjectionGroup** _tmp8_ = NULL;
+	gint _tmp8__length1 = 0;
+	InjectionGroup* _tmp9_ = NULL;
 	InjectionGroup* bg_group = NULL;
-	InjectionGroup* _tmp8_ = NULL;
-	InjectionGroup** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
 	InjectionGroup* _tmp10_ = NULL;
-	InjectionGroup** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	const gchar* _tmp11_ = NULL;
+	InjectionGroup** _tmp12_ = NULL;
+	gint _tmp12__length1 = 0;
+	InjectionGroup* _tmp13_ = NULL;
+	InjectionGroup** _tmp14_ = NULL;
+	gint _tmp14__length1 = 0;
+#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = PAGE_CLASS (library_photo_page_parent_class)->init_collect_injection_groups (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), &_tmp0_);
-#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	groups = _tmp1_;
-#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	groups_length1 = _tmp0_;
-#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_groups_size_ = groups_length1;
-#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = injection_group_new ("/MenuBar/FileMenu/PrintPlaceholder");
-#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp2_ = injection_group_new ("PrintPlaceholder");
+#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	print_group = _tmp2_;
-#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	injection_group_add_menu_item (print_group, "Print", NULL);
-#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = groups;
-#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3__length1 = groups_length1;
-#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _injection_group_ref0 (print_group);
-#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add244 (&groups, &groups_length1, &_groups_size_, _tmp4_);
-#line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = injection_group_new ("/MenuBar/FileMenu/PublishPlaceholder");
-#line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	publish_group = _tmp5_;
-#line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	injection_group_add_menu_item (publish_group, "Publish", NULL);
-#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = groups;
-#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6__length1 = groups_length1;
-#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = _injection_group_ref0 (publish_group);
-#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add245 (&groups, &groups_length1, &_groups_size_, _tmp7_);
-#line 2683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = injection_group_new ("/MenuBar/FileMenu/SetBackgroundPlaceholder");
-#line 2683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	bg_group = _tmp8_;
-#line 2684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	injection_group_add_menu_item (bg_group, "SetBackground", NULL);
-#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = groups;
-#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9__length1 = groups_length1;
-#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _injection_group_ref0 (bg_group);
-#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add246 (&groups, &groups_length1, &_groups_size_, _tmp10_);
-#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = groups;
-#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11__length1 = groups_length1;
-#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp3_ = _ ("_Print");
+#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	injection_group_add_menu_item (print_group, _tmp3_, "Print", "<Primary>p");
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp4_ = groups;
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp4__length1 = groups_length1;
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp5_ = _injection_group_ref0 (print_group);
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp5_);
+#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp6_ = injection_group_new ("PublishPlaceholder");
+#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	publish_group = _tmp6_;
+#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp7_ = _ ("_Publish");
+#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	injection_group_add_menu_item (publish_group, _tmp7_, "Publish", "<Primary><Shift>p");
+#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp8_ = groups;
+#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp8__length1 = groups_length1;
+#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp9_ = _injection_group_ref0 (publish_group);
+#line 2458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp9_);
+#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp10_ = injection_group_new ("SetBackgroundPlaceholder");
+#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	bg_group = _tmp10_;
+#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp11_ = _ ("Set as _Desktop Background");
+#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	injection_group_add_menu_item (bg_group, _tmp11_, "SetBackground", NULL);
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp12_ = groups;
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp12__length1 = groups_length1;
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp13_ = _injection_group_ref0 (bg_group);
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp13_);
+#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp14_ = groups;
+#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp14__length1 = groups_length1;
+#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (result_length1) {
-#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*result_length1 = _tmp11__length1;
-#line 18232 "PhotoPage.c"
+#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		*result_length1 = _tmp14__length1;
+#line 15829 "PhotoPage.c"
 	}
-#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp11_;
-#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	result = _tmp14_;
+#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (bg_group);
-#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (publish_group);
-#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (print_group);
-#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 18244 "PhotoPage.c"
-}
-
-
-static void _vala_array_add247 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 18255 "PhotoPage.c"
-	}
-#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 18259 "PhotoPage.c"
-}
-
-
-static void _vala_array_add248 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 18270 "PhotoPage.c"
-	}
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 18274 "PhotoPage.c"
-}
-
-
-static void _library_photo_page_on_raw_developer_changed_gtk_radio_action_callback (GtkAction* action, GtkAction* current, gpointer self) {
-#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, action, current);
-#line 18281 "PhotoPage.c"
-}
-
-
-static void library_photo_page_real_register_radio_actions (Page* base, GtkActionGroup* action_group) {
-	LibraryPhotoPage * self;
-	GtkRadioActionEntry* developer_actions = NULL;
-	GtkRadioActionEntry* _tmp0_ = NULL;
-	gint developer_actions_length1 = 0;
-	gint _developer_actions_size_ = 0;
-	GtkRadioActionEntry dev_shotwell = {0};
-	GtkRadioActionEntry _tmp1_ = {0};
-	gchar* label_shotwell = NULL;
-	gchar* _tmp2_ = NULL;
-	GtkRadioActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkRadioActionEntry _tmp4_ = {0};
-	GtkRadioActionEntry dev_camera = {0};
-	GtkRadioActionEntry _tmp5_ = {0};
-	gchar* label_camera = NULL;
-	gchar* _tmp6_ = NULL;
-	GtkRadioActionEntry* _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	GtkRadioActionEntry _tmp8_ = {0};
-	GtkActionGroup* _tmp9_ = NULL;
-	GtkRadioActionEntry* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	GtkActionGroup* _tmp11_ = NULL;
-#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
-#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = g_new0 (GtkRadioActionEntry, 0);
-#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	developer_actions = _tmp0_;
-#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	developer_actions_length1 = 0;
-#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_developer_actions_size_ = developer_actions_length1;
-#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_.name = "RawDeveloperShotwell";
-#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_.stock_id = NULL;
-#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_.label = TRANSLATABLE;
-#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_.accelerator = NULL;
-#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_.tooltip = TRANSLATABLE;
-#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_.value = (gint) RAW_DEVELOPER_SHOTWELL;
-#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	dev_shotwell = _tmp1_;
-#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL);
-#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	label_shotwell = _tmp2_;
-#line 2700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	dev_shotwell.label = label_shotwell;
-#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = developer_actions;
-#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3__length1 = developer_actions_length1;
-#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = dev_shotwell;
-#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add247 (&developer_actions, &developer_actions_length1, &_developer_actions_size_, &_tmp4_);
-#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.name = "RawDeveloperCamera";
-#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.stock_id = NULL;
-#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.accelerator = NULL;
-#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.tooltip = TRANSLATABLE;
-#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_.value = (gint) RAW_DEVELOPER_CAMERA;
-#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	dev_camera = _tmp5_;
-#line 2705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA);
-#line 2705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	label_camera = _tmp6_;
-#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	dev_camera.label = label_camera;
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = developer_actions;
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7__length1 = developer_actions_length1;
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = dev_camera;
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_array_add248 (&developer_actions, &developer_actions_length1, &_developer_actions_size_, &_tmp8_);
-#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = action_group;
-#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = developer_actions;
-#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10__length1 = developer_actions_length1;
-#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_action_group_add_radio_actions (_tmp9_, _tmp10_, _tmp10__length1, (gint) RAW_DEVELOPER_SHOTWELL, (GCallback) _library_photo_page_on_raw_developer_changed_gtk_radio_action_callback, self);
-#line 2711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = action_group;
-#line 2711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (library_photo_page_parent_class)->register_radio_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp11_);
-#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_free0 (label_camera);
-#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_free0 (label_shotwell);
-#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	developer_actions = (g_free (developer_actions), NULL);
-#line 18395 "PhotoPage.c"
+#line 15841 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GtkAction* action) {
+static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GtkAction* _tmp0_ = NULL;
+	GVariant* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
-#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	GSimpleAction* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = action;
-#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp0_ = value;
+#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp1_ = g_variant_get_boolean (_tmp0_);
+#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	display = _tmp1_;
-#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_set_display_ratings (self, display);
-#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
-#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 18427 "PhotoPage.c"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp4_ = action;
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp5_ = value;
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_simple_action_set_state (_tmp4_, _tmp5_);
+#line 15879 "PhotoPage.c"
 }
 
 
 static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display) {
-	GtkToggleAction* action = NULL;
-	GtkAction* _tmp0_ = NULL;
-	GtkToggleAction* _tmp1_ = NULL;
-	GtkToggleAction* _tmp2_ = NULL;
-#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	GSimpleAction* action = NULL;
+	GAction* _tmp0_ = NULL;
+	GSimpleAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp0_) : NULL;
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL;
+#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 18446 "PhotoPage.c"
+#line 15898 "PhotoPage.c"
 	}
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	action = _tmp1_;
-#line 2725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = action;
-#line 2725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 18454 "PhotoPage.c"
-		GtkToggleAction* _tmp3_ = NULL;
+#line 15906 "PhotoPage.c"
+		GSimpleAction* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = action;
-#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = display;
-#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gtk_toggle_action_set_active (_tmp3_, _tmp4_);
-#line 18463 "PhotoPage.c"
+#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_simple_action_set_enabled (_tmp3_, _tmp4_);
+#line 15915 "PhotoPage.c"
 	}
-#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 18467 "PhotoPage.c"
+#line 15919 "PhotoPage.c"
 }
 
 
@@ -18506,241 +15958,241 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	gboolean _tmp56_ = FALSE;
 	gint _tmp61_ = 0;
 	gint _tmp62_ = 0;
-#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 1;
-#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	multiple = _tmp3_;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 18523 "PhotoPage.c"
+#line 15975 "PhotoPage.c"
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp7_);
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp8_;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 18537 "PhotoPage.c"
+#line 15989 "PhotoPage.c"
 	} else {
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 18541 "PhotoPage.c"
+#line 15993 "PhotoPage.c"
 	}
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	rotate_possible = _tmp4_;
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 18549 "PhotoPage.c"
+#line 16001 "PhotoPage.c"
 		Photo* _tmp11_ = NULL;
 		Photo* _tmp12_ = NULL;
 		PhotoFileFormat _tmp13_ = 0;
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = photo_get_master_file_format (_tmp12_);
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 18563 "PhotoPage.c"
+#line 16015 "PhotoPage.c"
 	} else {
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = FALSE;
-#line 18567 "PhotoPage.c"
+#line 16019 "PhotoPage.c"
 	}
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	is_raw = _tmp9_;
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 18575 "PhotoPage.c"
+#line 16027 "PhotoPage.c"
 		ConfigFacade* _tmp16_ = NULL;
 		ConfigFacade* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = config_facade_get_instance ();
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _tmp16_;
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = g_strcmp0 (_tmp19_, "") != 0;
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp19_);
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 18594 "PhotoPage.c"
+#line 16046 "PhotoPage.c"
 	} else {
-#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 18598 "PhotoPage.c"
+#line 16050 "PhotoPage.c"
 	}
-#line 2734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_);
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 18606 "PhotoPage.c"
+#line 16058 "PhotoPage.c"
 		gboolean _tmp22_ = FALSE;
 		Photo* _tmp23_ = NULL;
 		Photo* _tmp24_ = NULL;
 		gboolean _tmp25_ = FALSE;
 		gboolean _tmp26_ = FALSE;
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_;
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = photo_has_transformations (_tmp24_);
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp24_);
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp26_) {
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = TRUE;
-#line 18626 "PhotoPage.c"
+#line 16078 "PhotoPage.c"
 		} else {
 			Photo* _tmp27_ = NULL;
 			Photo* _tmp28_ = NULL;
 			gboolean _tmp29_ = FALSE;
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp27_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp28_ = _tmp27_;
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp29_ = photo_has_editable (_tmp28_);
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = _tmp29_;
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp28_);
-#line 18641 "PhotoPage.c"
+#line 16093 "PhotoPage.c"
 		}
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp22_;
-#line 18645 "PhotoPage.c"
+#line 16097 "PhotoPage.c"
 	} else {
-#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 18649 "PhotoPage.c"
+#line 16101 "PhotoPage.c"
 	}
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_);
-#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp31_) {
-#line 18657 "PhotoPage.c"
+#line 16109 "PhotoPage.c"
 		gboolean _tmp32_ = FALSE;
-#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = !_tmp32_;
-#line 18663 "PhotoPage.c"
+#line 16115 "PhotoPage.c"
 	} else {
-#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = FALSE;
-#line 18667 "PhotoPage.c"
+#line 16119 "PhotoPage.c"
 	}
-#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
-#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 2742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
-#line 18675 "PhotoPage.c"
+#line 16127 "PhotoPage.c"
 	}
-#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp33_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp33_);
-#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_) {
-#line 18685 "PhotoPage.c"
+#line 16137 "PhotoPage.c"
 		Photo* _tmp36_ = NULL;
 		Photo* _tmp37_ = NULL;
 		gboolean _tmp38_ = FALSE;
-#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = _tmp36_;
-#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = photo_has_color_adjustments (_tmp37_);
-#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = _tmp38_;
-#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 18699 "PhotoPage.c"
+#line 16151 "PhotoPage.c"
 	} else {
-#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = FALSE;
-#line 18703 "PhotoPage.c"
+#line 16155 "PhotoPage.c"
 	}
-#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_);
-#line 2748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp39_ = pixel_transformation_bundle_has_copied_color_adjustments ();
-#line 2748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp39_);
-#line 2750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp40_ = multiple;
-#line 2750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp40_);
-#line 2751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp41_ = multiple;
-#line 2751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp41_);
-#line 2752 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2507 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp42_ = rotate_possible;
-#line 2752 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2507 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp42_);
-#line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = rotate_possible;
-#line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp43_);
-#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp44_ = rotate_possible;
-#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp44_);
-#line 2755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp45_ = rotate_possible;
-#line 2755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp45_);
-#line 2757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_) {
-#line 18739 "PhotoPage.c"
+#line 16191 "PhotoPage.c"
 		Photo* _tmp47_ = NULL;
 		Photo* _tmp48_ = NULL;
 		Scaling _tmp49_ = {0};
@@ -18749,153 +16201,215 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		Photo* _tmp52_ = NULL;
 		Scaling _tmp53_ = {0};
 		gboolean _tmp54_ = FALSE;
-#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = _tmp47_;
-#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		scaling_for_original (&_tmp49_);
-#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp50_ = editing_tools_crop_tool_is_available (_tmp48_, &_tmp49_);
-#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp50_);
-#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp48_);
-#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = _tmp51_;
-#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		scaling_for_original (&_tmp53_);
-#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp54_ = editing_tools_redeye_tool_is_available (_tmp52_, &_tmp53_);
-#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp54_);
-#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp52_);
-#line 18772 "PhotoPage.c"
+#line 16224 "PhotoPage.c"
 	}
-#line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
-#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp56_ = is_raw;
-#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp56_) {
-#line 18780 "PhotoPage.c"
+#line 16232 "PhotoPage.c"
 		ConfigFacade* _tmp57_ = NULL;
 		ConfigFacade* _tmp58_ = NULL;
 		gchar* _tmp59_ = NULL;
 		gchar* _tmp60_ = NULL;
-#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp57_ = config_facade_get_instance ();
-#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp58_ = _tmp57_;
-#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp59_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp60_ = _tmp59_;
-#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = g_strcmp0 (_tmp60_, "") != 0;
-#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp60_);
-#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp58_);
-#line 18799 "PhotoPage.c"
+#line 16251 "PhotoPage.c"
 	} else {
-#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = FALSE;
-#line 18803 "PhotoPage.c"
+#line 16255 "PhotoPage.c"
 	}
-#line 2765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_);
-#line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp61_ = selected_count;
-#line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp62_ = count;
-#line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp61_, _tmp62_);
-#line 18813 "PhotoPage.c"
+#line 16265 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 18826 "PhotoPage.c"
+#line 16278 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = photo_has_transformations (_tmp4_);
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = TRUE;
-#line 18846 "PhotoPage.c"
+#line 16298 "PhotoPage.c"
 		} else {
 			Photo* _tmp7_ = NULL;
 			Photo* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _tmp7_;
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = photo_has_editable (_tmp8_);
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = _tmp9_;
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp8_);
-#line 18861 "PhotoPage.c"
+#line 16313 "PhotoPage.c"
 		}
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18865 "PhotoPage.c"
+#line 16317 "PhotoPage.c"
 	} else {
-#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 18869 "PhotoPage.c"
+#line 16321 "PhotoPage.c"
 	}
-#line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp0_);
-#line 2774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
-#line 18875 "PhotoPage.c"
+#line 16327 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GtkAction* action, GtkAction* current) {
-	GtkAction* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-#line 2777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value) {
+	RawDeveloper developer = 0;
+	GVariant* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	GQuark _tmp4_ = 0U;
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	static GQuark _tmp3_label0 = 0;
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	static GQuark _tmp3_label1 = 0;
+#line 16341 "PhotoPage.c"
+	RawDeveloper _tmp5_ = 0;
+	GSimpleAction* _tmp6_ = NULL;
+	GVariant* _tmp7_ = NULL;
+#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 2777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (current));
-#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = current;
-#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = gtk_radio_action_get_current_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_radio_action_get_type (), GtkRadioAction));
-#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_developer_changed (self, (RawDeveloper) _tmp1_);
-#line 18894 "PhotoPage.c"
+#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	developer = RAW_DEVELOPER_SHOTWELL;
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp0_ = value;
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp1_ = g_variant_get_string (_tmp0_, NULL);
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp2_ = _tmp1_;
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) {
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		switch (0) {
+#line 16363 "PhotoPage.c"
+			default:
+			{
+#line 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				developer = RAW_DEVELOPER_SHOTWELL;
+#line 2539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				break;
+#line 16370 "PhotoPage.c"
+			}
+		}
+	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		switch (0) {
+#line 16376 "PhotoPage.c"
+			default:
+			{
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				developer = RAW_DEVELOPER_CAMERA;
+#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				break;
+#line 16383 "PhotoPage.c"
+			}
+		}
+	} else {
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		switch (0) {
+#line 16389 "PhotoPage.c"
+			default:
+			{
+#line 2544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				break;
+#line 16394 "PhotoPage.c"
+			}
+		}
+	}
+#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp5_ = developer;
+#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	library_photo_page_developer_changed (self, _tmp5_);
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp6_ = action;
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp7_ = value;
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_simple_action_set_state (_tmp6_, _tmp7_);
+#line 16408 "PhotoPage.c"
 }
 
 
@@ -18919,106 +16433,106 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	gboolean _tmp19_ = FALSE;
 	Photo* _tmp20_ = NULL;
 	gboolean _tmp21_ = FALSE;
-#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18932 "PhotoPage.c"
+#line 16446 "PhotoPage.c"
 	}
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = gee_list_get (_tmp7_, 0);
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = (DataView*) _tmp8_;
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = data_view_get_source (_tmp9_);
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO) ? ((Photo*) _tmp10_) : NULL;
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 18954 "PhotoPage.c"
+#line 16468 "PhotoPage.c"
 	}
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp12_;
-#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = photo;
-#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_ == NULL) {
-#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 18972 "PhotoPage.c"
+#line 16486 "PhotoPage.c"
 	} else {
 		RawDeveloper _tmp15_ = 0;
 		Photo* _tmp16_ = NULL;
 		RawDeveloper _tmp17_ = 0;
 		gboolean _tmp18_ = FALSE;
-#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = rd;
-#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = photo;
-#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = photo_get_raw_developer (_tmp16_);
-#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_);
-#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = _tmp18_;
-#line 18988 "PhotoPage.c"
+#line 16502 "PhotoPage.c"
 	}
-#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_) {
-#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18996 "PhotoPage.c"
+#line 16510 "PhotoPage.c"
 	}
-#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = photo;
-#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = photo_has_transformations (_tmp20_);
-#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp21_) {
-#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = TRUE;
-#line 19006 "PhotoPage.c"
+#line 16520 "PhotoPage.c"
 	} else {
 		gboolean _tmp22_ = FALSE;
-#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = dialogs_confirm_warn_developer_changed (1);
-#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp22_;
-#line 19013 "PhotoPage.c"
+#line 16527 "PhotoPage.c"
 	}
-#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 19017 "PhotoPage.c"
+#line 16531 "PhotoPage.c"
 		SetRawDeveloperCommand* command = NULL;
 		ViewCollection* _tmp23_ = NULL;
 		ViewCollection* _tmp24_ = NULL;
@@ -19030,133 +16544,108 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		CommandManager* _tmp30_ = NULL;
 		CommandManager* _tmp31_ = NULL;
 		SetRawDeveloperCommand* _tmp32_ = NULL;
-#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_;
-#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = view_collection_get_selected (_tmp24_);
-#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = rd;
-#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable), _tmp27_);
-#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = _tmp28_;
-#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp24_);
-#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command = _tmp29_;
-#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = _tmp30_;
-#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = command;
-#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_COMMAND, Command));
-#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp31_);
-#line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
-#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 19063 "PhotoPage.c"
+#line 16577 "PhotoPage.c"
 	}
-#line 2781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 19067 "PhotoPage.c"
+#line 16581 "PhotoPage.c"
 }
 
 
 void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper rd) {
-#line 2781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 19076 "PhotoPage.c"
+#line 16590 "PhotoPage.c"
 }
 
 
 static void library_photo_page_update_flag_action (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 19088 "PhotoPage.c"
-		GtkAction* action = NULL;
-		GtkAction* _tmp1_ = NULL;
-		GtkAction* _tmp2_ = NULL;
-		gboolean is_flagged = FALSE;
-		Photo* _tmp3_ = NULL;
-		LibraryPhoto* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_ = FALSE;
-		const gchar* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
-		GtkAction* _tmp9_ = NULL;
-		GtkAction* _tmp10_ = NULL;
-#line 2802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 16602 "PhotoPage.c"
+		GSimpleAction* action = NULL;
+		GAction* _tmp1_ = NULL;
+		GSimpleAction* _tmp2_ = NULL;
+		GSimpleAction* _tmp3_ = NULL;
+		GSimpleAction* _tmp4_ = NULL;
+#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
-#line 2802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		action = _tmp1_;
-#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = action;
-#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_vala_assert (_tmp2_ != NULL, "action != null");
-#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_FLAGGABLE, Flaggable));
-#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = _tmp5_;
-#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp4_);
-#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		is_flagged = _tmp6_;
-#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = is_flagged;
-#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp8_) {
-#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp7_ = RESOURCES_UNFLAG_MENU;
-#line 19127 "PhotoPage.c"
-		} else {
-#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp7_ = RESOURCES_FLAG_MENU;
-#line 19131 "PhotoPage.c"
+#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
+#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		if (_tmp2_ == NULL) {
+#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_g_object_unref0 (_tmp1_);
+#line 16616 "PhotoPage.c"
 		}
-#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = action;
-#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gtk_action_set_label (_tmp9_, _tmp7_);
-#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = action;
-#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gtk_action_set_sensitive (_tmp10_, TRUE);
-#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2573 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		action = _tmp2_;
+#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp3_ = action;
+#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_vala_assert (_tmp3_ != NULL, "action != null");
+#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_debug ("PhotoPage.vala:2578: Setting label of action flagged");
+#line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp4_ = action;
+#line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_simple_action_set_enabled (_tmp4_, TRUE);
+#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (action);
-#line 19143 "PhotoPage.c"
+#line 16632 "PhotoPage.c"
 	} else {
-#line 2810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", FALSE);
-#line 19147 "PhotoPage.c"
+#line 16636 "PhotoPage.c"
 	}
 }
 
 
 static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
-#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self);
-#line 19155 "PhotoPage.c"
+#line 16644 "PhotoPage.c"
 }
 
 
@@ -19167,75 +16656,75 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 	ViewCollection* _tmp3_ = NULL;
 	ViewCollection* _tmp4_ = NULL;
 	Photo* _tmp9_ = NULL;
-#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (return_page));
-#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((view == NULL) || IS_VIEW_COLLECTION (view));
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = return_page;
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = _tmp1_;
-#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = return_page;
-#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _library_photo_page_on_page_destroyed_gtk_widget_destroy, self, 0);
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = view;
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 19190 "PhotoPage.c"
+#line 16679 "PhotoPage.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = view;
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _data_collection_ref0 (_tmp5_);
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp6_;
-#line 19201 "PhotoPage.c"
+#line 16690 "PhotoPage.c"
 	} else {
 		CollectionPage* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = return_page;
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page));
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp8_;
-#line 19213 "PhotoPage.c"
+#line 16702 "PhotoPage.c"
 	}
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = photo;
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_display_copy_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp9_);
-#line 2818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 19221 "PhotoPage.c"
+#line 16710 "PhotoPage.c"
 }
 
 
 void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) {
-#line 2826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
-#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = NULL;
-#line 2830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_unset_view_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 19234 "PhotoPage.c"
+#line 16723 "PhotoPage.c"
 }
 
 
@@ -19243,17 +16732,17 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self)
 	CollectionPage* result = NULL;
 	CollectionPage* _tmp0_ = NULL;
 	CollectionPage* _tmp1_ = NULL;
-#line 2833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_page;
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 19252 "PhotoPage.c"
+#line 16741 "PhotoPage.c"
 }
 
 
@@ -19264,33 +16753,33 @@ static void library_photo_page_real_switched_to (Page* base) {
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp1_ != NULL, "get_photo() != null");
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page));
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 2846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_set_display_ratings (self, _tmp4_);
-#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 19289 "PhotoPage.c"
+#line 16778 "PhotoPage.c"
 }
 
 
@@ -19305,58 +16794,58 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 	gint _tmp8_ = 0;
 	GdkPixbuf* _tmp9_ = NULL;
 	GdkPixbuf* _tmp10_ = NULL;
-#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 19312 "PhotoPage.c"
+#line 16801 "PhotoPage.c"
 	} else {
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 19327 "PhotoPage.c"
+#line 16816 "PhotoPage.c"
 	}
-#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 19335 "PhotoPage.c"
+#line 16824 "PhotoPage.c"
 	}
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = scale;
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = resources_get_rating_trinket (_tmp7_, _tmp8_);
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp10_;
-#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 19355 "PhotoPage.c"
+#line 16844 "PhotoPage.c"
 }
 
 
@@ -19366,46 +16855,46 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GdkPixbuf* _tmp5_ = NULL;
-#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 19373 "PhotoPage.c"
+#line 16862 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
 		LibraryPhoto* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FLAGGABLE, Flaggable));
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 19388 "PhotoPage.c"
+#line 16877 "PhotoPage.c"
 	}
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 2860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 19396 "PhotoPage.c"
+#line 16885 "PhotoPage.c"
 	}
-#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
-#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp5_;
-#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 19404 "PhotoPage.c"
+#line 16893 "PhotoPage.c"
 }
 
 
@@ -19421,51 +16910,51 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
 	LibraryPhoto* _tmp7_ = NULL;
 	SlideshowPage* _tmp8_ = NULL;
 	SlideshowPage* _tmp9_ = NULL;
-#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 19434 "PhotoPage.c"
+#line 16923 "PhotoPage.c"
 	}
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = library_photo_global;
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = slideshow_page_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo));
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp8_);
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	app_window_go_fullscreen (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PAGE, Page));
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 19464 "PhotoPage.c"
+#line 16953 "PhotoPage.c"
 }
 
 
@@ -19476,73 +16965,73 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa
 	gboolean _tmp4_ = FALSE;
 	ZoomState _tmp5_ = {0};
 	gboolean _tmp6_ = FALSE;
-#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 19483 "PhotoPage.c"
+#line 16972 "PhotoPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 19489 "PhotoPage.c"
+#line 16978 "PhotoPage.c"
 	} else {
-#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 19493 "PhotoPage.c"
+#line 16982 "PhotoPage.c"
 	}
-#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
-#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = zoom_state_is_default (&_tmp5_);
-#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp6_) {
-#line 19503 "PhotoPage.c"
+#line 16992 "PhotoPage.c"
 		gboolean _tmp7_ = FALSE;
-#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = !_tmp7_;
-#line 19509 "PhotoPage.c"
+#line 16998 "PhotoPage.c"
 	} else {
-#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 19513 "PhotoPage.c"
+#line 17002 "PhotoPage.c"
 	}
-#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 19517 "PhotoPage.c"
+#line 17006 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_on_increase_size (EditingHostPage* base) {
 	LibraryPhotoPage * self;
-#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 19529 "PhotoPage.c"
+#line 17018 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	LibraryPhotoPage * self;
-#line 2885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 19541 "PhotoPage.c"
+#line 17030 "PhotoPage.c"
 }
 
 
@@ -19554,43 +17043,43 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
 	GdkEventKey* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	const gchar* _tmp4_ = NULL;
-#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_zoom_slider_key_press (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_);
-#line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 19567 "PhotoPage.c"
+#line 17056 "PhotoPage.c"
 	}
-#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (g_strcmp0 (_tmp4_, "Escape") == 0) {
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_return_to_collection (self);
-#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 19583 "PhotoPage.c"
+#line 17072 "PhotoPage.c"
 	} else {
-#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 19589 "PhotoPage.c"
+#line 17078 "PhotoPage.c"
 	}
 }
 
@@ -19600,77 +17089,77 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m
 	gboolean sensitivity = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	sensitivity = !_tmp0_;
-#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", sensitivity);
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", sensitivity);
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", sensitivity);
-#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", sensitivity);
-#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonUndo", sensitivity);
-#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", sensitivity);
-#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", sensitivity);
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", sensitivity);
-#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit", sensitivity);
-#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2689 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100", sensitivity);
-#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", sensitivity);
-#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", sensitivity);
-#line 2921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", sensitivity);
-#line 2922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", sensitivity);
-#line 2923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", sensitivity);
-#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", sensitivity);
-#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", sensitivity);
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", sensitivity);
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", sensitivity);
-#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", sensitivity);
-#line 2929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditTitle", sensitivity);
-#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", sensitivity);
-#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", sensitivity);
-#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", sensitivity);
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", sensitivity);
-#line 2935 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", sensitivity);
-#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", sensitivity);
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", sensitivity);
-#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2710 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", sensitivity);
-#line 2940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", sensitivity);
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = missing;
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp1_);
-#line 19669 "PhotoPage.c"
+#line 17158 "PhotoPage.c"
 }
 
 
@@ -19679,36 +17168,36 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag
 	gboolean _tmp0_ = FALSE;
 	Photo* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 19686 "PhotoPage.c"
+#line 17175 "PhotoPage.c"
 		Photo* _tmp1_ = NULL;
-#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = photo;
-#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_mark_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 19692 "PhotoPage.c"
+#line 17181 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
-#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2721 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
-#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2721 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 19699 "PhotoPage.c"
+#line 17188 "PhotoPage.c"
 	}
-#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo;
-#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = missing;
-#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->notify_photo_backing_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp4_);
-#line 19707 "PhotoPage.c"
+#line 17196 "PhotoPage.c"
 }
 
 
@@ -19722,300 +17211,300 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	GQuark _tmp8_ = 0U;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label0 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label1 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label2 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label3 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label4 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label5 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label6 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label7 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label8 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label9 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label10 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label11 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label12 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label13 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label14 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label15 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label16 = 0;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label17 = 0;
-#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) {
-#line 19763 "PhotoPage.c"
+#line 17252 "PhotoPage.c"
 		GdkEventKey* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = event;
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ == TRUE;
-#line 19772 "PhotoPage.c"
+#line 17261 "PhotoPage.c"
 	} else {
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 19776 "PhotoPage.c"
+#line 17265 "PhotoPage.c"
 	}
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 19784 "PhotoPage.c"
+#line 17273 "PhotoPage.c"
 	}
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = event;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_->keyval;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = gdk_keyval_name (_tmp4_);
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Escape")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("Return"))))) || (_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("KP_Enter"))))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19802 "PhotoPage.c"
+#line 17291 "PhotoPage.c"
 			default:
 			{
 				GtkWindow* _tmp9_ = NULL;
 				GtkWindow* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp9_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = _tmp9_;
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_FULLSCREEN_WINDOW);
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp10_);
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (_tmp11_) {
-#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					library_photo_page_return_to_collection (self);
-#line 19820 "PhotoPage.c"
+#line 17309 "PhotoPage.c"
 				}
-#line 2965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19824 "PhotoPage.c"
+#line 17313 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19830 "PhotoPage.c"
+#line 17319 "PhotoPage.c"
 			default:
 			{
-#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash");
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19837 "PhotoPage.c"
+#line 17326 "PhotoPage.c"
 			}
 		}
 	} else if ((_tmp8_ == ((0 != _tmp7_label4) ? _tmp7_label4 : (_tmp7_label4 = g_quark_from_static_string ("period")))) || (_tmp8_ == ((0 != _tmp7_label5) ? _tmp7_label5 : (_tmp7_label5 = g_quark_from_static_string ("greater"))))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19843 "PhotoPage.c"
+#line 17332 "PhotoPage.c"
 			default:
 			{
-#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19850 "PhotoPage.c"
+#line 17339 "PhotoPage.c"
 			}
 		}
 	} else if ((_tmp8_ == ((0 != _tmp7_label6) ? _tmp7_label6 : (_tmp7_label6 = g_quark_from_static_string ("comma")))) || (_tmp8_ == ((0 != _tmp7_label7) ? _tmp7_label7 : (_tmp7_label7 = g_quark_from_static_string ("less"))))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19856 "PhotoPage.c"
+#line 17345 "PhotoPage.c"
 			default:
 			{
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
-#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19863 "PhotoPage.c"
+#line 17352 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19869 "PhotoPage.c"
+#line 17358 "PhotoPage.c"
 			default:
 			{
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
-#line 2986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19876 "PhotoPage.c"
+#line 17365 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19882 "PhotoPage.c"
+#line 17371 "PhotoPage.c"
 			default:
 			{
-#line 2989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
-#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19889 "PhotoPage.c"
+#line 17378 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19895 "PhotoPage.c"
+#line 17384 "PhotoPage.c"
 			default:
 			{
-#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
-#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19902 "PhotoPage.c"
+#line 17391 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19908 "PhotoPage.c"
+#line 17397 "PhotoPage.c"
 			default:
 			{
-#line 2997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2769 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
-#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19915 "PhotoPage.c"
+#line 17404 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19921 "PhotoPage.c"
+#line 17410 "PhotoPage.c"
 			default:
 			{
-#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19928 "PhotoPage.c"
+#line 17417 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19934 "PhotoPage.c"
+#line 17423 "PhotoPage.c"
 			default:
 			{
-#line 3005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
-#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19941 "PhotoPage.c"
+#line 17430 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19947 "PhotoPage.c"
+#line 17436 "PhotoPage.c"
 			default:
 			{
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19954 "PhotoPage.c"
+#line 17443 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19960 "PhotoPage.c"
+#line 17449 "PhotoPage.c"
 			default:
 			{
-#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19967 "PhotoPage.c"
+#line 17456 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19973 "PhotoPage.c"
+#line 17462 "PhotoPage.c"
 			default:
 			{
-#line 3017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2789 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
-#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19980 "PhotoPage.c"
+#line 17469 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19986 "PhotoPage.c"
+#line 17475 "PhotoPage.c"
 			default:
 			{
-#line 3021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
-#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19993 "PhotoPage.c"
+#line 17482 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 19999 "PhotoPage.c"
+#line 17488 "PhotoPage.c"
 			default:
 			{
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
-#line 3026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 20006 "PhotoPage.c"
+#line 17495 "PhotoPage.c"
 			}
 		}
 	}
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = handled;
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 20014 "PhotoPage.c"
+#line 17503 "PhotoPage.c"
 }
 
 
@@ -20026,44 +17515,44 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	GtkWindow* _tmp0_ = NULL;
 	FullscreenWindow* _tmp1_ = NULL;
 	FullscreenWindow* _tmp2_ = NULL;
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW) ? ((FullscreenWindow*) _tmp0_) : NULL;
-#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 20037 "PhotoPage.c"
+#line 17526 "PhotoPage.c"
 	}
-#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	fs = _tmp1_;
-#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = fs;
-#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = TRUE;
-#line 20047 "PhotoPage.c"
+#line 17536 "PhotoPage.c"
 	} else {
 		FullscreenWindow* _tmp3_ = NULL;
-#line 3037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = fs;
-#line 3037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_close (_tmp3_);
-#line 20054 "PhotoPage.c"
+#line 17543 "PhotoPage.c"
 	}
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (fs);
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 20062 "PhotoPage.c"
+#line 17551 "PhotoPage.c"
 }
 
 
@@ -20073,59 +17562,90 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu
 	gboolean _tmp0_ = FALSE;
 	GdkEventButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_to_collection_on_release;
-#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3044 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = FALSE;
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_return_to_collection (self);
-#line 3047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 3047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 20088 "PhotoPage.c"
+#line 17577 "PhotoPage.c"
 	}
-#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = PAGE_CLASS (library_photo_page_parent_class)->on_left_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp1_);
-#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 20098 "PhotoPage.c"
+#line 17587 "PhotoPage.c"
 }
 
 
 static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	GtkMenu* result = NULL;
-	GtkMenu* menu = NULL;
-	GtkUIManager* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-	GtkMenu* _tmp2_ = NULL;
-#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	GtkMenu* _tmp0_ = NULL;
+	GtkMenu* _tmp7_ = NULL;
+	GtkMenu* _tmp8_ = NULL;
+#line 2827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
-#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->ui;
-#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = gtk_ui_manager_get_widget (_tmp0_, "/PhotoContextMenu");
-#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_menu_get_type (), GtkMenu));
-#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	menu = _tmp2_;
-#line 3055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_assert (menu != NULL, "menu != null");
-#line 3056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = menu;
-#line 3056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp0_ = self->priv->context_menu;
+#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	if (_tmp0_ == NULL) {
+#line 17602 "PhotoPage.c"
+		GMenuModel* model = NULL;
+		GtkBuilder* _tmp1_ = NULL;
+		GObject* _tmp2_ = NULL;
+		GMenuModel* _tmp3_ = NULL;
+		GMenuModel* _tmp4_ = NULL;
+		GtkMenu* _tmp5_ = NULL;
+		GtkMenu* _tmp6_ = NULL;
+#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
+#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp2_ = gtk_builder_get_object (_tmp1_, "PhotoContextMenu");
+#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp2_) : NULL);
+#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		model = _tmp3_;
+#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp4_ = model;
+#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp5_ = (GtkMenu*) gtk_menu_new_from_model (_tmp4_);
+#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_object_ref_sink (_tmp5_);
+#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_g_object_unref0 (self->priv->context_menu);
+#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		self->priv->context_menu = _tmp5_;
+#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp6_ = self->priv->context_menu;
+#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
+#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_g_object_unref0 (model);
+#line 17634 "PhotoPage.c"
+	}
+#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp7_ = self->priv->context_menu;
+#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp8_ = _g_object_ref0 (_tmp7_);
+#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	result = _tmp8_;
+#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 20124 "PhotoPage.c"
+#line 17644 "PhotoPage.c"
 }
 
 
@@ -20135,25 +17655,25 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
 	GdkEventButton* _tmp2_ = NULL;
-#line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_page_get_context_menu (self);
-#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, _tmp2_);
-#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 20152 "PhotoPage.c"
+#line 17672 "PhotoPage.c"
 }
 
 
@@ -20162,59 +17682,59 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) {
 	gboolean result = FALSE;
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
-#line 3065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_page_get_context_menu (self);
-#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 20175 "PhotoPage.c"
+#line 17695 "PhotoPage.c"
 }
 
 
 static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 	CollectionPage* _tmp0_ = NULL;
-#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_page;
-#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (NULL != _tmp0_) {
-#line 20187 "PhotoPage.c"
+#line 17707 "PhotoPage.c"
 		LibraryWindow* _tmp1_ = NULL;
 		LibraryWindow* _tmp2_ = NULL;
 		CollectionPage* _tmp3_ = NULL;
-#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = library_window_get_app ();
-#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->return_page;
-#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page));
-#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 20201 "PhotoPage.c"
+#line 17721 "PhotoPage.c"
 	} else {
 		LibraryWindow* _tmp4_ = NULL;
 		LibraryWindow* _tmp5_ = NULL;
-#line 3076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = library_window_get_app ();
-#line 3076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 3076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp5_);
-#line 3076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 20213 "PhotoPage.c"
+#line 17733 "PhotoPage.c"
 	}
 }
 
@@ -20226,29 +17746,29 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
 	GeeArrayList* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (photos, photo);
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _ ("Remove From Library");
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _ ("Removing Photo From Library");
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	remove_from_app (photos, _tmp2_, _tmp3_);
-#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photos);
-#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 20247 "PhotoPage.c"
+#line 17767 "PhotoPage.c"
 }
 
 
@@ -20273,64 +17793,64 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 	TrashUntrashPhotosCommand* _tmp26_ = NULL;
 	LibraryWindow* _tmp27_ = NULL;
 	LibraryWindow* _tmp28_ = NULL;
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 20280 "PhotoPage.c"
+#line 17800 "PhotoPage.c"
 	}
-#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->return_page;
-#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) {
-#line 20286 "PhotoPage.c"
+#line 17806 "PhotoPage.c"
 		LibraryWindow* _tmp2_ = NULL;
 		LibraryWindow* _tmp3_ = NULL;
-#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = library_window_get_app ();
-#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_set_page_switching_enabled (_tmp3_, FALSE);
-#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 20297 "PhotoPage.c"
+#line 17817 "PhotoPage.c"
 	}
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = photos;
-#line 3104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 3104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (_tmp6_, _tmp7_);
-#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = photo;
-#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource));
-#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 20329 "PhotoPage.c"
+#line 17849 "PhotoPage.c"
 		LibraryWindow* _tmp13_ = NULL;
 		LibraryWindow* _tmp14_ = NULL;
 		GtkWindow* _tmp15_ = NULL;
@@ -20338,88 +17858,88 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 		gboolean _tmp17_ = FALSE;
 		LibraryWindow* _tmp20_ = NULL;
 		LibraryWindow* _tmp21_ = NULL;
-#line 3114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = library_window_get_app ();
-#line 3114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 3114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_set_page_switching_enabled (_tmp14_, TRUE);
-#line 3114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_FULLSCREEN_WINDOW);
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_) {
-#line 20355 "PhotoPage.c"
+#line 17875 "PhotoPage.c"
 			GtkWindow* _tmp18_ = NULL;
 			FullscreenWindow* _tmp19_ = NULL;
-#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp18_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			fullscreen_window_close (_tmp19_);
-#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 20366 "PhotoPage.c"
+#line 17886 "PhotoPage.c"
 		}
-#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
-#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp21_);
-#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 20376 "PhotoPage.c"
+#line 17896 "PhotoPage.c"
 	}
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = _tmp22_;
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = photos;
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = trash_untrash_photos_command_new (_tmp24_, TRUE);
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_;
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_COMMAND, Command));
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp26_);
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp23_);
-#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = library_window_get_app ();
-#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = _tmp27_;
-#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_window_set_page_switching_enabled (_tmp28_, TRUE);
-#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp28_);
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photos);
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 20406 "PhotoPage.c"
+#line 17926 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 20418 "PhotoPage.c"
+#line 17938 "PhotoPage.c"
 		GeeArrayList* photo_list = NULL;
 		GeeArrayList* _tmp1_ = NULL;
 		GeeArrayList* _tmp2_ = NULL;
@@ -20433,62 +17953,62 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 		gboolean _tmp10_ = FALSE;
 		FlagUnflagCommand* _tmp11_ = NULL;
 		FlagUnflagCommand* _tmp12_ = NULL;
-#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_list = _tmp1_;
-#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo_list;
-#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = photo_list;
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_FLAGGABLE, Flaggable));
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), !_tmp10_);
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo_list);
-#line 20472 "PhotoPage.c"
+#line 17992 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source) {
 	DataSource* _tmp0_ = NULL;
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = source;
-#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 20487 "PhotoPage.c"
+#line 18007 "PhotoPage.c"
 }
 
 
@@ -20510,100 +18030,100 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 	Photo* _tmp17_ = NULL;
 	gboolean _tmp18_ = FALSE;
 	gboolean _tmp19_ = FALSE;
-#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 20519 "PhotoPage.c"
+#line 18039 "PhotoPage.c"
 	} else {
 		LibraryPhoto* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource));
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp5_;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 20537 "PhotoPage.c"
+#line 18057 "PhotoPage.c"
 	}
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 20543 "PhotoPage.c"
+#line 18063 "PhotoPage.c"
 	}
-#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 3147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view = _tmp6_;
-#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = view;
-#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view;
-#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = view;
-#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = photo;
-#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = view_collection_get_view_for_source (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource));
-#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), _tmp14_);
-#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp14_);
-#line 3148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = photo;
-#line 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource));
-#line 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp17_);
-#line 3149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 20587 "PhotoPage.c"
+#line 18107 "PhotoPage.c"
 		LibraryWindow* _tmp20_ = NULL;
 		LibraryWindow* _tmp21_ = NULL;
-#line 3152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
-#line 3152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 3152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp21_);
-#line 3152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 20598 "PhotoPage.c"
+#line 18118 "PhotoPage.c"
 	}
-#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (view);
-#line 20602 "PhotoPage.c"
+#line 18122 "PhotoPage.c"
 }
 
 
@@ -20612,48 +18132,48 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 3156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2935 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 3157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 3157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 20625 "PhotoPage.c"
+#line 18145 "PhotoPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 3158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 20652 "PhotoPage.c"
+#line 18172 "PhotoPage.c"
 	}
 }
 
@@ -20661,55 +18181,55 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 3163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 20666 "PhotoPage.c"
+#line 18186 "PhotoPage.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = g_strcmp0 (_tmp5_, "") != 0;
-#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp5_);
-#line 3165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 20685 "PhotoPage.c"
+#line 18205 "PhotoPage.c"
 	} else {
-#line 3164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 20689 "PhotoPage.c"
+#line 18209 "PhotoPage.c"
 	}
-#line 3164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp0_);
-#line 20693 "PhotoPage.c"
+#line 18213 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 3170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 20708 "PhotoPage.c"
+#line 18228 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp1_ = NULL;
@@ -20718,39 +18238,39 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		Photo* _tmp4_ = NULL;
 		AppWindow* _tmp5_ = NULL;
 		AppWindow* _tmp6_ = NULL;
-#line 3173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = app_window_get_instance ();
-#line 3173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 3173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow));
-#line 3173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 3174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 3174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_open_with_external_editor (_tmp4_, &_inner_error_);
-#line 3174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 3174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20735 "PhotoPage.c"
-			goto __catch251_g_error;
+#line 18255 "PhotoPage.c"
+			goto __catch248_g_error;
 		}
-#line 3175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 3175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 3175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
-#line 3175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 20746 "PhotoPage.c"
+#line 18266 "PhotoPage.c"
 	}
-	goto __finally251;
-	__catch251_g_error:
+	goto __finally248;
+	__catch248_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp7_ = NULL;
@@ -20758,42 +18278,42 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		GError* _tmp9_ = NULL;
 		Photo* _tmp10_ = NULL;
 		Photo* _tmp11_ = NULL;
-#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 3177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = app_window_get_instance ();
-#line 3177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 3177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
-#line 3177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 3178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = err;
-#line 3178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 3178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		open_external_editor_error_dialog (_tmp9_, _tmp11_);
-#line 3178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 20781 "PhotoPage.c"
+#line 18301 "PhotoPage.c"
 	}
-	__finally251:
-#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally248:
+#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 20792 "PhotoPage.c"
+#line 18312 "PhotoPage.c"
 	}
 }
 
@@ -20805,31 +18325,31 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 	PhotoFileFormat _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 3185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 20812 "PhotoPage.c"
+#line 18332 "PhotoPage.c"
 	}
-#line 3187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 3187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo_get_master_file_format (_tmp2_);
-#line 3187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_ != PHOTO_FILE_FORMAT_RAW;
-#line 3187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 3187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 3188 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 20828 "PhotoPage.c"
+#line 18348 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp5_ = NULL;
@@ -20838,39 +18358,39 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		Photo* _tmp8_ = NULL;
 		AppWindow* _tmp9_ = NULL;
 		AppWindow* _tmp10_ = NULL;
-#line 3191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 3191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 3191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
-#line 3191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 3192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 3192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_open_with_raw_external_editor (_tmp8_, &_inner_error_);
-#line 3192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 3192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20855 "PhotoPage.c"
-			goto __catch252_g_error;
+#line 18375 "PhotoPage.c"
+			goto __catch249_g_error;
 		}
-#line 3193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = app_window_get_instance ();
-#line 3193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 3193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow));
-#line 3193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 20866 "PhotoPage.c"
+#line 18386 "PhotoPage.c"
 	}
-	goto __finally252;
-	__catch252_g_error:
+	goto __finally249;
+	__catch249_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp11_ = NULL;
@@ -20878,74 +18398,74 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		GError* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 3195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = app_window_get_instance ();
-#line 3195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 3195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE_WINDOW, PageWindow));
-#line 3195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 3196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = err;
-#line 3196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = resources_launch_editor_failed (_tmp13_);
-#line 3196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp14_;
-#line 3196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		app_window_error_message (_tmp15_, NULL);
-#line 3196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp15_);
-#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 20901 "PhotoPage.c"
+#line 18421 "PhotoPage.c"
 	}
-	__finally252:
-#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally249:
+#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 20912 "PhotoPage.c"
+#line 18432 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 3200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 20925 "PhotoPage.c"
+#line 18445 "PhotoPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
-#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		desktop_integration_send_to (_tmp4_);
-#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 3202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 20944 "PhotoPage.c"
+#line 18464 "PhotoPage.c"
 	}
 }
 
@@ -20977,85 +18497,85 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 	gint _tmp17_ = 0;
 	Scaling _tmp18_ = {0};
 	GError * _inner_error_ = NULL;
-#line 3205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 3207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 20984 "PhotoPage.c"
+#line 18504 "PhotoPage.c"
 	}
-#line 3209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _ ("Export Photo");
-#line 3209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = export_dialog_new (_tmp1_);
-#line 3209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp2_);
-#line 3209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_dialog = _tmp2_;
-#line 3213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_format_parameters_last (&_tmp3_);
-#line 3213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_params = _tmp3_;
-#line 3214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = export_dialog;
-#line 3214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = export_dialog_execute (_tmp4_, &_tmp5_, &_tmp6_, &export_params);
-#line 3214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale = _tmp5_;
-#line 3214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	constraint = _tmp6_;
-#line 3214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2993 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp7_) {
-#line 3215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 3215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 21012 "PhotoPage.c"
+#line 18532 "PhotoPage.c"
 	}
-#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = export_params;
-#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = photo_get_export_basename_for_parameters (_tmp9_, &_tmp10_);
-#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = export_ui_choose_file (_tmp12_);
-#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp12_);
-#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 3217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	save_as = _tmp14_;
-#line 3219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = save_as;
-#line 3219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_ == NULL) {
-#line 3220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (save_as);
-#line 3220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 3220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 21044 "PhotoPage.c"
+#line 18564 "PhotoPage.c"
 	}
-#line 3222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = constraint;
-#line 3222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = scale;
-#line 3222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling_for_constraint (_tmp16_, _tmp17_, FALSE, &_tmp18_);
-#line 3222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling = _tmp18_;
-#line 21054 "PhotoPage.c"
+#line 18574 "PhotoPage.c"
 	{
 		Photo* _tmp19_ = NULL;
 		Photo* _tmp20_ = NULL;
@@ -21071,48 +18591,48 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		ExportFormatMode _tmp30_ = 0;
 		ExportFormatParameters _tmp31_ = {0};
 		gboolean _tmp32_ = FALSE;
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = save_as;
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = scaling;
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = export_params;
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_.quality;
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = export_params;
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = photo_get_export_format_for_parameters (_tmp26_, &_tmp27_);
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = export_params;
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = _tmp29_.mode;
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = export_params;
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = _tmp31_.export_metadata;
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_export (_tmp20_, _tmp21_, &_tmp22_, _tmp24_, _tmp28_, _tmp30_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp32_, &_inner_error_);
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 21106 "PhotoPage.c"
-			goto __catch253_g_error;
+#line 18626 "PhotoPage.c"
+			goto __catch250_g_error;
 		}
 	}
-	goto __finally253;
-	__catch253_g_error:
+	goto __finally250;
+	__catch250_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp33_ = NULL;
@@ -21123,56 +18643,56 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		const gchar* _tmp38_ = NULL;
 		gchar* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
-#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = _ ("Unable to export %s: %s");
-#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = save_as;
-#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp35_ = g_file_get_path (_tmp34_);
-#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = _tmp35_;
-#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = err;
-#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = _tmp37_->message;
-#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = g_strdup_printf (_tmp33_, _tmp36_, _tmp38_);
-#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = _tmp39_;
-#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		app_window_error_message (_tmp40_, NULL);
-#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp40_);
-#line 3229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp36_);
-#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 21150 "PhotoPage.c"
+#line 18670 "PhotoPage.c"
 	}
-	__finally253:
-#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally250:
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (save_as);
-#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 21165 "PhotoPage.c"
+#line 18685 "PhotoPage.c"
 	}
-#line 3205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (save_as);
-#line 3205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 21171 "PhotoPage.c"
+#line 18691 "PhotoPage.c"
 }
 
 
@@ -21181,53 +18701,44 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 3233 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 3234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 3234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 21194 "PhotoPage.c"
+#line 18714 "PhotoPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
 		GeeCollection* _tmp7_ = NULL;
-#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		publishing_ui_publishing_dialog_go (_tmp7_);
-#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 21213 "PhotoPage.c"
+#line 18733 "PhotoPage.c"
 	}
 }
 
 
-static void library_photo_page_on_view_menu (LibraryPhotoPage* self) {
-#line 3239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 21223 "PhotoPage.c"
-}
-
-
 static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
@@ -21239,56 +18750,56 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
 	SetRatingSingleCommand* _tmp9_ = NULL;
-#line 3243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 21246 "PhotoPage.c"
+#line 18757 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 21253 "PhotoPage.c"
+#line 18764 "PhotoPage.c"
 	}
-#line 3244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 21259 "PhotoPage.c"
+#line 18770 "PhotoPage.c"
 	}
-#line 3247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), TRUE);
-#line 3247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 3247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp6_;
-#line 3248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 3248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = command;
-#line 3248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 3248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 3250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 21287 "PhotoPage.c"
+#line 18798 "PhotoPage.c"
 }
 
 
@@ -21303,56 +18814,56 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
 	SetRatingSingleCommand* _tmp9_ = NULL;
-#line 3253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 21310 "PhotoPage.c"
+#line 18821 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 21317 "PhotoPage.c"
+#line 18828 "PhotoPage.c"
 	}
-#line 3254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3255 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 21323 "PhotoPage.c"
+#line 18834 "PhotoPage.c"
 	}
-#line 3257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), FALSE);
-#line 3257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 3257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp6_;
-#line 3258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 3258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = command;
-#line 3258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 3258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 3260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 21351 "PhotoPage.c"
+#line 18862 "PhotoPage.c"
 }
 
 
@@ -21368,121 +18879,121 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat
 	CommandManager* _tmp8_ = NULL;
 	CommandManager* _tmp9_ = NULL;
 	SetRatingSingleCommand* _tmp10_ = NULL;
-#line 3263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 21375 "PhotoPage.c"
+#line 18886 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 21382 "PhotoPage.c"
+#line 18893 "PhotoPage.c"
 	}
-#line 3264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 21388 "PhotoPage.c"
+#line 18899 "PhotoPage.c"
 	}
-#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = rating;
-#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = set_rating_single_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), _tmp5_);
-#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp7_;
-#line 3268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 3268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = command;
-#line 3268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
-#line 3268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp9_);
-#line 3270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 21418 "PhotoPage.c"
+#line 18929 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) {
-#line 3273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_REJECTED);
-#line 21427 "PhotoPage.c"
+#line 18938 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) {
-#line 3277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_UNRATED);
-#line 21436 "PhotoPage.c"
+#line 18947 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_one (LibraryPhotoPage* self) {
-#line 3281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3057 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_ONE);
-#line 21445 "PhotoPage.c"
+#line 18956 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_two (LibraryPhotoPage* self) {
-#line 3285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_TWO);
-#line 21454 "PhotoPage.c"
+#line 18965 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_three (LibraryPhotoPage* self) {
-#line 3289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_THREE);
-#line 21463 "PhotoPage.c"
+#line 18974 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_four (LibraryPhotoPage* self) {
-#line 3293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3294 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FOUR);
-#line 21472 "PhotoPage.c"
+#line 18983 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_five (LibraryPhotoPage* self) {
-#line 3297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FIVE);
-#line 21481 "PhotoPage.c"
+#line 18992 "PhotoPage.c"
 }
 
 
@@ -21516,103 +19027,117 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto
 	Photo* _tmp26_ = NULL;
 	Rating _tmp27_ = 0;
 	gboolean _tmp28_ = FALSE;
-#line 3301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", _tmp2_ != RATING_REJECTED);
-#line 3302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", _tmp5_ != RATING_UNRATED);
-#line 3303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 3304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", _tmp8_ != RATING_ONE);
-#line 3304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 3305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 3305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", _tmp11_ != RATING_TWO);
-#line 3305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 3306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_;
-#line 3306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", _tmp14_ != RATING_THREE);
-#line 3306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3081 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp13_);
-#line 3307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 3307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", _tmp17_ != RATING_FOUR);
-#line 3307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 3308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 3308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", _tmp20_ != RATING_FIVE);
-#line 3308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp19_);
-#line 3309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = _tmp21_;
-#line 3309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = rating_can_increase (_tmp23_);
-#line 3309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", _tmp24_);
-#line 3309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp22_);
-#line 3310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_;
-#line 3310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = rating_can_decrease (_tmp27_);
-#line 3310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_);
-#line 3310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp26_);
-#line 21611 "PhotoPage.c"
+#line 19122 "PhotoPage.c"
+}
+
+
+static GVariant* _variant_new14 (const gchar* value) {
+#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 19129 "PhotoPage.c"
+}
+
+
+static GVariant* _variant_new15 (const gchar* value) {
+#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 19136 "PhotoPage.c"
 }
 
 
@@ -21624,123 +19149,98 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 	PhotoFileFormat _tmp3_ = 0;
 	PhotoFileFormat _tmp4_ = 0;
 	PhotoFileFormat _tmp5_ = 0;
-#line 3313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3314 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3314 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3314 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = photo_get_master_file_format (_tmp1_);
-#line 3314 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3314 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3314 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	format = _tmp3_;
-#line 3315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = format;
-#line 3315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp4_ == PHOTO_FILE_FORMAT_RAW);
-#line 3317 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = format;
-#line 3317 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) {
-#line 21645 "PhotoPage.c"
+#line 19170 "PhotoPage.c"
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
-		gboolean _tmp8_ = FALSE;
-		gboolean _tmp9_ = FALSE;
-		Photo* _tmp10_ = NULL;
-		Photo* _tmp11_ = NULL;
-		gboolean _tmp12_ = FALSE;
-		gboolean _tmp13_ = FALSE;
-		Photo* _tmp17_ = NULL;
-		Photo* _tmp18_ = NULL;
-		RawDeveloper _tmp19_ = 0;
-		RawDeveloper _tmp20_ = 0;
-#line 3319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		RawDeveloper _tmp8_ = 0;
+		RawDeveloper _tmp9_ = 0;
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 3319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = photo_is_raw_developer_available (_tmp7_, RAW_DEVELOPER_SHOTWELL);
-#line 3319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloperShotwell", _tmp8_);
-#line 3319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp8_ = photo_get_raw_developer (_tmp7_);
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp9_ = _tmp8_;
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = _tmp10_;
-#line 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = photo_is_raw_developer_available (_tmp11_, RAW_DEVELOPER_EMBEDDED);
-#line 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = _tmp12_;
-#line 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp11_);
-#line 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp13_) {
-#line 3322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp9_ = TRUE;
-#line 21682 "PhotoPage.c"
-		} else {
-			Photo* _tmp14_ = NULL;
-			Photo* _tmp15_ = NULL;
-			gboolean _tmp16_ = FALSE;
-#line 3323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp15_ = _tmp14_;
-#line 3323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp16_ = photo_is_raw_developer_available (_tmp15_, RAW_DEVELOPER_CAMERA);
-#line 3323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp9_ = _tmp16_;
-#line 3323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp15_);
-#line 21697 "PhotoPage.c"
-		}
-#line 3321 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloperCamera", _tmp9_);
-#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = _tmp17_;
-#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = photo_get_raw_developer (_tmp18_);
-#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = _tmp19_;
-#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp18_);
-#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		switch (_tmp20_) {
-#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		switch (_tmp9_) {
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_SHOTWELL:
-#line 21715 "PhotoPage.c"
+#line 19189 "PhotoPage.c"
 			{
-#line 3328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloperShotwell");
-#line 3329 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				GAction* _tmp10_ = NULL;
+				GAction* _tmp11_ = NULL;
+				GVariant* _tmp12_ = NULL;
+#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
+#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp11_ = _tmp10_;
+#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp12_ = _variant_new14 ("'Shotwell'");
+#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				g_action_change_state (_tmp11_, _tmp12_);
+#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_g_variant_unref0 (_tmp12_);
+#line 3097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_g_object_unref0 (_tmp11_);
+#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 21721 "PhotoPage.c"
+#line 19208 "PhotoPage.c"
 			}
-#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_CAMERA:
-#line 3326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_EMBEDDED:
-#line 21727 "PhotoPage.c"
+#line 19214 "PhotoPage.c"
 			{
-#line 3333 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloperCamera");
-#line 3334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				GAction* _tmp13_ = NULL;
+				GAction* _tmp14_ = NULL;
+				GVariant* _tmp15_ = NULL;
+#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
+#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp14_ = _tmp13_;
+#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp15_ = _variant_new15 ("'Camera'");
+#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				g_action_change_state (_tmp14_, _tmp15_);
+#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_g_variant_unref0 (_tmp15_);
+#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_g_object_unref0 (_tmp14_);
+#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 21733 "PhotoPage.c"
+#line 19233 "PhotoPage.c"
 			}
 			default:
 			{
-#line 3337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_assert_not_reached ();
-#line 21739 "PhotoPage.c"
+#line 19239 "PhotoPage.c"
 			}
 		}
 	}
@@ -21754,60 +19254,60 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM
 	Photo* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 3342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = map;
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gee_map_has_key (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 21771 "PhotoPage.c"
+#line 19271 "PhotoPage.c"
 		GeeMap* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		gpointer _tmp9_ = NULL;
 		Alteration* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = map;
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = gee_map_get (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = (Alteration*) _tmp9_;
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = alteration_has_subject (_tmp10_, "metadata");
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp11_;
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_alteration_unref0 (_tmp10_);
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 21796 "PhotoPage.c"
+#line 19296 "PhotoPage.c"
 	} else {
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 21800 "PhotoPage.c"
+#line 19300 "PhotoPage.c"
 	}
-#line 3343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 21806 "PhotoPage.c"
+#line 19306 "PhotoPage.c"
 	}
 }
 
@@ -21823,29 +19323,29 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 	gint _names_size_ = 0;
 	gchar** _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 3347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = add_tags_dialog_new ();
-#line 3348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp0_;
-#line 3349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = dialog;
-#line 3349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = add_tags_dialog_execute (_tmp1_, &_tmp2_);
-#line 3349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = _tmp3_;
-#line 3349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names_length1 = _tmp2_;
-#line 3349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_names_size_ = names_length1;
-#line 3350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = names;
-#line 3350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4__length1 = names_length1;
-#line 3350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 21844 "PhotoPage.c"
+#line 19344 "PhotoPage.c"
 		CommandManager* _tmp5_ = NULL;
 		CommandManager* _tmp6_ = NULL;
 		HierarchicalTagIndex* _tmp7_ = NULL;
@@ -21862,57 +19362,57 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 		GeeCollection* _tmp16_ = NULL;
 		AddTagsCommand* _tmp17_ = NULL;
 		AddTagsCommand* _tmp18_ = NULL;
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = hierarchical_tag_index_get_global_index ();
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = names;
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9__length1 = names_length1;
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = hierarchical_tag_index_get_paths_for_names_array (_tmp8_, _tmp9_, _tmp9__length1, &_tmp10_);
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12__length1 = _tmp10_;
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = view_collection_get_selected_sources (_tmp14_);
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = add_tags_command_new (_tmp12_, _tmp10_, _tmp16_);
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command));
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL);
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_hierarchical_tag_index_unref0 (_tmp8_);
-#line 3351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 21905 "PhotoPage.c"
+#line 19405 "PhotoPage.c"
 	}
-#line 3347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 3347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 21911 "PhotoPage.c"
+#line 19411 "PhotoPage.c"
 }
 
 
@@ -21937,77 +19437,77 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
 	GeeArrayList* _tmp14_ = NULL;
 	ModifyTagsCommand* _tmp15_ = NULL;
 	ModifyTagsCommand* _tmp16_ = NULL;
-#line 3357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_at (_tmp1_, 0);
-#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = data_view_get_source (_tmp3_);
-#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp5_;
-#line 3360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = photo;
-#line 3360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = modify_tags_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp7_;
-#line 3361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = dialog;
-#line 3361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = modify_tags_dialog_execute (_tmp8_);
-#line 3361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_tags = _tmp9_;
-#line 3363 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = new_tags;
-#line 3363 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ == NULL) {
-#line 3364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (new_tags);
-#line 3364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_text_entry_dialog_mediator_unref0 (dialog);
-#line 3364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 3364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 21980 "PhotoPage.c"
+#line 19480 "PhotoPage.c"
 	}
-#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = photo;
-#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_tags;
-#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = modify_tags_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 3366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 3357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_tags);
-#line 3357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 3357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 22006 "PhotoPage.c"
+#line 19506 "PhotoPage.c"
 }
 
 
@@ -22019,53 +19519,53 @@ static gboolean library_photo_page_library_photo_page_view_filter_real_predicate
 	MediaSource* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 2329 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2331 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER, LibraryPhotoPageLibraryPhotoPageViewFilter);
-#line 2329 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2331 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = view;
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = data_view_get_source (_tmp0_);
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = media_source_is_trashed (_tmp2_);
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp4_;
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 22038 "PhotoPage.c"
+#line 19538 "PhotoPage.c"
 }
 
 
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_construct (GType object_type) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter* self = NULL;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type);
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 22048 "PhotoPage.c"
+#line 19548 "PhotoPage.c"
 }
 
 
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) {
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return library_photo_page_library_photo_page_view_filter_construct (LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER);
-#line 22055 "PhotoPage.c"
+#line 19555 "PhotoPage.c"
 }
 
 
 static void library_photo_page_library_photo_page_view_filter_class_init (LibraryPhotoPageLibraryPhotoPageViewFilterClass * klass) {
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_library_photo_page_view_filter_parent_class = g_type_class_peek_parent (klass);
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((ViewFilterClass *) klass)->predicate = library_photo_page_library_photo_page_view_filter_real_predicate;
-#line 22064 "PhotoPage.c"
+#line 19564 "PhotoPage.c"
 }
 
 
@@ -22086,69 +19586,65 @@ static GType library_photo_page_library_photo_page_view_filter_get_type (void) {
 
 
 static void library_photo_page_class_init (LibraryPhotoPageClass * klass) {
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoPagePrivate));
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = library_photo_page_real_init_collect_ui_filenames;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->init_collect_action_entries = library_photo_page_real_init_collect_action_entries;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->init_collect_toggle_action_entries = library_photo_page_real_init_collect_toggle_action_entries;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	((PageClass *) klass)->add_actions = library_photo_page_real_add_actions;
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->init_collect_injection_groups = library_photo_page_real_init_collect_injection_groups;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	((PageClass *) klass)->register_radio_actions = library_photo_page_real_register_radio_actions;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->update_actions = library_photo_page_real_update_actions;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((LibraryPhotoPageClass *) klass)->developer_changed = library_photo_page_real_developer_changed;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->switched_to = library_photo_page_real_switched_to;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->get_bottom_left_trinket = library_photo_page_real_get_bottom_left_trinket;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->get_top_right_trinket = library_photo_page_real_get_top_right_trinket;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->on_increase_size = library_photo_page_real_on_increase_size;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->on_decrease_size = library_photo_page_real_on_decrease_size;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->on_zoom_slider_key_press = library_photo_page_real_on_zoom_slider_key_press;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->update_ui = library_photo_page_real_update_ui;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->notify_photo_backing_missing = library_photo_page_real_notify_photo_backing_missing;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((GtkWidgetClass *) klass)->key_press_event = library_photo_page_real_key_press_event;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->on_double_click = library_photo_page_real_on_double_click;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->on_left_released = library_photo_page_real_on_left_released;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->on_context_buttonpress = library_photo_page_real_on_context_buttonpress;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->on_context_keypress = library_photo_page_real_on_context_keypress;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize;
-#line 22131 "PhotoPage.c"
+#line 19627 "PhotoPage.c"
 }
 
 
 static void library_photo_page_instance_init (LibraryPhotoPage * self) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv = LIBRARY_PHOTO_PAGE_GET_PRIVATE (self);
-#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = NULL;
-#line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_to_collection_on_release = FALSE;
-#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_page_library_photo_page_view_filter_new ();
-#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->filter = _tmp0_;
-#line 22147 "PhotoPage.c"
+#line 19643 "PhotoPage.c"
 }
 
 
@@ -22161,37 +19657,39 @@ static void library_photo_page_finalize (GObject* obj) {
 	ConfigFacade* _tmp4_ = NULL;
 	ConfigFacade* _tmp5_ = NULL;
 	guint _tmp6_ = 0U;
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_global;
-#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_photo_page_on_photo_destroyed_source_collection_item_destroyed, self);
-#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = library_photo_global;
-#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_photo_page_on_metadata_altered_data_collection_items_altered, self);
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("external-app-changed", TYPE_CONFIGURATION_FACADE, &_tmp6_, NULL, FALSE);
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed, self);
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->return_page);
 #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (self->priv->return_page);
+#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_view_filter_unref0 (self->priv->filter);
-#line 2326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (self->priv->context_menu);
+#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (library_photo_page_parent_class)->finalize (obj);
-#line 22190 "PhotoPage.c"
+#line 19688 "PhotoPage.c"
 }
 
 
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index 0e14aab..3ad2076 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -434,16 +434,16 @@ public abstract class EditingHostPage : SinglePhotoPage {
         Gtk.Toolbar toolbar = get_toolbar();
         
         // rotate tool
-        rotate_button = new Gtk.ToolButton.from_stock("");
+        rotate_button = new Gtk.ToolButton (null, Resources.ROTATE_CW_LABEL);
         rotate_button.set_icon_name(Resources.CLOCKWISE);
-        rotate_button.set_label(Resources.ROTATE_CW_LABEL);
         rotate_button.set_tooltip_text(Resources.ROTATE_CW_TOOLTIP);
         rotate_button.clicked.connect(on_rotate_clockwise);
         rotate_button.is_important = true;
         toolbar.insert(rotate_button, -1);
         
         // crop tool
-        crop_button = new Gtk.ToggleToolButton.from_stock(Resources.CROP);
+        crop_button = new Gtk.ToggleToolButton ();
+        crop_button.set_icon_name("crop");
         crop_button.set_label(Resources.CROP_LABEL);
         crop_button.set_tooltip_text(Resources.CROP_TOOLTIP);
         crop_button.toggled.connect(on_crop_toggled);
@@ -451,7 +451,8 @@ public abstract class EditingHostPage : SinglePhotoPage {
         toolbar.insert(crop_button, -1);
 
         // straightening tool
-        straighten_button = new Gtk.ToggleToolButton.from_stock(Resources.STRAIGHTEN);
+        straighten_button = new Gtk.ToggleToolButton ();
+        straighten_button.set_icon_name("straighten");
         straighten_button.set_label(Resources.STRAIGHTEN_LABEL);
         straighten_button.set_tooltip_text(Resources.STRAIGHTEN_TOOLTIP);
         straighten_button.toggled.connect(on_straighten_toggled);
@@ -459,7 +460,8 @@ public abstract class EditingHostPage : SinglePhotoPage {
         toolbar.insert(straighten_button, -1);
 
         // redeye reduction tool
-        redeye_button = new Gtk.ToggleToolButton.from_stock(Resources.REDEYE);
+        redeye_button = new Gtk.ToggleToolButton ();
+        redeye_button.set_icon_name("redeye");
         redeye_button.set_label(Resources.RED_EYE_LABEL);
         redeye_button.set_tooltip_text(Resources.RED_EYE_TOOLTIP);
         redeye_button.toggled.connect(on_redeye_toggled);
@@ -2378,352 +2380,105 @@ public class LibraryPhotoPage : EditingHostPage {
         ui_filenames.add("photo_context.ui");
         ui_filenames.add("photo.ui");
     }
-    
-    protected override Gtk.ActionEntry[] init_collect_action_entries() {
-        Gtk.ActionEntry[] actions = base.init_collect_action_entries();
-        
-        Gtk.ActionEntry export = { "Export", Resources.SAVE_AS_LABEL, TRANSLATABLE, "<Ctrl><Shift>E",
-            TRANSLATABLE, on_export };
-        export.label = Resources.EXPORT_MENU;
-        actions += export;
-
-        Gtk.ActionEntry print = { "Print", Resources.PRINT_LABEL, TRANSLATABLE, "<Ctrl>P",
-            TRANSLATABLE, on_print };
-        print.label = Resources.PRINT_MENU;
-        actions += print;
-        
-        Gtk.ActionEntry publish = { "Publish", Resources.PUBLISH, TRANSLATABLE, "<Ctrl><Shift>P",
-            TRANSLATABLE, on_publish };
-        publish.label = Resources.PUBLISH_MENU;
-        publish.tooltip = Resources.PUBLISH_TOOLTIP;
-        actions += publish;
-        
-        Gtk.ActionEntry remove_from_library = { "RemoveFromLibrary", Resources.REMOVE_LABEL, TRANSLATABLE,
-            "<Shift>Delete", TRANSLATABLE, on_remove_from_library };
-        remove_from_library.label = Resources.REMOVE_FROM_LIBRARY_MENU;
-        actions += remove_from_library;
-
-        Gtk.ActionEntry move_to_trash = { "MoveToTrash", "user-trash-full", TRANSLATABLE, "Delete",
-            TRANSLATABLE, on_move_to_trash };
-        move_to_trash.label = Resources.MOVE_TO_TRASH_MENU;
-        actions += move_to_trash;
-
-        Gtk.ActionEntry view = { "ViewMenu", null, TRANSLATABLE, null, null, on_view_menu };
-        view.label = _("_View");
-        actions += view;
-        
-        Gtk.ActionEntry tools = { "Tools", null, TRANSLATABLE, null, null, null };
-        tools.label = _("T_ools");
-        actions += tools;
-        
-        Gtk.ActionEntry prev = { "PrevPhoto", Resources.PREVIOUS_LABEL, TRANSLATABLE, null,
-            TRANSLATABLE, on_previous_photo };
-        prev.label = _("_Previous Photo");
-        prev.tooltip = _("Previous Photo");
-        actions += prev;
-
-        Gtk.ActionEntry next = { "NextPhoto", Resources.NEXT_LABEL, TRANSLATABLE, null,
-            TRANSLATABLE, on_next_photo };
-        next.label = _("_Next Photo");
-        next.tooltip = _("Next Photo");
-        actions += next;
-
-        Gtk.ActionEntry rotate_right = { "RotateClockwise", Resources.CLOCKWISE, TRANSLATABLE,
-            "<Ctrl>R", TRANSLATABLE, on_rotate_clockwise };
-        rotate_right.label = Resources.ROTATE_CW_MENU;
-        rotate_right.tooltip = Resources.ROTATE_CW_TOOLTIP;
-        actions += rotate_right;
-
-        Gtk.ActionEntry rotate_left = { "RotateCounterclockwise", Resources.COUNTERCLOCKWISE,
-            TRANSLATABLE, "<Ctrl><Shift>R", TRANSLATABLE, on_rotate_counterclockwise };
-        rotate_left.label = Resources.ROTATE_CCW_MENU;
-        rotate_left.tooltip = Resources.ROTATE_CCW_TOOLTIP;
-        actions += rotate_left;
-
-        Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, TRANSLATABLE, null,
-            TRANSLATABLE, on_flip_horizontally };
-        hflip.label = Resources.HFLIP_MENU;
-        actions += hflip;
-        
-        Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, TRANSLATABLE, null,
-            TRANSLATABLE, on_flip_vertically };
-        vflip.label = Resources.VFLIP_MENU;
-        actions += vflip;
-        
-        Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, TRANSLATABLE, "<Ctrl>E",
-            TRANSLATABLE, on_enhance };
-        enhance.label = Resources.ENHANCE_MENU;
-        enhance.tooltip = Resources.ENHANCE_TOOLTIP;
-        actions += enhance;
-        
-        Gtk.ActionEntry copy_adjustments = { "CopyColorAdjustments", null, TRANSLATABLE,
-            "<Ctrl><Shift>C", TRANSLATABLE, on_copy_adjustments};
-        copy_adjustments.label = Resources.COPY_ADJUSTMENTS_MENU;
-        copy_adjustments.tooltip = Resources.COPY_ADJUSTMENTS_TOOLTIP;
-        actions += copy_adjustments;
-        
-        Gtk.ActionEntry paste_adjustments = { "PasteColorAdjustments", null, TRANSLATABLE,
-            "<Ctrl><Shift>V", TRANSLATABLE, on_paste_adjustments};
-        paste_adjustments.label = Resources.PASTE_ADJUSTMENTS_MENU;
-        paste_adjustments.tooltip = Resources.PASTE_ADJUSTMENTS_TOOLTIP;
-        actions += paste_adjustments;
-        
-        Gtk.ActionEntry crop = { "Crop", Resources.CROP, TRANSLATABLE, "<Ctrl>O",
-            TRANSLATABLE, toggle_crop };
-        crop.label = Resources.CROP_MENU;
-        crop.tooltip = Resources.CROP_TOOLTIP;
-        actions += crop;
-        
-        Gtk.ActionEntry straighten = { "Straighten", Resources.REFRESH_LABEL, TRANSLATABLE, "<Ctrl>A",
-            TRANSLATABLE, toggle_straighten };
-        straighten.label = Resources.STRAIGHTEN_MENU;
-        straighten.tooltip = Resources.STRAIGHTEN_TOOLTIP;
-        actions += straighten;
-        
-        Gtk.ActionEntry red_eye = { "RedEye", Resources.REDEYE, TRANSLATABLE, "<Ctrl>Y",
-            TRANSLATABLE, toggle_redeye };
-        red_eye.label = Resources.RED_EYE_MENU;
-        red_eye.tooltip = Resources.RED_EYE_TOOLTIP;
-        actions += red_eye;
-        
-        Gtk.ActionEntry adjust = { "Adjust", Resources.ADJUST, TRANSLATABLE, "<Ctrl>D",
-            TRANSLATABLE, toggle_adjust };
-        adjust.label = Resources.ADJUST_MENU;
-        adjust.tooltip = Resources.ADJUST_TOOLTIP;
-        actions += adjust;
-        
-        Gtk.ActionEntry revert = { "Revert", Resources.REVERT_TO_SAVED_LABEL, TRANSLATABLE,
-            null, TRANSLATABLE, on_revert };
-        revert.label = Resources.REVERT_MENU;
-        actions += revert;
-        
-        Gtk.ActionEntry edit_title = { "EditTitle", null, TRANSLATABLE, "F2", TRANSLATABLE,
-            on_edit_title };
-        edit_title.label = Resources.EDIT_TITLE_MENU;
-        actions += edit_title;
-
-        Gtk.ActionEntry edit_comment = { "EditComment", null, TRANSLATABLE, "F3", TRANSLATABLE,
-            on_edit_comment };
-        edit_comment.label = Resources.EDIT_COMMENT_MENU;
-        actions += edit_comment;
-
-        Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, TRANSLATABLE, null,
-            TRANSLATABLE, on_adjust_date_time };
-        adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
-        actions += adjust_date_time;
-        
-        Gtk.ActionEntry external_edit = { "ExternalEdit", Resources.EDIT_LABEL, TRANSLATABLE,
-            "<Ctrl>Return", TRANSLATABLE, on_external_edit };
-        external_edit.label = Resources.EXTERNAL_EDIT_MENU;
-        actions += external_edit;
-
-        Gtk.ActionEntry edit_raw = { "ExternalEditRAW", null, TRANSLATABLE, "<Ctrl><Shift>Return", 
-            TRANSLATABLE, on_external_edit_raw };
-        edit_raw.label = Resources.EXTERNAL_EDIT_RAW_MENU;
-        actions += edit_raw;
-        
-        Gtk.ActionEntry send_to = { "SendTo", "document-send", TRANSLATABLE, null,
-            TRANSLATABLE, on_send_to };
-        send_to.label = Resources.SEND_TO_MENU;
-        actions += send_to;
-        
-        Gtk.ActionEntry set_background = { "SetBackground", null, TRANSLATABLE, "<Ctrl>B",
-            TRANSLATABLE, on_set_background };
-        set_background.label = Resources.SET_BACKGROUND_MENU;
-        set_background.tooltip = Resources.SET_BACKGROUND_TOOLTIP;
-        actions += set_background;
-        
-        Gtk.ActionEntry flag = { "Flag", null, TRANSLATABLE, "<Ctrl>G", TRANSLATABLE, on_flag_unflag };
-        flag.label = Resources.FLAG_MENU;
-        actions += flag;
-        
-        Gtk.ActionEntry set_rating = { "Rate", null, TRANSLATABLE, null, null, null };
-        set_rating.label = Resources.RATING_MENU;
-        actions += set_rating;
-
-        Gtk.ActionEntry increase_rating = { "IncreaseRating", null, TRANSLATABLE, 
-            "greater", TRANSLATABLE, on_increase_rating };
-        increase_rating.label = Resources.INCREASE_RATING_MENU;
-        actions += increase_rating;
-
-        Gtk.ActionEntry decrease_rating = { "DecreaseRating", null, TRANSLATABLE, 
-            "less", TRANSLATABLE, on_decrease_rating };
-        decrease_rating.label = Resources.DECREASE_RATING_MENU;
-        actions += decrease_rating;
-
-        Gtk.ActionEntry rate_rejected = { "RateRejected", null, TRANSLATABLE, 
-            "9", TRANSLATABLE, on_rate_rejected };
-        rate_rejected.label = Resources.rating_menu(Rating.REJECTED);
-        actions += rate_rejected;
-
-        Gtk.ActionEntry rate_unrated = { "RateUnrated", null, TRANSLATABLE, 
-            "0", TRANSLATABLE, on_rate_unrated };
-        rate_unrated.label = Resources.rating_menu(Rating.UNRATED);
-        actions += rate_unrated;
-
-        Gtk.ActionEntry rate_one = { "RateOne", null, TRANSLATABLE, 
-            "1", TRANSLATABLE, on_rate_one };
-        rate_one.label = Resources.rating_menu(Rating.ONE);
-        actions += rate_one;
-
-        Gtk.ActionEntry rate_two = { "RateTwo", null, TRANSLATABLE, 
-            "2", TRANSLATABLE, on_rate_two };
-        rate_two.label = Resources.rating_menu(Rating.TWO);
-        actions += rate_two;
-
-        Gtk.ActionEntry rate_three = { "RateThree", null, TRANSLATABLE, 
-            "3", TRANSLATABLE, on_rate_three };
-        rate_three.label = Resources.rating_menu(Rating.THREE);
-        actions += rate_three;
-
-        Gtk.ActionEntry rate_four = { "RateFour", null, TRANSLATABLE, 
-            "4", TRANSLATABLE, on_rate_four };
-        rate_four.label = Resources.rating_menu(Rating.FOUR);
-        actions += rate_four;
-
-        Gtk.ActionEntry rate_five = { "RateFive", null, TRANSLATABLE, 
-            "5", TRANSLATABLE, on_rate_five };
-        rate_five.label = Resources.rating_menu(Rating.FIVE);
-        actions += rate_five;
-
-        Gtk.ActionEntry increase_size = { "IncreaseSize", Resources.ZOOM_IN_LABEL, TRANSLATABLE,
-            "<Ctrl>plus", TRANSLATABLE, on_increase_size };
-        increase_size.label = _("Zoom _In");
-        increase_size.tooltip = _("Increase the magnification of the photo");
-        actions += increase_size;
-
-        Gtk.ActionEntry decrease_size = { "DecreaseSize", Resources.ZOOM_OUT_LABEL, TRANSLATABLE,
-            "<Ctrl>minus", TRANSLATABLE, on_decrease_size };
-        decrease_size.label = _("Zoom _Out");
-        decrease_size.tooltip = _("Decrease the magnification of the photo");
-        actions += decrease_size;
-
-        Gtk.ActionEntry best_fit = { "ZoomFit", Resources.ZOOM_FIT_LABEL, TRANSLATABLE,
-            "<Ctrl>0", TRANSLATABLE, snap_zoom_to_min };
-        best_fit.label = _("Fit to _Page");
-        best_fit.tooltip = _("Zoom the photo to fit on the screen");
-        actions += best_fit;
-
-        Gtk.ActionEntry actual_size = { "Zoom100", Resources.ZOOM_100_LABEL, TRANSLATABLE,
-            "<Ctrl>1", TRANSLATABLE, snap_zoom_to_isomorphic };
-        /// xgettext:no-c-format
-        actual_size.label = _("Zoom _100%");
-        /// xgettext:no-c-format
-        actual_size.tooltip = _("Zoom the photo to 100% magnification");
-        actions += actual_size;
-        
-        Gtk.ActionEntry max_size = { "Zoom200", null, TRANSLATABLE,
-            "<Ctrl>2", TRANSLATABLE, snap_zoom_to_max };
-        /// xgettext:no-c-format
-        max_size.label = _("Zoom _200%");
-        /// xgettext:no-c-format
-        max_size.tooltip = _("Zoom the photo to 200% magnification");
-        actions += max_size;
-
-        Gtk.ActionEntry add_tags = { "AddTags", null, TRANSLATABLE, "<Ctrl>T", TRANSLATABLE, 
-            on_add_tags };
-        add_tags.label = Resources.ADD_TAGS_MENU;
-        actions += add_tags;
-        
-        Gtk.ActionEntry modify_tags = { "ModifyTags", null, TRANSLATABLE, "<Ctrl>M", TRANSLATABLE, 
-            on_modify_tags };
-        modify_tags.label = Resources.MODIFY_TAGS_MENU;
-        actions += modify_tags;
-        
-        Gtk.ActionEntry slideshow = { "Slideshow", null, TRANSLATABLE, "F5", TRANSLATABLE,
-            on_slideshow };
-        slideshow.label = _("S_lideshow");
-        slideshow.tooltip = _("Play a slideshow");
-        actions += slideshow;
-        
-        Gtk.ActionEntry raw_developer = { "RawDeveloper", null, TRANSLATABLE, null, null, null };
-        raw_developer.label = _("_Developer");
-        actions += raw_developer;
-
-        // These are identical to add_tags and send_to, except that they have
-        // different mnemonics and are _only_ for use in the context menu.
-        Gtk.ActionEntry send_to_context_menu = { "SendToContextMenu", "document-send", TRANSLATABLE, null,
-            TRANSLATABLE, on_send_to };
-        send_to_context_menu.label = Resources.SEND_TO_CONTEXT_MENU;
-        actions += send_to_context_menu;        
-
-        Gtk.ActionEntry add_tags_context_menu = { "AddTagsContextMenu", null, TRANSLATABLE, "<Ctrl>A", TRANSLATABLE,
-            on_add_tags };
-        add_tags_context_menu.label = Resources.ADD_TAGS_CONTEXT_MENU;
-        actions += add_tags_context_menu;
-
-        return actions;
-    }
-    
-    protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries() {
-        Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries();
-        
-        Gtk.ToggleActionEntry ratings = { "ViewRatings", null, TRANSLATABLE, "<Ctrl><Shift>N",
-            TRANSLATABLE, on_display_ratings, Config.Facade.get_instance().get_display_photo_ratings() };
-        ratings.label = Resources.VIEW_RATINGS_MENU;
-        ratings.tooltip = Resources.VIEW_RATINGS_TOOLTIP;
-        toggle_actions += ratings;
-        
-        return toggle_actions;
+
+    private const GLib.ActionEntry[] entries = {
+        { "Export", on_export },
+        { "Print", on_print },
+        { "Publish", on_publish },
+        { "RemoveFromLibrary", on_remove_from_library },
+        { "MoveToTrash", on_move_to_trash },
+        { "PrevPhoto", on_previous_photo },
+        { "NextPhoto", on_next_photo },
+        { "RotateClockwise", on_rotate_clockwise },
+        { "RotateCounterclockwise", on_rotate_counterclockwise },
+        { "FlipHorizontally", on_flip_horizontally },
+        { "FlipVertically", on_flip_vertically },
+        { "Enhance", on_enhance },
+        { "CopyColorAdjustments", on_copy_adjustments },
+        { "PasteColorAdjustments", on_paste_adjustments },
+        { "Crop", toggle_crop },
+        { "Straighten", toggle_straighten },
+        { "RedEye", toggle_redeye },
+        { "Adjust", toggle_adjust },
+        { "Revert", on_revert },
+        { "EditTitle", on_edit_title },
+        { "EditComment", on_edit_comment },
+        { "AdjustDateTime", on_adjust_date_time },
+        { "ExternalEdit", on_external_edit },
+        { "ExternalEditRAW", on_external_edit_raw },
+        { "SendTo", on_send_to },
+        { "SetBackground", on_set_background },
+        { "Flag", on_flag_unflag },
+        { "IncreaseRating", on_increase_rating },
+        { "DecreaseRating", on_decrease_rating },
+        { "RateRejected", on_rate_rejected },
+        { "RateUnrated", on_rate_unrated },
+        { "RateOne", on_rate_one },
+        { "RateTwo", on_rate_two },
+        { "RateThree", on_rate_three },
+        { "RateFour", on_rate_four },
+        { "RateFive", on_rate_five },
+        { "IncreaseSize", on_increase_size },
+        { "DecreaseSize", on_decrease_size },
+        { "ZoomFit", snap_zoom_to_min },
+        { "Zoom100", snap_zoom_to_isomorphic },
+        { "Zoom200", snap_zoom_to_max },
+        { "AddTags", on_add_tags },
+        { "ModifyTags", on_modify_tags },
+        { "Slideshow", on_slideshow },
+
+        // Toggle actions
+        { "ViewRatings", on_action_toggle, null, "false", on_display_ratings },
+
+        // Radio actions
+        { "RawDeveloper", on_action_radio, "s", "'Shotwell'", on_raw_developer_changed }
+    };
+
+    protected override void add_actions () {
+        base.add_actions ();
+
+        AppWindow.get_instance ().add_action_entries (entries, this);
+        (get_action ("ViewRatings") as GLib.SimpleAction).set_state (Config.Facade.get_instance ().get_display_photo_ratings ());
+        var d = Config.Facade.get_instance().get_default_raw_developer();
+        var action = get_action ("RawDeveloper") as GLib.SimpleAction;
+        action.set_state (d == RawDeveloper.SHOTWELL ? "'Shotwell'" : "'Camera'");
     }
-    
+
     protected override InjectionGroup[] init_collect_injection_groups() {
         InjectionGroup[] groups = base.init_collect_injection_groups();
-        
-        InjectionGroup print_group = new InjectionGroup("/MenuBar/FileMenu/PrintPlaceholder");
-        print_group.add_menu_item("Print");
+
+        InjectionGroup print_group = new InjectionGroup("PrintPlaceholder");
+        print_group.add_menu_item(_("_Print"), "Print", "<Primary>p");
         
         groups += print_group;
         
-        InjectionGroup publish_group = new InjectionGroup("/MenuBar/FileMenu/PublishPlaceholder");
-        publish_group.add_menu_item("Publish");
+        InjectionGroup publish_group = new InjectionGroup("PublishPlaceholder");
+        publish_group.add_menu_item(_("_Publish"), "Publish", "<Primary><Shift>p");
         
         groups += publish_group;
         
-        InjectionGroup bg_group = new InjectionGroup("/MenuBar/FileMenu/SetBackgroundPlaceholder");
-        bg_group.add_menu_item("SetBackground");
+        InjectionGroup bg_group = new InjectionGroup("SetBackgroundPlaceholder");
+        bg_group.add_menu_item(_("Set as _Desktop Background"), "SetBackground");
         
         groups += bg_group;
         
         return groups;
     }
     
-    protected override void register_radio_actions(Gtk.ActionGroup action_group) {
-        // RAW developer.
-        //get_config_photos_sort(out sort_order, out sort_by); // TODO: fetch default from config
-        
-        Gtk.RadioActionEntry[] developer_actions = new Gtk.RadioActionEntry[0];
-        
-        Gtk.RadioActionEntry dev_shotwell = { "RawDeveloperShotwell", null, TRANSLATABLE, null, TRANSLATABLE,
-            RawDeveloper.SHOTWELL };
-        string label_shotwell = RawDeveloper.SHOTWELL.get_label();
-        dev_shotwell.label = label_shotwell;
-        developer_actions += dev_shotwell;
-        
-        Gtk.RadioActionEntry dev_camera = { "RawDeveloperCamera", null, TRANSLATABLE, null, TRANSLATABLE,
-            RawDeveloper.CAMERA };
-        string label_camera = RawDeveloper.CAMERA.get_label();
-        dev_camera.label = label_camera;
-        developer_actions += dev_camera;
-        
-        action_group.add_radio_actions(developer_actions, RawDeveloper.SHOTWELL, on_raw_developer_changed);
-        
-        base.register_radio_actions(action_group);
-    }
-    
-    private void on_display_ratings(Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active();
+    private void on_display_ratings(GLib.SimpleAction action, Variant? value) {
+        bool display = value.get_boolean ();
         
         set_display_ratings(display);
         
         Config.Facade.get_instance().set_display_photo_ratings(display);
-        repaint();
+        action.set_state (value);
     }
 
+
     private void set_display_ratings(bool display) {
-        Gtk.ToggleAction? action = get_action("ViewRatings") as Gtk.ToggleAction;
+        var action = get_action("ViewRatings") as GLib.SimpleAction;
         if (action != null)
-            action.set_active(display);
+            action.set_enabled(display);
     }
     
     protected override void update_actions(int selected_count, int count) {
@@ -2774,8 +2529,24 @@ public class LibraryPhotoPage : EditingHostPage {
         update_flag_action();
     }
     
-    private void on_raw_developer_changed(Gtk.Action action, Gtk.Action current) {
-        developer_changed((RawDeveloper) ((Gtk.RadioAction) current).get_current_value());
+    private void on_raw_developer_changed(GLib.SimpleAction action,
+                                          Variant? value) {
+        RawDeveloper developer = RawDeveloper.SHOTWELL;
+
+        switch (value.get_string ()) {
+            case "Shotwell":
+                developer = RawDeveloper.SHOTWELL;
+                break;
+            case "Camera":
+                developer = RawDeveloper.CAMERA;
+                break;
+            default:
+                break;
+        }
+
+        developer_changed(developer);
+
+        action.set_state (value);
     }
     
     protected virtual void developer_changed(RawDeveloper rd) {
@@ -2799,13 +2570,14 @@ public class LibraryPhotoPage : EditingHostPage {
     
     private void update_flag_action() {
         if (has_photo()) {
-            Gtk.Action? action = get_action("Flag");
+            var action = get_action("Flag") as GLib.SimpleAction;
             assert(action != null);
             
-            bool is_flagged = ((LibraryPhoto) get_photo()).is_flagged();
+//            bool is_flagged = ((LibraryPhoto) get_photo()).is_flagged();
             
-            action.label = is_flagged ? Resources.UNFLAG_MENU : Resources.FLAG_MENU;
-            action.sensitive = true;
+            debug ("Setting label of action flagged");
+//            action.label = is_flagged ? Resources.UNFLAG_MENU : Resources.FLAG_MENU;
+            action.set_enabled (true);
         } else {
             set_action_sensitive("Flag", false);
         }
@@ -3049,11 +2821,18 @@ public class LibraryPhotoPage : EditingHostPage {
         
         return base.on_left_released(event);
     }
-    
+
+    private Gtk.Menu context_menu;
+
     private Gtk.Menu get_context_menu() {
-        Gtk.Menu menu = (Gtk.Menu) ui.get_widget("/PhotoContextMenu");
-        assert(menu != null);
-        return menu;
+        if (context_menu == null) {
+            var model = this.builder.get_object ("PhotoContextMenu")
+                as GLib.MenuModel;
+            context_menu = new Gtk.Menu.from_model (model);
+            context_menu.attach_to_widget (this, null);
+        }
+
+        return this.context_menu;
     }
     
     protected override bool on_context_buttonpress(Gdk.EventButton event) {
@@ -3236,10 +3015,6 @@ public class LibraryPhotoPage : EditingHostPage {
                 (Gee.Collection<MediaSource>) get_view().get_selected_sources());
     }
     
-    private void on_view_menu() {
-        update_zoom_menu_item_sensitivity();
-    }
-
     private void on_increase_rating() {
         if (!has_photo() || get_photo_missing())
             return;
@@ -3315,22 +3090,16 @@ public class LibraryPhotoPage : EditingHostPage {
         set_action_sensitive("RawDeveloper", format == PhotoFileFormat.RAW);
         
         if (format == PhotoFileFormat.RAW) {
-            // Set which developers are available.
-            set_action_sensitive("RawDeveloperShotwell", 
-                get_photo().is_raw_developer_available(RawDeveloper.SHOTWELL));
-            set_action_sensitive("RawDeveloperCamera", 
-                get_photo().is_raw_developer_available(RawDeveloper.EMBEDDED) || 
-                get_photo().is_raw_developer_available(RawDeveloper.CAMERA));;
-                
+            // FIXME: Only enable radio actions that are actually possible..
             // Set active developer in menu.
             switch (get_photo().get_raw_developer()) {
                 case RawDeveloper.SHOTWELL:
-                    activate_action("RawDeveloperShotwell");
+                    get_action ("RawDeveloper").change_state ("'Shotwell'");
                     break;
                 
                 case RawDeveloper.CAMERA:
                 case RawDeveloper.EMBEDDED:
-                    activate_action("RawDeveloperCamera");
+                    get_action ("RawDeveloper").change_state ("'Camera'");
                     break;
                 
                 default:
diff --git a/src/PixbufCache.c b/src/PixbufCache.c
index facd682..3fbf1a8 100644
--- a/src/PixbufCache.c
+++ b/src/PixbufCache.c
@@ -440,8 +440,7 @@ enum  {
 };
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_new (void);
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType object_type);
-gint background_job_job_priority_compare_func (void* a, void* b);
-static gint _background_job_job_priority_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
+gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, BackgroundJobJobPriority b);
 enum  {
 	PIXBUF_CACHE_FETCH_JOB_DUMMY_PROPERTY
 };
@@ -474,14 +473,14 @@ static void pixbuf_cache_finalize (GObject* obj);
 static void _pixbuf_cache_on_sources_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_on_sources_altered ((PixbufCache*) self, items);
-#line 478 "PixbufCache.c"
+#line 477 "PixbufCache.c"
 }
 
 
 static void _pixbuf_cache_on_sources_removed_data_collection_items_removed (DataCollection* _sender, GeeIterable* removed, gpointer self) {
 #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_on_sources_removed ((PixbufCache*) self, removed);
-#line 485 "PixbufCache.c"
+#line 484 "PixbufCache.c"
 }
 
 
@@ -500,7 +499,7 @@ GType pixbuf_cache_photo_type_get_type (void) {
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 87 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 504 "PixbufCache.c"
+#line 503 "PixbufCache.c"
 }
 
 
@@ -559,7 +558,7 @@ PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* source
 	_tmp7_ = pixbuf_cache_background_workers;
 #line 95 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp7_ == NULL) {
-#line 563 "PixbufCache.c"
+#line 562 "PixbufCache.c"
 		guint _tmp8_ = 0U;
 		Workers* _tmp9_ = NULL;
 #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -570,19 +569,19 @@ PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* source
 		_workers_unref0 (pixbuf_cache_background_workers);
 #line 96 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		pixbuf_cache_background_workers = _tmp9_;
-#line 574 "PixbufCache.c"
+#line 573 "PixbufCache.c"
 	}
 #line 100 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp10_ = type;
 #line 100 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp10_ != PIXBUF_CACHE_PHOTO_TYPE_MASTER) {
-#line 580 "PixbufCache.c"
+#line 579 "PixbufCache.c"
 		SourceCollection* _tmp11_ = NULL;
 #line 101 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp11_ = sources;
 #line 101 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _pixbuf_cache_on_sources_altered_data_collection_items_altered, self, 0);
-#line 586 "PixbufCache.c"
+#line 585 "PixbufCache.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp12_ = sources;
@@ -590,14 +589,14 @@ PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* source
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), "items-removed", (GCallback) _pixbuf_cache_on_sources_removed_data_collection_items_removed, self, 0);
 #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
-#line 594 "PixbufCache.c"
+#line 593 "PixbufCache.c"
 }
 
 
 PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target) {
 #line 85 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return pixbuf_cache_construct (TYPE_PIXBUF_CACHE, sources, type, scaling, max_count, filter, filter_target);
-#line 601 "PixbufCache.c"
+#line 600 "PixbufCache.c"
 }
 
 
@@ -611,7 +610,7 @@ void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result) {
 	*result = _tmp0_;
 #line 119 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return;
-#line 615 "PixbufCache.c"
+#line 614 "PixbufCache.c"
 }
 
 
@@ -631,21 +630,21 @@ GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, Photo* photo) {
 	result = _tmp1_;
 #line 124 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 635 "PixbufCache.c"
+#line 634 "PixbufCache.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 642 "PixbufCache.c"
+#line 641 "PixbufCache.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 649 "PixbufCache.c"
+#line 648 "PixbufCache.c"
 }
 
 
@@ -691,13 +690,13 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 	_g_object_unref0 (_tmp2_);
 #line 130 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp4_) {
-#line 695 "PixbufCache.c"
+#line 694 "PixbufCache.c"
 		Photo* _tmp5_ = NULL;
 #line 131 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp5_ = photo;
 #line 131 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		pixbuf_cache_decache (self, _tmp5_);
-#line 701 "PixbufCache.c"
+#line 700 "PixbufCache.c"
 	}
 #line 133 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp6_ = photo;
@@ -713,7 +712,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 		result = pixbuf;
 #line 139 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return result;
-#line 717 "PixbufCache.c"
+#line 716 "PixbufCache.c"
 	}
 #line 142 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp9_ = self->priv->in_progress;
@@ -727,7 +726,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 	_tmp12_ = job;
 #line 143 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp12_ != NULL) {
-#line 731 "PixbufCache.c"
+#line 730 "PixbufCache.c"
 		PixbufCacheFetchJob* _tmp13_ = NULL;
 		PixbufCacheFetchJob* _tmp14_ = NULL;
 		GError* _tmp15_ = NULL;
@@ -744,7 +743,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 		_tmp15_ = _tmp14_->err;
 #line 145 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		if (_tmp15_ != NULL) {
-#line 748 "PixbufCache.c"
+#line 747 "PixbufCache.c"
 			PixbufCacheFetchJob* _tmp16_ = NULL;
 			GError* _tmp17_ = NULL;
 			GError* _tmp18_ = NULL;
@@ -764,7 +763,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 			_g_object_unref0 (pixbuf);
 #line 146 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			return NULL;
-#line 768 "PixbufCache.c"
+#line 767 "PixbufCache.c"
 		}
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp19_ = job;
@@ -780,7 +779,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 		_g_object_unref0 (pixbuf);
 #line 148 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return result;
-#line 784 "PixbufCache.c"
+#line 783 "PixbufCache.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp23_ = photo;
@@ -800,7 +799,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 		_g_object_unref0 (pixbuf);
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return NULL;
-#line 804 "PixbufCache.c"
+#line 803 "PixbufCache.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp26_ = _tmp22_;
@@ -824,7 +823,7 @@ GdkPixbuf* pixbuf_cache_fetch (PixbufCache* self, Photo* photo, GError** error)
 	_background_job_unref0 (job);
 #line 159 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 828 "PixbufCache.c"
+#line 827 "PixbufCache.c"
 }
 
 
@@ -843,14 +842,14 @@ void pixbuf_cache_drop (PixbufCache* self, Photo* photo) {
 	_tmp1_ = photo;
 #line 167 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_decache (self, _tmp1_);
-#line 847 "PixbufCache.c"
+#line 846 "PixbufCache.c"
 }
 
 
 static void _pixbuf_cache_on_fetched_completion_callback (BackgroundJob* job, gpointer self) {
 #line 192 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_on_fetched ((PixbufCache*) self, job);
-#line 854 "PixbufCache.c"
+#line 853 "PixbufCache.c"
 }
 
 
@@ -893,19 +892,19 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 	_g_object_unref0 (_tmp2_);
 #line 174 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp4_) {
-#line 897 "PixbufCache.c"
+#line 896 "PixbufCache.c"
 		Photo* _tmp5_ = NULL;
 #line 175 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp5_ = photo;
 #line 175 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		pixbuf_cache_decache (self, _tmp5_);
-#line 903 "PixbufCache.c"
+#line 902 "PixbufCache.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp7_ = force;
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (!_tmp7_) {
-#line 909 "PixbufCache.c"
+#line 908 "PixbufCache.c"
 		GeeHashMap* _tmp8_ = NULL;
 		Photo* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
@@ -917,15 +916,15 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 		_tmp10_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_);
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp6_ = _tmp10_;
-#line 921 "PixbufCache.c"
+#line 920 "PixbufCache.c"
 	} else {
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp6_ = FALSE;
-#line 925 "PixbufCache.c"
+#line 924 "PixbufCache.c"
 	}
 #line 177 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp6_) {
-#line 929 "PixbufCache.c"
+#line 928 "PixbufCache.c"
 		Photo* _tmp11_ = NULL;
 #line 178 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp11_ = photo;
@@ -933,7 +932,7 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 		pixbuf_cache_prioritize (self, _tmp11_);
 #line 180 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 937 "PixbufCache.c"
+#line 936 "PixbufCache.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp12_ = self->priv->in_progress;
@@ -945,7 +944,7 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 	if (_tmp14_) {
 #line 184 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 949 "PixbufCache.c"
+#line 948 "PixbufCache.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp16_ = self->priv->filter;
@@ -953,7 +952,7 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 	_tmp16__target = self->priv->filter_target;
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp16_ != NULL) {
-#line 957 "PixbufCache.c"
+#line 956 "PixbufCache.c"
 		PixbufCacheCacheFilter _tmp17_ = NULL;
 		void* _tmp17__target = NULL;
 		Photo* _tmp18_ = NULL;
@@ -968,17 +967,17 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 		_tmp19_ = _tmp17_ (_tmp18_, _tmp17__target);
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp15_ = !_tmp19_;
-#line 972 "PixbufCache.c"
+#line 971 "PixbufCache.c"
 	} else {
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp15_ = FALSE;
-#line 976 "PixbufCache.c"
+#line 975 "PixbufCache.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp15_) {
 #line 187 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 982 "PixbufCache.c"
+#line 981 "PixbufCache.c"
 	}
 #line 189 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	job = NULL;
@@ -988,7 +987,7 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 	switch (_tmp20_) {
 #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		case PIXBUF_CACHE_PHOTO_TYPE_BASELINE:
-#line 992 "PixbufCache.c"
+#line 991 "PixbufCache.c"
 		{
 			BackgroundJobJobPriority _tmp21_ = 0;
 			Photo* _tmp22_ = NULL;
@@ -1008,11 +1007,11 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 			job = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob);
 #line 193 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			break;
-#line 1012 "PixbufCache.c"
+#line 1011 "PixbufCache.c"
 		}
 #line 190 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		case PIXBUF_CACHE_PHOTO_TYPE_MASTER:
-#line 1016 "PixbufCache.c"
+#line 1015 "PixbufCache.c"
 		{
 			BackgroundJobJobPriority _tmp25_ = 0;
 			Photo* _tmp26_ = NULL;
@@ -1032,7 +1031,7 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 			job = G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob);
 #line 197 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			break;
-#line 1036 "PixbufCache.c"
+#line 1035 "PixbufCache.c"
 		}
 		default:
 		{
@@ -1041,7 +1040,7 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 			_tmp29_ = self->priv->type;
 #line 200 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			g_error ("PixbufCache.vala:200: Unknown photo type: %d", (gint) _tmp29_);
-#line 1045 "PixbufCache.c"
+#line 1044 "PixbufCache.c"
 		}
 	}
 #line 203 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1060,7 +1059,7 @@ void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPri
 	workers_enqueue (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 172 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_background_job_unref0 (job);
-#line 1064 "PixbufCache.c"
+#line 1063 "PixbufCache.c"
 }
 
 
@@ -1069,7 +1068,7 @@ void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, Backg
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 210 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (photos));
-#line 1073 "PixbufCache.c"
+#line 1072 "PixbufCache.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
@@ -1082,7 +1081,7 @@ void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, Backg
 		_photo_it = _tmp1_;
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1086 "PixbufCache.c"
+#line 1085 "PixbufCache.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			Photo* photo = NULL;
@@ -1099,7 +1098,7 @@ void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, Backg
 			if (!_tmp3_) {
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1103 "PixbufCache.c"
+#line 1102 "PixbufCache.c"
 			}
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp4_ = _photo_it;
@@ -1117,11 +1116,11 @@ void pixbuf_cache_prefetch_many (PixbufCache* self, GeeCollection* photos, Backg
 			pixbuf_cache_prefetch (self, _tmp6_, _tmp7_, _tmp8_);
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_g_object_unref0 (photo);
-#line 1121 "PixbufCache.c"
+#line 1120 "PixbufCache.c"
 		}
 #line 212 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_photo_it);
-#line 1125 "PixbufCache.c"
+#line 1124 "PixbufCache.c"
 	}
 }
 
@@ -1131,7 +1130,7 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 217 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (PIXBUF_CACHE_IS_PIXBUF_CACHE_BATCH (batch));
-#line 1135 "PixbufCache.c"
+#line 1134 "PixbufCache.c"
 	{
 		GeeIterator* _priority_it = NULL;
 		PixbufCachePixbufCacheBatch* _tmp0_ = NULL;
@@ -1155,7 +1154,7 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 		_priority_it = _tmp4_;
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1159 "PixbufCache.c"
+#line 1158 "PixbufCache.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			BackgroundJobJobPriority priority = 0;
@@ -1169,7 +1168,7 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 			if (!_tmp6_) {
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1173 "PixbufCache.c"
+#line 1172 "PixbufCache.c"
 			}
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp7_ = _priority_it;
@@ -1177,7 +1176,7 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 			_tmp8_ = gee_iterator_get (_tmp7_);
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			priority = (BackgroundJobJobPriority) ((gintptr) _tmp8_);
-#line 1181 "PixbufCache.c"
+#line 1180 "PixbufCache.c"
 			{
 				GeeIterator* _photo_it = NULL;
 				PixbufCachePixbufCacheBatch* _tmp9_ = NULL;
@@ -1204,7 +1203,7 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 				_photo_it = _tmp14_;
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				while (TRUE) {
-#line 1208 "PixbufCache.c"
+#line 1207 "PixbufCache.c"
 					GeeIterator* _tmp15_ = NULL;
 					gboolean _tmp16_ = FALSE;
 					Photo* photo = NULL;
@@ -1221,7 +1220,7 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 					if (!_tmp16_) {
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 						break;
-#line 1225 "PixbufCache.c"
+#line 1224 "PixbufCache.c"
 					}
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 					_tmp17_ = _photo_it;
@@ -1239,16 +1238,16 @@ void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch
 					pixbuf_cache_prefetch (self, _tmp19_, _tmp20_, _tmp21_);
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 					_g_object_unref0 (photo);
-#line 1243 "PixbufCache.c"
+#line 1242 "PixbufCache.c"
 				}
 #line 219 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				_g_object_unref0 (_photo_it);
-#line 1247 "PixbufCache.c"
+#line 1246 "PixbufCache.c"
 			}
 		}
 #line 218 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_priority_it);
-#line 1252 "PixbufCache.c"
+#line 1251 "PixbufCache.c"
 	}
 }
 
@@ -1288,7 +1287,7 @@ gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo) {
 		_background_job_unref0 (job);
 #line 227 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return result;
-#line 1292 "PixbufCache.c"
+#line 1291 "PixbufCache.c"
 	}
 #line 230 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp4_ = self->priv->in_progress;
@@ -1312,7 +1311,7 @@ gboolean pixbuf_cache_cancel_prefetch (PixbufCache* self, Photo* photo) {
 	_background_job_unref0 (job);
 #line 239 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 1316 "PixbufCache.c"
+#line 1315 "PixbufCache.c"
 }
 
 
@@ -1320,7 +1319,7 @@ void pixbuf_cache_cancel_all (PixbufCache* self) {
 	GeeHashMap* _tmp11_ = NULL;
 #line 242 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
-#line 1324 "PixbufCache.c"
+#line 1323 "PixbufCache.c"
 	{
 		GeeIterator* _job_it = NULL;
 		GeeHashMap* _tmp0_ = NULL;
@@ -1347,7 +1346,7 @@ void pixbuf_cache_cancel_all (PixbufCache* self) {
 		_job_it = _tmp5_;
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1351 "PixbufCache.c"
+#line 1350 "PixbufCache.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			PixbufCacheFetchJob* job = NULL;
@@ -1362,7 +1361,7 @@ void pixbuf_cache_cancel_all (PixbufCache* self) {
 			if (!_tmp7_) {
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1366 "PixbufCache.c"
+#line 1365 "PixbufCache.c"
 			}
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp8_ = _job_it;
@@ -1376,24 +1375,24 @@ void pixbuf_cache_cancel_all (PixbufCache* self) {
 			background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_background_job_unref0 (job);
-#line 1380 "PixbufCache.c"
+#line 1379 "PixbufCache.c"
 		}
 #line 246 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_job_it);
-#line 1384 "PixbufCache.c"
+#line 1383 "PixbufCache.c"
 	}
 #line 249 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp11_ = self->priv->in_progress;
 #line 249 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 1390 "PixbufCache.c"
+#line 1389 "PixbufCache.c"
 }
 
 
 static gpointer _background_job_ref0 (gpointer self) {
 #line 253 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self ? background_job_ref (self) : NULL;
-#line 1397 "PixbufCache.c"
+#line 1396 "PixbufCache.c"
 }
 
 
@@ -1438,7 +1437,7 @@ static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) {
 	_tmp6_ = _tmp5_->err;
 #line 259 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp6_ != NULL) {
-#line 1442 "PixbufCache.c"
+#line 1441 "PixbufCache.c"
 		PixbufCacheFetchJob* _tmp7_ = NULL;
 		GdkPixbuf* _tmp8_ = NULL;
 		PixbufCacheFetchJob* _tmp9_ = NULL;
@@ -1490,7 +1489,7 @@ static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) {
 		_background_job_unref0 (job);
 #line 265 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 1494 "PixbufCache.c"
+#line 1493 "PixbufCache.c"
 	}
 #line 272 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp20_ = job;
@@ -1514,7 +1513,7 @@ static void pixbuf_cache_on_fetched (PixbufCache* self, BackgroundJob* j) {
 	g_signal_emit_by_name (self, "fetched", _tmp25_, _tmp27_, NULL);
 #line 252 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_background_job_unref0 (job);
-#line 1518 "PixbufCache.c"
+#line 1517 "PixbufCache.c"
 }
 
 
@@ -1523,7 +1522,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 278 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 1527 "PixbufCache.c"
+#line 1526 "PixbufCache.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -1550,7 +1549,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 		_object_it = _tmp5_;
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1554 "PixbufCache.c"
+#line 1553 "PixbufCache.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -1578,7 +1577,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 			if (!_tmp7_) {
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1582 "PixbufCache.c"
+#line 1581 "PixbufCache.c"
 			}
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp8_ = _object_it;
@@ -1606,7 +1605,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 				_g_object_unref0 (object);
 #line 281 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				continue;
-#line 1610 "PixbufCache.c"
+#line 1609 "PixbufCache.c"
 			}
 #line 283 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp16_ = object;
@@ -1622,7 +1621,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 			_tmp20_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_);
 #line 285 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			if (_tmp20_) {
-#line 1626 "PixbufCache.c"
+#line 1625 "PixbufCache.c"
 				GeeHashMap* _tmp21_ = NULL;
 				Photo* _tmp22_ = NULL;
 				gpointer _tmp23_ = NULL;
@@ -1647,7 +1646,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 				_tmp26_ = photo;
 #line 289 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, NULL);
-#line 1651 "PixbufCache.c"
+#line 1650 "PixbufCache.c"
 			} else {
 				GeeHashMap* _tmp27_ = NULL;
 				Photo* _tmp28_ = NULL;
@@ -1666,7 +1665,7 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 					_g_object_unref0 (object);
 #line 291 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 					continue;
-#line 1670 "PixbufCache.c"
+#line 1669 "PixbufCache.c"
 				}
 			}
 #line 294 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -1681,11 +1680,11 @@ static void pixbuf_cache_on_sources_altered (PixbufCache* self, GeeMap* map) {
 			_g_object_unref0 (photo);
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_g_object_unref0 (object);
-#line 1685 "PixbufCache.c"
+#line 1684 "PixbufCache.c"
 		}
 #line 279 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_object_it);
-#line 1689 "PixbufCache.c"
+#line 1688 "PixbufCache.c"
 	}
 }
 
@@ -1695,7 +1694,7 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem
 	g_return_if_fail (IS_PIXBUF_CACHE (self));
 #line 305 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (removed));
-#line 1699 "PixbufCache.c"
+#line 1698 "PixbufCache.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
@@ -1708,7 +1707,7 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem
 		_object_it = _tmp1_;
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 1712 "PixbufCache.c"
+#line 1711 "PixbufCache.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			DataObject* object = NULL;
@@ -1727,7 +1726,7 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem
 			if (!_tmp3_) {
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 1731 "PixbufCache.c"
+#line 1730 "PixbufCache.c"
 			}
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp4_ = _object_it;
@@ -1753,11 +1752,11 @@ static void pixbuf_cache_on_sources_removed (PixbufCache* self, GeeIterable* rem
 			_g_object_unref0 (photo);
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_g_object_unref0 (object);
-#line 1757 "PixbufCache.c"
+#line 1756 "PixbufCache.c"
 		}
 #line 306 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_object_it);
-#line 1761 "PixbufCache.c"
+#line 1760 "PixbufCache.c"
 	}
 }
 
@@ -1785,19 +1784,19 @@ static GdkPixbuf* pixbuf_cache_get_cached (PixbufCache* self, Photo* photo) {
 	_tmp3_ = pixbuf;
 #line 316 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp3_ != NULL) {
-#line 1789 "PixbufCache.c"
+#line 1788 "PixbufCache.c"
 		Photo* _tmp4_ = NULL;
 #line 317 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = photo;
 #line 317 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		pixbuf_cache_prioritize (self, _tmp4_);
-#line 1795 "PixbufCache.c"
+#line 1794 "PixbufCache.c"
 	}
 #line 319 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	result = pixbuf;
 #line 319 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 1801 "PixbufCache.c"
+#line 1800 "PixbufCache.c"
 }
 
 
@@ -1828,7 +1827,7 @@ static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo) {
 	_tmp4_ = index;
 #line 327 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp4_ > 0) {
-#line 1832 "PixbufCache.c"
+#line 1831 "PixbufCache.c"
 		GeeArrayList* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
 		gpointer _tmp7_ = NULL;
@@ -1851,7 +1850,7 @@ static void pixbuf_cache_prioritize (PixbufCache* self, Photo* photo) {
 		_tmp10_ = photo;
 #line 329 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp10_);
-#line 1855 "PixbufCache.c"
+#line 1854 "PixbufCache.c"
 	}
 }
 
@@ -1895,7 +1894,7 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 	gee_abstract_list_insert (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0, _tmp5_);
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	while (TRUE) {
-#line 1899 "PixbufCache.c"
+#line 1898 "PixbufCache.c"
 		GeeArrayList* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
 		gint _tmp8_ = 0;
@@ -1924,7 +1923,7 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 		if (!(_tmp8_ > _tmp9_)) {
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			break;
-#line 1928 "PixbufCache.c"
+#line 1927 "PixbufCache.c"
 		}
 #line 341 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp10_ = self->priv->lru;
@@ -1956,7 +1955,7 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 		_vala_assert (_tmp19_, "removed");
 #line 340 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (cached_photo);
-#line 1960 "PixbufCache.c"
+#line 1959 "PixbufCache.c"
 	}
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp20_ = self->priv->lru;
@@ -1972,7 +1971,7 @@ static void pixbuf_cache_encache (PixbufCache* self, Photo* photo, GdkPixbuf* pi
 	_tmp25_ = _tmp24_;
 #line 348 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_vala_assert (_tmp22_ == _tmp25_, "lru.size == cache.size");
-#line 1976 "PixbufCache.c"
+#line 1975 "PixbufCache.c"
 }
 
 
@@ -1997,7 +1996,7 @@ static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) {
 	_tmp2_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, NULL);
 #line 352 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (!_tmp2_) {
-#line 2001 "PixbufCache.c"
+#line 2000 "PixbufCache.c"
 		GeeArrayList* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
@@ -2011,7 +2010,7 @@ static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) {
 		_vala_assert (!_tmp5_, "!lru.contains(photo)");
 #line 355 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 2015 "PixbufCache.c"
+#line 2014 "PixbufCache.c"
 	}
 #line 358 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp6_ = self->priv->lru;
@@ -2025,7 +2024,7 @@ static void pixbuf_cache_decache (PixbufCache* self, Photo* photo) {
 	_tmp9_ = removed;
 #line 359 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_vala_assert (_tmp9_, "removed");
-#line 2029 "PixbufCache.c"
+#line 2028 "PixbufCache.c"
 }
 
 
@@ -2044,52 +2043,43 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER (GClosure * clos
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2048 "PixbufCache.c"
+#line 2047 "PixbufCache.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		data2 = closure->data;
-#line 2054 "PixbufCache.c"
+#line 2053 "PixbufCache.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_POINTER) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_pointer (param_values + 3), data2);
-#line 2060 "PixbufCache.c"
-}
-
-
-static gint _background_job_job_priority_compare_func_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
-	gint result;
-	result = background_job_job_priority_compare_func (a, b);
-#line 17 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	return result;
-#line 2069 "PixbufCache.c"
+#line 2059 "PixbufCache.c"
 }
 
 
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType object_type) {
 	PixbufCachePixbufCacheBatch * self = NULL;
 #line 17 "/home/jens/Source/shotwell/src/PixbufCache.vala"
-	self = (PixbufCachePixbufCacheBatch*) gee_tree_multi_map_construct (object_type, BACKGROUND_JOB_TYPE_JOB_PRIORITY, NULL, NULL, TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _background_job_job_priority_compare_func_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
+	self = (PixbufCachePixbufCacheBatch*) gee_tree_multi_map_construct (object_type, BACKGROUND_JOB_TYPE_JOB_PRIORITY, NULL, NULL, TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GCompareDataFunc) background_job_job_priority_compare_func, NULL, NULL, NULL, NULL, NULL);
 #line 16 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
-#line 2079 "PixbufCache.c"
+#line 2069 "PixbufCache.c"
 }
 
 
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_new (void) {
 #line 16 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return pixbuf_cache_pixbuf_cache_batch_construct (PIXBUF_CACHE_TYPE_PIXBUF_CACHE_BATCH);
-#line 2086 "PixbufCache.c"
+#line 2076 "PixbufCache.c"
 }
 
 
 static void pixbuf_cache_pixbuf_cache_batch_class_init (PixbufCachePixbufCacheBatchClass * klass) {
 #line 15 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	pixbuf_cache_pixbuf_cache_batch_parent_class = g_type_class_peek_parent (klass);
-#line 2093 "PixbufCache.c"
+#line 2083 "PixbufCache.c"
 }
 
 
@@ -2166,7 +2156,7 @@ static PixbufCacheFetchJob* pixbuf_cache_fetch_job_construct (GType object_type,
 	self->scaling = _tmp9_;
 #line 28 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
-#line 2170 "PixbufCache.c"
+#line 2160 "PixbufCache.c"
 }
 
 
@@ -2182,7 +2172,7 @@ static BackgroundJobJobPriority pixbuf_cache_fetch_job_real_get_priority (Backgr
 	result = _tmp0_;
 #line 38 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return result;
-#line 2186 "PixbufCache.c"
+#line 2176 "PixbufCache.c"
 }
 
 
@@ -2193,7 +2183,7 @@ static void pixbuf_cache_fetch_job_class_init (PixbufCacheFetchJobClass * klass)
 	((BackgroundJobClass *) klass)->finalize = pixbuf_cache_fetch_job_finalize;
 #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	((BackgroundJobClass *) klass)->get_priority = pixbuf_cache_fetch_job_real_get_priority;
-#line 2197 "PixbufCache.c"
+#line 2187 "PixbufCache.c"
 }
 
 
@@ -2202,7 +2192,7 @@ static void pixbuf_cache_fetch_job_instance_init (PixbufCacheFetchJob * self) {
 	self->pixbuf = NULL;
 #line 26 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->err = NULL;
-#line 2206 "PixbufCache.c"
+#line 2196 "PixbufCache.c"
 }
 
 
@@ -2218,7 +2208,7 @@ static void pixbuf_cache_fetch_job_finalize (BackgroundJob* obj) {
 	_g_error_free0 (self->err);
 #line 21 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	BACKGROUND_JOB_CLASS (pixbuf_cache_fetch_job_parent_class)->finalize (obj);
-#line 2222 "PixbufCache.c"
+#line 2212 "PixbufCache.c"
 }
 
 
@@ -2264,14 +2254,14 @@ static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_construct (G
 	self = (PixbufCacheBaselineFetchJob*) pixbuf_cache_fetch_job_construct (object_type, _tmp0_, _tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target);
 #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
-#line 2268 "PixbufCache.c"
+#line 2258 "PixbufCache.c"
 }
 
 
 static PixbufCacheBaselineFetchJob* pixbuf_cache_baseline_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) {
 #line 43 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return pixbuf_cache_baseline_fetch_job_construct (PIXBUF_CACHE_TYPE_BASELINE_FETCH_JOB, owner, priority, photo, scaling, callback, callback_target);
-#line 2275 "PixbufCache.c"
+#line 2265 "PixbufCache.c"
 }
 
 
@@ -2280,7 +2270,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 	GError * _inner_error_ = NULL;
 #line 48 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PIXBUF_CACHE_TYPE_BASELINE_FETCH_JOB, PixbufCacheBaselineFetchJob);
-#line 2284 "PixbufCache.c"
+#line 2274 "PixbufCache.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_ = NULL;
@@ -2297,8 +2287,8 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		_tmp0_ = _tmp3_;
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2301 "PixbufCache.c"
-			goto __catch455_g_error;
+#line 2291 "PixbufCache.c"
+			goto __catch452_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2310,10 +2300,10 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->pixbuf = _tmp4_;
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2314 "PixbufCache.c"
+#line 2304 "PixbufCache.c"
 	}
-	goto __finally455;
-	__catch455_g_error:
+	goto __finally452;
+	__catch452_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2332,9 +2322,9 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->err = _tmp6_;
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_error_free0 (err);
-#line 2336 "PixbufCache.c"
+#line 2326 "PixbufCache.c"
 	}
-	__finally455:
+	__finally452:
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2343,7 +2333,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		g_clear_error (&_inner_error_);
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 2347 "PixbufCache.c"
+#line 2337 "PixbufCache.c"
 	}
 }
 
@@ -2353,7 +2343,7 @@ static void pixbuf_cache_baseline_fetch_job_class_init (PixbufCacheBaselineFetch
 	pixbuf_cache_baseline_fetch_job_parent_class = g_type_class_peek_parent (klass);
 #line 42 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	((BackgroundJobClass *) klass)->execute = pixbuf_cache_baseline_fetch_job_real_execute;
-#line 2357 "PixbufCache.c"
+#line 2347 "PixbufCache.c"
 }
 
 
@@ -2403,14 +2393,14 @@ static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_construct (GType
 	self = (PixbufCacheMasterFetchJob*) pixbuf_cache_fetch_job_construct (object_type, _tmp0_, _tmp1_, _tmp2_, &_tmp3_, _tmp4_, _tmp4__target);
 #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return self;
-#line 2407 "PixbufCache.c"
+#line 2397 "PixbufCache.c"
 }
 
 
 static PixbufCacheMasterFetchJob* pixbuf_cache_master_fetch_job_new (PixbufCache* owner, BackgroundJobJobPriority priority, Photo* photo, Scaling* scaling, CompletionCallback callback, void* callback_target) {
 #line 58 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	return pixbuf_cache_master_fetch_job_construct (PIXBUF_CACHE_TYPE_MASTER_FETCH_JOB, owner, priority, photo, scaling, callback, callback_target);
-#line 2414 "PixbufCache.c"
+#line 2404 "PixbufCache.c"
 }
 
 
@@ -2419,7 +2409,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 	GError * _inner_error_ = NULL;
 #line 63 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PIXBUF_CACHE_TYPE_MASTER_FETCH_JOB, PixbufCacheMasterFetchJob);
-#line 2423 "PixbufCache.c"
+#line 2413 "PixbufCache.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_ = NULL;
@@ -2436,8 +2426,8 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		_tmp0_ = _tmp3_;
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2440 "PixbufCache.c"
-			goto __catch456_g_error;
+#line 2430 "PixbufCache.c"
+			goto __catch453_g_error;
 		}
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2449,10 +2439,10 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->pixbuf = _tmp4_;
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2453 "PixbufCache.c"
+#line 2443 "PixbufCache.c"
 	}
-	goto __finally456;
-	__catch456_g_error:
+	goto __finally453;
+	__catch453_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2471,9 +2461,9 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		G_TYPE_CHECK_INSTANCE_CAST (self, PIXBUF_CACHE_TYPE_FETCH_JOB, PixbufCacheFetchJob)->err = _tmp6_;
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_error_free0 (err);
-#line 2475 "PixbufCache.c"
+#line 2465 "PixbufCache.c"
 	}
-	__finally456:
+	__finally453:
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2482,7 +2472,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		g_clear_error (&_inner_error_);
 #line 64 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		return;
-#line 2486 "PixbufCache.c"
+#line 2476 "PixbufCache.c"
 	}
 }
 
@@ -2492,7 +2482,7 @@ static void pixbuf_cache_master_fetch_job_class_init (PixbufCacheMasterFetchJobC
 	pixbuf_cache_master_fetch_job_parent_class = g_type_class_peek_parent (klass);
 #line 57 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	((BackgroundJobClass *) klass)->execute = pixbuf_cache_master_fetch_job_real_execute;
-#line 2496 "PixbufCache.c"
+#line 2486 "PixbufCache.c"
 }
 
 
@@ -2521,7 +2511,7 @@ static void pixbuf_cache_class_init (PixbufCacheClass * klass) {
 	G_OBJECT_CLASS (klass)->finalize = pixbuf_cache_finalize;
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_signal_new ("fetched", TYPE_PIXBUF_CACHE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_POINTER, G_TYPE_NONE, 3, TYPE_PHOTO, gdk_pixbuf_get_type (), G_TYPE_POINTER);
-#line 2525 "PixbufCache.c"
+#line 2515 "PixbufCache.c"
 }
 
 
@@ -2543,7 +2533,7 @@ static void pixbuf_cache_instance_init (PixbufCache * self) {
 	_tmp2_ = gee_hash_map_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, PIXBUF_CACHE_TYPE_FETCH_JOB, (GBoxedCopyFunc) background_job_ref, background_job_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 81 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	self->priv->in_progress = _tmp2_;
-#line 2547 "PixbufCache.c"
+#line 2537 "PixbufCache.c"
 }
 
 
@@ -2558,7 +2548,7 @@ static void pixbuf_cache_finalize (GObject* obj) {
 	_tmp0_ = self->priv->type;
 #line 110 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (_tmp0_ != PIXBUF_CACHE_PHOTO_TYPE_MASTER) {
-#line 2562 "PixbufCache.c"
+#line 2552 "PixbufCache.c"
 		SourceCollection* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2567,7 +2557,7 @@ static void pixbuf_cache_finalize (GObject* obj) {
 		g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp2_, NULL, FALSE);
 #line 111 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _pixbuf_cache_on_sources_altered_data_collection_items_altered, self);
-#line 2571 "PixbufCache.c"
+#line 2561 "PixbufCache.c"
 	}
 #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_tmp3_ = self->priv->sources;
@@ -2575,7 +2565,7 @@ static void pixbuf_cache_finalize (GObject* obj) {
 	g_signal_parse_name ("items-removed", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
 #line 112 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _pixbuf_cache_on_sources_removed_data_collection_items_removed, self);
-#line 2579 "PixbufCache.c"
+#line 2569 "PixbufCache.c"
 	{
 		GeeIterator* _job_it = NULL;
 		GeeHashMap* _tmp5_ = NULL;
@@ -2602,7 +2592,7 @@ static void pixbuf_cache_finalize (GObject* obj) {
 		_job_it = _tmp10_;
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		while (TRUE) {
-#line 2606 "PixbufCache.c"
+#line 2596 "PixbufCache.c"
 			GeeIterator* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			PixbufCacheFetchJob* job = NULL;
@@ -2617,7 +2607,7 @@ static void pixbuf_cache_finalize (GObject* obj) {
 			if (!_tmp12_) {
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 				break;
-#line 2621 "PixbufCache.c"
+#line 2611 "PixbufCache.c"
 			}
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_tmp13_ = _job_it;
@@ -2631,11 +2621,11 @@ static void pixbuf_cache_finalize (GObject* obj) {
 			background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 			_background_job_unref0 (job);
-#line 2635 "PixbufCache.c"
+#line 2625 "PixbufCache.c"
 		}
 #line 114 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_g_object_unref0 (_job_it);
-#line 2639 "PixbufCache.c"
+#line 2629 "PixbufCache.c"
 	}
 #line 74 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	_data_collection_unref0 (self->priv->sources);
@@ -2647,7 +2637,7 @@ static void pixbuf_cache_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->in_progress);
 #line 7 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	G_OBJECT_CLASS (pixbuf_cache_parent_class)->finalize (obj);
-#line 2651 "PixbufCache.c"
+#line 2641 "PixbufCache.c"
 }
 
 
diff --git a/src/PixbufCache.vala b/src/PixbufCache.vala
index 5b79868..6ab4426 100644
--- a/src/PixbufCache.vala
+++ b/src/PixbufCache.vala
@@ -14,7 +14,7 @@ public class PixbufCache : Object {
     
     public class PixbufCacheBatch : Gee.TreeMultiMap<BackgroundJob.JobPriority, Photo> {
         public PixbufCacheBatch() {
-            base (BackgroundJob.JobPriority.compare_func);
+            base ((GLib.CompareDataFunc<BackgroundJob.JobPriority>)BackgroundJob.JobPriority.compare_func);
         }
     }
     
diff --git a/src/Printing.c b/src/Printing.c
index 273adef..3a70b0f 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -592,21 +592,21 @@ enum  {
 #define PRINT_MANAGER_IMAGE_DISTANCE 0.24
 static PrintManager* print_manager_new (void);
 static PrintManager* print_manager_construct (GType object_type);
-static void _vala_array_add278 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add279 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add280 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add281 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add282 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add283 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add284 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add285 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add286 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add287 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add288 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add289 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add290 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add291 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
-static void _vala_array_add292 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add112 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add113 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add114 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add115 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add116 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add117 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add118 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add119 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add120 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add121 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add122 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add123 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add124 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add125 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
+static void _vala_array_add126 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value);
 void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print);
 gchar* data_object_get_name (DataObject* self);
 static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation* emitting_object, GtkPrintContext* job_context);
@@ -5635,7 +5635,7 @@ static PrintManager* print_manager_new (void) {
 }
 
 
-static void _vala_array_add278 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add112 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 818 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 818 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5652,7 +5652,7 @@ static void _vala_array_add278 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add279 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add113 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 821 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 821 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5669,7 +5669,7 @@ static void _vala_array_add279 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add280 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add114 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 824 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 824 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5686,7 +5686,7 @@ static void _vala_array_add280 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add281 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add115 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 827 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 827 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5703,7 +5703,7 @@ static void _vala_array_add281 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add282 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add116 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 830 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 830 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5720,7 +5720,7 @@ static void _vala_array_add282 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add283 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add117 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 833 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 833 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5737,7 +5737,7 @@ static void _vala_array_add283 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add284 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add118 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 836 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 836 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5754,7 +5754,7 @@ static void _vala_array_add284 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add285 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add119 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5771,7 +5771,7 @@ static void _vala_array_add285 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add286 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add120 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 842 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 842 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5788,7 +5788,7 @@ static void _vala_array_add286 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add287 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add121 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 845 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 845 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5805,7 +5805,7 @@ static void _vala_array_add287 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add288 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add122 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 848 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 848 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5822,7 +5822,7 @@ static void _vala_array_add288 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add289 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add123 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 851 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 851 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5839,7 +5839,7 @@ static void _vala_array_add289 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add290 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add124 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5856,7 +5856,7 @@ static void _vala_array_add290 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add291 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add125 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 857 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 857 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -5873,7 +5873,7 @@ static void _vala_array_add291 (StandardPrintSize*** array, int* length, int* si
 }
 
 
-static void _vala_array_add292 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
+static void _vala_array_add126 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
 #line 860 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
 #line 860 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6010,7 +6010,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 818 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = standard_print_size_new (_tmp2_, &_tmp3_, &_tmp4_);
 #line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add278 (&_result_, &_result__length1, &__result__size_, _tmp5_);
+	_vala_array_add112 (&_result_, &_result__length1, &__result__size_, _tmp5_);
 #line 821 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = _result_;
 #line 821 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6024,7 +6024,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 821 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = standard_print_size_new (_tmp7_, &_tmp8_, &_tmp9_);
 #line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add279 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+	_vala_array_add113 (&_result_, &_result__length1, &__result__size_, _tmp10_);
 #line 824 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = _result_;
 #line 824 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6038,7 +6038,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 824 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = standard_print_size_new (_tmp12_, &_tmp13_, &_tmp14_);
 #line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add280 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+	_vala_array_add114 (&_result_, &_result__length1, &__result__size_, _tmp15_);
 #line 827 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp16_ = _result_;
 #line 827 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6052,7 +6052,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 827 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp20_ = standard_print_size_new (_tmp17_, &_tmp18_, &_tmp19_);
 #line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add281 (&_result_, &_result__length1, &__result__size_, _tmp20_);
+	_vala_array_add115 (&_result_, &_result__length1, &__result__size_, _tmp20_);
 #line 830 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp21_ = _result_;
 #line 830 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6066,7 +6066,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 830 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp25_ = standard_print_size_new (_tmp22_, &_tmp23_, &_tmp24_);
 #line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add282 (&_result_, &_result__length1, &__result__size_, _tmp25_);
+	_vala_array_add116 (&_result_, &_result__length1, &__result__size_, _tmp25_);
 #line 833 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp26_ = _result_;
 #line 833 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6080,7 +6080,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 833 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp30_ = standard_print_size_new (_tmp27_, &_tmp28_, &_tmp29_);
 #line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add283 (&_result_, &_result__length1, &__result__size_, _tmp30_);
+	_vala_array_add117 (&_result_, &_result__length1, &__result__size_, _tmp30_);
 #line 836 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp31_ = _result_;
 #line 836 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6094,7 +6094,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 836 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp35_ = standard_print_size_new (_tmp32_, &_tmp33_, &_tmp34_);
 #line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add284 (&_result_, &_result__length1, &__result__size_, _tmp35_);
+	_vala_array_add118 (&_result_, &_result__length1, &__result__size_, _tmp35_);
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp36_ = _result_;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6106,7 +6106,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp39_ = standard_print_size_new ("-", &_tmp37_, &_tmp38_);
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add285 (&_result_, &_result__length1, &__result__size_, _tmp39_);
+	_vala_array_add119 (&_result_, &_result__length1, &__result__size_, _tmp39_);
 #line 842 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp40_ = _result_;
 #line 842 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6120,7 +6120,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 842 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp44_ = standard_print_size_new (_tmp41_, &_tmp42_, &_tmp43_);
 #line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add286 (&_result_, &_result__length1, &__result__size_, _tmp44_);
+	_vala_array_add120 (&_result_, &_result__length1, &__result__size_, _tmp44_);
 #line 845 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp45_ = _result_;
 #line 845 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6134,7 +6134,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 845 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp49_ = standard_print_size_new (_tmp46_, &_tmp47_, &_tmp48_);
 #line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add287 (&_result_, &_result__length1, &__result__size_, _tmp49_);
+	_vala_array_add121 (&_result_, &_result__length1, &__result__size_, _tmp49_);
 #line 848 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp50_ = _result_;
 #line 848 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6148,7 +6148,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 848 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp54_ = standard_print_size_new (_tmp51_, &_tmp52_, &_tmp53_);
 #line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add288 (&_result_, &_result__length1, &__result__size_, _tmp54_);
+	_vala_array_add122 (&_result_, &_result__length1, &__result__size_, _tmp54_);
 #line 851 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp55_ = _result_;
 #line 851 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6162,7 +6162,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 851 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp59_ = standard_print_size_new (_tmp56_, &_tmp57_, &_tmp58_);
 #line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add289 (&_result_, &_result__length1, &__result__size_, _tmp59_);
+	_vala_array_add123 (&_result_, &_result__length1, &__result__size_, _tmp59_);
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp60_ = _result_;
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6176,7 +6176,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp64_ = standard_print_size_new (_tmp61_, &_tmp62_, &_tmp63_);
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add290 (&_result_, &_result__length1, &__result__size_, _tmp64_);
+	_vala_array_add124 (&_result_, &_result__length1, &__result__size_, _tmp64_);
 #line 857 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp65_ = _result_;
 #line 857 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6190,7 +6190,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 857 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp69_ = standard_print_size_new (_tmp66_, &_tmp67_, &_tmp68_);
 #line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add291 (&_result_, &_result__length1, &__result__size_, _tmp69_);
+	_vala_array_add125 (&_result_, &_result__length1, &__result__size_, _tmp69_);
 #line 860 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp70_ = _result_;
 #line 860 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6204,7 +6204,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 860 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp74_ = standard_print_size_new (_tmp71_, &_tmp72_, &_tmp73_);
 #line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add292 (&_result_, &_result__length1, &__result__size_, _tmp74_);
+	_vala_array_add126 (&_result_, &_result__length1, &__result__size_, _tmp74_);
 #line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp75_ = _result_;
 #line 864 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6415,7 +6415,7 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6417 "Printing.c"
-			goto __catch470_g_error;
+			goto __catch467_g_error;
 		}
 #line 895 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_result_ == GTK_PRINT_OPERATION_RESULT_APPLY) {
@@ -6433,8 +6433,8 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 6433 "Printing.c"
 		}
 	}
-	goto __finally470;
-	__catch470_g_error:
+	goto __finally467;
+	__catch467_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp22_ = NULL;
@@ -6460,7 +6460,7 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 		_g_error_free0 (e);
 #line 6461 "Printing.c"
 	}
-	__finally470:
+	__finally467:
 #line 892 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 892 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7984,7 +7984,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 #line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7986 "Printing.c"
-				goto __catch471_g_error;
+				goto __catch468_g_error;
 			}
 #line 1090 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp52_ = photo_pixbuf;
@@ -8111,7 +8111,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 #line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8113 "Printing.c"
-				goto __catch471_g_error;
+				goto __catch468_g_error;
 			}
 #line 1105 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp85_ = photo_pixbuf;
@@ -8137,8 +8137,8 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		cairo_paint (_tmp89_);
 #line 8138 "Printing.c"
 	}
-	goto __finally471;
-	__catch471_g_error:
+	goto __finally468;
+	__catch468_g_error:
 	{
 		GError* e = NULL;
 		PrintJob* _tmp90_ = NULL;
@@ -8173,7 +8173,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		_g_error_free0 (e);
 #line 8174 "Printing.c"
 	}
-	__finally471:
+	__finally468:
 #line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
diff --git a/src/Properties.c b/src/Properties.c
index df77935..1ac8e72 100644
--- a/src/Properties.c
+++ b/src/Properties.c
@@ -13,11 +13,11 @@
 #include <gee.h>
 #include <stdlib.h>
 #include <string.h>
-#include <float.h>
-#include <math.h>
 #include <pango/pango.h>
 #include <time.h>
 #include <glib/gi18n-lib.h>
+#include <float.h>
+#include <math.h>
 #include <gdk/gdk.h>
 #include <gio/gio.h>
 
@@ -720,10 +720,10 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 	gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-	GtkLabel* _tmp43_ = NULL;
-	guint _tmp44_ = 0U;
-	gboolean _tmp45_ = FALSE;
-	guint _tmp50_ = 0U;
+	GtkLabel* _tmp46_ = NULL;
+	guint _tmp47_ = 0U;
+	gboolean _tmp48_ = FALSE;
+	guint _tmp53_ = 0U;
 #line 15 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PROPERTIES (self));
 #line 15 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -781,8 +781,9 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 		GtkScrolledWindow* _tmp26_ = NULL;
 		GtkTextView* _tmp27_ = NULL;
 		GtkLabel* _tmp28_ = NULL;
-		GtkScrolledWindow* _tmp29_ = NULL;
-		GtkWidget* _tmp30_ = NULL;
+		GtkLabel* _tmp29_ = NULL;
+		GtkScrolledWindow* _tmp30_ = NULL;
+		GtkWidget* _tmp31_ = NULL;
 #line 24 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp7_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
 #line 24 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -835,14 +836,14 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 		if (_tmp21_) {
 #line 37 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp19_ = "";
-#line 839 "Properties.c"
+#line 840 "Properties.c"
 		} else {
 			const gchar* _tmp22_ = NULL;
 #line 37 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp22_ = info_text;
 #line 37 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp19_ = _tmp22_;
-#line 846 "Properties.c"
+#line 847 "Properties.c"
 		}
 #line 37 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp23_ = view;
@@ -861,66 +862,68 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 #line 39 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp28_ = label;
 #line 39 "/home/jens/Source/shotwell/src/Properties.vala"
-		gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_misc_get_type (), GtkMisc), (gfloat) 1, (gfloat) 0);
+		gtk_label_set_xalign (_tmp28_, 1.0f);
 #line 40 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp29_ = info_scroll;
-#line 40 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget));
+		_tmp29_ = label;
 #line 40 "/home/jens/Source/shotwell/src/Properties.vala"
+		gtk_label_set_yalign (_tmp29_, 0.0f);
+#line 41 "/home/jens/Source/shotwell/src/Properties.vala"
+		_tmp30_ = info_scroll;
+#line 41 "/home/jens/Source/shotwell/src/Properties.vala"
+		_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
+#line 41 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (info);
-#line 40 "/home/jens/Source/shotwell/src/Properties.vala"
-		info = _tmp30_;
+#line 41 "/home/jens/Source/shotwell/src/Properties.vala"
+		info = _tmp31_;
 #line 23 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (context);
 #line 23 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (view);
 #line 23 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (info_scroll);
-#line 880 "Properties.c"
+#line 885 "Properties.c"
 	} else {
 		GtkLabel* info_label = NULL;
-		GtkLabel* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
+		GtkLabel* _tmp32_ = NULL;
 		const gchar* _tmp33_ = NULL;
-		gboolean _tmp34_ = FALSE;
-		GtkLabel* _tmp36_ = NULL;
+		const gchar* _tmp34_ = NULL;
+		gboolean _tmp35_ = FALSE;
 		GtkLabel* _tmp37_ = NULL;
 		GtkLabel* _tmp38_ = NULL;
 		GtkLabel* _tmp39_ = NULL;
 		GtkLabel* _tmp40_ = NULL;
 		GtkLabel* _tmp41_ = NULL;
-		GtkWidget* _tmp42_ = NULL;
-#line 42 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp31_ = (GtkLabel*) gtk_label_new ("");
-#line 42 "/home/jens/Source/shotwell/src/Properties.vala"
-		g_object_ref_sink (_tmp31_);
-#line 42 "/home/jens/Source/shotwell/src/Properties.vala"
-		info_label = _tmp31_;
-#line 43 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp33_ = info_text;
+		GtkLabel* _tmp42_ = NULL;
+		GtkLabel* _tmp43_ = NULL;
+		GtkLabel* _tmp44_ = NULL;
+		GtkWidget* _tmp45_ = NULL;
 #line 43 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp34_ = is_string_empty (_tmp33_);
+		_tmp32_ = (GtkLabel*) gtk_label_new ("");
 #line 43 "/home/jens/Source/shotwell/src/Properties.vala"
-		if (_tmp34_) {
-#line 43 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp32_ = "";
-#line 908 "Properties.c"
-		} else {
-			const gchar* _tmp35_ = NULL;
+		g_object_ref_sink (_tmp32_);
 #line 43 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp35_ = info_text;
-#line 43 "/home/jens/Source/shotwell/src/Properties.vala"
-			_tmp32_ = _tmp35_;
+		info_label = _tmp32_;
+#line 44 "/home/jens/Source/shotwell/src/Properties.vala"
+		_tmp34_ = info_text;
+#line 44 "/home/jens/Source/shotwell/src/Properties.vala"
+		_tmp35_ = is_string_empty (_tmp34_);
+#line 44 "/home/jens/Source/shotwell/src/Properties.vala"
+		if (_tmp35_) {
+#line 44 "/home/jens/Source/shotwell/src/Properties.vala"
+			_tmp33_ = "";
 #line 915 "Properties.c"
+		} else {
+			const gchar* _tmp36_ = NULL;
+#line 44 "/home/jens/Source/shotwell/src/Properties.vala"
+			_tmp36_ = info_text;
+#line 44 "/home/jens/Source/shotwell/src/Properties.vala"
+			_tmp33_ = _tmp36_;
+#line 922 "Properties.c"
 		}
-#line 43 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp36_ = info_label;
-#line 43 "/home/jens/Source/shotwell/src/Properties.vala"
-		gtk_label_set_markup (_tmp36_, _tmp32_);
 #line 44 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp37_ = info_label;
 #line 44 "/home/jens/Source/shotwell/src/Properties.vala"
-		gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_misc_get_type (), GtkMisc), (gfloat) 0, (gfloat) 5e-1);
+		gtk_label_set_markup (_tmp37_, _tmp33_);
 #line 45 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp38_ = info_label;
 #line 45 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -928,63 +931,75 @@ void properties_add_line (Properties* self, const gchar* label_text, const gchar
 #line 46 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp39_ = info_label;
 #line 46 "/home/jens/Source/shotwell/src/Properties.vala"
-		gtk_label_set_selectable (_tmp39_, TRUE);
+		gtk_label_set_xalign (_tmp39_, 0.0f);
 #line 47 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp40_ = label;
+		_tmp40_ = info_label;
 #line 47 "/home/jens/Source/shotwell/src/Properties.vala"
-		gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_misc_get_type (), GtkMisc), (gfloat) 1, (gfloat) 5e-1);
+		gtk_label_set_yalign (_tmp40_, 0.5f);
 #line 48 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp41_ = info_label;
 #line 48 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp42_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget));
-#line 48 "/home/jens/Source/shotwell/src/Properties.vala"
+		gtk_label_set_selectable (_tmp41_, TRUE);
+#line 49 "/home/jens/Source/shotwell/src/Properties.vala"
+		_tmp42_ = label;
+#line 49 "/home/jens/Source/shotwell/src/Properties.vala"
+		gtk_label_set_xalign (_tmp42_, 1.0f);
+#line 50 "/home/jens/Source/shotwell/src/Properties.vala"
+		_tmp43_ = label;
+#line 50 "/home/jens/Source/shotwell/src/Properties.vala"
+		gtk_label_set_yalign (_tmp43_, 0.5f);
+#line 51 "/home/jens/Source/shotwell/src/Properties.vala"
+		_tmp44_ = info_label;
+#line 51 "/home/jens/Source/shotwell/src/Properties.vala"
+		_tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget));
+#line 51 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (info);
-#line 48 "/home/jens/Source/shotwell/src/Properties.vala"
-		info = _tmp42_;
+#line 51 "/home/jens/Source/shotwell/src/Properties.vala"
+		info = _tmp45_;
 #line 23 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (info_label);
-#line 947 "Properties.c"
+#line 962 "Properties.c"
 	}
-#line 51 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp43_ = label;
-#line 51 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp44_ = self->priv->line_count;
-#line 51 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), 0, (gint) _tmp44_, 1, 1);
-#line 53 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp45_ = multi_line;
-#line 53 "/home/jens/Source/shotwell/src/Properties.vala"
-	if (_tmp45_) {
-#line 959 "Properties.c"
-		GtkWidget* _tmp46_ = NULL;
-		guint _tmp47_ = 0U;
 #line 54 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp46_ = info;
+	_tmp46_ = label;
 #line 54 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp47_ = self->priv->line_count;
+	_tmp47_ = self->priv->line_count;
 #line 54 "/home/jens/Source/shotwell/src/Properties.vala"
-		gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), _tmp46_, 1, (gint) _tmp47_, 1, 2);
-#line 968 "Properties.c"
-	} else {
-		GtkWidget* _tmp48_ = NULL;
-		guint _tmp49_ = 0U;
-#line 56 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp48_ = info;
+	gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), 0, (gint) _tmp47_, 1, 1);
 #line 56 "/home/jens/Source/shotwell/src/Properties.vala"
-		_tmp49_ = self->priv->line_count;
+	_tmp48_ = multi_line;
 #line 56 "/home/jens/Source/shotwell/src/Properties.vala"
-		gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), _tmp48_, 1, (gint) _tmp49_, 1, 1);
-#line 978 "Properties.c"
-	}
+	if (_tmp48_) {
+#line 974 "Properties.c"
+		GtkWidget* _tmp49_ = NULL;
+		guint _tmp50_ = 0U;
+#line 57 "/home/jens/Source/shotwell/src/Properties.vala"
+		_tmp49_ = info;
+#line 57 "/home/jens/Source/shotwell/src/Properties.vala"
+		_tmp50_ = self->priv->line_count;
+#line 57 "/home/jens/Source/shotwell/src/Properties.vala"
+		gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), _tmp49_, 1, (gint) _tmp50_, 1, 2);
+#line 983 "Properties.c"
+	} else {
+		GtkWidget* _tmp51_ = NULL;
+		guint _tmp52_ = 0U;
 #line 59 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp50_ = self->priv->line_count;
+		_tmp51_ = info;
 #line 59 "/home/jens/Source/shotwell/src/Properties.vala"
-	self->priv->line_count = _tmp50_ + 1;
+		_tmp52_ = self->priv->line_count;
+#line 59 "/home/jens/Source/shotwell/src/Properties.vala"
+		gtk_grid_attach (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_grid_get_type (), GtkGrid), _tmp51_, 1, (gint) _tmp52_, 1, 1);
+#line 993 "Properties.c"
+	}
+#line 62 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp53_ = self->priv->line_count;
+#line 62 "/home/jens/Source/shotwell/src/Properties.vala"
+	self->priv->line_count = _tmp53_ + 1;
 #line 15 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (info);
 #line 15 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (label);
-#line 988 "Properties.c"
+#line 1003 "Properties.c"
 }
 
 
@@ -1030,7 +1045,7 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	buffer = (g_free (buffer), NULL);
 #line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 1034 "Properties.c"
+#line 1049 "Properties.c"
 }
 
 
@@ -1048,7 +1063,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 1052 "Properties.c"
+#line 1067 "Properties.c"
 }
 
 
@@ -1071,7 +1086,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 1075 "Properties.c"
+#line 1090 "Properties.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -1079,7 +1094,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 1083 "Properties.c"
+#line 1098 "Properties.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -1091,7 +1106,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 1095 "Properties.c"
+#line 1110 "Properties.c"
 	}
 }
 
@@ -1115,21 +1130,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 1119 "Properties.c"
+#line 1134 "Properties.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1125 "Properties.c"
+#line 1140 "Properties.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 1129 "Properties.c"
+#line 1144 "Properties.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 1133 "Properties.c"
+#line 1148 "Properties.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -1141,7 +1156,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 1145 "Properties.c"
+#line 1160 "Properties.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -1151,13 +1166,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 1155 "Properties.c"
+#line 1170 "Properties.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 1161 "Properties.c"
+#line 1176 "Properties.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -1171,7 +1186,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1175 "Properties.c"
+#line 1190 "Properties.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -1181,13 +1196,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1185 "Properties.c"
+#line 1200 "Properties.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 1191 "Properties.c"
+#line 1206 "Properties.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1196,7 +1211,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 1200 "Properties.c"
+#line 1215 "Properties.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -1216,7 +1231,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 1220 "Properties.c"
+#line 1235 "Properties.c"
 }
 
 
@@ -1229,46 +1244,46 @@ gchar* properties_get_prettyprint_time (Properties* self, struct tm* time) {
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gchar _tmp5_ = '\0';
-#line 62 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 65 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (IS_PROPERTIES (self), NULL);
-#line 62 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 65 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (time != NULL, NULL);
-#line 63 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 66 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = resources_get_hh_mm_format_string ();
-#line 63 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 66 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = _tmp0_;
-#line 63 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 66 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp2_ = g_time_format (time, _tmp1_);
-#line 63 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 66 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = _tmp2_;
-#line 63 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 66 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (_tmp1_);
-#line 63 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 66 "/home/jens/Source/shotwell/src/Properties.vala"
 	timestring = _tmp3_;
-#line 65 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 68 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = timestring;
-#line 65 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 68 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = string_get (_tmp4_, (glong) 0);
-#line 65 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 68 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp5_ == '0') {
-#line 1255 "Properties.c"
+#line 1270 "Properties.c"
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 66 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 69 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp6_ = timestring;
-#line 66 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 69 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp7_ = string_substring (_tmp6_, (glong) 1, (glong) -1);
-#line 66 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 69 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (timestring);
-#line 66 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 69 "/home/jens/Source/shotwell/src/Properties.vala"
 		timestring = _tmp7_;
-#line 1266 "Properties.c"
+#line 1281 "Properties.c"
 	}
-#line 68 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 71 "/home/jens/Source/shotwell/src/Properties.vala"
 	result = timestring;
-#line 68 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 71 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 1272 "Properties.c"
+#line 1287 "Properties.c"
 }
 
 
@@ -1281,46 +1296,46 @@ gchar* properties_get_prettyprint_time_with_seconds (Properties* self, struct tm
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gchar _tmp5_ = '\0';
-#line 71 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 74 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (IS_PROPERTIES (self), NULL);
-#line 71 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 74 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (time != NULL, NULL);
-#line 72 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 75 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = resources_get_hh_mm_ss_format_string ();
-#line 72 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 75 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = _tmp0_;
-#line 72 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 75 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp2_ = g_time_format (time, _tmp1_);
-#line 72 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 75 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = _tmp2_;
-#line 72 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 75 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (_tmp1_);
-#line 72 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 75 "/home/jens/Source/shotwell/src/Properties.vala"
 	timestring = _tmp3_;
-#line 74 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 77 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = timestring;
-#line 74 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 77 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = string_get (_tmp4_, (glong) 0);
-#line 74 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 77 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp5_ == '0') {
-#line 1307 "Properties.c"
+#line 1322 "Properties.c"
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 75 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 78 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp6_ = timestring;
-#line 75 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 78 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp7_ = string_substring (_tmp6_, (glong) 1, (glong) -1);
-#line 75 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 78 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (timestring);
-#line 75 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 78 "/home/jens/Source/shotwell/src/Properties.vala"
 		timestring = _tmp7_;
-#line 1318 "Properties.c"
+#line 1333 "Properties.c"
 	}
-#line 77 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 80 "/home/jens/Source/shotwell/src/Properties.vala"
 	result = timestring;
-#line 77 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 80 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 1324 "Properties.c"
+#line 1339 "Properties.c"
 }
 
 
@@ -1335,7 +1350,7 @@ static void g_time_local (time_t time, struct tm* result) {
 	*result = _result_;
 #line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
-#line 1339 "Properties.c"
+#line 1354 "Properties.c"
 }
 
 
@@ -1350,165 +1365,165 @@ gchar* properties_get_prettyprint_date (Properties* self, struct tm* date) {
 	gint _tmp4_ = 0;
 	struct tm _tmp5_ = {0};
 	gint _tmp6_ = 0;
-#line 80 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (IS_PROPERTIES (self), NULL);
-#line 80 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (date != NULL, NULL);
-#line 81 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 84 "/home/jens/Source/shotwell/src/Properties.vala"
 	date_string = NULL;
-#line 82 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = time (NULL);
-#line 82 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_time_local (_tmp0_, &_tmp1_);
-#line 82 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
 	today = _tmp1_;
-#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = *date;
-#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = _tmp3_.tm_yday;
-#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = today;
-#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp6_ = _tmp5_.tm_yday;
-#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp4_ == _tmp6_) {
-#line 1376 "Properties.c"
+#line 1391 "Properties.c"
 		struct tm _tmp7_ = {0};
 		gint _tmp8_ = 0;
 		struct tm _tmp9_ = {0};
 		gint _tmp10_ = 0;
-#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp7_ = *date;
-#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp8_ = _tmp7_.tm_year;
-#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp9_ = today;
-#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp10_ = _tmp9_.tm_year;
-#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp2_ = _tmp8_ == _tmp10_;
-#line 1391 "Properties.c"
+#line 1406 "Properties.c"
 	} else {
-#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp2_ = FALSE;
-#line 1395 "Properties.c"
+#line 1410 "Properties.c"
 	}
-#line 83 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp2_) {
-#line 1399 "Properties.c"
+#line 1414 "Properties.c"
 		const gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 87 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp11_ = _ ("Today");
-#line 84 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 87 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp12_ = g_strdup (_tmp11_);
-#line 84 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 87 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (date_string);
-#line 84 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 87 "/home/jens/Source/shotwell/src/Properties.vala"
 		date_string = _tmp12_;
-#line 1410 "Properties.c"
+#line 1425 "Properties.c"
 	} else {
 		gboolean _tmp13_ = FALSE;
 		struct tm _tmp14_ = {0};
 		gint _tmp15_ = 0;
 		struct tm _tmp16_ = {0};
 		gint _tmp17_ = 0;
-#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp14_ = *date;
-#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp15_ = _tmp14_.tm_yday;
-#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp16_ = today;
-#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp17_ = _tmp16_.tm_yday;
-#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp15_ == (_tmp17_ - 1)) {
-#line 1427 "Properties.c"
+#line 1442 "Properties.c"
 			struct tm _tmp18_ = {0};
 			gint _tmp19_ = 0;
 			struct tm _tmp20_ = {0};
 			gint _tmp21_ = 0;
-#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp18_ = *date;
-#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp19_ = _tmp18_.tm_year;
-#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp20_ = today;
-#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp21_ = _tmp20_.tm_year;
-#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp13_ = _tmp19_ == _tmp21_;
-#line 1442 "Properties.c"
+#line 1457 "Properties.c"
 		} else {
-#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp13_ = FALSE;
-#line 1446 "Properties.c"
+#line 1461 "Properties.c"
 		}
-#line 85 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp13_) {
-#line 1450 "Properties.c"
+#line 1465 "Properties.c"
 			const gchar* _tmp22_ = NULL;
 			gchar* _tmp23_ = NULL;
-#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 89 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp22_ = _ ("Yesterday");
-#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 89 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp23_ = g_strdup (_tmp22_);
-#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 89 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (date_string);
-#line 86 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 89 "/home/jens/Source/shotwell/src/Properties.vala"
 			date_string = _tmp23_;
-#line 1461 "Properties.c"
+#line 1476 "Properties.c"
 		} else {
 			struct tm _tmp24_ = {0};
 			gchar* _tmp25_ = NULL;
-#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 91 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp24_ = *date;
-#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 91 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp25_ = format_local_date (&_tmp24_);
-#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 91 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (date_string);
-#line 88 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 91 "/home/jens/Source/shotwell/src/Properties.vala"
 			date_string = _tmp25_;
-#line 1473 "Properties.c"
+#line 1488 "Properties.c"
 		}
 	}
-#line 91 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 94 "/home/jens/Source/shotwell/src/Properties.vala"
 	result = date_string;
-#line 91 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 94 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 1480 "Properties.c"
+#line 1495 "Properties.c"
 }
 
 
 static void properties_real_get_single_properties (Properties* self, DataView* view) {
-#line 94 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 97 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_DATA_VIEW (view));
-#line 1487 "Properties.c"
+#line 1502 "Properties.c"
 }
 
 
 void properties_get_single_properties (Properties* self, DataView* view) {
-#line 94 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 97 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PROPERTIES (self));
-#line 94 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 97 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->get_single_properties (self, view);
-#line 1496 "Properties.c"
+#line 1511 "Properties.c"
 }
 
 
 static void properties_real_get_multiple_properties (Properties* self, GeeIterable* iter) {
-#line 97 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 100 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail ((iter == NULL) || GEE_IS_ITERABLE (iter));
-#line 1503 "Properties.c"
+#line 1518 "Properties.c"
 }
 
 
 void properties_get_multiple_properties (Properties* self, GeeIterable* iter) {
-#line 97 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 100 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PROPERTIES (self));
-#line 97 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 100 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->get_multiple_properties (self, iter);
-#line 1512 "Properties.c"
+#line 1527 "Properties.c"
 }
 
 
@@ -1525,306 +1540,306 @@ static void properties_real_get_properties (Properties* self, Page* current_page
 	gboolean _tmp12_ = FALSE;
 	GeeIterable* _tmp13_ = NULL;
 	gint _tmp15_ = 0;
-#line 100 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 103 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PAGE (current_page));
-#line 101 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 104 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = current_page;
-#line 101 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 104 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = page_get_view (_tmp0_);
-#line 101 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 104 "/home/jens/Source/shotwell/src/Properties.vala"
 	view = _tmp1_;
-#line 102 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 105 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp2_ = view;
-#line 102 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 105 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp2_ == NULL) {
-#line 103 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 106 "/home/jens/Source/shotwell/src/Properties.vala"
 		_data_collection_unref0 (view);
-#line 103 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 106 "/home/jens/Source/shotwell/src/Properties.vala"
 		return;
-#line 1545 "Properties.c"
+#line 1560 "Properties.c"
 	}
-#line 106 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 109 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = view;
-#line 106 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 109 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 106 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 109 "/home/jens/Source/shotwell/src/Properties.vala"
 	count = _tmp4_;
-#line 107 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 110 "/home/jens/Source/shotwell/src/Properties.vala"
 	iter = NULL;
-#line 108 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 111 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = count;
-#line 108 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 111 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp5_ != 0) {
-#line 1559 "Properties.c"
+#line 1574 "Properties.c"
 		ViewCollection* _tmp6_ = NULL;
 		GeeList* _tmp7_ = NULL;
-#line 109 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 112 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp6_ = view;
-#line 109 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 112 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp7_ = view_collection_get_selected (_tmp6_);
-#line 109 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 112 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (iter);
-#line 109 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 112 "/home/jens/Source/shotwell/src/Properties.vala"
 		iter = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable);
-#line 1570 "Properties.c"
+#line 1585 "Properties.c"
 	} else {
 		ViewCollection* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
 		ViewCollection* _tmp10_ = NULL;
 		GeeCollection* _tmp11_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 114 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp8_ = view;
-#line 111 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 114 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp9_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection));
-#line 111 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 114 "/home/jens/Source/shotwell/src/Properties.vala"
 		count = _tmp9_;
-#line 112 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 115 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp10_ = view;
-#line 112 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 115 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp11_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
-#line 112 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 115 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (iter);
-#line 112 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 115 "/home/jens/Source/shotwell/src/Properties.vala"
 		iter = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable);
-#line 1590 "Properties.c"
+#line 1605 "Properties.c"
 	}
-#line 115 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp13_ = iter;
-#line 115 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp13_ == NULL) {
-#line 115 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp12_ = TRUE;
-#line 1598 "Properties.c"
+#line 1613 "Properties.c"
 	} else {
 		gint _tmp14_ = 0;
-#line 115 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp14_ = count;
-#line 115 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp12_ = _tmp14_ == 0;
-#line 1605 "Properties.c"
+#line 1620 "Properties.c"
 	}
-#line 115 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 118 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp12_) {
-#line 116 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (iter);
-#line 116 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
 		_data_collection_unref0 (view);
-#line 116 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
 		return;
-#line 1615 "Properties.c"
+#line 1630 "Properties.c"
 	}
-#line 118 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 121 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp15_ = count;
-#line 118 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 121 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp15_ == 1) {
-#line 1621 "Properties.c"
+#line 1636 "Properties.c"
 		{
 			GeeIterator* _item_it = NULL;
 			GeeIterable* _tmp16_ = NULL;
 			GeeIterator* _tmp17_ = NULL;
-#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp16_ = iter;
-#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp17_ = gee_iterable_iterator (_tmp16_);
-#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 			_item_it = _tmp17_;
-#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 			while (TRUE) {
-#line 1634 "Properties.c"
+#line 1649 "Properties.c"
 				GeeIterator* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
 				DataView* item = NULL;
 				GeeIterator* _tmp20_ = NULL;
 				gpointer _tmp21_ = NULL;
 				DataView* _tmp22_ = NULL;
-#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp18_ = _item_it;
-#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp19_ = gee_iterator_next (_tmp18_);
-#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (!_tmp19_) {
-#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 					break;
-#line 1649 "Properties.c"
+#line 1664 "Properties.c"
 				}
-#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp20_ = _item_it;
-#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp21_ = gee_iterator_get (_tmp20_);
-#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 				item = (DataView*) _tmp21_;
-#line 120 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 123 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp22_ = item;
-#line 120 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 123 "/home/jens/Source/shotwell/src/Properties.vala"
 				properties_get_single_properties (self, _tmp22_);
-#line 121 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 124 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_object_unref0 (item);
-#line 121 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 124 "/home/jens/Source/shotwell/src/Properties.vala"
 				break;
-#line 1665 "Properties.c"
+#line 1680 "Properties.c"
 			}
-#line 119 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 122 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (_item_it);
-#line 1669 "Properties.c"
+#line 1684 "Properties.c"
 		}
 	} else {
 		GeeIterable* _tmp23_ = NULL;
-#line 124 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 127 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp23_ = iter;
-#line 124 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 127 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_get_multiple_properties (self, _tmp23_);
-#line 1677 "Properties.c"
+#line 1692 "Properties.c"
 	}
-#line 100 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 103 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (iter);
-#line 100 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 103 "/home/jens/Source/shotwell/src/Properties.vala"
 	_data_collection_unref0 (view);
-#line 1683 "Properties.c"
+#line 1698 "Properties.c"
 }
 
 
 void properties_get_properties (Properties* self, Page* current_page) {
-#line 100 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 103 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PROPERTIES (self));
-#line 100 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 103 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->get_properties (self, current_page);
-#line 1692 "Properties.c"
+#line 1707 "Properties.c"
 }
 
 
 static void properties_real_clear_properties (Properties* self) {
 	GList* _tmp0_ = NULL;
-#line 129 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer));
-#line 1700 "Properties.c"
+#line 1715 "Properties.c"
 	{
 		GList* child_collection = NULL;
 		GList* child_it = NULL;
-#line 129 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 		child_collection = _tmp0_;
-#line 129 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 		for (child_it = child_collection; child_it != NULL; child_it = child_it->next) {
-#line 1708 "Properties.c"
+#line 1723 "Properties.c"
 			GtkWidget* _tmp1_ = NULL;
 			GtkWidget* child = NULL;
-#line 129 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp1_ = _g_object_ref0 ((GtkWidget*) child_it->data);
-#line 129 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 			child = _tmp1_;
-#line 1715 "Properties.c"
+#line 1730 "Properties.c"
 			{
 				GtkWidget* _tmp2_ = NULL;
-#line 130 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 133 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp2_ = child;
-#line 130 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 133 "/home/jens/Source/shotwell/src/Properties.vala"
 				gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), _tmp2_);
-#line 129 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_object_unref0 (child);
-#line 1724 "Properties.c"
+#line 1739 "Properties.c"
 			}
 		}
-#line 129 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 132 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_list_free0 (child_collection);
-#line 1729 "Properties.c"
+#line 1744 "Properties.c"
 	}
-#line 132 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 135 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->line_count = (guint) 0;
-#line 1733 "Properties.c"
+#line 1748 "Properties.c"
 }
 
 
 void properties_clear_properties (Properties* self) {
-#line 128 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 131 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PROPERTIES (self));
-#line 128 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 131 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->clear_properties (self);
-#line 1742 "Properties.c"
+#line 1757 "Properties.c"
 }
 
 
 void properties_update_properties (Properties* self, Page* page) {
 	Page* _tmp0_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 138 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PROPERTIES (self));
-#line 135 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 138 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 136 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 139 "/home/jens/Source/shotwell/src/Properties.vala"
 	properties_clear_properties (self);
-#line 137 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 140 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = page;
-#line 137 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 140 "/home/jens/Source/shotwell/src/Properties.vala"
 	properties_internal_update_properties (self, _tmp0_);
-#line 138 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 141 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1760 "Properties.c"
+#line 1775 "Properties.c"
 }
 
 
 static void properties_real_internal_update_properties (Properties* self, Page* page) {
 	Page* _tmp0_ = NULL;
-#line 141 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 144 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 142 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 145 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = page;
-#line 142 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 145 "/home/jens/Source/shotwell/src/Properties.vala"
 	properties_get_properties (self, _tmp0_);
-#line 1772 "Properties.c"
+#line 1787 "Properties.c"
 }
 
 
 void properties_internal_update_properties (Properties* self, Page* page) {
-#line 141 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 144 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PROPERTIES (self));
-#line 141 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 144 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_GET_CLASS (self)->internal_update_properties (self, page);
-#line 1781 "Properties.c"
+#line 1796 "Properties.c"
 }
 
 
 void properties_unselect_text (Properties* self) {
 	GList* _tmp0_ = NULL;
-#line 145 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 148 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PROPERTIES (self));
-#line 146 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer));
-#line 1791 "Properties.c"
+#line 1806 "Properties.c"
 	{
 		GList* child_collection = NULL;
 		GList* child_it = NULL;
-#line 146 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 		child_collection = _tmp0_;
-#line 146 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 		for (child_it = child_collection; child_it != NULL; child_it = child_it->next) {
-#line 1799 "Properties.c"
+#line 1814 "Properties.c"
 			GtkWidget* _tmp1_ = NULL;
 			GtkWidget* child = NULL;
-#line 146 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp1_ = _g_object_ref0 ((GtkWidget*) child_it->data);
-#line 146 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 			child = _tmp1_;
-#line 1806 "Properties.c"
+#line 1821 "Properties.c"
 			{
 				GtkWidget* _tmp2_ = NULL;
-#line 147 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 150 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp2_ = child;
-#line 147 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 150 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_label_get_type ())) {
-#line 1813 "Properties.c"
+#line 1828 "Properties.c"
 					GtkWidget* _tmp3_ = NULL;
-#line 148 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 151 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp3_ = child;
-#line 148 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 151 "/home/jens/Source/shotwell/src/Properties.vala"
 					gtk_label_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_label_get_type (), GtkLabel), 0, 0);
-#line 1819 "Properties.c"
+#line 1834 "Properties.c"
 				}
-#line 146 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_object_unref0 (child);
-#line 1823 "Properties.c"
+#line 1838 "Properties.c"
 			}
 		}
-#line 146 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 149 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_list_free0 (child_collection);
-#line 1828 "Properties.c"
+#line 1843 "Properties.c"
 	}
 }
 
@@ -1846,7 +1861,7 @@ static void properties_class_init (PropertiesClass * klass) {
 	((PropertiesClass *) klass)->internal_update_properties = properties_real_internal_update_properties;
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = properties_finalize;
-#line 1850 "Properties.c"
+#line 1865 "Properties.c"
 }
 
 
@@ -1855,7 +1870,7 @@ static void properties_instance_init (Properties * self) {
 	self->priv = PROPERTIES_GET_PRIVATE (self);
 #line 8 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->line_count = (guint) 0;
-#line 1859 "Properties.c"
+#line 1874 "Properties.c"
 }
 
 
@@ -1865,7 +1880,7 @@ static void properties_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROPERTIES, Properties);
 #line 7 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (properties_parent_class)->finalize (obj);
-#line 1869 "Properties.c"
+#line 1884 "Properties.c"
 }
 
 
@@ -1883,18 +1898,18 @@ GType properties_get_type (void) {
 
 BasicProperties* basic_properties_construct (GType object_type) {
 	BasicProperties * self = NULL;
-#line 168 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 171 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = (BasicProperties*) properties_construct (object_type);
-#line 168 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 171 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self;
-#line 1891 "Properties.c"
+#line 1906 "Properties.c"
 }
 
 
 BasicProperties* basic_properties_new (void) {
-#line 168 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 171 "/home/jens/Source/shotwell/src/Properties.vala"
 	return basic_properties_construct (TYPE_BASIC_PROPERTIES);
-#line 1898 "Properties.c"
+#line 1913 "Properties.c"
 }
 
 
@@ -1906,68 +1921,68 @@ static void basic_properties_real_clear_properties (Properties* base) {
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 171 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 174 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties);
-#line 172 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 175 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_CLASS (basic_properties_parent_class)->clear_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties));
-#line 173 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 176 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = g_strdup ("");
-#line 173 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 176 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->title);
-#line 173 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 176 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->title = _tmp0_;
-#line 174 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 177 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->start_time = (time_t) 0;
-#line 175 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 178 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->end_time = (time_t) 0;
-#line 176 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 179 "/home/jens/Source/shotwell/src/Properties.vala"
 	dimensions_init (&self->priv->dimensions, 0, 0);
-#line 177 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 180 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->photo_count = -1;
-#line 178 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 181 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->event_count = -1;
-#line 179 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 182 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->video_count = -1;
-#line 180 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 183 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = g_strdup ("");
-#line 180 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 183 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->exposure);
-#line 180 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 183 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->exposure = _tmp1_;
-#line 181 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 184 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp2_ = g_strdup ("");
-#line 181 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 184 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->aperture);
-#line 181 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 184 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->aperture = _tmp2_;
-#line 182 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 185 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = g_strdup ("");
-#line 182 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 185 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->iso);
-#line 182 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 185 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->iso = _tmp3_;
-#line 183 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 186 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->clip_duration = 0.0;
-#line 184 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 187 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = g_strdup ("");
-#line 184 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 187 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->raw_developer);
-#line 184 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 187 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->raw_developer = _tmp4_;
-#line 185 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 188 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = g_strdup ("");
-#line 185 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 188 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->raw_assoc);
-#line 185 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 188 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->raw_assoc = _tmp5_;
-#line 1964 "Properties.c"
+#line 1979 "Properties.c"
 }
 
 
 static gpointer _media_metadata_ref0 (gpointer self) {
-#line 200 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 1971 "Properties.c"
+#line 1986 "Properties.c"
 }
 
 
@@ -1981,46 +1996,46 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 	gchar* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
 	DataSource* _tmp6_ = NULL;
-#line 188 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 191 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties);
-#line 188 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 191 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_DATA_VIEW (view));
-#line 189 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 192 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = view;
-#line 189 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 192 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_CLASS (basic_properties_parent_class)->get_single_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_);
-#line 191 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 194 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = view;
-#line 191 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 194 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp2_ = data_view_get_source (_tmp1_);
-#line 191 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 194 "/home/jens/Source/shotwell/src/Properties.vala"
 	source = _tmp2_;
-#line 193 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 196 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = source;
-#line 193 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 196 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 193 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 196 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->title);
-#line 193 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 196 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->title = _tmp4_;
-#line 195 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp6_ = source;
-#line 195 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, TYPE_PHOTO_SOURCE)) {
-#line 195 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp5_ = TRUE;
-#line 2013 "Properties.c"
+#line 2028 "Properties.c"
 	} else {
 		DataSource* _tmp7_ = NULL;
-#line 195 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp7_ = source;
-#line 195 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_PHOTO_IMPORT_SOURCE);
-#line 2020 "Properties.c"
+#line 2035 "Properties.c"
 	}
-#line 195 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp5_) {
-#line 2024 "Properties.c"
+#line 2039 "Properties.c"
 		time_t _tmp8_ = 0;
 		DataSource* _tmp9_ = NULL;
 		time_t _tmp14_ = 0;
@@ -2032,75 +2047,75 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 		DataSource* _tmp47_ = NULL;
 		gboolean _tmp50_ = FALSE;
 		DataSource* _tmp51_ = NULL;
-#line 196 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp9_ = source;
-#line 196 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_SOURCE)) {
-#line 2040 "Properties.c"
+#line 2055 "Properties.c"
 			DataSource* _tmp10_ = NULL;
 			time_t _tmp11_ = 0;
-#line 196 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp10_ = source;
-#line 196 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp11_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource));
-#line 196 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp8_ = _tmp11_;
-#line 2049 "Properties.c"
+#line 2064 "Properties.c"
 		} else {
 			DataSource* _tmp12_ = NULL;
 			time_t _tmp13_ = 0;
-#line 197 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 200 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp12_ = source;
-#line 197 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 200 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp13_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
-#line 197 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 200 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp8_ = _tmp13_;
-#line 2059 "Properties.c"
+#line 2074 "Properties.c"
 		}
-#line 196 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 199 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->start_time = _tmp8_;
-#line 198 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 201 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp14_ = self->priv->start_time;
-#line 198 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 201 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->end_time = _tmp14_;
-#line 200 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp16_ = source;
-#line 200 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_SOURCE)) {
-#line 2071 "Properties.c"
+#line 2086 "Properties.c"
 			DataSource* _tmp17_ = NULL;
 			PhotoMetadata* _tmp18_ = NULL;
-#line 200 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp17_ = source;
-#line 200 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp18_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 200 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 			_media_metadata_unref0 (_tmp15_);
-#line 200 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp15_ = _tmp18_;
-#line 2082 "Properties.c"
+#line 2097 "Properties.c"
 		} else {
 			DataSource* _tmp19_ = NULL;
 			PhotoMetadata* _tmp20_ = NULL;
-#line 201 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 204 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp19_ = source;
-#line 201 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 204 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp20_ = photo_import_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
-#line 201 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 204 "/home/jens/Source/shotwell/src/Properties.vala"
 			_media_metadata_unref0 (_tmp15_);
-#line 201 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 204 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp15_ = _tmp20_;
-#line 2094 "Properties.c"
+#line 2109 "Properties.c"
 		}
-#line 200 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 203 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp21_ = _media_metadata_ref0 (_tmp15_);
-#line 200 "/home/jens/Source/shotwell/src/Properties.vala"
-		metadata = _tmp21_;
 #line 203 "/home/jens/Source/shotwell/src/Properties.vala"
+		metadata = _tmp21_;
+#line 206 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp22_ = metadata;
-#line 203 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 206 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp22_ != NULL) {
-#line 2104 "Properties.c"
+#line 2119 "Properties.c"
 			PhotoMetadata* _tmp23_ = NULL;
 			gchar* _tmp24_ = NULL;
 			const gchar* _tmp25_ = NULL;
@@ -2115,85 +2130,85 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			Dimensions* _tmp37_ = NULL;
 			Dimensions* _tmp38_ = NULL;
 			gboolean _tmp39_ = FALSE;
-#line 204 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 207 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp23_ = metadata;
-#line 204 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 207 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp24_ = photo_metadata_get_exposure_string (_tmp23_);
-#line 204 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 207 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (self->priv->exposure);
-#line 204 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 207 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->exposure = _tmp24_;
-#line 205 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 208 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp25_ = self->priv->exposure;
-#line 205 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 208 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp25_ == NULL) {
-#line 2131 "Properties.c"
+#line 2146 "Properties.c"
 				gchar* _tmp26_ = NULL;
-#line 206 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 209 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp26_ = g_strdup ("");
-#line 206 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 209 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (self->priv->exposure);
-#line 206 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 209 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->exposure = _tmp26_;
-#line 2139 "Properties.c"
+#line 2154 "Properties.c"
 			}
-#line 208 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 211 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp27_ = metadata;
-#line 208 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 211 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp28_ = photo_metadata_get_aperture_string (_tmp27_, TRUE);
-#line 208 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 211 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (self->priv->aperture);
-#line 208 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 211 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->aperture = _tmp28_;
-#line 209 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 212 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp29_ = self->priv->aperture;
-#line 209 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 212 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp29_ == NULL) {
-#line 2153 "Properties.c"
+#line 2168 "Properties.c"
 				gchar* _tmp30_ = NULL;
-#line 210 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 213 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp30_ = g_strdup ("");
-#line 210 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 213 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (self->priv->aperture);
-#line 210 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 213 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->aperture = _tmp30_;
-#line 2161 "Properties.c"
+#line 2176 "Properties.c"
 			}
-#line 212 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 215 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp31_ = metadata;
-#line 212 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 215 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp32_ = photo_metadata_get_iso_string (_tmp31_);
-#line 212 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 215 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (self->priv->iso);
-#line 212 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 215 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->iso = _tmp32_;
-#line 213 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 216 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp33_ = self->priv->iso;
-#line 213 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 216 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp33_ == NULL) {
-#line 2175 "Properties.c"
+#line 2190 "Properties.c"
 				gchar* _tmp34_ = NULL;
-#line 214 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 217 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp34_ = g_strdup ("");
-#line 214 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 217 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (self->priv->iso);
-#line 214 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 217 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->iso = _tmp34_;
-#line 2183 "Properties.c"
+#line 2198 "Properties.c"
 			}
-#line 216 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp36_ = metadata;
-#line 216 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp37_ = photo_metadata_get_pixel_dimensions (_tmp36_);
-#line 216 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp38_ = _tmp37_;
-#line 216 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp39_ = _tmp38_ != NULL;
-#line 216 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			_dimensions_free0 (_tmp38_);
-#line 216 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp39_) {
-#line 2197 "Properties.c"
+#line 2212 "Properties.c"
 				PhotoMetadata* _tmp40_ = NULL;
 				Orientation _tmp41_ = 0;
 				PhotoMetadata* _tmp42_ = NULL;
@@ -2201,71 +2216,71 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 				Dimensions* _tmp44_ = NULL;
 				Dimensions _tmp45_ = {0};
 				Dimensions _tmp46_ = {0};
-#line 217 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 220 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp40_ = metadata;
-#line 217 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 220 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp41_ = photo_metadata_get_orientation (_tmp40_);
-#line 217 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 220 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp42_ = metadata;
-#line 217 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 220 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp43_ = photo_metadata_get_pixel_dimensions (_tmp42_);
-#line 217 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 220 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp44_ = _tmp43_;
-#line 217 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 220 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp45_ = *_tmp44_;
-#line 217 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 220 "/home/jens/Source/shotwell/src/Properties.vala"
 				orientation_rotate_dimensions (_tmp41_, &_tmp45_, &_tmp46_);
-#line 217 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 220 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp35_ = _tmp46_;
-#line 217 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 220 "/home/jens/Source/shotwell/src/Properties.vala"
 				_dimensions_free0 (_tmp44_);
-#line 2223 "Properties.c"
+#line 2238 "Properties.c"
 			} else {
-#line 218 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 221 "/home/jens/Source/shotwell/src/Properties.vala"
 				dimensions_init (&_tmp35_, 0, 0);
-#line 2227 "Properties.c"
+#line 2242 "Properties.c"
 			}
-#line 216 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 219 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->dimensions = _tmp35_;
-#line 2231 "Properties.c"
+#line 2246 "Properties.c"
 		}
-#line 221 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 224 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp47_ = source;
-#line 221 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 224 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, TYPE_PHOTO_SOURCE)) {
-#line 2237 "Properties.c"
+#line 2252 "Properties.c"
 			DataSource* _tmp48_ = NULL;
 			Dimensions _tmp49_ = {0};
-#line 222 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 225 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp48_ = source;
-#line 222 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 225 "/home/jens/Source/shotwell/src/Properties.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp49_);
-#line 222 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 225 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->dimensions = _tmp49_;
-#line 2246 "Properties.c"
+#line 2261 "Properties.c"
 		}
-#line 224 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp51_ = source;
-#line 224 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp51_, TYPE_PHOTO)) {
-#line 2252 "Properties.c"
+#line 2267 "Properties.c"
 			DataSource* _tmp52_ = NULL;
 			PhotoFileFormat _tmp53_ = 0;
-#line 224 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp52_ = source;
-#line 224 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp53_ = photo_get_master_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_PHOTO, Photo));
-#line 224 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp50_ = _tmp53_ == PHOTO_FILE_FORMAT_RAW;
-#line 2261 "Properties.c"
+#line 2276 "Properties.c"
 		} else {
-#line 224 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp50_ = FALSE;
-#line 2265 "Properties.c"
+#line 2280 "Properties.c"
 		}
-#line 224 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp50_) {
-#line 2269 "Properties.c"
+#line 2284 "Properties.c"
 			Photo* photo = NULL;
 			DataSource* _tmp54_ = NULL;
 			Photo* _tmp55_ = NULL;
@@ -2276,62 +2291,62 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			Photo* _tmp60_ = NULL;
 			gboolean _tmp61_ = FALSE;
 			gchar* _tmp63_ = NULL;
-#line 225 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 228 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp54_ = source;
-#line 225 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 228 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp55_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp54_, TYPE_PHOTO) ? ((Photo*) _tmp54_) : NULL);
-#line 225 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 228 "/home/jens/Source/shotwell/src/Properties.vala"
 			photo = _tmp55_;
-#line 226 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 229 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp56_ = photo;
-#line 226 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 229 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp57_ = photo_get_raw_developer (_tmp56_);
-#line 226 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 229 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp58_ = raw_developer_get_label (_tmp57_);
-#line 226 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 229 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (self->priv->raw_developer);
-#line 226 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 229 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->raw_developer = _tmp58_;
-#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp60_ = photo;
-#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp61_ = photo_is_raw_developer_available (_tmp60_, RAW_DEVELOPER_CAMERA);
-#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp61_) {
-#line 2302 "Properties.c"
+#line 2317 "Properties.c"
 				const gchar* _tmp62_ = NULL;
-#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp62_ = _ ("RAW+JPEG");
-#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp59_ = _tmp62_;
-#line 2308 "Properties.c"
+#line 2323 "Properties.c"
 			} else {
-#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp59_ = "";
-#line 2312 "Properties.c"
+#line 2327 "Properties.c"
 			}
-#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp63_ = g_strdup (_tmp59_);
-#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (self->priv->raw_assoc);
-#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->raw_assoc = _tmp63_;
-#line 224 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 227 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (photo);
-#line 2322 "Properties.c"
+#line 2337 "Properties.c"
 		}
-#line 195 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_media_metadata_unref0 (metadata);
-#line 195 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 198 "/home/jens/Source/shotwell/src/Properties.vala"
 		_media_metadata_unref0 (_tmp15_);
-#line 2328 "Properties.c"
+#line 2343 "Properties.c"
 	} else {
 		DataSource* _tmp64_ = NULL;
-#line 229 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 232 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp64_ = source;
-#line 229 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 232 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp64_, TYPE_EVENT_SOURCE)) {
-#line 2335 "Properties.c"
+#line 2350 "Properties.c"
 			EventSource* event_source = NULL;
 			DataSource* _tmp65_ = NULL;
 			EventSource* _tmp66_ = NULL;
@@ -2348,77 +2363,77 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 			gint _tmp75_ = 0;
 			gint _tmp76_ = 0;
 			gint _tmp77_ = 0;
-#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 233 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp65_ = source;
-#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 233 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp66_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_EVENT_SOURCE, EventSource));
-#line 230 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 233 "/home/jens/Source/shotwell/src/Properties.vala"
 			event_source = _tmp66_;
-#line 232 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 235 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp67_ = event_source;
-#line 232 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 235 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp68_ = event_source_get_start_time (_tmp67_);
-#line 232 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 235 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->start_time = _tmp68_;
-#line 233 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 236 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp69_ = event_source;
-#line 233 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 236 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp70_ = event_source_get_end_time (_tmp69_);
-#line 233 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 236 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->end_time = _tmp70_;
-#line 237 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 240 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp71_ = event_source;
-#line 237 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 240 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp72_ = event_source_get_media (_tmp71_);
-#line 237 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 240 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp73_ = _tmp72_;
-#line 237 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 240 "/home/jens/Source/shotwell/src/Properties.vala"
 			media_source_collection_count_media (_tmp73_, &_tmp74_, &_tmp75_);
-#line 237 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 240 "/home/jens/Source/shotwell/src/Properties.vala"
 			event_photo_count = _tmp74_;
-#line 237 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 240 "/home/jens/Source/shotwell/src/Properties.vala"
 			event_video_count = _tmp75_;
-#line 237 "/home/jens/Source/shotwell/src/Properties.vala"
-			_g_object_unref0 (_tmp73_);
 #line 240 "/home/jens/Source/shotwell/src/Properties.vala"
+			_g_object_unref0 (_tmp73_);
+#line 243 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp76_ = event_photo_count;
-#line 240 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 243 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->photo_count = _tmp76_;
-#line 241 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 244 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp77_ = event_video_count;
-#line 241 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 244 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->video_count = _tmp77_;
-#line 229 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 232 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (event_source);
-#line 2394 "Properties.c"
+#line 2409 "Properties.c"
 		} else {
 			gboolean _tmp78_ = FALSE;
 			DataSource* _tmp79_ = NULL;
-#line 242 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 245 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp79_ = source;
-#line 242 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 245 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, TYPE_VIDEO_SOURCE)) {
-#line 242 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 245 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp78_ = TRUE;
-#line 2404 "Properties.c"
+#line 2419 "Properties.c"
 			} else {
 				DataSource* _tmp80_ = NULL;
-#line 242 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 245 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp80_ = source;
-#line 242 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 245 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp78_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp80_, TYPE_VIDEO_IMPORT_SOURCE);
-#line 2411 "Properties.c"
+#line 2426 "Properties.c"
 			}
-#line 242 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 245 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp78_) {
-#line 2415 "Properties.c"
+#line 2430 "Properties.c"
 				DataSource* _tmp81_ = NULL;
 				time_t _tmp94_ = 0;
-#line 243 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 246 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp81_ = source;
-#line 243 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 246 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp81_, TYPE_VIDEO_SOURCE)) {
-#line 2422 "Properties.c"
+#line 2437 "Properties.c"
 					Video* video = NULL;
 					DataSource* _tmp82_ = NULL;
 					Video* _tmp83_ = NULL;
@@ -2428,98 +2443,98 @@ static void basic_properties_real_get_single_properties (Properties* base, DataV
 					gboolean _tmp87_ = FALSE;
 					Video* _tmp90_ = NULL;
 					time_t _tmp91_ = 0;
-#line 244 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 247 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp82_ = source;
-#line 244 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 247 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_VIDEO, Video));
-#line 244 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 247 "/home/jens/Source/shotwell/src/Properties.vala"
 					video = _tmp83_;
-#line 245 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 248 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp84_ = video;
-#line 245 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 248 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp85_ = video_get_clip_duration (_tmp84_);
-#line 245 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 248 "/home/jens/Source/shotwell/src/Properties.vala"
 					self->priv->clip_duration = _tmp85_;
-#line 247 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 250 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp86_ = video;
-#line 247 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 250 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp87_ = video_get_is_interpretable (_tmp86_);
-#line 247 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 250 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp87_) {
-#line 2450 "Properties.c"
+#line 2465 "Properties.c"
 						Video* _tmp88_ = NULL;
 						Dimensions _tmp89_ = {0};
-#line 248 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 251 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp88_ = video;
-#line 248 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 251 "/home/jens/Source/shotwell/src/Properties.vala"
 						video_get_frame_dimensions (_tmp88_, &_tmp89_);
-#line 248 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 251 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->dimensions = _tmp89_;
-#line 2459 "Properties.c"
+#line 2474 "Properties.c"
 					}
-#line 250 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 253 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp90_ = video;
-#line 250 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 253 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp91_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 250 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 253 "/home/jens/Source/shotwell/src/Properties.vala"
 					self->priv->start_time = _tmp91_;
-#line 243 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 246 "/home/jens/Source/shotwell/src/Properties.vala"
 					_g_object_unref0 (video);
-#line 2469 "Properties.c"
+#line 2484 "Properties.c"
 				} else {
 					DataSource* _tmp92_ = NULL;
 					time_t _tmp93_ = 0;
-#line 252 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 255 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp92_ = source;
-#line 252 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 255 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp93_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
-#line 252 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 255 "/home/jens/Source/shotwell/src/Properties.vala"
 					self->priv->start_time = _tmp93_;
-#line 2479 "Properties.c"
+#line 2494 "Properties.c"
 				}
-#line 254 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 257 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp94_ = self->priv->start_time;
-#line 254 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 257 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->end_time = _tmp94_;
-#line 2485 "Properties.c"
+#line 2500 "Properties.c"
 			}
 		}
 	}
-#line 188 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 191 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (source);
-#line 2491 "Properties.c"
+#line 2506 "Properties.c"
 }
 
 
 static void basic_properties_real_get_multiple_properties (Properties* base, GeeIterable* iter) {
 	BasicProperties * self;
 	GeeIterable* _tmp0_ = NULL;
-#line 258 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 261 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties);
-#line 258 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 261 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail ((iter == NULL) || GEE_IS_ITERABLE (iter));
-#line 259 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 262 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = iter;
-#line 259 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 262 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_CLASS (basic_properties_parent_class)->get_multiple_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_);
-#line 261 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 264 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->photo_count = 0;
-#line 262 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 265 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->video_count = 0;
-#line 2510 "Properties.c"
+#line 2525 "Properties.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp1_ = NULL;
 		GeeIterator* _tmp2_ = NULL;
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp1_ = iter;
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 		_view_it = _tmp2_;
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 		while (TRUE) {
-#line 2523 "Properties.c"
+#line 2538 "Properties.c"
 			GeeIterator* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
 			DataView* view = NULL;
@@ -2530,156 +2545,156 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 			DataSource* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			DataSource* _tmp10_ = NULL;
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp3_ = _view_it;
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (!_tmp4_) {
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 				break;
-#line 2542 "Properties.c"
+#line 2557 "Properties.c"
 			}
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp5_ = _view_it;
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp6_ = gee_iterator_get (_tmp5_);
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			view = (DataView*) _tmp6_;
-#line 264 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 267 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp7_ = view;
-#line 264 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 267 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp8_ = data_view_get_source (_tmp7_);
-#line 264 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 267 "/home/jens/Source/shotwell/src/Properties.vala"
 			source = _tmp8_;
-#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp10_ = source;
-#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO_SOURCE)) {
-#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp9_ = TRUE;
-#line 2562 "Properties.c"
+#line 2577 "Properties.c"
 			} else {
 				DataSource* _tmp11_ = NULL;
-#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp11_ = source;
-#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_PHOTO_IMPORT_SOURCE);
-#line 2569 "Properties.c"
+#line 2584 "Properties.c"
 			}
-#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 269 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp9_) {
-#line 2573 "Properties.c"
+#line 2588 "Properties.c"
 				time_t _tmp12_ = 0;
 				DataSource* _tmp13_ = NULL;
 				time_t exposure_time = 0;
 				time_t _tmp18_ = 0;
 				gint _tmp29_ = 0;
-#line 267 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 270 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp13_ = source;
-#line 267 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 270 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_PHOTO_SOURCE)) {
-#line 2583 "Properties.c"
+#line 2598 "Properties.c"
 					DataSource* _tmp14_ = NULL;
 					time_t _tmp15_ = 0;
-#line 268 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 271 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp14_ = source;
-#line 268 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 271 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp15_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO_SOURCE, PhotoSource), TYPE_MEDIA_SOURCE, MediaSource));
-#line 268 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 271 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp12_ = _tmp15_;
-#line 2592 "Properties.c"
+#line 2607 "Properties.c"
 				} else {
 					DataSource* _tmp16_ = NULL;
 					time_t _tmp17_ = 0;
-#line 269 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 272 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp16_ = source;
-#line 269 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 272 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp17_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
-#line 269 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 272 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp12_ = _tmp17_;
-#line 2602 "Properties.c"
+#line 2617 "Properties.c"
 				}
-#line 267 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 270 "/home/jens/Source/shotwell/src/Properties.vala"
 				exposure_time = _tmp12_;
-#line 271 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 274 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp18_ = exposure_time;
-#line 271 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 274 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (_tmp18_ != ((time_t) 0)) {
-#line 2610 "Properties.c"
+#line 2625 "Properties.c"
 					gboolean _tmp19_ = FALSE;
 					time_t _tmp20_ = 0;
 					gboolean _tmp24_ = FALSE;
 					time_t _tmp25_ = 0;
-#line 272 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp20_ = self->priv->start_time;
-#line 272 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp20_ == ((time_t) 0)) {
-#line 272 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp19_ = TRUE;
-#line 2621 "Properties.c"
+#line 2636 "Properties.c"
 					} else {
 						time_t _tmp21_ = 0;
 						time_t _tmp22_ = 0;
-#line 272 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp21_ = exposure_time;
-#line 272 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp22_ = self->priv->start_time;
-#line 272 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp19_ = _tmp21_ < _tmp22_;
-#line 2631 "Properties.c"
+#line 2646 "Properties.c"
 					}
-#line 272 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp19_) {
-#line 2635 "Properties.c"
+#line 2650 "Properties.c"
 						time_t _tmp23_ = 0;
-#line 273 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 276 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp23_ = exposure_time;
-#line 273 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 276 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->start_time = _tmp23_;
-#line 2641 "Properties.c"
+#line 2656 "Properties.c"
 					}
-#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp25_ = self->priv->end_time;
-#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp25_ == ((time_t) 0)) {
-#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp24_ = TRUE;
-#line 2649 "Properties.c"
+#line 2664 "Properties.c"
 					} else {
 						time_t _tmp26_ = 0;
 						time_t _tmp27_ = 0;
-#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp26_ = exposure_time;
-#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp27_ = self->priv->end_time;
-#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp24_ = _tmp26_ > _tmp27_;
-#line 2659 "Properties.c"
+#line 2674 "Properties.c"
 					}
-#line 275 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 278 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp24_) {
-#line 2663 "Properties.c"
+#line 2678 "Properties.c"
 						time_t _tmp28_ = 0;
-#line 276 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 279 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp28_ = exposure_time;
-#line 276 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 279 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->end_time = _tmp28_;
-#line 2669 "Properties.c"
+#line 2684 "Properties.c"
 					}
 				}
-#line 279 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 282 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp29_ = self->priv->photo_count;
-#line 279 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 282 "/home/jens/Source/shotwell/src/Properties.vala"
 				self->priv->photo_count = _tmp29_ + 1;
-#line 2676 "Properties.c"
+#line 2691 "Properties.c"
 			} else {
 				DataSource* _tmp30_ = NULL;
-#line 280 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 283 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp30_ = source;
-#line 280 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 283 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_EVENT_SOURCE)) {
-#line 2683 "Properties.c"
+#line 2698 "Properties.c"
 					EventSource* event_source = NULL;
 					DataSource* _tmp31_ = NULL;
 					EventSource* _tmp32_ = NULL;
@@ -2702,328 +2717,328 @@ static void basic_properties_real_get_multiple_properties (Properties* base, Gee
 					gint _tmp68_ = 0;
 					gint _tmp69_ = 0;
 					gint _tmp70_ = 0;
-#line 281 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 284 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp31_ = source;
-#line 281 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 284 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_EVENT_SOURCE, EventSource));
-#line 281 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 284 "/home/jens/Source/shotwell/src/Properties.vala"
 					event_source = _tmp32_;
-#line 283 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 286 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp33_ = self->priv->event_count;
-#line 283 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 286 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp33_ == -1) {
-#line 284 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 287 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->event_count = 0;
-#line 2718 "Properties.c"
+#line 2733 "Properties.c"
 					}
-#line 286 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp36_ = self->priv->start_time;
-#line 286 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp36_ == ((time_t) 0)) {
-#line 286 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp35_ = TRUE;
-#line 2726 "Properties.c"
+#line 2741 "Properties.c"
 					} else {
 						EventSource* _tmp37_ = NULL;
 						time_t _tmp38_ = 0;
 						time_t _tmp39_ = 0;
-#line 286 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp37_ = event_source;
-#line 286 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp38_ = event_source_get_start_time (_tmp37_);
-#line 286 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp39_ = self->priv->start_time;
-#line 286 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp35_ = _tmp38_ < _tmp39_;
-#line 2739 "Properties.c"
+#line 2754 "Properties.c"
 					}
-#line 286 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp35_) {
-#line 2743 "Properties.c"
+#line 2758 "Properties.c"
 						EventSource* _tmp40_ = NULL;
 						time_t _tmp41_ = 0;
-#line 287 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp40_ = event_source;
-#line 287 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp41_ = event_source_get_start_time (_tmp40_);
-#line 287 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp34_ = _tmp41_ != ((time_t) 0);
-#line 2752 "Properties.c"
+#line 2767 "Properties.c"
 					} else {
-#line 286 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp34_ = FALSE;
-#line 2756 "Properties.c"
+#line 2771 "Properties.c"
 					}
-#line 286 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 289 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp34_) {
-#line 2760 "Properties.c"
+#line 2775 "Properties.c"
 						EventSource* _tmp42_ = NULL;
 						time_t _tmp43_ = 0;
-#line 288 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 291 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp42_ = event_source;
-#line 288 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 291 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp43_ = event_source_get_start_time (_tmp42_);
-#line 288 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 291 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->start_time = _tmp43_;
-#line 2769 "Properties.c"
+#line 2784 "Properties.c"
 					}
-#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp46_ = self->priv->end_time;
-#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp46_ == ((time_t) 0)) {
-#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp45_ = TRUE;
-#line 2777 "Properties.c"
+#line 2792 "Properties.c"
 					} else {
 						EventSource* _tmp47_ = NULL;
 						time_t _tmp48_ = 0;
 						time_t _tmp49_ = 0;
-#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp47_ = event_source;
-#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp48_ = event_source_get_end_time (_tmp47_);
-#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp49_ = self->priv->end_time;
-#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp45_ = _tmp48_ > _tmp49_;
-#line 2790 "Properties.c"
+#line 2805 "Properties.c"
 					}
-#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp45_) {
-#line 2794 "Properties.c"
+#line 2809 "Properties.c"
 						EventSource* _tmp50_ = NULL;
 						time_t _tmp51_ = 0;
-#line 291 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 294 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp50_ = event_source;
-#line 291 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 294 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp51_ = event_source_get_end_time (_tmp50_);
-#line 291 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 294 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp44_ = _tmp51_ != ((time_t) 0);
-#line 2803 "Properties.c"
+#line 2818 "Properties.c"
 					} else {
-#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp44_ = FALSE;
-#line 2807 "Properties.c"
+#line 2822 "Properties.c"
 					}
-#line 290 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp44_) {
-#line 2811 "Properties.c"
+#line 2826 "Properties.c"
 						EventSource* _tmp52_ = NULL;
 						time_t _tmp53_ = 0;
-#line 292 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 295 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp52_ = event_source;
-#line 292 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 295 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp53_ = event_source_get_end_time (_tmp52_);
-#line 292 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 295 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->end_time = _tmp53_;
-#line 2820 "Properties.c"
+#line 2835 "Properties.c"
 					} else {
 						gboolean _tmp54_ = FALSE;
 						time_t _tmp55_ = 0;
-#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp55_ = self->priv->end_time;
-#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 						if (_tmp55_ == ((time_t) 0)) {
-#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp54_ = TRUE;
-#line 2830 "Properties.c"
+#line 2845 "Properties.c"
 						} else {
 							EventSource* _tmp56_ = NULL;
 							time_t _tmp57_ = 0;
 							time_t _tmp58_ = 0;
-#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp56_ = event_source;
-#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp57_ = event_source_get_start_time (_tmp56_);
-#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp58_ = self->priv->end_time;
-#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp54_ = _tmp57_ > _tmp58_;
-#line 2843 "Properties.c"
+#line 2858 "Properties.c"
 						}
-#line 293 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 296 "/home/jens/Source/shotwell/src/Properties.vala"
 						if (_tmp54_) {
-#line 2847 "Properties.c"
+#line 2862 "Properties.c"
 							EventSource* _tmp59_ = NULL;
 							time_t _tmp60_ = 0;
-#line 294 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 297 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp59_ = event_source;
-#line 294 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 297 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp60_ = event_source_get_start_time (_tmp59_);
-#line 294 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 297 "/home/jens/Source/shotwell/src/Properties.vala"
 							self->priv->end_time = _tmp60_;
-#line 2856 "Properties.c"
+#line 2871 "Properties.c"
 						}
 					}
-#line 299 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 302 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp61_ = event_source;
-#line 299 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 302 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp62_ = event_source_get_media (_tmp61_);
-#line 299 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 302 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp63_ = _tmp62_;
-#line 299 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 302 "/home/jens/Source/shotwell/src/Properties.vala"
 					media_source_collection_count_media (_tmp63_, &_tmp64_, &_tmp65_);
-#line 299 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 302 "/home/jens/Source/shotwell/src/Properties.vala"
 					event_photo_count = _tmp64_;
-#line 299 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 302 "/home/jens/Source/shotwell/src/Properties.vala"
 					event_video_count = _tmp65_;
-#line 299 "/home/jens/Source/shotwell/src/Properties.vala"
-					_g_object_unref0 (_tmp63_);
 #line 302 "/home/jens/Source/shotwell/src/Properties.vala"
+					_g_object_unref0 (_tmp63_);
+#line 305 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp66_ = self->priv->photo_count;
-#line 302 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 305 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp67_ = event_photo_count;
-#line 302 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 305 "/home/jens/Source/shotwell/src/Properties.vala"
 					self->priv->photo_count = _tmp66_ + _tmp67_;
-#line 303 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 306 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp68_ = self->priv->video_count;
-#line 303 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 306 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp69_ = event_video_count;
-#line 303 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 306 "/home/jens/Source/shotwell/src/Properties.vala"
 					self->priv->video_count = _tmp68_ + _tmp69_;
-#line 304 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 307 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp70_ = self->priv->event_count;
-#line 304 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 307 "/home/jens/Source/shotwell/src/Properties.vala"
 					self->priv->event_count = _tmp70_ + 1;
-#line 280 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 283 "/home/jens/Source/shotwell/src/Properties.vala"
 					_g_object_unref0 (event_source);
-#line 2891 "Properties.c"
+#line 2906 "Properties.c"
 				} else {
 					gboolean _tmp71_ = FALSE;
 					DataSource* _tmp72_ = NULL;
-#line 305 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp72_ = source;
-#line 305 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp72_, TYPE_VIDEO_SOURCE)) {
-#line 305 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp71_ = TRUE;
-#line 2901 "Properties.c"
+#line 2916 "Properties.c"
 					} else {
 						DataSource* _tmp73_ = NULL;
-#line 305 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp73_ = source;
-#line 305 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp71_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp73_, TYPE_VIDEO_IMPORT_SOURCE);
-#line 2908 "Properties.c"
+#line 2923 "Properties.c"
 					}
-#line 305 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 308 "/home/jens/Source/shotwell/src/Properties.vala"
 					if (_tmp71_) {
-#line 2912 "Properties.c"
+#line 2927 "Properties.c"
 						time_t _tmp74_ = 0;
 						DataSource* _tmp75_ = NULL;
 						time_t exposure_time = 0;
 						time_t _tmp80_ = 0;
 						gint _tmp91_ = 0;
-#line 306 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 309 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp75_ = source;
-#line 306 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 309 "/home/jens/Source/shotwell/src/Properties.vala"
 						if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_VIDEO_SOURCE)) {
-#line 2922 "Properties.c"
+#line 2937 "Properties.c"
 							DataSource* _tmp76_ = NULL;
 							time_t _tmp77_ = 0;
-#line 307 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 310 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp76_ = source;
-#line 307 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 310 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp77_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_VIDEO_SOURCE, VideoSource), TYPE_MEDIA_SOURCE, MediaSource));
-#line 307 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 310 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp74_ = _tmp77_;
-#line 2931 "Properties.c"
+#line 2946 "Properties.c"
 						} else {
 							DataSource* _tmp78_ = NULL;
 							time_t _tmp79_ = 0;
-#line 308 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 311 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp78_ = source;
-#line 308 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 311 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp79_ = import_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_VIDEO_IMPORT_SOURCE, VideoImportSource), TYPE_IMPORT_SOURCE, ImportSource));
-#line 308 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 311 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp74_ = _tmp79_;
-#line 2941 "Properties.c"
+#line 2956 "Properties.c"
 						}
-#line 306 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 309 "/home/jens/Source/shotwell/src/Properties.vala"
 						exposure_time = _tmp74_;
-#line 310 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 313 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp80_ = exposure_time;
-#line 310 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 313 "/home/jens/Source/shotwell/src/Properties.vala"
 						if (_tmp80_ != ((time_t) 0)) {
-#line 2949 "Properties.c"
+#line 2964 "Properties.c"
 							gboolean _tmp81_ = FALSE;
 							time_t _tmp82_ = 0;
 							gboolean _tmp86_ = FALSE;
 							time_t _tmp87_ = 0;
-#line 311 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp82_ = self->priv->start_time;
-#line 311 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 							if (_tmp82_ == ((time_t) 0)) {
-#line 311 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp81_ = TRUE;
-#line 2960 "Properties.c"
+#line 2975 "Properties.c"
 							} else {
 								time_t _tmp83_ = 0;
 								time_t _tmp84_ = 0;
-#line 311 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp83_ = exposure_time;
-#line 311 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp84_ = self->priv->start_time;
-#line 311 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp81_ = _tmp83_ < _tmp84_;
-#line 2970 "Properties.c"
+#line 2985 "Properties.c"
 							}
-#line 311 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
 							if (_tmp81_) {
-#line 2974 "Properties.c"
+#line 2989 "Properties.c"
 								time_t _tmp85_ = 0;
-#line 312 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 315 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp85_ = exposure_time;
-#line 312 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 315 "/home/jens/Source/shotwell/src/Properties.vala"
 								self->priv->start_time = _tmp85_;
-#line 2980 "Properties.c"
+#line 2995 "Properties.c"
 							}
-#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 							_tmp87_ = self->priv->end_time;
-#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 							if (_tmp87_ == ((time_t) 0)) {
-#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp86_ = TRUE;
-#line 2988 "Properties.c"
+#line 3003 "Properties.c"
 							} else {
 								time_t _tmp88_ = 0;
 								time_t _tmp89_ = 0;
-#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp88_ = exposure_time;
-#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp89_ = self->priv->end_time;
-#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp86_ = _tmp88_ > _tmp89_;
-#line 2998 "Properties.c"
+#line 3013 "Properties.c"
 							}
-#line 314 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 317 "/home/jens/Source/shotwell/src/Properties.vala"
 							if (_tmp86_) {
-#line 3002 "Properties.c"
+#line 3017 "Properties.c"
 								time_t _tmp90_ = 0;
-#line 315 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 318 "/home/jens/Source/shotwell/src/Properties.vala"
 								_tmp90_ = exposure_time;
-#line 315 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 318 "/home/jens/Source/shotwell/src/Properties.vala"
 								self->priv->end_time = _tmp90_;
-#line 3008 "Properties.c"
+#line 3023 "Properties.c"
 							}
 						}
-#line 318 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 321 "/home/jens/Source/shotwell/src/Properties.vala"
 						_tmp91_ = self->priv->video_count;
-#line 318 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 321 "/home/jens/Source/shotwell/src/Properties.vala"
 						self->priv->video_count = _tmp91_ + 1;
-#line 3015 "Properties.c"
+#line 3030 "Properties.c"
 					}
 				}
 			}
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (source);
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (view);
-#line 3023 "Properties.c"
+#line 3038 "Properties.c"
 		}
-#line 263 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 266 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (_view_it);
-#line 3027 "Properties.c"
+#line 3042 "Properties.c"
 	}
 }
 
@@ -3033,37 +3048,37 @@ static void basic_properties_real_get_properties (Properties* base, Page* curren
 	Page* _tmp0_ = NULL;
 	time_t _tmp1_ = 0;
 	time_t _tmp3_ = 0;
-#line 323 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 326 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties);
-#line 323 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 326 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PAGE (current_page));
-#line 324 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 327 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = current_page;
-#line 324 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 327 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_CLASS (basic_properties_parent_class)->get_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_);
-#line 326 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 329 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = self->priv->end_time;
-#line 326 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 329 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp1_ == ((time_t) 0)) {
-#line 3049 "Properties.c"
+#line 3064 "Properties.c"
 		time_t _tmp2_ = 0;
-#line 327 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 330 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp2_ = self->priv->start_time;
-#line 327 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 330 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->end_time = _tmp2_;
-#line 3055 "Properties.c"
+#line 3070 "Properties.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 331 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = self->priv->start_time;
-#line 328 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 331 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp3_ == ((time_t) 0)) {
-#line 3061 "Properties.c"
+#line 3076 "Properties.c"
 		time_t _tmp4_ = 0;
-#line 329 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 332 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp4_ = self->priv->end_time;
-#line 329 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 332 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->start_time = _tmp4_;
-#line 3067 "Properties.c"
+#line 3082 "Properties.c"
 	}
 }
 
@@ -3084,94 +3099,94 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 	gboolean _tmp95_ = FALSE;
 	gboolean _tmp96_ = FALSE;
 	const gchar* _tmp97_ = NULL;
-#line 332 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 335 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_BASIC_PROPERTIES, BasicProperties);
-#line 332 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 335 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 333 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 336 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = page;
-#line 333 "/home/jens/Source/shotwell/src/Properties.vala"
-	PROPERTIES_CLASS (basic_properties_parent_class)->internal_update_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_);
 #line 336 "/home/jens/Source/shotwell/src/Properties.vala"
+	PROPERTIES_CLASS (basic_properties_parent_class)->internal_update_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_);
+#line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp2_ = self->priv->title;
-#line 336 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp2_, "") == 0) {
-#line 3100 "Properties.c"
+#line 3115 "Properties.c"
 		Page* _tmp3_ = NULL;
-#line 336 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp3_ = page;
-#line 336 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_TAG_PAGE);
-#line 3106 "Properties.c"
+#line 3121 "Properties.c"
 	} else {
-#line 336 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp1_ = FALSE;
-#line 3110 "Properties.c"
+#line 3125 "Properties.c"
 	}
-#line 336 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 339 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp1_) {
-#line 3114 "Properties.c"
+#line 3129 "Properties.c"
 		Page* _tmp4_ = NULL;
 		Tag* _tmp5_ = NULL;
 		Tag* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp4_ = page;
-#line 337 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp5_ = tag_page_get_tag (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_TAG_PAGE, TagPage));
-#line 337 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp6_ = _tmp5_;
-#line 337 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp7_ = tag_get_user_visible_name (_tmp6_);
-#line 337 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->title);
-#line 337 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->title = _tmp7_;
-#line 337 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (_tmp6_);
-#line 3133 "Properties.c"
+#line 3148 "Properties.c"
 	}
-#line 339 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 342 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp8_ = self->priv->title;
-#line 339 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 342 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp8_, "") != 0) {
-#line 3139 "Properties.c"
+#line 3154 "Properties.c"
 		const gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 343 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp9_ = _ ("Title:");
-#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 343 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp10_ = self->priv->title;
-#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 343 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp11_ = guarded_markup_escape_text (_tmp10_);
-#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 343 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp12_ = _tmp11_;
-#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 343 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp9_, _tmp12_, FALSE);
-#line 340 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 343 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (_tmp12_);
-#line 3156 "Properties.c"
+#line 3171 "Properties.c"
 	}
-#line 342 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp14_ = self->priv->photo_count;
-#line 342 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp14_ >= 0) {
-#line 342 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp13_ = TRUE;
-#line 3164 "Properties.c"
+#line 3179 "Properties.c"
 	} else {
 		gint _tmp15_ = 0;
-#line 342 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp15_ = self->priv->video_count;
-#line 342 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp13_ = _tmp15_ >= 0;
-#line 3171 "Properties.c"
+#line 3186 "Properties.c"
 	}
-#line 342 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp13_) {
-#line 3175 "Properties.c"
+#line 3190 "Properties.c"
 		gchar* label = NULL;
 		const gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
@@ -3191,17 +3206,17 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		const gchar* _tmp39_ = NULL;
 		const gchar* _tmp40_ = NULL;
 		gint _tmp41_ = 0;
-#line 343 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 346 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp16_ = _ ("Items:");
-#line 343 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 346 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp17_ = g_strdup (_tmp16_);
-#line 343 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 346 "/home/jens/Source/shotwell/src/Properties.vala"
 		label = _tmp17_;
-#line 345 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 348 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp18_ = self->priv->event_count;
-#line 345 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 348 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp18_ >= 0) {
-#line 3205 "Properties.c"
+#line 3220 "Properties.c"
 			gchar* event_num_string = NULL;
 			gint _tmp19_ = 0;
 			const gchar* _tmp20_ = NULL;
@@ -3210,120 +3225,120 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 			const gchar* _tmp23_ = NULL;
 			const gchar* _tmp24_ = NULL;
 			gchar* _tmp25_ = NULL;
-#line 346 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 349 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp19_ = self->priv->event_count;
-#line 346 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 349 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp20_ = ngettext ("%d Event", "%d Events", (gulong) _tmp19_);
-#line 346 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 349 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp21_ = self->priv->event_count;
-#line 346 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 349 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp22_ = g_strdup_printf (_tmp20_, _tmp21_);
-#line 346 "/home/jens/Source/shotwell/src/Properties.vala"
-			event_num_string = _tmp22_;
 #line 349 "/home/jens/Source/shotwell/src/Properties.vala"
+			event_num_string = _tmp22_;
+#line 352 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp23_ = label;
-#line 349 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 352 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp24_ = event_num_string;
-#line 349 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 352 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp23_, _tmp24_, FALSE);
-#line 350 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 353 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp25_ = g_strdup ("");
-#line 350 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 353 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (label);
-#line 350 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 353 "/home/jens/Source/shotwell/src/Properties.vala"
 			label = _tmp25_;
-#line 345 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 348 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (event_num_string);
-#line 3238 "Properties.c"
+#line 3253 "Properties.c"
 		}
-#line 353 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 356 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp26_ = self->priv->photo_count;
-#line 353 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 356 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp27_ = ngettext ("%d Photo", "%d Photos", (gulong) _tmp26_);
-#line 353 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 356 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp28_ = self->priv->photo_count;
-#line 353 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 356 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp29_ = g_strdup_printf (_tmp27_, _tmp28_);
-#line 353 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 356 "/home/jens/Source/shotwell/src/Properties.vala"
 		photo_num_string = _tmp29_;
-#line 355 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 358 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp30_ = self->priv->video_count;
-#line 355 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 358 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp31_ = ngettext ("%d Video", "%d Videos", (gulong) _tmp30_);
-#line 355 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 358 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp32_ = self->priv->video_count;
-#line 355 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 358 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp33_ = g_strdup_printf (_tmp31_, _tmp32_);
-#line 355 "/home/jens/Source/shotwell/src/Properties.vala"
-		video_num_string = _tmp33_;
 #line 358 "/home/jens/Source/shotwell/src/Properties.vala"
+		video_num_string = _tmp33_;
+#line 361 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp35_ = self->priv->photo_count;
-#line 358 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 361 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp35_ == 0) {
-#line 3264 "Properties.c"
+#line 3279 "Properties.c"
 			gint _tmp36_ = 0;
-#line 358 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 361 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp36_ = self->priv->video_count;
-#line 358 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 361 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp34_ = _tmp36_ > 0;
-#line 3270 "Properties.c"
+#line 3285 "Properties.c"
 		} else {
-#line 358 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 361 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp34_ = FALSE;
-#line 3274 "Properties.c"
+#line 3289 "Properties.c"
 		}
-#line 358 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 361 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp34_) {
-#line 3278 "Properties.c"
+#line 3293 "Properties.c"
 			const gchar* _tmp37_ = NULL;
 			const gchar* _tmp38_ = NULL;
-#line 359 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 362 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp37_ = label;
-#line 359 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 362 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp38_ = video_num_string;
-#line 359 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 362 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp37_, _tmp38_, FALSE);
-#line 360 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 363 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (video_num_string);
-#line 360 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 363 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (photo_num_string);
-#line 360 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 363 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (label);
-#line 360 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 363 "/home/jens/Source/shotwell/src/Properties.vala"
 			return;
-#line 3295 "Properties.c"
+#line 3310 "Properties.c"
 		}
-#line 363 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 366 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp39_ = label;
-#line 363 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 366 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp40_ = photo_num_string;
-#line 363 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 366 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp39_, _tmp40_, FALSE);
-#line 365 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 368 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp41_ = self->priv->video_count;
-#line 365 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 368 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp41_ > 0) {
-#line 3307 "Properties.c"
+#line 3322 "Properties.c"
 			const gchar* _tmp42_ = NULL;
-#line 366 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 369 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp42_ = video_num_string;
-#line 366 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 369 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp42_, FALSE);
-#line 3313 "Properties.c"
+#line 3328 "Properties.c"
 		}
-#line 342 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (video_num_string);
-#line 342 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (photo_num_string);
-#line 342 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 345 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (label);
-#line 3321 "Properties.c"
+#line 3336 "Properties.c"
 	}
-#line 369 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 372 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp43_ = self->priv->start_time;
-#line 369 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 372 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp43_ != ((time_t) 0)) {
-#line 3327 "Properties.c"
+#line 3342 "Properties.c"
 		gchar* start_date = NULL;
 		time_t _tmp44_ = 0;
 		struct tm _tmp45_ = {0};
@@ -3342,139 +3357,139 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 		gchar* _tmp55_ = NULL;
 		const gchar* _tmp56_ = NULL;
 		const gchar* _tmp57_ = NULL;
-#line 370 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 373 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp44_ = self->priv->start_time;
-#line 370 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 373 "/home/jens/Source/shotwell/src/Properties.vala"
 		g_time_local (_tmp44_, &_tmp45_);
-#line 370 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 373 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp46_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp45_);
-#line 370 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 373 "/home/jens/Source/shotwell/src/Properties.vala"
 		start_date = _tmp46_;
-#line 371 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 374 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp47_ = self->priv->start_time;
-#line 371 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 374 "/home/jens/Source/shotwell/src/Properties.vala"
 		g_time_local (_tmp47_, &_tmp48_);
-#line 371 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 374 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp49_ = properties_get_prettyprint_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp48_);
-#line 371 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 374 "/home/jens/Source/shotwell/src/Properties.vala"
 		start_time = _tmp49_;
-#line 372 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 375 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp50_ = self->priv->end_time;
-#line 372 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 375 "/home/jens/Source/shotwell/src/Properties.vala"
 		g_time_local (_tmp50_, &_tmp51_);
-#line 372 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 375 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp52_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp51_);
-#line 372 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 375 "/home/jens/Source/shotwell/src/Properties.vala"
 		end_date = _tmp52_;
-#line 373 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 376 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp53_ = self->priv->end_time;
-#line 373 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 376 "/home/jens/Source/shotwell/src/Properties.vala"
 		g_time_local (_tmp53_, &_tmp54_);
-#line 373 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 376 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp55_ = properties_get_prettyprint_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp54_);
-#line 373 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 376 "/home/jens/Source/shotwell/src/Properties.vala"
 		end_time = _tmp55_;
-#line 375 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 378 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp56_ = start_date;
-#line 375 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 378 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp57_ = end_date;
-#line 375 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 378 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp56_, _tmp57_) == 0) {
-#line 3384 "Properties.c"
+#line 3399 "Properties.c"
 			const gchar* _tmp58_ = NULL;
 			const gchar* _tmp59_ = NULL;
 			const gchar* _tmp60_ = NULL;
 			const gchar* _tmp61_ = NULL;
-#line 377 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 380 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp58_ = _ ("Date:");
-#line 377 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 380 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp59_ = start_date;
-#line 377 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 380 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp58_, _tmp59_, FALSE);
-#line 379 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 382 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp60_ = start_time;
-#line 379 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 382 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp61_ = end_time;
-#line 379 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 382 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (g_strcmp0 (_tmp60_, _tmp61_) == 0) {
-#line 3401 "Properties.c"
+#line 3416 "Properties.c"
 				const gchar* _tmp62_ = NULL;
 				const gchar* _tmp63_ = NULL;
-#line 381 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 384 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp62_ = _ ("Time:");
-#line 381 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 384 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp63_ = start_time;
-#line 381 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 384 "/home/jens/Source/shotwell/src/Properties.vala"
 				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp62_, _tmp63_, FALSE);
-#line 3410 "Properties.c"
+#line 3425 "Properties.c"
 			} else {
 				const gchar* _tmp64_ = NULL;
 				const gchar* _tmp65_ = NULL;
 				const gchar* _tmp66_ = NULL;
 				const gchar* _tmp67_ = NULL;
-#line 384 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 387 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp64_ = _ ("From:");
-#line 384 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 387 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp65_ = start_time;
-#line 384 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 387 "/home/jens/Source/shotwell/src/Properties.vala"
 				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp64_, _tmp65_, FALSE);
-#line 385 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 388 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp66_ = _ ("To:");
-#line 385 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 388 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp67_ = end_time;
-#line 385 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 388 "/home/jens/Source/shotwell/src/Properties.vala"
 				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp66_, _tmp67_, FALSE);
-#line 3428 "Properties.c"
+#line 3443 "Properties.c"
 			}
 		} else {
 			const gchar* _tmp68_ = NULL;
 			const gchar* _tmp69_ = NULL;
 			const gchar* _tmp70_ = NULL;
 			const gchar* _tmp71_ = NULL;
-#line 389 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 392 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp68_ = _ ("From:");
-#line 389 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 392 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp69_ = start_date;
-#line 389 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 392 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp68_, _tmp69_, FALSE);
-#line 390 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 393 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp70_ = _ ("To:");
-#line 390 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 393 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp71_ = end_date;
-#line 390 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 393 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp70_, _tmp71_, FALSE);
-#line 3447 "Properties.c"
+#line 3462 "Properties.c"
 		}
-#line 369 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 372 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (end_time);
-#line 369 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 372 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (end_date);
-#line 369 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 372 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (start_time);
-#line 369 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 372 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (start_date);
-#line 3457 "Properties.c"
+#line 3472 "Properties.c"
 	}
-#line 394 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 397 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp72_ = dimensions_has_area (&self->priv->dimensions);
-#line 394 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 397 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp72_) {
-#line 3463 "Properties.c"
+#line 3478 "Properties.c"
 		gchar* label = NULL;
 		const gchar* _tmp73_ = NULL;
 		gchar* _tmp74_ = NULL;
 		gboolean _tmp75_ = FALSE;
-#line 395 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp73_ = _ ("Size:");
-#line 395 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp74_ = g_strdup (_tmp73_);
-#line 395 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
 		label = _tmp74_;
-#line 397 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 400 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp75_ = dimensions_has_area (&self->priv->dimensions);
-#line 397 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 400 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp75_) {
-#line 3478 "Properties.c"
+#line 3493 "Properties.c"
 			const gchar* _tmp76_ = NULL;
 			Dimensions _tmp77_ = {0};
 			gint _tmp78_ = 0;
@@ -3483,402 +3498,402 @@ static void basic_properties_real_internal_update_properties (Properties* base,
 			gchar* _tmp81_ = NULL;
 			gchar* _tmp82_ = NULL;
 			gchar* _tmp83_ = NULL;
-#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 401 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp76_ = label;
-#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 401 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp77_ = self->priv->dimensions;
-#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 401 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp78_ = _tmp77_.width;
-#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 401 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp79_ = self->priv->dimensions;
-#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 401 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp80_ = _tmp79_.height;
-#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 401 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp81_ = g_strdup_printf ("%d &#215; %d", _tmp78_, _tmp80_);
-#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 401 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp82_ = _tmp81_;
-#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 401 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp76_, _tmp82_, FALSE);
-#line 398 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 401 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (_tmp82_);
-#line 399 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 402 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp83_ = g_strdup ("");
-#line 399 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 402 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (label);
-#line 399 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 402 "/home/jens/Source/shotwell/src/Properties.vala"
 			label = _tmp83_;
-#line 3511 "Properties.c"
+#line 3526 "Properties.c"
 		}
-#line 394 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 397 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (label);
-#line 3515 "Properties.c"
+#line 3530 "Properties.c"
 	}
-#line 403 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 406 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp84_ = self->priv->clip_duration;
-#line 403 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 406 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp84_ > 0.0) {
-#line 3521 "Properties.c"
+#line 3536 "Properties.c"
 		const gchar* _tmp85_ = NULL;
 		const gchar* _tmp86_ = NULL;
 		gdouble _tmp87_ = 0.0;
 		gchar* _tmp88_ = NULL;
 		gchar* _tmp89_ = NULL;
-#line 404 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 407 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp85_ = _ ("Duration:");
-#line 404 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 407 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp86_ = _ ("%.1f seconds");
-#line 404 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 407 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp87_ = self->priv->clip_duration;
-#line 404 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 407 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp88_ = g_strdup_printf (_tmp86_, _tmp87_);
-#line 404 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 407 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp89_ = _tmp88_;
-#line 404 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 407 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp85_, _tmp89_, FALSE);
-#line 404 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 407 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (_tmp89_);
-#line 3541 "Properties.c"
+#line 3556 "Properties.c"
 	}
-#line 407 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 410 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp90_ = self->priv->raw_developer;
-#line 407 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 410 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp90_, "") != 0) {
-#line 3547 "Properties.c"
+#line 3562 "Properties.c"
 		const gchar* _tmp91_ = NULL;
 		const gchar* _tmp92_ = NULL;
-#line 408 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 411 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp91_ = _ ("Developer:");
-#line 408 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 411 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp92_ = self->priv->raw_developer;
-#line 408 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 411 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp91_, _tmp92_, FALSE);
-#line 3556 "Properties.c"
+#line 3571 "Properties.c"
 	}
-#line 412 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp93_ = self->priv->raw_assoc;
-#line 412 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp93_, "") != 0) {
-#line 3562 "Properties.c"
+#line 3577 "Properties.c"
 		const gchar* _tmp94_ = NULL;
-#line 413 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 416 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp94_ = self->priv->raw_assoc;
-#line 413 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 416 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp94_, FALSE);
-#line 3568 "Properties.c"
+#line 3583 "Properties.c"
 	}
-#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp97_ = self->priv->exposure;
-#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp97_, "") != 0) {
-#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp96_ = TRUE;
-#line 3576 "Properties.c"
+#line 3591 "Properties.c"
 	} else {
 		const gchar* _tmp98_ = NULL;
-#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp98_ = self->priv->aperture;
-#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp96_ = g_strcmp0 (_tmp98_, "") != 0;
-#line 3583 "Properties.c"
+#line 3598 "Properties.c"
 	}
-#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp96_) {
-#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp95_ = TRUE;
-#line 3589 "Properties.c"
+#line 3604 "Properties.c"
 	} else {
 		const gchar* _tmp99_ = NULL;
-#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp99_ = self->priv->iso;
-#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp95_ = g_strcmp0 (_tmp99_, "") != 0;
-#line 3596 "Properties.c"
+#line 3611 "Properties.c"
 	}
-#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp95_) {
-#line 3600 "Properties.c"
+#line 3615 "Properties.c"
 		gchar* line = NULL;
 		const gchar* _tmp100_ = NULL;
 		const gchar* _tmp103_ = NULL;
 		gboolean _tmp112_ = FALSE;
 		gboolean _tmp113_ = FALSE;
 		const gchar* _tmp114_ = NULL;
-#line 416 "/home/jens/Source/shotwell/src/Properties.vala"
-		line = NULL;
 #line 419 "/home/jens/Source/shotwell/src/Properties.vala"
+		line = NULL;
+#line 422 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp100_ = self->priv->exposure;
-#line 419 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 422 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp100_, "") != 0) {
-#line 3613 "Properties.c"
+#line 3628 "Properties.c"
 			const gchar* _tmp101_ = NULL;
 			gchar* _tmp102_ = NULL;
-#line 420 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 423 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp101_ = self->priv->exposure;
-#line 420 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 423 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp102_ = g_strdup (_tmp101_);
-#line 420 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 423 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (line);
-#line 420 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 423 "/home/jens/Source/shotwell/src/Properties.vala"
 			line = _tmp102_;
-#line 3624 "Properties.c"
+#line 3639 "Properties.c"
 		}
-#line 422 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 425 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp103_ = self->priv->aperture;
-#line 422 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 425 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp103_, "") != 0) {
-#line 3630 "Properties.c"
+#line 3645 "Properties.c"
 			const gchar* _tmp104_ = NULL;
-#line 423 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 426 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp104_ = line;
-#line 423 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 426 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp104_ != NULL) {
-#line 3636 "Properties.c"
+#line 3651 "Properties.c"
 				const gchar* _tmp105_ = NULL;
 				const gchar* _tmp106_ = NULL;
 				gchar* _tmp107_ = NULL;
 				gchar* _tmp108_ = NULL;
 				gchar* _tmp109_ = NULL;
-#line 424 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 427 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp105_ = line;
-#line 424 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 427 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp106_ = self->priv->aperture;
-#line 424 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 427 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp107_ = g_strconcat (", ", _tmp106_, NULL);
-#line 424 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 427 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp108_ = _tmp107_;
-#line 424 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 427 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp109_ = g_strconcat (_tmp105_, _tmp108_, NULL);
-#line 424 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 427 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (line);
-#line 424 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 427 "/home/jens/Source/shotwell/src/Properties.vala"
 				line = _tmp109_;
-#line 424 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 427 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (_tmp108_);
-#line 3658 "Properties.c"
+#line 3673 "Properties.c"
 			} else {
 				const gchar* _tmp110_ = NULL;
 				gchar* _tmp111_ = NULL;
-#line 426 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 429 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp110_ = self->priv->aperture;
-#line 426 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 429 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp111_ = g_strdup (_tmp110_);
-#line 426 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 429 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (line);
-#line 426 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 429 "/home/jens/Source/shotwell/src/Properties.vala"
 				line = _tmp111_;
-#line 3670 "Properties.c"
+#line 3685 "Properties.c"
 			}
 		}
-#line 430 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp114_ = self->priv->exposure;
-#line 430 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp114_, "") == 0) {
-#line 430 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp113_ = TRUE;
-#line 3679 "Properties.c"
+#line 3694 "Properties.c"
 		} else {
 			const gchar* _tmp115_ = NULL;
-#line 430 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp115_ = self->priv->aperture;
-#line 430 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp113_ = g_strcmp0 (_tmp115_, "") == 0;
-#line 3686 "Properties.c"
+#line 3701 "Properties.c"
 		}
-#line 430 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp113_) {
-#line 3690 "Properties.c"
+#line 3705 "Properties.c"
 			const gchar* _tmp116_ = NULL;
-#line 430 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp116_ = self->priv->iso;
-#line 430 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp112_ = g_strcmp0 (_tmp116_, "") != 0;
-#line 3696 "Properties.c"
+#line 3711 "Properties.c"
 		} else {
-#line 430 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp112_ = FALSE;
-#line 3700 "Properties.c"
+#line 3715 "Properties.c"
 		}
-#line 430 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 433 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp112_) {
-#line 3704 "Properties.c"
+#line 3719 "Properties.c"
 			const gchar* _tmp117_ = NULL;
 			const gchar* _tmp125_ = NULL;
 			const gchar* _tmp126_ = NULL;
-#line 431 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 434 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp117_ = line;
-#line 431 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 434 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp117_ != NULL) {
-#line 3712 "Properties.c"
+#line 3727 "Properties.c"
 				const gchar* _tmp118_ = NULL;
 				const gchar* _tmp119_ = NULL;
 				gchar* _tmp120_ = NULL;
 				gchar* _tmp121_ = NULL;
 				gchar* _tmp122_ = NULL;
-#line 432 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 435 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp118_ = line;
-#line 432 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 435 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp119_ = self->priv->iso;
-#line 432 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 435 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp120_ = g_strconcat (", " "ISO ", _tmp119_, NULL);
-#line 432 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 435 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp121_ = _tmp120_;
-#line 432 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 435 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp122_ = g_strconcat (_tmp118_, _tmp121_, NULL);
-#line 432 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 435 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (line);
-#line 432 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 435 "/home/jens/Source/shotwell/src/Properties.vala"
 				line = _tmp122_;
-#line 432 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 435 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (_tmp121_);
-#line 3734 "Properties.c"
+#line 3749 "Properties.c"
 			} else {
 				const gchar* _tmp123_ = NULL;
 				gchar* _tmp124_ = NULL;
-#line 434 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 437 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp123_ = self->priv->iso;
-#line 434 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 437 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp124_ = g_strconcat ("ISO ", _tmp123_, NULL);
-#line 434 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 437 "/home/jens/Source/shotwell/src/Properties.vala"
 				_g_free0 (line);
-#line 434 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 437 "/home/jens/Source/shotwell/src/Properties.vala"
 				line = _tmp124_;
-#line 3746 "Properties.c"
+#line 3761 "Properties.c"
 			}
-#line 436 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 439 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp125_ = _ ("Exposure:");
-#line 436 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 439 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp126_ = line;
-#line 436 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 439 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp125_, _tmp126_, FALSE);
-#line 3754 "Properties.c"
+#line 3769 "Properties.c"
 		} else {
 			const gchar* _tmp127_ = NULL;
 			const gchar* _tmp130_ = NULL;
-#line 439 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 442 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp127_ = line;
-#line 439 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 442 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (_tmp127_ != NULL) {
-#line 3762 "Properties.c"
+#line 3777 "Properties.c"
 				const gchar* _tmp128_ = NULL;
 				const gchar* _tmp129_ = NULL;
-#line 440 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 443 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp128_ = _ ("Exposure:");
-#line 440 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 443 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp129_ = line;
-#line 440 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 443 "/home/jens/Source/shotwell/src/Properties.vala"
 				properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp128_, _tmp129_, FALSE);
-#line 3771 "Properties.c"
+#line 3786 "Properties.c"
 			}
-#line 443 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 446 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp130_ = self->priv->iso;
-#line 443 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 446 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (g_strcmp0 (_tmp130_, "") != 0) {
-#line 3777 "Properties.c"
+#line 3792 "Properties.c"
 				const gchar* _tmp131_ = NULL;
-#line 444 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 447 "/home/jens/Source/shotwell/src/Properties.vala"
 				_tmp131_ = line;
-#line 444 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 447 "/home/jens/Source/shotwell/src/Properties.vala"
 				if (_tmp131_ != NULL) {
-#line 3783 "Properties.c"
+#line 3798 "Properties.c"
 					const gchar* _tmp132_ = NULL;
 					gchar* _tmp133_ = NULL;
 					gchar* _tmp134_ = NULL;
-#line 445 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 448 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp132_ = self->priv->iso;
-#line 445 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 448 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp133_ = g_strconcat ("ISO ", _tmp132_, NULL);
-#line 445 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 448 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp134_ = _tmp133_;
-#line 445 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 448 "/home/jens/Source/shotwell/src/Properties.vala"
 					properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), "", _tmp134_, FALSE);
-#line 445 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 448 "/home/jens/Source/shotwell/src/Properties.vala"
 					_g_free0 (_tmp134_);
-#line 3797 "Properties.c"
+#line 3812 "Properties.c"
 				} else {
 					const gchar* _tmp135_ = NULL;
 					const gchar* _tmp136_ = NULL;
 					gchar* _tmp137_ = NULL;
 					gchar* _tmp138_ = NULL;
-#line 447 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 450 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp135_ = _ ("Exposure:");
-#line 447 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 450 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp136_ = self->priv->iso;
-#line 447 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 450 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp137_ = g_strconcat ("ISO ", _tmp136_, NULL);
-#line 447 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 450 "/home/jens/Source/shotwell/src/Properties.vala"
 					_tmp138_ = _tmp137_;
-#line 447 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 450 "/home/jens/Source/shotwell/src/Properties.vala"
 					properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp135_, _tmp138_, FALSE);
-#line 447 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 450 "/home/jens/Source/shotwell/src/Properties.vala"
 					_g_free0 (_tmp138_);
-#line 3815 "Properties.c"
+#line 3830 "Properties.c"
 				}
 			}
 		}
-#line 415 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 418 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (line);
-#line 3821 "Properties.c"
+#line 3836 "Properties.c"
 	}
 }
 
 
 static void basic_properties_class_init (BasicPropertiesClass * klass) {
-#line 153 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	basic_properties_parent_class = g_type_class_peek_parent (klass);
-#line 153 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_type_class_add_private (klass, sizeof (BasicPropertiesPrivate));
-#line 153 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	((PropertiesClass *) klass)->clear_properties = basic_properties_real_clear_properties;
-#line 153 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	((PropertiesClass *) klass)->get_single_properties = basic_properties_real_get_single_properties;
-#line 153 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	((PropertiesClass *) klass)->get_multiple_properties = basic_properties_real_get_multiple_properties;
-#line 153 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	((PropertiesClass *) klass)->get_properties = basic_properties_real_get_properties;
-#line 153 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	((PropertiesClass *) klass)->internal_update_properties = basic_properties_real_internal_update_properties;
-#line 153 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = basic_properties_finalize;
-#line 3843 "Properties.c"
+#line 3858 "Properties.c"
 }
 
 
 static void basic_properties_instance_init (BasicProperties * self) {
 	time_t _tmp0_ = 0;
 	time_t _tmp1_ = 0;
-#line 153 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv = BASIC_PROPERTIES_GET_PRIVATE (self);
-#line 155 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 158 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = time (NULL);
-#line 155 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 158 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->start_time = _tmp0_;
-#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 159 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = time (NULL);
-#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 159 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->end_time = _tmp1_;
-#line 3860 "Properties.c"
+#line 3875 "Properties.c"
 }
 
 
 static void basic_properties_finalize (GObject* obj) {
 	BasicProperties * self;
-#line 153 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BASIC_PROPERTIES, BasicProperties);
-#line 154 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 157 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->title);
-#line 161 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 164 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->exposure);
-#line 162 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 165 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->aperture);
-#line 163 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 166 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->iso);
-#line 165 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 168 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->raw_developer);
-#line 166 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 169 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->raw_assoc);
-#line 153 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 156 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (basic_properties_parent_class)->finalize (obj);
-#line 3882 "Properties.c"
+#line 3897 "Properties.c"
 }
 
 
@@ -3897,9 +3912,9 @@ GType basic_properties_get_type (void) {
 static gboolean _gtk_widget_hide_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = gtk_widget_hide_on_delete ((GtkWidget*) self);
-#line 646 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 649 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 3903 "Properties.c"
+#line 3918 "Properties.c"
 }
 
 
@@ -3912,88 +3927,114 @@ ExtendedPropertiesWindow* extended_properties_window_construct (GType object_typ
 	const gchar* _tmp3_ = NULL;
 	GtkWindow* _tmp4_ = NULL;
 	ExtendedPropertiesWindowExtendedProperties* _tmp5_ = NULL;
-	GtkAlignment* alignment = NULL;
-	GtkAlignment* _tmp6_ = NULL;
+	ExtendedPropertiesWindowExtendedProperties* _tmp6_ = NULL;
 	ExtendedPropertiesWindowExtendedProperties* _tmp7_ = NULL;
-	GtkBox* _tmp8_ = NULL;
-#line 632 "/home/jens/Source/shotwell/src/Properties.vala"
+	ExtendedPropertiesWindowExtendedProperties* _tmp8_ = NULL;
+	ExtendedPropertiesWindowExtendedProperties* _tmp9_ = NULL;
+	ExtendedPropertiesWindowExtendedProperties* _tmp10_ = NULL;
+	ExtendedPropertiesWindowExtendedProperties* _tmp11_ = NULL;
+	ExtendedPropertiesWindowExtendedProperties* _tmp12_ = NULL;
+	ExtendedPropertiesWindowExtendedProperties* _tmp13_ = NULL;
+	GtkBox* _tmp14_ = NULL;
+	ExtendedPropertiesWindowExtendedProperties* _tmp15_ = NULL;
+#line 635 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL);
-#line 634 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 637 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = gtk_settings_get_default ();
-#line 634 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 637 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 635 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 638 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp2_ = use_header;
-#line 635 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 638 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp2_) {
-#line 635 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 638 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp1_ = 1;
-#line 3932 "Properties.c"
+#line 3953 "Properties.c"
 	} else {
-#line 635 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 638 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp1_ = 0;
-#line 3936 "Properties.c"
+#line 3957 "Properties.c"
 	}
-#line 635 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 638 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = (ExtendedPropertiesWindow*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 637 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 640 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) (GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK));
-#line 638 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 641 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_focus_on_map (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 639 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 642 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_accept_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 640 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 643 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 641 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 644 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = _ ("Extended Information");
-#line 641 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 644 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp3_);
-#line 642 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 645 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GTK_WIN_POS_CENTER);
-#line 643 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 646 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = owner;
-#line 643 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 646 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 644 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 647 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 646 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 649 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _gtk_widget_hide_on_delete_gtk_widget_delete_event, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), 0);
-#line 648 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 651 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = extended_properties_window_extended_properties_new ();
-#line 648 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 651 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_object_ref_sink (_tmp5_);
-#line 648 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 651 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (self->priv->properties);
-#line 648 "/home/jens/Source/shotwell/src/Properties.vala"
-	self->priv->properties = _tmp5_;
-#line 649 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp6_ = (GtkAlignment*) gtk_alignment_new (0.5f, 0.5f, (gfloat) 1, (gfloat) 1);
-#line 649 "/home/jens/Source/shotwell/src/Properties.vala"
-	g_object_ref_sink (_tmp6_);
-#line 649 "/home/jens/Source/shotwell/src/Properties.vala"
-	alignment = _tmp6_;
-#line 650 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp7_ = self->priv->properties;
-#line 650 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (alignment, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
 #line 651 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (alignment, gtk_container_get_type (), GtkContainer), (guint) 3);
+	self->priv->properties = _tmp5_;
 #line 652 "/home/jens/Source/shotwell/src/Properties.vala"
-	_tmp8_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp6_ = self->priv->properties;
 #line 652 "/home/jens/Source/shotwell/src/Properties.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (alignment, gtk_widget_get_type (), GtkWidget));
-#line 632 "/home/jens/Source/shotwell/src/Properties.vala"
-	_g_object_unref0 (alignment);
-#line 632 "/home/jens/Source/shotwell/src/Properties.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+#line 653 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp7_ = self->priv->properties;
+#line 653 "/home/jens/Source/shotwell/src/Properties.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+#line 654 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp8_ = self->priv->properties;
+#line 654 "/home/jens/Source/shotwell/src/Properties.vala"
+	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 655 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp9_ = self->priv->properties;
+#line 655 "/home/jens/Source/shotwell/src/Properties.vala"
+	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 656 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp10_ = self->priv->properties;
+#line 656 "/home/jens/Source/shotwell/src/Properties.vala"
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 3);
+#line 657 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp11_ = self->priv->properties;
+#line 657 "/home/jens/Source/shotwell/src/Properties.vala"
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 3);
+#line 658 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp12_ = self->priv->properties;
+#line 658 "/home/jens/Source/shotwell/src/Properties.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 3);
+#line 659 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp13_ = self->priv->properties;
+#line 659 "/home/jens/Source/shotwell/src/Properties.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 3);
+#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp14_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
+	_tmp15_ = self->priv->properties;
+#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
+#line 635 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self;
-#line 3990 "Properties.c"
+#line 4031 "Properties.c"
 }
 
 
 ExtendedPropertiesWindow* extended_properties_window_new (GtkWindow* owner) {
-#line 632 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 635 "/home/jens/Source/shotwell/src/Properties.vala"
 	return extended_properties_window_construct (TYPE_EXTENDED_PROPERTIES_WINDOW, owner);
-#line 3997 "Properties.c"
+#line 4038 "Properties.c"
 }
 
 
@@ -4010,64 +4051,64 @@ static gboolean extended_properties_window_real_button_press_event (GtkWidget* b
 	gdouble _tmp10_ = 0.0;
 	GdkEventButton* _tmp11_ = NULL;
 	guint32 _tmp12_ = 0U;
-#line 655 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 663 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow);
-#line 655 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 663 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 657 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 665 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = event;
-#line 657 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 665 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = _tmp0_->button;
-#line 657 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 665 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp1_ != ((guint) 1)) {
-#line 4024 "Properties.c"
+#line 4065 "Properties.c"
 		gboolean _tmp2_ = FALSE;
-#line 658 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (GTK_WIDGET_CLASS (extended_properties_window_parent_class)->button_press_event != NULL) {
-#line 4028 "Properties.c"
+#line 4069 "Properties.c"
 			GdkEventButton* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 658 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp3_ = event;
-#line 658 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp4_ = GTK_WIDGET_CLASS (extended_properties_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 658 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp2_ = _tmp4_;
-#line 4037 "Properties.c"
+#line 4078 "Properties.c"
 		} else {
-#line 658 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp2_ = TRUE;
-#line 4041 "Properties.c"
+#line 4082 "Properties.c"
 		}
-#line 658 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 		result = _tmp2_;
-#line 658 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 666 "/home/jens/Source/shotwell/src/Properties.vala"
 		return result;
-#line 4047 "Properties.c"
+#line 4088 "Properties.c"
 	}
-#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = event;
-#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp6_ = _tmp5_->button;
-#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp7_ = event;
-#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp8_ = _tmp7_->x_root;
-#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp9_ = event;
-#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp10_ = _tmp9_->y_root;
-#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp11_ = event;
-#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp12_ = _tmp11_->time;
-#line 660 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_window_begin_move_drag (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), (gint) _tmp6_, (gint) _tmp8_, (gint) _tmp10_, _tmp12_);
-#line 662 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 670 "/home/jens/Source/shotwell/src/Properties.vala"
 	result = TRUE;
-#line 662 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 670 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 4071 "Properties.c"
+#line 4112 "Properties.c"
 }
 
 
@@ -4082,84 +4123,84 @@ static gboolean extended_properties_window_real_key_press_event (GtkWidget* base
 	GdkEventKey* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 665 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 673 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow);
-#line 665 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 673 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 667 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 675 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = event;
-#line 667 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 675 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 667 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 675 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 667 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 675 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 668 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 676 "/home/jens/Source/shotwell/src/Properties.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 669 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 677 "/home/jens/Source/shotwell/src/Properties.vala"
 		result = TRUE;
-#line 669 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 677 "/home/jens/Source/shotwell/src/Properties.vala"
 		return result;
-#line 4104 "Properties.c"
+#line 4145 "Properties.c"
 	}
-#line 672 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = app_window_get_instance ();
-#line 672 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = _tmp3_;
-#line 672 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = event;
-#line 672 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp5_, &_tmp6_);
-#line 672 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp7_ = _tmp6_;
-#line 672 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (_tmp4_);
-#line 672 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
 	result = _tmp7_;
-#line 672 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
 	return result;
-#line 4122 "Properties.c"
+#line 4163 "Properties.c"
 }
 
 
 void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, Page* page) {
 	ExtendedPropertiesWindowExtendedProperties* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 675 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 683 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_EXTENDED_PROPERTIES_WINDOW (self));
-#line 675 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 683 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 676 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 684 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = self->priv->properties;
-#line 676 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 684 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = page;
-#line 676 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 684 "/home/jens/Source/shotwell/src/Properties.vala"
 	properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROPERTIES, Properties), _tmp1_);
-#line 4139 "Properties.c"
+#line 4180 "Properties.c"
 }
 
 
 static void extended_properties_window_real_show_all (GtkWidget* base) {
 	ExtendedPropertiesWindow * self;
 	ExtendedPropertiesWindowExtendedProperties* _tmp0_ = NULL;
-#line 679 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 687 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow);
-#line 680 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 688 "/home/jens/Source/shotwell/src/Properties.vala"
 	GTK_WIDGET_CLASS (extended_properties_window_parent_class)->show_all (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), gtk_widget_get_type (), GtkWidget));
-#line 681 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 689 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = self->priv->properties;
-#line 681 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 689 "/home/jens/Source/shotwell/src/Properties.vala"
 	properties_unselect_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PROPERTIES, Properties));
-#line 682 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 690 "/home/jens/Source/shotwell/src/Properties.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 4156 "Properties.c"
+#line 4197 "Properties.c"
 }
 
 
 static gpointer _dimensions_dup0 (gpointer self) {
-#line 495 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 498 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self ? dimensions_dup (self) : NULL;
-#line 4163 "Properties.c"
+#line 4204 "Properties.c"
 }
 
 
@@ -4182,117 +4223,117 @@ static void extended_properties_window_extended_properties_real_clear_properties
 	gchar* _tmp14_ = NULL;
 	gchar* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
-#line 488 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 491 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedProperties);
-#line 489 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 492 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_CLASS (extended_properties_window_extended_properties_parent_class)->clear_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties));
-#line 491 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 494 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = g_strdup ("");
-#line 491 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 494 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->file_path);
-#line 491 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 494 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->file_path = _tmp0_;
-#line 492 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 495 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = g_strdup ("");
-#line 492 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 495 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->development_path);
-#line 492 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 495 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->development_path = _tmp1_;
-#line 493 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 496 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->is_raw = FALSE;
-#line 494 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 497 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->filesize = (guint64) 0;
-#line 495 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 498 "/home/jens/Source/shotwell/src/Properties.vala"
 	dimensions_init (&_tmp2_, 0, 0);
-#line 495 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 498 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = _dimensions_dup0 (&_tmp2_);
-#line 495 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 498 "/home/jens/Source/shotwell/src/Properties.vala"
 	_dimensions_free0 (self->priv->original_dim);
-#line 495 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 498 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->original_dim = _tmp3_;
-#line 496 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 499 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = g_strdup ("");
-#line 496 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 499 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->camera_make);
-#line 496 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 499 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->camera_make = _tmp4_;
-#line 497 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 500 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp5_ = g_strdup ("");
-#line 497 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 500 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->camera_model);
-#line 497 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 500 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->camera_model = _tmp5_;
-#line 498 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 501 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp6_ = g_strdup ("");
-#line 498 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 501 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->flash);
-#line 498 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 501 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->flash = _tmp6_;
-#line 499 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 502 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp7_ = g_strdup ("");
-#line 499 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 502 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->focal_length);
-#line 499 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 502 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->focal_length = _tmp7_;
-#line 500 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 503 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->gps_lat = (gdouble) -1;
-#line 501 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 504 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp8_ = g_strdup ("");
-#line 501 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 504 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->gps_lat_ref);
-#line 501 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 504 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->gps_lat_ref = _tmp8_;
-#line 502 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 505 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->gps_long = (gdouble) -1;
-#line 503 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 506 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp9_ = g_strdup ("");
-#line 503 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 506 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->gps_long_ref);
-#line 503 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 506 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->gps_long_ref = _tmp9_;
-#line 504 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 507 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp10_ = g_strdup ("");
-#line 504 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 507 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->artist);
-#line 504 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 507 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->artist = _tmp10_;
-#line 505 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 508 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp11_ = g_strdup ("");
-#line 505 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 508 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->copyright);
-#line 505 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 508 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->copyright = _tmp11_;
-#line 506 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 509 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp12_ = g_strdup ("");
-#line 506 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 509 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->software);
-#line 506 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 509 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->software = _tmp12_;
-#line 507 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 510 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp13_ = g_strdup ("");
-#line 507 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 510 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->exposure_bias);
-#line 507 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 510 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->exposure_bias = _tmp13_;
-#line 508 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 511 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp14_ = g_strdup ("");
-#line 508 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 511 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->exposure_date);
-#line 508 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 511 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->exposure_date = _tmp14_;
-#line 509 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 512 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp15_ = g_strdup ("");
-#line 509 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 512 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->exposure_time);
-#line 509 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 512 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->exposure_time = _tmp15_;
-#line 510 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 513 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp16_ = g_strdup ("");
-#line 510 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 513 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->comment);
-#line 510 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 513 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->comment = _tmp16_;
-#line 4296 "Properties.c"
+#line 4337 "Properties.c"
 }
 
 
@@ -4305,35 +4346,35 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 	DataSource* _tmp3_ = NULL;
 	DataSource* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 513 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 516 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedProperties);
-#line 513 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 516 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_DATA_VIEW (view));
-#line 514 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 517 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = view;
-#line 514 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 517 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_CLASS (extended_properties_window_extended_properties_parent_class)->get_single_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_);
-#line 516 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 519 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = view;
-#line 516 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 519 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp2_ = data_view_get_source (_tmp1_);
-#line 516 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 519 "/home/jens/Source/shotwell/src/Properties.vala"
 	source = _tmp2_;
-#line 517 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 520 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp3_ = source;
-#line 517 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 520 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp3_ == NULL) {
-#line 518 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 521 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (source);
-#line 518 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 521 "/home/jens/Source/shotwell/src/Properties.vala"
 		return;
-#line 4331 "Properties.c"
+#line 4372 "Properties.c"
 	}
-#line 520 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 523 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp4_ = source;
-#line 520 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 523 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_MEDIA_SOURCE)) {
-#line 4337 "Properties.c"
+#line 4378 "Properties.c"
 		MediaSource* media = NULL;
 		DataSource* _tmp5_ = NULL;
 		MediaSource* _tmp6_ = NULL;
@@ -4397,364 +4438,364 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 		gchar* _tmp72_ = NULL;
 		MediaSource* _tmp73_ = NULL;
 		gchar* _tmp74_ = NULL;
-#line 521 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 524 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp5_ = source;
-#line 521 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 524 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 521 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 524 "/home/jens/Source/shotwell/src/Properties.vala"
 		media = _tmp6_;
-#line 522 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 525 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp7_ = media;
-#line 522 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 525 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp8_ = media_source_get_master_file (_tmp7_);
-#line 522 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 525 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp9_ = _tmp8_;
-#line 522 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 525 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp10_ = g_file_get_path (_tmp9_);
-#line 522 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 525 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->file_path);
-#line 522 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 525 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->file_path = _tmp10_;
-#line 522 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 525 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (_tmp9_);
-#line 523 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 526 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp11_ = media;
-#line 523 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 526 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp12_ = media_source_get_file (_tmp11_);
-#line 523 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 526 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp13_ = _tmp12_;
-#line 523 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 526 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp14_ = g_file_get_path (_tmp13_);
-#line 523 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 526 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->development_path);
-#line 523 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 526 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->development_path = _tmp14_;
-#line 523 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 526 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (_tmp13_);
-#line 524 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 527 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp15_ = media;
-#line 524 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 527 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp16_ = media_source_get_master_filesize (_tmp15_);
-#line 524 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 527 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->filesize = _tmp16_;
-#line 529 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 532 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp17_ = media;
-#line 529 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 532 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_PHOTO) ? ((Photo*) _tmp17_) : NULL);
-#line 529 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 532 "/home/jens/Source/shotwell/src/Properties.vala"
 		photo = _tmp18_;
-#line 530 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 533 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp19_ = photo;
-#line 530 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 533 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp19_ == NULL) {
-#line 531 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 534 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (photo);
-#line 531 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 534 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (media);
-#line 531 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 534 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (source);
-#line 531 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 534 "/home/jens/Source/shotwell/src/Properties.vala"
 			return;
-#line 4459 "Properties.c"
+#line 4500 "Properties.c"
 		}
 		{
 			PhotoMetadata* _tmp20_ = NULL;
 			Photo* _tmp21_ = NULL;
 			PhotoMetadata* _tmp22_ = NULL;
 			PhotoMetadata* _tmp23_ = NULL;
-#line 540 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp21_ = photo;
-#line 540 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp22_ = photo_get_master_metadata (_tmp21_, &_inner_error_);
-#line 540 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp20_ = _tmp22_;
-#line 540 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4474 "Properties.c"
-				goto __catch435_g_error;
+#line 4515 "Properties.c"
+				goto __catch432_g_error;
 			}
-#line 540 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp23_ = _tmp20_;
-#line 540 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp20_ = NULL;
-#line 540 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			_media_metadata_unref0 (metadata);
-#line 540 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			metadata = _tmp23_;
-#line 535 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			_media_metadata_unref0 (_tmp20_);
-#line 4487 "Properties.c"
+#line 4528 "Properties.c"
 		}
-		goto __finally435;
-		__catch435_g_error:
+		goto __finally432;
+		__catch432_g_error:
 		{
 			GError* e = NULL;
 			Photo* _tmp24_ = NULL;
 			PhotoMetadata* _tmp25_ = NULL;
-#line 535 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			e = _inner_error_;
-#line 535 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			_inner_error_ = NULL;
-#line 542 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 545 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp24_ = photo;
-#line 542 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 545 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp25_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 542 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 545 "/home/jens/Source/shotwell/src/Properties.vala"
 			_media_metadata_unref0 (metadata);
-#line 542 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 545 "/home/jens/Source/shotwell/src/Properties.vala"
 			metadata = _tmp25_;
-#line 535 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_error_free0 (e);
-#line 4509 "Properties.c"
+#line 4550 "Properties.c"
 		}
-		__finally435:
-#line 535 "/home/jens/Source/shotwell/src/Properties.vala"
+		__finally432:
+#line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 535 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			_media_metadata_unref0 (metadata);
-#line 535 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (photo);
-#line 535 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (media);
-#line 535 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (source);
-#line 535 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 535 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			g_clear_error (&_inner_error_);
-#line 535 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 			return;
-#line 4528 "Properties.c"
+#line 4569 "Properties.c"
 		}
-#line 545 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 548 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp26_ = metadata;
-#line 545 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 548 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp26_ == NULL) {
-#line 546 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 549 "/home/jens/Source/shotwell/src/Properties.vala"
 			_media_metadata_unref0 (metadata);
-#line 546 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 549 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (photo);
-#line 546 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 549 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (media);
-#line 546 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 549 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (source);
-#line 546 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 549 "/home/jens/Source/shotwell/src/Properties.vala"
 			return;
-#line 4544 "Properties.c"
+#line 4585 "Properties.c"
 		}
-#line 553 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 556 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp27_ = metadata;
-#line 553 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 556 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp28_ = photo_metadata_get_exposure_date_time (_tmp27_);
-#line 553 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 556 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp29_ = _tmp28_;
-#line 553 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 556 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp30_ = _tmp29_ == NULL;
-#line 553 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 556 "/home/jens/Source/shotwell/src/Properties.vala"
 		_metadata_date_time_unref0 (_tmp29_);
-#line 553 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 556 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp30_) {
-#line 4558 "Properties.c"
+#line 4599 "Properties.c"
 			PhotoMetadata* _tmp31_ = NULL;
 			Photo* _tmp32_ = NULL;
 			time_t _tmp33_ = 0;
 			MetadataDateTime* _tmp34_ = NULL;
 			MetadataDateTime* _tmp35_ = NULL;
-#line 554 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 557 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp31_ = metadata;
-#line 554 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 557 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp32_ = photo;
-#line 554 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 557 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp33_ = media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 554 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 557 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp34_ = metadata_date_time_new (_tmp33_);
-#line 554 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 557 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp35_ = _tmp34_;
-#line 554 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 557 "/home/jens/Source/shotwell/src/Properties.vala"
 			photo_metadata_set_exposure_date_time (_tmp31_, _tmp35_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 554 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 557 "/home/jens/Source/shotwell/src/Properties.vala"
 			_metadata_date_time_unref0 (_tmp35_);
-#line 4578 "Properties.c"
+#line 4619 "Properties.c"
 		}
-#line 556 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 559 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp36_ = photo;
-#line 556 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 559 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp37_ = photo_get_master_file_format (_tmp36_);
-#line 556 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 559 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->is_raw = _tmp37_ == PHOTO_FILE_FORMAT_RAW;
-#line 557 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 560 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp38_ = metadata;
-#line 557 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 560 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp39_ = photo_metadata_get_pixel_dimensions (_tmp38_);
-#line 557 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 560 "/home/jens/Source/shotwell/src/Properties.vala"
 		_dimensions_free0 (self->priv->original_dim);
-#line 557 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 560 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->original_dim = _tmp39_;
-#line 558 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 561 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp40_ = metadata;
-#line 558 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 561 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp41_ = photo_metadata_get_camera_make (_tmp40_);
-#line 558 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 561 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->camera_make);
-#line 558 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 561 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->camera_make = _tmp41_;
-#line 559 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp42_ = metadata;
-#line 559 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp43_ = photo_metadata_get_camera_model (_tmp42_);
-#line 559 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->camera_model);
-#line 559 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->camera_model = _tmp43_;
-#line 560 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 563 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp44_ = metadata;
-#line 560 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 563 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp45_ = photo_metadata_get_flash_string (_tmp44_);
-#line 560 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 563 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->flash);
-#line 560 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 563 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->flash = _tmp45_;
-#line 561 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 564 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp46_ = metadata;
-#line 561 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 564 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp47_ = photo_metadata_get_focal_length_string (_tmp46_);
-#line 561 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 564 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->focal_length);
-#line 561 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 564 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->focal_length = _tmp47_;
-#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp48_ = metadata;
-#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
 		photo_metadata_get_gps (_tmp48_, &_tmp49_, &_tmp50_, &_tmp51_, &_tmp52_, &_tmp53_);
-#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->gps_long = _tmp49_;
-#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->gps_long_ref);
-#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->gps_long_ref = _tmp50_;
-#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->gps_lat = _tmp51_;
-#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->gps_lat_ref);
-#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->gps_lat_ref = _tmp52_;
-#line 562 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->gps_alt = _tmp53_;
-#line 563 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 566 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp54_ = metadata;
-#line 563 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 566 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp55_ = photo_metadata_get_artist (_tmp54_);
-#line 563 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 566 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->artist);
-#line 563 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 566 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->artist = _tmp55_;
-#line 564 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 567 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp56_ = metadata;
-#line 564 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 567 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp57_ = photo_metadata_get_copyright (_tmp56_);
-#line 564 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 567 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->copyright);
-#line 564 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 567 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->copyright = _tmp57_;
-#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 568 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp58_ = metadata;
-#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 568 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp59_ = photo_metadata_get_software (_tmp58_);
-#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 568 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->software);
-#line 565 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 568 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->software = _tmp59_;
-#line 566 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 569 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp60_ = metadata;
-#line 566 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 569 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp61_ = photo_metadata_get_exposure_bias (_tmp60_);
-#line 566 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 569 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->exposure_bias);
-#line 566 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 569 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->exposure_bias = _tmp61_;
-#line 567 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 570 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp62_ = metadata;
-#line 567 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 570 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp63_ = photo_metadata_get_exposure_date_time (_tmp62_);
-#line 567 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 570 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp64_ = _tmp63_;
-#line 567 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 570 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp65_ = metadata_date_time_get_timestamp (_tmp64_);
-#line 567 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 570 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp66_ = _tmp65_;
-#line 567 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 570 "/home/jens/Source/shotwell/src/Properties.vala"
 		_metadata_date_time_unref0 (_tmp64_);
-#line 567 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 570 "/home/jens/Source/shotwell/src/Properties.vala"
 		exposure_time_obj = _tmp66_;
-#line 568 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 571 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp67_ = exposure_time_obj;
-#line 568 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 571 "/home/jens/Source/shotwell/src/Properties.vala"
 		g_time_local (_tmp67_, &_tmp68_);
-#line 568 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 571 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp69_ = properties_get_prettyprint_date (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp68_);
-#line 568 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 571 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->exposure_date);
-#line 568 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 571 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->exposure_date = _tmp69_;
-#line 569 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 572 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp70_ = exposure_time_obj;
-#line 569 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 572 "/home/jens/Source/shotwell/src/Properties.vala"
 		g_time_local (_tmp70_, &_tmp71_);
-#line 569 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 572 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp72_ = properties_get_prettyprint_time_with_seconds (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), &_tmp71_);
-#line 569 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 572 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->exposure_time);
-#line 569 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 572 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->exposure_time = _tmp72_;
-#line 570 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 573 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp73_ = media;
-#line 570 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 573 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp74_ = media_source_get_comment (_tmp73_);
-#line 570 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 573 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (self->priv->comment);
-#line 570 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 573 "/home/jens/Source/shotwell/src/Properties.vala"
 		self->priv->comment = _tmp74_;
-#line 520 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 523 "/home/jens/Source/shotwell/src/Properties.vala"
 		_media_metadata_unref0 (metadata);
-#line 520 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 523 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (photo);
-#line 520 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 523 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_object_unref0 (media);
-#line 4724 "Properties.c"
+#line 4765 "Properties.c"
 	} else {
 		DataSource* _tmp75_ = NULL;
-#line 571 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 574 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp75_ = source;
-#line 571 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 574 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, TYPE_EVENT_SOURCE)) {
-#line 4731 "Properties.c"
+#line 4772 "Properties.c"
 			Event* event = NULL;
 			DataSource* _tmp76_ = NULL;
 			Event* _tmp77_ = NULL;
 			Event* _tmp78_ = NULL;
 			gchar* _tmp79_ = NULL;
-#line 572 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 575 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp76_ = source;
-#line 572 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 575 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp77_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, TYPE_EVENT, Event));
-#line 572 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 575 "/home/jens/Source/shotwell/src/Properties.vala"
 			event = _tmp77_;
-#line 573 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 576 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp78_ = event;
-#line 573 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 576 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp79_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_EVENT_SOURCE, EventSource));
-#line 573 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 576 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (self->priv->comment);
-#line 573 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 576 "/home/jens/Source/shotwell/src/Properties.vala"
 			self->priv->comment = _tmp79_;
-#line 571 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 574 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_object_unref0 (event);
-#line 4753 "Properties.c"
+#line 4794 "Properties.c"
 		}
 	}
-#line 513 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 516 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (source);
-#line 4758 "Properties.c"
+#line 4799 "Properties.c"
 }
 
 
@@ -4767,7 +4808,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 4771 "Properties.c"
+#line 4812 "Properties.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -4798,8 +4839,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4802 "Properties.c"
-				goto __catch436_g_regex_error;
+#line 4843 "Properties.c"
+				goto __catch433_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4807,7 +4848,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4811 "Properties.c"
+#line 4852 "Properties.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -4823,8 +4864,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4827 "Properties.c"
-				goto __catch436_g_regex_error;
+#line 4868 "Properties.c"
+				goto __catch433_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -4834,7 +4875,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4838 "Properties.c"
+#line 4879 "Properties.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -4848,10 +4889,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 4852 "Properties.c"
+#line 4893 "Properties.c"
 	}
-	goto __finally436;
-	__catch436_g_regex_error:
+	goto __finally433;
+	__catch433_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4862,9 +4903,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 4866 "Properties.c"
+#line 4907 "Properties.c"
 	}
-	__finally436:
+	__finally433:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4873,7 +4914,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 4877 "Properties.c"
+#line 4918 "Properties.c"
 	}
 }
 
@@ -4889,19 +4930,19 @@ static void extended_properties_window_extended_properties_real_internal_update_
 	gboolean _tmp117_ = FALSE;
 	const gchar* _tmp119_ = NULL;
 	gboolean _tmp120_ = FALSE;
-#line 577 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 580 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedProperties);
-#line 577 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 580 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 578 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 581 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp0_ = page;
-#line 578 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 581 "/home/jens/Source/shotwell/src/Properties.vala"
 	PROPERTIES_CLASS (extended_properties_window_extended_properties_parent_class)->internal_update_properties (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp0_);
-#line 580 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp1_ = page;
-#line 580 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENTS_DIRECTORY_PAGE)) {
-#line 4905 "Properties.c"
+#line 4946 "Properties.c"
 	} else {
 		gchar* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
@@ -4965,749 +5006,749 @@ static void extended_properties_window_extended_properties_real_internal_update_
 		gboolean _tmp108_ = FALSE;
 		const gchar* _tmp109_ = NULL;
 		const gchar* _tmp112_ = NULL;
-#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp4_ = self->priv->file_path;
-#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp4_, "") != 0) {
-#line 4973 "Properties.c"
+#line 5014 "Properties.c"
 			const gchar* _tmp5_ = NULL;
-#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp5_ = self->priv->file_path;
-#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp3_ = _tmp5_ != NULL;
-#line 4979 "Properties.c"
+#line 5020 "Properties.c"
 		} else {
-#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp3_ = FALSE;
-#line 4983 "Properties.c"
+#line 5024 "Properties.c"
 		}
-#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp3_) {
-#line 4987 "Properties.c"
+#line 5028 "Properties.c"
 			const gchar* _tmp6_ = NULL;
 			gchar* _tmp7_ = NULL;
-#line 584 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp6_ = self->priv->file_path;
-#line 584 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp7_ = string_replace (_tmp6_, "&", "&amp;");
-#line 584 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (_tmp2_);
-#line 584 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp2_ = _tmp7_;
-#line 4998 "Properties.c"
+#line 5039 "Properties.c"
 		} else {
 			gchar* _tmp8_ = NULL;
-#line 584 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp8_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
-#line 584 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (_tmp2_);
-#line 584 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp2_ = _tmp8_;
-#line 5007 "Properties.c"
+#line 5048 "Properties.c"
 		}
-#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 586 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp9_ = _ ("Location:");
-#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp9_, _tmp2_, FALSE);
 #line 586 "/home/jens/Source/shotwell/src/Properties.vala"
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp9_, _tmp2_, FALSE);
+#line 589 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp11_ = self->priv->filesize;
-#line 586 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 589 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp11_ > ((guint64) 0)) {
-#line 5017 "Properties.c"
+#line 5058 "Properties.c"
 			guint64 _tmp12_ = 0ULL;
 			gchar* _tmp13_ = NULL;
-#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 590 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp12_ = self->priv->filesize;
-#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 590 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp13_ = g_format_size_full ((guint64) ((gint64) _tmp12_), G_FORMAT_SIZE_DEFAULT);
-#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 590 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (_tmp10_);
-#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 590 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp10_ = _tmp13_;
-#line 5028 "Properties.c"
+#line 5069 "Properties.c"
 		} else {
 			gchar* _tmp14_ = NULL;
-#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 590 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp14_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
-#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 590 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (_tmp10_);
-#line 587 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 590 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp10_ = _tmp14_;
-#line 5037 "Properties.c"
+#line 5078 "Properties.c"
 		}
-#line 586 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 589 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp15_ = _ ("File size:");
-#line 586 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp15_, _tmp10_, FALSE);
 #line 589 "/home/jens/Source/shotwell/src/Properties.vala"
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp15_, _tmp10_, FALSE);
+#line 592 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp16_ = self->priv->is_raw;
-#line 589 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 592 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp16_) {
-#line 5047 "Properties.c"
+#line 5088 "Properties.c"
 			const gchar* _tmp17_ = NULL;
 			const gchar* _tmp18_ = NULL;
-#line 590 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp17_ = _ ("Current Development:");
-#line 590 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp18_ = self->priv->development_path;
-#line 590 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
 			properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp17_, _tmp18_, FALSE);
-#line 5056 "Properties.c"
+#line 5097 "Properties.c"
 		}
-#line 592 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp21_ = self->priv->original_dim;
-#line 592 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp21_ != NULL) {
-#line 5062 "Properties.c"
+#line 5103 "Properties.c"
 			Dimensions* _tmp22_ = NULL;
 			gboolean _tmp23_ = FALSE;
-#line 592 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp22_ = self->priv->original_dim;
-#line 592 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp23_ = dimensions_has_area (_tmp22_);
-#line 592 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp20_ = _tmp23_;
-#line 5071 "Properties.c"
+#line 5112 "Properties.c"
 		} else {
-#line 592 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp20_ = FALSE;
-#line 5075 "Properties.c"
+#line 5116 "Properties.c"
 		}
-#line 592 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp20_) {
-#line 5079 "Properties.c"
+#line 5120 "Properties.c"
 			Dimensions* _tmp24_ = NULL;
 			gint _tmp25_ = 0;
 			Dimensions* _tmp26_ = NULL;
 			gint _tmp27_ = 0;
 			gchar* _tmp28_ = NULL;
-#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp24_ = self->priv->original_dim;
-#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp25_ = (*_tmp24_).width;
-#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp26_ = self->priv->original_dim;
-#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp27_ = (*_tmp26_).height;
-#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp28_ = g_strdup_printf ("%d &#215; %d", _tmp25_, _tmp27_);
-#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (_tmp19_);
-#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp19_ = _tmp28_;
-#line 5099 "Properties.c"
+#line 5140 "Properties.c"
 		} else {
 			gchar* _tmp29_ = NULL;
-#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp29_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
-#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (_tmp19_);
-#line 593 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp19_ = _tmp29_;
-#line 5108 "Properties.c"
+#line 5149 "Properties.c"
 		}
-#line 592 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp30_ = _ ("Original dimensions:");
-#line 592 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp30_, _tmp19_, FALSE);
 #line 595 "/home/jens/Source/shotwell/src/Properties.vala"
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp30_, _tmp19_, FALSE);
+#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp33_ = self->priv->camera_make;
-#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp33_, "") != 0) {
-#line 5118 "Properties.c"
+#line 5159 "Properties.c"
 			const gchar* _tmp34_ = NULL;
-#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp34_ = self->priv->camera_make;
-#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp32_ = _tmp34_ != NULL;
-#line 5124 "Properties.c"
+#line 5165 "Properties.c"
 		} else {
-#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp32_ = FALSE;
-#line 5128 "Properties.c"
+#line 5169 "Properties.c"
 		}
-#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp32_) {
-#line 5132 "Properties.c"
+#line 5173 "Properties.c"
 			const gchar* _tmp35_ = NULL;
-#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 599 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp35_ = self->priv->camera_make;
-#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 599 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp31_ = _tmp35_;
-#line 5138 "Properties.c"
+#line 5179 "Properties.c"
 		} else {
-#line 596 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 599 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp31_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5142 "Properties.c"
+#line 5183 "Properties.c"
 		}
-#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp36_ = _ ("Camera make:");
-#line 595 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp36_, _tmp31_, FALSE);
 #line 598 "/home/jens/Source/shotwell/src/Properties.vala"
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp36_, _tmp31_, FALSE);
+#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp39_ = self->priv->camera_model;
-#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp39_, "") != 0) {
-#line 5152 "Properties.c"
+#line 5193 "Properties.c"
 			const gchar* _tmp40_ = NULL;
-#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp40_ = self->priv->camera_model;
-#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp38_ = _tmp40_ != NULL;
-#line 5158 "Properties.c"
+#line 5199 "Properties.c"
 		} else {
-#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp38_ = FALSE;
-#line 5162 "Properties.c"
+#line 5203 "Properties.c"
 		}
-#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp38_) {
-#line 5166 "Properties.c"
+#line 5207 "Properties.c"
 			const gchar* _tmp41_ = NULL;
-#line 599 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 602 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp41_ = self->priv->camera_model;
-#line 599 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 602 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp37_ = _tmp41_;
-#line 5172 "Properties.c"
+#line 5213 "Properties.c"
 		} else {
-#line 599 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 602 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp37_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5176 "Properties.c"
+#line 5217 "Properties.c"
 		}
-#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp42_ = _ ("Camera model:");
-#line 598 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp42_, _tmp37_, FALSE);
 #line 601 "/home/jens/Source/shotwell/src/Properties.vala"
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp42_, _tmp37_, FALSE);
+#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp45_ = self->priv->flash;
-#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp45_, "") != 0) {
-#line 5186 "Properties.c"
+#line 5227 "Properties.c"
 			const gchar* _tmp46_ = NULL;
-#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp46_ = self->priv->flash;
-#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp44_ = _tmp46_ != NULL;
-#line 5192 "Properties.c"
+#line 5233 "Properties.c"
 		} else {
-#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp44_ = FALSE;
-#line 5196 "Properties.c"
+#line 5237 "Properties.c"
 		}
-#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp44_) {
-#line 5200 "Properties.c"
+#line 5241 "Properties.c"
 			const gchar* _tmp47_ = NULL;
-#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp47_ = self->priv->flash;
-#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp43_ = _tmp47_;
-#line 5206 "Properties.c"
+#line 5247 "Properties.c"
 		} else {
-#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp43_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5210 "Properties.c"
+#line 5251 "Properties.c"
 		}
-#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp48_ = _ ("Flash:");
-#line 601 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp48_, _tmp43_, FALSE);
-#line 603 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp51_ = self->priv->focal_length;
-#line 603 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp51_, "") != 0) {
-#line 5220 "Properties.c"
+#line 5261 "Properties.c"
 			const gchar* _tmp52_ = NULL;
-#line 603 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp52_ = self->priv->focal_length;
-#line 603 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp50_ = _tmp52_ != NULL;
-#line 5226 "Properties.c"
+#line 5267 "Properties.c"
 		} else {
-#line 603 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp50_ = FALSE;
-#line 5230 "Properties.c"
+#line 5271 "Properties.c"
 		}
-#line 603 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp50_) {
-#line 5234 "Properties.c"
+#line 5275 "Properties.c"
 			const gchar* _tmp53_ = NULL;
-#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 607 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp53_ = self->priv->focal_length;
-#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 607 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp49_ = _tmp53_;
-#line 5240 "Properties.c"
+#line 5281 "Properties.c"
 		} else {
-#line 604 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 607 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp49_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5244 "Properties.c"
+#line 5285 "Properties.c"
 		}
-#line 603 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp54_ = _ ("Focal length:");
-#line 603 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp54_, _tmp49_, FALSE);
 #line 606 "/home/jens/Source/shotwell/src/Properties.vala"
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp54_, _tmp49_, FALSE);
+#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp57_ = self->priv->exposure_date;
-#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp57_, "") != 0) {
-#line 5254 "Properties.c"
+#line 5295 "Properties.c"
 			const gchar* _tmp58_ = NULL;
-#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp58_ = self->priv->exposure_date;
-#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp56_ = _tmp58_ != NULL;
-#line 5260 "Properties.c"
+#line 5301 "Properties.c"
 		} else {
-#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp56_ = FALSE;
-#line 5264 "Properties.c"
+#line 5305 "Properties.c"
 		}
-#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp56_) {
-#line 5268 "Properties.c"
+#line 5309 "Properties.c"
 			const gchar* _tmp59_ = NULL;
-#line 607 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 610 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp59_ = self->priv->exposure_date;
-#line 607 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 610 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp55_ = _tmp59_;
-#line 5274 "Properties.c"
+#line 5315 "Properties.c"
 		} else {
-#line 607 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 610 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp55_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5278 "Properties.c"
+#line 5319 "Properties.c"
 		}
-#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp60_ = _ ("Exposure date:");
-#line 606 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp60_, _tmp55_, FALSE);
 #line 609 "/home/jens/Source/shotwell/src/Properties.vala"
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp60_, _tmp55_, FALSE);
+#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp63_ = self->priv->exposure_time;
-#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp63_, "") != 0) {
-#line 5288 "Properties.c"
+#line 5329 "Properties.c"
 			const gchar* _tmp64_ = NULL;
-#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp64_ = self->priv->exposure_time;
-#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp62_ = _tmp64_ != NULL;
-#line 5294 "Properties.c"
+#line 5335 "Properties.c"
 		} else {
-#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp62_ = FALSE;
-#line 5298 "Properties.c"
+#line 5339 "Properties.c"
 		}
-#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp62_) {
-#line 5302 "Properties.c"
+#line 5343 "Properties.c"
 			const gchar* _tmp65_ = NULL;
-#line 610 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 613 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp65_ = self->priv->exposure_time;
-#line 610 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 613 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp61_ = _tmp65_;
-#line 5308 "Properties.c"
+#line 5349 "Properties.c"
 		} else {
-#line 610 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 613 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp61_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5312 "Properties.c"
+#line 5353 "Properties.c"
 		}
-#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp66_ = _ ("Exposure time:");
-#line 609 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp66_, _tmp61_, FALSE);
 #line 612 "/home/jens/Source/shotwell/src/Properties.vala"
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp66_, _tmp61_, FALSE);
+#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp69_ = self->priv->exposure_bias;
-#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp69_, "") != 0) {
-#line 5322 "Properties.c"
+#line 5363 "Properties.c"
 			const gchar* _tmp70_ = NULL;
-#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp70_ = self->priv->exposure_bias;
-#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp68_ = _tmp70_ != NULL;
-#line 5328 "Properties.c"
+#line 5369 "Properties.c"
 		} else {
-#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp68_ = FALSE;
-#line 5332 "Properties.c"
+#line 5373 "Properties.c"
 		}
-#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp68_) {
-#line 5336 "Properties.c"
+#line 5377 "Properties.c"
 			const gchar* _tmp71_ = NULL;
-#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp71_ = self->priv->exposure_bias;
-#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp67_ = _tmp71_;
-#line 5342 "Properties.c"
+#line 5383 "Properties.c"
 		} else {
-#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp67_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5346 "Properties.c"
+#line 5387 "Properties.c"
 		}
-#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp72_ = _ ("Exposure bias:");
-#line 612 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp72_, _tmp67_, FALSE);
-#line 614 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp76_ = self->priv->gps_lat;
-#line 614 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp76_ != ((gdouble) -1)) {
-#line 5356 "Properties.c"
+#line 5397 "Properties.c"
 			const gchar* _tmp77_ = NULL;
-#line 614 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp77_ = self->priv->gps_lat_ref;
-#line 614 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp75_ = g_strcmp0 (_tmp77_, "") != 0;
-#line 5362 "Properties.c"
+#line 5403 "Properties.c"
 		} else {
-#line 614 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp75_ = FALSE;
-#line 5366 "Properties.c"
+#line 5407 "Properties.c"
 		}
-#line 614 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp75_) {
-#line 5370 "Properties.c"
+#line 5411 "Properties.c"
 			const gchar* _tmp78_ = NULL;
-#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp78_ = self->priv->gps_lat_ref;
-#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp74_ = _tmp78_ != NULL;
-#line 5376 "Properties.c"
+#line 5417 "Properties.c"
 		} else {
-#line 614 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp74_ = FALSE;
-#line 5380 "Properties.c"
+#line 5421 "Properties.c"
 		}
-#line 614 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp74_) {
-#line 5384 "Properties.c"
+#line 5425 "Properties.c"
 			gdouble _tmp79_ = 0.0;
 			const gchar* _tmp80_ = NULL;
 			gchar* _tmp81_ = NULL;
-#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp79_ = self->priv->gps_lat;
-#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp80_ = self->priv->gps_lat_ref;
-#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp81_ = g_strdup_printf ("%f °%s", _tmp79_, _tmp80_);
-#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (_tmp73_);
-#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp73_ = _tmp81_;
-#line 5398 "Properties.c"
+#line 5439 "Properties.c"
 		} else {
 			gchar* _tmp82_ = NULL;
-#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp82_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
-#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (_tmp73_);
-#line 615 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp73_ = _tmp82_;
-#line 5407 "Properties.c"
+#line 5448 "Properties.c"
 		}
-#line 614 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp83_ = _ ("GPS latitude:");
-#line 614 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp83_, _tmp73_, FALSE);
 #line 617 "/home/jens/Source/shotwell/src/Properties.vala"
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp83_, _tmp73_, FALSE);
+#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp87_ = self->priv->gps_long;
-#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp87_ != ((gdouble) -1)) {
-#line 5417 "Properties.c"
+#line 5458 "Properties.c"
 			const gchar* _tmp88_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp88_ = self->priv->gps_long_ref;
-#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp86_ = g_strcmp0 (_tmp88_, "") != 0;
-#line 5423 "Properties.c"
+#line 5464 "Properties.c"
 		} else {
-#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp86_ = FALSE;
-#line 5427 "Properties.c"
+#line 5468 "Properties.c"
 		}
-#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp86_) {
-#line 5431 "Properties.c"
+#line 5472 "Properties.c"
 			const gchar* _tmp89_ = NULL;
-#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp89_ = self->priv->gps_long_ref;
-#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp85_ = _tmp89_ != NULL;
-#line 5437 "Properties.c"
+#line 5478 "Properties.c"
 		} else {
-#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp85_ = FALSE;
-#line 5441 "Properties.c"
+#line 5482 "Properties.c"
 		}
-#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp85_) {
-#line 5445 "Properties.c"
+#line 5486 "Properties.c"
 			gdouble _tmp90_ = 0.0;
 			const gchar* _tmp91_ = NULL;
 			gchar* _tmp92_ = NULL;
-#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp90_ = self->priv->gps_long;
-#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp91_ = self->priv->gps_long_ref;
-#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp92_ = g_strdup_printf ("%f °%s", _tmp90_, _tmp91_);
-#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (_tmp84_);
-#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp84_ = _tmp92_;
-#line 5459 "Properties.c"
+#line 5500 "Properties.c"
 		} else {
 			gchar* _tmp93_ = NULL;
-#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp93_ = g_strdup (EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE);
-#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_g_free0 (_tmp84_);
-#line 618 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 621 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp84_ = _tmp93_;
-#line 5468 "Properties.c"
+#line 5509 "Properties.c"
 		}
-#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp94_ = _ ("GPS longitude:");
-#line 617 "/home/jens/Source/shotwell/src/Properties.vala"
-		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp94_, _tmp84_, FALSE);
 #line 620 "/home/jens/Source/shotwell/src/Properties.vala"
+		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp94_, _tmp84_, FALSE);
+#line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp97_ = self->priv->artist;
-#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp97_, "") != 0) {
-#line 5478 "Properties.c"
+#line 5519 "Properties.c"
 			const gchar* _tmp98_ = NULL;
-#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp98_ = self->priv->artist;
-#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp96_ = _tmp98_ != NULL;
-#line 5484 "Properties.c"
+#line 5525 "Properties.c"
 		} else {
-#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp96_ = FALSE;
-#line 5488 "Properties.c"
+#line 5529 "Properties.c"
 		}
-#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp96_) {
-#line 5492 "Properties.c"
+#line 5533 "Properties.c"
 			const gchar* _tmp99_ = NULL;
-#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp99_ = self->priv->artist;
-#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp95_ = _tmp99_;
-#line 5498 "Properties.c"
+#line 5539 "Properties.c"
 		} else {
-#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp95_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5502 "Properties.c"
+#line 5543 "Properties.c"
 		}
-#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp100_ = _ ("Artist:");
-#line 620 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 623 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp100_, _tmp95_, FALSE);
-#line 622 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp103_ = self->priv->copyright;
-#line 622 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp103_, "") != 0) {
-#line 5512 "Properties.c"
+#line 5553 "Properties.c"
 			const gchar* _tmp104_ = NULL;
-#line 622 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp104_ = self->priv->copyright;
-#line 622 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp102_ = _tmp104_ != NULL;
-#line 5518 "Properties.c"
+#line 5559 "Properties.c"
 		} else {
-#line 622 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp102_ = FALSE;
-#line 5522 "Properties.c"
+#line 5563 "Properties.c"
 		}
-#line 622 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp102_) {
-#line 5526 "Properties.c"
+#line 5567 "Properties.c"
 			const gchar* _tmp105_ = NULL;
-#line 622 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp105_ = self->priv->copyright;
-#line 622 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp101_ = _tmp105_;
-#line 5532 "Properties.c"
+#line 5573 "Properties.c"
 		} else {
-#line 622 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp101_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5536 "Properties.c"
+#line 5577 "Properties.c"
 		}
-#line 622 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp106_ = _ ("Copyright:");
-#line 622 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 625 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp106_, _tmp101_, FALSE);
-#line 624 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp109_ = self->priv->software;
-#line 624 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (g_strcmp0 (_tmp109_, "") != 0) {
-#line 5546 "Properties.c"
+#line 5587 "Properties.c"
 			const gchar* _tmp110_ = NULL;
-#line 624 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp110_ = self->priv->software;
-#line 624 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp108_ = _tmp110_ != NULL;
-#line 5552 "Properties.c"
+#line 5593 "Properties.c"
 		} else {
-#line 624 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp108_ = FALSE;
-#line 5556 "Properties.c"
+#line 5597 "Properties.c"
 		}
-#line 624 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (_tmp108_) {
-#line 5560 "Properties.c"
+#line 5601 "Properties.c"
 			const gchar* _tmp111_ = NULL;
-#line 624 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp111_ = self->priv->software;
-#line 624 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp107_ = _tmp111_;
-#line 5566 "Properties.c"
+#line 5607 "Properties.c"
 		} else {
-#line 624 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp107_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5570 "Properties.c"
+#line 5611 "Properties.c"
 		}
-#line 624 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp112_ = _ ("Software:");
-#line 624 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
 		properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp112_, _tmp107_, FALSE);
-#line 580 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (_tmp84_);
-#line 580 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (_tmp73_);
-#line 580 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (_tmp19_);
-#line 580 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (_tmp10_);
-#line 580 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 583 "/home/jens/Source/shotwell/src/Properties.vala"
 		_g_free0 (_tmp2_);
-#line 5586 "Properties.c"
+#line 5627 "Properties.c"
 	}
-#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 630 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp114_ = self->priv->comment;
-#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 630 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (g_strcmp0 (_tmp114_, "") != 0) {
-#line 5592 "Properties.c"
+#line 5633 "Properties.c"
 		const gchar* _tmp115_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 630 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp115_ = self->priv->comment;
-#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 630 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp113_ = _tmp115_ != NULL;
-#line 5598 "Properties.c"
+#line 5639 "Properties.c"
 	} else {
-#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 630 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp113_ = FALSE;
-#line 5602 "Properties.c"
+#line 5643 "Properties.c"
 	}
-#line 627 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 630 "/home/jens/Source/shotwell/src/Properties.vala"
 	has_comment = _tmp113_;
-#line 628 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp117_ = has_comment;
-#line 628 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 	if (_tmp117_) {
-#line 5610 "Properties.c"
+#line 5651 "Properties.c"
 		const gchar* _tmp118_ = NULL;
-#line 628 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp118_ = self->priv->comment;
-#line 628 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp116_ = _tmp118_;
-#line 5616 "Properties.c"
+#line 5657 "Properties.c"
 	} else {
-#line 628 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 		_tmp116_ = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_NO_VALUE;
-#line 5620 "Properties.c"
+#line 5661 "Properties.c"
 	}
-#line 628 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp119_ = _ ("Comment:");
-#line 628 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 	_tmp120_ = has_comment;
-#line 628 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 631 "/home/jens/Source/shotwell/src/Properties.vala"
 	properties_add_line (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PROPERTIES, Properties), _tmp119_, _tmp116_, _tmp120_);
-#line 5628 "Properties.c"
+#line 5669 "Properties.c"
 }
 
 
 static ExtendedPropertiesWindowExtendedProperties* extended_properties_window_extended_properties_construct (GType object_type) {
 	ExtendedPropertiesWindowExtendedProperties * self = NULL;
-#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = (ExtendedPropertiesWindowExtendedProperties*) properties_construct (object_type);
-#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	return self;
-#line 5638 "Properties.c"
+#line 5679 "Properties.c"
 }
 
 
 static ExtendedPropertiesWindowExtendedProperties* extended_properties_window_extended_properties_new (void) {
-#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	return extended_properties_window_extended_properties_construct (EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES);
-#line 5645 "Properties.c"
+#line 5686 "Properties.c"
 }
 
 
 static void extended_properties_window_extended_properties_class_init (ExtendedPropertiesWindowExtendedPropertiesClass * klass) {
-#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	extended_properties_window_extended_properties_parent_class = g_type_class_peek_parent (klass);
-#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_type_class_add_private (klass, sizeof (ExtendedPropertiesWindowExtendedPropertiesPrivate));
-#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	((PropertiesClass *) klass)->clear_properties = extended_properties_window_extended_properties_real_clear_properties;
-#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	((PropertiesClass *) klass)->get_single_properties = extended_properties_window_extended_properties_real_get_single_properties;
-#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	((PropertiesClass *) klass)->internal_update_properties = extended_properties_window_extended_properties_real_internal_update_properties;
-#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = extended_properties_window_extended_properties_finalize;
-#line 5662 "Properties.c"
+#line 5703 "Properties.c"
 }
 
 
 static void extended_properties_window_extended_properties_instance_init (ExtendedPropertiesWindowExtendedProperties * self) {
-#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv = EXTENDED_PROPERTIES_WINDOW_EXTENDED_PROPERTIES_GET_PRIVATE (self);
-#line 5669 "Properties.c"
+#line 5710 "Properties.c"
 }
 
 
 static void extended_properties_window_extended_properties_finalize (GObject* obj) {
 	ExtendedPropertiesWindowExtendedProperties * self;
-#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedProperties);
 #line 460 "/home/jens/Source/shotwell/src/Properties.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EXTENDED_PROPERTIES_WINDOW_TYPE_EXTENDED_PROPERTIES, ExtendedPropertiesWindowExtendedProperties);
+#line 463 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->file_path);
-#line 462 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 465 "/home/jens/Source/shotwell/src/Properties.vala"
 	_dimensions_free0 (self->priv->original_dim);
-#line 463 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 466 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->camera_make);
-#line 464 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 467 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->camera_model);
-#line 465 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 468 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->flash);
-#line 466 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 469 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->focal_length);
-#line 468 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 471 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->gps_lat_ref);
-#line 470 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 473 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->gps_long_ref);
-#line 472 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 475 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->artist);
-#line 473 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 476 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->copyright);
-#line 474 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 477 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->software);
-#line 475 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 478 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->exposure_bias);
-#line 476 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 479 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->exposure_date);
-#line 477 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 480 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->exposure_time);
-#line 479 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 482 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->development_path);
-#line 486 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 489 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_free0 (self->priv->comment);
-#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 460 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (extended_properties_window_extended_properties_parent_class)->finalize (obj);
-#line 5711 "Properties.c"
+#line 5752 "Properties.c"
 }
 
 
@@ -5724,40 +5765,40 @@ static GType extended_properties_window_extended_properties_get_type (void) {
 
 
 static void extended_properties_window_class_init (ExtendedPropertiesWindowClass * klass) {
-#line 454 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	extended_properties_window_parent_class = g_type_class_peek_parent (klass);
-#line 454 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	g_type_class_add_private (klass, sizeof (ExtendedPropertiesWindowPrivate));
-#line 454 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	((GtkWidgetClass *) klass)->button_press_event = extended_properties_window_real_button_press_event;
-#line 454 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	((GtkWidgetClass *) klass)->key_press_event = extended_properties_window_real_key_press_event;
-#line 454 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	((GtkWidgetClass *) klass)->show_all = extended_properties_window_real_show_all;
-#line 454 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (klass)->finalize = extended_properties_window_finalize;
-#line 5740 "Properties.c"
+#line 5781 "Properties.c"
 }
 
 
 static void extended_properties_window_instance_init (ExtendedPropertiesWindow * self) {
-#line 454 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv = EXTENDED_PROPERTIES_WINDOW_GET_PRIVATE (self);
-#line 455 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 458 "/home/jens/Source/shotwell/src/Properties.vala"
 	self->priv->properties = NULL;
-#line 5749 "Properties.c"
+#line 5790 "Properties.c"
 }
 
 
 static void extended_properties_window_finalize (GObject* obj) {
 	ExtendedPropertiesWindow * self;
-#line 454 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXTENDED_PROPERTIES_WINDOW, ExtendedPropertiesWindow);
-#line 455 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 458 "/home/jens/Source/shotwell/src/Properties.vala"
 	_g_object_unref0 (self->priv->properties);
-#line 454 "/home/jens/Source/shotwell/src/Properties.vala"
+#line 457 "/home/jens/Source/shotwell/src/Properties.vala"
 	G_OBJECT_CLASS (extended_properties_window_parent_class)->finalize (obj);
-#line 5761 "Properties.c"
+#line 5802 "Properties.c"
 }
 
 
diff --git a/src/Properties.vala b/src/Properties.vala
index 9d7bdd4..1f59040 100644
--- a/src/Properties.vala
+++ b/src/Properties.vala
@@ -36,15 +36,18 @@ private abstract class Properties : Gtk.Grid {
             view.set_editable(false);
             view.buffer.text = is_string_empty(info_text) ? "" : info_text;
             info_scroll.add(view);
-            label.set_alignment(1, 0);
+            label.xalign = 1.0f;
+            label.yalign = 0.0f;
             info = (Gtk.Widget) info_scroll;
         } else {
             Gtk.Label info_label = new Gtk.Label("");
             info_label.set_markup(is_string_empty(info_text) ? "" : info_text);
-            info_label.set_alignment(0, (float) 5e-1);
             info_label.set_ellipsize(Pango.EllipsizeMode.END);
+            info_label.xalign = 0.0f;
+            info_label.yalign = 0.5f;
             info_label.set_selectable(true);
-            label.set_alignment(1, (float) 5e-1);
+            label.xalign = 1.0f;
+            label.yalign = 0.5f;
             info = (Gtk.Widget) info_label;
         }
 
@@ -646,10 +649,15 @@ private class ExtendedPropertiesWindow : Gtk.Dialog {
         delete_event.connect(hide_on_delete);
 
         properties = new ExtendedProperties();
-        Gtk.Alignment alignment = new Gtk.Alignment(0.5f,0.5f,1,1);
-        alignment.add(properties);
-        alignment.set_border_width(3);
-        ((Gtk.Box) get_content_area()).add(alignment);
+        properties.halign = Gtk.Align.FILL;
+        properties.valign = Gtk.Align.FILL;
+        properties.hexpand = true;
+        properties.vexpand = true;
+        properties.set_margin_top (3);
+        properties.set_margin_bottom (3);
+        properties.set_margin_start (3);
+        properties.set_margin_end (3);
+        ((Gtk.Box) get_content_area()).add(properties);
     }
 
     public override bool button_press_event(Gdk.EventButton event) {
diff --git a/src/Resources.c b/src/Resources.c
index 541b6ac..a978be8 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -63,16 +63,16 @@ typedef enum  {
 
 typedef void (*ResourcesAddStockIconModify) (GdkPixbuf* pixbuf, void* user_data);
 
-extern gchar* resources_RATE_ONE_MENU;
-extern gchar* resources_RATE_TWO_MENU;
-extern gchar* resources_RATE_THREE_MENU;
-extern gchar* resources_RATE_FOUR_MENU;
-extern gchar* resources_RATE_FIVE_MENU;
 extern gchar* resources_RATE_ONE_LABEL;
 extern gchar* resources_RATE_TWO_LABEL;
 extern gchar* resources_RATE_THREE_LABEL;
 extern gchar* resources_RATE_FOUR_LABEL;
 extern gchar* resources_RATE_FIVE_LABEL;
+extern gchar* resources_RATE_ONE_MENU;
+extern gchar* resources_RATE_TWO_MENU;
+extern gchar* resources_RATE_THREE_MENU;
+extern gchar* resources_RATE_FOUR_MENU;
+extern gchar* resources_RATE_FIVE_MENU;
 extern gchar* resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP;
 extern gchar* resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP;
 extern gchar* resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP;
@@ -431,7 +431,6 @@ gchar* resources_rename_search_exists_message (const gchar* name);
 gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_name);
 gchar* resources_delete_search_label (const gchar* name);
 GType rating_get_type (void) G_GNUC_CONST;
-const gchar* resources_rating_menu (Rating rating);
 const gchar* resources_rating_label (Rating rating);
 const gchar* resources_rating_combo_box (Rating rating);
 GType rating_filter_get_type (void) G_GNUC_CONST;
@@ -515,7 +514,7 @@ gchar* resources_launch_editor_failed (GError* err) {
 	result = _tmp3_;
 #line 335 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 491 "Resources.c"
+#line 490 "Resources.c"
 }
 
 
@@ -529,7 +528,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 	_tmp0__length1 = names_length1;
 #line 339 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0__length1 == 1) {
-#line 505 "Resources.c"
+#line 504 "Resources.c"
 		const gchar* _tmp1_ = NULL;
 		gchar** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
@@ -560,7 +559,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 		result = _tmp7_;
 #line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 536 "Resources.c"
+#line 535 "Resources.c"
 	} else {
 		gchar** _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
@@ -570,7 +569,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 		_tmp8__length1 = names_length1;
 #line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp8__length1 == 2) {
-#line 546 "Resources.c"
+#line 545 "Resources.c"
 			const gchar* _tmp9_ = NULL;
 			gchar** _tmp10_ = NULL;
 			gint _tmp10__length1 = 0;
@@ -618,7 +617,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 			result = _tmp19_;
 #line 343 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 594 "Resources.c"
+#line 593 "Resources.c"
 		} else {
 			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
@@ -630,7 +629,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 			result = _tmp21_;
 #line 348 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 606 "Resources.c"
+#line 605 "Resources.c"
 		}
 	}
 }
@@ -653,7 +652,7 @@ gchar* resources_delete_tag_menu (const gchar* name) {
 	result = _tmp2_;
 #line 353 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 629 "Resources.c"
+#line 628 "Resources.c"
 }
 
 
@@ -674,7 +673,7 @@ gchar* resources_delete_tag_label (const gchar* name) {
 	result = _tmp2_;
 #line 357 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 650 "Resources.c"
+#line 649 "Resources.c"
 }
 
 
@@ -695,7 +694,7 @@ gchar* resources_rename_tag_menu (const gchar* name) {
 	result = _tmp2_;
 #line 366 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 671 "Resources.c"
+#line 670 "Resources.c"
 }
 
 
@@ -721,163 +720,103 @@ gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name)
 	result = _tmp3_;
 #line 370 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 697 "Resources.c"
+#line 696 "Resources.c"
 }
 
 
 gchar* resources_tag_photos_label (const gchar* name, gint count) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	gint _tmp0_ = 0;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
 #line 378 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = count;
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (_tmp1_ == 1) {
-#line 713 "Resources.c"
-		const gchar* _tmp2_ = NULL;
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp2_ = _ ("Tag Photo as “%s”");
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp0_ = _tmp2_;
-#line 719 "Resources.c"
-	} else {
-		const gchar* _tmp3_ = NULL;
+	_tmp0_ = count;
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp3_ = _ ("Tag Photos as “%s”");
+	_tmp1_ = ngettext ("Tag Photo as “%s”", "Tag Photos as “%s”", (gulong) _tmp0_);
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp0_ = _tmp3_;
-#line 726 "Resources.c"
-	}
+	_tmp2_ = name;
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = name;
+	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = g_strdup_printf (_tmp0_, _tmp4_);
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp5_;
+	result = _tmp3_;
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 736 "Resources.c"
+#line 720 "Resources.c"
 }
 
 
 gchar* resources_tag_photos_tooltip (const gchar* name, gint count) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-#line 382 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
-#line 383 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = count;
-#line 383 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (_tmp1_ == 1) {
-#line 752 "Resources.c"
-		const gchar* _tmp2_ = NULL;
-#line 383 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp2_ = _ ("Tag the selected photo as “%s”");
-#line 383 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp0_ = _tmp2_;
-#line 758 "Resources.c"
-	} else {
-		const gchar* _tmp3_ = NULL;
-#line 384 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp3_ = _ ("Tag the selected photos as “%s”");
+	gint _tmp0_ = 0;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
 #line 384 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp0_ = _tmp3_;
-#line 765 "Resources.c"
-	}
-#line 383 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = name;
-#line 383 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = g_strdup_printf (_tmp0_, _tmp4_);
-#line 383 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp5_;
-#line 383 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp0_ = count;
+#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp1_ = ngettext ("Tag the selected photo as “%s”", "Tag the selected photos as “%s”", (gulong) _tmp0_);
+#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp2_ = name;
+#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
+#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+	result = _tmp3_;
+#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 775 "Resources.c"
+#line 744 "Resources.c"
 }
 
 
 gchar* resources_untag_photos_menu (const gchar* name, gint count) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-#line 387 "/home/jens/Source/shotwell/src/Resources.vala"
+	gint _tmp0_ = 0;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#line 390 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 388 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = count;
-#line 388 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (_tmp1_ == 1) {
-#line 791 "Resources.c"
-		const gchar* _tmp2_ = NULL;
-#line 388 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp2_ = _ ("Remove Tag “%s” From _Photo");
-#line 388 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp0_ = _tmp2_;
-#line 797 "Resources.c"
-	} else {
-		const gchar* _tmp3_ = NULL;
-#line 389 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp3_ = _ ("Remove Tag “%s” From _Photos");
-#line 389 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp0_ = _tmp3_;
-#line 804 "Resources.c"
-	}
-#line 388 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = name;
-#line 388 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = g_strdup_printf (_tmp0_, _tmp4_);
-#line 388 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp5_;
-#line 388 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp0_ = count;
+#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp1_ = ngettext ("Remove Tag “%s” From _Photo", "Remove Tag “%s” From _Photos", (gulong) _tmp0_);
+#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp2_ = name;
+#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
+#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+	result = _tmp3_;
+#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 814 "Resources.c"
+#line 768 "Resources.c"
 }
 
 
 gchar* resources_untag_photos_label (const gchar* name, gint count) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
+	gint _tmp0_ = 0;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#line 396 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 393 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = count;
-#line 393 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (_tmp1_ == 1) {
-#line 830 "Resources.c"
-		const gchar* _tmp2_ = NULL;
-#line 393 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp2_ = _ ("Remove Tag “%s” From Photo");
-#line 393 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp0_ = _tmp2_;
-#line 836 "Resources.c"
-	} else {
-		const gchar* _tmp3_ = NULL;
-#line 394 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp3_ = _ ("Remove Tag “%s” From Photos");
-#line 394 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp0_ = _tmp3_;
-#line 843 "Resources.c"
-	}
-#line 393 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = name;
-#line 393 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = g_strdup_printf (_tmp0_, _tmp4_);
-#line 393 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp5_;
-#line 393 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp0_ = count;
+#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp1_ = ngettext ("Remove Tag “%s” From Photo", "Remove Tag “%s” From Photos", (gulong) _tmp0_);
+#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp2_ = name;
+#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
+#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+	result = _tmp3_;
+#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 853 "Resources.c"
+#line 792 "Resources.c"
 }
 
 
@@ -886,19 +825,19 @@ gchar* resources_rename_tag_exists_message (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 402 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Unable to rename tag to “%s” because the tag already exists.");
-#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 874 "Resources.c"
+#line 813 "Resources.c"
 }
 
 
@@ -907,19 +846,19 @@ gchar* resources_rename_search_exists_message (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 401 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 406 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 402 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Unable to rename search to “%s” because the search already exists.");
-#line 402 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 402 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 402 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 402 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 895 "Resources.c"
+#line 834 "Resources.c"
 }
 
 
@@ -929,23 +868,23 @@ gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_na
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 413 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 418 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (old_name != NULL, NULL);
-#line 413 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 418 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (new_name != NULL, NULL);
-#line 414 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Rename Search “%s” to “%s”");
-#line 414 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = old_name;
-#line 414 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = new_name;
-#line 414 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp1_, _tmp2_);
-#line 414 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 414 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 921 "Resources.c"
+#line 860 "Resources.c"
 }
 
 
@@ -954,225 +893,121 @@ gchar* resources_delete_search_label (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 417 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 422 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 418 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Delete Search “%s”");
-#line 418 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 418 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 418 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 418 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 942 "Resources.c"
-}
-
-
-const gchar* resources_rating_menu (Rating rating) {
-	const gchar* result = NULL;
-	Rating _tmp0_ = 0;
-#line 422 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = rating;
-#line 422 "/home/jens/Source/shotwell/src/Resources.vala"
-	switch (_tmp0_) {
-#line 422 "/home/jens/Source/shotwell/src/Resources.vala"
-		case RATING_REJECTED:
-#line 955 "Resources.c"
-		{
-#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
-			result = RESOURCES_RATE_REJECTED_MENU;
-#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
-			return result;
-#line 961 "Resources.c"
-		}
-#line 422 "/home/jens/Source/shotwell/src/Resources.vala"
-		case RATING_UNRATED:
-#line 965 "Resources.c"
-		{
-#line 426 "/home/jens/Source/shotwell/src/Resources.vala"
-			result = RESOURCES_RATE_UNRATED_MENU;
-#line 426 "/home/jens/Source/shotwell/src/Resources.vala"
-			return result;
-#line 971 "Resources.c"
-		}
-#line 422 "/home/jens/Source/shotwell/src/Resources.vala"
-		case RATING_ONE:
-#line 975 "Resources.c"
-		{
-			const gchar* _tmp1_ = NULL;
-#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp1_ = resources_RATE_ONE_MENU;
-#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
-			result = _tmp1_;
-#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
-			return result;
-#line 984 "Resources.c"
-		}
-#line 422 "/home/jens/Source/shotwell/src/Resources.vala"
-		case RATING_TWO:
-#line 988 "Resources.c"
-		{
-			const gchar* _tmp2_ = NULL;
-#line 430 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp2_ = resources_RATE_TWO_MENU;
-#line 430 "/home/jens/Source/shotwell/src/Resources.vala"
-			result = _tmp2_;
-#line 430 "/home/jens/Source/shotwell/src/Resources.vala"
-			return result;
-#line 997 "Resources.c"
-		}
-#line 422 "/home/jens/Source/shotwell/src/Resources.vala"
-		case RATING_THREE:
-#line 1001 "Resources.c"
-		{
-			const gchar* _tmp3_ = NULL;
-#line 432 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp3_ = resources_RATE_THREE_MENU;
-#line 432 "/home/jens/Source/shotwell/src/Resources.vala"
-			result = _tmp3_;
-#line 432 "/home/jens/Source/shotwell/src/Resources.vala"
-			return result;
-#line 1010 "Resources.c"
-		}
-#line 422 "/home/jens/Source/shotwell/src/Resources.vala"
-		case RATING_FOUR:
-#line 1014 "Resources.c"
-		{
-			const gchar* _tmp4_ = NULL;
-#line 434 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp4_ = resources_RATE_FOUR_MENU;
-#line 434 "/home/jens/Source/shotwell/src/Resources.vala"
-			result = _tmp4_;
-#line 434 "/home/jens/Source/shotwell/src/Resources.vala"
-			return result;
-#line 1023 "Resources.c"
-		}
-#line 422 "/home/jens/Source/shotwell/src/Resources.vala"
-		case RATING_FIVE:
-#line 1027 "Resources.c"
-		{
-			const gchar* _tmp5_ = NULL;
-#line 436 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp5_ = resources_RATE_FIVE_MENU;
-#line 436 "/home/jens/Source/shotwell/src/Resources.vala"
-			result = _tmp5_;
-#line 436 "/home/jens/Source/shotwell/src/Resources.vala"
-			return result;
-#line 1036 "Resources.c"
-		}
-		default:
-		{
-#line 438 "/home/jens/Source/shotwell/src/Resources.vala"
-			result = RESOURCES_RATE_UNRATED_MENU;
-#line 438 "/home/jens/Source/shotwell/src/Resources.vala"
-			return result;
-#line 1044 "Resources.c"
-		}
-	}
+#line 881 "Resources.c"
 }
 
 
 const gchar* resources_rating_label (Rating rating) {
 	const gchar* result = NULL;
 	Rating _tmp0_ = 0;
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1059 "Resources.c"
+#line 894 "Resources.c"
 		{
-#line 445 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 429 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_REJECTED_LABEL;
-#line 445 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 429 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1065 "Resources.c"
+#line 900 "Resources.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 1069 "Resources.c"
+#line 904 "Resources.c"
 		{
-#line 447 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 431 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_LABEL;
-#line 447 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 431 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1075 "Resources.c"
+#line 910 "Resources.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1079 "Resources.c"
+#line 914 "Resources.c"
 		{
 			const gchar* _tmp1_ = NULL;
-#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 433 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = resources_RATE_ONE_LABEL;
-#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 433 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 433 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1088 "Resources.c"
+#line 923 "Resources.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1092 "Resources.c"
+#line 927 "Resources.c"
 		{
 			const gchar* _tmp2_ = NULL;
-#line 451 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 435 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_RATE_TWO_LABEL;
-#line 451 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 435 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 451 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 435 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1101 "Resources.c"
+#line 936 "Resources.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1105 "Resources.c"
+#line 940 "Resources.c"
 		{
 			const gchar* _tmp3_ = NULL;
-#line 453 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 437 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = resources_RATE_THREE_LABEL;
-#line 453 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 437 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
-#line 453 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 437 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1114 "Resources.c"
+#line 949 "Resources.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1118 "Resources.c"
+#line 953 "Resources.c"
 		{
 			const gchar* _tmp4_ = NULL;
-#line 455 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 439 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_RATE_FOUR_LABEL;
-#line 455 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 439 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 455 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 439 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1127 "Resources.c"
+#line 962 "Resources.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1131 "Resources.c"
+#line 966 "Resources.c"
 		{
 			const gchar* _tmp5_ = NULL;
-#line 457 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 441 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = resources_RATE_FIVE_LABEL;
-#line 457 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 441 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
-#line 457 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 441 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1140 "Resources.c"
+#line 975 "Resources.c"
 		}
 		default:
 		{
-#line 459 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_LABEL;
-#line 459 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1148 "Resources.c"
+#line 983 "Resources.c"
 		}
 	}
 }
@@ -1181,102 +1016,102 @@ const gchar* resources_rating_label (Rating rating) {
 const gchar* resources_rating_combo_box (Rating rating) {
 	const gchar* result = NULL;
 	Rating _tmp0_ = 0;
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1163 "Resources.c"
+#line 998 "Resources.c"
 		{
-#line 466 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 450 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_REJECTED_COMBO_BOX;
-#line 466 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 450 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1169 "Resources.c"
+#line 1004 "Resources.c"
 		}
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 1173 "Resources.c"
+#line 1008 "Resources.c"
 		{
-#line 468 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 452 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_COMBO_BOX;
-#line 468 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 452 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1179 "Resources.c"
+#line 1014 "Resources.c"
 		}
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1183 "Resources.c"
+#line 1018 "Resources.c"
 		{
 			const gchar* _tmp1_ = NULL;
-#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 454 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = resources_RATE_ONE_MENU;
-#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 454 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 454 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1192 "Resources.c"
+#line 1027 "Resources.c"
 		}
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1196 "Resources.c"
+#line 1031 "Resources.c"
 		{
 			const gchar* _tmp2_ = NULL;
-#line 472 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 456 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_RATE_TWO_MENU;
-#line 472 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 456 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 472 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 456 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1205 "Resources.c"
+#line 1040 "Resources.c"
 		}
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1209 "Resources.c"
+#line 1044 "Resources.c"
 		{
 			const gchar* _tmp3_ = NULL;
-#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 458 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = resources_RATE_THREE_MENU;
-#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 458 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
-#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 458 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1218 "Resources.c"
+#line 1053 "Resources.c"
 		}
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1222 "Resources.c"
+#line 1057 "Resources.c"
 		{
 			const gchar* _tmp4_ = NULL;
-#line 476 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 460 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_RATE_FOUR_MENU;
-#line 476 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 460 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 476 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 460 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1231 "Resources.c"
+#line 1066 "Resources.c"
 		}
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1235 "Resources.c"
+#line 1070 "Resources.c"
 		{
 			const gchar* _tmp5_ = NULL;
-#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 462 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = resources_RATE_FIVE_MENU;
-#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 462 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
-#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 462 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1244 "Resources.c"
+#line 1079 "Resources.c"
 		}
 		default:
 		{
-#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_MENU;
-#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1252 "Resources.c"
+#line 1087 "Resources.c"
 		}
 	}
 }
@@ -1285,131 +1120,131 @@ const gchar* resources_rating_combo_box (Rating rating) {
 gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 	gchar* result = NULL;
 	RatingFilter _tmp0_ = 0;
-#line 485 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = filter;
-#line 485 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 485 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1267 "Resources.c"
+#line 1102 "Resources.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 471 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup (RESOURCES_DISPLAY_REJECTED_OR_HIGHER_TOOLTIP);
-#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 471 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 471 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1276 "Resources.c"
+#line 1111 "Resources.c"
 		}
-#line 485 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1280 "Resources.c"
+#line 1115 "Resources.c"
 		{
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP;
-#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
-#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1292 "Resources.c"
+#line 1127 "Resources.c"
 		}
-#line 485 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1296 "Resources.c"
+#line 1131 "Resources.c"
 		{
 			const gchar* _tmp4_ = NULL;
 			gchar* _tmp5_ = NULL;
-#line 493 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 477 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP;
-#line 493 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 477 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = g_strdup (_tmp4_);
-#line 493 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 477 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
-#line 493 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 477 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1308 "Resources.c"
+#line 1143 "Resources.c"
 		}
-#line 485 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1312 "Resources.c"
+#line 1147 "Resources.c"
 		{
 			const gchar* _tmp6_ = NULL;
 			gchar* _tmp7_ = NULL;
-#line 496 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP;
-#line 496 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = g_strdup (_tmp6_);
-#line 496 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp7_;
-#line 496 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1324 "Resources.c"
+#line 1159 "Resources.c"
 		}
-#line 485 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1328 "Resources.c"
+#line 1163 "Resources.c"
 		{
 			const gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 483 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP;
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 483 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = g_strdup (_tmp8_);
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 483 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp9_;
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 483 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1340 "Resources.c"
+#line 1175 "Resources.c"
 		}
-#line 485 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 485 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1346 "Resources.c"
+#line 1181 "Resources.c"
 		{
 			const gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
-#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP;
-#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = g_strdup (_tmp10_);
-#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp11_;
-#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1358 "Resources.c"
+#line 1193 "Resources.c"
 		}
-#line 485 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 1362 "Resources.c"
+#line 1197 "Resources.c"
 		{
 			gchar* _tmp12_ = NULL;
-#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = g_strdup (RESOURCES_DISPLAY_REJECTED_ONLY_TOOLTIP);
-#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp12_;
-#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1371 "Resources.c"
+#line 1206 "Resources.c"
 		}
 		default:
-#line 485 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1376 "Resources.c"
+#line 1211 "Resources.c"
 		{
 			gchar* _tmp13_ = NULL;
-#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 494 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp13_ = g_strdup (RESOURCES_DISPLAY_UNRATED_OR_HIGHER_TOOLTIP);
-#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 494 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp13_;
-#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 494 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1385 "Resources.c"
+#line 1220 "Resources.c"
 		}
 	}
 }
@@ -1418,126 +1253,126 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 gchar* resources_rating_progress (Rating rating) {
 	gchar* result = NULL;
 	Rating _tmp0_ = 0;
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1400 "Resources.c"
+#line 1235 "Resources.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 517 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 501 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup (RESOURCES_RATE_REJECTED_PROGRESS);
-#line 517 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 501 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 517 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 501 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1409 "Resources.c"
+#line 1244 "Resources.c"
 		}
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 1413 "Resources.c"
+#line 1248 "Resources.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 519 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS);
-#line 519 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 519 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1422 "Resources.c"
+#line 1257 "Resources.c"
 		}
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1426 "Resources.c"
+#line 1261 "Resources.c"
 		{
 			const gchar* _tmp3_ = NULL;
 			gchar* _tmp4_ = NULL;
-#line 521 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 505 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = resources_RATE_ONE_PROGRESS;
-#line 521 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 505 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = g_strdup (_tmp3_);
-#line 521 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 505 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 521 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 505 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1438 "Resources.c"
+#line 1273 "Resources.c"
 		}
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1442 "Resources.c"
+#line 1277 "Resources.c"
 		{
 			const gchar* _tmp5_ = NULL;
 			gchar* _tmp6_ = NULL;
-#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 507 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = resources_RATE_TWO_PROGRESS;
-#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 507 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = g_strdup (_tmp5_);
-#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 507 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp6_;
-#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 507 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1454 "Resources.c"
+#line 1289 "Resources.c"
 		}
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1458 "Resources.c"
+#line 1293 "Resources.c"
 		{
 			const gchar* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
-#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 509 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = resources_RATE_THREE_PROGRESS;
-#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 509 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = g_strdup (_tmp7_);
-#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 509 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp8_;
-#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 509 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1470 "Resources.c"
+#line 1305 "Resources.c"
 		}
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1474 "Resources.c"
+#line 1309 "Resources.c"
 		{
 			const gchar* _tmp9_ = NULL;
 			gchar* _tmp10_ = NULL;
-#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 511 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = resources_RATE_FOUR_PROGRESS;
-#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 511 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = g_strdup (_tmp9_);
-#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 511 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp10_;
-#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 511 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1486 "Resources.c"
+#line 1321 "Resources.c"
 		}
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1490 "Resources.c"
+#line 1325 "Resources.c"
 		{
 			const gchar* _tmp11_ = NULL;
 			gchar* _tmp12_ = NULL;
-#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 513 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = resources_RATE_FIVE_PROGRESS;
-#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 513 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = g_strdup (_tmp11_);
-#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 513 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp12_;
-#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 513 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1502 "Resources.c"
+#line 1337 "Resources.c"
 		}
 		default:
 		{
 			gchar* _tmp13_ = NULL;
-#line 531 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp13_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS);
-#line 531 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp13_;
-#line 531 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1513 "Resources.c"
+#line 1348 "Resources.c"
 		}
 	}
 }
@@ -1546,85 +1381,85 @@ gchar* resources_rating_progress (Rating rating) {
 gchar* resources_get_stars (Rating rating) {
 	gchar* result = NULL;
 	Rating _tmp0_ = 0;
-#line 538 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 538 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 538 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1528 "Resources.c"
+#line 1363 "Resources.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 524 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup ("\xE2\x98\x85");
-#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 524 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 524 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1537 "Resources.c"
+#line 1372 "Resources.c"
 		}
-#line 538 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1541 "Resources.c"
+#line 1376 "Resources.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 526 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85");
-#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 526 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 526 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1550 "Resources.c"
+#line 1385 "Resources.c"
 		}
-#line 538 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1554 "Resources.c"
+#line 1389 "Resources.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 528 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
-#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 528 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
-#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 528 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1563 "Resources.c"
+#line 1398 "Resources.c"
 		}
-#line 538 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1567 "Resources.c"
+#line 1402 "Resources.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 530 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
-#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 530 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 530 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1576 "Resources.c"
+#line 1411 "Resources.c"
 		}
-#line 538 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1580 "Resources.c"
+#line 1415 "Resources.c"
 		{
 			gchar* _tmp5_ = NULL;
-#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 532 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
-#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 532 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
-#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 532 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1589 "Resources.c"
+#line 1424 "Resources.c"
 		}
 		default:
 		{
 			gchar* _tmp6_ = NULL;
-#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 534 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = g_strdup ("");
-#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 534 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp6_;
-#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 534 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1600 "Resources.c"
+#line 1435 "Resources.c"
 		}
 	}
 }
@@ -1633,113 +1468,113 @@ gchar* resources_get_stars (Rating rating) {
 GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 	GdkPixbuf* result = NULL;
 	Rating _tmp0_ = 0;
-#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1615 "Resources.c"
+#line 1450 "Resources.c"
 		{
 			gint _tmp1_ = 0;
 			GdkPixbuf* _tmp2_ = NULL;
-#line 557 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 541 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = scale;
-#line 557 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 541 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_get_icon (RESOURCES_ICON_RATING_REJECTED, _tmp1_);
-#line 557 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 541 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 557 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 541 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1627 "Resources.c"
+#line 1462 "Resources.c"
 		}
-#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1631 "Resources.c"
+#line 1466 "Resources.c"
 		{
 			gint _tmp3_ = 0;
 			GdkPixbuf* _tmp4_ = NULL;
-#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = scale;
-#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_get_icon (RESOURCES_ICON_RATING_ONE, _tmp3_);
-#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1643 "Resources.c"
+#line 1478 "Resources.c"
 		}
-#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1647 "Resources.c"
+#line 1482 "Resources.c"
 		{
 			gint _tmp5_ = 0;
 			GdkPixbuf* _tmp6_ = NULL;
-#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = scale;
-#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = resources_get_icon (RESOURCES_ICON_RATING_TWO, _tmp5_ * 2);
-#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp6_;
-#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1659 "Resources.c"
+#line 1494 "Resources.c"
 		}
-#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1663 "Resources.c"
+#line 1498 "Resources.c"
 		{
 			gint _tmp7_ = 0;
 			GdkPixbuf* _tmp8_ = NULL;
-#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = scale;
-#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = resources_get_icon (RESOURCES_ICON_RATING_THREE, _tmp7_ * 3);
-#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp8_;
-#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1675 "Resources.c"
+#line 1510 "Resources.c"
 		}
-#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1679 "Resources.c"
+#line 1514 "Resources.c"
 		{
 			gint _tmp9_ = 0;
 			GdkPixbuf* _tmp10_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = scale;
-#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = resources_get_icon (RESOURCES_ICON_RATING_FOUR, _tmp9_ * 4);
-#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp10_;
-#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1691 "Resources.c"
+#line 1526 "Resources.c"
 		}
-#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1695 "Resources.c"
+#line 1530 "Resources.c"
 		{
 			gint _tmp11_ = 0;
 			GdkPixbuf* _tmp12_ = NULL;
-#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 552 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = scale;
-#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 552 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = resources_get_icon (RESOURCES_ICON_RATING_FIVE, _tmp11_ * 5);
-#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 552 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp12_;
-#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 552 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1707 "Resources.c"
+#line 1542 "Resources.c"
 		}
 		default:
 		{
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 554 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = NULL;
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 554 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1715 "Resources.c"
+#line 1550 "Resources.c"
 		}
 	}
 }
@@ -1879,503 +1714,503 @@ void resources_generate_rating_strings (void) {
 	gchar* _tmp120_ = NULL;
 	gchar* _tmp121_ = NULL;
 	gchar* _tmp122_ = NULL;
-#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = g_strdup ("%s");
-#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	menu_base = _tmp0_;
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _ ("Rate %s");
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
 	label_base = _tmp2_;
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 561 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _ ("Set rating to %s");
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 561 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 561 "/home/jens/Source/shotwell/src/Resources.vala"
 	tooltip_base = _tmp4_;
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _ ("Setting rating to %s");
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
 	progress_base = _tmp6_;
-#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 563 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = g_strdup ("%s");
-#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 563 "/home/jens/Source/shotwell/src/Resources.vala"
 	display_rating_menu_base = _tmp7_;
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp8_ = _ ("Display %s");
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_strdup (_tmp8_);
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
 	display_rating_label_base = _tmp9_;
-#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 565 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = _ ("Only show photos with a rating of %s");
-#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 565 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = g_strdup (_tmp10_);
-#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 565 "/home/jens/Source/shotwell/src/Resources.vala"
 	display_rating_tooltip_base = _tmp11_;
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = _ ("%s or Better");
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp13_ = g_strdup (_tmp12_);
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
 	display_rating_or_higher_menu_base = _tmp13_;
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 567 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp14_ = _ ("Display %s or Better");
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 567 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp15_ = g_strdup (_tmp14_);
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 567 "/home/jens/Source/shotwell/src/Resources.vala"
 	display_rating_or_higher_label_base = _tmp15_;
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp16_ = _ ("Only show photos with a rating of %s or better");
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp17_ = g_strdup (_tmp16_);
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
 	display_rating_or_higher_tooltip_base = _tmp17_;
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = resources_get_stars (RATING_ONE);
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp19_ = _tmp18_;
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp20_ = g_strdup_printf (menu_base, _tmp19_);
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_MENU);
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_ONE_MENU = _tmp20_;
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp19_);
-#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp21_ = resources_get_stars (RATING_TWO);
-#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = _tmp21_;
-#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp23_ = g_strdup_printf (menu_base, _tmp22_);
-#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_MENU);
-#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_TWO_MENU = _tmp23_;
-#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp22_);
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp24_ = resources_get_stars (RATING_THREE);
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp25_ = _tmp24_;
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp26_ = g_strdup_printf (menu_base, _tmp25_);
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_MENU);
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_THREE_MENU = _tmp26_;
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp25_);
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp27_ = resources_get_stars (RATING_FOUR);
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp28_ = _tmp27_;
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp29_ = g_strdup_printf (menu_base, _tmp28_);
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_MENU);
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FOUR_MENU = _tmp29_;
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp28_);
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp30_ = resources_get_stars (RATING_FIVE);
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp31_ = _tmp30_;
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp32_ = g_strdup_printf (menu_base, _tmp31_);
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_MENU);
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FIVE_MENU = _tmp32_;
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp31_);
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp33_ = resources_get_stars (RATING_ONE);
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp34_ = _tmp33_;
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp35_ = g_strdup_printf (label_base, _tmp34_);
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_LABEL);
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_ONE_LABEL = _tmp35_;
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp34_);
-#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp36_ = resources_get_stars (RATING_TWO);
-#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp37_ = _tmp36_;
-#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp38_ = g_strdup_printf (label_base, _tmp37_);
-#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_LABEL);
-#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_TWO_LABEL = _tmp38_;
-#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp37_);
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp39_ = resources_get_stars (RATING_THREE);
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp40_ = _tmp39_;
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp41_ = g_strdup_printf (label_base, _tmp40_);
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_LABEL);
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_THREE_LABEL = _tmp41_;
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp40_);
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp42_ = resources_get_stars (RATING_FOUR);
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp43_ = _tmp42_;
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp44_ = g_strdup_printf (label_base, _tmp43_);
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_LABEL);
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FOUR_LABEL = _tmp44_;
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp43_);
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp45_ = resources_get_stars (RATING_FIVE);
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp46_ = _tmp45_;
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp47_ = g_strdup_printf (label_base, _tmp46_);
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_LABEL);
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FIVE_LABEL = _tmp47_;
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp46_);
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp48_ = resources_get_stars (RATING_ONE);
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp49_ = _tmp48_;
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp50_ = g_strdup_printf (tooltip_base, _tmp49_);
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_TOOLTIP);
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_ONE_TOOLTIP = _tmp50_;
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp49_);
-#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp51_ = resources_get_stars (RATING_TWO);
-#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp52_ = _tmp51_;
-#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp53_ = g_strdup_printf (tooltip_base, _tmp52_);
-#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_TOOLTIP);
-#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_TWO_TOOLTIP = _tmp53_;
-#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp52_);
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp54_ = resources_get_stars (RATING_THREE);
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp55_ = _tmp54_;
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp56_ = g_strdup_printf (tooltip_base, _tmp55_);
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_TOOLTIP);
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_THREE_TOOLTIP = _tmp56_;
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp55_);
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp57_ = resources_get_stars (RATING_FOUR);
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp58_ = _tmp57_;
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp59_ = g_strdup_printf (tooltip_base, _tmp58_);
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_TOOLTIP);
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FOUR_TOOLTIP = _tmp59_;
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp58_);
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp60_ = resources_get_stars (RATING_FIVE);
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp61_ = _tmp60_;
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp62_ = g_strdup_printf (tooltip_base, _tmp61_);
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_TOOLTIP);
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FIVE_TOOLTIP = _tmp62_;
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp61_);
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp63_ = resources_get_stars (RATING_ONE);
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp64_ = _tmp63_;
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp65_ = g_strdup_printf (progress_base, _tmp64_);
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_PROGRESS);
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_ONE_PROGRESS = _tmp65_;
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp64_);
-#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp66_ = resources_get_stars (RATING_TWO);
-#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp67_ = _tmp66_;
-#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp68_ = g_strdup_printf (progress_base, _tmp67_);
-#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_PROGRESS);
-#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_TWO_PROGRESS = _tmp68_;
-#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp67_);
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp69_ = resources_get_stars (RATING_THREE);
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp70_ = _tmp69_;
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp71_ = g_strdup_printf (progress_base, _tmp70_);
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_PROGRESS);
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_THREE_PROGRESS = _tmp71_;
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp70_);
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp72_ = resources_get_stars (RATING_FOUR);
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp73_ = _tmp72_;
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp74_ = g_strdup_printf (progress_base, _tmp73_);
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_PROGRESS);
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FOUR_PROGRESS = _tmp74_;
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp73_);
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp75_ = resources_get_stars (RATING_FIVE);
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp76_ = _tmp75_;
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp77_ = g_strdup_printf (progress_base, _tmp76_);
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_PROGRESS);
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FIVE_PROGRESS = _tmp77_;
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp76_);
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp78_ = resources_get_stars (RATING_ONE);
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp79_ = _tmp78_;
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp80_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp79_);
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_ONE_OR_HIGHER_MENU);
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_ONE_OR_HIGHER_MENU = _tmp80_;
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp79_);
-#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp81_ = resources_get_stars (RATING_TWO);
-#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp82_ = _tmp81_;
-#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp83_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp82_);
-#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_TWO_OR_HIGHER_MENU);
-#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_TWO_OR_HIGHER_MENU = _tmp83_;
-#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp82_);
-#line 612 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp84_ = resources_get_stars (RATING_THREE);
-#line 612 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp85_ = _tmp84_;
-#line 612 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp86_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp85_);
-#line 612 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_THREE_OR_HIGHER_MENU);
-#line 612 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_THREE_OR_HIGHER_MENU = _tmp86_;
-#line 612 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp85_);
-#line 613 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp87_ = resources_get_stars (RATING_FOUR);
-#line 613 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp88_ = _tmp87_;
-#line 613 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp89_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp88_);
-#line 613 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FOUR_OR_HIGHER_MENU);
-#line 613 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FOUR_OR_HIGHER_MENU = _tmp89_;
-#line 613 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp88_);
-#line 614 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp90_ = resources_get_stars (RATING_FIVE);
-#line 614 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp91_ = _tmp90_;
-#line 614 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp92_ = g_strdup_printf (display_rating_menu_base, _tmp91_);
-#line 614 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FIVE_OR_HIGHER_MENU);
-#line 614 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FIVE_OR_HIGHER_MENU = _tmp92_;
-#line 614 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp91_);
-#line 616 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp93_ = resources_get_stars (RATING_ONE);
-#line 616 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp94_ = _tmp93_;
-#line 616 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp95_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp94_);
-#line 616 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_ONE_OR_HIGHER_LABEL);
-#line 616 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_ONE_OR_HIGHER_LABEL = _tmp95_;
-#line 616 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp94_);
-#line 617 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp96_ = resources_get_stars (RATING_TWO);
-#line 617 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp97_ = _tmp96_;
-#line 617 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp98_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp97_);
-#line 617 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_TWO_OR_HIGHER_LABEL);
-#line 617 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_TWO_OR_HIGHER_LABEL = _tmp98_;
-#line 617 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp97_);
-#line 618 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp99_ = resources_get_stars (RATING_THREE);
-#line 618 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp100_ = _tmp99_;
-#line 618 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp101_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp100_);
-#line 618 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_THREE_OR_HIGHER_LABEL);
-#line 618 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_THREE_OR_HIGHER_LABEL = _tmp101_;
-#line 618 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp100_);
-#line 619 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp102_ = resources_get_stars (RATING_FOUR);
-#line 619 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp103_ = _tmp102_;
-#line 619 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp104_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp103_);
-#line 619 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FOUR_OR_HIGHER_LABEL);
-#line 619 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FOUR_OR_HIGHER_LABEL = _tmp104_;
-#line 619 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp103_);
-#line 620 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp105_ = resources_get_stars (RATING_FIVE);
-#line 620 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp106_ = _tmp105_;
-#line 620 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp107_ = g_strdup_printf (display_rating_label_base, _tmp106_);
-#line 620 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FIVE_OR_HIGHER_LABEL);
-#line 620 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FIVE_OR_HIGHER_LABEL = _tmp107_;
-#line 620 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp106_);
-#line 622 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp108_ = resources_get_stars (RATING_ONE);
-#line 622 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp109_ = _tmp108_;
-#line 622 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp110_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp109_);
-#line 622 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP);
-#line 622 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP = _tmp110_;
-#line 622 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp109_);
-#line 623 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp111_ = resources_get_stars (RATING_TWO);
-#line 623 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp112_ = _tmp111_;
-#line 623 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp113_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp112_);
-#line 623 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP);
-#line 623 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP = _tmp113_;
-#line 623 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp112_);
-#line 624 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp114_ = resources_get_stars (RATING_THREE);
-#line 624 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp115_ = _tmp114_;
-#line 624 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp116_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp115_);
-#line 624 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP);
-#line 624 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP = _tmp116_;
-#line 624 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp115_);
-#line 625 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp117_ = resources_get_stars (RATING_FOUR);
-#line 625 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp118_ = _tmp117_;
-#line 625 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp119_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp118_);
-#line 625 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP);
-#line 625 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP = _tmp119_;
-#line 625 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp118_);
-#line 626 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp120_ = resources_get_stars (RATING_FIVE);
-#line 626 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp121_ = _tmp120_;
-#line 626 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp122_ = g_strdup_printf (display_rating_tooltip_base, _tmp121_);
-#line 626 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP);
-#line 626 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP = _tmp122_;
-#line 626 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp121_);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_or_higher_tooltip_base);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_or_higher_label_base);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_or_higher_menu_base);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_tooltip_base);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_label_base);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_menu_base);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (progress_base);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (tooltip_base);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (label_base);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (menu_base);
-#line 2351 "Resources.c"
+#line 2186 "Resources.c"
 }
 
 
@@ -2385,26 +2220,26 @@ gchar* resources_jump_to_file_failed (GError* err) {
 	GError* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 685 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Unable to open in file manager: %s");
-#line 685 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = err;
-#line 685 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = _tmp1_->message;
-#line 685 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 685 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 685 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2373 "Resources.c"
+#line 2208 "Resources.c"
 }
 
 
 static void _dim_pixbuf_resources_add_stock_icon_modify (GdkPixbuf* pixbuf, gpointer self) {
-#line 726 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	dim_pixbuf (pixbuf);
-#line 2380 "Resources.c"
+#line 2215 "Resources.c"
 }
 
 
@@ -2450,169 +2285,169 @@ void resources_init (void) {
 	GThemedIcon* _tmp37_ = NULL;
 	GThemedIcon* _tmp38_ = NULL;
 	GtkIconFactory* _tmp39_ = NULL;
-#line 709 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = gtk_icon_factory_new ();
-#line 709 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (resources_factory);
-#line 709 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_factory = _tmp0_;
-#line 711 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 695 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = app_dirs_get_resources_dir ();
-#line 711 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 695 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = _tmp1_;
-#line 711 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 695 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_file_get_child (_tmp2_, "icons");
-#line 711 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 695 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = _tmp3_;
-#line 711 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 695 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp2_);
-#line 711 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 695 "/home/jens/Source/shotwell/src/Resources.vala"
 	icons_dir = _tmp4_;
-#line 712 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 696 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = g_file_get_child (icons_dir, "crop.svg");
-#line 712 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 696 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = _tmp5_;
-#line 712 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 696 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon (_tmp6_, RESOURCES_CROP);
-#line 712 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 696 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp6_);
-#line 713 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 697 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = g_file_get_child (icons_dir, "redeye.png");
-#line 713 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 697 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp8_ = _tmp7_;
-#line 713 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 697 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon (_tmp8_, RESOURCES_REDEYE);
-#line 713 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 697 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp8_);
-#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 698 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_file_get_child (icons_dir, "make-primary.svg");
-#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 698 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = _tmp9_;
-#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 698 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon (_tmp10_, RESOURCES_MAKE_PRIMARY);
-#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 698 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp10_);
-#line 715 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 699 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = g_file_get_child (icons_dir, "import.svg");
-#line 715 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 699 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = _tmp11_;
-#line 715 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 699 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon (_tmp12_, RESOURCES_IMPORT);
-#line 715 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 699 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp12_);
-#line 716 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 700 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp13_ = g_file_get_child (icons_dir, "straighten.svg");
-#line 716 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 700 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp14_ = _tmp13_;
-#line 716 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 700 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon (_tmp14_, RESOURCES_STRAIGHTEN);
-#line 716 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 700 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp14_);
-#line 717 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 701 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp15_ = g_file_get_child (icons_dir, "import-all.png");
-#line 717 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 701 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp16_ = _tmp15_;
-#line 717 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 701 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon (_tmp16_, RESOURCES_IMPORT_ALL);
-#line 717 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 701 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp16_);
-#line 718 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 702 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp17_ = g_file_get_child (icons_dir, "shotwell-auto-enhance.png");
-#line 718 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 702 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = _tmp17_;
-#line 718 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 702 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon (_tmp18_, RESOURCES_ENHANCE);
-#line 718 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 702 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp18_);
-#line 719 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 703 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp19_ = g_file_get_child (icons_dir, "crop-pivot-reticle.png");
-#line 719 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 703 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp20_ = _tmp19_;
-#line 719 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 703 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon (_tmp20_, RESOURCES_CROP_PIVOT_RETICLE);
-#line 719 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 703 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp20_);
-#line 720 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 704 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp21_ = g_file_get_child (icons_dir, "merge.svg");
-#line 720 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 704 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = _tmp21_;
-#line 720 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 704 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon (_tmp22_, RESOURCES_MERGE);
-#line 720 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 704 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp22_);
-#line 721 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 705 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp23_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FLAGGED_PAGE);
-#line 721 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 705 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp24_ = _tmp23_;
-#line 721 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 705 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon_from_themed_icon (_tmp24_, RESOURCES_ICON_FLAGGED_PAGE, NULL, NULL);
-#line 721 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 705 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp24_);
-#line 722 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 706 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp25_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_VIDEOS_PAGE);
-#line 722 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 706 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp26_ = _tmp25_;
-#line 722 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 706 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon_from_themed_icon (_tmp26_, RESOURCES_ICON_VIDEOS_PAGE, NULL, NULL);
-#line 722 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 706 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp26_);
-#line 723 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 707 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp27_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_SINGLE_PHOTO);
-#line 723 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 707 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp28_ = _tmp27_;
-#line 723 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 707 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon_from_themed_icon (_tmp28_, RESOURCES_ICON_SINGLE_PHOTO, NULL, NULL);
-#line 723 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 707 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp28_);
-#line 724 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 708 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp29_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_CAMERAS);
-#line 724 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 708 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp30_ = _tmp29_;
-#line 724 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 708 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon_from_themed_icon (_tmp30_, RESOURCES_ICON_CAMERAS, NULL, NULL);
-#line 724 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 708 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp30_);
-#line 726 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp31_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FILTER_FLAGGED);
-#line 726 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp32_ = _tmp31_;
-#line 726 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon_from_themed_icon (_tmp32_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED, _dim_pixbuf_resources_add_stock_icon_modify, NULL);
-#line 726 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp32_);
-#line 728 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 712 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp33_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FILTER_PHOTOS);
-#line 728 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 712 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp34_ = _tmp33_;
-#line 728 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 712 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon_from_themed_icon (_tmp34_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED, _dim_pixbuf_resources_add_stock_icon_modify, NULL);
-#line 728 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 712 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp34_);
-#line 730 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp35_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FILTER_VIDEOS);
-#line 730 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp36_ = _tmp35_;
-#line 730 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon_from_themed_icon (_tmp36_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED, _dim_pixbuf_resources_add_stock_icon_modify, NULL);
-#line 730 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 714 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp36_);
-#line 732 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 716 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp37_ = (GThemedIcon*) g_themed_icon_new (RESOURCES_ICON_FILTER_RAW);
-#line 732 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 716 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp38_ = _tmp37_;
-#line 732 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 716 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_add_stock_icon_from_themed_icon (_tmp38_, RESOURCES_ICON_FILTER_RAW_DISABLED, _dim_pixbuf_resources_add_stock_icon_modify, NULL);
-#line 732 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 716 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp38_);
-#line 735 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 719 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp39_ = resources_factory;
-#line 735 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 719 "/home/jens/Source/shotwell/src/Resources.vala"
 	gtk_icon_factory_add_default (_tmp39_);
-#line 737 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 721 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_generate_rating_strings ();
-#line 707 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 691 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (icons_dir);
-#line 2588 "Resources.c"
+#line 2423 "Resources.c"
 }
 
 
@@ -2657,129 +2492,129 @@ void resources_fetch_lc_time_format (void) {
 	gchar* _tmp21_ = NULL;
 	const gchar* _tmp22_ = NULL;
 	const gchar* _tmp24_ = NULL;
-#line 756 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 740 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = g_getenv ("LANGUAGE");
-#line 756 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 740 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 756 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 740 "/home/jens/Source/shotwell/src/Resources.vala"
 	old_language = _tmp1_;
-#line 757 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 741 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = old_language;
-#line 757 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 741 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp2_ != NULL) {
-#line 758 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 742 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_unsetenv ("LANGUAGE");
-#line 2645 "Resources.c"
+#line 2480 "Resources.c"
 	}
-#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 746 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = setlocale (LC_MESSAGES, NULL);
-#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 746 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 746 "/home/jens/Source/shotwell/src/Resources.vala"
 	old_messages = _tmp4_;
-#line 763 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 747 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = setlocale (LC_TIME, NULL);
-#line 763 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 747 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 763 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 747 "/home/jens/Source/shotwell/src/Resources.vala"
 	lc_time = _tmp6_;
-#line 765 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 749 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = lc_time;
-#line 765 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 749 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp7_ != NULL) {
-#line 2663 "Resources.c"
+#line 2498 "Resources.c"
 		const gchar* _tmp8_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 750 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = lc_time;
-#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 750 "/home/jens/Source/shotwell/src/Resources.vala"
 		setlocale (LC_MESSAGES, _tmp8_);
-#line 2669 "Resources.c"
+#line 2504 "Resources.c"
 	}
-#line 773 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 757 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_strdup ("%X");
-#line 773 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 757 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_HH_MM_FORMAT_STRING);
-#line 773 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 757 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_HH_MM_FORMAT_STRING = _tmp9_;
-#line 778 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = nl_langinfo (T_FMT);
-#line 778 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = g_strdup (_tmp10_);
-#line 778 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_HH_MM_SS_FORMAT_STRING);
-#line 778 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 762 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_HH_MM_SS_FORMAT_STRING = _tmp11_;
-#line 782 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = _ ("%a %b %d, %Y");
-#line 782 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp13_ = g_strdup (_tmp12_);
-#line 782 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_LONG_DATE_FORMAT_STRING);
-#line 782 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 766 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_LONG_DATE_FORMAT_STRING = _tmp13_;
-#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 771 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp14_ = C_ ("MultidayFormat", "%a %b %d");
-#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 771 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp15_ = g_strdup (_tmp14_);
-#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 771 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_START_MULTIDAY_DATE_FORMAT_STRING);
-#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 771 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_START_MULTIDAY_DATE_FORMAT_STRING = _tmp15_;
-#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp16_ = C_ ("MultidayFormat", "%d, %Y");
-#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp17_ = g_strdup (_tmp16_);
-#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_END_MULTIDAY_DATE_FORMAT_STRING);
-#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_END_MULTIDAY_DATE_FORMAT_STRING = _tmp17_;
-#line 797 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 781 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = C_ ("MultimonthFormat", "%a %b %d");
-#line 797 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 781 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp19_ = g_strdup (_tmp18_);
-#line 797 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 781 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_START_MULTIMONTH_DATE_FORMAT_STRING);
-#line 797 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 781 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_START_MULTIMONTH_DATE_FORMAT_STRING = _tmp19_;
-#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 786 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp20_ = C_ ("MultimonthFormat", "%a %b %d, %Y");
-#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 786 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp21_ = g_strdup (_tmp20_);
-#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 786 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_END_MULTIMONTH_DATE_FORMAT_STRING);
-#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 786 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_END_MULTIMONTH_DATE_FORMAT_STRING = _tmp21_;
-#line 805 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = old_messages;
-#line 805 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp22_ != NULL) {
-#line 2729 "Resources.c"
+#line 2564 "Resources.c"
 		const gchar* _tmp23_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 790 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp23_ = old_messages;
-#line 806 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 790 "/home/jens/Source/shotwell/src/Resources.vala"
 		setlocale (LC_MESSAGES, _tmp23_);
-#line 2735 "Resources.c"
+#line 2570 "Resources.c"
 	}
-#line 809 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp24_ = old_language;
-#line 809 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp24_ != NULL) {
-#line 2741 "Resources.c"
+#line 2576 "Resources.c"
 		const gchar* _tmp25_ = NULL;
-#line 810 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25_ = old_language;
-#line 810 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_setenv ("LANGUAGE", _tmp25_, TRUE);
-#line 2747 "Resources.c"
+#line 2582 "Resources.c"
 	}
-#line 753 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 737 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (lc_time);
-#line 753 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 737 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (old_messages);
-#line 753 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 737 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (old_language);
-#line 2755 "Resources.c"
+#line 2590 "Resources.c"
 }
 
 
@@ -2792,23 +2627,23 @@ gchar* resources_get_hh_mm_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 819 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 803 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_HH_MM_FORMAT_STRING;
-#line 819 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 803 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2774 "Resources.c"
+#line 2609 "Resources.c"
 	}
-#line 823 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 807 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_HH_MM_FORMAT_STRING;
-#line 823 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 807 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 823 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 807 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 823 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 807 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2784 "Resources.c"
+#line 2619 "Resources.c"
 }
 
 
@@ -2817,23 +2652,23 @@ gchar* resources_get_hh_mm_ss_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 827 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 811 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_HH_MM_SS_FORMAT_STRING;
-#line 827 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 811 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2799 "Resources.c"
+#line 2634 "Resources.c"
 	}
-#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 815 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_HH_MM_SS_FORMAT_STRING;
-#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 815 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 815 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 815 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2809 "Resources.c"
+#line 2644 "Resources.c"
 }
 
 
@@ -2842,23 +2677,23 @@ gchar* resources_get_long_date_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 835 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 819 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_LONG_DATE_FORMAT_STRING;
-#line 835 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 819 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 836 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2824 "Resources.c"
+#line 2659 "Resources.c"
 	}
-#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 823 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_LONG_DATE_FORMAT_STRING;
-#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 823 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 823 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 823 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2834 "Resources.c"
+#line 2669 "Resources.c"
 }
 
 
@@ -2867,23 +2702,23 @@ gchar* resources_get_start_multiday_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 843 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 827 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_START_MULTIDAY_DATE_FORMAT_STRING;
-#line 843 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 827 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 844 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2849 "Resources.c"
+#line 2684 "Resources.c"
 	}
-#line 847 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_START_MULTIDAY_DATE_FORMAT_STRING;
-#line 847 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 847 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 847 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2859 "Resources.c"
+#line 2694 "Resources.c"
 }
 
 
@@ -2892,23 +2727,23 @@ gchar* resources_get_end_multiday_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 835 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_END_MULTIDAY_DATE_FORMAT_STRING;
-#line 851 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 835 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 852 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 836 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2874 "Resources.c"
+#line 2709 "Resources.c"
 	}
-#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_END_MULTIDAY_DATE_FORMAT_STRING;
-#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2884 "Resources.c"
+#line 2719 "Resources.c"
 }
 
 
@@ -2917,23 +2752,23 @@ gchar* resources_get_start_multimonth_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 843 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING;
-#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 843 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 860 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 844 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2899 "Resources.c"
+#line 2734 "Resources.c"
 	}
-#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 847 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING;
-#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 847 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 847 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 847 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2909 "Resources.c"
+#line 2744 "Resources.c"
 }
 
 
@@ -2942,23 +2777,23 @@ gchar* resources_get_end_multimonth_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 851 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING;
-#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 851 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 852 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2924 "Resources.c"
+#line 2759 "Resources.c"
 	}
-#line 871 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING;
-#line 871 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 871 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 871 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2934 "Resources.c"
+#line 2769 "Resources.c"
 }
 
 
@@ -2971,38 +2806,38 @@ GFile* resources_get_ui (const gchar* filename) {
 	const gchar* _tmp4_ = NULL;
 	GFile* _tmp5_ = NULL;
 	GFile* _tmp6_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 858 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = app_dirs_get_resources_dir ();
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_;
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "ui");
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_;
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = filename;
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = g_file_get_child (_tmp3_, _tmp4_);
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = _tmp5_;
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp3_);
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp1_);
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp6_;
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2971 "Resources.c"
+#line 2806 "Resources.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2978 "Resources.c"
+#line 2813 "Resources.c"
 }
 
 
@@ -3012,11 +2847,11 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 	GdkPixbuf* _tmp14_ = NULL;
 	GdkPixbuf* _tmp15_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_noninterpretable_badge_pixbuf;
-#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 2992 "Resources.c"
+#line 2827 "Resources.c"
 		{
 			GdkPixbuf* _tmp1_ = NULL;
 			GFile* _tmp2_ = NULL;
@@ -3030,92 +2865,92 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			GdkPixbuf* _tmp10_ = NULL;
 			GdkPixbuf* _tmp11_ = NULL;
 			GdkPixbuf* _tmp12_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = app_dirs_get_resources_dir ();
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = _tmp2_;
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = g_file_get_child (_tmp3_, "icons");
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = _tmp4_;
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = g_file_get_child (_tmp5_, RESOURCES_NONINTERPRETABLE_BADGE_FILE);
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = _tmp6_;
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = g_file_get_path (_tmp7_);
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = _tmp8_;
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = gdk_pixbuf_new_from_file (_tmp9_, &_inner_error_);
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = _tmp10_;
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (_tmp9_);
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (_tmp7_);
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (_tmp5_);
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (_tmp3_);
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = _tmp11_;
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3038 "Resources.c"
-				goto __catch429_g_error;
+#line 2873 "Resources.c"
+				goto __catch426_g_error;
 			}
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = _tmp1_;
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (resources_noninterpretable_badge_pixbuf);
-#line 884 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 868 "/home/jens/Source/shotwell/src/Resources.vala"
 			resources_noninterpretable_badge_pixbuf = _tmp12_;
-#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (_tmp1_);
-#line 3051 "Resources.c"
+#line 2886 "Resources.c"
 		}
-		goto __finally429;
-		__catch429_g_error:
+		goto __finally426;
+		__catch426_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp13_ = NULL;
-#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
 			err = _inner_error_;
-#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
 			_inner_error_ = NULL;
-#line 887 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 871 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp13_ = err->message;
-#line 887 "/home/jens/Source/shotwell/src/Resources.vala"
-			g_error ("Resources.vala:887: VideoReader can't load noninterpretable badge imag" \
+#line 871 "/home/jens/Source/shotwell/src/Resources.vala"
+			g_error ("Resources.vala:871: VideoReader can't load noninterpretable badge imag" \
 "e: %s", _tmp13_);
-#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_error_free0 (err);
-#line 3068 "Resources.c"
+#line 2903 "Resources.c"
 		}
-		__finally429:
-#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
+		__finally426:
+#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_clear_error (&_inner_error_);
-#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 867 "/home/jens/Source/shotwell/src/Resources.vala"
 			return NULL;
-#line 3079 "Resources.c"
+#line 2914 "Resources.c"
 		}
 	}
-#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp14_ = resources_noninterpretable_badge_pixbuf;
-#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp15_;
-#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3090 "Resources.c"
+#line 2925 "Resources.c"
 }
 
 
@@ -3130,37 +2965,37 @@ GtkIconTheme* resources_get_icon_theme_engine (void) {
 	GFile* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
 	icon_theme = _tmp1_;
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = app_dirs_get_resources_dir ();
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_;
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = g_file_get_child (_tmp3_, "icons");
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _tmp4_;
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = g_file_get_path (_tmp5_);
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = _tmp6_;
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
 	gtk_icon_theme_append_search_path (icon_theme, _tmp7_);
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp7_);
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp5_);
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 880 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp3_);
-#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = icon_theme;
-#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3135 "Resources.c"
+#line 2970 "Resources.c"
 }
 
 
@@ -3185,13 +3020,13 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 	gchar* _tmp31_ = NULL;
 	gchar* _tmp32_ = NULL;
 	GdkPixbuf* _tmp33_ = NULL;
-#line 903 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 887 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_scaled_icon_cache;
-#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ != NULL) {
-#line 3166 "Resources.c"
+#line 3001 "Resources.c"
 		gchar* scaled_name = NULL;
 		const gchar* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
@@ -3199,162 +3034,162 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 		GeeHashMap* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 905 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = name;
-#line 905 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = scale;
-#line 905 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp3_ = g_strdup_printf ("%s-%d", _tmp1_, _tmp2_);
-#line 905 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
 		scaled_name = _tmp3_;
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = resources_scaled_icon_cache;
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = scaled_name;
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp6_) {
-#line 3190 "Resources.c"
+#line 3025 "Resources.c"
 			GeeHashMap* _tmp7_ = NULL;
 			const gchar* _tmp8_ = NULL;
 			gpointer _tmp9_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = resources_scaled_icon_cache;
-#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = scaled_name;
-#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_);
-#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = (GdkPixbuf*) _tmp9_;
-#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (scaled_name);
-#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 891 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 3206 "Resources.c"
+#line 3041 "Resources.c"
 		}
-#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (scaled_name);
-#line 3210 "Resources.c"
+#line 3045 "Resources.c"
 	}
-#line 912 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = resources_icon_cache;
-#line 912 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp10_ == NULL) {
-#line 3216 "Resources.c"
+#line 3051 "Resources.c"
 		GeeHashMap* _tmp11_ = NULL;
-#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_icon_cache);
-#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_icon_cache = _tmp11_;
-#line 3224 "Resources.c"
+#line 3059 "Resources.c"
 	}
-#line 916 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = resources_icon_cache;
-#line 916 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp13_ = name;
-#line 916 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_);
-#line 916 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
 	pixbuf = (GdkPixbuf*) _tmp14_;
-#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 901 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp15_ = pixbuf;
-#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 901 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp15_ == NULL) {
-#line 3238 "Resources.c"
+#line 3073 "Resources.c"
 		const gchar* _tmp16_ = NULL;
 		GdkPixbuf* _tmp17_ = NULL;
 		GdkPixbuf* _tmp18_ = NULL;
 		GeeHashMap* _tmp19_ = NULL;
 		const gchar* _tmp20_ = NULL;
 		GdkPixbuf* _tmp21_ = NULL;
-#line 918 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = name;
-#line 918 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = resources_load_icon (_tmp16_, 0);
-#line 918 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 918 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
 		pixbuf = _tmp17_;
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 903 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp18_ = pixbuf;
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 903 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp18_ == NULL) {
-#line 920 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = NULL;
-#line 920 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (pixbuf);
-#line 920 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 3263 "Resources.c"
+#line 3098 "Resources.c"
 		}
-#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = resources_icon_cache;
-#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = name;
-#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21_ = pixbuf;
-#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, _tmp21_);
-#line 3273 "Resources.c"
+#line 3108 "Resources.c"
 	}
-#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = scale;
-#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp22_ <= 0) {
-#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 910 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = pixbuf;
-#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 910 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3283 "Resources.c"
+#line 3118 "Resources.c"
 	}
-#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 912 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp23_ = pixbuf;
-#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 912 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp24_ = scale;
-#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 912 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp25_ = scale_pixbuf (_tmp23_, _tmp24_, GDK_INTERP_BILINEAR, FALSE);
-#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 912 "/home/jens/Source/shotwell/src/Resources.vala"
 	scaled_pixbuf = _tmp25_;
-#line 930 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 914 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp26_ = resources_scaled_icon_cache;
-#line 930 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 914 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp26_ == NULL) {
-#line 3297 "Resources.c"
+#line 3132 "Resources.c"
 		GeeHashMap* _tmp27_ = NULL;
-#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 915 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 915 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_scaled_icon_cache);
-#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 915 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_scaled_icon_cache = _tmp27_;
-#line 3305 "Resources.c"
+#line 3140 "Resources.c"
 	}
-#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp28_ = resources_scaled_icon_cache;
-#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp29_ = name;
-#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp30_ = scale;
-#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp31_ = g_strdup_printf ("%s-%d", _tmp29_, _tmp30_);
-#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp32_ = _tmp31_;
-#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp33_ = scaled_pixbuf;
-#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp32_, _tmp33_);
-#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp32_);
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = scaled_pixbuf;
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (pixbuf);
-#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3329 "Resources.c"
+#line 3164 "Resources.c"
 }
 
 
@@ -3370,23 +3205,23 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 	GdkPixbuf* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	GError * _inner_error_ = NULL;
-#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 923 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = app_dirs_get_resources_dir ();
-#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 923 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_;
-#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 923 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "icons");
-#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 923 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_;
-#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 923 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp1_);
-#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 923 "/home/jens/Source/shotwell/src/Resources.vala"
 	icons_dir = _tmp3_;
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
 	pixbuf = NULL;
-#line 3361 "Resources.c"
+#line 3196 "Resources.c"
 	{
 		GdkPixbuf* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
@@ -3397,136 +3232,136 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		GdkPixbuf* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = name;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = g_file_get_child (icons_dir, _tmp5_);
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = _tmp6_;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = g_file_get_path (_tmp7_);
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = _tmp8_;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = gdk_pixbuf_new_from_file (_tmp9_, &_inner_error_);
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = _tmp10_;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp9_);
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp7_);
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = _tmp11_;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3394 "Resources.c"
-			goto __catch430_g_error;
+#line 3229 "Resources.c"
+			goto __catch427_g_error;
 		}
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = _tmp4_;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
 		pixbuf = _tmp12_;
-#line 942 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp4_);
-#line 3407 "Resources.c"
+#line 3242 "Resources.c"
 	}
-	goto __finally430;
-	__catch430_g_error:
+	goto __finally427;
+	__catch427_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp13_ = NULL;
 		GError* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
-#line 942 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 		err = _inner_error_;
-#line 942 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 		_inner_error_ = NULL;
-#line 945 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 929 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = name;
-#line 945 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 929 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = err;
-#line 945 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 929 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = _tmp14_->message;
-#line 945 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_critical ("Resources.vala:945: Unable to load icon %s: %s", _tmp13_, _tmp15_);
-#line 942 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 929 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_critical ("Resources.vala:929: Unable to load icon %s: %s", _tmp13_, _tmp15_);
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_error_free0 (err);
-#line 3430 "Resources.c"
+#line 3265 "Resources.c"
 	}
-	__finally430:
-#line 942 "/home/jens/Source/shotwell/src/Resources.vala"
+	__finally427:
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 942 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 942 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (icons_dir);
-#line 942 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 942 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_clear_error (&_inner_error_);
-#line 942 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 		return NULL;
-#line 3445 "Resources.c"
+#line 3280 "Resources.c"
 	}
-#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp16_ = pixbuf;
-#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp16_ == NULL) {
-#line 949 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = NULL;
-#line 949 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 949 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (icons_dir);
-#line 949 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3459 "Resources.c"
+#line 3294 "Resources.c"
 	}
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = scale;
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp18_ > 0) {
-#line 3465 "Resources.c"
+#line 3300 "Resources.c"
 		GdkPixbuf* _tmp19_ = NULL;
 		gint _tmp20_ = 0;
 		GdkPixbuf* _tmp21_ = NULL;
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = pixbuf;
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = scale;
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21_ = scale_pixbuf (_tmp19_, _tmp20_, GDK_INTERP_BILINEAR, FALSE);
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp17_);
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = _tmp21_;
-#line 3479 "Resources.c"
+#line 3314 "Resources.c"
 	} else {
 		GdkPixbuf* _tmp22_ = NULL;
 		GdkPixbuf* _tmp23_ = NULL;
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp22_ = pixbuf;
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp17_);
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = _tmp23_;
-#line 3491 "Resources.c"
+#line 3326 "Resources.c"
 	}
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp17_;
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (pixbuf);
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (icons_dir);
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3501 "Resources.c"
+#line 3336 "Resources.c"
 }
 
 
@@ -3538,13 +3373,13 @@ void resources_add_stock_icon (GFile* file, const gchar* stock_id) {
 	GtkIconFactory* _tmp12_ = NULL;
 	const gchar* _tmp13_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (stock_id != NULL);
-#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
 	pixbuf = NULL;
-#line 3519 "Resources.c"
+#line 3354 "Resources.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		GFile* _tmp1_ = NULL;
@@ -3553,90 +3388,90 @@ void resources_add_stock_icon (GFile* file, const gchar* stock_id) {
 		GdkPixbuf* _tmp4_ = NULL;
 		GdkPixbuf* _tmp5_ = NULL;
 		GdkPixbuf* _tmp6_ = NULL;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = file;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = g_file_get_path (_tmp1_);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp3_ = _tmp2_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = gdk_pixbuf_new_from_file (_tmp3_, &_inner_error_);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = _tmp4_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp3_);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp0_ = _tmp5_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3544 "Resources.c"
-			goto __catch431_g_error;
+#line 3379 "Resources.c"
+			goto __catch428_g_error;
 		}
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = _tmp0_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp0_ = NULL;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 		pixbuf = _tmp6_;
-#line 956 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp0_);
-#line 3557 "Resources.c"
+#line 3392 "Resources.c"
 	}
-	goto __finally431;
-	__catch431_g_error:
+	goto __finally428;
+	__catch428_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
-#line 956 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
 		err = _inner_error_;
-#line 956 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
 		_inner_error_ = NULL;
-#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = stock_id;
-#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = err;
-#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = _tmp8_->message;
-#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_critical ("Resources.vala:959: Unable to load stock icon %s: %s", _tmp7_, _tmp9_);
-#line 956 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_critical ("Resources.vala:943: Unable to load stock icon %s: %s", _tmp7_, _tmp9_);
+#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_error_free0 (err);
-#line 3580 "Resources.c"
+#line 3415 "Resources.c"
 	}
-	__finally431:
-#line 956 "/home/jens/Source/shotwell/src/Resources.vala"
+	__finally428:
+#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 956 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 956 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 956 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_clear_error (&_inner_error_);
-#line 956 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 3593 "Resources.c"
+#line 3428 "Resources.c"
 	}
-#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 946 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = pixbuf;
-#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 946 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = gtk_icon_set_new_from_pixbuf (_tmp10_);
-#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 946 "/home/jens/Source/shotwell/src/Resources.vala"
 	icon_set = _tmp11_;
-#line 963 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 947 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = resources_factory;
-#line 963 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 947 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp13_ = stock_id;
-#line 963 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 947 "/home/jens/Source/shotwell/src/Resources.vala"
 	gtk_icon_factory_add (_tmp12_, _tmp13_, icon_set);
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
 	_gtk_icon_set_unref0 (icon_set);
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (pixbuf);
-#line 3611 "Resources.c"
+#line 3446 "Resources.c"
 }
 
 
@@ -3657,63 +3492,63 @@ void resources_add_stock_icon_from_themed_icon (GThemedIcon* gicon, const gchar*
 	GtkIconInfo* _tmp11_ = NULL;
 	GtkIconInfo* _tmp12_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 968 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (G_IS_THEMED_ICON (gicon));
-#line 968 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (stock_id != NULL);
-#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
 	icon_theme = _tmp1_;
-#line 971 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = icon_theme;
-#line 971 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = app_dirs_get_resources_dir ();
-#line 971 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = _tmp3_;
-#line 971 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = g_file_get_child (_tmp4_, "icons");
-#line 971 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = _tmp5_;
-#line 971 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = g_file_get_path (_tmp6_);
-#line 971 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp8_ = _tmp7_;
-#line 971 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	gtk_icon_theme_append_search_path (_tmp2_, _tmp8_);
-#line 971 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp8_);
-#line 971 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp6_);
-#line 971 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp4_);
-#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = icon_theme;
-#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = gicon;
-#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = gtk_icon_theme_lookup_by_gicon (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_icon_get_type (), GIcon), RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE);
-#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 	info = _tmp11_;
-#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = info;
-#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp12_ == NULL) {
-#line 3676 "Resources.c"
+#line 3511 "Resources.c"
 		const gchar* _tmp13_ = NULL;
-#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = stock_id;
-#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_debug ("Resources.vala:976: unable to load icon for: %s", _tmp13_);
-#line 977 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_debug ("Resources.vala:960: unable to load icon for: %s", _tmp13_);
+#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 		_gtk_icon_info_free0 (info);
-#line 977 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (icon_theme);
-#line 977 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 3688 "Resources.c"
+#line 3523 "Resources.c"
 	}
 	{
 		GdkPixbuf* pix = NULL;
@@ -3727,97 +3562,97 @@ void resources_add_stock_icon_from_themed_icon (GThemedIcon* gicon, const gchar*
 		GtkIconFactory* _tmp21_ = NULL;
 		const gchar* _tmp22_ = NULL;
 		GtkIconSet* _tmp23_ = NULL;
-#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = info;
-#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = gtk_icon_info_load_icon (_tmp14_, &_inner_error_);
-#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
 		pix = _tmp15_;
-#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 965 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3710 "Resources.c"
-			goto __catch432_g_error;
+#line 3545 "Resources.c"
+			goto __catch429_g_error;
 		}
-#line 982 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = modify;
-#line 982 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16__target = modify_target;
-#line 982 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp16_ != NULL) {
-#line 3719 "Resources.c"
+#line 3554 "Resources.c"
 			ResourcesAddStockIconModify _tmp17_ = NULL;
 			void* _tmp17__target = NULL;
 			GdkPixbuf* _tmp18_ = NULL;
-#line 983 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp17_ = modify;
-#line 983 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp17__target = modify_target;
-#line 983 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp18_ = pix;
-#line 983 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp17_ (_tmp18_, _tmp17__target);
-#line 3731 "Resources.c"
+#line 3566 "Resources.c"
 		}
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = pix;
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = gtk_icon_set_new_from_pixbuf (_tmp19_);
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
 		icon_set = _tmp20_;
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21_ = resources_factory;
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp22_ = stock_id;
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp23_ = icon_set;
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 		gtk_icon_factory_add (_tmp21_, _tmp22_, _tmp23_);
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		_gtk_icon_set_unref0 (icon_set);
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pix);
-#line 3751 "Resources.c"
+#line 3586 "Resources.c"
 	}
-	goto __finally432;
-	__catch432_g_error:
+	goto __finally429;
+	__catch429_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		err = _inner_error_;
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		_inner_error_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 972 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp24_ = err;
-#line 988 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 972 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25_ = _tmp24_->message;
-#line 988 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_debug ("Resources.vala:988: %s", _tmp25_);
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 972 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_debug ("Resources.vala:972: %s", _tmp25_);
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_error_free0 (err);
-#line 3771 "Resources.c"
+#line 3606 "Resources.c"
 	}
-	__finally432:
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+	__finally429:
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		_gtk_icon_info_free0 (info);
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (icon_theme);
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_clear_error (&_inner_error_);
-#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 3786 "Resources.c"
+#line 3621 "Resources.c"
 	}
-#line 968 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_gtk_icon_info_free0 (info);
-#line 968 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (icon_theme);
-#line 3792 "Resources.c"
+#line 3627 "Resources.c"
 }
 
 
@@ -3835,88 +3670,88 @@ gchar* resources_get_help_path (void) {
 	GFile* _tmp7_ = NULL;
 	GFile* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = app_dirs_get_exec_dir ();
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_;
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "help");
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_;
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = g_file_get_child (_tmp3_, "C");
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _tmp4_;
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_dir = _tmp5_;
-#line 1001 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = help_dir;
-#line 1001 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = g_file_get_child (_tmp6_, "index.page");
-#line 1001 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_index = _tmp7_;
-#line 1003 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp8_ = help_index;
-#line 1003 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_file_query_exists (_tmp8_, NULL);
-#line 1003 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp9_) {
-#line 3840 "Resources.c"
+#line 3675 "Resources.c"
 		gchar* help_path = NULL;
 		GFile* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
-#line 1006 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = help_dir;
-#line 1006 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = g_file_get_path (_tmp10_);
-#line 1006 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (help_path);
-#line 1006 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		help_path = _tmp11_;
-#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = help_path;
-#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = g_str_has_suffix (_tmp12_, "/");
-#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (!_tmp13_) {
-#line 3860 "Resources.c"
+#line 3695 "Resources.c"
 			const gchar* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 993 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp14_ = help_path;
-#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 993 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp15_ = g_strconcat (_tmp14_, "/", NULL);
-#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 993 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 993 "/home/jens/Source/shotwell/src/Resources.vala"
 			help_path = _tmp15_;
-#line 3871 "Resources.c"
+#line 3706 "Resources.c"
 		}
-#line 1012 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 996 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = help_path;
-#line 1012 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 996 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (help_index);
-#line 1012 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 996 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (help_dir);
-#line 1012 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 996 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3881 "Resources.c"
+#line 3716 "Resources.c"
 	}
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (help_index);
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (help_dir);
-#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3891 "Resources.c"
+#line 3726 "Resources.c"
 }
 
 
@@ -3926,17 +3761,17 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp27_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1021 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (GDK_IS_SCREEN (screen));
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_get_help_path ();
-#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_path = _tmp0_;
-#line 1024 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = help_path;
-#line 1024 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp1_ != NULL) {
-#line 3911 "Resources.c"
+#line 3746 "Resources.c"
 		const gchar* _tmp2_ = NULL;
 		gchar** argv = NULL;
 		gchar** _tmp6_ = NULL;
@@ -3968,179 +3803,179 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 		gchar** _tmp25_ = NULL;
 		gint _tmp25__length1 = 0;
 		const gchar* _tmp26_ = NULL;
-#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = anchor;
-#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp2_ != NULL) {
-#line 3947 "Resources.c"
+#line 3782 "Resources.c"
 			const gchar* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
 			gchar* _tmp5_ = NULL;
-#line 1029 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = help_path;
-#line 1029 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = anchor;
-#line 1029 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL);
-#line 1029 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1029 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Resources.vala"
 			help_path = _tmp5_;
-#line 3961 "Resources.c"
+#line 3796 "Resources.c"
 		}
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = g_new0 (gchar*, 3 + 1);
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv = _tmp6_;
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv_length1 = 3;
-#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Resources.vala"
 		_argv_size_ = argv_length1;
-#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = argv;
-#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7__length1 = argv_length1;
-#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = g_strdup ("yelp");
-#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp7_[0]);
-#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_[0] = _tmp8_;
-#line 1033 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = _tmp7_[0];
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = argv;
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10__length1 = argv_length1;
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = help_path;
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = g_strdup (_tmp11_);
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp10_[1]);
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_[1] = _tmp12_;
-#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = _tmp10_[1];
-#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = argv;
-#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14__length1 = argv_length1;
-#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp14_[2]);
-#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_[2] = NULL;
-#line 1035 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = _tmp14_[2];
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = app_dirs_get_exec_dir ();
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp18_ = _tmp17_;
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = g_file_get_path (_tmp18_);
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = _tmp19_;
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21_ = argv;
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21__length1 = argv_length1;
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp23_ = g_spawn_async (_tmp20_, _tmp21_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, &_tmp22_, &_inner_error_);
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		pid = _tmp22_;
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp24_ = _tmp23_;
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp20_);
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = _tmp24_;
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 			argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 4041 "Resources.c"
+#line 3876 "Resources.c"
 		}
-#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp16_) {
-#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Resources.vala"
 			argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 4051 "Resources.c"
+#line 3886 "Resources.c"
 		}
-#line 1043 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25_ = argv;
-#line 1043 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25__length1 = argv_length1;
-#line 1043 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp26_ = _tmp25_[0];
-#line 1043 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_warning ("Resources.vala:1043: Unable to launch %s", _tmp26_);
-#line 1024 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_warning ("Resources.vala:1027: Unable to launch %s", _tmp26_);
+#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 4063 "Resources.c"
+#line 3898 "Resources.c"
 	}
-#line 1047 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp27_ = anchor;
-#line 1047 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp27_ != NULL) {
-#line 4069 "Resources.c"
+#line 3904 "Resources.c"
 		GdkScreen* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
-#line 1048 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp28_ = screen;
-#line 1048 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp29_ = anchor;
-#line 1048 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp30_ = g_strconcat ("help:shotwell", _tmp29_, NULL);
-#line 1048 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp31_ = _tmp30_;
-#line 1048 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		sys_show_uri (_tmp28_, _tmp31_, &_inner_error_);
-#line 1048 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp31_);
-#line 1048 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1048 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1048 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1048 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 4094 "Resources.c"
+#line 3929 "Resources.c"
 		}
 	} else {
 		GdkScreen* _tmp32_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp32_ = screen;
-#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
 		sys_show_uri (_tmp32_, "help:shotwell", &_inner_error_);
-#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 4110 "Resources.c"
+#line 3945 "Resources.c"
 		}
 	}
-#line 1021 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1005 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (help_path);
-#line 4115 "Resources.c"
+#line 3950 "Resources.c"
 }
 
 
@@ -4156,33 +3991,33 @@ gchar* resources_to_css_color (GdkRGBA* color) {
 	GdkRGBA _tmp4_ = {0};
 	gdouble _tmp5_ = 0.0;
 	gchar* _tmp6_ = NULL;
-#line 1054 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (color != NULL, NULL);
-#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = *color;
-#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_.red;
-#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Resources.vala"
 	r = (gint) (_tmp1_ * 255);
-#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = *color;
-#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_.green;
-#line 1056 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
 	g = (gint) (_tmp3_ * 255);
-#line 1057 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = *color;
-#line 1057 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _tmp4_.blue;
-#line 1057 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Resources.vala"
 	b = (gint) (_tmp5_ * 255);
-#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = g_strdup_printf ("rgb(%d, %d, %d)", r, g, b);
-#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp6_;
-#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 4157 "Resources.c"
+#line 3992 "Resources.c"
 }
 
 
@@ -4200,136 +4035,136 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 	GtkWidget* _tmp21_ = NULL;
 	GtkCssProvider* _tmp22_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1066 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 1066 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (stylesheet != NULL);
-#line 1067 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_providers;
-#line 1067 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 4183 "Resources.c"
+#line 4018 "Resources.c"
 		GeeHashMap* _tmp1_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = gee_hash_map_new (gtk_widget_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, GTK_TYPE_CSS_PROVIDER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 1068 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_providers);
-#line 1068 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_providers = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap);
-#line 4191 "Resources.c"
+#line 4026 "Resources.c"
 	}
-#line 1070 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = resources_providers;
-#line 1070 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = widget;
-#line 1070 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = gee_map_has_key (_tmp2_, _tmp3_);
-#line 1070 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp4_) {
-#line 4201 "Resources.c"
+#line 4036 "Resources.c"
 		GtkWidget* _tmp5_ = NULL;
 		GtkStyleContext* _tmp6_ = NULL;
 		GeeMap* _tmp7_ = NULL;
 		GtkWidget* _tmp8_ = NULL;
 		gpointer _tmp9_ = NULL;
 		GtkCssProvider* _tmp10_ = NULL;
-#line 1071 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = widget;
-#line 1071 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = gtk_widget_get_style_context (_tmp5_);
-#line 1071 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = resources_providers;
-#line 1071 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = widget;
-#line 1071 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = gee_map_get (_tmp7_, _tmp8_);
-#line 1071 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = (GtkCssProvider*) _tmp9_;
-#line 1071 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
 		gtk_style_context_remove_provider (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider));
-#line 1071 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp10_);
-#line 4224 "Resources.c"
+#line 4059 "Resources.c"
 	}
-#line 1073 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = gtk_css_provider_new ();
-#line 1073 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Resources.vala"
 	styler = _tmp11_;
-#line 4230 "Resources.c"
+#line 4065 "Resources.c"
 	{
 		GtkCssProvider* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
-#line 1076 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = styler;
-#line 1076 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = stylesheet;
-#line 1076 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Resources.vala"
 		gtk_css_provider_load_from_data (_tmp12_, _tmp13_, (gssize) RESOURCES_ALL_DATA, &_inner_error_);
-#line 1076 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4242 "Resources.c"
-			goto __catch433_g_error;
+#line 4077 "Resources.c"
+			goto __catch430_g_error;
 		}
 	}
-	goto __finally433;
-	__catch433_g_error:
+	goto __finally430;
+	__catch430_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp14_ = NULL;
 		GError* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
-#line 1075 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
 		e = _inner_error_;
-#line 1075 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
 		_inner_error_ = NULL;
-#line 1078 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = stylesheet;
-#line 1078 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = e;
-#line 1078 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = _tmp15_->message;
-#line 1078 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_warning ("Resources.vala:1078: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_);
-#line 1082 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Resources.vala"
+		g_warning ("Resources.vala:1062: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_);
+#line 1066 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_error_free0 (e);
-#line 1082 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (styler);
-#line 1082 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 4271 "Resources.c"
+#line 4106 "Resources.c"
 	}
-	__finally433:
-#line 1075 "/home/jens/Source/shotwell/src/Resources.vala"
+	__finally430:
+#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1075 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (styler);
-#line 1075 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1075 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_clear_error (&_inner_error_);
-#line 1075 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 4284 "Resources.c"
+#line 4119 "Resources.c"
 	}
-#line 1085 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp17_ = widget;
-#line 1085 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = gtk_widget_get_style_context (_tmp17_);
-#line 1085 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp19_ = styler;
-#line 1085 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Resources.vala"
 	gtk_style_context_add_provider (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-#line 1088 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp20_ = resources_providers;
-#line 1088 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp21_ = widget;
-#line 1088 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = styler;
-#line 1088 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Resources.vala"
 	gee_map_set (_tmp20_, _tmp21_, _tmp22_);
-#line 1066 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (styler);
-#line 4304 "Resources.c"
+#line 4139 "Resources.c"
 }
 
 
diff --git a/src/Resources.vala b/src/Resources.vala
index 138772e..bf34ae0 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -376,22 +376,27 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string MODIFY_TAGS_LABEL = _("Modify Tags");
     
     public string tag_photos_label(string name, int count) {
-        return ((count == 1) ? _("Tag Photo as “%s”") : _("Tag Photos as “%s”")).printf(name);
+        return ngettext ("Tag Photo as “%s”",
+                         "Tag Photos as “%s”",
+                         count).printf(name);
     }
     
     public string tag_photos_tooltip(string name, int count) {
-        return ((count == 1) ? _("Tag the selected photo as “%s”") :
-            _("Tag the selected photos as “%s”")).printf(name);
+        return ngettext ("Tag the selected photo as “%s”",
+                         "Tag the selected photos as “%s”",
+                         count).printf(name);
     }
     
     public string untag_photos_menu(string name, int count) {
-        return ((count == 1) ? _("Remove Tag “%s” From _Photo") :
-            _("Remove Tag “%s” From _Photos")).printf(name);
+        return ngettext ("Remove Tag “%s” From _Photo",
+                         "Remove Tag “%s” From _Photos",
+                         count).printf(name);
     }
     
     public string untag_photos_label(string name, int count) {
-        return ((count == 1) ? _("Remove Tag “%s” From Photo") :
-            _("Remove Tag “%s” From Photos")).printf(name);
+        return ngettext ("Remove Tag “%s” From Photo",
+                         "Remove Tag “%s” From Photos",
+                         count).printf(name);
     }
     
     public static string rename_tag_exists_message(string name) {
@@ -418,27 +423,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         return _("Delete Search “%s”").printf(name);
     }
     
-    private unowned string rating_menu(Rating rating) {
-        switch (rating) {
-            case Rating.REJECTED:
-                return RATE_REJECTED_MENU;
-            case Rating.UNRATED:
-                return RATE_UNRATED_MENU;
-            case Rating.ONE:
-                return RATE_ONE_MENU;
-            case Rating.TWO:
-                return RATE_TWO_MENU;
-            case Rating.THREE:
-                return RATE_THREE_MENU;
-            case Rating.FOUR:
-                return RATE_FOUR_MENU;
-            case Rating.FIVE:
-                return RATE_FIVE_MENU;
-            default:
-                return RATE_UNRATED_MENU;
-        }
-    }
-
     private unowned string rating_label(Rating rating) {
         switch (rating) {
             case Rating.REJECTED:
diff --git a/src/SearchFilter.c b/src/SearchFilter.c
index 1d891b7..b6c0196 100644
--- a/src/SearchFilter.c
+++ b/src/SearchFilter.c
@@ -13,13 +13,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gee.h>
+#include <gio/gio.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
 #include <float.h>
 #include <math.h>
-#include <gio/gio.h>
+#include <glib/gi18n-lib.h>
 #include <gdk/gdk.h>
-#include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gobject/gvaluecollector.h>
 
@@ -330,6 +329,37 @@ typedef struct _SearchFilterActionsClass SearchFilterActionsClass;
 typedef struct _SearchFilterActionsPrivate SearchFilterActionsPrivate;
 #define _text_action_unref0(var) ((var == NULL) ? NULL : (var = (text_action_unref (var), NULL)))
 
+#define TYPE_PAGE_WINDOW (page_window_get_type ())
+#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow))
+#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass))
+#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW))
+#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW))
+#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass))
+
+typedef struct _PageWindow PageWindow;
+typedef struct _PageWindowClass PageWindowClass;
+
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
+#define TYPE_LIBRARY_WINDOW (library_window_get_type ())
+#define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow))
+#define LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
+#define IS_LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_LIBRARY_WINDOW))
+#define IS_LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_LIBRARY_WINDOW))
+#define LIBRARY_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
+
+typedef struct _LibraryWindow LibraryWindow;
+typedef struct _LibraryWindowClass LibraryWindowClass;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
+
 #define TYPE_PAGE (page_get_type ())
 #define PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE, Page))
 #define PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE, PageClass))
@@ -498,57 +528,6 @@ typedef struct _SearchFilterToolbarToggleActionToolButtonClass SearchFilterToolb
 #define _search_filter_actions_unref0(var) ((var == NULL) ? NULL : (var = (search_filter_actions_unref (var), NULL)))
 #define _view_filter_unref0(var) ((var == NULL) ? NULL : (var = (view_filter_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-typedef struct _SearchFilterToolbarRatingFilterButtonPrivate SearchFilterToolbarRatingFilterButtonPrivate;
-
-#define TYPE_PAGE_WINDOW (page_window_get_type ())
-#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow))
-#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass))
-#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW))
-#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW))
-#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass))
-
-typedef struct _PageWindow PageWindow;
-typedef struct _PageWindowClass PageWindowClass;
-
-#define TYPE_APP_WINDOW (app_window_get_type ())
-#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
-#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
-#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
-#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
-#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
-
-typedef struct _AppWindow AppWindow;
-typedef struct _AppWindowClass AppWindowClass;
-
-#define TYPE_LIBRARY_WINDOW (library_window_get_type ())
-#define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow))
-#define LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
-#define IS_LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_LIBRARY_WINDOW))
-#define IS_LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_LIBRARY_WINDOW))
-#define LIBRARY_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
-
-typedef struct _LibraryWindow LibraryWindow;
-typedef struct _LibraryWindowClass LibraryWindowClass;
-
-#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
-#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
-#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
-#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
-#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
-#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
-
-typedef struct _ConfigurationFacade ConfigurationFacade;
-typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
-
-#define CONFIG_TYPE_FACADE (config_facade_get_type ())
-#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
-#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
-#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
-#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
-#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
-
-typedef struct _ConfigFacade ConfigFacade;
-typedef struct _ConfigFacadeClass ConfigFacadeClass;
 typedef struct _SearchFilterToolbarSavedSearchFilterButtonPrivate SearchFilterToolbarSavedSearchFilterButtonPrivate;
 
 #define SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER (search_filter_toolbar_saved_search_popover_get_type ())
@@ -626,6 +605,7 @@ typedef struct _DeleteSavedSearchCommandClass DeleteSavedSearchCommandClass;
 typedef struct _SearchFilterToolbarLabelToolItemPrivate SearchFilterToolbarLabelToolItemPrivate;
 typedef struct _SearchFilterToolbarToggleActionToolButtonPrivate SearchFilterToolbarToggleActionToolButtonPrivate;
 typedef struct _SearchFilterToolbarSearchBoxPrivate SearchFilterToolbarSearchBoxPrivate;
+typedef struct _SearchFilterToolbarRatingFilterButtonPrivate SearchFilterToolbarRatingFilterButtonPrivate;
 typedef struct _SearchFilterToolbarSavedSearchPopoverPrivate SearchFilterToolbarSavedSearchPopoverPrivate;
 
 #define SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON (search_filter_toolbar_saved_search_popover_data_button_get_type ())
@@ -811,7 +791,6 @@ struct _SearchFilterActionsClass {
 };
 
 struct _SearchFilterActionsPrivate {
-	GtkActionGroup* action_group;
 	SearchFilterCriteria criteria;
 	TextAction* _text;
 	gboolean has_flagged;
@@ -894,7 +873,7 @@ struct _ParamSpecSearchFilterActions {
 struct _SearchFilterToolbar {
 	GtkRevealer parent_instance;
 	SearchFilterToolbarPrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 };
 
 struct _SearchFilterToolbarClass {
@@ -922,17 +901,6 @@ struct _SearchFilterToolbarPrivate {
 	GtkSeparatorToolItem* sepr_rating_saved;
 };
 
-struct _SearchFilterToolbarRatingFilterButton {
-	GtkToolItem parent_instance;
-	SearchFilterToolbarRatingFilterButtonPrivate * priv;
-	GtkMenu* filter_popup;
-	GtkButton* button;
-};
-
-struct _SearchFilterToolbarRatingFilterButtonClass {
-	GtkToolItemClass parent_class;
-};
-
 struct _SearchFilterToolbarSavedSearchFilterButton {
 	GtkToolItem parent_instance;
 	SearchFilterToolbarSavedSearchFilterButtonPrivate * priv;
@@ -968,7 +936,6 @@ struct _SearchFilterToolbarToggleActionToolButtonClass {
 
 struct _SearchFilterToolbarToggleActionToolButtonPrivate {
 	GtkToggleButton* button;
-	GtkToggleAction* action;
 };
 
 struct _SearchFilterToolbarSearchBox {
@@ -985,6 +952,16 @@ struct _SearchFilterToolbarSearchBoxPrivate {
 	TextAction* action;
 };
 
+struct _SearchFilterToolbarRatingFilterButton {
+	GtkToolItem parent_instance;
+	SearchFilterToolbarRatingFilterButtonPrivate * priv;
+	GtkMenuButton* button;
+};
+
+struct _SearchFilterToolbarRatingFilterButtonClass {
+	GtkToolItemClass parent_class;
+};
+
 struct _SearchFilterToolbarSavedSearchPopover {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
@@ -1033,16 +1010,6 @@ extern TagSourceCollection* tag_global;
 static gpointer disabled_view_filter_parent_class = NULL;
 static gpointer text_action_parent_class = NULL;
 static gpointer search_filter_actions_parent_class = NULL;
-extern gchar* resources_DISPLAY_ONE_OR_HIGHER_MENU;
-extern gchar* resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP;
-extern gchar* resources_DISPLAY_TWO_OR_HIGHER_MENU;
-extern gchar* resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP;
-extern gchar* resources_DISPLAY_THREE_OR_HIGHER_MENU;
-extern gchar* resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP;
-extern gchar* resources_DISPLAY_FOUR_OR_HIGHER_MENU;
-extern gchar* resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP;
-extern gchar* resources_DISPLAY_FIVE_OR_HIGHER_MENU;
-extern gchar* resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP;
 static gpointer search_filter_toolbar_parent_class = NULL;
 static gpointer search_filter_toolbar_label_tool_item_parent_class = NULL;
 static gpointer search_filter_toolbar_toggle_action_tool_button_parent_class = NULL;
@@ -1079,7 +1046,7 @@ gboolean is_string_empty (const gchar* s);
 const gchar* search_view_filter_get_search_filter (SearchViewFilter* self);
 gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int* result_length1);
 void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar* text);
-static gchar** _vala_array_dup33 (gchar** self, int length);
+static gchar** _vala_array_dup32 (gchar** self, int length);
 void search_view_filter_clear_search_filter (SearchViewFilter* self);
 gboolean search_view_filter_has_saved_search (SearchViewFilter* self);
 SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self);
@@ -1180,22 +1147,40 @@ GType search_filter_actions_get_type (void) G_GNUC_CONST;
 enum  {
 	SEARCH_FILTER_ACTIONS_DUMMY_PROPERTY
 };
+static void search_filter_actions_on_action_radio (SearchFilterActions* self, GSimpleAction* action, GVariant* parameter);
+static void _search_filter_actions_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void search_filter_actions_on_rating_changed (SearchFilterActions* self, GSimpleAction* action, GVariant* value);
+static void _search_filter_actions_on_rating_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+static void search_filter_actions_on_action_toggle (SearchFilterActions* self, GSimpleAction* action, GVariant* parameter);
+static void _search_filter_actions_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value);
+static void _search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+static void search_filter_actions_on_photos_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value);
+static void _search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+static void search_filter_actions_on_videos_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value);
+static void _search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value);
+static void _search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
 SearchFilterActions* search_filter_actions_new (void);
 SearchFilterActions* search_filter_actions_construct (GType object_type);
 static void search_filter_actions_register (SearchFilterActions* self);
 TextAction* search_filter_actions_get_text (SearchFilterActions* self);
 static void search_filter_actions_on_text_changed (SearchFilterActions* self, TextAction* action, const gchar* text);
 static void _search_filter_actions_on_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self);
-GtkActionGroup* search_filter_actions_get_action_group (SearchFilterActions* self);
 SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* self);
-GtkAction* search_filter_actions_get_action (SearchFilterActions* self, const gchar* name);
+GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* result_length1);
+GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, const gchar* name);
+GType page_window_get_type (void) G_GNUC_CONST;
+GType app_window_get_type (void) G_GNUC_CONST;
+GType library_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 void search_filter_actions_set_action_sensitive (SearchFilterActions* self, const gchar* name, gboolean sensitive);
 void search_filter_actions_reset (SearchFilterActions* self);
-GtkToggleAction* search_filter_actions_get_flagged (SearchFilterActions* self);
-GtkToggleAction* search_filter_actions_get_photos (SearchFilterActions* self);
-GtkToggleAction* search_filter_actions_get_raw (SearchFilterActions* self);
-GtkToggleAction* search_filter_actions_get_videos (SearchFilterActions* self);
-GtkRadioAction* search_filter_actions_get_rating (SearchFilterActions* self);
+GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self);
+GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self);
+GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self);
+GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self);
+static GVariant* _variant_new28 (gchar* value);
 void search_filter_actions_set_sensitive_for_search_criteria (SearchFilterActions* self, SearchFilterCriteria criteria);
 static void search_filter_actions_update_sensitivities (SearchFilterActions* self);
 GType page_get_type (void) G_GNUC_CONST;
@@ -1229,47 +1214,13 @@ GType camera_accumulator_get_type (void) G_GNUC_CONST;
 gint camera_accumulator_get_photos (CameraAccumulator* self);
 gint camera_accumulator_get_videos (CameraAccumulator* self);
 gint camera_accumulator_get_raw (CameraAccumulator* self);
-#define RESOURCES_ICON_FILTER_FLAGGED "filter-flagged"
-#define RESOURCES_ICON_FILTER_FLAGGED_DISABLED "filter-flagged-disabled"
-#define RESOURCES_ICON_FILTER_VIDEOS "filter-videos"
-#define RESOURCES_ICON_FILTER_VIDEOS_DISABLED "filter-videos-disabled"
-#define RESOURCES_ICON_FILTER_PHOTOS "filter-photos"
-#define RESOURCES_ICON_FILTER_PHOTOS_DISABLED "filter-photos-disabled"
-#define RESOURCES_ICON_FILTER_RAW "filter-raw"
-#define RESOURCES_ICON_FILTER_RAW_DISABLED "filter-raw-disabled"
-#define TRANSLATABLE "translatable"
-#define RESOURCES_DISPLAY_REJECTED_ONLY_MENU _ ("Rejected _Only")
-#define RESOURCES_DISPLAY_REJECTED_ONLY_TOOLTIP _ ("Show only rejected photos")
-static void _vala_array_add339 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-#define RESOURCES_DISPLAY_REJECTED_OR_HIGHER_MENU _ ("All + _Rejected")
-#define RESOURCES_DISPLAY_REJECTED_OR_HIGHER_TOOLTIP "Show all photos, including rejected"
-static void _vala_array_add340 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-#define RESOURCES_DISPLAY_UNRATED_OR_HIGHER_MENU _ ("_All Photos")
-#define RESOURCES_DISPLAY_UNRATED_OR_HIGHER_TOOLTIP _ ("Show all photos")
-static void _vala_array_add341 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-static void _vala_array_add342 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-static void _vala_array_add343 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-static void _vala_array_add344 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-static void _vala_array_add345 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-static void _vala_array_add346 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-static void search_filter_actions_on_rating_changed (SearchFilterActions* self, GtkAction* action, GtkAction* current);
-static void _search_filter_actions_on_rating_changed_gtk_radio_action_callback (GtkAction* action, GtkAction* current, gpointer self);
-static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self, GtkAction* action);
-static void _search_filter_actions_on_flagged_toggled_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add347 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-static void search_filter_actions_on_photos_toggled (SearchFilterActions* self, GtkAction* action);
-static void _search_filter_actions_on_photos_toggled_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add348 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-static void search_filter_actions_on_videos_toggled (SearchFilterActions* self, GtkAction* action);
-static void _search_filter_actions_on_videos_toggled_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add349 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GtkAction* action);
-static void _search_filter_actions_on_raw_toggled_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add350 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
+static gboolean _variant_get29 (GVariant* value);
+static GVariant* _variant_new30 (gboolean value);
 gboolean search_filter_actions_get_has_photos (SearchFilterActions* self);
 gboolean search_filter_actions_get_has_videos (SearchFilterActions* self);
 gboolean search_filter_actions_get_has_raw (SearchFilterActions* self);
 gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self);
+GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self);
 static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void search_filter_actions_finalize (SearchFilterActions* obj);
 GType search_filter_toolbar_get_type (void) G_GNUC_CONST;
@@ -1300,8 +1251,6 @@ static void search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self
 static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, gpointer self);
 static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToolbar* self, gint x, gint y, gint button);
 static gboolean _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu (GtkToolbar* _sender, gint x, gint y, gint button_number, gpointer self);
-SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_new (void);
-SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_construct (GType object_type);
 SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_new (void);
 SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_construct (GType object_type);
 #define SEARCH_FILTER_TOOLBAR_FILTER_BUTTON_MARGIN 12
@@ -1313,41 +1262,37 @@ SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions);
 SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchFilterActions* actions);
 SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_new (TextAction* action);
 SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_construct (GType object_type, TextAction* action);
-GFile* resources_get_ui (const gchar* filename);
 void app_window_panic (const gchar* msg);
 static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterToolbar* self);
 static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
 static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_new (const gchar* s, gint left_padding, gint right_padding);
 static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_construct (GType object_type, const gchar* s, gint left_padding, gint right_padding);
-static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (GtkToggleAction* action);
-static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_construct (GType object_type, GtkToggleAction* action);
+static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (const gchar* action);
+static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_construct (GType object_type, const gchar* action);
 static void search_filter_toolbar_toggle_action_tool_button_set_label (SearchFilterToolbarToggleActionToolButton* self, const gchar* label);
+SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_new (GMenuModel* model);
+SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_construct (GType object_type, GMenuModel* model);
 void search_filter_toolbar_rating_filter_button_set_label (SearchFilterToolbarRatingFilterButton* self, const gchar* label);
-static void search_filter_toolbar_on_filter_button_clicked (SearchFilterToolbar* self);
-static void _search_filter_toolbar_on_filter_button_clicked_search_filter_toolbar_rating_filter_button_clicked (SearchFilterToolbarRatingFilterButton* _sender, gpointer self);
 void search_filter_toolbar_saved_search_filter_button_set_label (SearchFilterToolbarSavedSearchFilterButton* self, const gchar* label);
 static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterToolbar* self);
 static void _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked (SearchFilterToolbarSavedSearchFilterButton* _sender, gpointer self);
 static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (SearchFilterToolbarToggleActionToolButton* self, const gchar* icon_name);
-GType page_window_get_type (void) G_GNUC_CONST;
-GType app_window_get_type (void) G_GNUC_CONST;
-GType library_window_get_type (void) G_GNUC_CONST;
+#define RESOURCES_ICON_FILTER_PHOTOS "filter-photos"
+#define RESOURCES_ICON_FILTER_PHOTOS_DISABLED "filter-photos-disabled"
+#define RESOURCES_ICON_FILTER_VIDEOS "filter-videos"
+#define RESOURCES_ICON_FILTER_VIDEOS_DISABLED "filter-videos-disabled"
+#define RESOURCES_ICON_FILTER_RAW "filter-raw"
+#define RESOURCES_ICON_FILTER_RAW_DISABLED "filter-raw-disabled"
+#define RESOURCES_ICON_FILTER_FLAGGED "filter-flagged"
+#define RESOURCES_ICON_FILTER_FLAGGED_DISABLED "filter-flagged-disabled"
 LibraryWindow* library_window_get_app (void);
-GtkAction* app_window_get_common_action (AppWindow* self, const gchar* name);
+static GVariant* _variant_new31 (gboolean value);
 void search_filter_toolbar_update (SearchFilterToolbar* self);
+static GVariant* _variant_new32 (gboolean value);
 void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchViewFilter* search_filter);
 void search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self);
 void library_window_show_search_bar (LibraryWindow* self, gboolean display);
 void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter);
-static void search_filter_toolbar_position_filter_popup (SearchFilterToolbar* self, GtkMenu* menu, gint* x, gint* y, gboolean* push_in);
-AppWindow* app_window_get_instance (void);
-Page* page_window_get_current_page (PageWindow* self);
-GtkMenuBar* page_get_menubar (Page* self);
-GType configuration_facade_get_type (void) G_GNUC_CONST;
-GType config_facade_get_type (void) G_GNUC_CONST;
-ConfigFacade* config_facade_get_instance (void);
-gint configuration_facade_get_sidebar_position (ConfigurationFacade* self);
-static void _search_filter_toolbar_position_filter_popup_gtk_menu_position_func (GtkMenu* menu, gint* x, gint* y, gboolean* push_in, gpointer self);
 static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar* self, SavedSearch* saved_search);
 static void search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self);
 static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, SavedSearch* search);
@@ -1410,8 +1355,6 @@ static void search_filter_toolbar_label_tool_item_finalize (GObject* obj);
 enum  {
 	SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_DUMMY_PROPERTY
 };
-static void search_filter_toolbar_toggle_action_tool_button_on_button_activate (SearchFilterToolbarToggleActionToolButton* self);
-static void _search_filter_toolbar_toggle_action_tool_button_on_button_activate_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject* obj);
 #define SEARCH_FILTER_TOOLBAR_SEARCH_BOX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, SearchFilterToolbarSearchBoxPrivate))
 enum  {
@@ -1433,14 +1376,7 @@ static void search_filter_toolbar_search_box_finalize (GObject* obj);
 enum  {
 	SEARCH_FILTER_TOOLBAR_RATING_FILTER_BUTTON_DUMMY_PROPERTY
 };
-static void search_filter_toolbar_rating_filter_button_on_clicked (SearchFilterToolbarRatingFilterButton* self);
-static void _search_filter_toolbar_rating_filter_button_on_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter);
-#define RESOURCES_ICON_FILTER_ONE_OR_BETTER "one-star-filter-plus.svg"
-#define RESOURCES_ICON_FILTER_TWO_OR_BETTER "two-star-filter-plus.svg"
-#define RESOURCES_ICON_FILTER_THREE_OR_BETTER "three-star-filter-plus.svg"
-#define RESOURCES_ICON_FILTER_FOUR_OR_BETTER "four-star-filter-plus.svg"
-#define RESOURCES_ICON_FILTER_FIVE "five-star-filter.svg"
 #define RESOURCES_ICON_FILTER_REJECTED_OR_BETTER "all-rejected.png"
 #define RESOURCES_ICON_RATING_REJECTED "rejected.svg"
 #define RESOURCES_ICON_FILTER_UNRATED_OR_BETTER "shotwell-16.png"
@@ -1485,8 +1421,8 @@ GeeCollection* saved_search_table_get_all (SavedSearchTable* self);
 gchar* data_object_get_name (DataObject* self);
 static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_new (SavedSearch* search, const gchar* name);
 static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_construct (GType object_type, SavedSearch* search, const gchar* name);
-static void _vala_array_add351 (SearchFilterToolbarSavedSearchPopoverDataButton*** array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value);
-static void _vala_array_add352 (SearchFilterToolbarSavedSearchPopoverDataButton*** array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value);
+static void _vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton*** array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value);
+static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton*** array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value);
 void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSavedSearchPopover* self);
 static void search_filter_toolbar_saved_search_popover_data_button_restyle (SearchFilterToolbarSavedSearchPopoverDataButton* self);
 static gboolean search_filter_toolbar_saved_search_popover_is_search_row (SearchFilterToolbarSavedSearchPopover* self, GtkListBoxRow* row);
@@ -1509,6 +1445,7 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
 
+static const GActionEntry SEARCH_FILTER_ACTIONS_entries[5] = {{"display.rating", _search_filter_actions_on_action_radio_gsimple_action_activate_callback, "s", "'2'", _search_filter_actions_on_rating_changed_gsimple_action_change_state_callback}, {"display.flagged", _search_filter_actions_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback}, {"display.photos", _search_filter_actions_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback}, {"display.videos", _search_filter_actions_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback}, {"display.raw", _search_filter_actions_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback}};
 
 GType search_filter_criteria_get_type (void) {
 	static volatile gsize search_filter_criteria_type_id__volatile = 0;
@@ -1539,7 +1476,7 @@ static guint search_view_filter_real_get_criteria (SearchViewFilter* self) {
 	g_critical ("Type `%s' does not implement abstract method `search_view_filter_get_criteria'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return 0U;
-#line 1543 "SearchFilter.c"
+#line 1480 "SearchFilter.c"
 }
 
 
@@ -1548,7 +1485,7 @@ guint search_view_filter_get_criteria (SearchViewFilter* self) {
 	g_return_val_if_fail (IS_SEARCH_VIEW_FILTER (self), 0U);
 #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return SEARCH_VIEW_FILTER_GET_CLASS (self)->get_criteria (self);
-#line 1552 "SearchFilter.c"
+#line 1489 "SearchFilter.c"
 }
 
 
@@ -1567,7 +1504,7 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 	switch (_tmp1_) {
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 1571 "SearchFilter.c"
+#line 1508 "SearchFilter.c"
 		{
 #line 71 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1575,11 +1512,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 73 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1579 "SearchFilter.c"
+#line 1516 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1583 "SearchFilter.c"
+#line 1520 "SearchFilter.c"
 		{
 #line 76 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1587,11 +1524,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 78 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1591 "SearchFilter.c"
+#line 1528 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1595 "SearchFilter.c"
+#line 1532 "SearchFilter.c"
 		{
 #line 81 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1599,11 +1536,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 83 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1603 "SearchFilter.c"
+#line 1540 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_ONLY:
-#line 1607 "SearchFilter.c"
+#line 1544 "SearchFilter.c"
 		{
 #line 86 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1611,11 +1548,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 88 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1615 "SearchFilter.c"
+#line 1552 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1619 "SearchFilter.c"
+#line 1556 "SearchFilter.c"
 		{
 #line 91 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1623,11 +1560,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 93 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1627 "SearchFilter.c"
+#line 1564 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_ONLY:
-#line 1631 "SearchFilter.c"
+#line 1568 "SearchFilter.c"
 		{
 #line 96 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1635,11 +1572,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 98 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1639 "SearchFilter.c"
+#line 1576 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1643 "SearchFilter.c"
+#line 1580 "SearchFilter.c"
 		{
 #line 101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1647,11 +1584,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1651 "SearchFilter.c"
+#line 1588 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_ONLY:
-#line 1655 "SearchFilter.c"
+#line 1592 "SearchFilter.c"
 		{
 #line 106 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1659,11 +1596,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1663 "SearchFilter.c"
+#line 1600 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1667 "SearchFilter.c"
+#line 1604 "SearchFilter.c"
 		{
 #line 111 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1671,11 +1608,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1675 "SearchFilter.c"
+#line 1612 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_ONLY:
-#line 1679 "SearchFilter.c"
+#line 1616 "SearchFilter.c"
 		{
 #line 116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1683,11 +1620,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 118 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1687 "SearchFilter.c"
+#line 1624 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1691 "SearchFilter.c"
+#line 1628 "SearchFilter.c"
 		{
 #line 121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1695,11 +1632,11 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1699 "SearchFilter.c"
+#line 1636 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 1703 "SearchFilter.c"
+#line 1640 "SearchFilter.c"
 		{
 #line 126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1707,12 +1644,12 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = FALSE;
 #line 128 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1711 "SearchFilter.c"
+#line 1648 "SearchFilter.c"
 		}
 		default:
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1716 "SearchFilter.c"
+#line 1653 "SearchFilter.c"
 		{
 #line 132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_UNRATED;
@@ -1720,7 +1657,7 @@ void search_view_filter_set_rating_filter (SearchViewFilter* self, RatingFilter
 			self->priv->rating_allow_higher = TRUE;
 #line 134 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 1724 "SearchFilter.c"
+#line 1661 "SearchFilter.c"
 		}
 	}
 }
@@ -1740,7 +1677,7 @@ gboolean search_view_filter_has_search_filter (SearchViewFilter* self) {
 	result = !_tmp1_;
 #line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1744 "SearchFilter.c"
+#line 1681 "SearchFilter.c"
 }
 
 
@@ -1755,7 +1692,7 @@ const gchar* search_view_filter_get_search_filter (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1759 "SearchFilter.c"
+#line 1696 "SearchFilter.c"
 }
 
 
@@ -1779,34 +1716,34 @@ gchar** search_view_filter_get_search_filter_words (SearchViewFilter* self, int*
 	if (result_length1) {
 #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*result_length1 = _tmp1__length1;
-#line 1783 "SearchFilter.c"
+#line 1720 "SearchFilter.c"
 	}
 #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp1_;
 #line 147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1789 "SearchFilter.c"
+#line 1726 "SearchFilter.c"
 }
 
 
-static gchar** _vala_array_dup33 (gchar** self, int length) {
+static gchar** _vala_array_dup32 (gchar** self, int length) {
 	gchar** result;
 	int i;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = g_new0 (gchar*, length + 1);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	for (i = 0; i < length; i++) {
-#line 1800 "SearchFilter.c"
+#line 1737 "SearchFilter.c"
 		gchar* _tmp0_ = NULL;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		result[i] = _tmp0_;
-#line 1806 "SearchFilter.c"
+#line 1743 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1810 "SearchFilter.c"
+#line 1747 "SearchFilter.c"
 }
 
 
@@ -1829,7 +1766,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 	_tmp2_ = is_string_empty (_tmp1_);
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!_tmp2_) {
-#line 1833 "SearchFilter.c"
+#line 1770 "SearchFilter.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1840,13 +1777,13 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 		_g_free0 (_tmp0_);
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp4_;
-#line 1844 "SearchFilter.c"
+#line 1781 "SearchFilter.c"
 	} else {
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_free0 (_tmp0_);
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = NULL;
-#line 1850 "SearchFilter.c"
+#line 1787 "SearchFilter.c"
 	}
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = g_strdup (_tmp0_);
@@ -1858,7 +1795,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 	_tmp7_ = self->priv->search_filter;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp7_ != NULL) {
-#line 1862 "SearchFilter.c"
+#line 1799 "SearchFilter.c"
 		const gchar* _tmp8_ = NULL;
 		gchar** _tmp9_ = NULL;
 		gchar** _tmp10_ = NULL;
@@ -1874,7 +1811,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 		_tmp6__length1 = _vala_array_length (_tmp9_);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		__tmp6__size_ = _tmp6__length1;
-#line 1878 "SearchFilter.c"
+#line 1815 "SearchFilter.c"
 	} else {
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
@@ -1884,10 +1821,10 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 		_tmp6__length1 = 0;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		__tmp6__size_ = _tmp6__length1;
-#line 1888 "SearchFilter.c"
+#line 1825 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp11_ = (_tmp6_ != NULL) ? _vala_array_dup33 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
+	_tmp11_ = (_tmp6_ != NULL) ? _vala_array_dup32 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11__length1 = _tmp6__length1;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1902,7 +1839,7 @@ void search_view_filter_set_search_filter (SearchViewFilter* self, const gchar*
 	_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
 #line 150 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_free0 (_tmp0_);
-#line 1906 "SearchFilter.c"
+#line 1843 "SearchFilter.c"
 }
 
 
@@ -1921,7 +1858,7 @@ void search_view_filter_clear_search_filter (SearchViewFilter* self) {
 	self->priv->search_filter_words_length1 = 0;
 #line 157 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_search_filter_words_size_ = self->priv->search_filter_words_length1;
-#line 1925 "SearchFilter.c"
+#line 1862 "SearchFilter.c"
 }
 
 
@@ -1936,7 +1873,7 @@ gboolean search_view_filter_has_saved_search (SearchViewFilter* self) {
 	result = _tmp0_ != NULL;
 #line 161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1940 "SearchFilter.c"
+#line 1877 "SearchFilter.c"
 }
 
 
@@ -1951,7 +1888,7 @@ gboolean search_view_filter_get_rating_allow_higher (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1955 "SearchFilter.c"
+#line 1892 "SearchFilter.c"
 }
 
 
@@ -1966,7 +1903,7 @@ Rating search_view_filter_get_rating (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1970 "SearchFilter.c"
+#line 1907 "SearchFilter.c"
 }
 
 
@@ -1984,31 +1921,31 @@ gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) {
 	if (_tmp3_) {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = TRUE;
-#line 1988 "SearchFilter.c"
+#line 1925 "SearchFilter.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = self->priv->_show_media_photos;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp4_;
-#line 1995 "SearchFilter.c"
+#line 1932 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_) {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = TRUE;
-#line 2001 "SearchFilter.c"
+#line 1938 "SearchFilter.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = self->priv->_show_media_raw;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = _tmp5_;
-#line 2008 "SearchFilter.c"
+#line 1945 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 2012 "SearchFilter.c"
+#line 1949 "SearchFilter.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
@@ -2016,45 +1953,45 @@ gboolean search_view_filter_filter_by_media_type (SearchViewFilter* self) {
 		_tmp8_ = self->priv->_show_media_video;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp8_) {
-#line 2020 "SearchFilter.c"
+#line 1957 "SearchFilter.c"
 			gboolean _tmp9_ = FALSE;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp9_ = self->priv->_show_media_photos;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = _tmp9_;
-#line 2026 "SearchFilter.c"
+#line 1963 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = FALSE;
-#line 2030 "SearchFilter.c"
+#line 1967 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp7_) {
-#line 2034 "SearchFilter.c"
+#line 1971 "SearchFilter.c"
 			gboolean _tmp10_ = FALSE;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp10_ = self->priv->_show_media_raw;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = _tmp10_;
-#line 2040 "SearchFilter.c"
+#line 1977 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = FALSE;
-#line 2044 "SearchFilter.c"
+#line 1981 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = !_tmp6_;
-#line 2048 "SearchFilter.c"
+#line 1985 "SearchFilter.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 2052 "SearchFilter.c"
+#line 1989 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2058 "SearchFilter.c"
+#line 1995 "SearchFilter.c"
 }
 
 
@@ -2064,7 +2001,7 @@ SearchViewFilter* search_view_filter_construct (GType object_type) {
 	self = (SearchViewFilter*) view_filter_construct (object_type);
 #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 2068 "SearchFilter.c"
+#line 2005 "SearchFilter.c"
 }
 
 
@@ -2079,7 +2016,7 @@ gboolean search_view_filter_get_flagged (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2083 "SearchFilter.c"
+#line 2020 "SearchFilter.c"
 }
 
 
@@ -2091,7 +2028,7 @@ void search_view_filter_set_flagged (SearchViewFilter* self, gboolean value) {
 	_tmp0_ = value;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_flagged = _tmp0_;
-#line 2095 "SearchFilter.c"
+#line 2032 "SearchFilter.c"
 }
 
 
@@ -2106,7 +2043,7 @@ gboolean search_view_filter_get_show_media_video (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2110 "SearchFilter.c"
+#line 2047 "SearchFilter.c"
 }
 
 
@@ -2118,7 +2055,7 @@ void search_view_filter_set_show_media_video (SearchViewFilter* self, gboolean v
 	_tmp0_ = value;
 #line 51 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_show_media_video = _tmp0_;
-#line 2122 "SearchFilter.c"
+#line 2059 "SearchFilter.c"
 }
 
 
@@ -2133,7 +2070,7 @@ gboolean search_view_filter_get_show_media_photos (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2137 "SearchFilter.c"
+#line 2074 "SearchFilter.c"
 }
 
 
@@ -2145,7 +2082,7 @@ void search_view_filter_set_show_media_photos (SearchViewFilter* self, gboolean
 	_tmp0_ = value;
 #line 52 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_show_media_photos = _tmp0_;
-#line 2149 "SearchFilter.c"
+#line 2086 "SearchFilter.c"
 }
 
 
@@ -2160,7 +2097,7 @@ gboolean search_view_filter_get_show_media_raw (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2164 "SearchFilter.c"
+#line 2101 "SearchFilter.c"
 }
 
 
@@ -2172,7 +2109,7 @@ void search_view_filter_set_show_media_raw (SearchViewFilter* self, gboolean val
 	_tmp0_ = value;
 #line 53 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_show_media_raw = _tmp0_;
-#line 2176 "SearchFilter.c"
+#line 2113 "SearchFilter.c"
 }
 
 
@@ -2187,14 +2124,14 @@ SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2191 "SearchFilter.c"
+#line 2128 "SearchFilter.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2198 "SearchFilter.c"
+#line 2135 "SearchFilter.c"
 }
 
 
@@ -2211,7 +2148,7 @@ void search_view_filter_set_saved_search (SearchViewFilter* self, SavedSearch* v
 	_g_object_unref0 (self->priv->_saved_search);
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_saved_search = _tmp1_;
-#line 2215 "SearchFilter.c"
+#line 2152 "SearchFilter.c"
 }
 
 
@@ -2224,7 +2161,7 @@ static void search_view_filter_class_init (SearchViewFilterClass * klass) {
 	g_type_class_add_private (klass, sizeof (SearchViewFilterPrivate));
 #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = search_view_filter_real_get_criteria;
-#line 2228 "SearchFilter.c"
+#line 2165 "SearchFilter.c"
 }
 
 
@@ -2255,7 +2192,7 @@ static void search_view_filter_instance_init (SearchViewFilter * self) {
 	self->priv->_search_filter_words_size_ = self->priv->search_filter_words_length1;
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_saved_search = NULL;
-#line 2259 "SearchFilter.c"
+#line 2196 "SearchFilter.c"
 }
 
 
@@ -2271,7 +2208,7 @@ static void search_view_filter_finalize (ViewFilter* obj) {
 	_g_object_unref0 (self->priv->_saved_search);
 #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	VIEW_FILTER_CLASS (search_view_filter_parent_class)->finalize (obj);
-#line 2275 "SearchFilter.c"
+#line 2212 "SearchFilter.c"
 }
 
 
@@ -2303,7 +2240,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2307 "SearchFilter.c"
+#line 2244 "SearchFilter.c"
 }
 
 
@@ -2341,14 +2278,14 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_tmp3_ = criteria;
 #line 186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_RATING & _tmp3_) != 0) {
-#line 2345 "SearchFilter.c"
+#line 2282 "SearchFilter.c"
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp5_) {
-#line 2352 "SearchFilter.c"
+#line 2289 "SearchFilter.c"
 			MediaSource* _tmp6_ = NULL;
 			Rating _tmp7_ = 0;
 			Rating _tmp8_ = 0;
@@ -2360,11 +2297,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp8_ = search_view_filter_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = _tmp7_ < _tmp8_;
-#line 2364 "SearchFilter.c"
+#line 2301 "SearchFilter.c"
 		} else {
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = FALSE;
-#line 2368 "SearchFilter.c"
+#line 2305 "SearchFilter.c"
 		}
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp4_) {
@@ -2374,7 +2311,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_g_object_unref0 (source);
 #line 188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 2378 "SearchFilter.c"
+#line 2315 "SearchFilter.c"
 		} else {
 			gboolean _tmp9_ = FALSE;
 			gboolean _tmp10_ = FALSE;
@@ -2382,7 +2319,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp10_ = search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (!_tmp10_) {
-#line 2386 "SearchFilter.c"
+#line 2323 "SearchFilter.c"
 				MediaSource* _tmp11_ = NULL;
 				Rating _tmp12_ = 0;
 				Rating _tmp13_ = 0;
@@ -2394,11 +2331,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 				_tmp13_ = search_view_filter_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp9_ = _tmp12_ != _tmp13_;
-#line 2398 "SearchFilter.c"
+#line 2335 "SearchFilter.c"
 			} else {
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp9_ = FALSE;
-#line 2402 "SearchFilter.c"
+#line 2339 "SearchFilter.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp9_) {
@@ -2408,7 +2345,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 				_g_object_unref0 (source);
 #line 190 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				return result;
-#line 2412 "SearchFilter.c"
+#line 2349 "SearchFilter.c"
 			}
 		}
 	}
@@ -2416,7 +2353,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_tmp14_ = criteria;
 #line 194 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_FLAG & _tmp14_) != 0) {
-#line 2420 "SearchFilter.c"
+#line 2357 "SearchFilter.c"
 		gboolean _tmp15_ = FALSE;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_ = FALSE;
@@ -2427,21 +2364,21 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_tmp18_ = _tmp17_;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp18_) {
-#line 2431 "SearchFilter.c"
+#line 2368 "SearchFilter.c"
 			MediaSource* _tmp19_ = NULL;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp19_ = source;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_FLAGGABLE);
-#line 2437 "SearchFilter.c"
+#line 2374 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = FALSE;
-#line 2441 "SearchFilter.c"
+#line 2378 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp16_) {
-#line 2445 "SearchFilter.c"
+#line 2382 "SearchFilter.c"
 			MediaSource* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2450,11 +2387,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp21_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_FLAGGABLE, Flaggable));
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp15_ = !_tmp21_;
-#line 2454 "SearchFilter.c"
+#line 2391 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp15_ = FALSE;
-#line 2458 "SearchFilter.c"
+#line 2395 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp15_) {
@@ -2464,34 +2401,34 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_g_object_unref0 (source);
 #line 196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 2468 "SearchFilter.c"
+#line 2405 "SearchFilter.c"
 		}
 	}
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp23_ = criteria;
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_MEDIA & _tmp23_) != 0) {
-#line 2475 "SearchFilter.c"
+#line 2412 "SearchFilter.c"
 		gboolean _tmp24_ = FALSE;
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp24_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp22_ = _tmp24_;
-#line 2481 "SearchFilter.c"
+#line 2418 "SearchFilter.c"
 	} else {
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp22_ = FALSE;
-#line 2485 "SearchFilter.c"
+#line 2422 "SearchFilter.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp22_) {
-#line 2489 "SearchFilter.c"
+#line 2426 "SearchFilter.c"
 		MediaSource* _tmp25_ = NULL;
 #line 201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp25_ = source;
 #line 201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_VIDEO_SOURCE)) {
-#line 2495 "SearchFilter.c"
+#line 2432 "SearchFilter.c"
 			gboolean _tmp26_ = FALSE;
 			gboolean _tmp27_ = FALSE;
 #line 202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2506,7 +2443,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 				_g_object_unref0 (source);
 #line 203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				return result;
-#line 2510 "SearchFilter.c"
+#line 2447 "SearchFilter.c"
 			}
 		} else {
 			MediaSource* _tmp28_ = NULL;
@@ -2514,7 +2451,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp28_ = source;
 #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, TYPE_PHOTO)) {
-#line 2518 "SearchFilter.c"
+#line 2455 "SearchFilter.c"
 				Photo* photo = NULL;
 				MediaSource* _tmp29_ = NULL;
 				Photo* _tmp30_ = NULL;
@@ -2532,7 +2469,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 				_tmp32_ = photo_get_master_file_format (_tmp31_);
 #line 206 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				if (_tmp32_ == PHOTO_FILE_FORMAT_RAW) {
-#line 2536 "SearchFilter.c"
+#line 2473 "SearchFilter.c"
 					Photo* _tmp33_ = NULL;
 					gboolean _tmp34_ = FALSE;
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2541,7 +2478,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 					_tmp34_ = photo_is_raw_developer_available (_tmp33_, RAW_DEVELOPER_CAMERA);
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp34_) {
-#line 2545 "SearchFilter.c"
+#line 2482 "SearchFilter.c"
 						gboolean _tmp35_ = FALSE;
 						gboolean _tmp36_ = FALSE;
 						gboolean _tmp37_ = FALSE;
@@ -2551,7 +2488,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_tmp37_ = _tmp36_;
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						if (!_tmp37_) {
-#line 2555 "SearchFilter.c"
+#line 2492 "SearchFilter.c"
 							gboolean _tmp38_ = FALSE;
 							gboolean _tmp39_ = FALSE;
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2560,11 +2497,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 							_tmp39_ = _tmp38_;
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							_tmp35_ = !_tmp39_;
-#line 2564 "SearchFilter.c"
+#line 2501 "SearchFilter.c"
 						} else {
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							_tmp35_ = FALSE;
-#line 2568 "SearchFilter.c"
+#line 2505 "SearchFilter.c"
 						}
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						if (_tmp35_) {
@@ -2576,7 +2513,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 							_g_object_unref0 (source);
 #line 209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							return result;
-#line 2580 "SearchFilter.c"
+#line 2517 "SearchFilter.c"
 						}
 					} else {
 						gboolean _tmp40_ = FALSE;
@@ -2595,7 +2532,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 							_g_object_unref0 (source);
 #line 211 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							return result;
-#line 2599 "SearchFilter.c"
+#line 2536 "SearchFilter.c"
 						}
 					}
 				} else {
@@ -2615,12 +2552,12 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_g_object_unref0 (source);
 #line 214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						return result;
-#line 2619 "SearchFilter.c"
+#line 2556 "SearchFilter.c"
 					}
 				}
 #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (photo);
-#line 2624 "SearchFilter.c"
+#line 2561 "SearchFilter.c"
 			}
 		}
 	}
@@ -2628,21 +2565,21 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_tmp45_ = criteria;
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_TEXT & _tmp45_) != 0) {
-#line 2632 "SearchFilter.c"
+#line 2569 "SearchFilter.c"
 		gboolean _tmp46_ = FALSE;
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp46_ = search_view_filter_has_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp44_ = _tmp46_;
-#line 2638 "SearchFilter.c"
+#line 2575 "SearchFilter.c"
 	} else {
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp44_ = FALSE;
-#line 2642 "SearchFilter.c"
+#line 2579 "SearchFilter.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp44_) {
-#line 2646 "SearchFilter.c"
+#line 2583 "SearchFilter.c"
 		const gchar* media_keywords = NULL;
 		MediaSource* _tmp47_ = NULL;
 		const gchar* _tmp48_ = NULL;
@@ -2678,7 +2615,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_tmp51_ = event;
 #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp51_ != NULL) {
-#line 2682 "SearchFilter.c"
+#line 2619 "SearchFilter.c"
 			Event* _tmp52_ = NULL;
 			const gchar* _tmp53_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2687,7 +2624,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp53_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_INDEXABLE, Indexable));
 #line 225 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			event_keywords = _tmp53_;
-#line 2691 "SearchFilter.c"
+#line 2628 "SearchFilter.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp54_ = tag_global;
@@ -2701,7 +2638,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_tmp58_ = tags;
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp58_ != NULL) {
-#line 2705 "SearchFilter.c"
+#line 2642 "SearchFilter.c"
 			GeeList* _tmp59_ = NULL;
 			gint _tmp60_ = 0;
 			gint _tmp61_ = 0;
@@ -2713,17 +2650,17 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp61_ = _tmp60_;
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp57_ = _tmp61_;
-#line 2717 "SearchFilter.c"
+#line 2654 "SearchFilter.c"
 		} else {
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp57_ = 0;
-#line 2721 "SearchFilter.c"
+#line 2658 "SearchFilter.c"
 		}
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		tags_size = _tmp57_;
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp63_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp62_);
-#line 2727 "SearchFilter.c"
+#line 2664 "SearchFilter.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
@@ -2735,11 +2672,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			word_collection_length1 = _tmp62_;
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			for (word_it = 0; word_it < _tmp62_; word_it = word_it + 1) {
-#line 2739 "SearchFilter.c"
+#line 2676 "SearchFilter.c"
 				const gchar* word = NULL;
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				word = word_collection[word_it];
-#line 2743 "SearchFilter.c"
+#line 2680 "SearchFilter.c"
 				{
 					gboolean _tmp64_ = FALSE;
 					const gchar* _tmp65_ = NULL;
@@ -2750,7 +2687,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 					_tmp65_ = media_keywords;
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp65_ != NULL) {
-#line 2754 "SearchFilter.c"
+#line 2691 "SearchFilter.c"
 						const gchar* _tmp66_ = NULL;
 						const gchar* _tmp67_ = NULL;
 						gboolean _tmp68_ = FALSE;
@@ -2762,23 +2699,23 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_tmp68_ = string_contains (_tmp66_, _tmp67_);
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp64_ = _tmp68_;
-#line 2766 "SearchFilter.c"
+#line 2703 "SearchFilter.c"
 					} else {
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp64_ = FALSE;
-#line 2770 "SearchFilter.c"
+#line 2707 "SearchFilter.c"
 					}
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp64_) {
 #line 232 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2776 "SearchFilter.c"
+#line 2713 "SearchFilter.c"
 					}
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					_tmp70_ = event_keywords;
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp70_ != NULL) {
-#line 2782 "SearchFilter.c"
+#line 2719 "SearchFilter.c"
 						const gchar* _tmp71_ = NULL;
 						const gchar* _tmp72_ = NULL;
 						gboolean _tmp73_ = FALSE;
@@ -2790,40 +2727,40 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_tmp73_ = string_contains (_tmp71_, _tmp72_);
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp69_ = _tmp73_;
-#line 2794 "SearchFilter.c"
+#line 2731 "SearchFilter.c"
 					} else {
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp69_ = FALSE;
-#line 2798 "SearchFilter.c"
+#line 2735 "SearchFilter.c"
 					}
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp69_) {
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2804 "SearchFilter.c"
+#line 2741 "SearchFilter.c"
 					}
 #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					_tmp74_ = tags_size;
 #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp74_ > 0) {
-#line 2810 "SearchFilter.c"
+#line 2747 "SearchFilter.c"
 						gboolean found = FALSE;
 						gboolean _tmp90_ = FALSE;
 #line 238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						found = FALSE;
-#line 2815 "SearchFilter.c"
+#line 2752 "SearchFilter.c"
 						{
 							gint ctr = 0;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							ctr = 0;
-#line 2820 "SearchFilter.c"
+#line 2757 "SearchFilter.c"
 							{
 								gboolean _tmp75_ = FALSE;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 								_tmp75_ = TRUE;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 								while (TRUE) {
-#line 2827 "SearchFilter.c"
+#line 2764 "SearchFilter.c"
 									gint _tmp77_ = 0;
 									gint _tmp78_ = 0;
 									const gchar* tag_keywords = NULL;
@@ -2837,13 +2774,13 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 									const gchar* _tmp86_ = NULL;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (!_tmp75_) {
-#line 2841 "SearchFilter.c"
+#line 2778 "SearchFilter.c"
 										gint _tmp76_ = 0;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp76_ = ctr;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										ctr = _tmp76_ + 1;
-#line 2847 "SearchFilter.c"
+#line 2784 "SearchFilter.c"
 									}
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									_tmp75_ = FALSE;
@@ -2855,7 +2792,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 									if (!(_tmp77_ < _tmp78_)) {
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										break;
-#line 2859 "SearchFilter.c"
+#line 2796 "SearchFilter.c"
 									}
 #line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									_tmp79_ = tags;
@@ -2877,7 +2814,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 									_tmp86_ = tag_keywords;
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (_tmp86_ != NULL) {
-#line 2881 "SearchFilter.c"
+#line 2818 "SearchFilter.c"
 										const gchar* _tmp87_ = NULL;
 										const gchar* _tmp88_ = NULL;
 										gboolean _tmp89_ = FALSE;
@@ -2889,11 +2826,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 										_tmp89_ = string_contains (_tmp87_, _tmp88_);
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp85_ = _tmp89_;
-#line 2893 "SearchFilter.c"
+#line 2830 "SearchFilter.c"
 									} else {
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp85_ = FALSE;
-#line 2897 "SearchFilter.c"
+#line 2834 "SearchFilter.c"
 									}
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (_tmp85_) {
@@ -2901,7 +2838,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 										found = TRUE;
 #line 244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										break;
-#line 2905 "SearchFilter.c"
+#line 2842 "SearchFilter.c"
 									}
 								}
 							}
@@ -2912,7 +2849,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						if (_tmp90_) {
 #line 249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							continue;
-#line 2916 "SearchFilter.c"
+#line 2853 "SearchFilter.c"
 						}
 					}
 #line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2925,7 +2862,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 					_g_object_unref0 (source);
 #line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					return result;
-#line 2929 "SearchFilter.c"
+#line 2866 "SearchFilter.c"
 				}
 			}
 		}
@@ -2933,27 +2870,27 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_g_object_unref0 (tags);
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (event);
-#line 2937 "SearchFilter.c"
+#line 2874 "SearchFilter.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp92_ = criteria;
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_SAVEDSEARCH & _tmp92_) != 0) {
-#line 2943 "SearchFilter.c"
+#line 2880 "SearchFilter.c"
 		gboolean _tmp93_ = FALSE;
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp93_ = search_view_filter_has_saved_search (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp91_ = _tmp93_;
-#line 2949 "SearchFilter.c"
+#line 2886 "SearchFilter.c"
 	} else {
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp91_ = FALSE;
-#line 2953 "SearchFilter.c"
+#line 2890 "SearchFilter.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp91_) {
-#line 2957 "SearchFilter.c"
+#line 2894 "SearchFilter.c"
 		SavedSearch* _tmp94_ = NULL;
 		SavedSearch* _tmp95_ = NULL;
 		MediaSource* _tmp96_ = NULL;
@@ -2972,7 +2909,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_g_object_unref0 (source);
 #line 260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 2976 "SearchFilter.c"
+#line 2913 "SearchFilter.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
@@ -2980,7 +2917,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_g_object_unref0 (source);
 #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2984 "SearchFilter.c"
+#line 2921 "SearchFilter.c"
 }
 
 
@@ -2990,7 +2927,7 @@ DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type
 	self = (DefaultSearchViewFilter*) search_view_filter_construct (object_type);
 #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 2994 "SearchFilter.c"
+#line 2931 "SearchFilter.c"
 }
 
 
@@ -2999,7 +2936,7 @@ static void default_search_view_filter_class_init (DefaultSearchViewFilterClass
 	default_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((ViewFilterClass *) klass)->predicate = default_search_view_filter_real_predicate;
-#line 3003 "SearchFilter.c"
+#line 2940 "SearchFilter.c"
 }
 
 
@@ -3030,7 +2967,7 @@ static gboolean disabled_view_filter_real_predicate (ViewFilter* base, DataView*
 	result = TRUE;
 #line 269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3034 "SearchFilter.c"
+#line 2971 "SearchFilter.c"
 }
 
 
@@ -3043,7 +2980,7 @@ static guint disabled_view_filter_real_get_criteria (SearchViewFilter* base) {
 	result = (guint) SEARCH_FILTER_CRITERIA_RATING;
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3047 "SearchFilter.c"
+#line 2984 "SearchFilter.c"
 }
 
 
@@ -3053,14 +2990,14 @@ DisabledViewFilter* disabled_view_filter_construct (GType object_type) {
 	self = (DisabledViewFilter*) search_view_filter_construct (object_type);
 #line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 3057 "SearchFilter.c"
+#line 2994 "SearchFilter.c"
 }
 
 
 DisabledViewFilter* disabled_view_filter_new (void) {
 #line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return disabled_view_filter_construct (TYPE_DISABLED_VIEW_FILTER);
-#line 3064 "SearchFilter.c"
+#line 3001 "SearchFilter.c"
 }
 
 
@@ -3071,7 +3008,7 @@ static void disabled_view_filter_class_init (DisabledViewFilterClass * klass) {
 	((ViewFilterClass *) klass)->predicate = disabled_view_filter_real_predicate;
 #line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = disabled_view_filter_real_get_criteria;
-#line 3075 "SearchFilter.c"
+#line 3012 "SearchFilter.c"
 }
 
 
@@ -3107,14 +3044,14 @@ TextAction* text_action_construct (GType object_type, const gchar* init) {
 	self->priv->text = _tmp1_;
 #line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 3111 "SearchFilter.c"
+#line 3048 "SearchFilter.c"
 }
 
 
 TextAction* text_action_new (const gchar* init) {
 #line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return text_action_construct (TYPE_TEXT_ACTION, init);
-#line 3118 "SearchFilter.c"
+#line 3055 "SearchFilter.c"
 }
 
 
@@ -3129,7 +3066,7 @@ void text_action_set_text (TextAction* self, const gchar* text) {
 	_tmp1_ = text;
 #line 299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_strcmp0 (_tmp0_, _tmp1_) != 0) {
-#line 3133 "SearchFilter.c"
+#line 3070 "SearchFilter.c"
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -3145,7 +3082,7 @@ void text_action_set_text (TextAction* self, const gchar* text) {
 		_tmp4_ = text;
 #line 301 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (self, "text-changed", _tmp4_);
-#line 3149 "SearchFilter.c"
+#line 3086 "SearchFilter.c"
 	}
 }
 
@@ -3155,7 +3092,7 @@ void text_action_clear (TextAction* self) {
 	g_return_if_fail (IS_TEXT_ACTION (self));
 #line 306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	text_action_set_text (self, NULL);
-#line 3159 "SearchFilter.c"
+#line 3096 "SearchFilter.c"
 }
 
 
@@ -3170,7 +3107,7 @@ gboolean text_action_is_sensitive (TextAction* self) {
 	result = _tmp0_;
 #line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3174 "SearchFilter.c"
+#line 3111 "SearchFilter.c"
 }
 
 
@@ -3185,7 +3122,7 @@ void text_action_set_sensitive (TextAction* self, gboolean sensitive) {
 	_tmp1_ = sensitive;
 #line 314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ != _tmp1_) {
-#line 3189 "SearchFilter.c"
+#line 3126 "SearchFilter.c"
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
 #line 315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3196,7 +3133,7 @@ void text_action_set_sensitive (TextAction* self, gboolean sensitive) {
 		_tmp3_ = sensitive;
 #line 316 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (self, "sensitivity-changed", _tmp3_);
-#line 3200 "SearchFilter.c"
+#line 3137 "SearchFilter.c"
 	}
 }
 
@@ -3212,7 +3149,7 @@ gboolean text_action_is_visible (TextAction* self) {
 	result = _tmp0_;
 #line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3216 "SearchFilter.c"
+#line 3153 "SearchFilter.c"
 }
 
 
@@ -3227,7 +3164,7 @@ void text_action_set_visible (TextAction* self, gboolean visible) {
 	_tmp1_ = visible;
 #line 325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ != _tmp1_) {
-#line 3231 "SearchFilter.c"
+#line 3168 "SearchFilter.c"
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
 #line 326 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3238,7 +3175,7 @@ void text_action_set_visible (TextAction* self, gboolean visible) {
 		_tmp3_ = visible;
 #line 327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (self, "visibility-changed", _tmp3_);
-#line 3242 "SearchFilter.c"
+#line 3179 "SearchFilter.c"
 	}
 }
 
@@ -3254,14 +3191,14 @@ const gchar* text_action_get_value (TextAction* self) {
 	result = _tmp0_;
 #line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3258 "SearchFilter.c"
+#line 3195 "SearchFilter.c"
 }
 
 
 static void value_text_action_init (GValue* value) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 3265 "SearchFilter.c"
+#line 3202 "SearchFilter.c"
 }
 
 
@@ -3270,7 +3207,7 @@ static void value_text_action_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (value->data[0].v_pointer);
-#line 3274 "SearchFilter.c"
+#line 3211 "SearchFilter.c"
 	}
 }
 
@@ -3280,11 +3217,11 @@ static void value_text_action_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = text_action_ref (src_value->data[0].v_pointer);
-#line 3284 "SearchFilter.c"
+#line 3221 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3288 "SearchFilter.c"
+#line 3225 "SearchFilter.c"
 	}
 }
 
@@ -3292,37 +3229,37 @@ static void value_text_action_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_text_action_peek_pointer (const GValue* value) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 3296 "SearchFilter.c"
+#line 3233 "SearchFilter.c"
 }
 
 
 static gchar* value_text_action_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 3303 "SearchFilter.c"
+#line 3240 "SearchFilter.c"
 		TextAction* object;
 		object = collect_values[0].v_pointer;
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3310 "SearchFilter.c"
+#line 3247 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3314 "SearchFilter.c"
+#line 3251 "SearchFilter.c"
 		}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = text_action_ref (object);
-#line 3318 "SearchFilter.c"
+#line 3255 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3322 "SearchFilter.c"
+#line 3259 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3326 "SearchFilter.c"
+#line 3263 "SearchFilter.c"
 }
 
 
@@ -3333,25 +3270,25 @@ static gchar* value_text_action_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3337 "SearchFilter.c"
+#line 3274 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 3343 "SearchFilter.c"
+#line 3280 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3347 "SearchFilter.c"
+#line 3284 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = text_action_ref (value->data[0].v_pointer);
-#line 3351 "SearchFilter.c"
+#line 3288 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3355 "SearchFilter.c"
+#line 3292 "SearchFilter.c"
 }
 
 
@@ -3365,7 +3302,7 @@ GParamSpec* param_spec_text_action (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 3369 "SearchFilter.c"
+#line 3306 "SearchFilter.c"
 }
 
 
@@ -3374,7 +3311,7 @@ gpointer value_get_text_action (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ACTION), NULL);
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 3378 "SearchFilter.c"
+#line 3315 "SearchFilter.c"
 }
 
 
@@ -3394,17 +3331,17 @@ void value_set_text_action (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_ref (value->data[0].v_pointer);
-#line 3398 "SearchFilter.c"
+#line 3335 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3402 "SearchFilter.c"
+#line 3339 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (old);
-#line 3408 "SearchFilter.c"
+#line 3345 "SearchFilter.c"
 	}
 }
 
@@ -3423,17 +3360,17 @@ void value_take_text_action (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 3427 "SearchFilter.c"
+#line 3364 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3431 "SearchFilter.c"
+#line 3368 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (old);
-#line 3437 "SearchFilter.c"
+#line 3374 "SearchFilter.c"
 	}
 }
 
@@ -3451,7 +3388,7 @@ static void text_action_class_init (TextActionClass * klass) {
 	g_signal_new ("sensitivity_changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("visibility_changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 3455 "SearchFilter.c"
+#line 3392 "SearchFilter.c"
 }
 
 
@@ -3466,7 +3403,7 @@ static void text_action_instance_init (TextAction * self) {
 	self->priv->visible = TRUE;
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 3470 "SearchFilter.c"
+#line 3407 "SearchFilter.c"
 }
 
 
@@ -3478,7 +3415,7 @@ static void text_action_finalize (TextAction* obj) {
 	g_signal_handlers_destroy (self);
 #line 284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_free0 (self->priv->text);
-#line 3482 "SearchFilter.c"
+#line 3419 "SearchFilter.c"
 }
 
 
@@ -3503,7 +3440,7 @@ gpointer text_action_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 3507 "SearchFilter.c"
+#line 3444 "SearchFilter.c"
 }
 
 
@@ -3516,15 +3453,64 @@ void text_action_unref (gpointer instance) {
 		TEXT_ACTION_GET_CLASS (self)->finalize (self);
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3520 "SearchFilter.c"
+#line 3457 "SearchFilter.c"
 	}
 }
 
 
+static void _search_filter_actions_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_on_action_radio ((SearchFilterActions*) self, action, parameter);
+#line 3465 "SearchFilter.c"
+}
+
+
+static void _search_filter_actions_on_rating_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_on_rating_changed ((SearchFilterActions*) self, action, value);
+#line 3472 "SearchFilter.c"
+}
+
+
+static void _search_filter_actions_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_on_action_toggle ((SearchFilterActions*) self, action, parameter);
+#line 3479 "SearchFilter.c"
+}
+
+
+static void _search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_on_flagged_toggled ((SearchFilterActions*) self, action, value);
+#line 3486 "SearchFilter.c"
+}
+
+
+static void _search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_on_photos_toggled ((SearchFilterActions*) self, action, value);
+#line 3493 "SearchFilter.c"
+}
+
+
+static void _search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_on_videos_toggled ((SearchFilterActions*) self, action, value);
+#line 3500 "SearchFilter.c"
+}
+
+
+static void _search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_on_raw_toggled ((SearchFilterActions*) self, action, value);
+#line 3507 "SearchFilter.c"
+}
+
+
 static void _search_filter_actions_on_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self) {
 #line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_text_changed ((SearchFilterActions*) self, _sender, text);
-#line 3528 "SearchFilter.c"
+#line 3514 "SearchFilter.c"
 }
 
 
@@ -3544,194 +3530,257 @@ SearchFilterActions* search_filter_actions_construct (GType object_type) {
 	g_signal_connect (_tmp1_, "text-changed", (GCallback) _search_filter_actions_on_text_changed_text_action_text_changed, self);
 #line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 3548 "SearchFilter.c"
+#line 3534 "SearchFilter.c"
 }
 
 
 SearchFilterActions* search_filter_actions_new (void) {
 #line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_actions_construct (TYPE_SEARCH_FILTER_ACTIONS);
-#line 3555 "SearchFilter.c"
+#line 3541 "SearchFilter.c"
 }
 
 
-GtkActionGroup* search_filter_actions_get_action_group (SearchFilterActions* self) {
-	GtkActionGroup* result = NULL;
-	GtkActionGroup* _tmp0_ = NULL;
-	GtkActionGroup* _tmp1_ = NULL;
+SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* self) {
+	SearchFilterCriteria result = 0;
+	SearchFilterCriteria _tmp0_ = 0;
 #line 413 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
-#line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = self->priv->action_group;
+	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), 0);
 #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = self->priv->criteria;
 #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	result = _tmp1_;
+	result = _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3573 "SearchFilter.c"
+#line 3556 "SearchFilter.c"
 }
 
 
-SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* self) {
-	SearchFilterCriteria result = 0;
-	SearchFilterCriteria _tmp0_ = 0;
+GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* result_length1) {
+	GActionEntry* result = NULL;
+	GActionEntry* _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
 #line 417 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), 0);
+	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
 #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = self->priv->criteria;
+	_tmp0_ = SEARCH_FILTER_ACTIONS_entries;
+#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp0__length1 = G_N_ELEMENTS (SEARCH_FILTER_ACTIONS_entries);
+#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	if (result_length1) {
+#line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		*result_length1 = _tmp0__length1;
+#line 3574 "SearchFilter.c"
+	}
 #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
 #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3588 "SearchFilter.c"
+#line 3580 "SearchFilter.c"
 }
 
 
-GtkAction* search_filter_actions_get_action (SearchFilterActions* self, const gchar* name) {
-	GtkAction* result = NULL;
-	GtkActionGroup* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
+GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, const gchar* name) {
+	GSimpleAction* result = NULL;
+	LibraryWindow* lw = NULL;
+	AppWindow* _tmp0_ = NULL;
+	LibraryWindow* _tmp1_ = NULL;
+	LibraryWindow* _tmp2_ = NULL;
 #line 421 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
 #line 421 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = self->priv->action_group;
+	_tmp0_ = app_window_get_instance ();
 #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = name;
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_WINDOW) ? ((LibraryWindow*) _tmp0_) : NULL;
 #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = gtk_action_group_get_action (_tmp0_, _tmp1_);
+	if (_tmp1_ == NULL) {
 #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	result = _tmp2_;
+		_g_object_unref0 (_tmp0_);
+#line 3602 "SearchFilter.c"
+	}
 #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	lw = _tmp1_;
+#line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp2_ = lw;
+#line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	if (_tmp2_ != NULL) {
+#line 3610 "SearchFilter.c"
+		LibraryWindow* _tmp3_ = NULL;
+		const gchar* _tmp4_ = NULL;
+		GAction* _tmp5_ = NULL;
+#line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp3_ = lw;
+#line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp4_ = name;
+#line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp5_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_action_map_get_type (), GActionMap), _tmp4_);
+#line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp5_) : NULL;
+#line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_g_object_unref0 (lw);
+#line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		return result;
+#line 3626 "SearchFilter.c"
+	}
+#line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	result = NULL;
+#line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_object_unref0 (lw);
+#line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3611 "SearchFilter.c"
+#line 3634 "SearchFilter.c"
 }
 
 
 void search_filter_actions_set_action_sensitive (SearchFilterActions* self, const gchar* name, gboolean sensitive) {
-	GtkAction* action = NULL;
+	GSimpleAction* action = NULL;
 	const gchar* _tmp0_ = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-	GtkAction* _tmp3_ = NULL;
-#line 425 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+#line 431 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 425 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 431 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (name != NULL);
-#line 426 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 432 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = name;
-#line 426 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 432 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = search_filter_actions_get_action (self, _tmp0_);
-#line 426 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 432 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 426 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 432 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	action = _tmp2_;
-#line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 433 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = action;
-#line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 433 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_ != NULL) {
-#line 3637 "SearchFilter.c"
-		GtkAction* _tmp4_ = NULL;
+#line 3660 "SearchFilter.c"
+		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 428 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = action;
-#line 428 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = sensitive;
-#line 428 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		gtk_action_set_sensitive (_tmp4_, _tmp5_);
-#line 3646 "SearchFilter.c"
+#line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		g_simple_action_set_enabled (_tmp4_, _tmp5_);
+#line 3669 "SearchFilter.c"
 	}
-#line 425 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 431 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
-#line 3650 "SearchFilter.c"
+#line 3673 "SearchFilter.c"
+}
+
+
+static GVariant* _variant_new28 (gchar* value) {
+#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 3680 "SearchFilter.c"
 }
 
 
 void search_filter_actions_reset (SearchFilterActions* self) {
-	GtkToggleAction* _tmp0_ = NULL;
-	GtkToggleAction* _tmp1_ = NULL;
-	GtkToggleAction* _tmp2_ = NULL;
-	GtkToggleAction* _tmp3_ = NULL;
-	GtkToggleAction* _tmp4_ = NULL;
-	GtkToggleAction* _tmp5_ = NULL;
-	GtkToggleAction* _tmp6_ = NULL;
-	GtkToggleAction* _tmp7_ = NULL;
-	GtkRadioAction* _tmp8_ = NULL;
-	GtkRadioAction* _tmp9_ = NULL;
-	TextAction* _tmp10_ = NULL;
-	TextAction* _tmp11_ = NULL;
-#line 431 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GSimpleAction* _tmp0_ = NULL;
+	GSimpleAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+	GSimpleAction* _tmp4_ = NULL;
+	GSimpleAction* _tmp5_ = NULL;
+	GSimpleAction* _tmp6_ = NULL;
+	GSimpleAction* _tmp7_ = NULL;
+	GVariant* v = NULL;
+	gchar* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+	GVariant* _tmp10_ = NULL;
+	GVariant* _tmp11_ = NULL;
+	GSimpleAction* _tmp12_ = NULL;
+	GSimpleAction* _tmp13_ = NULL;
+	TextAction* _tmp14_ = NULL;
+	TextAction* _tmp15_ = NULL;
+#line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 432 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = search_filter_actions_get_flagged (self);
-#line 432 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp0_ = search_filter_actions_get_rating (self);
+#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_;
-#line 432 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toggle_action_set_active (_tmp1_, FALSE);
-#line 433 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_simple_action_set_enabled (_tmp1_, FALSE);
+#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search_filter_actions_get_photos (self);
-#line 433 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_;
-#line 433 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toggle_action_set_active (_tmp3_, FALSE);
-#line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_simple_action_set_enabled (_tmp3_, FALSE);
+#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = search_filter_actions_get_raw (self);
-#line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = _tmp4_;
-#line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toggle_action_set_active (_tmp5_, FALSE);
-#line 435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_simple_action_set_enabled (_tmp5_, FALSE);
+#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = search_filter_actions_get_videos (self);
-#line 435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = _tmp6_;
-#line 435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toggle_action_set_active (_tmp7_, FALSE);
-#line 436 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp8_ = search_filter_actions_get_rating (self);
-#line 436 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_simple_action_set_enabled (_tmp7_, FALSE);
+#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp8_ = g_strdup_printf ("'%d'", (gint) RATING_FILTER_UNRATED_OR_HIGHER);
+#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = _tmp8_;
-#line 436 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_radio_action_set_current_value (_tmp9_, (gint) RATING_FILTER_UNRATED_OR_HIGHER);
-#line 437 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp10_ = search_filter_actions_get_text (self);
-#line 437 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp10_ = _variant_new28 (_tmp9_);
+#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = _tmp10_;
-#line 437 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	text_action_set_text (_tmp11_, NULL);
-#line 3705 "SearchFilter.c"
+#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_free0 (_tmp9_);
+#line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	v = _tmp11_;
+#line 444 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp12_ = search_filter_actions_get_rating (self);
+#line 444 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp13_ = _tmp12_;
+#line 444 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_simple_action_set_state (_tmp13_, v);
+#line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp14_ = search_filter_actions_get_text (self);
+#line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp15_ = _tmp14_;
+#line 446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	text_action_set_text (_tmp15_, NULL);
+#line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (v);
+#line 3754 "SearchFilter.c"
 }
 
 
 void search_filter_actions_set_sensitive_for_search_criteria (SearchFilterActions* self, SearchFilterCriteria criteria) {
 	SearchFilterCriteria _tmp0_ = 0;
-#line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 449 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 450 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = criteria;
-#line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 450 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->criteria = _tmp0_;
-#line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 451 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_update_sensitivities (self);
-#line 445 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "criteria-changed");
-#line 3721 "SearchFilter.c"
+#line 3770 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_media_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) {
-#line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_media_tracker_updated ((SearchFilterActions*) self, _sender);
-#line 3728 "SearchFilter.c"
+#line 3777 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_camera_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) {
-#line 455 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_camera_tracker_updated ((SearchFilterActions*) self, _sender);
-#line 3735 "SearchFilter.c"
+#line 3784 "SearchFilter.c"
 }
 
 
@@ -3744,172 +3793,172 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 	Page* _tmp11_ = NULL;
 	CheckerboardPage* _tmp12_ = NULL;
 	CheckerboardPage* _tmp13_ = NULL;
-#line 448 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 448 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 448 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 449 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = old_page;
-#line 449 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL);
-#line 449 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	old_tracked_page = _tmp1_;
-#line 450 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = old_tracked_page;
-#line 450 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_ != NULL) {
-#line 3764 "SearchFilter.c"
+#line 3813 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
 		CheckerboardPage* _tmp3_ = NULL;
 		CoreViewTracker* _tmp4_ = NULL;
 		CoreViewTracker* _tmp5_ = NULL;
-#line 451 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = old_tracked_page;
-#line 451 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = checkerboard_page_get_view_tracker (_tmp3_);
-#line 451 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		tracker = _tmp4_;
-#line 452 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 461 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = tracker;
-#line 452 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 461 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_MEDIA_VIEW_TRACKER)) {
-#line 3779 "SearchFilter.c"
+#line 3828 "SearchFilter.c"
 			CoreViewTracker* _tmp6_ = NULL;
 			guint _tmp7_ = 0U;
-#line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = tracker;
-#line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp7_, NULL, FALSE);
-#line 453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_actions_on_media_tracker_updated_core_tracker_updated, self);
-#line 3788 "SearchFilter.c"
+#line 3837 "SearchFilter.c"
 		} else {
 			CoreViewTracker* _tmp8_ = NULL;
-#line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp8_ = tracker;
-#line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_CAMERA_VIEW_TRACKER)) {
-#line 3795 "SearchFilter.c"
+#line 3844 "SearchFilter.c"
 				CoreViewTracker* _tmp9_ = NULL;
 				guint _tmp10_ = 0U;
-#line 455 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp9_ = tracker;
-#line 455 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp10_, NULL, FALSE);
-#line 455 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _search_filter_actions_on_camera_tracker_updated_core_tracker_updated, self);
-#line 3804 "SearchFilter.c"
+#line 3853 "SearchFilter.c"
 			}
 		}
-#line 450 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3809 "SearchFilter.c"
+#line 3858 "SearchFilter.c"
 	}
-#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = new_page;
-#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp11_) : NULL);
-#line 458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	new_tracked_page = _tmp12_;
-#line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp13_ = new_tracked_page;
-#line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp13_ != NULL) {
-#line 3821 "SearchFilter.c"
+#line 3870 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
 		CheckerboardPage* _tmp14_ = NULL;
 		CoreViewTracker* _tmp15_ = NULL;
 		CoreViewTracker* _tmp16_ = NULL;
-#line 460 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		self->priv->can_filter_by_stars = TRUE;
-#line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 471 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp14_ = new_tracked_page;
-#line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 471 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp15_ = checkerboard_page_get_view_tracker (_tmp14_);
-#line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 471 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		tracker = _tmp15_;
-#line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp16_ = tracker;
-#line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_MEDIA_VIEW_TRACKER)) {
-#line 3838 "SearchFilter.c"
+#line 3887 "SearchFilter.c"
 			CoreViewTracker* _tmp17_ = NULL;
 			CoreViewTracker* _tmp18_ = NULL;
-#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp17_ = tracker;
-#line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, CORE_TYPE_TRACKER, CoreTracker), "updated", (GCallback) _search_filter_actions_on_media_tracker_updated_core_tracker_updated, self);
-#line 465 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 474 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp18_ = tracker;
-#line 465 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 474 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_actions_on_media_tracker_updated (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, CORE_TYPE_TRACKER, CoreTracker));
-#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_core_tracker_unref0 (tracker);
-#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (new_tracked_page);
-#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (old_tracked_page);
-#line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return;
-#line 3857 "SearchFilter.c"
+#line 3906 "SearchFilter.c"
 		} else {
 			CoreViewTracker* _tmp19_ = NULL;
-#line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp19_ = tracker;
-#line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_CAMERA_VIEW_TRACKER)) {
-#line 3864 "SearchFilter.c"
+#line 3913 "SearchFilter.c"
 				CoreViewTracker* _tmp20_ = NULL;
 				CoreViewTracker* _tmp21_ = NULL;
-#line 469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp20_ = tracker;
-#line 469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, CORE_TYPE_TRACKER, CoreTracker), "updated", (GCallback) _search_filter_actions_on_camera_tracker_updated_core_tracker_updated, self);
-#line 470 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 479 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp21_ = tracker;
-#line 470 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 479 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				search_filter_actions_on_camera_tracker_updated (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, CORE_TYPE_TRACKER, CoreTracker));
-#line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 481 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_core_tracker_unref0 (tracker);
-#line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 481 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (new_tracked_page);
-#line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 481 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (old_tracked_page);
-#line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 481 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				return;
-#line 3883 "SearchFilter.c"
+#line 3932 "SearchFilter.c"
 			}
 		}
-#line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3888 "SearchFilter.c"
+#line 3937 "SearchFilter.c"
 	}
-#line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = FALSE;
-#line 478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 487 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_photos = FALSE;
-#line 479 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 488 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_videos = FALSE;
-#line 480 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 489 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_raw = FALSE;
-#line 481 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 490 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->can_filter_by_stars = FALSE;
-#line 483 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_update_sensitivities (self);
-#line 448 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (new_tracked_page);
-#line 448 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (old_tracked_page);
-#line 3906 "SearchFilter.c"
+#line 3955 "SearchFilter.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
-#line 487 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 3913 "SearchFilter.c"
+#line 3962 "SearchFilter.c"
 }
 
 
@@ -3925,45 +3974,45 @@ static void search_filter_actions_on_media_tracker_updated (SearchFilterActions*
 	gint _tmp7_ = 0;
 	MediaAccumulator* _tmp8_ = NULL;
 	gint _tmp9_ = 0;
-#line 486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (CORE_IS_TRACKER (t));
-#line 487 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = t;
-#line 487 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_VIEW_TRACKER, MediaViewTracker));
-#line 487 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	tracker = _tmp1_;
-#line 489 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 498 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = tracker->all;
-#line 489 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 498 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_->flagged;
-#line 489 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 498 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = _tmp3_ > 0;
-#line 490 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 499 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = tracker->all;
-#line 490 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 499 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = _tmp4_->photos;
-#line 490 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 499 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_photos = _tmp5_ > 0;
-#line 491 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 500 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = tracker->all;
-#line 491 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 500 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = _tmp6_->videos;
-#line 491 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 500 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_videos = _tmp7_ > 0;
-#line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 501 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = tracker->all;
-#line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 501 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = _tmp8_->raw;
-#line 492 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 501 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_raw = _tmp9_ > 0;
-#line 494 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 503 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_update_sensitivities (self);
-#line 486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_core_tracker_unref0 (tracker);
-#line 3967 "SearchFilter.c"
+#line 4016 "SearchFilter.c"
 }
 
 
@@ -3980,1240 +4029,461 @@ static void search_filter_actions_on_camera_tracker_updated (SearchFilterActions
 	CameraAccumulator* _tmp8_ = NULL;
 	gint _tmp9_ = 0;
 	gint _tmp10_ = 0;
-#line 497 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 497 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (CORE_IS_TRACKER (t));
-#line 498 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = t;
-#line 498 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_CAMERA_VIEW_TRACKER, CameraViewTracker));
-#line 498 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 507 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	tracker = _tmp1_;
-#line 500 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 509 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = FALSE;
-#line 501 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 510 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = tracker->all;
-#line 501 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 510 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = camera_accumulator_get_photos (_tmp2_);
-#line 501 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 510 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = _tmp3_;
-#line 501 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 510 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_photos = _tmp4_ > 0;
-#line 502 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 511 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = tracker->all;
-#line 502 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 511 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = camera_accumulator_get_videos (_tmp5_);
-#line 502 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 511 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = _tmp6_;
-#line 502 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 511 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_videos = _tmp7_ > 0;
-#line 503 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 512 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = tracker->all;
-#line 503 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 512 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = camera_accumulator_get_raw (_tmp8_);
-#line 503 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 512 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = _tmp9_;
-#line 503 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 512 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_raw = _tmp10_ > 0;
-#line 505 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 514 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_update_sensitivities (self);
-#line 497 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_core_tracker_unref0 (tracker);
-#line 4024 "SearchFilter.c"
+#line 4073 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_update_sensitivities (SearchFilterActions* self) {
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	SearchFilterCriteria _tmp2_ = 0;
-	GtkToggleAction* _tmp4_ = NULL;
-	GtkToggleAction* _tmp5_ = NULL;
-	gboolean allow_media = FALSE;
-	SearchFilterCriteria _tmp6_ = 0;
-	const gchar* _tmp7_ = NULL;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_ = FALSE;
-	GtkToggleAction* _tmp11_ = NULL;
-	GtkToggleAction* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
-	GtkToggleAction* _tmp17_ = NULL;
-	GtkToggleAction* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	gboolean _tmp20_ = FALSE;
-	gboolean _tmp21_ = FALSE;
-	GtkToggleAction* _tmp23_ = NULL;
-	GtkToggleAction* _tmp24_ = NULL;
 	gboolean allow_ratings = FALSE;
-	SearchFilterCriteria _tmp25_ = 0;
-	gboolean _tmp26_ = FALSE;
-	gboolean _tmp27_ = FALSE;
-	gboolean _tmp28_ = FALSE;
-	gboolean _tmp29_ = FALSE;
-	gboolean _tmp30_ = FALSE;
-	gboolean _tmp31_ = FALSE;
-	gboolean _tmp32_ = FALSE;
-	gboolean _tmp33_ = FALSE;
-	TextAction* _tmp34_ = NULL;
-	TextAction* _tmp35_ = NULL;
-	gboolean _tmp36_ = FALSE;
-	gboolean _tmp37_ = FALSE;
-	gboolean _tmp38_ = FALSE;
-	gboolean _tmp39_ = FALSE;
-#line 508 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 509 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = self->priv->criteria;
-#line 509 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((SEARCH_FILTER_CRITERIA_FLAG & _tmp2_) != 0) {
-#line 4073 "SearchFilter.c"
-		gboolean _tmp3_ = FALSE;
-#line 509 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp3_ = self->priv->has_flagged;
-#line 509 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp1_ = _tmp3_;
-#line 4079 "SearchFilter.c"
-	} else {
-#line 509 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp1_ = FALSE;
-#line 4083 "SearchFilter.c"
-	}
-#line 509 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp1_) {
-#line 510 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp0_ = RESOURCES_ICON_FILTER_FLAGGED;
-#line 4089 "SearchFilter.c"
-	} else {
-#line 510 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp0_ = RESOURCES_ICON_FILTER_FLAGGED_DISABLED;
-#line 4093 "SearchFilter.c"
-	}
-#line 509 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp4_ = search_filter_actions_get_flagged (self);
-#line 509 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp5_ = _tmp4_;
-#line 509 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_action_set_stock_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_action_get_type (), GtkAction), _tmp0_);
-#line 512 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp6_ = self->priv->criteria;
-#line 512 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	allow_media = (SEARCH_FILTER_CRITERIA_MEDIA & _tmp6_) != 0;
-#line 513 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_ = allow_media;
-#line 513 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp9_) {
-#line 4109 "SearchFilter.c"
-		gboolean _tmp10_ = FALSE;
-#line 513 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp10_ = self->priv->has_videos;
-#line 513 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp8_ = _tmp10_;
-#line 4115 "SearchFilter.c"
-	} else {
-#line 513 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp8_ = FALSE;
-#line 4119 "SearchFilter.c"
-	}
-#line 513 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp8_) {
-#line 514 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp7_ = RESOURCES_ICON_FILTER_VIDEOS;
-#line 4125 "SearchFilter.c"
-	} else {
-#line 514 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp7_ = RESOURCES_ICON_FILTER_VIDEOS_DISABLED;
-#line 4129 "SearchFilter.c"
-	}
-#line 513 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp11_ = search_filter_actions_get_videos (self);
-#line 513 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp12_ = _tmp11_;
-#line 513 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_action_set_stock_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_action_get_type (), GtkAction), _tmp7_);
-#line 515 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp15_ = allow_media;
-#line 515 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp15_) {
-#line 4141 "SearchFilter.c"
-		gboolean _tmp16_ = FALSE;
-#line 515 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp16_ = self->priv->has_photos;
-#line 515 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp14_ = _tmp16_;
-#line 4147 "SearchFilter.c"
-	} else {
-#line 515 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp14_ = FALSE;
-#line 4151 "SearchFilter.c"
-	}
-#line 515 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp14_) {
-#line 516 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp13_ = RESOURCES_ICON_FILTER_PHOTOS;
-#line 4157 "SearchFilter.c"
-	} else {
-#line 516 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp13_ = RESOURCES_ICON_FILTER_PHOTOS_DISABLED;
-#line 4161 "SearchFilter.c"
-	}
-#line 515 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp17_ = search_filter_actions_get_photos (self);
-#line 515 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp18_ = _tmp17_;
-#line 515 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_action_set_stock_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_action_get_type (), GtkAction), _tmp13_);
-#line 517 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp21_ = allow_media;
-#line 517 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp21_) {
-#line 4173 "SearchFilter.c"
-		gboolean _tmp22_ = FALSE;
-#line 517 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp22_ = self->priv->has_raw;
-#line 517 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp20_ = _tmp22_;
-#line 4179 "SearchFilter.c"
-	} else {
-#line 517 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp20_ = FALSE;
-#line 4183 "SearchFilter.c"
-	}
+	SearchFilterCriteria _tmp0_ = 0;
+	gboolean _tmp1_ = FALSE;
+	TextAction* _tmp2_ = NULL;
+	TextAction* _tmp3_ = NULL;
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp5_ = FALSE;
+	gboolean _tmp6_ = FALSE;
+	gboolean _tmp7_ = FALSE;
 #line 517 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp20_) {
+	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
 #line 518 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp19_ = RESOURCES_ICON_FILTER_RAW;
-#line 4189 "SearchFilter.c"
-	} else {
+	_tmp0_ = self->priv->criteria;
 #line 518 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp19_ = RESOURCES_ICON_FILTER_RAW_DISABLED;
-#line 4193 "SearchFilter.c"
-	}
-#line 517 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp23_ = search_filter_actions_get_raw (self);
-#line 517 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp24_ = _tmp23_;
-#line 517 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_action_set_stock_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_action_get_type (), GtkAction), _tmp19_);
-#line 520 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp25_ = self->priv->criteria;
-#line 520 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	allow_ratings = (SEARCH_FILTER_CRITERIA_RATING & _tmp25_) != 0;
-#line 521 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp26_ = self->priv->can_filter_by_stars;
-#line 521 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_set_action_sensitive (self, "CommonDisplayRejectedOnly", allow_ratings & _tmp26_);
-#line 522 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp27_ = self->priv->can_filter_by_stars;
-#line 522 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_set_action_sensitive (self, "CommonDisplayRejectedOrHigher", allow_ratings & _tmp27_);
+	allow_ratings = (SEARCH_FILTER_CRITERIA_RATING & _tmp0_) != 0;
+#line 519 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp1_ = self->priv->can_filter_by_stars;
+#line 519 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_actions_set_action_sensitive (self, "display.rating", allow_ratings & _tmp1_);
+#line 523 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp2_ = search_filter_actions_get_text (self);
 #line 523 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp28_ = self->priv->can_filter_by_stars;
+	_tmp3_ = _tmp2_;
 #line 523 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_set_action_sensitive (self, "CommonDisplayUnratedOrHigher", allow_ratings & _tmp28_);
-#line 524 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp29_ = self->priv->can_filter_by_stars;
-#line 524 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_set_action_sensitive (self, "CommonDisplayOneOrHigher", allow_ratings & _tmp29_);
+	text_action_set_sensitive (_tmp3_, TRUE);
 #line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp30_ = self->priv->can_filter_by_stars;
+	_tmp4_ = self->priv->has_photos;
 #line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_set_action_sensitive (self, "CommonDisplayTwoOrHigher", allow_ratings & _tmp30_);
-#line 526 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp31_ = self->priv->can_filter_by_stars;
-#line 526 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_set_action_sensitive (self, "CommonDisplayThreeOrHigher", allow_ratings & _tmp31_);
-#line 527 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp32_ = self->priv->can_filter_by_stars;
-#line 527 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_set_action_sensitive (self, "CommonDisplayFourOrHigher", allow_ratings & _tmp32_);
-#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp33_ = self->priv->can_filter_by_stars;
-#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_set_action_sensitive (self, "CommonDisplayFiveOrHigher", allow_ratings & _tmp33_);
-#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp34_ = search_filter_actions_get_text (self);
-#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp35_ = _tmp34_;
-#line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	text_action_set_sensitive (_tmp35_, TRUE);
-#line 534 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp36_ = self->priv->has_photos;
-#line 534 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp37_ = self->priv->has_videos;
-#line 534 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp38_ = self->priv->has_raw;
-#line 534 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp39_ = self->priv->has_flagged;
-#line 534 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "media-context-changed", _tmp36_, _tmp37_, _tmp38_, _tmp39_);
-#line 4253 "SearchFilter.c"
+	_tmp5_ = self->priv->has_videos;
+#line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp6_ = self->priv->has_raw;
+#line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp7_ = self->priv->has_flagged;
+#line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit_by_name (self, "media-context-changed", _tmp4_, _tmp5_, _tmp6_, _tmp7_);
+#line 4113 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_on_text_changed (SearchFilterActions* self, TextAction* action, const gchar* text) {
 	const gchar* _tmp0_ = NULL;
-#line 537 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 537 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 528 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_TEXT_ACTION (action));
-#line 538 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 529 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = text;
-#line 538 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 529 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "text-changed", _tmp0_);
-#line 4267 "SearchFilter.c"
-}
-
-
-static void _vala_array_add339 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 550 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((*length) == (*size)) {
-#line 550 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 550 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4278 "SearchFilter.c"
-	}
-#line 550 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	(*array)[(*length)++] = *value;
-#line 4282 "SearchFilter.c"
+#line 4127 "SearchFilter.c"
 }
 
 
-static void _vala_array_add340 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((*length) == (*size)) {
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4293 "SearchFilter.c"
-	}
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	(*array)[(*length)++] = *value;
-#line 4297 "SearchFilter.c"
-}
-
-
-static void _vala_array_add341 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((*length) == (*size)) {
-#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4308 "SearchFilter.c"
-	}
-#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	(*array)[(*length)++] = *value;
-#line 4312 "SearchFilter.c"
-}
-
-
-static void _vala_array_add342 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((*length) == (*size)) {
-#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4323 "SearchFilter.c"
-	}
-#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	(*array)[(*length)++] = *value;
-#line 4327 "SearchFilter.c"
-}
-
-
-static void _vala_array_add343 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((*length) == (*size)) {
-#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4338 "SearchFilter.c"
-	}
-#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	(*array)[(*length)++] = *value;
-#line 4342 "SearchFilter.c"
-}
-
-
-static void _vala_array_add344 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((*length) == (*size)) {
-#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4353 "SearchFilter.c"
-	}
-#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	(*array)[(*length)++] = *value;
-#line 4357 "SearchFilter.c"
-}
-
-
-static void _vala_array_add345 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((*length) == (*size)) {
-#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4368 "SearchFilter.c"
-	}
-#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	(*array)[(*length)++] = *value;
-#line 4372 "SearchFilter.c"
-}
-
-
-static void _vala_array_add346 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((*length) == (*size)) {
-#line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 4383 "SearchFilter.c"
-	}
-#line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	(*array)[(*length)++] = *value;
-#line 4387 "SearchFilter.c"
-}
-
-
-static void _search_filter_actions_on_rating_changed_gtk_radio_action_callback (GtkAction* action, GtkAction* current, gpointer self) {
-#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_on_rating_changed ((SearchFilterActions*) self, action, current);
-#line 4394 "SearchFilter.c"
-}
-
-
-static void _search_filter_actions_on_flagged_toggled_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 600 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_on_flagged_toggled ((SearchFilterActions*) self, action);
-#line 4401 "SearchFilter.c"
-}
-
-
-static void _vala_array_add347 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 604 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((*length) == (*size)) {
-#line 604 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 604 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 4412 "SearchFilter.c"
-	}
-#line 604 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	(*array)[(*length)++] = *value;
-#line 4416 "SearchFilter.c"
-}
-
-
-static void _search_filter_actions_on_photos_toggled_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_on_photos_toggled ((SearchFilterActions*) self, action);
-#line 4423 "SearchFilter.c"
-}
-
-
-static void _vala_array_add348 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 610 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((*length) == (*size)) {
-#line 610 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 610 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 4434 "SearchFilter.c"
-	}
-#line 610 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	(*array)[(*length)++] = *value;
-#line 4438 "SearchFilter.c"
-}
-
-
-static void _search_filter_actions_on_videos_toggled_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 612 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_on_videos_toggled ((SearchFilterActions*) self, action);
-#line 4445 "SearchFilter.c"
+static void search_filter_actions_on_action_radio (SearchFilterActions* self, GSimpleAction* action, GVariant* parameter) {
+	GSimpleAction* _tmp0_ = NULL;
+	GVariant* _tmp1_ = NULL;
+#line 540 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
+#line 540 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 542 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp0_ = action;
+#line 542 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp1_ = parameter;
+#line 542 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit_by_name (_tmp0_, "change-state", _tmp1_);
+#line 4144 "SearchFilter.c"
 }
 
 
-static void _vala_array_add349 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((*length) == (*size)) {
-#line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 4456 "SearchFilter.c"
-	}
-#line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	(*array)[(*length)++] = *value;
-#line 4460 "SearchFilter.c"
+static gboolean _variant_get29 (GVariant* value) {
+#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	return g_variant_get_boolean (value);
+#line 4151 "SearchFilter.c"
 }
 
 
-static void _search_filter_actions_on_raw_toggled_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_actions_on_raw_toggled ((SearchFilterActions*) self, action);
-#line 4467 "SearchFilter.c"
+static GVariant* _variant_new30 (gboolean value) {
+#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 4158 "SearchFilter.c"
 }
 
 
-static void _vala_array_add350 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if ((*length) == (*size)) {
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 4478 "SearchFilter.c"
-	}
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	(*array)[(*length)++] = *value;
-#line 4482 "SearchFilter.c"
+static void search_filter_actions_on_action_toggle (SearchFilterActions* self, GSimpleAction* action, GVariant* parameter) {
+	gboolean state = FALSE;
+	GSimpleAction* _tmp0_ = NULL;
+	GVariant* _tmp1_ = NULL;
+	GVariant* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	gboolean _tmp4_ = FALSE;
+	GSimpleAction* _tmp5_ = NULL;
+	GVariant* _tmp6_ = NULL;
+#line 545 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
+#line 545 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp0_ = action;
+#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp1_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_action_get_type (), GAction));
+#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp2_ = _tmp1_;
+#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp3_ = _variant_get29 (_tmp2_);
+#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp4_ = _tmp3_;
+#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (_tmp2_);
+#line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	state = _tmp4_;
+#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp5_ = action;
+#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp6_ = _variant_new30 (!state);
+#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
+#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (_tmp6_);
+#line 4197 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_register (SearchFilterActions* self) {
 	TextAction* _tmp0_ = NULL;
-	GtkRadioActionEntry* view_filter_actions = NULL;
-	GtkRadioActionEntry* _tmp1_ = NULL;
-	gint view_filter_actions_length1 = 0;
-	gint _view_filter_actions_size_ = 0;
-	GtkRadioActionEntry rejected_only = {0};
-	GtkRadioActionEntry _tmp2_ = {0};
-	GtkRadioActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkRadioActionEntry _tmp4_ = {0};
-	GtkRadioActionEntry rejected_or_higher = {0};
-	GtkRadioActionEntry _tmp5_ = {0};
-	const gchar* _tmp6_ = NULL;
-	GtkRadioActionEntry* _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	GtkRadioActionEntry _tmp8_ = {0};
-	GtkRadioActionEntry unrated_or_higher = {0};
-	GtkRadioActionEntry _tmp9_ = {0};
-	GtkRadioActionEntry* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	GtkRadioActionEntry _tmp11_ = {0};
-	GtkRadioActionEntry one_or_higher = {0};
-	GtkRadioActionEntry _tmp12_ = {0};
-	const gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	GtkRadioActionEntry* _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	GtkRadioActionEntry _tmp16_ = {0};
-	GtkRadioActionEntry two_or_higher = {0};
-	GtkRadioActionEntry _tmp17_ = {0};
-	const gchar* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	GtkRadioActionEntry* _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	GtkRadioActionEntry _tmp21_ = {0};
-	GtkRadioActionEntry three_or_higher = {0};
-	GtkRadioActionEntry _tmp22_ = {0};
-	const gchar* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	GtkRadioActionEntry* _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	GtkRadioActionEntry _tmp26_ = {0};
-	GtkRadioActionEntry four_or_higher = {0};
-	GtkRadioActionEntry _tmp27_ = {0};
-	const gchar* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
-	GtkRadioActionEntry* _tmp30_ = NULL;
-	gint _tmp30__length1 = 0;
-	GtkRadioActionEntry _tmp31_ = {0};
-	GtkRadioActionEntry five_or_higher = {0};
-	GtkRadioActionEntry _tmp32_ = {0};
-	const gchar* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	GtkRadioActionEntry* _tmp35_ = NULL;
-	gint _tmp35__length1 = 0;
-	GtkRadioActionEntry _tmp36_ = {0};
-	GtkActionGroup* _tmp37_ = NULL;
-	GtkRadioActionEntry* _tmp38_ = NULL;
-	gint _tmp38__length1 = 0;
-	GtkToggleActionEntry* toggle_actions = NULL;
-	GtkToggleActionEntry* _tmp39_ = NULL;
-	gint toggle_actions_length1 = 0;
-	gint _toggle_actions_size_ = 0;
-	GtkToggleActionEntry flagged_action = {0};
-	GtkToggleActionEntry _tmp40_ = {0};
-	const gchar* _tmp41_ = NULL;
-	const gchar* _tmp42_ = NULL;
-	GtkToggleActionEntry* _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	GtkToggleActionEntry _tmp44_ = {0};
-	GtkToggleActionEntry photos_action = {0};
-	GtkToggleActionEntry _tmp45_ = {0};
-	const gchar* _tmp46_ = NULL;
-	const gchar* _tmp47_ = NULL;
-	GtkToggleActionEntry* _tmp48_ = NULL;
-	gint _tmp48__length1 = 0;
-	GtkToggleActionEntry _tmp49_ = {0};
-	GtkToggleActionEntry videos_action = {0};
-	GtkToggleActionEntry _tmp50_ = {0};
-	const gchar* _tmp51_ = NULL;
-	const gchar* _tmp52_ = NULL;
-	GtkToggleActionEntry* _tmp53_ = NULL;
-	gint _tmp53__length1 = 0;
-	GtkToggleActionEntry _tmp54_ = {0};
-	GtkToggleActionEntry raw_action = {0};
-	GtkToggleActionEntry _tmp55_ = {0};
-	const gchar* _tmp56_ = NULL;
-	const gchar* _tmp57_ = NULL;
-	GtkToggleActionEntry* _tmp58_ = NULL;
-	gint _tmp58__length1 = 0;
-	GtkToggleActionEntry _tmp59_ = {0};
-	GtkActionGroup* _tmp60_ = NULL;
-	GtkToggleActionEntry* _tmp61_ = NULL;
-	gint _tmp61__length1 = 0;
-#line 541 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 551 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 542 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = text_action_new (NULL);
-#line 542 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_text_action_unref0 (self->priv->_text);
-#line 542 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->_text = _tmp0_;
-#line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = g_new0 (GtkRadioActionEntry, 0);
-#line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	view_filter_actions = _tmp1_;
-#line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	view_filter_actions_length1 = 0;
-#line 544 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_view_filter_actions_size_ = view_filter_actions_length1;
-#line 546 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_.name = "CommonDisplayRejectedOnly";
-#line 546 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_.stock_id = NULL;
-#line 546 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 546 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_.accelerator = "<Ctrl>8";
-#line 546 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_.tooltip = TRANSLATABLE;
-#line 546 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_.value = (gint) RATING_FILTER_REJECTED_ONLY;
-#line 546 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	rejected_only = _tmp2_;
-#line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	rejected_only.label = RESOURCES_DISPLAY_REJECTED_ONLY_MENU;
-#line 549 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	rejected_only.tooltip = RESOURCES_DISPLAY_REJECTED_ONLY_TOOLTIP;
-#line 550 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp3_ = view_filter_actions;
-#line 550 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp3__length1 = view_filter_actions_length1;
-#line 550 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp4_ = rejected_only;
-#line 550 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_array_add339 (&view_filter_actions, &view_filter_actions_length1, &_view_filter_actions_size_, &_tmp4_);
-#line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp5_.name = "CommonDisplayRejectedOrHigher";
-#line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp5_.stock_id = NULL;
-#line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp5_.accelerator = "<Ctrl>9";
 #line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp5_.tooltip = TRANSLATABLE;
+	_tmp0_ = text_action_new (NULL);
 #line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp5_.value = (gint) RATING_FILTER_REJECTED_OR_HIGHER;
+	_text_action_unref0 (self->priv->_text);
 #line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	rejected_or_higher = _tmp5_;
-#line 554 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	rejected_or_higher.label = RESOURCES_DISPLAY_REJECTED_OR_HIGHER_MENU;
+	self->priv->_text = _tmp0_;
+#line 4211 "SearchFilter.c"
+}
+
+
+static void search_filter_actions_on_rating_changed (SearchFilterActions* self, GSimpleAction* action, GVariant* value) {
+	GSimpleAction* _tmp0_ = NULL;
+	GVariant* _tmp1_ = NULL;
+	RatingFilter filter = 0;
+	GVariant* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	gint _tmp4_ = 0;
 #line 555 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp6_ = g_dpgettext2 (NULL, "Tooltip", RESOURCES_DISPLAY_REJECTED_OR_HIGHER_TOOLTIP);
+	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
 #line 555 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	rejected_or_higher.tooltip = _tmp6_;
-#line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp7_ = view_filter_actions;
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 555 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (value != NULL);
 #line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp7__length1 = view_filter_actions_length1;
+	_tmp0_ = action;
 #line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp8_ = rejected_or_higher;
+	_tmp1_ = value;
 #line 557 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_array_add340 (&view_filter_actions, &view_filter_actions_length1, &_view_filter_actions_size_, &_tmp8_);
-#line 559 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_.name = "CommonDisplayUnratedOrHigher";
-#line 559 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_.stock_id = NULL;
-#line 559 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_.label = TRANSLATABLE;
+	g_simple_action_set_state (_tmp0_, _tmp1_);
+#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp2_ = value;
+#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp3_ = g_variant_get_string (_tmp2_, NULL);
+#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp4_ = atoi (_tmp3_);
+#line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	filter = (RatingFilter) _tmp4_;
 #line 559 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_.accelerator = "<Ctrl>0";
-#line 559 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_.tooltip = TRANSLATABLE;
-#line 559 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_.value = (gint) RATING_FILTER_UNRATED_OR_HIGHER;
-#line 559 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	unrated_or_higher = _tmp9_;
-#line 561 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	unrated_or_higher.label = RESOURCES_DISPLAY_UNRATED_OR_HIGHER_MENU;
+	g_signal_emit_by_name (self, "rating-changed", filter);
+#line 4244 "SearchFilter.c"
+}
+
+
+static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value) {
+	GSimpleAction* _tmp0_ = NULL;
+	GVariant* _tmp1_ = NULL;
+	GVariant* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
 #line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	unrated_or_higher.tooltip = RESOURCES_DISPLAY_UNRATED_OR_HIGHER_TOOLTIP;
-#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp10_ = view_filter_actions;
-#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp10__length1 = view_filter_actions_length1;
-#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp11_ = unrated_or_higher;
-#line 563 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_array_add341 (&view_filter_actions, &view_filter_actions_length1, &_view_filter_actions_size_, &_tmp11_);
-#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp12_.name = "CommonDisplayOneOrHigher";
-#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp12_.stock_id = NULL;
-#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp12_.label = TRANSLATABLE;
-#line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp12_.accelerator = "<Ctrl>1";
+	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
+#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (value != NULL);
+#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp0_ = action;
+#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp1_ = value;
+#line 564 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_simple_action_set_state (_tmp0_, _tmp1_);
 #line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp12_.tooltip = TRANSLATABLE;
+	_tmp2_ = value;
 #line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp12_.value = (gint) RATING_FILTER_ONE_OR_HIGHER;
+	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 565 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	one_or_higher = _tmp12_;
-#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp13_ = resources_DISPLAY_ONE_OR_HIGHER_MENU;
-#line 567 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	one_or_higher.label = _tmp13_;
-#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp14_ = resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP;
-#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	one_or_higher.tooltip = _tmp14_;
-#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp15_ = view_filter_actions;
-#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp15__length1 = view_filter_actions_length1;
-#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp16_ = one_or_higher;
-#line 569 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_array_add342 (&view_filter_actions, &view_filter_actions_length1, &_view_filter_actions_size_, &_tmp16_);
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp17_.name = "CommonDisplayTwoOrHigher";
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp17_.stock_id = NULL;
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp17_.label = TRANSLATABLE;
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp17_.accelerator = "<Ctrl>2";
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp17_.tooltip = TRANSLATABLE;
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp17_.value = (gint) RATING_FILTER_TWO_OR_HIGHER;
-#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	two_or_higher = _tmp17_;
-#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp18_ = resources_DISPLAY_TWO_OR_HIGHER_MENU;
-#line 573 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	two_or_higher.label = _tmp18_;
-#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp19_ = resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP;
-#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	two_or_higher.tooltip = _tmp19_;
-#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp20_ = view_filter_actions;
-#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp20__length1 = view_filter_actions_length1;
-#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp21_ = two_or_higher;
-#line 575 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_array_add343 (&view_filter_actions, &view_filter_actions_length1, &_view_filter_actions_size_, &_tmp21_);
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_.name = "CommonDisplayThreeOrHigher";
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_.stock_id = NULL;
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_.label = TRANSLATABLE;
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_.accelerator = "<Ctrl>3";
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_.tooltip = TRANSLATABLE;
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_.value = (gint) RATING_FILTER_THREE_OR_HIGHER;
-#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	three_or_higher = _tmp22_;
-#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp23_ = resources_DISPLAY_THREE_OR_HIGHER_MENU;
-#line 579 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	three_or_higher.label = _tmp23_;
-#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp24_ = resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP;
-#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	three_or_higher.tooltip = _tmp24_;
-#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp25_ = view_filter_actions;
-#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp25__length1 = view_filter_actions_length1;
-#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp26_ = three_or_higher;
-#line 581 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_array_add344 (&view_filter_actions, &view_filter_actions_length1, &_view_filter_actions_size_, &_tmp26_);
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp27_.name = "CommonDisplayFourOrHigher";
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp27_.stock_id = NULL;
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp27_.label = TRANSLATABLE;
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp27_.accelerator = "<Ctrl>4";
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp27_.tooltip = TRANSLATABLE;
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp27_.value = (gint) RATING_FILTER_FOUR_OR_HIGHER;
-#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	four_or_higher = _tmp27_;
-#line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp28_ = resources_DISPLAY_FOUR_OR_HIGHER_MENU;
-#line 585 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	four_or_higher.label = _tmp28_;
-#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp29_ = resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP;
-#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	four_or_higher.tooltip = _tmp29_;
-#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp30_ = view_filter_actions;
-#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp30__length1 = view_filter_actions_length1;
-#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp31_ = four_or_higher;
-#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_array_add345 (&view_filter_actions, &view_filter_actions_length1, &_view_filter_actions_size_, &_tmp31_);
-#line 589 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp32_.name = "CommonDisplayFiveOrHigher";
-#line 589 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp32_.stock_id = NULL;
-#line 589 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp32_.label = TRANSLATABLE;
-#line 589 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp32_.accelerator = "<Ctrl>5";
-#line 589 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp32_.tooltip = TRANSLATABLE;
-#line 589 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp32_.value = (gint) RATING_FILTER_FIVE_OR_HIGHER;
-#line 589 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	five_or_higher = _tmp32_;
-#line 591 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp33_ = resources_DISPLAY_FIVE_OR_HIGHER_MENU;
-#line 591 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	five_or_higher.label = _tmp33_;
-#line 592 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp34_ = resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP;
-#line 592 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	five_or_higher.tooltip = _tmp34_;
-#line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp35_ = view_filter_actions;
-#line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp35__length1 = view_filter_actions_length1;
-#line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp36_ = five_or_higher;
-#line 593 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_array_add346 (&view_filter_actions, &view_filter_actions_length1, &_view_filter_actions_size_, &_tmp36_);
-#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp37_ = self->priv->action_group;
-#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp38_ = view_filter_actions;
-#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp38__length1 = view_filter_actions_length1;
-#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_action_group_add_radio_actions (_tmp37_, _tmp38_, _tmp38__length1, (gint) RATING_FILTER_UNRATED_OR_HIGHER, (GCallback) _search_filter_actions_on_rating_changed_gtk_radio_action_callback, self);
-#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp39_ = g_new0 (GtkToggleActionEntry, 0);
-#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	toggle_actions = _tmp39_;
-#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	toggle_actions_length1 = 0;
-#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_toggle_actions_size_ = toggle_actions_length1;
-#line 600 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp40_.name = "CommonDisplayFlagged";
-#line 600 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp40_.stock_id = RESOURCES_ICON_FILTER_FLAGGED;
-#line 600 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp40_.label = TRANSLATABLE;
-#line 600 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp40_.accelerator = NULL;
-#line 600 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp40_.tooltip = TRANSLATABLE;
-#line 600 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp40_.callback = (GCallback) _search_filter_actions_on_flagged_toggled_gtk_action_callback;
-#line 600 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp40_.is_active = FALSE;
-#line 600 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	flagged_action = _tmp40_;
-#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp41_ = _ ("Flagged");
-#line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	flagged_action.label = _tmp41_;
-#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp42_ = _ ("Flagged");
-#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	flagged_action.tooltip = _tmp42_;
-#line 604 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp43_ = toggle_actions;
-#line 604 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp43__length1 = toggle_actions_length1;
-#line 604 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp44_ = flagged_action;
-#line 604 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_array_add347 (&toggle_actions, &toggle_actions_length1, &_toggle_actions_size_, &_tmp44_);
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_.name = "CommonDisplayPhotos";
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_.stock_id = RESOURCES_ICON_FILTER_PHOTOS;
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_.label = TRANSLATABLE;
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_.accelerator = NULL;
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_.tooltip = TRANSLATABLE;
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_.callback = (GCallback) _search_filter_actions_on_photos_toggled_gtk_action_callback;
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_.is_active = FALSE;
-#line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	photos_action = _tmp45_;
-#line 608 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp46_ = _ ("Photos");
-#line 608 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	photos_action.label = _tmp46_;
-#line 609 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp47_ = _ ("Photos");
-#line 609 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	photos_action.tooltip = _tmp47_;
-#line 610 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp48_ = toggle_actions;
-#line 610 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp48__length1 = toggle_actions_length1;
-#line 610 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp49_ = photos_action;
-#line 610 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_array_add348 (&toggle_actions, &toggle_actions_length1, &_toggle_actions_size_, &_tmp49_);
-#line 612 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp50_.name = "CommonDisplayVideos";
-#line 612 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp50_.stock_id = RESOURCES_ICON_FILTER_VIDEOS;
-#line 612 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp50_.label = TRANSLATABLE;
-#line 612 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp50_.accelerator = NULL;
-#line 612 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp50_.tooltip = TRANSLATABLE;
-#line 612 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp50_.callback = (GCallback) _search_filter_actions_on_videos_toggled_gtk_action_callback;
-#line 612 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp50_.is_active = FALSE;
-#line 612 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	videos_action = _tmp50_;
-#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp51_ = _ ("Videos");
-#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	videos_action.label = _tmp51_;
-#line 615 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp52_ = _ ("Videos");
-#line 615 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	videos_action.tooltip = _tmp52_;
-#line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp53_ = toggle_actions;
-#line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp53__length1 = toggle_actions_length1;
-#line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp54_ = videos_action;
-#line 616 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_array_add349 (&toggle_actions, &toggle_actions_length1, &_toggle_actions_size_, &_tmp54_);
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp55_.name = "CommonDisplayRaw";
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp55_.stock_id = RESOURCES_ICON_FILTER_RAW;
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp55_.label = TRANSLATABLE;
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp55_.accelerator = NULL;
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp55_.tooltip = TRANSLATABLE;
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp55_.callback = (GCallback) _search_filter_actions_on_raw_toggled_gtk_action_callback;
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp55_.is_active = FALSE;
-#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	raw_action = _tmp55_;
-#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp56_ = _ ("RAW Photos");
-#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	raw_action.label = _tmp56_;
-#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp57_ = _ ("RAW photos");
-#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	raw_action.tooltip = _tmp57_;
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp58_ = toggle_actions;
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp58__length1 = toggle_actions_length1;
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp59_ = raw_action;
-#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_array_add350 (&toggle_actions, &toggle_actions_length1, &_toggle_actions_size_, &_tmp59_);
-#line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp60_ = self->priv->action_group;
-#line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp61_ = toggle_actions;
-#line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp61__length1 = toggle_actions_length1;
-#line 624 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_action_group_add_toggle_actions (_tmp60_, _tmp61_, _tmp61__length1, self);
-#line 541 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	toggle_actions = (g_free (toggle_actions), NULL);
-#line 541 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	view_filter_actions = (g_free (view_filter_actions), NULL);
-#line 4983 "SearchFilter.c"
-}
-
-
-static void search_filter_actions_on_rating_changed (SearchFilterActions* self, GtkAction* action, GtkAction* current) {
-	GtkAction* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-#line 627 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 627 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 627 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (GTK_IS_ACTION (current));
-#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = current;
-#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = gtk_radio_action_get_current_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_radio_action_get_type (), GtkRadioAction));
-#line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "rating-changed", (RatingFilter) _tmp1_);
-#line 5002 "SearchFilter.c"
-}
-
-
-static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self, GtkAction* action) {
-	GtkAction* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 631 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 631 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = action;
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = _tmp1_;
-#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "flagged-toggled", _tmp2_);
-#line 5022 "SearchFilter.c"
+	g_signal_emit_by_name (self, "flagged-toggled", _tmp3_);
+#line 4271 "SearchFilter.c"
 }
 
 
-static void search_filter_actions_on_photos_toggled (SearchFilterActions* self, GtkAction* action) {
-	GtkAction* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+static void search_filter_actions_on_photos_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value) {
+	GSimpleAction* _tmp0_ = NULL;
+	GVariant* _tmp1_ = NULL;
+	GVariant* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (value != NULL);
+#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = _tmp1_;
-#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "photos-toggled", _tmp2_);
-#line 5042 "SearchFilter.c"
+#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp1_ = value;
+#line 570 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_simple_action_set_state (_tmp0_, _tmp1_);
+#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp2_ = value;
+#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp3_ = g_variant_get_boolean (_tmp2_);
+#line 571 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit_by_name (self, "photos-toggled", _tmp3_);
+#line 4298 "SearchFilter.c"
 }
 
 
-static void search_filter_actions_on_videos_toggled (SearchFilterActions* self, GtkAction* action) {
-	GtkAction* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 639 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+static void search_filter_actions_on_videos_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value) {
+	GSimpleAction* _tmp0_ = NULL;
+	GVariant* _tmp1_ = NULL;
+	GVariant* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 639 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (value != NULL);
+#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = _tmp1_;
-#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "videos-toggled", _tmp2_);
-#line 5062 "SearchFilter.c"
+#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp1_ = value;
+#line 576 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_simple_action_set_state (_tmp0_, _tmp1_);
+#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp2_ = value;
+#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp3_ = g_variant_get_boolean (_tmp2_);
+#line 577 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit_by_name (self, "videos-toggled", _tmp3_);
+#line 4325 "SearchFilter.c"
 }
 
 
-static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GtkAction* action) {
-	GtkAction* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_ = FALSE;
-#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GSimpleAction* action, GVariant* value) {
+	GSimpleAction* _tmp0_ = NULL;
+	GVariant* _tmp1_ = NULL;
+	GVariant* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_ACTIONS (self));
-#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 644 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_if_fail (value != NULL);
+#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 644 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 644 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = _tmp1_;
-#line 644 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "raw-toggled", _tmp2_);
-#line 5082 "SearchFilter.c"
+#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp1_ = value;
+#line 582 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_simple_action_set_state (_tmp0_, _tmp1_);
+#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp2_ = value;
+#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp3_ = g_variant_get_boolean (_tmp2_);
+#line 583 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit_by_name (self, "raw-toggled", _tmp3_);
+#line 4352 "SearchFilter.c"
 }
 
 
 gboolean search_filter_actions_get_has_photos (SearchFilterActions* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE);
-#line 648 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->has_photos;
-#line 648 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 648 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 587 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5097 "SearchFilter.c"
+#line 4367 "SearchFilter.c"
 }
 
 
 gboolean search_filter_actions_get_has_videos (SearchFilterActions* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE);
-#line 652 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 591 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->has_videos;
-#line 652 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 591 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 652 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 591 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5112 "SearchFilter.c"
+#line 4382 "SearchFilter.c"
 }
 
 
 gboolean search_filter_actions_get_has_raw (SearchFilterActions* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 655 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE);
-#line 656 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->has_raw;
-#line 656 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 656 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 595 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5127 "SearchFilter.c"
+#line 4397 "SearchFilter.c"
 }
 
 
 gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 659 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), FALSE);
-#line 660 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 599 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->has_flagged;
-#line 660 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 599 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 660 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 599 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5142 "SearchFilter.c"
+#line 4412 "SearchFilter.c"
 }
 
 
-GtkToggleAction* search_filter_actions_get_flagged (SearchFilterActions* self) {
-	GtkToggleAction* result;
-	GtkAction* _tmp0_ = NULL;
+GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self) {
+	GSimpleAction* result;
+	GSimpleAction* _tmp0_ = NULL;
 #line 335 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
 #line 336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = search_filter_actions_get_action (self, "CommonDisplayFlagged");
+	_tmp0_ = search_filter_actions_get_action (self, "display.flagged");
 #line 336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp0_) : NULL;
+	result = _tmp0_;
 #line 336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5157 "SearchFilter.c"
+#line 4427 "SearchFilter.c"
 }
 
 
-GtkToggleAction* search_filter_actions_get_photos (SearchFilterActions* self) {
-	GtkToggleAction* result;
-	GtkAction* _tmp0_ = NULL;
+GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self) {
+	GSimpleAction* result;
+	GSimpleAction* _tmp0_ = NULL;
 #line 341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
 #line 342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = search_filter_actions_get_action (self, "CommonDisplayPhotos");
+	_tmp0_ = search_filter_actions_get_action (self, "display.photos");
 #line 342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp0_) : NULL;
+	result = _tmp0_;
 #line 342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5172 "SearchFilter.c"
+#line 4442 "SearchFilter.c"
 }
 
 
-GtkToggleAction* search_filter_actions_get_videos (SearchFilterActions* self) {
-	GtkToggleAction* result;
-	GtkAction* _tmp0_ = NULL;
+GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self) {
+	GSimpleAction* result;
+	GSimpleAction* _tmp0_ = NULL;
 #line 347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
 #line 348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = search_filter_actions_get_action (self, "CommonDisplayVideos");
+	_tmp0_ = search_filter_actions_get_action (self, "display.videos");
 #line 348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp0_) : NULL;
+	result = _tmp0_;
 #line 348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5187 "SearchFilter.c"
+#line 4457 "SearchFilter.c"
 }
 
 
-GtkToggleAction* search_filter_actions_get_raw (SearchFilterActions* self) {
-	GtkToggleAction* result;
-	GtkAction* _tmp0_ = NULL;
+GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self) {
+	GSimpleAction* result;
+	GSimpleAction* _tmp0_ = NULL;
 #line 353 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
 #line 354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = search_filter_actions_get_action (self, "CommonDisplayRaw");
+	_tmp0_ = search_filter_actions_get_action (self, "display.raw");
 #line 354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp0_) : NULL;
+	result = _tmp0_;
 #line 354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5202 "SearchFilter.c"
+#line 4472 "SearchFilter.c"
 }
 
 
-GtkRadioAction* search_filter_actions_get_rating (SearchFilterActions* self) {
-	GtkRadioAction* result;
-	GtkAction* _tmp0_ = NULL;
+GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self) {
+	GSimpleAction* result;
+	GSimpleAction* _tmp0_ = NULL;
 #line 359 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (self), NULL);
 #line 360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = search_filter_actions_get_action (self, "CommonDisplayUnratedOrHigher");
+	_tmp0_ = search_filter_actions_get_action (self, "display.rating");
 #line 360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_radio_action_get_type ()) ? ((GtkRadioAction*) _tmp0_) : NULL;
+	result = _tmp0_;
 #line 360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5217 "SearchFilter.c"
+#line 4487 "SearchFilter.c"
 }
 
 
@@ -5233,7 +4503,7 @@ TextAction* search_filter_actions_get_text (SearchFilterActions* self) {
 	result = _tmp1_;
 #line 367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5237 "SearchFilter.c"
+#line 4507 "SearchFilter.c"
 }
 
 
@@ -5252,26 +4522,26 @@ static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClos
 		data1 = closure->data;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 5256 "SearchFilter.c"
+#line 4526 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data2 = closure->data;
-#line 5262 "SearchFilter.c"
+#line 4532 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	callback = (GMarshalFunc_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	callback (data1, g_value_get_boolean (param_values + 1), g_value_get_boolean (param_values + 2), g_value_get_boolean (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 5268 "SearchFilter.c"
+#line 4538 "SearchFilter.c"
 }
 
 
 static void value_search_filter_actions_init (GValue* value) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 5275 "SearchFilter.c"
+#line 4545 "SearchFilter.c"
 }
 
 
@@ -5280,7 +4550,7 @@ static void value_search_filter_actions_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (value->data[0].v_pointer);
-#line 5284 "SearchFilter.c"
+#line 4554 "SearchFilter.c"
 	}
 }
 
@@ -5290,11 +4560,11 @@ static void value_search_filter_actions_copy_value (const GValue* src_value, GVa
 	if (src_value->data[0].v_pointer) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = search_filter_actions_ref (src_value->data[0].v_pointer);
-#line 5294 "SearchFilter.c"
+#line 4564 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5298 "SearchFilter.c"
+#line 4568 "SearchFilter.c"
 	}
 }
 
@@ -5302,37 +4572,37 @@ static void value_search_filter_actions_copy_value (const GValue* src_value, GVa
 static gpointer value_search_filter_actions_peek_pointer (const GValue* value) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 5306 "SearchFilter.c"
+#line 4576 "SearchFilter.c"
 }
 
 
 static gchar* value_search_filter_actions_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 5313 "SearchFilter.c"
+#line 4583 "SearchFilter.c"
 		SearchFilterActions* object;
 		object = collect_values[0].v_pointer;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5320 "SearchFilter.c"
+#line 4590 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5324 "SearchFilter.c"
+#line 4594 "SearchFilter.c"
 		}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = search_filter_actions_ref (object);
-#line 5328 "SearchFilter.c"
+#line 4598 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 5332 "SearchFilter.c"
+#line 4602 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 5336 "SearchFilter.c"
+#line 4606 "SearchFilter.c"
 }
 
 
@@ -5343,25 +4613,25 @@ static gchar* value_search_filter_actions_lcopy_value (const GValue* value, guin
 	if (!object_p) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5347 "SearchFilter.c"
+#line 4617 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 5353 "SearchFilter.c"
+#line 4623 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5357 "SearchFilter.c"
+#line 4627 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = search_filter_actions_ref (value->data[0].v_pointer);
-#line 5361 "SearchFilter.c"
+#line 4631 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 5365 "SearchFilter.c"
+#line 4635 "SearchFilter.c"
 }
 
 
@@ -5375,7 +4645,7 @@ GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* ni
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 5379 "SearchFilter.c"
+#line 4649 "SearchFilter.c"
 }
 
 
@@ -5384,7 +4654,7 @@ gpointer value_get_search_filter_actions (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_FILTER_ACTIONS), NULL);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 5388 "SearchFilter.c"
+#line 4658 "SearchFilter.c"
 }
 
 
@@ -5404,17 +4674,17 @@ void value_set_search_filter_actions (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_ref (value->data[0].v_pointer);
-#line 5408 "SearchFilter.c"
+#line 4678 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 5412 "SearchFilter.c"
+#line 4682 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (old);
-#line 5418 "SearchFilter.c"
+#line 4688 "SearchFilter.c"
 	}
 }
 
@@ -5433,17 +4703,17 @@ void value_take_search_filter_actions (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 5437 "SearchFilter.c"
+#line 4707 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 5441 "SearchFilter.c"
+#line 4711 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (old);
-#line 5447 "SearchFilter.c"
+#line 4717 "SearchFilter.c"
 	}
 }
 
@@ -5467,7 +4737,7 @@ static void search_filter_actions_class_init (SearchFilterActionsClass * klass)
 	g_signal_new ("rating_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, TYPE_RATING_FILTER);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("text_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 5471 "SearchFilter.c"
+#line 4741 "SearchFilter.c"
 	/**
 	     * fired when the kinds of media present in the current view change (e.g., a video becomes
 	     * available in the view through a new import operation or no raw photos are available in
@@ -5477,35 +4747,30 @@ static void search_filter_actions_class_init (SearchFilterActionsClass * klass)
 	g_signal_new ("media_context_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("criteria_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 5481 "SearchFilter.c"
+#line 4751 "SearchFilter.c"
 }
 
 
 static void search_filter_actions_instance_init (SearchFilterActions * self) {
-	GtkActionGroup* _tmp0_ = NULL;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_ACTIONS_GET_PRIVATE (self);
 #line 371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = gtk_action_group_new ("SearchFilterActionGroup");
-#line 371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->action_group = _tmp0_;
-#line 372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->criteria = SEARCH_FILTER_CRITERIA_ALL;
-#line 373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_text = NULL;
-#line 374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = TRUE;
-#line 375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_photos = TRUE;
-#line 376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_videos = TRUE;
-#line 377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_raw = TRUE;
-#line 378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->can_filter_by_stars = TRUE;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 5509 "SearchFilter.c"
+#line 4774 "SearchFilter.c"
 }
 
 
@@ -5515,11 +4780,9 @@ static void search_filter_actions_finalize (SearchFilterActions* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_FILTER_ACTIONS, SearchFilterActions);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_destroy (self);
-#line 371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->action_group);
-#line 373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_text_action_unref0 (self->priv->_text);
-#line 5523 "SearchFilter.c"
+#line 4786 "SearchFilter.c"
 }
 
 
@@ -5544,7 +4807,7 @@ gpointer search_filter_actions_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 5548 "SearchFilter.c"
+#line 4811 "SearchFilter.c"
 }
 
 
@@ -5557,101 +4820,94 @@ void search_filter_actions_unref (gpointer instance) {
 		SEARCH_FILTER_ACTIONS_GET_CLASS (self)->finalize (self);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5561 "SearchFilter.c"
+#line 4824 "SearchFilter.c"
 	}
 }
 
 
 static void _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed (SearchFilterActions* _sender, gboolean has_photos, gboolean has_videos, gboolean has_raw, gboolean has_flagged, gpointer self) {
-#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_media_context_changed ((SearchFilterToolbar*) self, has_photos, has_videos, has_raw, has_flagged);
-#line 5569 "SearchFilter.c"
+#line 4832 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
-#line 1246 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_flagged_toggled ((SearchFilterToolbar*) self);
-#line 5576 "SearchFilter.c"
+#line 4839 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
-#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_photos_toggled ((SearchFilterToolbar*) self);
-#line 5583 "SearchFilter.c"
+#line 4846 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
-#line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_videos_toggled ((SearchFilterToolbar*) self);
-#line 5590 "SearchFilter.c"
+#line 4853 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
-#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_raw_toggled ((SearchFilterToolbar*) self);
-#line 5597 "SearchFilter.c"
+#line 4860 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed (SearchFilterActions* _sender, RatingFilter filter, gpointer self) {
-#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_rating_changed ((SearchFilterToolbar*) self);
-#line 5604 "SearchFilter.c"
+#line 4867 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed (SearchFilterActions* _sender, const gchar* text, gpointer self) {
-#line 1251 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_search_text_changed ((SearchFilterToolbar*) self);
-#line 5611 "SearchFilter.c"
+#line 4874 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, gpointer self) {
-#line 1252 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1167 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_criteria_changed ((SearchFilterToolbar*) self);
-#line 5618 "SearchFilter.c"
+#line 4881 "SearchFilter.c"
 }
 
 
 static gboolean _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu (GtkToolbar* _sender, gint x, gint y, gint button_number, gpointer self) {
 	gboolean result;
 	result = search_filter_toolbar_on_context_menu_requested ((SearchFilterToolbar*) self, x, y, button_number);
-#line 1254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5627 "SearchFilter.c"
+#line 4890 "SearchFilter.c"
 }
 
 
 static gpointer _search_filter_actions_ref0 (gpointer self) {
-#line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? search_filter_actions_ref (self) : NULL;
-#line 5634 "SearchFilter.c"
+#line 4897 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
-#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_context_menu_close_chosen ((SearchFilterToolbar*) self);
-#line 5641 "SearchFilter.c"
-}
-
-
-static void _search_filter_toolbar_on_filter_button_clicked_search_filter_toolbar_rating_filter_button_clicked (SearchFilterToolbarRatingFilterButton* _sender, gpointer self) {
-#line 1201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_on_filter_button_clicked ((SearchFilterToolbar*) self);
-#line 5648 "SearchFilter.c"
+#line 4904 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked (SearchFilterToolbarSavedSearchFilterButton* _sender, gpointer self) {
-#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_saved_search_button_clicked ((SearchFilterToolbar*) self);
-#line 5655 "SearchFilter.c"
+#line 4911 "SearchFilter.c"
 }
 
 
@@ -5667,643 +4923,499 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 	SearchFilterToolbarSearchBox* _tmp7_ = NULL;
 	GtkToolbar* _tmp8_ = NULL;
 	GtkToolbar* _tmp9_ = NULL;
-	GFile* ui_file = NULL;
-	GFile* _tmp10_ = NULL;
-	GtkUIManager* _tmp21_ = NULL;
-	SearchFilterActions* _tmp22_ = NULL;
-	GtkActionGroup* _tmp23_ = NULL;
-	GtkActionGroup* _tmp24_ = NULL;
-	GtkMenuItem* _tmp25_ = NULL;
-	const gchar* _tmp26_ = NULL;
-	GtkMenuItem* _tmp27_ = NULL;
-	GtkMenuItem* _tmp28_ = NULL;
-	GtkMenu* _tmp29_ = NULL;
-	GtkMenuItem* _tmp30_ = NULL;
+	GtkMenuItem* _tmp16_ = NULL;
+	const gchar* _tmp17_ = NULL;
+	GtkMenuItem* _tmp18_ = NULL;
+	GtkMenuItem* _tmp19_ = NULL;
+	GtkMenu* _tmp20_ = NULL;
+	GtkMenuItem* _tmp21_ = NULL;
+	const gchar* _tmp22_ = NULL;
+	SearchFilterToolbarLabelToolItem* _tmp23_ = NULL;
+	GtkToolbar* _tmp24_ = NULL;
+	SearchFilterToolbarLabelToolItem* _tmp25_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp26_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp27_ = NULL;
+	const gchar* _tmp28_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp29_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp30_ = NULL;
 	const gchar* _tmp31_ = NULL;
-	SearchFilterToolbarLabelToolItem* _tmp32_ = NULL;
-	GtkToolbar* _tmp33_ = NULL;
-	SearchFilterToolbarLabelToolItem* _tmp34_ = NULL;
-	SearchFilterActions* _tmp35_ = NULL;
-	GtkToggleAction* _tmp36_ = NULL;
-	GtkToggleAction* _tmp37_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp32_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp33_ = NULL;
+	const gchar* _tmp34_ = NULL;
+	GtkToolbar* _tmp35_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp36_ = NULL;
+	GtkToolbar* _tmp37_ = NULL;
 	SearchFilterToolbarToggleActionToolButton* _tmp38_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp39_ = NULL;
-	SearchFilterActions* _tmp40_ = NULL;
-	GtkActionGroup* _tmp41_ = NULL;
-	GtkActionGroup* _tmp42_ = NULL;
-	GtkAction* _tmp43_ = NULL;
-	const gchar* _tmp44_ = NULL;
-	const gchar* _tmp45_ = NULL;
-	SearchFilterActions* _tmp46_ = NULL;
-	GtkToggleAction* _tmp47_ = NULL;
-	GtkToggleAction* _tmp48_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp49_ = NULL;
+	GtkToolbar* _tmp39_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp40_ = NULL;
+	GtkSeparatorToolItem* _tmp41_ = NULL;
+	GtkToolbar* _tmp42_ = NULL;
+	GtkSeparatorToolItem* _tmp43_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp44_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp45_ = NULL;
+	const gchar* _tmp46_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp47_ = NULL;
+	const gchar* _tmp48_ = NULL;
+	GtkToolbar* _tmp49_ = NULL;
 	SearchFilterToolbarToggleActionToolButton* _tmp50_ = NULL;
-	SearchFilterActions* _tmp51_ = NULL;
-	GtkActionGroup* _tmp52_ = NULL;
-	GtkActionGroup* _tmp53_ = NULL;
-	GtkAction* _tmp54_ = NULL;
-	const gchar* _tmp55_ = NULL;
-	const gchar* _tmp56_ = NULL;
-	SearchFilterActions* _tmp57_ = NULL;
-	GtkToggleAction* _tmp58_ = NULL;
-	GtkToggleAction* _tmp59_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp60_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp61_ = NULL;
-	SearchFilterActions* _tmp62_ = NULL;
-	GtkActionGroup* _tmp63_ = NULL;
-	GtkActionGroup* _tmp64_ = NULL;
-	GtkAction* _tmp65_ = NULL;
-	const gchar* _tmp66_ = NULL;
-	const gchar* _tmp67_ = NULL;
-	GtkToolbar* _tmp68_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp69_ = NULL;
-	GtkToolbar* _tmp70_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp71_ = NULL;
+	GtkSeparatorToolItem* _tmp51_ = NULL;
+	GtkToolbar* _tmp52_ = NULL;
+	GtkSeparatorToolItem* _tmp53_ = NULL;
+	GMenuModel* model = NULL;
+	GtkBuilder* _tmp54_ = NULL;
+	GObject* _tmp55_ = NULL;
+	GMenuModel* _tmp56_ = NULL;
+	SearchFilterToolbarRatingFilterButton* _tmp57_ = NULL;
+	SearchFilterToolbarRatingFilterButton* _tmp58_ = NULL;
+	const gchar* _tmp59_ = NULL;
+	SearchFilterToolbarRatingFilterButton* _tmp60_ = NULL;
+	GtkToolbar* _tmp61_ = NULL;
+	SearchFilterToolbarRatingFilterButton* _tmp62_ = NULL;
+	GtkSeparatorToolItem* _tmp63_ = NULL;
+	GtkToolbar* _tmp64_ = NULL;
+	GtkSeparatorToolItem* _tmp65_ = NULL;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp66_ = NULL;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp67_ = NULL;
+	const gchar* _tmp68_ = NULL;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp69_ = NULL;
+	const gchar* _tmp70_ = NULL;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp71_ = NULL;
 	GtkToolbar* _tmp72_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp73_ = NULL;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp73_ = NULL;
+	GtkSeparatorToolItem* separator_align = NULL;
 	GtkSeparatorToolItem* _tmp74_ = NULL;
 	GtkToolbar* _tmp75_ = NULL;
-	GtkSeparatorToolItem* _tmp76_ = NULL;
-	SearchFilterActions* _tmp77_ = NULL;
-	GtkToggleAction* _tmp78_ = NULL;
-	GtkToggleAction* _tmp79_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp80_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp81_ = NULL;
-	const gchar* _tmp82_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp83_ = NULL;
+	GtkToolbar* _tmp76_ = NULL;
+	SearchFilterToolbarSearchBox* _tmp77_ = NULL;
+	GtkToolbar* _tmp78_ = NULL;
+	SearchFilterActions* _tmp79_ = NULL;
+	SearchFilterActions* _tmp80_ = NULL;
+	SearchFilterActions* _tmp81_ = NULL;
+	SearchFilterActions* _tmp82_ = NULL;
+	SearchFilterActions* _tmp83_ = NULL;
 	SearchFilterActions* _tmp84_ = NULL;
-	GtkActionGroup* _tmp85_ = NULL;
-	GtkActionGroup* _tmp86_ = NULL;
-	GtkAction* _tmp87_ = NULL;
-	const gchar* _tmp88_ = NULL;
-	const gchar* _tmp89_ = NULL;
-	GtkToolbar* _tmp90_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp91_ = NULL;
-	GtkSeparatorToolItem* _tmp92_ = NULL;
-	GtkToolbar* _tmp93_ = NULL;
-	GtkSeparatorToolItem* _tmp94_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp95_ = NULL;
-	GtkUIManager* _tmp96_ = NULL;
-	GtkWidget* _tmp97_ = NULL;
-	GtkMenu* _tmp98_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp99_ = NULL;
-	const gchar* _tmp100_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp101_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp102_ = NULL;
-	GtkToolbar* _tmp103_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp104_ = NULL;
-	GtkSeparatorToolItem* _tmp105_ = NULL;
-	GtkToolbar* _tmp106_ = NULL;
-	GtkSeparatorToolItem* _tmp107_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp108_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp109_ = NULL;
-	const gchar* _tmp110_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp111_ = NULL;
-	const gchar* _tmp112_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp113_ = NULL;
-	GtkToolbar* _tmp114_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp115_ = NULL;
-	GtkSeparatorToolItem* separator_align = NULL;
-	GtkSeparatorToolItem* _tmp116_ = NULL;
-	GtkToolbar* _tmp117_ = NULL;
-	GtkToolbar* _tmp118_ = NULL;
-	SearchFilterToolbarSearchBox* _tmp119_ = NULL;
-	GtkToolbar* _tmp120_ = NULL;
-	SearchFilterActions* _tmp121_ = NULL;
-	SearchFilterActions* _tmp122_ = NULL;
-	SearchFilterActions* _tmp123_ = NULL;
-	SearchFilterActions* _tmp124_ = NULL;
-	SearchFilterActions* _tmp125_ = NULL;
-	SearchFilterActions* _tmp126_ = NULL;
-	SearchFilterActions* _tmp127_ = NULL;
-	GtkToolbar* _tmp128_ = NULL;
-	SearchFilterActions* _tmp129_ = NULL;
-	gboolean _tmp130_ = FALSE;
-	SearchFilterActions* _tmp131_ = NULL;
-	gboolean _tmp132_ = FALSE;
-	SearchFilterActions* _tmp133_ = NULL;
-	gboolean _tmp134_ = FALSE;
-	SearchFilterActions* _tmp135_ = NULL;
-	gboolean _tmp136_ = FALSE;
+	SearchFilterActions* _tmp85_ = NULL;
+	GtkToolbar* _tmp86_ = NULL;
+	SearchFilterActions* _tmp87_ = NULL;
+	gboolean _tmp88_ = FALSE;
+	SearchFilterActions* _tmp89_ = NULL;
+	gboolean _tmp90_ = FALSE;
+	SearchFilterActions* _tmp91_ = NULL;
+	gboolean _tmp92_ = FALSE;
+	SearchFilterActions* _tmp93_ = NULL;
+	gboolean _tmp94_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1135 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (actions), NULL);
-#line 1135 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbar*) g_object_new (object_type, NULL);
-#line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = actions;
-#line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _search_filter_actions_ref0 (_tmp0_);
-#line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_search_filter_actions_unref0 (self->priv->actions);
-#line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->actions = _tmp1_;
-#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = (GtkToolbar*) gtk_toolbar_new ();
-#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbar);
-#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->toolbar = _tmp2_;
-#line 1138 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = actions;
-#line 1138 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp3_, "media-context-changed", (GCallback) _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed, self, 0);
-#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = actions;
-#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = search_filter_actions_get_text (_tmp4_);
-#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = _tmp5_;
-#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = search_filter_toolbar_search_box_new (_tmp6_);
-#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp7_);
-#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->search_box);
-#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1057 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_box = _tmp7_;
-#line 1141 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = self->priv->toolbar;
-#line 1141 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_buildable_set_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_BUILDABLE, GtkBuildable), "search-filter-toolbar");
-#line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = self->priv->toolbar;
-#line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1060 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toolbar_set_icon_size (_tmp9_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp10_ = resources_get_ui ("search_bar.ui");
-#line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	ui_file = _tmp10_;
-#line 5841 "SearchFilter.c"
+#line 5055 "SearchFilter.c"
 	{
-		GtkUIManager* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-#line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp11_ = self->ui;
-#line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp12_ = g_file_get_path (ui_file);
-#line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp13_ = _tmp12_;
-#line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		gtk_ui_manager_add_ui_from_file (_tmp11_, _tmp13_, &_inner_error_);
-#line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_g_free0 (_tmp13_);
-#line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		GtkBuilder* _tmp10_ = NULL;
+#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp10_ = self->builder;
+#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		gtk_builder_add_from_resource (_tmp10_, "/org/gnome/Shotwell/search_bar.ui", &_inner_error_);
+#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5858 "SearchFilter.c"
-			goto __catch593_g_error;
+#line 5064 "SearchFilter.c"
+			goto __catch590_g_error;
 		}
 	}
-	goto __finally593;
-	__catch593_g_error:
+	goto __finally590;
+	__catch590_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp14_ = NULL;
+		const gchar* _tmp11_ = NULL;
+		GError* _tmp12_ = NULL;
+		const gchar* _tmp13_ = NULL;
+		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		GError* _tmp17_ = NULL;
-		const gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		err = _inner_error_;
-#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_inner_error_ = NULL;
-#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp14_ = _ ("Error loading UI file %s: %s");
-#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp15_ = g_file_get_path (ui_file);
-#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp16_ = _tmp15_;
-#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp17_ = err;
-#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp18_ = _tmp17_->message;
-#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp19_ = g_strdup_printf (_tmp14_, _tmp16_, _tmp18_);
-#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp20_ = _tmp19_;
-#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		app_window_panic (_tmp20_);
-#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_g_free0 (_tmp20_);
-#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_g_free0 (_tmp16_);
-#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp11_ = _ ("Error loading search bar UI: %s");
+#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp12_ = err;
+#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp13_ = _tmp12_->message;
+#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp14_ = g_strdup_printf (_tmp11_, _tmp13_);
+#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp15_ = _tmp14_;
+#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		app_window_panic (_tmp15_);
+#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_g_free0 (_tmp15_);
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_error_free0 (err);
-#line 5899 "SearchFilter.c"
+#line 5097 "SearchFilter.c"
 	}
-	__finally593:
-#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	__finally590:
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_g_object_unref0 (ui_file);
-#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_clear_error (&_inner_error_);
-#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return NULL;
-#line 5912 "SearchFilter.c"
-	}
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp21_ = self->ui;
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_ = actions;
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp23_ = search_filter_actions_get_action_group (_tmp22_);
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp24_ = _tmp23_;
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_ui_manager_insert_action_group (_tmp21_, _tmp24_, 0);
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (_tmp24_);
-#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp25_ = self->priv->close_item;
-#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp26_ = _ ("Close");
-#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_menu_item_set_label (_tmp25_, _tmp26_);
-#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp27_ = self->priv->close_item;
-#line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget));
-#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp28_ = self->priv->close_item;
-#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp28_, "activate", (GCallback) _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate, self, 0);
-#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp29_ = self->priv->close_menu;
-#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp30_ = self->priv->close_item;
-#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_menu_shell_get_type (), GtkMenuShell), (GtkWidget*) _tmp30_);
-#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp31_ = _ ("Type");
-#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp32_ = search_filter_toolbar_label_tool_item_new (_tmp31_, 10, 5);
-#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp32_);
-#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 5108 "SearchFilter.c"
+	}
+#line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp16_ = self->priv->close_item;
+#line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp17_ = _ ("Close");
+#line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_menu_item_set_label (_tmp16_, _tmp17_);
+#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp18_ = self->priv->close_item;
+#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
+#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp19_ = self->priv->close_item;
+#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp19_, "activate", (GCallback) _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate, self, 0);
+#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp20_ = self->priv->close_menu;
+#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp21_ = self->priv->close_item;
+#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_menu_shell_get_type (), GtkMenuShell), (GtkWidget*) _tmp21_);
+#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp22_ = _ ("Type");
+#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp23_ = search_filter_toolbar_label_tool_item_new (_tmp22_, 10, 5);
+#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp23_);
+#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->label_type);
-#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->label_type = _tmp32_;
-#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp33_ = self->priv->toolbar;
-#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp34_ = self->priv->label_type;
-#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp35_ = actions;
-#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp36_ = search_filter_actions_get_photos (_tmp35_);
-#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp37_ = _tmp36_;
-#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp38_ = search_filter_toolbar_toggle_action_tool_button_new (_tmp37_);
-#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp38_);
-#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->label_type = _tmp23_;
+#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp24_ = self->priv->toolbar;
+#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp25_ = self->priv->label_type;
+#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp26_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.photos");
+#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp26_);
+#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_photos);
-#line 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_photos = _tmp38_;
-#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp39_ = self->priv->toolbtn_photos;
-#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp40_ = actions;
-#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp41_ = search_filter_actions_get_action_group (_tmp40_);
-#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp42_ = _tmp41_;
-#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp43_ = gtk_action_group_get_action (_tmp42_, "CommonDisplayPhotos");
-#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp44_ = gtk_action_get_tooltip (_tmp43_);
-#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_ = _tmp44_;
-#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_item_get_type (), GtkToolItem), _tmp45_);
-#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (_tmp42_);
-#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp46_ = actions;
-#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp47_ = search_filter_actions_get_videos (_tmp46_);
-#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp48_ = _tmp47_;
-#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp49_ = search_filter_toolbar_toggle_action_tool_button_new (_tmp48_);
-#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp49_);
-#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->toolbtn_photos = _tmp26_;
+#line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp27_ = self->priv->toolbtn_photos;
+#line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp28_ = _ ("Photos");
+#line 1084 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), _tmp28_);
+#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp29_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.videos");
+#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp29_);
+#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_videos);
-#line 1171 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_videos = _tmp49_;
-#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp50_ = self->priv->toolbtn_videos;
-#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp51_ = actions;
-#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp52_ = search_filter_actions_get_action_group (_tmp51_);
-#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp53_ = _tmp52_;
-#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp54_ = gtk_action_group_get_action (_tmp53_, "CommonDisplayVideos");
-#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp55_ = gtk_action_get_tooltip (_tmp54_);
-#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp56_ = _tmp55_;
-#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_tool_item_get_type (), GtkToolItem), _tmp56_);
-#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (_tmp53_);
-#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp57_ = actions;
-#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp58_ = search_filter_actions_get_raw (_tmp57_);
-#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp59_ = _tmp58_;
-#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp60_ = search_filter_toolbar_toggle_action_tool_button_new (_tmp59_);
-#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp60_);
-#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->toolbtn_videos = _tmp29_;
+#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp30_ = self->priv->toolbtn_videos;
+#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp31_ = _ ("Videos");
+#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_tool_item_get_type (), GtkToolItem), _tmp31_);
+#line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp32_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.raw");
+#line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp32_);
+#line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_raw);
-#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_raw = _tmp60_;
-#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp61_ = self->priv->toolbtn_raw;
-#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp62_ = actions;
-#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp63_ = search_filter_actions_get_action_group (_tmp62_);
-#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp64_ = _tmp63_;
-#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp65_ = gtk_action_group_get_action (_tmp64_, "CommonDisplayRaw");
-#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp66_ = gtk_action_get_tooltip (_tmp65_);
-#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp67_ = _tmp66_;
-#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_tool_item_get_type (), GtkToolItem), _tmp67_);
-#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (_tmp64_);
-#line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp68_ = self->priv->toolbar;
-#line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp69_ = self->priv->toolbtn_photos;
-#line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp68_, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1178 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp70_ = self->priv->toolbar;
-#line 1178 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp71_ = self->priv->toolbtn_videos;
-#line 1178 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp70_, G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp72_ = self->priv->toolbar;
-#line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp73_ = self->priv->toolbtn_raw;
-#line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp72_, G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp74_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp74_);
-#line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->toolbtn_raw = _tmp32_;
+#line 1090 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp33_ = self->priv->toolbtn_raw;
+#line 1090 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp34_ = _ ("RAW Photos");
+#line 1090 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), _tmp34_);
+#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp35_ = self->priv->toolbar;
+#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp36_ = self->priv->toolbtn_photos;
+#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp37_ = self->priv->toolbar;
+#line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp38_ = self->priv->toolbtn_videos;
+#line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1094 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp39_ = self->priv->toolbar;
+#line 1094 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp40_ = self->priv->toolbtn_raw;
+#line 1094 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp41_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp41_);
+#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_mediatype_flagged);
-#line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->sepr_mediatype_flagged = _tmp74_;
-#line 1183 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp75_ = self->priv->toolbar;
-#line 1183 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp76_ = self->priv->sepr_mediatype_flagged;
-#line 1183 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp75_, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp77_ = actions;
-#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp78_ = search_filter_actions_get_flagged (_tmp77_);
-#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp79_ = _tmp78_;
-#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp80_ = search_filter_toolbar_toggle_action_tool_button_new (_tmp79_);
-#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp80_);
-#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->sepr_mediatype_flagged = _tmp41_;
+#line 1098 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp42_ = self->priv->toolbar;
+#line 1098 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp43_ = self->priv->sepr_mediatype_flagged;
+#line 1098 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp44_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.flagged");
+#line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp44_);
+#line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_flag);
-#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_flag = _tmp80_;
-#line 1188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp81_ = self->priv->toolbtn_flag;
-#line 1188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp82_ = _ ("Flagged");
-#line 1188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_toggle_action_tool_button_set_label (_tmp81_, _tmp82_);
-#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp83_ = self->priv->toolbtn_flag;
-#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp84_ = actions;
-#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp85_ = search_filter_actions_get_action_group (_tmp84_);
-#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp86_ = _tmp85_;
-#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp87_ = gtk_action_group_get_action (_tmp86_, "CommonDisplayFlagged");
-#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp88_ = gtk_action_get_tooltip (_tmp87_);
-#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp89_ = _tmp88_;
-#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_tool_item_get_type (), GtkToolItem), _tmp89_);
-#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (_tmp86_);
-#line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp90_ = self->priv->toolbar;
-#line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp91_ = self->priv->toolbtn_flag;
-#line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp90_, G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1194 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp92_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 1194 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp92_);
-#line 1194 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->toolbtn_flag = _tmp44_;
+#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp45_ = self->priv->toolbtn_flag;
+#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp46_ = _ ("Flagged");
+#line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_toggle_action_tool_button_set_label (_tmp45_, _tmp46_);
+#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp47_ = self->priv->toolbtn_flag;
+#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp48_ = _ ("Flagged");
+#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_tool_item_get_type (), GtkToolItem), _tmp48_);
+#line 1106 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp49_ = self->priv->toolbar;
+#line 1106 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp50_ = self->priv->toolbtn_flag;
+#line 1106 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp51_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp51_);
+#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_flagged_rating);
-#line 1194 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->sepr_flagged_rating = _tmp92_;
-#line 1195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp93_ = self->priv->toolbar;
-#line 1195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp94_ = self->priv->sepr_flagged_rating;
-#line 1195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp93_, G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1198 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp95_ = self->priv->rating_button;
-#line 1198 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp96_ = self->ui;
-#line 1198 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp97_ = gtk_ui_manager_get_widget (_tmp96_, "/FilterPopupMenu");
-#line 1198 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp98_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, gtk_menu_get_type (), GtkMenu));
-#line 1198 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (_tmp95_->filter_popup);
-#line 1198 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp95_->filter_popup = _tmp98_;
-#line 1199 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp99_ = self->priv->rating_button;
-#line 1199 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp100_ = _ ("Rating");
-#line 1199 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_rating_filter_button_set_label (_tmp99_, _tmp100_);
-#line 1200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp101_ = self->priv->rating_button;
-#line 1200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
-#line 1201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp102_ = self->priv->rating_button;
-#line 1201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp102_, "clicked", (GCallback) _search_filter_toolbar_on_filter_button_clicked_search_filter_toolbar_rating_filter_button_clicked, self, 0);
-#line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp103_ = self->priv->toolbar;
-#line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp104_ = self->priv->rating_button;
-#line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp103_, G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1205 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp105_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 1205 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp105_);
-#line 1205 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->sepr_flagged_rating = _tmp51_;
+#line 1110 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp52_ = self->priv->toolbar;
+#line 1110 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp53_ = self->priv->sepr_flagged_rating;
+#line 1110 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp54_ = self->builder;
+#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp55_ = gtk_builder_get_object (_tmp54_, "popup-menu");
+#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp56_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp55_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp55_) : NULL);
+#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	model = _tmp56_;
+#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp57_ = search_filter_toolbar_rating_filter_button_new (model);
+#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp57_);
+#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_object_unref0 (self->priv->rating_button);
+#line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->rating_button = _tmp57_;
+#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp58_ = self->priv->rating_button;
+#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp59_ = _ ("Rating");
+#line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_rating_filter_button_set_label (_tmp58_, _tmp59_);
+#line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp60_ = self->priv->rating_button;
+#line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
+#line 1117 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp61_ = self->priv->toolbar;
+#line 1117 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp62_ = self->priv->rating_button;
+#line 1117 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp61_, G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp63_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp63_);
+#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_rating_saved);
-#line 1205 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->sepr_rating_saved = _tmp105_;
-#line 1206 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp106_ = self->priv->toolbar;
-#line 1206 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp107_ = self->priv->sepr_rating_saved;
-#line 1206 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp106_, G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp108_ = self->priv->saved_search_button;
-#line 1209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
-#line 1210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp109_ = self->priv->saved_search_button;
-#line 1210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp110_ = _ ("Saved Search");
-#line 1210 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_saved_search_filter_button_set_label (_tmp109_, _tmp110_);
-#line 1211 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp111_ = self->priv->saved_search_button;
-#line 1211 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp112_ = _ ("Use a saved search to filter items in the current view");
-#line 1211 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, gtk_tool_item_get_type (), GtkToolItem), _tmp112_);
-#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp113_ = self->priv->saved_search_button;
-#line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp113_, "clicked", (GCallback) _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked, self, 0);
-#line 1213 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp114_ = self->priv->toolbar;
-#line 1213 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp115_ = self->priv->saved_search_button;
-#line 1213 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp114_, G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1216 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp116_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
-#line 1216 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp116_);
-#line 1216 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	separator_align = _tmp116_;
-#line 1217 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->sepr_rating_saved = _tmp63_;
+#line 1121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp64_ = self->priv->toolbar;
+#line 1121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp65_ = self->priv->sepr_rating_saved;
+#line 1121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp64_, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp66_ = self->priv->saved_search_button;
+#line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
+#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp67_ = self->priv->saved_search_button;
+#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp68_ = _ ("Saved Search");
+#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_saved_search_filter_button_set_label (_tmp67_, _tmp68_);
+#line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp69_ = self->priv->saved_search_button;
+#line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp70_ = _ ("Use a saved search to filter items in the current view");
+#line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_tool_item_get_type (), GtkToolItem), _tmp70_);
+#line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp71_ = self->priv->saved_search_button;
+#line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp71_, "clicked", (GCallback) _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked, self, 0);
+#line 1128 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp72_ = self->priv->toolbar;
+#line 1128 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp73_ = self->priv->saved_search_button;
+#line 1128 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp72_, G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1131 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp74_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+#line 1131 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp74_);
+#line 1131 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	separator_align = _tmp74_;
+#line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), TRUE);
-#line 1218 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1133 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_separator_tool_item_set_draw (separator_align, FALSE);
-#line 1219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp117_ = self->priv->toolbar;
-#line 1219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp117_, G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1222 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp118_ = self->priv->toolbar;
-#line 1222 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp119_ = self->priv->search_box;
-#line 1222 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp118_, G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 1224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp120_ = self->priv->toolbar;
-#line 1224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_widget_get_type (), GtkWidget));
-#line 1227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp121_ = actions;
-#line 1227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp121_, "flagged-toggled", (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self, 0);
-#line 1228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp122_ = actions;
-#line 1228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp122_, "photos-toggled", (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self, 0);
-#line 1229 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp123_ = actions;
-#line 1229 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp123_, "videos-toggled", (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self, 0);
-#line 1230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp124_ = actions;
-#line 1230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp124_, "raw-toggled", (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self, 0);
-#line 1231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp125_ = actions;
-#line 1231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp125_, "rating-changed", (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self, 0);
-#line 1232 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp126_ = actions;
-#line 1232 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp126_, "text-changed", (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self, 0);
-#line 1233 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp127_ = actions;
-#line 1233 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp127_, "criteria-changed", (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self, 0);
-#line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp128_ = self->priv->toolbar;
-#line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp128_, "popup-context-menu", (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self, 0);
-#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp129_ = actions;
-#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp130_ = search_filter_actions_get_has_photos (_tmp129_);
-#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp131_ = actions;
-#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp132_ = search_filter_actions_get_has_videos (_tmp131_);
-#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp133_ = actions;
-#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp134_ = search_filter_actions_get_has_raw (_tmp133_);
-#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp135_ = actions;
-#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp136_ = search_filter_actions_get_has_flagged (_tmp135_);
-#line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_on_media_context_changed (self, _tmp130_, _tmp132_, _tmp134_, _tmp136_);
-#line 1135 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1134 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp75_ = self->priv->toolbar;
+#line 1134 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp75_, G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp76_ = self->priv->toolbar;
+#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp77_ = self->priv->search_box;
+#line 1137 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_toolbar_insert (_tmp76_, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp78_ = self->priv->toolbar;
+#line 1139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_widget_get_type (), GtkWidget));
+#line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp79_ = actions;
+#line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp79_, "flagged-toggled", (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self, 0);
+#line 1143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp80_ = actions;
+#line 1143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp80_, "photos-toggled", (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self, 0);
+#line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp81_ = actions;
+#line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp81_, "videos-toggled", (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self, 0);
+#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp82_ = actions;
+#line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp82_, "raw-toggled", (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self, 0);
+#line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp83_ = actions;
+#line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp83_, "rating-changed", (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self, 0);
+#line 1147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp84_ = actions;
+#line 1147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp84_, "text-changed", (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self, 0);
+#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp85_ = actions;
+#line 1148 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp85_, "criteria-changed", (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self, 0);
+#line 1151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp86_ = self->priv->toolbar;
+#line 1151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_connect_object (_tmp86_, "popup-context-menu", (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self, 0);
+#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp87_ = actions;
+#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp88_ = search_filter_actions_get_has_photos (_tmp87_);
+#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp89_ = actions;
+#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp90_ = search_filter_actions_get_has_videos (_tmp89_);
+#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp91_ = actions;
+#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp92_ = search_filter_actions_get_has_raw (_tmp91_);
+#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp93_ = actions;
+#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp94_ = search_filter_actions_get_has_flagged (_tmp93_);
+#line 1153 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_on_media_context_changed (self, _tmp88_, _tmp90_, _tmp92_, _tmp94_);
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (separator_align);
-#line 1135 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (ui_file);
-#line 1135 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_object_unref0 (model);
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 6300 "SearchFilter.c"
+#line 5412 "SearchFilter.c"
 }
 
 
 SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions) {
-#line 1135 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_construct (TYPE_SEARCH_FILTER_TOOLBAR, actions);
-#line 6307 "SearchFilter.c"
+#line 5419 "SearchFilter.c"
 }
 
 
@@ -6312,83 +5424,83 @@ static void search_filter_toolbar_on_media_context_changed (SearchFilterToolbar*
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp9_ = FALSE;
-#line 1257 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1172 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = has_photos;
-#line 1259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 6322 "SearchFilter.c"
+#line 5434 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp1_ = NULL;
-#line 1260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = self->priv->toolbtn_photos;
-#line 1260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1175 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp1_, RESOURCES_ICON_FILTER_PHOTOS);
-#line 6328 "SearchFilter.c"
+#line 5440 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp2_ = NULL;
-#line 1262 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->toolbtn_photos;
-#line 1262 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1177 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp2_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED);
-#line 6335 "SearchFilter.c"
+#line 5447 "SearchFilter.c"
 	}
-#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = has_videos;
-#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
-#line 6341 "SearchFilter.c"
+#line 5453 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp4_ = NULL;
-#line 1265 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = self->priv->toolbtn_videos;
-#line 1265 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp4_, RESOURCES_ICON_FILTER_VIDEOS);
-#line 6347 "SearchFilter.c"
+#line 5459 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp5_ = NULL;
-#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = self->priv->toolbtn_videos;
-#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1182 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp5_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED);
-#line 6354 "SearchFilter.c"
+#line 5466 "SearchFilter.c"
 	}
-#line 1269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = has_raw;
-#line 1269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp6_) {
-#line 6360 "SearchFilter.c"
+#line 5472 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp7_ = NULL;
-#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1185 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = self->priv->toolbtn_raw;
-#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1185 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp7_, RESOURCES_ICON_FILTER_RAW);
-#line 6366 "SearchFilter.c"
+#line 5478 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp8_ = NULL;
-#line 1272 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = self->priv->toolbtn_raw;
-#line 1272 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp8_, RESOURCES_ICON_FILTER_RAW_DISABLED);
-#line 6373 "SearchFilter.c"
+#line 5485 "SearchFilter.c"
 	}
-#line 1274 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = has_flagged;
-#line 1274 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp9_) {
-#line 6379 "SearchFilter.c"
+#line 5491 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp10_ = NULL;
-#line 1275 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1190 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = self->priv->toolbtn_flag;
-#line 1275 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1190 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp10_, RESOURCES_ICON_FILTER_FLAGGED);
-#line 6385 "SearchFilter.c"
+#line 5497 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp11_ = NULL;
-#line 1277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1192 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp11_ = self->priv->toolbtn_flag;
-#line 1277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1192 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp11_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED);
-#line 6392 "SearchFilter.c"
+#line 5504 "SearchFilter.c"
 	}
 }
 
@@ -6398,114 +5510,127 @@ static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToo
 	GtkMenu* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	guint32 _tmp2_ = 0U;
-#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1196 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_TOOLBAR (self), FALSE);
-#line 1282 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->close_menu;
-#line 1282 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = button;
-#line 1282 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = gtk_get_current_event_time ();
-#line 1282 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) _tmp1_, _tmp2_);
-#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1198 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = FALSE;
-#line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1198 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 6416 "SearchFilter.c"
+#line 5528 "SearchFilter.c"
+}
+
+
+static GVariant* _variant_new31 (gboolean value) {
+#line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 5535 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterToolbar* self) {
 	AppWindow* aw = NULL;
 	LibraryWindow* _tmp0_ = NULL;
-	GtkToggleAction* searchbar_toggle = NULL;
+	GSimpleAction* action = NULL;
 	AppWindow* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-	GtkToggleAction* _tmp3_ = NULL;
-	GtkToggleAction* _tmp4_ = NULL;
-#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+	GSimpleAction* _tmp4_ = NULL;
+#line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = library_window_get_app ();
-#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	aw = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_APP_WINDOW, AppWindow);
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = aw;
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = app_window_get_common_action (_tmp1_, "CommonDisplaySearchbar");
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp2_) : NULL;
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp3_ == NULL) {
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_g_object_unref0 (_tmp2_);
-#line 6444 "SearchFilter.c"
-	}
-#line 1294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	searchbar_toggle = _tmp3_;
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp4_ = searchbar_toggle;
-#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp2_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
+#line 1209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL);
+#line 1209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	action = _tmp3_;
+#line 1213 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp4_ = action;
+#line 1213 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp4_ != NULL) {
-#line 6452 "SearchFilter.c"
-		GtkToggleAction* _tmp5_ = NULL;
-#line 1299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp5_ = searchbar_toggle;
-#line 1299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		gtk_toggle_action_set_active (_tmp5_, FALSE);
-#line 6458 "SearchFilter.c"
+#line 5565 "SearchFilter.c"
+		GSimpleAction* _tmp5_ = NULL;
+		GVariant* _tmp6_ = NULL;
+#line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp5_ = action;
+#line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp6_ = _variant_new31 (FALSE);
+#line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		g_simple_action_set_state (_tmp5_, _tmp6_);
+#line 1215 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_g_variant_unref0 (_tmp6_);
+#line 5576 "SearchFilter.c"
 	}
-#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (searchbar_toggle);
-#line 1288 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_object_unref0 (action);
+#line 1203 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 6464 "SearchFilter.c"
+#line 5582 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_flagged_toggled (SearchFilterToolbar* self) {
-#line 1303 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1304 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1220 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6473 "SearchFilter.c"
+#line 5591 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_videos_toggled (SearchFilterToolbar* self) {
-#line 1307 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1223 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1308 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6482 "SearchFilter.c"
+#line 5600 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_photos_toggled (SearchFilterToolbar* self) {
-#line 1311 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1312 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6491 "SearchFilter.c"
+#line 5609 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_raw_toggled (SearchFilterToolbar* self) {
-#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1316 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1232 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6500 "SearchFilter.c"
+#line 5618 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_search_text_changed (SearchFilterToolbar* self) {
-#line 1319 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1320 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1236 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6509 "SearchFilter.c"
+#line 5627 "SearchFilter.c"
+}
+
+
+static GVariant* _variant_new32 (gboolean value) {
+#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 5634 "SearchFilter.c"
 }
 
 
@@ -6513,76 +5638,75 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 	AppWindow* aw = NULL;
 	LibraryWindow* _tmp0_ = NULL;
 	AppWindow* _tmp1_ = NULL;
-	GtkToggleAction* searchbar_toggle = NULL;
+	GSimpleAction* action = NULL;
 	AppWindow* _tmp2_ = NULL;
-	GtkAction* _tmp3_ = NULL;
-	GtkToggleAction* _tmp4_ = NULL;
-	GtkToggleAction* _tmp5_ = NULL;
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GAction* _tmp3_ = NULL;
+	GSimpleAction* _tmp4_ = NULL;
+	GSimpleAction* _tmp5_ = NULL;
+#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = library_window_get_app ();
-#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	aw = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_APP_WINDOW, AppWindow);
-#line 1326 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = aw;
-#line 1326 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_ == NULL) {
-#line 1327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1243 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (aw);
-#line 1327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1243 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 6536 "SearchFilter.c"
+#line 5661 "SearchFilter.c"
 	}
-#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1245 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = aw;
-#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp3_ = app_window_get_common_action (_tmp2_, "CommonDisplaySearchbar");
-#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp3_) : NULL;
-#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp4_ == NULL) {
-#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_g_object_unref0 (_tmp3_);
-#line 6548 "SearchFilter.c"
-	}
-#line 1329 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	searchbar_toggle = _tmp4_;
-#line 1330 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp5_ = searchbar_toggle;
-#line 1330 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1245 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp3_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
+#line 1245 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp3_) : NULL);
+#line 1245 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	action = _tmp4_;
+#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp5_ = action;
+#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp5_ != NULL) {
-#line 6556 "SearchFilter.c"
-		GtkToggleAction* _tmp6_ = NULL;
-#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp6_ = searchbar_toggle;
-#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		gtk_toggle_action_set_active (_tmp6_, TRUE);
-#line 6562 "SearchFilter.c"
+#line 5675 "SearchFilter.c"
+		GSimpleAction* _tmp6_ = NULL;
+		GVariant* _tmp7_ = NULL;
+#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp6_ = action;
+#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp7_ = _variant_new32 (TRUE);
+#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		g_simple_action_set_state (_tmp6_, _tmp7_);
+#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_g_variant_unref0 (_tmp7_);
+#line 5686 "SearchFilter.c"
 	}
-#line 1333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1253 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (searchbar_toggle);
-#line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_object_unref0 (action);
+#line 1239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 6570 "SearchFilter.c"
+#line 5694 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self) {
-#line 1339 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6579 "SearchFilter.c"
+#line 5703 "SearchFilter.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 6586 "SearchFilter.c"
+#line 5710 "SearchFilter.c"
 }
 
 
@@ -6597,64 +5721,64 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie
 	SearchFilterToolbarRatingFilterButton* _tmp7_ = NULL;
 	SearchViewFilter* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
-#line 1343 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1343 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_VIEW_FILTER (search_filter));
-#line 1344 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search_filter;
-#line 1344 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->search_filter;
-#line 1344 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 1345 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1265 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 6613 "SearchFilter.c"
+#line 5737 "SearchFilter.c"
 	}
-#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search_filter;
-#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _view_filter_ref0 (_tmp2_);
-#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_view_filter_unref0 (self->priv->search_filter);
-#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_filter = _tmp3_;
-#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->actions;
-#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = search_filter;
-#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = search_view_filter_get_criteria (_tmp5_);
-#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1270 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_set_sensitive_for_search_criteria (_tmp4_, (SearchFilterCriteria) _tmp6_);
-#line 1351 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1271 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = self->priv->rating_button;
-#line 1351 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1271 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = search_filter;
-#line 1351 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1271 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = search_view_filter_get_criteria (_tmp8_);
-#line 1351 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1271 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), (SEARCH_FILTER_CRITERIA_RATING & _tmp9_) != 0);
-#line 1353 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6641 "SearchFilter.c"
+#line 5765 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_unset_view_filter (SearchFilterToolbar* self) {
 	DisabledViewFilter* _tmp0_ = NULL;
 	DisabledViewFilter* _tmp1_ = NULL;
-#line 1356 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1357 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = disabled_view_filter_new ();
-#line 1357 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_;
-#line 1357 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_set_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 1357 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_view_filter_unref0 (_tmp1_);
-#line 6658 "SearchFilter.c"
+#line 5782 "SearchFilter.c"
 }
 
 
@@ -6669,550 +5793,418 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	const gchar* _tmp9_ = NULL;
 	SearchViewFilter* _tmp10_ = NULL;
 	SearchFilterActions* _tmp11_ = NULL;
-	GtkToggleAction* _tmp12_ = NULL;
-	GtkToggleAction* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
-	SearchViewFilter* _tmp16_ = NULL;
-	SearchFilterActions* _tmp17_ = NULL;
-	GtkToggleAction* _tmp18_ = NULL;
-	GtkToggleAction* _tmp19_ = NULL;
-	gboolean _tmp20_ = FALSE;
-	gboolean _tmp21_ = FALSE;
-	SearchViewFilter* _tmp22_ = NULL;
-	SearchFilterActions* _tmp23_ = NULL;
-	GtkToggleAction* _tmp24_ = NULL;
-	GtkToggleAction* _tmp25_ = NULL;
-	gboolean _tmp26_ = FALSE;
-	gboolean _tmp27_ = FALSE;
-	SearchViewFilter* _tmp28_ = NULL;
-	SearchFilterActions* _tmp29_ = NULL;
-	GtkToggleAction* _tmp30_ = NULL;
-	GtkToggleAction* _tmp31_ = NULL;
-	gboolean _tmp32_ = FALSE;
-	gboolean _tmp33_ = FALSE;
+	GSimpleAction* _tmp12_ = NULL;
+	GSimpleAction* _tmp13_ = NULL;
+	GVariant* _tmp14_ = NULL;
+	GVariant* _tmp15_ = NULL;
+	gboolean _tmp16_ = FALSE;
+	SearchViewFilter* _tmp17_ = NULL;
+	SearchFilterActions* _tmp18_ = NULL;
+	GSimpleAction* _tmp19_ = NULL;
+	GSimpleAction* _tmp20_ = NULL;
+	GVariant* _tmp21_ = NULL;
+	GVariant* _tmp22_ = NULL;
+	gboolean _tmp23_ = FALSE;
+	SearchViewFilter* _tmp24_ = NULL;
+	SearchFilterActions* _tmp25_ = NULL;
+	GSimpleAction* _tmp26_ = NULL;
+	GSimpleAction* _tmp27_ = NULL;
+	GVariant* _tmp28_ = NULL;
+	GVariant* _tmp29_ = NULL;
+	gboolean _tmp30_ = FALSE;
+	SearchViewFilter* _tmp31_ = NULL;
+	SearchFilterActions* _tmp32_ = NULL;
+	GSimpleAction* _tmp33_ = NULL;
+	GSimpleAction* _tmp34_ = NULL;
+	GVariant* _tmp35_ = NULL;
+	GVariant* _tmp36_ = NULL;
+	gboolean _tmp37_ = FALSE;
 	RatingFilter filter = 0;
-	SearchFilterActions* _tmp34_ = NULL;
-	GtkRadioAction* _tmp35_ = NULL;
-	GtkRadioAction* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	SearchViewFilter* _tmp39_ = NULL;
-	RatingFilter _tmp40_ = 0;
-	SearchFilterToolbarRatingFilterButton* _tmp41_ = NULL;
-	RatingFilter _tmp42_ = 0;
-	SearchViewFilter* _tmp43_ = NULL;
-	SavedSearch* _tmp44_ = NULL;
+	SearchFilterActions* _tmp38_ = NULL;
+	GSimpleAction* _tmp39_ = NULL;
+	GSimpleAction* _tmp40_ = NULL;
+	GVariant* _tmp41_ = NULL;
+	GVariant* _tmp42_ = NULL;
+	const gchar* _tmp43_ = NULL;
+	gint _tmp44_ = 0;
+	RatingFilter _tmp45_ = 0;
+	SearchViewFilter* _tmp46_ = NULL;
+	RatingFilter _tmp47_ = 0;
+	SearchFilterToolbarRatingFilterButton* _tmp48_ = NULL;
+	RatingFilter _tmp49_ = 0;
+	SearchViewFilter* _tmp50_ = NULL;
+	SavedSearch* _tmp51_ = NULL;
 	SearchFilterCriteria criteria = 0;
-	SearchFilterActions* _tmp45_ = NULL;
-	SearchFilterCriteria _tmp46_ = 0;
-	SearchFilterToolbarSearchBox* _tmp47_ = NULL;
-	SearchFilterCriteria _tmp48_ = 0;
-	SearchFilterToolbarRatingFilterButton* _tmp49_ = NULL;
-	SearchFilterCriteria _tmp50_ = 0;
-	SearchFilterToolbarToggleActionToolButton* _tmp51_ = NULL;
-	SearchFilterCriteria _tmp52_ = 0;
-	SearchFilterToolbarLabelToolItem* _tmp53_ = NULL;
-	SearchFilterCriteria _tmp54_ = 0;
-	SearchFilterToolbarToggleActionToolButton* _tmp55_ = NULL;
-	SearchFilterCriteria _tmp56_ = 0;
-	SearchFilterToolbarToggleActionToolButton* _tmp57_ = NULL;
-	SearchFilterCriteria _tmp58_ = 0;
-	SearchFilterToolbarToggleActionToolButton* _tmp59_ = NULL;
-	SearchFilterCriteria _tmp60_ = 0;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp61_ = NULL;
-	SearchFilterCriteria _tmp62_ = 0;
-	gboolean _tmp63_ = FALSE;
-	SearchFilterToolbarLabelToolItem* _tmp64_ = NULL;
-	gboolean _tmp65_ = FALSE;
-	gboolean _tmp66_ = FALSE;
-	GtkSeparatorToolItem* _tmp70_ = NULL;
-	gboolean _tmp71_ = FALSE;
+	SearchFilterActions* _tmp52_ = NULL;
+	SearchFilterCriteria _tmp53_ = 0;
+	SearchFilterToolbarSearchBox* _tmp54_ = NULL;
+	SearchFilterCriteria _tmp55_ = 0;
+	SearchFilterToolbarRatingFilterButton* _tmp56_ = NULL;
+	SearchFilterCriteria _tmp57_ = 0;
+	SearchFilterToolbarToggleActionToolButton* _tmp58_ = NULL;
+	SearchFilterCriteria _tmp59_ = 0;
+	SearchFilterToolbarLabelToolItem* _tmp60_ = NULL;
+	SearchFilterCriteria _tmp61_ = 0;
+	SearchFilterToolbarToggleActionToolButton* _tmp62_ = NULL;
+	SearchFilterCriteria _tmp63_ = 0;
+	SearchFilterToolbarToggleActionToolButton* _tmp64_ = NULL;
+	SearchFilterCriteria _tmp65_ = 0;
+	SearchFilterToolbarToggleActionToolButton* _tmp66_ = NULL;
+	SearchFilterCriteria _tmp67_ = 0;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp68_ = NULL;
+	SearchFilterCriteria _tmp69_ = 0;
+	gboolean _tmp70_ = FALSE;
+	SearchFilterToolbarLabelToolItem* _tmp71_ = NULL;
 	gboolean _tmp72_ = FALSE;
-	SearchFilterToolbarLabelToolItem* _tmp73_ = NULL;
-	gboolean _tmp74_ = FALSE;
-	gboolean _tmp75_ = FALSE;
-	GtkSeparatorToolItem* _tmp86_ = NULL;
-	SearchViewFilter* _tmp87_ = NULL;
-#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gboolean _tmp73_ = FALSE;
+	GtkSeparatorToolItem* _tmp77_ = NULL;
+	gboolean _tmp78_ = FALSE;
+	gboolean _tmp79_ = FALSE;
+	SearchFilterToolbarLabelToolItem* _tmp80_ = NULL;
+	gboolean _tmp81_ = FALSE;
+	gboolean _tmp82_ = FALSE;
+	GtkSeparatorToolItem* _tmp93_ = NULL;
+	SearchViewFilter* _tmp94_ = NULL;
+#line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1362 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1282 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 1362 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1282 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (NULL == _tmp0_) {
-#line 6744 "SearchFilter.c"
+#line 5875 "SearchFilter.c"
 		LibraryWindow* _tmp1_ = NULL;
 		LibraryWindow* _tmp2_ = NULL;
-#line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = library_window_get_app ();
-#line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp1_;
-#line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		library_window_show_search_bar (_tmp2_, TRUE);
-#line 1364 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp2_);
-#line 6755 "SearchFilter.c"
+#line 5886 "SearchFilter.c"
 	}
-#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_filter;
-#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1287 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_vala_assert (NULL != _tmp3_, "null != search_filter");
-#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->search_filter;
-#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->actions;
-#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = search_filter_actions_get_text (_tmp5_);
-#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = _tmp6_;
-#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = text_action_get_value (_tmp7_);
-#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = _tmp8_;
-#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1289 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_view_filter_set_search_filter (_tmp4_, _tmp9_);
-#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = self->priv->search_filter;
-#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = self->priv->actions;
-#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = search_filter_actions_get_flagged (_tmp11_);
-#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp13_ = _tmp12_;
-#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp14_ = gtk_toggle_action_get_active (_tmp13_);
-#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp14_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, g_action_get_type (), GAction));
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp15_ = _tmp14_;
-#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_view_filter_set_flagged (_tmp10_, _tmp15_);
-#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp16_ = self->priv->search_filter;
-#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp17_ = self->priv->actions;
-#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp18_ = search_filter_actions_get_videos (_tmp17_);
-#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp19_ = _tmp18_;
-#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp20_ = gtk_toggle_action_get_active (_tmp19_);
-#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp21_ = _tmp20_;
-#line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_view_filter_set_show_media_video (_tmp16_, _tmp21_);
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_ = self->priv->search_filter;
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp23_ = self->priv->actions;
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp24_ = search_filter_actions_get_photos (_tmp23_);
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp25_ = _tmp24_;
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp26_ = gtk_toggle_action_get_active (_tmp25_);
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp16_ = g_variant_get_boolean (_tmp15_);
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_view_filter_set_flagged (_tmp10_, _tmp16_);
+#line 1290 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (_tmp15_);
+#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp17_ = self->priv->search_filter;
+#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp18_ = self->priv->actions;
+#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp19_ = search_filter_actions_get_videos (_tmp18_);
+#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp20_ = _tmp19_;
+#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp21_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, g_action_get_type (), GAction));
+#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp22_ = _tmp21_;
+#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp23_ = g_variant_get_boolean (_tmp22_);
+#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_view_filter_set_show_media_video (_tmp17_, _tmp23_);
+#line 1291 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (_tmp22_);
+#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp24_ = self->priv->search_filter;
+#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp25_ = self->priv->actions;
+#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp26_ = search_filter_actions_get_photos (_tmp25_);
+#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp27_ = _tmp26_;
-#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_view_filter_set_show_media_photos (_tmp22_, _tmp27_);
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp28_ = self->priv->search_filter;
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp29_ = self->priv->actions;
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp30_ = search_filter_actions_get_raw (_tmp29_);
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp31_ = _tmp30_;
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp32_ = gtk_toggle_action_get_active (_tmp31_);
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp33_ = _tmp32_;
-#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_view_filter_set_show_media_raw (_tmp28_, _tmp33_);
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp34_ = self->priv->actions;
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp35_ = search_filter_actions_get_rating (_tmp34_);
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp28_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, g_action_get_type (), GAction));
+#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp29_ = _tmp28_;
+#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp30_ = g_variant_get_boolean (_tmp29_);
+#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_view_filter_set_show_media_photos (_tmp24_, _tmp30_);
+#line 1293 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (_tmp29_);
+#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp31_ = self->priv->search_filter;
+#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp32_ = self->priv->actions;
+#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp33_ = search_filter_actions_get_raw (_tmp32_);
+#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp34_ = _tmp33_;
+#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp35_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, g_action_get_type (), GAction));
+#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp36_ = _tmp35_;
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp37_ = gtk_radio_action_get_current_value (_tmp36_);
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp38_ = _tmp37_;
-#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	filter = (RatingFilter) _tmp38_;
-#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp39_ = self->priv->search_filter;
-#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp40_ = filter;
-#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_view_filter_set_rating_filter (_tmp39_, _tmp40_);
-#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp41_ = self->priv->rating_button;
-#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp42_ = filter;
-#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_rating_filter_button_set_filter_icon (_tmp41_, _tmp42_);
-#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp43_ = self->priv->search_filter;
-#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp44_ = self->priv->saved_search;
-#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_view_filter_set_saved_search (_tmp43_, _tmp44_);
-#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_ = self->priv->actions;
-#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp46_ = search_filter_actions_get_criteria (_tmp45_);
-#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	criteria = _tmp46_;
-#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp47_ = self->priv->search_box;
-#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp48_ = criteria;
-#line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), (_tmp48_ & SEARCH_FILTER_CRITERIA_TEXT) != 0);
-#line 1387 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp49_ = self->priv->rating_button;
-#line 1387 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp50_ = criteria;
-#line 1387 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), (_tmp50_ & SEARCH_FILTER_CRITERIA_RATING) != 0);
-#line 1389 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp51_ = self->priv->toolbtn_flag;
-#line 1389 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp52_ = criteria;
-#line 1389 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget), (_tmp52_ & SEARCH_FILTER_CRITERIA_FLAG) != 0);
-#line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp53_ = self->priv->label_type;
-#line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp54_ = criteria;
-#line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget), (_tmp54_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0);
-#line 1392 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp55_ = self->priv->toolbtn_photos;
-#line 1392 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp56_ = criteria;
-#line 1392 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), (_tmp56_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0);
-#line 1393 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp57_ = self->priv->toolbtn_videos;
-#line 1393 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp58_ = criteria;
-#line 1393 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), (_tmp58_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0);
-#line 1394 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp59_ = self->priv->toolbtn_raw;
-#line 1394 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp60_ = criteria;
-#line 1394 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), (_tmp60_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0);
-#line 1396 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp61_ = self->priv->saved_search_button;
-#line 1396 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp62_ = criteria;
-#line 1396 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), (_tmp62_ & SEARCH_FILTER_CRITERIA_SAVEDSEARCH) != 0);
-#line 1400 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp64_ = self->priv->label_type;
-#line 1400 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp65_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
-#line 1400 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp66_ = _tmp65_;
-#line 1400 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp66_) {
-#line 6923 "SearchFilter.c"
-		SearchFilterToolbarToggleActionToolButton* _tmp67_ = NULL;
-		gboolean _tmp68_ = FALSE;
-		gboolean _tmp69_ = FALSE;
-#line 1400 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp67_ = self->priv->toolbtn_flag;
-#line 1400 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp68_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget));
-#line 1400 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp69_ = _tmp68_;
-#line 1400 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp63_ = _tmp69_;
-#line 6935 "SearchFilter.c"
+#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp37_ = g_variant_get_boolean (_tmp36_);
+#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_view_filter_set_show_media_raw (_tmp31_, _tmp37_);
+#line 1295 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (_tmp36_);
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp38_ = self->priv->actions;
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp39_ = search_filter_actions_get_rating (_tmp38_);
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp40_ = _tmp39_;
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp41_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, g_action_get_type (), GAction));
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp42_ = _tmp41_;
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp43_ = g_variant_get_string (_tmp42_, NULL);
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp44_ = atoi (_tmp43_);
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp45_ = (RatingFilter) _tmp44_;
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_variant_unref0 (_tmp42_);
+#line 1297 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	filter = _tmp45_;
+#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp46_ = self->priv->search_filter;
+#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp47_ = filter;
+#line 1298 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_view_filter_set_rating_filter (_tmp46_, _tmp47_);
+#line 1299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp48_ = self->priv->rating_button;
+#line 1299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp49_ = filter;
+#line 1299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_rating_filter_button_set_filter_icon (_tmp48_, _tmp49_);
+#line 1301 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp50_ = self->priv->search_filter;
+#line 1301 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp51_ = self->priv->saved_search;
+#line 1301 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_view_filter_set_saved_search (_tmp50_, _tmp51_);
+#line 1305 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp52_ = self->priv->actions;
+#line 1305 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp53_ = search_filter_actions_get_criteria (_tmp52_);
+#line 1305 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	criteria = _tmp53_;
+#line 1307 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp54_ = self->priv->search_box;
+#line 1307 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp55_ = criteria;
+#line 1307 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), (_tmp55_ & SEARCH_FILTER_CRITERIA_TEXT) != 0);
+#line 1309 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp56_ = self->priv->rating_button;
+#line 1309 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp57_ = criteria;
+#line 1309 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_widget_get_type (), GtkWidget), (_tmp57_ & SEARCH_FILTER_CRITERIA_RATING) != 0);
+#line 1311 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp58_ = self->priv->toolbtn_flag;
+#line 1311 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp59_ = criteria;
+#line 1311 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), (_tmp59_ & SEARCH_FILTER_CRITERIA_FLAG) != 0);
+#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp60_ = self->priv->label_type;
+#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp61_ = criteria;
+#line 1313 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), (_tmp61_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0);
+#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp62_ = self->priv->toolbtn_photos;
+#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp63_ = criteria;
+#line 1314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), (_tmp63_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0);
+#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp64_ = self->priv->toolbtn_videos;
+#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp65_ = criteria;
+#line 1315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), (_tmp65_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0);
+#line 1316 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp66_ = self->priv->toolbtn_raw;
+#line 1316 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp67_ = criteria;
+#line 1316 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), (_tmp67_ & SEARCH_FILTER_CRITERIA_MEDIA) != 0);
+#line 1318 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp68_ = self->priv->saved_search_button;
+#line 1318 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp69_ = criteria;
+#line 1318 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), (_tmp69_ & SEARCH_FILTER_CRITERIA_SAVEDSEARCH) != 0);
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp71_ = self->priv->label_type;
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp72_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget));
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp73_ = _tmp72_;
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	if (_tmp73_) {
+#line 6078 "SearchFilter.c"
+		SearchFilterToolbarToggleActionToolButton* _tmp74_ = NULL;
+		gboolean _tmp75_ = FALSE;
+		gboolean _tmp76_ = FALSE;
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp74_ = self->priv->toolbtn_flag;
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp75_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp76_ = _tmp75_;
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp70_ = _tmp76_;
+#line 6090 "SearchFilter.c"
 	} else {
-#line 1400 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp63_ = FALSE;
-#line 6939 "SearchFilter.c"
-	}
-#line 1400 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp70_ = self->priv->sepr_mediatype_flagged;
-#line 1400 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget), _tmp63_);
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp73_ = self->priv->label_type;
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp74_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_widget_get_type (), GtkWidget));
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp75_ = _tmp74_;
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp75_) {
-#line 6953 "SearchFilter.c"
-		SearchFilterToolbarRatingFilterButton* _tmp76_ = NULL;
-		gboolean _tmp77_ = FALSE;
-		gboolean _tmp78_ = FALSE;
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp76_ = self->priv->rating_button;
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp77_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget));
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp78_ = _tmp77_;
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp72_ = _tmp78_;
-#line 6965 "SearchFilter.c"
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp70_ = FALSE;
+#line 6094 "SearchFilter.c"
+	}
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp77_ = self->priv->sepr_mediatype_flagged;
+#line 1322 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), _tmp70_);
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp80_ = self->priv->label_type;
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp81_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget));
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp82_ = _tmp81_;
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	if (_tmp82_) {
+#line 6108 "SearchFilter.c"
+		SearchFilterToolbarRatingFilterButton* _tmp83_ = NULL;
+		gboolean _tmp84_ = FALSE;
+		gboolean _tmp85_ = FALSE;
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp83_ = self->priv->rating_button;
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp84_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_widget_get_type (), GtkWidget));
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp85_ = _tmp84_;
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp79_ = _tmp85_;
+#line 6120 "SearchFilter.c"
 	} else {
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp72_ = FALSE;
-#line 6969 "SearchFilter.c"
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp79_ = FALSE;
+#line 6124 "SearchFilter.c"
 	}
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (_tmp72_) {
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp71_ = TRUE;
-#line 6975 "SearchFilter.c"
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	if (_tmp79_) {
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp78_ = TRUE;
+#line 6130 "SearchFilter.c"
 	} else {
-		gboolean _tmp79_ = FALSE;
-		SearchFilterToolbarToggleActionToolButton* _tmp80_ = NULL;
-		gboolean _tmp81_ = FALSE;
-		gboolean _tmp82_ = FALSE;
-#line 1403 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp80_ = self->priv->toolbtn_flag;
-#line 1403 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp81_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget));
-#line 1403 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp82_ = _tmp81_;
-#line 1403 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		if (_tmp82_) {
-#line 6989 "SearchFilter.c"
-			SearchFilterToolbarRatingFilterButton* _tmp83_ = NULL;
-			gboolean _tmp84_ = FALSE;
-			gboolean _tmp85_ = FALSE;
-#line 1403 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp83_ = self->priv->rating_button;
-#line 1403 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp84_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_widget_get_type (), GtkWidget));
-#line 1403 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp85_ = _tmp84_;
-#line 1403 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp79_ = _tmp85_;
-#line 7001 "SearchFilter.c"
+		gboolean _tmp86_ = FALSE;
+		SearchFilterToolbarToggleActionToolButton* _tmp87_ = NULL;
+		gboolean _tmp88_ = FALSE;
+		gboolean _tmp89_ = FALSE;
+#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp87_ = self->priv->toolbtn_flag;
+#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp88_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_widget_get_type (), GtkWidget));
+#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp89_ = _tmp88_;
+#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		if (_tmp89_) {
+#line 6144 "SearchFilter.c"
+			SearchFilterToolbarRatingFilterButton* _tmp90_ = NULL;
+			gboolean _tmp91_ = FALSE;
+			gboolean _tmp92_ = FALSE;
+#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp90_ = self->priv->rating_button;
+#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp91_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_widget_get_type (), GtkWidget));
+#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp92_ = _tmp91_;
+#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp86_ = _tmp92_;
+#line 6156 "SearchFilter.c"
 		} else {
-#line 1403 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp79_ = FALSE;
-#line 7005 "SearchFilter.c"
+#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp86_ = FALSE;
+#line 6160 "SearchFilter.c"
 		}
-#line 1403 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp71_ = _tmp79_;
-#line 7009 "SearchFilter.c"
-	}
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp86_ = self->priv->sepr_flagged_rating;
-#line 1402 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget), _tmp71_);
-#line 1406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp87_ = self->priv->search_filter;
-#line 1406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 7019 "SearchFilter.c"
-}
-
-
-static void search_filter_toolbar_position_filter_popup (SearchFilterToolbar* self, GtkMenu* menu, gint* x, gint* y, gboolean* push_in) {
-	gint _vala_x = 0;
-	gint _vala_y = 0;
-	gboolean _vala_push_in = FALSE;
-	GtkMenu* _tmp0_ = NULL;
-	gint rx = 0;
-	gint ry = 0;
-	SearchFilterToolbarRatingFilterButton* _tmp1_ = NULL;
-	GdkWindow* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GtkAllocation rating_button_allocation = {0};
-	SearchFilterToolbarRatingFilterButton* _tmp5_ = NULL;
-	GtkAllocation _tmp6_ = {0};
-	GtkAllocation menubar_allocation = {0};
-	AppWindow* _tmp7_ = NULL;
-	AppWindow* _tmp8_ = NULL;
-	Page* _tmp9_ = NULL;
-	Page* _tmp10_ = NULL;
-	GtkMenuBar* _tmp11_ = NULL;
-	GtkMenuBar* _tmp12_ = NULL;
-	GtkAllocation _tmp13_ = {0};
-	gint sidebar_w = 0;
-	ConfigFacade* _tmp14_ = NULL;
-	ConfigFacade* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	GtkAllocation _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	GtkAllocation _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	GtkAllocation _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	GtkAllocation _tmp24_ = {0};
-	gint _tmp25_ = 0;
-#line 1409 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1409 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (GTK_IS_MENU (menu));
-#line 1410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = menu;
-#line 1410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1412 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = self->priv->rating_button;
-#line 1412 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 1412 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gdk_window_get_root_origin (_tmp2_, &_tmp3_, &_tmp4_);
-#line 1412 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	rx = _tmp3_;
-#line 1412 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	ry = _tmp4_;
-#line 1415 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp5_ = self->priv->rating_button;
-#line 1415 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), &_tmp6_);
-#line 1415 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	rating_button_allocation = _tmp6_;
-#line 1418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp7_ = app_window_get_instance ();
-#line 1418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp8_ = _tmp7_;
-#line 1418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
-#line 1418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp10_ = _tmp9_;
-#line 1418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp11_ = page_get_menubar (_tmp10_);
-#line 1418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp12_ = _tmp11_;
-#line 1418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), &_tmp13_);
-#line 1418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	menubar_allocation = _tmp13_;
-#line 1418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (_tmp12_);
-#line 1418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (_tmp10_);
-#line 1418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (_tmp8_);
-#line 1420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp14_ = config_facade_get_instance ();
-#line 1420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp15_ = _tmp14_;
-#line 1420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp16_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp17_ = _tmp16_;
-#line 1420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (_tmp15_);
-#line 1420 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	sidebar_w = _tmp17_;
-#line 1422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp18_ = rating_button_allocation;
-#line 1422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp19_ = _tmp18_.x;
-#line 1422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_x = (rx + _tmp19_) + sidebar_w;
-#line 1423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp20_ = rating_button_allocation;
-#line 1423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp21_ = _tmp20_.y;
-#line 1423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_ = rating_button_allocation;
-#line 1423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp23_ = _tmp22_.height;
-#line 1423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp24_ = menubar_allocation;
-#line 1423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp25_ = _tmp24_.height;
-#line 1423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_y = ((ry + _tmp21_) + _tmp23_) + _tmp25_;
-#line 1426 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_vala_push_in = FALSE;
-#line 1409 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (x) {
-#line 1409 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*x = _vala_x;
-#line 7142 "SearchFilter.c"
+#line 1325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp78_ = _tmp86_;
+#line 6164 "SearchFilter.c"
 	}
-#line 1409 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (y) {
-#line 1409 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*y = _vala_y;
-#line 7148 "SearchFilter.c"
-	}
-#line 1409 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	if (push_in) {
-#line 1409 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		*push_in = _vala_push_in;
-#line 7154 "SearchFilter.c"
-	}
-}
-
-
-static void _search_filter_toolbar_position_filter_popup_gtk_menu_position_func (GtkMenu* menu, gint* x, gint* y, gboolean* push_in, gpointer self) {
-#line 1430 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_position_filter_popup ((SearchFilterToolbar*) self, menu, x, y, push_in);
-#line 1430 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_unref (self);
-#line 7164 "SearchFilter.c"
-}
-
-
-static void search_filter_toolbar_on_filter_button_clicked (SearchFilterToolbar* self) {
-	SearchFilterToolbarRatingFilterButton* _tmp0_ = NULL;
-	GtkMenu* _tmp1_ = NULL;
-	guint32 _tmp2_ = 0U;
-#line 1429 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1430 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = self->priv->rating_button;
-#line 1430 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = _tmp0_->filter_popup;
-#line 1430 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = gtk_get_current_event_time ();
-#line 1430 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_menu_popup (_tmp1_, NULL, NULL, _search_filter_toolbar_position_filter_popup_gtk_menu_position_func, g_object_ref (self), (guint) 0, _tmp2_);
-#line 7182 "SearchFilter.c"
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp93_ = self->priv->sepr_flagged_rating;
+#line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, gtk_widget_get_type (), GtkWidget), _tmp78_);
+#line 1328 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp94_ = self->priv->search_filter;
+#line 1328 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
+#line 6174 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar* self, SavedSearch* saved_search) {
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearch* _tmp1_ = NULL;
-#line 1434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1331 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (saved_search));
-#line 1435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = saved_search;
-#line 1435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->saved_search);
-#line 1435 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->saved_search = _tmp1_;
-#line 1436 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 7203 "SearchFilter.c"
+#line 6195 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self) {
-#line 1439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1337 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->saved_search);
-#line 1440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1337 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->saved_search = NULL;
-#line 1441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1338 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 7216 "SearchFilter.c"
+#line 6208 "SearchFilter.c"
 }
 
 
@@ -7222,27 +6214,27 @@ static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, SavedS
 	SavedSearchDialog* ssd = NULL;
 	SavedSearch* _tmp2_ = NULL;
 	SavedSearchDialog* _tmp3_ = NULL;
-#line 1444 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1444 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 1445 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->saved_search_button;
-#line 1445 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_->filter_popup;
-#line 1445 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp1_);
-#line 1446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1343 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search;
-#line 1446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1343 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = saved_search_dialog_new_edit_existing (_tmp2_);
-#line 1446 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1343 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	ssd = _tmp3_;
-#line 1447 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1344 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	saved_search_dialog_show (ssd);
-#line 1444 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1341 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (ssd);
-#line 7246 "SearchFilter.c"
+#line 6238 "SearchFilter.c"
 }
 
 
@@ -7251,45 +6243,45 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 	SearchFilterToolbarSavedSearchPopover* _tmp1_ = NULL;
 	SavedSearch* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1450 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1450 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1347 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 1451 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->saved_search_button;
-#line 1451 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_->filter_popup;
-#line 1451 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp1_);
-#line 1452 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search;
-#line 1452 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = dialogs_confirm_delete_saved_search (_tmp2_);
-#line 1452 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
-#line 7271 "SearchFilter.c"
+#line 6263 "SearchFilter.c"
 		CommandManager* _tmp4_ = NULL;
 		CommandManager* _tmp5_ = NULL;
 		SavedSearch* _tmp6_ = NULL;
 		DeleteSavedSearchCommand* _tmp7_ = NULL;
 		DeleteSavedSearchCommand* _tmp8_ = NULL;
-#line 1453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = app_window_get_command_manager ();
-#line 1453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = _tmp4_;
-#line 1453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = search;
-#line 1453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = delete_saved_search_command_new (_tmp6_);
-#line 1453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = _tmp7_;
-#line 1453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command));
-#line 1453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1453 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1350 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 7293 "SearchFilter.c"
+#line 6285 "SearchFilter.c"
 	}
 }
 
@@ -7299,23 +6291,23 @@ static void search_filter_toolbar_add_dialog (SearchFilterToolbar* self) {
 	SearchFilterToolbarSavedSearchPopover* _tmp1_ = NULL;
 	SavedSearchDialog* _tmp2_ = NULL;
 	SavedSearchDialog* _tmp3_ = NULL;
-#line 1456 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1353 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->saved_search_button;
-#line 1457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_->filter_popup;
-#line 1457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp1_);
-#line 1458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1355 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = saved_search_dialog_new ();
-#line 1458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1355 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_;
-#line 1458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1355 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	saved_search_dialog_show (_tmp3_);
-#line 1458 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1355 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (_tmp3_);
-#line 7319 "SearchFilter.c"
+#line 6311 "SearchFilter.c"
 }
 
 
@@ -7324,104 +6316,104 @@ static void search_filter_toolbar_on_popover_closed (SearchFilterToolbar* self)
 	SavedSearch* _tmp1_ = NULL;
 	SearchFilterToolbarSavedSearchFilterButton* _tmp2_ = NULL;
 	SearchFilterToolbarSavedSearchPopover* _tmp3_ = NULL;
-#line 1461 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1358 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = TRUE;
-#line 1464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->saved_search_button;
-#line 1464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->saved_search;
-#line 1464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_filter_button_set_active (_tmp0_, _tmp1_ != NULL);
-#line 1465 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1362 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->saved_search_button;
-#line 1465 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1362 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_->filter_popup;
-#line 1465 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1362 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp3_);
-#line 7344 "SearchFilter.c"
+#line 6336 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
-#line 1476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_edit_dialog ((SearchFilterToolbar*) self, search);
-#line 7351 "SearchFilter.c"
+#line 6343 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
-#line 1477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_savedsearch_selected ((SearchFilterToolbar*) self, search);
-#line 7358 "SearchFilter.c"
+#line 6350 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
-#line 1478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_delete_dialog ((SearchFilterToolbar*) self, search);
-#line 7365 "SearchFilter.c"
+#line 6357 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
-#line 1479 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_add_dialog ((SearchFilterToolbar*) self);
-#line 7372 "SearchFilter.c"
+#line 6364 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
-#line 1480 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_popover_closed ((SearchFilterToolbar*) self);
-#line 7379 "SearchFilter.c"
+#line 6371 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterToolbar* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 1468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->elide_showing_again;
-#line 1469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 7392 "SearchFilter.c"
+#line 6384 "SearchFilter.c"
 		SavedSearch* _tmp2_ = NULL;
-#line 1469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->saved_search;
-#line 1469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 7398 "SearchFilter.c"
+#line 6390 "SearchFilter.c"
 	} else {
-#line 1469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 7402 "SearchFilter.c"
+#line 6394 "SearchFilter.c"
 	}
-#line 1469 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 7406 "SearchFilter.c"
+#line 6398 "SearchFilter.c"
 	} else {
 		SavedSearch* _tmp3_ = NULL;
-#line 1470 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->saved_search;
-#line 1470 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp3_ != NULL) {
-#line 7413 "SearchFilter.c"
+#line 6405 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchFilterButton* _tmp4_ = NULL;
-#line 1471 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1368 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (self->priv->saved_search);
-#line 1471 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1368 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->saved_search = NULL;
-#line 1472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = self->priv->saved_search_button;
-#line 1472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_saved_search_filter_button_set_active (_tmp4_, FALSE);
-#line 1473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1370 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_disable_savedsearch (self);
-#line 7425 "SearchFilter.c"
+#line 6417 "SearchFilter.c"
 		} else {
 			SearchFilterToolbarSavedSearchFilterButton* _tmp5_ = NULL;
 			SearchFilterToolbarSavedSearchPopover* _tmp6_ = NULL;
@@ -7440,13 +6432,13 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			SearchFilterToolbarSavedSearchPopover* _tmp34_ = NULL;
 			SearchFilterToolbarSavedSearchFilterButton* _tmp35_ = NULL;
 			SearchFilterToolbarSavedSearchPopover* _tmp36_ = NULL;
-#line 1475 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = self->priv->saved_search_button;
-#line 1475 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = _tmp5_->filter_popup;
-#line 1475 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp6_ != NULL) {
-#line 7450 "SearchFilter.c"
+#line 6442 "SearchFilter.c"
 				SearchFilterToolbarSavedSearchFilterButton* _tmp7_ = NULL;
 				SearchFilterToolbarSavedSearchPopover* _tmp8_ = NULL;
 				guint _tmp9_ = 0U;
@@ -7462,112 +6454,112 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 				SearchFilterToolbarSavedSearchFilterButton* _tmp19_ = NULL;
 				SearchFilterToolbarSavedSearchPopover* _tmp20_ = NULL;
 				guint _tmp21_ = 0U;
-#line 1476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp7_ = self->priv->saved_search_button;
-#line 1476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp8_ = _tmp7_->filter_popup;
-#line 1476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("edit-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp9_, NULL, FALSE);
-#line 1476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked, self);
-#line 1477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp10_ = self->priv->saved_search_button;
-#line 1477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp11_ = _tmp10_->filter_popup;
-#line 1477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("search-activated", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp12_, NULL, FALSE);
-#line 1477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated, self);
-#line 1478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp13_ = self->priv->saved_search_button;
-#line 1478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp14_ = _tmp13_->filter_popup;
-#line 1478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("delete-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp15_, NULL, FALSE);
-#line 1478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked, self);
-#line 1479 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp16_ = self->priv->saved_search_button;
-#line 1479 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp17_ = _tmp16_->filter_popup;
-#line 1479 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("add-clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp18_, NULL, FALSE);
-#line 1479 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked, self);
-#line 1480 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp19_ = self->priv->saved_search_button;
-#line 1480 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp20_ = _tmp19_->filter_popup;
-#line 1480 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, &_tmp21_, NULL, FALSE);
-#line 1480 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1377 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp20_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp21_, 0, NULL, (GCallback) _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed, self);
-#line 7506 "SearchFilter.c"
+#line 6498 "SearchFilter.c"
 			}
-#line 1482 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_ = self->priv->saved_search_button;
-#line 1482 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp23_ = self->priv->saved_search_button;
-#line 1482 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp24_ = search_filter_toolbar_saved_search_popover_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
-#line 1482 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_search_filter_toolbar_saved_search_popover_unref0 (_tmp22_->filter_popup);
-#line 1482 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1379 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_->filter_popup = _tmp24_;
-#line 1483 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp25_ = self->priv->saved_search_button;
-#line 1483 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp26_ = _tmp25_->filter_popup;
-#line 1483 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1380 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect_object (_tmp26_, "edit-clicked", (GCallback) _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked, self, 0);
-#line 1484 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp27_ = self->priv->saved_search_button;
-#line 1484 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp28_ = _tmp27_->filter_popup;
-#line 1484 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1381 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect_object (_tmp28_, "search-activated", (GCallback) _search_filter_toolbar_on_savedsearch_selected_search_filter_toolbar_saved_search_popover_search_activated, self, 0);
-#line 1485 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp29_ = self->priv->saved_search_button;
-#line 1485 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp30_ = _tmp29_->filter_popup;
-#line 1485 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1382 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect_object (_tmp30_, "delete-clicked", (GCallback) _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked, self, 0);
-#line 1486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp31_ = self->priv->saved_search_button;
-#line 1486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp32_ = _tmp31_->filter_popup;
-#line 1486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1383 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect_object (_tmp32_, "add-clicked", (GCallback) _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked, self, 0);
-#line 1487 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1384 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp33_ = self->priv->saved_search_button;
-#line 1487 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1384 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp34_ = _tmp33_->filter_popup;
-#line 1487 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1384 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect_object (_tmp34_, "closed", (GCallback) _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed, self, 0);
-#line 1489 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1386 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp35_ = self->priv->saved_search_button;
-#line 1489 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1386 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp36_ = _tmp35_->filter_popup;
-#line 1489 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1386 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_saved_search_popover_show_all (_tmp36_);
-#line 7554 "SearchFilter.c"
+#line 6546 "SearchFilter.c"
 		}
 	}
-#line 1491 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1388 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = FALSE;
-#line 7559 "SearchFilter.c"
+#line 6551 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_take_focus (SearchFilterToolbar* self) {
 	SearchFilterToolbarSearchBox* _tmp0_ = NULL;
-#line 1494 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
-#line 1495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1392 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->search_box;
-#line 1495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1392 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_get_focus (_tmp0_);
-#line 7571 "SearchFilter.c"
+#line 6563 "SearchFilter.c"
 }
 
 
@@ -7577,126 +6569,111 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 	GtkLabel* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 678 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkLabel* _tmp11_ = NULL;
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (s != NULL, NULL);
-#line 678 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarLabelToolItem*) g_object_new (object_type, NULL);
-#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = s;
-#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = (GtkLabel*) gtk_label_new (_tmp0_);
-#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp1_);
-#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->label);
-#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 618 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->label = _tmp1_;
-#line 680 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = left_padding;
-#line 680 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_ != 0) {
-#line 680 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = TRUE;
-#line 7601 "SearchFilter.c"
+#line 6594 "SearchFilter.c"
 	} else {
 		gint _tmp4_ = 0;
-#line 680 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = right_padding;
-#line 680 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp4_ != 0;
-#line 7608 "SearchFilter.c"
+#line 6601 "SearchFilter.c"
 	}
-#line 680 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 619 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_) {
-#line 7612 "SearchFilter.c"
-		GtkAlignment* alignment = NULL;
-		GtkAlignment* _tmp5_ = NULL;
-		GtkAlignment* _tmp6_ = NULL;
+#line 6605 "SearchFilter.c"
+		GtkLabel* _tmp5_ = NULL;
+		GtkLabel* _tmp6_ = NULL;
 		GtkLabel* _tmp7_ = NULL;
-		GtkAlignment* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		GtkAlignment* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		GtkAlignment* _tmp12_ = NULL;
-#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp5_ = (GtkAlignment*) gtk_alignment_new ((gfloat) 0, 0.5f, (gfloat) 0, (gfloat) 0);
-#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		g_object_ref_sink (_tmp5_);
-#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		alignment = _tmp5_;
-#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp6_ = alignment;
-#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		gint _tmp8_ = 0;
+		GtkLabel* _tmp9_ = NULL;
+		gint _tmp10_ = 0;
+#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp5_ = self->priv->label;
+#line 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp6_ = self->priv->label;
+#line 621 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = self->priv->label;
-#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 683 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp8_ = alignment;
-#line 683 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp9_ = left_padding;
-#line 683 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		g_object_set (_tmp8_, "left-padding", (guint) _tmp9_, NULL);
-#line 684 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp10_ = alignment;
-#line 684 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp11_ = right_padding;
-#line 684 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		g_object_set (_tmp10_, "right-padding", (guint) _tmp11_, NULL);
-#line 685 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp12_ = alignment;
-#line 685 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 680 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_g_object_unref0 (alignment);
-#line 7652 "SearchFilter.c"
-	} else {
-		GtkLabel* _tmp13_ = NULL;
-#line 687 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp13_ = self->priv->label;
-#line 687 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
-#line 7659 "SearchFilter.c"
-	}
-#line 678 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp8_ = left_padding;
+#line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), _tmp8_);
+#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp9_ = self->priv->label;
+#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp10_ = right_padding;
+#line 623 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_);
+#line 6632 "SearchFilter.c"
+	}
+#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp11_ = self->priv->label;
+#line 625 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7663 "SearchFilter.c"
+#line 6640 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_new (const gchar* s, gint left_padding, gint right_padding) {
-#line 678 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_label_tool_item_construct (SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, s, left_padding, right_padding);
-#line 7670 "SearchFilter.c"
+#line 6647 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_label_tool_item_class_init (SearchFilterToolbarLabelToolItemClass * klass) {
-#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_label_tool_item_parent_class = g_type_class_peek_parent (klass);
-#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarLabelToolItemPrivate));
-#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_label_tool_item_finalize;
-#line 7681 "SearchFilter.c"
+#line 6658 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_label_tool_item_instance_init (SearchFilterToolbarLabelToolItem * self) {
-#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_GET_PRIVATE (self);
-#line 7688 "SearchFilter.c"
+#line 6665 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_label_tool_item_finalize (GObject* obj) {
 	SearchFilterToolbarLabelToolItem * self;
-#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_LABEL_TOOL_ITEM, SearchFilterToolbarLabelToolItem);
-#line 676 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 615 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->label);
-#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 614 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_label_tool_item_parent_class)->finalize (obj);
-#line 7700 "SearchFilter.c"
+#line 6677 "SearchFilter.c"
 }
 
 
@@ -7712,104 +6689,64 @@ static GType search_filter_toolbar_label_tool_item_get_type (void) {
 }
 
 
-static void _search_filter_toolbar_toggle_action_tool_button_on_button_activate_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_toggle_action_tool_button_on_button_activate ((SearchFilterToolbarToggleActionToolButton*) self);
-#line 7719 "SearchFilter.c"
-}
-
-
-static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_construct (GType object_type, GtkToggleAction* action) {
+static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_construct (GType object_type, const gchar* action) {
 	SearchFilterToolbarToggleActionToolButton * self = NULL;
-	GtkToggleAction* _tmp0_ = NULL;
-	GtkToggleAction* _tmp1_ = NULL;
+	GtkToggleButton* _tmp0_ = NULL;
+	GtkToggleButton* _tmp1_ = NULL;
 	GtkToggleButton* _tmp2_ = NULL;
-	GtkToggleButton* _tmp3_ = NULL;
+	const gchar* _tmp3_ = NULL;
 	GtkToggleButton* _tmp4_ = NULL;
-	GtkToggleAction* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	GtkToggleButton* _tmp8_ = NULL;
-	GtkToggleButton* _tmp9_ = NULL;
-	GtkToggleButton* _tmp10_ = NULL;
-	GtkToggleButton* _tmp11_ = NULL;
-	GtkToggleButton* _tmp12_ = NULL;
-#line 696 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_val_if_fail (GTK_IS_TOGGLE_ACTION (action), NULL);
-#line 696 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkToggleButton* _tmp5_ = NULL;
+	GtkToggleButton* _tmp6_ = NULL;
+	GtkToggleButton* _tmp7_ = NULL;
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_val_if_fail (action != NULL, NULL);
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarToggleActionToolButton*) g_object_new (object_type, NULL);
-#line 697 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = action;
-#line 697 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 697 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->action);
-#line 697 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->action = _tmp1_;
-#line 698 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = (GtkToggleButton*) gtk_toggle_button_new ();
-#line 698 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp2_);
-#line 698 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp0_ = (GtkToggleButton*) gtk_toggle_button_new ();
+#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp0_);
+#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->button);
-#line 698 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->button = _tmp2_;
-#line 699 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp3_ = self->priv->button;
-#line 699 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 700 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 633 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->button = _tmp0_;
+#line 634 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp1_ = self->priv->button;
+#line 634 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp2_ = self->priv->button;
+#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp3_ = action;
+#line 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_ACTIONABLE, GtkActionable), _tmp3_);
+#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->button;
-#line 700 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp5_ = action;
-#line 700 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp6_ = gtk_toggle_action_get_active (_tmp5_);
-#line 700 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp7_ = _tmp6_;
-#line 700 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toggle_button_set_active (_tmp4_, _tmp7_);
-#line 701 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp8_ = self->priv->button;
-#line 701 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _search_filter_toolbar_toggle_action_tool_button_on_button_activate_gtk_button_clicked, self, 0);
-#line 702 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_ = self->priv->button;
-#line 702 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 703 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp10_ = self->priv->button;
-#line 703 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE);
-#line 704 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp11_ = self->priv->button;
-#line 704 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 2);
-#line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp12_ = self->priv->button;
-#line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 696 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 636 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp5_ = self->priv->button;
+#line 637 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE);
+#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp6_ = self->priv->button;
+#line 638 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 2);
+#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp7_ = self->priv->button;
+#line 640 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7794 "SearchFilter.c"
+#line 6743 "SearchFilter.c"
 }
 
 
-static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (GtkToggleAction* action) {
-#line 696 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (const gchar* action) {
+#line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_toggle_action_tool_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, action);
-#line 7801 "SearchFilter.c"
-}
-
-
-static void search_filter_toolbar_toggle_action_tool_button_on_button_activate (SearchFilterToolbarToggleActionToolButton* self) {
-	GtkToggleAction* _tmp0_ = NULL;
-#line 713 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_TOGGLE_ACTION_TOOL_BUTTON (self));
-#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = self->priv->action;
-#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_action_activate (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_action_get_type (), GtkAction));
-#line 7813 "SearchFilter.c"
+#line 6750 "SearchFilter.c"
 }
 
 
@@ -7821,121 +6758,111 @@ static void search_filter_toolbar_toggle_action_tool_button_set_icon_name (Searc
 	GtkImage* _tmp7_ = NULL;
 	GtkToggleButton* _tmp8_ = NULL;
 	GtkImage* _tmp9_ = NULL;
-#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_TOGGLE_ACTION_TOOL_BUTTON (self));
-#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (icon_name != NULL);
-#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 644 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	image = NULL;
-#line 719 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->button;
-#line 719 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 645 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_always_show_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), TRUE);
-#line 720 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = icon_name;
-#line 720 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = string_contains (_tmp1_, "disabled");
-#line 720 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_) {
-#line 7841 "SearchFilter.c"
+#line 6778 "SearchFilter.c"
 		const gchar* _tmp3_ = NULL;
 		GtkImage* _tmp4_ = NULL;
-#line 721 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = icon_name;
-#line 721 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = (GtkImage*) gtk_image_new_from_stock (_tmp3_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 721 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_object_ref_sink (_tmp4_);
-#line 721 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (image);
-#line 721 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 647 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		image = _tmp4_;
-#line 7854 "SearchFilter.c"
+#line 6791 "SearchFilter.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 		GtkImage* _tmp6_ = NULL;
-#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = icon_name;
-#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = (GtkImage*) gtk_image_new_from_icon_name (_tmp5_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_object_ref_sink (_tmp6_);
-#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (image);
-#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 649 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		image = _tmp6_;
-#line 7868 "SearchFilter.c"
+#line 6805 "SearchFilter.c"
 	}
-#line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 650 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = image;
-#line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 650 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 6);
-#line 725 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = self->priv->button;
-#line 725 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = image;
-#line 725 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 651 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 643 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (image);
-#line 7882 "SearchFilter.c"
+#line 6819 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_set_label (SearchFilterToolbarToggleActionToolButton* self, const gchar* label) {
 	GtkToggleButton* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 654 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_TOGGLE_ACTION_TOOL_BUTTON (self));
-#line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 654 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (label != NULL);
-#line 729 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 655 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->button;
-#line 729 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 655 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = label;
-#line 729 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 655 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 7899 "SearchFilter.c"
+#line 6836 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_class_init (SearchFilterToolbarToggleActionToolButtonClass * klass) {
-#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_toggle_action_tool_button_parent_class = g_type_class_peek_parent (klass);
-#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarToggleActionToolButtonPrivate));
-#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_toggle_action_tool_button_finalize;
-#line 7910 "SearchFilter.c"
+#line 6847 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_instance_init (SearchFilterToolbarToggleActionToolButton * self) {
-#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_GET_PRIVATE (self);
-#line 7917 "SearchFilter.c"
+#line 6854 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject* obj) {
 	SearchFilterToolbarToggleActionToolButton * self;
-	GtkToggleButton* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_TOGGLE_ACTION_TOOL_BUTTON, SearchFilterToolbarToggleActionToolButton);
-#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = self->priv->button;
-#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE);
-#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_toggle_action_tool_button_on_button_activate_gtk_button_clicked, self);
-#line 693 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 630 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->button);
-#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->priv->action);
-#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 629 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_toggle_action_tool_button_parent_class)->finalize (obj);
-#line 7939 "SearchFilter.c"
+#line 6866 "SearchFilter.c"
 }
 
 
@@ -7952,53 +6879,53 @@ static GType search_filter_toolbar_toggle_action_tool_button_get_type (void) {
 
 
 static void _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self) {
-#line 764 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_action_text_changed ((SearchFilterToolbarSearchBox*) self, text);
-#line 7958 "SearchFilter.c"
+#line 6885 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed (TextAction* _sender, gboolean sensitive, gpointer self) {
-#line 765 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_sensitivity_changed ((SearchFilterToolbarSearchBox*) self, sensitive);
-#line 7965 "SearchFilter.c"
+#line 6892 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed (TextAction* _sender, gboolean visible, gpointer self) {
-#line 766 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_visibility_changed ((SearchFilterToolbarSearchBox*) self, visible);
-#line 7972 "SearchFilter.c"
+#line 6899 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text (GtkEntryBuffer* _sender, guint position, guint n_chars, gpointer self) {
-#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self);
-#line 7979 "SearchFilter.c"
+#line 6906 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text (GtkEntryBuffer* _sender, guint position, const gchar* chars, guint n_chars, gpointer self) {
-#line 769 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self);
-#line 7986 "SearchFilter.c"
+#line 6913 "SearchFilter.c"
 }
 
 
 static gpointer _text_action_ref0 (gpointer self) {
-#line 746 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? text_action_ref (self) : NULL;
-#line 7993 "SearchFilter.c"
+#line 6920 "SearchFilter.c"
 }
 
 
 static gboolean _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = search_filter_toolbar_search_box_on_escape_key ((SearchFilterToolbarSearchBox*) self, event);
-#line 750 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 676 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8002 "SearchFilter.c"
+#line 6929 "SearchFilter.c"
 }
 
 
@@ -8022,96 +6949,96 @@ SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_construct (GType
 	GtkSearchEntry* _tmp15_ = NULL;
 	GtkEntryBuffer* _tmp16_ = NULL;
 	GtkEntryBuffer* _tmp17_ = NULL;
-#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_TEXT_ACTION (action), NULL);
-#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarSearchBox*) g_object_new (object_type, NULL);
-#line 746 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = action;
-#line 746 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _text_action_ref0 (_tmp0_);
-#line 746 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_text_action_unref0 (self->priv->action);
-#line 746 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->action = _tmp1_;
-#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 673 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = (GtkSearchEntry*) gtk_search_entry_new ();
-#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 673 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp2_);
-#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 673 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->search_entry);
-#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 673 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_entry = _tmp2_;
-#line 749 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_entry;
-#line 749 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 675 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry), 23);
-#line 750 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 676 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->search_entry;
-#line 750 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 676 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _search_filter_toolbar_search_box_on_escape_key_gtk_widget_key_press_event, self, 0);
-#line 751 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 677 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->search_entry;
-#line 751 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 677 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 753 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = action;
-#line 753 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = text_action_get_value (_tmp6_);
-#line 753 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = _tmp7_;
-#line 753 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 679 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_set_nullable_text (self, _tmp8_);
-#line 755 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = action;
-#line 755 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 681 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp9_, "text-changed", (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self, 0);
-#line 756 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = action;
-#line 756 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 682 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp10_, "sensitivity-changed", (GCallback) _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed, self, 0);
-#line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 683 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = action;
-#line 757 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 683 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp11_, "visibility-changed", (GCallback) _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed, self, 0);
-#line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 685 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = self->priv->search_entry;
-#line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 685 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp13_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_entry_get_type (), GtkEntry));
-#line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 685 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp14_ = _tmp13_;
-#line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 685 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp14_, "deleted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self, 0);
-#line 760 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp15_ = self->priv->search_entry;
-#line 760 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp16_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_entry_get_type (), GtkEntry));
-#line 760 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp17_ = _tmp16_;
-#line 760 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 686 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp17_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0);
-#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 8096 "SearchFilter.c"
+#line 7023 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_new (TextAction* action) {
-#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_search_box_construct (SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, action);
-#line 8103 "SearchFilter.c"
+#line 7030 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_search_box_get_focus (SearchFilterToolbarSearchBox* self) {
 	GtkSearchEntry* _tmp0_ = NULL;
-#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 698 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self));
-#line 773 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 699 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->search_entry;
-#line 773 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 699 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "has-focus", TRUE, NULL);
-#line 8115 "SearchFilter.c"
+#line 7042 "SearchFilter.c"
 }
 
 
@@ -8120,31 +7047,31 @@ static gboolean search_filter_toolbar_search_box_on_escape_key (SearchFilterTool
 	GdkEventKey* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
 	const gchar* _tmp2_ = NULL;
-#line 778 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 704 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self), FALSE);
-#line 778 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 704 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (e != NULL, FALSE);
-#line 779 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 705 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = e;
-#line 779 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 705 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 779 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 705 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 779 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 705 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 8136 "SearchFilter.c"
+#line 7063 "SearchFilter.c"
 		TextAction* _tmp3_ = NULL;
-#line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->action;
-#line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_clear (_tmp3_);
-#line 8142 "SearchFilter.c"
+#line 7069 "SearchFilter.c"
 	}
-#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = FALSE;
-#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8148 "SearchFilter.c"
+#line 7075 "SearchFilter.c"
 }
 
 
@@ -8164,49 +7091,49 @@ static void search_filter_toolbar_search_box_on_action_text_changed (SearchFilte
 	GtkSearchEntry* _tmp12_ = NULL;
 	GtkEntryBuffer* _tmp13_ = NULL;
 	GtkEntryBuffer* _tmp14_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 713 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self));
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->search_entry;
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry));
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = _tmp1_;
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("deleted-text", gtk_entry_buffer_get_type (), &_tmp3_, NULL, FALSE);
-#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 714 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self);
-#line 789 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->search_entry;
-#line 789 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_entry_get_type (), GtkEntry));
-#line 789 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = _tmp5_;
-#line 789 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("inserted-text", gtk_entry_buffer_get_type (), &_tmp7_, NULL, FALSE);
-#line 789 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 715 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self);
-#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 716 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = text;
-#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 716 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_set_nullable_text (self, _tmp8_);
-#line 791 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = self->priv->search_entry;
-#line 791 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_entry_get_type (), GtkEntry));
-#line 791 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = _tmp10_;
-#line 791 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 717 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp11_, "deleted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self, 0);
-#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = self->priv->search_entry;
-#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp13_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_entry_get_type (), GtkEntry));
-#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp14_ = _tmp13_;
-#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp14_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0);
-#line 8210 "SearchFilter.c"
+#line 7137 "SearchFilter.c"
 }
 
 
@@ -8217,51 +7144,51 @@ static void search_filter_toolbar_search_box_on_entry_changed (SearchFilterToolb
 	GtkSearchEntry* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	TextAction* _tmp5_ = NULL;
-#line 795 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 721 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self));
-#line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 722 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->action;
-#line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 722 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("text-changed", TYPE_TEXT_ACTION, &_tmp1_, NULL, FALSE);
-#line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 722 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self);
-#line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->action;
-#line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_entry;
-#line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = gtk_entry_get_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry));
-#line 797 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 723 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	text_action_set_text (_tmp2_, _tmp4_);
-#line 798 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->action;
-#line 798 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp5_, "text-changed", (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self, 0);
-#line 8241 "SearchFilter.c"
+#line 7168 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_on_sensitivity_changed (SearchFilterToolbarSearchBox* self, gboolean sensitive) {
 	gboolean _tmp0_ = FALSE;
-#line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 727 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self));
-#line 802 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = sensitive;
-#line 802 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 8253 "SearchFilter.c"
+#line 7180 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_on_visibility_changed (SearchFilterToolbarSearchBox* self, gboolean visible) {
 	gboolean _tmp0_ = FALSE;
-#line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 731 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self));
-#line 806 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = visible;
-#line 806 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 8265 "SearchFilter.c"
+#line 7192 "SearchFilter.c"
 }
 
 
@@ -8269,47 +7196,47 @@ static void search_filter_toolbar_search_box_set_nullable_text (SearchFilterTool
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GtkSearchEntry* _tmp3_ = NULL;
-#line 809 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 735 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SEARCH_BOX (self));
-#line 810 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = text;
-#line 810 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_ != NULL) {
-#line 8279 "SearchFilter.c"
+#line 7206 "SearchFilter.c"
 		const gchar* _tmp2_ = NULL;
-#line 810 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = text;
-#line 810 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_;
-#line 8285 "SearchFilter.c"
+#line 7212 "SearchFilter.c"
 	} else {
-#line 810 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = "";
-#line 8289 "SearchFilter.c"
+#line 7216 "SearchFilter.c"
 	}
-#line 810 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_entry;
-#line 810 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry), _tmp0_);
-#line 8295 "SearchFilter.c"
+#line 7222 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_class_init (SearchFilterToolbarSearchBoxClass * klass) {
-#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_parent_class = g_type_class_peek_parent (klass);
-#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarSearchBoxPrivate));
-#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_search_box_finalize;
-#line 8306 "SearchFilter.c"
+#line 7233 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_instance_init (SearchFilterToolbarSearchBox * self) {
-#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_SEARCH_BOX_GET_PRIVATE (self);
-#line 8313 "SearchFilter.c"
+#line 7240 "SearchFilter.c"
 }
 
 
@@ -8329,53 +7256,53 @@ static void search_filter_toolbar_search_box_finalize (GObject* obj) {
 	GtkEntryBuffer* _tmp11_ = NULL;
 	GtkEntryBuffer* _tmp12_ = NULL;
 	guint _tmp13_ = 0U;
-#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, SearchFilterToolbarSearchBox);
-#line 764 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->action;
-#line 764 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("text-changed", TYPE_TEXT_ACTION, &_tmp1_, NULL, FALSE);
-#line 764 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self);
-#line 765 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->action;
-#line 765 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("sensitivity-changed", TYPE_TEXT_ACTION, &_tmp3_, NULL, FALSE);
-#line 765 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed, self);
-#line 766 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->action;
-#line 766 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("visibility-changed", TYPE_TEXT_ACTION, &_tmp5_, NULL, FALSE);
-#line 766 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed, self);
-#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = self->priv->search_entry;
-#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_entry_get_type (), GtkEntry));
-#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = _tmp7_;
-#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("deleted-text", gtk_entry_buffer_get_type (), &_tmp9_, NULL, FALSE);
-#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_deleted_text, self);
-#line 769 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = self->priv->search_entry;
-#line 769 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = gtk_entry_get_buffer (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_entry_get_type (), GtkEntry));
-#line 769 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = _tmp11_;
-#line 769 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("inserted-text", gtk_entry_buffer_get_type (), &_tmp13_, NULL, FALSE);
-#line 769 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self);
-#line 742 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 668 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->search_entry);
-#line 743 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 669 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_text_action_unref0 (self->priv->action);
-#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_search_box_parent_class)->finalize (obj);
-#line 8379 "SearchFilter.c"
+#line 7306 "SearchFilter.c"
 }
 
 
@@ -8391,85 +7318,74 @@ GType search_filter_toolbar_search_box_get_type (void) {
 }
 
 
-static void _search_filter_toolbar_rating_filter_button_on_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_rating_filter_button_on_clicked ((SearchFilterToolbarRatingFilterButton*) self);
-#line 8398 "SearchFilter.c"
-}
-
-
-SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_construct (GType object_type) {
+SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_construct (GType object_type, GMenuModel* model) {
 	SearchFilterToolbarRatingFilterButton * self = NULL;
-	GtkButton* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
+	GtkMenuButton* _tmp0_ = NULL;
+	GtkMenuButton* _tmp1_ = NULL;
 	GtkWidget* _tmp2_ = NULL;
 	GtkWidget* _tmp3_ = NULL;
-	GtkButton* _tmp4_ = NULL;
-	GtkButton* _tmp5_ = NULL;
-	GtkButton* _tmp6_ = NULL;
-	GtkButton* _tmp7_ = NULL;
-	GtkButton* _tmp8_ = NULL;
-#line 821 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkMenuButton* _tmp4_ = NULL;
+	GtkMenuButton* _tmp5_ = NULL;
+	GtkMenuButton* _tmp6_ = NULL;
+	GtkMenuButton* _tmp7_ = NULL;
+	GMenuModel* _tmp8_ = NULL;
+	GtkMenuButton* _tmp9_ = NULL;
+#line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL);
+#line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarRatingFilterButton*) g_object_new (object_type, NULL);
-#line 822 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = (GtkButton*) gtk_button_new ();
-#line 822 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp0_ = (GtkMenuButton*) gtk_menu_button_new ();
+#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp0_);
-#line 822 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->button);
-#line 822 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 745 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->button = _tmp0_;
-#line 823 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->button;
-#line 823 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search_filter_toolbar_rating_filter_button_get_filter_icon (self, RATING_FILTER_UNRATED_OR_HIGHER);
-#line 823 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_;
-#line 823 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_button_set_image (_tmp1_, _tmp3_);
-#line 823 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), _tmp3_);
+#line 747 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (_tmp3_);
-#line 824 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 748 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->button;
-#line 824 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 748 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 825 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 749 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->button;
-#line 825 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_button_set_relief (_tmp5_, GTK_RELIEF_NONE);
-#line 826 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 749 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE);
+#line 750 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = self->button;
-#line 826 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 750 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 2);
-#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 751 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = self->button;
-#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp7_, "clicked", (GCallback) _search_filter_toolbar_rating_filter_button_on_clicked_gtk_button_clicked, self, 0);
-#line 830 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 751 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp8_ = model;
+#line 751 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_menu_button_set_menu_model (_tmp7_, _tmp8_);
+#line 753 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_tool_item_set_homogeneous (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), FALSE);
-#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp8_ = self->button;
-#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 821 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 755 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp9_ = self->button;
+#line 755 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
+#line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 8457 "SearchFilter.c"
+#line 7382 "SearchFilter.c"
 }
 
 
-SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_new (void) {
-#line 821 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	return search_filter_toolbar_rating_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_RATING_FILTER_BUTTON);
-#line 8464 "SearchFilter.c"
-}
-
-
-static void search_filter_toolbar_rating_filter_button_on_clicked (SearchFilterToolbarRatingFilterButton* self) {
-#line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self));
-#line 840 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_emit_by_name (self, "clicked");
-#line 8473 "SearchFilter.c"
+SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_new (GMenuModel* model) {
+#line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	return search_filter_toolbar_rating_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_RATING_FILTER_BUTTON, model);
+#line 7389 "SearchFilter.c"
 }
 
 
@@ -8478,172 +7394,97 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 	gchar* filename = NULL;
 	RatingFilter _tmp0_ = 0;
 	GtkImage* image = NULL;
-	const gchar* _tmp9_ = NULL;
-	RatingFilter _tmp10_ = 0;
-	gint _tmp11_ = 0;
-	GdkPixbuf* _tmp12_ = NULL;
-	GdkPixbuf* _tmp13_ = NULL;
-	GtkImage* _tmp14_ = NULL;
-	GtkImage* _tmp15_ = NULL;
-#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	const gchar* _tmp4_ = NULL;
+	RatingFilter _tmp5_ = 0;
+	gint _tmp6_ = 0;
+	GdkPixbuf* _tmp7_ = NULL;
+	GdkPixbuf* _tmp8_ = NULL;
+	GtkImage* _tmp9_ = NULL;
+	GtkImage* _tmp10_ = NULL;
+#line 758 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self), NULL);
-#line 844 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 759 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	filename = NULL;
-#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = filter;
-#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	switch (_tmp0_) {
-#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case RATING_FILTER_ONE_OR_HIGHER:
-#line 8499 "SearchFilter.c"
+#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case RATING_FILTER_REJECTED_OR_HIGHER:
+#line 7415 "SearchFilter.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp1_ = g_strdup (RESOURCES_ICON_FILTER_ONE_OR_BETTER);
-#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp1_ = g_strdup (RESOURCES_ICON_FILTER_REJECTED_OR_BETTER);
+#line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_free0 (filename);
-#line 848 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			filename = _tmp1_;
-#line 849 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 764 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 8510 "SearchFilter.c"
+#line 7426 "SearchFilter.c"
 		}
-#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case RATING_FILTER_TWO_OR_HIGHER:
-#line 8514 "SearchFilter.c"
+#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case RATING_FILTER_REJECTED_ONLY:
+#line 7430 "SearchFilter.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp2_ = g_strdup (RESOURCES_ICON_FILTER_TWO_OR_BETTER);
-#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 767 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp2_ = g_strdup (RESOURCES_ICON_RATING_REJECTED);
+#line 767 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_free0 (filename);
-#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 767 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			filename = _tmp2_;
-#line 853 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			break;
-#line 8525 "SearchFilter.c"
-		}
-#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case RATING_FILTER_THREE_OR_HIGHER:
-#line 8529 "SearchFilter.c"
-		{
-			gchar* _tmp3_ = NULL;
-#line 856 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp3_ = g_strdup (RESOURCES_ICON_FILTER_THREE_OR_BETTER);
-#line 856 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_g_free0 (filename);
-#line 856 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			filename = _tmp3_;
-#line 857 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			break;
-#line 8540 "SearchFilter.c"
-		}
-#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 8544 "SearchFilter.c"
-		{
-			gchar* _tmp4_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp4_ = g_strdup (RESOURCES_ICON_FILTER_FOUR_OR_BETTER);
-#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_g_free0 (filename);
-#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			filename = _tmp4_;
-#line 861 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			break;
-#line 8555 "SearchFilter.c"
-		}
-#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 8559 "SearchFilter.c"
-		{
-			gchar* _tmp5_ = NULL;
-#line 864 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp5_ = g_strdup (RESOURCES_ICON_FILTER_FIVE);
-#line 864 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_g_free0 (filename);
-#line 864 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			filename = _tmp5_;
-#line 865 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			break;
-#line 8570 "SearchFilter.c"
-		}
-#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 8574 "SearchFilter.c"
-		{
-			gchar* _tmp6_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp6_ = g_strdup (RESOURCES_ICON_FILTER_REJECTED_OR_BETTER);
-#line 868 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_g_free0 (filename);
-#line 868 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			filename = _tmp6_;
-#line 869 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			break;
-#line 8585 "SearchFilter.c"
-		}
-#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		case RATING_FILTER_REJECTED_ONLY:
-#line 8589 "SearchFilter.c"
-		{
-			gchar* _tmp7_ = NULL;
-#line 872 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp7_ = g_strdup (RESOURCES_ICON_RATING_REJECTED);
-#line 872 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_g_free0 (filename);
-#line 872 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			filename = _tmp7_;
-#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 8600 "SearchFilter.c"
+#line 7441 "SearchFilter.c"
 		}
 		default:
-#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 8605 "SearchFilter.c"
+#line 7446 "SearchFilter.c"
 		{
-			gchar* _tmp8_ = NULL;
-#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_tmp8_ = g_strdup (RESOURCES_ICON_FILTER_UNRATED_OR_BETTER);
-#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gchar* _tmp3_ = NULL;
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp3_ = g_strdup (RESOURCES_ICON_FILTER_UNRATED_OR_BETTER);
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_free0 (filename);
-#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			filename = _tmp8_;
-#line 878 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			filename = _tmp3_;
+#line 773 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 8616 "SearchFilter.c"
+#line 7457 "SearchFilter.c"
 		}
 	}
-#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_ = filename;
-#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp10_ = filter;
-#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp11_ = search_filter_toolbar_rating_filter_button_get_filter_icon_size (self, _tmp10_);
-#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp12_ = resources_load_icon (_tmp9_, _tmp11_);
-#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp13_ = _tmp12_;
-#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp14_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp13_);
-#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp14_);
-#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp15_ = _tmp14_;
-#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (_tmp13_);
-#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	image = _tmp15_;
-#line 883 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp4_ = filename;
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp5_ = filter;
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp6_ = search_filter_toolbar_rating_filter_button_get_filter_icon_size (self, _tmp5_);
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp7_ = resources_load_icon (_tmp4_, _tmp6_);
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp8_ = _tmp7_;
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp9_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp8_);
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	g_object_ref_sink (_tmp9_);
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp10_ = _tmp9_;
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_object_unref0 (_tmp8_);
+#line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	image = _tmp10_;
+#line 778 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget), 6);
-#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget);
-#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_free0 (filename);
-#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8647 "SearchFilter.c"
+#line 7488 "SearchFilter.c"
 }
 
 
@@ -8653,189 +7494,291 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 	gint icon_star_base = 0;
 	gint icon_plus = 0;
 	RatingFilter _tmp0_ = 0;
-#line 888 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 783 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self), 0);
-#line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 784 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	icon_base = (gint) (SEARCH_FILTER_TOOLBAR_FILTER_ICON_BASE_WIDTH * SEARCH_FILTER_TOOLBAR_FILTER_ICON_SCALE);
-#line 890 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 785 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	icon_star_base = (gint) (SEARCH_FILTER_TOOLBAR_FILTER_ICON_BASE_WIDTH * SEARCH_FILTER_TOOLBAR_FILTER_ICON_STAR_SCALE);
-#line 891 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 786 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	icon_plus = (gint) (SEARCH_FILTER_TOOLBAR_FILTER_ICON_PLUS_WIDTH * SEARCH_FILTER_TOOLBAR_FILTER_ICON_STAR_SCALE);
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = filter;
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	switch (_tmp0_) {
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 8671 "SearchFilter.c"
+#line 7512 "SearchFilter.c"
 		{
 			gint _tmp1_ = 0;
 			gint _tmp2_ = 0;
-#line 895 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp1_ = icon_star_base;
-#line 895 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp2_ = icon_plus;
-#line 895 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = _tmp1_ + _tmp2_;
-#line 895 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 8683 "SearchFilter.c"
+#line 7524 "SearchFilter.c"
 		}
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 8687 "SearchFilter.c"
+#line 7528 "SearchFilter.c"
 		{
 			gint _tmp3_ = 0;
 			gint _tmp4_ = 0;
-#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp3_ = icon_star_base;
-#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = icon_plus;
-#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = (_tmp3_ * 2) + _tmp4_;
-#line 897 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 8699 "SearchFilter.c"
+#line 7540 "SearchFilter.c"
 		}
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 8703 "SearchFilter.c"
+#line 7544 "SearchFilter.c"
 		{
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
-#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = icon_star_base;
-#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = icon_plus;
-#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = (_tmp5_ * 3) + _tmp6_;
-#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 8715 "SearchFilter.c"
+#line 7556 "SearchFilter.c"
 		}
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 8719 "SearchFilter.c"
+#line 7560 "SearchFilter.c"
 		{
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
-#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = icon_star_base;
-#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp8_ = icon_plus;
-#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = (_tmp7_ * 4) + _tmp8_;
-#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 8731 "SearchFilter.c"
+#line 7572 "SearchFilter.c"
 		}
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 8737 "SearchFilter.c"
+#line 7578 "SearchFilter.c"
 		{
 			gint _tmp9_ = 0;
-#line 904 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp9_ = icon_star_base;
-#line 904 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = _tmp9_ * 5;
-#line 904 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 8746 "SearchFilter.c"
+#line 7587 "SearchFilter.c"
 		}
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 8750 "SearchFilter.c"
+#line 7591 "SearchFilter.c"
 		{
-#line 906 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = RESOURCES_ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE;
-#line 906 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 8756 "SearchFilter.c"
+#line 7597 "SearchFilter.c"
 		}
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 8760 "SearchFilter.c"
+#line 7601 "SearchFilter.c"
 		{
-#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = RESOURCES_ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE;
-#line 908 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 8766 "SearchFilter.c"
+#line 7607 "SearchFilter.c"
 		}
-#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 8770 "SearchFilter.c"
+#line 7611 "SearchFilter.c"
 		{
-#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = icon_plus;
-#line 910 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 8776 "SearchFilter.c"
+#line 7617 "SearchFilter.c"
 		}
 		default:
 		{
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 807 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = icon_base;
-#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 807 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 8784 "SearchFilter.c"
+#line 7625 "SearchFilter.c"
 		}
 	}
 }
 
 
 void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToolbarRatingFilterButton* self, RatingFilter filter) {
-	GtkButton* _tmp0_ = NULL;
-	GtkButton* _tmp1_ = NULL;
-	RatingFilter _tmp2_ = 0;
-	GtkWidget* _tmp3_ = NULL;
-	GtkWidget* _tmp4_ = NULL;
-	RatingFilter _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	RatingFilter _tmp7_ = 0;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-#line 916 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkMenuButton* _tmp0_ = NULL;
+	RatingFilter _tmp1_ = 0;
+	RatingFilter _tmp18_ = 0;
+	gint _tmp19_ = 0;
+	RatingFilter _tmp20_ = 0;
+	gchar* _tmp21_ = NULL;
+	gchar* _tmp22_ = NULL;
+#line 811 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self));
-#line 917 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 812 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->button;
-#line 917 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_button_set_always_show_image (_tmp0_, TRUE);
-#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp1_ = self->button;
-#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = filter;
-#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp3_ = search_filter_toolbar_rating_filter_button_get_filter_icon (self, _tmp2_);
-#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp4_ = _tmp3_;
-#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_button_set_image (_tmp1_, _tmp4_);
-#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (_tmp4_);
-#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp5_ = filter;
-#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp6_ = search_filter_toolbar_rating_filter_button_get_filter_button_size (self, _tmp5_);
-#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp6_, -1);
-#line 920 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp7_ = filter;
-#line 920 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp8_ = resources_get_rating_filter_tooltip (_tmp7_);
-#line 920 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp9_ = _tmp8_;
-#line 920 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), _tmp9_);
-#line 920 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_free0 (_tmp9_);
-#line 921 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 812 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_button_set_always_show_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), TRUE);
+#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp1_ = filter;
+#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	switch (_tmp1_) {
+#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case RATING_FILTER_ONE_OR_HIGHER:
+#line 7651 "SearchFilter.c"
+		{
+			GtkMenuButton* _tmp2_ = NULL;
+			const gchar* _tmp3_ = NULL;
+#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp2_ = self->button;
+#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp3_ = _ ("★+ Rating");
+#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_button_get_type (), GtkButton), _tmp3_);
+#line 816 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			break;
+#line 7663 "SearchFilter.c"
+		}
+#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case RATING_FILTER_TWO_OR_HIGHER:
+#line 7667 "SearchFilter.c"
+		{
+			GtkMenuButton* _tmp4_ = NULL;
+			const gchar* _tmp5_ = NULL;
+#line 818 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp4_ = self->button;
+#line 818 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp5_ = _ ("★★+ Rating");
+#line 818 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), _tmp5_);
+#line 819 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			break;
+#line 7679 "SearchFilter.c"
+		}
+#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case RATING_FILTER_THREE_OR_HIGHER:
+#line 7683 "SearchFilter.c"
+		{
+			GtkMenuButton* _tmp6_ = NULL;
+			const gchar* _tmp7_ = NULL;
+#line 821 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp6_ = self->button;
+#line 821 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp7_ = _ ("★★★+ Rating");
+#line 821 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_button_get_type (), GtkButton), _tmp7_);
+#line 822 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			break;
+#line 7695 "SearchFilter.c"
+		}
+#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case RATING_FILTER_FOUR_OR_HIGHER:
+#line 7699 "SearchFilter.c"
+		{
+			GtkMenuButton* _tmp8_ = NULL;
+			const gchar* _tmp9_ = NULL;
+#line 824 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp8_ = self->button;
+#line 824 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp9_ = _ ("★★★★+ Rating");
+#line 824 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_button_get_type (), GtkButton), _tmp9_);
+#line 825 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			break;
+#line 7711 "SearchFilter.c"
+		}
+#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case RATING_FILTER_FIVE_ONLY:
+#line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		case RATING_FILTER_FIVE_OR_HIGHER:
+#line 7717 "SearchFilter.c"
+		{
+			GtkMenuButton* _tmp10_ = NULL;
+			const gchar* _tmp11_ = NULL;
+#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp10_ = self->button;
+#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp11_ = _ ("★★★★★+ Rating");
+#line 828 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_button_get_type (), GtkButton), _tmp11_);
+#line 829 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			break;
+#line 7729 "SearchFilter.c"
+		}
+		default:
+		{
+			GtkMenuButton* _tmp12_ = NULL;
+			const gchar* _tmp13_ = NULL;
+			GtkMenuButton* _tmp14_ = NULL;
+			RatingFilter _tmp15_ = 0;
+			GtkWidget* _tmp16_ = NULL;
+			GtkWidget* _tmp17_ = NULL;
+#line 831 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp12_ = self->button;
+#line 831 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp13_ = _ ("Rating");
+#line 831 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_button_get_type (), GtkButton), _tmp13_);
+#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp14_ = self->button;
+#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp15_ = filter;
+#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp16_ = search_filter_toolbar_rating_filter_button_get_filter_icon (self, _tmp15_);
+#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_tmp17_ = _tmp16_;
+#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_button_get_type (), GtkButton), _tmp17_);
+#line 832 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_g_object_unref0 (_tmp17_);
+#line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			break;
+#line 7759 "SearchFilter.c"
+		}
+	}
+#line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp18_ = filter;
+#line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp19_ = search_filter_toolbar_rating_filter_button_get_filter_button_size (self, _tmp18_);
+#line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp19_, -1);
+#line 837 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp20_ = filter;
+#line 837 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp21_ = resources_get_rating_filter_tooltip (_tmp20_);
+#line 837 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp22_ = _tmp21_;
+#line 837 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), _tmp22_);
+#line 837 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_free0 (_tmp22_);
+#line 838 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_has_tooltip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 922 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 839 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 8839 "SearchFilter.c"
+#line 7782 "SearchFilter.c"
 }
 
 
@@ -8843,74 +7786,59 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_button_size (S
 	gint result = 0;
 	RatingFilter _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 842 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self), 0);
-#line 926 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = filter;
-#line 926 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = search_filter_toolbar_rating_filter_button_get_filter_icon_size (self, _tmp0_);
-#line 926 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp1_ + (2 * SEARCH_FILTER_TOOLBAR_FILTER_BUTTON_MARGIN);
-#line 926 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8857 "SearchFilter.c"
+#line 7800 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_rating_filter_button_set_label (SearchFilterToolbarRatingFilterButton* self, const gchar* label) {
-	GtkButton* _tmp0_ = NULL;
+	GtkMenuButton* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_RATING_FILTER_BUTTON (self));
-#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 846 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (label != NULL);
-#line 930 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 847 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->button;
-#line 930 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 847 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = label;
-#line 930 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_button_set_label (_tmp0_, _tmp1_);
-#line 8874 "SearchFilter.c"
+#line 847 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
+#line 7817 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_rating_filter_button_class_init (SearchFilterToolbarRatingFilterButtonClass * klass) {
-#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_rating_filter_button_parent_class = g_type_class_peek_parent (klass);
-#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_rating_filter_button_finalize;
-#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_TYPE_RATING_FILTER_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 8885 "SearchFilter.c"
+#line 7826 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_rating_filter_button_instance_init (SearchFilterToolbarRatingFilterButton * self) {
-#line 816 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->filter_popup = NULL;
-#line 8892 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_rating_filter_button_finalize (GObject* obj) {
 	SearchFilterToolbarRatingFilterButton * self;
-	GtkButton* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_RATING_FILTER_BUTTON, SearchFilterToolbarRatingFilterButton);
-#line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp0_ = self->button;
-#line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE);
-#line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_rating_filter_button_on_clicked_gtk_button_clicked, self);
-#line 816 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->filter_popup);
-#line 817 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 742 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->button);
-#line 815 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_rating_filter_button_parent_class)->finalize (obj);
-#line 8914 "SearchFilter.c"
+#line 7842 "SearchFilter.c"
 }
 
 
@@ -8927,9 +7855,9 @@ GType search_filter_toolbar_rating_filter_button_get_type (void) {
 
 
 static void _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_filter_button_on_clicked ((SearchFilterToolbarSavedSearchFilterButton*) self);
-#line 8933 "SearchFilter.c"
+#line 7861 "SearchFilter.c"
 }
 
 
@@ -8943,136 +7871,136 @@ SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_f
 	GtkToggleButton* _tmp4_ = NULL;
 	GtkToggleButton* _tmp5_ = NULL;
 	GtkToggleButton* _tmp6_ = NULL;
-#line 941 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarSavedSearchFilterButton*) g_object_new (object_type, NULL);
-#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 859 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = (GtkToggleButton*) gtk_toggle_button_new ();
-#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 859 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp0_);
-#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 859 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->button);
-#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 859 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->button = _tmp0_;
-#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->button;
-#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 860 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_always_show_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), TRUE);
-#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 862 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = (GtkImage*) gtk_image_new_from_icon_name ("find", GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 862 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp2_);
-#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 862 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	image = _tmp2_;
-#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 863 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget), 6);
-#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 864 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->button;
-#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 864 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_image (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_button_get_type (), GtkButton), G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget));
-#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 865 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->button;
-#line 948 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 865 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 867 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->button;
-#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 867 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked, self, 0);
-#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 869 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_filter_button_restyle (self);
-#line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 871 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_tool_item_set_homogeneous (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tool_item_get_type (), GtkToolItem), FALSE);
-#line 956 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = self->button;
-#line 956 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 873 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 941 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (image);
-#line 941 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 8993 "SearchFilter.c"
+#line 7921 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_new (void) {
-#line 941 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_saved_search_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON);
-#line 9000 "SearchFilter.c"
+#line 7928 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_filter_button_on_clicked (SearchFilterToolbarSavedSearchFilterButton* self) {
-#line 963 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 880 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self));
-#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "clicked");
-#line 9009 "SearchFilter.c"
+#line 7937 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_filter_button_set_active (SearchFilterToolbarSavedSearchFilterButton* self, gboolean active) {
 	GtkToggleButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 967 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 884 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self));
-#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->button;
-#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = active;
-#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toggle_button_set_active (_tmp0_, _tmp1_);
-#line 9024 "SearchFilter.c"
+#line 7952 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_filter_button_set_label (SearchFilterToolbarSavedSearchFilterButton* self, const gchar* label) {
 	GtkToggleButton* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 971 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 888 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self));
-#line 971 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 888 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (label != NULL);
-#line 972 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->button;
-#line 972 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = label;
-#line 972 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 9041 "SearchFilter.c"
+#line 7969 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_filter_button_restyle (SearchFilterToolbarSavedSearchFilterButton* self) {
 	GtkToggleButton* _tmp0_ = NULL;
 	GtkToggleButton* _tmp1_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 892 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_FILTER_BUTTON (self));
-#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->button;
-#line 976 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 893 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), 24, 24);
-#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->button;
-#line 977 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE);
-#line 9058 "SearchFilter.c"
+#line 7986 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_filter_button_class_init (SearchFilterToolbarSavedSearchFilterButtonClass * klass) {
-#line 935 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_filter_button_parent_class = g_type_class_peek_parent (klass);
-#line 935 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_saved_search_filter_button_finalize;
-#line 935 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 9069 "SearchFilter.c"
+#line 7997 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_filter_button_instance_init (SearchFilterToolbarSavedSearchFilterButton * self) {
-#line 936 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 853 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->filter_popup = NULL;
-#line 9076 "SearchFilter.c"
+#line 8004 "SearchFilter.c"
 }
 
 
@@ -9080,21 +8008,21 @@ static void search_filter_toolbar_saved_search_filter_button_finalize (GObject*
 	SearchFilterToolbarSavedSearchFilterButton * self;
 	GtkToggleButton* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 935 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON, SearchFilterToolbarSavedSearchFilterButton);
-#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->button;
-#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE);
-#line 960 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_filter_button_on_clicked_gtk_button_clicked, self);
-#line 936 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 853 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_search_filter_toolbar_saved_search_popover_unref0 (self->filter_popup);
-#line 937 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 854 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->button);
-#line 935 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_saved_search_filter_button_parent_class)->finalize (obj);
-#line 9098 "SearchFilter.c"
+#line 8026 "SearchFilter.c"
 }
 
 
@@ -9111,71 +8039,71 @@ GType search_filter_toolbar_saved_search_filter_button_get_type (void) {
 
 
 static void _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, SavedSearch* search, gpointer self) {
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_edit_click ((SearchFilterToolbarSavedSearchPopover*) self, search);
-#line 9117 "SearchFilter.c"
+#line 8045 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked (SearchFilterToolbarSavedSearchPopoverDataButton* _sender, SavedSearch* search, gpointer self) {
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_delete_click ((SearchFilterToolbarSavedSearchPopover*) self, search);
-#line 9124 "SearchFilter.c"
+#line 8052 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_add_click ((SearchFilterToolbarSavedSearchPopover*) self);
-#line 9131 "SearchFilter.c"
+#line 8059 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated (GtkListBox* _sender, GtkListBoxRow* row, gpointer self) {
-#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_activate_row ((SearchFilterToolbarSavedSearchPopover*) self, row);
-#line 9138 "SearchFilter.c"
+#line 8066 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed (GtkPopover* _sender, gpointer self) {
-#line 1066 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_popover_closed ((SearchFilterToolbarSavedSearchPopover*) self);
-#line 9145 "SearchFilter.c"
+#line 8073 "SearchFilter.c"
 }
 
 
-static void _vala_array_add351 (SearchFilterToolbarSavedSearchPopoverDataButton*** array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) {
-#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+static void _vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton*** array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) {
+#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((*length) == (*size)) {
-#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1);
-#line 9156 "SearchFilter.c"
+#line 8084 "SearchFilter.c"
 	}
-#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[(*length)++] = value;
-#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[*length] = NULL;
-#line 9162 "SearchFilter.c"
+#line 8090 "SearchFilter.c"
 }
 
 
-static void _vala_array_add352 (SearchFilterToolbarSavedSearchPopoverDataButton*** array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) {
-#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton*** array, int* length, int* size, SearchFilterToolbarSavedSearchPopoverDataButton* value) {
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((*length) == (*size)) {
-#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1);
-#line 9173 "SearchFilter.c"
+#line 8101 "SearchFilter.c"
 	}
-#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[(*length)++] = value;
-#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[*length] = NULL;
-#line 9179 "SearchFilter.c"
+#line 8107 "SearchFilter.c"
 }
 
 
@@ -9195,53 +8123,53 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 	GtkListBox* _tmp49_ = NULL;
 	GtkPopover* _tmp50_ = NULL;
 	GtkListBox* _tmp51_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (GTK_IS_WIDGET (relative_to), NULL);
-#line 1025 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarSavedSearchPopover*) g_type_create_instance (object_type);
-#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = relative_to;
-#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = (GtkPopover*) gtk_popover_new (_tmp0_);
-#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->popover);
-#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 943 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->popover = _tmp1_;
-#line 1027 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 944 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->popover;
-#line 1027 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 944 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect (_tmp2_, "closed", (GCallback) _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed, self);
-#line 1028 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = (GtkListBox*) gtk_list_box_new ();
-#line 1028 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1028 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->list_box);
-#line 1028 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 945 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->list_box = _tmp3_;
-#line 1029 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = g_new0 (SearchFilterToolbarSavedSearchPopoverDataButton*, 0 + 1);
-#line 1029 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->edit_buttons = (_vala_array_free (self->priv->edit_buttons, self->priv->edit_buttons_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1029 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->edit_buttons = _tmp4_;
-#line 1029 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->edit_buttons_length1 = 0;
-#line 1029 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 946 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_edit_buttons_size_ = self->priv->edit_buttons_length1;
-#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = g_new0 (SearchFilterToolbarSavedSearchPopoverDataButton*, 0 + 1);
-#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->delete_buttons = (_vala_array_free (self->priv->delete_buttons, self->priv->delete_buttons_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->delete_buttons = _tmp5_;
-#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->delete_buttons_length1 = 0;
-#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_delete_buttons_size_ = self->priv->delete_buttons_length1;
-#line 9245 "SearchFilter.c"
+#line 8173 "SearchFilter.c"
 	{
 		GeeIterator* _search_it = NULL;
 		SavedSearchTable* _tmp6_ = NULL;
@@ -9250,27 +8178,27 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 		GeeCollection* _tmp9_ = NULL;
 		GeeIterator* _tmp10_ = NULL;
 		GeeIterator* _tmp11_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = saved_search_table_get_instance ();
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = _tmp6_;
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = saved_search_table_get_all (_tmp7_);
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp9_ = _tmp8_;
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp11_ = _tmp10_;
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp9_);
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_saved_search_table_unref0 (_tmp7_);
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_search_it = _tmp11_;
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		while (TRUE) {
-#line 9274 "SearchFilter.c"
+#line 8202 "SearchFilter.c"
 			GeeIterator* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
 			SavedSearch* search = NULL;
@@ -9310,180 +8238,180 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp41_ = NULL;
 			GtkListBox* _tmp42_ = NULL;
 			GtkBox* _tmp43_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp12_ = _search_it;
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp13_ = gee_iterator_next (_tmp12_);
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (!_tmp13_) {
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				break;
-#line 9322 "SearchFilter.c"
+#line 8250 "SearchFilter.c"
 			}
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp14_ = _search_it;
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp15_ = gee_iterator_get (_tmp14_);
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search = (SavedSearch*) _tmp15_;
-#line 1033 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
-#line 1033 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_object_ref_sink (_tmp16_);
-#line 1033 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 950 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			row = _tmp16_;
-#line 1034 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 951 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp17_ = row;
-#line 1034 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 951 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			gtk_box_set_homogeneous (_tmp17_, FALSE);
-#line 1035 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp18_ = search;
-#line 1035 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp19_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_OBJECT, DataObject));
-#line 1035 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp20_ = _tmp19_;
-#line 1035 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp21_ = (GtkLabel*) gtk_label_new (_tmp20_);
-#line 1035 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_object_ref_sink (_tmp21_);
-#line 1035 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_ = _tmp21_;
-#line 1035 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_free0 (_tmp20_);
-#line 1035 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 952 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			label = _tmp22_;
-#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 953 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp23_ = label;
-#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 953 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 1037 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp24_ = row;
-#line 1037 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp25_ = label;
-#line 1037 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 954 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 3);
-#line 1039 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 956 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp26_ = search;
-#line 1039 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 956 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp27_ = search_filter_toolbar_saved_search_popover_data_button_new (_tmp26_, "edit-delete-symbolic");
-#line 1039 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 956 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_object_ref_sink (_tmp27_);
-#line 1039 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 956 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			delete_button = _tmp27_;
-#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp28_ = row;
-#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp29_ = delete_button;
-#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 957 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			gtk_box_pack_end (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1041 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 958 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp30_ = delete_button;
-#line 1041 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 958 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect (_tmp30_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self);
-#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp31_ = self->priv->delete_buttons;
-#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp31__length1 = self->priv->delete_buttons_length1;
-#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp32_ = delete_button;
-#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp33_ = _g_object_ref0 (_tmp32_);
-#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_vala_array_add351 (&self->priv->delete_buttons, &self->priv->delete_buttons_length1, &self->priv->_delete_buttons_size_, _tmp33_);
-#line 1044 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_vala_array_add133 (&self->priv->delete_buttons, &self->priv->delete_buttons_length1, &self->priv->_delete_buttons_size_, _tmp33_);
+#line 961 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp34_ = search;
-#line 1044 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 961 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp35_ = search_filter_toolbar_saved_search_popover_data_button_new (_tmp34_, "text-editor-symbolic");
-#line 1044 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 961 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_object_ref_sink (_tmp35_);
-#line 1044 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 961 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			edit_button = _tmp35_;
-#line 1045 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp36_ = row;
-#line 1045 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp37_ = edit_button;
-#line 1045 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 962 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			gtk_box_pack_end (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1046 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 963 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp38_ = edit_button;
-#line 1046 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 963 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_connect (_tmp38_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self);
-#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp39_ = self->priv->edit_buttons;
-#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp39__length1 = self->priv->edit_buttons_length1;
-#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp40_ = edit_button;
-#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp41_ = _g_object_ref0 (_tmp40_);
-#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-			_vala_array_add352 (&self->priv->edit_buttons, &self->priv->edit_buttons_length1, &self->priv->_edit_buttons_size_, _tmp41_);
-#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+			_vala_array_add134 (&self->priv->edit_buttons, &self->priv->edit_buttons_length1, &self->priv->_edit_buttons_size_, _tmp41_);
+#line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp42_ = self->priv->list_box;
-#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp43_ = row;
-#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 966 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			gtk_list_box_insert (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), -1);
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (edit_button);
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (delete_button);
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (label);
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (row);
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (search);
-#line 9438 "SearchFilter.c"
+#line 8366 "SearchFilter.c"
 		}
-#line 1032 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_search_it);
-#line 9442 "SearchFilter.c"
+#line 8370 "SearchFilter.c"
 	}
-#line 1051 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp44_ = (GtkButton*) gtk_button_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON);
-#line 1051 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp44_);
-#line 1051 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->add);
-#line 1051 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->add = _tmp44_;
-#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 969 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp45_ = self->priv->add;
-#line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 969 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect (_tmp45_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked, self);
-#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 970 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp46_ = self->priv->list_box;
-#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 970 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp47_ = self->priv->add;
-#line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 970 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_list_box_insert (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), -1);
-#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 971 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp48_ = self->priv->list_box;
-#line 1054 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 971 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect (_tmp48_, "row-activated", (GCallback) _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated, self);
-#line 1055 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 972 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp49_ = self->priv->list_box;
-#line 1055 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 972 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_list_box_set_selection_mode (_tmp49_, GTK_SELECTION_NONE);
-#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 973 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp50_ = self->priv->popover;
-#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 973 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp51_ = self->priv->list_box;
-#line 1056 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 973 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget));
-#line 1058 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 975 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_restyle (self);
-#line 1025 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 9480 "SearchFilter.c"
+#line 8408 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popover_new (GtkWidget* relative_to) {
-#line 1025 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_saved_search_popover_construct (SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, relative_to);
-#line 9487 "SearchFilter.c"
+#line 8415 "SearchFilter.c"
 }
 
 
@@ -9493,81 +8421,81 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 	gint _tmp1__length1 = 0;
 	SearchFilterToolbarSavedSearchPopoverDataButton** _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 1069 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1070 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->add;
-#line 1070 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 987 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (_tmp0_, GTK_RELIEF_NONE);
-#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->edit_buttons;
-#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1__length1 = self->priv->edit_buttons_length1;
-#line 9507 "SearchFilter.c"
+#line 8435 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
 		gint _button_collection_size_ = 0;
 		gint button_it = 0;
-#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection = _tmp1_;
-#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection_length1 = _tmp1__length1;
-#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp1__length1; button_it = button_it + 1) {
-#line 9519 "SearchFilter.c"
+#line 8447 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_ = NULL;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
-#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp2_ = _g_object_ref0 (button_collection[button_it]);
-#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp2_;
-#line 9526 "SearchFilter.c"
+#line 8454 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp3_ = NULL;
-#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp3_ = button;
-#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp3_);
-#line 1071 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 9535 "SearchFilter.c"
+#line 8463 "SearchFilter.c"
 			}
 		}
 	}
-#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->delete_buttons;
-#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4__length1 = self->priv->delete_buttons_length1;
-#line 9543 "SearchFilter.c"
+#line 8471 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
 		gint _button_collection_size_ = 0;
 		gint button_it = 0;
-#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection = _tmp4_;
-#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection_length1 = _tmp4__length1;
-#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) {
-#line 9555 "SearchFilter.c"
+#line 8483 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_ = NULL;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
-#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = _g_object_ref0 (button_collection[button_it]);
-#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp5_;
-#line 9562 "SearchFilter.c"
+#line 8490 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL;
-#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp6_ = button;
-#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp6_);
-#line 1072 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 9571 "SearchFilter.c"
+#line 8499 "SearchFilter.c"
 			}
 		}
 	}
@@ -9583,47 +8511,47 @@ static gboolean search_filter_toolbar_saved_search_popover_is_search_row (Search
 	GList* _tmp4_ = NULL;
 	gconstpointer _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self), FALSE);
-#line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 992 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail ((row == NULL) || GTK_IS_LIST_BOX_ROW (row), FALSE);
-#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = row;
-#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ == NULL) {
-#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		result = FALSE;
-#line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 9599 "SearchFilter.c"
+#line 8527 "SearchFilter.c"
 	}
-#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = row;
-#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer));
-#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = _tmp2_;
-#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = g_list_last (_tmp3_);
-#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = _tmp4_->data;
-#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE ((GtkWidget*) _tmp5_, gtk_button_get_type ());
-#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_list_free0 (_tmp3_);
-#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp6_) {
-#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		result = FALSE;
-#line 1077 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 9621 "SearchFilter.c"
+#line 8549 "SearchFilter.c"
 	}
-#line 1078 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
-#line 1078 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 9627 "SearchFilter.c"
+#line 8555 "SearchFilter.c"
 }
 
 
@@ -9646,55 +8574,55 @@ static SavedSearch* search_filter_toolbar_saved_search_popover_get_search (Searc
 	SavedSearch* _tmp13_ = NULL;
 	SavedSearch* _tmp14_ = NULL;
 	SavedSearch* _tmp15_ = NULL;
-#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 998 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self), NULL);
-#line 1081 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 998 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (GTK_IS_LIST_BOX_ROW (row), NULL);
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = row;
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer));
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = _tmp1_;
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = g_list_first (_tmp2_);
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = _tmp3_->data;
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = (GtkWidget*) _tmp4_;
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = gtk_container_get_children (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, gtk_box_get_type ()) ? ((GtkBox*) _tmp5_) : NULL, gtk_container_get_type (), GtkContainer));
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = _tmp6_;
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = g_list_last (_tmp7_);
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = _tmp8_->data;
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = (GtkWidget*) _tmp9_;
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON) ? ((SearchFilterToolbarSavedSearchPopoverDataButton*) _tmp10_) : NULL);
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = _tmp11_;
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_list_free0 (_tmp7_);
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_list_free0 (_tmp2_);
-#line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 999 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	button = _tmp12_;
-#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp13_ = search_filter_toolbar_saved_search_popover_data_button_get_search (button);
-#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp14_ = _tmp13_;
-#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp15_;
-#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (button);
-#line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 9698 "SearchFilter.c"
+#line 8626 "SearchFilter.c"
 }
 
 
@@ -9702,114 +8630,114 @@ static void search_filter_toolbar_saved_search_popover_on_activate_row (SearchFi
 	GtkListBoxRow* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	GtkPopover* _tmp5_ = NULL;
-#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1003 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1003 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail ((row == NULL) || GTK_IS_LIST_BOX_ROW (row));
-#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = row;
-#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = search_filter_toolbar_saved_search_popover_is_search_row (self, _tmp0_);
-#line 1087 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 9716 "SearchFilter.c"
+#line 8644 "SearchFilter.c"
 		GtkListBoxRow* _tmp2_ = NULL;
 		SavedSearch* _tmp3_ = NULL;
 		SavedSearch* _tmp4_ = NULL;
-#line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = row;
-#line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = search_filter_toolbar_saved_search_popover_get_search (self, _tmp2_);
-#line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = _tmp3_;
-#line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (self, "search-activated", _tmp4_);
-#line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp4_);
-#line 9730 "SearchFilter.c"
+#line 8658 "SearchFilter.c"
 	}
-#line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->popover;
-#line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 9736 "SearchFilter.c"
+#line 8664 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_on_edit_click (SearchFilterToolbarSavedSearchPopover* self, SavedSearch* search) {
 	SavedSearch* _tmp0_ = NULL;
-#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1009 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1009 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1010 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search;
-#line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1010 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "edit-clicked", _tmp0_);
-#line 9750 "SearchFilter.c"
+#line 8678 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_on_delete_click (SearchFilterToolbarSavedSearchPopover* self, SavedSearch* search) {
 	SavedSearch* _tmp0_ = NULL;
-#line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1013 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1013 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1014 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = search;
-#line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1014 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "delete-clicked", _tmp0_);
-#line 9764 "SearchFilter.c"
+#line 8692 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_on_add_click (SearchFilterToolbarSavedSearchPopover* self) {
-#line 1100 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1017 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1018 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "add-clicked");
-#line 9773 "SearchFilter.c"
+#line 8701 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_on_popover_closed (SearchFilterToolbarSavedSearchPopover* self) {
-#line 1104 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1021 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1022 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "closed");
-#line 9782 "SearchFilter.c"
+#line 8710 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_popover_show_all (SearchFilterToolbarSavedSearchPopover* self) {
 	GtkPopover* _tmp0_ = NULL;
-#line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1025 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->popover;
-#line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 9794 "SearchFilter.c"
+#line 8722 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_popover_hide (SearchFilterToolbarSavedSearchPopover* self) {
 	GtkPopover* _tmp0_ = NULL;
-#line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1029 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_IS_SAVED_SEARCH_POPOVER (self));
-#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->popover;
-#line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 9806 "SearchFilter.c"
+#line 8734 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1012 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_data_button_on_click ((SearchFilterToolbarSavedSearchPopoverDataButton*) self);
-#line 9813 "SearchFilter.c"
+#line 8741 "SearchFilter.c"
 }
 
 
@@ -9820,137 +8748,137 @@ static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_sa
 	SavedSearch* _tmp2_ = NULL;
 	GtkButton* _tmp3_ = NULL;
 	GtkButton* _tmp4_ = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
-#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = (SearchFilterToolbarSavedSearchPopoverDataButton*) g_object_new (object_type, NULL);
-#line 1002 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = name;
-#line 1002 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = (GtkButton*) gtk_button_new_from_icon_name (_tmp0_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 1002 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1002 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->button);
-#line 1002 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 919 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->button = _tmp1_;
-#line 1003 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 920 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search;
-#line 1003 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 920 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_data_button_set_search (self, _tmp2_);
-#line 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 921 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->button;
-#line 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 921 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 923 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_data_button_restyle (self);
-#line 1008 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->button;
-#line 1008 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 925 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp4_, "clicked", (GCallback) _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked, self, 0);
-#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 9856 "SearchFilter.c"
+#line 8784 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_new (SavedSearch* search, const gchar* name) {
-#line 1001 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_saved_search_popover_data_button_construct (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, search, name);
-#line 9863 "SearchFilter.c"
+#line 8791 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_data_button_restyle (SearchFilterToolbarSavedSearchPopoverDataButton* self) {
 	GtkButton* _tmp0_ = NULL;
 	GtkButton* _tmp1_ = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 932 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self));
-#line 1016 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 933 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->button;
-#line 1016 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 933 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), 24, 24);
-#line 1017 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 934 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = self->priv->button;
-#line 1017 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 934 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (_tmp1_, GTK_RELIEF_NONE);
-#line 9880 "SearchFilter.c"
+#line 8808 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_data_button_on_click (SearchFilterToolbarSavedSearchPopoverDataButton* self) {
 	SavedSearch* _tmp0_ = NULL;
-#line 1020 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 937 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self));
-#line 1021 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->_search;
-#line 1021 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "clicked", _tmp0_);
-#line 9892 "SearchFilter.c"
+#line 8820 "SearchFilter.c"
 }
 
 
 static SavedSearch* search_filter_toolbar_saved_search_popover_data_button_get_search (SearchFilterToolbarSavedSearchPopoverDataButton* self) {
 	SavedSearch* result;
 	SavedSearch* _tmp0_ = NULL;
-#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self), NULL);
-#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->_search;
-#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
-#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 9907 "SearchFilter.c"
+#line 8835 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_data_button_set_search (SearchFilterToolbarSavedSearchPopoverDataButton* self, SavedSearch* value) {
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearch* _tmp1_ = NULL;
-#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_IS_DATA_BUTTON (self));
-#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = value;
-#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->_search);
-#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_search = _tmp1_;
-#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_notify ((GObject *) self, "search");
-#line 9926 "SearchFilter.c"
+#line 8854 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_data_button_class_init (SearchFilterToolbarSavedSearchPopoverDataButtonClass * klass) {
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_data_button_parent_class = g_type_class_peek_parent (klass);
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarSavedSearchPopoverDataButtonPrivate));
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_search_filter_toolbar_saved_search_popover_data_button_get_property;
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_search_filter_toolbar_saved_search_popover_data_button_set_property;
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_saved_search_popover_data_button_finalize;
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH, g_param_spec_object ("search", "search", "search", TYPE_SAVED_SEARCH, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
-#line 9945 "SearchFilter.c"
+#line 8873 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_data_button_instance_init (SearchFilterToolbarSavedSearchPopoverDataButton * self) {
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_GET_PRIVATE (self);
-#line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 913 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->button = NULL;
-#line 9954 "SearchFilter.c"
+#line 8882 "SearchFilter.c"
 }
 
 
@@ -9958,21 +8886,21 @@ static void search_filter_toolbar_saved_search_popover_data_button_finalize (GOb
 	SearchFilterToolbarSavedSearchPopoverDataButton * self;
 	GtkButton* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, SearchFilterToolbarSavedSearchPopoverDataButton);
-#line 1012 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->button;
-#line 1012 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE);
-#line 1012 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked, self);
-#line 996 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 913 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->button);
-#line 997 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->_search);
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_saved_search_popover_data_button_parent_class)->finalize (obj);
-#line 9976 "SearchFilter.c"
+#line 8904 "SearchFilter.c"
 }
 
 
@@ -9991,21 +8919,21 @@ static GType search_filter_toolbar_saved_search_popover_data_button_get_type (vo
 static void _vala_search_filter_toolbar_saved_search_popover_data_button_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	SearchFilterToolbarSavedSearchPopoverDataButton * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, SearchFilterToolbarSavedSearchPopoverDataButton);
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	switch (property_id) {
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH:
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_value_set_object (value, search_filter_toolbar_saved_search_popover_data_button_get_search (self));
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 10003 "SearchFilter.c"
+#line 8931 "SearchFilter.c"
 		default:
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 10009 "SearchFilter.c"
+#line 8937 "SearchFilter.c"
 	}
 }
 
@@ -10013,250 +8941,250 @@ static void _vala_search_filter_toolbar_saved_search_popover_data_button_get_pro
 static void _vala_search_filter_toolbar_saved_search_popover_data_button_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	SearchFilterToolbarSavedSearchPopoverDataButton * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, SearchFilterToolbarSavedSearchPopoverDataButton);
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	switch (property_id) {
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_DATA_BUTTON_SEARCH:
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_data_button_set_search (self, g_value_get_object (value));
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 10025 "SearchFilter.c"
+#line 8953 "SearchFilter.c"
 		default:
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 10031 "SearchFilter.c"
+#line 8959 "SearchFilter.c"
 	}
 }
 
 
 static void search_filter_toolbar_value_saved_search_popover_init (GValue* value) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 10039 "SearchFilter.c"
+#line 8967 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_value_saved_search_popover_free_value (GValue* value) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (value->data[0].v_pointer) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (value->data[0].v_pointer);
-#line 10048 "SearchFilter.c"
+#line 8976 "SearchFilter.c"
 	}
 }
 
 
 static void search_filter_toolbar_value_saved_search_popover_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (src_value->data[0].v_pointer) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (src_value->data[0].v_pointer);
-#line 10058 "SearchFilter.c"
+#line 8986 "SearchFilter.c"
 	} else {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 10062 "SearchFilter.c"
+#line 8990 "SearchFilter.c"
 	}
 }
 
 
 static gpointer search_filter_toolbar_value_saved_search_popover_peek_pointer (const GValue* value) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 10070 "SearchFilter.c"
+#line 8998 "SearchFilter.c"
 }
 
 
 static gchar* search_filter_toolbar_value_saved_search_popover_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 10077 "SearchFilter.c"
+#line 9005 "SearchFilter.c"
 		SearchFilterToolbarSavedSearchPopover* object;
 		object = collect_values[0].v_pointer;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 10084 "SearchFilter.c"
+#line 9012 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 10088 "SearchFilter.c"
+#line 9016 "SearchFilter.c"
 		}
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (object);
-#line 10092 "SearchFilter.c"
+#line 9020 "SearchFilter.c"
 	} else {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 10096 "SearchFilter.c"
+#line 9024 "SearchFilter.c"
 	}
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 10100 "SearchFilter.c"
+#line 9028 "SearchFilter.c"
 }
 
 
 static gchar* search_filter_toolbar_value_saved_search_popover_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	SearchFilterToolbarSavedSearchPopover** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!object_p) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 10111 "SearchFilter.c"
+#line 9039 "SearchFilter.c"
 	}
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 10117 "SearchFilter.c"
+#line 9045 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 10121 "SearchFilter.c"
+#line 9049 "SearchFilter.c"
 	} else {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer);
-#line 10125 "SearchFilter.c"
+#line 9053 "SearchFilter.c"
 	}
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 10129 "SearchFilter.c"
+#line 9057 "SearchFilter.c"
 }
 
 
 GParamSpec* search_filter_toolbar_param_spec_saved_search_popover (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	SearchFilterToolbarParamSpecSavedSearchPopover* spec;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER), NULL);
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 10143 "SearchFilter.c"
+#line 9071 "SearchFilter.c"
 }
 
 
 gpointer search_filter_toolbar_value_get_saved_search_popover (const GValue* value) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER), NULL);
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 10152 "SearchFilter.c"
+#line 9080 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_value_set_saved_search_popover (GValue* value, gpointer v_object) {
 	SearchFilterToolbarSavedSearchPopover* old;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER));
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	old = value->data[0].v_pointer;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (v_object) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER));
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer);
-#line 10172 "SearchFilter.c"
+#line 9100 "SearchFilter.c"
 	} else {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 10176 "SearchFilter.c"
+#line 9104 "SearchFilter.c"
 	}
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (old);
-#line 10182 "SearchFilter.c"
+#line 9110 "SearchFilter.c"
 	}
 }
 
 
 void search_filter_toolbar_value_take_saved_search_popover (GValue* value, gpointer v_object) {
 	SearchFilterToolbarSavedSearchPopover* old;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER));
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	old = value->data[0].v_pointer;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (v_object) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER));
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 10201 "SearchFilter.c"
+#line 9129 "SearchFilter.c"
 	} else {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 10205 "SearchFilter.c"
+#line 9133 "SearchFilter.c"
 	}
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (old);
-#line 10211 "SearchFilter.c"
+#line 9139 "SearchFilter.c"
 	}
 }
 
 
 static void search_filter_toolbar_saved_search_popover_class_init (SearchFilterToolbarSavedSearchPopoverClass * klass) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_parent_class = g_type_class_peek_parent (klass);
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((SearchFilterToolbarSavedSearchPopoverClass *) klass)->finalize = search_filter_toolbar_saved_search_popover_finalize;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarSavedSearchPopoverPrivate));
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("search_activated", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("edit_clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("delete_clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("add_clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 10233 "SearchFilter.c"
+#line 9161 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_popover_instance_init (SearchFilterToolbarSavedSearchPopover * self) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_PRIVATE (self);
-#line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->popover = NULL;
-#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 900 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->list_box = NULL;
-#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->edit_buttons = NULL;
-#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->edit_buttons_length1 = 0;
-#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_edit_buttons_size_ = self->priv->edit_buttons_length1;
-#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 902 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->delete_buttons = NULL;
-#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 902 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->delete_buttons_length1 = 0;
-#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 902 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_delete_buttons_size_ = self->priv->delete_buttons_length1;
-#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 903 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->add = NULL;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 10260 "SearchFilter.c"
+#line 9188 "SearchFilter.c"
 }
 
 
@@ -10272,117 +9200,117 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 	guint _tmp11_ = 0U;
 	GtkPopover* _tmp12_ = NULL;
 	guint _tmp13_ = 0U;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, SearchFilterToolbarSavedSearchPopover);
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_destroy (self);
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->edit_buttons;
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0__length1 = self->priv->edit_buttons_length1;
-#line 10284 "SearchFilter.c"
+#line 9212 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
 		gint _button_collection_size_ = 0;
 		gint button_it = 0;
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection = _tmp0_;
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection_length1 = _tmp0__length1;
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp0__length1; button_it = button_it + 1) {
-#line 10296 "SearchFilter.c"
+#line 9224 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp1_ = NULL;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp1_ = _g_object_ref0 (button_collection[button_it]);
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp1_;
-#line 10303 "SearchFilter.c"
+#line 9231 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp2_ = button;
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, &_tmp3_, NULL, FALSE);
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_edit_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self);
-#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 10315 "SearchFilter.c"
+#line 9243 "SearchFilter.c"
 			}
 		}
 	}
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->delete_buttons;
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4__length1 = self->priv->delete_buttons_length1;
-#line 10323 "SearchFilter.c"
+#line 9251 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
 		gint _button_collection_size_ = 0;
 		gint button_it = 0;
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection = _tmp4_;
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		button_collection_length1 = _tmp4__length1;
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) {
-#line 10335 "SearchFilter.c"
+#line 9263 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_ = NULL;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = _g_object_ref0 (button_collection[button_it]);
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp5_;
-#line 10342 "SearchFilter.c"
+#line 9270 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL;
 				guint _tmp7_ = 0U;
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp6_ = button;
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_parse_name ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, &_tmp7_, NULL, FALSE);
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_delete_click_search_filter_toolbar_saved_search_popover_data_button_clicked, self);
-#line 1063 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 10354 "SearchFilter.c"
+#line 9282 "SearchFilter.c"
 			}
 		}
 	}
-#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = self->priv->add;
-#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp9_, NULL, FALSE);
-#line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked, self);
-#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = self->priv->list_box;
-#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("row-activated", gtk_list_box_get_type (), &_tmp11_, NULL, FALSE);
-#line 1065 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_activate_row_gtk_list_box_row_activated, self);
-#line 1066 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = self->priv->popover;
-#line 1066 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("closed", gtk_popover_get_type (), &_tmp13_, NULL, FALSE);
-#line 1066 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed, self);
-#line 982 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 899 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->popover);
-#line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 900 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->list_box);
-#line 984 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 901 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->edit_buttons = (_vala_array_free (self->priv->edit_buttons, self->priv->edit_buttons_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 985 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 902 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->delete_buttons = (_vala_array_free (self->priv->delete_buttons, self->priv->delete_buttons_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 986 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 903 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->add);
-#line 10386 "SearchFilter.c"
+#line 9314 "SearchFilter.c"
 }
 
 
@@ -10403,82 +9331,75 @@ GType search_filter_toolbar_saved_search_popover_get_type (void) {
 gpointer search_filter_toolbar_saved_search_popover_ref (gpointer instance) {
 	SearchFilterToolbarSavedSearchPopover* self;
 	self = instance;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 10411 "SearchFilter.c"
+#line 9339 "SearchFilter.c"
 }
 
 
 void search_filter_toolbar_saved_search_popover_unref (gpointer instance) {
 	SearchFilterToolbarSavedSearchPopover* self;
 	self = instance;
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_CLASS (self)->finalize (self);
-#line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 10424 "SearchFilter.c"
+#line 9352 "SearchFilter.c"
 	}
 }
 
 
 static void search_filter_toolbar_class_init (SearchFilterToolbarClass * klass) {
-#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_parent_class = g_type_class_peek_parent (klass);
-#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarPrivate));
-#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_finalize;
-#line 10436 "SearchFilter.c"
+#line 9364 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_instance_init (SearchFilterToolbar * self) {
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenuItem* _tmp1_ = NULL;
-	GtkUIManager* _tmp2_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp3_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp4_ = NULL;
-#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	GtkBuilder* _tmp2_ = NULL;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp3_ = NULL;
+#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_GET_PRIVATE (self);
-#line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = (GtkMenu*) gtk_menu_new ();
-#line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp0_);
-#line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->close_menu = _tmp0_;
-#line 738 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = (GtkMenuItem*) gtk_menu_item_new ();
-#line 738 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp1_);
-#line 738 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->close_item = _tmp1_;
-#line 1117 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp2_ = gtk_ui_manager_new ();
-#line 1117 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->ui = _tmp2_;
-#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1034 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp2_ = gtk_builder_new ();
+#line 1034 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->builder = _tmp2_;
+#line 1037 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->saved_search = NULL;
-#line 1122 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp3_ = search_filter_toolbar_rating_filter_button_new ();
-#line 1122 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp3_ = search_filter_toolbar_saved_search_filter_button_new ();
+#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1122 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->rating_button = _tmp3_;
-#line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp4_ = search_filter_toolbar_saved_search_filter_button_new ();
-#line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp4_);
-#line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->saved_search_button = _tmp4_;
-#line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	self->priv->saved_search_button = _tmp3_;
+#line 1041 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = FALSE;
-#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_filter = NULL;
-#line 10482 "SearchFilter.c"
+#line 9403 "SearchFilter.c"
 }
 
 
@@ -10502,101 +9423,101 @@ static void search_filter_toolbar_finalize (GObject* obj) {
 	guint _tmp15_ = 0U;
 	GtkToolbar* _tmp16_ = NULL;
 	guint _tmp17_ = 0U;
-#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SEARCH_FILTER_TOOLBAR, SearchFilterToolbar);
-#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0_ = self->priv->actions;
-#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("media-context-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp1_, NULL, FALSE);
-#line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1159 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _search_filter_toolbar_on_media_context_changed_search_filter_actions_media_context_changed, self);
-#line 1246 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = self->priv->actions;
-#line 1246 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("flagged-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp3_, NULL, FALSE);
-#line 1246 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self);
-#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4_ = self->priv->actions;
-#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("photos-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp5_, NULL, FALSE);
-#line 1247 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self);
-#line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = self->priv->actions;
-#line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("videos-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp7_, NULL, FALSE);
-#line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self);
-#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp8_ = self->priv->actions;
-#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("raw-toggled", TYPE_SEARCH_FILTER_ACTIONS, &_tmp9_, NULL, FALSE);
-#line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp8_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self);
-#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp10_ = self->priv->actions;
-#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("rating-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp11_, NULL, FALSE);
-#line 1250 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self);
-#line 1251 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp12_ = self->priv->actions;
-#line 1251 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("text-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp13_, NULL, FALSE);
-#line 1251 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self);
-#line 1252 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1167 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp14_ = self->priv->actions;
-#line 1252 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1167 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("criteria-changed", TYPE_SEARCH_FILTER_ACTIONS, &_tmp15_, NULL, FALSE);
-#line 1252 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1167 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self);
-#line 1254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp16_ = self->priv->toolbar;
-#line 1254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_parse_name ("popup-context-menu", gtk_toolbar_get_type (), &_tmp17_, NULL, FALSE);
-#line 1254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self);
-#line 665 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 604 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbar);
-#line 737 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 663 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->close_menu);
-#line 738 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->close_item);
-#line 1117 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_g_object_unref0 (self->ui);
-#line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1034 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_g_object_unref0 (self->builder);
+#line 1036 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_search_filter_actions_unref0 (self->priv->actions);
-#line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1037 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->saved_search);
-#line 1121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1038 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->search_box);
-#line 1122 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1039 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->rating_button);
-#line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1040 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->saved_search_button);
-#line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_view_filter_unref0 (self->priv->search_filter);
-#line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1043 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->label_type);
-#line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1044 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_photos);
-#line 1128 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1045 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_videos);
-#line 1129 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1046 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_raw);
-#line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1047 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_flag);
-#line 1131 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1048 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_mediatype_flagged);
-#line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1049 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_flagged_rating);
-#line 1133 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 1050 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_rating_saved);
-#line 664 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+#line 603 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_parent_class)->finalize (obj);
-#line 10600 "SearchFilter.c"
+#line 9521 "SearchFilter.c"
 }
 
 
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index d9fe0fe..a080884 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -331,33 +331,33 @@ public class TextAction {
 
 
 public class SearchFilterActions {
-    public unowned Gtk.ToggleAction? flagged {
+    public unowned GLib.SimpleAction? flagged {
         get {
-            return get_action("CommonDisplayFlagged") as Gtk.ToggleAction;
+            return get_action ("display.flagged");
         }
     }
     
-    public unowned Gtk.ToggleAction? photos {
+    public unowned GLib.SimpleAction? photos {
         get {
-            return get_action("CommonDisplayPhotos") as Gtk.ToggleAction;
+            return get_action ("display.photos");
         }
     }
     
-    public unowned Gtk.ToggleAction? videos {
+    public unowned GLib.SimpleAction? videos {
         get {
-            return get_action("CommonDisplayVideos") as Gtk.ToggleAction;
+            return get_action ("display.videos");
         }
     }
     
-    public unowned Gtk.ToggleAction? raw {
+    public unowned GLib.SimpleAction? raw {
         get {
-            return get_action("CommonDisplayRaw") as Gtk.ToggleAction;
+            return get_action ("display.raw");
         }
     }
     
-    public unowned Gtk.RadioAction? rating {
+    public unowned GLib.SimpleAction? rating {
         get {
-            return get_action("CommonDisplayUnratedOrHigher") as Gtk.RadioAction;
+            return get_action ("display.rating");
         }
     }
     
@@ -368,7 +368,6 @@ public class SearchFilterActions {
         }
     }
     
-    private Gtk.ActionGroup action_group = new Gtk.ActionGroup("SearchFilterActionGroup");
     private SearchFilterCriteria criteria = SearchFilterCriteria.ALL;
     private TextAction? _text = null;
     private bool has_flagged = true;
@@ -388,6 +387,7 @@ public class SearchFilterActions {
     public signal void rating_changed(RatingFilter filter);
     
     public signal void text_changed(string? text);
+
     
     /**
      * fired when the kinds of media present in the current view change (e.g., a video becomes
@@ -410,30 +410,39 @@ public class SearchFilterActions {
         text.text_changed.connect(on_text_changed);
     }
     
-    public Gtk.ActionGroup get_action_group() {
-        return action_group;
-    }
-    
     public SearchFilterCriteria get_criteria() {
         return criteria;
     }
+
+    public unowned GLib.ActionEntry[] get_actions () {
+        return SearchFilterActions.entries;
+    }
     
-    public unowned Gtk.Action? get_action(string name) {
-        return action_group.get_action(name);
+    public unowned GLib.SimpleAction? get_action(string name) {
+        var lw = AppWindow.get_instance () as LibraryWindow;
+        if (lw != null) {
+            return lw.lookup_action (name) as GLib.SimpleAction;
+        }
+
+        return null;
+        //    return action_group.lookup_action(name) as GLib.SimpleAction;
     }
     
-    public void set_action_sensitive(string name, bool sensitive) {
-        Gtk.Action? action = get_action(name);
-        if (action != null)
-            action.sensitive = sensitive;
+    public void set_action_sensitive (string name, bool sensitive) {
+        var action = get_action(name);
+        if (action != null) {
+            action.set_enabled (sensitive);
+        }
     }
     
     public void reset() {
-        flagged.active = false;
-        photos.active = false;
-        raw.active = false;
-        videos.active = false;
-        rating.current_value = RatingFilter.UNRATED_OR_HIGHER;
+        rating.set_enabled (false);
+        photos.set_enabled (false);
+        raw.set_enabled (false);
+        videos.set_enabled (false);
+        Variant v = "'%d'".printf (RatingFilter.UNRATED_OR_HIGHER);
+        rating.set_state (v);
+
         text.set_text(null);
     }
     
@@ -506,27 +515,9 @@ public class SearchFilterActions {
     }
     
     private void update_sensitivities() {
-        flagged.set_stock_id(((SearchFilterCriteria.FLAG & criteria) != 0 && has_flagged) ?
-            Resources.ICON_FILTER_FLAGGED : Resources.ICON_FILTER_FLAGGED_DISABLED);
-        
-        bool allow_media = (SearchFilterCriteria.MEDIA & criteria) != 0;
-        videos.set_stock_id((allow_media && has_videos) ?
-             Resources.ICON_FILTER_VIDEOS :  Resources.ICON_FILTER_VIDEOS_DISABLED);
-        photos.set_stock_id((allow_media && has_photos) ?
-             Resources.ICON_FILTER_PHOTOS :  Resources.ICON_FILTER_PHOTOS_DISABLED);
-        raw.set_stock_id((allow_media && has_raw) ?
-             Resources.ICON_FILTER_RAW :  Resources.ICON_FILTER_RAW_DISABLED);
-        
         bool allow_ratings = (SearchFilterCriteria.RATING & criteria) != 0;
-        set_action_sensitive("CommonDisplayRejectedOnly", allow_ratings & can_filter_by_stars);
-        set_action_sensitive("CommonDisplayRejectedOrHigher", allow_ratings & can_filter_by_stars);
-        set_action_sensitive("CommonDisplayUnratedOrHigher", allow_ratings & can_filter_by_stars);
-        set_action_sensitive("CommonDisplayOneOrHigher", allow_ratings & can_filter_by_stars);
-        set_action_sensitive("CommonDisplayTwoOrHigher", allow_ratings & can_filter_by_stars);
-        set_action_sensitive("CommonDisplayThreeOrHigher", allow_ratings & can_filter_by_stars);
-        set_action_sensitive("CommonDisplayFourOrHigher", allow_ratings & can_filter_by_stars);
-        set_action_sensitive("CommonDisplayFiveOrHigher", allow_ratings & can_filter_by_stars);
-        
+        set_action_sensitive("display.rating", allow_ratings & can_filter_by_stars);
+
         // Ticket #3343 - Don't disable the text field, even
         // when no searchable items are available.
         text.set_sensitive(true);
@@ -537,111 +528,59 @@ public class SearchFilterActions {
     private void on_text_changed(TextAction action, string? text) {
         text_changed(text);
     }
+
+    private const GLib.ActionEntry[] entries = {
+        { "display.rating", on_action_radio, "s", "'2'", on_rating_changed },
+        { "display.flagged", on_action_toggle, null, "false", on_flagged_toggled },
+        { "display.photos", on_action_toggle, null, "false", on_photos_toggled },
+        { "display.videos", on_action_toggle, null, "false", on_videos_toggled },
+        { "display.raw", on_action_toggle, null, "false", on_raw_toggled }
+    };
+
+    private void on_action_radio (GLib.SimpleAction action,
+                                  GLib.Variant?     parameter) {
+        action.change_state (parameter);
+    }
+
+    private void on_action_toggle (GLib.SimpleAction action,
+                                   GLib.Variant?     parameter) {
+        var state = (bool) action.get_state ();
+        action.change_state (!state);
+    }
     
     private void register() {
         _text = new TextAction();
-        
-        Gtk.RadioActionEntry[] view_filter_actions = new Gtk.RadioActionEntry[0];
-        
-        Gtk.RadioActionEntry rejected_only = { "CommonDisplayRejectedOnly", null, TRANSLATABLE,
-            "<Ctrl>8", TRANSLATABLE, RatingFilter.REJECTED_ONLY };
-        rejected_only.label = Resources.DISPLAY_REJECTED_ONLY_MENU;
-        rejected_only.tooltip = Resources.DISPLAY_REJECTED_ONLY_TOOLTIP;
-        view_filter_actions += rejected_only;
-        
-        Gtk.RadioActionEntry rejected_or_higher = { "CommonDisplayRejectedOrHigher", null, TRANSLATABLE,
-            "<Ctrl>9", TRANSLATABLE, RatingFilter.REJECTED_OR_HIGHER };
-        rejected_or_higher.label = Resources.DISPLAY_REJECTED_OR_HIGHER_MENU;
-        rejected_or_higher.tooltip = GLib.dpgettext2 (null, "Tooltip",
-                Resources.DISPLAY_REJECTED_OR_HIGHER_TOOLTIP);
-        view_filter_actions += rejected_or_higher;
-        
-        Gtk.RadioActionEntry unrated_or_higher = { "CommonDisplayUnratedOrHigher", null, TRANSLATABLE, 
-            "<Ctrl>0", TRANSLATABLE, RatingFilter.UNRATED_OR_HIGHER };
-        unrated_or_higher.label = Resources.DISPLAY_UNRATED_OR_HIGHER_MENU;
-        unrated_or_higher.tooltip = Resources.DISPLAY_UNRATED_OR_HIGHER_TOOLTIP;
-        view_filter_actions += unrated_or_higher;
-        
-        Gtk.RadioActionEntry one_or_higher = { "CommonDisplayOneOrHigher", null, TRANSLATABLE,
-            "<Ctrl>1", TRANSLATABLE, RatingFilter.ONE_OR_HIGHER };
-        one_or_higher.label = Resources.DISPLAY_ONE_OR_HIGHER_MENU;
-        one_or_higher.tooltip = Resources.DISPLAY_ONE_OR_HIGHER_TOOLTIP;
-        view_filter_actions += one_or_higher;
-        
-        Gtk.RadioActionEntry two_or_higher = { "CommonDisplayTwoOrHigher", null, TRANSLATABLE,
-            "<Ctrl>2", TRANSLATABLE, RatingFilter.TWO_OR_HIGHER };
-        two_or_higher.label = Resources.DISPLAY_TWO_OR_HIGHER_MENU;
-        two_or_higher.tooltip = Resources.DISPLAY_TWO_OR_HIGHER_TOOLTIP;
-        view_filter_actions += two_or_higher;
-        
-        Gtk.RadioActionEntry three_or_higher = { "CommonDisplayThreeOrHigher", null, TRANSLATABLE,
-            "<Ctrl>3", TRANSLATABLE, RatingFilter.THREE_OR_HIGHER };
-        three_or_higher.label = Resources.DISPLAY_THREE_OR_HIGHER_MENU;
-        three_or_higher.tooltip = Resources.DISPLAY_THREE_OR_HIGHER_TOOLTIP;
-        view_filter_actions += three_or_higher;
-        
-        Gtk.RadioActionEntry four_or_higher = { "CommonDisplayFourOrHigher", null, TRANSLATABLE,
-            "<Ctrl>4", TRANSLATABLE, RatingFilter.FOUR_OR_HIGHER };
-        four_or_higher.label = Resources.DISPLAY_FOUR_OR_HIGHER_MENU;
-        four_or_higher.tooltip = Resources.DISPLAY_FOUR_OR_HIGHER_TOOLTIP;
-        view_filter_actions += four_or_higher;
-        
-        Gtk.RadioActionEntry five_or_higher = { "CommonDisplayFiveOrHigher", null, TRANSLATABLE,
-            "<Ctrl>5", TRANSLATABLE, RatingFilter.FIVE_OR_HIGHER };
-        five_or_higher.label = Resources.DISPLAY_FIVE_OR_HIGHER_MENU;
-        five_or_higher.tooltip = Resources.DISPLAY_FIVE_OR_HIGHER_TOOLTIP;
-        view_filter_actions += five_or_higher;
-        
-        action_group.add_radio_actions(view_filter_actions, RatingFilter.UNRATED_OR_HIGHER,
-            on_rating_changed);
-        
-        Gtk.ToggleActionEntry[] toggle_actions = new Gtk.ToggleActionEntry[0];
-        
-        Gtk.ToggleActionEntry flagged_action = { "CommonDisplayFlagged", Resources.ICON_FILTER_FLAGGED,
-            TRANSLATABLE, null, TRANSLATABLE, on_flagged_toggled, false };
-        flagged_action.label = _("Flagged");
-        flagged_action.tooltip = _("Flagged");
-        toggle_actions += flagged_action;
-        
-        Gtk.ToggleActionEntry photos_action = { "CommonDisplayPhotos", Resources.ICON_FILTER_PHOTOS,
-            TRANSLATABLE, null, TRANSLATABLE, on_photos_toggled, false };
-        photos_action.label = _("Photos");
-        photos_action.tooltip = _("Photos");
-        toggle_actions += photos_action;
-        
-        Gtk.ToggleActionEntry videos_action = { "CommonDisplayVideos", Resources.ICON_FILTER_VIDEOS,
-            TRANSLATABLE, null, TRANSLATABLE, on_videos_toggled, false };
-        videos_action.label = _("Videos");
-        videos_action.tooltip = _("Videos");
-        toggle_actions += videos_action;
-        
-        Gtk.ToggleActionEntry raw_action = { "CommonDisplayRaw", Resources.ICON_FILTER_RAW, TRANSLATABLE,
-            null, TRANSLATABLE, on_raw_toggled, false };
-        raw_action.label = _("RAW Photos");
-        raw_action.tooltip = _("RAW photos");
-        toggle_actions += raw_action;
-        
-        action_group.add_toggle_actions(toggle_actions, this);
     }
-    
-    private void on_rating_changed(Gtk.Action action, Gtk.Action current) {
-        rating_changed((RatingFilter) ((Gtk.RadioAction) current).get_current_value());
+
+    private void on_rating_changed (GLib.SimpleAction action,
+                                    GLib.Variant      value) {
+        action.set_state (value);
+        var filter = (RatingFilter) int.parse (value.get_string ());
+        rating_changed(filter);
     }
     
-    private void on_flagged_toggled(Gtk.Action action) {
-        flagged_toggled(((Gtk.ToggleAction) action).active);
+    private void on_flagged_toggled (GLib.SimpleAction action,
+                                     GLib.Variant      value) {
+        action.set_state (value);
+        flagged_toggled (value.get_boolean ());
     }
     
-    private void on_photos_toggled(Gtk.Action action) {
-        photos_toggled(((Gtk.ToggleAction) action).active);
+    private void on_photos_toggled (GLib.SimpleAction action,
+                                    GLib.Variant      value) {
+        action.set_state (value);
+        photos_toggled (value.get_boolean ());
     }
     
-    private void on_videos_toggled(Gtk.Action action) {
-        videos_toggled(((Gtk.ToggleAction) action).active);
+    private void on_videos_toggled (GLib.SimpleAction action,
+                                    GLib.Variant      value) {
+        action.set_state (value);
+        videos_toggled (value.get_boolean ());
     }
     
-    private void on_raw_toggled(Gtk.Action action) {
-        raw_toggled(((Gtk.ToggleAction) action).active);
+    private void on_raw_toggled (GLib.SimpleAction action,
+                                 GLib.Variant      value) {
+        action.set_state (value);
+        raw_toggled (value.get_boolean ());
     }
     
     public bool get_has_photos() {
@@ -678,27 +617,22 @@ public class SearchFilterToolbar : Gtk.Revealer {
         public LabelToolItem(string s, int left_padding = 0, int right_padding = 0) {
             label = new Gtk.Label(s);
             if (left_padding != 0 || right_padding != 0) {
-                Gtk.Alignment alignment = new Gtk.Alignment(0, 0.5f, 0, 0);
-                alignment.add(label);
-                alignment.left_padding = left_padding;
-                alignment.right_padding = right_padding;
-                add(alignment);
-            } else {
-                add(label);
+                label.halign = Gtk.Align.START;
+                label.valign = Gtk.Align.CENTER;
+                label.margin_start = left_padding;
+                label.margin_end = right_padding;
             }
+            add (label);
         }
     }
     
     private class ToggleActionToolButton : Gtk.ToolItem {
         private Gtk.ToggleButton button;
-        private Gtk.ToggleAction action;
 
-        public ToggleActionToolButton(Gtk.ToggleAction action) {
-            this.action = action;
+        public ToggleActionToolButton(string action) {
             button = new Gtk.ToggleButton();
             button.set_can_focus(false);
-            button.set_active(action.active);
-            button.clicked.connect(on_button_activate);
+            button.set_action_name (action);
             button.set_has_tooltip(true);
             button.set_relief(Gtk.ReliefStyle.NONE);
             button.set_margin_start(2);
@@ -706,14 +640,6 @@ public class SearchFilterToolbar : Gtk.Revealer {
             this.add(button);
         }
         
-        ~ToggleActionToolButton() {
-            button.clicked.disconnect(on_button_activate);
-        }
-        
-        private void on_button_activate() {
-            action.activate();
-        }
-        
         public void set_icon_name(string icon_name) {
             Gtk.Image? image = null;
             button.set_always_show_image(true);
@@ -813,57 +739,26 @@ public class SearchFilterToolbar : Gtk.Revealer {
     
     // Handles ratings filters.
     protected class RatingFilterButton : Gtk.ToolItem {
-        public Gtk.Menu filter_popup = null;
-        public Gtk.Button button;
-        
-        public signal void clicked();
-        
-        public RatingFilterButton() {
-            button = new Gtk.Button();
-            button.set_image(get_filter_icon(RatingFilter.UNRATED_OR_HIGHER));
+        public Gtk.MenuButton button;
+
+        public RatingFilterButton(GLib.MenuModel model) {
+            button = new Gtk.MenuButton();
+
+            button.set_image (get_filter_icon(RatingFilter.UNRATED_OR_HIGHER));
             button.set_can_focus(false);
             button.set_relief(Gtk.ReliefStyle.NONE);
             button.set_margin_start(2);
+            button.set_menu_model (model);
 
-            button.clicked.connect(on_clicked);
-            
             set_homogeneous(false);
-            
+
             this.add(button);
         }
-        
-        ~RatingFilterButton() {
-            button.clicked.disconnect(on_clicked);
-        }
-        
-        private void on_clicked() {
-            clicked();
-        }
-        
+
         private Gtk.Widget get_filter_icon(RatingFilter filter) {
             string filename = null;
 
             switch (filter) {
-                case RatingFilter.ONE_OR_HIGHER:
-                    filename = Resources.ICON_FILTER_ONE_OR_BETTER;
-                break;
-                
-                case RatingFilter.TWO_OR_HIGHER:
-                    filename = Resources.ICON_FILTER_TWO_OR_BETTER;
-                break;
-                
-                case RatingFilter.THREE_OR_HIGHER:
-                    filename = Resources.ICON_FILTER_THREE_OR_BETTER;
-                break;
-                
-                case RatingFilter.FOUR_OR_HIGHER:
-                    filename = Resources.ICON_FILTER_FOUR_OR_BETTER;
-                break;
-                
-                case RatingFilter.FIVE_OR_HIGHER:
-                    filename = Resources.ICON_FILTER_FIVE;
-                break;
-                
                 case RatingFilter.REJECTED_OR_HIGHER:
                     filename = Resources.ICON_FILTER_REJECTED_OR_BETTER;
                 break;
@@ -915,7 +810,29 @@ public class SearchFilterToolbar : Gtk.Revealer {
 
         public void set_filter_icon(RatingFilter filter) {
             button.set_always_show_image(true);
-            button.set_image(get_filter_icon(filter));
+            switch (filter) {
+            case RatingFilter.ONE_OR_HIGHER:
+                button.set_label (_("★+ Rating"));
+                break;
+            case RatingFilter.TWO_OR_HIGHER:
+                button.set_label (_("★★+ Rating"));
+                break;
+            case RatingFilter.THREE_OR_HIGHER:
+                button.set_label (_("★★★+ Rating"));
+                break;
+            case RatingFilter.FOUR_OR_HIGHER:
+                button.set_label (_("★★★★+ Rating"));
+                break;
+            case RatingFilter.FIVE_ONLY:
+            case RatingFilter.FIVE_OR_HIGHER:
+                button.set_label (_("★★★★★+ Rating"));
+                break;
+            default:
+                button.set_label (_("Rating"));
+                button.set_image(get_filter_icon(filter));
+                break;
+            }
+
             set_size_request(get_filter_button_size(filter), -1);
             set_tooltip_text(Resources.get_rating_filter_tooltip(filter));
             set_has_tooltip(true);
@@ -1114,12 +1031,12 @@ public class SearchFilterToolbar : Gtk.Revealer {
         }
     }
     
-    public Gtk.UIManager ui = new Gtk.UIManager();
+    public Gtk.Builder builder = new Gtk.Builder ();
     
     private SearchFilterActions actions;
     private SavedSearch saved_search = null;
     private SearchBox search_box;
-    private RatingFilterButton rating_button = new RatingFilterButton();
+    private RatingFilterButton rating_button;
     private SavedSearchFilterButton saved_search_button = new SavedSearchFilterButton();
     private bool elide_showing_again = false;
     private SearchViewFilter? search_filter = null;
@@ -1135,22 +1052,20 @@ public class SearchFilterToolbar : Gtk.Revealer {
     public SearchFilterToolbar(SearchFilterActions actions) {
         this.actions = actions;
         toolbar = new Gtk.Toolbar();
+//        toolbar.insert_action_group ("filterbar", actions.get_action_group ());
         actions.media_context_changed.connect(on_media_context_changed);
         search_box = new SearchBox(actions.text);
         
         toolbar.set_name("search-filter-toolbar");
         toolbar.set_icon_size(Gtk.IconSize.SMALL_TOOLBAR);
         
-        File ui_file = Resources.get_ui("search_bar.ui");
         try {
-            ui.add_ui_from_file(ui_file.get_path());
+            this.builder.add_from_resource ("/org/gnome/Shotwell/search_bar.ui");
         } catch (Error err) {
-            AppWindow.panic(_("Error loading UI file %s: %s").printf(
-                ui_file.get_path(), err.message));
+            AppWindow.panic(_("Error loading search bar UI: %s").printf(
+                err.message));
         }
         
-        ui.insert_action_group(actions.get_action_group(), 0);
-        
         // Ticket #3260 - Add a 'close' context menu to
         // the searchbar.
         // Prepare the close menu for use, but don't
@@ -1165,14 +1080,14 @@ public class SearchFilterToolbar : Gtk.Revealer {
         label_type = new LabelToolItem(_("Type"), 10, 5);
         toolbar.insert(label_type, -1);
         
-        toolbtn_photos = new ToggleActionToolButton(actions.photos);
-        toolbtn_photos.set_tooltip_text(actions.get_action_group().get_action("CommonDisplayPhotos").tooltip);
+        toolbtn_photos = new ToggleActionToolButton("win.display.photos");
+        toolbtn_photos.set_tooltip_text (_("Photos"));
         
-        toolbtn_videos = new ToggleActionToolButton(actions.videos);
-        toolbtn_videos.set_tooltip_text(actions.get_action_group().get_action("CommonDisplayVideos").tooltip);
+        toolbtn_videos = new ToggleActionToolButton("win.display.videos");
+        toolbtn_videos.set_tooltip_text(_("Videos"));
         
-        toolbtn_raw = new ToggleActionToolButton(actions.raw);
-        toolbtn_raw.set_tooltip_text(actions.get_action_group().get_action("CommonDisplayRaw").tooltip);
+        toolbtn_raw = new ToggleActionToolButton("win.display.raw");
+        toolbtn_raw.set_tooltip_text(_("RAW Photos"));
         
         toolbar.insert(toolbtn_photos, -1);
         toolbar.insert(toolbtn_videos, -1);
@@ -1184,9 +1099,9 @@ public class SearchFilterToolbar : Gtk.Revealer {
         
         // Flagged button
         
-        toolbtn_flag = new ToggleActionToolButton(actions.flagged);
+        toolbtn_flag = new ToggleActionToolButton("win.display.flagged");
         toolbtn_flag.set_label(_("Flagged"));
-        toolbtn_flag.set_tooltip_text(actions.get_action_group().get_action("CommonDisplayFlagged").tooltip);
+        toolbtn_flag.set_tooltip_text(_("Flagged"));
         
         toolbar.insert(toolbtn_flag, -1);
         
@@ -1195,10 +1110,10 @@ public class SearchFilterToolbar : Gtk.Revealer {
         toolbar.insert(sepr_flagged_rating, -1);
         
         // Rating button
-        rating_button.filter_popup = (Gtk.Menu) ui.get_widget("/FilterPopupMenu");
+        var model = this.builder.get_object ("popup-menu") as GLib.MenuModel;
+        rating_button = new RatingFilterButton (model);
         rating_button.set_label(_("Rating"));
         rating_button.set_expand(false);
-        rating_button.clicked.connect(on_filter_button_clicked);
         toolbar.insert(rating_button, -1);
         
         // separator
@@ -1291,12 +1206,13 @@ public class SearchFilterToolbar : Gtk.Revealer {
         // Try to obtain the action for toggling the searchbar.  If
         // it's null, then we're probably in direct edit mode, and 
         // shouldn't do anything anyway.
-        Gtk.ToggleAction searchbar_toggle = aw.get_common_action("CommonDisplaySearchbar") as Gtk.ToggleAction;
+        var action = aw.lookup_action ("CommonDisplaySearchbar") as
+            GLib.SimpleAction;
         
         // Could we find the appropriate action?
-        if(searchbar_toggle != null) {
+        if(action != null) {
             // Yes, hide the search bar.
-            searchbar_toggle.set_active(false);
+            action.set_state(false);
         }
     }
     
@@ -1326,9 +1242,13 @@ public class SearchFilterToolbar : Gtk.Revealer {
         if (aw == null)
             return;
 
-        Gtk.ToggleAction searchbar_toggle = aw.get_common_action("CommonDisplaySearchbar") as Gtk.ToggleAction;
-        if(searchbar_toggle != null)
-            searchbar_toggle.set_active(true);
+        var action = aw.lookup_action ("CommonDisplaySearchbar") as
+            GLib.SimpleAction;
+
+        // Could we find the appropriate action?
+        if(action != null) {
+            action.set_state(true);
+        }
 
         update();
     }
@@ -1367,12 +1287,14 @@ public class SearchFilterToolbar : Gtk.Revealer {
         assert(null != search_filter);
         
         search_filter.set_search_filter(actions.text.value);
-        search_filter.flagged = actions.flagged.active;
-        search_filter.show_media_video = actions.videos.active;
-        search_filter.show_media_photos = actions.photos.active;
-        search_filter.show_media_raw = actions.raw.active;
-        
-        RatingFilter filter = (RatingFilter) actions.rating.current_value;
+        search_filter.flagged = actions.flagged.get_state ().get_boolean ();
+        search_filter.show_media_video = actions.videos.get_state
+            ().get_boolean ();
+        search_filter.show_media_photos = actions.photos.get_state
+            ().get_boolean ();
+        search_filter.show_media_raw = actions.raw.get_state ().get_boolean ();
+
+        var filter = (RatingFilter) int.parse (actions.rating.get_state ().get_string ());
         search_filter.set_rating_filter(filter);
         rating_button.set_filter_icon(filter);
 
@@ -1406,31 +1328,6 @@ public class SearchFilterToolbar : Gtk.Revealer {
         search_filter.refresh();
     }
     
-    private void position_filter_popup(Gtk.Menu menu, out int x, out int y, out bool push_in) {
-        menu.realize();
-        int rx, ry;
-        rating_button.get_window().get_root_origin(out rx, out ry);
-        
-        Gtk.Allocation rating_button_allocation;
-        rating_button.get_allocation(out rating_button_allocation);
-        
-        Gtk.Allocation menubar_allocation;
-        AppWindow.get_instance().get_current_page().get_menubar().get_allocation(out menubar_allocation);
-        
-        int sidebar_w = Config.Facade.get_instance().get_sidebar_position();
-        
-        x = rx + rating_button_allocation.x + sidebar_w;
-        y = ry + rating_button_allocation.y + rating_button_allocation.height +
-                menubar_allocation.height;
-
-        push_in = false;
-    }
-    
-    private void on_filter_button_clicked() {
-        rating_button.filter_popup.popup(null, null, position_filter_popup, 0,
-            Gtk.get_current_event_time());
-    }
-
     private void on_savedsearch_selected(SavedSearch saved_search) {
         this.saved_search = saved_search;
         update();
@@ -1440,7 +1337,7 @@ public class SearchFilterToolbar : Gtk.Revealer {
         this.saved_search = null;
         update();
     }
-    
+
     private void edit_dialog(SavedSearch search) {
         saved_search_button.filter_popup.hide();
         SavedSearchDialog ssd = new SavedSearchDialog.edit_existing(search);
diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c
index 187b5e5..8fce3ed 100644
--- a/src/SlideshowPage.c
+++ b/src/SlideshowPage.c
@@ -297,7 +297,7 @@ typedef struct _SlideshowPageSettingsDialogPrivate SlideshowPageSettingsDialogPr
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -307,8 +307,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -316,10 +314,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -655,42 +651,42 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 143 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 659 "SlideshowPage.c"
+#line 655 "SlideshowPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 152 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 666 "SlideshowPage.c"
+#line 662 "SlideshowPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 163 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 673 "SlideshowPage.c"
+#line 669 "SlideshowPage.c"
 }
 
 
 static void _slideshow_page_on_play_pause_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 170 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_on_play_pause ((SlideshowPage*) self);
-#line 680 "SlideshowPage.c"
+#line 676 "SlideshowPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 177 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 687 "SlideshowPage.c"
+#line 683 "SlideshowPage.c"
 }
 
 
 static void _slideshow_page_on_change_settings_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
 #line 185 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_on_change_settings ((SlideshowPage*) self);
-#line 694 "SlideshowPage.c"
+#line 690 "SlideshowPage.c"
 }
 
 
@@ -929,14 +925,14 @@ SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* so
 	_g_object_unref0 (pluggables);
 #line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self;
-#line 933 "SlideshowPage.c"
+#line 929 "SlideshowPage.c"
 }
 
 
 SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start) {
 #line 140 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return slideshow_page_construct (TYPE_SLIDESHOW_PAGE, sources, controller, start);
-#line 940 "SlideshowPage.c"
+#line 936 "SlideshowPage.c"
 }
 
 
@@ -945,7 +941,7 @@ static gboolean _slideshow_page_auto_advance_gsource_func (gpointer self) {
 	result = slideshow_page_auto_advance ((SlideshowPage*) self);
 #line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 949 "SlideshowPage.c"
+#line 945 "SlideshowPage.c"
 }
 
 
@@ -989,7 +985,7 @@ static void slideshow_page_real_switched_to (Page* base) {
 	pixbuf = _tmp5_;
 #line 201 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp6_) {
-#line 993 "SlideshowPage.c"
+#line 989 "SlideshowPage.c"
 		GdkPixbuf* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
@@ -1004,7 +1000,7 @@ static void slideshow_page_real_switched_to (Page* base) {
 		_tmp10_ = DIRECTION_FORWARD;
 #line 202 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp7_, &_tmp9_, &_tmp10_);
-#line 1008 "SlideshowPage.c"
+#line 1004 "SlideshowPage.c"
 	}
 #line 205 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) SLIDESHOW_PAGE_CHECK_ADVANCE_MSEC, _slideshow_page_auto_advance_gsource_func, g_object_ref (self), g_object_unref);
@@ -1018,7 +1014,7 @@ static void slideshow_page_real_switched_to (Page* base) {
 	screensaver_inhibit (_tmp12_, "Playing slideshow");
 #line 193 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 1022 "SlideshowPage.c"
+#line 1018 "SlideshowPage.c"
 }
 
 
@@ -1035,7 +1031,7 @@ static void slideshow_page_real_switching_from (Page* base) {
 	screensaver_uninhibit (_tmp0_);
 #line 215 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->exiting = TRUE;
-#line 1039 "SlideshowPage.c"
+#line 1035 "SlideshowPage.c"
 }
 
 
@@ -1058,14 +1054,14 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 	_g_object_unref0 (_vala_next);
 #line 220 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_vala_next = _tmp1_;
-#line 1062 "SlideshowPage.c"
+#line 1058 "SlideshowPage.c"
 	{
 		gboolean _tmp2_ = FALSE;
 #line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = TRUE;
 #line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		while (TRUE) {
-#line 1069 "SlideshowPage.c"
+#line 1065 "SlideshowPage.c"
 			DataSource* forward = NULL;
 			DataSource* back = NULL;
 			ViewCollection* _tmp40_ = NULL;
@@ -1088,11 +1084,11 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 			GeeSet* _tmp56_ = NULL;
 #line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (!_tmp2_) {
-#line 1092 "SlideshowPage.c"
+#line 1088 "SlideshowPage.c"
 			}
 #line 222 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp2_ = FALSE;
-#line 1096 "SlideshowPage.c"
+#line 1092 "SlideshowPage.c"
 			{
 				GdkPixbuf* _tmp3_ = NULL;
 				PixbufCache* _tmp4_ = NULL;
@@ -1109,8 +1105,8 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_tmp3_ = _tmp6_;
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1113 "SlideshowPage.c"
-					goto __catch463_g_error;
+#line 1109 "SlideshowPage.c"
+					goto __catch460_g_error;
 				}
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp7_ = _tmp3_;
@@ -1122,10 +1118,10 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_vala_next_pixbuf = _tmp7_;
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_tmp3_);
-#line 1126 "SlideshowPage.c"
+#line 1122 "SlideshowPage.c"
 			}
-			goto __finally463;
-			__catch463_g_error:
+			goto __finally460;
+			__catch460_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp8_ = NULL;
@@ -1176,7 +1172,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_tmp17_ = direction;
 #line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp17_ == DIRECTION_FORWARD) {
-#line 1180 "SlideshowPage.c"
+#line 1176 "SlideshowPage.c"
 					ViewCollection* _tmp18_ = NULL;
 					DataView* _tmp19_ = NULL;
 					DataView* _tmp20_ = NULL;
@@ -1190,7 +1186,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 					_g_object_unref0 (_tmp16_);
 #line 232 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp16_ = _tmp20_;
-#line 1194 "SlideshowPage.c"
+#line 1190 "SlideshowPage.c"
 				} else {
 					ViewCollection* _tmp21_ = NULL;
 					DataView* _tmp22_ = NULL;
@@ -1205,7 +1201,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 					_g_object_unref0 (_tmp16_);
 #line 233 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp16_ = _tmp23_;
-#line 1209 "SlideshowPage.c"
+#line 1205 "SlideshowPage.c"
 				}
 #line 231 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp24_ = _g_object_ref0 (_tmp16_);
@@ -1227,7 +1223,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_tmp30_ = start;
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp29_ == _tmp30_) {
-#line 1231 "SlideshowPage.c"
+#line 1227 "SlideshowPage.c"
 					Photo* _tmp31_ = NULL;
 					Photo* _tmp32_ = NULL;
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1236,17 +1232,17 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 					_tmp32_ = self->priv->current;
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp28_ = _tmp31_ != _tmp32_;
-#line 1240 "SlideshowPage.c"
+#line 1236 "SlideshowPage.c"
 				} else {
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp28_ = FALSE;
-#line 1244 "SlideshowPage.c"
+#line 1240 "SlideshowPage.c"
 				}
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp28_) {
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp27_ = TRUE;
-#line 1250 "SlideshowPage.c"
+#line 1246 "SlideshowPage.c"
 				} else {
 					Photo* _tmp33_ = NULL;
 					Photo* _tmp34_ = NULL;
@@ -1256,11 +1252,11 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 					_tmp34_ = self->priv->current;
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					_tmp27_ = _tmp33_ == _tmp34_;
-#line 1260 "SlideshowPage.c"
+#line 1256 "SlideshowPage.c"
 				}
 #line 237 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (_tmp27_) {
-#line 1264 "SlideshowPage.c"
+#line 1260 "SlideshowPage.c"
 					const gchar* _tmp35_ = NULL;
 					GtkWindow* _tmp36_ = NULL;
 					GtkWindow* _tmp37_ = NULL;
@@ -1304,25 +1300,25 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 					if (next) {
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						*next = _vala_next;
-#line 1308 "SlideshowPage.c"
+#line 1304 "SlideshowPage.c"
 					} else {
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						_g_object_unref0 (_vala_next);
-#line 1312 "SlideshowPage.c"
+#line 1308 "SlideshowPage.c"
 					}
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					if (next_pixbuf) {
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						*next_pixbuf = _vala_next_pixbuf;
-#line 1318 "SlideshowPage.c"
+#line 1314 "SlideshowPage.c"
 					} else {
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 						_g_object_unref0 (_vala_next_pixbuf);
-#line 1322 "SlideshowPage.c"
+#line 1318 "SlideshowPage.c"
 					}
 #line 244 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 					return result;
-#line 1326 "SlideshowPage.c"
+#line 1322 "SlideshowPage.c"
 				}
 #line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_tmp16_);
@@ -1332,9 +1328,9 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_g_error_free0 (err);
 #line 247 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				continue;
-#line 1336 "SlideshowPage.c"
+#line 1332 "SlideshowPage.c"
 			}
-			__finally463:
+			__finally460:
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1343,7 +1339,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				g_clear_error (&_inner_error_);
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				return FALSE;
-#line 1347 "SlideshowPage.c"
+#line 1343 "SlideshowPage.c"
 			}
 #line 253 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp40_ = self->priv->controller;
@@ -1409,46 +1405,46 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 			if (next) {
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				*next = _vala_next;
-#line 1413 "SlideshowPage.c"
+#line 1409 "SlideshowPage.c"
 			} else {
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_vala_next);
-#line 1417 "SlideshowPage.c"
+#line 1413 "SlideshowPage.c"
 			}
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (next_pixbuf) {
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				*next_pixbuf = _vala_next_pixbuf;
-#line 1423 "SlideshowPage.c"
+#line 1419 "SlideshowPage.c"
 			} else {
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_g_object_unref0 (_vala_next_pixbuf);
-#line 1427 "SlideshowPage.c"
+#line 1423 "SlideshowPage.c"
 			}
 #line 263 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			return result;
-#line 1431 "SlideshowPage.c"
+#line 1427 "SlideshowPage.c"
 		}
 	}
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (next) {
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		*next = _vala_next;
-#line 1438 "SlideshowPage.c"
+#line 1434 "SlideshowPage.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_vala_next);
-#line 1442 "SlideshowPage.c"
+#line 1438 "SlideshowPage.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (next_pixbuf) {
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		*next_pixbuf = _vala_next_pixbuf;
-#line 1448 "SlideshowPage.c"
+#line 1444 "SlideshowPage.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_vala_next_pixbuf);
-#line 1452 "SlideshowPage.c"
+#line 1448 "SlideshowPage.c"
 	}
 }
 
@@ -1463,7 +1459,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {
 	_tmp0_ = self->priv->playing;
 #line 268 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp0_) {
-#line 1467 "SlideshowPage.c"
+#line 1463 "SlideshowPage.c"
 		GtkToolButton* _tmp1_ = NULL;
 		GtkToolButton* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -1485,7 +1481,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {
 		_tmp5_ = _ ("Continue the slideshow");
 #line 271 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_tool_item_get_type (), GtkToolItem), _tmp5_);
-#line 1489 "SlideshowPage.c"
+#line 1485 "SlideshowPage.c"
 	} else {
 		GtkToolButton* _tmp6_ = NULL;
 		GtkToolButton* _tmp7_ = NULL;
@@ -1508,7 +1504,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {
 		_tmp10_ = _ ("Pause the slideshow");
 #line 275 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_tool_item_get_type (), GtkToolItem), _tmp10_);
-#line 1512 "SlideshowPage.c"
+#line 1508 "SlideshowPage.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp11_ = self->priv->playing;
@@ -1518,7 +1514,7 @@ static void slideshow_page_on_play_pause (SlideshowPage* self) {
 	_tmp12_ = self->priv->timer;
 #line 281 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_timer_start (_tmp12_);
-#line 1522 "SlideshowPage.c"
+#line 1518 "SlideshowPage.c"
 }
 
 
@@ -1565,7 +1561,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 	prev_view = _tmp7_;
 #line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	while (TRUE) {
-#line 1569 "SlideshowPage.c"
+#line 1565 "SlideshowPage.c"
 		DataView* _tmp8_ = NULL;
 		DataView* _tmp9_ = NULL;
 		DataSource* _tmp10_ = NULL;
@@ -1582,7 +1578,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 		if (!(_tmp8_ != NULL)) {
 #line 291 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1586 "SlideshowPage.c"
+#line 1582 "SlideshowPage.c"
 		}
 #line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = prev_view;
@@ -1596,7 +1592,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 		_g_object_unref0 (_tmp11_);
 #line 292 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		if (_tmp12_) {
-#line 1600 "SlideshowPage.c"
+#line 1596 "SlideshowPage.c"
 			DataView* _tmp13_ = NULL;
 			DataSource* _tmp14_ = NULL;
 #line 293 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1609,7 +1605,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 			prev_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo);
 #line 294 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1613 "SlideshowPage.c"
+#line 1609 "SlideshowPage.c"
 		}
 #line 297 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp15_ = self->priv->controller;
@@ -1640,7 +1636,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 			_g_object_unref0 (view);
 #line 301 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			return;
-#line 1643 "SlideshowPage.c"
+#line 1639 "SlideshowPage.c"
 		}
 	}
 #line 305 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1655,7 +1651,7 @@ static void slideshow_page_real_on_previous_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (prev_photo);
 #line 284 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (view);
-#line 1658 "SlideshowPage.c"
+#line 1654 "SlideshowPage.c"
 }
 
 
@@ -1707,7 +1703,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 	next_view = _tmp7_;
 #line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	while (TRUE) {
-#line 1710 "SlideshowPage.c"
+#line 1706 "SlideshowPage.c"
 		DataView* _tmp8_ = NULL;
 		DataView* _tmp9_ = NULL;
 		DataSource* _tmp10_ = NULL;
@@ -1724,7 +1720,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 		if (!(_tmp8_ != NULL)) {
 #line 315 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1727 "SlideshowPage.c"
+#line 1723 "SlideshowPage.c"
 		}
 #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = next_view;
@@ -1738,7 +1734,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 		_g_object_unref0 (_tmp11_);
 #line 316 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		if (_tmp12_) {
-#line 1741 "SlideshowPage.c"
+#line 1737 "SlideshowPage.c"
 			DataView* _tmp13_ = NULL;
 			DataSource* _tmp14_ = NULL;
 #line 317 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1751,7 +1747,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 			next_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo);
 #line 318 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			break;
-#line 1754 "SlideshowPage.c"
+#line 1750 "SlideshowPage.c"
 		}
 #line 321 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp15_ = self->priv->controller;
@@ -1782,7 +1778,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 			_g_object_unref0 (view);
 #line 325 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			return;
-#line 1784 "SlideshowPage.c"
+#line 1780 "SlideshowPage.c"
 		}
 	}
 #line 329 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1803,7 +1799,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 	if (_tmp24_) {
 #line 331 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		slideshow_page_random_transition_effect (self);
-#line 1805 "SlideshowPage.c"
+#line 1801 "SlideshowPage.c"
 	}
 #line 334 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp25_ = next_photo;
@@ -1817,7 +1813,7 @@ static void slideshow_page_real_on_next_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (next_photo);
 #line 308 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (view);
-#line 1819 "SlideshowPage.c"
+#line 1815 "SlideshowPage.c"
 }
 
 
@@ -1859,7 +1855,7 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction
 	next_pixbuf = _tmp5_;
 #line 342 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp6_) {
-#line 1861 "SlideshowPage.c"
+#line 1857 "SlideshowPage.c"
 		GdkPixbuf* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
@@ -1874,7 +1870,7 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction
 		_tmp10_ = direction;
 #line 343 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp7_, &_tmp9_, &_tmp10_);
-#line 1876 "SlideshowPage.c"
+#line 1872 "SlideshowPage.c"
 	}
 #line 346 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp11_ = self->priv->timer;
@@ -1882,7 +1878,7 @@ static void slideshow_page_advance (SlideshowPage* self, Photo* photo, Direction
 	g_timer_start (_tmp11_);
 #line 337 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (next_pixbuf);
-#line 1884 "SlideshowPage.c"
+#line 1880 "SlideshowPage.c"
 }
 
 
@@ -1906,7 +1902,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 		result = FALSE;
 #line 351 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1908 "SlideshowPage.c"
+#line 1904 "SlideshowPage.c"
 	}
 #line 353 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp1_ = self->priv->playing;
@@ -1916,7 +1912,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 		result = TRUE;
 #line 354 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1918 "SlideshowPage.c"
+#line 1914 "SlideshowPage.c"
 	}
 #line 356 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp2_ = self->priv->timer;
@@ -1938,7 +1934,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 		result = TRUE;
 #line 357 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 1940 "SlideshowPage.c"
+#line 1936 "SlideshowPage.c"
 	}
 #line 359 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
@@ -1946,7 +1942,7 @@ static gboolean slideshow_page_auto_advance (SlideshowPage* self) {
 	result = TRUE;
 #line 361 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 1948 "SlideshowPage.c"
+#line 1944 "SlideshowPage.c"
 }
 
 
@@ -1961,7 +1957,7 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
 	GQuark _tmp5_ = 0U;
 #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 1963 "SlideshowPage.c"
+#line 1959 "SlideshowPage.c"
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
 #line 364 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -1984,27 +1980,27 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
 	if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("space")))) {
 #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		switch (0) {
-#line 1986 "SlideshowPage.c"
+#line 1982 "SlideshowPage.c"
 			default:
 			{
 #line 368 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				slideshow_page_on_play_pause (self);
 #line 369 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				break;
-#line 1993 "SlideshowPage.c"
+#line 1989 "SlideshowPage.c"
 			}
 		}
 	} else {
 #line 366 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		switch (0) {
-#line 1999 "SlideshowPage.c"
+#line 1995 "SlideshowPage.c"
 			default:
 			{
 #line 372 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				handled = FALSE;
 #line 373 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				break;
-#line 2006 "SlideshowPage.c"
+#line 2002 "SlideshowPage.c"
 			}
 		}
 	}
@@ -2016,11 +2012,11 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
 		result = TRUE;
 #line 377 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 2018 "SlideshowPage.c"
+#line 2014 "SlideshowPage.c"
 	}
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event != NULL) {
-#line 2022 "SlideshowPage.c"
+#line 2018 "SlideshowPage.c"
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2029,17 +2025,17 @@ static gboolean slideshow_page_real_key_press_event (GtkWidget* base, GdkEventKe
 		_tmp9_ = GTK_WIDGET_CLASS (slideshow_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp8_);
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = _tmp9_;
-#line 2031 "SlideshowPage.c"
+#line 2027 "SlideshowPage.c"
 	} else {
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = TRUE;
-#line 2035 "SlideshowPage.c"
+#line 2031 "SlideshowPage.c"
 	}
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	result = _tmp7_;
 #line 379 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 2041 "SlideshowPage.c"
+#line 2037 "SlideshowPage.c"
 }
 
 
@@ -2080,7 +2076,7 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {
 	_tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_dialog_get_type (), GtkDialog));
 #line 390 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) {
-#line 2082 "SlideshowPage.c"
+#line 2078 "SlideshowPage.c"
 		ConfigFacade* _tmp5_ = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		SlideshowPageSettingsDialog* _tmp7_ = NULL;
@@ -2152,7 +2148,7 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {
 		_g_object_unref0 (_tmp19_);
 #line 398 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		slideshow_page_update_transition_effect (self);
-#line 2154 "SlideshowPage.c"
+#line 2150 "SlideshowPage.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp22_ = settings_dialog;
@@ -2168,7 +2164,7 @@ static void slideshow_page_on_change_settings (SlideshowPage* self) {
 	g_timer_start (_tmp24_);
 #line 382 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_object_unref0 (settings_dialog);
-#line 2170 "SlideshowPage.c"
+#line 2166 "SlideshowPage.c"
 }
 
 
@@ -2213,7 +2209,7 @@ static void slideshow_page_update_transition_effect (SlideshowPage* self) {
 	single_photo_page_set_transition (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), effect_id, (gint) (effect_delay * 1000.0));
 #line 406 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (effect_id);
-#line 2215 "SlideshowPage.c"
+#line 2211 "SlideshowPage.c"
 }
 
 
@@ -2253,7 +2249,7 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {
 	_tmp5__length1 = self->priv->transitions_length1;
 #line 416 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (0 < _tmp5__length1) {
-#line 2255 "SlideshowPage.c"
+#line 2251 "SlideshowPage.c"
 		gint random = 0;
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
@@ -2285,7 +2281,7 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {
 		_g_free0 (effect_id);
 #line 418 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		effect_id = _tmp11_;
-#line 2287 "SlideshowPage.c"
+#line 2283 "SlideshowPage.c"
 	}
 #line 420 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = effect_id;
@@ -2295,7 +2291,7 @@ static void slideshow_page_random_transition_effect (SlideshowPage* self) {
 	single_photo_page_set_transition (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, (gint) (_tmp13_ * 1000.0));
 #line 413 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (effect_id);
-#line 2297 "SlideshowPage.c"
+#line 2293 "SlideshowPage.c"
 }
 
 
@@ -2368,14 +2364,14 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 	if (_tmp3_ == NULL) {
 #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = TRUE;
-#line 2370 "SlideshowPage.c"
+#line 2366 "SlideshowPage.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
 #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp4_ = title;
 #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
-#line 2377 "SlideshowPage.c"
+#line 2373 "SlideshowPage.c"
 	}
 #line 428 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_) {
@@ -2383,7 +2379,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 		_g_free0 (title);
 #line 429 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return;
-#line 2385 "SlideshowPage.c"
+#line 2381 "SlideshowPage.c"
 	}
 #line 431 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp5_ = title;
@@ -2451,7 +2447,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 	_tmp27_ = _tmp26_.height;
 #line 445 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if ((_tmp24_ + _tmp25_) >= (_tmp27_ * 0.95)) {
-#line 2453 "SlideshowPage.c"
+#line 2449 "SlideshowPage.c"
 		Dimensions _tmp28_ = {0};
 		gint _tmp29_ = 0;
 		gint _tmp30_ = 0;
@@ -2463,7 +2459,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 		_tmp30_ = title_height;
 #line 446 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		y = (_tmp29_ * 0.95) - _tmp30_;
-#line 2465 "SlideshowPage.c"
+#line 2461 "SlideshowPage.c"
 	}
 #line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp31_ = x;
@@ -2475,7 +2471,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 	_tmp34_ = _tmp33_.width;
 #line 448 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if ((_tmp31_ + _tmp32_) >= (_tmp34_ * 0.95)) {
-#line 2477 "SlideshowPage.c"
+#line 2473 "SlideshowPage.c"
 		Dimensions _tmp35_ = {0};
 		gint _tmp36_ = 0;
 		gint _tmp37_ = 0;
@@ -2487,7 +2483,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 		_tmp37_ = title_width;
 #line 449 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		x = (gdouble) ((_tmp36_ / 2) - (_tmp37_ / 2));
-#line 2489 "SlideshowPage.c"
+#line 2485 "SlideshowPage.c"
 	}
 #line 451 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp38_ = ctx;
@@ -2533,7 +2529,7 @@ static void slideshow_page_paint_title (SlideshowPage* self, cairo_t* ctx, Dimen
 	_g_object_unref0 (layout);
 #line 424 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (title);
-#line 2535 "SlideshowPage.c"
+#line 2531 "SlideshowPage.c"
 }
 
 
@@ -2570,21 +2566,21 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime
 	_g_object_unref0 (_tmp4_);
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp6_) {
-#line 2572 "SlideshowPage.c"
+#line 2568 "SlideshowPage.c"
 		gboolean _tmp7_ = FALSE;
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp7_ = single_photo_page_is_transition_in_progress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = !_tmp7_;
-#line 2578 "SlideshowPage.c"
+#line 2574 "SlideshowPage.c"
 	} else {
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = FALSE;
-#line 2582 "SlideshowPage.c"
+#line 2578 "SlideshowPage.c"
 	}
 #line 463 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_) {
-#line 2586 "SlideshowPage.c"
+#line 2582 "SlideshowPage.c"
 		cairo_t* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
 #line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2593,7 +2589,7 @@ static void slideshow_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dime
 		_tmp9_ = *ctx_dim;
 #line 464 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		slideshow_page_paint_title (self, _tmp8_, &_tmp9_);
-#line 2595 "SlideshowPage.c"
+#line 2591 "SlideshowPage.c"
 	}
 }
 
@@ -2603,14 +2599,14 @@ static gint _utf8_ci_compare_gcompare_data_func (gconstpointer a, gconstpointer
 	result = utf8_ci_compare (a, b);
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 2605 "SlideshowPage.c"
+#line 2601 "SlideshowPage.c"
 }
 
 
 static void _slideshow_page_settings_dialog_on_transition_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	slideshow_page_settings_dialog_on_transition_changed ((SlideshowPageSettingsDialog*) self);
-#line 2612 "SlideshowPage.c"
+#line 2608 "SlideshowPage.c"
 }
 
 
@@ -2845,7 +2841,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_get_type (), GtkComboBox), 0);
 #line 72 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	i = 1;
-#line 2847 "SlideshowPage.c"
+#line 2843 "SlideshowPage.c"
 	{
 		GeeIterator* _display_name_it = NULL;
 		TransitionEffectsManager* _tmp43_ = NULL;
@@ -2874,7 +2870,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 		_display_name_it = _tmp48_;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		while (TRUE) {
-#line 2876 "SlideshowPage.c"
+#line 2872 "SlideshowPage.c"
 			GeeIterator* _tmp49_ = NULL;
 			gboolean _tmp50_ = FALSE;
 			gchar* display_name = NULL;
@@ -2900,7 +2896,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 			if (!_tmp50_) {
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				break;
-#line 2902 "SlideshowPage.c"
+#line 2898 "SlideshowPage.c"
 			}
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp51_ = _display_name_it;
@@ -2918,7 +2914,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 				_g_free0 (display_name);
 #line 76 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				continue;
-#line 2920 "SlideshowPage.c"
+#line 2916 "SlideshowPage.c"
 			}
 #line 78 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp55_ = self->priv->transition_effect_selector;
@@ -2946,7 +2942,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 			_transition_effects_manager_unref0 (_tmp59_);
 #line 79 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (_tmp63_) {
-#line 2948 "SlideshowPage.c"
+#line 2944 "SlideshowPage.c"
 				GtkComboBoxText* _tmp64_ = NULL;
 				gint _tmp65_ = 0;
 #line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
@@ -2955,7 +2951,7 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 				_tmp65_ = i;
 #line 80 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_combo_box_get_type (), GtkComboBox), _tmp65_);
-#line 2957 "SlideshowPage.c"
+#line 2953 "SlideshowPage.c"
 			}
 #line 82 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_tmp66_ = i;
@@ -2963,11 +2959,11 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 			i = _tmp66_ + 1;
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			_g_free0 (display_name);
-#line 2965 "SlideshowPage.c"
+#line 2961 "SlideshowPage.c"
 		}
 #line 73 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_g_object_unref0 (_display_name_it);
-#line 2969 "SlideshowPage.c"
+#line 2965 "SlideshowPage.c"
 	}
 #line 84 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp67_ = self->priv->transition_effect_selector;
@@ -3075,14 +3071,14 @@ static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_construct (GT
 	_g_object_unref0 (adjustment);
 #line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return self;
-#line 3077 "SlideshowPage.c"
+#line 3073 "SlideshowPage.c"
 }
 
 
 static SlideshowPageSettingsDialog* slideshow_page_settings_dialog_new (void) {
 #line 37 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return slideshow_page_settings_dialog_construct (SLIDESHOW_PAGE_TYPE_SETTINGS_DIALOG);
-#line 3084 "SlideshowPage.c"
+#line 3080 "SlideshowPage.c"
 }
 
 
@@ -3107,17 +3103,17 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS
 	_tmp3_ = selected;
 #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp3_ != NULL) {
-#line 3109 "SlideshowPage.c"
+#line 3105 "SlideshowPage.c"
 		const gchar* _tmp4_ = NULL;
 #line 111 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp4_ = selected;
 #line 111 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID) != 0;
-#line 3115 "SlideshowPage.c"
+#line 3111 "SlideshowPage.c"
 	} else {
 #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp2_ = FALSE;
-#line 3119 "SlideshowPage.c"
+#line 3115 "SlideshowPage.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	sensitive = _tmp2_;
@@ -3131,7 +3127,7 @@ static void slideshow_page_settings_dialog_on_transition_changed (SlideshowPageS
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitive);
 #line 108 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_g_free0 (selected);
-#line 3133 "SlideshowPage.c"
+#line 3129 "SlideshowPage.c"
 }
 
 
@@ -3149,7 +3145,7 @@ static gdouble slideshow_page_settings_dialog_get_delay (SlideshowPageSettingsDi
 	result = _tmp1_;
 #line 118 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3151 "SlideshowPage.c"
+#line 3147 "SlideshowPage.c"
 }
 
 
@@ -3167,7 +3163,7 @@ static gdouble slideshow_page_settings_dialog_get_transition_delay (SlideshowPag
 	result = _tmp1_;
 #line 122 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3169 "SlideshowPage.c"
+#line 3165 "SlideshowPage.c"
 }
 
 
@@ -3198,7 +3194,7 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
 	_tmp2_ = active;
 #line 127 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp2_ == NULL) {
-#line 3200 "SlideshowPage.c"
+#line 3196 "SlideshowPage.c"
 		gchar* _tmp3_ = NULL;
 #line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp3_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
@@ -3208,7 +3204,7 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
 		_g_free0 (active);
 #line 128 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		return result;
-#line 3210 "SlideshowPage.c"
+#line 3206 "SlideshowPage.c"
 	}
 #line 130 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp4_ = transition_effects_manager_get_instance ();
@@ -3228,17 +3224,17 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
 	_tmp10_ = id;
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	if (_tmp10_ != NULL) {
-#line 3230 "SlideshowPage.c"
+#line 3226 "SlideshowPage.c"
 		const gchar* _tmp11_ = NULL;
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp11_ = id;
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = _tmp11_;
-#line 3236 "SlideshowPage.c"
+#line 3232 "SlideshowPage.c"
 	} else {
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 		_tmp9_ = TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID;
-#line 3240 "SlideshowPage.c"
+#line 3236 "SlideshowPage.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	_tmp12_ = g_strdup (_tmp9_);
@@ -3250,7 +3246,7 @@ static gchar* slideshow_page_settings_dialog_get_transition_effect_id (Slideshow
 	_g_free0 (active);
 #line 132 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3252 "SlideshowPage.c"
+#line 3248 "SlideshowPage.c"
 }
 
 
@@ -3271,7 +3267,7 @@ static gboolean slideshow_page_settings_dialog_get_show_title (SlideshowPageSett
 	result = _tmp2_;
 #line 136 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	return result;
-#line 3273 "SlideshowPage.c"
+#line 3269 "SlideshowPage.c"
 }
 
 
@@ -3282,7 +3278,7 @@ static void slideshow_page_settings_dialog_class_init (SlideshowPageSettingsDial
 	g_type_class_add_private (klass, sizeof (SlideshowPageSettingsDialogPrivate));
 #line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = slideshow_page_settings_dialog_finalize;
-#line 3284 "SlideshowPage.c"
+#line 3280 "SlideshowPage.c"
 }
 
 
@@ -3291,7 +3287,7 @@ static void slideshow_page_settings_dialog_instance_init (SlideshowPageSettingsD
 	self->priv = SLIDESHOW_PAGE_SETTINGS_DIALOG_GET_PRIVATE (self);
 #line 27 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->builder = NULL;
-#line 3293 "SlideshowPage.c"
+#line 3289 "SlideshowPage.c"
 }
 
 
@@ -3319,7 +3315,7 @@ static void slideshow_page_settings_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->pane);
 #line 26 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	G_OBJECT_CLASS (slideshow_page_settings_dialog_parent_class)->finalize (obj);
-#line 3321 "SlideshowPage.c"
+#line 3317 "SlideshowPage.c"
 }
 
 
@@ -3356,7 +3352,7 @@ static void slideshow_page_class_init (SlideshowPageClass * klass) {
 	G_OBJECT_CLASS (klass)->finalize = slideshow_page_finalize;
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	g_signal_new ("hide_toolbar", TYPE_SLIDESHOW_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3358 "SlideshowPage.c"
+#line 3354 "SlideshowPage.c"
 }
 
 
@@ -3374,7 +3370,7 @@ static void slideshow_page_instance_init (SlideshowPage * self) {
 	self->priv->playing = TRUE;
 #line 19 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	self->priv->exiting = FALSE;
-#line 3376 "SlideshowPage.c"
+#line 3372 "SlideshowPage.c"
 }
 
 
@@ -3402,7 +3398,7 @@ static void slideshow_page_finalize (GObject* obj) {
 	_screensaver_unref0 (self->priv->screensaver);
 #line 7 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 	G_OBJECT_CLASS (slideshow_page_parent_class)->finalize (obj);
-#line 3404 "SlideshowPage.c"
+#line 3400 "SlideshowPage.c"
 }
 
 
diff --git a/src/Tag.c b/src/Tag.c
index 9df503d..4813ce0 100644
--- a/src/Tag.c
+++ b/src/Tag.c
@@ -923,7 +923,7 @@ GType prepare_input_text_options_get_type (void) G_GNUC_CONST;
 gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length);
 #define DEFAULT_USER_TEXT_INPUT_LENGTH 1024
 gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length1);
-static void _vala_array_add293 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add127 (gchar*** array, int* length, int* size, gchar* value);
 static void tag_set_raw_flat_name (Tag* self, const gchar* name);
 void tag_table_rename (TagTable* self, TagID* tag_id, const gchar* new_name, GError** error);
 void data_object_notify_altered (DataObject* self, Alteration* alteration);
@@ -3240,7 +3240,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 393 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3243 "Tag.c"
-				goto __catch472_database_error;
+				goto __catch469_database_error;
 			}
 #line 393 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (rows);
@@ -3264,8 +3264,8 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 		_g_object_unref0 (_tmp1_);
 #line 3266 "Tag.c"
 	}
-	goto __finally472;
-	__catch472_database_error:
+	goto __finally469;
+	__catch469_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -3281,7 +3281,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 		_g_error_free0 (err);
 #line 3283 "Tag.c"
 	}
-	__finally472:
+	__finally469:
 #line 392 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 392 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -3423,7 +3423,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 418 "/home/jens/Source/shotwell/src/Tag.vala"
 							if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3426 "Tag.c"
-								goto __catch473_database_error;
+								goto __catch470_database_error;
 							}
 #line 418 "/home/jens/Source/shotwell/src/Tag.vala"
 							_g_free0 (name);
@@ -3444,8 +3444,8 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 #line 3445 "Tag.c"
 						}
 					}
-					goto __finally473;
-					__catch473_database_error:
+					goto __finally470;
+					__catch470_database_error:
 					{
 						GError* err = NULL;
 						TagRow* _tmp30_ = NULL;
@@ -3470,7 +3470,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 						_g_error_free0 (err);
 #line 3472 "Tag.c"
 					}
-					__finally473:
+					__finally470:
 #line 417 "/home/jens/Source/shotwell/src/Tag.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 417 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -4577,7 +4577,7 @@ Tag* tag_for_path (const gchar* name) {
 #line 563 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 4580 "Tag.c"
-				goto __catch474_database_error;
+				goto __catch471_database_error;
 			}
 #line 563 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (tag);
@@ -4599,8 +4599,8 @@ Tag* tag_for_path (const gchar* name) {
 		_tag_row_unref0 (_tmp8_);
 #line 4601 "Tag.c"
 	}
-	goto __finally474;
-	__catch474_database_error:
+	goto __finally471;
+	__catch471_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
@@ -4616,7 +4616,7 @@ Tag* tag_for_path (const gchar* name) {
 		_g_error_free0 (err);
 #line 4618 "Tag.c"
 	}
-	__finally474:
+	__finally471:
 #line 562 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 562 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5336,7 +5336,7 @@ gchar* tag_prep_tag_name (const gchar* name) {
 }
 
 
-static void _vala_array_add293 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add127 (gchar*** array, int* length, int* size, gchar* value) {
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
 	if ((*length) == (*size)) {
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5446,7 +5446,7 @@ gchar** tag_prep_tag_names (gchar** names, int names_length1, int* result_length
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
 					_tmp12_ = g_strdup (_tmp11_);
 #line 665 "/home/jens/Source/shotwell/src/Tag.vala"
-					_vala_array_add293 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+					_vala_array_add127 (&_result_, &_result__length1, &__result__size_, _tmp12_);
 #line 5451 "Tag.c"
 				}
 #line 662 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5532,7 +5532,7 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 #line 678 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5535 "Tag.c"
-				goto __catch475_database_error;
+				goto __catch472_database_error;
 			}
 #line 678 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_free0 (prepped_name);
@@ -5545,8 +5545,8 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 #line 5546 "Tag.c"
 		}
 	}
-	goto __finally475;
-	__catch475_database_error:
+	goto __finally472;
+	__catch472_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -5566,7 +5566,7 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 		return;
 #line 5568 "Tag.c"
 	}
-	__finally475:
+	__finally472:
 #line 677 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 677 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5678,7 +5678,7 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 #line 700 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5681 "Tag.c"
-				goto __catch476_database_error;
+				goto __catch473_database_error;
 			}
 #line 700 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_free0 (prepped_path);
@@ -5691,8 +5691,8 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 #line 5692 "Tag.c"
 		}
 	}
-	goto __finally476;
-	__catch476_database_error:
+	goto __finally473;
+	__catch473_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
@@ -5712,7 +5712,7 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 		return;
 #line 5714 "Tag.c"
 	}
-	__finally476:
+	__finally473:
 #line 699 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 699 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7069,7 +7069,7 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7072 "Tag.c"
-				goto __catch477_database_error;
+				goto __catch474_database_error;
 			}
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7085,8 +7085,8 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 		_tmp6_->tag_id = _tmp0_;
 #line 7087 "Tag.c"
 	}
-	goto __finally477;
-	__catch477_database_error:
+	goto __finally474;
+	__catch474_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -7102,7 +7102,7 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 		_g_error_free0 (err);
 #line 7104 "Tag.c"
 	}
-	__finally477:
+	__finally474:
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9016,7 +9016,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 #line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 9019 "Tag.c"
-				goto __catch478_database_error;
+				goto __catch475_database_error;
 			}
 #line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (removed_sources);
@@ -9031,8 +9031,8 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 #line 9032 "Tag.c"
 		}
 	}
-	goto __finally478;
-	__catch478_database_error:
+	goto __finally475;
+	__catch475_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp57_ = NULL;
@@ -9048,7 +9048,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 		_g_error_free0 (err);
 #line 9050 "Tag.c"
 	}
-	__finally478:
+	__finally475:
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9260,7 +9260,7 @@ static void tag_real_destroy (DataSource* base) {
 #line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 9263 "Tag.c"
-				goto __catch479_database_error;
+				goto __catch476_database_error;
 			}
 #line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9271,8 +9271,8 @@ static void tag_real_destroy (DataSource* base) {
 #line 9272 "Tag.c"
 		}
 	}
-	goto __finally479;
-	__catch479_database_error:
+	goto __finally476;
+	__catch476_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
@@ -9288,7 +9288,7 @@ static void tag_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 9290 "Tag.c"
 	}
-	__finally479:
+	__finally476:
 #line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c
index e691057..70c3eca 100644
--- a/src/ThumbnailCache.c
+++ b/src/ThumbnailCache.c
@@ -1802,7 +1802,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1805 "ThumbnailCache.c"
-			goto __catch236_g_error;
+			goto __catch233_g_error;
 		}
 #line 300 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp9_ = _tmp4_;
@@ -1816,8 +1816,8 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 		_g_object_unref0 (_tmp4_);
 #line 1818 "ThumbnailCache.c"
 	}
-	goto __finally236;
-	__catch236_g_error:
+	goto __finally233;
+	__catch233_g_error:
 	{
 		GError* err = NULL;
 		GdkPixbuf* _tmp10_ = NULL;
@@ -1839,7 +1839,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_g_error_free0 (err);
 #line 1842 "ThumbnailCache.c"
-			goto __finally236;
+			goto __finally233;
 		}
 #line 305 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		_tmp13_ = _tmp10_;
@@ -1855,7 +1855,7 @@ void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader
 		_g_error_free0 (err);
 #line 1857 "ThumbnailCache.c"
 	}
-	__finally236:
+	__finally233:
 #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 299 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2390,11 +2390,11 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 #line 423 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2393 "ThumbnailCache.c"
-				goto __catch237_g_error;
+				goto __catch234_g_error;
 			}
 		}
-		goto __finally237;
-		__catch237_g_error:
+		goto __finally234;
+		__catch234_g_error:
 		{
 			GError* err = NULL;
 			ThumbnailCacheAsyncFetchJob* _tmp14_ = NULL;
@@ -2418,7 +2418,7 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 			_g_error_free0 (err);
 #line 2420 "ThumbnailCache.c"
 		}
-		__finally237:
+		__finally234:
 #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 422 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2771,11 +2771,11 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s
 #line 494 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2774 "ThumbnailCache.c"
-			goto __catch238_g_error;
+			goto __catch235_g_error;
 		}
 	}
-	goto __finally238;
-	__catch238_g_error:
+	goto __finally235;
+	__catch235_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -2802,7 +2802,7 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s
 		_g_error_free0 (err);
 #line 2804 "ThumbnailCache.c"
 	}
-	__finally238:
+	__finally235:
 #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 493 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2946,11 +2946,11 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour
 #line 529 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2949 "ThumbnailCache.c"
-			goto __catch239_g_error;
+			goto __catch236_g_error;
 		}
 	}
-	goto __finally239;
-	__catch239_g_error:
+	goto __finally236;
+	__catch236_g_error:
 	{
 		GError* err = NULL;
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -2961,7 +2961,7 @@ static void _thumbnail_cache_remove (ThumbnailCache* self, ThumbnailSource* sour
 		_g_error_free0 (err);
 #line 2963 "ThumbnailCache.c"
 	}
-	__finally239:
+	__finally236:
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4079,7 +4079,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4081 "ThumbnailCache.c"
-				goto __catch240_g_error;
+				goto __catch237_g_error;
 			}
 #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp6_ = _tmp1_;
@@ -4148,8 +4148,8 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp8_);
 #line 4149 "ThumbnailCache.c"
 	}
-	goto __finally240;
-	__catch240_g_error:
+	goto __finally237;
+	__catch237_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp17_ = NULL;
@@ -4168,11 +4168,11 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 #line 137 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4170 "ThumbnailCache.c"
-					goto __catch241_g_error;
+					goto __catch238_g_error;
 				}
 			}
-			goto __finally241;
-			__catch241_g_error:
+			goto __finally238;
+			__catch238_g_error:
 			{
 				GError* generr = NULL;
 				GError* _tmp18_ = NULL;
@@ -4193,7 +4193,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 				_g_error_free0 (generr);
 #line 4194 "ThumbnailCache.c"
 			}
-			__finally241:
+			__finally238:
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4225,7 +4225,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 4226 "ThumbnailCache.c"
 	}
-	__finally240:
+	__finally237:
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 122 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
diff --git a/src/Tombstone.c b/src/Tombstone.c
index de95373..e9904b5 100644
--- a/src/Tombstone.c
+++ b/src/Tombstone.c
@@ -1320,7 +1320,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 1323 "Tombstone.c"
-				goto __catch548_database_error;
+				goto __catch545_database_error;
 			}
 #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (marker);
@@ -1333,8 +1333,8 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 #line 1334 "Tombstone.c"
 		}
 	}
-	goto __finally548;
-	__catch548_database_error:
+	goto __finally545;
+	__catch545_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -1350,7 +1350,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 		_g_error_free0 (err);
 #line 1352 "Tombstone.c"
 	}
-	__finally548:
+	__finally545:
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1636,7 +1636,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 1639 "Tombstone.c"
-						goto __catch549_g_error;
+						goto __catch546_g_error;
 					}
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_tmp22_ = NULL;
@@ -1652,8 +1652,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 					_g_object_unref0 (_data_->_tmp18_);
 #line 1654 "Tombstone.c"
 				}
-				goto __finally549;
-				__catch549_g_error:
+				goto __finally546;
+				__catch546_g_error:
 				{
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->err = _data_->_inner_error_;
@@ -1716,7 +1716,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 					_g_error_free0 (_data_->err);
 #line 1717 "Tombstone.c"
 				}
-				__finally549:
+				__finally546:
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1818,7 +1818,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				if (_data_->_inner_error_->domain == DATABASE_ERROR) {
 #line 1820 "Tombstone.c"
-					goto __catch550_database_error;
+					goto __catch547_database_error;
 				}
 #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_g_object_unref0 (_data_->marker);
@@ -1831,8 +1831,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 1831 "Tombstone.c"
 			}
 		}
-		goto __finally550;
-		__catch550_database_error:
+		goto __finally547;
+		__catch547_database_error:
 		{
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->err2 = _data_->_inner_error_;
@@ -1848,7 +1848,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 			_g_error_free0 (_data_->err2);
 #line 1849 "Tombstone.c"
 		}
-		__finally550:
+		__finally547:
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2374,7 +2374,7 @@ void tombstone_init (void) {
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 2376 "Tombstone.c"
-				goto __catch551_database_error;
+				goto __catch548_database_error;
 			}
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL);
@@ -2406,8 +2406,8 @@ void tombstone_init (void) {
 		_tmp1_ = (_vala_array_free (_tmp1_, _tmp1__length1, (GDestroyNotify) tombstone_row_unref), NULL);
 #line 2407 "Tombstone.c"
 	}
-	goto __finally551;
-	__catch551_database_error:
+	goto __finally548;
+	__catch548_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp8_ = NULL;
@@ -2423,7 +2423,7 @@ void tombstone_init (void) {
 		_g_error_free0 (err);
 #line 2424 "Tombstone.c"
 	}
-	__finally551:
+	__finally548:
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3210,7 +3210,7 @@ void tombstone_move (Tombstone* self, GFile* file) {
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3212 "Tombstone.c"
-				goto __catch552_database_error;
+				goto __catch549_database_error;
 			}
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3221,8 +3221,8 @@ void tombstone_move (Tombstone* self, GFile* file) {
 #line 3221 "Tombstone.c"
 		}
 	}
-	goto __finally552;
-	__catch552_database_error:
+	goto __finally549;
+	__catch549_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -3238,7 +3238,7 @@ void tombstone_move (Tombstone* self, GFile* file) {
 		_g_error_free0 (err);
 #line 3239 "Tombstone.c"
 	}
-	__finally552:
+	__finally549:
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3457,7 +3457,7 @@ static void tombstone_real_destroy (DataSource* base) {
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3459 "Tombstone.c"
-				goto __catch553_database_error;
+				goto __catch550_database_error;
 			}
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3468,8 +3468,8 @@ static void tombstone_real_destroy (DataSource* base) {
 #line 3468 "Tombstone.c"
 		}
 	}
-	goto __finally553;
-	__catch553_database_error:
+	goto __finally550;
+	__catch550_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -3485,7 +3485,7 @@ static void tombstone_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 3486 "Tombstone.c"
 	}
-	__finally553:
+	__finally550:
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
diff --git a/src/Upgrades.c b/src/Upgrades.c
index f55ebcc..ed5a4de 100644
--- a/src/Upgrades.c
+++ b/src/Upgrades.c
@@ -1123,14 +1123,14 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1126 "Upgrades.c"
-			goto __catch594_g_error;
+			goto __catch591_g_error;
 		}
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		self->priv->num_mimics = _tmp0_;
 #line 1131 "Upgrades.c"
 	}
-	goto __finally594;
-	__catch594_g_error:
+	goto __finally591;
+	__catch591_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
@@ -1149,7 +1149,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 		_g_error_free0 (e);
 #line 1151 "Upgrades.c"
 	}
-	__finally594:
+	__finally591:
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1195,7 +1195,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1198 "Upgrades.c"
-			goto __catch595_g_error;
+			goto __catch592_g_error;
 		}
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp3_ = self->priv->mimic_dir;
@@ -1204,11 +1204,11 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1207 "Upgrades.c"
-			goto __catch595_g_error;
+			goto __catch592_g_error;
 		}
 	}
-	goto __finally595;
-	__catch595_g_error:
+	goto __finally592;
+	__catch592_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp4_ = NULL;
@@ -1227,7 +1227,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		_g_error_free0 (e);
 #line 1229 "Upgrades.c"
 	}
-	__finally595:
+	__finally592:
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c
index 76d63fe..b3620b3 100644
--- a/src/VideoMetadata.c
+++ b/src/VideoMetadata.c
@@ -746,7 +746,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 80 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 749 "VideoMetadata.c"
-			goto __catch576_g_error;
+			goto __catch573_g_error;
 		}
 #line 81 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = test;
@@ -755,7 +755,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 81 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 758 "VideoMetadata.c"
-			goto __catch576_g_error;
+			goto __catch573_g_error;
 		}
 #line 84 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = test;
@@ -809,7 +809,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 95 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 812 "VideoMetadata.c"
-					goto __catch576_g_error;
+					goto __catch573_g_error;
 				}
 #line 96 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp13_ = test;
@@ -818,7 +818,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 96 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 821 "VideoMetadata.c"
-					goto __catch576_g_error;
+					goto __catch573_g_error;
 				}
 #line 97 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 				_tmp14_ = test;
@@ -833,8 +833,8 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 			}
 		}
 	}
-	goto __finally576;
-	__catch576_g_error:
+	goto __finally573;
+	__catch573_g_error:
 	{
 		GError* e = NULL;
 		GFile* _tmp16_ = NULL;
@@ -865,7 +865,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 		_g_error_free0 (e);
 #line 866 "VideoMetadata.c"
 	}
-	__finally576:
+	__finally573:
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -887,11 +887,11 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 889 "VideoMetadata.c"
-			goto __catch577_g_error;
+			goto __catch574_g_error;
 		}
 	}
-	goto __finally577;
-	__catch577_g_error:
+	goto __finally574;
+	__catch574_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp22_ = NULL;
@@ -910,7 +910,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 		_g_error_free0 (e);
 #line 911 "VideoMetadata.c"
 	}
-	__finally577:
+	__finally574:
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -963,7 +963,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 119 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 965 "VideoMetadata.c"
-			goto __catch578_g_error;
+			goto __catch575_g_error;
 		}
 #line 120 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		done = FALSE;
@@ -994,7 +994,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 123 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 996 "VideoMetadata.c"
-				goto __catch578_g_error;
+				goto __catch575_g_error;
 			}
 #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp5_ = test;
@@ -1058,7 +1058,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_quick_time_atom_unref0 (child);
 #line 1060 "VideoMetadata.c"
-						goto __catch578_g_error;
+						goto __catch575_g_error;
 					}
 #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp16_ = child;
@@ -1114,7 +1114,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 							_quick_time_atom_unref0 (child);
 #line 1116 "VideoMetadata.c"
-							goto __catch578_g_error;
+							goto __catch575_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_tmp26_ = child;
@@ -1127,7 +1127,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 							_quick_time_atom_unref0 (child);
 #line 1129 "VideoMetadata.c"
-							goto __catch578_g_error;
+							goto __catch575_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						timestamp = _tmp25_ - QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT;
@@ -1146,7 +1146,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_quick_time_atom_unref0 (child);
 #line 1148 "VideoMetadata.c"
-						goto __catch578_g_error;
+						goto __catch575_g_error;
 					}
 				}
 #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1160,12 +1160,12 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1162 "VideoMetadata.c"
-				goto __catch578_g_error;
+				goto __catch575_g_error;
 			}
 		}
 	}
-	goto __finally578;
-	__catch578_g_error:
+	goto __finally575;
+	__catch575_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp30_ = NULL;
@@ -1184,7 +1184,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		_g_error_free0 (e);
 #line 1185 "VideoMetadata.c"
 	}
-	__finally578:
+	__finally575:
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1206,11 +1206,11 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1208 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch576_g_error;
 		}
 	}
-	goto __finally579;
-	__catch579_g_error:
+	goto __finally576;
+	__catch576_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp33_ = NULL;
@@ -1229,7 +1229,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		_g_error_free0 (e);
 #line 1230 "VideoMetadata.c"
 	}
-	__finally579:
+	__finally576:
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2602,7 +2602,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2604 "VideoMetadata.c"
-			goto __catch580_g_error;
+			goto __catch577_g_error;
 		}
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = chunk;
@@ -2611,7 +2611,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2613 "VideoMetadata.c"
-			goto __catch580_g_error;
+			goto __catch577_g_error;
 		}
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp5_ = chunk;
@@ -2640,7 +2640,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2642 "VideoMetadata.c"
-				goto __catch580_g_error;
+				goto __catch577_g_error;
 			}
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp12_ = _tmp9_;
@@ -2667,8 +2667,8 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 2667 "VideoMetadata.c"
 		}
 	}
-	goto __finally580;
-	__catch580_g_error:
+	goto __finally577;
+	__catch577_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
@@ -2687,7 +2687,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		_g_error_free0 (e);
 #line 2688 "VideoMetadata.c"
 	}
-	__finally580:
+	__finally577:
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2709,11 +2709,11 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2711 "VideoMetadata.c"
-			goto __catch581_g_error;
+			goto __catch578_g_error;
 		}
 	}
-	goto __finally581;
-	__catch581_g_error:
+	goto __finally578;
+	__catch578_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp17_ = NULL;
@@ -2732,7 +2732,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		_g_error_free0 (e);
 #line 2733 "VideoMetadata.c"
 	}
-	__finally581:
+	__finally578:
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4073,7 +4073,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4075 "VideoMetadata.c"
-			goto __catch582_g_error;
+			goto __catch579_g_error;
 		}
 #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = chunk;
@@ -4082,7 +4082,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4084 "VideoMetadata.c"
-			goto __catch582_g_error;
+			goto __catch579_g_error;
 		}
 #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = chunk;
@@ -4093,7 +4093,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4095 "VideoMetadata.c"
-			goto __catch582_g_error;
+			goto __catch579_g_error;
 		}
 #line 518 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp6_ = sdate;
@@ -4122,8 +4122,8 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_free0 (sdate);
 #line 4123 "VideoMetadata.c"
 	}
-	goto __finally582;
-	__catch582_g_error:
+	goto __finally579;
+	__catch579_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp11_ = NULL;
@@ -4142,7 +4142,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_error_free0 (e);
 #line 4143 "VideoMetadata.c"
 	}
-	__finally582:
+	__finally579:
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4164,11 +4164,11 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4166 "VideoMetadata.c"
-			goto __catch583_g_error;
+			goto __catch580_g_error;
 		}
 	}
-	goto __finally583;
-	__catch583_g_error:
+	goto __finally580;
+	__catch580_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
@@ -4187,7 +4187,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_error_free0 (e);
 #line 4188 "VideoMetadata.c"
 	}
-	__finally583:
+	__finally580:
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
diff --git a/src/VideoSupport.c b/src/VideoSupport.c
index 40ad3ea..f781734 100644
--- a/src/VideoSupport.c
+++ b/src/VideoSupport.c
@@ -22,7 +22,6 @@
 #include <sys/types.h>
 #include <gio/gunixinputstream.h>
 #include <sys/wait.h>
-#include <unistd.h>
 #include <glib/gstdio.h>
 #include <gee.h>
 #include <gtk/gtk.h>
@@ -1512,14 +1511,14 @@ GQuark video_error_quark (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 30 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1516 "VideoSupport.c"
+#line 1515 "VideoSupport.c"
 }
 
 
 static gpointer _thumbnails_ref0 (gpointer self) {
 #line 33 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? thumbnails_ref (self) : NULL;
-#line 1523 "VideoSupport.c"
+#line 1522 "VideoSupport.c"
 }
 
 
@@ -1575,21 +1574,21 @@ VideoImportParams* video_import_params_construct (GType object_type, GFile* file
 	self->exposure_time_override = _tmp7_;
 #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 1579 "VideoSupport.c"
+#line 1578 "VideoSupport.c"
 }
 
 
 VideoImportParams* video_import_params_new (GFile* file, ImportID* import_id, const gchar* md5, Thumbnails* thumbnails, time_t exposure_time_override) {
 #line 28 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_import_params_construct (TYPE_VIDEO_IMPORT_PARAMS, file, import_id, md5, thumbnails, exposure_time_override);
-#line 1586 "VideoSupport.c"
+#line 1585 "VideoSupport.c"
 }
 
 
 static void value_video_import_params_init (GValue* value) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 1593 "VideoSupport.c"
+#line 1592 "VideoSupport.c"
 }
 
 
@@ -1598,7 +1597,7 @@ static void value_video_import_params_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_import_params_unref (value->data[0].v_pointer);
-#line 1602 "VideoSupport.c"
+#line 1601 "VideoSupport.c"
 	}
 }
 
@@ -1608,11 +1607,11 @@ static void value_video_import_params_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_import_params_ref (src_value->data[0].v_pointer);
-#line 1612 "VideoSupport.c"
+#line 1611 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1616 "VideoSupport.c"
+#line 1615 "VideoSupport.c"
 	}
 }
 
@@ -1620,37 +1619,37 @@ static void value_video_import_params_copy_value (const GValue* src_value, GValu
 static gpointer value_video_import_params_peek_pointer (const GValue* value) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 1624 "VideoSupport.c"
+#line 1623 "VideoSupport.c"
 }
 
 
 static gchar* value_video_import_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 1631 "VideoSupport.c"
+#line 1630 "VideoSupport.c"
 		VideoImportParams* object;
 		object = collect_values[0].v_pointer;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1638 "VideoSupport.c"
+#line 1637 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1642 "VideoSupport.c"
+#line 1641 "VideoSupport.c"
 		}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_import_params_ref (object);
-#line 1646 "VideoSupport.c"
+#line 1645 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1650 "VideoSupport.c"
+#line 1649 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 1654 "VideoSupport.c"
+#line 1653 "VideoSupport.c"
 }
 
 
@@ -1661,25 +1660,25 @@ static gchar* value_video_import_params_lcopy_value (const GValue* value, guint
 	if (!object_p) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1665 "VideoSupport.c"
+#line 1664 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 1671 "VideoSupport.c"
+#line 1670 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1675 "VideoSupport.c"
+#line 1674 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_import_params_ref (value->data[0].v_pointer);
-#line 1679 "VideoSupport.c"
+#line 1678 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 1683 "VideoSupport.c"
+#line 1682 "VideoSupport.c"
 }
 
 
@@ -1693,7 +1692,7 @@ GParamSpec* param_spec_video_import_params (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 1697 "VideoSupport.c"
+#line 1696 "VideoSupport.c"
 }
 
 
@@ -1702,7 +1701,7 @@ gpointer value_get_video_import_params (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_IMPORT_PARAMS), NULL);
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 1706 "VideoSupport.c"
+#line 1705 "VideoSupport.c"
 }
 
 
@@ -1722,17 +1721,17 @@ void value_set_video_import_params (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_import_params_ref (value->data[0].v_pointer);
-#line 1726 "VideoSupport.c"
+#line 1725 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1730 "VideoSupport.c"
+#line 1729 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_import_params_unref (old);
-#line 1736 "VideoSupport.c"
+#line 1735 "VideoSupport.c"
 	}
 }
 
@@ -1751,17 +1750,17 @@ void value_take_video_import_params (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1755 "VideoSupport.c"
+#line 1754 "VideoSupport.c"
 	} else {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1759 "VideoSupport.c"
+#line 1758 "VideoSupport.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_import_params_unref (old);
-#line 1765 "VideoSupport.c"
+#line 1764 "VideoSupport.c"
 	}
 }
 
@@ -1771,7 +1770,7 @@ static void video_import_params_class_init (VideoImportParamsClass * klass) {
 	video_import_params_parent_class = g_type_class_peek_parent (klass);
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((VideoImportParamsClass *) klass)->finalize = video_import_params_finalize;
-#line 1775 "VideoSupport.c"
+#line 1774 "VideoSupport.c"
 }
 
 
@@ -1785,7 +1784,7 @@ static void video_import_params_instance_init (VideoImportParams * self) {
 	self->row = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 1789 "VideoSupport.c"
+#line 1788 "VideoSupport.c"
 }
 
 
@@ -1803,7 +1802,7 @@ static void video_import_params_finalize (VideoImportParams* obj) {
 	_thumbnails_unref0 (self->thumbnails);
 #line 26 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_row_unref0 (self->row);
-#line 1807 "VideoSupport.c"
+#line 1806 "VideoSupport.c"
 }
 
 
@@ -1828,7 +1827,7 @@ gpointer video_import_params_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 1832 "VideoSupport.c"
+#line 1831 "VideoSupport.c"
 }
 
 
@@ -1841,7 +1840,7 @@ void video_import_params_unref (gpointer instance) {
 		VIDEO_IMPORT_PARAMS_GET_CLASS (self)->finalize (self);
 #line 15 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1845 "VideoSupport.c"
+#line 1844 "VideoSupport.c"
 	}
 }
 
@@ -1864,14 +1863,14 @@ VideoReader* video_reader_construct (GType object_type, GFile* file) {
 	self->priv->file = _tmp1_;
 #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 1868 "VideoSupport.c"
+#line 1867 "VideoSupport.c"
 }
 
 
 VideoReader* video_reader_new (GFile* file) {
 #line 51 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_reader_construct (TYPE_VIDEO_READER, file);
-#line 1875 "VideoSupport.c"
+#line 1874 "VideoSupport.c"
 }
 
 
@@ -1900,7 +1899,7 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 	result = _tmp4_;
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 1904 "VideoSupport.c"
+#line 1903 "VideoSupport.c"
 }
 
 
@@ -1933,7 +1932,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1937 "VideoSupport.c"
+#line 1936 "VideoSupport.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1942,13 +1941,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1946 "VideoSupport.c"
+#line 1945 "VideoSupport.c"
 	}
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1952 "VideoSupport.c"
+#line 1951 "VideoSupport.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1957,13 +1956,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1961 "VideoSupport.c"
+#line 1960 "VideoSupport.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1967 "VideoSupport.c"
+#line 1966 "VideoSupport.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1972,11 +1971,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1976 "VideoSupport.c"
+#line 1975 "VideoSupport.c"
 	} else {
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1980 "VideoSupport.c"
+#line 1979 "VideoSupport.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -1984,7 +1983,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1988 "VideoSupport.c"
+#line 1987 "VideoSupport.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1993,11 +1992,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1997 "VideoSupport.c"
+#line 1996 "VideoSupport.c"
 	} else {
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 2001 "VideoSupport.c"
+#line 2000 "VideoSupport.c"
 	}
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -2019,7 +2018,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2023 "VideoSupport.c"
+#line 2022 "VideoSupport.c"
 }
 
 
@@ -2061,7 +2060,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 	_tmp7_ = _tmp6_;
 #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ >= 6) {
-#line 2065 "VideoSupport.c"
+#line 2064 "VideoSupport.c"
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
@@ -2075,15 +2074,15 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 		_tmp4_ = g_strcmp0 (_tmp10_, "video/") == 0;
 #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp10_);
-#line 2079 "VideoSupport.c"
+#line 2078 "VideoSupport.c"
 	} else {
 #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = FALSE;
-#line 2083 "VideoSupport.c"
+#line 2082 "VideoSupport.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp4_) {
-#line 2087 "VideoSupport.c"
+#line 2086 "VideoSupport.c"
 		gchar* extension = NULL;
 		gchar* name = NULL;
 		const gchar* _tmp11_ = NULL;
@@ -2120,7 +2119,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 			_g_free0 (mime_type);
 #line 68 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2124 "VideoSupport.c"
+#line 2123 "VideoSupport.c"
 		}
 		{
 			const gchar** s_collection = NULL;
@@ -2133,14 +2132,14 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 			s_collection_length1 = G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS);
 #line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			for (s_it = 0; s_it < G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS); s_it = s_it + 1) {
-#line 2137 "VideoSupport.c"
+#line 2136 "VideoSupport.c"
 				gchar* _tmp15_ = NULL;
 				gchar* s = NULL;
 #line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = g_strdup (s_collection[s_it]);
 #line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				s = _tmp15_;
-#line 2144 "VideoSupport.c"
+#line 2143 "VideoSupport.c"
 				{
 					const gchar* _tmp16_ = NULL;
 					const gchar* _tmp17_ = NULL;
@@ -2165,11 +2164,11 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 						_g_free0 (mime_type);
 #line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						return result;
-#line 2169 "VideoSupport.c"
+#line 2168 "VideoSupport.c"
 					}
 #line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (s);
-#line 2173 "VideoSupport.c"
+#line 2172 "VideoSupport.c"
 				}
 			}
 		}
@@ -2183,7 +2182,7 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 		_g_free0 (mime_type);
 #line 75 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2187 "VideoSupport.c"
+#line 2186 "VideoSupport.c"
 	} else {
 #line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = FALSE;
@@ -2191,11 +2190,11 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 		_g_free0 (mime_type);
 #line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2195 "VideoSupport.c"
+#line 2194 "VideoSupport.c"
 	}
 #line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (mime_type);
-#line 2199 "VideoSupport.c"
+#line 2198 "VideoSupport.c"
 }
 
 
@@ -2307,7 +2306,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	file = _tmp2_;
 #line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	info = NULL;
-#line 2311 "VideoSupport.c"
+#line 2310 "VideoSupport.c"
 	{
 		GFileInfo* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
@@ -2321,8 +2320,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp3_ = _tmp5_;
 #line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2325 "VideoSupport.c"
-			goto __catch495_g_error;
+#line 2324 "VideoSupport.c"
+			goto __catch492_g_error;
 		}
 #line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp3_;
@@ -2334,10 +2333,10 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		info = _tmp6_;
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2338 "VideoSupport.c"
+#line 2337 "VideoSupport.c"
 	}
-	goto __finally495;
-	__catch495_g_error:
+	goto __finally492;
+	__catch492_g_error:
 	{
 		GError* err = NULL;
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2354,9 +2353,9 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (file);
 #line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2358 "VideoSupport.c"
+#line 2357 "VideoSupport.c"
 	}
-	__finally495:
+	__finally492:
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2369,7 +2368,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2373 "VideoSupport.c"
+#line 2372 "VideoSupport.c"
 	}
 #line 95 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = info;
@@ -2385,7 +2384,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (file);
 #line 96 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2389 "VideoSupport.c"
+#line 2388 "VideoSupport.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = file;
@@ -2393,7 +2392,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_tmp10_ = video_reader_is_supported_video_file (_tmp9_);
 #line 98 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp10_) {
-#line 2397 "VideoSupport.c"
+#line 2396 "VideoSupport.c"
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
@@ -2415,7 +2414,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (file);
 #line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2419 "VideoSupport.c"
+#line 2418 "VideoSupport.c"
 	}
 #line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp14_ = info;
@@ -2459,7 +2458,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_tmp25_ = video_reader_read_preview_frame (_tmp24_);
 #line 117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	preview_frame = _tmp25_;
-#line 2463 "VideoSupport.c"
+#line 2462 "VideoSupport.c"
 	{
 		gdouble _tmp26_ = 0.0;
 		VideoReader* _tmp27_ = NULL;
@@ -2474,8 +2473,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 2478 "VideoSupport.c"
-				goto __catch496_video_error;
+#line 2477 "VideoSupport.c"
+				goto __catch493_video_error;
 			}
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
@@ -2495,14 +2494,14 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			g_clear_error (&_inner_error_);
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 2499 "VideoSupport.c"
+#line 2498 "VideoSupport.c"
 		}
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp26_;
-#line 2503 "VideoSupport.c"
+#line 2502 "VideoSupport.c"
 	}
-	goto __finally496;
-	__catch496_video_error:
+	goto __finally493;
+	__catch493_video_error:
 	{
 		GError* err = NULL;
 		GError* _tmp29_ = NULL;
@@ -2532,7 +2531,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_g_object_unref0 (file);
 #line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2536 "VideoSupport.c"
+#line 2535 "VideoSupport.c"
 		} else {
 			GError* _tmp30_ = NULL;
 #line 123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2543,19 +2542,19 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 				is_interpretable = FALSE;
 #line 125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				clip_duration = 0.0;
-#line 2547 "VideoSupport.c"
+#line 2546 "VideoSupport.c"
 			} else {
 #line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_error ("VideoSupport.vala:127: can't prepare video for import: an unknown kind" \
 " of video error occurred");
-#line 2551 "VideoSupport.c"
+#line 2550 "VideoSupport.c"
 			}
 		}
 #line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2556 "VideoSupport.c"
+#line 2555 "VideoSupport.c"
 	}
-	__finally496:
+	__finally493:
 #line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2576,7 +2575,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2579 "VideoSupport.c"
+#line 2578 "VideoSupport.c"
 	}
 	{
 		VideoMetadata* metadata = NULL;
@@ -2603,8 +2602,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		metadata = _tmp32_;
 #line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2606 "VideoSupport.c"
-			goto __catch497_g_error;
+#line 2605 "VideoSupport.c"
+			goto __catch494_g_error;
 		}
 #line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp33_ = metadata;
@@ -2616,7 +2615,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp36_ = creation_date_time;
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp36_ != NULL) {
-#line 2619 "VideoSupport.c"
+#line 2618 "VideoSupport.c"
 			MetadataDateTime* _tmp37_ = NULL;
 			time_t _tmp38_ = 0;
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2625,15 +2624,15 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_tmp38_ = metadata_date_time_get_timestamp (_tmp37_);
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = _tmp38_ != ((time_t) 0);
-#line 2628 "VideoSupport.c"
+#line 2627 "VideoSupport.c"
 		} else {
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = FALSE;
-#line 2632 "VideoSupport.c"
+#line 2631 "VideoSupport.c"
 		}
 #line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp35_) {
-#line 2636 "VideoSupport.c"
+#line 2635 "VideoSupport.c"
 			MetadataDateTime* _tmp39_ = NULL;
 			time_t _tmp40_ = 0;
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2642,7 +2641,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_tmp40_ = metadata_date_time_get_timestamp (_tmp39_);
 #line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			exposure_time = _tmp40_;
-#line 2645 "VideoSupport.c"
+#line 2644 "VideoSupport.c"
 		}
 #line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp41_ = metadata;
@@ -2660,7 +2659,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp45_ = video_title;
 #line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp45_ != NULL) {
-#line 2663 "VideoSupport.c"
+#line 2662 "VideoSupport.c"
 			const gchar* _tmp46_ = NULL;
 			gchar* _tmp47_ = NULL;
 #line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2671,13 +2670,13 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_g_free0 (title);
 #line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			title = _tmp47_;
-#line 2674 "VideoSupport.c"
+#line 2673 "VideoSupport.c"
 		}
 #line 142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp48_ = video_comment;
 #line 142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp48_ != NULL) {
-#line 2680 "VideoSupport.c"
+#line 2679 "VideoSupport.c"
 			const gchar* _tmp49_ = NULL;
 			gchar* _tmp50_ = NULL;
 #line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2688,7 +2687,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_g_free0 (comment);
 #line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			comment = _tmp50_;
-#line 2691 "VideoSupport.c"
+#line 2690 "VideoSupport.c"
 		}
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_comment);
@@ -2698,10 +2697,10 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_metadata_date_time_unref0 (creation_date_time);
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 2701 "VideoSupport.c"
+#line 2700 "VideoSupport.c"
 	}
-	goto __finally497;
-	__catch497_g_error:
+	goto __finally494;
+	__catch494_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp51_ = NULL;
@@ -2718,9 +2717,9 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_warning ("VideoSupport.vala:145: Unable to read video metadata: %s", _tmp52_);
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2721 "VideoSupport.c"
+#line 2720 "VideoSupport.c"
 	}
-	__finally497:
+	__finally494:
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2741,13 +2740,13 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2744 "VideoSupport.c"
+#line 2743 "VideoSupport.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp53_ = exposure_time;
 #line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp53_ == ((time_t) 0)) {
-#line 2750 "VideoSupport.c"
+#line 2749 "VideoSupport.c"
 		gint64 _tmp54_ = 0LL;
 		VideoReader* _tmp55_ = NULL;
 		GDateTime* _tmp56_ = NULL;
@@ -2757,7 +2756,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp56_ = _tmp55_->priv->_timestamp;
 #line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp56_ != NULL) {
-#line 2760 "VideoSupport.c"
+#line 2759 "VideoSupport.c"
 			VideoReader* _tmp57_ = NULL;
 			GDateTime* _tmp58_ = NULL;
 			gint64 _tmp59_ = 0LL;
@@ -2769,15 +2768,15 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 			_tmp59_ = g_date_time_to_unix (_tmp58_);
 #line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp54_ = _tmp59_;
-#line 2772 "VideoSupport.c"
+#line 2771 "VideoSupport.c"
 		} else {
 #line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp54_ = (gint64) 0;
-#line 2776 "VideoSupport.c"
+#line 2775 "VideoSupport.c"
 		}
 #line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		exposure_time = (time_t) _tmp54_;
-#line 2780 "VideoSupport.c"
+#line 2779 "VideoSupport.c"
 	}
 #line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp60_ = params;
@@ -2953,7 +2952,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_tmp122_ = _tmp121_->thumbnails;
 #line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp122_ != NULL) {
-#line 2956 "VideoSupport.c"
+#line 2955 "VideoSupport.c"
 		VideoImportParams* _tmp123_ = NULL;
 		Thumbnails* _tmp124_ = NULL;
 		VideoImportParams* _tmp125_ = NULL;
@@ -2975,7 +2974,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_tmp127_ = preview_frame;
 #line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		thumbnail_cache_generate_for_video_frame (_tmp126_, _tmp127_);
-#line 2978 "VideoSupport.c"
+#line 2977 "VideoSupport.c"
 	}
 #line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
@@ -2993,7 +2992,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	_g_object_unref0 (file);
 #line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 2996 "VideoSupport.c"
+#line 2995 "VideoSupport.c"
 }
 
 
@@ -3005,14 +3004,14 @@ static GDate* _g_date_dup (GDate* self) {
 	memcpy (dup, self, sizeof (GDate));
 #line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 3008 "VideoSupport.c"
+#line 3007 "VideoSupport.c"
 }
 
 
 static gpointer __g_date_dup0 (gpointer self) {
 #line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? _g_date_dup (self) : NULL;
-#line 3015 "VideoSupport.c"
+#line 3014 "VideoSupport.c"
 }
 
 
@@ -3025,7 +3024,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 	_tmp0_ = video_reader_does_file_exist (self);
 #line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp0_) {
-#line 3028 "VideoSupport.c"
+#line 3027 "VideoSupport.c"
 		GFile* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -3059,7 +3058,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3062 "VideoSupport.c"
+#line 3061 "VideoSupport.c"
 		} else {
 #line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3067,7 +3066,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3070 "VideoSupport.c"
+#line 3069 "VideoSupport.c"
 		}
 	}
 	{
@@ -3092,8 +3091,8 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		d = _tmp8_;
 #line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3095 "VideoSupport.c"
-			goto __catch498_g_error;
+#line 3094 "VideoSupport.c"
+			goto __catch495_g_error;
 		}
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = d;
@@ -3115,8 +3114,8 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (d);
-#line 3118 "VideoSupport.c"
-			goto __catch498_g_error;
+#line 3117 "VideoSupport.c"
+			goto __catch495_g_error;
 		}
 #line 193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = info;
@@ -3132,7 +3131,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_tmp19_ = gst_discoverer_info_get_tags (_tmp18_);
 #line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp19_ != NULL) {
-#line 3135 "VideoSupport.c"
+#line 3134 "VideoSupport.c"
 			GstDiscovererInfo* _tmp20_ = NULL;
 			GstTagList* _tmp21_ = NULL;
 			GDate _tmp22_ = {0};
@@ -3155,21 +3154,21 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			video_date = _tmp25_;
 #line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _tmp23_;
-#line 3158 "VideoSupport.c"
+#line 3157 "VideoSupport.c"
 		} else {
 #line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = FALSE;
-#line 3162 "VideoSupport.c"
+#line 3161 "VideoSupport.c"
 		}
 #line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp17_) {
-#line 3166 "VideoSupport.c"
+#line 3165 "VideoSupport.c"
 			GDate* _tmp26_ = NULL;
 #line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp26_ = video_date;
 #line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp26_ != NULL) {
-#line 3172 "VideoSupport.c"
+#line 3171 "VideoSupport.c"
 				GDate* _tmp27_ = NULL;
 				GDateYear _tmp28_ = 0U;
 				GDate* _tmp29_ = NULL;
@@ -3198,7 +3197,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 				video_reader_set_timestamp (self, _tmp34_);
 #line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_date_time_unref0 (_tmp34_);
-#line 3201 "VideoSupport.c"
+#line 3200 "VideoSupport.c"
 			}
 		}
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3207,10 +3206,10 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_g_object_unref0 (info);
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (d);
-#line 3210 "VideoSupport.c"
+#line 3209 "VideoSupport.c"
 	}
-	goto __finally498;
-	__catch498_g_error:
+	goto __finally495;
+	__catch495_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp35_ = NULL;
@@ -3249,10 +3248,10 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_inner_error_ = _tmp42_;
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3252 "VideoSupport.c"
-		goto __finally498;
+#line 3251 "VideoSupport.c"
+		goto __finally495;
 	}
-	__finally498:
+	__finally495:
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3261,7 +3260,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3264 "VideoSupport.c"
+#line 3263 "VideoSupport.c"
 		} else {
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3269,7 +3268,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3272 "VideoSupport.c"
+#line 3271 "VideoSupport.c"
 		}
 	}
 }
@@ -3286,7 +3285,7 @@ static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) {
 	_tmp0_ = self->priv->thumbnailer_pid;
 #line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != ((GPid) 0)) {
-#line 3289 "VideoSupport.c"
+#line 3288 "VideoSupport.c"
 		GPid _tmp1_ = 0;
 		GPid _tmp2_ = 0;
 #line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3297,13 +3296,13 @@ static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) {
 		_tmp2_ = self->priv->thumbnailer_pid;
 #line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		kill ((pid_t) _tmp2_, SIGKILL);
-#line 3300 "VideoSupport.c"
+#line 3299 "VideoSupport.c"
 	}
 #line 220 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = FALSE;
 #line 220 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3306 "VideoSupport.c"
+#line 3305 "VideoSupport.c"
 }
 
 
@@ -3312,7 +3311,7 @@ static gboolean _video_reader_on_thumbnailer_timer_gsource_func (gpointer self)
 	result = video_reader_on_thumbnailer_timer ((VideoReader*) self);
 #line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3315 "VideoSupport.c"
+#line 3314 "VideoSupport.c"
 }
 
 
@@ -3341,8 +3340,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	gint _tmp28_ = 0;
 	pid_t _tmp29_ = 0;
 	gint _tmp30_ = 0;
-	gint _tmp36_ = 0;
-	GPid _tmp37_ = 0;
+	GPid _tmp36_ = 0;
 	GError * _inner_error_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
@@ -3390,7 +3388,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	argv_length1 = _tmp10__length1;
 #line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_argv_size_ = argv_length1;
-#line 3393 "VideoSupport.c"
+#line 3391 "VideoSupport.c"
 	{
 		gchar** _tmp11_ = NULL;
 		gint _tmp11__length1 = 0;
@@ -3409,17 +3407,17 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		child_stdout = _tmp13_;
 #line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3412 "VideoSupport.c"
-			goto __catch499_g_error;
+#line 3410 "VideoSupport.c"
+			goto __catch496_g_error;
 		}
 #line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = self->priv->thumbnailer_pid;
 #line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_debug ("VideoSupport.vala:234: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
-#line 3419 "VideoSupport.c"
+#line 3417 "VideoSupport.c"
 	}
-	goto __finally499;
-	__catch499_g_error:
+	goto __finally496;
+	__catch496_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_ = NULL;
@@ -3439,13 +3437,13 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_tmp17_ = self->priv->thumbnailer_pid;
 #line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp17_ != ((GPid) 0)) {
-#line 3442 "VideoSupport.c"
+#line 3440 "VideoSupport.c"
 			GPid _tmp18_ = 0;
 #line 238 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->thumbnailer_pid;
 #line 238 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_spawn_close_pid (_tmp18_);
-#line 3448 "VideoSupport.c"
+#line 3446 "VideoSupport.c"
 		}
 #line 239 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
@@ -3455,9 +3453,9 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
 #line 239 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3458 "VideoSupport.c"
+#line 3456 "VideoSupport.c"
 	}
-	__finally499:
+	__finally496:
 #line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3468,13 +3466,13 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		g_clear_error (&_inner_error_);
 #line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3471 "VideoSupport.c"
+#line 3469 "VideoSupport.c"
 	}
 #line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, VIDEO_READER_THUMBNAILER_TIMEOUT, _video_reader_on_thumbnailer_timer_gsource_func, video_reader_ref (self), video_reader_unref);
 #line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	buf = NULL;
-#line 3477 "VideoSupport.c"
+#line 3475 "VideoSupport.c"
 	{
 		GUnixInputStream* unix_input = NULL;
 		gint _tmp19_ = 0;
@@ -3499,8 +3497,8 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (unix_input);
-#line 3502 "VideoSupport.c"
-			goto __catch500_g_error;
+#line 3500 "VideoSupport.c"
+			goto __catch497_g_error;
 		}
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = _tmp21_;
@@ -3514,10 +3512,10 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_object_unref0 (_tmp21_);
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (unix_input);
-#line 3517 "VideoSupport.c"
+#line 3515 "VideoSupport.c"
 	}
-	goto __finally500;
-	__catch500_g_error:
+	goto __finally497;
+	__catch497_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp25_ = NULL;
@@ -3538,9 +3536,9 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		buf = NULL;
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3541 "VideoSupport.c"
+#line 3539 "VideoSupport.c"
 	}
-	__finally500:
+	__finally497:
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3553,7 +3551,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		g_clear_error (&_inner_error_);
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3556 "VideoSupport.c"
+#line 3554 "VideoSupport.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	child_status = 0;
@@ -3569,7 +3567,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	_tmp30_ = ret_waitpid;
 #line 258 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp30_ < 0) {
-#line 3572 "VideoSupport.c"
+#line 3570 "VideoSupport.c"
 		gint _tmp31_ = 0;
 #line 259 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp31_ = ret_waitpid;
@@ -3579,7 +3577,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_object_unref0 (buf);
 #line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = NULL;
-#line 3582 "VideoSupport.c"
+#line 3580 "VideoSupport.c"
 	} else {
 		gint _tmp32_ = 0;
 		gint _tmp33_ = 0;
@@ -3589,7 +3587,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_tmp33_ = WEXITSTATUS (_tmp32_);
 #line 261 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (0 != _tmp33_) {
-#line 3592 "VideoSupport.c"
+#line 3590 "VideoSupport.c"
 			gint _tmp34_ = 0;
 			gint _tmp35_ = 0;
 #line 262 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3602,26 +3600,22 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 			_g_object_unref0 (buf);
 #line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			buf = NULL;
-#line 3605 "VideoSupport.c"
+#line 3603 "VideoSupport.c"
 		}
 	}
 #line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp36_ = child_stdout;
+	_tmp36_ = self->priv->thumbnailer_pid;
 #line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	close (_tmp36_);
-#line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp37_ = self->priv->thumbnailer_pid;
+	g_spawn_close_pid (_tmp36_);
 #line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_spawn_close_pid (_tmp37_);
-#line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->thumbnailer_pid = (GPid) 0;
-#line 270 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = buf;
-#line 270 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 270 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3624 "VideoSupport.c"
+#line 3618 "VideoSupport.c"
 }
 
 
@@ -3632,25 +3626,25 @@ static gboolean video_reader_does_file_exist (VideoReader* self) {
 	gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 272 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), FALSE);
-#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->file;
-#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR);
-#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp2_);
-#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3653 "VideoSupport.c"
+#line 3647 "VideoSupport.c"
 }
 
 
@@ -3665,72 +3659,72 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 	GdkPixbuf* _tmp8_ = NULL;
 	GdkPixbuf* _tmp10_ = NULL;
 	GdkPixbuf* _tmp11_ = NULL;
-#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->preview_frame;
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 3674 "VideoSupport.c"
+#line 3668 "VideoSupport.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
-#line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->preview_frame;
-#line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = _tmp2_;
-#line 279 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3685 "VideoSupport.c"
+#line 3679 "VideoSupport.c"
 	}
-#line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_does_file_exist (self);
-#line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp3_) {
-#line 282 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 282 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3695 "VideoSupport.c"
+#line 3689 "VideoSupport.c"
 	}
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = self->priv->file;
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = g_file_get_path (_tmp4_);
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_reader_thumbnailer (self, _tmp6_);
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->priv->preview_frame);
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->preview_frame = _tmp7_;
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp6_);
-#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = self->priv->preview_frame;
-#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (NULL == _tmp8_) {
-#line 3715 "VideoSupport.c"
+#line 3709 "VideoSupport.c"
 		GdkPixbuf* _tmp9_ = NULL;
-#line 287 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = resources_get_noninterpretable_badge_pixbuf ();
-#line 287 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (self->priv->preview_frame);
-#line 287 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->preview_frame = _tmp9_;
-#line 3723 "VideoSupport.c"
+#line 3717 "VideoSupport.c"
 	}
-#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = self->priv->preview_frame;
-#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp11_;
-#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3733 "VideoSupport.c"
+#line 3727 "VideoSupport.c"
 }
 
 
@@ -3739,41 +3733,41 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
 	gdouble _tmp0_ = 0.0;
 	gdouble _tmp1_ = 0.0;
 	GError * _inner_error_ = NULL;
-#line 292 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 291 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), 0.0);
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 292 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->clip_duration;
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 292 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ == VIDEO_READER_UNKNOWN_CLIP_DURATION) {
-#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_read_internal (self, &_inner_error_);
-#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0.0;
-#line 3758 "VideoSupport.c"
+#line 3752 "VideoSupport.c"
 			} else {
-#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0.0;
-#line 3766 "VideoSupport.c"
+#line 3760 "VideoSupport.c"
 			}
 		}
 	}
-#line 296 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = self->priv->clip_duration;
-#line 296 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 296 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3776 "VideoSupport.c"
+#line 3770 "VideoSupport.c"
 }
 
 
@@ -3787,43 +3781,43 @@ VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error) {
 	GFile* _tmp4_ = NULL;
 	GFile* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 299 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 299 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_metadata_new ();
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 299 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	metadata = _tmp0_;
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = self->priv->file;
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = g_file_new_for_path (_tmp3_);
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (metadata, TYPE_MEDIA_METADATA, MediaMetadata), _tmp5_, &_inner_error_);
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp5_);
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp3_);
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3820 "VideoSupport.c"
+#line 3814 "VideoSupport.c"
 	}
-#line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = metadata;
-#line 303 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3826 "VideoSupport.c"
+#line 3820 "VideoSupport.c"
 }
 
 
@@ -3838,14 +3832,14 @@ GDateTime* video_reader_get_timestamp (VideoReader* self) {
 	result = _tmp0_;
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3841 "VideoSupport.c"
+#line 3835 "VideoSupport.c"
 }
 
 
 static gpointer _g_date_time_ref0 (gpointer self) {
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? g_date_time_ref (self) : NULL;
-#line 3848 "VideoSupport.c"
+#line 3842 "VideoSupport.c"
 }
 
 
@@ -3862,14 +3856,14 @@ static void video_reader_set_timestamp (VideoReader* self, GDateTime* value) {
 	_g_date_time_unref0 (self->priv->_timestamp);
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->_timestamp = _tmp1_;
-#line 3865 "VideoSupport.c"
+#line 3859 "VideoSupport.c"
 }
 
 
 static void value_video_reader_init (GValue* value) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3872 "VideoSupport.c"
+#line 3866 "VideoSupport.c"
 }
 
 
@@ -3878,7 +3872,7 @@ static void value_video_reader_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (value->data[0].v_pointer);
-#line 3881 "VideoSupport.c"
+#line 3875 "VideoSupport.c"
 	}
 }
 
@@ -3888,11 +3882,11 @@ static void value_video_reader_copy_value (const GValue* src_value, GValue* dest
 	if (src_value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_reader_ref (src_value->data[0].v_pointer);
-#line 3891 "VideoSupport.c"
+#line 3885 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3895 "VideoSupport.c"
+#line 3889 "VideoSupport.c"
 	}
 }
 
@@ -3900,37 +3894,37 @@ static void value_video_reader_copy_value (const GValue* src_value, GValue* dest
 static gpointer value_video_reader_peek_pointer (const GValue* value) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 3903 "VideoSupport.c"
+#line 3897 "VideoSupport.c"
 }
 
 
 static gchar* value_video_reader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3910 "VideoSupport.c"
+#line 3904 "VideoSupport.c"
 		VideoReader* object;
 		object = collect_values[0].v_pointer;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3917 "VideoSupport.c"
+#line 3911 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3921 "VideoSupport.c"
+#line 3915 "VideoSupport.c"
 		}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_reader_ref (object);
-#line 3925 "VideoSupport.c"
+#line 3919 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3929 "VideoSupport.c"
+#line 3923 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 3933 "VideoSupport.c"
+#line 3927 "VideoSupport.c"
 }
 
 
@@ -3941,25 +3935,25 @@ static gchar* value_video_reader_lcopy_value (const GValue* value, guint n_colle
 	if (!object_p) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3944 "VideoSupport.c"
+#line 3938 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 3950 "VideoSupport.c"
+#line 3944 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3954 "VideoSupport.c"
+#line 3948 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_reader_ref (value->data[0].v_pointer);
-#line 3958 "VideoSupport.c"
+#line 3952 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 3962 "VideoSupport.c"
+#line 3956 "VideoSupport.c"
 }
 
 
@@ -3973,7 +3967,7 @@ GParamSpec* param_spec_video_reader (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3976 "VideoSupport.c"
+#line 3970 "VideoSupport.c"
 }
 
 
@@ -3982,7 +3976,7 @@ gpointer value_get_video_reader (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_VIDEO_READER), NULL);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 3985 "VideoSupport.c"
+#line 3979 "VideoSupport.c"
 }
 
 
@@ -4002,17 +3996,17 @@ void value_set_video_reader (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_ref (value->data[0].v_pointer);
-#line 4005 "VideoSupport.c"
+#line 3999 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4009 "VideoSupport.c"
+#line 4003 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (old);
-#line 4015 "VideoSupport.c"
+#line 4009 "VideoSupport.c"
 	}
 }
 
@@ -4031,17 +4025,17 @@ void value_take_video_reader (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 4034 "VideoSupport.c"
+#line 4028 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4038 "VideoSupport.c"
+#line 4032 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_unref (old);
-#line 4044 "VideoSupport.c"
+#line 4038 "VideoSupport.c"
 	}
 }
 
@@ -4053,7 +4047,7 @@ static void video_reader_class_init (VideoReaderClass * klass) {
 	((VideoReaderClass *) klass)->finalize = video_reader_finalize;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoReaderPrivate));
-#line 4056 "VideoSupport.c"
+#line 4050 "VideoSupport.c"
 }
 
 
@@ -4072,7 +4066,7 @@ static void video_reader_instance_init (VideoReader * self) {
 	self->priv->_timestamp = NULL;
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 4075 "VideoSupport.c"
+#line 4069 "VideoSupport.c"
 }
 
 
@@ -4088,7 +4082,7 @@ static void video_reader_finalize (VideoReader* obj) {
 	_g_object_unref0 (self->priv->file);
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_date_time_unref0 (self->priv->_timestamp);
-#line 4091 "VideoSupport.c"
+#line 4085 "VideoSupport.c"
 }
 
 
@@ -4113,7 +4107,7 @@ gpointer video_reader_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 4116 "VideoSupport.c"
+#line 4110 "VideoSupport.c"
 }
 
 
@@ -4126,15 +4120,15 @@ void video_reader_unref (gpointer instance) {
 		VIDEO_READER_GET_CLASS (self)->finalize (self);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4129 "VideoSupport.c"
+#line 4123 "VideoSupport.c"
 	}
 }
 
 
 static gpointer _video_row_ref0 (gpointer self) {
-#line 351 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? video_row_ref (self) : NULL;
-#line 4137 "VideoSupport.c"
+#line 4131 "VideoSupport.c"
 }
 
 
@@ -4149,76 +4143,76 @@ Video* video_construct (GType object_type, VideoRow* row) {
 	gboolean _tmp6_ = FALSE;
 	VideoRow* _tmp7_ = NULL;
 	guint64 _tmp8_ = 0ULL;
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_ROW (row), NULL);
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (Video*) video_source_construct (object_type);
-#line 351 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = row;
-#line 351 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _video_row_ref0 (_tmp0_);
-#line 351 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_row_unref0 (self->priv->backing_row);
-#line 351 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->backing_row = _tmp1_;
-#line 354 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = self->priv->backing_row;
-#line 354 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->priv->backing_row;
-#line 354 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_->title;
-#line 354 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = media_source_prep_title (_tmp4_);
-#line 354 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp2_->title);
-#line 354 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_->title = _tmp5_;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = row;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_->flags;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if ((_tmp8_ & VIDEO_FLAG_TRASH) != ((guint64) 0)) {
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = TRUE;
-#line 4184 "VideoSupport.c"
+#line 4178 "VideoSupport.c"
 	} else {
 		VideoRow* _tmp9_ = NULL;
 		guint64 _tmp10_ = 0ULL;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = row;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_->flags;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = (_tmp10_ & VIDEO_FLAG_OFFLINE) != ((guint64) 0);
-#line 4194 "VideoSupport.c"
+#line 4188 "VideoSupport.c"
 	}
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp6_) {
-#line 4198 "VideoSupport.c"
+#line 4192 "VideoSupport.c"
 		VideoSourceCollection* _tmp11_ = NULL;
 		VideoRow* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
-#line 357 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = video_global;
-#line 357 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = row;
-#line 357 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = _tmp12_->backlinks;
-#line 357 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		data_source_rehydrate_backlinks (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp13_);
-#line 4210 "VideoSupport.c"
+#line 4204 "VideoSupport.c"
 	}
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 4214 "VideoSupport.c"
+#line 4208 "VideoSupport.c"
 }
 
 
 Video* video_new (VideoRow* row) {
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_construct (TYPE_VIDEO, row);
-#line 4221 "VideoSupport.c"
+#line 4215 "VideoSupport.c"
 }
 
 
@@ -4268,168 +4262,168 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 	GeeArrayList* _tmp63_ = NULL;
 	GeeCollection* _tmp64_ = NULL;
 	GeeCollection* _tmp65_ = NULL;
-#line 364 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_interpreter_state_changed = FALSE;
-#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 364 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_current_state = -1;
-#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_normal_regen_complete = FALSE;
-#line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_offline_regen_complete = FALSE;
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	args = NULL;
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	args_length1 = 0;
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_args_size_ = args_length1;
-#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	gst_init (&args_length1, &args);
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = gst_registry_get ();
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	registry = _tmp1_;
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = configuration_facade_get_video_interpreter_state_cookie (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp3_);
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	saved_state = _tmp5_;
-#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = registry;
-#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = gst_registry_get_feature_list_cookie (_tmp6_);
-#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_current_state = (gint) _tmp7_;
-#line 377 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = saved_state;
-#line 377 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp8_ == CONFIG_FACADE_NO_VIDEO_INTERPRETER_STATE) {
-#line 378 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_message ("VideoSupport.vala:378: interpreter state cookie not found; assuming al" \
+#line 377 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_message ("VideoSupport.vala:377: interpreter state cookie not found; assuming al" \
 "l video thumbnails are out of date");
-#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 378 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = TRUE;
-#line 4319 "VideoSupport.c"
+#line 4313 "VideoSupport.c"
 	} else {
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 380 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = saved_state;
-#line 380 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = video_current_state;
-#line 380 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp9_ != _tmp10_) {
-#line 381 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_message ("VideoSupport.vala:381: interpreter state has changed; video thumbnails" \
+#line 380 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_message ("VideoSupport.vala:380: interpreter state has changed; video thumbnails" \
 " may be out of date");
-#line 382 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 381 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_interpreter_state_changed = TRUE;
-#line 4333 "VideoSupport.c"
+#line 4327 "VideoSupport.c"
 		}
 	}
-#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = registry;
-#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = gst_registry_find_feature (_tmp11_, "vaapidecodebin", gst_element_factory_get_type ());
-#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	feature = _tmp12_;
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = feature;
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_ != NULL) {
-#line 4346 "VideoSupport.c"
+#line 4340 "VideoSupport.c"
 		GstRegistry* _tmp14_ = NULL;
 		GstPluginFeature* _tmp15_ = NULL;
-#line 394 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = registry;
-#line 394 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = feature;
-#line 394 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gst_registry_remove_feature (_tmp14_, _tmp15_);
-#line 4355 "VideoSupport.c"
+#line 4349 "VideoSupport.c"
 	}
-#line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = registry;
-#line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = gst_registry_find_feature (_tmp16_, "vaapidecode", gst_element_factory_get_type ());
-#line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (feature);
-#line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	feature = _tmp17_;
-#line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = feature;
-#line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp18_ != NULL) {
-#line 4369 "VideoSupport.c"
+#line 4363 "VideoSupport.c"
 		GstRegistry* _tmp19_ = NULL;
 		GstPluginFeature* _tmp20_ = NULL;
-#line 400 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = registry;
-#line 400 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = feature;
-#line 400 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gst_registry_remove_feature (_tmp19_, _tmp20_);
-#line 4378 "VideoSupport.c"
+#line 4372 "VideoSupport.c"
 	}
-#line 403 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 402 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = video_source_collection_new ();
-#line 403 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 402 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_data_collection_unref0 (video_global);
-#line 403 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 402 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_global = _tmp21_;
-#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = video_table_get_instance ();
-#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = _tmp22_;
-#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = video_table_get_all (_tmp23_);
-#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = _tmp24_;
-#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp23_);
-#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	all = _tmp25_;
-#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	all_videos = _tmp26_;
-#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	trashed_videos = _tmp27_;
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp28_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	offline_videos = _tmp28_;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp29_ = all;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp31_ = _tmp30_;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	count = _tmp31_;
-#line 4418 "VideoSupport.c"
+#line 4412 "VideoSupport.c"
 	{
 		gint ctr = 0;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		ctr = 0;
-#line 4423 "VideoSupport.c"
+#line 4417 "VideoSupport.c"
 		{
 			gboolean _tmp32_ = FALSE;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp32_ = TRUE;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4430 "VideoSupport.c"
+#line 4424 "VideoSupport.c"
 				gint _tmp34_ = 0;
 				gint _tmp35_ = 0;
 				Video* video = NULL;
@@ -4444,180 +4438,180 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 				gboolean _tmp45_ = FALSE;
 				ProgressMonitor _tmp54_ = NULL;
 				void* _tmp54__target = NULL;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp32_) {
-#line 4447 "VideoSupport.c"
+#line 4441 "VideoSupport.c"
 					gint _tmp33_ = 0;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp33_ = ctr;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					ctr = _tmp33_ + 1;
-#line 4453 "VideoSupport.c"
+#line 4447 "VideoSupport.c"
 				}
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp32_ = FALSE;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp34_ = ctr;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp35_ = count;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!(_tmp34_ < _tmp35_)) {
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4465 "VideoSupport.c"
+#line 4459 "VideoSupport.c"
 				}
-#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp36_ = all;
-#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp37_ = ctr;
-#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp38_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp37_);
-#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp39_ = (VideoRow*) _tmp38_;
-#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp40_ = video_new (_tmp39_);
-#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp41_ = _tmp40_;
-#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_video_row_unref0 (_tmp39_);
-#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp41_;
-#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp42_ = video_interpreter_state_changed;
-#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp42_) {
-#line 4487 "VideoSupport.c"
+#line 4481 "VideoSupport.c"
 					Video* _tmp43_ = NULL;
-#line 414 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp43_ = video;
-#line 414 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					video_set_is_interpretable (_tmp43_, FALSE);
-#line 4493 "VideoSupport.c"
+#line 4487 "VideoSupport.c"
 				}
-#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp44_ = video;
-#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp45_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp45_) {
-#line 4501 "VideoSupport.c"
+#line 4495 "VideoSupport.c"
 					GeeArrayList* _tmp46_ = NULL;
 					Video* _tmp47_ = NULL;
-#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp46_ = trashed_videos;
-#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp47_ = video;
-#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp47_);
-#line 4510 "VideoSupport.c"
+#line 4504 "VideoSupport.c"
 				} else {
 					Video* _tmp48_ = NULL;
 					gboolean _tmp49_ = FALSE;
-#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp48_ = video;
-#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp49_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_tmp49_) {
-#line 4520 "VideoSupport.c"
+#line 4514 "VideoSupport.c"
 						GeeArrayList* _tmp50_ = NULL;
 						Video* _tmp51_ = NULL;
-#line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp50_ = offline_videos;
-#line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp51_ = video;
-#line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_);
-#line 4529 "VideoSupport.c"
+#line 4523 "VideoSupport.c"
 					} else {
 						GeeArrayList* _tmp52_ = NULL;
 						Video* _tmp53_ = NULL;
-#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp52_ = all_videos;
-#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp53_ = video;
-#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp53_);
-#line 4539 "VideoSupport.c"
+#line 4533 "VideoSupport.c"
 					}
 				}
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp54_ = monitor;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp54__target = monitor_target;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp54_ != NULL) {
-#line 4548 "VideoSupport.c"
+#line 4542 "VideoSupport.c"
 					ProgressMonitor _tmp55_ = NULL;
 					void* _tmp55__target = NULL;
 					gint _tmp56_ = 0;
 					gint _tmp57_ = 0;
-#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55_ = monitor;
-#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55__target = monitor_target;
-#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp56_ = ctr;
-#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp57_ = count;
-#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55_ ((guint64) _tmp56_, (guint64) _tmp57_, TRUE, _tmp55__target);
-#line 4563 "VideoSupport.c"
+#line 4557 "VideoSupport.c"
 				}
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 4567 "VideoSupport.c"
+#line 4561 "VideoSupport.c"
 			}
 		}
 	}
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp58_ = video_global;
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp59_ = trashed_videos;
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp60_ = video_global;
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp61_ = offline_videos;
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp62_ = video_global;
-#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp63_ = all_videos;
-#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp64_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
-#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp65_ = _tmp64_;
-#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp65_);
-#line 360 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (offline_videos);
-#line 360 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (trashed_videos);
-#line 360 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (all_videos);
-#line 360 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (all);
-#line 360 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (feature);
-#line 360 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (registry);
-#line 4605 "VideoSupport.c"
+#line 4599 "VideoSupport.c"
 }
 
 
 gboolean video_has_interpreter_state_changed (void) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
-#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 4618 "VideoSupport.c"
+#line 4612 "VideoSupport.c"
 }
 
 
@@ -4625,39 +4619,39 @@ void video_notify_normal_thumbs_regenerated (void) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_normal_regen_complete;
-#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4632 "VideoSupport.c"
+#line 4626 "VideoSupport.c"
 	}
-#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_message ("VideoSupport.vala:440: normal video thumbnail regeneration completed");
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_message ("VideoSupport.vala:439: normal video thumbnail regeneration completed");
+#line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_normal_regen_complete = TRUE;
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_normal_regen_complete;
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4642 "VideoSupport.c"
+#line 4636 "VideoSupport.c"
 		gboolean _tmp3_ = FALSE;
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4648 "VideoSupport.c"
+#line 4642 "VideoSupport.c"
 	} else {
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4652 "VideoSupport.c"
+#line 4646 "VideoSupport.c"
 	}
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
-#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4658 "VideoSupport.c"
+#line 4652 "VideoSupport.c"
 	}
 }
 
@@ -4666,69 +4660,69 @@ void video_notify_offline_thumbs_regenerated (void) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 447 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_offline_regen_complete;
-#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 447 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 449 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4673 "VideoSupport.c"
+#line 4667 "VideoSupport.c"
 	}
-#line 451 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_message ("VideoSupport.vala:451: offline video thumbnail regeneration completed");
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 450 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_message ("VideoSupport.vala:450: offline video thumbnail regeneration completed");
+#line 452 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_offline_regen_complete = TRUE;
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_normal_regen_complete;
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4683 "VideoSupport.c"
+#line 4677 "VideoSupport.c"
 		gboolean _tmp3_ = FALSE;
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4689 "VideoSupport.c"
+#line 4683 "VideoSupport.c"
 	} else {
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4693 "VideoSupport.c"
+#line 4687 "VideoSupport.c"
 	}
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
-#line 455 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4699 "VideoSupport.c"
+#line 4693 "VideoSupport.c"
 	}
 }
 
 
 static void video_save_interpreter_state (void) {
 	gboolean _tmp0_ = FALSE;
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 4710 "VideoSupport.c"
+#line 4704 "VideoSupport.c"
 		ConfigFacade* _tmp1_ = NULL;
 		ConfigFacade* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
-#line 460 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_message ("VideoSupport.vala:460: saving video interpreter state to configuration" \
+#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_message ("VideoSupport.vala:459: saving video interpreter state to configuration" \
 " system");
-#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = config_facade_get_instance ();
-#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_current_state;
-#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		configuration_facade_set_video_interpreter_state_cookie (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
-#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp2_);
-#line 463 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = FALSE;
-#line 4728 "VideoSupport.c"
+#line 4722 "VideoSupport.c"
 	}
 }
 
@@ -4763,27 +4757,27 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 	ExporterCompletionCallback _tmp51_ = NULL;
 	void* _tmp51__target = NULL;
 	GError * _inner_error_ = NULL;
-#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (videos), NULL);
-#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = videos;
-#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_ == 0) {
-#line 473 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 473 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4777 "VideoSupport.c"
+#line 4771 "VideoSupport.c"
 	}
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = export_in_place;
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_) {
-#line 4783 "VideoSupport.c"
+#line 4777 "VideoSupport.c"
 		ExporterUI* temp_exporter = NULL;
 		GeeCollection* _tmp4_ = NULL;
 		Scaling _tmp5_ = {0};
@@ -4795,47 +4789,47 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		ExporterUI* _tmp11_ = NULL;
 		ExporterCompletionCallback _tmp12_ = NULL;
 		void* _tmp12__target = NULL;
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = videos;
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		scaling_for_original (&_tmp5_);
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		export_format_parameters_unmodified (&_tmp6_);
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = exporter_new_for_temp_file (_tmp4_, &_tmp5_, &_tmp6_);
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = _tmp7_;
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = exporter_ui_new (_tmp8_);
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp8_);
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		temp_exporter = _tmp10_;
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = temp_exporter;
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = done;
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12__target = done_target;
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		exporter_ui_export (_tmp11_, _tmp12_, _tmp12__target);
-#line 480 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = temp_exporter;
-#line 480 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4825 "VideoSupport.c"
+#line 4819 "VideoSupport.c"
 	}
-#line 484 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = videos;
-#line 484 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp14_ = gee_collection_get_size (_tmp13_);
-#line 484 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp15_ = _tmp14_;
-#line 484 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp15_ == 1) {
-#line 4835 "VideoSupport.c"
+#line 4829 "VideoSupport.c"
 		Video* video = NULL;
 		GFile* save_as = NULL;
 		Video* _tmp24_ = NULL;
@@ -4844,22 +4838,22 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		GFile* _tmp27_ = NULL;
 		GFile* _tmp28_ = NULL;
 		GFile* _tmp29_ = NULL;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 484 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video = NULL;
-#line 4846 "VideoSupport.c"
+#line 4840 "VideoSupport.c"
 		{
 			GeeIterator* _v_it = NULL;
 			GeeCollection* _tmp16_ = NULL;
 			GeeIterator* _tmp17_ = NULL;
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = videos;
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_v_it = _tmp17_;
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4859 "VideoSupport.c"
+#line 4853 "VideoSupport.c"
 				GeeIterator* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
 				Video* v = NULL;
@@ -4867,67 +4861,67 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 				gpointer _tmp21_ = NULL;
 				Video* _tmp22_ = NULL;
 				Video* _tmp23_ = NULL;
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _v_it;
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = gee_iterator_next (_tmp18_);
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp19_) {
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4875 "VideoSupport.c"
+#line 4869 "VideoSupport.c"
 				}
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = _v_it;
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp21_ = gee_iterator_get (_tmp20_);
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				v = (Video*) _tmp21_;
-#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp22_ = v;
-#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp23_;
-#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (v);
-#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 4895 "VideoSupport.c"
+#line 4889 "VideoSupport.c"
 			}
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_v_it);
-#line 4899 "VideoSupport.c"
+#line 4893 "VideoSupport.c"
 		}
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = video;
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp25_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp26_ = _tmp25_;
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp27_ = export_ui_choose_file (_tmp26_);
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp28_ = _tmp27_;
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp26_);
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		save_as = _tmp28_;
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp29_ = save_as;
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp29_ == NULL) {
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = NULL;
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (save_as);
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 4927 "VideoSupport.c"
+#line 4921 "VideoSupport.c"
 		}
 		{
 			AppWindow* _tmp30_ = NULL;
@@ -4936,270 +4930,270 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			GFile* _tmp33_ = NULL;
 			AppWindow* _tmp34_ = NULL;
 			AppWindow* _tmp35_ = NULL;
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp30_ = app_window_get_instance ();
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp31_ = _tmp30_;
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PAGE_WINDOW, PageWindow));
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp31_);
-#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp32_ = video;
-#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp33_ = save_as;
-#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_export (_tmp32_, _tmp33_, &_inner_error_);
-#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4952 "VideoSupport.c"
-				goto __catch501_g_error;
+#line 4946 "VideoSupport.c"
+				goto __catch498_g_error;
 			}
-#line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp34_ = app_window_get_instance ();
-#line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = _tmp34_;
-#line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PAGE_WINDOW, PageWindow));
-#line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp35_);
-#line 4963 "VideoSupport.c"
+#line 4957 "VideoSupport.c"
 		}
-		goto __finally501;
-		__catch501_g_error:
+		goto __finally498;
+		__catch498_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp36_ = NULL;
 			AppWindow* _tmp37_ = NULL;
 			GFile* _tmp38_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			err = _inner_error_;
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_inner_error_ = NULL;
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp36_ = app_window_get_instance ();
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp37_ = _tmp36_;
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PAGE_WINDOW, PageWindow));
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp37_);
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp38_ = save_as;
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			export_error_dialog (_tmp38_, FALSE);
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 4990 "VideoSupport.c"
+#line 4984 "VideoSupport.c"
 		}
-		__finally501:
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		__finally498:
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (save_as);
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5005 "VideoSupport.c"
+#line 4999 "VideoSupport.c"
 		}
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (save_as);
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (video);
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5015 "VideoSupport.c"
+#line 5009 "VideoSupport.c"
 	}
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp39_ = _ ("Export Videos");
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp40_ = export_ui_choose_dir (_tmp39_);
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	export_dir = _tmp40_;
-#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp41_ = export_dir;
-#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp41_ == NULL) {
-#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (export_dir);
-#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5033 "VideoSupport.c"
+#line 5027 "VideoSupport.c"
 	}
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp42_ = videos;
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp43_ = export_dir;
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	scaling_for_original (&_tmp44_);
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	export_format_parameters_unmodified (&_tmp45_);
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp46_ = exporter_new (_tmp42_, _tmp43_, &_tmp44_, &_tmp45_, FALSE);
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp47_ = _tmp46_;
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp48_ = exporter_ui_new (_tmp47_);
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp49_ = _tmp48_;
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp47_);
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	exporter = _tmp49_;
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp50_ = exporter;
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp51_ = done;
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp51__target = done_target;
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	exporter_ui_export (_tmp50_, _tmp51_, _tmp51__target);
-#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = exporter;
-#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (export_dir);
-#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5069 "VideoSupport.c"
+#line 5063 "VideoSupport.c"
 }
 
 
 static void video_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 518 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 518 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 5080 "VideoSupport.c"
+#line 5074 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_ = NULL;
 		VideoTable* _tmp1_ = NULL;
 		VideoID _tmp2_ = {0};
 		const gchar* _tmp3_ = NULL;
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp2_);
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = backlinks;
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_);
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5102 "VideoSupport.c"
-				goto __catch502_database_error;
+#line 5096 "VideoSupport.c"
+				goto __catch499_database_error;
 			}
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5111 "VideoSupport.c"
+#line 5105 "VideoSupport.c"
 		}
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5119 "VideoSupport.c"
+#line 5113 "VideoSupport.c"
 			{
 				VideoRow* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
 				gchar* _tmp7_ = NULL;
-#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = backlinks;
-#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = g_strdup (_tmp6_);
-#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (_tmp5_->backlinks);
-#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_->backlinks = _tmp7_;
-#line 5134 "VideoSupport.c"
+#line 5128 "VideoSupport.c"
 			}
-			__finally503:
+			__finally500:
 			{
 				VideoRow* _tmp8_ = NULL;
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5143 "VideoSupport.c"
+#line 5137 "VideoSupport.c"
 			}
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5149 "VideoSupport.c"
-					goto __catch502_database_error;
+#line 5143 "VideoSupport.c"
+					goto __catch499_database_error;
 				}
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 5158 "VideoSupport.c"
+#line 5152 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally502;
-	__catch502_database_error:
+	goto __finally499;
+	__catch499_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		GError* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = err;
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_->message;
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_warning ("VideoSupport.vala:526: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_warning ("VideoSupport.vala:525: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp10_);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5188 "VideoSupport.c"
+#line 5182 "VideoSupport.c"
 	}
-	__finally502:
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally499:
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5199 "VideoSupport.c"
+#line 5193 "VideoSupport.c"
 	}
 }
 
@@ -5208,18 +5202,18 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 	Video * self;
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 5212 "VideoSupport.c"
+#line 5206 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5219 "VideoSupport.c"
+#line 5213 "VideoSupport.c"
 		{
 			gboolean committed = FALSE;
 			VideoTable* _tmp1_ = NULL;
@@ -5230,70 +5224,70 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 			gboolean _tmp6_ = FALSE;
 			gboolean _tmp7_ = FALSE;
 			gboolean _tmp8_ = FALSE;
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = video_table_get_instance ();
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_;
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->video_id;
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = *event_id;
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = video_table_set_event (_tmp2_, &_tmp4_, &_tmp5_);
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_;
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_database_table_unref0 (_tmp2_);
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			committed = _tmp7_;
-#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = committed;
-#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp8_) {
-#line 5252 "VideoSupport.c"
+#line 5246 "VideoSupport.c"
 				VideoRow* _tmp9_ = NULL;
 				EventID _tmp10_ = {0};
-#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = *event_id;
-#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 5261 "VideoSupport.c"
+#line 5255 "VideoSupport.c"
 			}
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = committed;
-#line 5265 "VideoSupport.c"
+#line 5259 "VideoSupport.c"
 			{
 				VideoRow* _tmp11_ = NULL;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = self->priv->backing_row;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5272 "VideoSupport.c"
+#line 5266 "VideoSupport.c"
 			}
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5276 "VideoSupport.c"
+#line 5270 "VideoSupport.c"
 		}
-		__finally504:
+		__finally501:
 		{
 			VideoRow* _tmp12_ = NULL;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = self->priv->backing_row;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5285 "VideoSupport.c"
+#line 5279 "VideoSupport.c"
 		}
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 5293 "VideoSupport.c"
+#line 5287 "VideoSupport.c"
 	}
 }
 
@@ -5308,44 +5302,44 @@ gboolean video_is_duplicate (GFile* file, const gchar* full_md5) {
 	const gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 540 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
-#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = file;
-#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = TRUE;
-#line 5316 "VideoSupport.c"
+#line 5310 "VideoSupport.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
-#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = full_md5;
-#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 5323 "VideoSupport.c"
+#line 5317 "VideoSupport.c"
 	}
-#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp0_, "file != null || full_md5 != null");
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_table_get_instance ();
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = file;
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = full_md5;
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_table_has_duplicate (_tmp4_, _tmp5_, _tmp6_);
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_;
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp4_);
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp8_;
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5345 "VideoSupport.c"
+#line 5339 "VideoSupport.c"
 }
 
 
@@ -5356,13 +5350,13 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 	VideoRow* _tmp9_ = NULL;
 	Video* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 549 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0);
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = NULL;
-#line 5362 "VideoSupport.c"
+#line 5356 "VideoSupport.c"
 	{
 		VideoID _tmp0_ = {0};
 		VideoTable* _tmp1_ = NULL;
@@ -5372,188 +5366,188 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 		VideoID _tmp5_ = {0};
 		VideoID _tmp6_ = {0};
 		gboolean _tmp7_ = FALSE;
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = params;
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp3_->row;
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_add (_tmp2_, _tmp4_, &_tmp5_, &_inner_error_);
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp5_;
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp6_;
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5392 "VideoSupport.c"
-				goto __catch505_database_error;
+#line 5386 "VideoSupport.c"
+				goto __catch502_database_error;
 			}
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 5401 "VideoSupport.c"
+#line 5395 "VideoSupport.c"
 		}
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_id_is_invalid (&_tmp0_);
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp7_) {
-#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = IMPORT_RESULT_DATABASE_ERROR;
-#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (video) {
-#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*video = _vala_video;
-#line 5413 "VideoSupport.c"
+#line 5407 "VideoSupport.c"
 			} else {
-#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_vala_video);
-#line 5417 "VideoSupport.c"
+#line 5411 "VideoSupport.c"
 			}
-#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5421 "VideoSupport.c"
+#line 5415 "VideoSupport.c"
 		}
 	}
-	goto __finally505;
-	__catch505_database_error:
+	goto __finally502;
+	__catch502_database_error:
 	{
 		GError* err = NULL;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_DATABASE_ERROR;
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (video) {
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*video = _vala_video;
-#line 5440 "VideoSupport.c"
+#line 5434 "VideoSupport.c"
 		} else {
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_vala_video);
-#line 5444 "VideoSupport.c"
+#line 5438 "VideoSupport.c"
 		}
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5448 "VideoSupport.c"
+#line 5442 "VideoSupport.c"
 	}
-	__finally505:
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally502:
+#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 5459 "VideoSupport.c"
+#line 5453 "VideoSupport.c"
 	}
-#line 562 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = params;
-#line 562 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = _tmp8_->row;
-#line 562 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = video_new (_tmp9_);
-#line 562 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
-#line 562 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = _tmp10_;
-#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (video) {
-#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*video = _vala_video;
-#line 5477 "VideoSupport.c"
+#line 5471 "VideoSupport.c"
 	} else {
-#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_vala_video);
-#line 5481 "VideoSupport.c"
+#line 5475 "VideoSupport.c"
 	}
-#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5485 "VideoSupport.c"
+#line 5479 "VideoSupport.c"
 }
 
 
 void video_import_failed (Video* video) {
 	GError * _inner_error_ = NULL;
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 566 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 5493 "VideoSupport.c"
+#line 5487 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_ = NULL;
 		VideoTable* _tmp1_ = NULL;
 		Video* _tmp2_ = NULL;
 		VideoID _tmp3_ = {0};
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video;
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (_tmp2_, &_tmp3_);
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_remove (_tmp1_, &_tmp3_, &_inner_error_);
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5515 "VideoSupport.c"
-				goto __catch506_database_error;
+#line 5509 "VideoSupport.c"
+				goto __catch503_database_error;
 			}
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5524 "VideoSupport.c"
+#line 5518 "VideoSupport.c"
 		}
 	}
-	goto __finally506;
-	__catch506_database_error:
+	goto __finally503;
+	__catch503_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = err;
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp4_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5542 "VideoSupport.c"
+#line 5536 "VideoSupport.c"
 	}
-	__finally506:
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally503:
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5553 "VideoSupport.c"
+#line 5547 "VideoSupport.c"
 	}
 }
 
@@ -5568,24 +5562,24 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 	BackingFileState** _tmp13_ = NULL;
 	gint _tmp13__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_new0 (BackingFileState*, 1 + 1);
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing = _tmp0_;
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_length1 = 1;
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_backing_size_ = backing_length1;
-#line 5578 "VideoSupport.c"
+#line 5572 "VideoSupport.c"
 	{
 		VideoRow* _tmp1_ = NULL;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->backing_row;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5585 "VideoSupport.c"
+#line 5579 "VideoSupport.c"
 		{
 			VideoRow* _tmp2_ = NULL;
 			const gchar* _tmp3_ = NULL;
@@ -5597,69 +5591,69 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			const gchar* _tmp9_ = NULL;
 			BackingFileState* _tmp10_ = NULL;
 			BackingFileState* _tmp11_ = NULL;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = _tmp2_->filepath;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = _tmp4_->filesize;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_->timestamp;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->priv->backing_row;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = _tmp8_->md5;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = backing_file_state_new (_tmp3_, _tmp5_, _tmp7_, _tmp9_);
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_backing_file_state_unref0 (backing[0]);
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			backing[0] = _tmp10_;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = backing[0];
-#line 5621 "VideoSupport.c"
+#line 5615 "VideoSupport.c"
 		}
-		__finally507:
+		__finally504:
 		{
 			VideoRow* _tmp12_ = NULL;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = self->priv->backing_row;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5630 "VideoSupport.c"
+#line 5624 "VideoSupport.c"
 		}
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			backing = (_vala_array_free (backing, backing_length1, (GDestroyNotify) backing_file_state_unref), NULL);
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5642 "VideoSupport.c"
+#line 5636 "VideoSupport.c"
 		}
 	}
-#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = backing;
-#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13__length1 = backing_length1;
-#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (result_length1) {
-#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*result_length1 = _tmp13__length1;
-#line 5653 "VideoSupport.c"
+#line 5647 "VideoSupport.c"
 	}
-#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp13_;
-#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5659 "VideoSupport.c"
+#line 5653 "VideoSupport.c"
 }
 
 
@@ -5671,33 +5665,33 @@ static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, gint scale, G
 	GdkPixbuf* _tmp2_ = NULL;
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scale;
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = thumbnail_cache_fetch (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = _tmp2_;
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5685 "VideoSupport.c"
+#line 5679 "VideoSupport.c"
 	}
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp0_;
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp0_);
-#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5697 "VideoSupport.c"
+#line 5691 "VideoSupport.c"
 }
 
 
@@ -5705,57 +5699,57 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 588 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5707 "VideoSupport.c"
+#line 5701 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5714 "VideoSupport.c"
+#line 5708 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->md5;
-#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 5727 "VideoSupport.c"
+#line 5721 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5734 "VideoSupport.c"
+#line 5728 "VideoSupport.c"
 			}
-#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5738 "VideoSupport.c"
+#line 5732 "VideoSupport.c"
 		}
-		__finally508:
+		__finally505:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5747 "VideoSupport.c"
+#line 5741 "VideoSupport.c"
 		}
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5755 "VideoSupport.c"
+#line 5749 "VideoSupport.c"
 	}
 }
 
@@ -5767,31 +5761,31 @@ static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* sca
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 596 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), (gint) THUMBNAIL_CACHE_SIZE_BIG, &_inner_error_);
-#line 596 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	pixbuf = _tmp0_;
-#line 596 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 596 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 596 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5781 "VideoSupport.c"
+#line 5775 "VideoSupport.c"
 	}
-#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_NEAREST, TRUE);
-#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (pixbuf);
-#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5791 "VideoSupport.c"
+#line 5785 "VideoSupport.c"
 }
 
 
@@ -5808,69 +5802,69 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 	GdkPixbuf* _tmp5_ = NULL;
 	GdkPixbuf* _tmp6_ = NULL;
 	GdkPixbuf* _tmp7_ = NULL;
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 600 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_reader_new (_tmp1_);
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp1_);
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	reader = _tmp3_;
-#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = reader;
-#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = video_reader_read_preview_frame (_tmp4_);
-#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	frame = _tmp5_;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = frame;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 5832 "VideoSupport.c"
+#line 5826 "VideoSupport.c"
 		GdkPixbuf* _tmp8_ = NULL;
 		GdkPixbuf* _tmp9_ = NULL;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = frame;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 5843 "VideoSupport.c"
+#line 5837 "VideoSupport.c"
 	} else {
 		GdkPixbuf* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = resources_get_noninterpretable_badge_pixbuf ();
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = _tmp10_;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = gdk_pixbuf_copy (_tmp11_);
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp12_;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp11_);
-#line 5860 "VideoSupport.c"
+#line 5854 "VideoSupport.c"
 	}
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp6_;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (frame);
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (reader);
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5870 "VideoSupport.c"
+#line 5864 "VideoSupport.c"
 }
 
 
@@ -5878,15 +5872,15 @@ static gchar* video_real_get_typename (DataSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_strdup (VIDEO_TYPENAME);
-#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5886 "VideoSupport.c"
+#line 5880 "VideoSupport.c"
 }
 
 
@@ -5895,71 +5889,71 @@ static gint64 video_real_get_instance_id (DataSource* base) {
 	gint64 result = 0LL;
 	VideoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (self, &_tmp0_);
-#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_.id;
-#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5905 "VideoSupport.c"
+#line 5899 "VideoSupport.c"
 }
 
 
 static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 615 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5914 "VideoSupport.c"
+#line 5908 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5921 "VideoSupport.c"
+#line 5915 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			ImportID _tmp2_ = {0};
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->import_id;
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 5931 "VideoSupport.c"
+#line 5925 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5938 "VideoSupport.c"
+#line 5932 "VideoSupport.c"
 			}
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5942 "VideoSupport.c"
+#line 5936 "VideoSupport.c"
 		}
-		__finally509:
+		__finally506:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5951 "VideoSupport.c"
+#line 5945 "VideoSupport.c"
 		}
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5959 "VideoSupport.c"
+#line 5953 "VideoSupport.c"
 	}
 }
 
@@ -5968,15 +5962,15 @@ static PhotoFileFormat video_real_get_preferred_thumbnail_format (ThumbnailSourc
 	Video * self;
 	PhotoFileFormat result = 0;
 	PhotoFileFormat _tmp0_ = 0;
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 623 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = photo_file_format_get_system_default_format ();
-#line 623 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 623 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5976 "VideoSupport.c"
+#line 5970 "VideoSupport.c"
 }
 
 
@@ -5984,57 +5978,57 @@ static gchar* video_real_get_title (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5986 "VideoSupport.c"
+#line 5980 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5993 "VideoSupport.c"
+#line 5987 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->title;
-#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6006 "VideoSupport.c"
+#line 6000 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6013 "VideoSupport.c"
+#line 6007 "VideoSupport.c"
 			}
-#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6017 "VideoSupport.c"
+#line 6011 "VideoSupport.c"
 		}
-		__finally510:
+		__finally507:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6026 "VideoSupport.c"
+#line 6020 "VideoSupport.c"
 		}
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6034 "VideoSupport.c"
+#line 6028 "VideoSupport.c"
 	}
 }
 
@@ -6047,22 +6041,22 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 	Alteration* _tmp20_ = NULL;
 	Alteration* _tmp21_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = title;
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_title = _tmp1_;
-#line 6055 "VideoSupport.c"
+#line 6049 "VideoSupport.c"
 	{
 		VideoRow* _tmp2_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6062 "VideoSupport.c"
+#line 6056 "VideoSupport.c"
 		{
 			VideoRow* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
@@ -6070,28 +6064,28 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			VideoRow* _tmp16_ = NULL;
 			const gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->title;
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = new_title;
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 6078 "VideoSupport.c"
+#line 6072 "VideoSupport.c"
 				{
 					VideoRow* _tmp6_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6085 "VideoSupport.c"
+#line 6079 "VideoSupport.c"
 				}
-#line 637 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 637 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6091 "VideoSupport.c"
+#line 6085 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp7_ = NULL;
@@ -6099,143 +6093,143 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 				VideoRow* _tmp9_ = NULL;
 				VideoID _tmp10_ = {0};
 				const gchar* _tmp11_ = NULL;
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = video_table_get_instance ();
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_;
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = _tmp9_->video_id;
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = new_title;
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_title (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp8_);
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6117 "VideoSupport.c"
-						goto __catch512_database_error;
+#line 6111 "VideoSupport.c"
+						goto __catch509_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6126 "VideoSupport.c"
+#line 6120 "VideoSupport.c"
 					}
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_title);
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6136 "VideoSupport.c"
+#line 6130 "VideoSupport.c"
 				}
 			}
-			goto __finally512;
-			__catch512_database_error:
+			goto __finally509;
+			__catch509_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6154 "VideoSupport.c"
+#line 6148 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6161 "VideoSupport.c"
+#line 6155 "VideoSupport.c"
 				}
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6167 "VideoSupport.c"
+#line 6161 "VideoSupport.c"
 			}
-			__finally512:
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally509:
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6172 "VideoSupport.c"
+#line 6166 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6179 "VideoSupport.c"
+#line 6173 "VideoSupport.c"
 				}
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6189 "VideoSupport.c"
+#line 6183 "VideoSupport.c"
 			}
-#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = new_title;
-#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp16_->title);
-#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->title = _tmp18_;
-#line 6201 "VideoSupport.c"
+#line 6195 "VideoSupport.c"
 		}
-		__finally511:
+		__finally508:
 		{
 			VideoRow* _tmp19_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = self->priv->backing_row;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6210 "VideoSupport.c"
+#line 6204 "VideoSupport.c"
 		}
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_title);
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6222 "VideoSupport.c"
+#line 6216 "VideoSupport.c"
 		}
 	}
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = alteration_new ("metadata", "name");
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = _tmp20_;
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp21_);
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_title);
-#line 6235 "VideoSupport.c"
+#line 6229 "VideoSupport.c"
 }
 
 
@@ -6243,57 +6237,57 @@ static gchar* video_real_get_comment (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6245 "VideoSupport.c"
+#line 6239 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6252 "VideoSupport.c"
+#line 6246 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->comment;
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6265 "VideoSupport.c"
+#line 6259 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6272 "VideoSupport.c"
+#line 6266 "VideoSupport.c"
 			}
-#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6276 "VideoSupport.c"
+#line 6270 "VideoSupport.c"
 		}
-		__finally513:
+		__finally510:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6285 "VideoSupport.c"
+#line 6279 "VideoSupport.c"
 		}
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6293 "VideoSupport.c"
+#line 6287 "VideoSupport.c"
 	}
 }
 
@@ -6307,22 +6301,22 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 	Alteration* _tmp20_ = NULL;
 	Alteration* _tmp21_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = comment;
-#line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_comment = _tmp1_;
-#line 6315 "VideoSupport.c"
+#line 6309 "VideoSupport.c"
 	{
 		VideoRow* _tmp2_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6322 "VideoSupport.c"
+#line 6316 "VideoSupport.c"
 		{
 			VideoRow* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
@@ -6330,30 +6324,30 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 			VideoRow* _tmp16_ = NULL;
 			const gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->comment;
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = new_comment;
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 664 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = TRUE;
-#line 6340 "VideoSupport.c"
+#line 6334 "VideoSupport.c"
 				{
 					VideoRow* _tmp6_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6347 "VideoSupport.c"
+#line 6341 "VideoSupport.c"
 				}
-#line 664 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 664 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6353 "VideoSupport.c"
+#line 6347 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp7_ = NULL;
@@ -6361,149 +6355,149 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 				VideoRow* _tmp9_ = NULL;
 				VideoID _tmp10_ = {0};
 				const gchar* _tmp11_ = NULL;
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = video_table_get_instance ();
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_;
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = _tmp9_->video_id;
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = new_comment;
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_comment (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp8_);
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6379 "VideoSupport.c"
-						goto __catch515_database_error;
+#line 6373 "VideoSupport.c"
+						goto __catch512_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6388 "VideoSupport.c"
+#line 6382 "VideoSupport.c"
 					}
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_comment);
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return FALSE;
-#line 6398 "VideoSupport.c"
+#line 6392 "VideoSupport.c"
 				}
 			}
-			goto __finally515;
-			__catch515_database_error:
+			goto __finally512;
+			__catch512_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = FALSE;
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6418 "VideoSupport.c"
+#line 6412 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6425 "VideoSupport.c"
+#line 6419 "VideoSupport.c"
 				}
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6431 "VideoSupport.c"
+#line 6425 "VideoSupport.c"
 			}
-			__finally515:
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally512:
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6436 "VideoSupport.c"
+#line 6430 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6443 "VideoSupport.c"
+#line 6437 "VideoSupport.c"
 				}
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return FALSE;
-#line 6453 "VideoSupport.c"
+#line 6447 "VideoSupport.c"
 			}
-#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = new_comment;
-#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp16_->comment);
-#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->comment = _tmp18_;
-#line 6465 "VideoSupport.c"
+#line 6459 "VideoSupport.c"
 		}
-		__finally514:
+		__finally511:
 		{
 			VideoRow* _tmp19_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = self->priv->backing_row;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6474 "VideoSupport.c"
+#line 6468 "VideoSupport.c"
 		}
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_comment);
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return FALSE;
-#line 6486 "VideoSupport.c"
+#line 6480 "VideoSupport.c"
 		}
 	}
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = alteration_new ("metadata", "comment");
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = _tmp20_;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp21_);
-#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = TRUE;
-#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_comment);
-#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6503 "VideoSupport.c"
+#line 6497 "VideoSupport.c"
 }
 
 
@@ -6511,54 +6505,54 @@ static Rating video_real_get_rating (MediaSource* base) {
 	Video * self;
 	Rating result = 0;
 	GError * _inner_error_ = NULL;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6513 "VideoSupport.c"
+#line 6507 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6520 "VideoSupport.c"
+#line 6514 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
-#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 6530 "VideoSupport.c"
+#line 6524 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6537 "VideoSupport.c"
+#line 6531 "VideoSupport.c"
 			}
-#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6541 "VideoSupport.c"
+#line 6535 "VideoSupport.c"
 		}
-		__finally516:
+		__finally513:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6550 "VideoSupport.c"
+#line 6544 "VideoSupport.c"
 		}
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 6558 "VideoSupport.c"
+#line 6552 "VideoSupport.c"
 	}
 }
 
@@ -6568,234 +6562,234 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 	Alteration* _tmp19_ = NULL;
 	Alteration* _tmp20_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 688 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6570 "VideoSupport.c"
+#line 6564 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6577 "VideoSupport.c"
+#line 6571 "VideoSupport.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			Rating _tmp2_ = 0;
 			gboolean _tmp3_ = FALSE;
 			VideoRow* _tmp16_ = NULL;
 			Rating _tmp17_ = 0;
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = rating;
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_is_valid (_tmp2_);
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp3_) {
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = TRUE;
-#line 6592 "VideoSupport.c"
+#line 6586 "VideoSupport.c"
 			} else {
 				Rating _tmp4_ = 0;
 				VideoRow* _tmp5_ = NULL;
 				Rating _tmp6_ = 0;
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = rating;
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = _tmp5_->rating;
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = _tmp4_ == _tmp6_;
-#line 6605 "VideoSupport.c"
+#line 6599 "VideoSupport.c"
 			}
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp1_) {
-#line 6609 "VideoSupport.c"
+#line 6603 "VideoSupport.c"
 				{
 					VideoRow* _tmp7_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp7_ = self->priv->backing_row;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6616 "VideoSupport.c"
+#line 6610 "VideoSupport.c"
 				}
-#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6620 "VideoSupport.c"
+#line 6614 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp8_ = NULL;
 				VideoTable* _tmp9_ = NULL;
 				VideoID _tmp10_ = {0};
 				Rating _tmp11_ = 0;
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_;
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp10_);
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = rating;
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_rating (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp9_);
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6643 "VideoSupport.c"
-						goto __catch518_database_error;
+#line 6637 "VideoSupport.c"
+						goto __catch515_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6652 "VideoSupport.c"
+#line 6646 "VideoSupport.c"
 					}
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6660 "VideoSupport.c"
+#line 6654 "VideoSupport.c"
 				}
 			}
-			goto __finally518;
-			__catch518_database_error:
+			goto __finally515;
+			__catch515_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 696 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 696 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6678 "VideoSupport.c"
+#line 6672 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6685 "VideoSupport.c"
+#line 6679 "VideoSupport.c"
 				}
-#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6689 "VideoSupport.c"
+#line 6683 "VideoSupport.c"
 			}
-			__finally518:
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally515:
+#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6694 "VideoSupport.c"
+#line 6688 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6701 "VideoSupport.c"
+#line 6695 "VideoSupport.c"
 				}
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6709 "VideoSupport.c"
+#line 6703 "VideoSupport.c"
 			}
-#line 702 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 702 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = rating;
-#line 702 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->rating = _tmp17_;
-#line 6717 "VideoSupport.c"
+#line 6711 "VideoSupport.c"
 		}
-		__finally517:
+		__finally514:
 		{
 			VideoRow* _tmp18_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->backing_row;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6726 "VideoSupport.c"
+#line 6720 "VideoSupport.c"
 		}
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6736 "VideoSupport.c"
+#line 6730 "VideoSupport.c"
 		}
 	}
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "rating");
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 6747 "VideoSupport.c"
+#line 6741 "VideoSupport.c"
 }
 
 
 static void video_real_increase_rating (MediaSource* base) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6756 "VideoSupport.c"
+#line 6750 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6763 "VideoSupport.c"
+#line 6757 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
 			Rating _tmp3_ = 0;
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_increase (_tmp2_);
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6776 "VideoSupport.c"
+#line 6770 "VideoSupport.c"
 		}
-		__finally519:
+		__finally516:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6785 "VideoSupport.c"
+#line 6779 "VideoSupport.c"
 		}
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6795 "VideoSupport.c"
+#line 6789 "VideoSupport.c"
 		}
 	}
 }
@@ -6804,48 +6798,48 @@ static void video_real_increase_rating (MediaSource* base) {
 static void video_real_decrease_rating (MediaSource* base) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6806 "VideoSupport.c"
+#line 6800 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6813 "VideoSupport.c"
+#line 6807 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
 			Rating _tmp3_ = 0;
-#line 716 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 716 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 716 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_decrease (_tmp2_);
-#line 716 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6826 "VideoSupport.c"
+#line 6820 "VideoSupport.c"
 		}
-		__finally520:
+		__finally517:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6835 "VideoSupport.c"
+#line 6829 "VideoSupport.c"
 		}
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6845 "VideoSupport.c"
+#line 6839 "VideoSupport.c"
 		}
 	}
 }
@@ -6855,15 +6849,15 @@ static gboolean video_real_is_trashed (MediaSource* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 719 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_TRASH);
-#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6863 "VideoSupport.c"
+#line 6857 "VideoSupport.c"
 }
 
 
@@ -6871,25 +6865,25 @@ static gboolean video_real_is_offline (Monitorable* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_OFFLINE);
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6879 "VideoSupport.c"
+#line 6873 "VideoSupport.c"
 }
 
 
 static void video_real_mark_offline (Monitorable* base) {
 	Video * self;
-#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 727 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 6889 "VideoSupport.c"
+#line 6883 "VideoSupport.c"
 }
 
 
@@ -6897,61 +6891,61 @@ static void video_real_mark_online (Monitorable* base) {
 	Video * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 733 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_get_is_interpretable (self);
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp1_) {
-#line 6905 "VideoSupport.c"
+#line 6899 "VideoSupport.c"
 		gboolean _tmp2_ = FALSE;
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video_has_interpreter_state_changed ();
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_;
-#line 6911 "VideoSupport.c"
+#line 6905 "VideoSupport.c"
 	} else {
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = FALSE;
-#line 6915 "VideoSupport.c"
+#line 6909 "VideoSupport.c"
 	}
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 6919 "VideoSupport.c"
+#line 6913 "VideoSupport.c"
 		VideoInterpretableResults* _tmp3_ = NULL;
 		VideoInterpretableResults* _tmp4_ = NULL;
-#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_check_is_interpretable (self);
-#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp3_;
-#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_foreground_finish (_tmp4_);
-#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (_tmp4_);
-#line 6930 "VideoSupport.c"
+#line 6924 "VideoSupport.c"
 	}
 }
 
 
 static void video_real_trash (MediaSource* base) {
 	Video * self;
-#line 739 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 739 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 6941 "VideoSupport.c"
+#line 6935 "VideoSupport.c"
 }
 
 
 static void video_real_untrash (MediaSource* base) {
 	Video * self;
-#line 743 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 744 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 743 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 6951 "VideoSupport.c"
+#line 6945 "VideoSupport.c"
 }
 
 
@@ -6959,15 +6953,15 @@ static gboolean video_real_is_flagged (Flaggable* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 746 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_FLAGGED);
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6967 "VideoSupport.c"
+#line 6961 "VideoSupport.c"
 }
 
 
@@ -6975,17 +6969,17 @@ static void video_real_mark_flagged (Flaggable* base) {
 	Video * self;
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
-#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 6985 "VideoSupport.c"
+#line 6979 "VideoSupport.c"
 }
 
 
@@ -6993,71 +6987,71 @@ static void video_real_mark_unflagged (Flaggable* base) {
 	Video * self;
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
-#line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 7003 "VideoSupport.c"
+#line 6997 "VideoSupport.c"
 }
 
 
 static void video_real_get_event_id (MediaSource* base, EventID* result) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 758 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7012 "VideoSupport.c"
+#line 7006 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7019 "VideoSupport.c"
+#line 7013 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			EventID _tmp2_ = {0};
-#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->event_id;
-#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7029 "VideoSupport.c"
+#line 7023 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7036 "VideoSupport.c"
+#line 7030 "VideoSupport.c"
 			}
-#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7040 "VideoSupport.c"
+#line 7034 "VideoSupport.c"
 		}
-		__finally521:
+		__finally518:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7049 "VideoSupport.c"
+#line 7043 "VideoSupport.c"
 		}
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7057 "VideoSupport.c"
+#line 7051 "VideoSupport.c"
 	}
 }
 
@@ -7066,16 +7060,16 @@ static gchar* video_real_to_string (DataObject* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 764 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7068 "VideoSupport.c"
+#line 7062 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7075 "VideoSupport.c"
+#line 7069 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			VideoID _tmp2_ = {0};
@@ -7086,111 +7080,111 @@ static gchar* video_real_to_string (DataObject* base) {
 			const gchar* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->video_id;
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = _tmp2_.id;
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp3_);
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = _tmp4_;
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_->filepath;
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = g_strdup_printf ("[%s] %s", _tmp5_, _tmp7_);
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = _tmp8_;
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp5_);
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp9_;
-#line 7108 "VideoSupport.c"
+#line 7102 "VideoSupport.c"
 			{
 				VideoRow* _tmp10_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7115 "VideoSupport.c"
+#line 7109 "VideoSupport.c"
 			}
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7119 "VideoSupport.c"
+#line 7113 "VideoSupport.c"
 		}
-		__finally522:
+		__finally519:
 		{
 			VideoRow* _tmp11_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = self->priv->backing_row;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7128 "VideoSupport.c"
+#line 7122 "VideoSupport.c"
 		}
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7136 "VideoSupport.c"
+#line 7130 "VideoSupport.c"
 	}
 }
 
 
 void video_get_video_id (Video* self, VideoID* result) {
 	GError * _inner_error_ = NULL;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 770 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7145 "VideoSupport.c"
+#line 7139 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7152 "VideoSupport.c"
+#line 7146 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			VideoID _tmp2_ = {0};
-#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->video_id;
-#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7162 "VideoSupport.c"
+#line 7156 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7169 "VideoSupport.c"
+#line 7163 "VideoSupport.c"
 			}
-#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7173 "VideoSupport.c"
+#line 7167 "VideoSupport.c"
 		}
-		__finally523:
+		__finally520:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7182 "VideoSupport.c"
+#line 7176 "VideoSupport.c"
 		}
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7190 "VideoSupport.c"
+#line 7184 "VideoSupport.c"
 	}
 }
 
@@ -7199,54 +7193,54 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7201 "VideoSupport.c"
+#line 7195 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7208 "VideoSupport.c"
+#line 7202 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
-#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->exposure_time;
-#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7218 "VideoSupport.c"
+#line 7212 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7225 "VideoSupport.c"
+#line 7219 "VideoSupport.c"
 			}
-#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7229 "VideoSupport.c"
+#line 7223 "VideoSupport.c"
 		}
-		__finally524:
+		__finally521:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7238 "VideoSupport.c"
+#line 7232 "VideoSupport.c"
 		}
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 7246 "VideoSupport.c"
+#line 7240 "VideoSupport.c"
 	}
 }
 
@@ -7256,16 +7250,16 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 	Alteration* _tmp12_ = NULL;
 	Alteration* _tmp13_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7258 "VideoSupport.c"
+#line 7252 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7265 "VideoSupport.c"
+#line 7259 "VideoSupport.c"
 		{
 			VideoRow* _tmp9_ = NULL;
 			time_t _tmp10_ = 0;
@@ -7275,165 +7269,165 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 				VideoRow* _tmp3_ = NULL;
 				VideoID _tmp4_ = {0};
 				time_t _tmp5_ = 0;
-#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = video_table_get_instance ();
-#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp2_ = _tmp1_;
-#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->video_id;
-#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = time;
-#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_, &_inner_error_);
-#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp2_);
-#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7291 "VideoSupport.c"
-					goto __catch526_g_error;
+#line 7285 "VideoSupport.c"
+					goto __catch523_g_error;
 				}
 			}
-			goto __finally526;
-			__catch526_g_error:
+			goto __finally523;
+			__catch523_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = e;
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = _tmp6_->message;
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				g_debug ("VideoSupport.vala:788: Warning - %s", _tmp7_);
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				g_debug ("VideoSupport.vala:787: Warning - %s", _tmp7_);
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 7313 "VideoSupport.c"
+#line 7307 "VideoSupport.c"
 			}
-			__finally526:
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally523:
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7318 "VideoSupport.c"
+#line 7312 "VideoSupport.c"
 				{
 					VideoRow* _tmp8_ = NULL;
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp8_ = self->priv->backing_row;
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7325 "VideoSupport.c"
+#line 7319 "VideoSupport.c"
 				}
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7333 "VideoSupport.c"
+#line 7327 "VideoSupport.c"
 			}
-#line 790 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = self->priv->backing_row;
-#line 790 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = time;
-#line 790 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_->exposure_time = _tmp10_;
-#line 7341 "VideoSupport.c"
+#line 7335 "VideoSupport.c"
 		}
-		__finally525:
+		__finally522:
 		{
 			VideoRow* _tmp11_ = NULL;
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = self->priv->backing_row;
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7350 "VideoSupport.c"
+#line 7344 "VideoSupport.c"
 		}
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7360 "VideoSupport.c"
+#line 7354 "VideoSupport.c"
 		}
 	}
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = alteration_new ("metadata", "exposure-time");
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = _tmp12_;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp13_);
-#line 7371 "VideoSupport.c"
+#line 7365 "VideoSupport.c"
 }
 
 
 void video_get_frame_dimensions (Video* self, Dimensions* result) {
 	GError * _inner_error_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 795 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7379 "VideoSupport.c"
+#line 7373 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7386 "VideoSupport.c"
+#line 7380 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gint _tmp2_ = 0;
 			VideoRow* _tmp3_ = NULL;
 			gint _tmp4_ = 0;
 			Dimensions _tmp5_ = {0};
-#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->width;
-#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->height;
-#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			dimensions_init (&_tmp5_, _tmp2_, _tmp4_);
-#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp5_;
-#line 7405 "VideoSupport.c"
+#line 7399 "VideoSupport.c"
 			{
 				VideoRow* _tmp6_ = NULL;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = self->priv->backing_row;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7412 "VideoSupport.c"
+#line 7406 "VideoSupport.c"
 			}
-#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7416 "VideoSupport.c"
+#line 7410 "VideoSupport.c"
 		}
-		__finally527:
+		__finally524:
 		{
 			VideoRow* _tmp7_ = NULL;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->priv->backing_row;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7425 "VideoSupport.c"
+#line 7419 "VideoSupport.c"
 		}
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7433 "VideoSupport.c"
+#line 7427 "VideoSupport.c"
 	}
 }
 
@@ -7441,15 +7435,15 @@ void video_get_frame_dimensions (Video* self, Dimensions* result) {
 static void video_real_get_dimensions (MediaSource* base, PhotoException disallowed_steps, Dimensions* result) {
 	Video * self;
 	Dimensions _tmp0_ = {0};
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_frame_dimensions (self, &_tmp0_);
-#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	*result = _tmp0_;
-#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 7449 "VideoSupport.c"
+#line 7443 "VideoSupport.c"
 }
 
 
@@ -7457,15 +7451,15 @@ static guint64 video_real_get_filesize (MediaSource* base) {
 	Video * self;
 	guint64 result = 0ULL;
 	guint64 _tmp0_ = 0ULL;
-#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 807 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 807 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 807 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7465 "VideoSupport.c"
+#line 7459 "VideoSupport.c"
 }
 
 
@@ -7473,54 +7467,54 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 	Video * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7475 "VideoSupport.c"
+#line 7469 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7482 "VideoSupport.c"
+#line 7476 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->filesize;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = (guint64) _tmp2_;
-#line 7492 "VideoSupport.c"
+#line 7486 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7499 "VideoSupport.c"
+#line 7493 "VideoSupport.c"
 			}
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7503 "VideoSupport.c"
+#line 7497 "VideoSupport.c"
 		}
-		__finally528:
+		__finally525:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7512 "VideoSupport.c"
+#line 7506 "VideoSupport.c"
 		}
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0ULL;
-#line 7520 "VideoSupport.c"
+#line 7514 "VideoSupport.c"
 	}
 }
 
@@ -7529,54 +7523,54 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 815 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7531 "VideoSupport.c"
+#line 7525 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7538 "VideoSupport.c"
+#line 7532 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
-#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->timestamp;
-#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7548 "VideoSupport.c"
+#line 7542 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7555 "VideoSupport.c"
+#line 7549 "VideoSupport.c"
 			}
-#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7559 "VideoSupport.c"
+#line 7553 "VideoSupport.c"
 		}
-		__finally529:
+		__finally526:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7568 "VideoSupport.c"
+#line 7562 "VideoSupport.c"
 		}
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 7576 "VideoSupport.c"
+#line 7570 "VideoSupport.c"
 	}
 }
 
@@ -7589,25 +7583,25 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 	Alteration* _tmp19_ = NULL;
 	Alteration* _tmp20_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = info;
-#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
-#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	time_val = _tmp1_;
-#line 7599 "VideoSupport.c"
+#line 7593 "VideoSupport.c"
 	{
 		{
 			VideoRow* _tmp2_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7607 "VideoSupport.c"
+#line 7601 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 				time_t _tmp4_ = 0;
@@ -7622,182 +7616,182 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				VideoRow* _tmp14_ = NULL;
 				GTimeVal _tmp15_ = {0};
 				glong _tmp16_ = 0L;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->timestamp;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = time_val;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = _tmp5_.tv_sec;
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp4_ == ((time_t) _tmp6_)) {
-#line 7632 "VideoSupport.c"
+#line 7626 "VideoSupport.c"
 					{
 						VideoRow* _tmp7_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp7_ = self->priv->backing_row;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7639 "VideoSupport.c"
+#line 7633 "VideoSupport.c"
 					}
-#line 828 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 7643 "VideoSupport.c"
+#line 7637 "VideoSupport.c"
 				}
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_;
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = _tmp10_->video_id;
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = time_val;
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = _tmp12_.tv_sec;
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_timestamp (_tmp9_, &_tmp11_, (time_t) _tmp13_, &_inner_error_);
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp9_);
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7663 "VideoSupport.c"
-					goto __finally531;
+#line 7657 "VideoSupport.c"
+					goto __finally528;
 				}
-#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = self->priv->backing_row;
-#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = time_val;
-#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _tmp15_.tv_sec;
-#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_->timestamp = (time_t) _tmp16_;
-#line 7674 "VideoSupport.c"
+#line 7668 "VideoSupport.c"
 			}
-			__finally531:
+			__finally528:
 			{
 				VideoRow* _tmp17_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7683 "VideoSupport.c"
+#line 7677 "VideoSupport.c"
 			}
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 7689 "VideoSupport.c"
-					goto __catch530_database_error;
+#line 7683 "VideoSupport.c"
+					goto __catch527_database_error;
 				}
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7698 "VideoSupport.c"
+#line 7692 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally530;
-	__catch530_database_error:
+	goto __finally527;
+	__catch527_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp18_ = err;
-#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp18_);
-#line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7719 "VideoSupport.c"
+#line 7713 "VideoSupport.c"
 	}
-	__finally530:
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally527:
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7730 "VideoSupport.c"
+#line 7724 "VideoSupport.c"
 	}
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "master-timestamp");
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 7740 "VideoSupport.c"
+#line 7734 "VideoSupport.c"
 }
 
 
 gchar* video_get_filename (Video* self) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 7749 "VideoSupport.c"
+#line 7743 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7756 "VideoSupport.c"
+#line 7750 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->filepath;
-#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 7769 "VideoSupport.c"
+#line 7763 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7776 "VideoSupport.c"
+#line 7770 "VideoSupport.c"
 			}
-#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7780 "VideoSupport.c"
+#line 7774 "VideoSupport.c"
 		}
-		__finally532:
+		__finally529:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7789 "VideoSupport.c"
+#line 7783 "VideoSupport.c"
 		}
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7797 "VideoSupport.c"
+#line 7791 "VideoSupport.c"
 	}
 }
 
@@ -7809,23 +7803,23 @@ static GFile* video_real_get_file (MediaSource* base) {
 	gchar* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_get_filename (self);
-#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp1_);
-#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7825 "VideoSupport.c"
+#line 7819 "VideoSupport.c"
 }
 
 
@@ -7833,15 +7827,15 @@ static GFile* video_real_get_master_file (MediaSource* base) {
 	Video * self;
 	GFile* result = NULL;
 	GFile* _tmp0_ = NULL;
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 853 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 853 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 853 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7841 "VideoSupport.c"
+#line 7835 "VideoSupport.c"
 }
 
 
@@ -7853,93 +7847,93 @@ void video_export (Video* self, GFile* dest_file, GError** error) {
 	GFile* _tmp3_ = NULL;
 	GFile* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_get_filename (self);
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp1_);
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	source_file = _tmp3_;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = dest_file;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_copy (source_file, _tmp4_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (source_file);
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7881 "VideoSupport.c"
+#line 7875 "VideoSupport.c"
 	}
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (source_file);
-#line 7885 "VideoSupport.c"
+#line 7879 "VideoSupport.c"
 }
 
 
 gdouble video_get_clip_duration (Video* self) {
 	gdouble result = 0.0;
 	GError * _inner_error_ = NULL;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 861 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0.0);
-#line 7894 "VideoSupport.c"
+#line 7888 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7901 "VideoSupport.c"
+#line 7895 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gdouble _tmp2_ = 0.0;
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->clip_duration;
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7911 "VideoSupport.c"
+#line 7905 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7918 "VideoSupport.c"
+#line 7912 "VideoSupport.c"
 			}
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7922 "VideoSupport.c"
+#line 7916 "VideoSupport.c"
 		}
-		__finally533:
+		__finally530:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7931 "VideoSupport.c"
+#line 7925 "VideoSupport.c"
 		}
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0.0;
-#line 7939 "VideoSupport.c"
+#line 7933 "VideoSupport.c"
 	}
 }
 
@@ -7947,123 +7941,123 @@ gdouble video_get_clip_duration (Video* self) {
 gboolean video_get_is_interpretable (Video* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 867 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 7949 "VideoSupport.c"
+#line 7943 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7956 "VideoSupport.c"
+#line 7950 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
-#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
-#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7966 "VideoSupport.c"
+#line 7960 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7973 "VideoSupport.c"
+#line 7967 "VideoSupport.c"
 			}
-#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7977 "VideoSupport.c"
+#line 7971 "VideoSupport.c"
 		}
-		__finally534:
+		__finally531:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7986 "VideoSupport.c"
+#line 7980 "VideoSupport.c"
 		}
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 7994 "VideoSupport.c"
+#line 7988 "VideoSupport.c"
 	}
 }
 
 
 static void video_set_is_interpretable (Video* self, gboolean is_interpretable) {
 	GError * _inner_error_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 8003 "VideoSupport.c"
+#line 7997 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8010 "VideoSupport.c"
+#line 8004 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
 			gboolean _tmp3_ = FALSE;
 			VideoRow* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
-#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = is_interpretable;
-#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp2_ == _tmp3_) {
-#line 8025 "VideoSupport.c"
+#line 8019 "VideoSupport.c"
 				{
 					VideoRow* _tmp4_ = NULL;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp4_ = self->priv->backing_row;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8032 "VideoSupport.c"
+#line 8026 "VideoSupport.c"
 				}
-#line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 8036 "VideoSupport.c"
+#line 8030 "VideoSupport.c"
 			}
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = is_interpretable;
-#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_->is_interpretable = _tmp6_;
-#line 8044 "VideoSupport.c"
+#line 8038 "VideoSupport.c"
 		}
-		__finally535:
+		__finally532:
 		{
 			VideoRow* _tmp7_ = NULL;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->priv->backing_row;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8053 "VideoSupport.c"
+#line 8047 "VideoSupport.c"
 		}
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8063 "VideoSupport.c"
+#line 8057 "VideoSupport.c"
 		}
 	}
 	{
@@ -8071,61 +8065,61 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 		VideoTable* _tmp9_ = NULL;
 		VideoID _tmp10_ = {0};
 		gboolean _tmp11_ = FALSE;
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = video_table_get_instance ();
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = _tmp8_;
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp10_);
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = is_interpretable;
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_update_is_interpretable (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp9_);
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8087 "VideoSupport.c"
-				goto __catch536_database_error;
+#line 8081 "VideoSupport.c"
+				goto __catch533_database_error;
 			}
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8096 "VideoSupport.c"
+#line 8090 "VideoSupport.c"
 		}
 	}
-	goto __finally536;
-	__catch536_database_error:
+	goto __finally533;
+	__catch533_database_error:
 	{
 		GError* e = NULL;
 		GError* _tmp12_ = NULL;
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = e;
-#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp12_);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 8114 "VideoSupport.c"
+#line 8108 "VideoSupport.c"
 	}
-	__finally536:
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally533:
+#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8125 "VideoSupport.c"
+#line 8119 "VideoSupport.c"
 	}
 }
 
@@ -8152,235 +8146,235 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 	GdkPixbuf* _tmp27_ = NULL;
 	GdkPixbuf* _tmp28_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 893 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpretable_results_new (self);
-#line 893 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	results = _tmp0_;
-#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	clip_duration = -1.0;
-#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	preview_frame = NULL;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_new (_tmp2_);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_file_reader = _tmp4_;
-#line 8174 "VideoSupport.c"
+#line 8168 "VideoSupport.c"
 	{
 		gdouble _tmp5_ = 0.0;
 		VideoReader* _tmp6_ = NULL;
 		gdouble _tmp7_ = 0.0;
 		VideoReader* _tmp8_ = NULL;
 		GdkPixbuf* _tmp9_ = NULL;
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = backing_file_reader;
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_reader_read_clip_duration (_tmp6_, &_inner_error_);
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp7_;
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 8191 "VideoSupport.c"
-				goto __catch537_video_error;
+#line 8185 "VideoSupport.c"
+				goto __catch534_video_error;
 			}
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_interpretable_results_unref0 (results);
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8206 "VideoSupport.c"
+#line 8200 "VideoSupport.c"
 		}
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp5_;
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = backing_file_reader;
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = video_reader_read_preview_frame (_tmp8_);
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		preview_frame = _tmp9_;
-#line 8218 "VideoSupport.c"
+#line 8212 "VideoSupport.c"
 	}
-	goto __finally537;
-	__catch537_video_error:
+	goto __finally534;
+	__catch534_video_error:
 	{
 		GError* e = NULL;
 		VideoInterpretableResults* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		VideoInterpretableResults* _tmp12_ = NULL;
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = results;
-#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = video_get_is_interpretable (self);
-#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_->update_interpretable = _tmp11_;
-#line 906 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = results;
-#line 906 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_->is_interpretable = FALSE;
-#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
-#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8251 "VideoSupport.c"
+#line 8245 "VideoSupport.c"
 	}
-	__finally537:
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally534:
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (results);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 8268 "VideoSupport.c"
+#line 8262 "VideoSupport.c"
 	}
-#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = video_get_is_interpretable (self);
-#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_) {
-#line 8274 "VideoSupport.c"
+#line 8268 "VideoSupport.c"
 		VideoInterpretableResults* _tmp14_ = NULL;
 		VideoInterpretableResults* _tmp15_ = NULL;
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = results;
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_->update_interpretable = FALSE;
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = results;
-#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_->is_interpretable = TRUE;
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8293 "VideoSupport.c"
+#line 8287 "VideoSupport.c"
 	}
-#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = _tmp16_;
-#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = g_file_get_basename (_tmp17_);
-#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = _tmp18_;
-#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:919: video %s has become interpretable", _tmp19_);
-#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_debug ("VideoSupport.vala:918: video %s has become interpretable", _tmp19_);
+#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp19_);
-#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp17_);
-#line 8309 "VideoSupport.c"
+#line 8303 "VideoSupport.c"
 	{
 		VideoRow* _tmp20_ = NULL;
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = self->priv->backing_row;
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8316 "VideoSupport.c"
+#line 8310 "VideoSupport.c"
 		{
 			VideoRow* _tmp21_ = NULL;
 			gdouble _tmp22_ = 0.0;
-#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = clip_duration;
-#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->clip_duration = _tmp22_;
-#line 8326 "VideoSupport.c"
+#line 8320 "VideoSupport.c"
 		}
-		__finally538:
+		__finally535:
 		{
 			VideoRow* _tmp23_ = NULL;
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8335 "VideoSupport.c"
+#line 8329 "VideoSupport.c"
 		}
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_interpretable_results_unref0 (results);
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8351 "VideoSupport.c"
+#line 8345 "VideoSupport.c"
 		}
 	}
-#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 925 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = results;
-#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 925 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_->update_interpretable = TRUE;
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = results;
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_->is_interpretable = TRUE;
-#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = results;
-#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = preview_frame;
-#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp26_->new_thumbnail);
-#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_->new_thumbnail = _tmp28_;
-#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = results;
-#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (backing_file_reader);
-#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (preview_frame);
-#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8380 "VideoSupport.c"
+#line 8374 "VideoSupport.c"
 }
 
 
@@ -8389,81 +8383,81 @@ static void video_real_destroy (DataSource* base) {
 	VideoID video_id = {0};
 	VideoID _tmp0_ = {0};
 	GError * _inner_error_ = NULL;
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (self, &_tmp0_);
-#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id = _tmp0_;
-#line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 8397 "VideoSupport.c"
+#line 8391 "VideoSupport.c"
 	{
 		VideoTable* _tmp1_ = NULL;
 		VideoTable* _tmp2_ = NULL;
 		VideoID _tmp3_ = {0};
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_id;
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_remove (_tmp2_, &_tmp3_, &_inner_error_);
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8416 "VideoSupport.c"
-				goto __catch539_database_error;
+#line 8410 "VideoSupport.c"
+				goto __catch536_database_error;
 			}
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8425 "VideoSupport.c"
+#line 8419 "VideoSupport.c"
 		}
 	}
-	goto __finally539;
-	__catch539_database_error:
+	goto __finally536;
+	__catch536_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_error ("VideoSupport.vala:941: failed to remove video %s from video table", _tmp5_);
-#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_error ("VideoSupport.vala:940: failed to remove video %s from video table", _tmp5_);
+#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp5_);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 8448 "VideoSupport.c"
+#line 8442 "VideoSupport.c"
 	}
-	__finally539:
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally536:
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8459 "VideoSupport.c"
+#line 8453 "VideoSupport.c"
 	}
-#line 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_SOURCE_CLASS (video_parent_class)->destroy (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource));
-#line 8463 "VideoSupport.c"
+#line 8457 "VideoSupport.c"
 }
 
 
@@ -8476,39 +8470,39 @@ static gboolean video_real_internal_delete_backing (DataSource* base, GError** e
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 948 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 948 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	ret = _tmp0_;
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = DATA_SOURCE_CLASS (video_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_VIDEO_SOURCE, VideoSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp3_;
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 8492 "VideoSupport.c"
+#line 8486 "VideoSupport.c"
 	}
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = ret;
-#line 8498 "VideoSupport.c"
+#line 8492 "VideoSupport.c"
 	} else {
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 8502 "VideoSupport.c"
+#line 8496 "VideoSupport.c"
 	}
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8508 "VideoSupport.c"
+#line 8502 "VideoSupport.c"
 }
 
 
@@ -8517,41 +8511,41 @@ static void video_notify_flags_altered (Video* self, Alteration* additional_alte
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
 	Alteration* _tmp5_ = NULL;
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration));
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flags");
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	alteration = _tmp0_;
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = additional_alteration;
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 8529 "VideoSupport.c"
+#line 8523 "VideoSupport.c"
 		Alteration* _tmp2_ = NULL;
 		Alteration* _tmp3_ = NULL;
 		Alteration* _tmp4_ = NULL;
-#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = alteration;
-#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = additional_alteration;
-#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = alteration_compress (_tmp2_, _tmp3_);
-#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_alteration_unref0 (alteration);
-#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		alteration = _tmp4_;
-#line 8543 "VideoSupport.c"
+#line 8537 "VideoSupport.c"
 	}
-#line 959 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 958 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = alteration;
-#line 959 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 958 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (alteration);
-#line 8551 "VideoSupport.c"
+#line 8545 "VideoSupport.c"
 }
 
 
@@ -8560,18 +8554,18 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 	guint64 new_flags = 0ULL;
 	Alteration* _tmp24_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 962 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
-#line 962 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8564 "VideoSupport.c"
+#line 8558 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8571 "VideoSupport.c"
+#line 8565 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -8582,180 +8576,180 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 			guint64 _tmp7_ = 0ULL;
 			VideoRow* _tmp21_ = NULL;
 			guint64 _tmp22_ = 0ULL;
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flags_to_add;
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_);
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			new_flags = _tmp4_;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = new_flags;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp6_ == _tmp7_) {
-#line 8600 "VideoSupport.c"
+#line 8594 "VideoSupport.c"
 				VideoRow* _tmp8_ = NULL;
 				guint64 _tmp9_ = 0ULL;
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_->flags;
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8609 "VideoSupport.c"
+#line 8603 "VideoSupport.c"
 				{
 					VideoRow* _tmp10_ = NULL;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8616 "VideoSupport.c"
+#line 8610 "VideoSupport.c"
 				}
-#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8620 "VideoSupport.c"
+#line 8614 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp11_ = NULL;
 				VideoTable* _tmp12_ = NULL;
 				VideoID _tmp13_ = {0};
 				guint64 _tmp14_ = 0ULL;
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = video_table_get_instance ();
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = _tmp11_;
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp13_);
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_flags;
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp12_);
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8643 "VideoSupport.c"
-						goto __catch541_database_error;
+#line 8637 "VideoSupport.c"
+						goto __catch538_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp15_ = self->priv->backing_row;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8652 "VideoSupport.c"
+#line 8646 "VideoSupport.c"
 					}
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return 0ULL;
-#line 8660 "VideoSupport.c"
+#line 8654 "VideoSupport.c"
 				}
 			}
-			goto __finally541;
-			__catch541_database_error:
+			goto __finally538;
+			__catch538_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
 				VideoRow* _tmp17_ = NULL;
 				guint64 _tmp18_ = 0ULL;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = e;
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp16_);
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _tmp17_->flags;
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp18_;
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8686 "VideoSupport.c"
+#line 8680 "VideoSupport.c"
 				{
 					VideoRow* _tmp19_ = NULL;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp19_ = self->priv->backing_row;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8693 "VideoSupport.c"
+#line 8687 "VideoSupport.c"
 				}
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8697 "VideoSupport.c"
+#line 8691 "VideoSupport.c"
 			}
-			__finally541:
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally538:
+#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8702 "VideoSupport.c"
+#line 8696 "VideoSupport.c"
 				{
 					VideoRow* _tmp20_ = NULL;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp20_ = self->priv->backing_row;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8709 "VideoSupport.c"
+#line 8703 "VideoSupport.c"
 				}
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0ULL;
-#line 8717 "VideoSupport.c"
+#line 8711 "VideoSupport.c"
 			}
-#line 976 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 976 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = new_flags;
-#line 976 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->flags = _tmp22_;
-#line 8725 "VideoSupport.c"
+#line 8719 "VideoSupport.c"
 		}
-		__finally540:
+		__finally537:
 		{
 			VideoRow* _tmp23_ = NULL;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8734 "VideoSupport.c"
+#line 8728 "VideoSupport.c"
 		}
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0ULL;
-#line 8744 "VideoSupport.c"
+#line 8738 "VideoSupport.c"
 		}
 	}
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = additional_alteration;
-#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_notify_flags_altered (self, _tmp24_);
-#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
-#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8755 "VideoSupport.c"
+#line 8749 "VideoSupport.c"
 }
 
 
@@ -8764,18 +8758,18 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 	guint64 new_flags = 0ULL;
 	Alteration* _tmp24_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
-#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8768 "VideoSupport.c"
+#line 8762 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8775 "VideoSupport.c"
+#line 8769 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -8786,240 +8780,240 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 			guint64 _tmp7_ = 0ULL;
 			VideoRow* _tmp21_ = NULL;
 			guint64 _tmp22_ = 0ULL;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flags_to_remove;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_);
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			new_flags = _tmp4_;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = new_flags;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp6_ == _tmp7_) {
-#line 8804 "VideoSupport.c"
+#line 8798 "VideoSupport.c"
 				VideoRow* _tmp8_ = NULL;
 				guint64 _tmp9_ = 0ULL;
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_->flags;
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8813 "VideoSupport.c"
+#line 8807 "VideoSupport.c"
 				{
 					VideoRow* _tmp10_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8820 "VideoSupport.c"
+#line 8814 "VideoSupport.c"
 				}
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8824 "VideoSupport.c"
+#line 8818 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp11_ = NULL;
 				VideoTable* _tmp12_ = NULL;
 				VideoID _tmp13_ = {0};
 				guint64 _tmp14_ = 0ULL;
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = video_table_get_instance ();
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = _tmp11_;
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp13_);
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_flags;
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp12_);
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8847 "VideoSupport.c"
-						goto __catch543_database_error;
+#line 8841 "VideoSupport.c"
+						goto __catch540_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp15_ = self->priv->backing_row;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8856 "VideoSupport.c"
+#line 8850 "VideoSupport.c"
 					}
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return 0ULL;
-#line 8864 "VideoSupport.c"
+#line 8858 "VideoSupport.c"
 				}
 			}
-			goto __finally543;
-			__catch543_database_error:
+			goto __finally540;
+			__catch540_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
 				VideoRow* _tmp17_ = NULL;
 				guint64 _tmp18_ = 0ULL;
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 993 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = e;
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 993 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp16_);
-#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _tmp17_->flags;
-#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp18_;
-#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8890 "VideoSupport.c"
+#line 8884 "VideoSupport.c"
 				{
 					VideoRow* _tmp19_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp19_ = self->priv->backing_row;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8897 "VideoSupport.c"
+#line 8891 "VideoSupport.c"
 				}
-#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8901 "VideoSupport.c"
+#line 8895 "VideoSupport.c"
 			}
-			__finally543:
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally540:
+#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8906 "VideoSupport.c"
+#line 8900 "VideoSupport.c"
 				{
 					VideoRow* _tmp20_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp20_ = self->priv->backing_row;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8913 "VideoSupport.c"
+#line 8907 "VideoSupport.c"
 				}
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0ULL;
-#line 8921 "VideoSupport.c"
+#line 8915 "VideoSupport.c"
 			}
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = new_flags;
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->flags = _tmp22_;
-#line 8929 "VideoSupport.c"
+#line 8923 "VideoSupport.c"
 		}
-		__finally542:
+		__finally539:
 		{
 			VideoRow* _tmp23_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8938 "VideoSupport.c"
+#line 8932 "VideoSupport.c"
 		}
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0ULL;
-#line 8948 "VideoSupport.c"
+#line 8942 "VideoSupport.c"
 		}
 	}
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = additional_alteration;
-#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_notify_flags_altered (self, _tmp24_);
-#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
-#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8959 "VideoSupport.c"
+#line 8953 "VideoSupport.c"
 }
 
 
 gboolean video_is_flag_set (Video* self, guint64 flag) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 8968 "VideoSupport.c"
+#line 8962 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8975 "VideoSupport.c"
+#line 8969 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
 			guint64 _tmp3_ = 0ULL;
 			gboolean _tmp4_ = FALSE;
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flag;
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp4_;
-#line 8991 "VideoSupport.c"
+#line 8985 "VideoSupport.c"
 			{
 				VideoRow* _tmp5_ = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8998 "VideoSupport.c"
+#line 8992 "VideoSupport.c"
 			}
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 9002 "VideoSupport.c"
+#line 8996 "VideoSupport.c"
 		}
-		__finally544:
+		__finally541:
 		{
 			VideoRow* _tmp6_ = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9011 "VideoSupport.c"
+#line 9005 "VideoSupport.c"
 		}
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 9019 "VideoSupport.c"
+#line 9013 "VideoSupport.c"
 	}
 }
 
@@ -9038,27 +9032,27 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 	Alteration* _tmp25_ = NULL;
 	Alteration* _tmp26_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_filepath = _tmp1_;
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old_filepath = NULL;
-#line 9050 "VideoSupport.c"
+#line 9044 "VideoSupport.c"
 	{
 		{
 			VideoRow* _tmp2_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 9058 "VideoSupport.c"
+#line 9052 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
@@ -9074,169 +9068,169 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				VideoRow* _tmp15_ = NULL;
 				const gchar* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->filepath;
-#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = new_filepath;
-#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 9082 "VideoSupport.c"
+#line 9076 "VideoSupport.c"
 					{
 						VideoRow* _tmp6_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp6_ = self->priv->backing_row;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9089 "VideoSupport.c"
+#line 9083 "VideoSupport.c"
 					}
-#line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (old_filepath);
-#line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_filepath);
-#line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 9097 "VideoSupport.c"
+#line 9091 "VideoSupport.c"
 				}
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = self->priv->backing_row;
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_->filepath;
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = g_strdup (_tmp8_);
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				old_filepath = _tmp9_;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = video_table_get_instance ();
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = _tmp10_;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = self->priv->backing_row;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = _tmp12_->video_id;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_filepath;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_filepath (_tmp11_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp11_);
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9125 "VideoSupport.c"
-					goto __finally546;
+#line 9119 "VideoSupport.c"
+					goto __finally543;
 				}
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = self->priv->backing_row;
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = new_filepath;
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = g_strdup (_tmp16_);
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (_tmp15_->filepath);
-#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_->filepath = _tmp17_;
-#line 9138 "VideoSupport.c"
+#line 9132 "VideoSupport.c"
 			}
-			__finally546:
+			__finally543:
 			{
 				VideoRow* _tmp18_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = self->priv->backing_row;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9147 "VideoSupport.c"
+#line 9141 "VideoSupport.c"
 			}
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 9153 "VideoSupport.c"
-					goto __catch545_database_error;
+#line 9147 "VideoSupport.c"
+					goto __catch542_database_error;
 				}
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_filepath);
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 9166 "VideoSupport.c"
+#line 9160 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally545;
-	__catch545_database_error:
+	goto __finally542;
+	__catch542_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = err;
-#line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp19_);
-#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (old_filepath);
-#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (new_filepath);
-#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9191 "VideoSupport.c"
+#line 9185 "VideoSupport.c"
 	}
-	__finally545:
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally542:
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (old_filepath);
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (new_filepath);
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9206 "VideoSupport.c"
+#line 9200 "VideoSupport.c"
 	}
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = old_filepath;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp20_ != NULL, "old_filepath != null");
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = old_filepath;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = g_file_new_for_path (_tmp21_);
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = _tmp22_;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = file;
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	media_source_notify_master_replaced (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp23_, _tmp24_);
-#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp23_);
-#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = alteration_new_from_list ("backing:master,metadata:name");
-#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = _tmp25_;
-#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp26_);
-#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp26_);
-#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (old_filepath);
-#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_filepath);
-#line 9236 "VideoSupport.c"
+#line 9230 "VideoSupport.c"
 }
 
 
@@ -9251,45 +9245,45 @@ VideoMetadata* video_read_metadata (Video* self, GError** error) {
 	VideoMetadata* _tmp6_ = NULL;
 	VideoMetadata* _tmp7_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_new (_tmp2_);
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = video_reader_read_metadata (_tmp4_, &_inner_error_);
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (_tmp4_);
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = _tmp6_;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 9277 "VideoSupport.c"
+#line 9271 "VideoSupport.c"
 	}
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = _tmp0_;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp7_;
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_media_metadata_unref0 (_tmp0_);
-#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9289 "VideoSupport.c"
+#line 9283 "VideoSupport.c"
 }
 
 
@@ -9297,28 +9291,28 @@ VideoInterpretableResults* video_interpretable_results_construct (GType object_t
 	VideoInterpretableResults* self = NULL;
 	Video* _tmp0_ = NULL;
 	Video* _tmp1_ = NULL;
-#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (video), NULL);
-#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (VideoInterpretableResults*) g_type_create_instance (object_type);
-#line 321 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video;
-#line 321 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 321 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->video);
-#line 321 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	self->video = _tmp1_;
 #line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	self->video = _tmp1_;
+#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9311 "VideoSupport.c"
+#line 9305 "VideoSupport.c"
 }
 
 
 VideoInterpretableResults* video_interpretable_results_new (Video* video) {
-#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_interpretable_results_construct (VIDEO_TYPE_INTERPRETABLE_RESULTS, video);
-#line 9318 "VideoSupport.c"
+#line 9312 "VideoSupport.c"
 }
 
 
@@ -9326,64 +9320,64 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 	gboolean _tmp0_ = FALSE;
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 324 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (VIDEO_IS_INTERPRETABLE_RESULTS (self));
-#line 325 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 324 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->update_interpretable;
-#line 325 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 324 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 9332 "VideoSupport.c"
+#line 9326 "VideoSupport.c"
 		Video* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 326 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 325 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->video;
-#line 326 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 325 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->is_interpretable;
-#line 326 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 325 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_set_is_interpretable (_tmp1_, _tmp2_);
-#line 9341 "VideoSupport.c"
+#line 9335 "VideoSupport.c"
 	}
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 327 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->new_thumbnail;
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 327 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_ != NULL) {
-#line 9347 "VideoSupport.c"
+#line 9341 "VideoSupport.c"
 		{
 			Video* _tmp4_ = NULL;
 			GdkPixbuf* _tmp5_ = NULL;
 			Video* _tmp6_ = NULL;
 			GdkPixbuf* _tmp7_ = NULL;
 			Video* _tmp8_ = NULL;
-#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->video;
-#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->new_thumbnail;
-#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_BIG, _tmp5_, &_inner_error_);
-#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9362 "VideoSupport.c"
-				goto __catch547_g_error;
+#line 9356 "VideoSupport.c"
+				goto __catch544_g_error;
 			}
-#line 331 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->video;
-#line 331 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->new_thumbnail;
-#line 331 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_MEDIUM, _tmp7_, &_inner_error_);
-#line 331 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9373 "VideoSupport.c"
-				goto __catch547_g_error;
+#line 9367 "VideoSupport.c"
+				goto __catch544_g_error;
 			}
-#line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->video;
-#line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 9380 "VideoSupport.c"
+#line 9374 "VideoSupport.c"
 		}
-		goto __finally547;
-		__catch547_g_error:
+		goto __finally544;
+		__catch544_g_error:
 		{
 			GError* err = NULL;
 			Video* _tmp9_ = NULL;
@@ -9391,256 +9385,256 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			gchar* _tmp11_ = NULL;
 			GError* _tmp12_ = NULL;
 			const gchar* _tmp13_ = NULL;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			err = _inner_error_;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_inner_error_ = NULL;
-#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = self->video;
-#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
-#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = _tmp10_;
-#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = err;
-#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp13_ = _tmp12_->message;
-#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_message ("VideoSupport.vala:335: Unable to update video thumbnails for %s: %s", _tmp11_, _tmp13_);
-#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_message ("VideoSupport.vala:334: Unable to update video thumbnails for %s: %s", _tmp11_, _tmp13_);
+#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp11_);
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 9411 "VideoSupport.c"
+#line 9405 "VideoSupport.c"
 		}
-		__finally547:
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		__finally544:
+#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 9422 "VideoSupport.c"
+#line 9416 "VideoSupport.c"
 		}
 	}
 }
 
 
 static void video_value_interpretable_results_init (GValue* value) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 9431 "VideoSupport.c"
+#line 9425 "VideoSupport.c"
 }
 
 
 static void video_value_interpretable_results_free_value (GValue* value) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (value->data[0].v_pointer) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (value->data[0].v_pointer);
-#line 9440 "VideoSupport.c"
+#line 9434 "VideoSupport.c"
 	}
 }
 
 
 static void video_value_interpretable_results_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_interpretable_results_ref (src_value->data[0].v_pointer);
-#line 9450 "VideoSupport.c"
+#line 9444 "VideoSupport.c"
 	} else {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9454 "VideoSupport.c"
+#line 9448 "VideoSupport.c"
 	}
 }
 
 
 static gpointer video_value_interpretable_results_peek_pointer (const GValue* value) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9462 "VideoSupport.c"
+#line 9456 "VideoSupport.c"
 }
 
 
 static gchar* video_value_interpretable_results_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 9469 "VideoSupport.c"
+#line 9463 "VideoSupport.c"
 		VideoInterpretableResults* object;
 		object = collect_values[0].v_pointer;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9476 "VideoSupport.c"
+#line 9470 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9480 "VideoSupport.c"
+#line 9474 "VideoSupport.c"
 		}
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_interpretable_results_ref (object);
-#line 9484 "VideoSupport.c"
+#line 9478 "VideoSupport.c"
 	} else {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9488 "VideoSupport.c"
+#line 9482 "VideoSupport.c"
 	}
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9492 "VideoSupport.c"
+#line 9486 "VideoSupport.c"
 }
 
 
 static gchar* video_value_interpretable_results_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	VideoInterpretableResults** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!object_p) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9503 "VideoSupport.c"
+#line 9497 "VideoSupport.c"
 	}
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 9509 "VideoSupport.c"
+#line 9503 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9513 "VideoSupport.c"
+#line 9507 "VideoSupport.c"
 	} else {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9517 "VideoSupport.c"
+#line 9511 "VideoSupport.c"
 	}
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9521 "VideoSupport.c"
+#line 9515 "VideoSupport.c"
 }
 
 
 GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	VideoParamSpecInterpretableResults* spec;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL);
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 9535 "VideoSupport.c"
+#line 9529 "VideoSupport.c"
 }
 
 
 gpointer video_value_get_interpretable_results (const GValue* value) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL);
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9544 "VideoSupport.c"
+#line 9538 "VideoSupport.c"
 }
 
 
 void video_value_set_interpretable_results (GValue* value, gpointer v_object) {
 	VideoInterpretableResults* old;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old = value->data[0].v_pointer;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (v_object) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9564 "VideoSupport.c"
+#line 9558 "VideoSupport.c"
 	} else {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9568 "VideoSupport.c"
+#line 9562 "VideoSupport.c"
 	}
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9574 "VideoSupport.c"
+#line 9568 "VideoSupport.c"
 	}
 }
 
 
 void video_value_take_interpretable_results (GValue* value, gpointer v_object) {
 	VideoInterpretableResults* old;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old = value->data[0].v_pointer;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (v_object) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 9593 "VideoSupport.c"
+#line 9587 "VideoSupport.c"
 	} else {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9597 "VideoSupport.c"
+#line 9591 "VideoSupport.c"
 	}
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9603 "VideoSupport.c"
+#line 9597 "VideoSupport.c"
 	}
 }
 
 
 static void video_interpretable_results_class_init (VideoInterpretableResultsClass * klass) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_interpretable_results_parent_class = g_type_class_peek_parent (klass);
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((VideoInterpretableResultsClass *) klass)->finalize = video_interpretable_results_finalize;
-#line 9613 "VideoSupport.c"
+#line 9607 "VideoSupport.c"
 }
 
 
 static void video_interpretable_results_instance_init (VideoInterpretableResults * self) {
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 315 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->update_interpretable = FALSE;
-#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->is_interpretable = FALSE;
-#line 318 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->new_thumbnail = NULL;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 9626 "VideoSupport.c"
+#line 9620 "VideoSupport.c"
 }
 
 
 static void video_interpretable_results_finalize (VideoInterpretableResults* obj) {
 	VideoInterpretableResults * self;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIDEO_TYPE_INTERPRETABLE_RESULTS, VideoInterpretableResults);
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_handlers_destroy (self);
-#line 315 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->video);
-#line 318 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->new_thumbnail);
-#line 9640 "VideoSupport.c"
+#line 9634 "VideoSupport.c"
 }
 
 
@@ -9661,172 +9655,172 @@ GType video_interpretable_results_get_type (void) {
 gpointer video_interpretable_results_ref (gpointer instance) {
 	VideoInterpretableResults* self;
 	self = instance;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 9665 "VideoSupport.c"
+#line 9659 "VideoSupport.c"
 }
 
 
 void video_interpretable_results_unref (gpointer instance) {
 	VideoInterpretableResults* self;
 	self = instance;
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		VIDEO_INTERPRETABLE_RESULTS_GET_CLASS (self)->finalize (self);
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9678 "VideoSupport.c"
+#line 9672 "VideoSupport.c"
 	}
 }
 
 
 static void video_class_init (VideoClass * klass) {
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_parent_class = g_type_class_peek_parent (klass);
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoPrivate));
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->commit_backlinks = video_real_commit_backlinks;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->set_event_id = video_real_set_event_id;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_backing_files_state = video_real_get_backing_files_state;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((ThumbnailSourceClass *) klass)->get_thumbnail = video_real_get_thumbnail;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_master_md5 = video_real_get_master_md5;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_preview_pixbuf = video_real_get_preview_pixbuf;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((ThumbnailSourceClass *) klass)->create_thumbnail = video_real_create_thumbnail;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->get_typename = video_real_get_typename;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->get_instance_id = video_real_get_instance_id;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_import_id = video_real_get_import_id;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = video_real_get_preferred_thumbnail_format;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_title = video_real_get_title;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->set_title = video_real_set_title;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_comment = video_real_get_comment;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->set_comment = video_real_set_comment;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_rating = video_real_get_rating;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->set_rating = video_real_set_rating;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->increase_rating = video_real_increase_rating;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->decrease_rating = video_real_decrease_rating;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->is_trashed = video_real_is_trashed;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->is_offline = video_real_is_offline;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->mark_offline = video_real_mark_offline;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->mark_online = video_real_mark_online;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->trash = video_real_trash;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->untrash = video_real_untrash;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_event_id = video_real_get_event_id;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataObjectClass *) klass)->to_string = video_real_to_string;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_exposure_time = video_real_get_exposure_time;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_dimensions = video_real_get_dimensions;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_filesize = video_real_get_filesize;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_master_filesize = video_real_get_master_filesize;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_timestamp = video_real_get_timestamp;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_file = video_real_get_file;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_master_file = video_real_get_master_file;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->destroy = video_real_destroy;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->internal_delete_backing = video_real_internal_delete_backing;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = video_finalize;
-#line 9762 "VideoSupport.c"
+#line 9756 "VideoSupport.c"
 }
 
 
 static void video_flaggable_interface_init (FlaggableIface * iface) {
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_flaggable_parent_iface = g_type_interface_peek_parent (iface);
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->is_flagged = (gboolean (*)(Flaggable*)) video_real_is_flagged;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_flagged = (void (*)(Flaggable*)) video_real_mark_flagged;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_unflagged = (void (*)(Flaggable*)) video_real_mark_unflagged;
-#line 9775 "VideoSupport.c"
+#line 9769 "VideoSupport.c"
 }
 
 
 static void video_monitorable_interface_init (MonitorableIface * iface) {
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_monitorable_parent_iface = g_type_interface_peek_parent (iface);
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->is_offline = (gboolean (*)(Monitorable*)) video_real_is_offline;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_offline = (void (*)(Monitorable*)) video_real_mark_offline;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_online = (void (*)(Monitorable*)) video_real_mark_online;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_master_timestamp = (void (*)(Monitorable*, GFileInfo*)) video_real_set_master_timestamp;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_master_file = (void (*)(Monitorable*, GFile*)) video_real_set_master_file;
-#line 9792 "VideoSupport.c"
+#line 9786 "VideoSupport.c"
 }
 
 
 static void video_dateable_interface_init (DateableIface * iface) {
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_dateable_parent_iface = g_type_interface_peek_parent (iface);
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->get_exposure_time = (time_t (*)(Dateable*)) video_real_get_exposure_time;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_exposure_time = (void (*)(Dateable*, time_t)) video_real_set_exposure_time;
-#line 9803 "VideoSupport.c"
+#line 9797 "VideoSupport.c"
 }
 
 
 static void video_instance_init (Video * self) {
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_GET_PRIVATE (self);
-#line 348 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_rec_mutex_init (&self->priv->__lock_backing_row);
-#line 9812 "VideoSupport.c"
+#line 9806 "VideoSupport.c"
 }
 
 
 static void video_finalize (GObject* obj) {
 	Video * self;
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO, Video);
-#line 348 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_rec_mutex_clear (&self->priv->__lock_backing_row);
-#line 348 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_row_unref0 (self->priv->backing_row);
-#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (video_parent_class)->finalize (obj);
-#line 9826 "VideoSupport.c"
+#line 9820 "VideoSupport.c"
 }
 
 
@@ -9863,44 +9857,44 @@ GType video_source_collection_state_get_type (void) {
 static gint _uint64_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = uint64_compare ((guint64*) a, (guint64*) b);
-#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9865 "VideoSupport.c"
+#line 9859 "VideoSupport.c"
 }
 
 
 static guint64* _uint64_dup (guint64* self) {
 	guint64* dup;
-#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	dup = g_new0 (guint64, 1);
-#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	memcpy (dup, self, sizeof (guint64));
-#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 9877 "VideoSupport.c"
+#line 9871 "VideoSupport.c"
 }
 
 
 static gint64 _video_source_collection_get_video_key_get_source_database_key (DataSource* source, gpointer self) {
 	gint64 result;
 	result = video_source_collection_get_video_key (source);
-#line 1064 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1063 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9886 "VideoSupport.c"
+#line 9880 "VideoSupport.c"
 }
 
 
 static void _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_trashcan_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 9893 "VideoSupport.c"
+#line 9887 "VideoSupport.c"
 }
 
 
 static void _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered (SourceHoldingTank* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_offline_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 9900 "VideoSupport.c"
+#line 9894 "VideoSupport.c"
 }
 
 
@@ -9910,43 +9904,43 @@ VideoSourceCollection* video_source_collection_construct (GType object_type) {
 	MediaSourceHoldingTank* _tmp1_ = NULL;
 	MediaSourceHoldingTank* _tmp2_ = NULL;
 	MediaSourceHoldingTank* _tmp3_ = NULL;
-#line 1064 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1063 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (VideoSourceCollection*) media_source_collection_construct (object_type, "VideoSourceCollection", _video_source_collection_get_video_key_get_source_database_key, NULL);
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _video_source_collection_on_trashcan_contents_altered_source_holding_tank_contents_altered, self);
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_HOLDING_TANK, SourceHoldingTank), "contents-altered", (GCallback) _video_source_collection_on_offline_contents_altered_source_holding_tank_contents_altered, self);
-#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp3_);
-#line 1063 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1062 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9930 "VideoSupport.c"
+#line 9924 "VideoSupport.c"
 }
 
 
 VideoSourceCollection* video_source_collection_new (void) {
-#line 1063 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1062 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_source_collection_construct (TYPE_VIDEO_SOURCE_COLLECTION);
-#line 9937 "VideoSupport.c"
+#line 9931 "VideoSupport.c"
 }
 
 
 static gboolean _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = video_source_collection_is_video_trashed (source);
-#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9946 "VideoSupport.c"
+#line 9940 "VideoSupport.c"
 }
 
 
@@ -9954,24 +9948,24 @@ static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (Med
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_ = NULL;
-#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_holding_tank_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _video_source_collection_is_video_trashed_source_holding_tank_check_to_keep, NULL, _video_source_collection_get_video_key_get_source_database_key, NULL);
-#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9962 "VideoSupport.c"
+#line 9956 "VideoSupport.c"
 }
 
 
 static gboolean _video_source_collection_is_video_offline_source_holding_tank_check_to_keep (DataSource* source, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = video_source_collection_is_video_offline (source);
-#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9971 "VideoSupport.c"
+#line 9965 "VideoSupport.c"
 }
 
 
@@ -9979,15 +9973,15 @@ static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin (
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_ = NULL;
-#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_holding_tank_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _video_source_collection_is_video_offline_source_holding_tank_check_to_keep, NULL, _video_source_collection_get_video_key_get_source_database_key, NULL);
-#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9987 "VideoSupport.c"
+#line 9981 "VideoSupport.c"
 }
 
 
@@ -9996,21 +9990,21 @@ static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSou
 	MediaMonitor* result = NULL;
 	GCancellable* _tmp0_ = NULL;
 	VideoMonitor* _tmp1_ = NULL;
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_WORKERS (workers), NULL);
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = cancellable;
-#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_monitor_new (_tmp0_);
-#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_MONITOR, MediaMonitor);
-#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10010 "VideoSupport.c"
+#line 10004 "VideoSupport.c"
 }
 
 
@@ -10018,17 +10012,17 @@ static gboolean video_source_collection_real_holds_type_of_source (SourceCollect
 	VideoSourceCollection * self;
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_VIDEO);
-#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10028 "VideoSupport.c"
+#line 10022 "VideoSupport.c"
 }
 
 
@@ -10036,15 +10030,15 @@ static gchar* video_source_collection_real_get_typename (MediaSourceCollection*
 	VideoSourceCollection * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1085 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_strdup (VIDEO_TYPENAME);
-#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10044 "VideoSupport.c"
+#line 10038 "VideoSupport.c"
 }
 
 
@@ -10053,57 +10047,57 @@ static gboolean video_source_collection_real_is_file_recognized (MediaSourceColl
 	gboolean result = FALSE;
 	GFile* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_reader_is_supported_video_file (_tmp0_);
-#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10065 "VideoSupport.c"
+#line 10059 "VideoSupport.c"
 }
 
 
 static void video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = removed;
-#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "trashcan-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 10084 "VideoSupport.c"
+#line 10078 "VideoSupport.c"
 }
 
 
 static void video_source_collection_on_offline_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = removed;
-#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), "offline-contents-altered", G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 10103 "VideoSupport.c"
+#line 10097 "VideoSupport.c"
 }
 
 
@@ -10113,19 +10107,19 @@ static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourc
 	gint64 _tmp0_ = 0LL;
 	VideoID _tmp1_ = {0};
 	Video* _tmp2_ = NULL;
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = numeric_id;
-#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp1_, _tmp0_);
-#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_source_collection_fetch (self, &_tmp1_);
-#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10125 "VideoSupport.c"
+#line 10119 "VideoSupport.c"
 }
 
 
@@ -10138,29 +10132,29 @@ gint64 video_source_collection_get_video_key (DataSource* source) {
 	VideoID _tmp2_ = {0};
 	VideoID _tmp3_ = {0};
 	gint64 _tmp4_ = 0LL;
-#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
-#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video));
-#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = _tmp1_;
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (video, &_tmp2_);
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id = _tmp2_;
-#line 1114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_id;
-#line 1114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_.id;
-#line 1114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 1114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10160 "VideoSupport.c"
+#line 10154 "VideoSupport.c"
 }
 
 
@@ -10168,17 +10162,17 @@ gboolean video_source_collection_is_video_trashed (DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource));
-#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10178 "VideoSupport.c"
+#line 10172 "VideoSupport.c"
 }
 
 
@@ -10186,17 +10180,17 @@ gboolean video_source_collection_is_video_offline (DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video), TYPE_MEDIA_SOURCE, MediaSource));
-#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10196 "VideoSupport.c"
+#line 10190 "VideoSupport.c"
 }
 
 
@@ -10205,21 +10199,21 @@ Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* vide
 	VideoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
 	DataSource* _tmp2_ = NULL;
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (video_id != NULL, NULL);
-#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = *video_id;
-#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = database_source_collection_fetch_by_key (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection), _tmp1_);
-#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIDEO, Video);
-#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10219 "VideoSupport.c"
+#line 10213 "VideoSupport.c"
 }
 
 
@@ -10231,27 +10225,27 @@ static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSo
 	EventID _tmp2_ = {0};
 	GeeArrayList* _tmp3_ = NULL;
 	GeeCollection* _tmp4_ = NULL;
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, NULL);
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_table_get_instance ();
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = *event_id;
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_table_get_event_source_ids (_tmp1_, &_tmp2_);
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp1_);
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10251 "VideoSupport.c"
+#line 10245 "VideoSupport.c"
 }
 
 
@@ -10272,113 +10266,113 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 	GFile* _tmp10_ = NULL;
 	MediaSource* _tmp11_ = NULL;
 	Video* _tmp12_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
-#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_collection_fetch_by_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp0_);
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VIDEO, Video);
-#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video;
-#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_ != NULL) {
-#line 1136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_ONLINE;
-#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10294 "VideoSupport.c"
+#line 10288 "VideoSupport.c"
 		}
-#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10298 "VideoSupport.c"
+#line 10292 "VideoSupport.c"
 	}
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = file;
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = media_source_holding_tank_fetch_by_master_file (_tmp4_, _tmp5_);
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIDEO, Video);
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp4_);
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video;
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_TRASH;
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10326 "VideoSupport.c"
+#line 10320 "VideoSupport.c"
 		}
-#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10330 "VideoSupport.c"
+#line 10324 "VideoSupport.c"
 	}
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = media_source_collection_get_offline_bin (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = file;
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = media_source_holding_tank_fetch_by_master_file (_tmp9_, _tmp10_);
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_VIDEO, Video);
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp9_);
-#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = video;
-#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp12_ != NULL) {
-#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_OFFLINE;
-#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10358 "VideoSupport.c"
+#line 10352 "VideoSupport.c"
 		}
-#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10362 "VideoSupport.c"
+#line 10356 "VideoSupport.c"
 	}
-#line 1155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_state = VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN;
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = NULL;
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (state) {
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*state = _vala_state;
-#line 10374 "VideoSupport.c"
+#line 10368 "VideoSupport.c"
 	}
-#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10378 "VideoSupport.c"
+#line 10372 "VideoSupport.c"
 }
 
 
@@ -10392,83 +10386,83 @@ static void video_source_collection_compare_backing (VideoSourceCollection* self
 	GFileInfo* _tmp6_ = NULL;
 	GTimeVal _tmp7_ = {0};
 	glong _tmp8_ = 0L;
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video;
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = info;
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_file_info_get_size (_tmp2_);
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != ((guint64) _tmp3_)) {
-#line 1162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 10412 "VideoSupport.c"
+#line 10406 "VideoSupport.c"
 	}
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = video;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = info;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp6_, &_tmp7_);
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_.tv_sec;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp5_ == ((time_t) _tmp8_)) {
-#line 10426 "VideoSupport.c"
+#line 10420 "VideoSupport.c"
 		GeeCollection* _tmp9_ = NULL;
 		Video* _tmp10_ = NULL;
-#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = matching_master;
-#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = video;
-#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gee_collection_add (_tmp9_, _tmp10_);
-#line 10435 "VideoSupport.c"
+#line 10429 "VideoSupport.c"
 	}
 }
 
 
 void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master) {
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 10447 "VideoSupport.c"
+#line 10441 "VideoSupport.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
 		GeeCollection* _tmp1_ = NULL;
 		GeeIterator* _tmp2_ = NULL;
 		GeeIterator* _tmp3_ = NULL;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_object_it = _tmp3_;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10468 "VideoSupport.c"
+#line 10462 "VideoSupport.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			DataObject* object = NULL;
@@ -10477,37 +10471,37 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			DataObject* _tmp8_ = NULL;
 			GFileInfo* _tmp9_ = NULL;
 			GeeCollection* _tmp10_ = NULL;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _object_it;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp5_) {
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10485 "VideoSupport.c"
+#line 10479 "VideoSupport.c"
 			}
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _object_it;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			object = (DataObject*) _tmp7_;
-#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = object;
-#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = info;
-#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = matching_master;
-#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_VIDEO, Video), _tmp9_, _tmp10_);
 #line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_VIDEO, Video), _tmp9_, _tmp10_);
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (object);
-#line 10503 "VideoSupport.c"
+#line 10497 "VideoSupport.c"
 		}
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_object_it);
-#line 10507 "VideoSupport.c"
+#line 10501 "VideoSupport.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -10515,21 +10509,21 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 		GeeCollection* _tmp12_ = NULL;
 		GeeIterator* _tmp13_ = NULL;
 		GeeIterator* _tmp14_ = NULL;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = media_source_collection_get_offline_bin_contents (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = _tmp13_;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_it = _tmp14_;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10529 "VideoSupport.c"
+#line 10523 "VideoSupport.c"
 			GeeIterator* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
 			MediaSource* media = NULL;
@@ -10538,37 +10532,37 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			MediaSource* _tmp19_ = NULL;
 			GFileInfo* _tmp20_ = NULL;
 			GeeCollection* _tmp21_ = NULL;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = _media_it;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = gee_iterator_next (_tmp15_);
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp16_) {
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10546 "VideoSupport.c"
+#line 10540 "VideoSupport.c"
 			}
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _media_it;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = gee_iterator_get (_tmp17_);
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media = (MediaSource*) _tmp18_;
-#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = media;
-#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp20_ = info;
-#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = matching_master;
-#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIDEO, Video), _tmp20_, _tmp21_);
 #line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIDEO, Video), _tmp20_, _tmp21_);
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (media);
-#line 10564 "VideoSupport.c"
+#line 10558 "VideoSupport.c"
 		}
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_media_it);
-#line 10568 "VideoSupport.c"
+#line 10562 "VideoSupport.c"
 	}
 }
 
@@ -10579,30 +10573,30 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 	GeeIterable* _tmp13_ = NULL;
 	GeeIterable* _tmp26_ = NULL;
 	GeeIterable* _tmp27_ = NULL;
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 10589 "VideoSupport.c"
+#line 10583 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = added;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_object_it = _tmp2_;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10602 "VideoSupport.c"
+#line 10596 "VideoSupport.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataObject* object = NULL;
@@ -10615,67 +10609,67 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				Video* _tmp10_ = NULL;
 				guint64 _tmp11_ = 0ULL;
 				Video* _tmp12_ = NULL;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = _object_it;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp4_) {
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10623 "VideoSupport.c"
+#line 10617 "VideoSupport.c"
 				}
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = _object_it;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				object = (DataObject*) _tmp6_;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = object;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIDEO, Video));
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp8_;
-#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->filesize_to_video;
-#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = video;
-#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = video;
-#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				gee_multi_map_set (_tmp9_, &_tmp11_, _tmp12_);
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10651 "VideoSupport.c"
+#line 10645 "VideoSupport.c"
 			}
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10655 "VideoSupport.c"
+#line 10649 "VideoSupport.c"
 		}
 	}
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = removed;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_ != NULL) {
-#line 10662 "VideoSupport.c"
+#line 10656 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp14_ = NULL;
 			GeeIterator* _tmp15_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp14_ = removed;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = gee_iterable_iterator (_tmp14_);
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_object_it = _tmp15_;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10675 "VideoSupport.c"
+#line 10669 "VideoSupport.c"
 				GeeIterator* _tmp16_ = NULL;
 				gboolean _tmp17_ = FALSE;
 				DataObject* object = NULL;
@@ -10688,66 +10682,66 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				Video* _tmp23_ = NULL;
 				guint64 _tmp24_ = 0ULL;
 				Video* _tmp25_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _object_it;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = gee_iterator_next (_tmp16_);
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp17_) {
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10696 "VideoSupport.c"
+#line 10690 "VideoSupport.c"
 				}
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _object_it;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = gee_iterator_get (_tmp18_);
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				object = (DataObject*) _tmp19_;
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = object;
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_VIDEO, Video));
-#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp21_;
-#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp22_ = self->priv->filesize_to_video;
-#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp23_ = video;
-#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp24_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp25_ = video;
-#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				gee_multi_map_remove (_tmp22_, &_tmp24_, _tmp25_);
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10724 "VideoSupport.c"
+#line 10718 "VideoSupport.c"
 			}
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10728 "VideoSupport.c"
+#line 10722 "VideoSupport.c"
 		}
 	}
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = added;
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = removed;
-#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->notify_contents_altered (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), TYPE_DATA_COLLECTION, DataCollection), _tmp26_, _tmp27_);
-#line 10737 "VideoSupport.c"
+#line 10731 "VideoSupport.c"
 }
 
 
 void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result) {
 	VideoID _tmp19_ = {0};
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1196 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1196 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (basename != NULL);
-#line 10747 "VideoSupport.c"
+#line 10741 "VideoSupport.c"
 	{
 		GeeIterator* _video_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -10756,25 +10750,25 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 		GeeCollection* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->filesize_to_video;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = filesize;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_);
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_it = _tmp5_;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10774 "VideoSupport.c"
+#line 10768 "VideoSupport.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			Video* video = NULL;
@@ -10787,72 +10781,72 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 			const gchar* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
 			gboolean _tmp16_ = FALSE;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _video_it;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp7_) {
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10795 "VideoSupport.c"
+#line 10789 "VideoSupport.c"
 			}
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = _video_it;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video = (Video*) _tmp9_;
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = video;
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = _tmp11_;
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp13_ = g_file_get_basename (_tmp12_);
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp14_ = basename;
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_);
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = _tmp15_ == 0;
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp12_);
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp16_) {
-#line 10821 "VideoSupport.c"
+#line 10815 "VideoSupport.c"
 				Video* _tmp17_ = NULL;
 				VideoID _tmp18_ = {0};
-#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = video;
-#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (_tmp17_, &_tmp18_);
-#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*result = _tmp18_;
-#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_video_it);
-#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 10836 "VideoSupport.c"
+#line 10830 "VideoSupport.c"
 			}
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 10840 "VideoSupport.c"
+#line 10834 "VideoSupport.c"
 		}
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_video_it);
-#line 10844 "VideoSupport.c"
+#line 10838 "VideoSupport.c"
 	}
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp19_, VIDEO_ID_INVALID);
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	*result = _tmp19_;
-#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 10852 "VideoSupport.c"
+#line 10846 "VideoSupport.c"
 }
 
 
@@ -10862,23 +10856,23 @@ gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCol
 	guint64 _tmp1_ = 0ULL;
 	VideoID _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), FALSE);
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
-#line 1208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = basename;
-#line 1208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = filesize;
-#line 1208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 1208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_id_is_valid (&_tmp2_);
-#line 1208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 1208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10878 "VideoSupport.c"
+#line 10872 "VideoSupport.c"
 }
 
 
@@ -10887,88 +10881,88 @@ static TransactionController* video_source_collection_real_get_transaction_contr
 	VideoSourceCollection* self;
 	TransactionController* _tmp0_ = NULL;
 	TransactionController* _tmp2_ = NULL;
-#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1050 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->_transaction_controller;
-#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ == NULL) {
-#line 10893 "VideoSupport.c"
+#line 10887 "VideoSupport.c"
 		MediaSourceTransactionController* _tmp1_ = NULL;
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 10901 "VideoSupport.c"
+#line 10895 "VideoSupport.c"
 	}
-#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = self->priv->_transaction_controller;
-#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp2_;
-#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10909 "VideoSupport.c"
+#line 10903 "VideoSupport.c"
 }
 
 
 static void video_source_collection_class_init (VideoSourceCollectionClass * klass) {
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_parent_class = g_type_class_peek_parent (klass);
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataCollectionClass *) klass)->finalize = video_source_collection_finalize;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoSourceCollectionPrivate));
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_trashcan = video_source_collection_real_create_trashcan;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_offline_bin = video_source_collection_real_create_offline_bin;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_media_monitor = video_source_collection_real_create_media_monitor;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((SourceCollectionClass *) klass)->holds_type_of_source = video_source_collection_real_holds_type_of_source;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->get_typename = video_source_collection_real_get_typename;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->is_file_recognized = video_source_collection_real_is_file_recognized;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = video_source_collection_real_fetch_by_numeric_id;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->get_event_source_ids = video_source_collection_real_get_event_source_ids;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataCollectionClass *) klass)->notify_contents_altered = video_source_collection_real_notify_contents_altered;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = video_source_collection_real_get_transaction_controller;
-#line 10940 "VideoSupport.c"
+#line 10934 "VideoSupport.c"
 }
 
 
 static void video_source_collection_instance_init (VideoSourceCollection * self) {
 	GeeTreeMultiMap* _tmp0_ = NULL;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_SOURCE_COLLECTION_GET_PRIVATE (self);
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->_transaction_controller = NULL;
-#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = gee_tree_multi_map_new (G_TYPE_UINT64, (GBoxedCopyFunc) _uint64_dup, g_free, TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _uint64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->filesize_to_video = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 10954 "VideoSupport.c"
+#line 10948 "VideoSupport.c"
 }
 
 
 static void video_source_collection_finalize (DataCollection* obj) {
 	VideoSourceCollection * self;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->priv->filesize_to_video);
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->finalize (obj);
-#line 10968 "VideoSupport.c"
+#line 10962 "VideoSupport.c"
 }
 
 
diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
index 791a12a..540aad4 100644
--- a/src/VideoSupport.vala
+++ b/src/VideoSupport.vala
@@ -264,7 +264,6 @@ public class VideoReader {
             buf = null;
         }
         
-        Posix.close(child_stdout);
         GLib.Process.close_pid(thumbnailer_pid);
         thumbnailer_pid = 0;
         return buf;
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index 294f2ae..b25e4e0 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -221,7 +221,7 @@ gint camera_table_get_count (CameraTable* self);
 DiscoveredCamera* camera_table_get_for_uri (CameraTable* self, const gchar* uri);
 static void camera_table_do_op (CameraTable* self, int res, const gchar* op, GError** error);
 static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_length1);
-static void _vala_array_add141 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add66 (gchar*** array, int* length, int* size, gchar* value);
 static void _g_object_unref0_ (gpointer var);
 static void _g_list_free__g_object_unref0_ (GList* self);
 static gboolean camera_table_usb_esp (CameraTable* self, gint current_camera_count, gchar** usb_cameras, int usb_cameras_length1, const gchar* port, gchar** full_port);
@@ -229,7 +229,7 @@ gchar* camera_table_get_port_uri (const gchar* port);
 gchar* camera_table_get_port_path (const gchar* port);
 static gchar* camera_table_get_name_for_uuid (CameraTable* self, const gchar* uuid);
 static gchar* camera_table_get_icon_for_uuid (CameraTable* self, const gchar* uuid);
-static void _vala_array_add142 (DiscoveredCamera*** array, int* length, int* size, DiscoveredCamera* value);
+static void _vala_array_add67 (DiscoveredCamera*** array, int* length, int* size, DiscoveredCamera* value);
 void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
 static void g_cclosure_user_marshal_VOID__DISCOVERED_CAMERA (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void camera_table_finalize (CameraTable* obj);
@@ -672,7 +672,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
 #line 675 "CameraTable.c"
-				goto __catch55_gphoto_error;
+				goto __catch54_gphoto_error;
 			}
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -683,8 +683,8 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 684 "CameraTable.c"
 		}
 	}
-	goto __finally55;
-	__catch55_gphoto_error:
+	goto __finally54;
+	__catch54_gphoto_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -707,7 +707,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		return result;
 #line 709 "CameraTable.c"
 	}
-	__finally55:
+	__finally54:
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -726,7 +726,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
 #line 729 "CameraTable.c"
-				goto __catch56_gphoto_error;
+				goto __catch55_gphoto_error;
 			}
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -737,8 +737,8 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 738 "CameraTable.c"
 		}
 	}
-	goto __finally56;
-	__catch56_gphoto_error:
+	goto __finally55;
+	__catch55_gphoto_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -757,7 +757,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		_g_error_free0 (err);
 #line 759 "CameraTable.c"
 	}
-	__finally56:
+	__finally55:
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1009,7 +1009,7 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add141 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add66 (gchar*** array, int* length, int* size, gchar* value) {
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if ((*length) == (*size)) {
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1198,7 +1198,7 @@ static gchar** camera_table_get_all_usb_cameras (CameraTable* self, int* result_
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_tmp24_ = g_strdup (_tmp23_);
 #line 135 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-					_vala_array_add141 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
+					_vala_array_add66 (&cameras, &cameras_length1, &_cameras_size_, _tmp24_);
 #line 117 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 					_g_free0 (camera);
 #line 1204 "CameraTable.c"
@@ -1747,7 +1747,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1748 "CameraTable.c"
-				goto __catch57_g_regex_error;
+				goto __catch56_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1772,7 +1772,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1773 "CameraTable.c"
-				goto __catch57_g_regex_error;
+				goto __catch56_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -1798,8 +1798,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 1798 "CameraTable.c"
 	}
-	goto __finally57;
-	__catch57_g_regex_error:
+	goto __finally56;
+	__catch56_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1812,7 +1812,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 1812 "CameraTable.c"
 	}
-	__finally57:
+	__finally56:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2064,7 +2064,7 @@ static gpointer _discovered_camera_ref0 (gpointer self) {
 }
 
 
-static void _vala_array_add142 (DiscoveredCamera*** array, int* length, int* size, DiscoveredCamera* value) {
+static void _vala_array_add67 (DiscoveredCamera*** array, int* length, int* size, DiscoveredCamera* value) {
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if ((*length) == (*size)) {
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -2789,7 +2789,7 @@ static void camera_table_update_camera_table (CameraTable* self, GError** error)
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			_tmp79_ = _discovered_camera_ref0 (_tmp78_);
 #line 292 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
-			_vala_array_add142 (&missing, &missing_length1, &_missing_size_, _tmp79_);
+			_vala_array_add67 (&missing, &missing_length1, &_missing_size_, _tmp79_);
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			 (abilities);
 #line 272 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -4170,7 +4170,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
 #line 4171 "CameraTable.c"
-				goto __catch58_gphoto_error;
+				goto __catch57_gphoto_error;
 			}
 #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4181,8 +4181,8 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 #line 4180 "CameraTable.c"
 		}
 	}
-	goto __finally58;
-	__catch58_gphoto_error:
+	goto __finally57;
+	__catch57_gphoto_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -4201,7 +4201,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 		_g_error_free0 (err);
 #line 4201 "CameraTable.c"
 	}
-	__finally58:
+	__finally57:
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index 04c79de..7d923bd 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -1295,11 +1295,11 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1298 "GPhoto.c"
-			goto __catch59_g_error;
+			goto __catch58_g_error;
 		}
 	}
-	goto __finally59;
-	__catch59_g_error:
+	goto __finally58;
+	__catch58_g_error:
 	{
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
@@ -1311,7 +1311,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		metadata = NULL;
 #line 1313 "GPhoto.c"
 	}
-	__finally59:
+	__finally58:
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1420,7 +1420,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1423 "GPhoto.c"
-			goto __catch60_g_error;
+			goto __catch59_g_error;
 		}
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = _tmp0_;
@@ -1440,8 +1440,8 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_tmp0_ = (g_free (_tmp0_), NULL);
 #line 1442 "GPhoto.c"
 	}
-	goto __finally60;
-	__catch60_g_error:
+	goto __finally59;
+	__catch59_g_error:
 	{
 		PhotoMetadata* metadata = NULL;
 		Camera* _tmp8_ = NULL;
@@ -1578,7 +1578,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_media_metadata_unref0 (metadata);
 #line 1581 "GPhoto.c"
-			goto __finally60;
+			goto __finally59;
 		}
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp24_ = _tmp20_;
@@ -1602,7 +1602,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_media_metadata_unref0 (metadata);
 #line 1604 "GPhoto.c"
 	}
-	__finally60:
+	__finally59:
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -2145,7 +2145,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 #line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2148 "GPhoto.c"
-			goto __catch61_g_error;
+			goto __catch60_g_error;
 		}
 #line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = _tmp0_;
@@ -2167,8 +2167,8 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		_tmp0_ = (g_free (_tmp0_), NULL);
 #line 2169 "GPhoto.c"
 	}
-	goto __finally61;
-	__catch61_g_error:
+	goto __finally60;
+	__catch60_g_error:
 	{
 		Camera* _tmp8_ = NULL;
 		GPContext* _tmp9_ = NULL;
@@ -2197,7 +2197,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		return result;
 #line 2199 "GPhoto.c"
 	}
-	__finally61:
+	__finally60:
 #line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index 0abeb1f..be81b96 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -619,6 +619,7 @@ typedef struct _ImportPageCameraImportJobClass ImportPageCameraImportJobClass;
 
 typedef struct _AppWindow AppWindow;
 typedef struct _AppWindowClass AppWindowClass;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
 
 #define TYPE_MEDIA_SOURCE (media_source_get_type ())
 #define MEDIA_SOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE, MediaSource))
@@ -1154,7 +1155,7 @@ struct _CameraAccumulatorPrivate {
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -1164,8 +1165,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -1173,10 +1172,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -1805,6 +1802,14 @@ static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_n
 static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_construct (GType object_type);
 #define IMPORT_PAGE_UNMOUNT_FAILED_MSG _ ("Unable to unmount camera. Try unmounting the camera from the file mana" \
 "ger.")
+static void import_page_on_import_selected (ImportPage* self);
+static void _import_page_on_import_selected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void import_page_on_import_all (ImportPage* self);
+static void _import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void page_on_action_toggle (Page* self, GAction* action, GVariant* value);
+static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void import_page_on_display_titles (ImportPage* self, GSimpleAction* action, GVariant* value);
+static void _import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
 ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon);
 ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon);
 CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name);
@@ -1853,7 +1858,6 @@ GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
 gboolean configuration_facade_get_hide_photos_already_imported (ConfigurationFacade* self);
-GtkAction* page_get_action (Page* self, const gchar* name);
 #define RESOURCES_IMPORT "shotwell-import"
 #define RESOURCES_IMPORT_ALL "shotwell-import-all"
 static void import_page_update_toolbar_state (ImportPage* self);
@@ -1873,21 +1877,13 @@ static GType import_page_camera_import_job_get_type (void) G_GNUC_CONST G_GNUC_U
 static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraImportJob* self);
 static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static GtkToggleActionEntry* import_page_real_init_collect_toggle_action_entries (Page* base, int* result_length1);
-GtkToggleActionEntry* page_init_collect_toggle_action_entries (Page* self, int* result_length1);
-#define TRANSLATABLE "translatable"
-static void import_page_on_display_titles (ImportPage* self, GtkAction* action);
-static void _import_page_on_display_titles_gtk_action_callback (GtkAction* action, gpointer self);
+static void import_page_real_add_actions (Page* base);
+void page_add_actions (Page* self);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
+GAction* page_get_action (Page* self, const gchar* name);
 gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* self);
-static void _vala_array_add143 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-static GtkActionEntry* import_page_real_init_collect_action_entries (Page* base, int* result_length1);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-static void import_page_on_import_selected (ImportPage* self);
-static void _import_page_on_import_selected_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add144 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void import_page_on_import_all (ImportPage* self);
-static void _import_page_on_import_all_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add145 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static GVariant* _variant_new11 (gboolean value);
 Camera* import_page_get_camera (ImportPage* self);
 gchar* import_page_get_uri (ImportPage* self);
 gboolean import_page_is_busy (ImportPage* self);
@@ -1901,9 +1897,6 @@ gint view_collection_get_unfiltered_count (ViewCollection* self);
 gint view_collection_get_selected_count (ViewCollection* self);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 gint data_collection_get_count (DataCollection* self);
-GType app_window_get_type (void) G_GNUC_CONST;
-AppWindow* app_window_get_instance (void);
-void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name, gboolean sensitive);
 void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display);
 void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, gboolean display);
 static void import_page_real_switched_to (Page* base);
@@ -2015,6 +2008,7 @@ gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 t
 static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self);
 void progress_dialog_close (ProgressDialog* self);
 static void import_page_real_set_display_titles (CheckerboardPage* base, gboolean display);
+void page_set_action_active (Page* self, const gchar* name, gboolean active);
 static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPage* base);
 #define IMPORT_PAGE_IMPORT_VIEW_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, ImportPageImportViewManagerPrivate))
 enum  {
@@ -2083,6 +2077,7 @@ static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter
 ViewFilter* view_filter_construct (GType object_type);
 static void import_page_finalize (GObject* obj);
 
+static const GActionEntry IMPORT_PAGE_entries[3] = {{"ImportSelected", _import_page_on_import_selected_gsimple_action_activate_callback}, {"ImportAll", _import_page_on_import_all_gsimple_action_activate_callback}, {"ViewTitle", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _import_page_on_display_titles_gsimple_action_change_state_callback}};
 
 ImportSourceCollection* import_source_collection_construct (GType object_type, const gchar* name) {
 	ImportSourceCollection* self = NULL;
@@ -2095,14 +2090,14 @@ ImportSourceCollection* import_source_collection_construct (GType object_type, c
 	self = (ImportSourceCollection*) source_collection_construct (object_type, _tmp0_);
 #line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 2098 "ImportPage.c"
+#line 2093 "ImportPage.c"
 }
 
 
 ImportSourceCollection* import_source_collection_new (const gchar* name) {
 #line 8 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_source_collection_construct (TYPE_IMPORT_SOURCE_COLLECTION, name);
-#line 2105 "ImportPage.c"
+#line 2100 "ImportPage.c"
 }
 
 
@@ -2120,7 +2115,7 @@ static gboolean import_source_collection_real_holds_type_of_source (SourceCollec
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_IMPORT_SOURCE);
 #line 13 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2123 "ImportPage.c"
+#line 2118 "ImportPage.c"
 }
 
 
@@ -2129,7 +2124,7 @@ static void import_source_collection_class_init (ImportSourceCollectionClass * k
 	import_source_collection_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((SourceCollectionClass *) klass)->holds_type_of_source = import_source_collection_real_holds_type_of_source;
-#line 2132 "ImportPage.c"
+#line 2127 "ImportPage.c"
 }
 
 
@@ -2152,7 +2147,7 @@ GType import_source_collection_get_type (void) {
 static gpointer _GPHOTO_REF_CAMERA0 (gpointer self) {
 #line 31 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? GPHOTO_REF_CAMERA (self) : NULL;
-#line 2155 "ImportPage.c"
+#line 2150 "ImportPage.c"
 }
 
 
@@ -2235,14 +2230,14 @@ ImportSource* import_source_construct (GType object_type, const gchar* camera_na
 	self->priv->indexable_keywords = _tmp12_;
 #line 28 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 2238 "ImportPage.c"
+#line 2233 "ImportPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2245 "ImportPage.c"
+#line 2240 "ImportPage.c"
 }
 
 
@@ -2261,7 +2256,7 @@ void import_source_set_preview (ImportSource* self, GdkPixbuf* preview) {
 	_g_object_unref0 (self->priv->preview);
 #line 41 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->preview = _tmp1_;
-#line 2264 "ImportPage.c"
+#line 2259 "ImportPage.c"
 }
 
 
@@ -2279,7 +2274,7 @@ gchar* import_source_get_camera_name (ImportSource* self) {
 	result = _tmp1_;
 #line 45 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2282 "ImportPage.c"
+#line 2277 "ImportPage.c"
 }
 
 
@@ -2297,7 +2292,7 @@ Camera* import_source_get_camera (ImportSource* self) {
 	result = _tmp1_;
 #line 49 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2300 "ImportPage.c"
+#line 2295 "ImportPage.c"
 }
 
 
@@ -2312,7 +2307,7 @@ gint import_source_get_fsid (ImportSource* self) {
 	result = _tmp0_;
 #line 53 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2315 "ImportPage.c"
+#line 2310 "ImportPage.c"
 }
 
 
@@ -2330,7 +2325,7 @@ gchar* import_source_get_folder (ImportSource* self) {
 	result = _tmp1_;
 #line 57 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2333 "ImportPage.c"
+#line 2328 "ImportPage.c"
 }
 
 
@@ -2348,7 +2343,7 @@ gchar* import_source_get_filename (ImportSource* self) {
 	result = _tmp1_;
 #line 61 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2351 "ImportPage.c"
+#line 2346 "ImportPage.c"
 }
 
 
@@ -2363,7 +2358,7 @@ gulong import_source_get_filesize (ImportSource* self) {
 	result = _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2366 "ImportPage.c"
+#line 2361 "ImportPage.c"
 }
 
 
@@ -2378,7 +2373,7 @@ time_t import_source_get_modification_time (ImportSource* self) {
 	result = _tmp0_;
 #line 69 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2381 "ImportPage.c"
+#line 2376 "ImportPage.c"
 }
 
 
@@ -2394,7 +2389,7 @@ static GdkPixbuf* import_source_real_get_preview (ImportSource* self) {
 	result = _tmp1_;
 #line 73 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2397 "ImportPage.c"
+#line 2392 "ImportPage.c"
 }
 
 
@@ -2403,7 +2398,7 @@ GdkPixbuf* import_source_get_preview (ImportSource* self) {
 	g_return_val_if_fail (IS_IMPORT_SOURCE (self), NULL);
 #line 72 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return IMPORT_SOURCE_GET_CLASS (self)->get_preview (self);
-#line 2406 "ImportPage.c"
+#line 2401 "ImportPage.c"
 }
 
 
@@ -2416,7 +2411,7 @@ static time_t import_source_real_get_exposure_time (ImportSource* self) {
 	result = _tmp0_;
 #line 77 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2419 "ImportPage.c"
+#line 2414 "ImportPage.c"
 }
 
 
@@ -2425,7 +2420,7 @@ time_t import_source_get_exposure_time (ImportSource* self) {
 	g_return_val_if_fail (IS_IMPORT_SOURCE (self), 0);
 #line 76 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return IMPORT_SOURCE_GET_CLASS (self)->get_exposure_time (self);
-#line 2428 "ImportPage.c"
+#line 2423 "ImportPage.c"
 }
 
 
@@ -2470,7 +2465,7 @@ gchar* import_source_get_fulldir (ImportSource* self) {
 	result = _tmp8_;
 #line 81 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2473 "ImportPage.c"
+#line 2468 "ImportPage.c"
 }
 
 
@@ -2513,7 +2508,7 @@ static gchar* import_source_real_to_string (DataObject* base) {
 	result = _tmp7_;
 #line 85 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2516 "ImportPage.c"
+#line 2511 "ImportPage.c"
 }
 
 
@@ -2529,7 +2524,7 @@ static gchar* gp_result_to_full_string (int self) {
 	result = _tmp1_;
 #line 480 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
 	return result;
-#line 2532 "ImportPage.c"
+#line 2527 "ImportPage.c"
 }
 
 
@@ -2577,7 +2572,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 	_tmp4_ = fulldir;
 #line 92 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ == NULL) {
-#line 2580 "ImportPage.c"
+#line 2575 "ImportPage.c"
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
@@ -2605,7 +2600,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 			_g_free0 (fulldir);
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return FALSE;
-#line 2608 "ImportPage.c"
+#line 2603 "ImportPage.c"
 		}
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp8_;
@@ -2613,7 +2608,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 		_g_free0 (fulldir);
 #line 95 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 2616 "ImportPage.c"
+#line 2611 "ImportPage.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = import_source_get_camera (self);
@@ -2643,7 +2638,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 	_tmp19_ = _result_;
 #line 100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp19_ != GP_OK) {
-#line 2646 "ImportPage.c"
+#line 2641 "ImportPage.c"
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
 		const gchar* _tmp22_ = NULL;
@@ -2668,7 +2663,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 		_g_free0 (_tmp25_);
 #line 101 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp21_);
-#line 2671 "ImportPage.c"
+#line 2666 "ImportPage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp28_ = DATA_SOURCE_CLASS (import_source_parent_class)->internal_delete_backing (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), TYPE_DATA_SOURCE, DataSource), &_inner_error_);
@@ -2682,21 +2677,21 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 		_g_free0 (fulldir);
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return FALSE;
-#line 2685 "ImportPage.c"
+#line 2680 "ImportPage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp27_) {
-#line 2689 "ImportPage.c"
+#line 2684 "ImportPage.c"
 		int _tmp29_ = 0;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp29_ = _result_;
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp26_ = _tmp29_ == GP_OK;
-#line 2695 "ImportPage.c"
+#line 2690 "ImportPage.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp26_ = FALSE;
-#line 2699 "ImportPage.c"
+#line 2694 "ImportPage.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp26_;
@@ -2704,7 +2699,7 @@ static gboolean import_source_real_internal_delete_backing (DataSource* base, GE
 	_g_free0 (fulldir);
 #line 103 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2707 "ImportPage.c"
+#line 2702 "ImportPage.c"
 }
 
 
@@ -2720,7 +2715,7 @@ static const gchar* import_source_real_get_indexable_keywords (Indexable* base)
 	result = _tmp0_;
 #line 107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2723 "ImportPage.c"
+#line 2718 "ImportPage.c"
 }
 
 
@@ -2739,7 +2734,7 @@ static void import_source_class_init (ImportSourceClass * klass) {
 	((DataSourceClass *) klass)->internal_delete_backing = import_source_real_internal_delete_backing;
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_source_finalize;
-#line 2742 "ImportPage.c"
+#line 2737 "ImportPage.c"
 }
 
 
@@ -2748,7 +2743,7 @@ static void import_source_indexable_interface_init (IndexableIface * iface) {
 	import_source_indexable_parent_iface = g_type_interface_peek_parent (iface);
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	iface->get_indexable_keywords = (const gchar* (*)(Indexable*)) import_source_real_get_indexable_keywords;
-#line 2751 "ImportPage.c"
+#line 2746 "ImportPage.c"
 }
 
 
@@ -2759,7 +2754,7 @@ static void import_source_instance_init (ImportSource * self) {
 	self->priv->preview = NULL;
 #line 26 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->indexable_keywords = NULL;
-#line 2762 "ImportPage.c"
+#line 2757 "ImportPage.c"
 }
 
 
@@ -2781,7 +2776,7 @@ static void import_source_finalize (GObject* obj) {
 	_g_free0 (self->priv->indexable_keywords);
 #line 17 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (import_source_parent_class)->finalize (obj);
-#line 2784 "ImportPage.c"
+#line 2779 "ImportPage.c"
 }
 
 
@@ -2834,14 +2829,14 @@ VideoImportSource* video_import_source_construct (GType object_type, const gchar
 	self = (VideoImportSource*) import_source_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
 #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 2837 "ImportPage.c"
+#line 2832 "ImportPage.c"
 }
 
 
 VideoImportSource* video_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time) {
 #line 112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return video_import_source_construct (TYPE_VIDEO_IMPORT_SOURCE, camera_name, camera, fsid, folder, filename, file_size, modification_time);
-#line 2844 "ImportPage.c"
+#line 2839 "ImportPage.c"
 }
 
 
@@ -2867,7 +2862,7 @@ static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base,
 		g_propagate_error (error, _inner_error_);
 #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return NULL;
-#line 2870 "ImportPage.c"
+#line 2865 "ImportPage.c"
 	}
 #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp0_;
@@ -2879,7 +2874,7 @@ static GdkPixbuf* video_import_source_real_get_thumbnail (ThumbnailSource* base,
 	_g_object_unref0 (_tmp0_);
 #line 118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2882 "ImportPage.c"
+#line 2877 "ImportPage.c"
 }
 
 
@@ -2907,13 +2902,13 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
 		result = NULL;
 #line 123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 2910 "ImportPage.c"
+#line 2905 "ImportPage.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = scale;
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ > 0) {
-#line 2916 "ImportPage.c"
+#line 2911 "ImportPage.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		GdkPixbuf* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
@@ -2932,7 +2927,7 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
 		_tmp3_ = _tmp8_;
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2935 "ImportPage.c"
+#line 2930 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp9_ = NULL;
 #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -2941,13 +2936,13 @@ static GdkPixbuf* video_import_source_real_create_thumbnail (ThumbnailSource* ba
 		_g_object_unref0 (_tmp3_);
 #line 128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _tmp9_;
-#line 2944 "ImportPage.c"
+#line 2939 "ImportPage.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp3_;
 #line 127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2950 "ImportPage.c"
+#line 2945 "ImportPage.c"
 }
 
 
@@ -2963,7 +2958,7 @@ static gchar* video_import_source_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2966 "ImportPage.c"
+#line 2961 "ImportPage.c"
 }
 
 
@@ -2979,7 +2974,7 @@ static gint64 video_import_source_real_get_instance_id (DataSource* base) {
 	result = _tmp0_;
 #line 136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2982 "ImportPage.c"
+#line 2977 "ImportPage.c"
 }
 
 
@@ -2995,7 +2990,7 @@ static PhotoFileFormat video_import_source_real_get_preferred_thumbnail_format (
 	result = _tmp0_;
 #line 140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 2998 "ImportPage.c"
+#line 2993 "ImportPage.c"
 }
 
 
@@ -3011,7 +3006,7 @@ static gchar* video_import_source_real_get_name (DataObject* base) {
 	result = _tmp0_;
 #line 144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3014 "ImportPage.c"
+#line 3009 "ImportPage.c"
 }
 
 
@@ -3026,7 +3021,7 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
 	_tmp1_ = preview;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_ != NULL) {
-#line 3029 "ImportPage.c"
+#line 3024 "ImportPage.c"
 		GdkPixbuf* _tmp2_ = NULL;
 		GdkPixbuf* _tmp3_ = NULL;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3037,7 +3032,7 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
 		_g_object_unref0 (_tmp0_);
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp3_;
-#line 3040 "ImportPage.c"
+#line 3035 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp4_ = NULL;
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3046,13 +3041,13 @@ void video_import_source_update (VideoImportSource* self, GdkPixbuf* preview) {
 		_g_object_unref0 (_tmp0_);
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp4_;
-#line 3049 "ImportPage.c"
+#line 3044 "ImportPage.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_source_set_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource), _tmp0_);
 #line 147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3055 "ImportPage.c"
+#line 3050 "ImportPage.c"
 }
 
 
@@ -3071,7 +3066,7 @@ static void video_import_source_class_init (VideoImportSourceClass * klass) {
 	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = video_import_source_real_get_preferred_thumbnail_format;
 #line 111 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((DataObjectClass *) klass)->get_name = video_import_source_real_get_name;
-#line 3074 "ImportPage.c"
+#line 3069 "ImportPage.c"
 }
 
 
@@ -3131,14 +3126,14 @@ PhotoImportSource* photo_import_source_construct (GType object_type, const gchar
 	self->priv->file_format = _tmp7_;
 #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 3134 "ImportPage.c"
+#line 3129 "ImportPage.c"
 }
 
 
 PhotoImportSource* photo_import_source_new (const gchar* camera_name, Camera* camera, gint fsid, const gchar* folder, const gchar* filename, gulong file_size, time_t modification_time, PhotoFileFormat file_format) {
 #line 161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return photo_import_source_construct (TYPE_PHOTO_IMPORT_SOURCE, camera_name, camera, fsid, folder, filename, file_size, modification_time, file_format);
-#line 3141 "ImportPage.c"
+#line 3136 "ImportPage.c"
 }
 
 
@@ -3162,7 +3157,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
 	_tmp3_ = is_string_empty (_tmp2_);
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp3_) {
-#line 3165 "ImportPage.c"
+#line 3160 "ImportPage.c"
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3173,7 +3168,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
 		_g_free0 (_tmp1_);
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = _tmp5_;
-#line 3176 "ImportPage.c"
+#line 3171 "ImportPage.c"
 	} else {
 		gchar* _tmp6_ = NULL;
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3182,7 +3177,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
 		_g_free0 (_tmp1_);
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = _tmp6_;
-#line 3185 "ImportPage.c"
+#line 3180 "ImportPage.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
@@ -3190,7 +3185,7 @@ static gchar* photo_import_source_real_get_name (DataObject* base) {
 	_g_free0 (title);
 #line 170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3193 "ImportPage.c"
+#line 3188 "ImportPage.c"
 }
 
 
@@ -3206,7 +3201,7 @@ static gchar* photo_import_source_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3209 "ImportPage.c"
+#line 3204 "ImportPage.c"
 }
 
 
@@ -3222,7 +3217,7 @@ static gint64 photo_import_source_real_get_instance_id (DataSource* base) {
 	result = _tmp0_;
 #line 178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3225 "ImportPage.c"
+#line 3220 "ImportPage.c"
 }
 
 
@@ -3240,26 +3235,26 @@ static PhotoFileFormat photo_import_source_real_get_preferred_thumbnail_format (
 	_tmp2_ = photo_file_format_can_write (_tmp1_);
 #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_) {
-#line 3243 "ImportPage.c"
+#line 3238 "ImportPage.c"
 		PhotoFileFormat _tmp3_ = 0;
 #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->file_format;
 #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp3_;
-#line 3249 "ImportPage.c"
+#line 3244 "ImportPage.c"
 	} else {
 		PhotoFileFormat _tmp4_ = 0;
 #line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = photo_file_format_get_system_default_format ();
 #line 183 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp4_;
-#line 3256 "ImportPage.c"
+#line 3251 "ImportPage.c"
 	}
 #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
 #line 182 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3262 "ImportPage.c"
+#line 3257 "ImportPage.c"
 }
 
 
@@ -3287,13 +3282,13 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
 		result = NULL;
 #line 188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3290 "ImportPage.c"
+#line 3285 "ImportPage.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = scale;
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ > 0) {
-#line 3296 "ImportPage.c"
+#line 3291 "ImportPage.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		GdkPixbuf* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
@@ -3312,7 +3307,7 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
 		_tmp3_ = _tmp8_;
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 3315 "ImportPage.c"
+#line 3310 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp9_ = NULL;
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3321,20 +3316,20 @@ static GdkPixbuf* photo_import_source_real_create_thumbnail (ThumbnailSource* ba
 		_g_object_unref0 (_tmp3_);
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _tmp9_;
-#line 3324 "ImportPage.c"
+#line 3319 "ImportPage.c"
 	}
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp3_;
 #line 192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3330 "ImportPage.c"
+#line 3325 "ImportPage.c"
 }
 
 
 static gpointer _media_metadata_ref0 (gpointer self) {
 #line 199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 3337 "ImportPage.c"
+#line 3332 "ImportPage.c"
 }
 
 
@@ -3380,7 +3375,7 @@ void photo_import_source_update (PhotoImportSource* self, GdkPixbuf* preview, co
 	_g_free0 (self->priv->exif_md5);
 #line 200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->exif_md5 = _tmp6_;
-#line 3383 "ImportPage.c"
+#line 3378 "ImportPage.c"
 }
 
 
@@ -3399,7 +3394,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 	_tmp0_ = self->priv->metadata;
 #line 204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ == NULL) {
-#line 3402 "ImportPage.c"
+#line 3397 "ImportPage.c"
 		time_t _tmp1_ = 0;
 #line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
@@ -3407,7 +3402,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 		result = _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3410 "ImportPage.c"
+#line 3405 "ImportPage.c"
 	}
 #line 207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->metadata;
@@ -3419,7 +3414,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 	_tmp5_ = date_time;
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ != NULL) {
-#line 3422 "ImportPage.c"
+#line 3417 "ImportPage.c"
 		MetadataDateTime* _tmp6_ = NULL;
 		time_t _tmp7_ = 0;
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3428,14 +3423,14 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 		_tmp7_ = metadata_date_time_get_timestamp (_tmp6_);
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = _tmp7_;
-#line 3431 "ImportPage.c"
+#line 3426 "ImportPage.c"
 	} else {
 		time_t _tmp8_ = 0;
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = import_source_get_modification_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = _tmp8_;
-#line 3438 "ImportPage.c"
+#line 3433 "ImportPage.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp4_;
@@ -3443,7 +3438,7 @@ static time_t photo_import_source_real_get_exposure_time (ImportSource* base) {
 	_metadata_date_time_unref0 (date_time);
 #line 209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3446 "ImportPage.c"
+#line 3441 "ImportPage.c"
 }
 
 
@@ -3457,7 +3452,7 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) {
 	_tmp1_ = self->priv->metadata;
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_ != NULL) {
-#line 3460 "ImportPage.c"
+#line 3455 "ImportPage.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3468,19 +3463,19 @@ gchar* photo_import_source_get_title (PhotoImportSource* self) {
 		_g_free0 (_tmp0_);
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp3_;
-#line 3471 "ImportPage.c"
+#line 3466 "ImportPage.c"
 	} else {
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp0_);
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = NULL;
-#line 3477 "ImportPage.c"
+#line 3472 "ImportPage.c"
 	}
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
 #line 213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3483 "ImportPage.c"
+#line 3478 "ImportPage.c"
 }
 
 
@@ -3495,7 +3490,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 	_tmp0_ = self->priv->associated;
 #line 217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 3498 "ImportPage.c"
+#line 3493 "ImportPage.c"
 		PhotoImportSource* _tmp1_ = NULL;
 		PhotoMetadata* _tmp2_ = NULL;
 #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3506,7 +3501,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 		result = _tmp2_;
 #line 218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3509 "ImportPage.c"
+#line 3504 "ImportPage.c"
 	}
 #line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->metadata;
@@ -3516,7 +3511,7 @@ PhotoMetadata* photo_import_source_get_metadata (PhotoImportSource* self) {
 	result = _tmp4_;
 #line 220 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3519 "ImportPage.c"
+#line 3514 "ImportPage.c"
 }
 
 
@@ -3533,7 +3528,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
 	_tmp0_ = self->priv->associated;
 #line 224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 3536 "ImportPage.c"
+#line 3531 "ImportPage.c"
 		PhotoImportSource* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3544,7 +3539,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
 		result = _tmp2_;
 #line 225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3547 "ImportPage.c"
+#line 3542 "ImportPage.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
@@ -3556,7 +3551,7 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
 	_g_object_unref0 (_tmp4_);
 #line 227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
-#line 3559 "ImportPage.c"
+#line 3554 "ImportPage.c"
 		GdkPixbuf* _tmp6_ = NULL;
 #line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = IMPORT_SOURCE_CLASS (photo_import_source_parent_class)->get_preview (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORT_SOURCE, ImportSource));
@@ -3564,13 +3559,13 @@ static GdkPixbuf* photo_import_source_real_get_preview (ImportSource* base) {
 		result = _tmp6_;
 #line 228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3567 "ImportPage.c"
+#line 3562 "ImportPage.c"
 	}
 #line 230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = NULL;
 #line 230 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3573 "ImportPage.c"
+#line 3568 "ImportPage.c"
 }
 
 
@@ -3598,13 +3593,13 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
 		result = NULL;
 #line 235 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 3601 "ImportPage.c"
+#line 3596 "ImportPage.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = scale;
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ > 0) {
-#line 3607 "ImportPage.c"
+#line 3602 "ImportPage.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		GdkPixbuf* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
@@ -3623,7 +3618,7 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
 		_tmp3_ = _tmp8_;
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 3626 "ImportPage.c"
+#line 3621 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp9_ = NULL;
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3632,13 +3627,13 @@ static GdkPixbuf* photo_import_source_real_get_thumbnail (ThumbnailSource* base,
 		_g_object_unref0 (_tmp3_);
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _tmp9_;
-#line 3635 "ImportPage.c"
+#line 3630 "ImportPage.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp3_;
 #line 237 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3641 "ImportPage.c"
+#line 3636 "ImportPage.c"
 }
 
 
@@ -3653,7 +3648,7 @@ PhotoFileFormat photo_import_source_get_file_format (PhotoImportSource* self) {
 	result = _tmp0_;
 #line 241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3656 "ImportPage.c"
+#line 3651 "ImportPage.c"
 }
 
 
@@ -3671,7 +3666,7 @@ gchar* photo_import_source_get_preview_md5 (PhotoImportSource* self) {
 	result = _tmp1_;
 #line 245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3674 "ImportPage.c"
+#line 3669 "ImportPage.c"
 }
 
 
@@ -3690,7 +3685,7 @@ void photo_import_source_set_associated (PhotoImportSource* self, PhotoImportSou
 	_g_object_unref0 (self->priv->associated);
 #line 249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated = _tmp1_;
-#line 3693 "ImportPage.c"
+#line 3688 "ImportPage.c"
 }
 
 
@@ -3708,7 +3703,7 @@ PhotoImportSource* photo_import_source_get_associated (PhotoImportSource* self)
 	result = _tmp1_;
 #line 253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3711 "ImportPage.c"
+#line 3706 "ImportPage.c"
 }
 
 
@@ -3731,13 +3726,13 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
 		g_propagate_error (error, _inner_error_);
 #line 257 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return FALSE;
-#line 3734 "ImportPage.c"
+#line 3729 "ImportPage.c"
 	}
 #line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->associated;
 #line 258 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_ != NULL) {
-#line 3740 "ImportPage.c"
+#line 3735 "ImportPage.c"
 		gboolean _tmp2_ = FALSE;
 		PhotoImportSource* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
@@ -3754,19 +3749,19 @@ static gboolean photo_import_source_real_internal_delete_backing (DataSource* ba
 			g_propagate_error (error, _inner_error_);
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return FALSE;
-#line 3757 "ImportPage.c"
+#line 3752 "ImportPage.c"
 		}
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = ret;
 #line 259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ret = _tmp5_ & _tmp2_;
-#line 3763 "ImportPage.c"
+#line 3758 "ImportPage.c"
 	}
 #line 260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = ret;
 #line 260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 3769 "ImportPage.c"
+#line 3764 "ImportPage.c"
 }
 
 
@@ -3795,7 +3790,7 @@ static void photo_import_source_class_init (PhotoImportSourceClass * klass) {
 	((DataSourceClass *) klass)->internal_delete_backing = photo_import_source_real_internal_delete_backing;
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = photo_import_source_finalize;
-#line 3798 "ImportPage.c"
+#line 3793 "ImportPage.c"
 }
 
 
@@ -3810,7 +3805,7 @@ static void photo_import_source_instance_init (PhotoImportSource * self) {
 	self->priv->exif_md5 = NULL;
 #line 159 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated = NULL;
-#line 3813 "ImportPage.c"
+#line 3808 "ImportPage.c"
 }
 
 
@@ -3828,7 +3823,7 @@ static void photo_import_source_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->associated);
 #line 152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (photo_import_source_parent_class)->finalize (obj);
-#line 3831 "ImportPage.c"
+#line 3826 "ImportPage.c"
 }
 
 
@@ -3888,11 +3883,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) {
 #line 278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		media_source_item_set_enable_sprockets (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem), TRUE);
-#line 3891 "ImportPage.c"
+#line 3886 "ImportPage.c"
 	}
 #line 281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	pixbuf = NULL;
-#line 3895 "ImportPage.c"
+#line 3890 "ImportPage.c"
 	{
 		GdkPixbuf* _tmp6_ = NULL;
 		ImportSource* _tmp7_ = NULL;
@@ -3906,8 +3901,8 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_tmp6_ = _tmp8_;
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3909 "ImportPage.c"
-			goto __catch62_g_error;
+#line 3904 "ImportPage.c"
+			goto __catch61_g_error;
 		}
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp6_;
@@ -3919,10 +3914,10 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		pixbuf = _tmp9_;
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 3922 "ImportPage.c"
+#line 3917 "ImportPage.c"
 	}
-	goto __finally62;
-	__catch62_g_error:
+	goto __finally61;
+	__catch61_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp10_ = NULL;
@@ -3947,9 +3942,9 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_free0 (_tmp11_);
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 3950 "ImportPage.c"
+#line 3945 "ImportPage.c"
 	}
-	__finally62:
+	__finally61:
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -3960,7 +3955,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		g_clear_error (&_inner_error_);
 #line 282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return NULL;
-#line 3963 "ImportPage.c"
+#line 3958 "ImportPage.c"
 	}
 #line 289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = pixbuf;
@@ -3970,7 +3965,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 	_tmp15_ = pixbuf;
 #line 290 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp15_ == NULL) {
-#line 3973 "ImportPage.c"
+#line 3968 "ImportPage.c"
 		GdkPixbuf* _tmp16_ = NULL;
 		GdkPixbuf* _tmp20_ = NULL;
 		GdkPixbuf* _tmp21_ = NULL;
@@ -3978,7 +3973,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_tmp16_ = import_preview_placeholder_preview;
 #line 291 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp16_ == NULL) {
-#line 3981 "ImportPage.c"
+#line 3976 "ImportPage.c"
 			GdkPixbuf* _tmp17_ = NULL;
 			GdkPixbuf* _tmp18_ = NULL;
 			GdkPixbuf* _tmp19_ = NULL;
@@ -3996,7 +3991,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 			_g_object_unref0 (import_preview_placeholder_preview);
 #line 293 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_preview_placeholder_preview = _tmp19_;
-#line 3999 "ImportPage.c"
+#line 3994 "ImportPage.c"
 		}
 #line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = import_preview_placeholder_preview;
@@ -4006,7 +4001,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_object_unref0 (pixbuf);
 #line 297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		pixbuf = _tmp21_;
-#line 4009 "ImportPage.c"
+#line 4004 "ImportPage.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp23_ = pixbuf;
@@ -4016,7 +4011,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 	if (_tmp24_ > IMPORT_PREVIEW_MAX_SCALE) {
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = TRUE;
-#line 4019 "ImportPage.c"
+#line 4014 "ImportPage.c"
 	} else {
 		GdkPixbuf* _tmp25_ = NULL;
 		gint _tmp26_ = 0;
@@ -4026,11 +4021,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_tmp26_ = gdk_pixbuf_get_height (_tmp25_);
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = _tmp26_ > IMPORT_PREVIEW_MAX_SCALE;
-#line 4029 "ImportPage.c"
+#line 4024 "ImportPage.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp22_) {
-#line 4033 "ImportPage.c"
+#line 4028 "ImportPage.c"
 		GdkPixbuf* _tmp27_ = NULL;
 		GdkPixbuf* _tmp28_ = NULL;
 #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4041,13 +4036,13 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_object_unref0 (pixbuf);
 #line 302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		pixbuf = _tmp28_;
-#line 4044 "ImportPage.c"
+#line 4039 "ImportPage.c"
 	}
 #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp29_ = source;
 #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 4050 "ImportPage.c"
+#line 4045 "ImportPage.c"
 		PhotoImportSource* photo_import_source = NULL;
 		ImportSource* _tmp30_ = NULL;
 		PhotoImportSource* _tmp31_ = NULL;
@@ -4067,7 +4062,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_tmp33_ = using_placeholder;
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp33_) {
-#line 4070 "ImportPage.c"
+#line 4065 "ImportPage.c"
 			PhotoImportSource* _tmp34_ = NULL;
 			PhotoMetadata* _tmp35_ = NULL;
 			PhotoMetadata* _tmp36_ = NULL;
@@ -4081,15 +4076,15 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 			_tmp32_ = _tmp36_ != NULL;
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_media_metadata_unref0 (_tmp36_);
-#line 4084 "ImportPage.c"
+#line 4079 "ImportPage.c"
 		} else {
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp32_ = FALSE;
-#line 4088 "ImportPage.c"
+#line 4083 "ImportPage.c"
 		}
 #line 307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp32_) {
-#line 4092 "ImportPage.c"
+#line 4087 "ImportPage.c"
 			PhotoImportSource* _tmp37_ = NULL;
 			PhotoMetadata* _tmp38_ = NULL;
 			PhotoMetadata* _tmp39_ = NULL;
@@ -4114,7 +4109,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 			pixbuf = _tmp42_;
 #line 308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_media_metadata_unref0 (_tmp39_);
-#line 4117 "ImportPage.c"
+#line 4112 "ImportPage.c"
 		}
 #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp43_ = photo_import_source;
@@ -4128,7 +4123,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_object_unref0 (_tmp45_);
 #line 310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp46_) {
-#line 4131 "ImportPage.c"
+#line 4126 "ImportPage.c"
 			const gchar* _tmp47_ = NULL;
 			gchar* _tmp48_ = NULL;
 			gchar* _tmp49_ = NULL;
@@ -4142,11 +4137,11 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 			checkerboard_item_set_subtitle (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp49_, TRUE, PANGO_ALIGN_LEFT);
 #line 311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp49_);
-#line 4145 "ImportPage.c"
+#line 4140 "ImportPage.c"
 		}
 #line 304 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (photo_import_source);
-#line 4149 "ImportPage.c"
+#line 4144 "ImportPage.c"
 	}
 #line 315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp50_ = pixbuf;
@@ -4156,14 +4151,14 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 	_g_object_unref0 (pixbuf);
 #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 4159 "ImportPage.c"
+#line 4154 "ImportPage.c"
 }
 
 
 ImportPreview* import_preview_new (ImportSource* source) {
 #line 271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_preview_construct (TYPE_IMPORT_PREVIEW, source);
-#line 4166 "ImportPage.c"
+#line 4161 "ImportPage.c"
 }
 
 
@@ -4187,7 +4182,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	if (_tmp1_ == NULL) {
 #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 4190 "ImportPage.c"
+#line 4185 "ImportPage.c"
 	}
 #line 319 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	photo_import_source = _tmp1_;
@@ -4195,7 +4190,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	_tmp2_ = photo_import_source;
 #line 320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_ != NULL) {
-#line 4198 "ImportPage.c"
+#line 4193 "ImportPage.c"
 		gchar* preview_md5 = NULL;
 		PhotoImportSource* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -4224,7 +4219,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 		_tmp9_ = is_string_empty (_tmp8_);
 #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp9_) {
-#line 4227 "ImportPage.c"
+#line 4222 "ImportPage.c"
 			const gchar* _tmp10_ = NULL;
 			PhotoFileFormat _tmp11_ = 0;
 			gboolean _tmp12_ = FALSE;
@@ -4236,15 +4231,15 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 			_tmp12_ = library_photo_has_nontrash_duplicate (NULL, _tmp10_, NULL, _tmp11_);
 #line 326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = _tmp12_;
-#line 4239 "ImportPage.c"
+#line 4234 "ImportPage.c"
 		} else {
 #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = FALSE;
-#line 4243 "ImportPage.c"
+#line 4238 "ImportPage.c"
 		}
 #line 325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp7_) {
-#line 4247 "ImportPage.c"
+#line 4242 "ImportPage.c"
 			const gchar* _tmp13_ = NULL;
 			PhotoFileFormat _tmp14_ = 0;
 			PhotoID _tmp15_ = {0};
@@ -4269,13 +4264,13 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 			_g_object_unref0 (photo_import_source);
 #line 331 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 4272 "ImportPage.c"
+#line 4267 "ImportPage.c"
 		}
 #line 337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = file_format;
 #line 337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp17_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4278 "ImportPage.c"
+#line 4273 "ImportPage.c"
 			guint64 filesize = 0ULL;
 			ImportSource* _tmp18_ = NULL;
 			ImportSource* _tmp19_ = NULL;
@@ -4298,7 +4293,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 			_tmp22_ = filesize;
 #line 340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp22_ <= ((guint64) G_MAXINT64)) {
-#line 4301 "ImportPage.c"
+#line 4296 "ImportPage.c"
 				LibraryPhotoSourceCollection* _tmp23_ = NULL;
 				ImportSource* _tmp24_ = NULL;
 				ImportSource* _tmp25_ = NULL;
@@ -4329,7 +4324,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 				_g_object_unref0 (_tmp25_);
 #line 341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp30_) {
-#line 4332 "ImportPage.c"
+#line 4327 "ImportPage.c"
 					LibraryPhotoSourceCollection* _tmp31_ = NULL;
 					ImportSource* _tmp32_ = NULL;
 					ImportSource* _tmp33_ = NULL;
@@ -4370,7 +4365,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 					_g_object_unref0 (photo_import_source);
 #line 348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 4373 "ImportPage.c"
+#line 4368 "ImportPage.c"
 				}
 			}
 		}
@@ -4382,7 +4377,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 		_g_object_unref0 (photo_import_source);
 #line 353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4385 "ImportPage.c"
+#line 4380 "ImportPage.c"
 	}
 #line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp39_ = import_preview_get_import_source (self);
@@ -4392,7 +4387,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	if (_tmp40_ == NULL) {
 #line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp39_);
-#line 4395 "ImportPage.c"
+#line 4390 "ImportPage.c"
 	}
 #line 356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	video_import_source = _tmp40_;
@@ -4400,7 +4395,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	_tmp41_ = video_import_source;
 #line 357 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp41_ != NULL) {
-#line 4403 "ImportPage.c"
+#line 4398 "ImportPage.c"
 		VideoSourceCollection* _tmp42_ = NULL;
 		VideoImportSource* _tmp43_ = NULL;
 		gchar* _tmp44_ = NULL;
@@ -4429,7 +4424,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 		_g_free0 (_tmp45_);
 #line 362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp49_) {
-#line 4432 "ImportPage.c"
+#line 4427 "ImportPage.c"
 			VideoSourceCollection* _tmp50_ = NULL;
 			VideoImportSource* _tmp51_ = NULL;
 			gchar* _tmp52_ = NULL;
@@ -4468,7 +4463,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 			_g_object_unref0 (photo_import_source);
 #line 370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 4471 "ImportPage.c"
+#line 4466 "ImportPage.c"
 		}
 #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
@@ -4478,7 +4473,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 		_g_object_unref0 (photo_import_source);
 #line 373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4481 "ImportPage.c"
+#line 4476 "ImportPage.c"
 	}
 #line 376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = FALSE;
@@ -4488,7 +4483,7 @@ gboolean import_preview_is_already_imported (ImportPreview* self) {
 	_g_object_unref0 (photo_import_source);
 #line 376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4491 "ImportPage.c"
+#line 4486 "ImportPage.c"
 }
 
 
@@ -4507,7 +4502,7 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
 		result = NULL;
 #line 381 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 4510 "ImportPage.c"
+#line 4505 "ImportPage.c"
 	}
 #line 383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->duplicated_file;
@@ -4517,7 +4512,7 @@ DuplicatedFile* import_preview_get_duplicated_file (ImportPreview* self) {
 	result = _tmp2_;
 #line 383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4520 "ImportPage.c"
+#line 4515 "ImportPage.c"
 }
 
 
@@ -4532,7 +4527,7 @@ ImportSource* import_preview_get_import_source (ImportPreview* self) {
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_IMPORT_SOURCE, ImportSource);
 #line 387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4535 "ImportPage.c"
+#line 4530 "ImportPage.c"
 }
 
 
@@ -4543,14 +4538,14 @@ static void import_preview_class_init (ImportPreviewClass * klass) {
 	g_type_class_add_private (klass, sizeof (ImportPreviewPrivate));
 #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_preview_finalize;
-#line 4546 "ImportPage.c"
+#line 4541 "ImportPage.c"
 }
 
 
 static void import_preview_instance_init (ImportPreview * self) {
 #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv = IMPORT_PREVIEW_GET_PRIVATE (self);
-#line 4553 "ImportPage.c"
+#line 4548 "ImportPage.c"
 }
 
 
@@ -4562,7 +4557,7 @@ static void import_preview_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->duplicated_file);
 #line 264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (import_preview_parent_class)->finalize (obj);
-#line 4565 "ImportPage.c"
+#line 4560 "ImportPage.c"
 }
 
 
@@ -4600,14 +4595,14 @@ CameraViewTracker* camera_view_tracker_construct (GType object_type, ViewCollect
 	core_view_tracker_start (G_TYPE_CHECK_INSTANCE_CAST (self, CORE_TYPE_VIEW_TRACKER, CoreViewTracker), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, CORE_TYPE_TRACKER_ACCUMULATOR, CoreTrackerAccumulator));
 #line 396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 4603 "ImportPage.c"
+#line 4598 "ImportPage.c"
 }
 
 
 CameraViewTracker* camera_view_tracker_new (ViewCollection* collection) {
 #line 396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return camera_view_tracker_construct (TYPE_CAMERA_VIEW_TRACKER, collection);
-#line 4610 "ImportPage.c"
+#line 4605 "ImportPage.c"
 }
 
 
@@ -4616,7 +4611,7 @@ static void camera_view_tracker_class_init (CameraViewTrackerClass * klass) {
 	camera_view_tracker_parent_class = g_type_class_peek_parent (klass);
 #line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((CoreTrackerClass *) klass)->finalize = camera_view_tracker_finalize;
-#line 4619 "ImportPage.c"
+#line 4614 "ImportPage.c"
 }
 
 
@@ -4636,7 +4631,7 @@ static void camera_view_tracker_instance_init (CameraViewTracker * self) {
 	_tmp2_ = camera_accumulator_new ();
 #line 394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->selected = _tmp2_;
-#line 4639 "ImportPage.c"
+#line 4634 "ImportPage.c"
 }
 
 
@@ -4652,7 +4647,7 @@ static void camera_view_tracker_finalize (CoreTracker* obj) {
 	_g_object_unref0 (self->selected);
 #line 391 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	CORE_TRACKER_CLASS (camera_view_tracker_parent_class)->finalize (obj);
-#line 4655 "ImportPage.c"
+#line 4650 "ImportPage.c"
 }
 
 
@@ -4704,7 +4699,7 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 	_tmp6_ = photo;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ != NULL) {
-#line 4707 "ImportPage.c"
+#line 4702 "ImportPage.c"
 		PhotoImportSource* _tmp7_ = NULL;
 		PhotoFileFormat _tmp8_ = 0;
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4713,21 +4708,21 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 		_tmp8_ = photo_import_source_get_file_format (_tmp7_);
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW;
-#line 4716 "ImportPage.c"
+#line 4711 "ImportPage.c"
 	} else {
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = FALSE;
-#line 4720 "ImportPage.c"
+#line 4715 "ImportPage.c"
 	}
 #line 415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
-#line 4724 "ImportPage.c"
+#line 4719 "ImportPage.c"
 		gint _tmp9_ = 0;
 #line 416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = self->priv->_photos;
 #line 416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_photos (self, _tmp9_ + 1);
-#line 4730 "ImportPage.c"
+#line 4725 "ImportPage.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
 		PhotoImportSource* _tmp11_ = NULL;
@@ -4735,7 +4730,7 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 		_tmp11_ = photo;
 #line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_ != NULL) {
-#line 4738 "ImportPage.c"
+#line 4733 "ImportPage.c"
 			PhotoImportSource* _tmp12_ = NULL;
 			PhotoFileFormat _tmp13_ = 0;
 #line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4744,34 +4739,34 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 			_tmp13_ = photo_import_source_get_file_format (_tmp12_);
 #line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
-#line 4747 "ImportPage.c"
+#line 4742 "ImportPage.c"
 		} else {
 #line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = FALSE;
-#line 4751 "ImportPage.c"
+#line 4746 "ImportPage.c"
 		}
 #line 417 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp10_) {
-#line 4755 "ImportPage.c"
+#line 4750 "ImportPage.c"
 			gint _tmp14_ = 0;
 #line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = self->priv->_raw;
 #line 418 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			camera_accumulator_set_raw (self, _tmp14_ + 1);
-#line 4761 "ImportPage.c"
+#line 4756 "ImportPage.c"
 		} else {
 			ImportSource* _tmp15_ = NULL;
 #line 419 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = source;
 #line 419 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4768 "ImportPage.c"
+#line 4763 "ImportPage.c"
 				gint _tmp16_ = 0;
 #line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp16_ = self->priv->_videos;
 #line 420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				camera_accumulator_set_videos (self, _tmp16_ + 1);
-#line 4774 "ImportPage.c"
+#line 4769 "ImportPage.c"
 			}
 		}
 	}
@@ -4783,7 +4778,7 @@ static gboolean camera_accumulator_real_include (CoreTrackerAccumulator* base, D
 	_g_object_unref0 (source);
 #line 423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4786 "ImportPage.c"
+#line 4781 "ImportPage.c"
 }
 
 
@@ -4823,7 +4818,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 	_tmp6_ = photo;
 #line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ != NULL) {
-#line 4826 "ImportPage.c"
+#line 4821 "ImportPage.c"
 		PhotoImportSource* _tmp7_ = NULL;
 		PhotoFileFormat _tmp8_ = 0;
 #line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4832,15 +4827,15 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 		_tmp8_ = photo_import_source_get_file_format (_tmp7_);
 #line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _tmp8_ != PHOTO_FILE_FORMAT_RAW;
-#line 4835 "ImportPage.c"
+#line 4830 "ImportPage.c"
 	} else {
 #line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = FALSE;
-#line 4839 "ImportPage.c"
+#line 4834 "ImportPage.c"
 	}
 #line 432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_) {
-#line 4843 "ImportPage.c"
+#line 4838 "ImportPage.c"
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 #line 433 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4851,7 +4846,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 		_tmp10_ = self->priv->_photos;
 #line 434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		camera_accumulator_set_photos (self, _tmp10_ - 1);
-#line 4854 "ImportPage.c"
+#line 4849 "ImportPage.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
 		PhotoImportSource* _tmp12_ = NULL;
@@ -4859,7 +4854,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 		_tmp12_ = photo;
 #line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp12_ != NULL) {
-#line 4862 "ImportPage.c"
+#line 4857 "ImportPage.c"
 			PhotoImportSource* _tmp13_ = NULL;
 			PhotoFileFormat _tmp14_ = 0;
 #line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4868,15 +4863,15 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 			_tmp14_ = photo_import_source_get_file_format (_tmp13_);
 #line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = _tmp14_ == PHOTO_FILE_FORMAT_RAW;
-#line 4871 "ImportPage.c"
+#line 4866 "ImportPage.c"
 		} else {
 #line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = FALSE;
-#line 4875 "ImportPage.c"
+#line 4870 "ImportPage.c"
 		}
 #line 435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_) {
-#line 4879 "ImportPage.c"
+#line 4874 "ImportPage.c"
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
 #line 436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4887,14 +4882,14 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 			_tmp16_ = self->priv->_raw;
 #line 437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			camera_accumulator_set_raw (self, _tmp16_ - 1);
-#line 4890 "ImportPage.c"
+#line 4885 "ImportPage.c"
 		} else {
 			ImportSource* _tmp17_ = NULL;
 #line 438 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = source;
 #line 438 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 4897 "ImportPage.c"
+#line 4892 "ImportPage.c"
 				gint _tmp18_ = 0;
 				gint _tmp19_ = 0;
 #line 439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -4905,7 +4900,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 				_tmp19_ = self->priv->_videos;
 #line 440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				camera_accumulator_set_videos (self, _tmp19_ - 1);
-#line 4908 "ImportPage.c"
+#line 4903 "ImportPage.c"
 			}
 		}
 	}
@@ -4917,7 +4912,7 @@ static gboolean camera_accumulator_real_uninclude (CoreTrackerAccumulator* base,
 	_g_object_unref0 (source);
 #line 444 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4920 "ImportPage.c"
+#line 4915 "ImportPage.c"
 }
 
 
@@ -4934,7 +4929,7 @@ static gboolean camera_accumulator_real_altered (CoreTrackerAccumulator* base, D
 	result = FALSE;
 #line 449 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4937 "ImportPage.c"
+#line 4932 "ImportPage.c"
 }
 
 
@@ -4961,7 +4956,7 @@ gchar* camera_accumulator_to_string (CameraAccumulator* self) {
 	result = _tmp4_;
 #line 453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4964 "ImportPage.c"
+#line 4959 "ImportPage.c"
 }
 
 
@@ -4971,14 +4966,14 @@ CameraAccumulator* camera_accumulator_construct (GType object_type) {
 	self = (CameraAccumulator*) g_object_new (object_type, NULL);
 #line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 4974 "ImportPage.c"
+#line 4969 "ImportPage.c"
 }
 
 
 CameraAccumulator* camera_accumulator_new (void) {
 #line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return camera_accumulator_construct (TYPE_CAMERA_ACCUMULATOR);
-#line 4981 "ImportPage.c"
+#line 4976 "ImportPage.c"
 }
 
 
@@ -4993,7 +4988,7 @@ gint camera_accumulator_get_total (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 4996 "ImportPage.c"
+#line 4991 "ImportPage.c"
 }
 
 
@@ -5007,7 +5002,7 @@ static void camera_accumulator_set_total (CameraAccumulator* self, gint value) {
 	self->priv->_total = _tmp0_;
 #line 404 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_notify ((GObject *) self, "total");
-#line 5010 "ImportPage.c"
+#line 5005 "ImportPage.c"
 }
 
 
@@ -5022,7 +5017,7 @@ gint camera_accumulator_get_photos (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5025 "ImportPage.c"
+#line 5020 "ImportPage.c"
 }
 
 
@@ -5036,7 +5031,7 @@ static void camera_accumulator_set_photos (CameraAccumulator* self, gint value)
 	self->priv->_photos = _tmp0_;
 #line 405 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_notify ((GObject *) self, "photos");
-#line 5039 "ImportPage.c"
+#line 5034 "ImportPage.c"
 }
 
 
@@ -5051,7 +5046,7 @@ gint camera_accumulator_get_videos (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5054 "ImportPage.c"
+#line 5049 "ImportPage.c"
 }
 
 
@@ -5065,7 +5060,7 @@ static void camera_accumulator_set_videos (CameraAccumulator* self, gint value)
 	self->priv->_videos = _tmp0_;
 #line 406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_notify ((GObject *) self, "videos");
-#line 5068 "ImportPage.c"
+#line 5063 "ImportPage.c"
 }
 
 
@@ -5080,7 +5075,7 @@ gint camera_accumulator_get_raw (CameraAccumulator* self) {
 	result = _tmp0_;
 #line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5083 "ImportPage.c"
+#line 5078 "ImportPage.c"
 }
 
 
@@ -5094,7 +5089,7 @@ static void camera_accumulator_set_raw (CameraAccumulator* self, gint value) {
 	self->priv->_raw = _tmp0_;
 #line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_notify ((GObject *) self, "raw");
-#line 5097 "ImportPage.c"
+#line 5092 "ImportPage.c"
 }
 
 
@@ -5117,7 +5112,7 @@ static void camera_accumulator_class_init (CameraAccumulatorClass * klass) {
 	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_VIDEOS, g_param_spec_int ("videos", "videos", "videos", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), CAMERA_ACCUMULATOR_RAW, g_param_spec_int ("raw", "raw", "raw", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 5120 "ImportPage.c"
+#line 5115 "ImportPage.c"
 }
 
 
@@ -5130,7 +5125,7 @@ static void camera_accumulator_core_tracker_accumulator_interface_init (CoreTrac
 	iface->uninclude = (gboolean (*)(CoreTrackerAccumulator*, DataObject*)) camera_accumulator_real_uninclude;
 #line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	iface->altered = (gboolean (*)(CoreTrackerAccumulator*, DataObject*, Alteration*)) camera_accumulator_real_altered;
-#line 5133 "ImportPage.c"
+#line 5128 "ImportPage.c"
 }
 
 
@@ -5145,7 +5140,7 @@ static void camera_accumulator_instance_init (CameraAccumulator * self) {
 	self->priv->_videos = 0;
 #line 407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->_raw = 0;
-#line 5148 "ImportPage.c"
+#line 5143 "ImportPage.c"
 }
 
 
@@ -5155,7 +5150,7 @@ static void camera_accumulator_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CAMERA_ACCUMULATOR, CameraAccumulator);
 #line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (camera_accumulator_parent_class)->finalize (obj);
-#line 5158 "ImportPage.c"
+#line 5153 "ImportPage.c"
 }
 
 
@@ -5202,13 +5197,13 @@ static void _vala_camera_accumulator_get_property (GObject * object, guint prope
 		g_value_set_int (value, camera_accumulator_get_raw (self));
 #line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5205 "ImportPage.c"
+#line 5200 "ImportPage.c"
 		default:
 #line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5211 "ImportPage.c"
+#line 5206 "ImportPage.c"
 	}
 }
 
@@ -5242,13 +5237,13 @@ static void _vala_camera_accumulator_set_property (GObject * object, guint prope
 		camera_accumulator_set_raw (self, g_value_get_int (value));
 #line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5245 "ImportPage.c"
+#line 5240 "ImportPage.c"
 		default:
 #line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		break;
-#line 5251 "ImportPage.c"
+#line 5246 "ImportPage.c"
 	}
 }
 
@@ -5256,7 +5251,7 @@ static void _vala_camera_accumulator_set_property (GObject * object, guint prope
 static void _import_page_on_media_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_media_added_removed ((ImportPage*) self);
-#line 5259 "ImportPage.c"
+#line 5254 "ImportPage.c"
 }
 
 
@@ -5272,12 +5267,40 @@ GType import_page_refresh_result_get_type (void) {
 }
 
 
+static void _import_page_on_import_selected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 868 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	import_page_on_import_selected ((ImportPage*) self);
+#line 5273 "ImportPage.c"
+}
+
+
+static void _import_page_on_import_all_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 868 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	import_page_on_import_all ((ImportPage*) self);
+#line 5280 "ImportPage.c"
+}
+
+
+static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 868 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	page_on_action_toggle ((Page*) self, action, parameter);
+#line 5287 "ImportPage.c"
+}
+
+
+static void _import_page_on_display_titles_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 868 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	import_page_on_display_titles ((ImportPage*) self, action, value);
+#line 5294 "ImportPage.c"
+}
+
+
 static gint64 _import_page_preview_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = import_page_preview_comparator (a, b);
 #line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5280 "ImportPage.c"
+#line 5303 "ImportPage.c"
 }
 
 
@@ -5286,28 +5309,28 @@ static gboolean _import_page_preview_comparator_predicate_comparator_predicate (
 	result = import_page_preview_comparator_predicate (object, alteration);
 #line 747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5289 "ImportPage.c"
+#line 5312 "ImportPage.c"
 }
 
 
 static void _import_page_on_view_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
 #line 750 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed ((ImportPage*) self);
-#line 5296 "ImportPage.c"
+#line 5319 "ImportPage.c"
 }
 
 
 static void _import_page_on_view_changed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed ((ImportPage*) self);
-#line 5303 "ImportPage.c"
+#line 5326 "ImportPage.c"
 }
 
 
 static void _import_page_on_view_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
 #line 752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed ((ImportPage*) self);
-#line 5310 "ImportPage.c"
+#line 5333 "ImportPage.c"
 }
 
 
@@ -5416,7 +5439,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 	_tmp14_ = display_name;
 #line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (NULL != _tmp14_) {
-#line 5419 "ImportPage.c"
+#line 5442 "ImportPage.c"
 		const gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 #line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5427,7 +5450,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 		_g_free0 (self->priv->camera_name);
 #line 720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->camera_name = _tmp16_;
-#line 5430 "ImportPage.c"
+#line 5453 "ImportPage.c"
 	} else {
 		CameraAbilities abilities = {0};
 		int res = 0;
@@ -5449,7 +5472,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 		_tmp20_ = res;
 #line 724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp20_ != GP_OK) {
-#line 5452 "ImportPage.c"
+#line 5475 "ImportPage.c"
 			int _tmp21_ = 0;
 			gchar* _tmp22_ = NULL;
 			gchar* _tmp23_ = NULL;
@@ -5473,11 +5496,11 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 			_g_free0 (self->priv->camera_name);
 #line 726 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			self->priv->camera_name = _tmp25_;
-#line 5476 "ImportPage.c"
+#line 5499 "ImportPage.c"
 		}
 #line 719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		 (abilities);
-#line 5480 "ImportPage.c"
+#line 5503 "ImportPage.c"
 	}
 #line 729 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp26_ = self->priv->camera_label;
@@ -5499,7 +5522,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 	_tmp30_ = import_page_null_context;
 #line 736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp30_ == NULL) {
-#line 5502 "ImportPage.c"
+#line 5525 "ImportPage.c"
 		GPContextWrapper* _tmp31_ = NULL;
 #line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp31_ = gp_context_wrapper_new ();
@@ -5507,13 +5530,13 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 		_gp_context_wrapper_unref0 (import_page_null_context);
 #line 737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_null_context = _tmp31_;
-#line 5510 "ImportPage.c"
+#line 5533 "ImportPage.c"
 	}
 #line 740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp32_ = import_page_spin_idle_context;
 #line 740 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp32_ == NULL) {
-#line 5516 "ImportPage.c"
+#line 5539 "ImportPage.c"
 		GPSpinIdleWrapper* _tmp33_ = NULL;
 #line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp33_ = gp_spin_idle_wrapper_new ();
@@ -5521,7 +5544,7 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 		_gp_context_wrapper_unref0 (import_page_spin_idle_context);
 #line 741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_spin_idle_context = _tmp33_;
-#line 5524 "ImportPage.c"
+#line 5547 "ImportPage.c"
 	}
 #line 744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp34_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -5603,21 +5626,21 @@ ImportPage* import_page_construct (GType object_type, Camera* camera, const gcha
 	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/ImportContextMenu");
 #line 709 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 5606 "ImportPage.c"
+#line 5629 "ImportPage.c"
 }
 
 
 ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon) {
 #line 709 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_construct (TYPE_IMPORT_PAGE, camera, uri, display_name, icon);
-#line 5613 "ImportPage.c"
+#line 5636 "ImportPage.c"
 }
 
 
 static void _import_page_on_hide_imported_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 777 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_hide_imported ((ImportPage*) self);
-#line 5620 "ImportPage.c"
+#line 5643 "ImportPage.c"
 }
 
 
@@ -5625,15 +5648,15 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 	ImportPage * self;
 	GtkToolbar* result = NULL;
 	GtkToolbar* _tmp0_ = NULL;
-	GtkToolbar* _tmp56_ = NULL;
-	GtkToolbar* _tmp57_ = NULL;
+	GtkToolbar* _tmp50_ = NULL;
+	GtkToolbar* _tmp51_ = NULL;
 #line 770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
 #line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ == NULL) {
-#line 5636 "ImportPage.c"
+#line 5659 "ImportPage.c"
 		GtkToolbar* _tmp1_ = NULL;
 		GtkToolbar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -5671,30 +5694,24 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 		GtkToggleToolButton* find_button = NULL;
 		GtkToggleToolButton* _tmp32_ = NULL;
 		GtkToggleToolButton* _tmp33_ = NULL;
-		GtkAction* _tmp34_ = NULL;
-		GtkAction* _tmp35_ = NULL;
+		GtkToolbar* _tmp34_ = NULL;
+		GtkToggleToolButton* _tmp35_ = NULL;
 		GtkToolbar* _tmp36_ = NULL;
-		GtkToggleToolButton* _tmp37_ = NULL;
-		GtkToolbar* _tmp38_ = NULL;
-		GtkSeparatorToolItem* _tmp39_ = NULL;
-		GtkSeparatorToolItem* _tmp40_ = NULL;
+		GtkSeparatorToolItem* _tmp37_ = NULL;
+		GtkSeparatorToolItem* _tmp38_ = NULL;
 		GtkToolButton* import_selected_button = NULL;
+		GtkToolButton* _tmp39_ = NULL;
+		GtkToolButton* _tmp40_ = NULL;
 		GtkToolButton* _tmp41_ = NULL;
-		GtkToolButton* _tmp42_ = NULL;
+		GtkToolbar* _tmp42_ = NULL;
 		GtkToolButton* _tmp43_ = NULL;
-		GtkAction* _tmp44_ = NULL;
-		GtkAction* _tmp45_ = NULL;
-		GtkToolbar* _tmp46_ = NULL;
-		GtkToolButton* _tmp47_ = NULL;
 		GtkToolButton* import_all_button = NULL;
+		GtkToolButton* _tmp44_ = NULL;
+		GtkToolButton* _tmp45_ = NULL;
+		GtkToolButton* _tmp46_ = NULL;
+		GtkToolbar* _tmp47_ = NULL;
 		GtkToolButton* _tmp48_ = NULL;
-		GtkToolButton* _tmp49_ = NULL;
-		GtkToolButton* _tmp50_ = NULL;
-		GtkAction* _tmp51_ = NULL;
-		GtkAction* _tmp52_ = NULL;
-		GtkToolbar* _tmp53_ = NULL;
-		GtkToolButton* _tmp54_ = NULL;
-		GtkProgressBar* _tmp55_ = NULL;
+		GtkProgressBar* _tmp49_ = NULL;
 #line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = PAGE_CLASS (import_page_parent_class)->get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
 #line 772 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5818,87 +5835,69 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 #line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp33_ = find_button;
 #line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp34_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonDisplaySearchbar");
-#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp35_ = _tmp34_;
-#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_activatable_set_related_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GTK_TYPE_ACTIVATABLE, GtkActivatable), _tmp35_);
-#line 804 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_object_unref0 (_tmp35_);
+		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.CommonDisplaySearchbar");
 #line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+		_tmp34_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp37_ = find_button;
+		_tmp35_ = find_button;
 #line 806 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toolbar_insert (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_tool_item_get_type (), GtkToolItem), -1);
+		gtk_toolbar_insert (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+		_tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp39_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+		_tmp37_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp39_);
+		g_object_ref_sink (_tmp37_);
 #line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp40_ = _tmp39_;
+		_tmp38_ = _tmp37_;
 #line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toolbar_insert (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), -1);
+		gtk_toolbar_insert (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 809 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_object_unref0 (_tmp40_);
+		_g_object_unref0 (_tmp38_);
 #line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp41_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
+		_tmp39_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
 #line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp41_);
+		g_object_ref_sink (_tmp39_);
 #line 812 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		import_selected_button = _tmp41_;
+		import_selected_button = _tmp39_;
 #line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp42_ = import_selected_button;
+		_tmp40_ = import_selected_button;
 #line 813 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_button_set_icon_name (_tmp42_, RESOURCES_IMPORT);
-#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp43_ = import_selected_button;
-#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp44_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected");
-#line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp45_ = _tmp44_;
+		gtk_tool_button_set_icon_name (_tmp40_, RESOURCES_IMPORT);
 #line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_activatable_set_related_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_ACTIVATABLE, GtkActivatable), _tmp45_);
+		_tmp41_ = import_selected_button;
 #line 814 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_object_unref0 (_tmp45_);
+		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportSelected");
 #line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+		_tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp47_ = import_selected_button;
+		_tmp43_ = import_selected_button;
 #line 816 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toolbar_insert (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_tool_item_get_type (), GtkToolItem), -1);
+		gtk_toolbar_insert (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp48_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
+		_tmp44_ = (GtkToolButton*) gtk_tool_button_new (NULL, NULL);
 #line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_object_ref_sink (_tmp48_);
+		g_object_ref_sink (_tmp44_);
 #line 819 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		import_all_button = _tmp48_;
+		import_all_button = _tmp44_;
 #line 820 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp49_ = import_all_button;
+		_tmp45_ = import_all_button;
 #line 820 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_tool_button_set_icon_name (_tmp49_, RESOURCES_IMPORT_ALL);
-#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp50_ = import_all_button;
-#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp51_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll");
+		gtk_tool_button_set_icon_name (_tmp45_, RESOURCES_IMPORT_ALL);
 #line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp52_ = _tmp51_;
+		_tmp46_ = import_all_button;
 #line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_activatable_set_related_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GTK_TYPE_ACTIVATABLE, GtkActivatable), _tmp52_);
-#line 821 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_object_unref0 (_tmp52_);
+		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.ImportAll");
 #line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp53_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+		_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp54_ = import_all_button;
+		_tmp48_ = import_all_button;
 #line 823 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toolbar_insert (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_tool_item_get_type (), GtkToolItem), -1);
+		gtk_toolbar_insert (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp55_ = self->priv->progress_bar;
+		_tmp49_ = self->priv->progress_bar;
 #line 827 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), TRUE);
+		gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 829 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_toolbar_state (self);
 #line 831 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -5915,24 +5914,24 @@ static GtkToolbar* import_page_real_get_toolbar (Page* base) {
 		_g_object_unref0 (separator);
 #line 771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (hide_item);
-#line 5918 "ImportPage.c"
+#line 5917 "ImportPage.c"
 	}
 #line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp56_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+	_tmp50_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
 #line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp57_ = _g_object_ref0 (_tmp56_);
+	_tmp51_ = _g_object_ref0 (_tmp50_);
 #line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	result = _tmp57_;
+	result = _tmp51_;
 #line 834 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5928 "ImportPage.c"
+#line 5927 "ImportPage.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
 #line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 5935 "ImportPage.c"
+#line 5934 "ImportPage.c"
 }
 
 
@@ -5951,7 +5950,7 @@ static CoreViewTracker* import_page_real_get_view_tracker (CheckerboardPage* bas
 	result = _tmp1_;
 #line 838 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5954 "ImportPage.c"
+#line 5953 "ImportPage.c"
 }
 
 
@@ -5970,7 +5969,7 @@ static gchar* import_page_real_get_view_empty_message (CheckerboardPage* base) {
 	result = _tmp1_;
 #line 842 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5973 "ImportPage.c"
+#line 5972 "ImportPage.c"
 }
 
 
@@ -5989,7 +5988,7 @@ static gchar* import_page_real_get_filter_no_match_message (CheckerboardPage* ba
 	result = _tmp1_;
 #line 846 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 5992 "ImportPage.c"
+#line 5991 "ImportPage.c"
 }
 
 
@@ -6030,7 +6029,7 @@ static gint64 import_page_preview_comparator (void* a, void* b) {
 	result = _tmp8_;
 #line 850 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6033 "ImportPage.c"
+#line 6032 "ImportPage.c"
 }
 
 
@@ -6050,7 +6049,7 @@ static gboolean import_page_preview_comparator_predicate (DataObject* object, Al
 	result = _tmp1_;
 #line 855 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6053 "ImportPage.c"
+#line 6052 "ImportPage.c"
 }
 
 
@@ -6074,7 +6073,7 @@ static gint64 import_page_import_job_comparator (ImportPage* self, void* a, void
 	result = (gint64) (_tmp1_ - _tmp3_);
 #line 859 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6077 "ImportPage.c"
+#line 6076 "ImportPage.c"
 }
 
 
@@ -6094,276 +6093,69 @@ static void import_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_
 	_tmp1_ = ui_filenames;
 #line 865 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "import.ui");
-#line 6097 "ImportPage.c"
-}
-
-
-static void _import_page_on_display_titles_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_page_on_display_titles ((ImportPage*) self, action);
-#line 6104 "ImportPage.c"
+#line 6096 "ImportPage.c"
 }
 
 
-static void _vala_array_add143 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 875 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if ((*length) == (*size)) {
-#line 875 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 875 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 6115 "ImportPage.c"
-	}
-#line 875 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	(*array)[(*length)++] = *value;
-#line 6119 "ImportPage.c"
+static GVariant* _variant_new11 (gboolean value) {
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 6103 "ImportPage.c"
 }
 
 
-static GtkToggleActionEntry* import_page_real_init_collect_toggle_action_entries (Page* base, int* result_length1) {
+static void import_page_real_add_actions (Page* base) {
 	ImportPage * self;
-	GtkToggleActionEntry* result = NULL;
-	GtkToggleActionEntry* toggle_actions = NULL;
-	gint _tmp0_ = 0;
-	GtkToggleActionEntry* _tmp1_ = NULL;
-	gint toggle_actions_length1 = 0;
-	gint _toggle_actions_size_ = 0;
-	GtkToggleActionEntry titles = {0};
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	GtkToggleActionEntry _tmp5_ = {0};
-	GtkToggleActionEntry _tmp6_ = {0};
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkToggleActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkToggleActionEntry _tmp10_ = {0};
-	GtkToggleActionEntry* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-#line 868 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp1_ = PAGE_CLASS (import_page_parent_class)->init_collect_toggle_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), &_tmp0_);
-#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	toggle_actions = _tmp1_;
-#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	toggle_actions_length1 = _tmp0_;
-#line 869 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_toggle_actions_size_ = toggle_actions_length1;
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp2_ = config_facade_get_instance ();
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp3_ = _tmp2_;
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp4_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_.name = "ViewTitle";
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_.stock_id = NULL;
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_.accelerator = "<Ctrl><Shift>T";
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_.tooltip = TRANSLATABLE;
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_.callback = (GCallback) _import_page_on_display_titles_gtk_action_callback;
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_.is_active = _tmp4_;
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp6_ = _tmp5_;
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_g_object_unref0 (_tmp3_);
-#line 871 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	titles = _tmp6_;
-#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp7_ = _ ("_Titles");
-#line 873 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	titles.label = _tmp7_;
-#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp8_ = _ ("Display the title of each photo");
-#line 874 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	titles.tooltip = _tmp8_;
-#line 875 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp9_ = toggle_actions;
-#line 875 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp9__length1 = toggle_actions_length1;
-#line 875 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp10_ = titles;
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
+	GAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+	GSimpleAction* _tmp4_ = NULL;
+	ConfigFacade* _tmp5_ = NULL;
+	ConfigFacade* _tmp6_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	GVariant* _tmp8_ = NULL;
 #line 875 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_vala_array_add143 (&toggle_actions, &toggle_actions_length1, &_toggle_actions_size_, &_tmp10_);
-#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp11_ = toggle_actions;
-#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp11__length1 = toggle_actions_length1;
-#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (result_length1) {
-#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		*result_length1 = _tmp11__length1;
-#line 6204 "ImportPage.c"
-	}
-#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	result = _tmp11_;
-#line 877 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	return result;
-#line 6210 "ImportPage.c"
-}
-
-
-static void _import_page_on_import_selected_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_page_on_import_selected ((ImportPage*) self);
-#line 6217 "ImportPage.c"
-}
-
-
-static void _vala_array_add144 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 887 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if ((*length) == (*size)) {
-#line 887 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 887 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 6228 "ImportPage.c"
-	}
-#line 887 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	(*array)[(*length)++] = *value;
-#line 6232 "ImportPage.c"
-}
-
-
-static void _import_page_on_import_all_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 889 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_page_on_import_all ((ImportPage*) self);
-#line 6239 "ImportPage.c"
-}
-
-
-static void _vala_array_add145 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if ((*length) == (*size)) {
-#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 6250 "ImportPage.c"
-	}
-#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	(*array)[(*length)++] = *value;
-#line 6254 "ImportPage.c"
-}
-
-
-static GtkActionEntry* import_page_real_init_collect_action_entries (Page* base, int* result_length1) {
-	ImportPage * self;
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	gint _tmp0_ = 0;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry import_selected = {0};
-	GtkActionEntry _tmp2_ = {0};
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkActionEntry* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	GtkActionEntry _tmp6_ = {0};
-	GtkActionEntry import_all = {0};
-	GtkActionEntry _tmp7_ = {0};
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	GtkActionEntry* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	GtkActionEntry _tmp11_ = {0};
-	GtkActionEntry* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 881 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp1_ = PAGE_CLASS (import_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), &_tmp0_);
-#line 881 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	actions = _tmp1_;
-#line 881 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	actions_length1 = _tmp0_;
-#line 881 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_actions_size_ = actions_length1;
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp2_.name = "ImportSelected";
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp2_.stock_id = RESOURCES_IMPORT;
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp2_.accelerator = NULL;
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp2_.tooltip = NULL;
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp2_.callback = (GCallback) _import_page_on_import_selected_gtk_action_callback;
-#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_selected = _tmp2_;
-#line 885 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp3_ = _ ("Import _Selected");
-#line 885 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_selected.label = _tmp3_;
-#line 886 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp4_ = _ ("Import the selected photos into your library");
-#line 886 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_selected.tooltip = _tmp4_;
-#line 887 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_ = actions;
-#line 887 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5__length1 = actions_length1;
-#line 887 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp6_ = import_selected;
-#line 887 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_vala_array_add144 (&actions, &actions_length1, &_actions_size_, &_tmp6_);
-#line 889 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp7_.name = "ImportAll";
-#line 889 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp7_.stock_id = RESOURCES_IMPORT_ALL;
-#line 889 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp7_.label = TRANSLATABLE;
-#line 889 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp7_.accelerator = NULL;
-#line 889 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp7_.tooltip = NULL;
-#line 889 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp7_.callback = (GCallback) _import_page_on_import_all_gtk_action_callback;
-#line 889 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_all = _tmp7_;
-#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp8_ = _ ("Import _All");
-#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_all.label = _tmp8_;
-#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp9_ = _ ("Import all the photos into your library");
-#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	import_all.tooltip = _tmp9_;
-#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp10_ = actions;
-#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp10__length1 = actions_length1;
-#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp11_ = import_all;
-#line 893 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_vala_array_add145 (&actions, &actions_length1, &_actions_size_, &_tmp11_);
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp12_ = actions;
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp12__length1 = actions_length1;
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (result_length1) {
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		*result_length1 = _tmp12__length1;
-#line 6360 "ImportPage.c"
+#line 876 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	PAGE_CLASS (import_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
+#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp0_ = app_window_get_instance ();
+#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp1_ = _tmp0_;
+#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), IMPORT_PAGE_entries, G_N_ELEMENTS (IMPORT_PAGE_entries), self);
+#line 878 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_g_object_unref0 (_tmp1_);
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	if (_tmp3_ == NULL) {
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		_g_object_unref0 (_tmp2_);
+#line 6138 "ImportPage.c"
 	}
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	result = _tmp12_;
-#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	return result;
-#line 6366 "ImportPage.c"
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp4_ = _tmp3_;
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp5_ = config_facade_get_instance ();
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp6_ = _tmp5_;
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp7_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp8_ = _variant_new11 (_tmp7_);
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_simple_action_set_state (_tmp4_, _tmp8_);
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_g_variant_unref0 (_tmp8_);
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_g_object_unref0 (_tmp6_);
+#line 880 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_g_object_unref0 (_tmp4_);
+#line 6158 "ImportPage.c"
 }
 
 
@@ -6371,17 +6163,17 @@ Camera* import_page_get_camera (ImportPage* self) {
 	Camera* result = NULL;
 	Camera* _tmp0_ = NULL;
 	Camera* _tmp1_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 883 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
-#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _GPHOTO_REF_CAMERA0 (_tmp0_);
-#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 884 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6384 "ImportPage.c"
+#line 6176 "ImportPage.c"
 }
 
 
@@ -6389,32 +6181,32 @@ gchar* import_page_get_uri (ImportPage* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 902 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
-#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->uri;
-#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 903 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 888 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6402 "ImportPage.c"
+#line 6194 "ImportPage.c"
 }
 
 
 gboolean import_page_is_busy (ImportPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 906 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 891 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 907 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->busy;
-#line 907 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 907 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 892 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6417 "ImportPage.c"
+#line 6209 "ImportPage.c"
 }
 
 
@@ -6422,21 +6214,21 @@ static void import_page_real_init_actions (Page* base, gint selected_count, gint
 	ImportPage * self;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 913 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 898 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", TRUE);
-#line 914 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 899 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", TRUE);
-#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = selected_count;
-#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = count;
-#line 916 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	PAGE_CLASS (import_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 6439 "ImportPage.c"
+#line 6231 "ImportPage.c"
 }
 
 
@@ -6444,29 +6236,29 @@ gboolean import_page_is_refreshed (ImportPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 919 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 904 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->refreshed;
-#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 6453 "ImportPage.c"
+#line 6245 "ImportPage.c"
 		gboolean _tmp2_ = FALSE;
-#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = self->priv->busy;
-#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = !_tmp2_;
-#line 6459 "ImportPage.c"
+#line 6251 "ImportPage.c"
 	} else {
-#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 6463 "ImportPage.c"
+#line 6255 "ImportPage.c"
 	}
-#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
-#line 920 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 905 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6469 "ImportPage.c"
+#line 6261 "ImportPage.c"
 }
 
 
@@ -6474,130 +6266,130 @@ gchar* import_page_get_refresh_message (ImportPage* self) {
 	gchar* result = NULL;
 	gchar* msg = NULL;
 	const gchar* _tmp0_ = NULL;
-#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 908 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), NULL);
-#line 924 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 909 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	msg = NULL;
-#line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->refresh_error;
-#line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 910 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 6485 "ImportPage.c"
+#line 6277 "ImportPage.c"
 		const gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
-#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = self->priv->refresh_error;
-#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = g_strdup (_tmp1_);
-#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (msg);
-#line 926 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 911 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		msg = _tmp2_;
-#line 6496 "ImportPage.c"
+#line 6288 "ImportPage.c"
 	} else {
 		int _tmp3_ = 0;
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 912 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->refresh_result;
-#line 927 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 912 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp3_ == GP_OK) {
-#line 6503 "ImportPage.c"
+#line 6295 "ImportPage.c"
 		} else {
 			int _tmp4_ = 0;
 			gchar* _tmp5_ = NULL;
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp4_ = self->priv->refresh_result;
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = gp_result_to_full_string (_tmp4_);
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (msg);
-#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			msg = _tmp5_;
-#line 6515 "ImportPage.c"
+#line 6307 "ImportPage.c"
 		}
 	}
-#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = msg;
-#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 6522 "ImportPage.c"
+#line 6314 "ImportPage.c"
 }
 
 
 static void import_page_update_status (ImportPage* self, gboolean busy, gboolean refreshed) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 922 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = busy;
-#line 937 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 922 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->busy = _tmp0_;
-#line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = refreshed;
-#line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 923 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refreshed = _tmp1_;
-#line 940 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 925 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 6541 "ImportPage.c"
+#line 6333 "ImportPage.c"
 }
 
 
 static void import_page_update_toolbar_state (ImportPage* self) {
 	GtkCheckButton* _tmp0_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 928 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 929 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->hide_imported;
-#line 944 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 929 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_ != NULL) {
-#line 6553 "ImportPage.c"
+#line 6345 "ImportPage.c"
 		gboolean _tmp1_ = FALSE;
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
 		GtkCheckButton* _tmp8_ = NULL;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->busy;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp3_) {
-#line 6562 "ImportPage.c"
+#line 6354 "ImportPage.c"
 			gboolean _tmp4_ = FALSE;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp4_ = self->priv->refreshed;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp2_ = _tmp4_;
-#line 6568 "ImportPage.c"
+#line 6360 "ImportPage.c"
 		} else {
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp2_ = FALSE;
-#line 6572 "ImportPage.c"
+#line 6364 "ImportPage.c"
 		}
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp2_) {
-#line 6576 "ImportPage.c"
+#line 6368 "ImportPage.c"
 			ViewCollection* _tmp5_ = NULL;
 			ViewCollection* _tmp6_ = NULL;
 			gint _tmp7_ = 0;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = _tmp5_;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = view_collection_get_unfiltered_count (_tmp6_);
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp1_ = _tmp7_ > 0;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_data_collection_unref0 (_tmp6_);
-#line 6590 "ImportPage.c"
+#line 6382 "ImportPage.c"
 		} else {
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp1_ = FALSE;
-#line 6594 "ImportPage.c"
+#line 6386 "ImportPage.c"
 		}
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = self->priv->hide_imported;
-#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 6600 "ImportPage.c"
+#line 6392 "ImportPage.c"
 	}
 }
 
@@ -6611,167 +6403,167 @@ static void import_page_on_view_changed (ImportPage* self) {
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp15_ = FALSE;
-	AppWindow* _tmp19_ = NULL;
-	AppWindow* _tmp20_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->busy;
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp2_) {
-#line 6622 "ImportPage.c"
+#line 6412 "ImportPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = self->priv->refreshed;
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = _tmp3_;
-#line 6628 "ImportPage.c"
+#line 6418 "ImportPage.c"
 	} else {
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = FALSE;
-#line 6632 "ImportPage.c"
+#line 6422 "ImportPage.c"
 	}
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 6636 "ImportPage.c"
+#line 6426 "ImportPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _tmp4_;
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp6_ > 0;
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 6650 "ImportPage.c"
+#line 6440 "ImportPage.c"
 	} else {
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 6654 "ImportPage.c"
+#line 6444 "ImportPage.c"
 	}
-#line 949 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 934 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportSelected", _tmp0_);
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = self->priv->busy;
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp9_) {
-#line 6662 "ImportPage.c"
+#line 6452 "ImportPage.c"
 		gboolean _tmp10_ = FALSE;
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = self->priv->refreshed;
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = _tmp10_;
-#line 6668 "ImportPage.c"
+#line 6458 "ImportPage.c"
 	} else {
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = FALSE;
-#line 6672 "ImportPage.c"
+#line 6462 "ImportPage.c"
 	}
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp8_) {
-#line 6676 "ImportPage.c"
+#line 6466 "ImportPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = _tmp11_;
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp13_ > 0;
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 6690 "ImportPage.c"
+#line 6480 "ImportPage.c"
 	} else {
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = FALSE;
-#line 6694 "ImportPage.c"
+#line 6484 "ImportPage.c"
 	}
-#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 935 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ImportAll", _tmp7_);
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = self->priv->busy;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp15_) {
-#line 6702 "ImportPage.c"
+#line 6492 "ImportPage.c"
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		gint _tmp18_ = 0;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = _tmp16_;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp18_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection));
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = _tmp18_ > 0;
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 6716 "ImportPage.c"
+#line 6506 "ImportPage.c"
 	} else {
-#line 952 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = FALSE;
-#line 6720 "ImportPage.c"
+#line 6510 "ImportPage.c"
 	}
-#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp19_ = app_window_get_instance ();
-#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp20_ = _tmp19_;
-#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	app_window_set_common_action_sensitive (_tmp20_, "CommonSelectAll", _tmp14_);
-#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_g_object_unref0 (_tmp20_);
-#line 954 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSelectAll", _tmp14_);
+#line 938 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_toolbar_state (self);
-#line 6732 "ImportPage.c"
+#line 6516 "ImportPage.c"
 }
 
 
 static void import_page_on_media_added_removed (ImportPage* self) {
 	ImportPageImportPageSearchViewFilter* _tmp0_ = NULL;
-#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 958 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6744 "ImportPage.c"
+#line 6528 "ImportPage.c"
 }
 
 
-static void import_page_on_display_titles (ImportPage* self, GtkAction* action) {
+static void import_page_on_display_titles (ImportPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GtkAction* _tmp0_ = NULL;
+	GVariant* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
-#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	GSimpleAction* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 962 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp0_ = action;
-#line 962 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 962 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 945 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 946 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp0_ = value;
+#line 946 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp1_ = g_variant_get_boolean (_tmp0_);
+#line 946 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	display = _tmp1_;
-#line 964 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 948 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
-#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_;
-#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	configuration_facade_set_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
-#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 6774 "ImportPage.c"
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp4_ = action;
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp5_ = value;
+#line 951 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_simple_action_set_state (_tmp4_, _tmp5_);
+#line 6566 "ImportPage.c"
 }
 
 
@@ -6780,36 +6572,36 @@ static void import_page_real_switched_to (Page* base) {
 	ConfigFacade* _tmp0_ = NULL;
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 954 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 969 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 969 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _tmp0_;
-#line 969 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = configuration_facade_get_display_photo_titles (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 969 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	checkerboard_page_set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp2_);
-#line 969 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 955 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	PAGE_CLASS (import_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
-#line 6797 "ImportPage.c"
+#line 6589 "ImportPage.c"
 }
 
 
 static void import_page_real_ready (Page* base) {
 	ImportPage * self;
 	ImportPageHideImportedViewFilter* _tmp0_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 960 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 975 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_try_refreshing_camera (self, FALSE);
-#line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->hide_imported_filter;
-#line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6812 "ImportPage.c"
+#line 6604 "ImportPage.c"
 }
 
 
@@ -6820,50 +6612,50 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 	ImportPageRefreshResult _tmp3_ = 0;
 	ImportPageRefreshResult _tmp4_ = 0;
 	GError * _inner_error_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 965 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 981 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->refreshed;
-#line 981 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 981 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = TRUE;
-#line 6831 "ImportPage.c"
+#line 6623 "ImportPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 981 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = self->priv->busy;
-#line 981 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp2_;
-#line 6838 "ImportPage.c"
+#line 6630 "ImportPage.c"
 	}
-#line 981 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 6844 "ImportPage.c"
+#line 6636 "ImportPage.c"
 	}
-#line 984 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = import_page_refresh_camera (self);
-#line 984 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp3_;
-#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = res;
-#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	switch (_tmp4_) {
-#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_OK:
-#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_BUSY:
-#line 6858 "ImportPage.c"
+#line 6650 "ImportPage.c"
 		{
-#line 990 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 976 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 6862 "ImportPage.c"
+#line 6654 "ImportPage.c"
 		}
-#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_LOCKED:
-#line 6866 "ImportPage.c"
+#line 6658 "ImportPage.c"
 		{
 			gboolean _tmp5_ = FALSE;
 			const gchar* _tmp6_ = NULL;
@@ -6872,89 +6664,89 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 			GFile* _tmp8_ = NULL;
 			GMount* mount = NULL;
 			GMount* _tmp13_ = NULL;
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = fail_on_locked;
-#line 993 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp5_) {
-#line 994 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 980 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
-#line 996 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 982 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 6883 "ImportPage.c"
+#line 6675 "ImportPage.c"
 			}
-#line 1000 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = self->priv->uri;
-#line 1000 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			g_debug ("ImportPage.vala:1000: Checking if %s is mounted…", _tmp6_);
-#line 1002 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			g_debug ("ImportPage.vala:986: Checking if %s is mounted…", _tmp6_);
+#line 988 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = self->priv->uri;
-#line 1002 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 1002 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			uri = _tmp8_;
-#line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 990 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			mount = NULL;
-#line 6897 "ImportPage.c"
+#line 6689 "ImportPage.c"
 			{
 				GMount* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
 				GMount* _tmp11_ = NULL;
 				GMount* _tmp12_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp10_ = uri;
-#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_);
-#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp9_ = _tmp11_;
-#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6911 "ImportPage.c"
-					goto __catch63_g_error;
+#line 6703 "ImportPage.c"
+					goto __catch62_g_error;
 				}
-#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp12_ = _tmp9_;
-#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp9_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (mount);
-#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 992 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				mount = _tmp12_;
-#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp9_);
-#line 6924 "ImportPage.c"
+#line 6716 "ImportPage.c"
 			}
-			goto __finally63;
-			__catch63_g_error:
+			goto __finally62;
+			__catch62_g_error:
 			{
 				GError* err = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				err = _inner_error_;
-#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_inner_error_ = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_error_free0 (err);
-#line 6936 "ImportPage.c"
+#line 6728 "ImportPage.c"
 			}
-			__finally63:
-#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			__finally62:
+#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (mount);
-#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (uri);
-#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_clear_error (&_inner_error_);
-#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 991 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return;
-#line 6951 "ImportPage.c"
+#line 6743 "ImportPage.c"
 			}
-#line 1011 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp13_ = mount;
-#line 1011 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp13_ != NULL) {
-#line 6957 "ImportPage.c"
+#line 6749 "ImportPage.c"
 				gchar* mounted_message = NULL;
 				const gchar* _tmp14_ = NULL;
 				gchar* _tmp15_ = NULL;
@@ -6972,73 +6764,73 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				gint _tmp25_ = 0;
 				GtkMessageDialog* _tmp26_ = NULL;
 				gint _tmp27_ = 0;
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp14_ = _ ("Shotwell needs to unmount the camera from the filesystem in order to a" \
 "ccess it. Continue?");
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp15_ = g_strdup (_tmp14_);
-#line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				mounted_message = _tmp15_;
-#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp16_ = app_window_get_instance ();
-#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp17_ = _tmp16_;
-#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp18_ = mounted_message;
-#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", _tmp18_);
-#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_object_ref_sink (_tmp19_);
-#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp20_ = _tmp19_;
-#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp17_);
-#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				dialog = _tmp20_;
-#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = dialog;
-#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp22_ = dialog;
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp23_ = _ ("_Unmount");
-#line 1019 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog), _tmp23_, (gint) GTK_RESPONSE_YES);
-#line 1020 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = dialog;
-#line 1020 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp25_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_dialog_get_type (), GtkDialog));
-#line 1020 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				dialog_res = _tmp25_;
-#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp26_ = dialog;
-#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp27_ = dialog_res;
-#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1009 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp27_ != ((gint) GTK_RESPONSE_YES)) {
-#line 7021 "ImportPage.c"
+#line 6813 "ImportPage.c"
 					const gchar* _tmp28_ = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp28_ = _ ("Please unmount the camera.");
-#line 1024 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp28_);
-#line 7027 "ImportPage.c"
+#line 6819 "ImportPage.c"
 				} else {
 					GMount* _tmp29_ = NULL;
-#line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp29_ = mount;
-#line 1026 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1012 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					import_page_unmount_camera (self, _tmp29_);
-#line 7034 "ImportPage.c"
+#line 6826 "ImportPage.c"
 				}
-#line 1011 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (dialog);
-#line 1011 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (mounted_message);
-#line 7040 "ImportPage.c"
+#line 6832 "ImportPage.c"
 			} else {
 				gchar* locked_message = NULL;
 				const gchar* _tmp30_ = NULL;
@@ -7053,115 +6845,115 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				GtkMessageDialog* _tmp38_ = NULL;
 				GtkMessageDialog* _tmp39_ = NULL;
 				const gchar* _tmp40_ = NULL;
-#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp30_ = _ ("The camera is locked by another application. Shotwell can only access " \
 "the camera when it’s unlocked. Please close any other application usin" \
 "g the camera and try again.");
-#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp31_ = g_strdup (_tmp30_);
-#line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				locked_message = _tmp31_;
-#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp32_ = app_window_get_instance ();
-#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp33_ = _tmp32_;
-#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp34_ = locked_message;
-#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp35_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", _tmp34_);
-#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_object_ref_sink (_tmp35_);
-#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp36_ = _tmp35_;
-#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp33_);
-#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				dialog = _tmp36_;
-#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp37_ = dialog;
-#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_window_get_type (), GtkWindow), RESOURCES_APP_TITLE);
-#line 1036 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp38_ = dialog;
-#line 1036 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_dialog_get_type (), GtkDialog));
-#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp39_ = dialog;
-#line 1037 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1023 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
-#line 1039 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp40_ = _ ("Please close any other application using the camera.");
-#line 1039 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp40_);
-#line 1011 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (dialog);
-#line 1011 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 997 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (locked_message);
-#line 7097 "ImportPage.c"
+#line 6889 "ImportPage.c"
 			}
-#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (mount);
-#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (uri);
-#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1027 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 7105 "ImportPage.c"
+#line 6897 "ImportPage.c"
 		}
-#line 985 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 971 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR:
-#line 7109 "ImportPage.c"
+#line 6901 "ImportPage.c"
 		{
 			const gchar* _tmp41_ = NULL;
 			gchar* _tmp42_ = NULL;
 			gchar* _tmp43_ = NULL;
 			gchar* _tmp44_ = NULL;
 			gchar* _tmp45_ = NULL;
-#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp41_ = _ ("Unable to fetch previews from the camera:\n%s");
-#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp42_ = import_page_get_refresh_message (self);
-#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp43_ = _tmp42_;
-#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp44_ = g_strdup_printf (_tmp41_, _tmp43_);
-#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp45_ = _tmp44_;
-#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			app_window_error_message (_tmp45_, NULL);
-#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp45_);
-#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1030 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp43_);
-#line 1046 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1032 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 7134 "ImportPage.c"
+#line 6926 "ImportPage.c"
 		}
 		default:
 		{
 			ImportPageRefreshResult _tmp46_ = 0;
-#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp46_ = res;
-#line 1049 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			g_error ("ImportPage.vala:1049: Unknown result type %d", (gint) _tmp46_);
-#line 7143 "ImportPage.c"
+#line 1035 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			g_error ("ImportPage.vala:1035: Unknown result type %d", (gint) _tmp46_);
+#line 6935 "ImportPage.c"
 		}
 	}
 }
 
 
 static void _import_page_on_unmounted_g_mount_unmounted (GMount* _sender, gpointer self) {
-#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_unmounted ((ImportPage*) self, _sender);
-#line 7152 "ImportPage.c"
+#line 6944 "ImportPage.c"
 }
 
 
 static void _import_page_on_unmount_finished_gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_unmount_finished ((ImportPage*) self, source_object, res);
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_unref (self);
-#line 7161 "ImportPage.c"
+#line 6953 "ImportPage.c"
 }
 
 
@@ -7179,67 +6971,67 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
 	AppWindow* _tmp9_ = NULL;
 	GtkMountOperation* _tmp10_ = NULL;
 	GtkMountOperation* _tmp11_ = NULL;
-#line 1053 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1039 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 1053 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1039 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
-#line 1054 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->busy;
-#line 1054 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1040 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7191 "ImportPage.c"
+#line 6983 "ImportPage.c"
 	}
-#line 1057 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1043 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, TRUE, FALSE);
-#line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->progress_bar;
-#line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1044 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1059 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->progress_bar;
-#line 1059 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1045 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_fraction (_tmp2_, 0.0);
-#line 1060 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1046 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->progress_bar;
-#line 1060 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1046 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_ellipsize (_tmp3_, PANGO_ELLIPSIZE_NONE);
-#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = self->priv->progress_bar;
-#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = _ ("Unmounting…");
-#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1047 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_text (_tmp4_, _tmp5_);
-#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = mount;
-#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1052 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (_tmp6_, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0);
-#line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_debug ("ImportPage.vala:1068: Unmounting camera…");
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1054 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_debug ("ImportPage.vala:1054: Unmounting camera…");
+#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = mount;
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = app_window_get_instance ();
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = (GtkMountOperation*) gtk_mount_operation_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow));
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = _tmp10_;
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_mount_unmount_with_operation (_tmp7_, G_MOUNT_UNMOUNT_NONE, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, g_mount_operation_get_type (), GMountOperation), NULL, _import_page_on_unmount_finished_gasync_ready_callback, g_object_ref (self));
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp11_);
-#line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 1072 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
-#line 1072 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1058 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 7239 "ImportPage.c"
+#line 7031 "ImportPage.c"
 }
 
 
@@ -7248,35 +7040,35 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 	GObject* _tmp0_ = NULL;
 	GMount* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1075 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1075 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail ((source == NULL) || G_IS_OBJECT (source));
-#line 1075 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (G_IS_ASYNC_RESULT (aresult));
-#line 1076 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_debug ("ImportPage.vala:1076: Async unmount finished");
-#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_debug ("ImportPage.vala:1062: Async unmount finished");
+#line 1064 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = source;
-#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1064 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_mount_get_type (), GMount));
-#line 1078 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1064 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	mount = _tmp1_;
-#line 7262 "ImportPage.c"
+#line 7054 "ImportPage.c"
 	{
 		GAsyncResult* _tmp2_ = NULL;
-#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = aresult;
-#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_mount_unmount_with_operation_finish (mount, _tmp2_, &_inner_error_);
-#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7271 "ImportPage.c"
-			goto __catch64_g_error;
+#line 7063 "ImportPage.c"
+			goto __catch63_g_error;
 		}
 	}
-	goto __finally64;
-	__catch64_g_error:
+	goto __finally63;
+	__catch63_g_error:
 	{
 		GError* err = NULL;
 		guint _tmp3_ = 0U;
@@ -7284,52 +7076,52 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 		GtkProgressBar* _tmp5_ = NULL;
 		GtkProgressBar* _tmp6_ = NULL;
 		GtkProgressBar* _tmp7_ = NULL;
-#line 1079 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		err = _inner_error_;
-#line 1079 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_inner_error_ = NULL;
-#line 1082 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		app_window_error_message (IMPORT_PAGE_UNMOUNT_FAILED_MSG, NULL);
-#line 1085 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_signal_parse_name ("unmounted", g_mount_get_type (), &_tmp3_, NULL, FALSE);
-#line 1085 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_signal_handlers_disconnect_matched (mount, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _import_page_on_unmounted_g_mount_unmounted, self);
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1073 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = self->priv->refreshed;
-#line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1073 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, _tmp4_);
-#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = self->priv->progress_bar;
-#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_progress_bar_set_ellipsize (_tmp5_, PANGO_ELLIPSIZE_NONE);
-#line 1089 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = self->priv->progress_bar;
-#line 1089 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_progress_bar_set_text (_tmp6_, "");
-#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = self->priv->progress_bar;
-#line 1090 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1076 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1079 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 7312 "ImportPage.c"
+#line 7104 "ImportPage.c"
 	}
-	__finally64:
-#line 1079 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	__finally63:
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1079 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (mount);
-#line 1079 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1079 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1079 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 7325 "ImportPage.c"
+#line 7117 "ImportPage.c"
 	}
-#line 1075 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (mount);
-#line 7329 "ImportPage.c"
+#line 7121 "ImportPage.c"
 }
 
 
@@ -7338,31 +7130,31 @@ static void import_page_on_unmounted (ImportPage* self, GMount* mount) {
 	GtkProgressBar* _tmp1_ = NULL;
 	GtkProgressBar* _tmp2_ = NULL;
 	GtkProgressBar* _tmp3_ = NULL;
-#line 1094 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1094 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (G_IS_MOUNT (mount));
-#line 1095 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_debug ("ImportPage.vala:1095: on_unmounted");
-#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1081 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_debug ("ImportPage.vala:1081: on_unmounted");
+#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->refreshed;
-#line 1097 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, FALSE, _tmp0_);
-#line 1098 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->progress_bar;
-#line 1098 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1084 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_ellipsize (_tmp1_, PANGO_ELLIPSIZE_NONE);
-#line 1099 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1085 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->progress_bar;
-#line 1099 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1085 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_text (_tmp2_, "");
-#line 1100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->progress_bar;
-#line 1100 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1086 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1102 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_try_refreshing_camera (self, TRUE);
-#line 7362 "ImportPage.c"
+#line 7154 "ImportPage.c"
 }
 
 
@@ -7371,23 +7163,23 @@ static void import_page_clear_all_import_sources (ImportPage* self) {
 	SourceCollection* _tmp0_ = NULL;
 	Marker* _tmp1_ = NULL;
 	SourceCollection* _tmp2_ = NULL;
-#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->import_sources;
-#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1106 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	marker = _tmp1_;
-#line 1107 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1093 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	marker_mark_all (marker);
-#line 1108 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1094 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->import_sources;
-#line 1108 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1094 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	source_collection_destroy_marked (_tmp2_, marker, FALSE, NULL, NULL, NULL);
-#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (marker);
-#line 7387 "ImportPage.c"
+#line 7179 "ImportPage.c"
 }
 
 
@@ -7421,93 +7213,93 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 	gint list_len = 0;
 	CameraList* _tmp15_ = NULL;
 	gint _tmp16_ = 0;
-#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (dir != NULL, FALSE);
-#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (search_target != NULL, FALSE);
-#line 1119 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 1119 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->camera_name;
-#line 1119 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = fsid;
-#line 1119 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = dir;
-#line 1119 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 1119 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1105 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	fulldir = _tmp4_;
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = gp_list_new (&_tmp5_);
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	folders = _tmp5_;
-#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1109 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_result_ = _tmp6_;
-#line 1124 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = _result_;
-#line 1124 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1110 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp7_ != GP_OK) {
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (folders);
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1112 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7459 "ImportPage.c"
+#line 7251 "ImportPage.c"
 	}
-#line 1129 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = self->priv->camera;
-#line 1129 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = fulldir;
-#line 1129 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = folders;
-#line 1129 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = import_page_spin_idle_context;
-#line 1129 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1129 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = gp_camera_folder_list_folders (_tmp8_, _tmp9_, _tmp10_, _tmp12_);
-#line 1129 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1115 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_result_ = _tmp13_;
-#line 1130 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = _result_;
-#line 1130 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp14_ != GP_OK) {
-#line 1132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (folders);
-#line 1132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1132 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1118 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7487 "ImportPage.c"
+#line 7279 "ImportPage.c"
 	}
-#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = folders;
-#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp16_ = gp_list_count (_tmp15_);
-#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1121 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	list_len = _tmp16_;
-#line 7495 "ImportPage.c"
+#line 7287 "ImportPage.c"
 	{
 		gint list_index = 0;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		list_index = 0;
-#line 7500 "ImportPage.c"
+#line 7292 "ImportPage.c"
 		{
 			gboolean _tmp17_ = FALSE;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = TRUE;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 7507 "ImportPage.c"
+#line 7299 "ImportPage.c"
 				gint _tmp19_ = 0;
 				gint _tmp20_ = 0;
 				gchar* tmp = NULL;
@@ -7517,73 +7309,73 @@ static gboolean import_page_check_directory_exists (ImportPage* self, gint fsid,
 				gchar* _tmp24_ = NULL;
 				const gchar* _tmp25_ = NULL;
 				const gchar* _tmp26_ = NULL;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp17_) {
-#line 7519 "ImportPage.c"
+#line 7311 "ImportPage.c"
 					gint _tmp18_ = 0;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp18_ = list_index;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					list_index = _tmp18_ + 1;
-#line 7525 "ImportPage.c"
+#line 7317 "ImportPage.c"
 				}
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp17_ = FALSE;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = list_index;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp20_ = list_len;
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!(_tmp19_ < _tmp20_)) {
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 7537 "ImportPage.c"
+#line 7329 "ImportPage.c"
 				}
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = folders;
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp22_ = list_index;
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gp_list_get_name (_tmp21_, _tmp22_, &_tmp23_);
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (tmp);
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = g_strdup (_tmp23_);
-#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1126 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				tmp = _tmp24_;
-#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp25_ = tmp;
-#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp26_ = search_target;
-#line 1141 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (g_strcmp0 (_tmp25_, _tmp26_) == 0) {
-#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = TRUE;
-#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (tmp);
-#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (folders);
-#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1128 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 7567 "ImportPage.c"
+#line 7359 "ImportPage.c"
 				}
-#line 1137 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (tmp);
-#line 7571 "ImportPage.c"
+#line 7363 "ImportPage.c"
 			}
 		}
 	}
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = FALSE;
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (fulldir);
-#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 7583 "ImportPage.c"
+#line 7375 "ImportPage.c"
 }
 
 
@@ -7628,143 +7420,143 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 	int _tmp85_ = 0;
 	int _tmp89_ = 0;
 	int _tmp94_ = 0;
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), 0);
-#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->busy;
-#line 1149 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1135 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = IMPORT_PAGE_REFRESH_RESULT_BUSY;
-#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7638 "ImportPage.c"
+#line 7430 "ImportPage.c"
 	}
-#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _ ("Starting import, please wait…");
-#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1138 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp1_);
-#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = self->priv->busy;
-#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1140 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, _tmp2_, FALSE);
-#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (self->priv->refresh_error);
-#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_error = NULL;
-#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = self->priv->camera;
-#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = import_page_spin_idle_context;
-#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = gp_camera_init (_tmp3_, _tmp5_);
-#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1143 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp6_;
-#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = self->priv->refresh_result;
-#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp7_ != GP_OK) {
-#line 7666 "ImportPage.c"
+#line 7458 "ImportPage.c"
 		int _tmp8_ = 0;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		ImportPageRefreshResult _tmp11_ = 0;
 		int _tmp12_ = 0;
-#line 1159 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = self->priv->refresh_result;
-#line 1159 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = gp_result_to_full_string (_tmp8_);
-#line 1159 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp9_;
-#line 1159 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1159: Unable to initialize camera: %s", _tmp10_);
-#line 1159 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1145: Unable to initialize camera: %s", _tmp10_);
+#line 1145 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp10_);
-#line 1161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = self->priv->refresh_result;
-#line 1161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp12_ == GP_ERROR_IO_LOCK) {
-#line 1161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 7688 "ImportPage.c"
+#line 7480 "ImportPage.c"
 		} else {
-#line 1161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 7692 "ImportPage.c"
+#line 7484 "ImportPage.c"
 		}
-#line 1161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp11_;
-#line 1161 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1147 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 7698 "ImportPage.c"
+#line 7490 "ImportPage.c"
 	}
-#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = self->priv->refreshed;
-#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1150 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, TRUE, _tmp13_);
-#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 1168 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = self->priv->progress_bar;
-#line 1168 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_ellipsize (_tmp14_, PANGO_ELLIPSIZE_NONE);
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1155 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = self->priv->progress_bar;
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1155 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp16_ = _ ("Fetching photo information");
-#line 1169 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1155 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_text (_tmp15_, _tmp16_);
-#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp17_ = self->priv->progress_bar;
-#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1156 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_fraction (_tmp17_, 0.0);
-#line 1171 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp18_ = self->priv->progress_bar;
-#line 1171 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1157 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_pulse_step (_tmp18_, 0.01);
-#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp19_ = self->priv->progress_bar;
-#line 1172 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp20_ = gee_array_list_new (TYPE_IMPORT_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1160 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_list = _tmp20_;
-#line 1176 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	sifs = NULL;
-#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1163 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	count = 0;
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp21_ = self->priv->camera;
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp22_ = import_page_spin_idle_context;
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp25_ = gp_camera_get_storageinfo (_tmp21_, &sifs, &_tmp24_, _tmp23_);
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	count = _tmp24_;
-#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp25_;
-#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp26_ = self->priv->refresh_result;
-#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1165 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp26_ == GP_OK) {
-#line 7752 "ImportPage.c"
+#line 7544 "ImportPage.c"
 		{
 			gint fsid = 0;
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			fsid = 0;
-#line 7757 "ImportPage.c"
+#line 7549 "ImportPage.c"
 			{
 				gboolean _tmp27_ = FALSE;
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp27_ = TRUE;
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				while (TRUE) {
-#line 7764 "ImportPage.c"
+#line 7556 "ImportPage.c"
 					gint _tmp29_ = 0;
 					gint _tmp30_ = 0;
 					gboolean got_well_known_dir = FALSE;
@@ -7789,381 +7581,381 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 					gint _tmp67_ = 0;
 					gboolean _tmp68_ = FALSE;
 					gboolean _tmp71_ = FALSE;
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp27_) {
-#line 7791 "ImportPage.c"
+#line 7583 "ImportPage.c"
 						gint _tmp28_ = 0;
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp28_ = fsid;
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						fsid = _tmp28_ + 1;
-#line 7797 "ImportPage.c"
+#line 7589 "ImportPage.c"
 					}
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp27_ = FALSE;
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp29_ = fsid;
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = count;
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!(_tmp29_ < _tmp30_)) {
-#line 1180 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1166 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						break;
-#line 7809 "ImportPage.c"
+#line 7601 "ImportPage.c"
 					}
-#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1170 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					got_well_known_dir = FALSE;
-#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp31_ = fsid;
-#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp32_ = import_page_check_directory_exists (self, _tmp31_, "/", "DCIM");
-#line 1187 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1173 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp32_) {
-#line 7819 "ImportPage.c"
+#line 7611 "ImportPage.c"
 						gint _tmp33_ = 0;
 						GeeArrayList* _tmp34_ = NULL;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp33_ = fsid;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp34_ = import_list;
-#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1174 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp33_, "/DCIM", _tmp34_);
-#line 1189 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1175 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7830 "ImportPage.c"
+#line 7622 "ImportPage.c"
 					}
-#line 1191 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = fsid;
-#line 1191 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp36_ = import_page_check_directory_exists (self, _tmp35_, "/", "dcim");
-#line 1191 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1177 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp36_) {
-#line 7838 "ImportPage.c"
+#line 7630 "ImportPage.c"
 						gint _tmp37_ = 0;
 						GeeArrayList* _tmp38_ = NULL;
-#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp37_ = fsid;
-#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp38_ = import_list;
-#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1178 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp37_, "/dcim", _tmp38_);
-#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7849 "ImportPage.c"
+#line 7641 "ImportPage.c"
 					}
-#line 1198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp39_ = fsid;
-#line 1198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp40_ = import_page_check_directory_exists (self, _tmp39_, "/PRIVATE/", "AVCHD");
-#line 1198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1184 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp40_) {
-#line 7857 "ImportPage.c"
+#line 7649 "ImportPage.c"
 						gint _tmp41_ = 0;
 						GeeArrayList* _tmp42_ = NULL;
-#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp41_ = fsid;
-#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp42_ = import_list;
-#line 1199 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp41_, "/PRIVATE/AVCHD", _tmp42_);
-#line 1200 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7868 "ImportPage.c"
+#line 7660 "ImportPage.c"
 					}
-#line 1202 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp43_ = fsid;
-#line 1202 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp44_ = import_page_check_directory_exists (self, _tmp43_, "/private/", "avchd");
-#line 1202 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1188 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp44_) {
-#line 7876 "ImportPage.c"
+#line 7668 "ImportPage.c"
 						gint _tmp45_ = 0;
 						GeeArrayList* _tmp46_ = NULL;
-#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1189 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp45_ = fsid;
-#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1189 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp46_ = import_list;
-#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1189 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp45_, "/private/avchd", _tmp46_);
-#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1190 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7887 "ImportPage.c"
+#line 7679 "ImportPage.c"
 					}
-#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp47_ = fsid;
-#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp48_ = import_page_check_directory_exists (self, _tmp47_, "/", "AVCHD");
-#line 1206 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1192 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp48_) {
-#line 7895 "ImportPage.c"
+#line 7687 "ImportPage.c"
 						gint _tmp49_ = 0;
 						GeeArrayList* _tmp50_ = NULL;
-#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp49_ = fsid;
-#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp50_ = import_list;
-#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1193 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp49_, "/AVCHD", _tmp50_);
-#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1194 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7906 "ImportPage.c"
+#line 7698 "ImportPage.c"
 					}
-#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp51_ = fsid;
-#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp52_ = import_page_check_directory_exists (self, _tmp51_, "/", "avchd");
-#line 1210 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1196 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp52_) {
-#line 7914 "ImportPage.c"
+#line 7706 "ImportPage.c"
 						gint _tmp53_ = 0;
 						GeeArrayList* _tmp54_ = NULL;
-#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp53_ = fsid;
-#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp54_ = import_list;
-#line 1211 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1197 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp53_, "/avchd", _tmp54_);
-#line 1212 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1198 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7925 "ImportPage.c"
+#line 7717 "ImportPage.c"
 					}
-#line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp55_ = fsid;
-#line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp56_ = import_page_check_directory_exists (self, _tmp55_, "/PRIVATE/", "SONY");
-#line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1203 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp56_) {
-#line 7933 "ImportPage.c"
+#line 7725 "ImportPage.c"
 						gint _tmp57_ = 0;
 						GeeArrayList* _tmp58_ = NULL;
-#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp57_ = fsid;
-#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp58_ = import_list;
-#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1204 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp57_, "/PRIVATE/SONY", _tmp58_);
-#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1205 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7944 "ImportPage.c"
+#line 7736 "ImportPage.c"
 					}
-#line 1221 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp59_ = fsid;
-#line 1221 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp60_ = import_page_check_directory_exists (self, _tmp59_, "/private/", "sony");
-#line 1221 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1207 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp60_) {
-#line 7952 "ImportPage.c"
+#line 7744 "ImportPage.c"
 						gint _tmp61_ = 0;
 						GeeArrayList* _tmp62_ = NULL;
-#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp61_ = fsid;
-#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp62_ = import_list;
-#line 1222 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1208 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp61_, "/private/sony", _tmp62_);
-#line 1223 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7963 "ImportPage.c"
+#line 7755 "ImportPage.c"
 					}
-#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp63_ = fsid;
-#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp64_ = import_page_check_directory_exists (self, _tmp63_, "/", "MP_ROOT");
-#line 1227 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp64_) {
-#line 7971 "ImportPage.c"
+#line 7763 "ImportPage.c"
 						gint _tmp65_ = 0;
 						GeeArrayList* _tmp66_ = NULL;
-#line 1228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp65_ = fsid;
-#line 1228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp66_ = import_list;
-#line 1228 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1214 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp65_, "/MP_ROOT", _tmp66_);
-#line 1229 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1215 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 7982 "ImportPage.c"
+#line 7774 "ImportPage.c"
 					}
-#line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp67_ = fsid;
-#line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp68_ = import_page_check_directory_exists (self, _tmp67_, "/", "mp_root");
-#line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1217 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp68_) {
-#line 7990 "ImportPage.c"
+#line 7782 "ImportPage.c"
 						gint _tmp69_ = 0;
 						GeeArrayList* _tmp70_ = NULL;
-#line 1232 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp69_ = fsid;
-#line 1232 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp70_ = import_list;
-#line 1232 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1218 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						import_page_enumerate_files (self, _tmp69_, "/mp_root", _tmp70_);
-#line 1233 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1219 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						got_well_known_dir = TRUE;
-#line 8001 "ImportPage.c"
+#line 7793 "ImportPage.c"
 					}
-#line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp71_ = got_well_known_dir;
-#line 1238 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1224 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp71_) {
-#line 8007 "ImportPage.c"
+#line 7799 "ImportPage.c"
 						gint _tmp72_ = 0;
 						GeeArrayList* _tmp73_ = NULL;
 						gboolean _tmp74_ = FALSE;
-#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp72_ = fsid;
-#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp73_ = import_list;
-#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp74_ = import_page_enumerate_files (self, _tmp72_, "/", _tmp73_);
-#line 1239 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp74_) {
-#line 1240 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							break;
-#line 8021 "ImportPage.c"
+#line 7813 "ImportPage.c"
 						}
 					}
 				}
 			}
 		}
 	}
-#line 1245 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1231 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_clear_all_import_sources (self);
-#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp75_ = import_list;
-#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1234 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_auto_match_raw_jpeg (self, _tmp75_);
-#line 1255 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp76_ = import_list;
-#line 1255 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_load_previews_and_metadata (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_LIST, GeeList));
-#line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp77_ = self->priv->progress_bar;
-#line 1262 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1248 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp78_ = self->priv->progress_bar;
-#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1249 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_ellipsize (_tmp78_, PANGO_ELLIPSIZE_NONE);
-#line 1264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1250 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp79_ = self->priv->progress_bar;
-#line 1264 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1250 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_text (_tmp79_, "");
-#line 1265 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1251 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp80_ = self->priv->progress_bar;
-#line 1265 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1251 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_fraction (_tmp80_, 0.0);
-#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp81_ = self->priv->camera;
-#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp82_ = import_page_spin_idle_context;
-#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp83_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp84_ = gp_camera_exit (_tmp81_, _tmp83_);
-#line 1267 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1253 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp84_;
-#line 1268 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp85_ = res;
-#line 1268 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1254 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp85_ != GP_OK) {
-#line 8068 "ImportPage.c"
+#line 7860 "ImportPage.c"
 		int _tmp86_ = 0;
 		gchar* _tmp87_ = NULL;
 		gchar* _tmp88_ = NULL;
-#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp86_ = res;
-#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp87_ = gp_result_to_full_string (_tmp86_);
-#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp88_ = _tmp87_;
-#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1270: Unable to unlock camera: %s", _tmp88_);
-#line 1270 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1256: Unable to unlock camera: %s", _tmp88_);
+#line 1256 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp88_);
-#line 8082 "ImportPage.c"
+#line 7874 "ImportPage.c"
 	}
-#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp89_ = self->priv->refresh_result;
-#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1259 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp89_ == GP_OK) {
-#line 8088 "ImportPage.c"
+#line 7880 "ImportPage.c"
 		SourceCollection* _tmp90_ = NULL;
 		gint _tmp91_ = 0;
-#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp90_ = self->priv->import_sources;
-#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp91_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1274 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1260 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp91_ == 0) {
-#line 8097 "ImportPage.c"
+#line 7889 "ImportPage.c"
 			gchar* _tmp92_ = NULL;
 			gchar* _tmp93_ = NULL;
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp92_ = checkerboard_page_get_view_empty_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp93_ = _tmp92_;
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp93_);
-#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1261 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp93_);
-#line 8108 "ImportPage.c"
+#line 7900 "ImportPage.c"
 		}
-#line 1277 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1263 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, TRUE);
-#line 8112 "ImportPage.c"
+#line 7904 "ImportPage.c"
 	} else {
-#line 1279 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1265 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_update_status (self, FALSE, FALSE);
-#line 1282 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1268 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_clear_all_import_sources (self);
-#line 8118 "ImportPage.c"
+#line 7910 "ImportPage.c"
 	}
-#line 1285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1271 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp94_ = self->priv->refresh_result;
-#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	switch (_tmp94_) {
-#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case GP_OK:
-#line 8128 "ImportPage.c"
+#line 7920 "ImportPage.c"
 		{
-#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_OK;
-#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_list);
-#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8136 "ImportPage.c"
+#line 7928 "ImportPage.c"
 		}
-#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1273 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		case GP_ERROR_IO_LOCK:
-#line 8140 "ImportPage.c"
+#line 7932 "ImportPage.c"
 		{
-#line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_LOCKED;
-#line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_list);
-#line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8148 "ImportPage.c"
+#line 7940 "ImportPage.c"
 		}
 		default:
 		{
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = IMPORT_PAGE_REFRESH_RESULT_LIBRARY_ERROR;
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_list);
-#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8158 "ImportPage.c"
+#line 7950 "ImportPage.c"
 		}
 	}
-#line 1148 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1134 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (import_list);
-#line 8163 "ImportPage.c"
+#line 7955 "ImportPage.c"
 }
 
 
@@ -8181,7 +7973,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 8181 "ImportPage.c"
+#line 7973 "ImportPage.c"
 }
 
 
@@ -8214,7 +8006,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 8214 "ImportPage.c"
+#line 8006 "ImportPage.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8223,13 +8015,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 8223 "ImportPage.c"
+#line 8015 "ImportPage.c"
 	}
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 8229 "ImportPage.c"
+#line 8021 "ImportPage.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8238,13 +8030,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 8238 "ImportPage.c"
+#line 8030 "ImportPage.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 8244 "ImportPage.c"
+#line 8036 "ImportPage.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8253,11 +8045,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 8253 "ImportPage.c"
+#line 8045 "ImportPage.c"
 	} else {
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 8257 "ImportPage.c"
+#line 8049 "ImportPage.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -8265,7 +8057,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 8265 "ImportPage.c"
+#line 8057 "ImportPage.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8274,11 +8066,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 8274 "ImportPage.c"
+#line 8066 "ImportPage.c"
 	} else {
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 8278 "ImportPage.c"
+#line 8070 "ImportPage.c"
 	}
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -8300,7 +8092,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 8300 "ImportPage.c"
+#line 8092 "ImportPage.c"
 }
 
 
@@ -8311,71 +8103,71 @@ static gchar* import_page_chomp_ch (const gchar* str, gchar ch) {
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
 	gchar* _tmp12_ = NULL;
-#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1285 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (str != NULL, NULL);
-#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1286 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = str;
-#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1286 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = strlen (_tmp0_);
-#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1286 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1300 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1286 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	offset = (glong) _tmp2_;
-#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	while (TRUE) {
-#line 8323 "ImportPage.c"
+#line 8115 "ImportPage.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		const gchar* _tmp5_ = NULL;
 		glong _tmp6_ = 0L;
 		gchar _tmp7_ = '\0';
 		gchar _tmp8_ = '\0';
-#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = offset;
-#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		offset = _tmp3_ - 1;
-#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = offset;
-#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!(_tmp4_ >= ((glong) 0))) {
-#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1287 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			break;
-#line 8340 "ImportPage.c"
+#line 8132 "ImportPage.c"
 		}
-#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = str;
-#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = offset;
-#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = string_get (_tmp5_, _tmp6_);
-#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = ch;
-#line 1302 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1288 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp7_ != _tmp8_) {
-#line 8352 "ImportPage.c"
+#line 8144 "ImportPage.c"
 			const gchar* _tmp9_ = NULL;
 			glong _tmp10_ = 0L;
 			gchar* _tmp11_ = NULL;
-#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp9_ = str;
-#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = offset;
-#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = string_slice (_tmp9_, (glong) 0, _tmp10_);
-#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = _tmp11_;
-#line 1303 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1289 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8366 "ImportPage.c"
+#line 8158 "ImportPage.c"
 		}
 	}
-#line 1306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = g_strdup ("");
-#line 1306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp12_;
-#line 1306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1292 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8375 "ImportPage.c"
+#line 8167 "ImportPage.c"
 }
 
 
@@ -8384,127 +8176,127 @@ gchar* import_page_append_path (const gchar* basepath, const gchar* addition) {
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (basepath != NULL, NULL);
-#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1295 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (addition != NULL, NULL);
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = basepath;
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = g_str_has_suffix (_tmp1_, "/");
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (!_tmp2_) {
-#line 8394 "ImportPage.c"
+#line 8186 "ImportPage.c"
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = addition;
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = g_str_has_prefix (_tmp3_, "/");
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 8403 "ImportPage.c"
+#line 8195 "ImportPage.c"
 	} else {
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = FALSE;
-#line 8407 "ImportPage.c"
+#line 8199 "ImportPage.c"
 	}
-#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 8411 "ImportPage.c"
+#line 8203 "ImportPage.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = basepath;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = g_strconcat (_tmp5_, "/", NULL);
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp6_;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = addition;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = g_strconcat (_tmp7_, _tmp8_, NULL);
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp9_;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp7_);
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp10_;
-#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1297 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8436 "ImportPage.c"
+#line 8228 "ImportPage.c"
 	} else {
 		gboolean _tmp11_ = FALSE;
 		const gchar* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
-#line 1312 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = basepath;
-#line 1312 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = g_str_has_suffix (_tmp12_, "/");
-#line 1312 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp13_) {
-#line 8447 "ImportPage.c"
+#line 8239 "ImportPage.c"
 			const gchar* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
-#line 1312 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = addition;
-#line 1312 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = g_str_has_prefix (_tmp14_, "/");
-#line 1312 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = _tmp15_;
-#line 8456 "ImportPage.c"
+#line 8248 "ImportPage.c"
 		} else {
-#line 1312 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = FALSE;
-#line 8460 "ImportPage.c"
+#line 8252 "ImportPage.c"
 		}
-#line 1312 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1298 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp11_) {
-#line 8464 "ImportPage.c"
+#line 8256 "ImportPage.c"
 			const gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
 			const gchar* _tmp19_ = NULL;
 			gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
-#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp16_ = basepath;
-#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = import_page_chomp_ch (_tmp16_, '/');
-#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp18_ = _tmp17_;
-#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp19_ = addition;
-#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL);
-#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp21_ = _tmp20_;
-#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp18_);
-#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = _tmp21_;
-#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8489 "ImportPage.c"
+#line 8281 "ImportPage.c"
 		} else {
 			const gchar* _tmp22_ = NULL;
 			const gchar* _tmp23_ = NULL;
 			gchar* _tmp24_ = NULL;
-#line 1315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp22_ = basepath;
-#line 1315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp23_ = addition;
-#line 1315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL);
-#line 1315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			result = _tmp24_;
-#line 1315 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1301 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 8504 "ImportPage.c"
+#line 8296 "ImportPage.c"
 		}
 	}
 }
@@ -8530,80 +8322,80 @@ gchar* import_page_get_fs_basedir (Camera* camera, gint fsid) {
 	CameraStorageInformation* _tmp11_ = NULL;
 	CameraStorageInfoFields _tmp12_ = 0;
 	gchar* _tmp15_ = NULL;
-#line 1320 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1306 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1307 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	sifs = NULL;
-#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1308 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	count = 0;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = camera;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_page_null_context;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_->context;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = gp_camera_get_storageinfo (_tmp0_, &sifs, &_tmp3_, _tmp2_);
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	count = _tmp3_;
-#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1309 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp4_;
-#line 1324 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = res;
-#line 1324 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1310 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ != GP_OK) {
-#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = NULL;
-#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1311 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8556 "ImportPage.c"
+#line 8348 "ImportPage.c"
 	}
-#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = fsid;
-#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = count;
-#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1313 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ >= _tmp7_) {
-#line 1328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = NULL;
-#line 1328 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1314 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8568 "ImportPage.c"
+#line 8360 "ImportPage.c"
 	}
-#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1316 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = sifs;
-#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1316 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = fsid;
-#line 1330 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1316 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	ifs = _tmp8_ + _tmp9_;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = ifs;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = (*_tmp11_).fields;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((_tmp12_ & GP_STORAGEINFO_BASE) != 0) {
-#line 8582 "ImportPage.c"
+#line 8374 "ImportPage.c"
 		CameraStorageInformation* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = ifs;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = (*_tmp13_).basedir;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp14_;
-#line 8591 "ImportPage.c"
+#line 8383 "ImportPage.c"
 	} else {
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = "/";
-#line 8595 "ImportPage.c"
+#line 8387 "ImportPage.c"
 	}
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = g_strdup (_tmp10_);
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp15_;
-#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8603 "ImportPage.c"
+#line 8395 "ImportPage.c"
 }
 
 
@@ -8620,74 +8412,74 @@ gchar* import_page_get_fulldir (Camera* camera, const gchar* camera_name, gint f
 	const gchar* _tmp11_ = NULL;
 	const gchar* _tmp12_ = NULL;
 	gchar* _tmp13_ = NULL;
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (camera_name != NULL, NULL);
-#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = folder;
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = strlen (_tmp0_);
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1322 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_ > GP_MAX_BASEDIR_LENGTH) {
-#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = NULL;
-#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1323 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8638 "ImportPage.c"
+#line 8430 "ImportPage.c"
 	}
-#line 1339 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = camera;
-#line 1339 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = fsid;
-#line 1339 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = import_page_get_fs_basedir (_tmp3_, _tmp4_);
-#line 1339 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1325 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	basedir = _tmp5_;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp6_ = basedir;
-#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1326 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp6_ == NULL) {
-#line 8652 "ImportPage.c"
+#line 8444 "ImportPage.c"
 		const gchar* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		const gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = camera_name;
-#line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = fsid;
-#line 1341 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_debug ("ImportPage.vala:1341: Unable to find base directory for %s fsid %d", _tmp7_, _tmp8_);
-#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1327 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_debug ("ImportPage.vala:1327: Unable to find base directory for %s fsid %d", _tmp7_, _tmp8_);
+#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = folder;
-#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = g_strdup (_tmp9_);
-#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = _tmp10_;
-#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (basedir);
-#line 1343 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1329 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8673 "ImportPage.c"
+#line 8465 "ImportPage.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = basedir;
-#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = folder;
-#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = import_page_append_path (_tmp11_, _tmp12_);
-#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp13_;
-#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (basedir);
-#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1332 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 8687 "ImportPage.c"
+#line 8479 "ImportPage.c"
 }
 
 
@@ -8723,137 +8515,137 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 	int _tmp120_ = 0;
 	int _tmp121_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (IS_IMPORT_PAGE (self), FALSE);
-#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (dir != NULL, FALSE);
-#line 1349 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_val_if_fail (GEE_IS_ARRAY_LIST (import_list), FALSE);
-#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = self->priv->camera_name;
-#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = fsid;
-#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = dir;
-#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = import_page_get_fulldir (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 1350 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1336 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	fulldir = _tmp4_;
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = fulldir;
-#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ == NULL) {
-#line 8745 "ImportPage.c"
+#line 8537 "ImportPage.c"
 		const gchar* _tmp6_ = NULL;
-#line 1352 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = dir;
-#line 1352 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1352: Skipping enumerating %s: invalid folder name", _tmp6_);
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1338 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1338: Skipping enumerating %s: invalid folder name", _tmp6_);
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = TRUE;
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1354 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8757 "ImportPage.c"
+#line 8549 "ImportPage.c"
 	}
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = gp_list_new (&_tmp7_);
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (files);
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	files = _tmp7_;
-#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp8_;
-#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = self->priv->refresh_result;
-#line 1359 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1345 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp9_ != GP_OK) {
-#line 8771 "ImportPage.c"
+#line 8563 "ImportPage.c"
 		int _tmp10_ = 0;
 		gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = self->priv->refresh_result;
-#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = gp_result_to_full_string (_tmp10_);
-#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = _tmp11_;
-#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1360: Unable to create file list: %s", _tmp12_);
-#line 1360 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1346: Unable to create file list: %s", _tmp12_);
+#line 1346 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp12_);
-#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (files);
-#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1362 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1348 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8793 "ImportPage.c"
+#line 8585 "ImportPage.c"
 	}
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = self->priv->camera;
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = fulldir;
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp15_ = files;
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp16_ = import_page_spin_idle_context;
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp18_ = gp_camera_folder_list_files (_tmp13_, _tmp14_, _tmp15_, _tmp17_);
-#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp18_;
-#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp19_ = self->priv->refresh_result;
-#line 1366 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp19_ != GP_OK) {
-#line 8813 "ImportPage.c"
+#line 8605 "ImportPage.c"
 		const gchar* _tmp20_ = NULL;
 		int _tmp21_ = 0;
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
-#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = fulldir;
-#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp21_ = self->priv->refresh_result;
-#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = gp_result_to_full_string (_tmp21_);
-#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp23_ = _tmp22_;
-#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1367: Unable to list files in %s: %s", _tmp20_, _tmp23_);
-#line 1367 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1353: Unable to list files in %s: %s", _tmp20_, _tmp23_);
+#line 1353 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp23_);
-#line 1370 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->refresh_result = GP_OK;
-#line 1372 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = TRUE;
-#line 1372 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (files);
-#line 1372 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1372 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 8840 "ImportPage.c"
+#line 8632 "ImportPage.c"
 	}
 	{
 		gint ctr = 0;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ctr = 0;
-#line 8846 "ImportPage.c"
+#line 8638 "ImportPage.c"
 		{
 			gboolean _tmp24_ = FALSE;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp24_ = TRUE;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 8853 "ImportPage.c"
+#line 8645 "ImportPage.c"
 				gint _tmp26_ = 0;
 				CameraList* _tmp27_ = NULL;
 				gint _tmp28_ = 0;
@@ -8864,79 +8656,79 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				int _tmp32_ = 0;
 				gchar* _tmp33_ = NULL;
 				int _tmp34_ = 0;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp24_) {
-#line 8866 "ImportPage.c"
+#line 8658 "ImportPage.c"
 					gint _tmp25_ = 0;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp25_ = ctr;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					ctr = _tmp25_ + 1;
-#line 8872 "ImportPage.c"
+#line 8664 "ImportPage.c"
 				}
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = FALSE;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp26_ = ctr;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp27_ = files;
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp28_ = gp_list_count (_tmp27_);
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!(_tmp26_ < _tmp28_)) {
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 8886 "ImportPage.c"
+#line 8678 "ImportPage.c"
 				}
-#line 1377 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = files;
-#line 1377 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp30_ = ctr;
-#line 1377 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp32_ = gp_list_get_name (_tmp29_, _tmp30_, &_tmp31_);
-#line 1377 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 1377 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp33_ = g_strdup (_tmp31_);
-#line 1377 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				filename = _tmp33_;
-#line 1377 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1363 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				self->priv->refresh_result = _tmp32_;
-#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp34_ = self->priv->refresh_result;
-#line 1378 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1364 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp34_ != GP_OK) {
-#line 8906 "ImportPage.c"
+#line 8698 "ImportPage.c"
 					gint _tmp35_ = 0;
 					const gchar* _tmp36_ = NULL;
 					int _tmp37_ = 0;
 					gchar* _tmp38_ = NULL;
 					gchar* _tmp39_ = NULL;
-#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = ctr;
-#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp36_ = fulldir;
-#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp37_ = self->priv->refresh_result;
-#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp38_ = gp_result_to_full_string (_tmp37_);
-#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp39_ = _tmp38_;
-#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1379: Unable to get the name of file %d in %s: %s", _tmp35_, _tmp36_, _tmp39_);
-#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1365: Unable to get the name of file %d in %s: %s", _tmp35_, _tmp36_, _tmp39_);
+#line 1365 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp39_);
-#line 1382 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
-#line 1382 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1382 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1382 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1382 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1368 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 8936 "ImportPage.c"
+#line 8728 "ImportPage.c"
 				}
 				{
 					CameraFileInfo info = {0};
@@ -8954,91 +8746,91 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					const gchar* _tmp58_ = NULL;
 					gboolean _tmp59_ = FALSE;
 					GtkProgressBar* _tmp102_ = NULL;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp41_ = import_page_spin_idle_context;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp43_ = self->priv->camera;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp44_ = fulldir;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp45_ = filename;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp47_ = gp_get_info (_tmp42_, _tmp43_, _tmp44_, _tmp45_, &_tmp46_, &_inner_error_);
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					 (info);
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					info = _tmp46_;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp40_ = _tmp47_;
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
-#line 8976 "ImportPage.c"
-						goto __catch65_g_error;
+#line 8768 "ImportPage.c"
+						goto __catch64_g_error;
 					}
-#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp40_) {
-#line 8981 "ImportPage.c"
+#line 8773 "ImportPage.c"
 						const gchar* _tmp48_ = NULL;
 						const gchar* _tmp49_ = NULL;
-#line 1388 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp48_ = fulldir;
-#line 1388 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp49_ = filename;
-#line 1388 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						g_warning ("ImportPage.vala:1388: Skipping import of %s/%s: name too long", _tmp48_, _tmp49_);
-#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						g_warning ("ImportPage.vala:1374: Skipping import of %s/%s: name too long", _tmp48_, _tmp49_);
+#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
-#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (filename);
-#line 1390 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1376 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						continue;
-#line 8996 "ImportPage.c"
+#line 8788 "ImportPage.c"
 					}
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp50_ = info;
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp51_ = _tmp50_.file;
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp52_ = _tmp51_.fields;
-#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1379 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if ((_tmp52_ & GP_FILE_INFO_TYPE) == 0) {
-#line 9006 "ImportPage.c"
+#line 8798 "ImportPage.c"
 						const gchar* _tmp53_ = NULL;
 						const gchar* _tmp54_ = NULL;
 						CameraFileInfo _tmp55_ = {0};
 						CameraFileInfoFile _tmp56_ = {0};
 						CameraFileInfoFields _tmp57_ = 0;
-#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp53_ = fulldir;
-#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp54_ = filename;
-#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp55_ = info;
-#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp56_ = _tmp55_.file;
-#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp57_ = _tmp56_.fields;
-#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						g_message ("ImportPage.vala:1394: Skipping %s/%s: No file (file=%02Xh)", _tmp53_, _tmp54_, (guint) _tmp57_);
-#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1380 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						g_message ("ImportPage.vala:1380: Skipping %s/%s: No file (file=%02Xh)", _tmp53_, _tmp54_, (guint) _tmp57_);
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
-#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (filename);
-#line 1397 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1383 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						continue;
-#line 9030 "ImportPage.c"
+#line 8822 "ImportPage.c"
 					}
-#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp58_ = filename;
-#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp59_ = video_reader_is_supported_video_filename (_tmp58_);
-#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp59_) {
-#line 9038 "ImportPage.c"
+#line 8830 "ImportPage.c"
 						VideoImportSource* video_source = NULL;
 						const gchar* _tmp60_ = NULL;
 						Camera* _tmp61_ = NULL;
@@ -9054,41 +8846,41 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 						VideoImportSource* _tmp71_ = NULL;
 						GeeArrayList* _tmp72_ = NULL;
 						VideoImportSource* _tmp73_ = NULL;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp60_ = self->priv->camera_name;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp61_ = self->priv->camera;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp62_ = fsid;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp63_ = dir;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp64_ = filename;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp65_ = info;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp66_ = _tmp65_.file;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp67_ = _tmp66_.size;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp68_ = info;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp69_ = _tmp68_.file;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp70_ = _tmp69_.mtime;
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp71_ = video_import_source_new (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, _tmp67_, _tmp70_);
-#line 1401 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						video_source = _tmp71_;
-#line 1403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp72_ = import_list;
-#line 1403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp73_ = video_source;
-#line 1403 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1389 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1400 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1386 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (video_source);
-#line 9088 "ImportPage.c"
+#line 8880 "ImportPage.c"
 					} else {
 						PhotoFileFormat file_format = 0;
 						CameraFileInfo _tmp74_ = {0};
@@ -9111,110 +8903,110 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 						PhotoFileFormat _tmp99_ = 0;
 						PhotoImportSource* _tmp100_ = NULL;
 						PhotoImportSource* _tmp101_ = NULL;
-#line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp74_ = info;
-#line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp75_ = _tmp74_.file;
-#line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp76_ = _tmp75_.type;
-#line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp77_ = photo_file_format_from_gphoto_type (_tmp76_);
-#line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1392 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						file_format = _tmp77_;
-#line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp78_ = file_format;
-#line 1407 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (_tmp78_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 9125 "ImportPage.c"
+#line 8917 "ImportPage.c"
 							const gchar* _tmp79_ = NULL;
 							PhotoFileFormat _tmp80_ = 0;
 							PhotoFileFormat _tmp81_ = 0;
-#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp79_ = filename;
-#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp80_ = photo_file_format_get_by_basename_extension (_tmp79_);
-#line 1408 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							file_format = _tmp80_;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp81_ = file_format;
-#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							if (_tmp81_ == PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 9139 "ImportPage.c"
+#line 8931 "ImportPage.c"
 								const gchar* _tmp82_ = NULL;
 								const gchar* _tmp83_ = NULL;
 								CameraFileInfo _tmp84_ = {0};
 								CameraFileInfoFile _tmp85_ = {0};
 								const gchar* _tmp86_ = NULL;
-#line 1410 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_tmp82_ = fulldir;
-#line 1410 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_tmp83_ = filename;
-#line 1410 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_tmp84_ = info;
-#line 1410 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_tmp85_ = _tmp84_.file;
-#line 1410 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_tmp86_ = _tmp85_.type;
-#line 1410 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-								g_message ("ImportPage.vala:1410: Skipping %s/%s: Not a supported file extension (" \
+#line 1396 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+								g_message ("ImportPage.vala:1396: Skipping %s/%s: Not a supported file extension (" \
 "%s)", _tmp82_, _tmp83_, _tmp86_);
-#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								 (info);
-#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								_g_free0 (filename);
-#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1399 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 								continue;
-#line 9163 "ImportPage.c"
+#line 8955 "ImportPage.c"
 							}
 						}
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp87_ = import_list;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp88_ = self->priv->camera_name;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp89_ = self->priv->camera;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp90_ = fsid;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp91_ = dir;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp92_ = filename;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp93_ = info;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp94_ = _tmp93_.file;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp95_ = _tmp94_.size;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp96_ = info;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp97_ = _tmp96_.file;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp98_ = _tmp97_.mtime;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp99_ = file_format;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp100_ = photo_import_source_new (_tmp88_, _tmp89_, _tmp90_, _tmp91_, _tmp92_, _tmp95_, _tmp98_, _tmp99_);
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp101_ = _tmp100_;
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1416 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1402 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp101_);
-#line 9200 "ImportPage.c"
+#line 8992 "ImportPage.c"
 					}
-#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp102_ = self->priv->progress_bar;
-#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1406 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					gtk_progress_bar_pulse (_tmp102_);
-#line 1423 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					spin_event_loop ();
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					 (info);
-#line 9210 "ImportPage.c"
+#line 9002 "ImportPage.c"
 				}
-				goto __finally65;
-				__catch65_g_error:
+				goto __finally64;
+				__catch64_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp103_ = NULL;
@@ -9223,164 +9015,164 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					GError* _tmp106_ = NULL;
 					const gchar* _tmp107_ = NULL;
 					gchar* _tmp108_ = NULL;
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					err = _inner_error_;
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_inner_error_ = NULL;
-#line 1425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp103_ = fulldir;
-#line 1425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp104_ = err;
-#line 1425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp105_ = _tmp104_->message;
-#line 1425 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1425: Error while enumerating files in %s: %s", _tmp103_, _tmp105_);
-#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1411 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1411: Error while enumerating files in %s: %s", _tmp103_, _tmp105_);
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp106_ = err;
-#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp107_ = _tmp106_->message;
-#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp108_ = g_strdup (_tmp107_);
-#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (self->priv->refresh_error);
-#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					self->priv->refresh_error = _tmp108_;
-#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
-#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1415 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9256 "ImportPage.c"
+#line 9048 "ImportPage.c"
 				}
-				__finally65:
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				__finally64:
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_clear_error (&_inner_error_);
-#line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1371 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return FALSE;
-#line 9273 "ImportPage.c"
+#line 9065 "ImportPage.c"
 				}
-#line 1375 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1361 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 9277 "ImportPage.c"
+#line 9069 "ImportPage.c"
 			}
 		}
 	}
-#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp110_ = gp_list_new (&_tmp109_);
-#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
-#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	folders = _tmp109_;
-#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1420 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp110_;
-#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp111_ = self->priv->refresh_result;
-#line 1435 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1421 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp111_ != GP_OK) {
-#line 9293 "ImportPage.c"
+#line 9085 "ImportPage.c"
 		int _tmp112_ = 0;
 		gchar* _tmp113_ = NULL;
 		gchar* _tmp114_ = NULL;
-#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp112_ = self->priv->refresh_result;
-#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp113_ = gp_result_to_full_string (_tmp112_);
-#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp114_ = _tmp113_;
-#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1436: Unable to create folder list: %s", _tmp114_);
-#line 1436 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1422: Unable to create folder list: %s", _tmp114_);
+#line 1422 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp114_);
-#line 1438 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = FALSE;
-#line 1438 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (folders);
-#line 1438 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (files);
-#line 1438 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1438 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 9317 "ImportPage.c"
+#line 9109 "ImportPage.c"
 	}
-#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp115_ = self->priv->camera;
-#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp116_ = fulldir;
-#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp117_ = folders;
-#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp118_ = import_page_spin_idle_context;
-#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp119_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp120_ = gp_camera_folder_list_folders (_tmp115_, _tmp116_, _tmp117_, _tmp119_);
-#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1427 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->refresh_result = _tmp120_;
-#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp121_ = self->priv->refresh_result;
-#line 1442 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1428 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp121_ != GP_OK) {
-#line 9337 "ImportPage.c"
+#line 9129 "ImportPage.c"
 		const gchar* _tmp122_ = NULL;
 		int _tmp123_ = 0;
 		gchar* _tmp124_ = NULL;
 		gchar* _tmp125_ = NULL;
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp122_ = fulldir;
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp123_ = self->priv->refresh_result;
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp124_ = gp_result_to_full_string (_tmp123_);
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp125_ = _tmp124_;
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_warning ("ImportPage.vala:1443: Unable to list folders in %s: %s", _tmp122_, _tmp125_);
-#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_warning ("ImportPage.vala:1429: Unable to list folders in %s: %s", _tmp122_, _tmp125_);
+#line 1429 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp125_);
-#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1432 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->refresh_result = GP_OK;
-#line 1448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		result = TRUE;
-#line 1448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (folders);
-#line 1448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_gp_list_unref0 (files);
-#line 1448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (fulldir);
-#line 1448 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1434 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 9366 "ImportPage.c"
+#line 9158 "ImportPage.c"
 	}
 	{
 		gint ctr = 0;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		ctr = 0;
-#line 9372 "ImportPage.c"
+#line 9164 "ImportPage.c"
 		{
 			gboolean _tmp126_ = FALSE;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp126_ = TRUE;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 9379 "ImportPage.c"
+#line 9171 "ImportPage.c"
 				gint _tmp128_ = 0;
 				CameraList* _tmp129_ = NULL;
 				gint _tmp130_ = 0;
@@ -9399,151 +9191,151 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 				GeeArrayList* _tmp146_ = NULL;
 				gboolean _tmp147_ = FALSE;
 				gboolean _tmp148_ = FALSE;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp126_) {
-#line 9400 "ImportPage.c"
+#line 9192 "ImportPage.c"
 					gint _tmp127_ = 0;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp127_ = ctr;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					ctr = _tmp127_ + 1;
-#line 9406 "ImportPage.c"
+#line 9198 "ImportPage.c"
 				}
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp126_ = FALSE;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp128_ = ctr;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp129_ = folders;
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp130_ = gp_list_count (_tmp129_);
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!(_tmp128_ < _tmp130_)) {
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 9420 "ImportPage.c"
+#line 9212 "ImportPage.c"
 				}
-#line 1453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp131_ = folders;
-#line 1453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp132_ = ctr;
-#line 1453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp134_ = gp_list_get_name (_tmp131_, _tmp132_, &_tmp133_);
-#line 1453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (subdir);
-#line 1453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp135_ = g_strdup (_tmp133_);
-#line 1453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				subdir = _tmp135_;
-#line 1453 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1439 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				self->priv->refresh_result = _tmp134_;
-#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp136_ = self->priv->refresh_result;
-#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1440 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp136_ != GP_OK) {
-#line 9440 "ImportPage.c"
+#line 9232 "ImportPage.c"
 					gint _tmp137_ = 0;
 					int _tmp138_ = 0;
 					gchar* _tmp139_ = NULL;
 					gchar* _tmp140_ = NULL;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp137_ = ctr;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp138_ = self->priv->refresh_result;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp139_ = gp_result_to_full_string (_tmp138_);
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp140_ = _tmp139_;
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1455: Unable to get name of folder %d: %s", _tmp137_, _tmp140_);
-#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1441: Unable to get name of folder %d: %s", _tmp137_, _tmp140_);
+#line 1441 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp140_);
-#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
-#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (subdir);
-#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (folders);
-#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9469 "ImportPage.c"
+#line 9261 "ImportPage.c"
 				}
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp141_ = fsid;
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp142_ = dir;
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp143_ = subdir;
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp144_ = import_page_append_path (_tmp142_, _tmp143_);
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp145_ = _tmp144_;
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp146_ = import_list;
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp147_ = import_page_enumerate_files (self, _tmp141_, _tmp145_, _tmp146_);
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp148_ = !_tmp147_;
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (_tmp145_);
-#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp148_) {
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					result = FALSE;
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (subdir);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (folders);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_gp_list_unref0 (files);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1447 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return result;
-#line 9503 "ImportPage.c"
+#line 9295 "ImportPage.c"
 				}
-#line 1451 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1437 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (subdir);
-#line 9507 "ImportPage.c"
+#line 9299 "ImportPage.c"
 			}
 		}
 	}
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = TRUE;
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (folders);
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_gp_list_unref0 (files);
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_free0 (fulldir);
-#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1450 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 9521 "ImportPage.c"
+#line 9313 "ImportPage.c"
 }
 
 
 static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* import_list) {
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1454 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_ARRAY_LIST (import_list));
-#line 9530 "ImportPage.c"
+#line 9322 "ImportPage.c"
 	{
 		gint i = 0;
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		i = 0;
-#line 9535 "ImportPage.c"
+#line 9327 "ImportPage.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp0_ = TRUE;
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			while (TRUE) {
-#line 9542 "ImportPage.c"
+#line 9334 "ImportPage.c"
 				gint _tmp2_ = 0;
 				GeeArrayList* _tmp3_ = NULL;
 				gint _tmp4_ = 0;
@@ -9567,162 +9359,162 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 				PhotoImportSource* _tmp29_ = NULL;
 				gboolean _tmp30_ = FALSE;
 				PhotoImportSource* _tmp31_ = NULL;
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp0_) {
-#line 9568 "ImportPage.c"
+#line 9360 "ImportPage.c"
 					gint _tmp1_ = 0;
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp1_ = i;
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					i = _tmp1_ + 1;
-#line 9574 "ImportPage.c"
+#line 9366 "ImportPage.c"
 				}
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp0_ = FALSE;
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp2_ = i;
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp3_ = import_list;
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp5_ = _tmp4_;
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!(_tmp2_ < _tmp5_)) {
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					break;
-#line 9590 "ImportPage.c"
+#line 9382 "ImportPage.c"
 				}
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp6_ = import_list;
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp7_ = i;
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp7_);
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp9_ = (ImportSource*) _tmp8_;
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp9_) : NULL;
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp10_ == NULL) {
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp9_);
-#line 9606 "ImportPage.c"
+#line 9398 "ImportPage.c"
 				}
-#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				current = _tmp10_;
-#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp12_ = i;
-#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp13_ = import_list;
-#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp14_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp15_ = _tmp14_;
-#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if ((_tmp12_ + 1) < _tmp15_) {
-#line 9620 "ImportPage.c"
+#line 9412 "ImportPage.c"
 					GeeArrayList* _tmp16_ = NULL;
 					gint _tmp17_ = 0;
 					gpointer _tmp18_ = NULL;
 					ImportSource* _tmp19_ = NULL;
 					PhotoImportSource* _tmp20_ = NULL;
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp16_ = import_list;
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp17_ = i;
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp18_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp17_ + 1);
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp19_ = (ImportSource*) _tmp18_;
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp19_) : NULL;
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp20_ == NULL) {
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp19_);
-#line 9640 "ImportPage.c"
+#line 9432 "ImportPage.c"
 					}
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp11_);
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp11_ = _tmp20_;
-#line 9646 "ImportPage.c"
+#line 9438 "ImportPage.c"
 				} else {
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp11_);
-#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp11_ = NULL;
-#line 9652 "ImportPage.c"
+#line 9444 "ImportPage.c"
 				}
-#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = _g_object_ref0 (_tmp11_);
-#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				next = _tmp21_;
-#line 1473 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp23_ = i;
-#line 1473 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp23_ > 0) {
-#line 9662 "ImportPage.c"
+#line 9454 "ImportPage.c"
 					GeeArrayList* _tmp24_ = NULL;
 					gint _tmp25_ = 0;
 					gpointer _tmp26_ = NULL;
 					ImportSource* _tmp27_ = NULL;
 					PhotoImportSource* _tmp28_ = NULL;
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp24_ = import_list;
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp25_ = i;
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp26_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp25_ - 1);
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp27_ = (ImportSource*) _tmp26_;
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp27_) : NULL;
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp28_ == NULL) {
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_object_unref0 (_tmp27_);
-#line 9682 "ImportPage.c"
+#line 9474 "ImportPage.c"
 					}
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp22_);
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp22_ = _tmp28_;
-#line 9688 "ImportPage.c"
+#line 9480 "ImportPage.c"
 				} else {
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_tmp22_);
-#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp22_ = NULL;
-#line 9694 "ImportPage.c"
+#line 9486 "ImportPage.c"
 				}
-#line 1473 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = _g_object_ref0 (_tmp22_);
-#line 1473 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1459 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				prev = _tmp29_;
-#line 1475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp31_ = current;
-#line 1475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp31_ != NULL) {
-#line 9704 "ImportPage.c"
+#line 9496 "ImportPage.c"
 					PhotoImportSource* _tmp32_ = NULL;
 					PhotoFileFormat _tmp33_ = 0;
-#line 1475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp32_ = current;
-#line 1475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp33_ = photo_import_source_get_file_format (_tmp32_);
-#line 1475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = _tmp33_ == PHOTO_FILE_FORMAT_RAW;
-#line 9713 "ImportPage.c"
+#line 9505 "ImportPage.c"
 				} else {
-#line 1475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp30_ = FALSE;
-#line 9717 "ImportPage.c"
+#line 9509 "ImportPage.c"
 				}
-#line 1475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp30_) {
-#line 9721 "ImportPage.c"
+#line 9513 "ImportPage.c"
 					gchar* current_name = NULL;
 					gchar* ext = NULL;
 					PhotoImportSource* _tmp34_ = NULL;
@@ -9736,48 +9528,48 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 					gboolean _tmp52_ = FALSE;
 					PhotoImportSource* _tmp53_ = NULL;
 					PhotoImportSource* _tmp65_ = NULL;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp34_ = current;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp35_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp36_ = _tmp35_;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					disassemble_filename (_tmp36_, &_tmp37_, &_tmp38_);
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (current_name);
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					current_name = _tmp37_;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (ext);
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					ext = _tmp38_;
-#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1464 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp36_);
-#line 1481 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1467 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					associated = NULL;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp40_ = next;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp40_ != NULL) {
-#line 9759 "ImportPage.c"
+#line 9551 "ImportPage.c"
 						PhotoImportSource* _tmp41_ = NULL;
 						PhotoFileFormat _tmp42_ = 0;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp41_ = next;
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp42_ = photo_import_source_get_file_format (_tmp41_);
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp39_ = _tmp42_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9768 "ImportPage.c"
+#line 9560 "ImportPage.c"
 					} else {
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp39_ = FALSE;
-#line 9772 "ImportPage.c"
+#line 9564 "ImportPage.c"
 					}
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp39_) {
-#line 9776 "ImportPage.c"
+#line 9568 "ImportPage.c"
 						gchar* next_name = NULL;
 						PhotoImportSource* _tmp43_ = NULL;
 						gchar* _tmp44_ = NULL;
@@ -9786,69 +9578,69 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						gchar* _tmp47_ = NULL;
 						const gchar* _tmp48_ = NULL;
 						const gchar* _tmp49_ = NULL;
-#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp43_ = next;
-#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp44_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp45_ = _tmp44_;
-#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						disassemble_filename (_tmp45_, &_tmp46_, &_tmp47_);
-#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (next_name);
-#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						next_name = _tmp46_;
-#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (ext);
-#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						ext = _tmp47_;
-#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1470 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (_tmp45_);
-#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp48_ = next_name;
-#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp49_ = current_name;
-#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1471 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (g_strcmp0 (_tmp48_, _tmp49_) == 0) {
-#line 9809 "ImportPage.c"
+#line 9601 "ImportPage.c"
 							PhotoImportSource* _tmp50_ = NULL;
 							PhotoImportSource* _tmp51_ = NULL;
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp50_ = next;
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp51_ = _g_object_ref0 (_tmp50_);
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (associated);
-#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							associated = _tmp51_;
-#line 9820 "ImportPage.c"
+#line 9612 "ImportPage.c"
 						}
-#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (next_name);
-#line 9824 "ImportPage.c"
+#line 9616 "ImportPage.c"
 					}
-#line 1488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp53_ = prev;
-#line 1488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp53_ != NULL) {
-#line 9830 "ImportPage.c"
+#line 9622 "ImportPage.c"
 						PhotoImportSource* _tmp54_ = NULL;
 						PhotoFileFormat _tmp55_ = 0;
-#line 1488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp54_ = prev;
-#line 1488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp55_ = photo_import_source_get_file_format (_tmp54_);
-#line 1488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp52_ = _tmp55_ == PHOTO_FILE_FORMAT_JFIF;
-#line 9839 "ImportPage.c"
+#line 9631 "ImportPage.c"
 					} else {
-#line 1488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp52_ = FALSE;
-#line 9843 "ImportPage.c"
+#line 9635 "ImportPage.c"
 					}
-#line 1488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp52_) {
-#line 9847 "ImportPage.c"
+#line 9639 "ImportPage.c"
 						gchar* prev_name = NULL;
 						PhotoImportSource* _tmp56_ = NULL;
 						gchar* _tmp57_ = NULL;
@@ -9857,52 +9649,52 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						gchar* _tmp60_ = NULL;
 						const gchar* _tmp61_ = NULL;
 						const gchar* _tmp62_ = NULL;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp56_ = prev;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp57_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp58_ = _tmp57_;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						disassemble_filename (_tmp58_, &_tmp59_, &_tmp60_);
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (prev_name);
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						prev_name = _tmp59_;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (ext);
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						ext = _tmp60_;
-#line 1490 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1476 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (_tmp58_);
-#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp61_ = prev_name;
-#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp62_ = current_name;
-#line 1491 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1477 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (g_strcmp0 (_tmp61_, _tmp62_) == 0) {
-#line 9880 "ImportPage.c"
+#line 9672 "ImportPage.c"
 							PhotoImportSource* _tmp63_ = NULL;
 							PhotoImportSource* _tmp64_ = NULL;
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp63_ = prev;
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp64_ = _g_object_ref0 (_tmp63_);
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_g_object_unref0 (associated);
-#line 1492 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							associated = _tmp64_;
-#line 9891 "ImportPage.c"
+#line 9683 "ImportPage.c"
 						}
-#line 1488 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1474 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (prev_name);
-#line 9895 "ImportPage.c"
+#line 9687 "ImportPage.c"
 					}
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp65_ = associated;
-#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp65_ != NULL) {
-#line 9901 "ImportPage.c"
+#line 9693 "ImportPage.c"
 						PhotoImportSource* _tmp66_ = NULL;
 						gchar* _tmp67_ = NULL;
 						gchar* _tmp68_ = NULL;
@@ -9914,68 +9706,68 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 						GeeArrayList* _tmp74_ = NULL;
 						PhotoImportSource* _tmp75_ = NULL;
 						gboolean _tmp76_ = FALSE;
-#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp66_ = current;
-#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp67_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp68_ = _tmp67_;
-#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp69_ = associated;
-#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp70_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp71_ = _tmp70_;
-#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-						g_debug ("ImportPage.vala:1497: Found RAW+JPEG pair: %s and %s", _tmp68_, _tmp71_);
-#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+						g_debug ("ImportPage.vala:1483: Found RAW+JPEG pair: %s and %s", _tmp68_, _tmp71_);
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (_tmp71_);
-#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_g_free0 (_tmp68_);
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp72_ = current;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp73_ = associated;
-#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						photo_import_source_set_associated (_tmp72_, _tmp73_);
-#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp74_ = import_list;
-#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp75_ = associated;
-#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						_tmp76_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp76_) {
-#line 9945 "ImportPage.c"
+#line 9737 "ImportPage.c"
 							PhotoImportSource* _tmp77_ = NULL;
-#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-							g_debug ("ImportPage.vala:1500: Unable to associate files");
-#line 1501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1486 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+							g_debug ("ImportPage.vala:1486: Unable to associate files");
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp77_ = current;
-#line 1501 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							photo_import_source_set_associated (_tmp77_, NULL);
-#line 9953 "ImportPage.c"
+#line 9745 "ImportPage.c"
 						}
 					}
-#line 1475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (associated);
-#line 1475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (ext);
-#line 1475 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (current_name);
-#line 9962 "ImportPage.c"
+#line 9754 "ImportPage.c"
 				}
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (prev);
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp22_);
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (next);
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 1469 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (current);
-#line 9974 "ImportPage.c"
+#line 9766 "ImportPage.c"
 			}
 		}
 	}
@@ -9985,13 +9777,13 @@ static void import_page_auto_match_raw_jpeg (ImportPage* self, GeeArrayList* imp
 static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* import_list) {
 	gint loaded_photos = 0;
 	GError * _inner_error_ = NULL;
-#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1494 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_LIST (import_list));
-#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1495 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	loaded_photos = 0;
-#line 9990 "ImportPage.c"
+#line 9782 "ImportPage.c"
 	{
 		GeeList* _import_source_list = NULL;
 		GeeList* _tmp0_ = NULL;
@@ -10001,25 +9793,25 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		gint _import_source_index = 0;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = import_list;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_source_list = _tmp1_;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = _import_source_list;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = _tmp3_;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_source_size = _tmp4_;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_source_index = -1;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 10018 "ImportPage.c"
+#line 9810 "ImportPage.c"
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
 			gint _tmp7_ = 0;
@@ -10070,143 +9862,143 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 			GeeList* _tmp130_ = NULL;
 			gint _tmp131_ = 0;
 			gint _tmp132_ = 0;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp5_ = _import_source_index;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_import_source_index = _tmp5_ + 1;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = _import_source_index;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = _import_source_size;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!(_tmp6_ < _tmp7_)) {
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 10081 "ImportPage.c"
+#line 9873 "ImportPage.c"
 			}
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp8_ = _import_source_list;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp9_ = _import_source_index;
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp10_ = gee_list_get (_tmp8_, _tmp9_);
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_source = (ImportSource*) _tmp10_;
-#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp11_ = import_source;
-#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp12_ = import_source_get_filename (_tmp11_);
-#line 1511 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			filename = _tmp12_;
-#line 1512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp13_ = import_source;
-#line 1512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp14_ = import_source_get_fulldir (_tmp13_);
-#line 1512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			fulldir = _tmp14_;
-#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp15_ = fulldir;
-#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp15_ == NULL) {
-#line 10107 "ImportPage.c"
+#line 9899 "ImportPage.c"
 				ImportSource* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
-#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp16_ = import_source;
-#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp17_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp18_ = _tmp17_;
-#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				g_warning ("ImportPage.vala:1514: Skipping loading preview of %s: invalid folder n" \
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				g_warning ("ImportPage.vala:1500: Skipping loading preview of %s: invalid folder n" \
 "ame", _tmp18_);
-#line 1514 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (_tmp18_);
-#line 1516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (fulldir);
-#line 1516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 1516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (import_source);
-#line 1516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1502 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				continue;
-#line 10129 "ImportPage.c"
+#line 9921 "ImportPage.c"
 			}
-#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1506 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			associated = NULL;
-#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp20_ = import_source;
-#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10137 "ImportPage.c"
+#line 9929 "ImportPage.c"
 				ImportSource* _tmp21_ = NULL;
 				PhotoImportSource* _tmp22_ = NULL;
 				PhotoImportSource* _tmp23_ = NULL;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp21_ = import_source;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp22_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp23_ = _tmp22_;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = _tmp23_ != NULL;
-#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp23_);
-#line 10151 "ImportPage.c"
+#line 9943 "ImportPage.c"
 			} else {
-#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp19_ = FALSE;
-#line 10155 "ImportPage.c"
+#line 9947 "ImportPage.c"
 			}
-#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1507 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp19_) {
-#line 10159 "ImportPage.c"
+#line 9951 "ImportPage.c"
 				ImportSource* _tmp24_ = NULL;
 				PhotoImportSource* _tmp25_ = NULL;
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp24_ = import_source;
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp25_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (associated);
-#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				associated = _tmp25_;
-#line 10170 "ImportPage.c"
+#line 9962 "ImportPage.c"
 			}
-#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp26_ = self->priv->progress_bar;
-#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			gtk_progress_bar_set_ellipsize (_tmp26_, PANGO_ELLIPSIZE_MIDDLE);
-#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp27_ = self->priv->progress_bar;
-#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp28_ = _ ("Fetching preview for %s");
-#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp29_ = import_source;
-#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
-#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp31_ = _tmp30_;
-#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp32_ = g_strdup_printf (_tmp28_, _tmp31_);
-#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp33_ = _tmp32_;
-#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			gtk_progress_bar_set_text (_tmp27_, _tmp33_);
-#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp33_);
-#line 1527 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (_tmp31_);
-#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			metadata = NULL;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp34_ = filename;
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp35_ = video_reader_is_supported_video_filename (_tmp34_);
-#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1521 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!_tmp35_) {
-#line 10204 "ImportPage.c"
+#line 9996 "ImportPage.c"
 				{
 					PhotoMetadata* _tmp36_ = NULL;
 					GPSpinIdleWrapper* _tmp37_ = NULL;
@@ -10216,94 +10008,94 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					const gchar* _tmp41_ = NULL;
 					PhotoMetadata* _tmp42_ = NULL;
 					PhotoMetadata* _tmp43_ = NULL;
-#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp37_ = import_page_spin_idle_context;
-#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp39_ = self->priv->camera;
-#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp40_ = fulldir;
-#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp41_ = filename;
-#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp42_ = gp_load_metadata (_tmp38_, _tmp39_, _tmp40_, _tmp41_, &_inner_error_);
-#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp36_ = _tmp42_;
-#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10230 "ImportPage.c"
-						goto __catch66_g_error;
+#line 10022 "ImportPage.c"
+						goto __catch65_g_error;
 					}
-#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp43_ = _tmp36_;
-#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp36_ = NULL;
-#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (metadata);
-#line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					metadata = _tmp43_;
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (_tmp36_);
-#line 10243 "ImportPage.c"
+#line 10035 "ImportPage.c"
 				}
-				goto __finally66;
-				__catch66_g_error:
+				goto __finally65;
+				__catch65_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp44_ = NULL;
 					const gchar* _tmp45_ = NULL;
 					GError* _tmp46_ = NULL;
 					const gchar* _tmp47_ = NULL;
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					err = _inner_error_;
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_inner_error_ = NULL;
-#line 1540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp44_ = fulldir;
-#line 1540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp45_ = filename;
-#line 1540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp46_ = err;
-#line 1540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp47_ = _tmp46_->message;
-#line 1540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1540: Unable to fetch metadata for %s/%s: %s", _tmp44_, _tmp45_, _tmp47_);
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1526 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1526: Unable to fetch metadata for %s/%s: %s", _tmp44_, _tmp45_, _tmp47_);
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 10269 "ImportPage.c"
+#line 10061 "ImportPage.c"
 				}
-				__finally66:
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				__finally65:
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (metadata);
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (associated);
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (import_source);
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_import_source_list);
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_clear_error (&_inner_error_);
-#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1522 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return;
-#line 10292 "ImportPage.c"
+#line 10084 "ImportPage.c"
 				}
 			}
-#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			exif_only_md5 = NULL;
-#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp48_ = metadata;
-#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp48_ != NULL) {
-#line 10301 "ImportPage.c"
+#line 10093 "ImportPage.c"
 				guint8* flattened_sans_thumbnail = NULL;
 				PhotoMetadata* _tmp49_ = NULL;
 				gint _tmp50_ = 0;
@@ -10313,76 +10105,76 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				gboolean _tmp52_ = FALSE;
 				guint8* _tmp53_ = NULL;
 				gint _tmp53__length1 = 0;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp49_ = metadata;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp51_ = photo_metadata_flatten_exif (_tmp49_, FALSE, &_tmp50_);
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				flattened_sans_thumbnail = _tmp51_;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				flattened_sans_thumbnail_length1 = _tmp50_;
-#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1;
-#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp53_ = flattened_sans_thumbnail;
-#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp53__length1 = flattened_sans_thumbnail_length1;
-#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp53_ != NULL) {
-#line 10327 "ImportPage.c"
+#line 10119 "ImportPage.c"
 					guint8* _tmp54_ = NULL;
 					gint _tmp54__length1 = 0;
-#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp54_ = flattened_sans_thumbnail;
-#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp54__length1 = flattened_sans_thumbnail_length1;
-#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp52_ = _tmp54__length1 > 0;
-#line 10336 "ImportPage.c"
+#line 10128 "ImportPage.c"
 				} else {
-#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp52_ = FALSE;
-#line 10340 "ImportPage.c"
+#line 10132 "ImportPage.c"
 				}
-#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp52_) {
-#line 10344 "ImportPage.c"
+#line 10136 "ImportPage.c"
 					guint8* _tmp55_ = NULL;
 					gint _tmp55__length1 = 0;
 					guint8* _tmp56_ = NULL;
 					gint _tmp56__length1 = 0;
 					gchar* _tmp57_ = NULL;
-#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp55_ = flattened_sans_thumbnail;
-#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp55__length1 = flattened_sans_thumbnail_length1;
-#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp56_ = flattened_sans_thumbnail;
-#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp56__length1 = flattened_sans_thumbnail_length1;
-#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp57_ = md5_binary (_tmp55_, (gsize) _tmp56__length1);
-#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (exif_only_md5);
-#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					exif_only_md5 = _tmp57_;
-#line 10364 "ImportPage.c"
+#line 10156 "ImportPage.c"
 				}
-#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1533 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL);
-#line 10368 "ImportPage.c"
+#line 10160 "ImportPage.c"
 			}
-#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_raw = NULL;
-#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_raw_length1 = 0;
-#line 1559 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_preview_raw_size_ = preview_raw_length1;
-#line 1560 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1546 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_raw_length = (gsize) 0;
-#line 1561 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview = NULL;
-#line 10380 "ImportPage.c"
+#line 10172 "ImportPage.c"
 			{
 				gchar* preview_fulldir = NULL;
 				const gchar* _tmp58_ = NULL;
@@ -10402,260 +10194,260 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				gsize _tmp75_ = 0UL;
 				GdkPixbuf* _tmp76_ = NULL;
 				GdkPixbuf* _tmp77_ = NULL;
-#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp58_ = fulldir;
-#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp59_ = g_strdup (_tmp58_);
-#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1549 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_fulldir = _tmp59_;
-#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp60_ = filename;
-#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp61_ = g_strdup (_tmp60_);
-#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_filename = _tmp61_;
-#line 1565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp62_ = associated;
-#line 1565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1551 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp62_ != NULL) {
-#line 10416 "ImportPage.c"
+#line 10208 "ImportPage.c"
 					PhotoImportSource* _tmp63_ = NULL;
 					gchar* _tmp64_ = NULL;
 					PhotoImportSource* _tmp65_ = NULL;
 					gchar* _tmp66_ = NULL;
-#line 1566 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp63_ = associated;
-#line 1566 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp64_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1566 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
-#line 1566 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1552 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					preview_fulldir = _tmp64_;
-#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp65_ = associated;
-#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp66_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_filename);
-#line 1567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1553 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					preview_filename = _tmp66_;
-#line 10437 "ImportPage.c"
+#line 10229 "ImportPage.c"
 				}
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp68_ = import_page_spin_idle_context;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp70_ = self->priv->camera;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp71_ = preview_fulldir;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp72_ = preview_filename;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp76_ = gp_load_preview (_tmp69_, _tmp70_, _tmp71_, _tmp72_, &_tmp73_, &_tmp74_, &_tmp75_, &_inner_error_);
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_raw = (g_free (preview_raw), NULL);
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_raw = _tmp73_;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_raw_length1 = _tmp74_;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_preview_raw_size_ = preview_raw_length1;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_raw_length = _tmp75_;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp67_ = _tmp76_;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_filename);
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
-#line 10469 "ImportPage.c"
-					goto __catch67_g_error;
+#line 10261 "ImportPage.c"
+					goto __catch66_g_error;
 				}
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp77_ = _tmp67_;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp67_ = NULL;
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (preview);
-#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview = _tmp77_;
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp67_);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_filename);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_fulldir);
-#line 10486 "ImportPage.c"
+#line 10278 "ImportPage.c"
 			}
-			goto __finally67;
-			__catch67_g_error:
+			goto __finally66;
+			__catch66_g_error:
 			{
 				GError* err = NULL;
 				const gchar* _tmp78_ = NULL;
 				gboolean _tmp79_ = FALSE;
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				err = _inner_error_;
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_inner_error_ = NULL;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp78_ = filename;
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp79_ = video_reader_is_supported_video_filename (_tmp78_);
-#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (!_tmp79_) {
-#line 10504 "ImportPage.c"
+#line 10296 "ImportPage.c"
 					const gchar* _tmp80_ = NULL;
 					const gchar* _tmp81_ = NULL;
 					GError* _tmp82_ = NULL;
 					const gchar* _tmp83_ = NULL;
-#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp80_ = fulldir;
-#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp81_ = filename;
-#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp82_ = err;
-#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp83_ = _tmp82_->message;
-#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1578: Unable to fetch preview for %s/%s: %s", _tmp80_, _tmp81_, _tmp83_);
-#line 10519 "ImportPage.c"
+#line 1564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1564: Unable to fetch preview for %s/%s: %s", _tmp80_, _tmp81_, _tmp83_);
+#line 10311 "ImportPage.c"
 				}
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_error_free0 (err);
-#line 10523 "ImportPage.c"
+#line 10315 "ImportPage.c"
 			}
-			__finally67:
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+			__finally66:
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (preview);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_raw = (g_free (preview_raw), NULL);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (exif_only_md5);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_media_metadata_unref0 (metadata);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (associated);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (fulldir);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (filename);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (import_source);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_import_source_list);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				g_clear_error (&_inner_error_);
-#line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return;
-#line 10552 "ImportPage.c"
+#line 10344 "ImportPage.c"
 			}
-#line 1583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_md5 = NULL;
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp86_ = preview;
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp86_ != NULL) {
-#line 10560 "ImportPage.c"
+#line 10352 "ImportPage.c"
 				guint8* _tmp87_ = NULL;
 				gint _tmp87__length1 = 0;
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp87_ = preview_raw;
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp87__length1 = preview_raw_length1;
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp85_ = _tmp87_ != NULL;
-#line 10569 "ImportPage.c"
+#line 10361 "ImportPage.c"
 			} else {
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp85_ = FALSE;
-#line 10573 "ImportPage.c"
+#line 10365 "ImportPage.c"
 			}
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp85_) {
-#line 10577 "ImportPage.c"
+#line 10369 "ImportPage.c"
 				gsize _tmp88_ = 0UL;
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp88_ = preview_raw_length;
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp84_ = _tmp88_ > ((gsize) 0);
-#line 10583 "ImportPage.c"
+#line 10375 "ImportPage.c"
 			} else {
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp84_ = FALSE;
-#line 10587 "ImportPage.c"
+#line 10379 "ImportPage.c"
 			}
-#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp84_) {
-#line 10591 "ImportPage.c"
+#line 10383 "ImportPage.c"
 				guint8* _tmp89_ = NULL;
 				gint _tmp89__length1 = 0;
 				gsize _tmp90_ = 0UL;
 				gchar* _tmp91_ = NULL;
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp89_ = preview_raw;
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp89__length1 = preview_raw_length1;
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp90_ = preview_raw_length;
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp91_ = md5_binary (_tmp89_, _tmp90_);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (preview_md5);
-#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				preview_md5 = _tmp91_;
-#line 10608 "ImportPage.c"
+#line 10400 "ImportPage.c"
 			}
-#line 1591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp92_ = import_source;
-#line 1591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 10614 "ImportPage.c"
+#line 10406 "ImportPage.c"
 				ImportSource* _tmp93_ = NULL;
 				GdkPixbuf* _tmp94_ = NULL;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp93_ = import_source;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp94_ = preview;
-#line 1592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1578 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				video_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp93_, TYPE_VIDEO_IMPORT_SOURCE) ? ((VideoImportSource*) _tmp93_) : NULL, _tmp94_);
-#line 10623 "ImportPage.c"
+#line 10415 "ImportPage.c"
 			}
-#line 1594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp95_ = import_source;
-#line 1594 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp95_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 10629 "ImportPage.c"
+#line 10421 "ImportPage.c"
 				ImportSource* _tmp96_ = NULL;
 				GdkPixbuf* _tmp97_ = NULL;
 				const gchar* _tmp98_ = NULL;
 				PhotoMetadata* _tmp99_ = NULL;
 				const gchar* _tmp100_ = NULL;
-#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp96_ = import_source;
-#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp97_ = preview;
-#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp98_ = preview_md5;
-#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp99_ = metadata;
-#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp100_ = exif_only_md5;
-#line 1595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				photo_import_source_update (G_TYPE_CHECK_INSTANCE_TYPE (_tmp96_, TYPE_PHOTO_IMPORT_SOURCE) ? ((PhotoImportSource*) _tmp96_) : NULL, _tmp97_, _tmp98_, _tmp99_, _tmp100_);
-#line 10647 "ImportPage.c"
+#line 10439 "ImportPage.c"
 			}
-#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp101_ = associated;
-#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp101_ != NULL) {
-#line 10653 "ImportPage.c"
+#line 10445 "ImportPage.c"
 				{
 					PhotoMetadata* associated_metadata = NULL;
 					GPSpinIdleWrapper* _tmp102_ = NULL;
@@ -10673,55 +10465,55 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					GdkPixbuf* _tmp114_ = NULL;
 					const gchar* _tmp115_ = NULL;
 					PhotoMetadata* _tmp116_ = NULL;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp102_ = import_page_spin_idle_context;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp103_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp104_ = self->priv->camera;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp105_ = associated;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp106_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp107_ = _tmp106_;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp108_ = associated;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp109_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp110_ = _tmp109_;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp111_ = gp_load_metadata (_tmp103_, _tmp104_, _tmp107_, _tmp110_, &_inner_error_);
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp112_ = _tmp111_;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp110_);
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp107_);
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					associated_metadata = _tmp112_;
-#line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10701 "ImportPage.c"
-						goto __catch68_g_error;
+#line 10493 "ImportPage.c"
+						goto __catch67_g_error;
 					}
-#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp113_ = associated;
-#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp114_ = preview;
-#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp115_ = preview_md5;
-#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp116_ = associated_metadata;
-#line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1588 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					photo_import_source_update (_tmp113_, _tmp114_, _tmp115_, _tmp116_, NULL);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (associated_metadata);
-#line 10716 "ImportPage.c"
+#line 10508 "ImportPage.c"
 				}
-				goto __finally68;
-				__catch68_g_error:
+				goto __finally67;
+				__catch67_g_error:
 				{
 					GError* err = NULL;
 					PhotoImportSource* _tmp117_ = NULL;
@@ -10732,115 +10524,115 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					gchar* _tmp122_ = NULL;
 					GError* _tmp123_ = NULL;
 					const gchar* _tmp124_ = NULL;
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					err = _inner_error_;
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_inner_error_ = NULL;
-#line 1604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp117_ = associated;
-#line 1604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp118_ = import_source_get_fulldir (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp119_ = _tmp118_;
-#line 1604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp120_ = associated;
-#line 1604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp121_ = import_source_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_IMPORT_SOURCE, ImportSource));
-#line 1604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp122_ = _tmp121_;
-#line 1604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp123_ = err;
-#line 1604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp124_ = _tmp123_->message;
-#line 1604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-					g_warning ("ImportPage.vala:1604: Unable to fetch metadata for %s/%s: %s", _tmp119_, _tmp122_, _tmp124_);
-#line 1604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+					g_warning ("ImportPage.vala:1590: Unable to fetch metadata for %s/%s: %s", _tmp119_, _tmp122_, _tmp124_);
+#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp122_);
-#line 1604 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (_tmp119_);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_error_free0 (err);
-#line 10758 "ImportPage.c"
+#line 10550 "ImportPage.c"
 				}
-				__finally68:
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				__finally67:
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_md5);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (preview);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					preview_raw = (g_free (preview_raw), NULL);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (exif_only_md5);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_media_metadata_unref0 (metadata);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (associated);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (fulldir);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (filename);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (import_source);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_object_unref0 (_import_source_list);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					g_clear_error (&_inner_error_);
-#line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					return;
-#line 10789 "ImportPage.c"
+#line 10581 "ImportPage.c"
 				}
 			}
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp125_ = self->priv->import_sources;
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp126_ = import_source;
-#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, TYPE_DATA_OBJECT, DataObject));
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp127_ = self->priv->progress_bar;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp128_ = loaded_photos;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			loaded_photos = _tmp128_ + 1;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp129_ = loaded_photos;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp130_ = import_list;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp131_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp132_ = _tmp131_;
-#line 1612 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			gtk_progress_bar_set_fraction (_tmp127_, ((gdouble) _tmp129_) / ((gdouble) _tmp132_));
-#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			spin_event_loop ();
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (preview_md5);
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (preview);
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview_raw = (g_free (preview_raw), NULL);
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (exif_only_md5);
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_media_metadata_unref0 (metadata);
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (associated);
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (fulldir);
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (filename);
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_source);
-#line 10834 "ImportPage.c"
+#line 10626 "ImportPage.c"
 		}
-#line 1510 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1496 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_import_source_list);
-#line 10838 "ImportPage.c"
+#line 10630 "ImportPage.c"
 	}
 }
 
@@ -10852,58 +10644,58 @@ static void import_page_on_hide_imported (ImportPage* self) {
 	ConfigFacade* _tmp9_ = NULL;
 	GtkCheckButton* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
-#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->hide_imported;
-#line 1624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1624 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp1_) {
-#line 10858 "ImportPage.c"
+#line 10650 "ImportPage.c"
 		ViewCollection* _tmp2_ = NULL;
 		ViewCollection* _tmp3_ = NULL;
 		ImportPageHideImportedViewFilter* _tmp4_ = NULL;
-#line 1625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _tmp2_;
-#line 1625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = self->priv->hide_imported_filter;
-#line 1625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		view_collection_install_view_filter (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1625 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1611 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 10872 "ImportPage.c"
+#line 10664 "ImportPage.c"
 	} else {
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ImportPageHideImportedViewFilter* _tmp7_ = NULL;
-#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp5_;
-#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = self->priv->hide_imported_filter;
-#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		view_collection_remove_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 10887 "ImportPage.c"
+#line 10679 "ImportPage.c"
 	}
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp10_ = self->priv->hide_imported;
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	configuration_facade_set_hide_photos_already_imported (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp11_);
-#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1615 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 10901 "ImportPage.c"
+#line 10693 "ImportPage.c"
 }
 
 
@@ -10912,23 +10704,23 @@ static void import_page_on_import_selected (ImportPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
 	GeeList* _tmp3_ = NULL;
-#line 1632 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = view_collection_get_selected (_tmp1_);
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1633 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 10926 "ImportPage.c"
+#line 10718 "ImportPage.c"
 }
 
 
@@ -10937,53 +10729,53 @@ static void import_page_on_import_all (ImportPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	GeeCollection* _tmp2_ = NULL;
 	GeeCollection* _tmp3_ = NULL;
-#line 1636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1622 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 10951 "ImportPage.c"
+#line 10743 "ImportPage.c"
 }
 
 
 static gint64 _import_page_import_job_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = import_page_import_job_comparator ((ImportPage*) self, a, b);
-#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 10960 "ImportPage.c"
+#line 10752 "ImportPage.c"
 }
 
 
 static void _import_page_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_import_reporter ((ImportPage*) self, manifest);
-#line 10967 "ImportPage.c"
+#line 10759 "ImportPage.c"
 }
 
 
 static void _import_page_on_import_job_failed_batch_import_import_job_failed (BatchImport* _sender, BatchImportResult* _result_, gpointer self) {
-#line 1691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1677 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_import_job_failed ((ImportPage*) self, _result_);
-#line 10974 "ImportPage.c"
+#line 10766 "ImportPage.c"
 }
 
 
 static void _import_page_close_import_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_close_import ((ImportPage*) self);
-#line 10981 "ImportPage.c"
+#line 10773 "ImportPage.c"
 }
 
 
@@ -11007,85 +10799,85 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 	SortedList* _tmp59_ = NULL;
 	gint _tmp60_ = 0;
 	gint _tmp61_ = 0;
-#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (items));
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_page_spin_idle_context;
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = gp_camera_init (_tmp0_, _tmp2_);
-#line 1641 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp3_;
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = res;
-#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1628 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ != GP_OK) {
-#line 11023 "ImportPage.c"
+#line 10815 "ImportPage.c"
 		const gchar* _tmp5_ = NULL;
 		int _tmp6_ = 0;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _ ("Unable to lock camera: %s");
-#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = res;
-#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = gp_result_to_full_string (_tmp6_);
-#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = _tmp7_;
-#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = g_strdup_printf (_tmp5_, _tmp8_);
-#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp9_;
-#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		app_window_error_message (_tmp10_, NULL);
-#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp10_);
-#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp8_);
-#line 1645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1631 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11050 "ImportPage.c"
+#line 10842 "ImportPage.c"
 	}
-#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp11_ = self->priv->refreshed;
-#line 1648 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1634 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, TRUE, _tmp11_);
-#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = self->priv->progress_bar;
-#line 1651 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp13_ = sorted_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, _import_page_import_job_comparator_comparator, self);
-#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	jobs = _tmp13_;
-#line 1654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp14_ = gee_array_list_new (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL);
-#line 1654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	already_imported = _tmp14_;
-#line 11070 "ImportPage.c"
+#line 10862 "ImportPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeIterable* _tmp15_ = NULL;
 		GeeIterator* _tmp16_ = NULL;
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = items;
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = gee_iterable_iterator (_tmp15_);
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_object_it = _tmp16_;
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 11083 "ImportPage.c"
+#line 10875 "ImportPage.c"
 			GeeIterator* _tmp17_ = NULL;
 			gboolean _tmp18_ = FALSE;
 			DataObject* object = NULL;
@@ -11107,41 +10899,41 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 			ImportSource* _tmp42_ = NULL;
 			SortedList* _tmp53_ = NULL;
 			ImportPageCameraImportJob* _tmp54_ = NULL;
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp17_ = _object_it;
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp18_ = gee_iterator_next (_tmp17_);
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!_tmp18_) {
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 11113 "ImportPage.c"
+#line 10905 "ImportPage.c"
 			}
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp19_ = _object_it;
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp20_ = gee_iterator_get (_tmp19_);
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			object = (DataObject*) _tmp20_;
-#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp21_ = object;
-#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_IMPORT_PREVIEW, ImportPreview));
-#line 1657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			preview = _tmp22_;
-#line 1658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp23_ = preview;
-#line 1658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp24_ = data_view_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_VIEW, DataView));
-#line 1658 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_file = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_IMPORT_SOURCE, ImportSource);
-#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp25_ = preview;
-#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp26_ = import_preview_is_already_imported (_tmp25_);
-#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp26_) {
-#line 11139 "ImportPage.c"
+#line 10931 "ImportPage.c"
 				ImportSource* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
 				gchar* _tmp29_ = NULL;
@@ -11153,84 +10945,84 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 				DuplicatedFile* _tmp35_ = NULL;
 				ImportPageCameraImportJob* _tmp36_ = NULL;
 				ImportPageCameraImportJob* _tmp37_ = NULL;
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp27_ = import_file;
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp28_ = import_source_get_filename (_tmp27_);
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp29_ = _tmp28_;
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				g_message ("ImportPage.vala:1661: Skipping import of %s: checksum detected in libr" \
+#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+				g_message ("ImportPage.vala:1647: Skipping import of %s: checksum detected in libr" \
 "ary", _tmp29_);
-#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_free0 (_tmp29_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp30_ = already_imported;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp31_ = import_page_null_context;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp32_ = import_file;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp33_ = preview;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp34_ = import_preview_get_duplicated_file (_tmp33_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp35_ = _tmp34_;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp36_ = import_page_camera_import_job_new (_tmp31_, _tmp32_, _tmp35_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp37_ = _tmp36_;
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_batch_import_job_unref0 (_tmp37_);
-#line 1664 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp35_);
-#line 1667 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (import_file);
-#line 1667 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (preview);
-#line 1667 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (object);
-#line 1667 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1653 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				continue;
-#line 11191 "ImportPage.c"
+#line 10983 "ImportPage.c"
 			}
-#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp38_ = import_page_null_context;
-#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp39_ = import_file;
-#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp40_ = import_page_camera_import_job_new (_tmp38_, _tmp39_, NULL);
-#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_job = _tmp40_;
-#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp42_ = import_file;
-#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp42_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 11205 "ImportPage.c"
+#line 10997 "ImportPage.c"
 				ImportSource* _tmp43_ = NULL;
 				PhotoImportSource* _tmp44_ = NULL;
 				PhotoImportSource* _tmp45_ = NULL;
-#line 1674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp43_ = import_file;
-#line 1674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp44_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
-#line 1674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp45_ = _tmp44_;
-#line 1674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp41_ = _tmp45_ != NULL;
-#line 1674 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp45_);
-#line 11219 "ImportPage.c"
+#line 11011 "ImportPage.c"
 			} else {
-#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp41_ = FALSE;
-#line 11223 "ImportPage.c"
+#line 11015 "ImportPage.c"
 			}
-#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (_tmp41_) {
-#line 11227 "ImportPage.c"
+#line 11019 "ImportPage.c"
 				ImportPageCameraImportJob* _tmp46_ = NULL;
 				GPContextWrapper* _tmp47_ = NULL;
 				ImportSource* _tmp48_ = NULL;
@@ -11238,67 +11030,67 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 				PhotoImportSource* _tmp50_ = NULL;
 				ImportPageCameraImportJob* _tmp51_ = NULL;
 				ImportPageCameraImportJob* _tmp52_ = NULL;
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp46_ = import_job;
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp47_ = import_page_null_context;
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp48_ = import_file;
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp49_ = photo_import_source_get_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_IMPORT_SOURCE, PhotoImportSource));
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp50_ = _tmp49_;
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp51_ = import_page_camera_import_job_new (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_IMPORT_SOURCE, ImportSource), NULL);
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp52_ = _tmp51_;
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				batch_import_job_set_associated (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_BATCH_IMPORT_JOB, BatchImportJob), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_BATCH_IMPORT_JOB, BatchImportJob));
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_batch_import_job_unref0 (_tmp52_);
-#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1661 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_tmp50_);
-#line 11255 "ImportPage.c"
+#line 11047 "ImportPage.c"
 			}
-#line 1679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp53_ = jobs;
-#line 1679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp54_ = import_job;
-#line 1679 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1665 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), _tmp54_);
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_job_unref0 (import_job);
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (import_file);
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (preview);
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (object);
-#line 11271 "ImportPage.c"
+#line 11063 "ImportPage.c"
 		}
-#line 1656 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_object_it);
-#line 11275 "ImportPage.c"
+#line 11067 "ImportPage.c"
 	}
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp55_ = jobs;
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp56_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp57_ = _tmp56_;
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp58_ = self->priv->camera_name;
-#line 1682 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_debug ("ImportPage.vala:1682: Importing %d files from %s", _tmp57_, _tmp58_);
-#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1668 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	g_debug ("ImportPage.vala:1668: Importing %d files from %s", _tmp57_, _tmp58_);
+#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp59_ = jobs;
-#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp60_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp61_ = _tmp60_;
-#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp61_ > 0) {
-#line 11295 "ImportPage.c"
+#line 11087 "ImportPage.c"
 		ImportPage* _tmp62_ = NULL;
 		ImportPage* _tmp63_ = NULL;
 		BatchImport* batch_import = NULL;
@@ -11313,92 +11105,92 @@ static void import_page_import (ImportPage* self, GeeIterable* items) {
 		BatchImport* _tmp72_ = NULL;
 		LibraryWindow* _tmp73_ = NULL;
 		LibraryWindow* _tmp74_ = NULL;
-#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp62_ = self->priv->local_ref;
-#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1672 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_vala_assert (_tmp62_ == NULL, "local_ref == null");
-#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp63_ = _g_object_ref0 (self);
-#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (self->priv->local_ref);
-#line 1687 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		self->priv->local_ref = _tmp63_;
-#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp64_ = jobs;
-#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp65_ = self->priv->camera_name;
-#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp66_ = already_imported;
-#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp67_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ITERABLE, GeeIterable), _tmp65_, _import_page_import_reporter_batch_import_import_reporter, self, NULL, _tmp66_, NULL, NULL, NULL);
-#line 1689 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		batch_import = _tmp67_;
-#line 1691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1677 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp68_ = batch_import;
-#line 1691 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1677 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_signal_connect_object (_tmp68_, "import-job-failed", (GCallback) _import_page_on_import_job_failed_batch_import_import_job_failed, self, 0);
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp69_ = batch_import;
-#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1678 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_signal_connect_object (_tmp69_, "import-complete", (GCallback) _import_page_close_import_batch_import_import_complete, self, 0);
-#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp70_ = library_window_get_app ();
-#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp71_ = _tmp70_;
-#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp72_ = batch_import;
-#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_window_enqueue_batch_import (_tmp71_, _tmp72_, TRUE);
-#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp71_);
-#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp73_ = library_window_get_app ();
-#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp74_ = _tmp73_;
-#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_window_switch_to_import_queue_page (_tmp74_);
-#line 1695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1681 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp74_);
-#line 1684 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (batch_import);
-#line 11358 "ImportPage.c"
+#line 11150 "ImportPage.c"
 	} else {
 		GeeArrayList* _tmp75_ = NULL;
 		gint _tmp76_ = 0;
 		gint _tmp77_ = 0;
-#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp75_ = already_imported;
-#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp76_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp77_ = _tmp76_;
-#line 1699 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1685 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp77_ > 0) {
-#line 11371 "ImportPage.c"
+#line 11163 "ImportPage.c"
 			GeeArrayList* _tmp78_ = NULL;
 			ImportManifest* _tmp79_ = NULL;
 			ImportManifest* _tmp80_ = NULL;
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp78_ = already_imported;
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp79_ = import_manifest_new (NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, GEE_TYPE_LIST, GeeList));
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp80_ = _tmp79_;
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			import_page_import_reporter (self, _tmp80_);
-#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_import_manifest_unref0 (_tmp80_);
-#line 11385 "ImportPage.c"
+#line 11177 "ImportPage.c"
 		}
-#line 1702 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_page_close_import (self);
-#line 11389 "ImportPage.c"
+#line 11181 "ImportPage.c"
 	}
-#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (already_imported);
-#line 1640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1626 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (jobs);
-#line 11395 "ImportPage.c"
+#line 11187 "ImportPage.c"
 }
 
 
@@ -11407,53 +11199,53 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 	BatchImportResult* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1706 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1706 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1692 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_RESULT (_result_));
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _result_;
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = _tmp1_->file;
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_ == NULL) {
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = TRUE;
-#line 11416 "ImportPage.c"
+#line 11208 "ImportPage.c"
 	} else {
 		BatchImportResult* _tmp3_ = NULL;
 		ImportResult _tmp4_ = 0;
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp3_ = _result_;
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = _tmp3_->result;
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp4_ == IMPORT_RESULT_SUCCESS;
-#line 11426 "ImportPage.c"
+#line 11218 "ImportPage.c"
 	}
-#line 1707 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp0_) {
-#line 1708 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1694 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11432 "ImportPage.c"
+#line 11224 "ImportPage.c"
 	}
 	{
 		BatchImportResult* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
-#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = _result_;
-#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp5_->file;
-#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_file_delete (_tmp6_, NULL, &_inner_error_);
-#line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 11445 "ImportPage.c"
-			goto __catch69_g_error;
+#line 11237 "ImportPage.c"
+			goto __catch68_g_error;
 		}
 	}
-	goto __finally69;
-	__catch69_g_error:
+	goto __finally68;
+	__catch68_g_error:
 	{
 		GError* err = NULL;
 		BatchImportResult* _tmp7_ = NULL;
@@ -11462,57 +11254,57 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		gchar* _tmp10_ = NULL;
 		GError* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		err = _inner_error_;
-#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_inner_error_ = NULL;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _result_;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = _tmp7_->file;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = g_file_get_path (_tmp8_);
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = _tmp9_;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = err;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = _tmp11_->message;
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_message ("ImportPage.vala:1714: Unable to delete downloaded file %s: %s", _tmp10_, _tmp12_);
-#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_message ("ImportPage.vala:1700: Unable to delete downloaded file %s: %s", _tmp10_, _tmp12_);
+#line 1700 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp10_);
-#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 11481 "ImportPage.c"
+#line 11273 "ImportPage.c"
 	}
-	__finally69:
-#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	__finally68:
+#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11492 "ImportPage.c"
+#line 11284 "ImportPage.c"
 	}
 }
 
 
 static gpointer _batch_import_job_ref0 (gpointer self) {
-#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? batch_import_job_ref (self) : NULL;
-#line 11500 "ImportPage.c"
+#line 11292 "ImportPage.c"
 }
 
 
 static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
 	gboolean result;
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 11509 "ImportPage.c"
+#line 11301 "ImportPage.c"
 }
 
 
@@ -11542,31 +11334,31 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 	gint _tmp91_ = 0;
 	gint _tmp92_ = 0;
 	ProgressDialog* _tmp98_ = NULL;
-#line 1718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 1724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->local_ref;
-#line 1724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1724 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1710 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	local_ref = _tmp1_;
-#line 1725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (self->priv->local_ref);
-#line 1725 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->local_ref = NULL;
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = manifest;
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = _tmp2_->success;
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp5_ > 0) {
-#line 11563 "ImportPage.c"
+#line 11355 "ImportPage.c"
 		gchar* photos_string = NULL;
 		ImportManifest* _tmp6_ = NULL;
 		GeeList* _tmp7_ = NULL;
@@ -11626,176 +11418,176 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		ImportManifest* _tmp56_ = NULL;
 		ImportUIQuestionParams* _tmp57_ = NULL;
 		gboolean _tmp58_ = FALSE;
-#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = manifest;
-#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp6_->success;
-#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp8_;
-#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp10_ = ngettext ("Delete this photo from camera?", "Delete these %d photos from camera?", (gulong) _tmp9_);
-#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp11_ = manifest;
-#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp12_ = _tmp11_->success;
-#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp14_ = _tmp13_;
-#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = g_strdup_printf (_tmp10_, _tmp14_);
-#line 1728 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		photos_string = _tmp15_;
-#line 1731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp16_ = manifest;
-#line 1731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp17_ = _tmp16_->success;
-#line 1731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp20_ = ngettext ("Delete this video from camera?", "Delete these %d videos from camera?", (gulong) _tmp19_);
-#line 1731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp21_ = manifest;
-#line 1731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp22_ = _tmp21_->success;
-#line 1731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp23_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp24_ = _tmp23_;
-#line 1731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp25_ = g_strdup_printf (_tmp20_, _tmp24_);
-#line 1731 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1717 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		videos_string = _tmp25_;
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp26_ = manifest;
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp27_ = _tmp26_->success;
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp29_ = _tmp28_;
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp30_ = ngettext ("Delete this photo/video from camera?", "Delete these %d photos/videos from camera?", (gulong) _tmp29_);
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp31_ = manifest;
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp32_ = _tmp31_->success;
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp33_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp34_ = _tmp33_;
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp35_ = g_strdup_printf (_tmp30_, _tmp34_);
-#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		both_string = _tmp35_;
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp36_ = manifest;
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp37_ = _tmp36_->success;
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp38_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp39_ = _tmp38_;
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp40_ = ngettext ("Delete these files from camera?", "Delete these %d files from camera?", (gulong) _tmp39_);
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp41_ = manifest;
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp42_ = _tmp41_->success;
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp43_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp44_ = _tmp43_;
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp45_ = g_strdup_printf (_tmp40_, _tmp44_);
-#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		neither_string = _tmp45_;
-#line 1741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp46_ = manifest;
-#line 1741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp47_ = _tmp46_->success;
-#line 1741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp48_ = photos_string;
-#line 1741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp49_ = videos_string;
-#line 1741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp50_ = both_string;
-#line 1741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp51_ = neither_string;
-#line 1741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp52_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection), _tmp48_, _tmp49_, _tmp50_, _tmp51_);
-#line 1741 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		question_string = _tmp52_;
-#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp53_ = question_string;
-#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp54_ = _ ("_Keep");
-#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp55_ = import_ui_question_params_new (_tmp53_, RESOURCES_DELETE_LABEL, _tmp54_);
-#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1730 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		question = _tmp55_;
-#line 1747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp56_ = manifest;
-#line 1747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp57_ = question;
-#line 1747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp58_ = import_ui_report_manifest (_tmp56_, FALSE, _tmp57_);
-#line 1747 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1733 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (!_tmp58_) {
-#line 1748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_import_ui_question_params_unref0 (question);
-#line 1748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (question_string);
-#line 1748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (neither_string);
-#line 1748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (both_string);
-#line 1748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (videos_string);
-#line 1748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_free0 (photos_string);
-#line 1748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (local_ref);
-#line 1748 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return;
-#line 11759 "ImportPage.c"
+#line 11551 "ImportPage.c"
 		}
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_import_ui_question_params_unref0 (question);
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (question_string);
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (neither_string);
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (both_string);
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (videos_string);
-#line 1727 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1713 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (photos_string);
-#line 11773 "ImportPage.c"
+#line 11565 "ImportPage.c"
 	} else {
 		ImportManifest* _tmp59_ = NULL;
-#line 1750 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp59_ = manifest;
-#line 1750 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1736 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		import_ui_report_manifest (_tmp59_, FALSE, NULL);
-#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (local_ref);
-#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1737 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return;
-#line 11784 "ImportPage.c"
+#line 11576 "ImportPage.c"
 	}
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp60_ = self->priv->import_sources;
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1756 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1742 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	marker = _tmp61_;
-#line 11792 "ImportPage.c"
+#line 11584 "ImportPage.c"
 	{
 		GeeList* _batch_result_list = NULL;
 		ImportManifest* _tmp62_ = NULL;
@@ -11806,27 +11598,27 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 		gint _tmp66_ = 0;
 		gint _tmp67_ = 0;
 		gint _batch_result_index = 0;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp62_ = manifest;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp63_ = _tmp62_->success;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp64_ = _g_object_ref0 (_tmp63_);
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_batch_result_list = _tmp64_;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp65_ = _batch_result_list;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp66_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp67_ = _tmp66_;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_batch_result_size = _tmp67_;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_batch_result_index = -1;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		while (TRUE) {
-#line 11823 "ImportPage.c"
+#line 11615 "ImportPage.c"
 			gint _tmp68_ = 0;
 			gint _tmp69_ = 0;
 			gint _tmp70_ = 0;
@@ -11842,134 +11634,134 @@ static void import_page_import_reporter (ImportPage* self, ImportManifest* manif
 			ImportPageCameraImportJob* _tmp78_ = NULL;
 			ImportSource* _tmp79_ = NULL;
 			ImportSource* _tmp80_ = NULL;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp68_ = _batch_result_index;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_result_index = _tmp68_ + 1;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp69_ = _batch_result_index;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp70_ = _batch_result_size;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (!(_tmp69_ < _tmp70_)) {
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				break;
-#line 11851 "ImportPage.c"
+#line 11643 "ImportPage.c"
 			}
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp71_ = _batch_result_list;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp72_ = _batch_result_index;
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp73_ = gee_list_get (_tmp71_, _tmp72_);
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			batch_result = (BatchImportResult*) _tmp73_;
-#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp74_ = batch_result;
-#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp75_ = _tmp74_->job;
-#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp76_ = _batch_import_job_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB) ? ((ImportPageCameraImportJob*) _tmp75_) : NULL);
-#line 1758 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1744 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			job = _tmp76_;
-#line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp77_ = marker;
-#line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp78_ = job;
-#line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp79_ = import_page_camera_import_job_get_source (_tmp78_);
-#line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp80_ = _tmp79_;
-#line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			marker_mark (_tmp77_, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_DATA_OBJECT, DataObject));
-#line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1746 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_tmp80_);
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_job_unref0 (job);
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_batch_import_result_unref0 (batch_result);
-#line 11885 "ImportPage.c"
+#line 11677 "ImportPage.c"
 		}
-#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1743 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_batch_result_list);
-#line 11889 "ImportPage.c"
+#line 11681 "ImportPage.c"
 	}
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp81_ = app_window_get_instance ();
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp82_ = _tmp81_;
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp83_ = _ ("Removing photos/videos from camera");
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp84_ = g_cancellable_new ();
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp85_ = _tmp84_;
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp86_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_window_get_type (), GtkWindow), _tmp83_, _tmp85_);
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_object_ref_sink (_tmp86_);
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp87_ = _tmp86_;
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp85_);
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (_tmp82_);
-#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	progress = _tmp87_;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp88_ = self->priv->import_sources;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp89_ = marker;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp90_ = progress;
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp91_ = source_collection_destroy_marked (_tmp88_, _tmp89_, TRUE, _progress_dialog_monitor_progress_monitor, _tmp90_, NULL);
-#line 1765 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1751 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	error_count = _tmp91_;
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp92_ = error_count;
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp92_ > 0) {
-#line 11927 "ImportPage.c"
+#line 11719 "ImportPage.c"
 		gchar* error_string = NULL;
 		gint _tmp93_ = 0;
 		const gchar* _tmp94_ = NULL;
 		gint _tmp95_ = 0;
 		gchar* _tmp96_ = NULL;
 		const gchar* _tmp97_ = NULL;
-#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp93_ = error_count;
-#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp94_ = ngettext ("Unable to delete %d photo/video from the camera due to errors.", "Unable to delete %d photos/videos from the camera due to errors.", (gulong) _tmp93_);
-#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp95_ = error_count;
-#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp96_ = g_strdup_printf (_tmp94_, _tmp95_);
-#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1753 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		error_string = _tmp96_;
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp97_ = error_string;
-#line 1771 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1757 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		app_window_error_message (_tmp97_, NULL);
-#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1752 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (error_string);
-#line 11950 "ImportPage.c"
+#line 11742 "ImportPage.c"
 	}
-#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp98_ = progress;
-#line 1774 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1760 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	progress_dialog_close (_tmp98_);
-#line 1777 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (local_ref);
-#line 1777 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1763 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	local_ref = NULL;
-#line 1718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (progress);
-#line 1718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (marker);
-#line 1718 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1704 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_g_object_unref0 (local_ref);
-#line 11966 "ImportPage.c"
+#line 11758 "ImportPage.c"
 }
 
 
@@ -11981,98 +11773,70 @@ static void import_page_close_import (ImportPage* self) {
 	int _tmp3_ = 0;
 	int _tmp4_ = 0;
 	gboolean _tmp8_ = FALSE;
-#line 1780 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1766 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_return_if_fail (IS_IMPORT_PAGE (self));
-#line 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->camera;
-#line 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = import_page_spin_idle_context;
-#line 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GP_TYPE_CONTEXT_WRAPPER, GPContextWrapper)->context;
-#line 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp3_ = gp_camera_exit (_tmp0_, _tmp2_);
-#line 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1767 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	res = _tmp3_;
-#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = res;
-#line 1782 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1768 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp4_ != GP_OK) {
-#line 11994 "ImportPage.c"
+#line 11786 "ImportPage.c"
 		int _tmp5_ = 0;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = res;
-#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = gp_result_to_full_string (_tmp5_);
-#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp7_ = _tmp6_;
-#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		g_message ("ImportPage.vala:1784: Unable to unlock camera: %s", _tmp7_);
-#line 1784 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+		g_message ("ImportPage.vala:1770: Unable to unlock camera: %s", _tmp7_);
+#line 1770 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_free0 (_tmp7_);
-#line 12008 "ImportPage.c"
+#line 11800 "ImportPage.c"
 	}
-#line 1787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp8_ = self->priv->refreshed;
-#line 1787 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1773 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_update_status (self, FALSE, _tmp8_);
-#line 1789 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	import_page_on_view_changed (self);
-#line 12016 "ImportPage.c"
+#line 11808 "ImportPage.c"
 }
 
 
 static void import_page_real_set_display_titles (CheckerboardPage* base, gboolean display) {
 	ImportPage * self;
 	gboolean _tmp0_ = FALSE;
-	GtkToggleAction* action = NULL;
-	GtkAction* _tmp1_ = NULL;
-	GtkToggleAction* _tmp2_ = NULL;
-	GtkToggleAction* _tmp3_ = NULL;
-#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	gboolean _tmp1_ = FALSE;
+#line 1778 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = display;
-#line 1793 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1779 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	CHECKERBOARD_PAGE_CLASS (import_page_parent_class)->set_display_titles (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp0_);
-#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp1_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle");
-#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp1_) : NULL;
-#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp2_ == NULL) {
-#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_g_object_unref0 (_tmp1_);
-#line 12041 "ImportPage.c"
-	}
-#line 1795 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	action = _tmp2_;
-#line 1796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp3_ = action;
-#line 1796 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	if (_tmp3_ != NULL) {
-#line 12049 "ImportPage.c"
-		GtkToggleAction* _tmp4_ = NULL;
-		gboolean _tmp5_ = FALSE;
-#line 1797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp4_ = action;
-#line 1797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		_tmp5_ = display;
-#line 1797 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-		gtk_toggle_action_set_active (_tmp4_, _tmp5_);
-#line 12058 "ImportPage.c"
-	}
-#line 1792 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_g_object_unref0 (action);
-#line 12062 "ImportPage.c"
+#line 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	_tmp1_ = display;
+#line 1781 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+	page_set_action_active (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewTitle", _tmp1_);
+#line 11826 "ImportPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 12069 "ImportPage.c"
+#line 11833 "ImportPage.c"
 }
 
 
@@ -12081,17 +11845,17 @@ static SearchViewFilter* import_page_real_get_search_view_filter (CheckerboardPa
 	SearchViewFilter* result = NULL;
 	ImportPageImportPageSearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 1801 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_PAGE, ImportPage);
-#line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp1_;
-#line 1802 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12088 "ImportPage.c"
+#line 11852 "ImportPage.c"
 }
 
 
@@ -12113,14 +11877,14 @@ static ImportPageImportViewManager* import_page_import_view_manager_construct (G
 	self->priv->owner = _tmp1_;
 #line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 12110 "ImportPage.c"
+#line 11874 "ImportPage.c"
 }
 
 
 static ImportPageImportViewManager* import_page_import_view_manager_new (ImportPage* owner) {
 #line 463 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_import_view_manager_construct (IMPORT_PAGE_TYPE_IMPORT_VIEW_MANAGER, owner);
-#line 12117 "ImportPage.c"
+#line 11881 "ImportPage.c"
 }
 
 
@@ -12141,7 +11905,7 @@ static DataView* import_page_import_view_manager_real_create_view (ViewManager*
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 468 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12138 "ImportPage.c"
+#line 11902 "ImportPage.c"
 }
 
 
@@ -12154,14 +11918,14 @@ static void import_page_import_view_manager_class_init (ImportPageImportViewMana
 	g_type_class_add_private (klass, sizeof (ImportPageImportViewManagerPrivate));
 #line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewManagerClass *) klass)->create_view = import_page_import_view_manager_real_create_view;
-#line 12151 "ImportPage.c"
+#line 11915 "ImportPage.c"
 }
 
 
 static void import_page_import_view_manager_instance_init (ImportPageImportViewManager * self) {
 #line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv = IMPORT_PAGE_IMPORT_VIEW_MANAGER_GET_PRIVATE (self);
-#line 12158 "ImportPage.c"
+#line 11922 "ImportPage.c"
 }
 
 
@@ -12173,7 +11937,7 @@ static void import_page_import_view_manager_finalize (ViewManager* obj) {
 	_g_object_unref0 (self->priv->owner);
 #line 460 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	VIEW_MANAGER_CLASS (import_page_import_view_manager_parent_class)->finalize (obj);
-#line 12170 "ImportPage.c"
+#line 11934 "ImportPage.c"
 }
 
 
@@ -12192,7 +11956,7 @@ static GType import_page_import_view_manager_get_type (void) {
 static gpointer _gp_context_wrapper_ref0 (gpointer self) {
 #line 487 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self ? gp_context_wrapper_ref (self) : NULL;
-#line 12189 "ImportPage.c"
+#line 11953 "ImportPage.c"
 }
 
 
@@ -12288,7 +12052,7 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 	_tmp16_ = import_file;
 #line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 12285 "ImportPage.c"
+#line 12049 "ImportPage.c"
 		ImportSource* _tmp17_ = NULL;
 		PhotoMetadata* _tmp18_ = NULL;
 #line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12299,13 +12063,13 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 		_media_metadata_unref0 (_tmp15_);
 #line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = _tmp18_;
-#line 12296 "ImportPage.c"
+#line 12060 "ImportPage.c"
 	} else {
 #line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_media_metadata_unref0 (_tmp15_);
 #line 499 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp15_ = NULL;
-#line 12302 "ImportPage.c"
+#line 12066 "ImportPage.c"
 	}
 #line 498 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp19_ = _media_metadata_ref0 (_tmp15_);
@@ -12323,14 +12087,14 @@ static ImportPageCameraImportJob* import_page_camera_import_job_construct (GType
 	_media_metadata_unref0 (_tmp15_);
 #line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 12320 "ImportPage.c"
+#line 12084 "ImportPage.c"
 }
 
 
 static ImportPageCameraImportJob* import_page_camera_import_job_new (GPContextWrapper* context, ImportSource* import_file, DuplicatedFile* duplicated_file) {
 #line 485 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_camera_import_job_construct (IMPORT_PAGE_TYPE_CAMERA_IMPORT_JOB, context, import_file, duplicated_file);
-#line 12327 "ImportPage.c"
+#line 12091 "ImportPage.c"
 }
 
 
@@ -12345,7 +12109,7 @@ static time_t import_page_camera_import_job_get_exposure_time (ImportPageCameraI
 	result = _tmp0_;
 #line 504 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12342 "ImportPage.c"
+#line 12106 "ImportPage.c"
 }
 
 
@@ -12364,7 +12128,7 @@ static DuplicatedFile* import_page_camera_import_job_real_get_duplicated_file (B
 	result = _tmp1_;
 #line 508 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12361 "ImportPage.c"
+#line 12125 "ImportPage.c"
 }
 
 
@@ -12379,23 +12143,23 @@ static time_t import_page_camera_import_job_real_get_exposure_time_override (Bat
 	_tmp1_ = self->priv->import_file;
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 12376 "ImportPage.c"
+#line 12140 "ImportPage.c"
 		time_t _tmp2_ = 0;
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = import_page_camera_import_job_get_exposure_time (self);
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = _tmp2_;
-#line 12382 "ImportPage.c"
+#line 12146 "ImportPage.c"
 	} else {
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp0_ = (time_t) 0;
-#line 12386 "ImportPage.c"
+#line 12150 "ImportPage.c"
 	}
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = _tmp0_;
 #line 512 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12392 "ImportPage.c"
+#line 12156 "ImportPage.c"
 }
 
 
@@ -12414,7 +12178,7 @@ static gchar* import_page_camera_import_job_real_get_dest_identifier (BatchImpor
 	result = _tmp1_;
 #line 516 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12411 "ImportPage.c"
+#line 12175 "ImportPage.c"
 }
 
 
@@ -12433,7 +12197,7 @@ static gchar* import_page_camera_import_job_real_get_source_identifier (BatchImp
 	result = _tmp1_;
 #line 520 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12430 "ImportPage.c"
+#line 12194 "ImportPage.c"
 }
 
 
@@ -12452,7 +12216,7 @@ static gchar* import_page_camera_import_job_real_get_basename (BatchImportJob* b
 	result = _tmp1_;
 #line 524 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12449 "ImportPage.c"
+#line 12213 "ImportPage.c"
 }
 
 
@@ -12471,7 +12235,7 @@ static gchar* import_page_camera_import_job_real_get_path (BatchImportJob* base)
 	result = _tmp1_;
 #line 528 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12468 "ImportPage.c"
+#line 12232 "ImportPage.c"
 }
 
 
@@ -12491,7 +12255,7 @@ static void import_page_camera_import_job_real_set_associated (BatchImportJob* b
 	_batch_import_job_unref0 (self->priv->associated);
 #line 532 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated = _tmp1_;
-#line 12488 "ImportPage.c"
+#line 12252 "ImportPage.c"
 }
 
 
@@ -12509,7 +12273,7 @@ static ImportSource* import_page_camera_import_job_get_source (ImportPageCameraI
 	result = _tmp1_;
 #line 536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12506 "ImportPage.c"
+#line 12270 "ImportPage.c"
 }
 
 
@@ -12522,7 +12286,7 @@ static gboolean import_page_camera_import_job_real_is_directory (BatchImportJob*
 	result = FALSE;
 #line 540 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12519 "ImportPage.c"
+#line 12283 "ImportPage.c"
 }
 
 
@@ -12548,21 +12312,21 @@ static gboolean import_page_camera_import_job_real_determine_file_size (BatchImp
 	if (filesize) {
 #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*filesize = _vala_filesize;
-#line 12545 "ImportPage.c"
+#line 12309 "ImportPage.c"
 	}
 #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (file) {
 #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*file = _vala_file;
-#line 12551 "ImportPage.c"
+#line 12315 "ImportPage.c"
 	} else {
 #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_vala_file);
-#line 12555 "ImportPage.c"
+#line 12319 "ImportPage.c"
 	}
 #line 547 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12559 "ImportPage.c"
+#line 12323 "ImportPage.c"
 }
 
 
@@ -12588,7 +12352,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 	_vala_copy_to_library = FALSE;
 #line 554 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	dest_file = NULL;
-#line 12585 "ImportPage.c"
+#line 12349 "ImportPage.c"
 	{
 		gboolean collision = FALSE;
 		GFile* _tmp0_ = NULL;
@@ -12612,8 +12376,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_tmp0_ = _tmp5_;
 #line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12609 "ImportPage.c"
-			goto __catch70_g_error;
+#line 12373 "ImportPage.c"
+			goto __catch69_g_error;
 		}
 #line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp0_;
@@ -12625,10 +12389,10 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		dest_file = _tmp6_;
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 12622 "ImportPage.c"
+#line 12386 "ImportPage.c"
 	}
-	goto __finally70;
-	__catch70_g_error:
+	goto __finally69;
+	__catch69_g_error:
 	{
 		GError* err = NULL;
 		ImportSource* _tmp7_ = NULL;
@@ -12656,9 +12420,9 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_free0 (_tmp9_);
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_error_free0 (err);
-#line 12653 "ImportPage.c"
+#line 12417 "ImportPage.c"
 	}
-	__finally70:
+	__finally69:
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12667,13 +12431,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_object_unref0 (dest_file);
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return FALSE;
-#line 12664 "ImportPage.c"
+#line 12428 "ImportPage.c"
 	}
 #line 564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp12_ = dest_file;
 #line 564 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp12_ == NULL) {
-#line 12670 "ImportPage.c"
+#line 12434 "ImportPage.c"
 		ImportSource* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
@@ -12695,27 +12459,27 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		if (file_to_import) {
 #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			*file_to_import = _vala_file_to_import;
-#line 12692 "ImportPage.c"
+#line 12456 "ImportPage.c"
 		} else {
 #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_vala_file_to_import);
-#line 12696 "ImportPage.c"
+#line 12460 "ImportPage.c"
 		}
 #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (copy_to_library) {
 #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			*copy_to_library = _vala_copy_to_library;
-#line 12702 "ImportPage.c"
+#line 12466 "ImportPage.c"
 		}
 #line 567 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return result;
-#line 12706 "ImportPage.c"
+#line 12470 "ImportPage.c"
 	}
 #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp16_ = dest_file;
 #line 572 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	library_monitor_blacklist_file (_tmp16_, "CameraImportJob.prepare");
-#line 12712 "ImportPage.c"
+#line 12476 "ImportPage.c"
 	{
 		GPContextWrapper* _tmp17_ = NULL;
 		GPContext* _tmp18_ = NULL;
@@ -12739,18 +12503,18 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		gp_save_image (_tmp18_, _tmp19_, _tmp20_, _tmp21_, _tmp22_, &_inner_error_);
 #line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12736 "ImportPage.c"
-			goto __finally71;
+#line 12500 "ImportPage.c"
+			goto __finally70;
 		}
 	}
-	__finally71:
+	__finally70:
 	{
 		GFile* _tmp23_ = NULL;
 #line 576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp23_ = dest_file;
 #line 576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_monitor_unblacklist_file (_tmp23_);
-#line 12747 "ImportPage.c"
+#line 12511 "ImportPage.c"
 	}
 #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -12760,13 +12524,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_object_unref0 (dest_file);
 #line 573 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		return FALSE;
-#line 12757 "ImportPage.c"
+#line 12521 "ImportPage.c"
 	}
 #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp24_ = self->priv->associated;
 #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp24_ != NULL) {
-#line 12763 "ImportPage.c"
+#line 12527 "ImportPage.c"
 		BackingPhotoRow* _tmp39_ = NULL;
 		GFile* assoc_dest = NULL;
 		BackingPhotoRow* _tmp42_ = NULL;
@@ -12808,8 +12572,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_tmp25_ = _tmp33_;
 #line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12805 "ImportPage.c"
-				goto __catch72_g_error;
+#line 12569 "ImportPage.c"
+				goto __catch71_g_error;
 			}
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp34_ = _tmp25_;
@@ -12821,10 +12585,10 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			self->priv->associated_file = _tmp34_;
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_backing_photo_row_unref0 (_tmp25_);
-#line 12818 "ImportPage.c"
+#line 12582 "ImportPage.c"
 		}
-		goto __finally72;
-		__catch72_g_error:
+		goto __finally71;
+		__catch71_g_error:
 		{
 			GError* err = NULL;
 			ImportPageCameraImportJob* _tmp35_ = NULL;
@@ -12848,9 +12612,9 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 ": %s", _tmp36_, _tmp38_);
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_error_free0 (err);
-#line 12844 "ImportPage.c"
+#line 12608 "ImportPage.c"
 		}
-		__finally72:
+		__finally71:
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12859,13 +12623,13 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_g_object_unref0 (dest_file);
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return FALSE;
-#line 12855 "ImportPage.c"
+#line 12619 "ImportPage.c"
 		}
 #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp39_ = self->priv->associated_file;
 #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp39_ == NULL) {
-#line 12861 "ImportPage.c"
+#line 12625 "ImportPage.c"
 			ImportPageCameraImportJob* _tmp40_ = NULL;
 			const gchar* _tmp41_ = NULL;
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12882,21 +12646,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			if (file_to_import) {
 #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				*file_to_import = _vala_file_to_import;
-#line 12878 "ImportPage.c"
+#line 12642 "ImportPage.c"
 			} else {
 #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (_vala_file_to_import);
-#line 12882 "ImportPage.c"
+#line 12646 "ImportPage.c"
 			}
 #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (copy_to_library) {
 #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				*copy_to_library = _vala_copy_to_library;
-#line 12888 "ImportPage.c"
+#line 12652 "ImportPage.c"
 			}
 #line 592 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 12892 "ImportPage.c"
+#line 12656 "ImportPage.c"
 		}
 #line 595 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp42_ = self->priv->associated_file;
@@ -12910,7 +12674,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_tmp45_ = assoc_dest;
 #line 596 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		library_monitor_blacklist_file (_tmp45_, "CameraImportJob.prepare");
-#line 12906 "ImportPage.c"
+#line 12670 "ImportPage.c"
 		{
 			GPContextWrapper* _tmp46_ = NULL;
 			GPContext* _tmp47_ = NULL;
@@ -12940,18 +12704,18 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			gp_save_image (_tmp47_, _tmp48_, _tmp50_, _tmp52_, _tmp53_, &_inner_error_);
 #line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 12936 "ImportPage.c"
-				goto __finally73;
+#line 12700 "ImportPage.c"
+				goto __finally72;
 			}
 		}
-		__finally73:
+		__finally72:
 		{
 			GFile* _tmp54_ = NULL;
 #line 601 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp54_ = assoc_dest;
 #line 601 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			library_monitor_unblacklist_file (_tmp54_);
-#line 12947 "ImportPage.c"
+#line 12711 "ImportPage.c"
 		}
 #line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -12963,11 +12727,11 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_g_object_unref0 (dest_file);
 #line 597 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return FALSE;
-#line 12959 "ImportPage.c"
+#line 12723 "ImportPage.c"
 		}
 #line 580 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (assoc_dest);
-#line 12963 "ImportPage.c"
+#line 12727 "ImportPage.c"
 	}
 #line 605 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp55_ = dest_file;
@@ -12987,21 +12751,21 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 	if (file_to_import) {
 #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*file_to_import = _vala_file_to_import;
-#line 12983 "ImportPage.c"
+#line 12747 "ImportPage.c"
 	} else {
 #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (_vala_file_to_import);
-#line 12987 "ImportPage.c"
+#line 12751 "ImportPage.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (copy_to_library) {
 #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		*copy_to_library = _vala_copy_to_library;
-#line 12993 "ImportPage.c"
+#line 12757 "ImportPage.c"
 	}
 #line 608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 12997 "ImportPage.c"
+#line 12761 "ImportPage.c"
 }
 
 
@@ -13023,7 +12787,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 	_tmp0_ = source;
 #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO)) {
-#line 13019 "ImportPage.c"
+#line 12783 "ImportPage.c"
 		Photo* photo = NULL;
 		MediaSource* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
@@ -13038,7 +12802,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 		_tmp3_ = self->priv->associated_file;
 #line 617 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (_tmp3_ != NULL) {
-#line 13034 "ImportPage.c"
+#line 12798 "ImportPage.c"
 			Photo* _tmp4_ = NULL;
 			BackingPhotoRow* _tmp5_ = NULL;
 			Photo* _tmp6_ = NULL;
@@ -13059,7 +12823,7 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 				_g_object_unref0 (photo);
 #line 618 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return FALSE;
-#line 13055 "ImportPage.c"
+#line 12819 "ImportPage.c"
 			}
 #line 619 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			ret = TRUE;
@@ -13075,17 +12839,17 @@ static gboolean import_page_camera_import_job_real_complete (BatchImportJob* bas
 			photo_set_raw_developer (_tmp6_, _tmp9_);
 #line 620 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_g_object_unref0 (_tmp8_);
-#line 13071 "ImportPage.c"
+#line 12835 "ImportPage.c"
 		}
 #line 613 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_g_object_unref0 (photo);
-#line 13075 "ImportPage.c"
+#line 12839 "ImportPage.c"
 	}
 #line 623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	result = ret;
 #line 623 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13081 "ImportPage.c"
+#line 12845 "ImportPage.c"
 }
 
 
@@ -13118,7 +12882,7 @@ static void import_page_camera_import_job_class_init (ImportPageCameraImportJobC
 	((BatchImportJobClass *) klass)->prepare = import_page_camera_import_job_real_prepare;
 #line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((BatchImportJobClass *) klass)->complete = import_page_camera_import_job_real_complete;
-#line 13114 "ImportPage.c"
+#line 12878 "ImportPage.c"
 }
 
 
@@ -13129,7 +12893,7 @@ static void import_page_camera_import_job_instance_init (ImportPageCameraImportJ
 	self->priv->associated = NULL;
 #line 482 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->associated_file = NULL;
-#line 13125 "ImportPage.c"
+#line 12889 "ImportPage.c"
 }
 
 
@@ -13157,7 +12921,7 @@ static void import_page_camera_import_job_finalize (BatchImportJob* obj) {
 	_g_object_unref0 (self->priv->duplicated_file);
 #line 472 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	BATCH_IMPORT_JOB_CLASS (import_page_camera_import_job_parent_class)->finalize (obj);
-#line 13153 "ImportPage.c"
+#line 12917 "ImportPage.c"
 }
 
 
@@ -13182,7 +12946,7 @@ static guint import_page_import_page_search_view_filter_real_get_criteria (Searc
 	result = (guint) (SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA);
 #line 629 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13178 "ImportPage.c"
+#line 12942 "ImportPage.c"
 }
 
 
@@ -13202,7 +12966,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 13198 "ImportPage.c"
+#line 12962 "ImportPage.c"
 }
 
 
@@ -13229,27 +12993,27 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 	_tmp3_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((gboolean) (SEARCH_FILTER_CRITERIA_MEDIA & _tmp3_)) {
-#line 13225 "ImportPage.c"
+#line 12989 "ImportPage.c"
 		gboolean _tmp4_ = FALSE;
 #line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp4_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = _tmp4_;
-#line 13231 "ImportPage.c"
+#line 12995 "ImportPage.c"
 	} else {
 #line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp2_ = FALSE;
-#line 13235 "ImportPage.c"
+#line 12999 "ImportPage.c"
 	}
 #line 636 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (_tmp2_) {
-#line 13239 "ImportPage.c"
+#line 13003 "ImportPage.c"
 		ImportSource* _tmp5_ = NULL;
 #line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp5_ = source;
 #line 637 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_VIDEO_IMPORT_SOURCE)) {
-#line 13245 "ImportPage.c"
+#line 13009 "ImportPage.c"
 			gboolean _tmp6_ = FALSE;
 			gboolean _tmp7_ = FALSE;
 #line 638 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13264,7 +13028,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 				_g_object_unref0 (source);
 #line 639 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				return result;
-#line 13260 "ImportPage.c"
+#line 13024 "ImportPage.c"
 			}
 		} else {
 			ImportSource* _tmp8_ = NULL;
@@ -13272,7 +13036,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 			_tmp8_ = source;
 #line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_PHOTO_IMPORT_SOURCE)) {
-#line 13268 "ImportPage.c"
+#line 13032 "ImportPage.c"
 				PhotoImportSource* photo = NULL;
 				ImportSource* _tmp9_ = NULL;
 				PhotoImportSource* _tmp10_ = NULL;
@@ -13290,7 +13054,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 				_tmp12_ = photo_import_source_get_file_format (_tmp11_);
 #line 642 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (_tmp12_ == PHOTO_FILE_FORMAT_RAW) {
-#line 13286 "ImportPage.c"
+#line 13050 "ImportPage.c"
 					PhotoImportSource* _tmp13_ = NULL;
 					PhotoImportSource* _tmp14_ = NULL;
 					PhotoImportSource* _tmp15_ = NULL;
@@ -13307,7 +13071,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 					_g_object_unref0 (_tmp15_);
 #line 643 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (_tmp16_) {
-#line 13303 "ImportPage.c"
+#line 13067 "ImportPage.c"
 						gboolean _tmp17_ = FALSE;
 						gboolean _tmp18_ = FALSE;
 						gboolean _tmp19_ = FALSE;
@@ -13317,7 +13081,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 						_tmp19_ = _tmp18_;
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (!_tmp19_) {
-#line 13313 "ImportPage.c"
+#line 13077 "ImportPage.c"
 							gboolean _tmp20_ = FALSE;
 							gboolean _tmp21_ = FALSE;
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13326,11 +13090,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 							_tmp21_ = _tmp20_;
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp17_ = !_tmp21_;
-#line 13322 "ImportPage.c"
+#line 13086 "ImportPage.c"
 						} else {
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							_tmp17_ = FALSE;
-#line 13326 "ImportPage.c"
+#line 13090 "ImportPage.c"
 						}
 #line 644 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						if (_tmp17_) {
@@ -13342,7 +13106,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 							_g_object_unref0 (source);
 #line 645 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							return result;
-#line 13338 "ImportPage.c"
+#line 13102 "ImportPage.c"
 						}
 					} else {
 						gboolean _tmp22_ = FALSE;
@@ -13361,7 +13125,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 							_g_object_unref0 (source);
 #line 647 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 							return result;
-#line 13357 "ImportPage.c"
+#line 13121 "ImportPage.c"
 						}
 					}
 				} else {
@@ -13381,12 +13145,12 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 						_g_object_unref0 (source);
 #line 650 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						return result;
-#line 13377 "ImportPage.c"
+#line 13141 "ImportPage.c"
 					}
 				}
 #line 640 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_g_object_unref0 (photo);
-#line 13382 "ImportPage.c"
+#line 13146 "ImportPage.c"
 			}
 		}
 	}
@@ -13394,7 +13158,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 	_tmp26_ = search_view_filter_get_criteria (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 654 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if ((gboolean) (SEARCH_FILTER_CRITERIA_TEXT & _tmp26_)) {
-#line 13390 "ImportPage.c"
+#line 13154 "ImportPage.c"
 		const gchar* keywords = NULL;
 		ImportSource* _tmp27_ = NULL;
 		const gchar* _tmp28_ = NULL;
@@ -13420,11 +13184,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 			_g_object_unref0 (source);
 #line 657 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			return result;
-#line 13416 "ImportPage.c"
+#line 13180 "ImportPage.c"
 		}
 #line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp32_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp31_);
-#line 13420 "ImportPage.c"
+#line 13184 "ImportPage.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
@@ -13436,11 +13200,11 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 			word_collection_length1 = _tmp31_;
 #line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			for (word_it = 0; word_it < _tmp31_; word_it = word_it + 1) {
-#line 13432 "ImportPage.c"
+#line 13196 "ImportPage.c"
 				const gchar* word = NULL;
 #line 660 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				word = word_collection[word_it];
-#line 13436 "ImportPage.c"
+#line 13200 "ImportPage.c"
 				{
 					const gchar* _tmp33_ = NULL;
 					const gchar* _tmp34_ = NULL;
@@ -13459,7 +13223,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 						_g_object_unref0 (source);
 #line 662 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						return result;
-#line 13455 "ImportPage.c"
+#line 13219 "ImportPage.c"
 					}
 				}
 			}
@@ -13471,7 +13235,7 @@ static gboolean import_page_import_page_search_view_filter_real_predicate (ViewF
 	_g_object_unref0 (source);
 #line 666 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13467 "ImportPage.c"
+#line 13231 "ImportPage.c"
 }
 
 
@@ -13481,14 +13245,14 @@ static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view
 	self = (ImportPageImportPageSearchViewFilter*) search_view_filter_construct (object_type);
 #line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 13477 "ImportPage.c"
+#line 13241 "ImportPage.c"
 }
 
 
 static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_new (void) {
 #line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_import_page_search_view_filter_construct (IMPORT_PAGE_TYPE_IMPORT_PAGE_SEARCH_VIEW_FILTER);
-#line 13484 "ImportPage.c"
+#line 13248 "ImportPage.c"
 }
 
 
@@ -13499,7 +13263,7 @@ static void import_page_import_page_search_view_filter_class_init (ImportPageImp
 	((SearchViewFilterClass *) klass)->get_criteria = import_page_import_page_search_view_filter_real_get_criteria;
 #line 627 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewFilterClass *) klass)->predicate = import_page_import_page_search_view_filter_real_predicate;
-#line 13495 "ImportPage.c"
+#line 13259 "ImportPage.c"
 }
 
 
@@ -13536,7 +13300,7 @@ static gboolean import_page_hide_imported_view_filter_real_predicate (ViewFilter
 	result = !_tmp1_;
 #line 673 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return result;
-#line 13532 "ImportPage.c"
+#line 13296 "ImportPage.c"
 }
 
 
@@ -13546,14 +13310,14 @@ static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_c
 	self = (ImportPageHideImportedViewFilter*) view_filter_construct (object_type);
 #line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return self;
-#line 13542 "ImportPage.c"
+#line 13306 "ImportPage.c"
 }
 
 
 static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_new (void) {
 #line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	return import_page_hide_imported_view_filter_construct (IMPORT_PAGE_TYPE_HIDE_IMPORTED_VIEW_FILTER);
-#line 13549 "ImportPage.c"
+#line 13313 "ImportPage.c"
 }
 
 
@@ -13562,7 +13326,7 @@ static void import_page_hide_imported_view_filter_class_init (ImportPageHideImpo
 	import_page_hide_imported_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 671 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((ViewFilterClass *) klass)->predicate = import_page_hide_imported_view_filter_real_predicate;
-#line 13558 "ImportPage.c"
+#line 13322 "ImportPage.c"
 }
 
 
@@ -13598,9 +13362,7 @@ static void import_page_class_init (ImportPageClass * klass) {
 #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = import_page_real_init_collect_ui_filenames;
 #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((PageClass *) klass)->init_collect_toggle_action_entries = import_page_real_init_collect_toggle_action_entries;
-#line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	((PageClass *) klass)->init_collect_action_entries = import_page_real_init_collect_action_entries;
+	((PageClass *) klass)->add_actions = import_page_real_add_actions;
 #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	((PageClass *) klass)->init_actions = import_page_real_init_actions;
 #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -13613,7 +13375,7 @@ static void import_page_class_init (ImportPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = import_page_real_get_search_view_filter;
 #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_page_finalize;
-#line 13609 "ImportPage.c"
+#line 13371 "ImportPage.c"
 }
 
 
@@ -13658,7 +13420,7 @@ static void import_page_instance_init (ImportPage * self) {
 	_tmp3_ = import_page_hide_imported_view_filter_new ();
 #line 695 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	self->priv->hide_imported_filter = _tmp3_;
-#line 13654 "ImportPage.c"
+#line 13416 "ImportPage.c"
 }
 
 
@@ -13712,7 +13474,7 @@ static void import_page_finalize (GObject* obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 457 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	G_OBJECT_CLASS (import_page_parent_class)->finalize (obj);
-#line 13708 "ImportPage.c"
+#line 13470 "ImportPage.c"
 }
 
 
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index db48634..352bba6 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -801,7 +801,7 @@ public class ImportPage : CheckerboardPage {
             
             // Find button
             Gtk.ToggleToolButton find_button = new Gtk.ToggleToolButton();
-            find_button.set_related_action(get_action("CommonDisplaySearchbar"));
+            find_button.set_action_name ("win.CommonDisplaySearchbar");
             
             toolbar.insert(find_button, -1);
             
@@ -811,14 +811,14 @@ public class ImportPage : CheckerboardPage {
             // Import selected
             Gtk.ToolButton import_selected_button = new Gtk.ToolButton(null, null);
             import_selected_button.set_icon_name(Resources.IMPORT);
-            import_selected_button.set_related_action(get_action("ImportSelected"));
+            import_selected_button.set_action_name ("win.ImportSelected");
             
             toolbar.insert(import_selected_button, -1);
             
             // Import all
             Gtk.ToolButton import_all_button = new Gtk.ToolButton(null, null);
             import_all_button.set_icon_name(Resources.IMPORT_ALL);
-            import_all_button.set_related_action(get_action("ImportAll"));
+            import_all_button.set_action_name ("win.ImportAll");
             
             toolbar.insert(import_all_button, -1);
 
@@ -864,35 +864,20 @@ public class ImportPage : CheckerboardPage {
         
         ui_filenames.add("import.ui");
     }
-    
-    protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries() {
-        Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries();
 
-        Gtk.ToggleActionEntry titles = { "ViewTitle", null, TRANSLATABLE, "<Ctrl><Shift>T",
-            TRANSLATABLE, on_display_titles, Config.Facade.get_instance().get_display_photo_titles() };
-        titles.label = _("_Titles");
-        titles.tooltip = _("Display the title of each photo");
-        toggle_actions += titles;
+    private const GLib.ActionEntry[] entries = {
+        { "ImportSelected", on_import_selected },
+        { "ImportAll", on_import_all },
+        // Toggle actions
+        { "ViewTitle", on_action_toggle, null, "false", on_display_titles },
+    };
 
-        return toggle_actions;
-    }
+    protected override void add_actions () {
+        base.add_actions ();
 
-    protected override Gtk.ActionEntry[] init_collect_action_entries() {
-        Gtk.ActionEntry[] actions = base.init_collect_action_entries();
-        
-        Gtk.ActionEntry import_selected = { "ImportSelected", Resources.IMPORT,
-            TRANSLATABLE, null, null, on_import_selected };
-        import_selected.label = _("Import _Selected");
-        import_selected.tooltip = _("Import the selected photos into your library");
-        actions += import_selected;
+        AppWindow.get_instance ().add_action_entries (entries, this);
 
-        Gtk.ActionEntry import_all = { "ImportAll", Resources.IMPORT_ALL, TRANSLATABLE,
-            null, null, on_import_all };
-        import_all.label = _("Import _All");
-        import_all.tooltip = _("Import all the photos into your library");
-        actions += import_all;
-
-        return actions;
+        (get_action ("ViewTitle") as GLib.SimpleAction).set_state (Config.Facade.get_instance ().get_display_photo_titles ());
     }
     
     public GPhoto.Camera get_camera() {
@@ -948,8 +933,7 @@ public class ImportPage : CheckerboardPage {
     private void on_view_changed() {
         set_action_sensitive("ImportSelected", !busy && refreshed && get_view().get_selected_count() > 0);
         set_action_sensitive("ImportAll", !busy && refreshed && get_view().get_count() > 0);
-        AppWindow.get_instance().set_common_action_sensitive("CommonSelectAll",
-            !busy && (get_view().get_count() > 0));
+        set_action_sensitive("CommonSelectAll", !busy && (get_view().get_count() > 0));
 
         update_toolbar_state();
     }
@@ -958,13 +942,15 @@ public class ImportPage : CheckerboardPage {
         search_filter.refresh();
     }
 
-    private void on_display_titles(Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active();
+    private void on_display_titles(GLib.SimpleAction action, Variant? value) {
+        bool display = value.get_boolean ();
 
         set_display_titles(display);
+
         Config.Facade.get_instance().set_display_photo_titles(display);
+        action.set_state (value);
     }
-    
+
     public override void switched_to() {
         set_display_titles(Config.Facade.get_instance().get_display_photo_titles());
         
@@ -1791,10 +1777,8 @@ public class ImportPage : CheckerboardPage {
 
     public override void set_display_titles(bool display) {
         base.set_display_titles(display);
-    
-        Gtk.ToggleAction? action = get_action("ViewTitle") as Gtk.ToggleAction;
-        if (action != null)
-            action.set_active(display);
+
+        set_action_active ("ViewTitle", display);
     }
     
     // Gets the search view filter for this page.
diff --git a/src/config/ConfigurationInterfaces.c b/src/config/ConfigurationInterfaces.c
index 9081d18..484b46a 100644
--- a/src/config/ConfigurationInterfaces.c
+++ b/src/config/ConfigurationInterfaces.c
@@ -2107,7 +2107,7 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2105 "ConfigurationInterfaces.c"
-				goto __catch80_configuration_error;
+				goto __catch79_configuration_error;
 			}
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2123,8 +2123,8 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 		return result;
 #line 2120 "ConfigurationInterfaces.c"
 	}
-	goto __finally80;
-	__catch80_configuration_error:
+	goto __finally79;
+	__catch79_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2144,7 +2144,7 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 		return result;
 #line 2141 "ConfigurationInterfaces.c"
 	}
-	__finally80:
+	__finally79:
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2185,7 +2185,7 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2183 "ConfigurationInterfaces.c"
-				goto __catch81_configuration_error;
+				goto __catch80_configuration_error;
 			}
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2196,8 +2196,8 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 #line 2192 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally81;
-	__catch81_configuration_error:
+	goto __finally80;
+	__catch80_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -2215,7 +2215,7 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 		return;
 #line 2212 "ConfigurationInterfaces.c"
 	}
-	__finally81:
+	__finally80:
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2265,7 +2265,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2263 "ConfigurationInterfaces.c"
-				goto __catch82_configuration_error;
+				goto __catch81_configuration_error;
 			}
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2287,8 +2287,8 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		return result;
 #line 2284 "ConfigurationInterfaces.c"
 	}
-	goto __finally82;
-	__catch82_configuration_error:
+	goto __finally81;
+	__catch81_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -2311,7 +2311,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		return result;
 #line 2308 "ConfigurationInterfaces.c"
 	}
-	__finally82:
+	__finally81:
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2355,7 +2355,7 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2353 "ConfigurationInterfaces.c"
-				goto __catch83_configuration_error;
+				goto __catch82_configuration_error;
 			}
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2366,8 +2366,8 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 #line 2362 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally83;
-	__catch83_configuration_error:
+	goto __finally82;
+	__catch82_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -2385,7 +2385,7 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 		return;
 #line 2382 "ConfigurationInterfaces.c"
 	}
-	__finally83:
+	__finally82:
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2434,7 +2434,7 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2432 "ConfigurationInterfaces.c"
-				goto __catch84_configuration_error;
+				goto __catch83_configuration_error;
 			}
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2450,8 +2450,8 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 		return result;
 #line 2447 "ConfigurationInterfaces.c"
 	}
-	goto __finally84;
-	__catch84_configuration_error:
+	goto __finally83;
+	__catch83_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2471,7 +2471,7 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 		return result;
 #line 2468 "ConfigurationInterfaces.c"
 	}
-	__finally84:
+	__finally83:
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2512,7 +2512,7 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2510 "ConfigurationInterfaces.c"
-				goto __catch85_configuration_error;
+				goto __catch84_configuration_error;
 			}
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2523,8 +2523,8 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 #line 2519 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally85;
-	__catch85_configuration_error:
+	goto __finally84;
+	__catch84_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -2542,7 +2542,7 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 		return;
 #line 2539 "ConfigurationInterfaces.c"
 	}
-	__finally85:
+	__finally84:
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2592,7 +2592,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2590 "ConfigurationInterfaces.c"
-				goto __catch86_configuration_error;
+				goto __catch85_configuration_error;
 			}
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2614,8 +2614,8 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		return result;
 #line 2611 "ConfigurationInterfaces.c"
 	}
-	goto __finally86;
-	__catch86_configuration_error:
+	goto __finally85;
+	__catch85_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -2638,7 +2638,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		return result;
 #line 2635 "ConfigurationInterfaces.c"
 	}
-	__finally86:
+	__finally85:
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2684,7 +2684,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2682 "ConfigurationInterfaces.c"
-				goto __catch87_configuration_error;
+				goto __catch86_configuration_error;
 			}
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2707,7 +2707,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2705 "ConfigurationInterfaces.c"
-				goto __catch87_configuration_error;
+				goto __catch86_configuration_error;
 			}
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2718,8 +2718,8 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 #line 2714 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally87;
-	__catch87_configuration_error:
+	goto __finally86;
+	__catch86_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2735,7 +2735,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		_g_error_free0 (err);
 #line 2732 "ConfigurationInterfaces.c"
 	}
-	__finally87:
+	__finally86:
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2785,7 +2785,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2783 "ConfigurationInterfaces.c"
-				goto __catch88_configuration_error;
+				goto __catch87_configuration_error;
 			}
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2807,8 +2807,8 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		return result;
 #line 2804 "ConfigurationInterfaces.c"
 	}
-	goto __finally88;
-	__catch88_configuration_error:
+	goto __finally87;
+	__catch87_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -2831,7 +2831,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		return result;
 #line 2828 "ConfigurationInterfaces.c"
 	}
-	__finally88:
+	__finally87:
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2877,7 +2877,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2875 "ConfigurationInterfaces.c"
-				goto __catch89_configuration_error;
+				goto __catch88_configuration_error;
 			}
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2900,7 +2900,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2898 "ConfigurationInterfaces.c"
-				goto __catch89_configuration_error;
+				goto __catch88_configuration_error;
 			}
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2911,8 +2911,8 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 #line 2907 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally89;
-	__catch89_configuration_error:
+	goto __finally88;
+	__catch88_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2928,7 +2928,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		_g_error_free0 (err);
 #line 2925 "ConfigurationInterfaces.c"
 	}
-	__finally89:
+	__finally88:
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2979,7 +2979,7 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 2977 "ConfigurationInterfaces.c"
-				goto __catch90_configuration_error;
+				goto __catch89_configuration_error;
 			}
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3009,8 +3009,8 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		return result;
 #line 3006 "ConfigurationInterfaces.c"
 	}
-	goto __finally90;
-	__catch90_configuration_error:
+	goto __finally89;
+	__catch89_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -3033,7 +3033,7 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		return result;
 #line 3030 "ConfigurationInterfaces.c"
 	}
-	__finally90:
+	__finally89:
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3083,7 +3083,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3081 "ConfigurationInterfaces.c"
-				goto __catch91_configuration_error;
+				goto __catch90_configuration_error;
 			}
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3094,8 +3094,8 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 #line 3090 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally91;
-	__catch91_configuration_error:
+	goto __finally90;
+	__catch90_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -3111,7 +3111,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		_g_error_free0 (err);
 #line 3108 "ConfigurationInterfaces.c"
 	}
-	__finally91:
+	__finally90:
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3161,7 +3161,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3159 "ConfigurationInterfaces.c"
-				goto __catch92_configuration_error;
+				goto __catch91_configuration_error;
 			}
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3183,8 +3183,8 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		return result;
 #line 3180 "ConfigurationInterfaces.c"
 	}
-	goto __finally92;
-	__catch92_configuration_error:
+	goto __finally91;
+	__catch91_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -3207,7 +3207,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		return result;
 #line 3204 "ConfigurationInterfaces.c"
 	}
-	__finally92:
+	__finally91:
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3251,7 +3251,7 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3249 "ConfigurationInterfaces.c"
-				goto __catch93_configuration_error;
+				goto __catch92_configuration_error;
 			}
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3262,8 +3262,8 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 #line 3258 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally93;
-	__catch93_configuration_error:
+	goto __finally92;
+	__catch92_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -3279,7 +3279,7 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 		_g_error_free0 (err);
 #line 3276 "ConfigurationInterfaces.c"
 	}
-	__finally93:
+	__finally92:
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3346,7 +3346,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3344 "ConfigurationInterfaces.c"
-				goto __catch94_configuration_error;
+				goto __catch93_configuration_error;
 			}
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3375,7 +3375,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3373 "ConfigurationInterfaces.c"
-				goto __catch94_configuration_error;
+				goto __catch93_configuration_error;
 			}
 #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3402,7 +3402,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3400 "ConfigurationInterfaces.c"
-				goto __catch94_configuration_error;
+				goto __catch93_configuration_error;
 			}
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3420,8 +3420,8 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_);
 #line 3417 "ConfigurationInterfaces.c"
 	}
-	goto __finally94;
-	__catch94_configuration_error:
+	goto __finally93;
+	__catch93_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
@@ -3437,7 +3437,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		_g_error_free0 (err);
 #line 3434 "ConfigurationInterfaces.c"
 	}
-	__finally94:
+	__finally93:
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3504,7 +3504,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3502 "ConfigurationInterfaces.c"
-				goto __catch95_configuration_error;
+				goto __catch94_configuration_error;
 			}
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3531,7 +3531,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3529 "ConfigurationInterfaces.c"
-				goto __catch95_configuration_error;
+				goto __catch94_configuration_error;
 			}
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3558,7 +3558,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3556 "ConfigurationInterfaces.c"
-				goto __catch95_configuration_error;
+				goto __catch94_configuration_error;
 			}
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3569,8 +3569,8 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 #line 3565 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally95;
-	__catch95_configuration_error:
+	goto __finally94;
+	__catch94_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp11_ = NULL;
@@ -3586,7 +3586,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		_g_error_free0 (err);
 #line 3583 "ConfigurationInterfaces.c"
 	}
-	__finally95:
+	__finally94:
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3635,7 +3635,7 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3633 "ConfigurationInterfaces.c"
-				goto __catch96_configuration_error;
+				goto __catch95_configuration_error;
 			}
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3651,8 +3651,8 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 		return result;
 #line 3648 "ConfigurationInterfaces.c"
 	}
-	goto __finally96;
-	__catch96_configuration_error:
+	goto __finally95;
+	__catch95_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -3672,7 +3672,7 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 		return result;
 #line 3669 "ConfigurationInterfaces.c"
 	}
-	__finally96:
+	__finally95:
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3713,7 +3713,7 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3711 "ConfigurationInterfaces.c"
-				goto __catch97_configuration_error;
+				goto __catch96_configuration_error;
 			}
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3724,8 +3724,8 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 #line 3720 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally97;
-	__catch97_configuration_error:
+	goto __finally96;
+	__catch96_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -3741,7 +3741,7 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 		_g_error_free0 (err);
 #line 3738 "ConfigurationInterfaces.c"
 	}
-	__finally97:
+	__finally96:
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3790,7 +3790,7 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3788 "ConfigurationInterfaces.c"
-				goto __catch98_configuration_error;
+				goto __catch97_configuration_error;
 			}
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3806,8 +3806,8 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 		return result;
 #line 3803 "ConfigurationInterfaces.c"
 	}
-	goto __finally98;
-	__catch98_configuration_error:
+	goto __finally97;
+	__catch97_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -3827,7 +3827,7 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 		return result;
 #line 3824 "ConfigurationInterfaces.c"
 	}
-	__finally98:
+	__finally97:
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3868,7 +3868,7 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3866 "ConfigurationInterfaces.c"
-				goto __catch99_configuration_error;
+				goto __catch98_configuration_error;
 			}
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3879,8 +3879,8 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 #line 3875 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally99;
-	__catch99_configuration_error:
+	goto __finally98;
+	__catch98_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -3896,7 +3896,7 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 		_g_error_free0 (err);
 #line 3893 "ConfigurationInterfaces.c"
 	}
-	__finally99:
+	__finally98:
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3945,7 +3945,7 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 3943 "ConfigurationInterfaces.c"
-				goto __catch100_configuration_error;
+				goto __catch99_configuration_error;
 			}
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3961,8 +3961,8 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 		return result;
 #line 3958 "ConfigurationInterfaces.c"
 	}
-	goto __finally100;
-	__catch100_configuration_error:
+	goto __finally99;
+	__catch99_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -3982,7 +3982,7 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 		return result;
 #line 3979 "ConfigurationInterfaces.c"
 	}
-	__finally100:
+	__finally99:
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4023,7 +4023,7 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4021 "ConfigurationInterfaces.c"
-				goto __catch101_configuration_error;
+				goto __catch100_configuration_error;
 			}
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4034,8 +4034,8 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 #line 4030 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally101;
-	__catch101_configuration_error:
+	goto __finally100;
+	__catch100_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4051,7 +4051,7 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 4048 "ConfigurationInterfaces.c"
 	}
-	__finally101:
+	__finally100:
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4100,7 +4100,7 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4098 "ConfigurationInterfaces.c"
-				goto __catch102_configuration_error;
+				goto __catch101_configuration_error;
 			}
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4116,8 +4116,8 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 		return result;
 #line 4113 "ConfigurationInterfaces.c"
 	}
-	goto __finally102;
-	__catch102_configuration_error:
+	goto __finally101;
+	__catch101_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4137,7 +4137,7 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 		return result;
 #line 4134 "ConfigurationInterfaces.c"
 	}
-	__finally102:
+	__finally101:
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4178,7 +4178,7 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4176 "ConfigurationInterfaces.c"
-				goto __catch103_configuration_error;
+				goto __catch102_configuration_error;
 			}
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4189,8 +4189,8 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 #line 4185 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally103;
-	__catch103_configuration_error:
+	goto __finally102;
+	__catch102_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4206,7 +4206,7 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 4203 "ConfigurationInterfaces.c"
 	}
-	__finally103:
+	__finally102:
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4255,7 +4255,7 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4253 "ConfigurationInterfaces.c"
-				goto __catch104_configuration_error;
+				goto __catch103_configuration_error;
 			}
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4271,8 +4271,8 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 		return result;
 #line 4268 "ConfigurationInterfaces.c"
 	}
-	goto __finally104;
-	__catch104_configuration_error:
+	goto __finally103;
+	__catch103_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4292,7 +4292,7 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 		return result;
 #line 4289 "ConfigurationInterfaces.c"
 	}
-	__finally104:
+	__finally103:
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4333,7 +4333,7 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4331 "ConfigurationInterfaces.c"
-				goto __catch105_configuration_error;
+				goto __catch104_configuration_error;
 			}
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4344,8 +4344,8 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 #line 4340 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally105;
-	__catch105_configuration_error:
+	goto __finally104;
+	__catch104_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4361,7 +4361,7 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 		_g_error_free0 (err);
 #line 4358 "ConfigurationInterfaces.c"
 	}
-	__finally105:
+	__finally104:
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4410,7 +4410,7 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4408 "ConfigurationInterfaces.c"
-				goto __catch106_configuration_error;
+				goto __catch105_configuration_error;
 			}
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4426,8 +4426,8 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 		return result;
 #line 4423 "ConfigurationInterfaces.c"
 	}
-	goto __finally106;
-	__catch106_configuration_error:
+	goto __finally105;
+	__catch105_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4447,7 +4447,7 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 		return result;
 #line 4444 "ConfigurationInterfaces.c"
 	}
-	__finally106:
+	__finally105:
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4488,7 +4488,7 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4486 "ConfigurationInterfaces.c"
-				goto __catch107_configuration_error;
+				goto __catch106_configuration_error;
 			}
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4499,8 +4499,8 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 #line 4495 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally107;
-	__catch107_configuration_error:
+	goto __finally106;
+	__catch106_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4516,7 +4516,7 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 		_g_error_free0 (err);
 #line 4513 "ConfigurationInterfaces.c"
 	}
-	__finally107:
+	__finally106:
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4565,7 +4565,7 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4563 "ConfigurationInterfaces.c"
-				goto __catch108_configuration_error;
+				goto __catch107_configuration_error;
 			}
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4581,8 +4581,8 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 		return result;
 #line 4578 "ConfigurationInterfaces.c"
 	}
-	goto __finally108;
-	__catch108_configuration_error:
+	goto __finally107;
+	__catch107_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4602,7 +4602,7 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 		return result;
 #line 4599 "ConfigurationInterfaces.c"
 	}
-	__finally108:
+	__finally107:
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4643,7 +4643,7 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4641 "ConfigurationInterfaces.c"
-				goto __catch109_configuration_error;
+				goto __catch108_configuration_error;
 			}
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4654,8 +4654,8 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 #line 4650 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally109;
-	__catch109_configuration_error:
+	goto __finally108;
+	__catch108_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4671,7 +4671,7 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 		_g_error_free0 (err);
 #line 4668 "ConfigurationInterfaces.c"
 	}
-	__finally109:
+	__finally108:
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4720,7 +4720,7 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4718 "ConfigurationInterfaces.c"
-				goto __catch110_configuration_error;
+				goto __catch109_configuration_error;
 			}
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4736,8 +4736,8 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 		return result;
 #line 4733 "ConfigurationInterfaces.c"
 	}
-	goto __finally110;
-	__catch110_configuration_error:
+	goto __finally109;
+	__catch109_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4757,7 +4757,7 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 		return result;
 #line 4754 "ConfigurationInterfaces.c"
 	}
-	__finally110:
+	__finally109:
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4798,7 +4798,7 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4796 "ConfigurationInterfaces.c"
-				goto __catch111_configuration_error;
+				goto __catch110_configuration_error;
 			}
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4809,8 +4809,8 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 #line 4805 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally111;
-	__catch111_configuration_error:
+	goto __finally110;
+	__catch110_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4826,7 +4826,7 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 		_g_error_free0 (err);
 #line 4823 "ConfigurationInterfaces.c"
 	}
-	__finally111:
+	__finally110:
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4875,7 +4875,7 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4873 "ConfigurationInterfaces.c"
-				goto __catch112_configuration_error;
+				goto __catch111_configuration_error;
 			}
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4891,8 +4891,8 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 		return result;
 #line 4888 "ConfigurationInterfaces.c"
 	}
-	goto __finally112;
-	__catch112_configuration_error:
+	goto __finally111;
+	__catch111_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4912,7 +4912,7 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 		return result;
 #line 4909 "ConfigurationInterfaces.c"
 	}
-	__finally112:
+	__finally111:
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4953,7 +4953,7 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4951 "ConfigurationInterfaces.c"
-				goto __catch113_configuration_error;
+				goto __catch112_configuration_error;
 			}
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4964,8 +4964,8 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 #line 4960 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally113;
-	__catch113_configuration_error:
+	goto __finally112;
+	__catch112_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4981,7 +4981,7 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 		_g_error_free0 (err);
 #line 4978 "ConfigurationInterfaces.c"
 	}
-	__finally113:
+	__finally112:
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5030,7 +5030,7 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5028 "ConfigurationInterfaces.c"
-				goto __catch114_configuration_error;
+				goto __catch113_configuration_error;
 			}
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5046,8 +5046,8 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 		return result;
 #line 5043 "ConfigurationInterfaces.c"
 	}
-	goto __finally114;
-	__catch114_configuration_error:
+	goto __finally113;
+	__catch113_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -5067,7 +5067,7 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 		return result;
 #line 5064 "ConfigurationInterfaces.c"
 	}
-	__finally114:
+	__finally113:
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5108,7 +5108,7 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5106 "ConfigurationInterfaces.c"
-				goto __catch115_configuration_error;
+				goto __catch114_configuration_error;
 			}
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5119,8 +5119,8 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 #line 5115 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally115;
-	__catch115_configuration_error:
+	goto __finally114;
+	__catch114_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5136,7 +5136,7 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 		_g_error_free0 (err);
 #line 5133 "ConfigurationInterfaces.c"
 	}
-	__finally115:
+	__finally114:
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5196,7 +5196,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5194 "ConfigurationInterfaces.c"
-				goto __catch116_configuration_error;
+				goto __catch115_configuration_error;
 			}
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5225,7 +5225,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5223 "ConfigurationInterfaces.c"
-				goto __catch116_configuration_error;
+				goto __catch115_configuration_error;
 			}
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5239,8 +5239,8 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		_vala_sort_by = _tmp5_;
 #line 5236 "ConfigurationInterfaces.c"
 	}
-	goto __finally116;
-	__catch116_configuration_error:
+	goto __finally115;
+	__catch115_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -5256,7 +5256,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		_g_error_free0 (err);
 #line 5253 "ConfigurationInterfaces.c"
 	}
-	__finally116:
+	__finally115:
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5315,7 +5315,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5313 "ConfigurationInterfaces.c"
-				goto __catch117_configuration_error;
+				goto __catch116_configuration_error;
 			}
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5340,7 +5340,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5338 "ConfigurationInterfaces.c"
-				goto __catch117_configuration_error;
+				goto __catch116_configuration_error;
 			}
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5351,8 +5351,8 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 #line 5347 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally117;
-	__catch117_configuration_error:
+	goto __finally116;
+	__catch116_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5368,7 +5368,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		_g_error_free0 (err);
 #line 5365 "ConfigurationInterfaces.c"
 	}
-	__finally117:
+	__finally116:
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5417,7 +5417,7 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5415 "ConfigurationInterfaces.c"
-				goto __catch118_configuration_error;
+				goto __catch117_configuration_error;
 			}
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5433,8 +5433,8 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 		return result;
 #line 5430 "ConfigurationInterfaces.c"
 	}
-	goto __finally118;
-	__catch118_configuration_error:
+	goto __finally117;
+	__catch117_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -5454,7 +5454,7 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 		return result;
 #line 5451 "ConfigurationInterfaces.c"
 	}
-	__finally118:
+	__finally117:
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5495,7 +5495,7 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5493 "ConfigurationInterfaces.c"
-				goto __catch119_configuration_error;
+				goto __catch118_configuration_error;
 			}
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5506,8 +5506,8 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 #line 5502 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally119;
-	__catch119_configuration_error:
+	goto __finally118;
+	__catch118_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5525,7 +5525,7 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 		return;
 #line 5522 "ConfigurationInterfaces.c"
 	}
-	__finally119:
+	__finally118:
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5575,7 +5575,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5573 "ConfigurationInterfaces.c"
-				goto __catch120_configuration_error;
+				goto __catch119_configuration_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5597,8 +5597,8 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		return result;
 #line 5594 "ConfigurationInterfaces.c"
 	}
-	goto __finally120;
-	__catch120_configuration_error:
+	goto __finally119;
+	__catch119_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5621,7 +5621,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		return result;
 #line 5618 "ConfigurationInterfaces.c"
 	}
-	__finally120:
+	__finally119:
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5665,7 +5665,7 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5663 "ConfigurationInterfaces.c"
-				goto __catch121_configuration_error;
+				goto __catch120_configuration_error;
 			}
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5676,8 +5676,8 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 #line 5672 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally121;
-	__catch121_configuration_error:
+	goto __finally120;
+	__catch120_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5695,7 +5695,7 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 		return;
 #line 5692 "ConfigurationInterfaces.c"
 	}
-	__finally121:
+	__finally120:
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5745,7 +5745,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5743 "ConfigurationInterfaces.c"
-				goto __catch122_configuration_error;
+				goto __catch121_configuration_error;
 			}
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5767,8 +5767,8 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		return result;
 #line 5764 "ConfigurationInterfaces.c"
 	}
-	goto __finally122;
-	__catch122_configuration_error:
+	goto __finally121;
+	__catch121_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5791,7 +5791,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		return result;
 #line 5788 "ConfigurationInterfaces.c"
 	}
-	__finally122:
+	__finally121:
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5835,7 +5835,7 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5833 "ConfigurationInterfaces.c"
-				goto __catch123_configuration_error;
+				goto __catch122_configuration_error;
 			}
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5846,8 +5846,8 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 #line 5842 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally123;
-	__catch123_configuration_error:
+	goto __finally122;
+	__catch122_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5865,7 +5865,7 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 		return;
 #line 5862 "ConfigurationInterfaces.c"
 	}
-	__finally123:
+	__finally122:
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5914,7 +5914,7 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5912 "ConfigurationInterfaces.c"
-				goto __catch124_configuration_error;
+				goto __catch123_configuration_error;
 			}
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5930,8 +5930,8 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 		return result;
 #line 5927 "ConfigurationInterfaces.c"
 	}
-	goto __finally124;
-	__catch124_configuration_error:
+	goto __finally123;
+	__catch123_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -5951,7 +5951,7 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 		return result;
 #line 5948 "ConfigurationInterfaces.c"
 	}
-	__finally124:
+	__finally123:
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5992,7 +5992,7 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5990 "ConfigurationInterfaces.c"
-				goto __catch125_configuration_error;
+				goto __catch124_configuration_error;
 			}
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6003,8 +6003,8 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 #line 5999 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally125;
-	__catch125_configuration_error:
+	goto __finally124;
+	__catch124_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6022,7 +6022,7 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 		return;
 #line 6019 "ConfigurationInterfaces.c"
 	}
-	__finally125:
+	__finally124:
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6071,7 +6071,7 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 6069 "ConfigurationInterfaces.c"
-				goto __catch126_configuration_error;
+				goto __catch125_configuration_error;
 			}
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6087,8 +6087,8 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 		return result;
 #line 6084 "ConfigurationInterfaces.c"
 	}
-	goto __finally126;
-	__catch126_configuration_error:
+	goto __finally125;
+	__catch125_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6108,7 +6108,7 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 		return result;
 #line 6105 "ConfigurationInterfaces.c"
 	}
-	__finally126:
+	__finally125:
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6149,7 +6149,7 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 6147 "ConfigurationInterfaces.c"
-				goto __catch127_configuration_error;
+				goto __catch126_configuration_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6160,8 +6160,8 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 #line 6156 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally127;
-	__catch127_configuration_error:
+	goto __finally126;
+	__catch126_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6179,7 +6179,7 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 		return;
 #line 6176 "ConfigurationInterfaces.c"
 	}
-	__finally127:
+	__finally126:
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6228,7 +6228,7 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 6226 "ConfigurationInterfaces.c"
-				goto __catch128_configuration_error;
+				goto __catch127_configuration_error;
 			}
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6244,8 +6244,8 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 		return result;
 #line 6241 "ConfigurationInterfaces.c"
 	}
-	goto __finally128;
-	__catch128_configuration_error:
+	goto __finally127;
+	__catch127_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6265,7 +6265,7 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 		return result;
 #line 6262 "ConfigurationInterfaces.c"
 	}
-	__finally128:
+	__finally127:
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6306,7 +6306,7 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 6304 "ConfigurationInterfaces.c"
-				goto __catch129_configuration_error;
+				goto __catch128_configuration_error;
 			}
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6317,8 +6317,8 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 #line 6313 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally129;
-	__catch129_configuration_error:
+	goto __finally128;
+	__catch128_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6336,7 +6336,7 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 		return;
 #line 6333 "ConfigurationInterfaces.c"
 	}
-	__finally129:
+	__finally128:
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6386,7 +6386,7 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 6384 "ConfigurationInterfaces.c"
-				goto __catch130_configuration_error;
+				goto __catch129_configuration_error;
 			}
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6404,8 +6404,8 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 		return result;
 #line 6401 "ConfigurationInterfaces.c"
 	}
-	goto __finally130;
-	__catch130_configuration_error:
+	goto __finally129;
+	__catch129_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -6425,7 +6425,7 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 		return result;
 #line 6422 "ConfigurationInterfaces.c"
 	}
-	__finally130:
+	__finally129:
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6469,7 +6469,7 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 6467 "ConfigurationInterfaces.c"
-				goto __catch131_configuration_error;
+				goto __catch130_configuration_error;
 			}
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6480,8 +6480,8 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 #line 6476 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally131;
-	__catch131_configuration_error:
+	goto __finally130;
+	__catch130_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -6499,7 +6499,7 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 		return;
 #line 6496 "ConfigurationInterfaces.c"
 	}
-	__finally131:
+	__finally130:
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6548,7 +6548,7 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 6546 "ConfigurationInterfaces.c"
-				goto __catch132_configuration_error;
+				goto __catch131_configuration_error;
 			}
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6564,8 +6564,8 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 		return result;
 #line 6561 "ConfigurationInterfaces.c"
 	}
-	goto __finally132;
-	__catch132_configuration_error:
+	goto __finally131;
+	__catch131_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6585,7 +6585,7 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 		return result;
 #line 6582 "ConfigurationInterfaces.c"
 	}
-	__finally132:
+	__finally131:
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6626,7 +6626,7 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 6624 "ConfigurationInterfaces.c"
-				goto __catch133_configuration_error;
+				goto __catch132_configuration_error;
 			}
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6637,8 +6637,8 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 #line 6633 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally133;
-	__catch133_configuration_error:
+	goto __finally132;
+	__catch132_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6656,7 +6656,7 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 		return;
 #line 6653 "ConfigurationInterfaces.c"
 	}
-	__finally133:
+	__finally132:
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6705,7 +6705,7 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 6703 "ConfigurationInterfaces.c"
-				goto __catch134_configuration_error;
+				goto __catch133_configuration_error;
 			}
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6721,8 +6721,8 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 		return result;
 #line 6718 "ConfigurationInterfaces.c"
 	}
-	goto __finally134;
-	__catch134_configuration_error:
+	goto __finally133;
+	__catch133_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6742,7 +6742,7 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 		return result;
 #line 6739 "ConfigurationInterfaces.c"
 	}
-	__finally134:
+	__finally133:
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6783,7 +6783,7 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 6781 "ConfigurationInterfaces.c"
-				goto __catch135_configuration_error;
+				goto __catch134_configuration_error;
 			}
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6794,8 +6794,8 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 #line 6790 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally135;
-	__catch135_configuration_error:
+	goto __finally134;
+	__catch134_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6813,7 +6813,7 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 		return;
 #line 6810 "ConfigurationInterfaces.c"
 	}
-	__finally135:
+	__finally134:
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6863,7 +6863,7 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 6861 "ConfigurationInterfaces.c"
-				goto __catch136_configuration_error;
+				goto __catch135_configuration_error;
 			}
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6883,8 +6883,8 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		return result;
 #line 6880 "ConfigurationInterfaces.c"
 	}
-	goto __finally136;
-	__catch136_configuration_error:
+	goto __finally135;
+	__catch135_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -6904,7 +6904,7 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		return result;
 #line 6901 "ConfigurationInterfaces.c"
 	}
-	__finally136:
+	__finally135:
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6953,7 +6953,7 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 6951 "ConfigurationInterfaces.c"
-				goto __catch137_configuration_error;
+				goto __catch136_configuration_error;
 			}
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6964,8 +6964,8 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 #line 6960 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally137;
-	__catch137_configuration_error:
+	goto __finally136;
+	__catch136_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6983,7 +6983,7 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 		return;
 #line 6980 "ConfigurationInterfaces.c"
 	}
-	__finally137:
+	__finally136:
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7032,7 +7032,7 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7030 "ConfigurationInterfaces.c"
-				goto __catch138_configuration_error;
+				goto __catch137_configuration_error;
 			}
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7048,8 +7048,8 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 		return result;
 #line 7045 "ConfigurationInterfaces.c"
 	}
-	goto __finally138;
-	__catch138_configuration_error:
+	goto __finally137;
+	__catch137_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7069,7 +7069,7 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 		return result;
 #line 7066 "ConfigurationInterfaces.c"
 	}
-	__finally138:
+	__finally137:
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7110,7 +7110,7 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7108 "ConfigurationInterfaces.c"
-				goto __catch139_configuration_error;
+				goto __catch138_configuration_error;
 			}
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7121,8 +7121,8 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 #line 7117 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally139;
-	__catch139_configuration_error:
+	goto __finally138;
+	__catch138_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7138,7 +7138,7 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 		_g_error_free0 (err);
 #line 7135 "ConfigurationInterfaces.c"
 	}
-	__finally139:
+	__finally138:
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7188,7 +7188,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7186 "ConfigurationInterfaces.c"
-				goto __catch140_configuration_error;
+				goto __catch139_configuration_error;
 			}
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7210,8 +7210,8 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		return result;
 #line 7207 "ConfigurationInterfaces.c"
 	}
-	goto __finally140;
-	__catch140_configuration_error:
+	goto __finally139;
+	__catch139_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -7234,7 +7234,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		return result;
 #line 7231 "ConfigurationInterfaces.c"
 	}
-	__finally140:
+	__finally139:
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7278,7 +7278,7 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7276 "ConfigurationInterfaces.c"
-				goto __catch141_configuration_error;
+				goto __catch140_configuration_error;
 			}
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7289,8 +7289,8 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 #line 7285 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally141;
-	__catch141_configuration_error:
+	goto __finally140;
+	__catch140_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7306,7 +7306,7 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 		_g_error_free0 (err);
 #line 7303 "ConfigurationInterfaces.c"
 	}
-	__finally141:
+	__finally140:
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7355,7 +7355,7 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7353 "ConfigurationInterfaces.c"
-				goto __catch142_configuration_error;
+				goto __catch141_configuration_error;
 			}
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7371,8 +7371,8 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 		return result;
 #line 7368 "ConfigurationInterfaces.c"
 	}
-	goto __finally142;
-	__catch142_configuration_error:
+	goto __finally141;
+	__catch141_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7392,7 +7392,7 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 		return result;
 #line 7389 "ConfigurationInterfaces.c"
 	}
-	__finally142:
+	__finally141:
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7433,7 +7433,7 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7431 "ConfigurationInterfaces.c"
-				goto __catch143_configuration_error;
+				goto __catch142_configuration_error;
 			}
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7444,8 +7444,8 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 #line 7440 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally143;
-	__catch143_configuration_error:
+	goto __finally142;
+	__catch142_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7461,7 +7461,7 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 7458 "ConfigurationInterfaces.c"
 	}
-	__finally143:
+	__finally142:
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7510,7 +7510,7 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7508 "ConfigurationInterfaces.c"
-				goto __catch144_configuration_error;
+				goto __catch143_configuration_error;
 			}
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7526,8 +7526,8 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 		return result;
 #line 7523 "ConfigurationInterfaces.c"
 	}
-	goto __finally144;
-	__catch144_configuration_error:
+	goto __finally143;
+	__catch143_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7547,7 +7547,7 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 		return result;
 #line 7544 "ConfigurationInterfaces.c"
 	}
-	__finally144:
+	__finally143:
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7588,7 +7588,7 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7586 "ConfigurationInterfaces.c"
-				goto __catch145_configuration_error;
+				goto __catch144_configuration_error;
 			}
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7599,8 +7599,8 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 #line 7595 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally145;
-	__catch145_configuration_error:
+	goto __finally144;
+	__catch144_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7616,7 +7616,7 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 		_g_error_free0 (err);
 #line 7613 "ConfigurationInterfaces.c"
 	}
-	__finally145:
+	__finally144:
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7665,7 +7665,7 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7663 "ConfigurationInterfaces.c"
-				goto __catch146_configuration_error;
+				goto __catch145_configuration_error;
 			}
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7681,8 +7681,8 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 		return result;
 #line 7678 "ConfigurationInterfaces.c"
 	}
-	goto __finally146;
-	__catch146_configuration_error:
+	goto __finally145;
+	__catch145_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7702,7 +7702,7 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 		return result;
 #line 7699 "ConfigurationInterfaces.c"
 	}
-	__finally146:
+	__finally145:
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7743,7 +7743,7 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7741 "ConfigurationInterfaces.c"
-				goto __catch147_configuration_error;
+				goto __catch146_configuration_error;
 			}
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7754,8 +7754,8 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 #line 7750 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally147;
-	__catch147_configuration_error:
+	goto __finally146;
+	__catch146_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7771,7 +7771,7 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 7768 "ConfigurationInterfaces.c"
 	}
-	__finally147:
+	__finally146:
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7820,7 +7820,7 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7818 "ConfigurationInterfaces.c"
-				goto __catch148_configuration_error;
+				goto __catch147_configuration_error;
 			}
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7836,8 +7836,8 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 		return result;
 #line 7833 "ConfigurationInterfaces.c"
 	}
-	goto __finally148;
-	__catch148_configuration_error:
+	goto __finally147;
+	__catch147_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7857,7 +7857,7 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 		return result;
 #line 7854 "ConfigurationInterfaces.c"
 	}
-	__finally148:
+	__finally147:
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7898,7 +7898,7 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7896 "ConfigurationInterfaces.c"
-				goto __catch149_configuration_error;
+				goto __catch148_configuration_error;
 			}
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7909,8 +7909,8 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 #line 7905 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally149;
-	__catch149_configuration_error:
+	goto __finally148;
+	__catch148_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7926,7 +7926,7 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 		_g_error_free0 (err);
 #line 7923 "ConfigurationInterfaces.c"
 	}
-	__finally149:
+	__finally148:
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7975,7 +7975,7 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 7973 "ConfigurationInterfaces.c"
-				goto __catch150_configuration_error;
+				goto __catch149_configuration_error;
 			}
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7991,8 +7991,8 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 		return result;
 #line 7988 "ConfigurationInterfaces.c"
 	}
-	goto __finally150;
-	__catch150_configuration_error:
+	goto __finally149;
+	__catch149_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -8012,7 +8012,7 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 		return result;
 #line 8009 "ConfigurationInterfaces.c"
 	}
-	__finally150:
+	__finally149:
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8053,7 +8053,7 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8051 "ConfigurationInterfaces.c"
-				goto __catch151_configuration_error;
+				goto __catch150_configuration_error;
 			}
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8064,8 +8064,8 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 #line 8060 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally151;
-	__catch151_configuration_error:
+	goto __finally150;
+	__catch150_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -8081,7 +8081,7 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 8078 "ConfigurationInterfaces.c"
 	}
-	__finally151:
+	__finally150:
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8131,7 +8131,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8129 "ConfigurationInterfaces.c"
-				goto __catch152_configuration_error;
+				goto __catch151_configuration_error;
 			}
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8153,8 +8153,8 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		return result;
 #line 8150 "ConfigurationInterfaces.c"
 	}
-	goto __finally152;
-	__catch152_configuration_error:
+	goto __finally151;
+	__catch151_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -8177,7 +8177,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		return result;
 #line 8174 "ConfigurationInterfaces.c"
 	}
-	__finally152:
+	__finally151:
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8221,7 +8221,7 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8219 "ConfigurationInterfaces.c"
-				goto __catch153_configuration_error;
+				goto __catch152_configuration_error;
 			}
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8232,8 +8232,8 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 #line 8228 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally153;
-	__catch153_configuration_error:
+	goto __finally152;
+	__catch152_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -8249,7 +8249,7 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 		_g_error_free0 (err);
 #line 8246 "ConfigurationInterfaces.c"
 	}
-	__finally153:
+	__finally152:
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8299,7 +8299,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8297 "ConfigurationInterfaces.c"
-				goto __catch154_configuration_error;
+				goto __catch153_configuration_error;
 			}
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8321,8 +8321,8 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		return result;
 #line 8318 "ConfigurationInterfaces.c"
 	}
-	goto __finally154;
-	__catch154_configuration_error:
+	goto __finally153;
+	__catch153_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -8345,7 +8345,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		return result;
 #line 8342 "ConfigurationInterfaces.c"
 	}
-	__finally154:
+	__finally153:
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8389,7 +8389,7 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8387 "ConfigurationInterfaces.c"
-				goto __catch155_configuration_error;
+				goto __catch154_configuration_error;
 			}
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8400,8 +8400,8 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 #line 8396 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally155;
-	__catch155_configuration_error:
+	goto __finally154;
+	__catch154_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -8417,7 +8417,7 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 		_g_error_free0 (err);
 #line 8414 "ConfigurationInterfaces.c"
 	}
-	__finally155:
+	__finally154:
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8477,7 +8477,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8475 "ConfigurationInterfaces.c"
-				goto __catch156_configuration_error;
+				goto __catch155_configuration_error;
 			}
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8506,7 +8506,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8504 "ConfigurationInterfaces.c"
-				goto __catch156_configuration_error;
+				goto __catch155_configuration_error;
 			}
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8520,8 +8520,8 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		_vala_sort_by = _tmp5_;
 #line 8517 "ConfigurationInterfaces.c"
 	}
-	goto __finally156;
-	__catch156_configuration_error:
+	goto __finally155;
+	__catch155_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -8537,7 +8537,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		_g_error_free0 (err);
 #line 8534 "ConfigurationInterfaces.c"
 	}
-	__finally156:
+	__finally155:
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8596,7 +8596,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8594 "ConfigurationInterfaces.c"
-				goto __catch157_configuration_error;
+				goto __catch156_configuration_error;
 			}
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8621,7 +8621,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8619 "ConfigurationInterfaces.c"
-				goto __catch157_configuration_error;
+				goto __catch156_configuration_error;
 			}
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8632,8 +8632,8 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 #line 8628 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally157;
-	__catch157_configuration_error:
+	goto __finally156;
+	__catch156_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -8649,7 +8649,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		_g_error_free0 (err);
 #line 8646 "ConfigurationInterfaces.c"
 	}
-	__finally157:
+	__finally156:
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8716,7 +8716,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8714 "ConfigurationInterfaces.c"
-				goto __catch158_configuration_error;
+				goto __catch157_configuration_error;
 			}
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8745,7 +8745,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8743 "ConfigurationInterfaces.c"
-				goto __catch158_configuration_error;
+				goto __catch157_configuration_error;
 			}
 #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8772,7 +8772,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8770 "ConfigurationInterfaces.c"
-				goto __catch158_configuration_error;
+				goto __catch157_configuration_error;
 			}
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8790,8 +8790,8 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_);
 #line 8787 "ConfigurationInterfaces.c"
 	}
-	goto __finally158;
-	__catch158_configuration_error:
+	goto __finally157;
+	__catch157_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
@@ -8807,7 +8807,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		_g_error_free0 (err);
 #line 8804 "ConfigurationInterfaces.c"
 	}
-	__finally158:
+	__finally157:
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8874,7 +8874,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8872 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+				goto __catch158_configuration_error;
 			}
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8901,7 +8901,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8899 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+				goto __catch158_configuration_error;
 			}
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8928,7 +8928,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 8926 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+				goto __catch158_configuration_error;
 			}
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8939,8 +8939,8 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 #line 8935 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally159;
-	__catch159_configuration_error:
+	goto __finally158;
+	__catch158_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp11_ = NULL;
@@ -8956,7 +8956,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		_g_error_free0 (err);
 #line 8953 "ConfigurationInterfaces.c"
 	}
-	__finally159:
+	__finally158:
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9005,7 +9005,7 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9003 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+				goto __catch159_configuration_error;
 			}
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9021,8 +9021,8 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 		return result;
 #line 9018 "ConfigurationInterfaces.c"
 	}
-	goto __finally160;
-	__catch160_configuration_error:
+	goto __finally159;
+	__catch159_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9042,7 +9042,7 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 		return result;
 #line 9039 "ConfigurationInterfaces.c"
 	}
-	__finally160:
+	__finally159:
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9083,7 +9083,7 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9081 "ConfigurationInterfaces.c"
-				goto __catch161_configuration_error;
+				goto __catch160_configuration_error;
 			}
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9094,8 +9094,8 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 #line 9090 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally161;
-	__catch161_configuration_error:
+	goto __finally160;
+	__catch160_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9111,7 +9111,7 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 9108 "ConfigurationInterfaces.c"
 	}
-	__finally161:
+	__finally160:
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9160,7 +9160,7 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9158 "ConfigurationInterfaces.c"
-				goto __catch162_configuration_error;
+				goto __catch161_configuration_error;
 			}
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9176,8 +9176,8 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 		return result;
 #line 9173 "ConfigurationInterfaces.c"
 	}
-	goto __finally162;
-	__catch162_configuration_error:
+	goto __finally161;
+	__catch161_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9203,7 +9203,7 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 		return result;
 #line 9200 "ConfigurationInterfaces.c"
 	}
-	__finally162:
+	__finally161:
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9244,7 +9244,7 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9242 "ConfigurationInterfaces.c"
-				goto __catch163_configuration_error;
+				goto __catch162_configuration_error;
 			}
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9255,8 +9255,8 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 #line 9251 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally163;
-	__catch163_configuration_error:
+	goto __finally162;
+	__catch162_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9272,7 +9272,7 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 		_g_error_free0 (err);
 #line 9269 "ConfigurationInterfaces.c"
 	}
-	__finally163:
+	__finally162:
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9321,7 +9321,7 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9319 "ConfigurationInterfaces.c"
-				goto __catch164_configuration_error;
+				goto __catch163_configuration_error;
 			}
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9337,8 +9337,8 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 		return result;
 #line 9334 "ConfigurationInterfaces.c"
 	}
-	goto __finally164;
-	__catch164_configuration_error:
+	goto __finally163;
+	__catch163_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9358,7 +9358,7 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 		return result;
 #line 9355 "ConfigurationInterfaces.c"
 	}
-	__finally164:
+	__finally163:
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9399,7 +9399,7 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9397 "ConfigurationInterfaces.c"
-				goto __catch165_configuration_error;
+				goto __catch164_configuration_error;
 			}
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9410,8 +9410,8 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 #line 9406 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally165;
-	__catch165_configuration_error:
+	goto __finally164;
+	__catch164_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9427,7 +9427,7 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 		_g_error_free0 (err);
 #line 9424 "ConfigurationInterfaces.c"
 	}
-	__finally165:
+	__finally164:
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9476,7 +9476,7 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9474 "ConfigurationInterfaces.c"
-				goto __catch166_configuration_error;
+				goto __catch165_configuration_error;
 			}
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9492,8 +9492,8 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 		return result;
 #line 9489 "ConfigurationInterfaces.c"
 	}
-	goto __finally166;
-	__catch166_configuration_error:
+	goto __finally165;
+	__catch165_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9513,7 +9513,7 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 		return result;
 #line 9510 "ConfigurationInterfaces.c"
 	}
-	__finally166:
+	__finally165:
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9554,7 +9554,7 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9552 "ConfigurationInterfaces.c"
-				goto __catch167_configuration_error;
+				goto __catch166_configuration_error;
 			}
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9565,8 +9565,8 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 #line 9561 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally167;
-	__catch167_configuration_error:
+	goto __finally166;
+	__catch166_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9582,7 +9582,7 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 		_g_error_free0 (err);
 #line 9579 "ConfigurationInterfaces.c"
 	}
-	__finally167:
+	__finally166:
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9631,7 +9631,7 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9629 "ConfigurationInterfaces.c"
-				goto __catch168_configuration_error;
+				goto __catch167_configuration_error;
 			}
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9647,8 +9647,8 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 		return result;
 #line 9644 "ConfigurationInterfaces.c"
 	}
-	goto __finally168;
-	__catch168_configuration_error:
+	goto __finally167;
+	__catch167_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9668,7 +9668,7 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 		return result;
 #line 9665 "ConfigurationInterfaces.c"
 	}
-	__finally168:
+	__finally167:
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9709,7 +9709,7 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9707 "ConfigurationInterfaces.c"
-				goto __catch169_configuration_error;
+				goto __catch168_configuration_error;
 			}
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9720,8 +9720,8 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 #line 9716 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally169;
-	__catch169_configuration_error:
+	goto __finally168;
+	__catch168_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9737,7 +9737,7 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 		_g_error_free0 (err);
 #line 9734 "ConfigurationInterfaces.c"
 	}
-	__finally169:
+	__finally168:
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9786,7 +9786,7 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9784 "ConfigurationInterfaces.c"
-				goto __catch170_configuration_error;
+				goto __catch169_configuration_error;
 			}
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9802,8 +9802,8 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 		return result;
 #line 9799 "ConfigurationInterfaces.c"
 	}
-	goto __finally170;
-	__catch170_configuration_error:
+	goto __finally169;
+	__catch169_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9823,7 +9823,7 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 		return result;
 #line 9820 "ConfigurationInterfaces.c"
 	}
-	__finally170:
+	__finally169:
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9864,7 +9864,7 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9862 "ConfigurationInterfaces.c"
-				goto __catch171_configuration_error;
+				goto __catch170_configuration_error;
 			}
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9875,8 +9875,8 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 #line 9871 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally171;
-	__catch171_configuration_error:
+	goto __finally170;
+	__catch170_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9892,7 +9892,7 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 		_g_error_free0 (err);
 #line 9889 "ConfigurationInterfaces.c"
 	}
-	__finally171:
+	__finally170:
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9941,7 +9941,7 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 9939 "ConfigurationInterfaces.c"
-				goto __catch172_configuration_error;
+				goto __catch171_configuration_error;
 			}
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9957,8 +9957,8 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 		return result;
 #line 9954 "ConfigurationInterfaces.c"
 	}
-	goto __finally172;
-	__catch172_configuration_error:
+	goto __finally171;
+	__catch171_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9978,7 +9978,7 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 		return result;
 #line 9975 "ConfigurationInterfaces.c"
 	}
-	__finally172:
+	__finally171:
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10019,7 +10019,7 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10017 "ConfigurationInterfaces.c"
-				goto __catch173_configuration_error;
+				goto __catch172_configuration_error;
 			}
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10030,8 +10030,8 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 #line 10026 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally173;
-	__catch173_configuration_error:
+	goto __finally172;
+	__catch172_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10047,7 +10047,7 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 		_g_error_free0 (err);
 #line 10044 "ConfigurationInterfaces.c"
 	}
-	__finally173:
+	__finally172:
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10096,7 +10096,7 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10094 "ConfigurationInterfaces.c"
-				goto __catch174_configuration_error;
+				goto __catch173_configuration_error;
 			}
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10112,8 +10112,8 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 		return result;
 #line 10109 "ConfigurationInterfaces.c"
 	}
-	goto __finally174;
-	__catch174_configuration_error:
+	goto __finally173;
+	__catch173_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -10133,7 +10133,7 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 		return result;
 #line 10130 "ConfigurationInterfaces.c"
 	}
-	__finally174:
+	__finally173:
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10174,7 +10174,7 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10172 "ConfigurationInterfaces.c"
-				goto __catch175_configuration_error;
+				goto __catch174_configuration_error;
 			}
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10185,8 +10185,8 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 #line 10181 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally175;
-	__catch175_configuration_error:
+	goto __finally174;
+	__catch174_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10202,7 +10202,7 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 		_g_error_free0 (err);
 #line 10199 "ConfigurationInterfaces.c"
 	}
-	__finally175:
+	__finally174:
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10251,7 +10251,7 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10249 "ConfigurationInterfaces.c"
-				goto __catch176_configuration_error;
+				goto __catch175_configuration_error;
 			}
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10267,8 +10267,8 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 		return result;
 #line 10264 "ConfigurationInterfaces.c"
 	}
-	goto __finally176;
-	__catch176_configuration_error:
+	goto __finally175;
+	__catch175_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -10288,7 +10288,7 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 		return result;
 #line 10285 "ConfigurationInterfaces.c"
 	}
-	__finally176:
+	__finally175:
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10329,7 +10329,7 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10327 "ConfigurationInterfaces.c"
-				goto __catch177_configuration_error;
+				goto __catch176_configuration_error;
 			}
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10340,8 +10340,8 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 #line 10336 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally177;
-	__catch177_configuration_error:
+	goto __finally176;
+	__catch176_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10357,7 +10357,7 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 		_g_error_free0 (err);
 #line 10354 "ConfigurationInterfaces.c"
 	}
-	__finally177:
+	__finally176:
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10406,7 +10406,7 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10404 "ConfigurationInterfaces.c"
-				goto __catch178_configuration_error;
+				goto __catch177_configuration_error;
 			}
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10422,8 +10422,8 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 		return result;
 #line 10419 "ConfigurationInterfaces.c"
 	}
-	goto __finally178;
-	__catch178_configuration_error:
+	goto __finally177;
+	__catch177_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -10443,7 +10443,7 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 		return result;
 #line 10440 "ConfigurationInterfaces.c"
 	}
-	__finally178:
+	__finally177:
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10484,7 +10484,7 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10482 "ConfigurationInterfaces.c"
-				goto __catch179_configuration_error;
+				goto __catch178_configuration_error;
 			}
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10495,8 +10495,8 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 #line 10491 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally179;
-	__catch179_configuration_error:
+	goto __finally178;
+	__catch178_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10512,7 +10512,7 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 		_g_error_free0 (err);
 #line 10509 "ConfigurationInterfaces.c"
 	}
-	__finally179:
+	__finally178:
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10561,7 +10561,7 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10559 "ConfigurationInterfaces.c"
-				goto __catch180_configuration_error;
+				goto __catch179_configuration_error;
 			}
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10577,8 +10577,8 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 		return result;
 #line 10574 "ConfigurationInterfaces.c"
 	}
-	goto __finally180;
-	__catch180_configuration_error:
+	goto __finally179;
+	__catch179_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -10598,7 +10598,7 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 		return result;
 #line 10595 "ConfigurationInterfaces.c"
 	}
-	__finally180:
+	__finally179:
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10639,7 +10639,7 @@ static void configuration_facade_real_set_printing_size_selection (Configuration
 #line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10637 "ConfigurationInterfaces.c"
-				goto __catch181_configuration_error;
+				goto __catch180_configuration_error;
 			}
 #line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10650,8 +10650,8 @@ static void configuration_facade_real_set_printing_size_selection (Configuration
 #line 10646 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally181;
-	__catch181_configuration_error:
+	goto __finally180;
+	__catch180_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10667,7 +10667,7 @@ static void configuration_facade_real_set_printing_size_selection (Configuration
 		_g_error_free0 (err);
 #line 10664 "ConfigurationInterfaces.c"
 	}
-	__finally181:
+	__finally180:
 #line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10717,7 +10717,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 #line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10715 "ConfigurationInterfaces.c"
-				goto __catch182_configuration_error;
+				goto __catch181_configuration_error;
 			}
 #line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10739,8 +10739,8 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 		return result;
 #line 10736 "ConfigurationInterfaces.c"
 	}
-	goto __finally182;
-	__catch182_configuration_error:
+	goto __finally181;
+	__catch181_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -10763,7 +10763,7 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 		return result;
 #line 10760 "ConfigurationInterfaces.c"
 	}
-	__finally182:
+	__finally181:
 #line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10807,7 +10807,7 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac
 #line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10805 "ConfigurationInterfaces.c"
-				goto __catch183_configuration_error;
+				goto __catch182_configuration_error;
 			}
 #line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10818,8 +10818,8 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac
 #line 10814 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally183;
-	__catch183_configuration_error:
+	goto __finally182;
+	__catch182_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10835,7 +10835,7 @@ static void configuration_facade_real_set_printing_titles_font (ConfigurationFac
 		_g_error_free0 (err);
 #line 10832 "ConfigurationInterfaces.c"
 	}
-	__finally183:
+	__finally182:
 #line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10884,7 +10884,7 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 #line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10882 "ConfigurationInterfaces.c"
-				goto __catch184_configuration_error;
+				goto __catch183_configuration_error;
 			}
 #line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10900,8 +10900,8 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 		return result;
 #line 10897 "ConfigurationInterfaces.c"
 	}
-	goto __finally184;
-	__catch184_configuration_error:
+	goto __finally183;
+	__catch183_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -10921,7 +10921,7 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 		return result;
 #line 10918 "ConfigurationInterfaces.c"
 	}
-	__finally184:
+	__finally183:
 #line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10962,7 +10962,7 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca
 #line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 10960 "ConfigurationInterfaces.c"
-				goto __catch185_configuration_error;
+				goto __catch184_configuration_error;
 			}
 #line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10973,8 +10973,8 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca
 #line 10969 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally185;
-	__catch185_configuration_error:
+	goto __finally184;
+	__catch184_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10990,7 +10990,7 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca
 		_g_error_free0 (err);
 #line 10987 "ConfigurationInterfaces.c"
 	}
-	__finally185:
+	__finally184:
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11039,7 +11039,7 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 #line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 11037 "ConfigurationInterfaces.c"
-				goto __catch186_configuration_error;
+				goto __catch185_configuration_error;
 			}
 #line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11055,8 +11055,8 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 		return result;
 #line 11052 "ConfigurationInterfaces.c"
 	}
-	goto __finally186;
-	__catch186_configuration_error:
+	goto __finally185;
+	__catch185_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -11076,7 +11076,7 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 		return result;
 #line 11073 "ConfigurationInterfaces.c"
 	}
-	__finally186:
+	__finally185:
 #line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11117,7 +11117,7 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade*
 #line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 11115 "ConfigurationInterfaces.c"
-				goto __catch187_configuration_error;
+				goto __catch186_configuration_error;
 			}
 #line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11128,8 +11128,8 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade*
 #line 11124 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally187;
-	__catch187_configuration_error:
+	goto __finally186;
+	__catch186_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -11145,7 +11145,7 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 11142 "ConfigurationInterfaces.c"
 	}
-	__finally187:
+	__finally186:
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11194,7 +11194,7 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 #line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 11192 "ConfigurationInterfaces.c"
-				goto __catch188_configuration_error;
+				goto __catch187_configuration_error;
 			}
 #line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11210,8 +11210,8 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 		return result;
 #line 11207 "ConfigurationInterfaces.c"
 	}
-	goto __finally188;
-	__catch188_configuration_error:
+	goto __finally187;
+	__catch187_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -11231,7 +11231,7 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 		return result;
 #line 11228 "ConfigurationInterfaces.c"
 	}
-	__finally188:
+	__finally187:
 #line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11272,7 +11272,7 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade*
 #line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 11270 "ConfigurationInterfaces.c"
-				goto __catch189_configuration_error;
+				goto __catch188_configuration_error;
 			}
 #line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11283,8 +11283,8 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade*
 #line 11279 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally189;
-	__catch189_configuration_error:
+	goto __finally188;
+	__catch188_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -11300,7 +11300,7 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 11297 "ConfigurationInterfaces.c"
 	}
-	__finally189:
+	__finally188:
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11349,7 +11349,7 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 #line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 11347 "ConfigurationInterfaces.c"
-				goto __catch190_configuration_error;
+				goto __catch189_configuration_error;
 			}
 #line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11365,8 +11365,8 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 		return result;
 #line 11362 "ConfigurationInterfaces.c"
 	}
-	goto __finally190;
-	__catch190_configuration_error:
+	goto __finally189;
+	__catch189_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -11386,7 +11386,7 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 		return result;
 #line 11383 "ConfigurationInterfaces.c"
 	}
-	__finally190:
+	__finally189:
 #line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11427,7 +11427,7 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat
 #line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 11425 "ConfigurationInterfaces.c"
-				goto __catch191_configuration_error;
+				goto __catch190_configuration_error;
 			}
 #line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11438,8 +11438,8 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat
 #line 11434 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally191;
-	__catch191_configuration_error:
+	goto __finally190;
+	__catch190_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -11455,7 +11455,7 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat
 		_g_error_free0 (err);
 #line 11452 "ConfigurationInterfaces.c"
 	}
-	__finally191:
+	__finally190:
 #line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11505,7 +11505,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 #line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 11503 "ConfigurationInterfaces.c"
-				goto __catch192_configuration_error;
+				goto __catch191_configuration_error;
 			}
 #line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11527,8 +11527,8 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 		return result;
 #line 11524 "ConfigurationInterfaces.c"
 	}
-	goto __finally192;
-	__catch192_configuration_error:
+	goto __finally191;
+	__catch191_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -11551,7 +11551,7 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 		return result;
 #line 11548 "ConfigurationInterfaces.c"
 	}
-	__finally192:
+	__finally191:
 #line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11595,7 +11595,7 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config
 #line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 11593 "ConfigurationInterfaces.c"
-				goto __catch193_configuration_error;
+				goto __catch192_configuration_error;
 			}
 #line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11606,8 +11606,8 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config
 #line 11602 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally193;
-	__catch193_configuration_error:
+	goto __finally192;
+	__catch192_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -11623,7 +11623,7 @@ static void configuration_facade_real_set_slideshow_transition_effect_id (Config
 		_g_error_free0 (err);
 #line 11620 "ConfigurationInterfaces.c"
 	}
-	__finally193:
+	__finally192:
 #line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11672,7 +11672,7 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 #line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 11670 "ConfigurationInterfaces.c"
-				goto __catch194_configuration_error;
+				goto __catch193_configuration_error;
 			}
 #line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11688,8 +11688,8 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 		return result;
 #line 11685 "ConfigurationInterfaces.c"
 	}
-	goto __finally194;
-	__catch194_configuration_error:
+	goto __finally193;
+	__catch193_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -11709,7 +11709,7 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 		return result;
 #line 11706 "ConfigurationInterfaces.c"
 	}
-	__finally194:
+	__finally193:
 #line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11750,7 +11750,7 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac
 #line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 11748 "ConfigurationInterfaces.c"
-				goto __catch195_configuration_error;
+				goto __catch194_configuration_error;
 			}
 #line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11761,8 +11761,8 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac
 #line 11757 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally195;
-	__catch195_configuration_error:
+	goto __finally194;
+	__catch194_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -11778,7 +11778,7 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac
 		_g_error_free0 (err);
 #line 11775 "ConfigurationInterfaces.c"
 	}
-	__finally195:
+	__finally194:
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11888,7 +11888,7 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 #line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 11886 "ConfigurationInterfaces.c"
-				goto __catch196_configuration_error;
+				goto __catch195_configuration_error;
 			}
 #line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11904,8 +11904,8 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 		return result;
 #line 11901 "ConfigurationInterfaces.c"
 	}
-	goto __finally196;
-	__catch196_configuration_error:
+	goto __finally195;
+	__catch195_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -11942,7 +11942,7 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 		return result;
 #line 11939 "ConfigurationInterfaces.c"
 	}
-	__finally196:
+	__finally195:
 #line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -11983,7 +11983,7 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade*
 #line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 11981 "ConfigurationInterfaces.c"
-				goto __catch197_configuration_error;
+				goto __catch196_configuration_error;
 			}
 #line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -11994,8 +11994,8 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade*
 #line 11990 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally197;
-	__catch197_configuration_error:
+	goto __finally196;
+	__catch196_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -12011,7 +12011,7 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 12008 "ConfigurationInterfaces.c"
 	}
-	__finally197:
+	__finally196:
 #line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12060,7 +12060,7 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 #line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 12058 "ConfigurationInterfaces.c"
-				goto __catch198_configuration_error;
+				goto __catch197_configuration_error;
 			}
 #line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -12076,8 +12076,8 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 		return result;
 #line 12073 "ConfigurationInterfaces.c"
 	}
-	goto __finally198;
-	__catch198_configuration_error:
+	goto __finally197;
+	__catch197_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -12097,7 +12097,7 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 		return result;
 #line 12094 "ConfigurationInterfaces.c"
 	}
-	__finally198:
+	__finally197:
 #line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12138,7 +12138,7 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration
 #line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 12136 "ConfigurationInterfaces.c"
-				goto __catch199_configuration_error;
+				goto __catch198_configuration_error;
 			}
 #line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -12149,8 +12149,8 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration
 #line 12145 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally199;
-	__catch199_configuration_error:
+	goto __finally198;
+	__catch198_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -12166,7 +12166,7 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration
 		_g_error_free0 (err);
 #line 12163 "ConfigurationInterfaces.c"
 	}
-	__finally199:
+	__finally198:
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12215,7 +12215,7 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 #line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 12213 "ConfigurationInterfaces.c"
-				goto __catch200_configuration_error;
+				goto __catch199_configuration_error;
 			}
 #line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -12231,8 +12231,8 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 		return result;
 #line 12228 "ConfigurationInterfaces.c"
 	}
-	goto __finally200;
-	__catch200_configuration_error:
+	goto __finally199;
+	__catch199_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -12252,7 +12252,7 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 		return result;
 #line 12249 "ConfigurationInterfaces.c"
 	}
-	__finally200:
+	__finally199:
 #line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -12293,7 +12293,7 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config
 #line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 12291 "ConfigurationInterfaces.c"
-				goto __catch201_configuration_error;
+				goto __catch200_configuration_error;
 			}
 #line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -12304,8 +12304,8 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config
 #line 12300 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally201;
-	__catch201_configuration_error:
+	goto __finally200;
+	__catch200_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -12321,7 +12321,7 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config
 		_g_error_free0 (err);
 #line 12318 "ConfigurationInterfaces.c"
 	}
-	__finally201:
+	__finally200:
 #line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c
index e1ac2d2..405f807 100644
--- a/src/config/GSettingsEngine.c
+++ b/src/config/GSettingsEngine.c
@@ -3376,7 +3376,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 3379 "GSettingsEngine.c"
-				goto __catch202_g_regex_error;
+				goto __catch201_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3401,7 +3401,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 3404 "GSettingsEngine.c"
-				goto __catch202_g_regex_error;
+				goto __catch201_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -3427,8 +3427,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 3429 "GSettingsEngine.c"
 	}
-	goto __finally202;
-	__catch202_g_regex_error:
+	goto __finally201;
+	__catch201_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3441,7 +3441,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 3443 "GSettingsEngine.c"
 	}
-	__finally202:
+	__finally201:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4600,7 +4600,7 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4603 "GSettingsEngine.c"
-				goto __catch203_configuration_error;
+				goto __catch202_configuration_error;
 			}
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4620,8 +4620,8 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 		return result;
 #line 4622 "GSettingsEngine.c"
 	}
-	goto __finally203;
-	__catch203_configuration_error:
+	goto __finally202;
+	__catch202_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -4649,7 +4649,7 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 		return result;
 #line 4651 "GSettingsEngine.c"
 	}
-	__finally203:
+	__finally202:
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4708,7 +4708,7 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4711 "GSettingsEngine.c"
-				goto __catch204_configuration_error;
+				goto __catch203_configuration_error;
 			}
 #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4721,8 +4721,8 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 #line 4722 "GSettingsEngine.c"
 		}
 	}
-	goto __finally204;
-	__catch204_configuration_error:
+	goto __finally203;
+	__catch203_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -4741,7 +4741,7 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 		_g_error_free0 (err);
 #line 4743 "GSettingsEngine.c"
 	}
-	__finally204:
+	__finally203:
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4811,7 +4811,7 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4814 "GSettingsEngine.c"
-				goto __catch205_configuration_error;
+				goto __catch204_configuration_error;
 			}
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4831,8 +4831,8 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 		return result;
 #line 4833 "GSettingsEngine.c"
 	}
-	goto __finally205;
-	__catch205_configuration_error:
+	goto __finally204;
+	__catch204_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -4860,7 +4860,7 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 		return result;
 #line 4862 "GSettingsEngine.c"
 	}
-	__finally205:
+	__finally204:
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4919,7 +4919,7 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4922 "GSettingsEngine.c"
-				goto __catch206_configuration_error;
+				goto __catch205_configuration_error;
 			}
 #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4932,8 +4932,8 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 #line 4933 "GSettingsEngine.c"
 		}
 	}
-	goto __finally206;
-	__catch206_configuration_error:
+	goto __finally205;
+	__catch205_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -4952,7 +4952,7 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 		_g_error_free0 (err);
 #line 4954 "GSettingsEngine.c"
 	}
-	__finally206:
+	__finally205:
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5022,7 +5022,7 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5025 "GSettingsEngine.c"
-				goto __catch207_configuration_error;
+				goto __catch206_configuration_error;
 			}
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5042,8 +5042,8 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 		return result;
 #line 5044 "GSettingsEngine.c"
 	}
-	goto __finally207;
-	__catch207_configuration_error:
+	goto __finally206;
+	__catch206_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -5071,7 +5071,7 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 		return result;
 #line 5073 "GSettingsEngine.c"
 	}
-	__finally207:
+	__finally206:
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5130,7 +5130,7 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5133 "GSettingsEngine.c"
-				goto __catch208_configuration_error;
+				goto __catch207_configuration_error;
 			}
 #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5143,8 +5143,8 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 #line 5144 "GSettingsEngine.c"
 		}
 	}
-	goto __finally208;
-	__catch208_configuration_error:
+	goto __finally207;
+	__catch207_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -5163,7 +5163,7 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 		_g_error_free0 (err);
 #line 5165 "GSettingsEngine.c"
 	}
-	__finally208:
+	__finally207:
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5234,7 +5234,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5237 "GSettingsEngine.c"
-				goto __catch209_configuration_error;
+				goto __catch208_configuration_error;
 			}
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5260,8 +5260,8 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 		return result;
 #line 5262 "GSettingsEngine.c"
 	}
-	goto __finally209;
-	__catch209_configuration_error:
+	goto __finally208;
+	__catch208_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -5292,7 +5292,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 		return result;
 #line 5294 "GSettingsEngine.c"
 	}
-	__finally209:
+	__finally208:
 #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5351,7 +5351,7 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5354 "GSettingsEngine.c"
-				goto __catch210_configuration_error;
+				goto __catch209_configuration_error;
 			}
 #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5364,8 +5364,8 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 #line 5365 "GSettingsEngine.c"
 		}
 	}
-	goto __finally210;
-	__catch210_configuration_error:
+	goto __finally209;
+	__catch209_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -5384,7 +5384,7 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 		_g_error_free0 (err);
 #line 5386 "GSettingsEngine.c"
 	}
-	__finally210:
+	__finally209:
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5446,7 +5446,7 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5449 "GSettingsEngine.c"
-				goto __catch211_configuration_error;
+				goto __catch210_configuration_error;
 			}
 #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5459,8 +5459,8 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 #line 5460 "GSettingsEngine.c"
 		}
 	}
-	goto __finally211;
-	__catch211_configuration_error:
+	goto __finally210;
+	__catch210_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5479,7 +5479,7 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 		_g_error_free0 (err);
 #line 5481 "GSettingsEngine.c"
 	}
-	__finally211:
+	__finally210:
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5529,7 +5529,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5532 "GSettingsEngine.c"
-				goto __catch212_configuration_error;
+				goto __catch211_configuration_error;
 			}
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (enable_disable_name);
@@ -5559,8 +5559,8 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 		return result;
 #line 5561 "GSettingsEngine.c"
 	}
-	goto __finally212;
-	__catch212_configuration_error:
+	goto __finally211;
+	__catch211_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -5585,7 +5585,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 		return result;
 #line 5587 "GSettingsEngine.c"
 	}
-	__finally212:
+	__finally211:
 #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (enable_disable_name);
 #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5626,7 +5626,7 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5629 "GSettingsEngine.c"
-				goto __catch213_configuration_error;
+				goto __catch212_configuration_error;
 			}
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (enable_disable_name);
@@ -5639,8 +5639,8 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 #line 5640 "GSettingsEngine.c"
 		}
 	}
-	goto __finally213;
-	__catch213_configuration_error:
+	goto __finally212;
+	__catch212_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5659,7 +5659,7 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 		_g_error_free0 (err);
 #line 5661 "GSettingsEngine.c"
 	}
-	__finally213:
+	__finally212:
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5712,11 +5712,11 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {
 #line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5715 "GSettingsEngine.c"
-			goto __catch214_g_error;
+			goto __catch213_g_error;
 		}
 	}
-	goto __finally214;
-	__catch214_g_error:
+	goto __finally213;
+	__catch213_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5735,7 +5735,7 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {
 		_g_error_free0 (err);
 #line 5737 "GSettingsEngine.c"
 	}
-	__finally214:
+	__finally213:
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index 34e5dde..ba9cf0d 100644
--- a/src/core/DataSource.c
+++ b/src/core/DataSource.c
@@ -406,7 +406,7 @@ void data_view_notify_unsubscribed (DataView* self, DataSource* source);
 gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing);
 void source_collection_notify_unlinked_destroyed (SourceCollection* self, DataSource* unlinked);
 void data_source_internal_subscribe (DataSource* self, DataView* view);
-static void _vala_array_add122 (DataView*** array, int* length, int* size, DataView* value);
+static void _vala_array_add63 (DataView*** array, int* length, int* size, DataView* value);
 void data_source_internal_unsubscribe (DataSource* self, DataView* view);
 void data_source_contact_subscribers (DataSource* self, DataSourceContactSubscriber contact_subscriber, void* contact_subscriber_target);
 static void data_source_real_unlinked (DataSource* self, SourceCollection* sources);
@@ -2387,7 +2387,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2389 "DataSource.c"
-				goto __catch48_g_error;
+				goto __catch47_g_error;
 			}
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			ret = _tmp1_;
@@ -2409,8 +2409,8 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 #line 2409 "DataSource.c"
 			}
 		}
-		goto __finally48;
-		__catch48_g_error:
+		goto __finally47;
+		__catch47_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp6_ = NULL;
@@ -2439,7 +2439,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 			_g_error_free0 (err);
 #line 2440 "DataSource.c"
 		}
-		__finally48:
+		__finally47:
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2475,7 +2475,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 }
 
 
-static void _vala_array_add122 (DataView*** array, int* length, int* size, DataView* value) {
+static void _vala_array_add63 (DataView*** array, int* length, int* size, DataView* value) {
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	if ((*length) == (*size)) {
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
@@ -2599,7 +2599,7 @@ void data_source_internal_subscribe (DataSource* self, DataView* view) {
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 	_tmp15_ = _g_object_ref0 (_tmp14_);
 #line 406 "/home/jens/Source/shotwell/src/core/DataSource.vala"
-	_vala_array_add122 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp15_);
+	_vala_array_add63 (&self->priv->subscribers, &self->priv->subscribers_length1, &self->priv->_subscribers_size_, _tmp15_);
 #line 2603 "DataSource.c"
 }
 
diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c
index 8035c0b..3b2bcb6 100644
--- a/src/core/SourceCollection.c
+++ b/src/core/SourceCollection.c
@@ -757,14 +757,14 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 760 "SourceCollection.c"
-			goto __catch47_g_error;
+			goto __catch46_g_error;
 		}
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		success = _tmp0_;
 #line 765 "SourceCollection.c"
 	}
-	goto __finally47;
-	__catch47_g_error:
+	goto __finally46;
+	__catch46_g_error:
 	{
 		GError* err = NULL;
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -777,7 +777,7 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 		_g_error_free0 (err);
 #line 779 "SourceCollection.c"
 	}
-	__finally47:
+	__finally46:
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index 12a648f..f6a52ee 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -364,11 +364,11 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 367 "DataImportSource.c"
-				goto __catch215_g_error;
+				goto __catch214_g_error;
 			}
 		}
-		goto __finally215;
-		__catch215_g_error:
+		goto __finally214;
+		__catch214_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp26_ = NULL;
@@ -399,7 +399,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 401 "DataImportSource.c"
 		}
-		__finally215:
+		__finally214:
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -583,7 +583,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 586 "DataImportSource.c"
-					goto __catch216_g_error;
+					goto __catch215_g_error;
 				}
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_tmp57_ = preview_raw;
@@ -603,8 +603,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 				preview_raw = (g_free (preview_raw), NULL);
 #line 605 "DataImportSource.c"
 			}
-			goto __finally216;
-			__catch216_g_error:
+			goto __finally215;
+			__catch215_g_error:
 			{
 				GError* e = NULL;
 				gchar* _tmp60_ = NULL;
@@ -631,7 +631,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 				_g_error_free0 (e);
 #line 633 "DataImportSource.c"
 			}
-			__finally216:
+			__finally215:
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -670,14 +670,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 673 "DataImportSource.c"
-				goto __catch217_g_error;
+				goto __catch216_g_error;
 			}
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->file_size = _tmp64_;
 #line 678 "DataImportSource.c"
 		}
-		goto __finally217;
-		__catch217_g_error:
+		goto __finally216;
+		__catch216_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp67_ = NULL;
@@ -704,7 +704,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 706 "DataImportSource.c"
 		}
-		__finally217:
+		__finally216:
 #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -742,14 +742,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 745 "DataImportSource.c"
-				goto __catch218_g_error;
+				goto __catch217_g_error;
 			}
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->modification_time = _tmp71_;
 #line 750 "DataImportSource.c"
 		}
-		goto __finally218;
-		__catch218_g_error:
+		goto __finally217;
+		__catch217_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp74_ = NULL;
@@ -776,7 +776,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 778 "DataImportSource.c"
 		}
-		__finally218:
+		__finally217:
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
diff --git a/src/data_imports/DataImports.c b/src/data_imports/DataImports.c
index 79e795a..3e618b0 100644
--- a/src/data_imports/DataImports.c
+++ b/src/data_imports/DataImports.c
@@ -26,7 +26,7 @@
 
 
 void data_imports_init (GError** error);
-static void _vala_array_add150 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add68 (gchar*** array, int* length, int* size, gchar* value);
 void plugins_register_extension_point (GType type, const gchar* name, const gchar* icon_name, gchar** core_ids, int core_ids_length1);
 #define RESOURCES_IMPORT "shotwell-import"
 void data_imports_terminate (void);
@@ -34,7 +34,7 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
-static void _vala_array_add150 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add68 (gchar*** array, int* length, int* size, gchar* value) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	if ((*length) == (*size)) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
@@ -77,7 +77,7 @@ void data_imports_init (GError** error) {
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	_tmp2_ = g_strdup ("org.yorba.shotwell.dataimports.fspot");
 #line 20 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
-	_vala_array_add150 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
+	_vala_array_add68 (&core_ids, &core_ids_length1, &_core_ids_size_, _tmp2_);
 #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
 	_tmp3_ = _ ("Data Imports");
 #line 22 "/home/jens/Source/shotwell/src/data_imports/DataImports.vala"
diff --git a/src/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c
index 4f5a39b..cf3d857 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -623,7 +623,7 @@ static void spit_data_imports_welcome_import_meta_host_finalize (GObject* obj);
 SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int* result_length1);
 GeeCollection* plugins_get_pluggables_for_type (GType type, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify, gboolean include_disabled);
 gchar* plugins_get_pluggable_module_id (SpitPluggable* needle);
-static void _vala_array_add151 (SpitDataImportsService*** array, int* length, int* size, SpitDataImportsService* value);
+static void _vala_array_add69 (SpitDataImportsService*** array, int* length, int* size, SpitDataImportsService* value);
 static gint __lambda21_ (void* a, void* b);
 gint utf8_cs_compare (void* a, void* b);
 static gint ___lambda21____compar_fn_t (void* key1, void* key2);
@@ -3043,7 +3043,7 @@ SpitDataImportsService** spit_data_imports_load_all_services (int* result_length
 }
 
 
-static void _vala_array_add151 (SpitDataImportsService*** array, int* length, int* size, SpitDataImportsService* value) {
+static void _vala_array_add69 (SpitDataImportsService*** array, int* length, int* size, SpitDataImportsService* value) {
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	if ((*length) == (*size)) {
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -3239,7 +3239,7 @@ SpitDataImportsService** spit_data_imports_load_services (gboolean load_all, int
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_tmp25_ = _g_object_ref0 (_tmp24_);
 #line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-			_vala_array_add151 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp25_);
+			_vala_array_add69 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp25_);
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 			_g_object_unref0 (service);
 #line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
diff --git a/src/data_imports/DataImportsUI.c b/src/data_imports/DataImportsUI.c
index cd61c35..338abba 100644
--- a/src/data_imports/DataImportsUI.c
+++ b/src/data_imports/DataImportsUI.c
@@ -782,11 +782,11 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 #line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp4_ = content_box;
 #line 67 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_widget_set_margin_left (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), 30);
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), 30);
 #line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp5_ = content_box;
 #line 68 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 30);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 30);
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp6_ = (GtkLabel*) gtk_label_new (NULL);
 #line 69 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -987,13 +987,13 @@ DataImportsUILibrarySelectionPane* data_imports_ui_library_selection_pane_constr
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp42_ = chooser_margin_left;
 #line 107 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_widget_set_margin_left (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), _tmp42_);
+		gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), _tmp42_);
 #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp43_ = _data10_->file_chooser;
 #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp44_ = chooser_margin_right;
 #line 108 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp44_);
+		gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp44_);
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp45_ = content_box;
 #line 109 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1231,13 +1231,13 @@ static GtkRadioButton* data_imports_ui_library_selection_pane_create_radio_butto
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp11_ = margin_left;
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_widget_set_margin_left (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp11_);
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp11_);
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp12_ = _data11_->button;
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp13_ = margin_right;
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), _tmp13_);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), _tmp13_);
 #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp14_ = box;
 #line 149 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1582,7 +1582,7 @@ static void _data_imports_ui_data_imports_dialog_on_service_changed_gtk_combo_bo
 
 
 static void _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_on_close_cancel_clicked ((DataImportsUIDataImportsDialog*) self);
 #line 1583 "DataImportsUI.c"
 }
@@ -1609,15 +1609,15 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
 	gint _loaded_services_size_ = 0;
 	SpitDataImportsService** _tmp12_ = NULL;
 	gint _tmp12__length1 = 0;
-	GtkBox* _tmp64_ = NULL;
-	GtkBox* _tmp65_ = NULL;
-	GtkBox* _tmp66_ = NULL;
-	GtkButton* _tmp67_ = NULL;
-	GtkButton* _tmp68_ = NULL;
-	GtkButton* _tmp69_ = NULL;
+	GtkBox* _tmp67_ = NULL;
+	GtkBox* _tmp68_ = NULL;
+	GtkBox* _tmp69_ = NULL;
 	gboolean _tmp70_ = FALSE;
-	SpitDataImportsService** _tmp77_ = NULL;
-	gint _tmp77__length1 = 0;
+	GtkButton* _tmp80_ = NULL;
+	SpitDataImportsService** _tmp81_ = NULL;
+	gint _tmp81__length1 = 0;
+#line 211 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	use_header = FALSE;
 #line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = gtk_settings_get_default ();
 #line 212 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1854,31 +1854,32 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
 			GtkLabel* _tmp41_ = NULL;
 			GtkComboBoxText* _tmp42_ = NULL;
 			GtkLabel* _tmp43_ = NULL;
-			GtkAlignment* service_selector_box_wrapper = NULL;
-			GtkAlignment* _tmp44_ = NULL;
-			GtkAlignment* _tmp45_ = NULL;
+			GtkLabel* _tmp44_ = NULL;
+			GtkComboBoxText* _tmp45_ = NULL;
 			GtkComboBoxText* _tmp46_ = NULL;
+			GtkComboBoxText* _tmp47_ = NULL;
+			GtkComboBoxText* _tmp48_ = NULL;
 			GtkBox* service_selector_layouter = NULL;
-			GtkBox* _tmp47_ = NULL;
-			GtkBox* _tmp48_ = NULL;
 			GtkBox* _tmp49_ = NULL;
-			GtkLabel* _tmp50_ = NULL;
+			GtkBox* _tmp50_ = NULL;
 			GtkBox* _tmp51_ = NULL;
-			GtkAlignment* _tmp52_ = NULL;
-			GtkBox* service_area_layouter = NULL;
+			GtkLabel* _tmp52_ = NULL;
 			GtkBox* _tmp53_ = NULL;
-			GtkBox* _tmp54_ = NULL;
+			GtkComboBoxText* _tmp54_ = NULL;
+			GtkBox* service_area_layouter = NULL;
 			GtkBox* _tmp55_ = NULL;
-			GtkSeparator* service_central_separator = NULL;
-			GtkSeparator* _tmp56_ = NULL;
+			GtkBox* _tmp56_ = NULL;
 			GtkBox* _tmp57_ = NULL;
+			GtkSeparator* service_central_separator = NULL;
 			GtkSeparator* _tmp58_ = NULL;
-			GtkAlignment* service_area_wrapper = NULL;
-			GtkAlignment* _tmp59_ = NULL;
-			GtkAlignment* _tmp60_ = NULL;
+			GtkBox* _tmp59_ = NULL;
+			GtkSeparator* _tmp60_ = NULL;
 			GtkBox* _tmp61_ = NULL;
 			GtkBox* _tmp62_ = NULL;
-			GtkAlignment* _tmp63_ = NULL;
+			GtkBox* _tmp63_ = NULL;
+			GtkBox* _tmp64_ = NULL;
+			GtkBox* _tmp65_ = NULL;
+			GtkBox* _tmp66_ = NULL;
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp39_ = label;
 #line 255 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1896,85 +1897,95 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
 #line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp43_ = service_selector_box_label;
 #line 257 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 263 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp44_ = (GtkAlignment*) gtk_alignment_new (1.0f, 0.5f, 0.0f, 0.0f);
-#line 263 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp44_);
-#line 263 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_selector_box_wrapper = _tmp44_;
+			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 258 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp44_ = service_selector_box_label;
+#line 258 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp45_ = service_selector_box_wrapper;
+			_tmp45_ = self->priv->service_selector_box;
 #line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+#line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp46_ = self->priv->service_selector_box;
-#line 264 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget));
+#line 265 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp47_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+			_tmp47_ = self->priv->service_selector_box;
 #line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp47_);
-#line 266 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_selector_layouter = _tmp47_;
+			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 267 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp48_ = service_selector_layouter;
+			_tmp48_ = self->priv->service_selector_box;
 #line 267 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_container_get_type (), GtkContainer), (guint) 12);
-#line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp49_ = service_selector_layouter;
-#line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp50_ = service_selector_box_label;
-#line 268 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget));
+			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp51_ = service_selector_layouter;
+			_tmp49_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 #line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp52_ = service_selector_box_wrapper;
+			g_object_ref_sink (_tmp49_);
 #line 269 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_box_pack_start (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 273 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp53_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 273 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp53_);
-#line 273 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_area_layouter = _tmp53_;
-#line 274 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp54_ = service_area_layouter;
-#line 274 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp55_ = service_selector_layouter;
-#line 274 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_box_pack_start (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp56_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-#line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp56_);
-#line 275 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_central_separator = _tmp56_;
+			service_selector_layouter = _tmp49_;
+#line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp50_ = service_selector_layouter;
+#line 270 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_container_get_type (), GtkContainer), (guint) 12);
+#line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp51_ = service_selector_layouter;
+#line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp52_ = service_selector_box_label;
+#line 271 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget));
+#line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp53_ = service_selector_layouter;
+#line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp54_ = self->priv->service_selector_box;
+#line 272 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_box_pack_start (_tmp53_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp57_ = service_area_layouter;
+			_tmp55_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp58_ = service_central_separator;
+			g_object_ref_sink (_tmp55_);
 #line 276 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
+			service_area_layouter = _tmp55_;
+#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp56_ = service_area_layouter;
+#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp57_ = service_selector_layouter;
+#line 277 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_box_pack_start (_tmp56_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp59_ = (GtkAlignment*) gtk_alignment_new (0.0f, 0.0f, 1.0f, 0.0f);
+			_tmp58_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
 #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			g_object_ref_sink (_tmp59_);
+			g_object_ref_sink (_tmp58_);
 #line 278 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			service_area_wrapper = _tmp59_;
+			service_central_separator = _tmp58_;
 #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp60_ = service_area_wrapper;
+			_tmp59_ = service_area_layouter;
 #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp61_ = service_area_layouter;
+			_tmp60_ = service_central_separator;
 #line 279 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
-#line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp62_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+			gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget));
+#line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp61_ = service_area_layouter;
+#line 280 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
 #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_tmp63_ = service_area_wrapper;
+			_tmp62_ = service_area_layouter;
 #line 281 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_g_object_unref0 (service_area_wrapper);
+			gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp63_ = service_area_layouter;
+#line 282 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 283 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp64_ = service_area_layouter;
+#line 283 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp65_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			_tmp66_ = service_area_layouter;
+#line 285 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+			gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (service_central_separator);
 #line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
@@ -1982,105 +1993,112 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
 #line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (service_selector_layouter);
 #line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-			_g_object_unref0 (service_selector_box_wrapper);
-#line 253 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_g_object_unref0 (service_selector_box_label);
-#line 1984 "DataImportsUI.c"
+#line 1993 "DataImportsUI.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_free0 (last_used_service);
-#line 1988 "DataImportsUI.c"
+#line 1997 "DataImportsUI.c"
 	}
-#line 286 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp64_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 286 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_object_ref_sink (_tmp64_);
-#line 286 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_g_object_unref0 (self->priv->central_area_layouter);
-#line 286 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self->priv->central_area_layouter = _tmp64_;
-#line 287 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp65_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 287 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp66_ = self->priv->central_area_layouter;
-#line 287 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp67_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
-#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp67_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_object_ref_sink (_tmp67_);
-#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_g_object_unref0 (self->priv->close_cancel_button);
-#line 289 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	self->priv->close_cancel_button = _tmp67_;
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp68_ = self->priv->close_cancel_button;
+	_g_object_unref0 (self->priv->central_area_layouter);
 #line 290 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), TRUE);
+	self->priv->central_area_layouter = _tmp67_;
+#line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp68_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp69_ = self->priv->close_cancel_button;
+	_tmp69_ = self->priv->central_area_layouter;
 #line 291 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_signal_connect_object (_tmp69_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
-#line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp70_ = use_header;
-#line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp70_) {
-#line 2024 "DataImportsUI.c"
-		GtkWidget* _tmp71_ = NULL;
+#line 2017 "DataImportsUI.c"
+		GtkButton* _tmp71_ = NULL;
 		GtkButton* _tmp72_ = NULL;
 		GtkWidget* _tmp73_ = NULL;
-		GtkComboBoxText* _tmp74_ = NULL;
-#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp71_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp72_ = self->priv->close_cancel_button;
-#line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget));
+		GtkButton* _tmp74_ = NULL;
+		GtkWidget* _tmp75_ = NULL;
+		GtkComboBoxText* _tmp76_ = NULL;
 #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp73_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		_tmp71_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
 #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp74_ = self->priv->service_selector_box;
+		g_object_ref_sink (_tmp71_);
 #line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
-#line 2041 "DataImportsUI.c"
-	} else {
-		GtkWidget* _tmp75_ = NULL;
-		GtkButton* _tmp76_ = NULL;
+		_g_object_unref0 (self->priv->close_cancel_button);
+#line 295 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		self->priv->close_cancel_button = _tmp71_;
+#line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp72_ = self->priv->close_cancel_button;
+#line 296 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp73_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp74_ = self->priv->close_cancel_button;
+#line 297 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
 #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp75_ = gtk_dialog_get_action_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		_tmp75_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp76_ = self->priv->close_cancel_button;
+		_tmp76_ = self->priv->service_selector_box;
 #line 298 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget));
-#line 2051 "DataImportsUI.c"
-	}
-#line 300 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
+		gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget));
+#line 2048 "DataImportsUI.c"
+	} else {
+		const gchar* _tmp77_ = NULL;
+		GtkWidget* _tmp78_ = NULL;
+		GtkButton* _tmp79_ = NULL;
+#line 301 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp77_ = _ ("_Cancel");
+#line 301 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp77_, (gint) GTK_RESPONSE_CANCEL);
 #line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp77_ = loaded_services;
+		_tmp78_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
 #line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	_tmp77__length1 = loaded_services_length1;
+		_tmp79_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp78_, gtk_button_get_type ()) ? ((GtkButton*) _tmp78_) : NULL);
 #line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	if (_tmp77__length1 > 0) {
+		_g_object_unref0 (self->priv->close_cancel_button);
+#line 302 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		self->priv->close_cancel_button = _tmp79_;
+#line 2065 "DataImportsUI.c"
+	}
 #line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp80_ = self->priv->close_cancel_button;
+#line 304 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_signal_connect_object (_tmp80_, "clicked", (GCallback) _data_imports_ui_data_imports_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+#line 306 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
+#line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp81_ = loaded_services;
+#line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	_tmp81__length1 = loaded_services_length1;
+#line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	if (_tmp81__length1 > 0) {
+#line 310 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_on_service_changed (self);
-#line 2063 "DataImportsUI.c"
+#line 2081 "DataImportsUI.c"
 	} else {
-		DataImportsUIStaticMessagePane* _tmp78_ = NULL;
-		DataImportsUIStaticMessagePane* _tmp79_ = NULL;
-#line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp78_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
-#line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_tmp79_ = _tmp78_;
-#line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
-#line 307 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		_g_object_unref0 (_tmp79_);
-#line 308 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		DataImportsUIStaticMessagePane* _tmp82_ = NULL;
+		DataImportsUIStaticMessagePane* _tmp83_ = NULL;
+#line 313 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp82_ = data_imports_ui_static_message_pane_new_with_pango (DATA_IMPORTS_UI_NO_PLUGINS_ENABLED_MESSAGE);
+#line 313 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_tmp83_ = _tmp82_;
+#line 313 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		data_imports_ui_data_imports_dialog_install_pane (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, SPIT_DATA_IMPORTS_TYPE_DIALOG_PANE, SpitDataImportsDialogPane));
+#line 313 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		_g_object_unref0 (_tmp83_);
+#line 314 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_set_close_button_mode (self);
-#line 2077 "DataImportsUI.c"
+#line 2095 "DataImportsUI.c"
 	}
-#line 311 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 317 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	loaded_services = (_vala_array_free (loaded_services, loaded_services_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -2090,14 +2108,14 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_construct (G
 	_g_free0 (title);
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return self;
-#line 2089 "DataImportsUI.c"
+#line 2107 "DataImportsUI.c"
 }
 
 
 DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_new (void) {
 #line 210 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return data_imports_ui_data_imports_dialog_construct (DATA_IMPORTS_UI_TYPE_DATA_IMPORTS_DIALOG);
-#line 2096 "DataImportsUI.c"
+#line 2114 "DataImportsUI.c"
 }
 
 
@@ -2106,72 +2124,72 @@ DataImportsUIDataImportsDialog* data_imports_ui_data_imports_dialog_get_or_creat
 	DataImportsUIDataImportsDialog* _tmp0_ = NULL;
 	DataImportsUIDataImportsDialog* _tmp2_ = NULL;
 	DataImportsUIDataImportsDialog* _tmp3_ = NULL;
-#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 321 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = data_imports_ui_data_imports_dialog_instance;
-#line 315 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 321 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ == NULL) {
-#line 2109 "DataImportsUI.c"
+#line 2127 "DataImportsUI.c"
 		DataImportsUIDataImportsDialog* _tmp1_ = NULL;
-#line 316 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = data_imports_ui_data_imports_dialog_new ();
-#line 316 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		g_object_ref_sink (_tmp1_);
-#line 316 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
-#line 316 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_instance = _tmp1_;
-#line 2119 "DataImportsUI.c"
+#line 2137 "DataImportsUI.c"
 	}
-#line 318 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp2_ = data_imports_ui_data_imports_dialog_instance;
-#line 318 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 318 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	result = _tmp3_;
-#line 318 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 2129 "DataImportsUI.c"
+#line 2147 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_terminate_instance (void) {
 	DataImportsUIDataImportsDialog* _tmp0_ = NULL;
-#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 328 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = data_imports_ui_data_imports_dialog_instance;
-#line 322 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 328 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 2139 "DataImportsUI.c"
+#line 2157 "DataImportsUI.c"
 		DataImportsUIDataImportsDialog* _tmp1_ = NULL;
-#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = data_imports_ui_data_imports_dialog_instance;
-#line 323 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_terminate (_tmp1_);
-#line 2145 "DataImportsUI.c"
+#line 2163 "DataImportsUI.c"
 	}
-#line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
-#line 325 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 331 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2151 "DataImportsUI.c"
+#line 2169 "DataImportsUI.c"
 }
 
 
 static gboolean data_imports_ui_data_imports_dialog_on_window_close (DataImportsUIDataImportsDialog* self, GdkEventAny* evt) {
 	gboolean result = FALSE;
-#line 328 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 334 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), FALSE);
-#line 328 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 334 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (evt != NULL, FALSE);
-#line 329 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_debug ("DataImportsUI.vala:329: DataImportsDialog: on_window_close( ): invoked" \
+#line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_debug ("DataImportsUI.vala:335: DataImportsDialog: on_window_close( ): invoked" \
 ".");
-#line 330 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_terminate (self);
-#line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	result = TRUE;
-#line 332 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 338 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 2169 "DataImportsUI.c"
+#line 2187 "DataImportsUI.c"
 }
 
 
@@ -2195,232 +2213,232 @@ static void data_imports_ui_data_imports_dialog_on_service_changed (DataImportsU
 	SpitDataImportsService* _tmp16_ = NULL;
 	SpitDataImportsConcreteDataImportsHost* _tmp17_ = NULL;
 	SpitDataImportsConcreteDataImportsHost* _tmp18_ = NULL;
-#line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 336 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_debug ("DataImportsUI.vala:336: DataImportsDialog: on_service_changed invoked.");
-#line 337 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_debug ("DataImportsUI.vala:342: DataImportsDialog: on_service_changed invoked.");
+#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 337 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp1_ = gtk_combo_box_text_get_active_text (_tmp0_);
-#line 337 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	service_name = _tmp1_;
-#line 339 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	selected_service = NULL;
-#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp3_ = spit_data_imports_load_all_services (&_tmp2_);
-#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	services = _tmp3_;
-#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	services_length1 = _tmp2_;
-#line 340 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 346 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_services_size_ = services_length1;
-#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp4_ = services;
-#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp4__length1 = services_length1;
-#line 2217 "DataImportsUI.c"
+#line 2235 "DataImportsUI.c"
 	{
 		SpitDataImportsService** service_collection = NULL;
 		gint service_collection_length1 = 0;
 		gint _service_collection_size_ = 0;
 		gint service_it = 0;
-#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		service_collection = _tmp4_;
-#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		service_collection_length1 = _tmp4__length1;
-#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		for (service_it = 0; service_it < _tmp4__length1; service_it = service_it + 1) {
-#line 2229 "DataImportsUI.c"
+#line 2247 "DataImportsUI.c"
 			SpitDataImportsService* _tmp5_ = NULL;
 			SpitDataImportsService* service = NULL;
-#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			_tmp5_ = _g_object_ref0 (service_collection[service_it]);
-#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			service = _tmp5_;
-#line 2236 "DataImportsUI.c"
+#line 2254 "DataImportsUI.c"
 			{
 				SpitDataImportsService* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
-#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_tmp6_ = service;
-#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_tmp7_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_tmp8_ = service_name;
-#line 342 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 348 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 2249 "DataImportsUI.c"
+#line 2267 "DataImportsUI.c"
 					SpitDataImportsService* _tmp9_ = NULL;
 					SpitDataImportsService* _tmp10_ = NULL;
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_tmp9_ = service;
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_object_unref0 (selected_service);
-#line 343 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					selected_service = _tmp10_;
-#line 344 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					_g_object_unref0 (service);
-#line 344 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 350 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 					break;
-#line 2264 "DataImportsUI.c"
+#line 2282 "DataImportsUI.c"
 				}
-#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 				_g_object_unref0 (service);
-#line 2268 "DataImportsUI.c"
+#line 2286 "DataImportsUI.c"
 			}
 		}
 	}
-#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp11_ = selected_service;
-#line 347 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 353 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_vala_assert (_tmp11_ != NULL, "selected_service != null");
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp12_ = config_facade_get_instance ();
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp13_ = _tmp12_;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp14_ = selected_service;
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp15_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	configuration_facade_set_last_used_dataimports_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_);
-#line 349 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (_tmp13_);
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp16_ = selected_service;
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp17_ = spit_data_imports_concrete_data_imports_host_new (_tmp16_, self);
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 351 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv->host = _tmp17_;
-#line 352 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp18_ = self->priv->host;
-#line 352 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	spit_data_imports_plugin_host_start_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
-#line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (selected_service);
-#line 335 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_free0 (service_name);
-#line 2306 "DataImportsUI.c"
+#line 2324 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_on_close_cancel_clicked (DataImportsUIDataImportsDialog* self) {
-#line 355 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 356 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_debug ("DataImportsUI.vala:356: DataImportsDialog: on_close_cancel_clicked( ):" \
+#line 362 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_debug ("DataImportsUI.vala:362: DataImportsDialog: on_close_cancel_clicked( ):" \
 " invoked.");
-#line 358 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 364 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_terminate (self);
-#line 2317 "DataImportsUI.c"
+#line 2335 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_terminate (DataImportsUIDataImportsDialog* self) {
 	SpitDataImportsConcreteDataImportsHost* _tmp0_ = NULL;
-#line 361 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 367 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 362 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_debug ("DataImportsUI.vala:362: DataImportsDialog: terminate( ): invoked.");
-#line 364 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 368 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_debug ("DataImportsUI.vala:368: DataImportsDialog: terminate( ): invoked.");
+#line 370 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->host;
-#line 364 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 370 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 2331 "DataImportsUI.c"
+#line 2349 "DataImportsUI.c"
 		SpitDataImportsConcreteDataImportsHost* _tmp1_ = NULL;
-#line 365 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = self->priv->host;
-#line 365 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		spit_data_imports_plugin_host_stop_importing (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_DATA_IMPORTS_TYPE_PLUGIN_HOST, SpitDataImportsPluginHost));
-#line 366 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (self->priv->host);
-#line 366 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 372 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		self->priv->host = NULL;
-#line 2341 "DataImportsUI.c"
+#line 2359 "DataImportsUI.c"
 	}
-#line 369 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 375 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 370 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (data_imports_ui_data_imports_dialog_instance);
-#line 371 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 377 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	data_imports_ui_data_imports_dialog_instance = NULL;
-#line 2351 "DataImportsUI.c"
+#line 2369 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_set_large_window_mode (DataImportsUIDataImportsDialog* self) {
 	GtkBox* _tmp0_ = NULL;
-#line 374 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 380 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 375 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 381 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT);
-#line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 376 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_LARGE_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
-#line 378 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 384 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2367 "DataImportsUI.c"
+#line 2385 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_set_colossal_window_mode (DataImportsUIDataImportsDialog* self) {
 	GtkBox* _tmp0_ = NULL;
-#line 381 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 382 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 388 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT);
-#line 383 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 383 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_COLOSSAL_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
-#line 385 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 391 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2383 "DataImportsUI.c"
+#line 2401 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_set_standard_window_mode (DataImportsUIDataImportsDialog* self) {
 	GtkBox* _tmp0_ = NULL;
-#line 388 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 394 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 389 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT);
-#line 390 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 390 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_WIDTH - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_WIDTH, DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_STANDARD_WINDOW_HEIGHT - DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_BORDER_REGION_HEIGHT);
-#line 392 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 398 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2399 "DataImportsUI.c"
+#line 2417 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) {
-#line 395 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 401 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 396 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 2408 "DataImportsUI.c"
+#line 2426 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (DataImportsUIDataImportsDialog* self) {
-#line 399 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 405 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 400 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 406 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2417 "DataImportsUI.c"
+#line 2435 "DataImportsUI.c"
 }
 
 
@@ -2428,17 +2446,17 @@ SpitDataImportsDialogPane* data_imports_ui_data_imports_dialog_get_active_pane (
 	SpitDataImportsDialogPane* result = NULL;
 	SpitDataImportsDialogPane* _tmp0_ = NULL;
 	SpitDataImportsDialogPane* _tmp1_ = NULL;
-#line 403 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 409 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_val_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self), NULL);
-#line 404 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->active_pane;
-#line 404 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 404 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	result = _tmp1_;
-#line 404 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	return result;
-#line 2435 "DataImportsUI.c"
+#line 2453 "DataImportsUI.c"
 }
 
 
@@ -2446,58 +2464,58 @@ void data_imports_ui_data_imports_dialog_set_close_button_mode (DataImportsUIDat
 	GtkButton* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GtkButton* _tmp2_ = NULL;
-#line 407 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
-#line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp1_ = _ ("_Close");
-#line 408 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_button_set_label (_tmp0_, _tmp1_);
-#line 409 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp2_ = self->priv->close_cancel_button;
-#line 409 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 415 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2455 "DataImportsUI.c"
+#line 2473 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_set_cancel_button_mode (DataImportsUIDataImportsDialog* self) {
 	GtkButton* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 412 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 418 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 419 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
-#line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 419 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp1_ = _ ("_Cancel");
-#line 413 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 419 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_button_set_label (_tmp0_, _tmp1_);
-#line 2470 "DataImportsUI.c"
+#line 2488 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_lock_service (DataImportsUIDataImportsDialog* self) {
 	GtkComboBoxText* _tmp0_ = NULL;
-#line 416 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 422 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 423 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 417 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 423 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2482 "DataImportsUI.c"
+#line 2500 "DataImportsUI.c"
 }
 
 
 void data_imports_ui_data_imports_dialog_unlock_service (DataImportsUIDataImportsDialog* self) {
 	GtkComboBoxText* _tmp0_ = NULL;
-#line 420 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 426 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 427 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 421 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 427 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2494 "DataImportsUI.c"
+#line 2512 "DataImportsUI.c"
 }
 
 
@@ -2515,110 +2533,110 @@ void data_imports_ui_data_imports_dialog_install_pane (DataImportsUIDataImportsD
 	SpitDataImportsDialogPane* _tmp15_ = NULL;
 	SpitDataImportsDialogPane* _tmp16_ = NULL;
 	SpitDataImportsDialogPane* _tmp17_ = NULL;
-#line 424 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 430 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (DATA_IMPORTS_UI_IS_DATA_IMPORTS_DIALOG (self));
-#line 424 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 430 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	g_return_if_fail (SPIT_DATA_IMPORTS_IS_DIALOG_PANE (pane));
-#line 425 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-	g_debug ("DataImportsUI.vala:425: DataImportsDialog: install_pane( ): invoked.");
-#line 427 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+	g_debug ("DataImportsUI.vala:431: DataImportsDialog: install_pane( ): invoked.");
+#line 433 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp0_ = self->priv->active_pane;
-#line 427 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 433 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if (_tmp0_ != NULL) {
-#line 2522 "DataImportsUI.c"
+#line 2540 "DataImportsUI.c"
 		SpitDataImportsDialogPane* _tmp1_ = NULL;
 		GtkBox* _tmp2_ = NULL;
 		SpitDataImportsDialogPane* _tmp3_ = NULL;
 		GtkWidget* _tmp4_ = NULL;
 		GtkWidget* _tmp5_ = NULL;
-#line 428 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
-		g_debug ("DataImportsUI.vala:428: DataImportsDialog: install_pane( ): a pane is " \
+#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+		g_debug ("DataImportsUI.vala:434: DataImportsDialog: install_pane( ): a pane is " \
 "already installed; removing it.");
-#line 430 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 436 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp1_ = self->priv->active_pane;
-#line 430 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 436 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		spit_data_imports_dialog_pane_on_pane_uninstalled (_tmp1_);
-#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp2_ = self->priv->central_area_layouter;
-#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp3_ = self->priv->active_pane;
-#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp4_ = spit_data_imports_dialog_pane_get_widget (_tmp3_);
-#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp5_ = _tmp4_;
-#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
-#line 431 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_g_object_unref0 (_tmp5_);
-#line 2546 "DataImportsUI.c"
+#line 2564 "DataImportsUI.c"
 	}
-#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp6_ = self->priv->central_area_layouter;
-#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp7_ = pane;
-#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp8_ = spit_data_imports_dialog_pane_get_widget (_tmp7_);
-#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp9_ = _tmp8_;
-#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0);
-#line 434 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (_tmp9_);
-#line 435 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 443 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp10_ = pane;
-#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 443 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp11_ = spit_data_imports_dialog_pane_get_preferred_geometry (_tmp10_);
-#line 437 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 443 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	geometry_options = _tmp11_;
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp12_ = geometry_options;
-#line 439 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 445 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
-#line 440 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_set_large_window_mode (self);
-#line 2574 "DataImportsUI.c"
+#line 2592 "DataImportsUI.c"
 	} else {
 		SpitDataImportsDialogPaneGeometryOptions _tmp13_ = 0;
-#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		_tmp13_ = geometry_options;
-#line 441 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
-#line 442 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 448 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			data_imports_ui_data_imports_dialog_set_colossal_window_mode (self);
-#line 2583 "DataImportsUI.c"
+#line 2601 "DataImportsUI.c"
 		} else {
-#line 444 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 450 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 			data_imports_ui_data_imports_dialog_set_standard_window_mode (self);
-#line 2587 "DataImportsUI.c"
+#line 2605 "DataImportsUI.c"
 		}
 	}
-#line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp14_ = geometry_options;
-#line 446 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
-#line 447 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 453 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_set_free_sizable_window_mode (self);
-#line 2596 "DataImportsUI.c"
+#line 2614 "DataImportsUI.c"
 	} else {
-#line 449 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 455 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 		data_imports_ui_data_imports_dialog_clear_free_sizable_window_mode (self);
-#line 2600 "DataImportsUI.c"
+#line 2618 "DataImportsUI.c"
 	}
-#line 451 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp15_ = pane;
-#line 451 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 451 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_g_object_unref0 (self->priv->active_pane);
-#line 451 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv->active_pane = _tmp16_;
-#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	_tmp17_ = pane;
-#line 452 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
+#line 458 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	spit_data_imports_dialog_pane_on_pane_installed (_tmp17_);
-#line 2614 "DataImportsUI.c"
+#line 2632 "DataImportsUI.c"
 }
 
 
@@ -2629,14 +2647,14 @@ static void data_imports_ui_data_imports_dialog_class_init (DataImportsUIDataImp
 	g_type_class_add_private (klass, sizeof (DataImportsUIDataImportsDialogPrivate));
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_ui_data_imports_dialog_finalize;
-#line 2625 "DataImportsUI.c"
+#line 2643 "DataImportsUI.c"
 }
 
 
 static void data_imports_ui_data_imports_dialog_instance_init (DataImportsUIDataImportsDialog * self) {
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	self->priv = DATA_IMPORTS_UI_DATA_IMPORTS_DIALOG_GET_PRIVATE (self);
-#line 2632 "DataImportsUI.c"
+#line 2650 "DataImportsUI.c"
 }
 
 
@@ -2656,7 +2674,7 @@ static void data_imports_ui_data_imports_dialog_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->host);
 #line 191 "/home/jens/Source/shotwell/src/data_imports/DataImportsUI.vala"
 	G_OBJECT_CLASS (data_imports_ui_data_imports_dialog_parent_class)->finalize (obj);
-#line 2652 "DataImportsUI.c"
+#line 2670 "DataImportsUI.c"
 }
 
 
diff --git a/src/data_imports/DataImportsUI.vala b/src/data_imports/DataImportsUI.vala
index a64f751..5b94dcb 100644
--- a/src/data_imports/DataImportsUI.vala
+++ b/src/data_imports/DataImportsUI.vala
@@ -64,8 +64,8 @@ public class LibrarySelectionPane : ConcreteDialogPane {
         this.host = host;
         
         Gtk.Box content_box = new Gtk.Box(Gtk.Orientation.VERTICAL, 8);
-        content_box.set_margin_left(30);
-        content_box.set_margin_right(30);
+        content_box.set_margin_start(30);
+        content_box.set_margin_end(30);
         Gtk.Label welcome_label = new Gtk.Label(null);
         welcome_label.set_markup(welcome_message);
         welcome_label.set_line_wrap(true);
@@ -104,8 +104,8 @@ public class LibrarySelectionPane : ConcreteDialogPane {
                     file_radio.active = true;
                 set_import_button_sensitivity();
             });
-            file_chooser.set_margin_left(chooser_margin_left);
-            file_chooser.set_margin_right(chooser_margin_right);
+            file_chooser.set_margin_start(chooser_margin_left);
+            file_chooser.set_margin_end(chooser_margin_right);
             content_box.pack_start(file_chooser, false, false, 6);
         }
         
@@ -144,8 +144,8 @@ public class LibrarySelectionPane : ConcreteDialogPane {
             }
             
         });
-        button.set_margin_left(margin_left);
-        button.set_margin_right(margin_right);
+        button.set_margin_start(margin_left);
+        button.set_margin_end(margin_right);
         box.pack_start(button, false, false, 6);
         return button;
     }
@@ -208,7 +208,7 @@ public class DataImportsDialog : Gtk.Dialog {
     private Spit.DataImports.ConcreteDataImportsHost host;
 
     protected DataImportsDialog() {
-        bool use_header;
+        bool use_header = false;
         Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
         Object(use_header_bar: use_header ? 1 : 0);
         if (use_header)
@@ -254,19 +254,22 @@ public class DataImportsDialog : Gtk.Dialog {
             {
                 var service_selector_box_label = new Gtk.Label.with_mnemonic(label);
                 service_selector_box_label.set_mnemonic_widget(service_selector_box);
-                service_selector_box_label.set_alignment(0.0f, 0.5f);
+                service_selector_box_label.halign = Gtk.Align.START;
+                service_selector_box_label.valign = Gtk.Align.CENTER;
 
                 /* the wrapper is not an extraneous widget -- it's necessary to prevent the service
                    selection box from growing and shrinking whenever its parent's size changes.
                    When wrapped inside a Gtk.Alignment, the Alignment grows and shrinks instead of
                    the service selection box. */
-                Gtk.Alignment service_selector_box_wrapper = new Gtk.Alignment(1.0f, 0.5f, 0.0f, 0.0f);
-                service_selector_box_wrapper.add(service_selector_box);
+                service_selector_box.halign = Gtk.Align.END;
+                service_selector_box.valign = Gtk.Align.CENTER;
+                service_selector_box.hexpand = false;
+                service_selector_box.vexpand = false;
 
                 Gtk.Box service_selector_layouter = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
                 service_selector_layouter.set_border_width(12);
                 service_selector_layouter.add(service_selector_box_label);
-                service_selector_layouter.pack_start(service_selector_box_wrapper, true, true, 0);
+                service_selector_layouter.pack_start(service_selector_box, true, true, 0);
 
                 /* 'service area' is the selector assembly plus the horizontal rule dividing it from the
                    rest of the dialog */
@@ -274,11 +277,12 @@ public class DataImportsDialog : Gtk.Dialog {
                 service_area_layouter.pack_start(service_selector_layouter, true, true, 0);
                 Gtk.Separator service_central_separator = new Gtk.Separator(Gtk.Orientation.HORIZONTAL);
                 service_area_layouter.add(service_central_separator);
+                service_area_layouter.halign = Gtk.Align.FILL;
+                service_area_layouter.valign = Gtk.Align.START;
+                service_area_layouter.hexpand = true;
+                service_area_layouter.vexpand = false;
 
-                Gtk.Alignment service_area_wrapper = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 0.0f);
-                service_area_wrapper.add(service_area_layouter);
-
-                ((Gtk.Box) get_content_area()).pack_start(service_area_wrapper, false, false, 0);
+                ((Gtk.Box) get_content_area()).pack_start(service_area_layouter, false, false, 0);
             }
         }
         
@@ -286,16 +290,18 @@ public class DataImportsDialog : Gtk.Dialog {
         central_area_layouter = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
         ((Gtk.Box) get_content_area()).pack_start(central_area_layouter, true, true, 0);
         
-        close_cancel_button = new Gtk.Button.with_mnemonic("_Cancel");
-        close_cancel_button.set_can_default(true);
-        close_cancel_button.clicked.connect(on_close_cancel_clicked);
 
         if (use_header) {
+            close_cancel_button = new Gtk.Button.with_mnemonic("_Cancel");
+            close_cancel_button.set_can_default(true);
             ((Gtk.HeaderBar) get_header_bar()).pack_start(close_cancel_button);
             ((Gtk.HeaderBar) get_header_bar()).pack_end(service_selector_box);
         }
-        else
-            ((Gtk.Box) get_action_area()).add(close_cancel_button);
+        else {
+            add_button (_("_Cancel"), Gtk.ResponseType.CANCEL);
+            close_cancel_button = get_widget_for_response (Gtk.ResponseType.CANCEL) as Gtk.Button;
+        }
+        close_cancel_button.clicked.connect(on_close_cancel_clicked);
 
         set_standard_window_mode();
         
diff --git a/src/db/PhotoTable.c b/src/db/PhotoTable.c
index 59a11d0..7551157 100644
--- a/src/db/PhotoTable.c
+++ b/src/db/PhotoTable.c
@@ -1154,6 +1154,13 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	sqlite3_stmt* _tmp36_ = NULL;
 	gint _tmp37_ = 0;
 	gint _tmp38_ = 0;
+	sqlite3* _tmp40_ = NULL;
+	sqlite3_stmt* _tmp41_ = NULL;
+	gint _tmp42_ = 0;
+	gint _tmp43_ = 0;
+	sqlite3_stmt* _tmp44_ = NULL;
+	gint _tmp45_ = 0;
+	gint _tmp46_ = 0;
 #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = (PhotoTable*) database_table_construct (object_type);
 #line 114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1180,13 +1187,13 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	_tmp6_ = res;
 #line 148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
-#line 1184 "PhotoTable.c"
+#line 1191 "PhotoTable.c"
 		gint _tmp7_ = 0;
 #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = res;
 #line 149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_fatal ("create photo table", _tmp7_);
-#line 1190 "PhotoTable.c"
+#line 1197 "PhotoTable.c"
 	}
 #line 153 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = database_table_db;
@@ -1212,19 +1219,18 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	_tmp14_ = res2;
 #line 158 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
-#line 1216 "PhotoTable.c"
+#line 1223 "PhotoTable.c"
 		gint _tmp15_ = 0;
 #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp15_ = res2;
 #line 159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_fatal ("create photo table", _tmp15_);
-#line 1222 "PhotoTable.c"
+#line 1229 "PhotoTable.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = database_table_db;
 #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp18_ = sqlite3_prepare_v2 (_tmp16_, "CREATE UNIQUE INDEX IF NOT EXISTS PhotoTableMD5Format on PhotoTable(md" \
-"5, file_format)", -1, &_tmp17_, NULL);
+	_tmp18_ = sqlite3_prepare_v2 (_tmp16_, "DROP INDEX IF EXISTS PhotoTableMD5Format", -1, &_tmp17_, NULL);
 #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
 #line 165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
@@ -1245,81 +1251,114 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	_tmp22_ = res;
 #line 168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp22_ != SQLITE_DONE) {
-#line 1248 "PhotoTable.c"
+#line 1255 "PhotoTable.c"
 		gint _tmp23_ = 0;
 #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp23_ = res;
 #line 169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_warning ("Failed to create index on md5 and file_format", _tmp23_);
-#line 1254 "PhotoTable.c"
+		database_table_warning ("Failed to drop old PhotoTable index", _tmp23_);
+#line 1261 "PhotoTable.c"
 	}
-#line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = database_table_db;
-#line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp26_ = sqlite3_prepare_v2 (_tmp24_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5Format on PhotoTable(" \
-"thumbnail_md5, file_format)", -1, &_tmp25_, NULL);
-#line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp26_ = sqlite3_prepare_v2 (_tmp24_, "CREATE INDEX IF NOT EXISTS PhotoTableMD5FormatV2 on PhotoTable(md5, fi" \
+"le_format)", -1, &_tmp25_, NULL);
+#line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp25_;
-#line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp26_;
-#line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp27_ = res;
-#line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK");
-#line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp28_ = stmt;
-#line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp29_ = sqlite3_step (_tmp28_);
-#line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp29_;
-#line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_ = res;
-#line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp30_ != SQLITE_DONE) {
-#line 1280 "PhotoTable.c"
+#line 1287 "PhotoTable.c"
 		gint _tmp31_ = 0;
-#line 177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp31_ = res;
-#line 177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_warning ("Failed to create index on md5 and file_format", _tmp31_);
-#line 1286 "PhotoTable.c"
+#line 1293 "PhotoTable.c"
 	}
-#line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = database_table_db;
-#line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	_tmp34_ = sqlite3_prepare_v2 (_tmp32_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5MD5 on PhotoTable(thu" \
-"mbnail_md5, md5)", -1, &_tmp33_, NULL);
-#line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp34_ = sqlite3_prepare_v2 (_tmp32_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5Format on PhotoTable(" \
+"thumbnail_md5, file_format)", -1, &_tmp33_, NULL);
+#line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp33_;
-#line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp34_;
-#line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_ = res;
-#line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK");
-#line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = stmt;
-#line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = sqlite3_step (_tmp36_);
-#line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 182 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp37_;
-#line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = res;
-#line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp38_ != SQLITE_DONE) {
-#line 1312 "PhotoTable.c"
+#line 1319 "PhotoTable.c"
 		gint _tmp39_ = 0;
-#line 185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp39_ = res;
-#line 185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		database_table_warning ("Failed to create index on thumbnail_md5 and md5", _tmp39_);
-#line 1318 "PhotoTable.c"
+#line 184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+		database_table_warning ("Failed to create index on md5 and file_format", _tmp39_);
+#line 1325 "PhotoTable.c"
 	}
 #line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp40_ = database_table_db;
+#line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp42_ = sqlite3_prepare_v2 (_tmp40_, "CREATE INDEX IF NOT EXISTS PhotoTableThumbnailMD5MD5 on PhotoTable(thu" \
+"mbnail_md5, md5)", -1, &_tmp41_, NULL);
+#line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_sqlite3_finalize0 (stmt);
+#line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	stmt = _tmp41_;
+#line 188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp42_;
+#line 189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp43_ = res;
+#line 189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_vala_assert (_tmp43_ == SQLITE_OK, "res == Sqlite.OK");
+#line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp44_ = stmt;
+#line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp45_ = sqlite3_step (_tmp44_);
+#line 190 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp45_;
+#line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	_tmp46_ = res;
+#line 191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	if (_tmp46_ != SQLITE_DONE) {
+#line 1351 "PhotoTable.c"
+		gint _tmp47_ = 0;
+#line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+		_tmp47_ = res;
+#line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+		database_table_warning ("Failed to create index on thumbnail_md5 and md5", _tmp47_);
+#line 1357 "PhotoTable.c"
+	}
+#line 195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "PhotoTable");
 #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt2);
@@ -1327,21 +1366,21 @@ static PhotoTable* photo_table_construct (GType object_type) {
 	_sqlite3_finalize0 (stmt);
 #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self;
-#line 1328 "PhotoTable.c"
+#line 1367 "PhotoTable.c"
 }
 
 
 static PhotoTable* photo_table_new (void) {
 #line 112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return photo_table_construct (TYPE_PHOTO_TABLE);
-#line 1335 "PhotoTable.c"
+#line 1374 "PhotoTable.c"
 }
 
 
 static gpointer _database_table_ref0 (gpointer self) {
-#line 195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self ? database_table_ref (self) : NULL;
-#line 1342 "PhotoTable.c"
+#line 1381 "PhotoTable.c"
 }
 
 
@@ -1350,29 +1389,29 @@ PhotoTable* photo_table_get_instance (void) {
 	PhotoTable* _tmp0_ = NULL;
 	PhotoTable* _tmp2_ = NULL;
 	PhotoTable* _tmp3_ = NULL;
-#line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = photo_table_instance;
-#line 192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_ == NULL) {
-#line 1355 "PhotoTable.c"
+#line 1394 "PhotoTable.c"
 		PhotoTable* _tmp1_ = NULL;
-#line 193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = photo_table_new ();
-#line 193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_database_table_unref0 (photo_table_instance);
-#line 193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_table_instance = _tmp1_;
-#line 1363 "PhotoTable.c"
+#line 1402 "PhotoTable.c"
 	}
-#line 195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = photo_table_instance;
-#line 195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = _database_table_ref0 (_tmp2_);
-#line 195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp3_;
-#line 195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 1373 "PhotoTable.c"
+#line 1412 "PhotoTable.c"
 }
 
 
@@ -1523,433 +1562,433 @@ void photo_table_add (PhotoTable* self, PhotoRow* photo_row, PhotoID* result) {
 	PhotoRow* _tmp143_ = NULL;
 	PhotoRow* _tmp144_ = NULL;
 	PhotoID _tmp145_ = {0};
-#line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_ROW (photo_row));
-#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "INSERT INTO PhotoTable (filename, width, height, filesize, timestamp, " \
 "exposure_time, " "orientation, original_orientation, import_id, event_id, md5, thumbnail" \
 "_md5, " "exif_md5, time_created, file_format, title, rating, editable_id, devel" \
 "oper, comment) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", -1, &_tmp1_, NULL);
-#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = now_sec ();
-#line 210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	time_created = _tmp4_;
-#line 212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = stmt;
-#line 212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = photo_row;
-#line 212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = _tmp6_->master;
-#line 212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = _tmp7_->filepath;
-#line 212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = g_strdup (_tmp8_);
-#line 212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = g_free;
-#line 212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = sqlite3_bind_text (_tmp5_, 1, _tmp9_, -1, _tmp10_);
-#line 212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp11_;
-#line 213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = res;
-#line 213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp12_ == SQLITE_OK, "res == Sqlite.OK");
-#line 214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = stmt;
-#line 214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = photo_row;
-#line 214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = _tmp14_->master;
-#line 214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = _tmp15_->dim;
-#line 214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = _tmp16_.width;
-#line 214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = sqlite3_bind_int (_tmp13_, 2, _tmp17_);
-#line 214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp18_;
-#line 215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = res;
-#line 215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK");
-#line 216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp20_ = stmt;
-#line 216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = photo_row;
-#line 216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = _tmp21_->master;
-#line 216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp23_ = _tmp22_->dim;
-#line 216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = _tmp23_.height;
-#line 216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp25_ = sqlite3_bind_int (_tmp20_, 3, _tmp24_);
-#line 216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp25_;
-#line 217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp26_ = res;
-#line 217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp26_ == SQLITE_OK, "res == Sqlite.OK");
-#line 218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp27_ = stmt;
-#line 218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp28_ = photo_row;
-#line 218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp29_ = _tmp28_->master;
-#line 218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_ = _tmp29_->filesize;
-#line 218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp31_ = sqlite3_bind_int64 (_tmp27_, 4, _tmp30_);
-#line 218 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp31_;
-#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = res;
-#line 219 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp32_ == SQLITE_OK, "res == Sqlite.OK");
-#line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = stmt;
-#line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = photo_row;
-#line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_ = _tmp34_->master;
-#line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = _tmp35_->timestamp;
-#line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = sqlite3_bind_int64 (_tmp33_, 5, (gint64) _tmp36_);
-#line 220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp37_;
-#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = res;
-#line 221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK");
-#line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = stmt;
-#line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = photo_row;
-#line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_ = _tmp40_->exposure_time;
-#line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp42_ = sqlite3_bind_int64 (_tmp39_, 6, (gint64) _tmp41_);
-#line 222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp42_;
-#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp43_ = res;
-#line 223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp43_ == SQLITE_OK, "res == Sqlite.OK");
-#line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp44_ = stmt;
-#line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp45_ = photo_row;
-#line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_ = _tmp45_->master;
-#line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp47_ = _tmp46_->original_orientation;
-#line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp48_ = sqlite3_bind_int (_tmp44_, 7, (gint) _tmp47_);
-#line 224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp48_;
-#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp49_ = res;
-#line 225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp49_ == SQLITE_OK, "res == Sqlite.OK");
-#line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp50_ = stmt;
-#line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp51_ = photo_row;
-#line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp52_ = _tmp51_->master;
-#line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp53_ = _tmp52_->original_orientation;
-#line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp54_ = sqlite3_bind_int (_tmp50_, 8, (gint) _tmp53_);
-#line 226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp54_;
-#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp55_ = res;
-#line 227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp55_ == SQLITE_OK, "res == Sqlite.OK");
-#line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp56_ = stmt;
-#line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp57_ = photo_row;
-#line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp58_ = _tmp57_->import_id;
-#line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp59_ = _tmp58_.id;
-#line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp60_ = sqlite3_bind_int64 (_tmp56_, 9, _tmp59_);
-#line 228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp60_;
-#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp61_ = res;
-#line 229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK");
-#line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp62_ = stmt;
-#line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp63_ = sqlite3_bind_int64 (_tmp62_, 10, EVENT_ID_INVALID);
-#line 230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp63_;
-#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp64_ = res;
-#line 231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp64_ == SQLITE_OK, "res == Sqlite.OK");
-#line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp65_ = stmt;
-#line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp66_ = photo_row;
-#line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp67_ = _tmp66_->md5;
-#line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp68_ = g_strdup (_tmp67_);
-#line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp69_ = g_free;
-#line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp70_ = sqlite3_bind_text (_tmp65_, 11, _tmp68_, -1, _tmp69_);
-#line 232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp70_;
-#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp71_ = res;
-#line 233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp71_ == SQLITE_OK, "res == Sqlite.OK");
-#line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp72_ = stmt;
-#line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp73_ = photo_row;
-#line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp74_ = _tmp73_->thumbnail_md5;
-#line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp75_ = g_strdup (_tmp74_);
-#line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp76_ = g_free;
-#line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp77_ = sqlite3_bind_text (_tmp72_, 12, _tmp75_, -1, _tmp76_);
-#line 234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp77_;
-#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp78_ = res;
-#line 235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp78_ == SQLITE_OK, "res == Sqlite.OK");
-#line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp79_ = stmt;
-#line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp80_ = photo_row;
-#line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp81_ = _tmp80_->exif_md5;
-#line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp82_ = g_strdup (_tmp81_);
-#line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp83_ = g_free;
-#line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp84_ = sqlite3_bind_text (_tmp79_, 13, _tmp82_, -1, _tmp83_);
-#line 236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp84_;
-#line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp85_ = res;
-#line 237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp85_ == SQLITE_OK, "res == Sqlite.OK");
-#line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp86_ = stmt;
-#line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp87_ = time_created;
-#line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp88_ = sqlite3_bind_int64 (_tmp86_, 14, (gint64) _tmp87_);
-#line 238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp88_;
-#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp89_ = res;
-#line 239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp89_ == SQLITE_OK, "res == Sqlite.OK");
-#line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp90_ = stmt;
-#line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp91_ = photo_row;
-#line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp92_ = _tmp91_->master;
-#line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp93_ = _tmp92_->file_format;
-#line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp94_ = photo_file_format_serialize (_tmp93_);
-#line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp95_ = sqlite3_bind_int (_tmp90_, 15, _tmp94_);
-#line 240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp95_;
-#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp96_ = res;
-#line 241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp96_ == SQLITE_OK, "res == Sqlite.OK");
-#line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp97_ = stmt;
-#line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp98_ = photo_row;
-#line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp99_ = _tmp98_->title;
-#line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp100_ = g_strdup (_tmp99_);
-#line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp101_ = g_free;
-#line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp102_ = sqlite3_bind_text (_tmp97_, 16, _tmp100_, -1, _tmp101_);
-#line 242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp102_;
-#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp103_ = res;
-#line 243 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp103_ == SQLITE_OK, "res == Sqlite.OK");
-#line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp104_ = stmt;
-#line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp105_ = photo_row;
-#line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp106_ = _tmp105_->rating;
-#line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp107_ = rating_serialize (_tmp106_);
-#line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp108_ = sqlite3_bind_int64 (_tmp104_, 17, (gint64) _tmp107_);
-#line 244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp108_;
-#line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp109_ = res;
-#line 245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp109_ == SQLITE_OK, "res == Sqlite.OK");
-#line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp110_ = stmt;
-#line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp111_ = sqlite3_bind_int64 (_tmp110_, 18, BACKING_PHOTO_ID_INVALID);
-#line 246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp111_;
-#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp112_ = res;
-#line 247 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp112_ == SQLITE_OK, "res == Sqlite.OK");
-#line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp113_ = stmt;
-#line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp114_ = photo_row;
-#line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp115_ = _tmp114_->developer;
-#line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp116_ = raw_developer_to_string (_tmp115_);
-#line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp117_ = g_free;
-#line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp118_ = sqlite3_bind_text (_tmp113_, 19, _tmp116_, -1, _tmp117_);
-#line 248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp118_;
-#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp119_ = res;
-#line 249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp119_ == SQLITE_OK, "res == Sqlite.OK");
-#line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp120_ = stmt;
-#line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp121_ = photo_row;
-#line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp122_ = _tmp121_->comment;
-#line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp123_ = g_strdup (_tmp122_);
-#line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp124_ = g_free;
-#line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp125_ = sqlite3_bind_text (_tmp120_, 20, _tmp123_, -1, _tmp124_);
-#line 250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp125_;
-#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp126_ = res;
-#line 251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp126_ == SQLITE_OK, "res == Sqlite.OK");
-#line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp127_ = stmt;
-#line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp128_ = sqlite3_step (_tmp127_);
-#line 253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp128_;
-#line 254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp129_ = res;
-#line 254 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp129_ != SQLITE_DONE) {
-#line 1880 "PhotoTable.c"
+#line 1919 "PhotoTable.c"
 		gint _tmp130_ = 0;
 		PhotoID _tmp132_ = {0};
-#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp130_ = res;
-#line 255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp130_ != SQLITE_CONSTRAINT) {
-#line 1887 "PhotoTable.c"
+#line 1926 "PhotoTable.c"
 			gint _tmp131_ = 0;
-#line 256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp131_ = res;
-#line 256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			database_table_fatal ("add_photo", _tmp131_);
-#line 1893 "PhotoTable.c"
+#line 1932 "PhotoTable.c"
 		}
-#line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_id_init (&_tmp132_, PHOTO_ID_INVALID);
-#line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*result = _tmp132_;
-#line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return;
-#line 1903 "PhotoTable.c"
+#line 1942 "PhotoTable.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp133_ = photo_row;
-#line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp134_ = database_table_db;
-#line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp135_ = sqlite3_last_insert_rowid (_tmp134_);
-#line 262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	photo_id_init (&_tmp133_->photo_id, _tmp135_);
-#line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp136_ = photo_row;
-#line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp137_ = photo_row;
-#line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp138_ = _tmp137_->master;
-#line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp139_ = _tmp138_->original_orientation;
-#line 263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 270 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp136_->orientation = _tmp139_;
-#line 264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp140_ = photo_row;
-#line 264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	event_id_init (&_tmp140_->event_id, EVENT_ID_INVALID);
-#line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp141_ = photo_row;
-#line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp142_ = time_created;
-#line 265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp141_->time_created = (time_t) _tmp142_;
-#line 266 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp143_ = photo_row;
-#line 266 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 273 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp143_->flags = (guint64) 0;
-#line 268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp144_ = photo_row;
-#line 268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp145_ = _tmp144_->photo_id;
-#line 268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	*result = _tmp145_;
-#line 268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return;
-#line 1947 "PhotoTable.c"
+#line 1986 "PhotoTable.c"
 }
 
 
@@ -2060,322 +2099,322 @@ void photo_table_reimport (PhotoTable* self, PhotoRow* row, GError** error) {
 	BackingPhotoRow* _tmp101_ = NULL;
 	Orientation _tmp102_ = 0;
 	GError * _inner_error_ = NULL;
-#line 276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 278 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 285 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 278 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 285 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE PhotoTable SET width = ?, height = ?, filesize = ?, timestamp =" \
 " ?, " "exposure_time = ?, orientation = ?, original_orientation = ?, md5 = ?," \
 " " "exif_md5 = ?, thumbnail_md5 = ?, file_format = ?, title = ?, time_reim" \
 "ported = ? " "WHERE id = ?", -1, &_tmp1_, NULL);
-#line 278 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 285 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 278 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 285 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 278 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 285 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 290 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 290 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 285 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 292 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = now_sec ();
-#line 285 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 292 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	time_reimported = (time_t) _tmp4_;
-#line 287 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = stmt;
-#line 287 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = row;
-#line 287 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = _tmp6_->master;
-#line 287 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = _tmp7_->dim;
-#line 287 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = _tmp8_.width;
-#line 287 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = sqlite3_bind_int (_tmp5_, 1, _tmp9_);
-#line 287 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp10_;
-#line 288 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = res;
-#line 288 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 289 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = stmt;
-#line 289 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = row;
-#line 289 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = _tmp13_->master;
-#line 289 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = _tmp14_->dim;
-#line 289 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = _tmp15_.height;
-#line 289 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = sqlite3_bind_int (_tmp12_, 2, _tmp16_);
-#line 289 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp17_;
-#line 290 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = res;
-#line 290 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK");
-#line 291 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = stmt;
-#line 291 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp20_ = row;
-#line 291 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = _tmp20_->master;
-#line 291 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = _tmp21_->filesize;
-#line 291 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp23_ = sqlite3_bind_int64 (_tmp19_, 3, _tmp22_);
-#line 291 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp23_;
-#line 292 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = res;
-#line 292 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp24_ == SQLITE_OK, "res == Sqlite.OK");
-#line 293 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp25_ = stmt;
-#line 293 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp26_ = row;
-#line 293 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp27_ = _tmp26_->master;
-#line 293 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp28_ = _tmp27_->timestamp;
-#line 293 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp29_ = sqlite3_bind_int64 (_tmp25_, 4, (gint64) _tmp28_);
-#line 293 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp29_;
-#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_ = res;
-#line 294 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK");
-#line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp31_ = stmt;
-#line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = row;
-#line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = _tmp32_->exposure_time;
-#line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = sqlite3_bind_int64 (_tmp31_, 5, (gint64) _tmp33_);
-#line 295 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp34_;
-#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_ = res;
-#line 296 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp35_ == SQLITE_OK, "res == Sqlite.OK");
-#line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = stmt;
-#line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = row;
-#line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = _tmp37_->master;
-#line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = _tmp38_->original_orientation;
-#line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = sqlite3_bind_int (_tmp36_, 6, (gint) _tmp39_);
-#line 297 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp40_;
-#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_ = res;
-#line 298 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp41_ == SQLITE_OK, "res == Sqlite.OK");
-#line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp42_ = stmt;
-#line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp43_ = row;
-#line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp44_ = _tmp43_->master;
-#line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp45_ = _tmp44_->original_orientation;
-#line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_ = sqlite3_bind_int (_tmp42_, 7, (gint) _tmp45_);
-#line 299 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp46_;
-#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp47_ = res;
-#line 300 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK");
-#line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp48_ = stmt;
-#line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp49_ = row;
-#line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp50_ = _tmp49_->md5;
-#line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp51_ = g_strdup (_tmp50_);
-#line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp52_ = g_free;
-#line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp53_ = sqlite3_bind_text (_tmp48_, 8, _tmp51_, -1, _tmp52_);
-#line 301 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp53_;
-#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp54_ = res;
-#line 302 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp54_ == SQLITE_OK, "res == Sqlite.OK");
-#line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp55_ = stmt;
-#line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp56_ = row;
-#line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp57_ = _tmp56_->exif_md5;
-#line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp58_ = g_strdup (_tmp57_);
-#line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp59_ = g_free;
-#line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp60_ = sqlite3_bind_text (_tmp55_, 9, _tmp58_, -1, _tmp59_);
-#line 303 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp60_;
-#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp61_ = res;
-#line 304 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK");
-#line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp62_ = stmt;
-#line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp63_ = row;
-#line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp64_ = _tmp63_->thumbnail_md5;
-#line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp65_ = g_strdup (_tmp64_);
-#line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp66_ = g_free;
-#line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp67_ = sqlite3_bind_text (_tmp62_, 10, _tmp65_, -1, _tmp66_);
-#line 305 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp67_;
-#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp68_ = res;
-#line 306 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp68_ == SQLITE_OK, "res == Sqlite.OK");
-#line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp69_ = stmt;
-#line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp70_ = row;
-#line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp71_ = _tmp70_->master;
-#line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp72_ = _tmp71_->file_format;
-#line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp73_ = photo_file_format_serialize (_tmp72_);
-#line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp74_ = sqlite3_bind_int (_tmp69_, 11, _tmp73_);
-#line 307 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp74_;
-#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 315 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp75_ = res;
-#line 308 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 315 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp75_ == SQLITE_OK, "res == Sqlite.OK");
-#line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp76_ = stmt;
-#line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp77_ = row;
-#line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp78_ = _tmp77_->title;
-#line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp79_ = g_strdup (_tmp78_);
-#line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp80_ = g_free;
-#line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp81_ = sqlite3_bind_text (_tmp76_, 12, _tmp79_, -1, _tmp80_);
-#line 309 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp81_;
-#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 317 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp82_ = res;
-#line 310 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 317 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp82_ == SQLITE_OK, "res == Sqlite.OK");
-#line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp83_ = stmt;
-#line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp84_ = time_reimported;
-#line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp85_ = sqlite3_bind_int64 (_tmp83_, 13, (gint64) _tmp84_);
-#line 311 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp85_;
-#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp86_ = res;
-#line 312 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 319 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK");
-#line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp87_ = stmt;
-#line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp88_ = row;
-#line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp89_ = _tmp88_->photo_id;
-#line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp90_ = _tmp89_.id;
-#line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp91_ = sqlite3_bind_int64 (_tmp87_, 14, _tmp90_);
-#line 313 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp91_;
-#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp92_ = res;
-#line 314 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp92_ == SQLITE_OK, "res == Sqlite.OK");
-#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp93_ = stmt;
-#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp94_ = sqlite3_step (_tmp93_);
-#line 316 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 323 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp94_;
-#line 317 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp95_ = res;
-#line 317 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp95_ != SQLITE_DONE) {
-#line 2322 "PhotoTable.c"
+#line 2361 "PhotoTable.c"
 		gint _tmp96_ = 0;
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp96_ = res;
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_throw_error ("PhotoTable.reimport_master", _tmp96_, &_inner_error_);
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 2338 "PhotoTable.c"
+#line 2377 "PhotoTable.c"
 			} else {
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_clear_error (&_inner_error_);
-#line 318 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 325 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 2348 "PhotoTable.c"
+#line 2387 "PhotoTable.c"
 			}
 		}
 	}
-#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp97_ = row;
-#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp98_ = time_reimported;
-#line 320 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp97_->time_reimported = _tmp98_;
-#line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp99_ = row;
-#line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp100_ = row;
-#line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp101_ = _tmp100_->master;
-#line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp102_ = _tmp101_->original_orientation;
-#line 321 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 328 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp99_->orientation = _tmp102_;
-#line 276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 283 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 2370 "PhotoTable.c"
+#line 2409 "PhotoTable.c"
 }
 
 
@@ -2436,200 +2475,200 @@ gboolean photo_table_master_exif_updated (PhotoTable* self, PhotoID* photoID, gi
 	PhotoRow* _tmp52_ = NULL;
 	const gchar* _tmp53_ = NULL;
 	gchar* _tmp54_ = NULL;
-#line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photoID != NULL, FALSE);
-#line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (md5 != NULL, FALSE);
-#line 324 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 331 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_ROW (row), FALSE);
-#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE PhotoTable SET filesize = ?, timestamp = ?, md5 = ?, exif_md5 =" \
 " ?," "thumbnail_md5 =? WHERE id = ?", -1, &_tmp1_, NULL);
-#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 327 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 330 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 337 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 330 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 337 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 332 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 332 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = filesize;
-#line 332 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp5_);
-#line 332 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp6_;
-#line 333 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = res;
-#line 333 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = stmt;
-#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = timestamp;
-#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = sqlite3_bind_int64 (_tmp8_, 2, (gint64) _tmp9_);
-#line 334 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp10_;
-#line 335 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = res;
-#line 335 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 336 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = stmt;
-#line 336 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = md5;
-#line 336 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = g_strdup (_tmp13_);
-#line 336 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = g_free;
-#line 336 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = sqlite3_bind_text (_tmp12_, 3, _tmp14_, -1, _tmp15_);
-#line 336 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp16_;
-#line 337 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 344 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = res;
-#line 337 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 344 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp17_ == SQLITE_OK, "res == Sqlite.OK");
-#line 338 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = stmt;
-#line 338 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = exif_md5;
-#line 338 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp20_ = g_strdup (_tmp19_);
-#line 338 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = g_free;
-#line 338 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = sqlite3_bind_text (_tmp18_, 4, _tmp20_, -1, _tmp21_);
-#line 338 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp22_;
-#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 346 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp23_ = res;
-#line 339 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 346 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp23_ == SQLITE_OK, "res == Sqlite.OK");
-#line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = stmt;
-#line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp25_ = thumbnail_md5;
-#line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp26_ = g_strdup (_tmp25_);
-#line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp27_ = g_free;
-#line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp28_ = sqlite3_bind_text (_tmp24_, 5, _tmp26_, -1, _tmp27_);
-#line 340 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp28_;
-#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 348 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp29_ = res;
-#line 341 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 348 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp29_ == SQLITE_OK, "res == Sqlite.OK");
-#line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_ = stmt;
-#line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp31_ = *photoID;
-#line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = _tmp31_.id;
-#line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = sqlite3_bind_int64 (_tmp30_, 6, _tmp32_);
-#line 342 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 349 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp33_;
-#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = res;
-#line 343 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp34_ == SQLITE_OK, "res == Sqlite.OK");
-#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_ = stmt;
-#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = sqlite3_step (_tmp35_);
-#line 345 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 352 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp36_;
-#line 346 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = res;
-#line 346 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp37_ != SQLITE_DONE) {
-#line 2549 "PhotoTable.c"
+#line 2588 "PhotoTable.c"
 		gint _tmp38_ = 0;
-#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp38_ = res;
-#line 347 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp38_ != SQLITE_CONSTRAINT) {
-#line 2555 "PhotoTable.c"
+#line 2594 "PhotoTable.c"
 			gint _tmp39_ = 0;
-#line 348 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp39_ = res;
-#line 348 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			database_table_fatal ("write_update_photo", _tmp39_);
-#line 2561 "PhotoTable.c"
+#line 2600 "PhotoTable.c"
 		}
-#line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
-#line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 350 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 2569 "PhotoTable.c"
+#line 2608 "PhotoTable.c"
 	}
-#line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = row;
-#line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_ = _tmp40_->master;
-#line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp42_ = filesize;
-#line 353 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 360 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_->filesize = _tmp42_;
-#line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp43_ = row;
-#line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp44_ = _tmp43_->master;
-#line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp45_ = timestamp;
-#line 354 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 361 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp44_->timestamp = (time_t) _tmp45_;
-#line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_ = row;
-#line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp47_ = md5;
-#line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp48_ = g_strdup (_tmp47_);
-#line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp46_->md5);
-#line 355 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 362 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_->md5 = _tmp48_;
-#line 356 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp49_ = row;
-#line 356 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp50_ = exif_md5;
-#line 356 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp51_ = g_strdup (_tmp50_);
-#line 356 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp49_->exif_md5);
-#line 356 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 363 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp49_->exif_md5 = _tmp51_;
-#line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp52_ = row;
-#line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp53_ = thumbnail_md5;
-#line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp54_ = g_strdup (_tmp53_);
-#line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp52_->thumbnail_md5);
-#line 357 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 364 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp52_->thumbnail_md5 = _tmp54_;
-#line 359 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = TRUE;
-#line 359 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 359 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 366 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 2623 "PhotoTable.c"
+#line 2662 "PhotoTable.c"
 }
 
 
@@ -2637,47 +2676,47 @@ static void photo_table_validate_orientation (PhotoTable* self, PhotoRow* row) {
 	gboolean _tmp0_ = FALSE;
 	PhotoRow* _tmp1_ = NULL;
 	Orientation _tmp2_ = 0;
-#line 370 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 370 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 377 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 371 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = row;
-#line 371 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = _tmp1_->orientation;
-#line 371 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp2_ < ORIENTATION_MIN) {
-#line 371 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = TRUE;
-#line 2643 "PhotoTable.c"
+#line 2682 "PhotoTable.c"
 	} else {
 		PhotoRow* _tmp3_ = NULL;
 		Orientation _tmp4_ = 0;
-#line 372 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = row;
-#line 372 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp4_ = _tmp3_->orientation;
-#line 372 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp4_ > ORIENTATION_MAX;
-#line 2653 "PhotoTable.c"
+#line 2692 "PhotoTable.c"
 	}
-#line 371 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 378 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_) {
-#line 2657 "PhotoTable.c"
+#line 2696 "PhotoTable.c"
 		PhotoRow* _tmp5_ = NULL;
 		PhotoID _tmp6_ = {0};
 		PhotoRow* _tmp7_ = NULL;
-#line 374 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = row;
-#line 374 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp6_ = _tmp5_->photo_id;
-#line 374 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_table_set_orientation (self, &_tmp6_, ORIENTATION_MIN);
-#line 375 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = row;
-#line 375 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 382 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_->orientation = ORIENTATION_MIN;
-#line 2671 "PhotoTable.c"
+#line 2710 "PhotoTable.c"
 	}
 }
 
@@ -2813,384 +2852,384 @@ PhotoRow* photo_table_get_row (PhotoTable* self, PhotoID* photo_id) {
 	sqlite3_stmt* _tmp123_ = NULL;
 	const gchar* _tmp124_ = NULL;
 	gchar* _tmp125_ = NULL;
-#line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 379 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 386 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, NULL);
-#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 388 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 388 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT filename, width, height, filesize, timestamp, exposure_time, or" \
 "ientation, " "original_orientation, import_id, event_id, transformations, md5, thumb" \
 "nail_md5, " "exif_md5, time_created, flags, rating, file_format, title, backlinks, " "time_reimported, editable_id, metadata_dirty, developer, develop_shotw" \
 "ell_id, " "develop_camera_id, develop_embedded_id, comment " "FROM PhotoTable WHERE id=?", -1, &_tmp1_, NULL);
-#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 388 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 388 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 381 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 388 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 389 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 389 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 396 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 391 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 391 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = *photo_id;
-#line 391 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = _tmp5_.id;
-#line 391 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 391 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp7_;
-#line 392 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = res;
-#line 392 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 394 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = stmt;
-#line 394 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = sqlite3_step (_tmp9_);
-#line 394 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp10_ != SQLITE_ROW) {
-#line 395 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = NULL;
-#line 395 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 395 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 2851 "PhotoTable.c"
+#line 2890 "PhotoTable.c"
 	}
-#line 397 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = photo_row_new ();
-#line 397 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	row = _tmp11_;
-#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = row;
-#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = *photo_id;
-#line 398 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_->photo_id = _tmp13_;
-#line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = row;
-#line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = _tmp14_->master;
-#line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = stmt;
-#line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = sqlite3_column_text (_tmp16_, 0);
-#line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = g_strdup (_tmp17_);
-#line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp15_->filepath);
-#line 399 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_->filepath = _tmp18_;
-#line 400 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = row;
-#line 400 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp20_ = _tmp19_->master;
-#line 400 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = stmt;
-#line 400 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = sqlite3_column_int (_tmp21_, 1);
-#line 400 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp23_ = stmt;
-#line 400 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = sqlite3_column_int (_tmp23_, 2);
-#line 400 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	dimensions_init (&_tmp20_->dim, _tmp22_, _tmp24_);
-#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp25_ = row;
-#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp26_ = _tmp25_->master;
-#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp27_ = stmt;
-#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp28_ = sqlite3_column_int64 (_tmp27_, 3);
-#line 401 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp26_->filesize = _tmp28_;
-#line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp29_ = row;
-#line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_ = _tmp29_->master;
-#line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp31_ = stmt;
-#line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = sqlite3_column_int64 (_tmp31_, 4);
-#line 402 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_->timestamp = (time_t) _tmp32_;
-#line 403 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = row;
-#line 403 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = stmt;
-#line 403 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_ = sqlite3_column_int64 (_tmp34_, 5);
-#line 403 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_->exposure_time = (time_t) _tmp35_;
-#line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = row;
-#line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = stmt;
-#line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = sqlite3_column_int (_tmp37_, 6);
-#line 404 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_->orientation = (Orientation) _tmp38_;
-#line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = row;
-#line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = _tmp39_->master;
-#line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_ = stmt;
-#line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp42_ = sqlite3_column_int (_tmp41_, 7);
-#line 405 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_->original_orientation = (Orientation) _tmp42_;
-#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp43_ = row;
-#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp44_ = stmt;
-#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp45_ = sqlite3_column_int64 (_tmp44_, 8);
-#line 406 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp43_->import_id.id = _tmp45_;
-#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_ = row;
-#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp47_ = stmt;
-#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp48_ = sqlite3_column_int64 (_tmp47_, 9);
-#line 407 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_->event_id.id = _tmp48_;
-#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp49_ = row;
-#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp50_ = stmt;
-#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp51_ = sqlite3_column_text (_tmp50_, 10);
-#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp52_ = photo_table_marshall_all_transformations (_tmp51_);
-#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_object_unref0 (_tmp49_->transformations);
-#line 408 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp49_->transformations = _tmp52_;
-#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp53_ = row;
-#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp54_ = stmt;
-#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp55_ = sqlite3_column_text (_tmp54_, 11);
-#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp56_ = g_strdup (_tmp55_);
-#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp53_->md5);
-#line 409 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp53_->md5 = _tmp56_;
-#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp57_ = row;
-#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp58_ = stmt;
-#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp59_ = sqlite3_column_text (_tmp58_, 12);
-#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp60_ = g_strdup (_tmp59_);
-#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp57_->thumbnail_md5);
-#line 410 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp57_->thumbnail_md5 = _tmp60_;
-#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp61_ = row;
-#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp62_ = stmt;
-#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp63_ = sqlite3_column_text (_tmp62_, 13);
-#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp64_ = g_strdup (_tmp63_);
-#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp61_->exif_md5);
-#line 411 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp61_->exif_md5 = _tmp64_;
-#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp65_ = row;
-#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp66_ = stmt;
-#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp67_ = sqlite3_column_int64 (_tmp66_, 14);
-#line 412 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp65_->time_created = (time_t) _tmp67_;
-#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp68_ = row;
-#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp69_ = stmt;
-#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp70_ = sqlite3_column_int64 (_tmp69_, 15);
-#line 413 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp68_->flags = (guint64) _tmp70_;
-#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp71_ = row;
-#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp72_ = stmt;
-#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp73_ = sqlite3_column_int (_tmp72_, 16);
-#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp74_ = rating_unserialize (_tmp73_);
-#line 414 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp71_->rating = _tmp74_;
-#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp75_ = row;
-#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp76_ = _tmp75_->master;
-#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp77_ = stmt;
-#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp78_ = sqlite3_column_int (_tmp77_, 17);
-#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp79_ = photo_file_format_unserialize (_tmp78_);
-#line 415 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp76_->file_format = _tmp79_;
-#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp80_ = row;
-#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp81_ = stmt;
-#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp82_ = sqlite3_column_text (_tmp81_, 18);
-#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp83_ = g_strdup (_tmp82_);
-#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp80_->title);
-#line 416 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp80_->title = _tmp83_;
-#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp84_ = row;
-#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp85_ = stmt;
-#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp86_ = sqlite3_column_text (_tmp85_, 19);
-#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp87_ = g_strdup (_tmp86_);
-#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp84_->backlinks);
-#line 417 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp84_->backlinks = _tmp87_;
-#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp88_ = row;
-#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp89_ = stmt;
-#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp90_ = sqlite3_column_int64 (_tmp89_, 20);
-#line 418 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp88_->time_reimported = (time_t) _tmp90_;
-#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp91_ = row;
-#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp92_ = stmt;
-#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp93_ = sqlite3_column_int64 (_tmp92_, 21);
-#line 419 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_id_init (&_tmp91_->editable_id, _tmp93_);
-#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp94_ = row;
-#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp95_ = stmt;
-#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp96_ = sqlite3_column_int (_tmp95_, 22);
-#line 420 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 427 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp94_->metadata_dirty = _tmp96_ != 0;
-#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp98_ = stmt;
-#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp99_ = sqlite3_column_text (_tmp98_, 23);
-#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp99_ != NULL) {
-#line 3093 "PhotoTable.c"
+#line 3132 "PhotoTable.c"
 		sqlite3_stmt* _tmp100_ = NULL;
 		const gchar* _tmp101_ = NULL;
 		RawDeveloper _tmp102_ = 0;
-#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp100_ = stmt;
-#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp101_ = sqlite3_column_text (_tmp100_, 23);
-#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp102_ = raw_developer_from_string (_tmp101_);
-#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp97_ = _tmp102_;
-#line 3105 "PhotoTable.c"
+#line 3144 "PhotoTable.c"
 	} else {
-#line 422 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 429 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp97_ = RAW_DEVELOPER_CAMERA;
-#line 3109 "PhotoTable.c"
+#line 3148 "PhotoTable.c"
 	}
-#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp103_ = row;
-#line 421 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp103_->developer = _tmp97_;
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp104_ = row;
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp105_ = _tmp104_->development_ids;
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp105__length1 = _tmp104_->development_ids_length1;
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp106_ = stmt;
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp107_ = sqlite3_column_int64 (_tmp106_, 24);
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_id_init (&_tmp108_, _tmp107_);
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp105_[RAW_DEVELOPER_SHOTWELL] = _tmp108_;
-#line 423 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 430 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp109_ = _tmp105_[RAW_DEVELOPER_SHOTWELL];
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp110_ = row;
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp111_ = _tmp110_->development_ids;
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp111__length1 = _tmp110_->development_ids_length1;
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp112_ = stmt;
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp113_ = sqlite3_column_int64 (_tmp112_, 25);
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_id_init (&_tmp114_, _tmp113_);
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp111_[RAW_DEVELOPER_CAMERA] = _tmp114_;
-#line 424 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp115_ = _tmp111_[RAW_DEVELOPER_CAMERA];
-#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp116_ = row;
-#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp117_ = _tmp116_->development_ids;
-#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp117__length1 = _tmp116_->development_ids_length1;
-#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp118_ = stmt;
-#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp119_ = sqlite3_column_int64 (_tmp118_, 26);
-#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_id_init (&_tmp120_, _tmp119_);
-#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp117_[RAW_DEVELOPER_EMBEDDED] = _tmp120_;
-#line 425 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 432 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp121_ = _tmp117_[RAW_DEVELOPER_EMBEDDED];
-#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp122_ = row;
-#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp123_ = stmt;
-#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp124_ = sqlite3_column_text (_tmp123_, 27);
-#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp125_ = g_strdup (_tmp124_);
-#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp122_->comment);
-#line 426 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp122_->comment = _tmp125_;
-#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = row;
-#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 428 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 435 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 3181 "PhotoTable.c"
+#line 3220 "PhotoTable.c"
 }
 
 
@@ -3204,33 +3243,33 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 	gint _tmp3_ = 0;
 	GeeArrayList* all = NULL;
 	GeeArrayList* _tmp4_ = NULL;
-#line 431 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 438 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id, filename, width, height, filesize, timestamp, exposure_time" \
 ", orientation, " "original_orientation, import_id, event_id, transformations, md5, thumb" \
 "nail_md5, " "exif_md5, time_created, flags, rating, file_format, title, backlinks, " \
 "time_reimported, " "editable_id, metadata_dirty, developer, develop_shotwell_id, develop_c" \
 "amera_id, " "develop_embedded_id, comment FROM PhotoTable", -1, &_tmp1_, NULL);
-#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 433 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp2_;
 #line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp2_;
+#line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 440 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 442 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = gee_array_list_new (TYPE_PHOTO_ROW, (GBoxedCopyFunc) photo_row_ref, photo_row_unref, NULL, NULL, NULL);
-#line 442 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	all = _tmp4_;
-#line 444 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	while (TRUE) {
-#line 3217 "PhotoTable.c"
+#line 3256 "PhotoTable.c"
 		sqlite3_stmt* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -3354,365 +3393,365 @@ GeeArrayList* photo_table_get_all (PhotoTable* self) {
 		PhotoRow* _tmp124_ = NULL;
 		GeeArrayList* _tmp125_ = NULL;
 		PhotoRow* _tmp126_ = NULL;
-#line 444 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = stmt;
-#line 444 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp6_ = sqlite3_step (_tmp5_);
-#line 444 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		res = _tmp6_;
-#line 444 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = res;
-#line 444 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (!(_tmp7_ == SQLITE_ROW)) {
-#line 444 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 3353 "PhotoTable.c"
+#line 3392 "PhotoTable.c"
 		}
-#line 445 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = photo_row_new ();
-#line 445 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		row = _tmp8_;
-#line 446 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = row;
-#line 446 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp10_ = stmt;
-#line 446 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = sqlite3_column_int64 (_tmp10_, 0);
-#line 446 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_->photo_id.id = _tmp11_;
-#line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = row;
-#line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp13_ = _tmp12_->master;
-#line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp14_ = stmt;
-#line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp15_ = sqlite3_column_text (_tmp14_, 1);
-#line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp16_ = g_strdup (_tmp15_);
-#line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (_tmp13_->filepath);
-#line 447 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp13_->filepath = _tmp16_;
-#line 448 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp17_ = row;
-#line 448 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp18_ = _tmp17_->master;
-#line 448 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp19_ = stmt;
-#line 448 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp20_ = sqlite3_column_int (_tmp19_, 2);
-#line 448 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp21_ = stmt;
-#line 448 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp22_ = sqlite3_column_int (_tmp21_, 3);
-#line 448 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		dimensions_init (&_tmp18_->dim, _tmp20_, _tmp22_);
-#line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp23_ = row;
-#line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp24_ = _tmp23_->master;
-#line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp25_ = stmt;
-#line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp26_ = sqlite3_column_int64 (_tmp25_, 4);
-#line 449 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp24_->filesize = _tmp26_;
-#line 450 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp27_ = row;
-#line 450 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp28_ = _tmp27_->master;
-#line 450 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp29_ = stmt;
-#line 450 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp30_ = sqlite3_column_int64 (_tmp29_, 5);
-#line 450 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp28_->timestamp = (time_t) _tmp30_;
-#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp31_ = row;
-#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp32_ = stmt;
-#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp33_ = sqlite3_column_int64 (_tmp32_, 6);
-#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp31_->exposure_time = (time_t) _tmp33_;
-#line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp34_ = row;
-#line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp35_ = stmt;
-#line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp36_ = sqlite3_column_int (_tmp35_, 7);
-#line 452 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp34_->orientation = (Orientation) _tmp36_;
-#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp37_ = row;
-#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp38_ = _tmp37_->master;
-#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp39_ = stmt;
-#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp40_ = sqlite3_column_int (_tmp39_, 8);
-#line 453 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp38_->original_orientation = (Orientation) _tmp40_;
-#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp41_ = row;
-#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp42_ = stmt;
-#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp43_ = sqlite3_column_int64 (_tmp42_, 9);
-#line 454 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp41_->import_id.id = _tmp43_;
-#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp44_ = row;
-#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp45_ = stmt;
-#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp46_ = sqlite3_column_int64 (_tmp45_, 10);
-#line 455 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp44_->event_id.id = _tmp46_;
-#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp47_ = row;
-#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp48_ = stmt;
-#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp49_ = sqlite3_column_text (_tmp48_, 11);
-#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp50_ = photo_table_marshall_all_transformations (_tmp49_);
-#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_object_unref0 (_tmp47_->transformations);
-#line 456 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp47_->transformations = _tmp50_;
-#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp51_ = row;
-#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp52_ = stmt;
-#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp53_ = sqlite3_column_text (_tmp52_, 12);
-#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp54_ = g_strdup (_tmp53_);
-#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (_tmp51_->md5);
-#line 457 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp51_->md5 = _tmp54_;
-#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp55_ = row;
-#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp56_ = stmt;
-#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp57_ = sqlite3_column_text (_tmp56_, 13);
-#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp58_ = g_strdup (_tmp57_);
-#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (_tmp55_->thumbnail_md5);
-#line 458 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp55_->thumbnail_md5 = _tmp58_;
-#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp59_ = row;
-#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp60_ = stmt;
-#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp61_ = sqlite3_column_text (_tmp60_, 14);
-#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp62_ = g_strdup (_tmp61_);
-#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (_tmp59_->exif_md5);
-#line 459 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp59_->exif_md5 = _tmp62_;
-#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp63_ = row;
-#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp64_ = stmt;
-#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp65_ = sqlite3_column_int64 (_tmp64_, 15);
-#line 460 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp63_->time_created = (time_t) _tmp65_;
-#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp66_ = row;
-#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp67_ = stmt;
-#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp68_ = sqlite3_column_int64 (_tmp67_, 16);
-#line 461 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp66_->flags = (guint64) _tmp68_;
-#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp69_ = row;
-#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp70_ = stmt;
-#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp71_ = sqlite3_column_int (_tmp70_, 17);
-#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp72_ = rating_unserialize (_tmp71_);
-#line 462 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp69_->rating = _tmp72_;
-#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp73_ = row;
-#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp74_ = _tmp73_->master;
-#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp75_ = stmt;
-#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp76_ = sqlite3_column_int (_tmp75_, 18);
-#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp77_ = photo_file_format_unserialize (_tmp76_);
-#line 463 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp74_->file_format = _tmp77_;
-#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp78_ = row;
-#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp79_ = stmt;
-#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp80_ = sqlite3_column_text (_tmp79_, 19);
-#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp81_ = g_strdup (_tmp80_);
-#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (_tmp78_->title);
-#line 464 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp78_->title = _tmp81_;
-#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp82_ = row;
-#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp83_ = stmt;
-#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp84_ = sqlite3_column_text (_tmp83_, 20);
-#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp85_ = g_strdup (_tmp84_);
-#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (_tmp82_->backlinks);
-#line 465 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp82_->backlinks = _tmp85_;
-#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp86_ = row;
-#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp87_ = stmt;
-#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp88_ = sqlite3_column_int64 (_tmp87_, 21);
-#line 466 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp86_->time_reimported = (time_t) _tmp88_;
-#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp89_ = row;
-#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp90_ = stmt;
-#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp91_ = sqlite3_column_int64 (_tmp90_, 22);
-#line 467 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_id_init (&_tmp89_->editable_id, _tmp91_);
-#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp92_ = row;
-#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp93_ = stmt;
-#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp94_ = sqlite3_column_int (_tmp93_, 23);
-#line 468 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 475 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp92_->metadata_dirty = _tmp94_ != 0;
-#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp96_ = stmt;
-#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp97_ = sqlite3_column_text (_tmp96_, 24);
-#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp97_ != NULL) {
-#line 3597 "PhotoTable.c"
+#line 3636 "PhotoTable.c"
 			sqlite3_stmt* _tmp98_ = NULL;
 			const gchar* _tmp99_ = NULL;
 			RawDeveloper _tmp100_ = 0;
-#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp98_ = stmt;
-#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp99_ = sqlite3_column_text (_tmp98_, 24);
-#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp100_ = raw_developer_from_string (_tmp99_);
-#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp95_ = _tmp100_;
-#line 3609 "PhotoTable.c"
+#line 3648 "PhotoTable.c"
 		} else {
-#line 470 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 477 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp95_ = RAW_DEVELOPER_CAMERA;
-#line 3613 "PhotoTable.c"
+#line 3652 "PhotoTable.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp101_ = row;
-#line 469 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp101_->developer = _tmp95_;
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp102_ = row;
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp103_ = _tmp102_->development_ids;
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp103__length1 = _tmp102_->development_ids_length1;
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp104_ = stmt;
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp105_ = sqlite3_column_int64 (_tmp104_, 25);
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_id_init (&_tmp106_, _tmp105_);
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp103_[RAW_DEVELOPER_SHOTWELL] = _tmp106_;
-#line 471 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp107_ = _tmp103_[RAW_DEVELOPER_SHOTWELL];
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp108_ = row;
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp109_ = _tmp108_->development_ids;
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp109__length1 = _tmp108_->development_ids_length1;
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp110_ = stmt;
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp111_ = sqlite3_column_int64 (_tmp110_, 26);
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_id_init (&_tmp112_, _tmp111_);
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp109_[RAW_DEVELOPER_CAMERA] = _tmp112_;
-#line 472 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 479 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp113_ = _tmp109_[RAW_DEVELOPER_CAMERA];
-#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp114_ = row;
-#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp115_ = _tmp114_->development_ids;
-#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp115__length1 = _tmp114_->development_ids_length1;
-#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp116_ = stmt;
-#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp117_ = sqlite3_column_int64 (_tmp116_, 27);
-#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_id_init (&_tmp118_, _tmp117_);
-#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp115_[RAW_DEVELOPER_EMBEDDED] = _tmp118_;
-#line 473 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 480 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp119_ = _tmp115_[RAW_DEVELOPER_EMBEDDED];
-#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp120_ = row;
-#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp121_ = stmt;
-#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp122_ = sqlite3_column_text (_tmp121_, 28);
-#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp123_ = g_strdup (_tmp122_);
-#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (_tmp120_->comment);
-#line 474 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp120_->comment = _tmp123_;
-#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 483 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp124_ = row;
-#line 476 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 483 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_table_validate_orientation (self, _tmp124_);
-#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp125_ = all;
-#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp126_ = row;
-#line 478 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 485 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp126_);
-#line 444 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 451 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_photo_row_unref0 (row);
-#line 3691 "PhotoTable.c"
+#line 3730 "PhotoTable.c"
 	}
-#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = all;
-#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 481 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 488 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 3699 "PhotoTable.c"
+#line 3738 "PhotoTable.c"
 }
 
 
@@ -3883,498 +3922,498 @@ void photo_table_duplicate (PhotoTable* self, PhotoID* photo_id, const gchar* ne
 	sqlite3* _tmp163_ = NULL;
 	gint64 _tmp164_ = 0LL;
 	PhotoID _tmp165_ = {0};
-#line 486 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 486 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (photo_id != NULL);
-#line 486 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (new_filename != NULL);
-#line 486 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (editable_id != NULL);
-#line 486 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (develop_shotwell != NULL);
-#line 486 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (develop_camera_id != NULL);
-#line 486 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (develop_embedded_id != NULL);
-#line 490 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 497 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 490 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 497 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = photo_table_get_row (self, &_tmp0_);
-#line 490 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 497 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	original = _tmp1_;
-#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 500 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = database_table_db;
-#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 500 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = sqlite3_prepare_v2 (_tmp2_, "INSERT INTO PhotoTable (filename, width, height, filesize, " "timestamp, exposure_time, orientation, original_orientation, import_id" \
 ", event_id, " "transformations, md5, thumbnail_md5, exif_md5, time_created, flags, ra" \
 "ting, " "file_format, title, editable_id, developer, develop_shotwell_id, devel" \
 "op_camera_id, " "develop_embedded_id, comment) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?," \
 " ?, ?, ?, ?)", -1, &_tmp3_, NULL);
-#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 500 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 500 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp3_;
-#line 493 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-	res = _tmp4_;
 #line 500 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+	res = _tmp4_;
+#line 507 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = res;
-#line 500 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 507 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp5_ == SQLITE_OK, "res == Sqlite.OK");
-#line 502 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = stmt;
-#line 502 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = new_filename;
-#line 502 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = g_strdup (_tmp7_);
-#line 502 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = g_free;
-#line 502 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = sqlite3_bind_text (_tmp6_, 1, _tmp8_, -1, _tmp9_);
-#line 502 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp10_;
-#line 503 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = res;
-#line 503 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 504 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = stmt;
-#line 504 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = original;
-#line 504 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = _tmp13_->master;
-#line 504 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = _tmp14_->dim;
-#line 504 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = _tmp15_.width;
-#line 504 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = sqlite3_bind_int (_tmp12_, 2, _tmp16_);
-#line 504 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp17_;
-#line 505 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = res;
-#line 505 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK");
-#line 506 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = stmt;
-#line 506 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp20_ = original;
-#line 506 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = _tmp20_->master;
-#line 506 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = _tmp21_->dim;
-#line 506 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp23_ = _tmp22_.height;
-#line 506 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = sqlite3_bind_int (_tmp19_, 3, _tmp23_);
-#line 506 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp24_;
-#line 507 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp25_ = res;
-#line 507 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK");
-#line 508 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp26_ = stmt;
-#line 508 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp27_ = original;
-#line 508 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp28_ = _tmp27_->master;
-#line 508 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp29_ = _tmp28_->filesize;
-#line 508 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_ = sqlite3_bind_int64 (_tmp26_, 4, _tmp29_);
-#line 508 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp30_;
-#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp31_ = res;
-#line 509 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp31_ == SQLITE_OK, "res == Sqlite.OK");
-#line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = stmt;
-#line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = original;
-#line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = _tmp33_->master;
-#line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_ = _tmp34_->timestamp;
-#line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = sqlite3_bind_int64 (_tmp32_, 5, (gint64) _tmp35_);
-#line 510 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp36_;
-#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = res;
-#line 511 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK");
-#line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = stmt;
-#line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = original;
-#line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = _tmp39_->exposure_time;
-#line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_ = sqlite3_bind_int64 (_tmp38_, 6, (gint64) _tmp40_);
-#line 512 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp41_;
-#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp42_ = res;
-#line 513 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK");
-#line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp43_ = stmt;
-#line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp44_ = original;
-#line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp45_ = _tmp44_->orientation;
-#line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_ = sqlite3_bind_int (_tmp43_, 7, (gint) _tmp45_);
-#line 514 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp46_;
-#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp47_ = res;
-#line 515 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp47_ == SQLITE_OK, "res == Sqlite.OK");
-#line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp48_ = stmt;
-#line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp49_ = original;
-#line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp50_ = _tmp49_->master;
-#line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp51_ = _tmp50_->original_orientation;
-#line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp52_ = sqlite3_bind_int (_tmp48_, 8, (gint) _tmp51_);
-#line 516 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp52_;
-#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp53_ = res;
-#line 517 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK");
-#line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp54_ = stmt;
-#line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp55_ = original;
-#line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp56_ = _tmp55_->import_id;
-#line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp57_ = _tmp56_.id;
-#line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp58_ = sqlite3_bind_int64 (_tmp54_, 9, _tmp57_);
-#line 518 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp58_;
-#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp59_ = res;
-#line 519 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp59_ == SQLITE_OK, "res == Sqlite.OK");
-#line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp60_ = stmt;
-#line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp61_ = original;
-#line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp62_ = _tmp61_->event_id;
-#line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp63_ = _tmp62_.id;
-#line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp64_ = sqlite3_bind_int64 (_tmp60_, 10, _tmp63_);
-#line 520 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp64_;
-#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp65_ = res;
-#line 521 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp65_ == SQLITE_OK, "res == Sqlite.OK");
-#line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp66_ = stmt;
-#line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp67_ = original;
-#line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp68_ = _tmp67_->transformations;
-#line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp69_ = photo_table_unmarshall_all_transformations (_tmp68_);
-#line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp70_ = g_free;
-#line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp71_ = sqlite3_bind_text (_tmp66_, 11, _tmp69_, -1, _tmp70_);
-#line 522 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp71_;
-#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp72_ = res;
-#line 523 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK");
-#line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp73_ = stmt;
-#line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp74_ = original;
-#line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp75_ = _tmp74_->md5;
-#line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp76_ = g_strdup (_tmp75_);
-#line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp77_ = g_free;
-#line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp78_ = sqlite3_bind_text (_tmp73_, 12, _tmp76_, -1, _tmp77_);
-#line 524 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp78_;
-#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp79_ = res;
-#line 525 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp79_ == SQLITE_OK, "res == Sqlite.OK");
-#line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp80_ = stmt;
-#line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp81_ = original;
-#line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp82_ = _tmp81_->thumbnail_md5;
-#line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp83_ = g_strdup (_tmp82_);
-#line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp84_ = g_free;
-#line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp85_ = sqlite3_bind_text (_tmp80_, 13, _tmp83_, -1, _tmp84_);
-#line 526 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp85_;
-#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp86_ = res;
-#line 527 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp86_ == SQLITE_OK, "res == Sqlite.OK");
-#line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp87_ = stmt;
-#line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp88_ = original;
-#line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp89_ = _tmp88_->exif_md5;
-#line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp90_ = g_strdup (_tmp89_);
-#line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp91_ = g_free;
-#line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp92_ = sqlite3_bind_text (_tmp87_, 14, _tmp90_, -1, _tmp91_);
-#line 528 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp92_;
-#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp93_ = res;
-#line 529 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp93_ == SQLITE_OK, "res == Sqlite.OK");
-#line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp94_ = stmt;
-#line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp95_ = now_sec ();
-#line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp96_ = sqlite3_bind_int64 (_tmp94_, 15, (gint64) _tmp95_);
-#line 530 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp96_;
-#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp97_ = res;
-#line 531 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp97_ == SQLITE_OK, "res == Sqlite.OK");
-#line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp98_ = stmt;
-#line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp99_ = original;
-#line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp100_ = _tmp99_->flags;
-#line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp101_ = sqlite3_bind_int64 (_tmp98_, 16, (gint64) _tmp100_);
-#line 532 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp101_;
-#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp102_ = res;
-#line 533 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp102_ == SQLITE_OK, "res == Sqlite.OK");
-#line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp103_ = stmt;
-#line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp104_ = original;
-#line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp105_ = _tmp104_->rating;
-#line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp106_ = rating_serialize (_tmp105_);
-#line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp107_ = sqlite3_bind_int64 (_tmp103_, 17, (gint64) _tmp106_);
-#line 534 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp107_;
-#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 542 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp108_ = res;
-#line 535 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 542 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp108_ == SQLITE_OK, "res == Sqlite.OK");
-#line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp109_ = stmt;
-#line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp110_ = original;
-#line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp111_ = _tmp110_->master;
-#line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp112_ = _tmp111_->file_format;
-#line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp113_ = photo_file_format_serialize (_tmp112_);
-#line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp114_ = sqlite3_bind_int (_tmp109_, 18, _tmp113_);
-#line 536 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp114_;
-#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 544 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp115_ = res;
-#line 537 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 544 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp115_ == SQLITE_OK, "res == Sqlite.OK");
-#line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp116_ = stmt;
-#line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp117_ = original;
-#line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp118_ = _tmp117_->title;
-#line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp119_ = g_strdup (_tmp118_);
-#line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp120_ = g_free;
-#line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp121_ = sqlite3_bind_text (_tmp116_, 19, _tmp119_, -1, _tmp120_);
-#line 538 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp121_;
-#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 546 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp122_ = res;
-#line 539 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 546 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp122_ == SQLITE_OK, "res == Sqlite.OK");
-#line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp123_ = stmt;
-#line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp124_ = *editable_id;
-#line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp125_ = _tmp124_.id;
-#line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp126_ = sqlite3_bind_int64 (_tmp123_, 20, _tmp125_);
-#line 540 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp126_;
-#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 548 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp127_ = res;
-#line 541 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 548 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp127_ == SQLITE_OK, "res == Sqlite.OK");
-#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp128_ = stmt;
-#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp129_ = original;
-#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp130_ = _tmp129_->developer;
-#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp131_ = raw_developer_to_string (_tmp130_);
-#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp132_ = g_free;
-#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp133_ = sqlite3_bind_text (_tmp128_, 21, _tmp131_, -1, _tmp132_);
-#line 543 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp133_;
-#line 544 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp134_ = res;
-#line 544 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp134_ == SQLITE_OK, "res == Sqlite.OK");
-#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp135_ = stmt;
-#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp136_ = *develop_shotwell;
-#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp137_ = _tmp136_.id;
-#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp138_ = sqlite3_bind_int64 (_tmp135_, 22, _tmp137_);
-#line 545 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp138_;
-#line 546 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 553 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp139_ = res;
-#line 546 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 553 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp139_ == SQLITE_OK, "res == Sqlite.OK");
-#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp140_ = stmt;
-#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp141_ = *develop_camera_id;
-#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp142_ = _tmp141_.id;
-#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp143_ = sqlite3_bind_int64 (_tmp140_, 23, _tmp142_);
-#line 547 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp143_;
-#line 548 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 555 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp144_ = res;
-#line 548 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 555 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp144_ == SQLITE_OK, "res == Sqlite.OK");
-#line 549 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp145_ = stmt;
-#line 549 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp146_ = *develop_embedded_id;
-#line 549 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp147_ = _tmp146_.id;
-#line 549 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp148_ = sqlite3_bind_int64 (_tmp145_, 24, _tmp147_);
-#line 549 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp148_;
-#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 557 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp149_ = res;
-#line 550 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 557 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp149_ == SQLITE_OK, "res == Sqlite.OK");
-#line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp150_ = stmt;
-#line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp151_ = original;
-#line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp152_ = _tmp151_->comment;
-#line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp153_ = g_strdup (_tmp152_);
-#line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp154_ = g_free;
-#line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp155_ = sqlite3_bind_text (_tmp150_, 25, _tmp153_, -1, _tmp154_);
-#line 551 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 558 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp155_;
-#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp156_ = res;
-#line 552 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp156_ == SQLITE_OK, "res == Sqlite.OK");
-#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp157_ = stmt;
-#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp158_ = sqlite3_step (_tmp157_);
-#line 554 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 561 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp158_;
-#line 555 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp159_ = res;
-#line 555 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp159_ != SQLITE_DONE) {
-#line 4316 "PhotoTable.c"
+#line 4355 "PhotoTable.c"
 		gint _tmp160_ = 0;
 		PhotoID _tmp162_ = {0};
-#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp160_ = res;
-#line 556 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 563 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp160_ != SQLITE_CONSTRAINT) {
-#line 4323 "PhotoTable.c"
+#line 4362 "PhotoTable.c"
 			gint _tmp161_ = 0;
-#line 557 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp161_ = res;
-#line 557 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 564 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			database_table_fatal ("duplicate", _tmp161_);
-#line 4329 "PhotoTable.c"
+#line 4368 "PhotoTable.c"
 		}
-#line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_id_init (&_tmp162_, PHOTO_ID_INVALID);
-#line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*result = _tmp162_;
-#line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_photo_row_unref0 (original);
-#line 559 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return;
-#line 4341 "PhotoTable.c"
+#line 4380 "PhotoTable.c"
 	}
-#line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp163_ = database_table_db;
-#line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp164_ = sqlite3_last_insert_rowid (_tmp163_);
-#line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	photo_id_init (&_tmp165_, _tmp164_);
-#line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	*result = _tmp165_;
-#line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_photo_row_unref0 (original);
-#line 562 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return;
-#line 4357 "PhotoTable.c"
+#line 4396 "PhotoTable.c"
 }
 
 
@@ -4385,37 +4424,37 @@ gboolean photo_table_set_title (PhotoTable* self, PhotoID* photo_id, const gchar
 	PhotoID _tmp3_ = {0};
 	gint64 _tmp4_ = 0LL;
 	gboolean _tmp5_ = FALSE;
-#line 565 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 565 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 572 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = new_title;
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
-#line 4376 "PhotoTable.c"
+#line 4415 "PhotoTable.c"
 		const gchar* _tmp2_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = new_title;
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp2_;
-#line 4382 "PhotoTable.c"
+#line 4421 "PhotoTable.c"
 	} else {
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = "";
-#line 4386 "PhotoTable.c"
+#line 4425 "PhotoTable.c"
 	}
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = *photo_id;
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = _tmp3_.id;
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "title", _tmp0_);
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp5_;
-#line 566 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4398 "PhotoTable.c"
+#line 4437 "PhotoTable.c"
 }
 
 
@@ -4426,37 +4465,37 @@ gboolean photo_table_set_comment (PhotoTable* self, PhotoID* photo_id, const gch
 	PhotoID _tmp3_ = {0};
 	gint64 _tmp4_ = 0LL;
 	gboolean _tmp5_ = FALSE;
-#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 569 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 576 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 570 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = new_comment;
-#line 570 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
-#line 4417 "PhotoTable.c"
+#line 4456 "PhotoTable.c"
 		const gchar* _tmp2_ = NULL;
-#line 570 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = new_comment;
-#line 570 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp2_;
-#line 4423 "PhotoTable.c"
+#line 4462 "PhotoTable.c"
 	} else {
-#line 570 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = "";
-#line 4427 "PhotoTable.c"
+#line 4466 "PhotoTable.c"
 	}
-#line 570 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = *photo_id;
-#line 570 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = _tmp3_.id;
-#line 570 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "comment", _tmp0_);
-#line 570 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp5_;
-#line 570 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4439 "PhotoTable.c"
+#line 4478 "PhotoTable.c"
 }
 
 
@@ -4465,37 +4504,37 @@ void photo_table_set_filepath (PhotoTable* self, PhotoID* photo_id, const gchar*
 	gint64 _tmp1_ = 0LL;
 	const gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 580 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 580 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (photo_id != NULL);
-#line 573 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 580 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (filepath != NULL);
-#line 574 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 574 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 574 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = filepath;
-#line 574 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filename", _tmp2_, &_inner_error_);
-#line 574 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 574 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 574 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 574 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4470 "PhotoTable.c"
+#line 4509 "PhotoTable.c"
 		} else {
-#line 574 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 574 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 574 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4478 "PhotoTable.c"
+#line 4517 "PhotoTable.c"
 		}
 	}
 }
@@ -4506,35 +4545,35 @@ void photo_table_update_timestamp (PhotoTable* self, PhotoID* photo_id, time_t t
 	gint64 _tmp1_ = 0LL;
 	time_t _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 584 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 577 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 584 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (photo_id != NULL);
-#line 578 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 578 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 578 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = timestamp;
-#line 578 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) _tmp2_, &_inner_error_);
-#line 578 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 578 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 578 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 578 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4509 "PhotoTable.c"
+#line 4548 "PhotoTable.c"
 		} else {
-#line 578 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 578 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 578 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4517 "PhotoTable.c"
+#line 4556 "PhotoTable.c"
 		}
 	}
 }
@@ -4546,23 +4585,23 @@ gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, tim
 	gint64 _tmp1_ = 0LL;
 	time_t _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 581 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 588 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 582 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 582 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 582 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = time;
-#line 582 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "exposure_time", (gint64) _tmp2_);
-#line 582 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp3_;
-#line 582 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4545 "PhotoTable.c"
+#line 4584 "PhotoTable.c"
 }
 
 
@@ -4572,39 +4611,39 @@ void photo_table_set_import_id (PhotoTable* self, PhotoID* photo_id, ImportID* i
 	ImportID _tmp2_ = {0};
 	gint64 _tmp3_ = 0LL;
 	GError * _inner_error_ = NULL;
-#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 592 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 592 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (photo_id != NULL);
-#line 585 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 592 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (import_id != NULL);
-#line 586 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 586 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 586 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = *import_id;
-#line 586 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = _tmp2_.id;
-#line 586 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "import_id", _tmp3_, &_inner_error_);
-#line 586 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 586 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 586 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 586 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4579 "PhotoTable.c"
+#line 4618 "PhotoTable.c"
 		} else {
-#line 586 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 586 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 586 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 593 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4587 "PhotoTable.c"
+#line 4626 "PhotoTable.c"
 		}
 	}
 }
@@ -4627,71 +4666,71 @@ gboolean photo_table_remove_by_file (PhotoTable* self, GFile* file) {
 	sqlite3_stmt* _tmp10_ = NULL;
 	gint _tmp11_ = 0;
 	gint _tmp12_ = 0;
-#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 589 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 596 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 591 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 598 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 591 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 598 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "DELETE FROM PhotoTable WHERE filename=?", -1, &_tmp1_, NULL);
-#line 591 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 598 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 591 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 598 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 591 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 598 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 592 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 599 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 592 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 599 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 594 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 594 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = file;
-#line 594 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = g_file_get_path (_tmp5_);
-#line 594 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = g_free;
-#line 594 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = sqlite3_bind_text (_tmp4_, 1, _tmp6_, -1, _tmp7_);
-#line 594 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp8_;
-#line 595 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 602 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = res;
-#line 595 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 602 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp9_ == SQLITE_OK, "res == Sqlite.OK");
-#line 597 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = stmt;
-#line 597 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = sqlite3_step (_tmp10_);
-#line 597 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp11_;
-#line 598 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = res;
-#line 598 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 605 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp12_ != SQLITE_DONE) {
-#line 4654 "PhotoTable.c"
+#line 4693 "PhotoTable.c"
 		gint _tmp13_ = 0;
-#line 599 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp13_ = res;
-#line 599 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 606 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_warning ("remove", _tmp13_);
-#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
-#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 601 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 4666 "PhotoTable.c"
+#line 4705 "PhotoTable.c"
 	}
-#line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = TRUE;
-#line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 604 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4674 "PhotoTable.c"
+#line 4713 "PhotoTable.c"
 }
 
 
@@ -4699,33 +4738,33 @@ void photo_table_remove (PhotoTable* self, PhotoID* photo_id, GError** error) {
 	PhotoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
 	GError * _inner_error_ = NULL;
-#line 607 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 614 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 607 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 614 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (photo_id != NULL);
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_delete_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, &_inner_error_);
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4700 "PhotoTable.c"
+#line 4739 "PhotoTable.c"
 		} else {
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 608 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 615 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 4708 "PhotoTable.c"
+#line 4747 "PhotoTable.c"
 		}
 	}
 }
@@ -4741,34 +4780,34 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 	gint _tmp3_ = 0;
 	GeeArrayList* photo_ids = NULL;
 	GeeArrayList* _tmp4_ = NULL;
-#line 611 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 618 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 613 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 613 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id FROM PhotoTable", -1, &_tmp1_, NULL);
-#line 613 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 613 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 613 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 614 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 621 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 614 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 621 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 616 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 623 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = gee_array_list_new (TYPE_PHOTO_ID, (GBoxedCopyFunc) photo_id_dup, photo_id_free, NULL, NULL, NULL);
-#line 616 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 623 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	photo_ids = _tmp4_;
-#line 4744 "PhotoTable.c"
+#line 4783 "PhotoTable.c"
 	{
 		gboolean _tmp5_ = FALSE;
-#line 617 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = TRUE;
-#line 617 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
-#line 4751 "PhotoTable.c"
+#line 4790 "PhotoTable.c"
 			sqlite3_stmt* _tmp6_ = NULL;
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
@@ -4776,62 +4815,62 @@ GeeArrayList* photo_table_get_photos (PhotoTable* self) {
 			sqlite3_stmt* _tmp12_ = NULL;
 			gint64 _tmp13_ = 0LL;
 			PhotoID _tmp14_ = {0};
-#line 617 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp5_) {
-#line 4761 "PhotoTable.c"
+#line 4800 "PhotoTable.c"
 			}
-#line 617 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp5_ = FALSE;
-#line 618 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp6_ = stmt;
-#line 618 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp7_ = sqlite3_step (_tmp6_);
-#line 618 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 625 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			res = _tmp7_;
-#line 619 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 626 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp8_ = res;
-#line 619 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 626 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_tmp8_ == SQLITE_DONE) {
-#line 620 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 627 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				break;
-#line 4777 "PhotoTable.c"
+#line 4816 "PhotoTable.c"
 			} else {
 				gint _tmp9_ = 0;
-#line 621 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp9_ = res;
-#line 621 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 628 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_tmp9_ != SQLITE_ROW) {
-#line 4784 "PhotoTable.c"
+#line 4823 "PhotoTable.c"
 					gint _tmp10_ = 0;
-#line 622 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp10_ = res;
-#line 622 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 629 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					database_table_fatal ("get_photos", _tmp10_);
-#line 624 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 631 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					break;
-#line 4792 "PhotoTable.c"
+#line 4831 "PhotoTable.c"
 				}
 			}
-#line 627 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp11_ = photo_ids;
-#line 627 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp12_ = stmt;
-#line 627 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = sqlite3_column_int64 (_tmp12_, 0);
-#line 627 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			photo_id_init (&_tmp14_, _tmp13_);
-#line 627 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp14_);
-#line 4805 "PhotoTable.c"
+#line 4844 "PhotoTable.c"
 		}
 	}
-#line 630 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = photo_ids;
-#line 630 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 630 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4814 "PhotoTable.c"
+#line 4853 "PhotoTable.c"
 }
 
 
@@ -4841,23 +4880,23 @@ gboolean photo_table_set_orientation (PhotoTable* self, PhotoID* photo_id, Orien
 	gint64 _tmp1_ = 0LL;
 	Orientation _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 633 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 633 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 640 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = orientation;
-#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "orientation", (gint) _tmp2_);
-#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp3_;
-#line 634 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4840 "PhotoTable.c"
+#line 4879 "PhotoTable.c"
 }
 
 
@@ -4867,23 +4906,23 @@ gboolean photo_table_replace_flags (PhotoTable* self, PhotoID* photo_id, guint64
 	gint64 _tmp1_ = 0LL;
 	guint64 _tmp2_ = 0ULL;
 	gboolean _tmp3_ = FALSE;
-#line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 637 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 644 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 638 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 638 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 638 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = flags;
-#line 638 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "flags", (gint64) _tmp2_);
-#line 638 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp3_;
-#line 638 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4866 "PhotoTable.c"
+#line 4905 "PhotoTable.c"
 }
 
 
@@ -4894,25 +4933,25 @@ gboolean photo_table_set_rating (PhotoTable* self, PhotoID* photo_id, Rating rat
 	Rating _tmp2_ = 0;
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
-#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 641 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 642 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 642 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 642 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = rating;
-#line 642 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = rating_serialize (_tmp2_);
-#line 642 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = database_table_update_int_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "rating", _tmp3_);
-#line 642 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp4_;
-#line 642 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 649 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 4895 "PhotoTable.c"
+#line 4934 "PhotoTable.c"
 }
 
 
@@ -4930,102 +4969,102 @@ gint photo_table_get_event_photo_count (PhotoTable* self, EventID* event_id) {
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
 	gint count = 0;
-#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 652 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), 0);
-#line 645 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 652 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (event_id != NULL, 0);
-#line 647 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 647 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id FROM PhotoTable WHERE event_id = ?", -1, &_tmp1_, NULL);
-#line 647 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 647 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 647 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 655 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 648 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 655 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 650 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 650 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = *event_id;
-#line 650 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = _tmp5_.id;
-#line 650 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 650 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp7_;
-#line 651 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 658 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = res;
-#line 651 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 658 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 653 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 660 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	count = 0;
-#line 4947 "PhotoTable.c"
+#line 4986 "PhotoTable.c"
 	{
 		gboolean _tmp9_ = FALSE;
-#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = TRUE;
-#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
-#line 4954 "PhotoTable.c"
+#line 4993 "PhotoTable.c"
 			sqlite3_stmt* _tmp10_ = NULL;
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
 			gint _tmp15_ = 0;
-#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp9_) {
-#line 4961 "PhotoTable.c"
+#line 5000 "PhotoTable.c"
 			}
-#line 654 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp9_ = FALSE;
-#line 655 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp10_ = stmt;
-#line 655 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp11_ = sqlite3_step (_tmp10_);
-#line 655 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 662 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			res = _tmp11_;
-#line 656 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 663 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp12_ = res;
-#line 656 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 663 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_tmp12_ == SQLITE_DONE) {
-#line 657 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 664 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				break;
-#line 4977 "PhotoTable.c"
+#line 5016 "PhotoTable.c"
 			} else {
 				gint _tmp13_ = 0;
-#line 658 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp13_ = res;
-#line 658 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 665 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_tmp13_ != SQLITE_ROW) {
-#line 4984 "PhotoTable.c"
+#line 5023 "PhotoTable.c"
 					gint _tmp14_ = 0;
-#line 659 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp14_ = res;
-#line 659 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 666 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					database_table_fatal ("get_event_photo_count", _tmp14_);
-#line 661 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 668 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					break;
-#line 4992 "PhotoTable.c"
+#line 5031 "PhotoTable.c"
 				}
 			}
-#line 664 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp15_ = count;
-#line 664 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 671 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			count = _tmp15_ + 1;
-#line 4999 "PhotoTable.c"
+#line 5038 "PhotoTable.c"
 		}
 	}
-#line 667 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = count;
-#line 667 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 667 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 674 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5008 "PhotoTable.c"
+#line 5047 "PhotoTable.c"
 }
 
 
@@ -5044,50 +5083,50 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 	gint _tmp8_ = 0;
 	GeeArrayList* _result_ = NULL;
 	GeeArrayList* _tmp9_ = NULL;
-#line 670 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 670 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 677 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (event_id != NULL, NULL);
-#line 672 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 672 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id FROM PhotoTable WHERE event_id = ?", -1, &_tmp1_, NULL);
-#line 672 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 672 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 672 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 673 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 680 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 673 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 680 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 675 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 675 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = *event_id;
-#line 675 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = _tmp5_.id;
-#line 675 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 675 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp7_;
-#line 676 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = res;
-#line 676 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 678 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 678 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 685 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_result_ = _tmp9_;
-#line 5063 "PhotoTable.c"
+#line 5102 "PhotoTable.c"
 	{
 		gboolean _tmp10_ = FALSE;
-#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp10_ = TRUE;
-#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
-#line 5070 "PhotoTable.c"
+#line 5109 "PhotoTable.c"
 			sqlite3_stmt* _tmp11_ = NULL;
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
@@ -5097,68 +5136,68 @@ GeeArrayList* photo_table_get_event_source_ids (PhotoTable* self, EventID* event
 			PhotoID _tmp19_ = {0};
 			gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
-#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp10_) {
-#line 5082 "PhotoTable.c"
+#line 5121 "PhotoTable.c"
 			}
-#line 679 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp10_ = FALSE;
-#line 680 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp11_ = stmt;
-#line 680 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp12_ = sqlite3_step (_tmp11_);
-#line 680 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 687 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			res = _tmp12_;
-#line 681 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 688 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = res;
-#line 681 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 688 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_tmp13_ == SQLITE_DONE) {
-#line 682 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				break;
-#line 5098 "PhotoTable.c"
+#line 5137 "PhotoTable.c"
 			} else {
 				gint _tmp14_ = 0;
-#line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp14_ = res;
-#line 683 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 690 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_tmp14_ != SQLITE_ROW) {
-#line 5105 "PhotoTable.c"
+#line 5144 "PhotoTable.c"
 					gint _tmp15_ = 0;
-#line 684 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp15_ = res;
-#line 684 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 691 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					database_table_fatal ("get_event_source_ids", _tmp15_);
-#line 686 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 693 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					break;
-#line 5113 "PhotoTable.c"
+#line 5152 "PhotoTable.c"
 				}
 			}
-#line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp16_ = _result_;
-#line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp17_ = stmt;
-#line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp18_ = sqlite3_column_int64 (_tmp17_, 0);
-#line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			photo_id_init (&_tmp19_, _tmp18_);
-#line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp20_ = photo_id_upgrade_photo_id_to_source_id (&_tmp19_);
-#line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp21_ = _tmp20_;
-#line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
-#line 689 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 696 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (_tmp21_);
-#line 5132 "PhotoTable.c"
+#line 5171 "PhotoTable.c"
 		}
 	}
-#line 692 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _result_;
-#line 692 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 692 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 699 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5141 "PhotoTable.c"
+#line 5180 "PhotoTable.c"
 }
 
 
@@ -5178,83 +5217,83 @@ gboolean photo_table_event_has_photos (PhotoTable* self, EventID* event_id) {
 	sqlite3_stmt* _tmp9_ = NULL;
 	gint _tmp10_ = 0;
 	gint _tmp11_ = 0;
-#line 695 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 695 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 702 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 697 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 704 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 697 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 704 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT id FROM PhotoTable WHERE event_id = ? LIMIT 1", -1, &_tmp1_, NULL);
-#line 697 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 704 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 697 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 704 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 697 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 704 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 698 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 705 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 698 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 705 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 700 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 700 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = *event_id;
-#line 700 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = _tmp5_.id;
-#line 700 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 700 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp7_;
-#line 701 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 708 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = res;
-#line 701 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 708 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 703 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = stmt;
-#line 703 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = sqlite3_step (_tmp9_);
-#line 703 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 710 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp10_;
-#line 704 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 711 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = res;
-#line 704 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 711 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp11_ == SQLITE_DONE) {
-#line 705 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
-#line 705 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 705 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5209 "PhotoTable.c"
+#line 5248 "PhotoTable.c"
 	} else {
 		gint _tmp12_ = 0;
-#line 706 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = res;
-#line 706 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 713 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_ != SQLITE_ROW) {
-#line 5216 "PhotoTable.c"
+#line 5255 "PhotoTable.c"
 			gint _tmp13_ = 0;
-#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = res;
-#line 707 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 714 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			database_table_fatal ("event_has_photos", _tmp13_);
-#line 709 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			result = FALSE;
-#line 709 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_sqlite3_finalize0 (stmt);
-#line 709 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 716 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 5228 "PhotoTable.c"
+#line 5267 "PhotoTable.c"
 		}
 	}
-#line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = TRUE;
-#line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 712 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 719 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5237 "PhotoTable.c"
+#line 5276 "PhotoTable.c"
 }
 
 
@@ -5277,79 +5316,79 @@ gboolean photo_table_drop_event (PhotoTable* self, EventID* event_id) {
 	sqlite3_stmt* _tmp12_ = NULL;
 	gint _tmp13_ = 0;
 	gint _tmp14_ = 0;
-#line 715 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 715 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 717 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 724 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 717 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 724 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE PhotoTable SET event_id = ? WHERE event_id = ?", -1, &_tmp1_, NULL);
-#line 717 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 724 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 717 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 724 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 717 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 724 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 718 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 725 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 718 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 725 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 720 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 720 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = sqlite3_bind_int64 (_tmp4_, 1, EVENT_ID_INVALID);
-#line 720 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp5_;
-#line 721 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 728 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = res;
-#line 721 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 728 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp6_ == SQLITE_OK, "res == Sqlite.OK");
-#line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = stmt;
-#line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = *event_id;
-#line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = _tmp8_.id;
-#line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = sqlite3_bind_int64 (_tmp7_, 2, _tmp9_);
-#line 722 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp10_;
-#line 723 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 730 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = res;
-#line 723 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 730 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 725 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = stmt;
-#line 725 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = sqlite3_step (_tmp12_);
-#line 725 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp13_;
-#line 726 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = res;
-#line 726 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 733 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
-#line 5312 "PhotoTable.c"
+#line 5351 "PhotoTable.c"
 		gint _tmp15_ = 0;
-#line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp15_ = res;
-#line 727 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 734 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_fatal ("drop_event", _tmp15_);
-#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
-#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 729 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5324 "PhotoTable.c"
+#line 5363 "PhotoTable.c"
 	}
-#line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = TRUE;
-#line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 732 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5332 "PhotoTable.c"
+#line 5371 "PhotoTable.c"
 }
 
 
@@ -5360,27 +5399,27 @@ gboolean photo_table_set_event (PhotoTable* self, PhotoID* photo_id, EventID* ev
 	EventID _tmp2_ = {0};
 	gint64 _tmp3_ = 0LL;
 	gboolean _tmp4_ = FALSE;
-#line 735 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 735 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 735 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = *event_id;
-#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = _tmp2_.id;
-#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = database_table_update_int64_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "event_id", _tmp3_);
-#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp4_;
-#line 736 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 743 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5363 "PhotoTable.c"
+#line 5402 "PhotoTable.c"
 }
 
 
@@ -5397,78 +5436,78 @@ static gchar* photo_table_get_raw_transformations (PhotoTable* self, PhotoID* ph
 	gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	const gchar* _tmp8_ = NULL;
-#line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 746 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 739 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 746 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, NULL);
-#line 741 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 741 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 741 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = database_table_select_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "transformations", &_tmp2_);
-#line 741 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 741 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp2_;
-#line 741 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (!_tmp3_) {
-#line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 749 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = NULL;
-#line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 749 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 742 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 749 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5402 "PhotoTable.c"
+#line 5441 "PhotoTable.c"
 	}
-#line 744 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 744 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = sqlite3_column_text (_tmp4_, 0);
-#line 744 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 744 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	trans = _tmp6_;
-#line 745 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = trans;
-#line 745 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp8_ == NULL) {
-#line 745 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = TRUE;
-#line 5418 "PhotoTable.c"
+#line 5457 "PhotoTable.c"
 	} else {
 		const gchar* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
-#line 745 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = trans;
-#line 745 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp10_ = strlen (_tmp9_);
-#line 745 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = _tmp10_;
-#line 745 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = _tmp11_ == 0;
-#line 5431 "PhotoTable.c"
+#line 5470 "PhotoTable.c"
 	}
-#line 745 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp7_) {
-#line 746 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 753 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = NULL;
-#line 746 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 753 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (trans);
-#line 746 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 753 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 746 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 753 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5443 "PhotoTable.c"
+#line 5482 "PhotoTable.c"
 	}
-#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = trans;
-#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 748 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5451 "PhotoTable.c"
+#line 5490 "PhotoTable.c"
 }
 
 
@@ -5478,25 +5517,25 @@ static gboolean photo_table_set_raw_transformations (PhotoTable* self, PhotoID*
 	gint64 _tmp1_ = 0LL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 751 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (trans != NULL, FALSE);
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = trans;
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "transformations", _tmp2_);
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp3_;
-#line 752 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 759 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5479 "PhotoTable.c"
+#line 5518 "PhotoTable.c"
 }
 
 
@@ -5526,100 +5565,100 @@ gboolean photo_table_set_transformation_state (PhotoTable* self, PhotoID* photo_
 	sqlite3_stmt* _tmp19_ = NULL;
 	gint _tmp20_ = 0;
 	gint _tmp21_ = 0;
-#line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 755 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail ((transformations == NULL) || GEE_IS_HASH_MAP (transformations), FALSE);
-#line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 765 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 765 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE PhotoTable SET orientation = ?, transformations = ? WHERE id = " \
 "?", -1, &_tmp1_, NULL);
-#line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 765 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 765 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 758 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 765 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 760 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 767 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 760 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 767 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = orientation;
-#line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = sqlite3_bind_int (_tmp4_, 1, (gint) _tmp5_);
-#line 762 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp6_;
-#line 763 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 770 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = res;
-#line 763 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 770 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 764 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = stmt;
-#line 764 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = transformations;
-#line 764 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = photo_table_unmarshall_all_transformations (_tmp9_);
-#line 764 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = g_free;
-#line 764 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = sqlite3_bind_text (_tmp8_, 2, _tmp10_, -1, _tmp11_);
-#line 764 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp12_;
-#line 765 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 772 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = res;
-#line 765 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 772 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK");
-#line 766 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = stmt;
-#line 766 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = *photo_id;
-#line 766 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = _tmp15_.id;
-#line 766 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = sqlite3_bind_int64 (_tmp14_, 3, _tmp16_);
-#line 766 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp17_;
-#line 767 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 774 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = res;
-#line 767 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 774 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp18_ == SQLITE_OK, "res == Sqlite.OK");
-#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = stmt;
-#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp20_ = sqlite3_step (_tmp19_);
-#line 769 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp20_;
-#line 770 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = res;
-#line 770 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 777 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp21_ != SQLITE_DONE) {
-#line 5581 "PhotoTable.c"
+#line 5620 "PhotoTable.c"
 		gint _tmp22_ = 0;
-#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp22_ = res;
-#line 771 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 778 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_fatal ("set_transformation_state", _tmp22_);
-#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
-#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 773 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5593 "PhotoTable.c"
+#line 5632 "PhotoTable.c"
 	}
-#line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = TRUE;
-#line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 776 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 5601 "PhotoTable.c"
+#line 5640 "PhotoTable.c"
 }
 
 
@@ -5628,34 +5667,34 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = trans;
-#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ == NULL) {
-#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = TRUE;
-#line 5616 "PhotoTable.c"
+#line 5655 "PhotoTable.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = trans;
-#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = strlen (_tmp2_);
-#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp4_ = _tmp3_;
-#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 5629 "PhotoTable.c"
+#line 5668 "PhotoTable.c"
 	}
-#line 780 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 787 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_) {
-#line 781 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 788 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = NULL;
-#line 781 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 788 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5637 "PhotoTable.c"
+#line 5676 "PhotoTable.c"
 	}
 	{
 		GKeyFile* keyfile = NULL;
@@ -5677,79 +5716,79 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 		gint _objects_size_ = 0;
 		gchar** _tmp17_ = NULL;
 		gint _tmp17__length1 = 0;
-#line 784 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = g_key_file_new ();
-#line 784 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		keyfile = _tmp5_;
-#line 785 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = keyfile;
-#line 785 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = trans;
-#line 785 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = trans;
-#line 785 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp10_ = strlen (_tmp9_);
-#line 785 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = _tmp10_;
-#line 785 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = g_key_file_load_from_data (_tmp7_, _tmp8_, (gsize) _tmp11_, G_KEY_FILE_NONE, &_inner_error_);
-#line 785 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp6_ = _tmp12_;
-#line 785 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 785 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
-#line 5681 "PhotoTable.c"
+#line 5720 "PhotoTable.c"
 			goto __catch15_g_error;
 		}
-#line 785 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (!_tmp6_) {
-#line 786 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			result = NULL;
-#line 786 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
-#line 786 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 5692 "PhotoTable.c"
+#line 5731 "PhotoTable.c"
 		}
-#line 788 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp13_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 788 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 795 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		map = _tmp13_;
-#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp14_ = keyfile;
-#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp16_ = g_key_file_get_groups (_tmp14_, &_tmp15_);
-#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		objects = _tmp16_;
-#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		objects_length1 = _tmp15_;
-#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_objects_size_ = objects_length1;
-#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp17_ = objects;
-#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp17__length1 = objects_length1;
-#line 5712 "PhotoTable.c"
+#line 5751 "PhotoTable.c"
 		{
 			gchar** object_collection = NULL;
 			gint object_collection_length1 = 0;
 			gint _object_collection_size_ = 0;
 			gint object_it = 0;
-#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			object_collection = _tmp17_;
-#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			object_collection_length1 = _tmp17__length1;
-#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			for (object_it = 0; object_it < _tmp17__length1; object_it = object_it + 1) {
-#line 5724 "PhotoTable.c"
+#line 5763 "PhotoTable.c"
 				gchar* _tmp18_ = NULL;
 				gchar* object = NULL;
-#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp18_ = g_strdup (object_collection[object_it]);
-#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				object = _tmp18_;
-#line 5731 "PhotoTable.c"
+#line 5770 "PhotoTable.c"
 				{
 					gchar** keys = NULL;
 					GKeyFile* _tmp19_ = NULL;
@@ -5767,80 +5806,80 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 					GeeHashMap* _tmp43_ = NULL;
 					const gchar* _tmp44_ = NULL;
 					KeyValueMap* _tmp45_ = NULL;
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp19_ = keyfile;
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp20_ = object;
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp22_ = g_key_file_get_keys (_tmp19_, _tmp20_, &_tmp21_, &_inner_error_);
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					keys = _tmp22_;
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					keys_length1 = _tmp21_;
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_keys_size_ = keys_length1;
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_g_free0 (object);
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						objects = (_vala_array_free (objects, objects_length1, (GDestroyNotify) g_free), NULL);
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_g_object_unref0 (map);
-#line 792 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 799 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_g_key_file_unref0 (keyfile);
-#line 5771 "PhotoTable.c"
+#line 5810 "PhotoTable.c"
 						goto __catch15_g_error;
 					}
-#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp24_ = keys;
-#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp24__length1 = keys_length1;
-#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					if (_tmp24_ == NULL) {
-#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_tmp23_ = TRUE;
-#line 5782 "PhotoTable.c"
+#line 5821 "PhotoTable.c"
 					} else {
 						gchar** _tmp25_ = NULL;
 						gint _tmp25__length1 = 0;
-#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_tmp25_ = keys;
-#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_tmp25__length1 = keys_length1;
-#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_tmp23_ = _tmp25__length1 == 0;
-#line 5792 "PhotoTable.c"
+#line 5831 "PhotoTable.c"
 					}
-#line 793 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					if (_tmp23_) {
-#line 794 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 794 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						_g_free0 (object);
-#line 794 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 801 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						continue;
-#line 5802 "PhotoTable.c"
+#line 5841 "PhotoTable.c"
 					}
-#line 796 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp26_ = object;
-#line 796 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp27_ = key_value_map_new (_tmp26_);
-#line 796 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					key_map = _tmp27_;
-#line 5810 "PhotoTable.c"
+#line 5849 "PhotoTable.c"
 					{
 						gint ctr = 0;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						ctr = 0;
-#line 5815 "PhotoTable.c"
+#line 5854 "PhotoTable.c"
 						{
 							gboolean _tmp28_ = FALSE;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 							_tmp28_ = TRUE;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 							while (TRUE) {
-#line 5822 "PhotoTable.c"
+#line 5861 "PhotoTable.c"
 								gint _tmp30_ = 0;
 								gchar** _tmp31_ = NULL;
 								gint _tmp31__length1 = 0;
@@ -5857,134 +5896,134 @@ GeeHashMap* photo_table_marshall_all_transformations (const gchar* trans) {
 								gint _tmp40__length1 = 0;
 								gint _tmp41_ = 0;
 								const gchar* _tmp42_ = NULL;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								if (!_tmp28_) {
-#line 5841 "PhotoTable.c"
+#line 5880 "PhotoTable.c"
 									gint _tmp29_ = 0;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									_tmp29_ = ctr;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									ctr = _tmp29_ + 1;
-#line 5847 "PhotoTable.c"
+#line 5886 "PhotoTable.c"
 								}
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp28_ = FALSE;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp30_ = ctr;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp31_ = keys;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp31__length1 = keys_length1;
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								if (!(_tmp30_ < _tmp31__length1)) {
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									break;
-#line 5861 "PhotoTable.c"
+#line 5900 "PhotoTable.c"
 								}
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp33_ = keyfile;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp34_ = object;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp35_ = keys;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp35__length1 = keys_length1;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp36_ = ctr;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp37_ = _tmp35_[_tmp36_];
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp38_ = g_key_file_get_string (_tmp33_, _tmp34_, _tmp37_, &_inner_error_);
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp32_ = _tmp38_;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									_key_value_map_unref0 (key_map);
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									_g_free0 (object);
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									objects = (_vala_array_free (objects, objects_length1, (GDestroyNotify) g_free), NULL);
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									_g_object_unref0 (map);
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 									_g_key_file_unref0 (keyfile);
-#line 5893 "PhotoTable.c"
+#line 5932 "PhotoTable.c"
 									goto __catch15_g_error;
 								}
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp39_ = key_map;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp40_ = keys;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp40__length1 = keys_length1;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp41_ = ctr;
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_tmp42_ = _tmp40_[_tmp41_];
-#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								key_value_map_set_string (_tmp39_, _tmp42_, _tmp32_);
-#line 797 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 804 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 								_g_free0 (_tmp32_);
-#line 5910 "PhotoTable.c"
+#line 5949 "PhotoTable.c"
 							}
 						}
 					}
-#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp43_ = map;
-#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp44_ = object;
-#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp45_ = key_map;
-#line 800 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 807 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp44_, _tmp45_);
-#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_key_value_map_unref0 (key_map);
-#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 791 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 798 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_g_free0 (object);
-#line 5928 "PhotoTable.c"
+#line 5967 "PhotoTable.c"
 				}
 			}
 		}
-#line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = map;
-#line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		objects = (_vala_array_free (objects, objects_length1, (GDestroyNotify) g_free), NULL);
-#line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_key_file_unref0 (keyfile);
-#line 803 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 5940 "PhotoTable.c"
+#line 5979 "PhotoTable.c"
 	}
 	goto __finally15;
 	__catch15_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp46_ = NULL;
-#line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		err = _inner_error_;
-#line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_inner_error_ = NULL;
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 812 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp46_ = err->message;
-#line 805 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_error ("PhotoTable.vala:805: %s", _tmp46_);
-#line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 812 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+		g_error ("PhotoTable.vala:812: %s", _tmp46_);
+#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_error_free0 (err);
-#line 5957 "PhotoTable.c"
+#line 5996 "PhotoTable.c"
 	}
 	__finally15:
-#line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_clear_error (&_inner_error_);
-#line 783 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 790 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return NULL;
-#line 5966 "PhotoTable.c"
+#line 6005 "PhotoTable.c"
 }
 
 
@@ -6003,15 +6042,15 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 	const gchar* _tmp43_ = NULL;
 	gint _tmp44_ = 0;
 	gint _tmp45_ = 0;
-#line 809 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 816 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail ((transformations == NULL) || GEE_IS_HASH_MAP (transformations), NULL);
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = transformations;
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ == NULL) {
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = TRUE;
-#line 5993 "PhotoTable.c"
+#line 6032 "PhotoTable.c"
 	} else {
 		GeeHashMap* _tmp2_ = NULL;
 		GeeSet* _tmp3_ = NULL;
@@ -6019,37 +6058,37 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 		GeeSet* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = transformations;
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MAP, GeeMap));
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp4_ = _tmp3_;
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = _tmp4_;
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = _tmp6_;
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp7_ == 0;
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_object_unref0 (_tmp5_);
-#line 6017 "PhotoTable.c"
+#line 6056 "PhotoTable.c"
 	}
-#line 810 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 817 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_) {
-#line 811 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = NULL;
-#line 811 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 6025 "PhotoTable.c"
+#line 6064 "PhotoTable.c"
 	}
-#line 813 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = g_key_file_new ();
-#line 813 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	keyfile = _tmp8_;
-#line 6031 "PhotoTable.c"
+#line 6070 "PhotoTable.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeHashMap* _tmp9_ = NULL;
@@ -6058,25 +6097,25 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 		GeeSet* _tmp12_ = NULL;
 		GeeIterator* _tmp13_ = NULL;
 		GeeIterator* _tmp14_ = NULL;
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = transformations;
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp10_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_MAP, GeeMap));
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = _tmp10_;
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = _tmp11_;
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp14_ = _tmp13_;
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_object_unref0 (_tmp12_);
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_object_it = _tmp14_;
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		while (TRUE) {
-#line 6058 "PhotoTable.c"
+#line 6097 "PhotoTable.c"
 			GeeIterator* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
 			gchar* object = NULL;
@@ -6086,31 +6125,31 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 			GeeHashMap* _tmp19_ = NULL;
 			const gchar* _tmp20_ = NULL;
 			gpointer _tmp21_ = NULL;
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp15_ = _object_it;
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp16_ = gee_iterator_next (_tmp15_);
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp16_) {
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				break;
-#line 6076 "PhotoTable.c"
+#line 6115 "PhotoTable.c"
 			}
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp17_ = _object_it;
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp18_ = gee_iterator_get (_tmp17_);
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			object = (gchar*) _tmp18_;
-#line 816 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp19_ = transformations;
-#line 816 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp20_ = object;
-#line 816 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp21_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_);
-#line 816 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 823 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			map = (KeyValueMap*) _tmp21_;
-#line 6092 "PhotoTable.c"
+#line 6131 "PhotoTable.c"
 			{
 				GeeIterator* _key_it = NULL;
 				KeyValueMap* _tmp22_ = NULL;
@@ -6118,23 +6157,23 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 				GeeSet* _tmp24_ = NULL;
 				GeeIterator* _tmp25_ = NULL;
 				GeeIterator* _tmp26_ = NULL;
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp22_ = map;
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp23_ = key_value_map_get_keys (_tmp22_);
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp24_ = _tmp23_;
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp26_ = _tmp25_;
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_object_unref0 (_tmp24_);
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_key_it = _tmp26_;
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				while (TRUE) {
-#line 6116 "PhotoTable.c"
+#line 6155 "PhotoTable.c"
 					GeeIterator* _tmp27_ = NULL;
 					gboolean _tmp28_ = FALSE;
 					gchar* key = NULL;
@@ -6149,91 +6188,91 @@ gchar* photo_table_unmarshall_all_transformations (GeeHashMap* transformations)
 					const gchar* _tmp36_ = NULL;
 					const gchar* _tmp37_ = NULL;
 					const gchar* _tmp38_ = NULL;
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp27_ = _key_it;
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp28_ = gee_iterator_next (_tmp27_);
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					if (!_tmp28_) {
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 						break;
-#line 6139 "PhotoTable.c"
+#line 6178 "PhotoTable.c"
 					}
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp29_ = _key_it;
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp30_ = gee_iterator_get (_tmp29_);
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					key = (gchar*) _tmp30_;
-#line 819 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp31_ = map;
-#line 819 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp32_ = key;
-#line 819 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp33_ = key_value_map_get_string (_tmp31_, _tmp32_, NULL);
-#line 819 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 826 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					value = _tmp33_;
-#line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp34_ = value;
-#line 820 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_vala_assert (_tmp34_ != NULL, "value != null");
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp35_ = keyfile;
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp36_ = object;
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp37_ = key;
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_tmp38_ = value;
-#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					g_key_file_set_string (_tmp35_, _tmp36_, _tmp37_, _tmp38_);
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_g_free0 (value);
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_g_free0 (key);
-#line 6173 "PhotoTable.c"
+#line 6212 "PhotoTable.c"
 				}
-#line 818 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 825 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_object_unref0 (_key_it);
-#line 6177 "PhotoTable.c"
+#line 6216 "PhotoTable.c"
 			}
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_key_value_map_unref0 (map);
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (object);
-#line 6183 "PhotoTable.c"
+#line 6222 "PhotoTable.c"
 		}
-#line 815 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 822 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_object_unref0 (_object_it);
-#line 6187 "PhotoTable.c"
+#line 6226 "PhotoTable.c"
 	}
-#line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = keyfile;
-#line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_ = g_key_file_to_data (_tmp39_, &_tmp40_, NULL);
-#line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	length = _tmp40_;
-#line 827 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	unmarshalled = _tmp41_;
-#line 828 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp42_ = unmarshalled;
-#line 828 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp42_ != NULL, "unmarshalled != null");
-#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp43_ = unmarshalled;
-#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp44_ = strlen (_tmp43_);
-#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp45_ = _tmp44_;
-#line 829 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 836 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp45_ > 0, "unmarshalled.length > 0");
-#line 831 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = unmarshalled;
-#line 831 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_key_file_unref0 (keyfile);
-#line 831 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 6215 "PhotoTable.c"
+#line 6254 "PhotoTable.c"
 }
 
 
@@ -6246,19 +6285,19 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 	const gchar* _tmp38_ = NULL;
 	gboolean _tmp39_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 834 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (map), FALSE);
-#line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 842 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 842 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = photo_table_get_raw_transformations (self, &_tmp0_);
-#line 835 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 842 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	trans = _tmp1_;
-#line 6240 "PhotoTable.c"
+#line 6279 "PhotoTable.c"
 	{
 		GKeyFile* keyfile = NULL;
 		GKeyFile* _tmp2_ = NULL;
@@ -6274,15 +6313,15 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 		const gchar* _tmp33_ = NULL;
 		gint _tmp34_ = 0;
 		gint _tmp35_ = 0;
-#line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = g_key_file_new ();
-#line 838 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		keyfile = _tmp2_;
-#line 839 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 846 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = trans;
-#line 839 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 846 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp3_ != NULL) {
-#line 6264 "PhotoTable.c"
+#line 6303 "PhotoTable.c"
 			gboolean _tmp4_ = FALSE;
 			GKeyFile* _tmp5_ = NULL;
 			const gchar* _tmp6_ = NULL;
@@ -6290,60 +6329,60 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
 			gboolean _tmp10_ = FALSE;
-#line 840 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp5_ = keyfile;
-#line 840 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp6_ = trans;
-#line 840 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp7_ = trans;
-#line 840 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp8_ = strlen (_tmp7_);
-#line 840 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp9_ = _tmp8_;
-#line 840 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp10_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_);
-#line 840 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp4_ = _tmp10_;
-#line 840 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 840 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_key_file_unref0 (keyfile);
-#line 6290 "PhotoTable.c"
+#line 6329 "PhotoTable.c"
 				goto __catch16_g_error;
 			}
-#line 840 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (!_tmp4_) {
-#line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 848 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				result = FALSE;
-#line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 848 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_key_file_unref0 (keyfile);
-#line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 848 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (trans);
-#line 841 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 848 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return result;
-#line 6303 "PhotoTable.c"
+#line 6342 "PhotoTable.c"
 			}
 		}
-#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = map;
-#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = key_value_map_get_keys (_tmp11_);
-#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 851 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		keys = _tmp12_;
-#line 6312 "PhotoTable.c"
+#line 6351 "PhotoTable.c"
 		{
 			GeeIterator* _key_it = NULL;
 			GeeSet* _tmp13_ = NULL;
 			GeeIterator* _tmp14_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = keys;
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_key_it = _tmp14_;
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			while (TRUE) {
-#line 6325 "PhotoTable.c"
+#line 6364 "PhotoTable.c"
 				GeeIterator* _tmp15_ = NULL;
 				gboolean _tmp16_ = FALSE;
 				gchar* key = NULL;
@@ -6360,131 +6399,131 @@ gboolean photo_table_set_transformation (PhotoTable* self, PhotoID* photo_id, Ke
 				gchar* _tmp26_ = NULL;
 				const gchar* _tmp27_ = NULL;
 				const gchar* _tmp28_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp15_ = _key_it;
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp16_ = gee_iterator_next (_tmp15_);
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (!_tmp16_) {
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					break;
-#line 6350 "PhotoTable.c"
+#line 6389 "PhotoTable.c"
 				}
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp17_ = _key_it;
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp18_ = gee_iterator_get (_tmp17_);
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				key = (gchar*) _tmp18_;
-#line 846 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp19_ = map;
-#line 846 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp20_ = key;
-#line 846 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp21_ = key_value_map_get_string (_tmp19_, _tmp20_, NULL);
-#line 846 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				value = _tmp21_;
-#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 854 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp22_ = value;
-#line 847 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 854 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_vala_assert (_tmp22_ != NULL, "value != null");
-#line 849 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp23_ = keyfile;
-#line 849 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp24_ = map;
-#line 849 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp25_ = key_value_map_get_group (_tmp24_);
-#line 849 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp26_ = _tmp25_;
-#line 849 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp27_ = key;
-#line 849 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp28_ = value;
-#line 849 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_key_file_set_string (_tmp23_, _tmp26_, _tmp27_, _tmp28_);
-#line 849 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 856 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (_tmp26_);
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (value);
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (key);
-#line 6390 "PhotoTable.c"
+#line 6429 "PhotoTable.c"
 			}
-#line 845 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 852 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_object_unref0 (_key_it);
-#line 6394 "PhotoTable.c"
+#line 6433 "PhotoTable.c"
 		}
-#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp29_ = keyfile;
-#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp31_ = g_key_file_to_data (_tmp29_, &_tmp30_, NULL);
-#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		length = _tmp30_;
-#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (trans);
-#line 853 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		trans = _tmp31_;
-#line 854 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 861 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp32_ = trans;
-#line 854 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 861 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp32_ != NULL, "trans != null");
-#line 855 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp33_ = trans;
-#line 855 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp34_ = strlen (_tmp33_);
-#line 855 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp35_ = _tmp34_;
-#line 855 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 862 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp35_ > 0, "trans.length > 0");
-#line 837 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_object_unref0 (keys);
-#line 837 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_key_file_unref0 (keyfile);
-#line 6422 "PhotoTable.c"
+#line 6461 "PhotoTable.c"
 	}
 	goto __finally16;
 	__catch16_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp36_ = NULL;
-#line 837 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		err = _inner_error_;
-#line 837 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_inner_error_ = NULL;
-#line 857 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp36_ = err->message;
-#line 857 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_error ("PhotoTable.vala:857: %s", _tmp36_);
-#line 837 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+		g_error ("PhotoTable.vala:864: %s", _tmp36_);
+#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_error_free0 (err);
-#line 6439 "PhotoTable.c"
+#line 6478 "PhotoTable.c"
 	}
 	__finally16:
-#line 837 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 837 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (trans);
-#line 837 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 837 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_clear_error (&_inner_error_);
-#line 837 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 844 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return FALSE;
-#line 6452 "PhotoTable.c"
+#line 6491 "PhotoTable.c"
 	}
-#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = *photo_id;
-#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = trans;
-#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = photo_table_set_raw_transformations (self, &_tmp37_, _tmp38_);
-#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp39_;
-#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (trans);
-#line 860 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 867 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 6466 "PhotoTable.c"
+#line 6505 "PhotoTable.c"
 }
 
 
@@ -6498,29 +6537,29 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 	const gchar* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 863 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 863 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 863 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (object != NULL, FALSE);
-#line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 871 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 871 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = photo_table_get_raw_transformations (self, &_tmp0_);
-#line 864 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 871 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	trans = _tmp1_;
-#line 865 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 872 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = trans;
-#line 865 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 872 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp2_ == NULL) {
-#line 866 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = TRUE;
-#line 866 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (trans);
-#line 866 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 6502 "PhotoTable.c"
+#line 6541 "PhotoTable.c"
 	}
 	{
 		GKeyFile* keyfile = NULL;
@@ -6542,135 +6581,135 @@ gboolean photo_table_remove_transformation (PhotoTable* self, PhotoID* photo_id,
 		gsize _tmp17_ = 0UL;
 		gchar* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
-#line 869 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = g_key_file_new ();
-#line 869 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		keyfile = _tmp3_;
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp5_ = keyfile;
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp6_ = trans;
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = trans;
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = strlen (_tmp7_);
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = _tmp8_;
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp10_ = g_key_file_load_from_data (_tmp5_, _tmp6_, (gsize) _tmp9_, G_KEY_FILE_NONE, &_inner_error_);
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp4_ = _tmp10_;
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
-#line 6546 "PhotoTable.c"
+#line 6585 "PhotoTable.c"
 			goto __catch17_g_error;
 		}
-#line 870 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 877 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (!_tmp4_) {
-#line 871 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			result = FALSE;
-#line 871 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
-#line 871 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (trans);
-#line 871 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 878 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 6559 "PhotoTable.c"
+#line 6598 "PhotoTable.c"
 		}
-#line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = keyfile;
-#line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = object;
-#line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp13_ = g_key_file_has_group (_tmp11_, _tmp12_);
-#line 873 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (!_tmp13_) {
-#line 874 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			result = TRUE;
-#line 874 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
-#line 874 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (trans);
-#line 874 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 881 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 6577 "PhotoTable.c"
+#line 6616 "PhotoTable.c"
 		}
-#line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp14_ = keyfile;
-#line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp15_ = object;
-#line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_key_file_remove_group (_tmp14_, _tmp15_, &_inner_error_);
-#line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 876 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 883 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_key_file_unref0 (keyfile);
-#line 6589 "PhotoTable.c"
+#line 6628 "PhotoTable.c"
 			goto __catch17_g_error;
 		}
-#line 879 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp16_ = keyfile;
-#line 879 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp18_ = g_key_file_to_data (_tmp16_, &_tmp17_, NULL);
-#line 879 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		length = _tmp17_;
-#line 879 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (trans);
-#line 879 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 886 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		trans = _tmp18_;
-#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 887 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp19_ = trans;
-#line 880 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 887 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp19_ != NULL, "trans != null");
-#line 868 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_key_file_unref0 (keyfile);
-#line 6608 "PhotoTable.c"
+#line 6647 "PhotoTable.c"
 	}
 	goto __finally17;
 	__catch17_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp20_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		err = _inner_error_;
-#line 868 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_inner_error_ = NULL;
-#line 882 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp20_ = err->message;
-#line 882 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
-		g_error ("PhotoTable.vala:882: %s", _tmp20_);
-#line 868 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+		g_error ("PhotoTable.vala:889: %s", _tmp20_);
+#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_error_free0 (err);
-#line 6625 "PhotoTable.c"
+#line 6664 "PhotoTable.c"
 	}
 	__finally17:
-#line 868 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 868 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (trans);
-#line 868 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 868 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_clear_error (&_inner_error_);
-#line 868 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 875 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return FALSE;
-#line 6638 "PhotoTable.c"
+#line 6677 "PhotoTable.c"
 	}
-#line 885 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = *photo_id;
-#line 885 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = trans;
-#line 885 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp23_ = photo_table_set_raw_transformations (self, &_tmp21_, _tmp22_);
-#line 885 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp23_;
-#line 885 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (trans);
-#line 885 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 6652 "PhotoTable.c"
+#line 6691 "PhotoTable.c"
 }
 
 
@@ -6683,39 +6722,39 @@ gboolean photo_table_remove_all_transformations (PhotoTable* self, PhotoID* phot
 	PhotoID _tmp4_ = {0};
 	gint64 _tmp5_ = 0LL;
 	gboolean _tmp6_ = FALSE;
-#line 888 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 888 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 895 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (photo_id != NULL, FALSE);
-#line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 896 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *photo_id;
-#line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 896 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = photo_table_get_raw_transformations (self, &_tmp0_);
-#line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 896 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = _tmp1_;
-#line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 896 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = _tmp2_ == NULL;
-#line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 896 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp2_);
-#line 889 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 896 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp3_) {
-#line 890 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
-#line 890 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 6685 "PhotoTable.c"
+#line 6724 "PhotoTable.c"
 	}
-#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = *photo_id;
-#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = _tmp4_.id;
-#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = database_table_update_text_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp5_, "transformations", "");
-#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp6_;
-#line 892 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 6697 "PhotoTable.c"
+#line 6736 "PhotoTable.c"
 }
 
 
@@ -6744,83 +6783,83 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 	gboolean _tmp62_ = FALSE;
 	gboolean _tmp63_ = FALSE;
 	const gchar* _tmp64_ = NULL;
-#line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 897 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = file;
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp2_ != NULL) {
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = TRUE;
-#line 6736 "PhotoTable.c"
+#line 6775 "PhotoTable.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp3_ = thumbnail_md5;
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6743 "PhotoTable.c"
+#line 6782 "PhotoTable.c"
 	}
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_) {
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = TRUE;
-#line 6749 "PhotoTable.c"
+#line 6788 "PhotoTable.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp4_ = md5;
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 6756 "PhotoTable.c"
+#line 6795 "PhotoTable.c"
 	}
-#line 899 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp0_, "file != null || thumbnail_md5 != null || md5 != null");
-#line 901 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 908 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = g_strdup ("SELECT id FROM PhotoTable WHERE");
-#line 901 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 908 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	sql = _tmp5_;
-#line 902 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 909 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	first = TRUE;
-#line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = file;
-#line 904 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != NULL) {
-#line 6770 "PhotoTable.c"
+#line 6809 "PhotoTable.c"
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 905 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = sql;
-#line 905 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = g_strconcat (_tmp7_, " filename=?", NULL);
-#line 905 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (sql);
-#line 905 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 912 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		sql = _tmp8_;
-#line 906 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		first = FALSE;
-#line 6783 "PhotoTable.c"
+#line 6822 "PhotoTable.c"
 	}
-#line 909 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = thumbnail_md5;
-#line 909 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp10_ != NULL) {
-#line 909 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = TRUE;
-#line 6791 "PhotoTable.c"
+#line 6830 "PhotoTable.c"
 	} else {
 		const gchar* _tmp11_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = md5;
-#line 909 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = _tmp11_ != NULL;
-#line 6798 "PhotoTable.c"
+#line 6837 "PhotoTable.c"
 	}
-#line 909 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp9_) {
-#line 6802 "PhotoTable.c"
+#line 6841 "PhotoTable.c"
 		gboolean _tmp12_ = FALSE;
 		const gchar* _tmp17_ = NULL;
 		const gchar* _tmp20_ = NULL;
@@ -6829,148 +6868,148 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		PhotoFileFormat _tmp28_ = 0;
 		const gchar* _tmp31_ = NULL;
 		gchar* _tmp32_ = NULL;
-#line 910 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = first;
-#line 910 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_) {
-#line 6815 "PhotoTable.c"
+#line 6854 "PhotoTable.c"
 			const gchar* _tmp13_ = NULL;
 			gchar* _tmp14_ = NULL;
-#line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = sql;
-#line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp14_ = g_strconcat (_tmp13_, " ((", NULL);
-#line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (sql);
-#line 911 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 918 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp14_;
-#line 6826 "PhotoTable.c"
+#line 6865 "PhotoTable.c"
 		} else {
 			const gchar* _tmp15_ = NULL;
 			gchar* _tmp16_ = NULL;
-#line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp15_ = sql;
-#line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp16_ = g_strconcat (_tmp15_, " OR ((", NULL);
-#line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (sql);
-#line 913 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp16_;
-#line 6838 "PhotoTable.c"
+#line 6877 "PhotoTable.c"
 		}
-#line 914 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		first = FALSE;
-#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp17_ = thumbnail_md5;
-#line 916 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp17_ != NULL) {
-#line 6846 "PhotoTable.c"
+#line 6885 "PhotoTable.c"
 			const gchar* _tmp18_ = NULL;
 			gchar* _tmp19_ = NULL;
-#line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp18_ = sql;
-#line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp19_ = g_strconcat (_tmp18_, " thumbnail_md5=?", NULL);
-#line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (sql);
-#line 917 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 924 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp19_;
-#line 6857 "PhotoTable.c"
+#line 6896 "PhotoTable.c"
 		}
-#line 919 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 926 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp20_ = md5;
-#line 919 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 926 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp20_ != NULL) {
-#line 6863 "PhotoTable.c"
+#line 6902 "PhotoTable.c"
 			const gchar* _tmp21_ = NULL;
-#line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp21_ = thumbnail_md5;
-#line 920 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 927 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_tmp21_ == NULL) {
-#line 6869 "PhotoTable.c"
+#line 6908 "PhotoTable.c"
 				const gchar* _tmp22_ = NULL;
 				gchar* _tmp23_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp22_ = sql;
-#line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp23_ = g_strconcat (_tmp22_, " md5=?", NULL);
-#line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (sql);
-#line 921 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				sql = _tmp23_;
-#line 6880 "PhotoTable.c"
+#line 6919 "PhotoTable.c"
 			} else {
 				const gchar* _tmp24_ = NULL;
 				gchar* _tmp25_ = NULL;
-#line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 930 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp24_ = sql;
-#line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 930 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_tmp25_ = g_strconcat (_tmp24_, " OR md5=?", NULL);
-#line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 930 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (sql);
-#line 923 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 930 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				sql = _tmp25_;
-#line 6892 "PhotoTable.c"
+#line 6931 "PhotoTable.c"
 			}
 		}
-#line 926 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 933 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp26_ = sql;
-#line 926 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 933 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp27_ = g_strconcat (_tmp26_, ")", NULL);
-#line 926 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 933 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (sql);
-#line 926 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 933 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		sql = _tmp27_;
-#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 935 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp28_ = file_format;
-#line 928 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 935 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp28_ != PHOTO_FILE_FORMAT_UNKNOWN) {
-#line 6907 "PhotoTable.c"
+#line 6946 "PhotoTable.c"
 			const gchar* _tmp29_ = NULL;
 			gchar* _tmp30_ = NULL;
-#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp29_ = sql;
-#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp30_ = g_strconcat (_tmp29_, " AND file_format=?", NULL);
-#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (sql);
-#line 929 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			sql = _tmp30_;
-#line 6918 "PhotoTable.c"
+#line 6957 "PhotoTable.c"
 		}
-#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp31_ = sql;
-#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp32_ = g_strconcat (_tmp31_, ")", NULL);
-#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (sql);
-#line 931 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		sql = _tmp32_;
-#line 6928 "PhotoTable.c"
+#line 6967 "PhotoTable.c"
 	}
-#line 935 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = database_table_db;
-#line 935 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = sql;
-#line 935 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = sqlite3_prepare_v2 (_tmp33_, _tmp34_, -1, &_tmp35_, NULL);
-#line 935 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 935 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp35_;
-#line 935 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp36_;
-#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = res;
-#line 936 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 943 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp37_ == SQLITE_OK, "res == Sqlite.OK");
-#line 938 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 945 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	col = 1;
-#line 940 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 947 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = file;
-#line 940 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 947 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp38_ != NULL) {
-#line 6952 "PhotoTable.c"
+#line 6991 "PhotoTable.c"
 		sqlite3_stmt* _tmp39_ = NULL;
 		gint _tmp40_ = 0;
 		GFile* _tmp41_ = NULL;
@@ -6978,33 +7017,33 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		GDestroyNotify _tmp43_ = NULL;
 		gint _tmp44_ = 0;
 		gint _tmp45_ = 0;
-#line 941 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp39_ = stmt;
-#line 941 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp40_ = col;
-#line 941 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		col = _tmp40_ + 1;
-#line 941 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp41_ = file;
-#line 941 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp42_ = g_file_get_path (_tmp41_);
-#line 941 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp43_ = g_free;
-#line 941 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp44_ = sqlite3_bind_text (_tmp39_, _tmp40_, _tmp42_, -1, _tmp43_);
-#line 941 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 948 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		res = _tmp44_;
-#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp45_ = res;
-#line 942 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 949 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp45_ == SQLITE_OK, "res == Sqlite.OK");
-#line 6980 "PhotoTable.c"
+#line 7019 "PhotoTable.c"
 	}
-#line 945 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 952 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_ = thumbnail_md5;
-#line 945 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 952 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp46_ != NULL) {
-#line 6986 "PhotoTable.c"
+#line 7025 "PhotoTable.c"
 		sqlite3_stmt* _tmp47_ = NULL;
 		gint _tmp48_ = 0;
 		const gchar* _tmp49_ = NULL;
@@ -7012,33 +7051,33 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		GDestroyNotify _tmp51_ = NULL;
 		gint _tmp52_ = 0;
 		gint _tmp53_ = 0;
-#line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp47_ = stmt;
-#line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp48_ = col;
-#line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		col = _tmp48_ + 1;
-#line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp49_ = thumbnail_md5;
-#line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp50_ = g_strdup (_tmp49_);
-#line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp51_ = g_free;
-#line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp52_ = sqlite3_bind_text (_tmp47_, _tmp48_, _tmp50_, -1, _tmp51_);
-#line 946 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 953 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		res = _tmp52_;
-#line 947 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp53_ = res;
-#line 947 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 954 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp53_ == SQLITE_OK, "res == Sqlite.OK");
-#line 7014 "PhotoTable.c"
+#line 7053 "PhotoTable.c"
 	}
-#line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 957 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp54_ = md5;
-#line 950 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 957 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp54_ != NULL) {
-#line 7020 "PhotoTable.c"
+#line 7059 "PhotoTable.c"
 		sqlite3_stmt* _tmp55_ = NULL;
 		gint _tmp56_ = 0;
 		const gchar* _tmp57_ = NULL;
@@ -7046,93 +7085,93 @@ static sqlite3_stmt* photo_table_get_duplicate_stmt (PhotoTable* self, GFile* fi
 		GDestroyNotify _tmp59_ = NULL;
 		gint _tmp60_ = 0;
 		gint _tmp61_ = 0;
-#line 951 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp55_ = stmt;
-#line 951 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp56_ = col;
-#line 951 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		col = _tmp56_ + 1;
-#line 951 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp57_ = md5;
-#line 951 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp58_ = g_strdup (_tmp57_);
-#line 951 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp59_ = g_free;
-#line 951 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp60_ = sqlite3_bind_text (_tmp55_, _tmp56_, _tmp58_, -1, _tmp59_);
-#line 951 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 958 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		res = _tmp60_;
-#line 952 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp61_ = res;
-#line 952 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 959 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp61_ == SQLITE_OK, "res == Sqlite.OK");
-#line 7048 "PhotoTable.c"
+#line 7087 "PhotoTable.c"
 	}
-#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp64_ = thumbnail_md5;
-#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp64_ != NULL) {
-#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp63_ = TRUE;
-#line 7056 "PhotoTable.c"
+#line 7095 "PhotoTable.c"
 	} else {
 		const gchar* _tmp65_ = NULL;
-#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp65_ = md5;
-#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp63_ = _tmp65_ != NULL;
-#line 7063 "PhotoTable.c"
+#line 7102 "PhotoTable.c"
 	}
-#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp63_) {
-#line 7067 "PhotoTable.c"
+#line 7106 "PhotoTable.c"
 		PhotoFileFormat _tmp66_ = 0;
-#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp66_ = file_format;
-#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp62_ = _tmp66_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 7073 "PhotoTable.c"
+#line 7112 "PhotoTable.c"
 	} else {
-#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp62_ = FALSE;
-#line 7077 "PhotoTable.c"
+#line 7116 "PhotoTable.c"
 	}
-#line 955 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 962 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp62_) {
-#line 7081 "PhotoTable.c"
+#line 7120 "PhotoTable.c"
 		sqlite3_stmt* _tmp67_ = NULL;
 		gint _tmp68_ = 0;
 		PhotoFileFormat _tmp69_ = 0;
 		gint _tmp70_ = 0;
 		gint _tmp71_ = 0;
 		gint _tmp72_ = 0;
-#line 956 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp67_ = stmt;
-#line 956 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp68_ = col;
-#line 956 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		col = _tmp68_ + 1;
-#line 956 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp69_ = file_format;
-#line 956 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp70_ = photo_file_format_serialize (_tmp69_);
-#line 956 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp71_ = sqlite3_bind_int (_tmp67_, _tmp68_, _tmp70_);
-#line 956 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		res = _tmp71_;
-#line 957 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp72_ = res;
-#line 957 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_assert (_tmp72_ == SQLITE_OK, "res == Sqlite.OK");
-#line 7106 "PhotoTable.c"
+#line 7145 "PhotoTable.c"
 	}
-#line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 967 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = stmt;
-#line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 967 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (sql);
-#line 960 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 967 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7114 "PhotoTable.c"
+#line 7153 "PhotoTable.c"
 }
 
 
@@ -7148,85 +7187,85 @@ gboolean photo_table_has_duplicate (PhotoTable* self, GFile* file, const gchar*
 	sqlite3_stmt* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 970 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), FALSE);
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 970 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
-#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = file;
-#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = thumbnail_md5;
-#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = md5;
-#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = file_format;
-#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = photo_table_get_duplicate_stmt (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 964 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 971 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp4_;
-#line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = stmt;
-#line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = sqlite3_step (_tmp5_);
-#line 965 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp6_;
-#line 967 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 974 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = res;
-#line 967 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 974 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp7_ == SQLITE_DONE) {
-#line 969 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 976 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
-#line 969 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 976 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 969 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 976 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 7162 "PhotoTable.c"
+#line 7201 "PhotoTable.c"
 	} else {
 		gint _tmp8_ = 0;
-#line 970 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = res;
-#line 970 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 977 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp8_ == SQLITE_ROW) {
-#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 979 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			result = TRUE;
-#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 979 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_sqlite3_finalize0 (stmt);
-#line 972 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 979 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 7175 "PhotoTable.c"
+#line 7214 "PhotoTable.c"
 		} else {
 			gint _tmp9_ = 0;
-#line 974 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 981 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp9_ = res;
-#line 974 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 981 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			database_table_fatal ("has_duplicate", _tmp9_);
-#line 976 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 983 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			result = FALSE;
-#line 976 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 983 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_sqlite3_finalize0 (stmt);
-#line 976 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 983 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return result;
-#line 7188 "PhotoTable.c"
+#line 7227 "PhotoTable.c"
 		}
 	}
-#line 963 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 970 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 7193 "PhotoTable.c"
+#line 7232 "PhotoTable.c"
 }
 
 
 static void _vala_array_add2 (PhotoID** array, int* length, int* size, const PhotoID* value) {
-#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if ((*length) == (*size)) {
-#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*array = g_renew (PhotoID, *array, *size);
-#line 7204 "PhotoTable.c"
+#line 7243 "PhotoTable.c"
 	}
-#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	(*array)[(*length)++] = *value;
-#line 7208 "PhotoTable.c"
+#line 7247 "PhotoTable.c"
 }
 
 
@@ -7247,39 +7286,39 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 	gint _tmp7_ = 0;
 	PhotoID* _tmp15_ = NULL;
 	gint _tmp15__length1 = 0;
-#line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 987 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_PHOTO_TABLE (self), NULL);
-#line 980 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 987 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = file;
-#line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = thumbnail_md5;
-#line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = md5;
-#line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = file_format;
-#line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = photo_table_get_duplicate_stmt (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 982 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp4_;
-#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 991 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = g_new0 (PhotoID, 0);
-#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 991 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	ids = _tmp5_;
-#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 991 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	ids_length1 = 0;
-#line 984 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 991 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_ids_size_ = ids_length1;
-#line 986 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 993 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = stmt;
-#line 986 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 993 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = sqlite3_step (_tmp6_);
-#line 986 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 993 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp7_;
-#line 987 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	while (TRUE) {
-#line 7261 "PhotoTable.c"
+#line 7300 "PhotoTable.c"
 		gint _tmp8_ = 0;
 		PhotoID* _tmp9_ = NULL;
 		gint _tmp9__length1 = 0;
@@ -7288,51 +7327,51 @@ PhotoID* photo_table_get_duplicate_ids (PhotoTable* self, GFile* file, const gch
 		PhotoID _tmp12_ = {0};
 		sqlite3_stmt* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
-#line 987 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp8_ = res;
-#line 987 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (!(_tmp8_ == SQLITE_ROW)) {
-#line 987 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 994 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 7276 "PhotoTable.c"
+#line 7315 "PhotoTable.c"
 		}
-#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9_ = ids;
-#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp9__length1 = ids_length1;
-#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp10_ = stmt;
-#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp11_ = sqlite3_column_int64 (_tmp10_, 0);
-#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		photo_id_init (&_tmp12_, _tmp11_);
-#line 988 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_vala_array_add2 (&ids, &ids_length1, &_ids_size_, &_tmp12_);
-#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp13_ = stmt;
-#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp14_ = sqlite3_step (_tmp13_);
-#line 989 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		res = _tmp14_;
-#line 7296 "PhotoTable.c"
+#line 7335 "PhotoTable.c"
 	}
-#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = ids;
-#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15__length1 = ids_length1;
-#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (result_length1) {
-#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*result_length1 = _tmp15__length1;
-#line 7306 "PhotoTable.c"
+#line 7345 "PhotoTable.c"
 	}
-#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp15_;
-#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 992 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7314 "PhotoTable.c"
+#line 7353 "PhotoTable.c"
 }
 
 
@@ -7342,49 +7381,49 @@ void photo_table_update_backlinks (PhotoTable* self, PhotoID* photo_id, const gc
 	PhotoID _tmp3_ = {0};
 	gint64 _tmp4_ = 0LL;
 	GError * _inner_error_ = NULL;
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1002 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 995 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1002 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (photo_id != NULL);
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = backlinks;
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_ != NULL) {
-#line 7332 "PhotoTable.c"
+#line 7371 "PhotoTable.c"
 		const gchar* _tmp2_ = NULL;
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp2_ = backlinks;
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = _tmp2_;
-#line 7338 "PhotoTable.c"
+#line 7377 "PhotoTable.c"
 	} else {
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = "";
-#line 7342 "PhotoTable.c"
+#line 7381 "PhotoTable.c"
 	}
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = *photo_id;
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = _tmp3_.id;
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp4_, "backlinks", _tmp0_, &_inner_error_);
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7358 "PhotoTable.c"
+#line 7397 "PhotoTable.c"
 		} else {
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 996 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1003 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7366 "PhotoTable.c"
+#line 7405 "PhotoTable.c"
 		}
 	}
 }
@@ -7399,50 +7438,50 @@ void photo_table_attach_editable (PhotoTable* self, PhotoRow* row, BackingPhotoI
 	PhotoRow* _tmp5_ = NULL;
 	BackingPhotoID _tmp6_ = {0};
 	GError * _inner_error_ = NULL;
-#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 999 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (editable_id != NULL);
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = row;
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_->photo_id;
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = _tmp1_.id;
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = *editable_id;
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = _tmp3_.id;
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "editable_id", _tmp4_, &_inner_error_);
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7407 "PhotoTable.c"
+#line 7446 "PhotoTable.c"
 		} else {
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1000 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1007 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7415 "PhotoTable.c"
+#line 7454 "PhotoTable.c"
 		}
 	}
-#line 1002 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1009 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = row;
-#line 1002 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1009 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = *editable_id;
-#line 1002 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1009 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_->editable_id = _tmp6_;
-#line 7424 "PhotoTable.c"
+#line 7463 "PhotoTable.c"
 }
 
 
@@ -7452,42 +7491,42 @@ void photo_table_detach_editable (PhotoTable* self, PhotoRow* row, GError** erro
 	gint64 _tmp2_ = 0LL;
 	PhotoRow* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1005 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = row;
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_->photo_id;
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = _tmp1_.id;
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp2_, "editable_id", BACKING_PHOTO_ID_INVALID, &_inner_error_);
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7454 "PhotoTable.c"
+#line 7493 "PhotoTable.c"
 		} else {
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1006 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1013 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7462 "PhotoTable.c"
+#line 7501 "PhotoTable.c"
 		}
 	}
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1015 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = row;
-#line 1008 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1015 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_id_init (&_tmp3_->editable_id, BACKING_PHOTO_ID_INVALID);
-#line 7469 "PhotoTable.c"
+#line 7508 "PhotoTable.c"
 }
 
 
@@ -7497,45 +7536,45 @@ void photo_table_set_metadata_dirty (PhotoTable* self, PhotoID* photo_id, gboole
 	PhotoID _tmp2_ = {0};
 	gint64 _tmp3_ = 0LL;
 	GError * _inner_error_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1018 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1011 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1018 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (photo_id != NULL);
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = dirty;
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp1_) {
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = 1;
-#line 7489 "PhotoTable.c"
+#line 7528 "PhotoTable.c"
 	} else {
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp0_ = 0;
-#line 7493 "PhotoTable.c"
+#line 7532 "PhotoTable.c"
 	}
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = *photo_id;
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = _tmp2_.id;
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_update_int_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp3_, "metadata_dirty", _tmp0_, &_inner_error_);
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7509 "PhotoTable.c"
+#line 7548 "PhotoTable.c"
 		} else {
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1012 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7517 "PhotoTable.c"
+#line 7556 "PhotoTable.c"
 		}
 	}
 }
@@ -7559,175 +7598,175 @@ void photo_table_update_raw_development (PhotoTable* self, PhotoRow* row, RawDev
 	BackingPhotoID _tmp15_ = {0};
 	gint64 _tmp16_ = 0LL;
 	GError * _inner_error_ = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1015 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 1015 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (backing_photo_id != NULL);
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = rd;
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	switch (_tmp0_) {
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 7553 "PhotoTable.c"
+#line 7592 "PhotoTable.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 1021 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1028 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp1_ = g_strdup ("develop_shotwell_id");
-#line 1021 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1028 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (col);
-#line 1021 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1028 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			col = _tmp1_;
-#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 7564 "PhotoTable.c"
+#line 7603 "PhotoTable.c"
 		}
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 7568 "PhotoTable.c"
+#line 7607 "PhotoTable.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1032 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp2_ = g_strdup ("develop_camera_id");
-#line 1025 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1032 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (col);
-#line 1025 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1032 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			col = _tmp2_;
-#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 7579 "PhotoTable.c"
+#line 7618 "PhotoTable.c"
 		}
-#line 1019 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1026 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 7583 "PhotoTable.c"
+#line 7622 "PhotoTable.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp3_ = g_strdup ("develop_embedded_id");
-#line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (col);
-#line 1029 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			col = _tmp3_;
-#line 1030 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			break;
-#line 7594 "PhotoTable.c"
+#line 7633 "PhotoTable.c"
 		}
 		default:
 		{
-#line 1033 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_assert_not_reached ();
-#line 7600 "PhotoTable.c"
+#line 7639 "PhotoTable.c"
 		}
 	}
-#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = row;
-#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = _tmp4_->development_ids;
-#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5__length1 = _tmp4_->development_ids_length1;
-#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = rd;
-#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = *backing_photo_id;
-#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_[_tmp6_] = _tmp7_;
-#line 1036 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = _tmp5_[_tmp6_];
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = row;
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = _tmp9_->photo_id;
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = _tmp10_.id;
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = col;
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = *backing_photo_id;
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = _tmp13_.id;
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp11_, _tmp12_, _tmp14_, &_inner_error_);
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (col);
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7641 "PhotoTable.c"
+#line 7680 "PhotoTable.c"
 		} else {
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_g_free0 (col);
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1037 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7651 "PhotoTable.c"
+#line 7690 "PhotoTable.c"
 		}
 	}
-#line 1039 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1046 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = *backing_photo_id;
-#line 1039 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1046 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = _tmp15_.id;
-#line 1039 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1046 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp16_ != BACKING_PHOTO_ID_INVALID) {
-#line 7660 "PhotoTable.c"
+#line 7699 "PhotoTable.c"
 		PhotoRow* _tmp17_ = NULL;
 		PhotoID _tmp18_ = {0};
 		gint64 _tmp19_ = 0LL;
 		RawDeveloper _tmp20_ = 0;
 		gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp17_ = row;
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp18_ = _tmp17_->photo_id;
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp19_ = _tmp18_.id;
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp20_ = rd;
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp21_ = raw_developer_to_string (_tmp20_);
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp22_ = _tmp21_;
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp19_, "developer", _tmp22_, &_inner_error_);
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_g_free0 (_tmp22_);
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (col);
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 7693 "PhotoTable.c"
+#line 7732 "PhotoTable.c"
 			} else {
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_g_free0 (col);
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_clear_error (&_inner_error_);
-#line 1040 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1047 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 7703 "PhotoTable.c"
+#line 7742 "PhotoTable.c"
 			}
 		}
 	}
-#line 1015 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1022 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (col);
-#line 7709 "PhotoTable.c"
+#line 7748 "PhotoTable.c"
 }
 
 
@@ -7736,35 +7775,35 @@ void photo_table_remove_development (PhotoTable* self, PhotoRow* row, RawDevelop
 	RawDeveloper _tmp1_ = 0;
 	BackingPhotoID _tmp2_ = {0};
 	GError * _inner_error_ = NULL;
-#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1050 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_TABLE (self));
-#line 1043 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1050 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_PHOTO_ROW (row));
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = row;
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = rd;
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_id_init (&_tmp2_, BACKING_PHOTO_ID_INVALID);
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	photo_table_update_raw_development (self, _tmp0_, _tmp1_, &_tmp2_, &_inner_error_);
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7738 "PhotoTable.c"
+#line 7777 "PhotoTable.c"
 		} else {
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1044 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1051 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 7746 "PhotoTable.c"
+#line 7785 "PhotoTable.c"
 		}
 	}
 }
@@ -7775,7 +7814,7 @@ static void photo_table_class_init (PhotoTableClass * klass) {
 	photo_table_parent_class = g_type_class_peek_parent (klass);
 #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	((DatabaseTableClass *) klass)->finalize = photo_table_finalize;
-#line 7757 "PhotoTable.c"
+#line 7796 "PhotoTable.c"
 }
 
 
@@ -7789,7 +7828,7 @@ static void photo_table_finalize (DatabaseTable* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_TABLE, PhotoTable);
 #line 109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	DATABASE_TABLE_CLASS (photo_table_parent_class)->finalize (obj);
-#line 7771 "PhotoTable.c"
+#line 7810 "PhotoTable.c"
 }
 
 
@@ -7807,58 +7846,58 @@ GType photo_table_get_type (void) {
 
 void backing_photo_id_init (BackingPhotoID *self, gint64 id) {
 	gint64 _tmp0_ = 0LL;
-#line 1064 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1071 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	memset (self, 0, sizeof (BackingPhotoID));
-#line 1065 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1072 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = id;
-#line 1065 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1072 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	(*self).id = _tmp0_;
-#line 7795 "PhotoTable.c"
+#line 7834 "PhotoTable.c"
 }
 
 
 gboolean backing_photo_id_is_invalid (BackingPhotoID *self) {
 	gboolean result = FALSE;
 	gint64 _tmp0_ = 0LL;
-#line 1069 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1076 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = (*self).id;
-#line 1069 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1076 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp0_ == BACKING_PHOTO_ID_INVALID;
-#line 1069 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1076 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7808 "PhotoTable.c"
+#line 7847 "PhotoTable.c"
 }
 
 
 gboolean backing_photo_id_is_valid (BackingPhotoID *self) {
 	gboolean result = FALSE;
 	gint64 _tmp0_ = 0LL;
-#line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1080 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = (*self).id;
-#line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1080 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp0_ != BACKING_PHOTO_ID_INVALID;
-#line 1073 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1080 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7821 "PhotoTable.c"
+#line 7860 "PhotoTable.c"
 }
 
 
 BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self) {
 	BackingPhotoID* dup;
-#line 1059 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1066 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	dup = g_new0 (BackingPhotoID, 1);
-#line 1059 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1066 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	memcpy (dup, self, sizeof (BackingPhotoID));
-#line 1059 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1066 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return dup;
-#line 7833 "PhotoTable.c"
+#line 7872 "PhotoTable.c"
 }
 
 
 void backing_photo_id_free (BackingPhotoID* self) {
-#line 1059 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1066 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_free (self);
-#line 7840 "PhotoTable.c"
+#line 7879 "PhotoTable.c"
 }
 
 
@@ -7882,37 +7921,37 @@ gboolean backing_photo_row_matches_file_info (BackingPhotoRow* self, GFileInfo*
 	GFileInfo* _tmp4_ = NULL;
 	GTimeVal _tmp5_ = {0};
 	glong _tmp6_ = 0L;
-#line 1087 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1094 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE);
-#line 1087 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1094 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
-#line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = self->filesize;
-#line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = info;
-#line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = g_file_info_get_size (_tmp1_);
-#line 1088 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_ != _tmp2_) {
-#line 1089 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
-#line 1089 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 7880 "PhotoTable.c"
+#line 7919 "PhotoTable.c"
 	}
-#line 1091 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = self->timestamp;
-#line 1091 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = info;
-#line 1091 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_file_info_get_modification_time (_tmp4_, &_tmp5_);
-#line 1091 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = _tmp5_.tv_sec;
-#line 1091 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp3_ == ((time_t) _tmp6_);
-#line 1091 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7894 "PhotoTable.c"
+#line 7933 "PhotoTable.c"
 }
 
 
@@ -7925,37 +7964,37 @@ gboolean backing_photo_row_is_touched (BackingPhotoRow* self, GFileInfo* info) {
 	GFileInfo* _tmp4_ = NULL;
 	GTimeVal _tmp5_ = {0};
 	glong _tmp6_ = 0L;
-#line 1094 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1101 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (self), FALSE);
-#line 1094 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1101 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (G_IS_FILE_INFO (info), FALSE);
-#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = self->filesize;
-#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = info;
-#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = g_file_info_get_size (_tmp1_);
-#line 1095 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_ != _tmp2_) {
-#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = FALSE;
-#line 1096 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 7923 "PhotoTable.c"
+#line 7962 "PhotoTable.c"
 	}
-#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = self->timestamp;
-#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = info;
-#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_file_info_get_modification_time (_tmp4_, &_tmp5_);
-#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = _tmp5_.tv_sec;
-#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp3_ != ((time_t) _tmp6_);
-#line 1098 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 7937 "PhotoTable.c"
+#line 7976 "PhotoTable.c"
 }
 
 
@@ -7977,290 +8016,290 @@ void backing_photo_row_copy_from (BackingPhotoRow* self, BackingPhotoRow* from)
 	Dimensions _tmp14_ = {0};
 	BackingPhotoRow* _tmp15_ = NULL;
 	Orientation _tmp16_ = 0;
-#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_ROW (self));
-#line 1102 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_ROW (from));
-#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = from;
-#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_->id;
-#line 1103 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->id = _tmp1_;
-#line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = from;
-#line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = _tmp2_->time_created;
-#line 1104 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1111 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->time_created = _tmp3_;
-#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = from;
-#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = _tmp4_->filepath;
-#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (self->filepath);
-#line 1105 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1112 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->filepath = _tmp6_;
-#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = from;
-#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = _tmp7_->filesize;
-#line 1106 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1113 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->filesize = _tmp8_;
-#line 1107 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = from;
-#line 1107 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = _tmp9_->timestamp;
-#line 1107 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->timestamp = _tmp10_;
-#line 1108 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = from;
-#line 1108 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = _tmp11_->file_format;
-#line 1108 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1115 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->file_format = _tmp12_;
-#line 1109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = from;
-#line 1109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = _tmp13_->dim;
-#line 1109 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1116 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->dim = _tmp14_;
-#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = from;
-#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = _tmp15_->original_orientation;
-#line 1110 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->original_orientation = _tmp16_;
-#line 8015 "PhotoTable.c"
+#line 8054 "PhotoTable.c"
 }
 
 
 BackingPhotoRow* backing_photo_row_construct (GType object_type) {
 	BackingPhotoRow* self = NULL;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = (BackingPhotoRow*) g_type_create_instance (object_type);
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self;
-#line 8025 "PhotoTable.c"
+#line 8064 "PhotoTable.c"
 }
 
 
 BackingPhotoRow* backing_photo_row_new (void) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return backing_photo_row_construct (TYPE_BACKING_PHOTO_ROW);
-#line 8032 "PhotoTable.c"
+#line 8071 "PhotoTable.c"
 }
 
 
 static void value_backing_photo_row_init (GValue* value) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 8039 "PhotoTable.c"
+#line 8078 "PhotoTable.c"
 }
 
 
 static void value_backing_photo_row_free_value (GValue* value) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (value->data[0].v_pointer) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_unref (value->data[0].v_pointer);
-#line 8048 "PhotoTable.c"
+#line 8087 "PhotoTable.c"
 	}
 }
 
 
 static void value_backing_photo_row_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		dest_value->data[0].v_pointer = backing_photo_row_ref (src_value->data[0].v_pointer);
-#line 8058 "PhotoTable.c"
+#line 8097 "PhotoTable.c"
 	} else {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8062 "PhotoTable.c"
+#line 8101 "PhotoTable.c"
 	}
 }
 
 
 static gpointer value_backing_photo_row_peek_pointer (const GValue* value) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return value->data[0].v_pointer;
-#line 8070 "PhotoTable.c"
+#line 8109 "PhotoTable.c"
 }
 
 
 static gchar* value_backing_photo_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 8077 "PhotoTable.c"
+#line 8116 "PhotoTable.c"
 		BackingPhotoRow* object;
 		object = collect_values[0].v_pointer;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8084 "PhotoTable.c"
+#line 8123 "PhotoTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8088 "PhotoTable.c"
+#line 8127 "PhotoTable.c"
 		}
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = backing_photo_row_ref (object);
-#line 8092 "PhotoTable.c"
+#line 8131 "PhotoTable.c"
 	} else {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 8096 "PhotoTable.c"
+#line 8135 "PhotoTable.c"
 	}
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return NULL;
-#line 8100 "PhotoTable.c"
+#line 8139 "PhotoTable.c"
 }
 
 
 static gchar* value_backing_photo_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	BackingPhotoRow** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (!object_p) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8111 "PhotoTable.c"
+#line 8150 "PhotoTable.c"
 	}
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (!value->data[0].v_pointer) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = NULL;
-#line 8117 "PhotoTable.c"
+#line 8156 "PhotoTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8121 "PhotoTable.c"
+#line 8160 "PhotoTable.c"
 	} else {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		*object_p = backing_photo_row_ref (value->data[0].v_pointer);
-#line 8125 "PhotoTable.c"
+#line 8164 "PhotoTable.c"
 	}
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return NULL;
-#line 8129 "PhotoTable.c"
+#line 8168 "PhotoTable.c"
 }
 
 
 GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecBackingPhotoRow* spec;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_BACKING_PHOTO_ROW), NULL);
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 8143 "PhotoTable.c"
+#line 8182 "PhotoTable.c"
 }
 
 
 gpointer value_get_backing_photo_row (const GValue* value) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW), NULL);
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return value->data[0].v_pointer;
-#line 8152 "PhotoTable.c"
+#line 8191 "PhotoTable.c"
 }
 
 
 void value_set_backing_photo_row (GValue* value, gpointer v_object) {
 	BackingPhotoRow* old;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW));
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	old = value->data[0].v_pointer;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (v_object) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BACKING_PHOTO_ROW));
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_ref (value->data[0].v_pointer);
-#line 8172 "PhotoTable.c"
+#line 8211 "PhotoTable.c"
 	} else {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 8176 "PhotoTable.c"
+#line 8215 "PhotoTable.c"
 	}
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (old) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_unref (old);
-#line 8182 "PhotoTable.c"
+#line 8221 "PhotoTable.c"
 	}
 }
 
 
 void value_take_backing_photo_row (GValue* value, gpointer v_object) {
 	BackingPhotoRow* old;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BACKING_PHOTO_ROW));
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	old = value->data[0].v_pointer;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (v_object) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_BACKING_PHOTO_ROW));
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 8201 "PhotoTable.c"
+#line 8240 "PhotoTable.c"
 	} else {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 8205 "PhotoTable.c"
+#line 8244 "PhotoTable.c"
 	}
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (old) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_row_unref (old);
-#line 8211 "PhotoTable.c"
+#line 8250 "PhotoTable.c"
 	}
 }
 
 
 static void backing_photo_row_class_init (BackingPhotoRowClass * klass) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_row_parent_class = g_type_class_peek_parent (klass);
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	((BackingPhotoRowClass *) klass)->finalize = backing_photo_row_finalize;
-#line 8221 "PhotoTable.c"
+#line 8260 "PhotoTable.c"
 }
 
 
 static void backing_photo_row_instance_init (BackingPhotoRow * self) {
-#line 1080 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1087 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->filepath = NULL;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self->ref_count = 1;
-#line 8230 "PhotoTable.c"
+#line 8269 "PhotoTable.c"
 }
 
 
 static void backing_photo_row_finalize (BackingPhotoRow* obj) {
 	BackingPhotoRow * self;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_ROW, BackingPhotoRow);
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_signal_handlers_destroy (self);
-#line 1080 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1087 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (self->filepath);
-#line 8242 "PhotoTable.c"
+#line 8281 "PhotoTable.c"
 }
 
 
@@ -8281,24 +8320,24 @@ GType backing_photo_row_get_type (void) {
 gpointer backing_photo_row_ref (gpointer instance) {
 	BackingPhotoRow* self;
 	self = instance;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return instance;
-#line 8267 "PhotoTable.c"
+#line 8306 "PhotoTable.c"
 }
 
 
 void backing_photo_row_unref (gpointer instance) {
 	BackingPhotoRow* self;
 	self = instance;
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		BACKING_PHOTO_ROW_GET_CLASS (self)->finalize (self);
-#line 1077 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1084 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8280 "PhotoTable.c"
+#line 8319 "PhotoTable.c"
 	}
 }
 
@@ -8314,54 +8353,54 @@ static BackingPhotoTable* backing_photo_table_construct (GType object_type) {
 	sqlite3_stmt* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
-#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1124 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = (BackingPhotoTable*) database_table_construct (object_type);
-#line 1118 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1125 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_set_table_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), "BackingPhotoTable");
-#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "CREATE TABLE IF NOT EXISTS " "BackingPhotoTable " "(" "id INTEGER PRIMARY KEY, " "filepath TEXT UNIQUE NOT NULL, " "timestamp INTEGER, " "filesize INTEGER, " "width INTEGER, " "height INTEGER, " "original_orientation INTEGER, " "file_format INTEGER, " "time_created INTEGER " ")", -1, &_tmp1_, NULL);
-#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1128 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 1134 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1141 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 1134 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1141 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1136 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1143 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 1136 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1143 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = sqlite3_step (_tmp4_);
-#line 1136 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1143 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp5_;
-#line 1137 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = res;
-#line 1137 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1144 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp6_ != SQLITE_DONE) {
-#line 8324 "PhotoTable.c"
+#line 8363 "PhotoTable.c"
 		gint _tmp7_ = 0;
-#line 1138 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp7_ = res;
-#line 1138 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_fatal ("create PhotoBackingTable", _tmp7_);
-#line 8330 "PhotoTable.c"
+#line 8369 "PhotoTable.c"
 	}
-#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1124 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1124 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return self;
-#line 8336 "PhotoTable.c"
+#line 8375 "PhotoTable.c"
 }
 
 
 static BackingPhotoTable* backing_photo_table_new (void) {
-#line 1117 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1124 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return backing_photo_table_construct (TYPE_BACKING_PHOTO_TABLE);
-#line 8343 "PhotoTable.c"
+#line 8382 "PhotoTable.c"
 }
 
 
@@ -8370,29 +8409,29 @@ BackingPhotoTable* backing_photo_table_get_instance (void) {
 	BackingPhotoTable* _tmp0_ = NULL;
 	BackingPhotoTable* _tmp2_ = NULL;
 	BackingPhotoTable* _tmp3_ = NULL;
-#line 1142 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = backing_photo_table_instance;
-#line 1142 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1149 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp0_ == NULL) {
-#line 8356 "PhotoTable.c"
+#line 8395 "PhotoTable.c"
 		BackingPhotoTable* _tmp1_ = NULL;
-#line 1143 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp1_ = backing_photo_table_new ();
-#line 1143 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_database_table_unref0 (backing_photo_table_instance);
-#line 1143 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		backing_photo_table_instance = _tmp1_;
-#line 8364 "PhotoTable.c"
+#line 8403 "PhotoTable.c"
 	}
-#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1152 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = backing_photo_table_instance;
-#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1152 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = _database_table_ref0 (_tmp2_);
-#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1152 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = _tmp3_;
-#line 1145 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1152 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 8374 "PhotoTable.c"
+#line 8413 "PhotoTable.c"
 }
 
 
@@ -8458,205 +8497,205 @@ void backing_photo_table_add (BackingPhotoTable* self, BackingPhotoRow* state, G
 	BackingPhotoRow* _tmp56_ = NULL;
 	time_t _tmp57_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_ROW (state));
-#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "INSERT INTO BackingPhotoTable " "(filepath, timestamp, filesize, width, height, original_orientation, " "file_format, time_created) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?)", -1, &_tmp1_, NULL);
-#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 1150 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 1155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1162 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 1155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1162 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1164 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = now_sec ();
-#line 1157 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1164 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	time_created = (time_t) _tmp4_;
-#line 1159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = stmt;
-#line 1159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = state;
-#line 1159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = _tmp6_->filepath;
-#line 1159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = g_strdup (_tmp7_);
-#line 1159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = g_free;
-#line 1159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = sqlite3_bind_text (_tmp5_, 1, _tmp8_, -1, _tmp9_);
-#line 1159 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp10_;
-#line 1160 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = res;
-#line 1160 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1161 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = stmt;
-#line 1161 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = state;
-#line 1161 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = _tmp13_->timestamp;
-#line 1161 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = sqlite3_bind_int64 (_tmp12_, 2, (gint64) _tmp14_);
-#line 1161 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp15_;
-#line 1162 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = res;
-#line 1162 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = stmt;
-#line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = state;
-#line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = _tmp18_->filesize;
-#line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp20_ = sqlite3_bind_int64 (_tmp17_, 3, _tmp19_);
-#line 1163 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp20_;
-#line 1164 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = res;
-#line 1164 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp21_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = stmt;
-#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp23_ = state;
-#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = _tmp23_->dim;
-#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp25_ = _tmp24_.width;
-#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp26_ = sqlite3_bind_int (_tmp22_, 4, _tmp25_);
-#line 1165 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp26_;
-#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp27_ = res;
-#line 1166 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp27_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp28_ = stmt;
-#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp29_ = state;
-#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_ = _tmp29_->dim;
-#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp31_ = _tmp30_.height;
-#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = sqlite3_bind_int (_tmp28_, 5, _tmp31_);
-#line 1167 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp32_;
-#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = res;
-#line 1168 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1175 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp33_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = stmt;
-#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_ = state;
-#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = _tmp35_->original_orientation;
-#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = sqlite3_bind_int (_tmp34_, 6, (gint) _tmp36_);
-#line 1169 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp37_;
-#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = res;
-#line 1170 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp38_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = stmt;
-#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = state;
-#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_ = _tmp40_->file_format;
-#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp42_ = photo_file_format_serialize (_tmp41_);
-#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp43_ = sqlite3_bind_int (_tmp39_, 7, _tmp42_);
-#line 1171 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp43_;
-#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp44_ = res;
-#line 1172 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1179 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp44_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp45_ = stmt;
-#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp46_ = time_created;
-#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp47_ = sqlite3_bind_int64 (_tmp45_, 8, (gint64) _tmp46_);
-#line 1173 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp47_;
-#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp48_ = res;
-#line 1174 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp48_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp49_ = stmt;
-#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp50_ = sqlite3_step (_tmp49_);
-#line 1176 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1183 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp50_;
-#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp51_ = res;
-#line 1177 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp51_ != SQLITE_DONE) {
-#line 8592 "PhotoTable.c"
+#line 8631 "PhotoTable.c"
 		gint _tmp52_ = 0;
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp52_ = res;
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_throw_error ("PhotoBackingTable.add", _tmp52_, &_inner_error_);
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 8608 "PhotoTable.c"
+#line 8647 "PhotoTable.c"
 			} else {
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_clear_error (&_inner_error_);
-#line 1178 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1185 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 8618 "PhotoTable.c"
+#line 8657 "PhotoTable.c"
 			}
 		}
 	}
-#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1187 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp53_ = state;
-#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1187 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp54_ = database_table_db;
-#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1187 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp55_ = sqlite3_last_insert_rowid (_tmp54_);
-#line 1180 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1187 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_id_init (&_tmp53_->id, _tmp55_);
-#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp56_ = state;
-#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp57_ = time_created;
-#line 1181 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1188 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp56_->time_created = _tmp57_;
-#line 1148 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1155 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 8638 "PhotoTable.c"
+#line 8677 "PhotoTable.c"
 }
 
 
@@ -8706,176 +8745,176 @@ BackingPhotoRow* backing_photo_table_fetch (BackingPhotoTable* self, BackingPhot
 	sqlite3_stmt* _tmp40_ = NULL;
 	gint64 _tmp41_ = 0LL;
 	GError * _inner_error_ = NULL;
-#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_TABLE (self), NULL);
-#line 1184 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "SELECT filepath, timestamp, filesize, width, height, " "original_orientation, file_format, time_created FROM BackingPhotoTable" \
 " WHERE id=?", -1, &_tmp1_, NULL);
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 1186 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1193 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1196 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 1189 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1196 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 1191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = *id;
-#line 1191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = _tmp5_.id;
-#line 1191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, _tmp6_);
-#line 1191 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp7_;
-#line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = res;
-#line 1192 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1199 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1201 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = stmt;
-#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1201 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = sqlite3_step (_tmp9_);
-#line 1194 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1201 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp10_;
-#line 1195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = res;
-#line 1195 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp11_ == SQLITE_DONE) {
-#line 1196 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		result = NULL;
-#line 1196 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_sqlite3_finalize0 (stmt);
-#line 1196 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		return result;
-#line 8736 "PhotoTable.c"
+#line 8775 "PhotoTable.c"
 	} else {
 		gint _tmp12_ = 0;
-#line 1197 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp12_ = res;
-#line 1197 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_tmp12_ != SQLITE_ROW) {
-#line 8743 "PhotoTable.c"
+#line 8782 "PhotoTable.c"
 			gint _tmp13_ = 0;
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			_tmp13_ = res;
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			database_table_throw_error ("BackingPhotoTable.fetch_for_photo", _tmp13_, &_inner_error_);
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					g_propagate_error (error, _inner_error_);
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_sqlite3_finalize0 (stmt);
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					return NULL;
-#line 8759 "PhotoTable.c"
+#line 8798 "PhotoTable.c"
 				} else {
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					_sqlite3_finalize0 (stmt);
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					g_clear_error (&_inner_error_);
-#line 1198 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 					return NULL;
-#line 8769 "PhotoTable.c"
+#line 8808 "PhotoTable.c"
 				}
 			}
 		}
 	}
-#line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = backing_photo_row_new ();
-#line 1200 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	row = _tmp14_;
-#line 1201 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = row;
-#line 1201 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = *id;
-#line 1201 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_->id = _tmp16_;
-#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = row;
-#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = stmt;
-#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = sqlite3_column_text (_tmp18_, 0);
-#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp20_ = g_strdup (_tmp19_);
-#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_g_free0 (_tmp17_->filepath);
-#line 1202 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1209 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_->filepath = _tmp20_;
-#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = row;
-#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = stmt;
-#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp23_ = sqlite3_column_int64 (_tmp22_, 1);
-#line 1203 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_->timestamp = (time_t) _tmp23_;
-#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = row;
-#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp25_ = stmt;
-#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp26_ = sqlite3_column_int64 (_tmp25_, 2);
-#line 1204 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1211 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_->filesize = _tmp26_;
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp27_ = row;
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp28_ = stmt;
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp29_ = sqlite3_column_int (_tmp28_, 3);
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_ = stmt;
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp31_ = sqlite3_column_int (_tmp30_, 4);
-#line 1205 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1212 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	dimensions_init (&_tmp27_->dim, _tmp29_, _tmp31_);
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = row;
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = stmt;
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = sqlite3_column_int (_tmp33_, 5);
-#line 1206 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1213 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_->original_orientation = (Orientation) _tmp34_;
-#line 1207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_ = row;
-#line 1207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = stmt;
-#line 1207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = sqlite3_column_int (_tmp36_, 6);
-#line 1207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = photo_file_format_unserialize (_tmp37_);
-#line 1207 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_->file_format = _tmp38_;
-#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = row;
-#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = stmt;
-#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_ = sqlite3_column_int64 (_tmp40_, 7);
-#line 1208 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1215 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_->time_created = (time_t) _tmp41_;
-#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	result = row;
-#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1210 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1217 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	return result;
-#line 8856 "PhotoTable.c"
+#line 8895 "PhotoTable.c"
 }
 
 
@@ -8929,173 +8968,173 @@ void backing_photo_table_update (BackingPhotoTable* self, BackingPhotoRow* row,
 	gint _tmp44_ = 0;
 	gint _tmp45_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_ROW (row));
-#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE BackingPhotoTable SET timestamp=?, filesize=?, " "width=?, height=?, original_orientation=?, file_format=? " "WHERE id=?", -1, &_tmp1_, NULL);
-#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 1216 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 1220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 1220 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = row;
-#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = _tmp5_->timestamp;
-#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp6_);
-#line 1222 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp7_;
-#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = res;
-#line 1223 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp8_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = stmt;
-#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = row;
-#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = _tmp10_->filesize;
-#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = sqlite3_bind_int64 (_tmp9_, 2, _tmp11_);
-#line 1224 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp12_;
-#line 1225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = res;
-#line 1225 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp13_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = stmt;
-#line 1226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = row;
-#line 1226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = _tmp15_->dim;
-#line 1226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = _tmp16_.width;
-#line 1226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = sqlite3_bind_int (_tmp14_, 3, _tmp17_);
-#line 1226 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp18_;
-#line 1227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = res;
-#line 1227 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp19_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp20_ = stmt;
-#line 1228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp21_ = row;
-#line 1228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp22_ = _tmp21_->dim;
-#line 1228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp23_ = _tmp22_.height;
-#line 1228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp24_ = sqlite3_bind_int (_tmp20_, 4, _tmp23_);
-#line 1228 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp24_;
-#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp25_ = res;
-#line 1229 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1236 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp25_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp26_ = stmt;
-#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp27_ = row;
-#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp28_ = _tmp27_->original_orientation;
-#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp29_ = sqlite3_bind_int (_tmp26_, 5, (gint) _tmp28_);
-#line 1230 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp29_;
-#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp30_ = res;
-#line 1231 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp30_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp31_ = stmt;
-#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp32_ = row;
-#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp33_ = _tmp32_->file_format;
-#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp34_ = photo_file_format_serialize (_tmp33_);
-#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp35_ = sqlite3_bind_int (_tmp31_, 6, _tmp34_);
-#line 1232 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp35_;
-#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp36_ = res;
-#line 1233 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1240 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp36_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp37_ = stmt;
-#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp38_ = row;
-#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp39_ = _tmp38_->id;
-#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp40_ = _tmp39_.id;
-#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp41_ = sqlite3_bind_int64 (_tmp37_, 7, _tmp40_);
-#line 1234 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1241 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp41_;
-#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp42_ = res;
-#line 1235 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp42_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp43_ = stmt;
-#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp44_ = sqlite3_step (_tmp43_);
-#line 1237 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp44_;
-#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp45_ = res;
-#line 1238 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1245 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp45_ != SQLITE_DONE) {
-#line 9044 "PhotoTable.c"
+#line 9083 "PhotoTable.c"
 		gint _tmp46_ = 0;
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp46_ = res;
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_throw_error ("BackingPhotoTable.update", _tmp46_, &_inner_error_);
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 9060 "PhotoTable.c"
+#line 9099 "PhotoTable.c"
 			} else {
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_clear_error (&_inner_error_);
-#line 1239 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 9070 "PhotoTable.c"
+#line 9109 "PhotoTable.c"
 			}
 		}
 	}
-#line 1214 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1221 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 9076 "PhotoTable.c"
+#line 9115 "PhotoTable.c"
 }
 
 
@@ -9123,105 +9162,105 @@ void backing_photo_table_update_attributes (BackingPhotoTable* self, BackingPhot
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (id != NULL);
-#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = database_table_db;
-#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = sqlite3_prepare_v2 (_tmp0_, "UPDATE BackingPhotoTable SET timestamp=?, filesize=? WHERE id=?", -1, &_tmp1_, NULL);
-#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	stmt = _tmp1_;
-#line 1244 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp2_;
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp3_ = res;
-#line 1246 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp4_ = stmt;
-#line 1248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp5_ = timestamp;
-#line 1248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp6_ = sqlite3_bind_int64 (_tmp4_, 1, (gint64) _tmp5_);
-#line 1248 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp6_;
-#line 1249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp7_ = res;
-#line 1249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp8_ = stmt;
-#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp9_ = filesize;
-#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp10_ = sqlite3_bind_int64 (_tmp8_, 2, _tmp9_);
-#line 1250 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp10_;
-#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp11_ = res;
-#line 1251 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1258 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp11_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp12_ = stmt;
-#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp13_ = *id;
-#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp14_ = _tmp13_.id;
-#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp15_ = sqlite3_bind_int64 (_tmp12_, 3, _tmp14_);
-#line 1252 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1259 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp15_;
-#line 1253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp16_ = res;
-#line 1253 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_vala_assert (_tmp16_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp17_ = stmt;
-#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp18_ = sqlite3_step (_tmp17_);
-#line 1255 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1262 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	res = _tmp18_;
-#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp19_ = res;
-#line 1256 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1263 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (_tmp19_ != SQLITE_DONE) {
-#line 9170 "PhotoTable.c"
+#line 9209 "PhotoTable.c"
 		gint _tmp20_ = 0;
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		_tmp20_ = res;
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		database_table_throw_error ("BackingPhotoTable.update_attributes", _tmp20_, &_inner_error_);
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 9186 "PhotoTable.c"
+#line 9225 "PhotoTable.c"
 			} else {
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				_sqlite3_finalize0 (stmt);
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				g_clear_error (&_inner_error_);
-#line 1257 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 				return;
-#line 9196 "PhotoTable.c"
+#line 9235 "PhotoTable.c"
 			}
 		}
 	}
-#line 1242 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1249 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 9202 "PhotoTable.c"
+#line 9241 "PhotoTable.c"
 }
 
 
@@ -9229,33 +9268,33 @@ void backing_photo_table_remove (BackingPhotoTable* self, BackingPhotoID* backin
 	BackingPhotoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
 	GError * _inner_error_ = NULL;
-#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1267 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1260 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1267 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (backing_id != NULL);
-#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *backing_id;
-#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_delete_by_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, &_inner_error_);
-#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9228 "PhotoTable.c"
+#line 9267 "PhotoTable.c"
 		} else {
-#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1261 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9236 "PhotoTable.c"
+#line 9275 "PhotoTable.c"
 		}
 	}
 }
@@ -9266,37 +9305,37 @@ void backing_photo_table_set_filepath (BackingPhotoTable* self, BackingPhotoID*
 	gint64 _tmp1_ = 0LL;
 	const gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (id != NULL);
-#line 1264 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1271 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (filepath != NULL);
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *id;
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = filepath;
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_update_text_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "filepath", _tmp2_, &_inner_error_);
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9269 "PhotoTable.c"
+#line 9308 "PhotoTable.c"
 		} else {
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1265 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1272 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9277 "PhotoTable.c"
+#line 9316 "PhotoTable.c"
 		}
 	}
 }
@@ -9307,46 +9346,46 @@ void backing_photo_table_update_timestamp (BackingPhotoTable* self, BackingPhoto
 	gint64 _tmp1_ = 0LL;
 	time_t _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_TABLE (self));
-#line 1268 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1275 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	g_return_if_fail (id != NULL);
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp0_ = *id;
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	_tmp2_ = timestamp;
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	database_table_update_int64_by_id_2 (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATABASE_TABLE, DatabaseTable), _tmp1_, "timestamp", (gint64) _tmp2_, &_inner_error_);
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9308 "PhotoTable.c"
+#line 9347 "PhotoTable.c"
 		} else {
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			g_clear_error (&_inner_error_);
-#line 1269 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1276 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 			return;
-#line 9316 "PhotoTable.c"
+#line 9355 "PhotoTable.c"
 		}
 	}
 }
 
 
 static void backing_photo_table_class_init (BackingPhotoTableClass * klass) {
-#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	backing_photo_table_parent_class = g_type_class_peek_parent (klass);
-#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	((DatabaseTableClass *) klass)->finalize = backing_photo_table_finalize;
-#line 9327 "PhotoTable.c"
+#line 9366 "PhotoTable.c"
 }
 
 
@@ -9356,11 +9395,11 @@ static void backing_photo_table_instance_init (BackingPhotoTable * self) {
 
 static void backing_photo_table_finalize (DatabaseTable* obj) {
 	BackingPhotoTable * self;
-#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BACKING_PHOTO_TABLE, BackingPhotoTable);
-#line 1114 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
+#line 1121 "/home/jens/Source/shotwell/src/db/PhotoTable.vala"
 	DATABASE_TABLE_CLASS (backing_photo_table_parent_class)->finalize (obj);
-#line 9341 "PhotoTable.c"
+#line 9380 "PhotoTable.c"
 }
 
 
diff --git a/src/db/PhotoTable.vala b/src/db/PhotoTable.vala
index f774df5..4304da8 100644
--- a/src/db/PhotoTable.vala
+++ b/src/db/PhotoTable.vala
@@ -162,7 +162,14 @@ public class PhotoTable : DatabaseTable {
         // https://bugzilla.gnome.org/show_bug.cgi?id=742670
         //
         // 1) index on md5,file_format
-        res = db.prepare_v2 ("CREATE UNIQUE INDEX IF NOT EXISTS PhotoTableMD5Format on PhotoTable(md5, file_format)", -1, out stmt);
+        res = db.prepare_v2 ("DROP INDEX IF EXISTS PhotoTableMD5Format", -1, out stmt);
+        assert (res == Sqlite.OK);
+        res = stmt.step ();
+        if (res != Sqlite.DONE) {
+            DatabaseTable.warning ("Failed to drop old PhotoTable index", res);
+        }
+
+        res = db.prepare_v2 ("CREATE INDEX IF NOT EXISTS PhotoTableMD5FormatV2 on PhotoTable(md5, file_format)", -1, out stmt);
         assert (res == Sqlite.OK);
         res = stmt.step ();
         if (res != Sqlite.DONE) {
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index b4c3f1c..bcb3ed3 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1258,7 +1258,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1261 "DirectPhoto.c"
-			goto __catch43_g_error;
+			goto __catch42_g_error;
 		}
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row;
@@ -1270,8 +1270,8 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_g_object_unref0 (_tmp0_);
 #line 1272 "DirectPhoto.c"
 	}
-	goto __finally43;
-	__catch43_g_error:
+	goto __finally42;
+	__catch42_g_error:
 	{
 		GError* e = NULL;
 		gchar* _tmp5_ = NULL;
@@ -1292,7 +1292,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_g_error_free0 (e);
 #line 1294 "DirectPhoto.c"
 	}
-	__finally43:
+	__finally42:
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1337,7 +1337,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1340 "DirectPhoto.c"
-			goto __catch44_g_error;
+			goto __catch43_g_error;
 		}
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = reimport_state;
@@ -1346,11 +1346,11 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1349 "DirectPhoto.c"
-			goto __catch44_g_error;
+			goto __catch43_g_error;
 		}
 	}
-	goto __finally44;
-	__catch44_g_error:
+	goto __finally43;
+	__catch43_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -1375,7 +1375,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		return result;
 #line 1377 "DirectPhoto.c"
 	}
-	__finally44:
+	__finally43:
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2563,7 +2563,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_photo_reimport_master_state_unref0 (reimport_state);
 #line 2566 "DirectPhoto.c"
-					goto __catch45_g_error;
+					goto __catch44_g_error;
 				}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				if (_tmp12_) {
@@ -2582,7 +2582,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						_photo_reimport_master_state_unref0 (reimport_state);
 #line 2585 "DirectPhoto.c"
-						goto __catch45_g_error;
+						goto __catch44_g_error;
 					}
 #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp18_ = should_restore_ori;
@@ -2613,8 +2613,8 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				_photo_reimport_master_state_unref0 (reimport_state);
 #line 2615 "DirectPhoto.c"
 			}
-			goto __finally45;
-			__catch45_g_error:
+			goto __finally44;
+			__catch44_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp22_ = NULL;
@@ -2638,7 +2638,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				_g_error_free0 (err);
 #line 2640 "DirectPhoto.c"
 			}
-			__finally45:
+			__finally44:
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index dd66352..4e7eaef 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -265,6 +265,16 @@ typedef struct _AlterationClass AlterationClass;
 typedef struct _Application Application;
 typedef struct _ApplicationClass ApplicationClass;
 #define _application_unref0(var) ((var == NULL) ? NULL : (var = (application_unref (var), NULL)))
+
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
 #define _injection_group_unref0(var) ((var == NULL) ? NULL : (var = (injection_group_unref (var), NULL)))
 
 #define TYPE_DIRECT_PHOTO (direct_photo_get_type ())
@@ -339,16 +349,6 @@ typedef struct _PhotoFileFormatProperties PhotoFileFormatProperties;
 typedef struct _PhotoFileFormatPropertiesClass PhotoFileFormatPropertiesClass;
 #define _photo_file_format_properties_unref0(var) ((var == NULL) ? NULL : (var = (photo_file_format_properties_unref (var), NULL)))
 
-#define TYPE_APP_WINDOW (app_window_get_type ())
-#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
-#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
-#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
-#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
-#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
-
-typedef struct _AppWindow AppWindow;
-typedef struct _AppWindowClass AppWindowClass;
-
 #define TYPE_PRINT_MANAGER (print_manager_get_type ())
 #define PRINT_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PRINT_MANAGER, PrintManager))
 #define PRINT_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PRINT_MANAGER, PrintManagerClass))
@@ -375,7 +375,7 @@ typedef struct _DirectFullscreenPhotoPagePrivate DirectFullscreenPhotoPagePrivat
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -385,8 +385,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -394,10 +392,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -649,151 +645,83 @@ gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
 static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap* map);
 static void _direct_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
-DirectPhotoPage* direct_photo_page_new (GFile* file);
-DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file);
-EditingHostPage* editing_host_page_construct (GType object_type, SourceCollection* sources, const gchar* name);
-static gboolean direct_photo_page_check_editable_file (GFile* file);
-gpointer application_ref (gpointer instance);
-void application_unref (gpointer instance);
-GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_application (GValue* value, gpointer v_object);
-void value_take_application (GValue* value, gpointer v_object);
-gpointer value_get_application (const GValue* value);
-GType application_get_type (void) G_GNUC_CONST;
-Application* application_get_instance (void);
-void application_panic (Application* self);
-DirectViewCollection* direct_view_collection_new (void);
-DirectViewCollection* direct_view_collection_construct (GType object_type);
-ViewCollection* page_get_view (Page* self);
-static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self);
-static void _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self);
-static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static GtkActionEntry* direct_photo_page_real_init_collect_action_entries (Page* base, int* result_length1);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-#define TRANSLATABLE "translatable"
-static void _vala_array_add91 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_SAVE_LABEL _ ("_Save")
 static void direct_photo_page_on_save (DirectPhotoPage* self);
-static void _direct_photo_page_on_save_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add92 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_SAVE_AS_LABEL _ ("Save _As")
+static void _direct_photo_page_on_save_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void direct_photo_page_on_save_as (DirectPhotoPage* self);
-static void _direct_photo_page_on_save_as_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add93 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _direct_photo_page_on_save_as_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void direct_photo_page_on_send_to (DirectPhotoPage* self);
-static void _direct_photo_page_on_send_to_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_SEND_TO_MENU _ ("Send _To…")
-static void _vala_array_add94 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_PRINT_LABEL _ ("_Print")
+static void _direct_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 static void direct_photo_page_on_print (DirectPhotoPage* self);
-static void _direct_photo_page_on_print_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PRINT_MENU _ ("_Print…")
-static void _vala_array_add95 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add96 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add97 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add98 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_PREVIOUS_LABEL _ ("_Previous")
+static void _direct_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void single_photo_page_on_previous_photo (SinglePhotoPage* self);
-static void _single_photo_page_on_previous_photo_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add99 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_NEXT_LABEL _ ("_Next")
+static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void single_photo_page_on_next_photo (SinglePhotoPage* self);
-static void _single_photo_page_on_next_photo_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add100 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_CLOCKWISE "object-rotate-right"
+static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_on_rotate_clockwise (EditingHostPage* self);
-static void _editing_host_page_on_rotate_clockwise_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ROTATE_CW_MENU _ ("Rotate _Right")
-#define RESOURCES_ROTATE_CCW_TOOLTIP _ ("Rotate the photos left")
-static void _vala_array_add101 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_COUNTERCLOCKWISE "object-rotate-left"
+static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self);
-static void _editing_host_page_on_rotate_counterclockwise_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ROTATE_CCW_MENU _ ("Rotate _Left")
-static void _vala_array_add102 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_HFLIP "object-flip-horizontal"
+static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_on_flip_horizontally (EditingHostPage* self);
-static void _editing_host_page_on_flip_horizontally_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_HFLIP_MENU _ ("Flip Hori_zontally")
-static void _vala_array_add103 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_VFLIP "object-flip-vertical"
+static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_on_flip_vertically (EditingHostPage* self);
-static void _editing_host_page_on_flip_vertically_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_VFLIP_MENU _ ("Flip Verti_cally")
-static void _vala_array_add104 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ENHANCE "shotwell-auto-enhance"
+static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_on_enhance (EditingHostPage* self);
-static void _editing_host_page_on_enhance_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ENHANCE_MENU _ ("_Enhance")
-#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance")
-static void _vala_array_add105 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_CROP "shotwell-crop"
+static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_toggle_crop (EditingHostPage* self);
-static void _editing_host_page_toggle_crop_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_CROP_MENU _ ("_Crop")
-#define RESOURCES_CROP_TOOLTIP _ ("Crop the photo’s size")
-static void _vala_array_add106 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_REFRESH_LABEL _ ("_Refresh")
+static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_toggle_straighten (EditingHostPage* self);
-static void _editing_host_page_toggle_straighten_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_STRAIGHTEN_MENU _ ("_Straighten")
-#define RESOURCES_STRAIGHTEN_TOOLTIP _ ("Straighten the photo")
-static void _vala_array_add107 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_REDEYE "shotwell-redeye"
+static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_toggle_redeye (EditingHostPage* self);
-static void _editing_host_page_toggle_redeye_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_RED_EYE_MENU _ ("_Red-eye")
-#define RESOURCES_RED_EYE_TOOLTIP _ ("Reduce or eliminate any red-eye effects in the photo")
-static void _vala_array_add108 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ADJUST "image-adjust"
+static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_toggle_adjust (EditingHostPage* self);
-static void _editing_host_page_toggle_adjust_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADJUST_MENU _ ("_Adjust")
-#define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo’s color and tone")
-static void _vala_array_add109 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_REVERT_LABEL _ ("Revert to Original")
+static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_on_revert (EditingHostPage* self);
-static void _editing_host_page_on_revert_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_REVERT_MENU _ ("Re_vert to Original")
-static void _vala_array_add110 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_on_adjust_date_time (EditingHostPage* self);
-static void _editing_host_page_on_adjust_date_time_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time…")
-static void _vala_array_add111 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_on_set_background (EditingHostPage* self);
-static void _editing_host_page_on_set_background_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_SET_BACKGROUND_MENU _ ("Set as _Desktop Background")
-#define RESOURCES_SET_BACKGROUND_TOOLTIP _ ("Set selected image to be the new desktop background")
-static void _vala_array_add112 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add113 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add114 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ZOOM_IN_LABEL _ ("Zoom _In")
+static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_on_increase_size (EditingHostPage* self);
-static void _editing_host_page_on_increase_size_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add115 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ZOOM_OUT_LABEL _ ("Zoom _Out")
+static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_on_decrease_size (EditingHostPage* self);
-static void _editing_host_page_on_decrease_size_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add116 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ZOOM_FIT_LABEL _ ("Best _Fit")
+static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_snap_zoom_to_min (EditingHostPage* self);
-static void _editing_host_page_snap_zoom_to_min_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add117 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ZOOM_100_LABEL _ ("_Normal Size")
+static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self);
-static void _editing_host_page_snap_zoom_to_isomorphic_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add118 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void editing_host_page_snap_zoom_to_max (EditingHostPage* self);
-static void _editing_host_page_snap_zoom_to_max_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add119 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+DirectPhotoPage* direct_photo_page_new (GFile* file);
+DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file);
+EditingHostPage* editing_host_page_construct (GType object_type, SourceCollection* sources, const gchar* name);
+static gboolean direct_photo_page_check_editable_file (GFile* file);
+gpointer application_ref (gpointer instance);
+void application_unref (gpointer instance);
+GParamSpec* param_spec_application (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_application (GValue* value, gpointer v_object);
+void value_take_application (GValue* value, gpointer v_object);
+gpointer value_get_application (const GValue* value);
+GType application_get_type (void) G_GNUC_CONST;
+Application* application_get_instance (void);
+void application_panic (Application* self);
+DirectViewCollection* direct_view_collection_new (void);
+DirectViewCollection* direct_view_collection_construct (GType object_type);
+ViewCollection* page_get_view (Page* self);
+static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self);
+static void _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self);
+static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
+static void direct_photo_page_real_add_actions (Page* base);
+void page_add_actions (Page* self);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1);
 InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1);
 InjectionGroup* injection_group_new (const gchar* path);
 InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
-void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action);
-static void _vala_array_add120 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add121 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
+static void _vala_array_add61 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
+static void _vala_array_add62 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gboolean photo_file_format_is_file_supported (GFile* file);
 #define RESOURCES_APP_TITLE "Shotwell"
@@ -811,7 +739,6 @@ ImportResult direct_photo_demand_load (DirectPhoto* self);
 GFile* direct_photo_page_get_current_file (DirectPhotoPage* self);
 GFile* media_source_get_file (MediaSource* self);
 static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event);
-gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventButton* event);
 static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage* self);
 GType zoom_state_get_type (void) G_GNUC_CONST;
 ZoomState* zoom_state_dup (const ZoomState* self);
@@ -892,8 +819,6 @@ gpointer value_get_photo_file_format_properties (const GValue* value);
 GType photo_file_format_properties_get_type (void) G_GNUC_CONST;
 PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self);
 gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self, int* result_length1);
-GType app_window_get_type (void) G_GNUC_CONST;
-AppWindow* app_window_get_instance (void);
 #define RESOURCES_CANCEL_LABEL _ ("_Cancel")
 #define RESOURCES_OK_LABEL _ ("_OK")
 void desktop_integration_send_to (GeeCollection* media);
@@ -929,25 +854,187 @@ static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* b
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
+static const GActionEntry DIRECT_PHOTO_PAGE_entries[23] = {{"Save", _direct_photo_page_on_save_gsimple_action_activate_callback}, {"SaveAs", _direct_photo_page_on_save_as_gsimple_action_activate_callback}, {"SendTo", _direct_photo_page_on_send_to_gsimple_action_activate_callback}, {"Print", _direct_photo_page_on_print_gsimple_action_activate_callback}, {"PrevPhoto", _single_photo_page_on_previous_photo_gsimple_action_activate_callback}, {"NextPhoto", _single_photo_page_on_next_photo_gsimple_action_activate_callback}, {"RotateClockwise", _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback}, {"RotateCounterclockwise", _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback}, {"FlipHorizontally", _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback}, {"FlipVertically", _editing_host_page_on_flip_vertically_gsimple_action_activate_callback}, {"Enhance", _editing_host_page_on_enhance_gsimple_action_activate_callback}, {"Crop", _editing_host_page_toggle_crop_gsimple_action_activate_callback}, {"Straighten", _editing_host_page_toggle_straighten_gsimple_action_activate_callback}, {"RedEye", _editing_host_page_toggle_redeye_gsimple_action_activate_callback}, {"Adjust", _editing_host_page_toggle_adjust_gsimple_action_activate_callback}, {"Revert", _editing_host_page_on_revert_gsimple_action_activate_callback}, {"AdjustDateTime", _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback}, {"SetBackground", _editing_host_page_on_set_background_gsimple_action_activate_callback}, {"IncreaseSize", _editing_host_page_on_increase_size_gsimple_action_activate_callback}, {"DecreaseSize", _editing_host_page_on_decrease_size_gsimple_action_activate_callback}, {"ZoomFit", _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback}, {"Zoom100", _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback}, {"Zoom200", _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback}};
 
 static void _direct_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 32 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_photos_altered ((DirectPhotoPage*) self, items);
-#line 937 "DirectPhotoPage.c"
+#line 863 "DirectPhotoPage.c"
+}
+
+
+static void _direct_photo_page_on_save_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	direct_photo_page_on_save ((DirectPhotoPage*) self);
+#line 870 "DirectPhotoPage.c"
+}
+
+
+static void _direct_photo_page_on_save_as_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	direct_photo_page_on_save_as ((DirectPhotoPage*) self);
+#line 877 "DirectPhotoPage.c"
+}
+
+
+static void _direct_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	direct_photo_page_on_send_to ((DirectPhotoPage*) self);
+#line 884 "DirectPhotoPage.c"
+}
+
+
+static void _direct_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	direct_photo_page_on_print ((DirectPhotoPage*) self);
+#line 891 "DirectPhotoPage.c"
+}
+
+
+static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
+#line 898 "DirectPhotoPage.c"
+}
+
+
+static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
+#line 905 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
+#line 912 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
+#line 919 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
+#line 926 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_on_flip_vertically ((EditingHostPage*) self);
+#line 933 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_on_enhance ((EditingHostPage*) self);
+#line 940 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_toggle_crop ((EditingHostPage*) self);
+#line 947 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_toggle_straighten ((EditingHostPage*) self);
+#line 954 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_toggle_redeye ((EditingHostPage*) self);
+#line 961 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_toggle_adjust ((EditingHostPage*) self);
+#line 968 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_on_revert ((EditingHostPage*) self);
+#line 975 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
+#line 982 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_on_set_background ((EditingHostPage*) self);
+#line 989 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_on_increase_size ((EditingHostPage*) self);
+#line 996 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_on_decrease_size ((EditingHostPage*) self);
+#line 1003 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
+#line 1010 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
+#line 1017 "DirectPhotoPage.c"
+}
+
+
+static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
+#line 1024 "DirectPhotoPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 944 "DirectPhotoPage.c"
+#line 1031 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
 #line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_selection_group_altered ((DirectPhotoPage*) self);
-#line 951 "DirectPhotoPage.c"
+#line 1038 "DirectPhotoPage.c"
 }
 
 
@@ -987,7 +1074,7 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) {
 	_tmp5_ = direct_photo_page_check_editable_file (_tmp4_);
 #line 16 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp5_) {
-#line 991 "DirectPhotoPage.c"
+#line 1078 "DirectPhotoPage.c"
 		Application* _tmp6_ = NULL;
 		Application* _tmp7_ = NULL;
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1000,7 +1087,7 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) {
 		_application_unref0 (_tmp7_);
 #line 19 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return self;
-#line 1004 "DirectPhotoPage.c"
+#line 1091 "DirectPhotoPage.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = file;
@@ -1038,14 +1125,14 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) {
 	_data_collection_unref0 (_tmp15_);
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self;
-#line 1042 "DirectPhotoPage.c"
+#line 1129 "DirectPhotoPage.c"
 }
 
 
 DirectPhotoPage* direct_photo_page_new (GFile* file) {
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return direct_photo_page_construct (TYPE_DIRECT_PHOTO_PAGE, file);
-#line 1049 "DirectPhotoPage.c"
+#line 1136 "DirectPhotoPage.c"
 }
 
 
@@ -1070,1634 +1157,68 @@ static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeLis
 	_tmp2_ = ui_filenames;
 #line 39 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "direct.ui");
-#line 1074 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add91 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1085 "DirectPhotoPage.c"
-	}
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1089 "DirectPhotoPage.c"
-}
-
-
-static void _direct_photo_page_on_save_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 49 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	direct_photo_page_on_save ((DirectPhotoPage*) self);
-#line 1096 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add92 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 53 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 53 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 53 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1107 "DirectPhotoPage.c"
-	}
-#line 53 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1111 "DirectPhotoPage.c"
-}
-
-
-static void _direct_photo_page_on_save_as_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 55 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	direct_photo_page_on_save_as ((DirectPhotoPage*) self);
-#line 1118 "DirectPhotoPage.c"
+#line 1161 "DirectPhotoPage.c"
 }
 
 
-static void _vala_array_add93 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 59 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 59 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 59 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1129 "DirectPhotoPage.c"
-	}
-#line 59 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1133 "DirectPhotoPage.c"
-}
-
-
-static void _direct_photo_page_on_send_to_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	direct_photo_page_on_send_to ((DirectPhotoPage*) self);
-#line 1140 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add94 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1151 "DirectPhotoPage.c"
-	}
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1155 "DirectPhotoPage.c"
-}
-
-
-static void _direct_photo_page_on_print_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 66 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	direct_photo_page_on_print ((DirectPhotoPage*) self);
-#line 1162 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add95 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1173 "DirectPhotoPage.c"
-	}
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1177 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add96 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1188 "DirectPhotoPage.c"
-	}
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1192 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add97 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1203 "DirectPhotoPage.c"
-	}
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1207 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add98 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1218 "DirectPhotoPage.c"
-	}
-#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1222 "DirectPhotoPage.c"
-}
-
-
-static void _single_photo_page_on_previous_photo_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 1229 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add99 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 88 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 88 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 88 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1240 "DirectPhotoPage.c"
-	}
-#line 88 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1244 "DirectPhotoPage.c"
-}
-
-
-static void _single_photo_page_on_next_photo_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 1251 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add100 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1262 "DirectPhotoPage.c"
-	}
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1266 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_on_rotate_clockwise_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 1273 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add101 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1284 "DirectPhotoPage.c"
-	}
-#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1288 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_on_rotate_counterclockwise_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 1295 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add102 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1306 "DirectPhotoPage.c"
-	}
-#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1310 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_on_flip_horizontally_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
-#line 1317 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add103 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1328 "DirectPhotoPage.c"
-	}
-#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1332 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_on_flip_vertically_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_on_flip_vertically ((EditingHostPage*) self);
-#line 1339 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add104 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1350 "DirectPhotoPage.c"
-	}
-#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1354 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_on_enhance_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 1361 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add105 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 122 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 122 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 122 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1372 "DirectPhotoPage.c"
-	}
-#line 122 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1376 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_toggle_crop_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_toggle_crop ((EditingHostPage*) self);
-#line 1383 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add106 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1394 "DirectPhotoPage.c"
-	}
-#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1398 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_toggle_straighten_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_toggle_straighten ((EditingHostPage*) self);
-#line 1405 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add107 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 134 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 134 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 134 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1416 "DirectPhotoPage.c"
-	}
-#line 134 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1420 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_toggle_redeye_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 136 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_toggle_redeye ((EditingHostPage*) self);
-#line 1427 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add108 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1438 "DirectPhotoPage.c"
-	}
-#line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1442 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_toggle_adjust_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 142 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_toggle_adjust ((EditingHostPage*) self);
-#line 1449 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add109 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 146 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 146 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 146 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1460 "DirectPhotoPage.c"
-	}
-#line 146 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1464 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_on_revert_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_on_revert ((EditingHostPage*) self);
-#line 1471 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add110 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1482 "DirectPhotoPage.c"
-	}
-#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1486 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_on_adjust_date_time_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 153 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
-#line 1493 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add111 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1504 "DirectPhotoPage.c"
-	}
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1508 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_on_set_background_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_on_set_background ((EditingHostPage*) self);
-#line 1515 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add112 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 162 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 162 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 162 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1526 "DirectPhotoPage.c"
-	}
-#line 162 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1530 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add113 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1541 "DirectPhotoPage.c"
-	}
-#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1545 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add114 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1556 "DirectPhotoPage.c"
-	}
-#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1560 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_on_increase_size_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_on_increase_size ((EditingHostPage*) self);
-#line 1567 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add115 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1578 "DirectPhotoPage.c"
-	}
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1582 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_on_decrease_size_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_on_decrease_size ((EditingHostPage*) self);
-#line 1589 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add116 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1600 "DirectPhotoPage.c"
-	}
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1604 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_snap_zoom_to_min_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
-#line 1611 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add117 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1622 "DirectPhotoPage.c"
-	}
-#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1626 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_snap_zoom_to_isomorphic_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
-#line 1633 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add118 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1644 "DirectPhotoPage.c"
-	}
-#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1648 "DirectPhotoPage.c"
-}
-
-
-static void _editing_host_page_snap_zoom_to_max_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
-#line 1655 "DirectPhotoPage.c"
-}
-
-
-static void _vala_array_add119 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if ((*length) == (*size)) {
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1666 "DirectPhotoPage.c"
-	}
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1670 "DirectPhotoPage.c"
-}
-
-
-static GtkActionEntry* direct_photo_page_real_init_collect_action_entries (Page* base, int* result_length1) {
+static void direct_photo_page_real_add_actions (Page* base) {
 	DirectPhotoPage * self;
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	gint _tmp0_ = 0;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry file = {0};
-	GtkActionEntry _tmp2_ = {0};
-	const gchar* _tmp3_ = NULL;
-	GtkActionEntry* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GtkActionEntry _tmp5_ = {0};
-	GtkActionEntry save = {0};
-	GtkActionEntry _tmp6_ = {0};
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkActionEntry _tmp10_ = {0};
-	GtkActionEntry save_as = {0};
-	GtkActionEntry _tmp11_ = {0};
-	const gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	GtkActionEntry* _tmp14_ = NULL;
-	gint _tmp14__length1 = 0;
-	GtkActionEntry _tmp15_ = {0};
-	GtkActionEntry send_to = {0};
-	GtkActionEntry _tmp16_ = {0};
-	GtkActionEntry* _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	GtkActionEntry _tmp18_ = {0};
-	GtkActionEntry print = {0};
-	GtkActionEntry _tmp19_ = {0};
-	const gchar* _tmp20_ = NULL;
-	GtkActionEntry* _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
-	GtkActionEntry _tmp22_ = {0};
-	GtkActionEntry edit = {0};
-	GtkActionEntry _tmp23_ = {0};
-	const gchar* _tmp24_ = NULL;
-	GtkActionEntry* _tmp25_ = NULL;
-	gint _tmp25__length1 = 0;
-	GtkActionEntry _tmp26_ = {0};
-	GtkActionEntry photo = {0};
-	GtkActionEntry _tmp27_ = {0};
-	const gchar* _tmp28_ = NULL;
-	GtkActionEntry* _tmp29_ = NULL;
-	gint _tmp29__length1 = 0;
-	GtkActionEntry _tmp30_ = {0};
-	GtkActionEntry tools = {0};
-	GtkActionEntry _tmp31_ = {0};
-	const gchar* _tmp32_ = NULL;
-	GtkActionEntry* _tmp33_ = NULL;
-	gint _tmp33__length1 = 0;
-	GtkActionEntry _tmp34_ = {0};
-	GtkActionEntry prev = {0};
-	GtkActionEntry _tmp35_ = {0};
-	const gchar* _tmp36_ = NULL;
-	const gchar* _tmp37_ = NULL;
-	GtkActionEntry* _tmp38_ = NULL;
-	gint _tmp38__length1 = 0;
-	GtkActionEntry _tmp39_ = {0};
-	GtkActionEntry next = {0};
-	GtkActionEntry _tmp40_ = {0};
-	const gchar* _tmp41_ = NULL;
-	const gchar* _tmp42_ = NULL;
-	GtkActionEntry* _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	GtkActionEntry _tmp44_ = {0};
-	GtkActionEntry rotate_right = {0};
-	GtkActionEntry _tmp45_ = {0};
-	GtkActionEntry* _tmp46_ = NULL;
-	gint _tmp46__length1 = 0;
-	GtkActionEntry _tmp47_ = {0};
-	GtkActionEntry rotate_left = {0};
-	GtkActionEntry _tmp48_ = {0};
-	GtkActionEntry* _tmp49_ = NULL;
-	gint _tmp49__length1 = 0;
-	GtkActionEntry _tmp50_ = {0};
-	GtkActionEntry hflip = {0};
-	GtkActionEntry _tmp51_ = {0};
-	GtkActionEntry* _tmp52_ = NULL;
-	gint _tmp52__length1 = 0;
-	GtkActionEntry _tmp53_ = {0};
-	GtkActionEntry vflip = {0};
-	GtkActionEntry _tmp54_ = {0};
-	GtkActionEntry* _tmp55_ = NULL;
-	gint _tmp55__length1 = 0;
-	GtkActionEntry _tmp56_ = {0};
-	GtkActionEntry enhance = {0};
-	GtkActionEntry _tmp57_ = {0};
-	GtkActionEntry* _tmp58_ = NULL;
-	gint _tmp58__length1 = 0;
-	GtkActionEntry _tmp59_ = {0};
-	GtkActionEntry crop = {0};
-	GtkActionEntry _tmp60_ = {0};
-	GtkActionEntry* _tmp61_ = NULL;
-	gint _tmp61__length1 = 0;
-	GtkActionEntry _tmp62_ = {0};
-	GtkActionEntry straighten = {0};
-	GtkActionEntry _tmp63_ = {0};
-	GtkActionEntry* _tmp64_ = NULL;
-	gint _tmp64__length1 = 0;
-	GtkActionEntry _tmp65_ = {0};
-	GtkActionEntry red_eye = {0};
-	GtkActionEntry _tmp66_ = {0};
-	GtkActionEntry* _tmp67_ = NULL;
-	gint _tmp67__length1 = 0;
-	GtkActionEntry _tmp68_ = {0};
-	GtkActionEntry adjust = {0};
-	GtkActionEntry _tmp69_ = {0};
-	GtkActionEntry* _tmp70_ = NULL;
-	gint _tmp70__length1 = 0;
-	GtkActionEntry _tmp71_ = {0};
-	GtkActionEntry revert = {0};
-	GtkActionEntry _tmp72_ = {0};
-	GtkActionEntry* _tmp73_ = NULL;
-	gint _tmp73__length1 = 0;
-	GtkActionEntry _tmp74_ = {0};
-	GtkActionEntry adjust_date_time = {0};
-	GtkActionEntry _tmp75_ = {0};
-	GtkActionEntry* _tmp76_ = NULL;
-	gint _tmp76__length1 = 0;
-	GtkActionEntry _tmp77_ = {0};
-	GtkActionEntry set_background = {0};
-	GtkActionEntry _tmp78_ = {0};
-	GtkActionEntry* _tmp79_ = NULL;
-	gint _tmp79__length1 = 0;
-	GtkActionEntry _tmp80_ = {0};
-	GtkActionEntry view = {0};
-	GtkActionEntry _tmp81_ = {0};
-	const gchar* _tmp82_ = NULL;
-	GtkActionEntry* _tmp83_ = NULL;
-	gint _tmp83__length1 = 0;
-	GtkActionEntry _tmp84_ = {0};
-	GtkActionEntry help = {0};
-	GtkActionEntry _tmp85_ = {0};
-	const gchar* _tmp86_ = NULL;
-	GtkActionEntry* _tmp87_ = NULL;
-	gint _tmp87__length1 = 0;
-	GtkActionEntry _tmp88_ = {0};
-	GtkActionEntry increase_size = {0};
-	GtkActionEntry _tmp89_ = {0};
-	const gchar* _tmp90_ = NULL;
-	const gchar* _tmp91_ = NULL;
-	GtkActionEntry* _tmp92_ = NULL;
-	gint _tmp92__length1 = 0;
-	GtkActionEntry _tmp93_ = {0};
-	GtkActionEntry decrease_size = {0};
-	GtkActionEntry _tmp94_ = {0};
-	const gchar* _tmp95_ = NULL;
-	const gchar* _tmp96_ = NULL;
-	GtkActionEntry* _tmp97_ = NULL;
-	gint _tmp97__length1 = 0;
-	GtkActionEntry _tmp98_ = {0};
-	GtkActionEntry best_fit = {0};
-	GtkActionEntry _tmp99_ = {0};
-	const gchar* _tmp100_ = NULL;
-	const gchar* _tmp101_ = NULL;
-	GtkActionEntry* _tmp102_ = NULL;
-	gint _tmp102__length1 = 0;
-	GtkActionEntry _tmp103_ = {0};
-	GtkActionEntry actual_size = {0};
-	GtkActionEntry _tmp104_ = {0};
-	const gchar* _tmp105_ = NULL;
-	const gchar* _tmp106_ = NULL;
-	GtkActionEntry* _tmp107_ = NULL;
-	gint _tmp107__length1 = 0;
-	GtkActionEntry _tmp108_ = {0};
-	GtkActionEntry max_size = {0};
-	GtkActionEntry _tmp109_ = {0};
-	const gchar* _tmp110_ = NULL;
-	const gchar* _tmp111_ = NULL;
-	GtkActionEntry* _tmp112_ = NULL;
-	gint _tmp112__length1 = 0;
-	GtkActionEntry _tmp113_ = {0};
-	GtkActionEntry* _tmp114_ = NULL;
-	gint _tmp114__length1 = 0;
-#line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp1_ = PAGE_CLASS (direct_photo_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), &_tmp0_);
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	actions = _tmp1_;
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	actions_length1 = _tmp0_;
-#line 43 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_actions_size_ = actions_length1;
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp2_.name = "FileMenu";
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp2_.stock_id = NULL;
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp2_.accelerator = NULL;
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp2_.tooltip = NULL;
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp2_.callback = (GCallback) NULL;
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	file = _tmp2_;
-#line 46 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp3_ = _ ("_File");
-#line 46 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	file.label = _tmp3_;
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp4_ = actions;
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp4__length1 = actions_length1;
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp5_ = file;
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add91 (&actions, &actions_length1, &_actions_size_, &_tmp5_);
-#line 49 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp6_.name = "Save";
-#line 49 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp6_.stock_id = RESOURCES_SAVE_LABEL;
-#line 49 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp6_.label = TRANSLATABLE;
-#line 49 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp6_.accelerator = "<Ctrl>S";
-#line 49 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp6_.tooltip = TRANSLATABLE;
-#line 49 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp6_.callback = (GCallback) _direct_photo_page_on_save_gtk_action_callback;
-#line 49 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	save = _tmp6_;
-#line 51 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp7_ = _ ("_Save");
-#line 51 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	save.label = _tmp7_;
-#line 52 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp8_ = _ ("Save photo");
-#line 52 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	save.tooltip = _tmp8_;
-#line 53 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp9_ = actions;
-#line 53 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp9__length1 = actions_length1;
-#line 53 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp10_ = save;
-#line 53 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add92 (&actions, &actions_length1, &_actions_size_, &_tmp10_);
-#line 55 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp11_.name = "SaveAs";
-#line 55 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp11_.stock_id = RESOURCES_SAVE_AS_LABEL;
-#line 55 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp11_.label = TRANSLATABLE;
-#line 55 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp11_.accelerator = "<Ctrl><Shift>S";
-#line 55 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp11_.tooltip = TRANSLATABLE;
-#line 55 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp11_.callback = (GCallback) _direct_photo_page_on_save_as_gtk_action_callback;
-#line 55 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	save_as = _tmp11_;
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp12_ = _ ("Save _As…");
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	save_as.label = _tmp12_;
-#line 58 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp13_ = _ ("Save photo with a different name");
-#line 58 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	save_as.tooltip = _tmp13_;
-#line 59 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp14_ = actions;
-#line 59 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp14__length1 = actions_length1;
-#line 59 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp15_ = save_as;
-#line 59 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add93 (&actions, &actions_length1, &_actions_size_, &_tmp15_);
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp16_.name = "SendTo";
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp16_.stock_id = "document-send";
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp16_.label = TRANSLATABLE;
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp16_.accelerator = NULL;
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp16_.tooltip = TRANSLATABLE;
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp16_.callback = (GCallback) _direct_photo_page_on_send_to_gtk_action_callback;
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	send_to = _tmp16_;
-#line 63 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	send_to.label = RESOURCES_SEND_TO_MENU;
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp17_ = actions;
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp17__length1 = actions_length1;
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp18_ = send_to;
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add94 (&actions, &actions_length1, &_actions_size_, &_tmp18_);
-#line 66 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp19_.name = "Print";
-#line 66 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp19_.stock_id = RESOURCES_PRINT_LABEL;
-#line 66 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp19_.label = TRANSLATABLE;
-#line 66 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp19_.accelerator = "<Ctrl>P";
-#line 66 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp19_.tooltip = TRANSLATABLE;
-#line 66 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp19_.callback = (GCallback) _direct_photo_page_on_print_gtk_action_callback;
-#line 66 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	print = _tmp19_;
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
 #line 68 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	print.label = RESOURCES_PRINT_MENU;
-#line 69 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp20_ = _ ("Print the photo to a printer connected to your computer");
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 69 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	print.tooltip = _tmp20_;
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp21_ = actions;
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp21__length1 = actions_length1;
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp22_ = print;
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add95 (&actions, &actions_length1, &_actions_size_, &_tmp22_);
-#line 72 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp23_.name = "EditMenu";
-#line 72 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp23_.stock_id = NULL;
-#line 72 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp23_.label = TRANSLATABLE;
-#line 72 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp23_.accelerator = NULL;
-#line 72 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp23_.tooltip = NULL;
-#line 72 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp23_.callback = (GCallback) NULL;
-#line 72 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	edit = _tmp23_;
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp24_ = _ ("_Edit");
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	edit.label = _tmp24_;
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp25_ = actions;
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp25__length1 = actions_length1;
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp26_ = edit;
-#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add96 (&actions, &actions_length1, &_actions_size_, &_tmp26_);
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp27_.name = "PhotoMenu";
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp27_.stock_id = NULL;
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp27_.label = "";
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp27_.accelerator = NULL;
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp27_.tooltip = NULL;
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp27_.callback = (GCallback) NULL;
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	photo = _tmp27_;
-#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp28_ = _ ("_Photo");
-#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	photo.label = _tmp28_;
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp29_ = actions;
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp29__length1 = actions_length1;
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp30_ = photo;
-#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add97 (&actions, &actions_length1, &_actions_size_, &_tmp30_);
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp31_.name = "Tools";
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp31_.stock_id = NULL;
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp31_.label = TRANSLATABLE;
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp31_.accelerator = NULL;
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp31_.tooltip = NULL;
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp31_.callback = (GCallback) NULL;
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	tools = _tmp31_;
-#line 81 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp32_ = _ ("T_ools");
-#line 81 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	tools.label = _tmp32_;
-#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp33_ = actions;
-#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp33__length1 = actions_length1;
-#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp34_ = tools;
-#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add98 (&actions, &actions_length1, &_actions_size_, &_tmp34_);
-#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp35_.name = "PrevPhoto";
-#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp35_.stock_id = RESOURCES_PREVIOUS_LABEL;
-#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp35_.label = TRANSLATABLE;
-#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp35_.accelerator = NULL;
-#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp35_.tooltip = TRANSLATABLE;
-#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp35_.callback = (GCallback) _single_photo_page_on_previous_photo_gtk_action_callback;
-#line 84 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	prev = _tmp35_;
-#line 86 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp36_ = _ ("_Previous Photo");
-#line 86 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	prev.label = _tmp36_;
-#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp37_ = _ ("Previous Photo");
-#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	prev.tooltip = _tmp37_;
-#line 88 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp38_ = actions;
-#line 88 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp38__length1 = actions_length1;
-#line 88 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp39_ = prev;
-#line 88 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add99 (&actions, &actions_length1, &_actions_size_, &_tmp39_);
-#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp40_.name = "NextPhoto";
-#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp40_.stock_id = RESOURCES_NEXT_LABEL;
-#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp40_.label = TRANSLATABLE;
-#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp40_.accelerator = NULL;
-#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp40_.tooltip = TRANSLATABLE;
-#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp40_.callback = (GCallback) _single_photo_page_on_next_photo_gtk_action_callback;
-#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	next = _tmp40_;
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp41_ = _ ("_Next Photo");
-#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	next.label = _tmp41_;
-#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp42_ = _ ("Next Photo");
-#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	next.tooltip = _tmp42_;
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp43_ = actions;
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp43__length1 = actions_length1;
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp44_ = next;
-#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add100 (&actions, &actions_length1, &_actions_size_, &_tmp44_);
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp45_.name = "RotateClockwise";
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp45_.stock_id = RESOURCES_CLOCKWISE;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp45_.label = TRANSLATABLE;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp45_.accelerator = "<Ctrl>R";
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp45_.tooltip = TRANSLATABLE;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp45_.callback = (GCallback) _editing_host_page_on_rotate_clockwise_gtk_action_callback;
-#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	rotate_right = _tmp45_;
-#line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	rotate_right.label = RESOURCES_ROTATE_CW_MENU;
-#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	rotate_right.tooltip = RESOURCES_ROTATE_CCW_TOOLTIP;
-#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp46_ = actions;
-#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp46__length1 = actions_length1;
-#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp47_ = rotate_right;
-#line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add101 (&actions, &actions_length1, &_actions_size_, &_tmp47_);
-#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp48_.name = "RotateCounterclockwise";
-#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp48_.stock_id = RESOURCES_COUNTERCLOCKWISE;
-#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp48_.label = TRANSLATABLE;
-#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp48_.accelerator = "<Ctrl><Shift>R";
-#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp48_.tooltip = TRANSLATABLE;
-#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp48_.callback = (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_action_callback;
-#line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	rotate_left = _tmp48_;
-#line 104 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	rotate_left.label = RESOURCES_ROTATE_CCW_MENU;
-#line 105 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	rotate_left.tooltip = RESOURCES_ROTATE_CCW_TOOLTIP;
-#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp49_ = actions;
-#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp49__length1 = actions_length1;
-#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp50_ = rotate_left;
-#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add102 (&actions, &actions_length1, &_actions_size_, &_tmp50_);
-#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp51_.name = "FlipHorizontally";
-#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp51_.stock_id = RESOURCES_HFLIP;
-#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp51_.label = TRANSLATABLE;
-#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp51_.accelerator = NULL;
-#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp51_.tooltip = TRANSLATABLE;
-#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp51_.callback = (GCallback) _editing_host_page_on_flip_horizontally_gtk_action_callback;
-#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	hflip = _tmp51_;
-#line 110 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	hflip.label = RESOURCES_HFLIP_MENU;
-#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp52_ = actions;
-#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp52__length1 = actions_length1;
-#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp53_ = hflip;
-#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add103 (&actions, &actions_length1, &_actions_size_, &_tmp53_);
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp54_.name = "FlipVertically";
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp54_.stock_id = RESOURCES_VFLIP;
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp54_.label = TRANSLATABLE;
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp54_.accelerator = NULL;
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp54_.tooltip = TRANSLATABLE;
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp54_.callback = (GCallback) _editing_host_page_on_flip_vertically_gtk_action_callback;
-#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	vflip = _tmp54_;
-#line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	vflip.label = RESOURCES_VFLIP_MENU;
-#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp55_ = actions;
-#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp55__length1 = actions_length1;
-#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp56_ = vflip;
-#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add104 (&actions, &actions_length1, &_actions_size_, &_tmp56_);
-#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp57_.name = "Enhance";
-#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp57_.stock_id = RESOURCES_ENHANCE;
-#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp57_.label = TRANSLATABLE;
-#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp57_.accelerator = "<Ctrl>E";
-#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp57_.tooltip = TRANSLATABLE;
-#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp57_.callback = (GCallback) _editing_host_page_on_enhance_gtk_action_callback;
-#line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	enhance = _tmp57_;
-#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	enhance.label = RESOURCES_ENHANCE_MENU;
-#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	enhance.tooltip = RESOURCES_ENHANCE_TOOLTIP;
-#line 122 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp58_ = actions;
-#line 122 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp58__length1 = actions_length1;
-#line 122 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp59_ = enhance;
-#line 122 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add105 (&actions, &actions_length1, &_actions_size_, &_tmp59_);
-#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp60_.name = "Crop";
-#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp60_.stock_id = RESOURCES_CROP;
-#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp60_.label = TRANSLATABLE;
-#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp60_.accelerator = "<Ctrl>O";
-#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp60_.tooltip = TRANSLATABLE;
-#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp60_.callback = (GCallback) _editing_host_page_toggle_crop_gtk_action_callback;
-#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	crop = _tmp60_;
-#line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	crop.label = RESOURCES_CROP_MENU;
-#line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	crop.tooltip = RESOURCES_CROP_TOOLTIP;
-#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp61_ = actions;
-#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp61__length1 = actions_length1;
-#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp62_ = crop;
-#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add106 (&actions, &actions_length1, &_actions_size_, &_tmp62_);
-#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp63_.name = "Straighten";
-#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp63_.stock_id = RESOURCES_REFRESH_LABEL;
-#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp63_.label = TRANSLATABLE;
-#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp63_.accelerator = "<Ctrl>A";
-#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp63_.tooltip = TRANSLATABLE;
-#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp63_.callback = (GCallback) _editing_host_page_toggle_straighten_gtk_action_callback;
-#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	straighten = _tmp63_;
-#line 132 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	straighten.label = RESOURCES_STRAIGHTEN_MENU;
-#line 133 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	straighten.tooltip = RESOURCES_STRAIGHTEN_TOOLTIP;
-#line 134 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp64_ = actions;
-#line 134 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp64__length1 = actions_length1;
-#line 134 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp65_ = straighten;
-#line 134 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add107 (&actions, &actions_length1, &_actions_size_, &_tmp65_);
-#line 136 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp66_.name = "RedEye";
-#line 136 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp66_.stock_id = RESOURCES_REDEYE;
-#line 136 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp66_.label = TRANSLATABLE;
-#line 136 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp66_.accelerator = "<Ctrl>Y";
-#line 136 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp66_.tooltip = TRANSLATABLE;
-#line 136 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp66_.callback = (GCallback) _editing_host_page_toggle_redeye_gtk_action_callback;
-#line 136 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	red_eye = _tmp66_;
-#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	red_eye.label = RESOURCES_RED_EYE_MENU;
-#line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	red_eye.tooltip = RESOURCES_RED_EYE_TOOLTIP;
-#line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp67_ = actions;
-#line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp67__length1 = actions_length1;
-#line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp68_ = red_eye;
-#line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add108 (&actions, &actions_length1, &_actions_size_, &_tmp68_);
-#line 142 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp69_.name = "Adjust";
-#line 142 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp69_.stock_id = RESOURCES_ADJUST;
-#line 142 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp69_.label = TRANSLATABLE;
-#line 142 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp69_.accelerator = "<Ctrl>D";
-#line 142 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp69_.tooltip = TRANSLATABLE;
-#line 142 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp69_.callback = (GCallback) _editing_host_page_toggle_adjust_gtk_action_callback;
-#line 142 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	adjust = _tmp69_;
-#line 144 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	adjust.label = RESOURCES_ADJUST_MENU;
-#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	adjust.tooltip = RESOURCES_ADJUST_TOOLTIP;
-#line 146 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp70_ = actions;
-#line 146 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp70__length1 = actions_length1;
-#line 146 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp71_ = adjust;
-#line 146 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add109 (&actions, &actions_length1, &_actions_size_, &_tmp71_);
-#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp72_.name = "Revert";
-#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp72_.stock_id = RESOURCES_REVERT_LABEL;
-#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp72_.label = TRANSLATABLE;
-#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp72_.accelerator = NULL;
-#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp72_.tooltip = TRANSLATABLE;
-#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp72_.callback = (GCallback) _editing_host_page_on_revert_gtk_action_callback;
-#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	revert = _tmp72_;
-#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	revert.label = RESOURCES_REVERT_MENU;
-#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp73_ = actions;
-#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp73__length1 = actions_length1;
-#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp74_ = revert;
-#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add110 (&actions, &actions_length1, &_actions_size_, &_tmp74_);
-#line 153 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp75_.name = "AdjustDateTime";
-#line 153 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp75_.stock_id = NULL;
-#line 153 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp75_.label = TRANSLATABLE;
-#line 153 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp75_.accelerator = NULL;
-#line 153 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp75_.tooltip = TRANSLATABLE;
-#line 153 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp75_.callback = (GCallback) _editing_host_page_on_adjust_date_time_gtk_action_callback;
-#line 153 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	adjust_date_time = _tmp75_;
-#line 155 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	adjust_date_time.label = RESOURCES_ADJUST_DATE_TIME_MENU;
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp76_ = actions;
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp76__length1 = actions_length1;
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp77_ = adjust_date_time;
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add111 (&actions, &actions_length1, &_actions_size_, &_tmp77_);
-#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp78_.name = "SetBackground";
-#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp78_.stock_id = NULL;
-#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp78_.label = TRANSLATABLE;
-#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp78_.accelerator = "<Ctrl>B";
-#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp78_.tooltip = TRANSLATABLE;
-#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp78_.callback = (GCallback) _editing_host_page_on_set_background_gtk_action_callback;
-#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	set_background = _tmp78_;
-#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	set_background.label = RESOURCES_SET_BACKGROUND_MENU;
-#line 161 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	set_background.tooltip = RESOURCES_SET_BACKGROUND_TOOLTIP;
-#line 162 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp79_ = actions;
-#line 162 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp79__length1 = actions_length1;
-#line 162 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp80_ = set_background;
-#line 162 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add112 (&actions, &actions_length1, &_actions_size_, &_tmp80_);
-#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp81_.name = "ViewMenu";
-#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp81_.stock_id = NULL;
-#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp81_.label = TRANSLATABLE;
-#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp81_.accelerator = NULL;
-#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp81_.tooltip = NULL;
-#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp81_.callback = (GCallback) NULL;
-#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	view = _tmp81_;
-#line 165 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp82_ = _ ("_View");
-#line 165 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	view.label = _tmp82_;
-#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp83_ = actions;
-#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp83__length1 = actions_length1;
-#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp84_ = view;
-#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add113 (&actions, &actions_length1, &_actions_size_, &_tmp84_);
-#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp85_.name = "HelpMenu";
-#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp85_.stock_id = NULL;
-#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp85_.label = TRANSLATABLE;
-#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp85_.accelerator = NULL;
-#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp85_.tooltip = NULL;
-#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp85_.callback = (GCallback) NULL;
-#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	help = _tmp85_;
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp86_ = _ ("_Help");
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	help.label = _tmp86_;
-#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp87_ = actions;
-#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp87__length1 = actions_length1;
-#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp88_ = help;
-#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add114 (&actions, &actions_length1, &_actions_size_, &_tmp88_);
-#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp89_.name = "IncreaseSize";
-#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp89_.stock_id = RESOURCES_ZOOM_IN_LABEL;
-#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp89_.label = TRANSLATABLE;
-#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp89_.accelerator = "<Ctrl>plus";
-#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp89_.tooltip = TRANSLATABLE;
-#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp89_.callback = (GCallback) _editing_host_page_on_increase_size_gtk_action_callback;
-#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	increase_size = _tmp89_;
-#line 174 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp90_ = _ ("Zoom _In");
-#line 174 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	increase_size.label = _tmp90_;
-#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp91_ = _ ("Increase the magnification of the photo");
-#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	increase_size.tooltip = _tmp91_;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp92_ = actions;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp92__length1 = actions_length1;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp93_ = increase_size;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add115 (&actions, &actions_length1, &_actions_size_, &_tmp93_);
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp94_.name = "DecreaseSize";
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp94_.stock_id = RESOURCES_ZOOM_OUT_LABEL;
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp94_.label = TRANSLATABLE;
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp94_.accelerator = "<Ctrl>minus";
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp94_.tooltip = TRANSLATABLE;
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp94_.callback = (GCallback) _editing_host_page_on_decrease_size_gtk_action_callback;
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	decrease_size = _tmp94_;
-#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp95_ = _ ("Zoom _Out");
-#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	decrease_size.label = _tmp95_;
-#line 181 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp96_ = _ ("Decrease the magnification of the photo");
-#line 181 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	decrease_size.tooltip = _tmp96_;
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp97_ = actions;
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp97__length1 = actions_length1;
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp98_ = decrease_size;
-#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add116 (&actions, &actions_length1, &_actions_size_, &_tmp98_);
-#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp99_.name = "ZoomFit";
-#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp99_.stock_id = RESOURCES_ZOOM_FIT_LABEL;
-#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp99_.label = TRANSLATABLE;
-#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp99_.accelerator = "<Ctrl>0";
-#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp99_.tooltip = TRANSLATABLE;
-#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp99_.callback = (GCallback) _editing_host_page_snap_zoom_to_min_gtk_action_callback;
-#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	best_fit = _tmp99_;
-#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp100_ = _ ("Fit to _Page");
-#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	best_fit.label = _tmp100_;
-#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp101_ = _ ("Zoom the photo to fit on the screen");
-#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	best_fit.tooltip = _tmp101_;
-#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp102_ = actions;
-#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp102__length1 = actions_length1;
-#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp103_ = best_fit;
-#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add117 (&actions, &actions_length1, &_actions_size_, &_tmp103_);
-#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp104_.name = "Zoom100";
-#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp104_.stock_id = RESOURCES_ZOOM_100_LABEL;
-#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp104_.label = TRANSLATABLE;
-#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp104_.accelerator = "<Ctrl>1";
-#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp104_.tooltip = TRANSLATABLE;
-#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp104_.callback = (GCallback) _editing_host_page_snap_zoom_to_isomorphic_gtk_action_callback;
-#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	actual_size = _tmp104_;
-#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp105_ = _ ("Zoom _100%");
-#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	actual_size.label = _tmp105_;
-#line 195 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp106_ = _ ("Zoom the photo to 100% magnification");
-#line 195 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	actual_size.tooltip = _tmp106_;
-#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp107_ = actions;
-#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp107__length1 = actions_length1;
-#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp108_ = actual_size;
-#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add118 (&actions, &actions_length1, &_actions_size_, &_tmp108_);
-#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp109_.name = "Zoom200";
-#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp109_.stock_id = NULL;
-#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp109_.label = TRANSLATABLE;
-#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp109_.accelerator = "<Ctrl>2";
-#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp109_.tooltip = TRANSLATABLE;
-#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp109_.callback = (GCallback) _editing_host_page_snap_zoom_to_max_gtk_action_callback;
-#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	max_size = _tmp109_;
-#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp110_ = _ ("Zoom _200%");
-#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	max_size.label = _tmp110_;
-#line 203 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp111_ = _ ("Zoom the photo to 200% magnification");
-#line 203 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	max_size.tooltip = _tmp111_;
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp112_ = actions;
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp112__length1 = actions_length1;
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp113_ = max_size;
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add119 (&actions, &actions_length1, &_actions_size_, &_tmp113_);
-#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp114_ = actions;
-#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp114__length1 = actions_length1;
-#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	if (result_length1) {
-#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*result_length1 = _tmp114__length1;
-#line 2654 "DirectPhotoPage.c"
-	}
-#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	result = _tmp114_;
-#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	return result;
-#line 2660 "DirectPhotoPage.c"
+	PAGE_CLASS (direct_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page));
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp0_ = app_window_get_instance ();
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp1_ = _tmp0_;
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), DIRECT_PHOTO_PAGE_entries, G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries), self);
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_g_object_unref0 (_tmp1_);
+#line 1181 "DirectPhotoPage.c"
 }
 
 
 static gpointer _injection_group_ref0 (gpointer self) {
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 2667 "DirectPhotoPage.c"
+#line 1188 "DirectPhotoPage.c"
 }
 
 
-static void _vala_array_add120 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+static void _vala_array_add61 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2678 "DirectPhotoPage.c"
+#line 1199 "DirectPhotoPage.c"
 	}
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 2684 "DirectPhotoPage.c"
+#line 1205 "DirectPhotoPage.c"
 }
 
 
-static void _vala_array_add121 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+static void _vala_array_add62 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
+#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2695 "DirectPhotoPage.c"
+#line 1216 "DirectPhotoPage.c"
 	}
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 2701 "DirectPhotoPage.c"
+#line 1222 "DirectPhotoPage.c"
 }
 
 
@@ -2711,73 +1232,79 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 	gint _groups_size_ = 0;
 	InjectionGroup* print_group = NULL;
 	InjectionGroup* _tmp2_ = NULL;
-	InjectionGroup** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	InjectionGroup* _tmp4_ = NULL;
-	InjectionGroup* bg_group = NULL;
+	const gchar* _tmp3_ = NULL;
+	InjectionGroup** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
 	InjectionGroup* _tmp5_ = NULL;
-	InjectionGroup** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	InjectionGroup* _tmp7_ = NULL;
+	InjectionGroup* bg_group = NULL;
+	InjectionGroup* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
 	InjectionGroup** _tmp8_ = NULL;
 	gint _tmp8__length1 = 0;
-#line 209 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	InjectionGroup* _tmp9_ = NULL;
+	InjectionGroup** _tmp10_ = NULL;
+	gint _tmp10__length1 = 0;
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 210 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = PAGE_CLASS (direct_photo_page_parent_class)->init_collect_injection_groups (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), &_tmp0_);
-#line 210 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	groups = _tmp1_;
-#line 210 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	groups_length1 = _tmp0_;
-#line 210 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_groups_size_ = groups_length1;
-#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp2_ = injection_group_new ("/MenuBar/FileMenu/PrintPlaceholder");
-#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp2_ = injection_group_new ("PrintPlaceholder");
+#line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	print_group = _tmp2_;
-#line 213 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	injection_group_add_menu_item (print_group, "Print", NULL);
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp3_ = groups;
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp3__length1 = groups_length1;
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp4_ = _injection_group_ref0 (print_group);
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add120 (&groups, &groups_length1, &_groups_size_, _tmp4_);
-#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp5_ = injection_group_new ("/MenuBar/FileMenu/SetBackgroundPlaceholder");
-#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	bg_group = _tmp5_;
-#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	injection_group_add_menu_item (bg_group, "SetBackground", NULL);
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp6_ = groups;
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp6__length1 = groups_length1;
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp7_ = _injection_group_ref0 (bg_group);
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_vala_array_add121 (&groups, &groups_length1, &_groups_size_, _tmp7_);
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp3_ = _ ("_Print");
+#line 78 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	injection_group_add_menu_item (print_group, _tmp3_, "Print", "<Primary>p");
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp4_ = groups;
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp4__length1 = groups_length1;
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp5_ = _injection_group_ref0 (print_group);
+#line 80 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_vala_array_add61 (&groups, &groups_length1, &_groups_size_, _tmp5_);
+#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp6_ = injection_group_new ("SetBackgroundPlaceholder");
+#line 82 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	bg_group = _tmp6_;
+#line 83 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp7_ = _ ("Set as _Desktop Background");
+#line 83 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	injection_group_add_menu_item (bg_group, _tmp7_, "SetBackground", NULL);
+#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = groups;
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8__length1 = groups_length1;
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp9_ = _injection_group_ref0 (bg_group);
+#line 85 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_vala_array_add62 (&groups, &groups_length1, &_groups_size_, _tmp9_);
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp10_ = groups;
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp10__length1 = groups_length1;
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (result_length1) {
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-		*result_length1 = _tmp8__length1;
-#line 2771 "DirectPhotoPage.c"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		*result_length1 = _tmp10__length1;
+#line 1298 "DirectPhotoPage.c"
 	}
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	result = _tmp8_;
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	result = _tmp10_;
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_injection_group_unref0 (bg_group);
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_injection_group_unref0 (print_group);
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2781 "DirectPhotoPage.c"
+#line 1308 "DirectPhotoPage.c"
 }
 
 
@@ -2788,143 +1315,143 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 	gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 225 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = file;
-#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS);
-#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp2_);
-#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp4_) {
-#line 2808 "DirectPhotoPage.c"
+#line 1335 "DirectPhotoPage.c"
 		const gchar* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = _ ("%s does not exist.");
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = file;
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = g_file_get_path (_tmp6_);
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = g_strdup_printf (_tmp5_, _tmp8_);
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		app_window_error_message (_tmp10_, NULL);
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp10_);
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp8_);
-#line 2833 "DirectPhotoPage.c"
+#line 1360 "DirectPhotoPage.c"
 	} else {
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_ = FALSE;
-#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp11_ = file;
-#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp13_ = _tmp12_;
-#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = g_file_test (_tmp13_, G_FILE_TEST_IS_REGULAR);
-#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp15_ = !_tmp14_;
-#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp13_);
-#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp15_) {
-#line 2854 "DirectPhotoPage.c"
+#line 1381 "DirectPhotoPage.c"
 			const gchar* _tmp16_ = NULL;
 			GFile* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
 			gchar* _tmp19_ = NULL;
 			gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp16_ = _ ("%s is not a file.");
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp17_ = file;
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp18_ = g_file_get_path (_tmp17_);
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp19_ = _tmp18_;
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp20_ = g_strdup_printf (_tmp16_, _tmp19_);
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp21_ = _tmp20_;
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			app_window_error_message (_tmp21_, NULL);
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_free0 (_tmp21_);
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_free0 (_tmp19_);
-#line 2879 "DirectPhotoPage.c"
+#line 1406 "DirectPhotoPage.c"
 		} else {
 			GFile* _tmp22_ = NULL;
 			gboolean _tmp23_ = FALSE;
-#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp22_ = file;
-#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp23_ = photo_file_format_is_file_supported (_tmp22_);
-#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (!_tmp23_) {
-#line 2889 "DirectPhotoPage.c"
+#line 1416 "DirectPhotoPage.c"
 				const gchar* _tmp24_ = NULL;
 				GFile* _tmp25_ = NULL;
 				gchar* _tmp26_ = NULL;
 				gchar* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
 				gchar* _tmp29_ = NULL;
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp24_ = _ ("%s does not support the file format of\n%s.");
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp25_ = file;
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp26_ = g_file_get_path (_tmp25_);
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp27_ = _tmp26_;
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp28_ = g_strdup_printf (_tmp24_, RESOURCES_APP_TITLE, _tmp27_);
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp29_ = _tmp28_;
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				app_window_error_message (_tmp29_, NULL);
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp29_);
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp27_);
-#line 2914 "DirectPhotoPage.c"
+#line 1441 "DirectPhotoPage.c"
 			} else {
-#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				result = TRUE;
-#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				return result;
-#line 2920 "DirectPhotoPage.c"
+#line 1447 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = FALSE;
-#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2928 "DirectPhotoPage.c"
+#line 1455 "DirectPhotoPage.c"
 }
 
 
@@ -2935,36 +1462,36 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 	GFile* _tmp1_ = NULL;
 	DirectPhoto* _tmp2_ = NULL;
 	DirectPhoto* _tmp3_ = NULL;
-#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize != NULL) {
-#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget));
-#line 2945 "DirectPhotoPage.c"
+#line 1472 "DirectPhotoPage.c"
 	}
-#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = direct_photo_global;
-#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = self->priv->initial_file;
-#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = direct_photo_source_collection_get_file_source (_tmp0_, _tmp1_);
-#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	photo = _tmp2_;
-#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = photo;
-#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_ != NULL) {
-#line 2959 "DirectPhotoPage.c"
+#line 1486 "DirectPhotoPage.c"
 		DirectViewCollection* _tmp4_ = NULL;
 		DirectPhoto* _tmp5_ = NULL;
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = self->priv->view_controller;
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = photo;
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo));
-#line 2968 "DirectPhotoPage.c"
+#line 1495 "DirectPhotoPage.c"
 	} else {
 		const gchar* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
@@ -2972,40 +1499,40 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = _ ("Unable open photo %s. Sorry.");
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = self->priv->initial_file;
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = g_file_get_path (_tmp7_);
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = _tmp8_;
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = g_strdup_printf (_tmp6_, _tmp9_);
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		app_window_panic (_tmp11_);
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp11_);
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp9_);
-#line 2994 "DirectPhotoPage.c"
+#line 1521 "DirectPhotoPage.c"
 	}
-#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (self->priv->initial_file);
-#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self->priv->initial_file = NULL;
-#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 3002 "DirectPhotoPage.c"
+#line 1529 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, gboolean b, gpointer self) {
-#line 259 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_dphoto_can_rotate_changed ((DirectPhotoPage*) self, b);
-#line 3009 "DirectPhotoPage.c"
+#line 1536 "DirectPhotoPage.c"
 }
 
 
@@ -3019,81 +1546,81 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 	Photo* _tmp9_ = NULL;
 	DirectPhoto* _tmp10_ = NULL;
 	DirectPhoto* _tmp11_ = NULL;
-#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (new_photo));
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = _tmp1_ != NULL;
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp2_) {
-#line 3037 "DirectPhotoPage.c"
+#line 1564 "DirectPhotoPage.c"
 		DirectPhoto* tmp = NULL;
 		Photo* _tmp3_ = NULL;
 		DirectPhoto* _tmp4_ = NULL;
 		DirectPhoto* _tmp5_ = NULL;
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_DIRECT_PHOTO) ? ((DirectPhoto*) _tmp3_) : NULL;
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp4_ == NULL) {
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 3050 "DirectPhotoPage.c"
+#line 1577 "DirectPhotoPage.c"
 		}
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 121 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		tmp = _tmp4_;
-#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = tmp;
-#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 3058 "DirectPhotoPage.c"
+#line 1585 "DirectPhotoPage.c"
 			DirectPhoto* _tmp6_ = NULL;
 			guint _tmp7_ = 0U;
-#line 259 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = tmp;
-#line 259 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			g_signal_parse_name ("can-rotate-changed", TYPE_DIRECT_PHOTO, &_tmp7_, NULL, FALSE);
-#line 259 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 124 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self);
-#line 3067 "DirectPhotoPage.c"
+#line 1594 "DirectPhotoPage.c"
 		}
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (tmp);
-#line 3071 "DirectPhotoPage.c"
+#line 1598 "DirectPhotoPage.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = new_photo;
-#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_demand_load (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DIRECT_PHOTO, DirectPhoto));
-#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = new_photo;
-#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_DIRECT_PHOTO) ? ((DirectPhoto*) _tmp9_) : NULL);
-#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	tmp = _tmp10_;
-#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = tmp;
-#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp11_ != NULL) {
-#line 3087 "DirectPhotoPage.c"
+#line 1614 "DirectPhotoPage.c"
 		DirectPhoto* _tmp12_ = NULL;
-#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = tmp;
-#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_signal_connect_object (_tmp12_, "can-rotate-changed", (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self, 0);
-#line 3093 "DirectPhotoPage.c"
+#line 1620 "DirectPhotoPage.c"
 	}
-#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (tmp);
-#line 3097 "DirectPhotoPage.c"
+#line 1624 "DirectPhotoPage.c"
 }
 
 
@@ -3103,57 +1630,38 @@ GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) {
 	Photo* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 272 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), NULL);
-#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp3_;
-#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3123 "DirectPhotoPage.c"
+#line 1650 "DirectPhotoPage.c"
 }
 
 
 static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) {
 	DirectPhotoPage * self;
 	gboolean result = FALSE;
-	GtkMenu* context_menu = NULL;
-	GtkUIManager* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-	GtkMenu* _tmp2_ = NULL;
-	GdkEventButton* _tmp3_ = NULL;
-#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->ui;
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp1_ = gtk_ui_manager_get_widget (_tmp0_, "/DirectContextMenu");
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_menu_get_type (), GtkMenu));
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	context_menu = _tmp2_;
-#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp3_ = event;
-#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), context_menu, _tmp3_);
-#line 280 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = TRUE;
-#line 280 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_g_object_unref0 (context_menu);
-#line 280 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3157 "DirectPhotoPage.c"
+#line 1665 "DirectPhotoPage.c"
 }
 
 
@@ -3164,73 +1672,73 @@ static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage
 	gboolean _tmp4_ = FALSE;
 	ZoomState _tmp5_ = {0};
 	gboolean _tmp6_ = FALSE;
-#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 284 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 284 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 284 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp2_) {
-#line 3176 "DirectPhotoPage.c"
+#line 1684 "DirectPhotoPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 284 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 284 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 3182 "DirectPhotoPage.c"
+#line 1690 "DirectPhotoPage.c"
 	} else {
-#line 284 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 3186 "DirectPhotoPage.c"
+#line 1694 "DirectPhotoPage.c"
 	}
-#line 284 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
-#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = zoom_state_is_default (&_tmp5_);
-#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp6_) {
-#line 3196 "DirectPhotoPage.c"
+#line 1704 "DirectPhotoPage.c"
 		gboolean _tmp7_ = FALSE;
-#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = !_tmp7_;
-#line 3202 "DirectPhotoPage.c"
+#line 1710 "DirectPhotoPage.c"
 	} else {
-#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 3206 "DirectPhotoPage.c"
+#line 1714 "DirectPhotoPage.c"
 	}
-#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 3210 "DirectPhotoPage.c"
+#line 1718 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_real_on_increase_size (EditingHostPage* base) {
 	DirectPhotoPage * self;
-#line 288 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 291 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 3222 "DirectPhotoPage.c"
+#line 1730 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	DirectPhotoPage * self;
-#line 294 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 159 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 162 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 3234 "DirectPhotoPage.c"
+#line 1742 "DirectPhotoPage.c"
 }
 
 
@@ -3244,24 +1752,24 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 	gboolean _tmp19_ = FALSE;
 	gboolean _tmp20_ = FALSE;
 	gboolean _tmp25_ = FALSE;
-#line 300 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 165 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 300 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 165 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 301 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	contains = FALSE;
-#line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 3258 "DirectPhotoPage.c"
+#line 1766 "DirectPhotoPage.c"
 		Photo* photo = NULL;
 		Photo* _tmp1_ = NULL;
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo = _tmp1_;
-#line 3265 "DirectPhotoPage.c"
+#line 1773 "DirectPhotoPage.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeMap* _tmp2_ = NULL;
@@ -3270,25 +1778,25 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 			GeeSet* _tmp5_ = NULL;
 			GeeIterator* _tmp6_ = NULL;
 			GeeIterator* _tmp7_ = NULL;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp2_ = map;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp3_ = gee_map_get_keys (_tmp2_);
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp4_ = _tmp3_;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp5_ = _tmp4_;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp7_ = _tmp6_;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_tmp5_);
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_object_it = _tmp7_;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			while (TRUE) {
-#line 3292 "DirectPhotoPage.c"
+#line 1800 "DirectPhotoPage.c"
 				GeeIterator* _tmp8_ = NULL;
 				gboolean _tmp9_ = FALSE;
 				DataObject* object = NULL;
@@ -3296,129 +1804,129 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 				gpointer _tmp11_ = NULL;
 				DataObject* _tmp12_ = NULL;
 				Photo* _tmp13_ = NULL;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp8_ = _object_it;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp9_ = gee_iterator_next (_tmp8_);
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				if (!_tmp9_) {
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					break;
-#line 3308 "DirectPhotoPage.c"
+#line 1816 "DirectPhotoPage.c"
 				}
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp10_ = _object_it;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp11_ = gee_iterator_get (_tmp10_);
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				object = (DataObject*) _tmp11_;
-#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp12_ = object;
-#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp13_ = photo;
-#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 170 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				if (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo) == _tmp13_) {
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					contains = TRUE;
-#line 308 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					_g_object_unref0 (object);
-#line 308 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					break;
-#line 3328 "DirectPhotoPage.c"
+#line 1836 "DirectPhotoPage.c"
 				}
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (object);
-#line 3332 "DirectPhotoPage.c"
+#line 1840 "DirectPhotoPage.c"
 			}
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_object_it);
-#line 3336 "DirectPhotoPage.c"
+#line 1844 "DirectPhotoPage.c"
 		}
-#line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 3340 "DirectPhotoPage.c"
+#line 1848 "DirectPhotoPage.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp15_) {
-#line 3346 "DirectPhotoPage.c"
+#line 1854 "DirectPhotoPage.c"
 		gboolean _tmp16_ = FALSE;
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp16_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = !_tmp16_;
-#line 3352 "DirectPhotoPage.c"
+#line 1860 "DirectPhotoPage.c"
 	} else {
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 3356 "DirectPhotoPage.c"
+#line 1864 "DirectPhotoPage.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	sensitive = _tmp14_;
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = sensitive;
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp17_) {
-#line 3364 "DirectPhotoPage.c"
+#line 1872 "DirectPhotoPage.c"
 		gboolean _tmp18_ = FALSE;
-#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp18_ = contains;
-#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		sensitive = _tmp18_;
-#line 3370 "DirectPhotoPage.c"
+#line 1878 "DirectPhotoPage.c"
 	}
-#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = sensitive;
-#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp20_) {
-#line 3376 "DirectPhotoPage.c"
+#line 1884 "DirectPhotoPage.c"
 		Photo* _tmp21_ = NULL;
 		Photo* _tmp22_ = NULL;
 		PhotoFileFormat _tmp23_ = 0;
 		gboolean _tmp24_ = FALSE;
-#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp23_ = photo_get_file_format (_tmp22_);
-#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp24_ = photo_file_format_can_write (_tmp23_);
-#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = _tmp24_;
-#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp22_);
-#line 3393 "DirectPhotoPage.c"
+#line 1901 "DirectPhotoPage.c"
 	} else {
-#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = FALSE;
-#line 3397 "DirectPhotoPage.c"
+#line 1905 "DirectPhotoPage.c"
 	}
-#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp19_);
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = sensitive;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp25_);
-#line 3405 "DirectPhotoPage.c"
+#line 1913 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self) {
 	CommandManager* _tmp0_ = NULL;
 	CommandManager* _tmp1_ = NULL;
-#line 321 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 328 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 328 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 328 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	command_manager_reset (_tmp1_);
-#line 328 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 3422 "DirectPhotoPage.c"
+#line 1930 "DirectPhotoPage.c"
 }
 
 
@@ -3431,51 +1939,51 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G
 	FullscreenWindow* _tmp2_ = NULL;
 	GdkEventButton* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW) ? ((FullscreenWindow*) _tmp0_) : NULL;
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 3447 "DirectPhotoPage.c"
+#line 1955 "DirectPhotoPage.c"
 	}
-#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	fs = _tmp1_;
-#line 333 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = fs;
-#line 333 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 3455 "DirectPhotoPage.c"
+#line 1963 "DirectPhotoPage.c"
 		FullscreenWindow* _tmp3_ = NULL;
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = fs;
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		fullscreen_window_close (_tmp3_);
-#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (fs);
-#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 3467 "DirectPhotoPage.c"
+#line 1975 "DirectPhotoPage.c"
 	}
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = event;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_double_click (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp4_);
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp5_;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (fs);
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3479 "DirectPhotoPage.c"
+#line 1987 "DirectPhotoPage.c"
 }
 
 
@@ -3511,135 +2019,135 @@ static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean mi
 	gboolean _tmp26_ = FALSE;
 	gboolean _tmp27_ = FALSE;
 	gboolean _tmp29_ = FALSE;
-#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = missing;
-#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	sensitivity = !_tmp0_;
-#line 345 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = sensitivity;
-#line 345 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp1_);
-#line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = sensitivity;
-#line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SaveAs", _tmp2_);
-#line 347 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = sensitivity;
-#line 347 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp3_);
-#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 213 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = sensitivity;
-#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 213 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp4_);
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = sensitivity;
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp5_);
-#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = sensitivity;
-#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", _tmp6_);
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = sensitivity;
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonUndo", _tmp7_);
-#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = sensitivity;
-#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", _tmp8_);
-#line 355 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = sensitivity;
-#line 355 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp9_);
-#line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp10_ = sensitivity;
-#line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 221 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp10_);
-#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = sensitivity;
-#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit", _tmp11_);
-#line 358 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp12_ = sensitivity;
-#line 358 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100", _tmp12_);
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 224 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = sensitivity;
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 224 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", _tmp13_);
-#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = sensitivity;
-#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp14_);
-#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = sensitivity;
-#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp15_);
-#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = sensitivity;
-#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp16_);
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = sensitivity;
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp17_);
-#line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = sensitivity;
-#line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp18_);
-#line 366 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = sensitivity;
-#line 366 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp19_);
-#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = sensitivity;
-#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Straighten", _tmp20_);
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp21_ = sensitivity;
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp21_);
-#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = sensitivity;
-#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", _tmp22_);
-#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = sensitivity;
-#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp23_);
-#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = sensitivity;
-#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp24_);
-#line 372 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = sensitivity;
-#line 372 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Fullscreen", _tmp25_);
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp27_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp27_) {
-#line 3625 "DirectPhotoPage.c"
+#line 2133 "DirectPhotoPage.c"
 		gboolean _tmp28_ = FALSE;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp28_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = !_tmp28_;
-#line 3631 "DirectPhotoPage.c"
+#line 2139 "DirectPhotoPage.c"
 	} else {
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = FALSE;
-#line 3635 "DirectPhotoPage.c"
+#line 2143 "DirectPhotoPage.c"
 	}
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp26_);
-#line 376 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp29_ = missing;
-#line 376 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp29_);
-#line 3643 "DirectPhotoPage.c"
+#line 2151 "DirectPhotoPage.c"
 }
 
 
@@ -3674,157 +2182,157 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 	gboolean _tmp42_ = FALSE;
 	gint _tmp46_ = 0;
 	gint _tmp47_ = 0;
-#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_ > 1;
-#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	multiple = _tmp3_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_) {
-#line 3696 "DirectPhotoPage.c"
+#line 2204 "DirectPhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = photo_has_transformations (_tmp8_);
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp10_) {
-#line 3714 "DirectPhotoPage.c"
+#line 2222 "DirectPhotoPage.c"
 			gboolean _tmp11_ = FALSE;
-#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp11_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = !_tmp11_;
-#line 3720 "DirectPhotoPage.c"
+#line 2228 "DirectPhotoPage.c"
 		} else {
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = FALSE;
-#line 3724 "DirectPhotoPage.c"
+#line 2232 "DirectPhotoPage.c"
 		}
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = _tmp6_;
-#line 3728 "DirectPhotoPage.c"
+#line 2236 "DirectPhotoPage.c"
 	} else {
-#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 3732 "DirectPhotoPage.c"
+#line 2240 "DirectPhotoPage.c"
 	}
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	revert_possible = _tmp4_;
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp13_) {
-#line 3740 "DirectPhotoPage.c"
+#line 2248 "DirectPhotoPage.c"
 		Photo* _tmp14_ = NULL;
 		Photo* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp15_ = _tmp14_;
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp16_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp15_);
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = _tmp16_;
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 3754 "DirectPhotoPage.c"
+#line 2262 "DirectPhotoPage.c"
 	} else {
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 3758 "DirectPhotoPage.c"
+#line 2266 "DirectPhotoPage.c"
 	}
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	rotate_possible = _tmp12_;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp18_) {
-#line 3766 "DirectPhotoPage.c"
+#line 2274 "DirectPhotoPage.c"
 		Photo* _tmp19_ = NULL;
 		Photo* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp21_ = editing_host_page_is_enhance_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp20_);
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = _tmp21_;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 3780 "DirectPhotoPage.c"
+#line 2288 "DirectPhotoPage.c"
 	} else {
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = FALSE;
-#line 3784 "DirectPhotoPage.c"
+#line 2292 "DirectPhotoPage.c"
 	}
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	enhance_possible = _tmp17_;
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = multiple;
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp22_);
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = multiple;
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp23_);
-#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = rotate_possible;
-#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp24_);
-#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = rotate_possible;
-#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp25_);
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp26_ = rotate_possible;
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp26_);
-#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp27_ = rotate_possible;
-#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp27_);
-#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp28_ = revert_possible;
-#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp28_);
-#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp29_ = enhance_possible;
-#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp29_);
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp30_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp30_);
-#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp31_) {
-#line 3828 "DirectPhotoPage.c"
+#line 2336 "DirectPhotoPage.c"
 		Photo* _tmp32_ = NULL;
 		Photo* _tmp33_ = NULL;
 		Scaling _tmp34_ = {0};
@@ -3833,69 +2341,69 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 		Photo* _tmp37_ = NULL;
 		Scaling _tmp38_ = {0};
 		gboolean _tmp39_ = FALSE;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp32_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp33_ = _tmp32_;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		scaling_for_original (&_tmp34_);
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp35_ = editing_tools_crop_tool_is_available (_tmp33_, &_tmp34_);
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp35_);
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp33_);
-#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp37_ = _tmp36_;
-#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		scaling_for_original (&_tmp38_);
-#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp39_ = editing_tools_redeye_tool_is_available (_tmp37_, &_tmp38_);
-#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp39_);
-#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 3861 "DirectPhotoPage.c"
+#line 2369 "DirectPhotoPage.c"
 	}
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp40_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp41_ = _tmp40_;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp42_ = _tmp41_ != NULL;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp41_);
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp42_) {
-#line 3873 "DirectPhotoPage.c"
+#line 2381 "DirectPhotoPage.c"
 		Photo* _tmp43_ = NULL;
 		Photo* _tmp44_ = NULL;
 		PhotoFileFormat _tmp45_ = 0;
-#line 406 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp43_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 406 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp44_ = _tmp43_;
-#line 406 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp45_ = photo_get_file_format (_tmp44_);
-#line 406 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp45_ != PHOTO_FILE_FORMAT_RAW);
-#line 406 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp44_);
-#line 3887 "DirectPhotoPage.c"
+#line 2395 "DirectPhotoPage.c"
 	} else {
-#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", FALSE);
-#line 3891 "DirectPhotoPage.c"
+#line 2399 "DirectPhotoPage.c"
 	}
-#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp46_ = selected_count;
-#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp47_ = count;
-#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	PAGE_CLASS (direct_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp46_, _tmp47_);
-#line 3899 "DirectPhotoPage.c"
+#line 2407 "DirectPhotoPage.c"
 }
 
 
@@ -3927,216 +2435,216 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self
 	GtkResponseType _tmp23_ = 0;
 	GtkResponseType _tmp24_ = 0;
 	GtkResponseType _tmp25_ = 0;
-#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE);
-#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail ((photo == NULL) || IS_PHOTO (photo), FALSE);
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = photo;
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 3943 "DirectPhotoPage.c"
+#line 2451 "DirectPhotoPage.c"
 	}
-#line 420 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = photo;
-#line 420 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = photo_has_alterations (_tmp1_);
-#line 420 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp2_) {
-#line 421 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 421 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 3955 "DirectPhotoPage.c"
+#line 2463 "DirectPhotoPage.c"
 	}
-#line 423 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = self->priv->drop_if_dirty;
-#line 423 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_) {
-#line 3961 "DirectPhotoPage.c"
+#line 2469 "DirectPhotoPage.c"
 		Photo* _tmp4_ = NULL;
-#line 426 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = photo;
-#line 426 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo_remove_all_transformations (_tmp4_);
-#line 428 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 428 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 3971 "DirectPhotoPage.c"
+#line 2479 "DirectPhotoPage.c"
 	}
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = photo_get_file_format (_tmp6_);
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = photo_file_format_can_write (_tmp7_);
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	is_writeable = _tmp9_;
-#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = is_writeable;
-#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp11_) {
-#line 3991 "DirectPhotoPage.c"
+#line 2499 "DirectPhotoPage.c"
 		const gchar* _tmp12_ = NULL;
-#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = _ ("_Save");
-#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp12_;
-#line 3997 "DirectPhotoPage.c"
+#line 2505 "DirectPhotoPage.c"
 	} else {
 		const gchar* _tmp13_ = NULL;
-#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp13_ = _ ("_Save a Copy");
-#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp13_;
-#line 4004 "DirectPhotoPage.c"
+#line 2512 "DirectPhotoPage.c"
 	}
-#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = g_strdup (_tmp10_);
-#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 297 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	save_option = _tmp14_;
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = _ ("Lose changes to %s?");
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = photo;
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = _tmp17_;
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = g_strdup_printf (_tmp15_, _tmp18_);
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = _tmp19_;
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp21_ = save_option;
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = _ ("Close _without Saving");
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = app_window_negate_affirm_cancel_question (_tmp20_, _tmp21_, _tmp22_, NULL, NULL);
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = _tmp23_;
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp20_);
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp18_);
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	response = _tmp24_;
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = response;
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp25_ == GTK_RESPONSE_YES) {
-#line 4040 "DirectPhotoPage.c"
+#line 2548 "DirectPhotoPage.c"
 		Photo* _tmp26_ = NULL;
-#line 439 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = photo;
-#line 439 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo_remove_all_transformations (_tmp26_);
-#line 4046 "DirectPhotoPage.c"
+#line 2554 "DirectPhotoPage.c"
 	} else {
 		GtkResponseType _tmp27_ = 0;
-#line 440 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp27_ = response;
-#line 440 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp27_ == GTK_RESPONSE_NO) {
-#line 4053 "DirectPhotoPage.c"
+#line 2561 "DirectPhotoPage.c"
 			gboolean _tmp28_ = FALSE;
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp28_ = is_writeable;
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp28_) {
-#line 4059 "DirectPhotoPage.c"
+#line 2567 "DirectPhotoPage.c"
 				Photo* _tmp29_ = NULL;
 				GFile* _tmp30_ = NULL;
 				GFile* _tmp31_ = NULL;
 				Photo* _tmp32_ = NULL;
 				Photo* _tmp33_ = NULL;
 				PhotoFileFormat _tmp34_ = 0;
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp29_ = photo;
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp30_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp31_ = _tmp30_;
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp32_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp33_ = _tmp32_;
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp34_ = photo_get_file_format (_tmp33_);
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				direct_photo_page_save (self, _tmp31_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp34_, FALSE, TRUE);
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (_tmp33_);
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (_tmp31_);
-#line 4084 "DirectPhotoPage.c"
+#line 2592 "DirectPhotoPage.c"
 			} else {
-#line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				direct_photo_page_on_save_as (self);
-#line 4088 "DirectPhotoPage.c"
+#line 2596 "DirectPhotoPage.c"
 			}
 		} else {
 			gboolean _tmp35_ = FALSE;
 			gboolean _tmp36_ = FALSE;
 			GtkResponseType _tmp37_ = 0;
-#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp37_ = response;
-#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp37_ == GTK_RESPONSE_CANCEL) {
-#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp36_ = TRUE;
-#line 4100 "DirectPhotoPage.c"
+#line 2608 "DirectPhotoPage.c"
 			} else {
 				GtkResponseType _tmp38_ = 0;
-#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp38_ = response;
-#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp36_ = _tmp38_ == GTK_RESPONSE_DELETE_EVENT;
-#line 4107 "DirectPhotoPage.c"
+#line 2615 "DirectPhotoPage.c"
 			}
-#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp36_) {
-#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp35_ = TRUE;
-#line 4113 "DirectPhotoPage.c"
+#line 2621 "DirectPhotoPage.c"
 			} else {
 				GtkResponseType _tmp39_ = 0;
-#line 447 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp39_ = response;
-#line 447 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp35_ = _tmp39_ == GTK_RESPONSE_CLOSE;
-#line 4120 "DirectPhotoPage.c"
+#line 2628 "DirectPhotoPage.c"
 			}
-#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp35_) {
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				result = FALSE;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (save_option);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				return result;
-#line 4130 "DirectPhotoPage.c"
+#line 2638 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 451 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = TRUE;
-#line 451 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (save_option);
-#line 451 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 4140 "DirectPhotoPage.c"
+#line 2648 "DirectPhotoPage.c"
 }
 
 
@@ -4146,23 +2654,23 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self) {
 	Photo* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 454 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 319 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE);
-#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = direct_photo_page_check_ok_to_close_photo (self, _tmp1_);
-#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp3_;
-#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 4166 "DirectPhotoPage.c"
+#line 2674 "DirectPhotoPage.c"
 }
 
 
@@ -4171,36 +2679,36 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	Photo* _tmp1_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 458 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail ((old_photo == NULL) || IS_PHOTO (old_photo), FALSE);
-#line 458 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (new_photo), FALSE);
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = old_photo;
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 4185 "DirectPhotoPage.c"
+#line 2693 "DirectPhotoPage.c"
 		Photo* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp2_ = old_photo;
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = direct_photo_page_check_ok_to_close_photo (self, _tmp2_);
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = _tmp3_;
-#line 4194 "DirectPhotoPage.c"
+#line 2702 "DirectPhotoPage.c"
 	} else {
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 4198 "DirectPhotoPage.c"
+#line 2706 "DirectPhotoPage.c"
 	}
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp0_;
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 4204 "DirectPhotoPage.c"
+#line 2712 "DirectPhotoPage.c"
 }
 
 
@@ -4225,19 +2733,19 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 	DirectViewCollection* _tmp30_ = NULL;
 	DirectPhoto* _tmp31_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (G_IS_FILE (dest));
-#line 464 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = constraint;
-#line 464 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = scale;
-#line 464 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scaling_for_constraint (_tmp0_, _tmp1_, FALSE, &_tmp2_);
-#line 464 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scaling = _tmp2_;
-#line 4241 "DirectPhotoPage.c"
+#line 2749 "DirectPhotoPage.c"
 	{
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
@@ -4247,34 +2755,34 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		PhotoFileFormat _tmp8_ = 0;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = dest;
-#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = scaling;
-#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = quality;
-#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = format;
-#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = copy_unmodified;
-#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = save_metadata;
-#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo_export (_tmp4_, _tmp5_, &_tmp6_, _tmp7_, _tmp8_, _tmp9_, _tmp10_, &_inner_error_);
-#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4273 "DirectPhotoPage.c"
-			goto __catch46_g_error;
+#line 2781 "DirectPhotoPage.c"
+			goto __catch45_g_error;
 		}
 	}
-	goto __finally46;
-	__catch46_g_error:
+	goto __finally45;
+	__catch45_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp11_ = NULL;
@@ -4285,92 +2793,92 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		const gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
-#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		err = _inner_error_;
-#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_inner_error_ = NULL;
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp11_ = _ ("Error while saving to %s: %s");
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = dest;
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp13_ = g_file_get_path (_tmp12_);
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp15_ = err;
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp16_ = _tmp15_->message;
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = g_strdup_printf (_tmp11_, _tmp14_, _tmp16_);
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		app_window_error_message (_tmp18_, NULL);
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp18_);
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp14_);
-#line 472 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_error_free0 (err);
-#line 472 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 337 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 4319 "DirectPhotoPage.c"
+#line 2827 "DirectPhotoPage.c"
 	}
-	__finally46:
-#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	__finally45:
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 4330 "DirectPhotoPage.c"
+#line 2838 "DirectPhotoPage.c"
 	}
-#line 477 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = direct_photo_global;
-#line 477 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = dest;
-#line 477 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = direct_photo_source_collection_fetch (_tmp19_, _tmp20_, &_tmp21_, TRUE);
-#line 477 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 477 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	photo = _tmp21_;
-#line 477 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = _tmp22_;
-#line 477 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp23_);
-#line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = photo;
-#line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = direct_view_new (_tmp24_);
-#line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	tmp_view = _tmp25_;
-#line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp26_ = self->priv->view_controller;
-#line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp27_ = tmp_view;
-#line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_OBJECT, DataObject));
-#line 482 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp28_ = direct_photo_global;
-#line 482 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp29_ = photo;
-#line 482 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_source_collection_reimport_photo (_tmp28_, _tmp29_);
-#line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp30_ = self->priv->view_controller;
-#line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp31_ = photo;
-#line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO, Photo));
-#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (tmp_view);
-#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 4374 "DirectPhotoPage.c"
+#line 2882 "DirectPhotoPage.c"
 }
 
 
@@ -4388,84 +2896,84 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) {
 	Photo* _tmp15_ = NULL;
 	Photo* _tmp16_ = NULL;
 	PhotoFileFormat _tmp17_ = 0;
-#line 486 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = photo_has_alterations (_tmp3_);
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = !_tmp4_;
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_) {
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 4408 "DirectPhotoPage.c"
+#line 2916 "DirectPhotoPage.c"
 	} else {
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		PhotoFileFormat _tmp8_ = 0;
 		gboolean _tmp9_ = FALSE;
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = photo_get_file_format (_tmp7_);
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = photo_file_format_can_write (_tmp8_);
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = !_tmp9_;
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4426 "DirectPhotoPage.c"
+#line 2934 "DirectPhotoPage.c"
 	}
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_) {
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 4432 "DirectPhotoPage.c"
+#line 2940 "DirectPhotoPage.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
-#line 488 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 488 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = _tmp10_;
-#line 4439 "DirectPhotoPage.c"
+#line 2947 "DirectPhotoPage.c"
 	}
-#line 487 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 489 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 4445 "DirectPhotoPage.c"
+#line 2953 "DirectPhotoPage.c"
 	}
-#line 492 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 492 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 492 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 492 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 492 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 492 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 492 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = photo_get_file_format (_tmp16_);
-#line 492 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_save (self, _tmp14_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp17_, FALSE, TRUE);
-#line 492 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 492 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp14_);
-#line 492 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 4469 "DirectPhotoPage.c"
+#line 2977 "DirectPhotoPage.c"
 }
 
 
@@ -4530,114 +3038,114 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 	gint _tmp54_ = 0;
 	gint _tmp55_ = 0;
 	GtkFileChooserDialog* _tmp74_ = NULL;
-#line 496 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 497 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = _ ("Save As");
-#line 497 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = export_dialog_new (_tmp0_);
-#line 497 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_object_ref_sink (_tmp1_);
-#line 497 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 362 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	export_dialog = _tmp1_;
-#line 501 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 366 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	export_format_parameters_last (&_tmp2_);
-#line 501 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 366 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	export_params = _tmp2_;
-#line 502 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = export_dialog;
-#line 502 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = export_dialog_execute (_tmp3_, &_tmp4_, &_tmp5_, &export_params);
-#line 502 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scale = _tmp4_;
-#line 502 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	constraint = _tmp5_;
-#line 502 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 367 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp6_) {
-#line 503 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 503 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 4562 "DirectPhotoPage.c"
+#line 3070 "DirectPhotoPage.c"
 	}
-#line 505 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 505 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 505 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = export_params;
-#line 505 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp10_ = photo_get_export_basename_for_parameters (_tmp8_, &_tmp9_);
-#line 505 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = _tmp10_;
-#line 505 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 505 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 370 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	filename = _tmp11_;
-#line 506 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 506 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = _tmp12_;
-#line 506 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = export_params;
-#line 506 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = photo_get_export_format_for_parameters (_tmp13_, &_tmp14_);
-#line 506 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 506 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp13_);
-#line 506 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 371 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	effective_export_format = _tmp16_;
-#line 509 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = effective_export_format;
-#line 509 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = photo_file_format_get_properties (_tmp17_);
-#line 509 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 509 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp21_ = photo_file_format_properties_get_known_extensions (_tmp19_, &_tmp20_);
-#line 509 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = _tmp21_;
-#line 509 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22__length1 = _tmp20_;
-#line 509 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_photo_file_format_properties_unref0 (_tmp19_);
-#line 509 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_extensions = _tmp22_;
-#line 509 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_extensions_length1 = _tmp22__length1;
-#line 509 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_output_format_extensions_size_ = output_format_extensions_length1;
-#line 511 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 376 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = gtk_file_filter_new ();
-#line 511 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 376 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_object_ref_sink (_tmp23_);
-#line 511 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 376 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_filter = _tmp23_;
-#line 512 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = output_format_extensions;
-#line 512 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24__length1 = output_format_extensions_length1;
-#line 4622 "DirectPhotoPage.c"
+#line 3130 "DirectPhotoPage.c"
 	{
 		gchar** extension_collection = NULL;
 		gint extension_collection_length1 = 0;
 		gint _extension_collection_size_ = 0;
 		gint extension_it = 0;
-#line 512 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		extension_collection = _tmp24_;
-#line 512 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		extension_collection_length1 = _tmp24__length1;
-#line 512 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		for (extension_it = 0; extension_it < _tmp24__length1; extension_it = extension_it + 1) {
-#line 4634 "DirectPhotoPage.c"
+#line 3142 "DirectPhotoPage.c"
 			gchar* _tmp25_ = NULL;
 			gchar* extension = NULL;
-#line 512 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp25_ = g_strdup (extension_collection[extension_it]);
-#line 512 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			extension = _tmp25_;
-#line 4641 "DirectPhotoPage.c"
+#line 3149 "DirectPhotoPage.c"
 			{
 				gchar* uppercase_extension = NULL;
 				const gchar* _tmp26_ = NULL;
@@ -4650,109 +3158,109 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 				const gchar* _tmp33_ = NULL;
 				gchar* _tmp34_ = NULL;
 				gchar* _tmp35_ = NULL;
-#line 513 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp26_ = extension;
-#line 513 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp27_ = g_utf8_strup (_tmp26_, (gssize) -1);
-#line 513 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				uppercase_extension = _tmp27_;
-#line 514 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp28_ = output_format_filter;
-#line 514 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp29_ = extension;
-#line 514 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp30_ = g_strconcat ("*.", _tmp29_, NULL);
-#line 514 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp31_ = _tmp30_;
-#line 514 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				gtk_file_filter_add_pattern (_tmp28_, _tmp31_);
-#line 514 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp31_);
-#line 515 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp32_ = output_format_filter;
-#line 515 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp33_ = uppercase_extension;
-#line 515 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp34_ = g_strconcat ("*.", _tmp33_, NULL);
-#line 515 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp35_ = _tmp34_;
-#line 515 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				gtk_file_filter_add_pattern (_tmp32_, _tmp35_);
-#line 515 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 380 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp35_);
-#line 512 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (uppercase_extension);
-#line 512 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (extension);
-#line 4688 "DirectPhotoPage.c"
+#line 3196 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 518 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp36_ = _ ("Save As");
-#line 518 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp37_ = app_window_get_instance ();
-#line 518 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp38_ = _tmp37_;
-#line 518 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp39_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 518 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_object_ref_sink (_tmp39_);
-#line 518 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp40_ = _tmp39_;
-#line 518 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp38_);
-#line 518 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	save_as_dialog = _tmp40_;
-#line 521 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp41_ = save_as_dialog;
-#line 521 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
-#line 522 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp42_ = save_as_dialog;
-#line 522 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp43_ = filename;
-#line 522 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp43_);
-#line 523 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp44_ = save_as_dialog;
-#line 523 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp45_ = self->priv->current_save_dir;
-#line 523 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp46_ = g_file_get_path (_tmp45_);
-#line 523 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp47_ = _tmp46_;
-#line 523 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp47_);
-#line 523 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp47_);
-#line 524 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp48_ = save_as_dialog;
-#line 524 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp49_ = output_format_filter;
-#line 524 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp50_ = _g_object_ref0 (_tmp49_);
-#line 524 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_add_filter (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp50_);
-#line 525 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp51_ = save_as_dialog;
-#line 525 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
-#line 526 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp52_ = save_as_dialog;
-#line 526 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
-#line 528 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp53_ = save_as_dialog;
-#line 528 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp54_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_dialog_get_type (), GtkDialog));
-#line 528 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	response = _tmp54_;
-#line 529 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp55_ = response;
-#line 529 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp55_ == ((gint) GTK_RESPONSE_OK)) {
-#line 4756 "DirectPhotoPage.c"
+#line 3264 "DirectPhotoPage.c"
 		GtkFileChooserDialog* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
 		gchar* _tmp58_ = NULL;
@@ -4771,106 +3279,106 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 		gchar* _tmp71_ = NULL;
 		gchar* _tmp72_ = NULL;
 		GFile* _tmp73_ = NULL;
-#line 532 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->drop_if_dirty = TRUE;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp56_ = save_as_dialog;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp57_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp58_ = _tmp57_;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp59_ = g_file_new_for_uri (_tmp58_);
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp60_ = _tmp59_;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp61_ = scale;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp62_ = constraint;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp63_ = export_params;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp64_ = _tmp63_.quality;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp65_ = effective_export_format;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp66_ = export_params;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp67_ = _tmp66_.mode;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp68_ = export_params;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp69_ = _tmp68_.export_metadata;
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		direct_photo_page_save (self, _tmp60_, _tmp61_, _tmp62_, _tmp64_, _tmp65_, _tmp67_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp69_);
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp60_);
-#line 533 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp58_);
-#line 536 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->drop_if_dirty = FALSE;
-#line 538 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp70_ = save_as_dialog;
-#line 538 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp71_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 538 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp72_ = _tmp71_;
-#line 538 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp73_ = g_file_new_for_path (_tmp72_);
-#line 538 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (self->priv->current_save_dir);
-#line 538 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->current_save_dir = _tmp73_;
-#line 538 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp72_);
-#line 4827 "DirectPhotoPage.c"
+#line 3335 "DirectPhotoPage.c"
 	}
-#line 541 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp74_ = save_as_dialog;
-#line 541 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 406 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
-#line 496 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (save_as_dialog);
-#line 496 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (output_format_filter);
-#line 496 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_extensions = (_vala_array_free (output_format_extensions, output_format_extensions_length1, (GDestroyNotify) g_free), NULL);
-#line 496 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (filename);
-#line 496 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 4843 "DirectPhotoPage.c"
+#line 3351 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_send_to (DirectPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 544 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 545 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 545 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 4855 "DirectPhotoPage.c"
+#line 3363 "DirectPhotoPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
-#line 546 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 546 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 546 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 546 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 546 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		desktop_integration_send_to (_tmp4_);
-#line 546 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 546 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 4874 "DirectPhotoPage.c"
+#line 3382 "DirectPhotoPage.c"
 	}
 }
 
@@ -4884,93 +3392,93 @@ static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventK
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 552 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 552 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 4892 "DirectPhotoPage.c"
+#line 3400 "DirectPhotoPage.c"
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 549 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 549 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 550 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	handled = TRUE;
-#line 552 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = event;
-#line 552 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 552 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 552 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 552 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 552 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("bracketright")))) {
-#line 552 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 4915 "DirectPhotoPage.c"
+#line 3423 "DirectPhotoPage.c"
 			default:
 			{
-#line 554 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 555 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 420 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 4922 "DirectPhotoPage.c"
+#line 3430 "DirectPhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("bracketleft")))) {
-#line 552 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 4928 "DirectPhotoPage.c"
+#line 3436 "DirectPhotoPage.c"
 			default:
 			{
-#line 558 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 423 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 559 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 4935 "DirectPhotoPage.c"
+#line 3443 "DirectPhotoPage.c"
 			}
 		}
 	} else {
-#line 552 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 4941 "DirectPhotoPage.c"
+#line 3449 "DirectPhotoPage.c"
 			default:
 			{
-#line 562 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				handled = FALSE;
-#line 563 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 4948 "DirectPhotoPage.c"
+#line 3456 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 566 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = handled;
-#line 566 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp7_) {
-#line 566 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = TRUE;
-#line 4958 "DirectPhotoPage.c"
+#line 3466 "DirectPhotoPage.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
-#line 566 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = event;
-#line 566 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = PAGE_CLASS (direct_photo_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp8_);
-#line 566 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = _tmp9_;
-#line 4968 "DirectPhotoPage.c"
+#line 3476 "DirectPhotoPage.c"
 	}
-#line 566 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp6_;
-#line 566 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 4974 "DirectPhotoPage.c"
+#line 3482 "DirectPhotoPage.c"
 }
 
 
@@ -4979,75 +3487,75 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 569 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 570 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 570 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 570 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 570 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 570 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 570 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_) {
-#line 4997 "DirectPhotoPage.c"
+#line 3505 "DirectPhotoPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 571 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 571 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 571 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 571 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 571 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 571 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 571 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 571 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 571 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 571 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 5024 "DirectPhotoPage.c"
+#line 3532 "DirectPhotoPage.c"
 	}
 }
 
 
 static Block6Data* block6_data_ref (Block6Data* _data6_) {
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_atomic_int_inc (&_data6_->_ref_count_);
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return _data6_;
-#line 5034 "DirectPhotoPage.c"
+#line 3542 "DirectPhotoPage.c"
 }
 
 
 static void block6_data_unref (void * _userdata_) {
 	Block6Data* _data6_;
 	_data6_ = (Block6Data*) _userdata_;
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) {
-#line 5043 "DirectPhotoPage.c"
+#line 3551 "DirectPhotoPage.c"
 		DirectPhotoPage* self;
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self = _data6_->self;
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (self);
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_slice_free (Block6Data, _data6_);
-#line 5051 "DirectPhotoPage.c"
+#line 3559 "DirectPhotoPage.c"
 	}
 }
 
@@ -5056,51 +3564,51 @@ static gboolean __lambda14_ (Block6Data* _data6_) {
 	DirectPhotoPage* self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 580 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = _data6_->self;
-#line 581 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = _data6_->should_allow_rotation;
-#line 581 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_enable_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_);
-#line 583 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = FALSE;
-#line 583 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 5070 "DirectPhotoPage.c"
+#line 3578 "DirectPhotoPage.c"
 }
 
 
 static gboolean ___lambda14__gsource_func (gpointer self) {
 	gboolean result;
 	result = __lambda14_ (self);
-#line 580 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 5079 "DirectPhotoPage.c"
+#line 3587 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation) {
 	Block6Data* _data6_;
 	gboolean _tmp0_ = FALSE;
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_ = g_slice_new0 (Block6Data);
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_->_ref_count_ = 1;
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_->self = g_object_ref (self);
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = should_allow_rotation;
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_->should_allow_rotation = _tmp0_;
-#line 580 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda14__gsource_func, block6_data_ref (_data6_), block6_data_unref);
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	block6_data_unref (_data6_);
-#line 576 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_ = NULL;
-#line 5104 "DirectPhotoPage.c"
+#line 3612 "DirectPhotoPage.c"
 }
 
 
@@ -5109,19 +3617,19 @@ static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base
 	DataView* result = NULL;
 	DataSource* _tmp0_ = NULL;
 	DirectView* _tmp1_ = NULL;
-#line 587 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 587 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
-#line 588 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = source;
-#line 588 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto));
-#line 588 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
-#line 588 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 5125 "DirectPhotoPage.c"
+#line 3633 "DirectPhotoPage.c"
 }
 
 
@@ -5133,7 +3641,7 @@ static void direct_photo_page_class_init (DirectPhotoPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = direct_photo_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	((PageClass *) klass)->init_collect_action_entries = direct_photo_page_real_init_collect_action_entries;
+	((PageClass *) klass)->add_actions = direct_photo_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	((PageClass *) klass)->init_collect_injection_groups = direct_photo_page_real_init_collect_injection_groups;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -5160,7 +3668,7 @@ static void direct_photo_page_class_init (DirectPhotoPageClass * klass) {
 	((EditingHostPageClass *) klass)->create_photo_view = direct_photo_page_real_create_photo_view;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_photo_page_finalize;
-#line 5164 "DirectPhotoPage.c"
+#line 3672 "DirectPhotoPage.c"
 }
 
 
@@ -5171,7 +3679,7 @@ static void direct_photo_page_instance_init (DirectPhotoPage * self) {
 	self->priv->view_controller = NULL;
 #line 11 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self->priv->drop_if_dirty = FALSE;
-#line 5175 "DirectPhotoPage.c"
+#line 3683 "DirectPhotoPage.c"
 }
 
 
@@ -5195,7 +3703,7 @@ static void direct_photo_page_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->current_save_dir);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	G_OBJECT_CLASS (direct_photo_page_parent_class)->finalize (obj);
-#line 5199 "DirectPhotoPage.c"
+#line 3707 "DirectPhotoPage.c"
 }
 
 
@@ -5214,46 +3722,46 @@ GType direct_photo_page_get_type (void) {
 DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file) {
 	DirectFullscreenPhotoPage * self = NULL;
 	GFile* _tmp0_ = NULL;
-#line 593 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 594 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = file;
-#line 594 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = (DirectFullscreenPhotoPage*) direct_photo_page_construct (object_type, _tmp0_);
-#line 593 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self;
-#line 5226 "DirectPhotoPage.c"
+#line 3734 "DirectPhotoPage.c"
 }
 
 
 DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file) {
-#line 593 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return direct_fullscreen_photo_page_construct (TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, file);
-#line 5233 "DirectPhotoPage.c"
+#line 3741 "DirectPhotoPage.c"
 }
 
 
 static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	DirectFullscreenPhotoPage * self;
 	GeeList* _tmp0_ = NULL;
-#line 597 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, DirectFullscreenPhotoPage);
-#line 597 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 600 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = ui_filenames;
-#line 600 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui");
-#line 5248 "DirectPhotoPage.c"
+#line 3756 "DirectPhotoPage.c"
 }
 
 
 static void direct_fullscreen_photo_page_class_init (DirectFullscreenPhotoPageClass * klass) {
-#line 592 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 592 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = direct_fullscreen_photo_page_real_init_collect_ui_filenames;
-#line 5257 "DirectPhotoPage.c"
+#line 3765 "DirectPhotoPage.c"
 }
 
 
diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index 2a56887..57dfe11 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -38,184 +38,49 @@ public class DirectPhotoPage : EditingHostPage {
         ui_filenames.add("direct_context.ui");
         ui_filenames.add("direct.ui");
     }
-    
-    protected override Gtk.ActionEntry[] init_collect_action_entries() {
-        Gtk.ActionEntry[] actions = base.init_collect_action_entries();
-        
-        Gtk.ActionEntry file = { "FileMenu", null, TRANSLATABLE, null, null, null };
-        file.label = _("_File");
-        actions += file;
-
-        Gtk.ActionEntry save = { "Save", Resources.SAVE_LABEL, TRANSLATABLE, "<Ctrl>S", TRANSLATABLE,
-            on_save };
-        save.label = _("_Save");
-        save.tooltip = _("Save photo");
-        actions += save;
-
-        Gtk.ActionEntry save_as = { "SaveAs", Resources.SAVE_AS_LABEL, TRANSLATABLE,
-            "<Ctrl><Shift>S", TRANSLATABLE, on_save_as };
-        save_as.label = _("Save _As…");
-        save_as.tooltip = _("Save photo with a different name");
-        actions += save_as;
-        
-        Gtk.ActionEntry send_to = { "SendTo", "document-send", TRANSLATABLE, null,
-            TRANSLATABLE, on_send_to };
-        send_to.label = Resources.SEND_TO_MENU;
-        actions += send_to;
-
-        Gtk.ActionEntry print = { "Print", Resources.PRINT_LABEL, TRANSLATABLE, "<Ctrl>P",
-            TRANSLATABLE, on_print };
-        print.label = Resources.PRINT_MENU;
-        print.tooltip = _("Print the photo to a printer connected to your computer");
-        actions += print;
-        
-        Gtk.ActionEntry edit = { "EditMenu", null, TRANSLATABLE, null, null, null };
-        edit.label = _("_Edit");
-        actions += edit;
-
-        Gtk.ActionEntry photo = { "PhotoMenu", null, "", null, null, null };
-        photo.label = _("_Photo");
-        actions += photo;
-        
-        Gtk.ActionEntry tools = { "Tools", null, TRANSLATABLE, null, null, null };
-        tools.label = _("T_ools");
-        actions += tools;
-        
-        Gtk.ActionEntry prev = { "PrevPhoto", Resources.PREVIOUS_LABEL, TRANSLATABLE, null,
-            TRANSLATABLE, on_previous_photo };
-        prev.label = _("_Previous Photo");
-        prev.tooltip = _("Previous Photo");
-        actions += prev;
-
-        Gtk.ActionEntry next = { "NextPhoto", Resources.NEXT_LABEL, TRANSLATABLE, null,
-            TRANSLATABLE, on_next_photo };
-        next.label = _("_Next Photo");
-        next.tooltip = _("Next Photo");
-        actions += next;
-
-        Gtk.ActionEntry rotate_right = { "RotateClockwise", Resources.CLOCKWISE,
-            TRANSLATABLE, "<Ctrl>R", TRANSLATABLE, on_rotate_clockwise };
-        rotate_right.label = Resources.ROTATE_CW_MENU;
-        rotate_right.tooltip = Resources.ROTATE_CCW_TOOLTIP;
-        actions += rotate_right;
-
-        Gtk.ActionEntry rotate_left = { "RotateCounterclockwise", Resources.COUNTERCLOCKWISE,
-            TRANSLATABLE, "<Ctrl><Shift>R", TRANSLATABLE, on_rotate_counterclockwise };
-        rotate_left.label = Resources.ROTATE_CCW_MENU;
-        rotate_left.tooltip = Resources.ROTATE_CCW_TOOLTIP;
-        actions += rotate_left;
-
-        Gtk.ActionEntry hflip = { "FlipHorizontally", Resources.HFLIP, TRANSLATABLE, null,
-            TRANSLATABLE, on_flip_horizontally };
-        hflip.label = Resources.HFLIP_MENU;
-        actions += hflip;
-        
-        Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, TRANSLATABLE, null,
-            TRANSLATABLE, on_flip_vertically };
-        vflip.label = Resources.VFLIP_MENU;
-        actions += vflip;
-        
-        Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, TRANSLATABLE, "<Ctrl>E",
-            TRANSLATABLE, on_enhance };
-        enhance.label = Resources.ENHANCE_MENU;
-        enhance.tooltip = Resources.ENHANCE_TOOLTIP;
-        actions += enhance;
-        
-        Gtk.ActionEntry crop = { "Crop", Resources.CROP, TRANSLATABLE, "<Ctrl>O",
-            TRANSLATABLE, toggle_crop };
-        crop.label = Resources.CROP_MENU;
-        crop.tooltip = Resources.CROP_TOOLTIP;
-        actions += crop;
-        
-        Gtk.ActionEntry straighten = { "Straighten", Resources.REFRESH_LABEL, TRANSLATABLE, "<Ctrl>A",
-            TRANSLATABLE, toggle_straighten };
-        straighten.label = Resources.STRAIGHTEN_MENU;
-        straighten.tooltip = Resources.STRAIGHTEN_TOOLTIP;
-        actions += straighten;
-        
-        Gtk.ActionEntry red_eye = { "RedEye", Resources.REDEYE, TRANSLATABLE, "<Ctrl>Y",
-            TRANSLATABLE, toggle_redeye };
-        red_eye.label = Resources.RED_EYE_MENU;
-        red_eye.tooltip = Resources.RED_EYE_TOOLTIP;
-        actions += red_eye;
-        
-        Gtk.ActionEntry adjust = { "Adjust", Resources.ADJUST, TRANSLATABLE, "<Ctrl>D",
-            TRANSLATABLE, toggle_adjust };
-        adjust.label = Resources.ADJUST_MENU;
-        adjust.tooltip = Resources.ADJUST_TOOLTIP;
-        actions += adjust;
-        
-        Gtk.ActionEntry revert = { "Revert", Resources.REVERT_LABEL, TRANSLATABLE,
-            null, TRANSLATABLE, on_revert };
-        revert.label = Resources.REVERT_MENU;
-        actions += revert;
-
-        Gtk.ActionEntry adjust_date_time = { "AdjustDateTime", null, TRANSLATABLE, null,
-            TRANSLATABLE, on_adjust_date_time };
-        adjust_date_time.label = Resources.ADJUST_DATE_TIME_MENU;
-        actions += adjust_date_time;
-        
-        Gtk.ActionEntry set_background = { "SetBackground", null, TRANSLATABLE, "<Ctrl>B",
-            TRANSLATABLE, on_set_background };
-        set_background.label = Resources.SET_BACKGROUND_MENU;
-        set_background.tooltip = Resources.SET_BACKGROUND_TOOLTIP;
-        actions += set_background;
-
-        Gtk.ActionEntry view = { "ViewMenu", null, TRANSLATABLE, null, null, null };
-        view.label = _("_View");
-        actions += view;
-
-        Gtk.ActionEntry help = { "HelpMenu", null, TRANSLATABLE, null, null, null };
-        help.label = _("_Help");
-        actions += help;
-
-        Gtk.ActionEntry increase_size = { "IncreaseSize", Resources.ZOOM_IN_LABEL, TRANSLATABLE,
-            "<Ctrl>plus", TRANSLATABLE, on_increase_size };
-        increase_size.label = _("Zoom _In");
-        increase_size.tooltip = _("Increase the magnification of the photo");
-        actions += increase_size;
-
-        Gtk.ActionEntry decrease_size = { "DecreaseSize", Resources.ZOOM_OUT_LABEL, TRANSLATABLE,
-            "<Ctrl>minus", TRANSLATABLE, on_decrease_size };
-        decrease_size.label = _("Zoom _Out");
-        decrease_size.tooltip = _("Decrease the magnification of the photo");
-        actions += decrease_size;
-
-        Gtk.ActionEntry best_fit = { "ZoomFit", Resources.ZOOM_FIT_LABEL, TRANSLATABLE,
-            "<Ctrl>0", TRANSLATABLE, snap_zoom_to_min };
-        best_fit.label = _("Fit to _Page");
-        best_fit.tooltip = _("Zoom the photo to fit on the screen");
-        actions += best_fit;
-
-        Gtk.ActionEntry actual_size = { "Zoom100", Resources.ZOOM_100_LABEL, TRANSLATABLE,
-            "<Ctrl>1", TRANSLATABLE, snap_zoom_to_isomorphic };
-        /// xgettext:no-c-format
-        actual_size.label = _("Zoom _100%");
-        /// xgettext:no-c-format
-        actual_size.tooltip = _("Zoom the photo to 100% magnification");
-        actions += actual_size;
-        
-        Gtk.ActionEntry max_size = { "Zoom200", null, TRANSLATABLE,
-            "<Ctrl>2", TRANSLATABLE, snap_zoom_to_max };
-        /// xgettext:no-c-format
-        max_size.label = _("Zoom _200%");
-        /// xgettext:no-c-format
-        max_size.tooltip = _("Zoom the photo to 200% magnification");
-        actions += max_size;
 
-        return actions;
+    private const GLib.ActionEntry[] entries = {
+        { "Save", on_save },
+        { "SaveAs", on_save_as },
+        { "SendTo", on_send_to },
+        { "Print", on_print },
+        { "PrevPhoto", on_previous_photo },
+        { "NextPhoto", on_next_photo },
+        { "RotateClockwise", on_rotate_clockwise },
+        { "RotateCounterclockwise", on_rotate_counterclockwise },
+        { "FlipHorizontally", on_flip_horizontally },
+        { "FlipVertically", on_flip_vertically },
+        { "Enhance", on_enhance },
+        { "Crop", toggle_crop },
+        { "Straighten", toggle_straighten },
+        { "RedEye", toggle_redeye },
+        { "Adjust", toggle_adjust },
+        { "Revert", on_revert },
+        { "AdjustDateTime", on_adjust_date_time },
+        { "SetBackground", on_set_background },
+        { "IncreaseSize", on_increase_size },
+        { "DecreaseSize", on_decrease_size },
+        { "ZoomFit", snap_zoom_to_min },
+        { "Zoom100", snap_zoom_to_isomorphic },
+        { "Zoom200", snap_zoom_to_max }
+    };
+
+    protected override void add_actions () {
+        base.add_actions ();
+
+        AppWindow.get_instance ().add_action_entries (entries, this);
     }
     
     protected override InjectionGroup[] init_collect_injection_groups() {
         InjectionGroup[] groups = base.init_collect_injection_groups();
         
-        InjectionGroup print_group = new InjectionGroup("/MenuBar/FileMenu/PrintPlaceholder");
-        print_group.add_menu_item("Print");
+        InjectionGroup print_group = new InjectionGroup("PrintPlaceholder");
+        print_group.add_menu_item(_("_Print"), "Print", "<Primary>p");
         
         groups += print_group;
         
-        InjectionGroup bg_group = new InjectionGroup("/MenuBar/FileMenu/SetBackgroundPlaceholder");
-        bg_group.add_menu_item("SetBackground");
+        InjectionGroup bg_group = new InjectionGroup("SetBackgroundPlaceholder");
+        bg_group.add_menu_item(_("Set as _Desktop Background"), "SetBackground");
         
         groups += bg_group;
         
@@ -274,8 +139,8 @@ public class DirectPhotoPage : EditingHostPage {
     }
 
     protected override bool on_context_buttonpress(Gdk.EventButton event) {
-        Gtk.Menu context_menu = (Gtk.Menu) ui.get_widget("/DirectContextMenu");
-        popup_context_menu(context_menu, event);
+//        Gtk.Menu context_menu = (Gtk.Menu) ui.get_widget("/DirectContextMenu");
+//        popup_context_menu(context_menu, event);
 
         return true;
     }
diff --git a/src/direct/DirectWindow.c b/src/direct/DirectWindow.c
index ddaa2e1..2d6ffc1 100644
--- a/src/direct/DirectWindow.c
+++ b/src/direct/DirectWindow.c
@@ -228,13 +228,12 @@ typedef struct _ConfigFacade ConfigFacade;
 typedef struct _ConfigFacadeClass ConfigFacadeClass;
 
 struct _PageWindow {
-	GtkWindow parent_instance;
+	GtkApplicationWindow parent_instance;
 	PageWindowPrivate * priv;
-	GtkUIManager* ui;
 };
 
 struct _PageWindowClass {
-	GtkWindowClass parent_class;
+	GtkApplicationWindowClass parent_class;
 	void (*switched_pages) (PageWindow* self, Page* old_page, Page* new_page);
 	void (*set_current_page) (PageWindow* self, Page* page);
 	void (*clear_current_page) (PageWindow* self);
@@ -248,8 +247,6 @@ struct _Dimensions {
 struct _AppWindow {
 	PageWindow parent_instance;
 	AppWindowPrivate * priv;
-	GtkActionGroup** common_action_groups;
-	gint common_action_groups_length1;
 	gboolean maximized;
 	Dimensions dimensions;
 	gint pos_x;
@@ -261,8 +258,7 @@ struct _AppWindowClass {
 	void (*on_fullscreen) (AppWindow* self);
 	gchar* (*get_app_role) (AppWindow* self);
 	void (*on_quit) (AppWindow* self);
-	GtkActionGroup** (*create_common_action_groups) (AppWindow* self, int* result_length1);
-	void (*replace_common_placeholders) (AppWindow* self, GtkUIManager* ui);
+	void (*add_actions) (AppWindow* self);
 	void (*update_common_action_availability) (AppWindow* self, Page* old_page, Page* new_page);
 	void (*update_common_actions) (AppWindow* self, Page* page, gint selected_count, gint count);
 };
@@ -327,8 +323,9 @@ static void _direct_window_on_photo_changed_view_collection_items_state_changed
 void page_window_set_current_page (PageWindow* self, Page* page);
 void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modified);
 void page_switched_to (Page* self);
-GtkMenuBar* page_get_menubar (Page* self);
 GtkToolbar* page_get_toolbar (Page* self);
+void application_set_menubar (GMenuModel* model);
+GMenuModel* page_get_menubar (Page* self);
 DirectWindow* direct_window_get_app (void);
 DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self);
 Page* page_window_get_current_page (PageWindow* self);
@@ -367,14 +364,14 @@ static void direct_window_finalize (GObject* obj);
 static void _direct_window_on_photo_changed_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 12 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	direct_window_on_photo_changed ((DirectWindow*) self);
-#line 371 "DirectWindow.c"
+#line 368 "DirectWindow.c"
 }
 
 
 static void _direct_window_on_photo_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	direct_window_on_photo_changed ((DirectWindow*) self);
-#line 378 "DirectWindow.c"
+#line 375 "DirectWindow.c"
 }
 
 
@@ -394,12 +391,12 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file) {
 	GtkBox* layout = NULL;
 	GtkBox* _tmp11_ = NULL;
 	DirectPhotoPage* _tmp12_ = NULL;
-	GtkMenuBar* _tmp13_ = NULL;
-	GtkMenuBar* _tmp14_ = NULL;
-	DirectPhotoPage* _tmp15_ = NULL;
+	DirectPhotoPage* _tmp13_ = NULL;
+	GtkToolbar* _tmp14_ = NULL;
+	GtkToolbar* _tmp15_ = NULL;
 	DirectPhotoPage* _tmp16_ = NULL;
-	GtkToolbar* _tmp17_ = NULL;
-	GtkToolbar* _tmp18_ = NULL;
+	GMenuModel* _tmp17_ = NULL;
+	GMenuModel* _tmp18_ = NULL;
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
@@ -455,48 +452,48 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file) {
 #line 24 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp12_ = self->priv->direct_photo_page;
 #line 24 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp13_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page));
-#line 24 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp14_ = _tmp13_;
-#line 24 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	gtk_box_pack_start (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 24 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_g_object_unref0 (_tmp14_);
+	gtk_box_pack_start (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	_tmp13_ = self->priv->direct_photo_page;
 #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp15_ = self->priv->direct_photo_page;
+	_tmp14_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE, Page));
 #line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	gtk_box_pack_start (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 26 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	_tmp15_ = _tmp14_;
+#line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	gtk_box_pack_end (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 25 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	_g_object_unref0 (_tmp15_);
+#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp16_ = self->priv->direct_photo_page;
-#line 26 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	_tmp17_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE, Page));
-#line 26 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	_tmp17_ = page_get_menubar (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE, Page));
+#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp18_ = _tmp17_;
-#line 26 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	gtk_box_pack_end (layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 26 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	application_set_menubar (_tmp18_);
+#line 27 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp18_);
-#line 28 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 29 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget));
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (layout);
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return self;
-#line 486 "DirectWindow.c"
+#line 483 "DirectWindow.c"
 }
 
 
 DirectWindow* direct_window_new (GFile* file) {
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return direct_window_construct (TYPE_DIRECT_WINDOW, file);
-#line 493 "DirectWindow.c"
+#line 490 "DirectWindow.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 32 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 500 "DirectWindow.c"
+#line 497 "DirectWindow.c"
 }
 
 
@@ -504,30 +501,30 @@ DirectWindow* direct_window_get_app (void) {
 	DirectWindow* result = NULL;
 	AppWindow* _tmp0_ = NULL;
 	DirectWindow* _tmp1_ = NULL;
-#line 32 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 32 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_WINDOW, DirectWindow));
-#line 32 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = _tmp1_;
-#line 32 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 33 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 516 "DirectWindow.c"
+#line 513 "DirectWindow.c"
 }
 
 
 DirectPhotoPage* direct_window_get_direct_page (DirectWindow* self) {
 	DirectPhotoPage* result = NULL;
 	Page* _tmp0_ = NULL;
-#line 35 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	g_return_val_if_fail (IS_DIRECT_WINDOW (self), NULL);
 #line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	g_return_val_if_fail (IS_DIRECT_WINDOW (self), NULL);
+#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 36 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 37 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 531 "DirectWindow.c"
+#line 528 "DirectWindow.c"
 }
 
 
@@ -544,53 +541,53 @@ void direct_window_update_title (DirectWindow* self, GFile* file, gboolean modif
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_if_fail (IS_DIRECT_WINDOW (self));
-#line 39 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	g_return_if_fail (G_IS_FILE (file));
 #line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	g_return_if_fail (G_IS_FILE (file));
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = modified;
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp1_) {
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp0_ = "*";
-#line 558 "DirectWindow.c"
+#line 555 "DirectWindow.c"
 	} else {
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp0_ = "";
-#line 562 "DirectWindow.c"
+#line 559 "DirectWindow.c"
 	}
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = file;
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp3_ = g_file_get_basename (_tmp2_);
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp5_ = file;
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp6_ = g_file_get_parent (_tmp5_);
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp8_ = get_display_pathname (_tmp7_);
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp10_ = g_strdup_printf ("%s%s (%s) - %s", _tmp0_, _tmp4_, _tmp9_, RESOURCES_APP_TITLE);
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp11_);
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_free0 (_tmp11_);
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_free0 (_tmp9_);
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 40 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 41 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_free0 (_tmp4_);
-#line 594 "DirectWindow.c"
+#line 591 "DirectWindow.c"
 }
 
 
@@ -603,33 +600,33 @@ static void direct_window_real_on_fullscreen (AppWindow* base) {
 	GFile* _tmp3_ = NULL;
 	DirectFullscreenPhotoPage* _tmp4_ = NULL;
 	DirectFullscreenPhotoPage* _tmp5_ = NULL;
-#line 44 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
+#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = direct_window_get_direct_page (self);
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = direct_photo_page_get_current_file (_tmp1_);
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 46 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	file = _tmp3_;
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp4_ = direct_fullscreen_photo_page_new (file);
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_object_ref_sink (_tmp4_);
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	app_window_go_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE, Page));
-#line 47 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 48 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 44 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 45 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (file);
-#line 633 "DirectWindow.c"
+#line 630 "DirectWindow.c"
 }
 
 
@@ -637,15 +634,15 @@ static gchar* direct_window_real_get_app_role (AppWindow* base) {
 	DirectWindow * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 50 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 51 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
+#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = g_strdup (RESOURCES_APP_DIRECT_ROLE);
-#line 51 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = _tmp0_;
-#line 51 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 52 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 649 "DirectWindow.c"
+#line 646 "DirectWindow.c"
 }
 
 
@@ -654,43 +651,43 @@ static void direct_window_on_photo_changed (DirectWindow* self) {
 	DirectPhotoPage* _tmp0_ = NULL;
 	Photo* _tmp1_ = NULL;
 	Photo* _tmp2_ = NULL;
-#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	g_return_if_fail (IS_DIRECT_WINDOW (self));
 #line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	g_return_if_fail (IS_DIRECT_WINDOW (self));
+#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = self->priv->direct_photo_page;
-#line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	photo = _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	photo = _tmp1_;
+#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = photo;
-#line 56 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 670 "DirectWindow.c"
+#line 667 "DirectWindow.c"
 		Photo* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
 		Photo* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp3_ = photo;
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp6_ = photo;
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp7_ = photo_has_alterations (_tmp6_);
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		direct_window_update_title (self, _tmp5_, _tmp7_);
-#line 57 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 58 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 690 "DirectWindow.c"
+#line 687 "DirectWindow.c"
 	}
-#line 54 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 55 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (photo);
-#line 694 "DirectWindow.c"
+#line 691 "DirectWindow.c"
 }
 
 
@@ -704,39 +701,39 @@ static void direct_window_real_on_quit (AppWindow* base) {
 	ConfigFacade* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
 	Dimensions _tmp7_ = {0};
-#line 60 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
 #line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
+#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = direct_window_get_direct_page (self);
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = direct_photo_page_check_quit (_tmp1_);
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp3_ = !_tmp2_;
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 61 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	if (_tmp3_) {
 #line 62 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	if (_tmp3_) {
+#line 63 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return;
-#line 724 "DirectWindow.c"
+#line 721 "DirectWindow.c"
 	}
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized;
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions;
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	configuration_facade_set_direct_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_, &_tmp7_);
-#line 64 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 65 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 66 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 67 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	APP_WINDOW_CLASS (direct_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
-#line 740 "DirectWindow.c"
+#line 737 "DirectWindow.c"
 }
 
 
@@ -748,50 +745,50 @@ static gboolean direct_window_real_delete_event (GtkWidget* base, GdkEventAny* e
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 69 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
-#line 69 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
 #line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = direct_window_get_direct_page (self);
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = direct_photo_page_check_quit (_tmp1_);
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp3_ = !_tmp2_;
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 70 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	if (_tmp3_) {
 #line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	if (_tmp3_) {
+#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		result = TRUE;
-#line 71 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 72 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return result;
-#line 772 "DirectWindow.c"
+#line 769 "DirectWindow.c"
 	}
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event != NULL) {
-#line 776 "DirectWindow.c"
+#line 773 "DirectWindow.c"
 		GdkEventAny* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp5_ = event;
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp6_ = GTK_WIDGET_CLASS (direct_window_parent_class)->delete_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = _tmp6_;
-#line 785 "DirectWindow.c"
+#line 782 "DirectWindow.c"
 	} else {
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = FALSE;
-#line 789 "DirectWindow.c"
+#line 786 "DirectWindow.c"
 	}
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = _tmp4_;
-#line 73 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 74 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 795 "DirectWindow.c"
+#line 792 "DirectWindow.c"
 }
 
 
@@ -800,29 +797,29 @@ static gboolean direct_window_real_button_press_event (GtkWidget* base, GdkEvent
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	GdkEventType _tmp1_ = 0;
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
-#line 76 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
 #line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = event;
-#line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_->type;
-#line 77 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	if (_tmp1_ == GDK_2BUTTON_PRESS) {
 #line 78 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	if (_tmp1_ == GDK_2BUTTON_PRESS) {
+#line 79 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		app_window_on_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		result = TRUE;
-#line 80 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 81 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return result;
-#line 820 "DirectWindow.c"
+#line 817 "DirectWindow.c"
 	}
-#line 83 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = FALSE;
-#line 83 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 84 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 826 "DirectWindow.c"
+#line 823 "DirectWindow.c"
 }
 
 
@@ -833,48 +830,48 @@ static gboolean direct_window_real_key_press_event (GtkWidget* base, GdkEventKey
 	guint _tmp1_ = 0U;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 86 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_WINDOW, DirectWindow);
-#line 86 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 87 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 88 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp0_ = event;
-#line 88 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 88 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 88 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
-	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
 #line 89 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
+#line 90 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		app_window_on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
-#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		result = TRUE;
-#line 91 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 92 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		return result;
-#line 855 "DirectWindow.c"
+#line 852 "DirectWindow.c"
 	}
-#line 95 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	if (GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event != NULL) {
-#line 859 "DirectWindow.c"
+#line 856 "DirectWindow.c"
 		GdkEventKey* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 95 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp4_ = event;
-#line 95 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp5_ = GTK_WIDGET_CLASS (direct_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp4_);
-#line 95 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp3_ = _tmp5_;
-#line 868 "DirectWindow.c"
+#line 865 "DirectWindow.c"
 	} else {
-#line 95 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 		_tmp3_ = FALSE;
-#line 872 "DirectWindow.c"
+#line 869 "DirectWindow.c"
 	}
-#line 95 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	result = _tmp3_;
-#line 95 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
+#line 96 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	return result;
-#line 878 "DirectWindow.c"
+#line 875 "DirectWindow.c"
 }
 
 
@@ -897,14 +894,14 @@ static void direct_window_class_init (DirectWindowClass * klass) {
 	((GtkWidgetClass *) klass)->key_press_event = direct_window_real_key_press_event;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_window_finalize;
-#line 901 "DirectWindow.c"
+#line 898 "DirectWindow.c"
 }
 
 
 static void direct_window_instance_init (DirectWindow * self) {
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	self->priv = DIRECT_WINDOW_GET_PRIVATE (self);
-#line 908 "DirectWindow.c"
+#line 905 "DirectWindow.c"
 }
 
 
@@ -916,7 +913,7 @@ static void direct_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->direct_photo_page);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectWindow.vala"
 	G_OBJECT_CLASS (direct_window_parent_class)->finalize (obj);
-#line 920 "DirectWindow.c"
+#line 917 "DirectWindow.c"
 }
 
 
diff --git a/src/direct/DirectWindow.vala b/src/direct/DirectWindow.vala
index 2a33423..e1cbf75 100644
--- a/src/direct/DirectWindow.vala
+++ b/src/direct/DirectWindow.vala
@@ -21,10 +21,11 @@ public class DirectWindow : AppWindow {
         // simple layout: menu on top, photo in center, toolbar along bottom (mimicking the
         // PhotoPage in the library, but without the sidebar)
         Gtk.Box layout = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-        layout.pack_start(direct_photo_page.get_menubar(), false, false, 0);
         layout.pack_start(direct_photo_page, true, true, 0);
         layout.pack_end(direct_photo_page.get_toolbar(), false, false, 0);
         
+        Application.set_menubar (direct_photo_page.get_menubar ());
+
         add(layout);
     }
     
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index bb602a2..92f41f9 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -917,7 +917,7 @@ struct _EditingToolsAdjustToolAdjustToolWindow {
 	EditingToolsEditingToolWindow parent_instance;
 	EditingToolsAdjustToolAdjustToolWindowPrivate * priv;
 	GtkScale* exposure_slider;
-	GtkHScale* contrast_slider;
+	GtkScale* contrast_slider;
 	GtkScale* saturation_slider;
 	GtkScale* tint_slider;
 	GtkScale* temperature_slider;
@@ -1333,7 +1333,6 @@ enum  {
 #define EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING 8
 static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter);
 static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self);
-#define RESOURCES_CROP_PIVOT_RETICLE "shotwell-crop-pivot-reticle"
 static void editing_tools_crop_tool_crop_tool_window_finalize (GObject* obj);
 static void editing_tools_crop_tool_finalize (EditingToolsEditingTool* obj);
 GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST;
@@ -1681,9 +1680,9 @@ void editing_tools_terminate (void) {
 
 
 static void _suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
-#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 55 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	suppress_warnings (log_domain, log_levels, message);
-#line 1687 "EditingTools.c"
+#line 1686 "EditingTools.c"
 }
 
 
@@ -1699,55 +1698,51 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GTyp
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsEditingToolWindow*) g_object_new (object_type, NULL);
-#line 36 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_UTILITY);
-#line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 35 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 39 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 36 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 39 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 36 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
-#line 41 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkFrame*) gtk_frame_new (NULL);
-#line 41 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 41 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	outer_frame = _tmp1_;
-#line 42 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 39 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_container_get_type (), GtkContainer), (guint) 0);
-#line 43 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 40 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_frame_set_shadow_type (outer_frame, GTK_SHADOW_OUT);
-#line 45 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 42 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->layout_frame;
-#line 45 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 42 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), (guint) EDITING_TOOLS_EDITING_TOOL_WINDOW_FRAME_BORDER);
-#line 46 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 43 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->layout_frame;
-#line 46 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 43 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_frame_set_shadow_type (_tmp3_, GTK_SHADOW_NONE);
-#line 48 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 45 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->layout_frame;
-#line 48 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 45 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 49 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 46 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	GTK_CONTAINER_CLASS (editing_tools_editing_tool_window_parent_class)->add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_widget_get_type (), GtkWidget));
-#line 51 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 48 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) (GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK));
-#line 52 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 49 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_window_set_focus_on_map (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 53 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 50 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_window_set_accept_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 54 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 51 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 55 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_window_set_has_resize_grip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_log_set_handler ("Gdk", G_LOG_LEVEL_WARNING, _suppress_warnings_glog_func, NULL);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (outer_frame);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 1751 "EditingTools.c"
+#line 1746 "EditingTools.c"
 }
 
 
@@ -1755,32 +1750,32 @@ static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkW
 	EditingToolsEditingToolWindow * self;
 	GtkFrame* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 66 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 62 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
-#line 66 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 62 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->layout_frame;
-#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = widget;
-#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), _tmp1_);
-#line 1769 "EditingTools.c"
+#line 1764 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 70 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 66 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self), FALSE);
-#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->user_moved;
-#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1784 "EditingTools.c"
+#line 1779 "EditingTools.c"
 }
 
 
@@ -1794,39 +1789,39 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge
 	GdkEventKey* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
-#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 70 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
-#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 70 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = event;
-#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 76 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 76 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 1812 "EditingTools.c"
+#line 1807 "EditingTools.c"
 	}
-#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = event;
-#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp4_, &_tmp5_);
-#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp6_;
-#line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 74 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1830 "EditingTools.c"
+#line 1825 "EditingTools.c"
 }
 
 
@@ -1843,78 +1838,78 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 	gdouble _tmp10_ = 0.0;
 	GdkEventButton* _tmp11_ = NULL;
 	guint32 _tmp12_ = 0U;
-#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 77 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
-#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 77 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 79 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = event;
-#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 79 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->button;
-#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 79 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != ((guint) 1)) {
-#line 1857 "EditingTools.c"
+#line 1852 "EditingTools.c"
 		gboolean _tmp2_ = FALSE;
-#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event != NULL) {
-#line 1861 "EditingTools.c"
+#line 1856 "EditingTools.c"
 			GdkEventButton* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp3_ = event;
-#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp4_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = _tmp4_;
-#line 1870 "EditingTools.c"
+#line 1865 "EditingTools.c"
 		} else {
-#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = TRUE;
-#line 1874 "EditingTools.c"
+#line 1869 "EditingTools.c"
 		}
-#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = _tmp2_;
-#line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 1880 "EditingTools.c"
+#line 1875 "EditingTools.c"
 	}
-#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = event;
-#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->button;
-#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = event;
-#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_->x_root;
-#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = event;
-#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_->y_root;
-#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
-#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->time;
-#line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 82 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_window_begin_move_drag (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), (gint) _tmp6_, (gint) _tmp8_, (gint) _tmp10_, _tmp12_);
-#line 87 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_moved = TRUE;
-#line 89 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 85 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 89 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 85 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1906 "EditingTools.c"
+#line 1901 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_window_real_realize (GtkWidget* base) {
 	EditingToolsEditingToolWindow * self;
-#line 92 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 88 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
-#line 93 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_window_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_TRANSIENT_WINDOW_OPACITY);
-#line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 89 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_TYPE (self, gtk_widget_get_type ()) ? ((GtkWidget*) self) : NULL, RESOURCES_TRANSIENT_WINDOW_OPACITY);
+#line 91 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
-#line 1918 "EditingTools.c"
+#line 1913 "EditingTools.c"
 }
 
 
@@ -1933,7 +1928,7 @@ static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToo
 	((GtkWidgetClass *) klass)->realize = editing_tools_editing_tool_window_real_realize;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_editing_tool_window_finalize;
-#line 1937 "EditingTools.c"
+#line 1932 "EditingTools.c"
 }
 
 
@@ -1949,7 +1944,7 @@ static void editing_tools_editing_tool_window_instance_init (EditingToolsEditing
 	self->priv->layout_frame = _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_moved = FALSE;
-#line 1953 "EditingTools.c"
+#line 1948 "EditingTools.c"
 }
 
 
@@ -1959,17 +1954,17 @@ static void editing_tools_editing_tool_window_finalize (GObject* obj) {
 	void* _tmp0__target = NULL;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
-#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = g_log_default_handler;
-#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0__target = NULL;
-#line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_log_set_handler ("Gdk", G_LOG_LEVEL_WARNING, _tmp0_, _tmp0__target);
 #line 31 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->layout_frame);
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_editing_tool_window_parent_class)->finalize (obj);
-#line 1973 "EditingTools.c"
+#line 1968 "EditingTools.c"
 }
 
 
@@ -1986,16 +1981,16 @@ GType editing_tools_editing_tool_window_get_type (void) {
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1992 "EditingTools.c"
+#line 1987 "EditingTools.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 1999 "EditingTools.c"
+#line 1994 "EditingTools.c"
 }
 
 
@@ -2017,85 +2012,85 @@ EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type
 	GdkPixbuf* _tmp13_ = NULL;
 	GdkRectangle _tmp14_ = {0};
 	cairo_surface_t* _tmp15_ = NULL;
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GDK_IS_WINDOW (drawing_window), NULL);
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (default_ctx != NULL, NULL);
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (surface_dim != NULL, NULL);
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (scaled), NULL);
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaled_position != NULL, NULL);
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsPhotoCanvas*) g_type_create_instance (object_type);
-#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->container);
-#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->container = _tmp1_;
-#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = drawing_window;
-#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->drawing_window);
-#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->drawing_window = _tmp3_;
-#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = photo;
-#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
-#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->photo = _tmp5_;
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = default_ctx;
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _cairo_reference0 (_tmp6_);
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->default_ctx);
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->default_ctx = _tmp7_;
-#line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *surface_dim;
-#line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->surface_dim = _tmp8_;
-#line 119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = *scaled_position;
-#line 119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_position = _tmp9_;
-#line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = scaled;
-#line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
-#line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_pixbuf = _tmp11_;
-#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = default_ctx;
-#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = scaled;
-#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = *scaled_position;
-#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = editing_tools_photo_canvas_pixbuf_to_surface (self, _tmp12_, _tmp13_, &_tmp14_);
-#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->scaled);
-#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled = _tmp15_;
-#line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 2099 "EditingTools.c"
+#line 2094 "EditingTools.c"
 }
 
 
@@ -2103,21 +2098,21 @@ void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* s
 	Photo* _tmp0_ = NULL;
 	GdkRectangle _tmp1_ = {0};
 	GdkRectangle _tmp2_ = {0};
-#line 129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (rectangle != NULL);
-#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->photo;
-#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = *rectangle;
-#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_unscaled_to_raw_rect (_tmp0_, &_tmp1_, &_tmp2_);
-#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp2_;
-#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2121 "EditingTools.c"
+#line 2116 "EditingTools.c"
 }
 
 
@@ -2143,61 +2138,61 @@ void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanva
 	gint _tmp13_ = 0;
 	GdkPoint _tmp14_ = {0};
 	gint _tmp15_ = 0;
-#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (active_point != NULL);
-#line 134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (self, &_tmp0_);
-#line 134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_position = _tmp0_;
-#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->photo;
-#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp2_);
-#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	unscaled_dims = _tmp2_;
-#line 137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = unscaled_dims;
-#line 137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.width;
-#line 137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = scaled_position;
-#line 137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.width;
-#line 137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scale_factor_x = ((gdouble) _tmp4_) / ((gdouble) _tmp6_);
-#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = unscaled_dims;
-#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.height;
-#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = scaled_position;
-#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.height;
-#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scale_factor_y = ((gdouble) _tmp8_) / ((gdouble) _tmp10_);
-#line 142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_.x = 0;
-#line 142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp11_;
-#line 143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = *active_point;
-#line 143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.x;
-#line 143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.x = (gint) ((((gdouble) _tmp13_) * scale_factor_x) + 0.5);
-#line 144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = *active_point;
-#line 144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_.y;
-#line 144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.y = (gint) ((((gdouble) _tmp15_) * scale_factor_y) + 0.5);
-#line 146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2201 "EditingTools.c"
+#line 2196 "EditingTools.c"
 }
 
 
@@ -2235,101 +2230,101 @@ void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas
 	gint _tmp27_ = 0;
 	GdkPoint _tmp28_ = {0};
 	gint _tmp29_ = 0;
-#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (active_rect != NULL);
-#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_.x = 0;
-#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left = _tmp0_;
-#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_.x = 0;
-#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right = _tmp1_;
-#line 152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *active_rect;
-#line 152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left.x = _tmp3_;
-#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *active_rect;
-#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left.y = _tmp5_;
-#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = upper_left;
-#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.x;
-#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *active_rect;
-#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.width;
-#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right.x = _tmp7_ + _tmp9_;
-#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = upper_left;
-#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.y;
-#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = *active_rect;
-#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.height;
-#line 155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right.y = _tmp11_ + _tmp13_;
-#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = upper_left;
-#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_active_to_unscaled_point (self, &_tmp14_, &_tmp15_);
-#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left = _tmp15_;
-#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = lower_right;
-#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_active_to_unscaled_point (self, &_tmp16_, &_tmp17_);
-#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right = _tmp17_;
-#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (&unscaled_rect, 0, sizeof (GdkRectangle));
-#line 161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = upper_left;
-#line 161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.x;
-#line 161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	unscaled_rect.x = _tmp19_;
-#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = upper_left;
-#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_.y;
-#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	unscaled_rect.y = _tmp21_;
-#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = lower_right;
-#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.x;
-#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = upper_left;
-#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.x;
-#line 163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	unscaled_rect.width = _tmp23_ - _tmp25_;
-#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = lower_right;
-#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.y;
-#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = upper_left;
-#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = _tmp28_.y;
-#line 164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	unscaled_rect.height = _tmp27_ - _tmp29_;
-#line 166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = unscaled_rect;
-#line 166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2333 "EditingTools.c"
+#line 2328 "EditingTools.c"
 }
 
 
@@ -2346,43 +2341,43 @@ void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* s
 	gint _tmp7_ = 0;
 	GdkRectangle _tmp8_ = {0};
 	gint _tmp9_ = 0;
-#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (user_point != NULL);
-#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (self, &_tmp0_);
-#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_offsets = _tmp0_;
-#line 172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_.x = 0;
-#line 172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp1_;
-#line 173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *user_point;
-#line 173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = active_offsets;
-#line 173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.x;
-#line 173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.x = _tmp3_ - _tmp5_;
-#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = *user_point;
-#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = active_offsets;
-#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.y;
-#line 174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.y = _tmp7_ - _tmp9_;
-#line 176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2386 "EditingTools.c"
+#line 2381 "EditingTools.c"
 }
 
 
@@ -2420,101 +2415,101 @@ void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* se
 	gint _tmp27_ = 0;
 	GdkPoint _tmp28_ = {0};
 	gint _tmp29_ = 0;
-#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (user_rect != NULL);
-#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_.x = 0;
-#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left = _tmp0_;
-#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_.x = 0;
-#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right = _tmp1_;
-#line 182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *user_rect;
-#line 182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left.x = _tmp3_;
-#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *user_rect;
-#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left.y = _tmp5_;
-#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = upper_left;
-#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.x;
-#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *user_rect;
-#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.width;
-#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right.x = _tmp7_ + _tmp9_;
-#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = upper_left;
-#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.y;
-#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = *user_rect;
-#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.height;
-#line 185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right.y = _tmp11_ + _tmp13_;
-#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = upper_left;
-#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_user_to_active_point (self, &_tmp14_, &_tmp15_);
-#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	upper_left = _tmp15_;
-#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = lower_right;
-#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_user_to_active_point (self, &_tmp16_, &_tmp17_);
-#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	lower_right = _tmp17_;
-#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (&active_rect, 0, sizeof (GdkRectangle));
-#line 191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = upper_left;
-#line 191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.x;
-#line 191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_rect.x = _tmp19_;
-#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = upper_left;
-#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_.y;
-#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_rect.y = _tmp21_;
-#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = lower_right;
-#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.x;
-#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = upper_left;
-#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.x;
-#line 193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_rect.width = _tmp23_ - _tmp25_;
-#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = lower_right;
-#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.y;
-#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = upper_left;
-#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = _tmp28_.y;
-#line 194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_rect.height = _tmp27_ - _tmp29_;
-#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = active_rect;
-#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2518 "EditingTools.c"
+#line 2513 "EditingTools.c"
 }
 
 
@@ -2522,17 +2517,17 @@ Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) {
 	Photo* result = NULL;
 	Photo* _tmp0_ = NULL;
 	Photo* _tmp1_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->photo;
-#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2536 "EditingTools.c"
+#line 2531 "EditingTools.c"
 }
 
 
@@ -2540,17 +2535,17 @@ GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* se
 	GtkWindow* result = NULL;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 199 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->container;
-#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2554 "EditingTools.c"
+#line 2549 "EditingTools.c"
 }
 
 
@@ -2558,17 +2553,17 @@ GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanva
 	GdkWindow* result = NULL;
 	GdkWindow* _tmp0_ = NULL;
 	GdkWindow* _tmp1_ = NULL;
-#line 207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->drawing_window;
-#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2572 "EditingTools.c"
+#line 2567 "EditingTools.c"
 }
 
 
@@ -2576,48 +2571,48 @@ cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* se
 	cairo_t* result = NULL;
 	cairo_t* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
-#line 211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _cairo_reference0 (_tmp0_);
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2590 "EditingTools.c"
+#line 2585 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result) {
 	Dimensions _tmp0_ = {0};
-#line 215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->surface_dim;
-#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp0_;
-#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2604 "EditingTools.c"
+#line 2599 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scaling* result) {
 	Dimensions _tmp0_ = {0};
 	Scaling _tmp1_ = {0};
-#line 219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->surface_dim;
-#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaling_for_viewport (&_tmp0_, FALSE, &_tmp1_);
-#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp1_;
-#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2621 "EditingTools.c"
+#line 2616 "EditingTools.c"
 }
 
 
@@ -2627,38 +2622,38 @@ void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cair
 	Dimensions _tmp2_ = {0};
 	cairo_t* _tmp3_ = NULL;
 	Dimensions _tmp4_ = {0};
-#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (default_ctx != NULL);
-#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (surface_dim != NULL);
-#line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = default_ctx;
-#line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _cairo_reference0 (_tmp0_);
-#line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->default_ctx);
-#line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->default_ctx = _tmp1_;
-#line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *surface_dim;
-#line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->surface_dim = _tmp2_;
-#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = default_ctx;
-#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *surface_dim;
-#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "new-surface", _tmp3_, &_tmp4_);
-#line 2655 "EditingTools.c"
+#line 2650 "EditingTools.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 2662 "EditingTools.c"
+#line 2657 "EditingTools.c"
 }
 
 
@@ -2666,17 +2661,17 @@ cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhot
 	cairo_surface_t* result = NULL;
 	cairo_surface_t* _tmp0_ = NULL;
 	cairo_surface_t* _tmp1_ = NULL;
-#line 230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->scaled;
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _cairo_surface_reference0 (_tmp0_);
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2680 "EditingTools.c"
+#line 2675 "EditingTools.c"
 }
 
 
@@ -2684,31 +2679,31 @@ GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->scaled_pixbuf;
-#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2698 "EditingTools.c"
+#line 2693 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self, GdkRectangle* result) {
 	GdkRectangle _tmp0_ = {0};
-#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->scaled_position;
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp0_;
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2712 "EditingTools.c"
+#line 2707 "EditingTools.c"
 }
 
 
@@ -2723,65 +2718,65 @@ void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, D
 	Dimensions _tmp7_ = {0};
 	GdkPixbuf* _tmp8_ = NULL;
 	GdkRectangle _tmp9_ = {0};
-#line 242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (scaled));
-#line 242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (scaled_position != NULL);
-#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = scaled;
-#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *scaled_position;
-#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_photo_canvas_pixbuf_to_surface (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->scaled);
-#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled = _tmp3_;
-#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = scaled;
-#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
-#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_pixbuf = _tmp5_;
-#line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = *scaled_position;
-#line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_position = _tmp6_;
-#line 247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = *old_dim;
-#line 247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = scaled;
-#line 247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = *scaled_position;
-#line 247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "resized-scaled-pixbuf", &_tmp7_, _tmp8_, &_tmp9_);
-#line 2767 "EditingTools.c"
+#line 2762 "EditingTools.c"
 }
 
 
 static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* self) {
-#line 250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_critical ("Type `%s' does not implement abstract method `editing_tools_photo_canvas_repaint'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2776 "EditingTools.c"
+#line 2771 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self) {
-#line 250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->repaint (self);
-#line 2785 "EditingTools.c"
+#line 2780 "EditingTools.c"
 }
 
 
@@ -2811,77 +2806,77 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk
 	gint _tmp22_ = 0;
 	cairo_t* _tmp23_ = NULL;
 	cairo_t* _tmp24_ = NULL;
-#line 258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->default_ctx;
-#line 262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->default_ctx;
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->surface_dim;
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.width;
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->surface_dim;
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.height;
-#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp2_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp4_, (gdouble) _tmp6_);
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->default_ctx;
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp7_);
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->default_ctx;
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = pixbuf;
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->scaled_position;
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.x;
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->scaled_position;
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.y;
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_cairo_set_source_pixbuf (_tmp8_, _tmp9_, (gdouble) _tmp11_, (gdouble) _tmp13_);
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->default_ctx;
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->scaled_position;
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.x;
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->scaled_position;
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.y;
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = pixbuf;
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = gdk_pixbuf_get_width (_tmp19_);
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = pixbuf;
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = gdk_pixbuf_get_height (_tmp21_);
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp14_, (gdouble) _tmp16_, (gdouble) _tmp18_, (gdouble) _tmp20_, (gdouble) _tmp22_);
-#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->default_ctx;
-#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp23_);
-#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->default_ctx;
-#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp24_);
-#line 2885 "EditingTools.c"
+#line 2880 "EditingTools.c"
 }
 
 
@@ -2908,23 +2903,23 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 	gint _tmp32_ = 0;
 	cairo_t* _tmp33_ = NULL;
 	cairo_t* _tmp34_ = NULL;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (source_area != NULL);
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = pixbuf;
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gdk_pixbuf_get_has_alpha (_tmp1_);
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_) {
-#line 2928 "EditingTools.c"
+#line 2923 "EditingTools.c"
 		cairo_t* _tmp3_ = NULL;
 		cairo_t* _tmp4_ = NULL;
 		GdkRectangle _tmp5_ = {0};
@@ -2938,87 +2933,87 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
 		cairo_t* _tmp15_ = NULL;
-#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
-#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->default_ctx;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->scaled_position;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.x;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = *source_area;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.left;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = self->priv->scaled_position;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = _tmp9_.y;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = *source_area;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = _tmp11_.top;
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = box_get_width (source_area);
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = box_get_height (source_area);
-#line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_rectangle (_tmp4_, (gdouble) (_tmp6_ + _tmp8_), (gdouble) (_tmp10_ + _tmp12_), (gdouble) _tmp13_, (gdouble) _tmp14_);
-#line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = self->priv->default_ctx;
-#line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_fill (_tmp15_);
-#line 2974 "EditingTools.c"
+#line 2969 "EditingTools.c"
 	}
-#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->default_ctx;
-#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = pixbuf;
-#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->scaled_position;
-#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.x;
-#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->scaled_position;
-#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_.y;
-#line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_cairo_set_source_pixbuf (_tmp16_, _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp21_);
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->default_ctx;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->scaled_position;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _tmp23_.x;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = *source_area;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_.left;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->priv->scaled_position;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _tmp27_.y;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = *source_area;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_.top;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = box_get_width (source_area);
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = box_get_height (source_area);
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp22_, (gdouble) (_tmp24_ + _tmp26_), (gdouble) (_tmp28_ + _tmp30_), (gdouble) _tmp31_, (gdouble) _tmp32_);
-#line 289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->default_ctx;
-#line 289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp33_);
-#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = self->priv->default_ctx;
-#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp34_);
-#line 3022 "EditingTools.c"
+#line 3017 "EditingTools.c"
 }
 
 
@@ -3040,74 +3035,74 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca
 	gint _tmp16_ = 0;
 	cairo_t* _tmp17_ = NULL;
 	cairo_t* _tmp18_ = NULL;
-#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (surface != NULL);
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = over;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == FALSE) {
-#line 3056 "EditingTools.c"
+#line 3051 "EditingTools.c"
 		cairo_t* _tmp2_ = NULL;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->default_ctx;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3062 "EditingTools.c"
+#line 3057 "EditingTools.c"
 	} else {
 		cairo_t* _tmp3_ = NULL;
-#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
-#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3069 "EditingTools.c"
+#line 3064 "EditingTools.c"
 	}
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->default_ctx;
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->scaled;
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->scaled_position;
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.x;
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->scaled_position;
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.y;
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_);
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->default_ctx;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (_tmp10_);
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->default_ctx;
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = surface;
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->scaled_position;
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.x;
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->scaled_position;
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.y;
-#line 303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp11_, _tmp12_, (gdouble) _tmp14_, (gdouble) _tmp16_);
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->default_ctx;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (_tmp17_);
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->default_ctx;
-#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp18_);
-#line 3111 "EditingTools.c"
+#line 3106 "EditingTools.c"
 }
 
 
@@ -3151,124 +3146,124 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel
 	gint _tmp38_ = 0;
 	cairo_t* _tmp39_ = NULL;
 	cairo_t* _tmp40_ = NULL;
-#line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (surface != NULL);
-#line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (source_area != NULL);
-#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = over;
-#line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == FALSE) {
-#line 3169 "EditingTools.c"
+#line 3164 "EditingTools.c"
 		cairo_t* _tmp2_ = NULL;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->default_ctx;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3175 "EditingTools.c"
+#line 3170 "EditingTools.c"
 	} else {
 		cairo_t* _tmp3_ = NULL;
-#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
-#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3182 "EditingTools.c"
+#line 3177 "EditingTools.c"
 	}
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->default_ctx;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->scaled;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->scaled_position;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.x;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->scaled_position;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.y;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_);
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->default_ctx;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->scaled_position;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.x;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = *source_area;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.left;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->scaled_position;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.y;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = *source_area;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.top;
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = box_get_width (source_area);
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = box_get_height (source_area);
-#line 316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp10_, (gdouble) (_tmp12_ + _tmp14_), (gdouble) (_tmp16_ + _tmp18_), (gdouble) _tmp19_, (gdouble) _tmp20_);
-#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->default_ctx;
-#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp21_);
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->default_ctx;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = surface;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->scaled_position;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.x;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->priv->scaled_position;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.y;
-#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp22_, _tmp23_, (gdouble) _tmp25_, (gdouble) _tmp27_);
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = self->priv->default_ctx;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->scaled_position;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_.x;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = *source_area;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_.left;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->scaled_position;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_.y;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = *source_area;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = _tmp35_.top;
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = box_get_width (source_area);
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = box_get_height (source_area);
-#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp28_, (gdouble) (_tmp30_ + _tmp32_), (gdouble) (_tmp34_ + _tmp36_), (gdouble) _tmp37_, (gdouble) _tmp38_);
-#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->default_ctx;
-#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp39_);
-#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = self->priv->default_ctx;
-#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp40_);
-#line 3272 "EditingTools.c"
+#line 3267 "EditingTools.c"
 }
 
 
@@ -3291,57 +3286,57 @@ void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t
 	GdkRectangle _tmp14_ = {0};
 	gint _tmp15_ = 0;
 	cairo_t* _tmp16_ = NULL;
-#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (box != NULL);
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_rectangle (box, &_tmp0_);
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect = _tmp0_;
-#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = rect.x;
-#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->scaled_position;
-#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.x = _tmp1_ + _tmp3_;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = rect.y;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->scaled_position;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.y;
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.y = _tmp4_ + _tmp6_;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = rect;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.x;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = rect;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.y;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = rect;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.width;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = rect;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_.height;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp7_, _tmp9_ + 0.5, _tmp11_ + 0.5, (gdouble) (_tmp13_ - 1), (gdouble) (_tmp15_ - 1));
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = ctx;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp16_);
-#line 3345 "EditingTools.c"
+#line 3340 "EditingTools.c"
 }
 
 
@@ -3372,106 +3367,106 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 	cairo_t* _tmp27_ = NULL;
 	cairo_t* _tmp28_ = NULL;
 	const gchar* _tmp29_ = NULL;
-#line 338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
-#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = use_scaled_pos;
-#line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3386 "EditingTools.c"
+#line 3381 "EditingTools.c"
 		gint _tmp1_ = 0;
 		GdkRectangle _tmp2_ = {0};
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		GdkRectangle _tmp5_ = {0};
 		gint _tmp6_ = 0;
-#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
-#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->scaled_position;
-#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_.x;
-#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = _tmp1_ + _tmp3_;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = y;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->scaled_position;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.y;
-#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3409 "EditingTools.c"
+#line 3404 "EditingTools.c"
 	}
-#line 344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
-#line 344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = text;
-#line 344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_text_extents (_tmp7_, _tmp8_, &_tmp9_);
-#line 344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	extents = _tmp9_;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = x;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = extents;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.width;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	x = _tmp10_ - (((gint) _tmp12_) / 2);
-#line 347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = ctx;
-#line 347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp13_, RESOURCES_ONIMAGE_FONT_BACKGROUND);
-#line 349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pane_border = 5;
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = ctx;
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = x;
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = y;
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = extents;
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.height;
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = extents;
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_.width;
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = extents;
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_.height;
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp14_, (gdouble) (_tmp15_ - pane_border), (_tmp16_ - pane_border) - _tmp18_, _tmp20_ + (2 * pane_border), _tmp22_ + (2 * pane_border));
-#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = ctx;
-#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp23_);
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = ctx;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = x;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = y;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_move_to (_tmp24_, (gdouble) _tmp25_, (gdouble) _tmp26_);
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = ctx;
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp27_, RESOURCES_ONIMAGE_FONT_COLOR);
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = ctx;
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = text;
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_show_text (_tmp28_, _tmp29_);
-#line 3475 "EditingTools.c"
+#line 3470 "EditingTools.c"
 }
 
 
@@ -3496,62 +3491,62 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
 	gint _tmp12_ = 0;
 	gint _tmp13_ = 0;
 	cairo_t* _tmp14_ = NULL;
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = use_scaled_pos;
-#line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3508 "EditingTools.c"
+#line 3503 "EditingTools.c"
 		gint _tmp1_ = 0;
 		GdkRectangle _tmp2_ = {0};
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		GdkRectangle _tmp5_ = {0};
 		gint _tmp6_ = 0;
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->scaled_position;
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_.x;
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = _tmp1_ + _tmp3_;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = y;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->scaled_position;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.y;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3531 "EditingTools.c"
+#line 3526 "EditingTools.c"
 	}
-#line 377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
-#line 377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = x;
-#line 377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = y;
-#line 377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5);
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = ctx;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = x;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = width;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = y;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_line_to (_tmp10_, (gdouble) ((_tmp11_ + _tmp12_) - 1), _tmp13_ + 0.5);
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = ctx;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp14_);
-#line 3555 "EditingTools.c"
+#line 3550 "EditingTools.c"
 }
 
 
@@ -3576,62 +3571,62 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
 	gint _tmp12_ = 0;
 	gint _tmp13_ = 0;
 	cairo_t* _tmp14_ = NULL;
-#line 393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = use_scaled_pos;
-#line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3588 "EditingTools.c"
+#line 3583 "EditingTools.c"
 		gint _tmp1_ = 0;
 		GdkRectangle _tmp2_ = {0};
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		GdkRectangle _tmp5_ = {0};
 		gint _tmp6_ = 0;
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->scaled_position;
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_.x;
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = _tmp1_ + _tmp3_;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = y;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->scaled_position;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.y;
-#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3611 "EditingTools.c"
+#line 3606 "EditingTools.c"
 	}
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = x;
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = y;
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5);
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = ctx;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = x;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = y;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = height;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_line_to (_tmp10_, _tmp11_ + 0.5, (gdouble) ((_tmp12_ + _tmp13_) - 1));
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = ctx;
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp14_);
-#line 3635 "EditingTools.c"
+#line 3630 "EditingTools.c"
 }
 
 
@@ -3654,57 +3649,57 @@ void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas*
 	gint _tmp15_ = 0;
 	cairo_t* _tmp16_ = NULL;
 	cairo_t* _tmp17_ = NULL;
-#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->default_ctx;
-#line 407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE);
-#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->default_ctx;
-#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->scaled;
-#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->scaled_position;
-#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.x;
-#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->scaled_position;
-#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp2_, _tmp3_, (gdouble) _tmp5_, (gdouble) _tmp7_);
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->default_ctx;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->scaled_position;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.x;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = x;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->scaled_position;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.y;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = y;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = width;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) (_tmp15_ - 1), (gdouble) 1);
-#line 411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->default_ctx;
-#line 411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp16_);
-#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->default_ctx;
-#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp17_);
-#line 3708 "EditingTools.c"
+#line 3703 "EditingTools.c"
 }
 
 
@@ -3720,37 +3715,37 @@ void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cair
 	cairo_t* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	cairo_t* _tmp8_ = NULL;
-#line 416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = active_center_x;
-#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->scaled_position;
-#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_.x;
-#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	center_x = _tmp0_ + _tmp2_;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = active_center_y;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->scaled_position;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	center_y = _tmp3_ + _tmp5_;
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = ctx;
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = radius;
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_arc (_tmp6_, (gdouble) center_x, (gdouble) center_y, (gdouble) _tmp7_, (gdouble) 0, 2 * G_PI);
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = ctx;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp8_);
-#line 3754 "EditingTools.c"
+#line 3749 "EditingTools.c"
 }
 
 
@@ -3773,57 +3768,57 @@ void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* se
 	gint _tmp15_ = 0;
 	cairo_t* _tmp16_ = NULL;
 	cairo_t* _tmp17_ = NULL;
-#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
-#line 426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
-#line 432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->default_ctx;
-#line 432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE);
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->default_ctx;
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->scaled;
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->scaled_position;
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.x;
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->scaled_position;
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_surface (_tmp2_, _tmp3_, (gdouble) _tmp5_, (gdouble) _tmp7_);
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->default_ctx;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->scaled_position;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.x;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = x;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->scaled_position;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.y;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = y;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = height;
-#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) 1, (gdouble) _tmp15_);
-#line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->default_ctx;
-#line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (_tmp16_);
-#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->default_ctx;
-#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp17_);
-#line 3827 "EditingTools.c"
+#line 3822 "EditingTools.c"
 }
 
 
@@ -3848,59 +3843,59 @@ void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* b
 	Box _tmp17_ = {0};
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
-#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (box != NULL);
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *box;
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_.left;
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *box;
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.top;
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = box_get_width (box);
-#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_horizontal_line (self, _tmp1_, _tmp3_, _tmp4_);
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *box;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.left;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = *box;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.bottom;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = box_get_width (box);
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_horizontal_line (self, _tmp6_, _tmp8_, _tmp9_);
-#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = *box;
-#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.left;
-#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = *box;
-#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.top;
-#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = box_get_height (box);
-#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_vertical_line (self, _tmp11_, _tmp13_, _tmp14_);
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = *box;
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.right;
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = *box;
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.top;
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = box_get_height (box);
-#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_vertical_line (self, _tmp16_, _tmp18_, _tmp19_);
-#line 3904 "EditingTools.c"
+#line 3899 "EditingTools.c"
 }
 
 
@@ -3915,37 +3910,37 @@ void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self,
 	gint _tmp6_ = 0;
 	GdkWindow* _tmp7_ = NULL;
 	GdkRectangle _tmp8_ = {0};
-#line 449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
-#line 449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (area != NULL);
-#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_rectangle (area, &_tmp0_);
-#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect = _tmp0_;
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = rect.x;
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->scaled_position;
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.x = _tmp1_ + _tmp3_;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = rect.y;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->scaled_position;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.y;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.y = _tmp4_ + _tmp6_;
-#line 454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->drawing_window;
-#line 454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = rect;
-#line 454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_window_invalidate_rect (_tmp7_, &_tmp8_, FALSE);
-#line 3949 "EditingTools.c"
+#line 3944 "EditingTools.c"
 }
 
 
@@ -3962,47 +3957,47 @@ static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToo
 	cairo_t* ctx = NULL;
 	cairo_t* _tmp7_ = NULL;
 	GdkPixbuf* _tmp8_ = NULL;
-#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
-#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (default_ctx != NULL, NULL);
-#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (pos != NULL, NULL);
-#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = default_ctx;
-#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = cairo_get_target (_tmp0_);
-#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *pos;
-#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.width;
-#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *pos;
-#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.height;
-#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = cairo_surface_create_similar (_tmp1_, CAIRO_CONTENT_COLOR_ALPHA, _tmp3_, _tmp5_);
-#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	surface = _tmp6_;
-#line 461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = cairo_create (surface);
-#line 461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp7_;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = pixbuf;
-#line 462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_cairo_set_source_pixbuf (ctx, _tmp8_, (gdouble) 0, (gdouble) 0);
-#line 463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (ctx);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = surface;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4006 "EditingTools.c"
+#line 4001 "EditingTools.c"
 }
 
 
@@ -4013,27 +4008,27 @@ static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GVa
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = closure->data;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4025 "EditingTools.c"
+#line 4020 "EditingTools.c"
 	} else {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4031 "EditingTools.c"
+#line 4026 "EditingTools.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_pointer (param_values + 1), g_value_get_boxed (param_values + 2), data2);
-#line 4037 "EditingTools.c"
+#line 4032 "EditingTools.c"
 }
 
 
@@ -4044,255 +4039,255 @@ static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (n_param_values == 4);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = closure->data;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4056 "EditingTools.c"
+#line 4051 "EditingTools.c"
 	} else {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4062 "EditingTools.c"
+#line 4057 "EditingTools.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_boxed (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), data2);
-#line 4068 "EditingTools.c"
+#line 4063 "EditingTools.c"
 }
 
 
 static void editing_tools_value_photo_canvas_init (GValue* value) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4075 "EditingTools.c"
+#line 4070 "EditingTools.c"
 }
 
 
 static void editing_tools_value_photo_canvas_free_value (GValue* value) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (value->data[0].v_pointer) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (value->data[0].v_pointer);
-#line 4084 "EditingTools.c"
+#line 4079 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (src_value->data[0].v_pointer) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_photo_canvas_ref (src_value->data[0].v_pointer);
-#line 4094 "EditingTools.c"
+#line 4089 "EditingTools.c"
 	} else {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4098 "EditingTools.c"
+#line 4093 "EditingTools.c"
 	}
 }
 
 
 static gpointer editing_tools_value_photo_canvas_peek_pointer (const GValue* value) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4106 "EditingTools.c"
+#line 4101 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_photo_canvas_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4113 "EditingTools.c"
+#line 4108 "EditingTools.c"
 		EditingToolsPhotoCanvas* object;
 		object = collect_values[0].v_pointer;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4120 "EditingTools.c"
+#line 4115 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4124 "EditingTools.c"
+#line 4119 "EditingTools.c"
 		}
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_photo_canvas_ref (object);
-#line 4128 "EditingTools.c"
+#line 4123 "EditingTools.c"
 	} else {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4132 "EditingTools.c"
+#line 4127 "EditingTools.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4136 "EditingTools.c"
+#line 4131 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_photo_canvas_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	EditingToolsPhotoCanvas** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4147 "EditingTools.c"
+#line 4142 "EditingTools.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4153 "EditingTools.c"
+#line 4148 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4157 "EditingTools.c"
+#line 4152 "EditingTools.c"
 	} else {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4161 "EditingTools.c"
+#line 4156 "EditingTools.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4165 "EditingTools.c"
+#line 4160 "EditingTools.c"
 }
 
 
 GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	EditingToolsParamSpecPhotoCanvas* spec;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4179 "EditingTools.c"
+#line 4174 "EditingTools.c"
 }
 
 
 gpointer editing_tools_value_get_photo_canvas (const GValue* value) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4188 "EditingTools.c"
+#line 4183 "EditingTools.c"
 }
 
 
 void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) {
 	EditingToolsPhotoCanvas* old;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4208 "EditingTools.c"
+#line 4203 "EditingTools.c"
 	} else {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4212 "EditingTools.c"
+#line 4207 "EditingTools.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 4218 "EditingTools.c"
+#line 4213 "EditingTools.c"
 	}
 }
 
 
 void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) {
 	EditingToolsPhotoCanvas* old;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4237 "EditingTools.c"
+#line 4232 "EditingTools.c"
 	} else {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4241 "EditingTools.c"
+#line 4236 "EditingTools.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 4247 "EditingTools.c"
+#line 4242 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass * klass) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_parent_class = g_type_class_peek_parent (klass);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsPhotoCanvasClass *) klass)->finalize = editing_tools_photo_canvas_finalize;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsPhotoCanvasPrivate));
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsPhotoCanvasClass *) klass)->repaint = editing_tools_photo_canvas_real_repaint;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_new ("new_surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_BOXED, G_TYPE_NONE, 2, G_TYPE_POINTER, TYPE_DIMENSIONS);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_new ("resized_scaled_pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, gdk_pixbuf_get_type (), gdk_rectangle_get_type ());
-#line 4265 "EditingTools.c"
+#line 4260 "EditingTools.c"
 }
 
 
 static void editing_tools_photo_canvas_instance_init (EditingToolsPhotoCanvas * self) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_PHOTO_CANVAS_GET_PRIVATE (self);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4274 "EditingTools.c"
+#line 4269 "EditingTools.c"
 }
 
 
 static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas* obj) {
 	EditingToolsPhotoCanvas * self;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_destroy (self);
-#line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 99 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->container);
-#line 104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->drawing_window);
-#line 105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
-#line 106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->default_ctx);
-#line 108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->scaled);
-#line 109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
-#line 4296 "EditingTools.c"
+#line 4291 "EditingTools.c"
 }
 
 
@@ -4313,24 +4308,24 @@ GType editing_tools_photo_canvas_get_type (void) {
 gpointer editing_tools_photo_canvas_ref (gpointer instance) {
 	EditingToolsPhotoCanvas* self;
 	self = instance;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 4321 "EditingTools.c"
+#line 4316 "EditingTools.c"
 }
 
 
 void editing_tools_photo_canvas_unref (gpointer instance) {
 	EditingToolsPhotoCanvas* self;
 	self = instance;
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->finalize (self);
-#line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 98 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4334 "EditingTools.c"
+#line 4329 "EditingTools.c"
 	}
 }
 
@@ -4339,37 +4334,37 @@ EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type
 	EditingToolsEditingTool* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsEditingTool*) g_type_create_instance (object_type);
-#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = name;
-#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->name = _tmp1_;
-#line 489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 4357 "EditingTools.c"
+#line 4352 "EditingTools.c"
 }
 
 
 static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) {
-#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_photo_canvas_ref (self) : NULL;
-#line 4364 "EditingTools.c"
+#line 4359 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event);
-#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4373 "EditingTools.c"
+#line 4368 "EditingTools.c"
 }
 
 
@@ -4380,54 +4375,54 @@ static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* s
 	EditingToolsPhotoCanvas* _tmp3_ = NULL;
 	EditingToolsEditingToolWindow* _tmp4_ = NULL;
 	EditingToolsEditingToolWindow* _tmp5_ = NULL;
-#line 497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->canvas;
-#line 499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp0_ == NULL, "this.canvas == null");
-#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->tool_window;
-#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp1_ == NULL, "tool_window == null");
-#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = canvas;
-#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _editing_tools_photo_canvas_ref0 (_tmp2_);
-#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
-#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->canvas = _tmp3_;
-#line 504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = editing_tools_editing_tool_get_tool_window (self);
-#line 504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->tool_window);
-#line 504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->tool_window = _tmp4_;
-#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->tool_window;
-#line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 4412 "EditingTools.c"
+#line 4407 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp6_ = NULL;
-#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->tool_window;
-#line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
-#line 4418 "EditingTools.c"
+#line 4413 "EditingTools.c"
 	}
-#line 508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "activated");
-#line 4422 "EditingTools.c"
+#line 4417 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas) {
-#line 497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->activate (self, canvas);
-#line 4431 "EditingTools.c"
+#line 4426 "EditingTools.c"
 }
 
 
@@ -4435,129 +4430,129 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 	gboolean _tmp0_ = FALSE;
 	EditingToolsPhotoCanvas* _tmp1_ = NULL;
 	EditingToolsEditingToolWindow* _tmp3_ = NULL;
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->canvas;
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == NULL) {
-#line 4443 "EditingTools.c"
+#line 4438 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp2_ = NULL;
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->tool_window;
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 4449 "EditingTools.c"
+#line 4444 "EditingTools.c"
 	} else {
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 4453 "EditingTools.c"
+#line 4448 "EditingTools.c"
 	}
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 4459 "EditingTools.c"
+#line 4454 "EditingTools.c"
 	}
-#line 517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
-#line 517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->canvas = NULL;
-#line 519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->tool_window;
-#line 519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_ != NULL) {
-#line 4469 "EditingTools.c"
+#line 4464 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp4_ = NULL;
 		guint _tmp5_ = 0U;
-#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->tool_window;
-#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp5_, NULL, FALSE);
-#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
-#line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->tool_window);
-#line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tool_window = NULL;
-#line 4482 "EditingTools.c"
+#line 4477 "EditingTools.c"
 	}
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "deactivated");
-#line 4486 "EditingTools.c"
+#line 4481 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self) {
-#line 512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->deactivate (self);
-#line 4495 "EditingTools.c"
+#line 4490 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self) {
 	gboolean result = FALSE;
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
-#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->canvas;
-#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_ != NULL;
-#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4510 "EditingTools.c"
+#line 4505 "EditingTools.c"
 }
 
 
 static EditingToolsEditingToolWindow* editing_tools_editing_tool_real_get_tool_window (EditingToolsEditingTool* self) {
 	EditingToolsEditingToolWindow* result = NULL;
-#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = NULL;
-#line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4520 "EditingTools.c"
+#line 4515 "EditingTools.c"
 }
 
 
 EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self) {
-#line 531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
-#line 531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_tool_window (self);
-#line 4529 "EditingTools.c"
+#line 4524 "EditingTools.c"
 }
 
 
 static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) {
 	Dimensions _vala_max_dim = {0};
 	GdkPixbuf* result = NULL;
-#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions_init (&_vala_max_dim, 0, 0);
-#line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = NULL;
-#line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (max_dim) {
-#line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 4548 "EditingTools.c"
+#line 4543 "EditingTools.c"
 	}
-#line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4552 "EditingTools.c"
+#line 4547 "EditingTools.c"
 }
 
 
 GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) {
-#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
-#line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_display_pixbuf (self, scaling, photo, max_dim, error);
-#line 4561 "EditingTools.c"
+#line 4556 "EditingTools.c"
 }
 
 
@@ -4566,11 +4561,11 @@ static void editing_tools_editing_tool_real_on_left_click (EditingToolsEditingTo
 
 
 void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gint x, gint y) {
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_click (self, x, y);
-#line 4574 "EditingTools.c"
+#line 4569 "EditingTools.c"
 }
 
 
@@ -4579,11 +4574,11 @@ static void editing_tools_editing_tool_real_on_left_released (EditingToolsEditin
 
 
 void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, gint x, gint y) {
-#line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_released (self, x, y);
-#line 4587 "EditingTools.c"
+#line 4582 "EditingTools.c"
 }
 
 
@@ -4592,30 +4587,30 @@ static void editing_tools_editing_tool_real_on_motion (EditingToolsEditingTool*
 
 
 void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask) {
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_motion (self, x, y, mask);
-#line 4600 "EditingTools.c"
+#line 4595 "EditingTools.c"
 }
 
 
 static gboolean editing_tools_editing_tool_real_on_leave_notify_event (EditingToolsEditingTool* self) {
 	gboolean result = FALSE;
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4610 "EditingTools.c"
+#line 4605 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self) {
-#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
-#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_leave_notify_event (self);
-#line 4619 "EditingTools.c"
+#line 4614 "EditingTools.c"
 }
 
 
@@ -4624,63 +4619,63 @@ static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditing
 	GdkEventKey* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
 	const gchar* _tmp2_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = event;
-#line 568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_notify_cancel (self);
-#line 571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 4644 "EditingTools.c"
+#line 4639 "EditingTools.c"
 	}
-#line 574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4650 "EditingTools.c"
+#line 4645 "EditingTools.c"
 }
 
 
 gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event) {
-#line 566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
-#line 566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_keypress (self, event);
-#line 4659 "EditingTools.c"
+#line 4654 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
-#line 577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 4666 "EditingTools.c"
+#line 4661 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
-#line 577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->paint (self, ctx);
-#line 4675 "EditingTools.c"
+#line 4670 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self) {
-#line 581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
-#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "cancelled");
-#line 4684 "EditingTools.c"
+#line 4679 "EditingTools.c"
 }
 
 
@@ -4691,279 +4686,279 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (n_param_values == 5);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = closure->data;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4703 "EditingTools.c"
+#line 4698 "EditingTools.c"
 	} else {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4709 "EditingTools.c"
+#line 4704 "EditingTools.c"
 	}
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 4715 "EditingTools.c"
+#line 4710 "EditingTools.c"
 }
 
 
 static void editing_tools_value_editing_tool_init (GValue* value) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4722 "EditingTools.c"
+#line 4717 "EditingTools.c"
 }
 
 
 static void editing_tools_value_editing_tool_free_value (GValue* value) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (value->data[0].v_pointer) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (value->data[0].v_pointer);
-#line 4731 "EditingTools.c"
+#line 4726 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_value_editing_tool_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (src_value->data[0].v_pointer) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_editing_tool_ref (src_value->data[0].v_pointer);
-#line 4741 "EditingTools.c"
+#line 4736 "EditingTools.c"
 	} else {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4745 "EditingTools.c"
+#line 4740 "EditingTools.c"
 	}
 }
 
 
 static gpointer editing_tools_value_editing_tool_peek_pointer (const GValue* value) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4753 "EditingTools.c"
+#line 4748 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_editing_tool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4760 "EditingTools.c"
+#line 4755 "EditingTools.c"
 		EditingToolsEditingTool* object;
 		object = collect_values[0].v_pointer;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4767 "EditingTools.c"
+#line 4762 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4771 "EditingTools.c"
+#line 4766 "EditingTools.c"
 		}
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_editing_tool_ref (object);
-#line 4775 "EditingTools.c"
+#line 4770 "EditingTools.c"
 	} else {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4779 "EditingTools.c"
+#line 4774 "EditingTools.c"
 	}
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4783 "EditingTools.c"
+#line 4778 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_editing_tool_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	EditingToolsEditingTool** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4794 "EditingTools.c"
+#line 4789 "EditingTools.c"
 	}
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4800 "EditingTools.c"
+#line 4795 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4804 "EditingTools.c"
+#line 4799 "EditingTools.c"
 	} else {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4808 "EditingTools.c"
+#line 4803 "EditingTools.c"
 	}
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4812 "EditingTools.c"
+#line 4807 "EditingTools.c"
 }
 
 
 GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	EditingToolsParamSpecEditingTool* spec;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4826 "EditingTools.c"
+#line 4821 "EditingTools.c"
 }
 
 
 gpointer editing_tools_value_get_editing_tool (const GValue* value) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4835 "EditingTools.c"
+#line 4830 "EditingTools.c"
 }
 
 
 void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) {
 	EditingToolsEditingTool* old;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4855 "EditingTools.c"
+#line 4850 "EditingTools.c"
 	} else {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4859 "EditingTools.c"
+#line 4854 "EditingTools.c"
 	}
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4865 "EditingTools.c"
+#line 4860 "EditingTools.c"
 	}
 }
 
 
 void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) {
 	EditingToolsEditingTool* old;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_TYPE_EDITING_TOOL));
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4884 "EditingTools.c"
+#line 4879 "EditingTools.c"
 	} else {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4888 "EditingTools.c"
+#line 4883 "EditingTools.c"
 	}
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4894 "EditingTools.c"
+#line 4889 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass * klass) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_parent_class = g_type_class_peek_parent (klass);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_editing_tool_finalize;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsEditingToolPrivate));
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->activate = editing_tools_editing_tool_real_activate;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->deactivate = editing_tools_editing_tool_real_deactivate;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_editing_tool_real_get_tool_window;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = editing_tools_editing_tool_real_get_display_pixbuf;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_click = editing_tools_editing_tool_real_on_left_click;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_released = editing_tools_editing_tool_real_on_left_released;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_motion = editing_tools_editing_tool_real_on_motion;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_leave_notify_event = editing_tools_editing_tool_real_on_leave_notify_event;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_editing_tool_real_on_keypress;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = editing_tools_editing_tool_real_paint;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_new ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_new ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_new ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN, G_TYPE_NONE, 4, TYPE_COMMAND, gdk_pixbuf_get_type (), TYPE_DIMENSIONS, G_TYPE_BOOLEAN);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_new ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_new ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4936 "EditingTools.c"
+#line 4931 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_instance_init (EditingToolsEditingTool * self) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_EDITING_TOOL_GET_PRIVATE (self);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->canvas = NULL;
-#line 471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->tool_window = NULL;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4949 "EditingTools.c"
+#line 4944 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_finalize (EditingToolsEditingTool* obj) {
 	EditingToolsEditingTool * self;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_destroy (self);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
-#line 471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->tool_window);
-#line 472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->surface);
-#line 473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 4967 "EditingTools.c"
+#line 4962 "EditingTools.c"
 }
 
 
@@ -4984,24 +4979,24 @@ GType editing_tools_editing_tool_get_type (void) {
 gpointer editing_tools_editing_tool_ref (gpointer instance) {
 	EditingToolsEditingTool* self;
 	self = instance;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 4992 "EditingTools.c"
+#line 4987 "EditingTools.c"
 }
 
 
 void editing_tools_editing_tool_unref (gpointer instance) {
 	EditingToolsEditingTool* self;
 	self = instance;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->finalize (self);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5005 "EditingTools.c"
+#line 5000 "EditingTools.c"
 	}
 }
 
@@ -5009,21 +5004,21 @@ void editing_tools_editing_tool_unref (gpointer instance) {
 static EditingToolsCropToolReticleOrientation editing_tools_crop_tool_reticle_orientation_toggle (EditingToolsCropToolReticleOrientation self) {
 	EditingToolsCropToolReticleOrientation result = 0;
 	EditingToolsCropToolReticleOrientation _tmp0_ = 0;
-#line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (self == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
-#line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT;
-#line 5017 "EditingTools.c"
+#line 5012 "EditingTools.c"
 	} else {
-#line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 5021 "EditingTools.c"
+#line 5016 "EditingTools.c"
 	}
-#line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5027 "EditingTools.c"
+#line 5022 "EditingTools.c"
 }
 
 
@@ -5053,31 +5048,31 @@ static GType editing_tools_crop_tool_constraint_mode_get_type (void) {
 
 static EditingToolsCropTool* editing_tools_crop_tool_construct (GType object_type) {
 	EditingToolsCropTool* self = NULL;
-#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsCropTool*) editing_tools_editing_tool_construct (object_type, "CropTool");
-#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 5061 "EditingTools.c"
+#line 5056 "EditingTools.c"
 }
 
 
 static EditingToolsCropTool* editing_tools_crop_tool_new (void) {
-#line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_construct (EDITING_TOOLS_TYPE_CROP_TOOL);
-#line 5068 "EditingTools.c"
+#line 5063 "EditingTools.c"
 }
 
 
 EditingToolsCropTool* editing_tools_crop_tool_factory (void) {
 	EditingToolsCropTool* result = NULL;
 	EditingToolsCropTool* _tmp0_ = NULL;
-#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_new ();
-#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5081 "EditingTools.c"
+#line 5076 "EditingTools.c"
 }
 
 
@@ -5090,537 +5085,537 @@ gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) {
 	gboolean _tmp3_ = FALSE;
 	Dimensions _tmp4_ = {0};
 	gint _tmp5_ = 0;
-#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_get_original_dimensions (_tmp0_, &_tmp1_);
-#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_);
-#line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dim = _tmp2_;
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = dim;
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.width;
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 5112 "EditingTools.c"
+#line 5107 "EditingTools.c"
 		Dimensions _tmp6_ = {0};
 		gint _tmp7_ = 0;
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = dim;
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.height;
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 5121 "EditingTools.c"
+#line 5116 "EditingTools.c"
 	} else {
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 5125 "EditingTools.c"
+#line 5120 "EditingTools.c"
 	}
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp3_;
-#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5131 "EditingTools.c"
+#line 5126 "EditingTools.c"
 }
 
 
 static void _vala_array_add4 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if ((*length) == (*size)) {
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
+#line 5137 "EditingTools.c"
+	}
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[(*length)++] = value;
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[*length] = NULL;
+#line 5143 "EditingTools.c"
+}
+
+
+static void _vala_array_add5 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if ((*length) == (*size)) {
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
+#line 5154 "EditingTools.c"
+	}
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[(*length)++] = value;
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[*length] = NULL;
+#line 5160 "EditingTools.c"
+}
+
+
+static void _vala_array_add6 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if ((*length) == (*size)) {
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
+#line 5171 "EditingTools.c"
+	}
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[(*length)++] = value;
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[*length] = NULL;
+#line 5177 "EditingTools.c"
+}
+
+
+static void _vala_array_add7 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if ((*length) == (*size)) {
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
+#line 5188 "EditingTools.c"
+	}
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[(*length)++] = value;
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	(*array)[*length] = NULL;
+#line 5194 "EditingTools.c"
+}
+
+
+static void _vala_array_add8 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5142 "EditingTools.c"
+#line 5205 "EditingTools.c"
 	}
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5148 "EditingTools.c"
+#line 5211 "EditingTools.c"
 }
 
 
-static void _vala_array_add5 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add9 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5159 "EditingTools.c"
+#line 5222 "EditingTools.c"
 	}
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5165 "EditingTools.c"
+#line 5228 "EditingTools.c"
 }
 
 
-static void _vala_array_add6 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add10 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5176 "EditingTools.c"
+#line 5239 "EditingTools.c"
 	}
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5182 "EditingTools.c"
+#line 5245 "EditingTools.c"
 }
 
 
-static void _vala_array_add7 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add11 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5193 "EditingTools.c"
+#line 5256 "EditingTools.c"
 	}
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5199 "EditingTools.c"
+#line 5262 "EditingTools.c"
 }
 
 
-static void _vala_array_add8 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add12 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5210 "EditingTools.c"
+#line 5273 "EditingTools.c"
 	}
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5216 "EditingTools.c"
+#line 5279 "EditingTools.c"
 }
 
 
-static void _vala_array_add9 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add13 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5227 "EditingTools.c"
+#line 5290 "EditingTools.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5233 "EditingTools.c"
+#line 5296 "EditingTools.c"
 }
 
 
-static void _vala_array_add10 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add14 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5244 "EditingTools.c"
+#line 5307 "EditingTools.c"
 	}
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5250 "EditingTools.c"
+#line 5313 "EditingTools.c"
 }
 
 
-static void _vala_array_add11 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add15 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5261 "EditingTools.c"
+#line 5324 "EditingTools.c"
 	}
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5267 "EditingTools.c"
+#line 5330 "EditingTools.c"
 }
 
 
-static void _vala_array_add12 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add16 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5278 "EditingTools.c"
+#line 5341 "EditingTools.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5284 "EditingTools.c"
+#line 5347 "EditingTools.c"
 }
 
 
-static void _vala_array_add13 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add17 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5295 "EditingTools.c"
+#line 5358 "EditingTools.c"
 	}
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5301 "EditingTools.c"
+#line 5364 "EditingTools.c"
 }
 
 
-static void _vala_array_add14 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add18 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5312 "EditingTools.c"
+#line 5375 "EditingTools.c"
 	}
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5318 "EditingTools.c"
+#line 5381 "EditingTools.c"
 }
 
 
-static void _vala_array_add15 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add19 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5329 "EditingTools.c"
+#line 5392 "EditingTools.c"
 	}
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5335 "EditingTools.c"
+#line 5398 "EditingTools.c"
 }
 
 
-static void _vala_array_add16 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add20 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5346 "EditingTools.c"
+#line 5409 "EditingTools.c"
 	}
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5352 "EditingTools.c"
+#line 5415 "EditingTools.c"
 }
 
 
-static void _vala_array_add17 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add21 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5363 "EditingTools.c"
+#line 5426 "EditingTools.c"
 	}
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5369 "EditingTools.c"
+#line 5432 "EditingTools.c"
 }
 
 
-static void _vala_array_add18 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add22 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5380 "EditingTools.c"
+#line 5443 "EditingTools.c"
 	}
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5386 "EditingTools.c"
+#line 5449 "EditingTools.c"
 }
 
 
-static void _vala_array_add19 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add23 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5397 "EditingTools.c"
+#line 5460 "EditingTools.c"
 	}
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5403 "EditingTools.c"
+#line 5466 "EditingTools.c"
 }
 
 
-static void _vala_array_add20 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add24 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5414 "EditingTools.c"
+#line 5477 "EditingTools.c"
 	}
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5420 "EditingTools.c"
+#line 5483 "EditingTools.c"
 }
 
 
-static void _vala_array_add21 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add25 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5431 "EditingTools.c"
+#line 5494 "EditingTools.c"
 	}
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5437 "EditingTools.c"
+#line 5500 "EditingTools.c"
 }
 
 
-static void _vala_array_add22 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add26 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5448 "EditingTools.c"
+#line 5511 "EditingTools.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5454 "EditingTools.c"
+#line 5517 "EditingTools.c"
 }
 
 
-static void _vala_array_add23 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add27 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5465 "EditingTools.c"
+#line 5528 "EditingTools.c"
 	}
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5471 "EditingTools.c"
+#line 5534 "EditingTools.c"
 }
 
 
-static void _vala_array_add24 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add28 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5482 "EditingTools.c"
+#line 5545 "EditingTools.c"
 	}
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5488 "EditingTools.c"
+#line 5551 "EditingTools.c"
 }
 
 
-static void _vala_array_add25 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add29 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5499 "EditingTools.c"
+#line 5562 "EditingTools.c"
 	}
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5505 "EditingTools.c"
+#line 5568 "EditingTools.c"
 }
 
 
-static void _vala_array_add26 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add30 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5516 "EditingTools.c"
+#line 5579 "EditingTools.c"
 	}
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5522 "EditingTools.c"
+#line 5585 "EditingTools.c"
 }
 
 
-static void _vala_array_add27 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add31 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5533 "EditingTools.c"
+#line 5596 "EditingTools.c"
 	}
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5539 "EditingTools.c"
+#line 5602 "EditingTools.c"
 }
 
 
-static void _vala_array_add28 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void _vala_array_add32 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5550 "EditingTools.c"
+#line 5613 "EditingTools.c"
 	}
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5556 "EditingTools.c"
-}
-
-
-static void _vala_array_add29 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if ((*length) == (*size)) {
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5567 "EditingTools.c"
-	}
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[(*length)++] = value;
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[*length] = NULL;
-#line 5573 "EditingTools.c"
-}
-
-
-static void _vala_array_add30 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if ((*length) == (*size)) {
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5584 "EditingTools.c"
-	}
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[(*length)++] = value;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[*length] = NULL;
-#line 5590 "EditingTools.c"
-}
-
-
-static void _vala_array_add31 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if ((*length) == (*size)) {
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5601 "EditingTools.c"
-	}
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[(*length)++] = value;
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[*length] = NULL;
-#line 5607 "EditingTools.c"
-}
-
-
-static void _vala_array_add32 (EditingToolsCropToolConstraintDescription*** array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if ((*length) == (*size)) {
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5618 "EditingTools.c"
-	}
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[(*length)++] = value;
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	(*array)[*length] = NULL;
-#line 5624 "EditingTools.c"
+#line 5619 "EditingTools.c"
 }
 
 
@@ -5748,326 +5743,326 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 	EditingToolsCropToolConstraintDescription* _tmp87_ = NULL;
 	EditingToolsCropToolConstraintDescription** _tmp88_ = NULL;
 	gint _tmp88__length1 = 0;
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = g_new0 (EditingToolsCropToolConstraintDescription*, 0 + 1);
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp0_;
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result__length1 = 0;
-#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	__result__size_ = _result__length1;
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _result_;
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1__length1 = _result__length1;
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _ ("Unconstrained");
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_crop_tool_constraint_description_new (_tmp2_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO);
-#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add4 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _result_;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4__length1 = _result__length1;
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _ ("Square");
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = editing_tools_crop_tool_constraint_description_new (_tmp5_, 1, 1, FALSE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add5 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _result_;
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7__length1 = _result__length1;
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _ ("Screen");
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = editing_tools_crop_tool_constraint_description_new (_tmp8_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO);
-#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add6 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _result_;
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10__length1 = _result__length1;
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _ ("Original Size");
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = editing_tools_crop_tool_constraint_description_new (_tmp11_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO);
-#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _result_;
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13__length1 = _result__length1;
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _ ("-");
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = editing_tools_crop_tool_constraint_description_new (_tmp14_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _result_;
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16__length1 = _result__length1;
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _ ("SD Video (4 ∶ 3)");
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = editing_tools_crop_tool_constraint_description_new (_tmp17_, 4, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp18_);
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _result_;
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19__length1 = _result__length1;
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _ ("HD Video (16 ∶ 9)");
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = editing_tools_crop_tool_constraint_description_new (_tmp20_, 16, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, _tmp21_);
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _result_;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22__length1 = _result__length1;
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _ ("-");
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = editing_tools_crop_tool_constraint_description_new (_tmp23_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, _tmp24_);
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _result_;
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25__length1 = _result__length1;
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _ ("Wallet (2 × 3 in.)");
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = editing_tools_crop_tool_constraint_description_new (_tmp26_, 3, 2, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp27_);
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _result_;
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28__length1 = _result__length1;
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = _ ("Notecard (3 × 5 in.)");
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = editing_tools_crop_tool_constraint_description_new (_tmp29_, 5, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp30_);
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = _result_;
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31__length1 = _result__length1;
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _ ("4 × 6 in.");
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = editing_tools_crop_tool_constraint_description_new (_tmp32_, 6, 4, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp33_);
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _result_;
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34__length1 = _result__length1;
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = _ ("5 × 7 in.");
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = editing_tools_crop_tool_constraint_description_new (_tmp35_, 7, 5, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp36_);
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = _result_;
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37__length1 = _result__length1;
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = _ ("8 × 10 in.");
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = editing_tools_crop_tool_constraint_description_new (_tmp38_, 10, 8, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp39_);
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = _result_;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40__length1 = _result__length1;
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = _ ("Letter (8.5 × 11 in.)");
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = editing_tools_crop_tool_constraint_description_new (_tmp41_, 85, 110, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp42_);
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = _result_;
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43__length1 = _result__length1;
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp44_ = _ ("11 × 14 in.");
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = editing_tools_crop_tool_constraint_description_new (_tmp44_, 14, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp45_);
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = _result_;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46__length1 = _result__length1;
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp47_ = _ ("Tabloid (11 × 17 in.)");
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = editing_tools_crop_tool_constraint_description_new (_tmp47_, 17, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add19 (&_result_, &_result__length1, &__result__size_, _tmp48_);
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49_ = _result_;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49__length1 = _result__length1;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp50_ = _ ("16 × 20 in.");
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51_ = editing_tools_crop_tool_constraint_description_new (_tmp50_, 20, 16, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp51_);
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52_ = _result_;
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52__length1 = _result__length1;
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp53_ = _ ("-");
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp54_ = editing_tools_crop_tool_constraint_description_new (_tmp53_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp54_);
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp55_ = _result_;
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp55__length1 = _result__length1;
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp56_ = _ ("Metric Wallet (9 × 13 cm)");
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp57_ = editing_tools_crop_tool_constraint_description_new (_tmp56_, 13, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp57_);
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp58_ = _result_;
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp58__length1 = _result__length1;
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp59_ = _ ("Postcard (10 × 15 cm)");
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp60_ = editing_tools_crop_tool_constraint_description_new (_tmp59_, 15, 10, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp60_);
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp61_ = _result_;
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp61__length1 = _result__length1;
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp62_ = _ ("13 × 18 cm");
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = editing_tools_crop_tool_constraint_description_new (_tmp62_, 18, 13, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp63_);
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp64_ = _result_;
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp64__length1 = _result__length1;
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = _ ("18 × 24 cm");
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp66_ = editing_tools_crop_tool_constraint_description_new (_tmp65_, 24, 18, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp66_);
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = _result_;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67__length1 = _result__length1;
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = _ ("A4 (210 × 297 mm)");
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = editing_tools_crop_tool_constraint_description_new (_tmp68_, 210, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp69_);
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = _result_;
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70__length1 = _result__length1;
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = _ ("20 × 30 cm");
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp72_ = editing_tools_crop_tool_constraint_description_new (_tmp71_, 30, 20, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp72_);
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp73_ = _result_;
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp73__length1 = _result__length1;
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp74_ = _ ("24 × 40 cm");
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp75_ = editing_tools_crop_tool_constraint_description_new (_tmp74_, 40, 24, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp75_);
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp76_ = _result_;
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp76__length1 = _result__length1;
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp77_ = _ ("30 × 40 cm");
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp78_ = editing_tools_crop_tool_constraint_description_new (_tmp77_, 40, 30, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp78_);
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp79_ = _result_;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp79__length1 = _result__length1;
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp80_ = _ ("A3 (297 × 420 mm)");
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp81_ = editing_tools_crop_tool_constraint_description_new (_tmp80_, 420, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
-#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp81_);
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp82_ = _result_;
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp82__length1 = _result__length1;
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp83_ = _ ("-");
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp84_ = editing_tools_crop_tool_constraint_description_new (_tmp83_, 0, 0, FALSE, EDITING_TOOLS_CROP_TOOL_SEPARATOR);
-#line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp84_);
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp85_ = _result_;
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp85__length1 = _result__length1;
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp86_ = _ ("Custom");
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp87_ = editing_tools_crop_tool_constraint_description_new (_tmp86_, 0, 0, TRUE, EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO);
-#line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp87_);
-#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp88_ = _result_;
-#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp88__length1 = _result__length1;
-#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (result_length1) {
-#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*result_length1 = _tmp88__length1;
-#line 6058 "EditingTools.c"
+#line 6053 "EditingTools.c"
 	}
-#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp88_;
-#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6064 "EditingTools.c"
+#line 6059 "EditingTools.c"
 }
 
 
 static gpointer _editing_tools_crop_tool_constraint_description_ref0 (gpointer self) {
-#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_crop_tool_constraint_description_ref (self) : NULL;
-#line 6071 "EditingTools.c"
+#line 6066 "EditingTools.c"
 }
 
 
@@ -6078,34 +6073,34 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 	GtkTreeIter iter = {0};
 	EditingToolsCropToolConstraintDescription** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = gtk_list_store_new (1, G_TYPE_STRING, G_TYPE_STRING, -1);
-#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp0_;
-#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = constraint_data;
-#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1__length1 = constraint_data_length1;
-#line 6090 "EditingTools.c"
+#line 6085 "EditingTools.c"
 	{
 		EditingToolsCropToolConstraintDescription** constraint_collection = NULL;
 		gint constraint_collection_length1 = 0;
 		gint _constraint_collection_size_ = 0;
 		gint constraint_it = 0;
-#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		constraint_collection = _tmp1_;
-#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		constraint_collection_length1 = _tmp1__length1;
-#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		for (constraint_it = 0; constraint_it < _tmp1__length1; constraint_it = constraint_it + 1) {
-#line 6102 "EditingTools.c"
+#line 6097 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp2_ = NULL;
 			EditingToolsCropToolConstraintDescription* constraint = NULL;
-#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = _editing_tools_crop_tool_constraint_description_ref0 (constraint_collection[constraint_it]);
-#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			constraint = _tmp2_;
-#line 6109 "EditingTools.c"
+#line 6104 "EditingTools.c"
 			{
 				GtkListStore* _tmp3_ = NULL;
 				GtkTreeIter _tmp4_ = {0};
@@ -6114,39 +6109,39 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 				EditingToolsCropToolConstraintDescription* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
 				GValue _tmp9_ = {0};
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp3_ = _result_;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				gtk_list_store_append (_tmp3_, &_tmp4_);
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				iter = _tmp4_;
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp5_ = _result_;
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = iter;
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp7_ = constraint;
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp8_ = _tmp7_->name;
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				g_value_init (&_tmp9_, G_TYPE_STRING);
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				g_value_set_string (&_tmp9_, _tmp8_);
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				gtk_list_store_set_value (_tmp5_, &_tmp6_, 0, &_tmp9_);
-#line 792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				G_IS_VALUE (&_tmp9_) ? (g_value_unset (&_tmp9_), NULL) : NULL;
-#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_editing_tools_crop_tool_constraint_description_unref0 (constraint);
-#line 6142 "EditingTools.c"
+#line 6137 "EditingTools.c"
 			}
 		}
 	}
-#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
-#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6150 "EditingTools.c"
+#line 6145 "EditingTools.c"
 }
 
 
@@ -6156,23 +6151,23 @@ static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropT
 	EditingToolsCropToolConstraintDescription* _tmp2_ = NULL;
 	EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->pivot_reticle_button;
-#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->is_pivotable;
-#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp4_);
-#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp3_);
-#line 6176 "EditingTools.c"
+#line 6171 "EditingTools.c"
 }
 
 
@@ -6188,31 +6183,31 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 	EditingToolsCropToolConstraintDescription* _tmp5_ = NULL;
 	EditingToolsCropToolConstraintDescription* _tmp6_ = NULL;
 	gfloat _tmp7_ = 0.0F;
-#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->constraints;
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0__length1 = self->priv->constraints_length1;
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->constraint_combo;
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gtk_combo_box_get_active (_tmp2_);
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp0_[_tmp3_];
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp4_);
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp5_;
-#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _result_;
-#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->aspect_ratio;
-#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp7_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6216 "EditingTools.c"
+#line 6211 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* _tmp8_ = NULL;
 		EditingToolsPhotoCanvas* _tmp9_ = NULL;
 		GdkRectangle _tmp10_ = {0};
@@ -6221,37 +6216,37 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 		EditingToolsPhotoCanvas* _tmp13_ = NULL;
 		GdkRectangle _tmp14_ = {0};
 		gint _tmp15_ = 0;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _result_;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp9_, &_tmp10_);
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp10_.width;
-#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_->basis_width = _tmp11_;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = _result_;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp13_, &_tmp14_);
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = _tmp14_.height;
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_->basis_height = _tmp15_;
-#line 6245 "EditingTools.c"
+#line 6240 "EditingTools.c"
 	} else {
 		EditingToolsCropToolConstraintDescription* _tmp16_ = NULL;
 		gfloat _tmp17_ = 0.0F;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _result_;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp16_->aspect_ratio;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp17_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 6255 "EditingTools.c"
+#line 6250 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp18_ = NULL;
 			GdkScreen* _tmp19_ = NULL;
@@ -6261,38 +6256,38 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 			EditingToolsCropToolConstraintDescription* _tmp23_ = NULL;
 			GdkScreen* _tmp24_ = NULL;
 			gint _tmp25_ = 0;
-#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = gdk_screen_get_default ();
-#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			screen = _tmp19_;
-#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = _result_;
-#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp21_ = screen;
-#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp22_ = gdk_screen_get_width (_tmp21_);
-#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_->basis_width = _tmp22_;
-#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp23_ = _result_;
-#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp24_ = screen;
-#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp25_ = gdk_screen_get_height (_tmp24_);
-#line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp23_->basis_height = _tmp25_;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 6289 "EditingTools.c"
+#line 6284 "EditingTools.c"
 		}
 	}
-#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
-#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6296 "EditingTools.c"
+#line 6291 "EditingTools.c"
 }
 
 
@@ -6304,31 +6299,31 @@ static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCr
 	GtkEntry* _tmp3_ = NULL;
 	GdkEventFocus* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->custom_width_entry;
-#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_->most_recently_edited);
-#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_->most_recently_edited = _tmp3_;
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = event;
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_);
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp5_;
-#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6332 "EditingTools.c"
+#line 6327 "EditingTools.c"
 }
 
 
@@ -6340,31 +6335,31 @@ static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsC
 	GtkEntry* _tmp3_ = NULL;
 	GdkEventFocus* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->custom_height_entry;
-#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_->most_recently_edited);
-#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_->most_recently_edited = _tmp3_;
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = event;
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_);
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp5_;
-#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6368 "EditingTools.c"
+#line 6363 "EditingTools.c"
 }
 
 
@@ -6402,170 +6397,170 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	EditingToolsPhotoCanvas* _tmp71_ = NULL;
 	gint _tmp72_ = 0;
 	gint _tmp73_ = 0;
-#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->custom_width_entry;
-#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = atoi (_tmp3_);
-#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	width = _tmp4_;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->crop_tool_window;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->custom_height_entry;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = gtk_entry_get_text (_tmp6_);
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_;
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = atoi (_tmp8_);
-#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	height = _tmp9_;
-#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = width;
-#line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ < 1) {
-#line 6438 "EditingTools.c"
+#line 6433 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
 		GtkEntry* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		width = 1;
-#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = self->priv->crop_tool_window;
-#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = _tmp11_->custom_width_entry;
-#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = width;
-#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = g_strdup_printf ("%d", _tmp13_);
-#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = _tmp14_;
-#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp12_, _tmp15_);
-#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp15_);
-#line 6460 "EditingTools.c"
+#line 6455 "EditingTools.c"
 	}
-#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = height;
-#line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_ < 1) {
-#line 6466 "EditingTools.c"
+#line 6461 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp17_ = NULL;
 		GtkEntry* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		height = 1;
-#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = self->priv->crop_tool_window;
-#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = _tmp17_->custom_height_entry;
-#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = height;
-#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = g_strdup_printf ("%d", _tmp19_);
-#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = _tmp20_;
-#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp18_, _tmp21_);
-#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp21_);
-#line 6488 "EditingTools.c"
+#line 6483 "EditingTools.c"
 	}
-#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = width;
-#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->custom_width;
-#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp23_ == _tmp24_) {
-#line 6496 "EditingTools.c"
+#line 6491 "EditingTools.c"
 		gint _tmp25_ = 0;
 		gint _tmp26_ = 0;
-#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = height;
-#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = self->priv->custom_height;
-#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = _tmp25_ == _tmp26_;
-#line 6505 "EditingTools.c"
+#line 6500 "EditingTools.c"
 	} else {
-#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = FALSE;
-#line 6509 "EditingTools.c"
+#line 6504 "EditingTools.c"
 	}
-#line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp22_) {
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 6517 "EditingTools.c"
+#line 6512 "EditingTools.c"
 	}
-#line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = width;
-#line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = height;
-#line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_aspect_ratio = ((gfloat) _tmp27_) / ((gfloat) _tmp28_);
-#line 847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->custom_aspect_ratio;
-#line 847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp29_ < EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO) {
-#line 6529 "EditingTools.c"
+#line 6524 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp30_ = NULL;
 		GtkEntry* _tmp31_ = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp32_ = NULL;
 		GtkEntry* _tmp33_ = NULL;
-#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp30_ = self->priv->crop_tool_window;
-#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = _tmp30_->most_recently_edited;
-#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp32_ = self->priv->crop_tool_window;
-#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp33_ = _tmp32_->custom_height_entry;
-#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp31_ == _tmp33_) {
-#line 6544 "EditingTools.c"
+#line 6539 "EditingTools.c"
 			gint _tmp34_ = 0;
 			EditingToolsCropToolCropToolWindow* _tmp35_ = NULL;
 			GtkEntry* _tmp36_ = NULL;
 			gint _tmp37_ = 0;
 			gchar* _tmp38_ = NULL;
 			gchar* _tmp39_ = NULL;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = width;
-#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			height = (gint) (_tmp34_ / EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO);
-#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp35_ = self->priv->crop_tool_window;
-#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp36_ = _tmp35_->custom_height_entry;
-#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp37_ = height;
-#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp38_ = g_strdup_printf ("%d", _tmp37_);
-#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp39_ = _tmp38_;
-#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_entry_set_text (_tmp36_, _tmp39_);
-#line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_free0 (_tmp39_);
-#line 6569 "EditingTools.c"
+#line 6564 "EditingTools.c"
 		} else {
 			gint _tmp40_ = 0;
 			EditingToolsCropToolCropToolWindow* _tmp41_ = NULL;
@@ -6573,73 +6568,73 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 			gint _tmp43_ = 0;
 			gchar* _tmp44_ = NULL;
 			gchar* _tmp45_ = NULL;
-#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = height;
-#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			width = (gint) (_tmp40_ * EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO);
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp41_ = self->priv->crop_tool_window;
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp42_ = _tmp41_->custom_width_entry;
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp43_ = width;
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp44_ = g_strdup_printf ("%d", _tmp43_);
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp45_ = _tmp44_;
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_entry_set_text (_tmp42_, _tmp45_);
-#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_free0 (_tmp45_);
-#line 6595 "EditingTools.c"
+#line 6590 "EditingTools.c"
 		}
 	} else {
 		gfloat _tmp46_ = 0.0F;
-#line 855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = self->priv->custom_aspect_ratio;
-#line 855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp46_ > EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO) {
-#line 6603 "EditingTools.c"
+#line 6598 "EditingTools.c"
 			EditingToolsCropToolCropToolWindow* _tmp47_ = NULL;
 			GtkEntry* _tmp48_ = NULL;
 			EditingToolsCropToolCropToolWindow* _tmp49_ = NULL;
 			GtkEntry* _tmp50_ = NULL;
-#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp47_ = self->priv->crop_tool_window;
-#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp48_ = _tmp47_->most_recently_edited;
-#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp49_ = self->priv->crop_tool_window;
-#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp50_ = _tmp49_->custom_height_entry;
-#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp48_ == _tmp50_) {
-#line 6618 "EditingTools.c"
+#line 6613 "EditingTools.c"
 				gint _tmp51_ = 0;
 				EditingToolsCropToolCropToolWindow* _tmp52_ = NULL;
 				GtkEntry* _tmp53_ = NULL;
 				gint _tmp54_ = 0;
 				gchar* _tmp55_ = NULL;
 				gchar* _tmp56_ = NULL;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp51_ = width;
-#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				height = (gint) (_tmp51_ / EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO);
-#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp52_ = self->priv->crop_tool_window;
-#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp53_ = _tmp52_->custom_height_entry;
-#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp54_ = height;
-#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp55_ = g_strdup_printf ("%d", _tmp54_);
-#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp56_ = _tmp55_;
-#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				gtk_entry_set_text (_tmp53_, _tmp56_);
-#line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_g_free0 (_tmp56_);
-#line 6643 "EditingTools.c"
+#line 6638 "EditingTools.c"
 			} else {
 				gint _tmp57_ = 0;
 				EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
@@ -6647,71 +6642,71 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 				gint _tmp60_ = 0;
 				gchar* _tmp61_ = NULL;
 				gchar* _tmp62_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp57_ = height;
-#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				width = (gint) (_tmp57_ * EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO);
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp58_ = self->priv->crop_tool_window;
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp59_ = _tmp58_->custom_width_entry;
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp60_ = width;
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp61_ = g_strdup_printf ("%d", _tmp60_);
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp62_ = _tmp61_;
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				gtk_entry_set_text (_tmp59_, _tmp62_);
-#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_g_free0 (_tmp62_);
-#line 6669 "EditingTools.c"
+#line 6664 "EditingTools.c"
 			}
 		}
 	}
-#line 865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = width;
-#line 865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp64_ = height;
-#line 865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_aspect_ratio = ((gfloat) _tmp63_) / ((gfloat) _tmp64_);
-#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = self->priv->scaled_crop;
-#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constrain_crop (self, &_tmp65_, &_tmp66_);
-#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_crop = _tmp66_;
-#line 869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = new_crop;
-#line 869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_crop_resized (self, &_tmp67_);
-#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = new_crop;
-#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp68_;
-#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = new_crop;
-#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp69_, &_tmp70_);
-#line 872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp71_);
-#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp72_ = width;
-#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_width = _tmp72_;
-#line 875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp73_ = height;
-#line 875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_height = _tmp73_;
-#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6715 "EditingTools.c"
+#line 6710 "EditingTools.c"
 }
 
 
@@ -6720,21 +6715,21 @@ static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool*
 	GtkEntry* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->custom_width_entry;
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = text;
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = length;
-#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6738 "EditingTools.c"
+#line 6733 "EditingTools.c"
 }
 
 
@@ -6743,21 +6738,21 @@ static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool*
 	GtkEntry* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
-#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->custom_height_entry;
-#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = text;
-#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = length;
-#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6761 "EditingTools.c"
+#line 6756 "EditingTools.c"
 }
 
 
@@ -6775,7 +6770,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 6779 "EditingTools.c"
+#line 6774 "EditingTools.c"
 }
 
 
@@ -6788,96 +6783,96 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	gint _tmp22_ = 0;
 	gint _tmp23_ = 0;
 	GtkEntry* _tmp29_ = NULL;
-#line 888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GTK_IS_ENTRY (sender));
-#line 888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
-#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->entry_insert_in_progress;
-#line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 6804 "EditingTools.c"
+#line 6799 "EditingTools.c"
 	}
-#line 892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = TRUE;
-#line 894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = length;
-#line 894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == -1) {
-#line 6812 "EditingTools.c"
+#line 6807 "EditingTools.c"
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = text;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = strlen (_tmp2_);
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_;
-#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		length = (gint) _tmp4_;
-#line 6824 "EditingTools.c"
+#line 6819 "EditingTools.c"
 	}
-#line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = g_strdup ("");
-#line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_text = _tmp5_;
-#line 6830 "EditingTools.c"
+#line 6825 "EditingTools.c"
 	{
 		gint ctr = 0;
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ctr = 0;
-#line 6835 "EditingTools.c"
+#line 6830 "EditingTools.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = TRUE;
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 6842 "EditingTools.c"
+#line 6837 "EditingTools.c"
 				gint _tmp8_ = 0;
 				gint _tmp9_ = 0;
 				const gchar* _tmp10_ = NULL;
 				gint _tmp11_ = 0;
 				gchar _tmp12_ = '\0';
 				gboolean _tmp13_ = FALSE;
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!_tmp6_) {
-#line 6851 "EditingTools.c"
+#line 6846 "EditingTools.c"
 					gint _tmp7_ = 0;
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp7_ = ctr;
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					ctr = _tmp7_ + 1;
-#line 6857 "EditingTools.c"
+#line 6852 "EditingTools.c"
 				}
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = FALSE;
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp8_ = ctr;
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp9_ = length;
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!(_tmp8_ < _tmp9_)) {
-#line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 6869 "EditingTools.c"
+#line 6864 "EditingTools.c"
 				}
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp10_ = text;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp11_ = ctr;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp12_ = string_get (_tmp10_, (glong) _tmp11_);
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp13_ = g_ascii_isdigit (_tmp12_);
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp13_) {
-#line 6881 "EditingTools.c"
+#line 6876 "EditingTools.c"
 					const gchar* _tmp14_ = NULL;
 					const gchar* _tmp15_ = NULL;
 					gint _tmp16_ = 0;
@@ -6885,68 +6880,68 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 					gchar* _tmp18_ = NULL;
 					gchar* _tmp19_ = NULL;
 					gchar* _tmp20_ = NULL;
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp14_ = new_text;
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp15_ = text;
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp16_ = ctr;
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp17_ = string_get (_tmp15_, (glong) _tmp16_);
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp18_ = g_strdup_printf ("%c", (gchar) _tmp17_);
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp19_ = _tmp18_;
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp20_ = g_strconcat (_tmp14_, _tmp19_, NULL);
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_g_free0 (new_text);
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_text = _tmp20_;
-#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_g_free0 (_tmp19_);
-#line 6909 "EditingTools.c"
+#line 6904 "EditingTools.c"
 				}
 			}
 		}
 	}
-#line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = new_text;
-#line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = strlen (_tmp21_);
-#line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_;
-#line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp23_ > 0) {
-#line 6922 "EditingTools.c"
+#line 6917 "EditingTools.c"
 		GtkEntry* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
 		gint _tmp27_ = 0;
 		gint _tmp28_ = 0;
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = sender;
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = new_text;
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = new_text;
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = strlen (_tmp26_);
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = _tmp27_;
-#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 6940 "EditingTools.c"
+#line 6935 "EditingTools.c"
 	}
-#line 908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = sender;
-#line 908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_stop_emission_by_name (_tmp29_, "insert-text");
-#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = FALSE;
-#line 888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (new_text);
-#line 6950 "EditingTools.c"
+#line 6945 "EditingTools.c"
 }
 
 
@@ -6959,53 +6954,53 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 	gfloat _tmp3_ = 0.0F;
 	gfloat _tmp4_ = 0.0F;
 	EditingToolsCropToolReticleOrientation _tmp20_ = 0;
-#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
-#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->aspect_ratio;
-#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp1_);
-#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp3_;
-#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _result_;
-#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6981 "EditingTools.c"
+#line 6976 "EditingTools.c"
 		EditingToolsPhotoCanvas* _tmp5_ = NULL;
 		GdkRectangle _tmp6_ = {0};
 		gint _tmp7_ = 0;
 		EditingToolsPhotoCanvas* _tmp8_ = NULL;
 		GdkRectangle _tmp9_ = {0};
 		gint _tmp10_ = 0;
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp5_, &_tmp6_);
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.width;
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_);
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = _tmp9_.height;
-#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp7_) / ((gfloat) _tmp10_);
-#line 7002 "EditingTools.c"
+#line 6997 "EditingTools.c"
 	} else {
 		gfloat _tmp11_ = 0.0F;
-#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _result_;
-#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp11_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 7009 "EditingTools.c"
+#line 7004 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp12_ = NULL;
 			GdkScreen* _tmp13_ = NULL;
@@ -7013,58 +7008,58 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 			gint _tmp15_ = 0;
 			GdkScreen* _tmp16_ = NULL;
 			gint _tmp17_ = 0;
-#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp12_ = gdk_screen_get_default ();
-#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			screen = _tmp13_;
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = screen;
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp15_ = gdk_screen_get_width (_tmp14_);
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = screen;
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp17_ = gdk_screen_get_height (_tmp16_);
-#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_result_ = ((gfloat) _tmp15_) / ((gfloat) _tmp17_);
-#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 7035 "EditingTools.c"
+#line 7030 "EditingTools.c"
 		} else {
 			gfloat _tmp18_ = 0.0F;
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = _result_;
-#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 7042 "EditingTools.c"
+#line 7037 "EditingTools.c"
 				gfloat _tmp19_ = 0.0F;
-#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp19_ = self->priv->custom_aspect_ratio;
-#line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_result_ = _tmp19_;
-#line 7048 "EditingTools.c"
+#line 7043 "EditingTools.c"
 			}
 		}
 	}
-#line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->reticle_orientation;
-#line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp20_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 7056 "EditingTools.c"
+#line 7051 "EditingTools.c"
 		gfloat _tmp21_ = 0.0F;
-#line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = _result_;
-#line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = 1.0f / _tmp21_;
-#line 7062 "EditingTools.c"
+#line 7057 "EditingTools.c"
 	}
-#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
-#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7068 "EditingTools.c"
+#line 7063 "EditingTools.c"
 }
 
 
@@ -7075,23 +7070,23 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 	gfloat _tmp1_ = 0.0F;
 	gfloat _tmp2_ = 0.0F;
 	EditingToolsCropToolReticleOrientation _tmp18_ = 0;
-#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
-#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_CROP_TOOL_IS_CONSTRAINT_DESCRIPTION (constraint), 0.0F);
-#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), 0.0F);
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = constraint;
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->aspect_ratio;
-#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp1_;
-#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _result_;
-#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 7095 "EditingTools.c"
+#line 7090 "EditingTools.c"
 		Dimensions orig_dim = {0};
 		Photo* _tmp3_ = NULL;
 		Dimensions _tmp4_ = {0};
@@ -7099,30 +7094,30 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 		gint _tmp6_ = 0;
 		Dimensions _tmp7_ = {0};
 		gint _tmp8_ = 0;
-#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = photo;
-#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		photo_get_original_dimensions (_tmp3_, &_tmp4_);
-#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		orig_dim = _tmp4_;
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = orig_dim;
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.width;
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = orig_dim;
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.height;
-#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp6_) / ((gfloat) _tmp8_);
-#line 7119 "EditingTools.c"
+#line 7114 "EditingTools.c"
 	} else {
 		gfloat _tmp9_ = 0.0F;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _result_;
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp9_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 7126 "EditingTools.c"
+#line 7121 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp10_ = NULL;
 			GdkScreen* _tmp11_ = NULL;
@@ -7130,58 +7125,58 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 			gint _tmp13_ = 0;
 			GdkScreen* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
-#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = gdk_screen_get_default ();
-#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			screen = _tmp11_;
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp12_ = screen;
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = gdk_screen_get_width (_tmp12_);
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = screen;
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp15_ = gdk_screen_get_height (_tmp14_);
-#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_result_ = ((gfloat) _tmp13_) / ((gfloat) _tmp15_);
-#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 7152 "EditingTools.c"
+#line 7147 "EditingTools.c"
 		} else {
 			gfloat _tmp16_ = 0.0F;
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = _result_;
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 7159 "EditingTools.c"
+#line 7154 "EditingTools.c"
 				gfloat _tmp17_ = 0.0F;
-#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp17_ = self->priv->custom_aspect_ratio;
-#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_result_ = _tmp17_;
-#line 7165 "EditingTools.c"
+#line 7160 "EditingTools.c"
 			}
 		}
 	}
-#line 943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->reticle_orientation;
-#line 943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 7173 "EditingTools.c"
+#line 7168 "EditingTools.c"
 		gfloat _tmp19_ = 0.0F;
-#line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = _result_;
-#line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = 1.0f / _tmp19_;
-#line 7179 "EditingTools.c"
+#line 7174 "EditingTools.c"
 	}
-#line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
-#line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7185 "EditingTools.c"
+#line 7180 "EditingTools.c"
 }
 
 
@@ -7196,33 +7191,33 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	gboolean _tmp16_ = FALSE;
 	gfloat _tmp17_ = 0.0F;
 	gfloat _tmp18_ = 0.0F;
-#line 950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	selected_constraint = _tmp0_;
-#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = selected_constraint;
-#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->aspect_ratio;
-#line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 7214 "EditingTools.c"
+#line 7209 "EditingTools.c"
 	} else {
 		EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
 		gfloat _tmp4_ = 0.0F;
-#line 955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_normal_constraint_mode (self);
-#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = selected_constraint;
-#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_->aspect_ratio;
-#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp4_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7226 "EditingTools.c"
+#line 7221 "EditingTools.c"
 			ConfigFacade* _tmp5_ = NULL;
 			ConfigFacade* _tmp6_ = NULL;
 			gint _tmp7_ = 0;
@@ -7231,60 +7226,60 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
-#line 961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp5_ = config_facade_get_instance ();
-#line 961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = _tmp5_;
-#line 961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->custom_init_width = _tmp7_;
-#line 961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp6_);
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = config_facade_get_instance ();
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = _tmp8_;
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->custom_init_height = _tmp10_;
-#line 962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp9_);
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp11_ = self->priv->custom_init_width;
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp12_ = self->priv->custom_init_height;
-#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->custom_aspect_ratio = ((gfloat) _tmp11_) / ((gfloat) _tmp12_);
-#line 7261 "EditingTools.c"
+#line 7256 "EditingTools.c"
 		}
 	}
-#line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_pivot_button_state (self);
-#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_;
-#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_->is_pivotable;
-#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = !_tmp15_;
-#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp14_);
-#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_) {
-#line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 966 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 7280 "EditingTools.c"
+#line 7275 "EditingTools.c"
 	}
-#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->pre_aspect_ratio;
-#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp17_ != _tmp18_) {
-#line 7288 "EditingTools.c"
+#line 7283 "EditingTools.c"
 		Box new_crop = {0};
 		Box _tmp19_ = {0};
 		Box _tmp20_ = {0};
@@ -7294,39 +7289,39 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 		Box _tmp24_ = {0};
 		EditingToolsPhotoCanvas* _tmp25_ = NULL;
 		gfloat _tmp26_ = 0.0F;
-#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = self->priv->scaled_crop;
-#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constrain_crop (self, &_tmp19_, &_tmp20_);
-#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		new_crop = _tmp20_;
-#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = new_crop;
-#line 975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_resized (self, &_tmp21_);
-#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = new_crop;
-#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->scaled_crop = _tmp22_;
-#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = new_crop;
-#line 977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_invalidate_area (_tmp23_, &_tmp24_);
-#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_repaint (_tmp25_);
-#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->pre_aspect_ratio = _tmp26_;
-#line 7326 "EditingTools.c"
+#line 7321 "EditingTools.c"
 	}
-#line 950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (selected_constraint);
-#line 7330 "EditingTools.c"
+#line 7325 "EditingTools.c"
 }
 
 
@@ -7375,153 +7370,153 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	gint _tmp68_ = 0;
 	gint _tmp69_ = 0;
 	EditingToolsCropToolCropToolWindow* _tmp70_ = NULL;
-#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->constraint_mode;
-#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM) {
-#line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7387 "EditingTools.c"
+#line 7382 "EditingTools.c"
 	}
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->normal_width;
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_ == -1) {
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 7397 "EditingTools.c"
+#line 7392 "EditingTools.c"
 	} else {
 		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_->normal_height;
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = _tmp5_ == -1;
-#line 7407 "EditingTools.c"
+#line 7402 "EditingTools.c"
 	}
-#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 7411 "EditingTools.c"
+#line 7406 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp6_ = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp7_ = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->crop_tool_window;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = self->priv->crop_tool_window;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = self->priv->crop_tool_window;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_window_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), &_tmp9_, &_tmp10_);
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_->normal_width = _tmp9_;
-#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_->normal_height = _tmp10_;
-#line 7429 "EditingTools.c"
+#line 7424 "EditingTools.c"
 	}
-#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
-#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->layout;
-#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->crop_tool_window;
-#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->constraint_combo;
-#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->crop_tool_window;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->layout;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->crop_tool_window;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->pivot_reticle_button;
-#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = self->priv->crop_tool_window;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_->layout;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->crop_tool_window;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_->response_layout;
-#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
-#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->crop_tool_window;
-#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _tmp23_->layout;
-#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->crop_tool_window;
-#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_->constraint_combo;
-#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->priv->crop_tool_window;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _tmp27_->layout;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->crop_tool_window;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_->custom_width_entry;
-#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->priv->crop_tool_window;
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_->layout;
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->crop_tool_window;
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->custom_mulsign_label;
-#line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = self->priv->crop_tool_window;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = _tmp35_->layout;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = self->priv->crop_tool_window;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = _tmp37_->custom_height_entry;
-#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->crop_tool_window;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = _tmp39_->layout;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = self->priv->crop_tool_window;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = _tmp41_->pivot_reticle_button;
-#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = self->priv->crop_tool_window;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp44_ = _tmp43_->layout;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->priv->crop_tool_window;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = _tmp45_->response_layout;
-#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget));
-#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp47_ = self->priv->reticle_orientation;
-#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp47_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
-#line 7525 "EditingTools.c"
+#line 7520 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp48_ = NULL;
 		GtkEntry* _tmp49_ = NULL;
 		gint _tmp50_ = 0;
@@ -7532,35 +7527,35 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gint _tmp55_ = 0;
 		gchar* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = self->priv->crop_tool_window;
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp49_ = _tmp48_->custom_width_entry;
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp50_ = self->priv->custom_init_width;
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp51_ = g_strdup_printf ("%d", _tmp50_);
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp52_ = _tmp51_;
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp49_, _tmp52_);
-#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp52_);
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp53_ = self->priv->crop_tool_window;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp54_ = _tmp53_->custom_height_entry;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp55_ = self->priv->custom_init_height;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp56_ = g_strdup_printf ("%d", _tmp55_);
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp57_ = _tmp56_;
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp54_, _tmp57_);
-#line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp57_);
-#line 7564 "EditingTools.c"
+#line 7559 "EditingTools.c"
 	} else {
 		EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
 		GtkEntry* _tmp59_ = NULL;
@@ -7572,49 +7567,49 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gint _tmp65_ = 0;
 		gchar* _tmp66_ = NULL;
 		gchar* _tmp67_ = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp58_ = self->priv->crop_tool_window;
-#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp59_ = _tmp58_->custom_width_entry;
-#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp60_ = self->priv->custom_init_height;
-#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp61_ = g_strdup_printf ("%d", _tmp60_);
-#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp62_ = _tmp61_;
-#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp59_, _tmp62_);
-#line 1007 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp62_);
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp63_ = self->priv->crop_tool_window;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp64_ = _tmp63_->custom_height_entry;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp65_ = self->priv->custom_init_width;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp66_ = g_strdup_printf ("%d", _tmp65_);
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp67_ = _tmp66_;
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp64_, _tmp67_);
-#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp67_);
-#line 7604 "EditingTools.c"
+#line 7599 "EditingTools.c"
 	}
-#line 1010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = self->priv->custom_init_width;
-#line 1010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = self->priv->custom_init_height;
-#line 1010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_aspect_ratio = ((gfloat) _tmp68_) / ((gfloat) _tmp69_);
-#line 1012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = self->priv->crop_tool_window;
-#line 1012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget));
-#line 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM;
-#line 7618 "EditingTools.c"
+#line 7613 "EditingTools.c"
 }
 
 
@@ -7662,125 +7657,125 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop
 	EditingToolsCropToolCropToolWindow* _tmp40_ = NULL;
 	gint _tmp41_ = 0;
 	EditingToolsCropToolCropToolWindow* _tmp42_ = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1013 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->constraint_mode;
-#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL) {
-#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1015 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7674 "EditingTools.c"
+#line 7669 "EditingTools.c"
 	}
-#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->layout;
-#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->crop_tool_window;
-#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->constraint_combo;
-#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->crop_tool_window;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->layout;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->crop_tool_window;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_->custom_width_entry;
-#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->crop_tool_window;
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_->layout;
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->custom_mulsign_label;
-#line 1023 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->crop_tool_window;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->layout;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->crop_tool_window;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->custom_height_entry;
-#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->crop_tool_window;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->layout;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = self->priv->crop_tool_window;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_->pivot_reticle_button;
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->crop_tool_window;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_->layout;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->crop_tool_window;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _tmp23_->response_layout;
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
-#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->crop_tool_window;
-#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_->layout;
-#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->priv->crop_tool_window;
-#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _tmp27_->constraint_combo;
-#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->crop_tool_window;
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_->layout;
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->priv->crop_tool_window;
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_->pivot_reticle_button;
-#line 1029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->crop_tool_window;
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->layout;
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = self->priv->crop_tool_window;
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = _tmp35_->response_layout;
-#line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
-#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = self->priv->crop_tool_window;
-#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = self->priv->crop_tool_window;
-#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = _tmp38_->normal_width;
-#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = self->priv->crop_tool_window;
-#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = _tmp40_->normal_height;
-#line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_window_resize (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_window_get_type (), GtkWindow), _tmp39_, _tmp41_);
-#line 1035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = self->priv->crop_tool_window;
-#line 1035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 7784 "EditingTools.c"
+#line 7779 "EditingTools.c"
 }
 
 
@@ -7815,118 +7810,118 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 	gint _tmp24_ = 0;
 	gfloat _tmp25_ = 0.0F;
 	Box _tmp30_ = {0};
-#line 1040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (crop != NULL);
-#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	user_aspect_ratio = _tmp0_;
-#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = user_aspect_ratio;
-#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7831 "EditingTools.c"
+#line 7826 "EditingTools.c"
 		Box _tmp2_ = {0};
-#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = *crop;
-#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*result = _tmp2_;
-#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7839 "EditingTools.c"
+#line 7834 "EditingTools.c"
 	}
-#line 1046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = box_get_width (crop);
-#line 1046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = box_get_height (crop);
-#line 1046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old_area = (gfloat) (_tmp3_ * _tmp4_);
-#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = old_area;
-#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = user_aspect_ratio;
-#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = sqrt ((gdouble) (_tmp5_ / _tmp6_));
-#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_adjust_height (crop, (gint) _tmp7_);
-#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = old_area;
-#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = user_aspect_ratio;
-#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = sqrt ((gdouble) (_tmp8_ * _tmp9_));
-#line 1048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_adjust_width (crop, (gint) _tmp10_);
-#line 1051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_get_photo_dimensions (self, &_tmp11_);
-#line 1051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	image_size = _tmp11_;
-#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = editing_tools_photo_canvas_get_photo (_tmp12_);
-#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_;
-#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_get_straighten (_tmp14_, &_tmp15_);
-#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	angle = _tmp15_;
-#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp14_);
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = *crop;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = image_size;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_.width;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = image_size;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_.height;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = angle;
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	clamp_inside_rotated_image (&_tmp16_, _tmp18_, _tmp20_, _tmp21_, FALSE, &_tmp22_);
-#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*crop = _tmp22_;
-#line 1057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = box_get_width (crop);
-#line 1057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = box_get_height (crop);
-#line 1057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = user_aspect_ratio;
-#line 1057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (((gfloat) _tmp23_) >= (_tmp24_ * _tmp25_)) {
-#line 7903 "EditingTools.c"
+#line 7898 "EditingTools.c"
 		gint _tmp26_ = 0;
 		gfloat _tmp27_ = 0.0F;
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = box_get_height (crop);
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = user_aspect_ratio;
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_adjust_width (crop, (gint) (_tmp26_ * _tmp27_));
-#line 7912 "EditingTools.c"
+#line 7907 "EditingTools.c"
 	} else {
 		gint _tmp28_ = 0;
 		gfloat _tmp29_ = 0.0F;
-#line 1060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = box_get_width (crop);
-#line 1060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp29_ = user_aspect_ratio;
-#line 1060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_adjust_height (crop, (gint) (_tmp28_ / _tmp29_));
-#line 7922 "EditingTools.c"
+#line 7917 "EditingTools.c"
 	}
-#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = *crop;
-#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp30_;
-#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 7930 "EditingTools.c"
+#line 7925 "EditingTools.c"
 }
 
 
@@ -7941,60 +7936,60 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 	EditingToolsCropToolConstraintDescription** _tmp5_ = NULL;
 	gint _tmp5__length1 = 0;
 	EditingToolsCropToolConstraintDescription* _tmp9_ = NULL;
-#line 1065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
-#line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = configuration_facade_get_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_index = _tmp2_;
-#line 1066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _vala_index;
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->constraints;
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5__length1 = self->priv->constraints_length1;
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ < _tmp5__length1) {
-#line 7965 "EditingTools.c"
+#line 7960 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
 		gint _tmp7_ = 0;
 		EditingToolsCropToolConstraintDescription* _tmp8_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->constraints;
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6__length1 = self->priv->constraints_length1;
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _vala_index;
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp6_[_tmp7_];
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp8_;
-#line 7980 "EditingTools.c"
+#line 7975 "EditingTools.c"
 	} else {
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = NULL;
-#line 7984 "EditingTools.c"
+#line 7979 "EditingTools.c"
 	}
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp3_);
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp9_;
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (index) {
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*index = _vala_index;
-#line 7994 "EditingTools.c"
+#line 7989 "EditingTools.c"
 	}
-#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7998 "EditingTools.c"
+#line 7993 "EditingTools.c"
 }
 
 
@@ -8075,159 +8070,159 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	Box _tmp119_ = {0};
 	EditingToolsPhotoCanvas* _tmp120_ = NULL;
 	gfloat _tmp121_ = 0.0F;
-#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_bind_canvas_handlers (self, _tmp0_);
-#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = canvas;
-#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_default_ctx (_tmp1_);
-#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = canvas;
-#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_surface_dim (_tmp4_, &_tmp5_);
-#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_prepare_ctx (self, _tmp3_, &_tmp5_);
-#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (_tmp3_);
-#line 1076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->crop_surface;
-#line 1076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp6_ != NULL) {
-#line 1077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 8109 "EditingTools.c"
+#line 8104 "EditingTools.c"
 	}
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = canvas;
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp7_, &_tmp8_);
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.width;
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = canvas;
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp10_, &_tmp11_);
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.height;
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp9_, _tmp12_);
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_surface = _tmp13_;
-#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->crop_surface;
-#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = cairo_create (_tmp14_);
-#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp15_;
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = ctx;
-#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (_tmp16_, 0.0, 0.0, 0.0, 1.0);
-#line 1085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = ctx;
-#line 1085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (_tmp17_);
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = canvas;
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = editing_tools_photo_canvas_get_container (_tmp18_);
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_;
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = editing_tools_crop_tool_crop_tool_window_new (_tmp20_);
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp21_);
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->crop_tool_window);
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_tool_window = _tmp21_;
-#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp20_);
-#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->crop_tool_window;
-#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_->constraint_combo;
-#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->constraint_list;
-#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_combo_box_set_model (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = canvas;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = editing_tools_photo_canvas_get_photo (_tmp25_);
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = photo_has_crop (_tmp27_);
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = !_tmp28_;
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp27_);
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp29_) {
-#line 8181 "EditingTools.c"
+#line 8176 "EditingTools.c"
 		gint index = 0;
 		EditingToolsCropToolConstraintDescription* desc = NULL;
 		gint _tmp30_ = 0;
 		EditingToolsCropToolConstraintDescription* _tmp31_ = NULL;
 		gboolean _tmp32_ = FALSE;
 		EditingToolsCropToolConstraintDescription* _tmp33_ = NULL;
-#line 1094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = editing_tools_crop_tool_get_last_constraint (self, &_tmp30_);
-#line 1094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		index = _tmp30_;
-#line 1094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		desc = _tmp31_;
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp33_ = desc;
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp33_ != NULL) {
-#line 8198 "EditingTools.c"
+#line 8193 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp34_ = NULL;
 			gboolean _tmp35_ = FALSE;
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = desc;
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp35_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp34_);
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = !_tmp35_;
-#line 8207 "EditingTools.c"
+#line 8202 "EditingTools.c"
 		} else {
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = FALSE;
-#line 8211 "EditingTools.c"
+#line 8206 "EditingTools.c"
 		}
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp32_) {
-#line 8215 "EditingTools.c"
+#line 8210 "EditingTools.c"
 			EditingToolsCropToolCropToolWindow* _tmp36_ = NULL;
 			GtkComboBox* _tmp37_ = NULL;
 			gint _tmp38_ = 0;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp36_ = self->priv->crop_tool_window;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp37_ = _tmp36_->constraint_combo;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp38_ = index;
-#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_combo_box_set_active (_tmp37_, _tmp38_);
-#line 8227 "EditingTools.c"
+#line 8222 "EditingTools.c"
 		}
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8231 "EditingTools.c"
+#line 8226 "EditingTools.c"
 	} else {
 		Photo* photo = NULL;
 		EditingToolsPhotoCanvas* _tmp39_ = NULL;
@@ -8240,41 +8235,41 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		gint _tmp44_ = 0;
 		Dimensions _tmp45_ = {0};
 		gint _tmp46_ = 0;
-#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp39_ = canvas;
-#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp40_ = editing_tools_photo_canvas_get_photo (_tmp39_);
-#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		photo = _tmp40_;
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp41_ = photo;
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp42_);
-#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cropped_dim = _tmp42_;
-#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp43_ = cropped_dim;
-#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp44_ = _tmp43_.width;
-#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp45_ = cropped_dim;
-#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = _tmp45_.height;
-#line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ratio = ((gfloat) _tmp44_) / ((gfloat) _tmp46_);
-#line 8266 "EditingTools.c"
+#line 8261 "EditingTools.c"
 		{
 			gint index = 0;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			index = 1;
-#line 8271 "EditingTools.c"
+#line 8266 "EditingTools.c"
 			{
 				gboolean _tmp47_ = FALSE;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp47_ = TRUE;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				while (TRUE) {
-#line 8278 "EditingTools.c"
+#line 8273 "EditingTools.c"
 					gint _tmp49_ = 0;
 					EditingToolsCropToolConstraintDescription** _tmp50_ = NULL;
 					gint _tmp50__length1 = 0;
@@ -8286,106 +8281,106 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 					Photo* _tmp55_ = NULL;
 					gfloat _tmp56_ = 0.0F;
 					gdouble _tmp57_ = 0.0;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (!_tmp47_) {
-#line 8292 "EditingTools.c"
+#line 8287 "EditingTools.c"
 						gint _tmp48_ = 0;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp48_ = index;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						index = _tmp48_ + 1;
-#line 8298 "EditingTools.c"
+#line 8293 "EditingTools.c"
 					}
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp47_ = FALSE;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp49_ = index;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp50_ = self->priv->constraints;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp50__length1 = self->priv->constraints_length1;
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (!(_tmp49_ < _tmp50__length1)) {
-#line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						break;
-#line 8312 "EditingTools.c"
+#line 8307 "EditingTools.c"
 					}
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp51_ = ratio;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp52_ = self->priv->constraints;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp52__length1 = self->priv->constraints_length1;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp53_ = index;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp54_ = _tmp52_[_tmp53_];
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp55_ = photo;
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp56_ = editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (self, _tmp54_, _tmp55_);
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp57_ = fabs ((gdouble) (_tmp51_ - _tmp56_));
-#line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (_tmp57_ < 0.005) {
-#line 8332 "EditingTools.c"
+#line 8327 "EditingTools.c"
 						EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
 						GtkComboBox* _tmp59_ = NULL;
 						gint _tmp60_ = 0;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp58_ = self->priv->crop_tool_window;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp59_ = _tmp58_->constraint_combo;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp60_ = index;
-#line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						gtk_combo_box_set_active (_tmp59_, _tmp60_);
-#line 8344 "EditingTools.c"
+#line 8339 "EditingTools.c"
 					}
 				}
 			}
 		}
-#line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (photo);
-#line 8351 "EditingTools.c"
+#line 8346 "EditingTools.c"
 	}
-#line 1110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_pivot_button_state (self);
-#line 1111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 1113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_bind_window_handlers (self);
-#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp61_ = canvas;
-#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp62_ = editing_tools_photo_canvas_get_photo (_tmp61_);
-#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = _tmp62_;
-#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp64_);
-#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = _tmp64_;
-#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp63_);
-#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	uncropped_dim = _tmp65_;
-#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp66_ = canvas;
-#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = editing_tools_photo_canvas_get_photo (_tmp66_);
-#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = _tmp67_;
-#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = photo_get_crop (_tmp68_, &_tmp69_, PHOTO_EXCEPTION_NONE);
-#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	crop = _tmp69_;
-#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = !_tmp70_;
-#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp68_);
-#line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp71_) {
-#line 8389 "EditingTools.c"
+#line 8384 "EditingTools.c"
 		gint xofs = 0;
 		Dimensions _tmp72_ = {0};
 		gint _tmp73_ = 0;
@@ -8400,228 +8395,228 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		Dimensions _tmp81_ = {0};
 		gint _tmp82_ = 0;
 		gint _tmp83_ = 0;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp72_ = uncropped_dim;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp73_ = _tmp72_.width;
-#line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		xofs = (gint) (_tmp73_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_X_PCT);
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp74_ = uncropped_dim;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp75_ = _tmp74_.height;
-#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		yofs = (gint) (_tmp75_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_Y_PCT);
-#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp76_ = xofs;
-#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp77_ = yofs;
-#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp78_ = uncropped_dim;
-#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp79_ = _tmp78_.width;
-#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp80_ = xofs;
-#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp81_ = uncropped_dim;
-#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp82_ = _tmp81_.height;
-#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp83_ = yofs;
-#line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_init (&crop, _tmp76_, _tmp77_, _tmp79_ - _tmp80_, _tmp82_ - _tmp83_);
-#line 8434 "EditingTools.c"
+#line 8429 "EditingTools.c"
 	}
-#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp84_ = uncropped_dim;
-#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp85_ = canvas;
-#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp85_, &_tmp86_);
-#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions_for_rectangle (&_tmp86_, &_tmp87_);
-#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_scaled_similar (&crop, &_tmp84_, &_tmp87_, &_tmp88_);
-#line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp88_;
-#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp89_ = config_facade_get_instance ();
-#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp90_ = _tmp89_;
-#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp91_ = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_width = _tmp91_;
-#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp90_);
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp92_ = config_facade_get_instance ();
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp93_ = _tmp92_;
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp94_ = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_height = _tmp94_;
-#line 1136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp93_);
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp95_ = self->priv->custom_width;
-#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_init_width = _tmp95_;
-#line 1138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp96_ = self->priv->custom_height;
-#line 1138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_init_height = _tmp96_;
-#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp97_ = self->priv->custom_init_width;
-#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp98_ = self->priv->custom_init_height;
-#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = ((gfloat) _tmp97_) / ((gfloat) _tmp98_);
-#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 1143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp99_ = canvas;
-#line 1143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp99_);
-#line 1145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp100_ = self->priv->crop_tool_window;
-#line 1145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
-#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp101_ = canvas;
-#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp102_ = editing_tools_photo_canvas_get_photo (_tmp101_);
-#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp103_ = _tmp102_;
-#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp104_ = photo_has_crop (_tmp103_);
-#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp105_ = !_tmp104_;
-#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp103_);
-#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp105_) {
-#line 8506 "EditingTools.c"
+#line 8501 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* desc = NULL;
 		EditingToolsCropToolConstraintDescription* _tmp106_ = NULL;
 		gboolean _tmp107_ = FALSE;
 		gboolean _tmp108_ = FALSE;
 		EditingToolsCropToolConstraintDescription* _tmp109_ = NULL;
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp106_ = editing_tools_crop_tool_get_last_constraint (self, NULL);
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1145 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		desc = _tmp106_;
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp109_ = desc;
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp109_ != NULL) {
-#line 8520 "EditingTools.c"
+#line 8515 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp110_ = NULL;
 			gboolean _tmp111_ = FALSE;
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp110_ = desc;
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp111_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp110_);
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp108_ = !_tmp111_;
-#line 8529 "EditingTools.c"
+#line 8524 "EditingTools.c"
 		} else {
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp108_ = FALSE;
-#line 8533 "EditingTools.c"
+#line 8528 "EditingTools.c"
 		}
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp108_) {
-#line 8537 "EditingTools.c"
+#line 8532 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp112_ = NULL;
 			gfloat _tmp113_ = 0.0F;
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp112_ = desc;
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp113_ = _tmp112_->aspect_ratio;
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp107_ = _tmp113_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
-#line 8546 "EditingTools.c"
+#line 8541 "EditingTools.c"
 		} else {
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp107_ = FALSE;
-#line 8550 "EditingTools.c"
+#line 8545 "EditingTools.c"
 		}
-#line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp107_) {
-#line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 8556 "EditingTools.c"
+#line 8551 "EditingTools.c"
 		}
-#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8560 "EditingTools.c"
+#line 8555 "EditingTools.c"
 	}
-#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp114_ = self->priv->scaled_crop;
-#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constrain_crop (self, &_tmp114_, &_tmp115_);
-#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_crop = _tmp115_;
-#line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp116_ = new_crop;
-#line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_crop_resized (self, &_tmp116_);
-#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp117_ = new_crop;
-#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp117_;
-#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp118_ = canvas;
-#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp119_ = new_crop;
-#line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp118_, &_tmp119_);
-#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp120_ = canvas;
-#line 1163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp120_);
-#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp121_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = _tmp121_;
-#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 8592 "EditingTools.c"
+#line 8587 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
-#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_prepare_ctx ((EditingToolsCropTool*) self, ctx, dim);
-#line 8599 "EditingTools.c"
+#line 8594 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_resized_pixbuf ((EditingToolsCropTool*) self, old_dim, scaled, scaled_position);
-#line 8606 "EditingTools.c"
+#line 8601 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-#line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp0_, "new-surface", (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = canvas;
-#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8625 "EditingTools.c"
+#line 8620 "EditingTools.c"
 }
 
 
@@ -8630,83 +8625,83 @@ static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool
 	guint _tmp1_ = 0U;
 	EditingToolsPhotoCanvas* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 1173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1173 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = canvas;
-#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
-#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8650 "EditingTools.c"
+#line 8645 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_crop_ok ((EditingToolsCropTool*) self);
-#line 8657 "EditingTools.c"
+#line 8652 "EditingTools.c"
 }
 
 
 static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self);
-#line 8664 "EditingTools.c"
+#line 8659 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed ((EditingToolsCropTool*) self);
-#line 8671 "EditingTools.c"
+#line 8666 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_pivot_button_clicked ((EditingToolsCropTool*) self);
-#line 8678 "EditingTools.c"
+#line 8673 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_crop_tool_on_width_entry_focus_out ((EditingToolsCropTool*) self, event);
-#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8687 "EditingTools.c"
+#line 8682 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_crop_tool_on_height_entry_focus_out ((EditingToolsCropTool*) self, event);
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8696 "EditingTools.c"
+#line 8691 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_width_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8703 "EditingTools.c"
+#line 8698 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_height_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8710 "EditingTools.c"
+#line 8705 "EditingTools.c"
 }
 
 
@@ -8728,61 +8723,61 @@ static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool*
 	GtkEntry* _tmp14_ = NULL;
 	EditingToolsCropToolCropToolWindow* _tmp15_ = NULL;
 	GtkEntry* _tmp16_ = NULL;
-#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1174 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
-#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->ok_button;
-#line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp2_, "clicked", (GCallback) _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked, self);
-#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->crop_tool_window;
-#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->cancel_button;
-#line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp4_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->crop_tool_window;
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->constraint_combo;
-#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp6_, "changed", (GCallback) _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed, self);
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->crop_tool_window;
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_->pivot_reticle_button;
-#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp8_, "clicked", (GCallback) _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked, self);
-#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->crop_tool_window;
-#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_->custom_width_entry;
-#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->custom_height_entry;
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->crop_tool_window;
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->custom_width_entry;
-#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->crop_tool_window;
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->custom_height_entry;
-#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text, self);
-#line 8786 "EditingTools.c"
+#line 8781 "EditingTools.c"
 }
 
 
@@ -8810,71 +8805,71 @@ static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool
 	EditingToolsCropToolCropToolWindow* _tmp20_ = NULL;
 	GtkEntry* _tmp21_ = NULL;
 	guint _tmp22_ = 0U;
-#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp1_, NULL, FALSE);
-#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
-#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->ok_button;
-#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 1194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked, self);
-#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->crop_tool_window;
-#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_->cancel_button;
-#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp7_, NULL, FALSE);
-#line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->crop_tool_window;
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_->constraint_combo;
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp10_, NULL, FALSE);
-#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed, self);
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_->pivot_reticle_button;
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp13_, NULL, FALSE);
-#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked, self);
-#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->crop_tool_window;
-#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_->custom_width_entry;
-#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp16_, NULL, FALSE);
-#line 1200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->crop_tool_window;
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->custom_height_entry;
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp19_, NULL, FALSE);
-#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp19_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event, self);
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->crop_tool_window;
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_->custom_width_entry;
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("insert-text", GTK_TYPE_EDITABLE, &_tmp22_, NULL, FALSE);
-#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1198 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
-#line 8878 "EditingTools.c"
+#line 8873 "EditingTools.c"
 }
 
 
@@ -8888,73 +8883,73 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 	const gchar* _tmp4_ = NULL;
 	GdkEventKey* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 1205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = event;
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 8906 "EditingTools.c"
+#line 8901 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		const gchar* _tmp7_ = NULL;
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_->keyval;
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1203 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 8919 "EditingTools.c"
+#line 8914 "EditingTools.c"
 	}
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 8925 "EditingTools.c"
+#line 8920 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
 		const gchar* _tmp10_ = NULL;
-#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->keyval;
-#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 8938 "EditingTools.c"
+#line 8933 "EditingTools.c"
 	}
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_on_crop_ok (self);
-#line 1210 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 1210 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 8948 "EditingTools.c"
+#line 8943 "EditingTools.c"
 	}
-#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
-#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp12_;
-#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8958 "EditingTools.c"
+#line 8953 "EditingTools.c"
 }
 
 
@@ -8965,21 +8960,21 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 	gboolean _tmp3_ = FALSE;
 	EditingToolsCropToolReticleOrientation _tmp21_ = 0;
 	EditingToolsCropToolReticleOrientation _tmp22_ = 0;
-#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_crop_tool_get_selected_constraint (self);
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->aspect_ratio;
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp1_);
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 8983 "EditingTools.c"
+#line 8978 "EditingTools.c"
 		gchar* width_text = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
 		GtkEntry* _tmp5_ = NULL;
@@ -9000,69 +8995,69 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 		gint _tmp18_ = 0;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_->custom_width_entry;
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = gtk_entry_get_text (_tmp5_);
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		width_text = _tmp7_;
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = self->priv->crop_tool_window;
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->custom_height_entry;
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = g_strdup (_tmp10_);
-#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		height_text = _tmp11_;
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->crop_tool_window;
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = _tmp12_->custom_width_entry;
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = height_text;
-#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp13_, _tmp14_);
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = self->priv->crop_tool_window;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _tmp15_->custom_height_entry;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = width_text;
-#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_entry_set_text (_tmp16_, _tmp17_);
-#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = self->priv->custom_width;
-#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1219 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		temp = _tmp18_;
-#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = self->priv->custom_height;
-#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_width = _tmp19_;
-#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = temp;
-#line 1225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_height = _tmp20_;
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (height_text);
-#line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (width_text);
-#line 9056 "EditingTools.c"
+#line 9051 "EditingTools.c"
 	}
-#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->reticle_orientation;
-#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = editing_tools_crop_tool_reticle_orientation_toggle (_tmp21_);
-#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reticle_orientation = _tmp22_;
-#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed (self);
-#line 9066 "EditingTools.c"
+#line 9061 "EditingTools.c"
 }
 
 
@@ -9071,78 +9066,101 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	EditingToolsCropToolCropToolWindow* _tmp2_ = NULL;
 	EditingToolsPhotoCanvas* _tmp5_ = NULL;
-#line 1231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 9081 "EditingTools.c"
+#line 9076 "EditingTools.c"
 		EditingToolsPhotoCanvas* _tmp1_ = NULL;
-#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_unbind_canvas_handlers (self, _tmp1_);
-#line 9087 "EditingTools.c"
+#line 9082 "EditingTools.c"
 	}
-#line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
-#line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 9093 "EditingTools.c"
+#line 9088 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp3_ = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
-#line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_unbind_window_handlers (self);
-#line 1237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->crop_tool_window;
-#line 1237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->crop_tool_window;
-#line 1238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->crop_tool_window);
-#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_tool_window = NULL;
-#line 9110 "EditingTools.c"
+#line 9105 "EditingTools.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 9116 "EditingTools.c"
+#line 9111 "EditingTools.c"
+		GdkWindow* drawing_window = NULL;
 		EditingToolsPhotoCanvas* _tmp6_ = NULL;
 		GdkWindow* _tmp7_ = NULL;
+		GdkDisplay* display = NULL;
 		GdkWindow* _tmp8_ = NULL;
-		GdkCursor* _tmp9_ = NULL;
-		GdkCursor* _tmp10_ = NULL;
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		GdkDisplay* _tmp9_ = NULL;
+		GdkDisplay* _tmp10_ = NULL;
+		GdkCursor* cursor = NULL;
+		GdkDisplay* _tmp11_ = NULL;
+		GdkCursor* _tmp12_ = NULL;
+		GdkWindow* _tmp13_ = NULL;
+		GdkCursor* _tmp14_ = NULL;
+#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = editing_tools_photo_canvas_get_drawing_window (_tmp6_);
+#line 1240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		drawing_window = _tmp7_;
+#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp8_ = drawing_window;
+#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp9_ = gdk_window_get_display (_tmp8_);
+#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp10_ = _g_object_ref0 (_tmp9_);
+#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		display = _tmp10_;
+#line 1242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp11_ = display;
+#line 1242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp12_ = gdk_cursor_new_for_display (_tmp11_, GDK_LEFT_PTR);
+#line 1242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		cursor = _tmp12_;
 #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = _tmp7_;
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = gdk_cursor_new (GDK_LEFT_PTR);
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp10_ = _tmp9_;
+		_tmp13_ = drawing_window;
 #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		gdk_window_set_cursor (_tmp8_, _tmp10_);
+		_tmp14_ = cursor;
 #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_object_unref0 (_tmp10_);
-#line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_object_unref0 (_tmp8_);
-#line 9138 "EditingTools.c"
+		gdk_window_set_cursor (_tmp13_, _tmp14_);
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_g_object_unref0 (cursor);
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_g_object_unref0 (display);
+#line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_g_object_unref0 (drawing_window);
+#line 9156 "EditingTools.c"
 	}
-#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_surface = NULL;
-#line 1248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 9146 "EditingTools.c"
+#line 9164 "EditingTools.c"
 }
 
 
@@ -9151,17 +9169,17 @@ static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_wind
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsCropToolCropToolWindow* _tmp0_ = NULL;
 	EditingToolsEditingToolWindow* _tmp1_ = NULL;
-#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
+#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_tool_window;
-#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9165 "EditingTools.c"
+#line 9183 "EditingTools.c"
 }
 
 
@@ -9177,51 +9195,51 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
 	GdkPixbuf* _tmp5_ = NULL;
 	GdkPixbuf* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp1_);
-#line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_max_dim = _tmp1_;
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = photo;
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *scaling;
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = photo_get_pixbuf_with_options (_tmp3_, &_tmp4_, PHOTO_EXCEPTION_CROP, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp5_;
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 9207 "EditingTools.c"
+#line 9225 "EditingTools.c"
 	}
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp2_;
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = NULL;
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp6_;
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (max_dim) {
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 9221 "EditingTools.c"
+#line 9239 "EditingTools.c"
 	}
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9225 "EditingTools.c"
+#line 9243 "EditingTools.c"
 }
 
 
@@ -9245,81 +9263,81 @@ static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cai
 	cairo_surface_t* _tmp16_ = NULL;
 	cairo_t* _tmp17_ = NULL;
 	cairo_t* _tmp18_ = NULL;
-#line 1262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 1262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_return_if_fail (dim != NULL);
 #line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_return_if_fail (dim != NULL);
+#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = ctx;
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = cairo_get_target (_tmp0_);
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = cairo_create (_tmp1_);
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_black_ctx);
-#line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->wide_black_ctx = _tmp2_;
 #line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->wide_black_ctx = _tmp2_;
+#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->wide_black_ctx;
-#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	set_source_color_from_string (_tmp3_, "#000");
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	set_source_color_from_string (_tmp3_, "#000");
+#line 1266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->wide_black_ctx;
-#line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp4_, (gdouble) 1);
-#line 1267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = ctx;
-#line 1267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = cairo_get_target (_tmp5_);
-#line 1267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = cairo_create (_tmp6_);
-#line 1267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_white_ctx);
-#line 1267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->wide_white_ctx = _tmp7_;
 #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->wide_white_ctx = _tmp7_;
+#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->wide_white_ctx;
-#line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	set_source_color_from_string (_tmp8_, "#FFF");
 #line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	set_source_color_from_string (_tmp8_, "#FFF");
+#line 1270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->wide_white_ctx;
-#line 1269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp9_, (gdouble) 1);
-#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = ctx;
-#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = cairo_get_target (_tmp10_);
-#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = cairo_create (_tmp11_);
-#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->thin_white_ctx = _tmp12_;
 #line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->thin_white_ctx = _tmp12_;
+#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->thin_white_ctx;
-#line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	set_source_color_from_string (_tmp13_, "#FFF");
 #line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	set_source_color_from_string (_tmp13_, "#FFF");
+#line 1274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->thin_white_ctx;
-#line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp14_, 0.5);
-#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = ctx;
-#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = cairo_get_target (_tmp15_);
-#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = cairo_create (_tmp16_);
-#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->text_ctx = _tmp17_;
 #line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->text_ctx = _tmp17_;
+#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->text_ctx;
-#line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_select_font_face (_tmp18_, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-#line 9323 "EditingTools.c"
+#line 9341 "EditingTools.c"
 }
 
 
@@ -9351,91 +9369,91 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel
 	cairo_t* ctx = NULL;
 	cairo_surface_t* _tmp21_ = NULL;
 	cairo_t* _tmp22_ = NULL;
-#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (scaled));
-#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_return_if_fail (scaled_position != NULL);
 #line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_return_if_fail (scaled_position != NULL);
+#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = scaled;
-#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions_for_pixbuf (_tmp0_, &_tmp1_);
-#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_dim = _tmp1_;
 #line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	new_dim = _tmp1_;
+#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp5_);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	uncropped_dim = _tmp6_;
-#line 1284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = *old_dim;
-#line 1284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = uncropped_dim;
-#line 1284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_scaled_similar (&self->priv->scaled_crop, &_tmp7_, &_tmp8_, &_tmp9_);
-#line 1284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	crop = _tmp9_;
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = uncropped_dim;
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = new_dim;
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_scaled_similar (&crop, &_tmp10_, &_tmp11_, &_tmp12_);
-#line 1287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled_crop = _tmp12_;
 #line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->scaled_crop = _tmp12_;
+#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->crop_surface;
-#line 1288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp13_ != NULL) {
 #line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if (_tmp13_ != NULL) {
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 9407 "EditingTools.c"
+#line 9425 "EditingTools.c"
 	}
-#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = scaled;
-#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = gdk_pixbuf_get_width (_tmp14_);
-#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_;
-#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = scaled;
-#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = gdk_pixbuf_get_height (_tmp17_);
-#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_;
-#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp16_, _tmp19_);
-#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->crop_surface = _tmp20_;
 #line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->crop_surface = _tmp20_;
+#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->crop_surface;
-#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = cairo_create (_tmp21_);
-#line 1292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	ctx = _tmp22_;
 #line 1293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 1.0);
+	ctx = _tmp22_;
 #line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 1.0);
+#line 1295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (ctx);
-#line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9439 "EditingTools.c"
+#line 9457 "EditingTools.c"
 }
 
 
@@ -9462,63 +9480,63 @@ static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool*
 	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
 	EditingToolsPhotoCanvas* _tmp18_ = NULL;
-#line 1298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
+#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_pixbuf_pos = _tmp1_;
-#line 1302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = scaled_pixbuf_pos;
-#line 1302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 1302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = scaled_pixbuf_pos;
-#line 1302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 1302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_offset (&self->priv->scaled_crop, _tmp3_, _tmp5_, &_tmp6_);
-#line 1302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	offset_scaled_crop = _tmp6_;
-#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = x;
-#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = y;
-#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_);
-#line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->in_manipulation = _tmp9_;
 #line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->in_manipulation = _tmp9_;
+#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = x;
-#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = scaled_pixbuf_pos;
-#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.x;
-#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	x = _tmp10_ - _tmp12_;
-#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = x;
-#line 1306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->last_grab_x = _tmp13_;
 #line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->last_grab_x = _tmp13_;
+#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = y;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = scaled_pixbuf_pos;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.y;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	y = _tmp14_ - _tmp16_;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = y;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_y = _tmp17_;
-#line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp18_);
-#line 9522 "EditingTools.c"
+#line 9540 "EditingTools.c"
 }
 
 
@@ -9528,33 +9546,33 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
 	EditingToolsPhotoCanvas* _tmp3_ = NULL;
-#line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->in_manipulation;
-#line 1315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp0_ == BOX_LOCATION_OUTSIDE) {
 #line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if (_tmp0_ == BOX_LOCATION_OUTSIDE) {
+#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 9540 "EditingTools.c"
+#line 9558 "EditingTools.c"
 	}
-#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
 #line 1320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->last_grab_x = -1;
+	self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
 #line 1321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->last_grab_x = -1;
+#line 1322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_y = -1;
-#line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = x;
-#line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = y;
-#line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_cursor (self, _tmp1_, _tmp2_);
-#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 9558 "EditingTools.c"
+#line 9576 "EditingTools.c"
 }
 
 
@@ -9564,34 +9582,34 @@ static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* bas
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
 	EditingToolsPhotoCanvas* _tmp5_ = NULL;
-#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->in_manipulation;
-#line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 9574 "EditingTools.c"
+#line 9592 "EditingTools.c"
 		gint _tmp1_ = 0;
 		gint _tmp2_ = 0;
-#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = x;
-#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = y;
-#line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_on_canvas_manipulation (self, _tmp1_, _tmp2_);
-#line 9583 "EditingTools.c"
+#line 9601 "EditingTools.c"
 	}
-#line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = x;
-#line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = y;
-#line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_update_cursor (self, _tmp3_, _tmp4_);
 #line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	editing_tools_crop_tool_update_cursor (self, _tmp3_, _tmp4_);
+#line 1337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp5_);
-#line 9595 "EditingTools.c"
+#line 9613 "EditingTools.c"
 }
 
 
@@ -9625,97 +9643,97 @@ static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, c
 	EditingToolsPhotoCanvas* _tmp22_ = NULL;
 	cairo_surface_t* _tmp23_ = NULL;
 	Box _tmp24_ = {0};
-#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (default_ctx != NULL);
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_drawing_window (_tmp0_);
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gdk_window_get_width (_tmp2_);
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	w = _tmp4_;
 #line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	w = _tmp4_;
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_);
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_;
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = gdk_window_get_height (_tmp7_);
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_;
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp7_);
-#line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	h = _tmp9_;
-#line 1344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = default_ctx;
-#line 1344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_source_rgba (_tmp10_, 0.0, 0.0, 0.0, 1.0);
 #line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	cairo_set_source_rgba (_tmp10_, 0.0, 0.0, 0.0, 1.0);
+#line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = default_ctx;
-#line 1345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_rectangle (_tmp11_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h);
 #line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	cairo_rectangle (_tmp11_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h);
+#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = default_ctx;
-#line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_fill (_tmp12_);
 #line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	cairo_fill (_tmp12_);
+#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = default_ctx;
-#line 1347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (_tmp13_);
-#line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->crop_surface;
-#line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = cairo_create (_tmp14_);
-#line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	ctx = _tmp15_;
 #line 1350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE);
+	ctx = _tmp15_;
 #line 1351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.5);
+	cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE);
 #line 1352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.5);
+#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (ctx);
-#line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.0);
 #line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.0);
+#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->scaled_crop;
-#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_.left;
-#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->scaled_crop;
-#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.top;
-#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = box_get_width (&self->priv->scaled_crop);
-#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = box_get_height (&self->priv->scaled_crop);
-#line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (ctx, (gdouble) _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp20_, (gdouble) _tmp21_);
-#line 1358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_fill (ctx);
 #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	cairo_fill (ctx);
+#line 1360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->crop_surface;
-#line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_surface (_tmp22_, _tmp23_, TRUE);
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->scaled_crop;
-#line 1362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_paint_crop_tool (self, &_tmp24_);
-#line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9719 "EditingTools.c"
+#line 9737 "EditingTools.c"
 }
 
 
@@ -9760,113 +9778,113 @@ static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) {
 	CropCommand* _tmp35_ = NULL;
 	CropCommand* _tmp36_ = NULL;
 	Dimensions _tmp37_ = {0};
-#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
-#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->constraint_combo;
-#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gtk_combo_box_get_active (_tmp3_);
-#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	configuration_facade_set_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
-#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->custom_width;
-#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	configuration_facade_set_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp7_);
-#line 1371 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp6_);
 #line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (_tmp6_);
+#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_;
-#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->custom_height;
-#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	configuration_facade_set_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
-#line 1372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp9_);
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp11_, &_tmp12_);
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dimensions_for_rectangle (&_tmp12_, &_tmp13_);
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = editing_tools_photo_canvas_get_photo (_tmp14_);
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_;
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp17_);
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_scaled_similar (&self->priv->scaled_crop, &_tmp13_, &_tmp17_, &_tmp18_);
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_;
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp16_);
-#line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	crop = _tmp19_;
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp20_);
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_;
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->scaled_crop;
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = _tmp23_.left;
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->scaled_crop;
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_.top;
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = box_get_width (&self->priv->scaled_crop);
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = box_get_height (&self->priv->scaled_crop);
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = gdk_pixbuf_new_subpixbuf (_tmp22_, _tmp24_, _tmp26_, _tmp27_, _tmp28_);
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = _tmp29_;
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp22_);
-#line 1380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cropped = _tmp30_;
-#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = editing_tools_photo_canvas_get_photo (_tmp31_);
-#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = _tmp32_;
-#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = crop;
-#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = crop_command_new (_tmp33_, &_tmp34_, RESOURCES_CROP_LABEL, RESOURCES_CROP_TOOLTIP);
-#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = _tmp35_;
-#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_dimensions (&crop, &_tmp37_);
-#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_COMMAND, Command), cropped, &_tmp37_, TRUE);
-#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp36_);
-#line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp33_);
-#line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (cropped);
-#line 9870 "EditingTools.c"
+#line 9888 "EditingTools.c"
 }
 
 
@@ -9886,173 +9904,193 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 	BoxLocation _tmp9_ = 0;
 	GdkCursorType _tmp10_ = 0;
 	GdkCursorType _tmp11_ = 0;
-#line 1389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	scaled_pos = _tmp1_;
 #line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	scaled_pos = _tmp1_;
+#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = scaled_pos;
-#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.x;
-#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = scaled_pos;
-#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.y;
-#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_offset (&self->priv->scaled_crop, _tmp3_, _tmp5_, &_tmp6_);
-#line 1392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	offset_scaled_crop = _tmp6_;
-#line 1394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cursor_type = GDK_LEFT_PTR;
 #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	cursor_type = GDK_LEFT_PTR;
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = x;
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = y;
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_);
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	switch (_tmp9_) {
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 9922 "EditingTools.c"
+#line 9940 "EditingTools.c"
 		{
-#line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			cursor_type = GDK_LEFT_SIDE;
 #line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			cursor_type = GDK_LEFT_SIDE;
+#line 1399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9928 "EditingTools.c"
+#line 9946 "EditingTools.c"
 		}
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 9932 "EditingTools.c"
+#line 9950 "EditingTools.c"
 		{
-#line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			cursor_type = GDK_TOP_SIDE;
 #line 1402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			cursor_type = GDK_TOP_SIDE;
+#line 1403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9938 "EditingTools.c"
+#line 9956 "EditingTools.c"
 		}
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 9942 "EditingTools.c"
+#line 9960 "EditingTools.c"
 		{
-#line 1405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			cursor_type = GDK_RIGHT_SIDE;
 #line 1406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			cursor_type = GDK_RIGHT_SIDE;
+#line 1407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9948 "EditingTools.c"
+#line 9966 "EditingTools.c"
 		}
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 9952 "EditingTools.c"
+#line 9970 "EditingTools.c"
 		{
-#line 1409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			cursor_type = GDK_BOTTOM_SIDE;
 #line 1410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			cursor_type = GDK_BOTTOM_SIDE;
+#line 1411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9958 "EditingTools.c"
+#line 9976 "EditingTools.c"
 		}
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 9962 "EditingTools.c"
+#line 9980 "EditingTools.c"
 		{
-#line 1413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			cursor_type = GDK_TOP_LEFT_CORNER;
 #line 1414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			cursor_type = GDK_TOP_LEFT_CORNER;
+#line 1415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9968 "EditingTools.c"
+#line 9986 "EditingTools.c"
 		}
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 9972 "EditingTools.c"
+#line 9990 "EditingTools.c"
 		{
-#line 1417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			cursor_type = GDK_BOTTOM_LEFT_CORNER;
 #line 1418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			cursor_type = GDK_BOTTOM_LEFT_CORNER;
+#line 1419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9978 "EditingTools.c"
+#line 9996 "EditingTools.c"
 		}
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 9982 "EditingTools.c"
+#line 10000 "EditingTools.c"
 		{
-#line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			cursor_type = GDK_TOP_RIGHT_CORNER;
 #line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			cursor_type = GDK_TOP_RIGHT_CORNER;
+#line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9988 "EditingTools.c"
+#line 10006 "EditingTools.c"
 		}
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 9992 "EditingTools.c"
+#line 10010 "EditingTools.c"
 		{
-#line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			cursor_type = GDK_BOTTOM_RIGHT_CORNER;
 #line 1426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			cursor_type = GDK_BOTTOM_RIGHT_CORNER;
+#line 1427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9998 "EditingTools.c"
+#line 10016 "EditingTools.c"
 		}
-#line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 10002 "EditingTools.c"
+#line 10020 "EditingTools.c"
 		{
-#line 1429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			cursor_type = GDK_FLEUR;
 #line 1430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			cursor_type = GDK_FLEUR;
+#line 1431 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10008 "EditingTools.c"
+#line 10026 "EditingTools.c"
 		}
 		default:
 		{
-#line 1434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10014 "EditingTools.c"
+#line 10032 "EditingTools.c"
 		}
 	}
-#line 1437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = cursor_type;
-#line 1437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->current_cursor_type;
-#line 1437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != _tmp11_) {
-#line 10023 "EditingTools.c"
+#line 10041 "EditingTools.c"
+		GdkWindow* drawing_window = NULL;
+		EditingToolsPhotoCanvas* _tmp12_ = NULL;
+		GdkWindow* _tmp13_ = NULL;
+		GdkDisplay* display = NULL;
+		GdkWindow* _tmp14_ = NULL;
+		GdkDisplay* _tmp15_ = NULL;
+		GdkDisplay* _tmp16_ = NULL;
 		GdkCursor* cursor = NULL;
-		GdkCursorType _tmp12_ = 0;
-		GdkCursor* _tmp13_ = NULL;
-		EditingToolsPhotoCanvas* _tmp14_ = NULL;
-		GdkWindow* _tmp15_ = NULL;
-		GdkWindow* _tmp16_ = NULL;
-		GdkCursor* _tmp17_ = NULL;
+		GdkDisplay* _tmp17_ = NULL;
 		GdkCursorType _tmp18_ = 0;
-#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp12_ = cursor_type;
-#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp13_ = gdk_cursor_new (_tmp12_);
-#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		cursor = _tmp13_;
-#line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		GdkCursor* _tmp19_ = NULL;
+		GdkWindow* _tmp20_ = NULL;
+		GdkCursor* _tmp21_ = NULL;
+		GdkCursorType _tmp22_ = 0;
 #line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp15_ = editing_tools_photo_canvas_get_drawing_window (_tmp14_);
+		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp16_ = _tmp15_;
+		_tmp13_ = editing_tools_photo_canvas_get_drawing_window (_tmp12_);
 #line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp17_ = cursor;
-#line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		gdk_window_set_cursor (_tmp16_, _tmp17_);
-#line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_object_unref0 (_tmp16_);
+		drawing_window = _tmp13_;
 #line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp18_ = cursor_type;
+		_tmp14_ = drawing_window;
 #line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->current_cursor_type = _tmp18_;
-#line 1437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp15_ = gdk_window_get_display (_tmp14_);
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp16_ = _g_object_ref0 (_tmp15_);
+#line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		display = _tmp16_;
+#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp17_ = display;
+#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp18_ = cursor_type;
+#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp19_ = gdk_cursor_new_for_display (_tmp17_, _tmp18_);
+#line 1441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		cursor = _tmp19_;
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp20_ = drawing_window;
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp21_ = cursor;
+#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		gdk_window_set_cursor (_tmp20_, _tmp21_);
+#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp22_ = cursor_type;
+#line 1443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		self->priv->current_cursor_type = _tmp22_;
+#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (cursor);
-#line 10056 "EditingTools.c"
+#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_g_object_unref0 (display);
+#line 1438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_g_object_unref0 (drawing_window);
+#line 10094 "EditingTools.c"
 	}
 }
 
@@ -10068,31 +10106,31 @@ static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self
 	gdouble _tmp4_ = 0.0;
 	gdouble _tmp5_ = 0.0;
 	gdouble _tmp6_ = 0.0;
-#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0);
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = bounds_y;
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = center_y;
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = bounds_x;
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = center_x;
-#line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	decision_slope = (_tmp0_ - _tmp1_) / (_tmp2_ - _tmp3_);
-#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = bounds_y;
-#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = bounds_x;
-#line 1447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	decision_intercept = _tmp4_ - (decision_slope * _tmp5_);
-#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = user_x;
-#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = (gint) ((decision_slope * _tmp6_) + decision_intercept);
-#line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 10096 "EditingTools.c"
+#line 10134 "EditingTools.c"
 }
 
 
@@ -10129,136 +10167,136 @@ static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool*
 	gint _tmp26_ = 0;
 	gdouble _tmp27_ = 0.0;
 	Dimensions _tmp28_ = {0};
-#line 1453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_);
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp3_);
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_dims = _tmp4_;
-#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_surface_dim (_tmp5_, &_tmp6_);
-#line 1455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	surface_dims = _tmp6_;
-#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = surface_dims;
-#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.width;
-#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = photo_dims;
-#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.width;
-#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = surface_dims;
-#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.height;
-#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = photo_dims;
-#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.height;
-#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = MIN (((gdouble) _tmp8_) / _tmp10_, ((gdouble) _tmp12_) / _tmp14_);
-#line 1456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scale_factor = _tmp15_;
-#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = scale_factor;
-#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = MIN (_tmp16_, 1.0);
-#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scale_factor = _tmp17_;
-#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
-#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_;
-#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_STRAIGHTEN, &_tmp21_);
-#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_dims = _tmp21_;
-#line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp20_);
 #line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (_tmp20_);
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = photo_dims;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.width;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = scale_factor;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = photo_dims;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_.height;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = scale_factor;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_.width = (gint) (_tmp23_ * _tmp24_);
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_.height = (gint) (_tmp26_ * _tmp27_);
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _tmp28_;
-#line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 10213 "EditingTools.c"
+#line 10251 "EditingTools.c"
 }
 
 
 static gboolean _box_equal (const Box* s1, const Box* s2) {
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == s2) {
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return TRUE;
-#line 10222 "EditingTools.c"
+#line 10260 "EditingTools.c"
 	}
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == NULL) {
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10228 "EditingTools.c"
+#line 10266 "EditingTools.c"
 	}
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s2 == NULL) {
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10234 "EditingTools.c"
+#line 10272 "EditingTools.c"
 	}
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->left != s2->left) {
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10240 "EditingTools.c"
+#line 10278 "EditingTools.c"
 	}
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->top != s2->top) {
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10246 "EditingTools.c"
+#line 10284 "EditingTools.c"
 	}
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->right != s2->right) {
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10252 "EditingTools.c"
+#line 10290 "EditingTools.c"
 	}
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->bottom != s2->bottom) {
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10258 "EditingTools.c"
+#line 10296 "EditingTools.c"
 	}
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return TRUE;
-#line 10262 "EditingTools.c"
+#line 10300 "EditingTools.c"
 }
 
 
@@ -10312,317 +10350,317 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	BoxLocation _tmp254_ = 0;
 	Box _tmp257_ = {0};
 	gfloat _tmp258_ = 0.0F;
-#line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_pos = _tmp1_;
-#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = x;
-#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = scaled_pos;
-#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.x;
-#line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	x = _tmp2_ - _tmp4_;
-#line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = x;
-#line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ < 0) {
-#line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = 0;
-#line 10338 "EditingTools.c"
+#line 10376 "EditingTools.c"
 	} else {
 		gint _tmp6_ = 0;
 		GdkRectangle _tmp7_ = {0};
 		gint _tmp8_ = 0;
-#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = x;
-#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = scaled_pos;
-#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.width;
-#line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ >= _tmp8_) {
-#line 10351 "EditingTools.c"
+#line 10389 "EditingTools.c"
 			GdkRectangle _tmp9_ = {0};
 			gint _tmp10_ = 0;
-#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = scaled_pos;
-#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = _tmp9_.width;
-#line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			x = _tmp10_ - 1;
-#line 10360 "EditingTools.c"
+#line 10398 "EditingTools.c"
 		}
 	}
-#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = y;
-#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = scaled_pos;
-#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.y;
-#line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	y = _tmp11_ - _tmp13_;
-#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = y;
-#line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp14_ < 0) {
-#line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = 0;
-#line 10377 "EditingTools.c"
+#line 10415 "EditingTools.c"
 	} else {
 		gint _tmp15_ = 0;
 		GdkRectangle _tmp16_ = {0};
 		gint _tmp17_ = 0;
-#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = y;
-#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = scaled_pos;
-#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp16_.height;
-#line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp15_ >= _tmp17_) {
-#line 10390 "EditingTools.c"
+#line 10428 "EditingTools.c"
 			GdkRectangle _tmp18_ = {0};
 			gint _tmp19_ = 0;
-#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = scaled_pos;
-#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp19_ = _tmp18_.height;
-#line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			y = _tmp19_ - 1;
-#line 10399 "EditingTools.c"
+#line 10437 "EditingTools.c"
 		}
 	}
-#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->scaled_crop;
-#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_.left;
-#line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	left = _tmp21_;
-#line 1487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->scaled_crop;
-#line 1487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.top;
-#line 1487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	top = _tmp23_;
-#line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->scaled_crop;
-#line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.right;
-#line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	right = _tmp25_;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->priv->scaled_crop;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.bottom;
-#line 1489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	bottom = _tmp27_;
 #line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	bottom = _tmp27_;
+#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = left;
-#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = right;
-#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	center_x = (_tmp28_ + _tmp29_) / 2;
-#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = top;
-#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = bottom;
-#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	center_y = (_tmp30_ + _tmp31_) / 2;
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = self->priv->in_manipulation;
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	switch (_tmp32_) {
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 10444 "EditingTools.c"
+#line 10482 "EditingTools.c"
 		{
 			gint _tmp33_ = 0;
 			gfloat _tmp34_ = 0.0F;
-#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp33_ = x;
-#line 1497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			left = _tmp33_;
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp34_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10456 "EditingTools.c"
+#line 10494 "EditingTools.c"
 				gfloat new_height = 0.0F;
 				gint _tmp35_ = 0;
 				gint _tmp36_ = 0;
 				gfloat _tmp37_ = 0.0F;
 				gint _tmp38_ = 0;
 				gfloat _tmp39_ = 0.0F;
-#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp35_ = right;
-#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp36_ = left;
-#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp37_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				new_height = ((gfloat) (_tmp35_ - _tmp36_)) / _tmp37_;
-#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp38_ = top;
-#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp39_ = new_height;
-#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp38_ + ((gint) _tmp39_);
-#line 10477 "EditingTools.c"
+#line 10515 "EditingTools.c"
 			}
-#line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10481 "EditingTools.c"
+#line 10519 "EditingTools.c"
 		}
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 10485 "EditingTools.c"
+#line 10523 "EditingTools.c"
 		{
 			gint _tmp40_ = 0;
 			gfloat _tmp41_ = 0.0F;
-#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = y;
-#line 1505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			top = _tmp40_;
-#line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp41_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp41_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10497 "EditingTools.c"
+#line 10535 "EditingTools.c"
 				gfloat new_width = 0.0F;
 				gint _tmp42_ = 0;
 				gint _tmp43_ = 0;
 				gfloat _tmp44_ = 0.0F;
 				gint _tmp45_ = 0;
 				gfloat _tmp46_ = 0.0F;
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp42_ = bottom;
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp43_ = top;
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp44_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				new_width = ((gfloat) (_tmp42_ - _tmp43_)) * _tmp44_;
-#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp45_ = left;
-#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp46_ = new_width;
-#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp45_ + ((gint) _tmp46_);
-#line 10518 "EditingTools.c"
+#line 10556 "EditingTools.c"
 			}
-#line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10522 "EditingTools.c"
+#line 10560 "EditingTools.c"
 		}
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 10526 "EditingTools.c"
+#line 10564 "EditingTools.c"
 		{
 			gint _tmp47_ = 0;
 			gfloat _tmp48_ = 0.0F;
-#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp47_ = x;
-#line 1513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			right = _tmp47_;
-#line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp48_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp48_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10538 "EditingTools.c"
+#line 10576 "EditingTools.c"
 				gfloat new_height = 0.0F;
 				gint _tmp49_ = 0;
 				gint _tmp50_ = 0;
 				gfloat _tmp51_ = 0.0F;
 				gint _tmp52_ = 0;
 				gfloat _tmp53_ = 0.0F;
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp49_ = right;
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp50_ = left;
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp51_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				new_height = ((gfloat) (_tmp49_ - _tmp50_)) / _tmp51_;
-#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp52_ = top;
-#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp53_ = new_height;
-#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp52_ + ((gint) _tmp53_);
-#line 10559 "EditingTools.c"
+#line 10597 "EditingTools.c"
 			}
-#line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10563 "EditingTools.c"
+#line 10601 "EditingTools.c"
 		}
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 10567 "EditingTools.c"
+#line 10605 "EditingTools.c"
 		{
 			gint _tmp54_ = 0;
 			gfloat _tmp55_ = 0.0F;
-#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp54_ = y;
-#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			bottom = _tmp54_;
-#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp55_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp55_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10579 "EditingTools.c"
+#line 10617 "EditingTools.c"
 				gfloat new_width = 0.0F;
 				gint _tmp56_ = 0;
 				gint _tmp57_ = 0;
 				gfloat _tmp58_ = 0.0F;
 				gint _tmp59_ = 0;
 				gfloat _tmp60_ = 0.0F;
-#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp56_ = bottom;
-#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp57_ = top;
-#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp58_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				new_width = ((gfloat) (_tmp56_ - _tmp57_)) * _tmp58_;
-#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp59_ = left;
-#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp60_ = new_width;
-#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp59_ + ((gint) _tmp60_);
-#line 10600 "EditingTools.c"
+#line 10638 "EditingTools.c"
 			}
-#line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10604 "EditingTools.c"
+#line 10642 "EditingTools.c"
 		}
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 10608 "EditingTools.c"
+#line 10646 "EditingTools.c"
 		{
 			gfloat _tmp61_ = 0.0F;
-#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp61_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp61_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10615 "EditingTools.c"
+#line 10653 "EditingTools.c"
 				gint _tmp62_ = 0;
 				gint _tmp63_ = 0;
-#line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp62_ = y;
-#line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = _tmp62_;
-#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp63_ = x;
-#line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = _tmp63_;
-#line 10626 "EditingTools.c"
+#line 10664 "EditingTools.c"
 			} else {
 				gint _tmp64_ = 0;
 				gint _tmp65_ = 0;
@@ -10631,23 +10669,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				gint _tmp68_ = 0;
 				gint _tmp69_ = 0;
 				gint _tmp70_ = 0;
-#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp64_ = y;
-#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp65_ = center_x;
-#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp66_ = center_y;
-#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp67_ = left;
-#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp68_ = top;
-#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp69_ = x;
-#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp70_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp65_, (gdouble) _tmp66_, (gdouble) _tmp67_, (gdouble) _tmp68_, (gdouble) _tmp69_);
-#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp64_ < _tmp70_) {
-#line 10651 "EditingTools.c"
+#line 10689 "EditingTools.c"
 					gint _tmp71_ = 0;
 					gfloat new_width = 0.0F;
 					gint _tmp72_ = 0;
@@ -10655,25 +10693,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp74_ = 0.0F;
 					gint _tmp75_ = 0;
 					gfloat _tmp76_ = 0.0F;
-#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp71_ = y;
-#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp71_;
-#line 1535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp72_ = bottom;
-#line 1535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp73_ = top;
-#line 1535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp74_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_width = ((gfloat) (_tmp72_ - _tmp73_)) * _tmp74_;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp75_ = right;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp76_ = new_width;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp75_ - ((gint) _tmp76_);
-#line 10677 "EditingTools.c"
+#line 10715 "EditingTools.c"
 				} else {
 					gint _tmp77_ = 0;
 					gfloat new_height = 0.0F;
@@ -10682,52 +10720,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp80_ = 0.0F;
 					gint _tmp81_ = 0;
 					gfloat _tmp82_ = 0.0F;
-#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp77_ = x;
-#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp77_;
-#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp78_ = right;
-#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp79_ = left;
-#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp80_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_height = ((gfloat) (_tmp78_ - _tmp79_)) / _tmp80_;
-#line 1540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp81_ = bottom;
-#line 1540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp82_ = new_height;
-#line 1540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp81_ - ((gint) _tmp82_);
-#line 10704 "EditingTools.c"
+#line 10742 "EditingTools.c"
 				}
 			}
-#line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10709 "EditingTools.c"
+#line 10747 "EditingTools.c"
 		}
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 10713 "EditingTools.c"
+#line 10751 "EditingTools.c"
 		{
 			gfloat _tmp83_ = 0.0F;
-#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp83_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp83_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10720 "EditingTools.c"
+#line 10758 "EditingTools.c"
 				gint _tmp84_ = 0;
 				gint _tmp85_ = 0;
-#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp84_ = y;
-#line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp84_;
-#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp85_ = x;
-#line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = _tmp85_;
-#line 10731 "EditingTools.c"
+#line 10769 "EditingTools.c"
 			} else {
 				gint _tmp86_ = 0;
 				gint _tmp87_ = 0;
@@ -10736,23 +10774,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				gint _tmp90_ = 0;
 				gint _tmp91_ = 0;
 				gint _tmp92_ = 0;
-#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp86_ = y;
-#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp87_ = center_x;
-#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp88_ = center_y;
-#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp89_ = left;
-#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp90_ = bottom;
-#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp91_ = x;
-#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp92_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp91_);
-#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp86_ < _tmp92_) {
-#line 10756 "EditingTools.c"
+#line 10794 "EditingTools.c"
 					gint _tmp93_ = 0;
 					gfloat new_height = 0.0F;
 					gint _tmp94_ = 0;
@@ -10760,25 +10798,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp96_ = 0.0F;
 					gint _tmp97_ = 0;
 					gfloat _tmp98_ = 0.0F;
-#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp93_ = x;
-#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp93_;
-#line 1552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp94_ = right;
-#line 1552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp95_ = left;
-#line 1552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp96_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_height = ((gfloat) (_tmp94_ - _tmp95_)) / _tmp96_;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp97_ = top;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp98_ = new_height;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp97_ + ((gint) _tmp98_);
-#line 10782 "EditingTools.c"
+#line 10820 "EditingTools.c"
 				} else {
 					gint _tmp99_ = 0;
 					gfloat new_width = 0.0F;
@@ -10787,52 +10825,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp102_ = 0.0F;
 					gint _tmp103_ = 0;
 					gfloat _tmp104_ = 0.0F;
-#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp99_ = y;
-#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp99_;
-#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp100_ = bottom;
-#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp101_ = top;
-#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp102_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_width = ((gfloat) (_tmp100_ - _tmp101_)) * _tmp102_;
-#line 1557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp103_ = right;
-#line 1557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp104_ = new_width;
-#line 1557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp103_ - ((gint) _tmp104_);
-#line 10809 "EditingTools.c"
+#line 10847 "EditingTools.c"
 				}
 			}
-#line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10814 "EditingTools.c"
+#line 10852 "EditingTools.c"
 		}
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 10818 "EditingTools.c"
+#line 10856 "EditingTools.c"
 		{
 			gfloat _tmp105_ = 0.0F;
-#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp105_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp105_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10825 "EditingTools.c"
+#line 10863 "EditingTools.c"
 				gint _tmp106_ = 0;
 				gint _tmp107_ = 0;
-#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp106_ = y;
-#line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = _tmp106_;
-#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp107_ = x;
-#line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp107_;
-#line 10836 "EditingTools.c"
+#line 10874 "EditingTools.c"
 			} else {
 				gint _tmp108_ = 0;
 				gint _tmp109_ = 0;
@@ -10841,23 +10879,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				gint _tmp112_ = 0;
 				gint _tmp113_ = 0;
 				gint _tmp114_ = 0;
-#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp108_ = y;
-#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp109_ = center_x;
-#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp110_ = center_y;
-#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp111_ = right;
-#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp112_ = top;
-#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp113_ = x;
-#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp114_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp109_, (gdouble) _tmp110_, (gdouble) _tmp111_, (gdouble) _tmp112_, (gdouble) _tmp113_);
-#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp108_ < _tmp114_) {
-#line 10861 "EditingTools.c"
+#line 10899 "EditingTools.c"
 					gint _tmp115_ = 0;
 					gfloat new_width = 0.0F;
 					gint _tmp116_ = 0;
@@ -10865,25 +10903,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp118_ = 0.0F;
 					gint _tmp119_ = 0;
 					gfloat _tmp120_ = 0.0F;
-#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp115_ = y;
-#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp115_;
-#line 1569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp116_ = bottom;
-#line 1569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp117_ = top;
-#line 1569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp118_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_width = ((gfloat) (_tmp116_ - _tmp117_)) * _tmp118_;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp119_ = left;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp120_ = new_width;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp119_ + ((gint) _tmp120_);
-#line 10887 "EditingTools.c"
+#line 10925 "EditingTools.c"
 				} else {
 					gint _tmp121_ = 0;
 					gfloat new_height = 0.0F;
@@ -10892,52 +10930,52 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp124_ = 0.0F;
 					gint _tmp125_ = 0;
 					gfloat _tmp126_ = 0.0F;
-#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp121_ = x;
-#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp121_;
-#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp122_ = right;
-#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp123_ = left;
-#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp124_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_height = ((gfloat) (_tmp122_ - _tmp123_)) / _tmp124_;
-#line 1574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp125_ = bottom;
-#line 1574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp126_ = new_height;
-#line 1574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp125_ - ((gint) _tmp126_);
-#line 10914 "EditingTools.c"
+#line 10952 "EditingTools.c"
 				}
 			}
-#line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10919 "EditingTools.c"
+#line 10957 "EditingTools.c"
 		}
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 10923 "EditingTools.c"
+#line 10961 "EditingTools.c"
 		{
 			gfloat _tmp127_ = 0.0F;
-#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp127_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp127_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10930 "EditingTools.c"
+#line 10968 "EditingTools.c"
 				gint _tmp128_ = 0;
 				gint _tmp129_ = 0;
-#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp128_ = y;
-#line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp128_;
-#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp129_ = x;
-#line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp129_;
-#line 10941 "EditingTools.c"
+#line 10979 "EditingTools.c"
 			} else {
 				gint _tmp130_ = 0;
 				gint _tmp131_ = 0;
@@ -10946,23 +10984,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				gint _tmp134_ = 0;
 				gint _tmp135_ = 0;
 				gint _tmp136_ = 0;
-#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp130_ = y;
-#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp131_ = center_x;
-#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp132_ = center_y;
-#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp133_ = right;
-#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp134_ = bottom;
-#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp135_ = x;
-#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp136_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp131_, (gdouble) _tmp132_, (gdouble) _tmp133_, (gdouble) _tmp134_, (gdouble) _tmp135_);
-#line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp130_ < _tmp136_) {
-#line 10966 "EditingTools.c"
+#line 11004 "EditingTools.c"
 					gint _tmp137_ = 0;
 					gfloat new_height = 0.0F;
 					gint _tmp138_ = 0;
@@ -10970,25 +11008,25 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp140_ = 0.0F;
 					gint _tmp141_ = 0;
 					gfloat _tmp142_ = 0.0F;
-#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp137_ = x;
-#line 1585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp137_;
-#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp138_ = right;
-#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp139_ = left;
-#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp140_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_height = ((gfloat) (_tmp138_ - _tmp139_)) / _tmp140_;
-#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp141_ = top;
-#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp142_ = new_height;
-#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp141_ + ((gint) _tmp142_);
-#line 10992 "EditingTools.c"
+#line 11030 "EditingTools.c"
 				} else {
 					gint _tmp143_ = 0;
 					gfloat new_width = 0.0F;
@@ -10997,34 +11035,34 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					gfloat _tmp146_ = 0.0F;
 					gint _tmp147_ = 0;
 					gfloat _tmp148_ = 0.0F;
-#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp143_ = y;
-#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp143_;
-#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp144_ = bottom;
-#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp145_ = top;
-#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp146_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					new_width = ((gfloat) (_tmp144_ - _tmp145_)) * _tmp146_;
-#line 1591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp147_ = left;
-#line 1591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp148_ = new_width;
-#line 1591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp147_ + ((gint) _tmp148_);
-#line 11019 "EditingTools.c"
+#line 11057 "EditingTools.c"
 				}
 			}
-#line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 11024 "EditingTools.c"
+#line 11062 "EditingTools.c"
 		}
-#line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 11028 "EditingTools.c"
+#line 11066 "EditingTools.c"
 		{
 			gint _tmp149_ = 0;
 			gint _tmp150_ = 0;
@@ -11068,250 +11106,250 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			gint _tmp186_ = 0;
 			gint _tmp192_ = 0;
 			gint _tmp193_ = 0;
-#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp149_ = self->priv->last_grab_x;
-#line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_vala_assert (_tmp149_ >= 0, "last_grab_x >= 0");
-#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp150_ = self->priv->last_grab_y;
-#line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_vala_assert (_tmp150_ >= 0, "last_grab_y >= 0");
-#line 1600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp151_ = x;
-#line 1600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp152_ = self->priv->last_grab_x;
-#line 1600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			delta_x = _tmp151_ - _tmp152_;
-#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp153_ = y;
-#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp154_ = self->priv->last_grab_y;
-#line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			delta_y = _tmp153_ - _tmp154_;
-#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp155_ = x;
-#line 1603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->last_grab_x = _tmp155_;
-#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp156_ = y;
-#line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->last_grab_y = _tmp156_;
-#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp157_ = right;
-#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp158_ = left;
-#line 1606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			width = (_tmp157_ - _tmp158_) + 1;
-#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp159_ = bottom;
-#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp160_ = top;
-#line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			height = (_tmp159_ - _tmp160_) + 1;
-#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp161_ = left;
-#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp162_ = delta_x;
-#line 1609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			left = _tmp161_ + _tmp162_;
-#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp163_ = top;
-#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp164_ = delta_y;
-#line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			top = _tmp163_ + _tmp164_;
-#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp165_ = right;
-#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp166_ = delta_x;
-#line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			right = _tmp165_ + _tmp166_;
-#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp167_ = bottom;
-#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp168_ = delta_y;
-#line 1612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			bottom = _tmp167_ + _tmp168_;
 #line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			bottom = _tmp167_ + _tmp168_;
+#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp169_ = left;
-#line 1615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp169_ < 0) {
-#line 1616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = 0;
-#line 11142 "EditingTools.c"
+#line 11180 "EditingTools.c"
 			}
-#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp170_ = top;
-#line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp170_ < 0) {
-#line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = 0;
-#line 11150 "EditingTools.c"
+#line 11188 "EditingTools.c"
 			}
-#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp171_ = right;
-#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp172_ = scaled_pos;
-#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp173_ = _tmp172_.width;
-#line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp171_ >= _tmp173_) {
-#line 11160 "EditingTools.c"
+#line 11198 "EditingTools.c"
 				GdkRectangle _tmp174_ = {0};
 				gint _tmp175_ = 0;
-#line 1622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp174_ = scaled_pos;
-#line 1622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp175_ = _tmp174_.width;
-#line 1622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp175_ - 1;
-#line 11169 "EditingTools.c"
+#line 11207 "EditingTools.c"
 			}
-#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp176_ = bottom;
-#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp177_ = scaled_pos;
-#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp178_ = _tmp177_.height;
-#line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp176_ >= _tmp178_) {
-#line 11179 "EditingTools.c"
+#line 11217 "EditingTools.c"
 				GdkRectangle _tmp179_ = {0};
 				gint _tmp180_ = 0;
-#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp179_ = scaled_pos;
-#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp180_ = _tmp179_.height;
-#line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp180_ - 1;
-#line 11188 "EditingTools.c"
+#line 11226 "EditingTools.c"
 			}
-#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp181_ = right;
-#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp182_ = left;
-#line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			adj_width = (_tmp181_ - _tmp182_) + 1;
-#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp183_ = bottom;
-#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp184_ = top;
-#line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			adj_height = (_tmp183_ - _tmp184_) + 1;
 #line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			adj_height = (_tmp183_ - _tmp184_) + 1;
+#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp185_ = adj_width;
-#line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp186_ = width;
-#line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp185_ != _tmp186_) {
-#line 11208 "EditingTools.c"
+#line 11246 "EditingTools.c"
 				gint _tmp187_ = 0;
-#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp187_ = delta_x;
-#line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp187_ < 0) {
-#line 11214 "EditingTools.c"
+#line 11252 "EditingTools.c"
 					gint _tmp188_ = 0;
 					gint _tmp189_ = 0;
-#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp188_ = left;
-#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp189_ = width;
-#line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = (_tmp188_ + _tmp189_) - 1;
-#line 11223 "EditingTools.c"
+#line 11261 "EditingTools.c"
 				} else {
 					gint _tmp190_ = 0;
 					gint _tmp191_ = 0;
-#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp190_ = right;
-#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp191_ = width;
-#line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = (_tmp190_ - _tmp191_) + 1;
-#line 11233 "EditingTools.c"
+#line 11271 "EditingTools.c"
 				}
 			}
-#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp192_ = adj_height;
-#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp193_ = height;
-#line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp192_ != _tmp193_) {
-#line 11242 "EditingTools.c"
+#line 11280 "EditingTools.c"
 				gint _tmp194_ = 0;
-#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp194_ = delta_y;
-#line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp194_ < 0) {
-#line 11248 "EditingTools.c"
+#line 11286 "EditingTools.c"
 					gint _tmp195_ = 0;
 					gint _tmp196_ = 0;
-#line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp195_ = top;
-#line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp196_ = height;
-#line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = (_tmp195_ + _tmp196_) - 1;
-#line 11257 "EditingTools.c"
+#line 11295 "EditingTools.c"
 				} else {
 					gint _tmp197_ = 0;
 					gint _tmp198_ = 0;
-#line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp197_ = bottom;
-#line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp198_ = height;
-#line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = (_tmp197_ - _tmp198_) + 1;
-#line 11267 "EditingTools.c"
+#line 11305 "EditingTools.c"
 				}
 			}
-#line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 11272 "EditingTools.c"
+#line 11310 "EditingTools.c"
 		}
 		default:
 		{
-#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			result = FALSE;
-#line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return result;
-#line 11280 "EditingTools.c"
+#line 11318 "EditingTools.c"
 		}
 	}
-#line 1658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp199_ = right;
-#line 1658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp200_ = left;
-#line 1658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	width = (_tmp199_ - _tmp200_) + 1;
-#line 1659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp201_ = bottom;
-#line 1659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp202_ = top;
-#line 1659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	height = (_tmp201_ - _tmp202_) + 1;
-#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_get_photo_dimensions (self, &_tmp203_);
-#line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_dims = _tmp203_;
-#line 1663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp204_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp205_ = editing_tools_photo_canvas_get_photo (_tmp204_);
-#line 1663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp206_ = _tmp205_;
-#line 1663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_get_straighten (_tmp206_, &_tmp207_);
-#line 1663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	angle = _tmp207_;
-#line 1663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp206_);
 #line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (_tmp206_);
+#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp208_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp208_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11315 "EditingTools.c"
+#line 11353 "EditingTools.c"
 		gint _tmp209_ = 0;
 		gint _tmp210_ = 0;
 		gint _tmp211_ = 0;
@@ -11330,167 +11368,167 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		gdouble _tmp232_ = 0.0;
 		BoxLocation _tmp233_ = 0;
 		Box _tmp234_ = {0};
-#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp209_ = right;
-#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp210_ = left;
-#line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		width = (_tmp209_ - _tmp210_) + 1;
-#line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp211_ = bottom;
-#line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp212_ = top;
-#line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		height = (_tmp211_ - _tmp212_) + 1;
-#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp213_ = self->priv->in_manipulation;
-#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		switch (_tmp213_) {
-#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_LEFT_SIDE:
-#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_LEFT:
-#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_LEFT:
-#line 11356 "EditingTools.c"
+#line 11394 "EditingTools.c"
 			{
 				gint _tmp214_ = 0;
-#line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp214_ = width;
-#line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp214_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11363 "EditingTools.c"
+#line 11401 "EditingTools.c"
 					gint _tmp215_ = 0;
-#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp215_ = right;
-#line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp215_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11369 "EditingTools.c"
+#line 11407 "EditingTools.c"
 				}
-#line 1676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11373 "EditingTools.c"
+#line 11411 "EditingTools.c"
 			}
-#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_RIGHT_SIDE:
-#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_RIGHT:
-#line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11381 "EditingTools.c"
+#line 11419 "EditingTools.c"
 			{
 				gint _tmp216_ = 0;
-#line 1681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp216_ = width;
-#line 1681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp216_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11388 "EditingTools.c"
+#line 11426 "EditingTools.c"
 					gint _tmp217_ = 0;
-#line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp217_ = left;
-#line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp217_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11394 "EditingTools.c"
+#line 11432 "EditingTools.c"
 				}
-#line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11398 "EditingTools.c"
+#line 11436 "EditingTools.c"
 			}
 			default:
 			{
-#line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11404 "EditingTools.c"
+#line 11442 "EditingTools.c"
 			}
 		}
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp218_ = self->priv->in_manipulation;
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		switch (_tmp218_) {
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_SIDE:
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_LEFT:
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_RIGHT:
-#line 11417 "EditingTools.c"
+#line 11455 "EditingTools.c"
 			{
 				gint _tmp219_ = 0;
-#line 1693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp219_ = height;
-#line 1693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp219_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11424 "EditingTools.c"
+#line 11462 "EditingTools.c"
 					gint _tmp220_ = 0;
-#line 1694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp220_ = bottom;
-#line 1694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp220_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11430 "EditingTools.c"
+#line 11468 "EditingTools.c"
 				}
-#line 1695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11434 "EditingTools.c"
+#line 11472 "EditingTools.c"
 			}
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_SIDE:
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_LEFT:
-#line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11442 "EditingTools.c"
+#line 11480 "EditingTools.c"
 			{
 				gint _tmp221_ = 0;
-#line 1700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp221_ = height;
-#line 1700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp221_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11449 "EditingTools.c"
+#line 11487 "EditingTools.c"
 					gint _tmp222_ = 0;
-#line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp222_ = top;
-#line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp222_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11455 "EditingTools.c"
+#line 11493 "EditingTools.c"
 				}
-#line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11459 "EditingTools.c"
+#line 11497 "EditingTools.c"
 			}
 			default:
 			{
-#line 1705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11465 "EditingTools.c"
+#line 11503 "EditingTools.c"
 			}
 		}
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp223_ = left;
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp224_ = top;
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp225_ = right;
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp226_ = bottom;
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_init (&_tmp227_, _tmp223_, _tmp224_, _tmp225_, _tmp226_);
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp228_ = photo_dims;
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp229_ = _tmp228_.width;
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp230_ = photo_dims;
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp231_ = _tmp230_.height;
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp232_ = angle;
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp233_ = self->priv->in_manipulation;
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		clamp_inside_rotated_image (&_tmp227_, _tmp229_, _tmp231_, _tmp232_, _tmp233_ == BOX_LOCATION_INSIDE, &_tmp234_);
-#line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		new_crop = _tmp234_;
-#line 11494 "EditingTools.c"
+#line 11532 "EditingTools.c"
 	} else {
 		gint _tmp235_ = 0;
 		gint _tmp236_ = 0;
@@ -11509,128 +11547,128 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		gboolean _tmp248_ = FALSE;
 		Box _tmp249_ = {0};
 		Box _tmp250_ = {0};
-#line 1720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp235_ = left;
-#line 1720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp236_ = top;
-#line 1720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp237_ = right;
-#line 1720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp238_ = bottom;
-#line 1720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_init (&new_crop, _tmp235_, _tmp236_, _tmp237_, _tmp238_);
-#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp239_ = new_crop;
-#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp240_ = photo_dims;
-#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp241_ = _tmp240_.width;
-#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp242_ = photo_dims;
-#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp243_ = _tmp242_.height;
-#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp244_ = angle;
-#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp245_ = self->priv->in_manipulation;
-#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		clamp_inside_rotated_image (&_tmp239_, _tmp241_, _tmp243_, _tmp244_, _tmp245_ == BOX_LOCATION_INSIDE, &_tmp246_);
-#line 1721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		adjusted = _tmp246_;
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp249_ = adjusted;
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp250_ = new_crop;
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_box_equal (&_tmp249_, &_tmp250_) != TRUE) {
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp248_ = TRUE;
-#line 11549 "EditingTools.c"
+#line 11587 "EditingTools.c"
 		} else {
 			gint _tmp251_ = 0;
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp251_ = width;
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp248_ = _tmp251_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11556 "EditingTools.c"
+#line 11594 "EditingTools.c"
 		}
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp248_) {
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp247_ = TRUE;
-#line 11562 "EditingTools.c"
+#line 11600 "EditingTools.c"
 		} else {
 			gint _tmp252_ = 0;
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp252_ = height;
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp247_ = _tmp252_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11569 "EditingTools.c"
+#line 11607 "EditingTools.c"
 		}
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp247_) {
-#line 11573 "EditingTools.c"
+#line 11611 "EditingTools.c"
 			Box _tmp253_ = {0};
-#line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp253_ = self->priv->scaled_crop;
-#line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			new_crop = _tmp253_;
-#line 11579 "EditingTools.c"
+#line 11617 "EditingTools.c"
 		}
 	}
-#line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp254_ = self->priv->in_manipulation;
-#line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp254_ != BOX_LOCATION_INSIDE) {
-#line 11586 "EditingTools.c"
+#line 11624 "EditingTools.c"
 		Box _tmp255_ = {0};
-#line 1731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp255_ = new_crop;
-#line 1731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_resized (self, &_tmp255_);
-#line 11592 "EditingTools.c"
+#line 11630 "EditingTools.c"
 	} else {
 		Box _tmp256_ = {0};
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp256_ = new_crop;
-#line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_moved (self, &_tmp256_);
-#line 11599 "EditingTools.c"
+#line 11637 "EditingTools.c"
 	}
-#line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp257_ = new_crop;
-#line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->scaled_crop = _tmp257_;
-#line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp258_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp258_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11609 "EditingTools.c"
+#line 11647 "EditingTools.c"
 		gint _tmp259_ = 0;
 		gint _tmp260_ = 0;
 		gint _tmp261_ = 0;
 		gint _tmp262_ = 0;
-#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp259_ = box_get_width (&self->priv->scaled_crop);
-#line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_init_width = _tmp259_;
-#line 1740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp260_ = box_get_height (&self->priv->scaled_crop);
-#line 1740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_init_height = _tmp260_;
-#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp261_ = self->priv->custom_init_width;
-#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp262_ = self->priv->custom_init_height;
-#line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_aspect_ratio = ((gfloat) _tmp261_) / ((gfloat) _tmp262_);
-#line 11628 "EditingTools.c"
+#line 11666 "EditingTools.c"
 	}
-#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 11634 "EditingTools.c"
+#line 11672 "EditingTools.c"
 }
 
 
@@ -11658,133 +11696,133 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	Box _tmp23_ = {0};
 	EditingToolsPhotoCanvas* _tmp24_ = NULL;
 	Box _tmp25_ = {0};
-#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (new_crop != NULL);
-#line 1748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *new_crop;
-#line 1748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_);
-#line 1748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 1750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11674 "EditingTools.c"
+#line 11712 "EditingTools.c"
 	}
-#line 1753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->scaled_crop;
-#line 1753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_);
-#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = *new_crop;
-#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = box_resized_complements (&self->priv->scaled_crop, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	horizontal = _tmp5_;
-#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	horizontal_enlarged = _tmp6_;
-#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	vertical = _tmp7_;
-#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	vertical_enlarged = _tmp8_;
-#line 1759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	complements = _tmp9_;
-#line 1763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = complements;
-#line 1763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp10_ != BOX_COMPLEMENTS_NONE, "complements != BoxComplements.NONE");
-#line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = complements;
-#line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp12_ == BOX_COMPLEMENTS_HORIZONTAL) {
-#line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = TRUE;
-#line 11706 "EditingTools.c"
+#line 11744 "EditingTools.c"
 	} else {
 		BoxComplements _tmp13_ = 0;
-#line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = complements;
-#line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp13_ == BOX_COMPLEMENTS_BOTH;
-#line 11713 "EditingTools.c"
+#line 11751 "EditingTools.c"
 	}
-#line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp11_) {
-#line 11717 "EditingTools.c"
+#line 11755 "EditingTools.c"
 		gdouble _tmp14_ = 0.0;
 		gboolean _tmp15_ = FALSE;
 		Box _tmp16_ = {0};
-#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = horizontal_enlarged;
-#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp15_) {
-#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = 0.0;
-#line 11727 "EditingTools.c"
+#line 11765 "EditingTools.c"
 		} else {
-#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = 0.5;
-#line 11731 "EditingTools.c"
+#line 11769 "EditingTools.c"
 		}
-#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = horizontal;
-#line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_area_alpha (self, &_tmp16_, _tmp14_);
-#line 11737 "EditingTools.c"
+#line 11775 "EditingTools.c"
 	}
-#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = complements;
-#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp18_ == BOX_COMPLEMENTS_VERTICAL) {
-#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = TRUE;
-#line 11745 "EditingTools.c"
+#line 11783 "EditingTools.c"
 	} else {
 		BoxComplements _tmp19_ = 0;
-#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = complements;
-#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp19_ == BOX_COMPLEMENTS_BOTH;
-#line 11752 "EditingTools.c"
+#line 11790 "EditingTools.c"
 	}
-#line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp17_) {
-#line 11756 "EditingTools.c"
+#line 11794 "EditingTools.c"
 		gdouble _tmp20_ = 0.0;
 		gboolean _tmp21_ = FALSE;
 		Box _tmp22_ = {0};
-#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = vertical_enlarged;
-#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp21_) {
-#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = 0.0;
-#line 11766 "EditingTools.c"
+#line 11804 "EditingTools.c"
 		} else {
-#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = 0.5;
-#line 11770 "EditingTools.c"
+#line 11808 "EditingTools.c"
 		}
-#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = vertical;
-#line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_area_alpha (self, &_tmp22_, _tmp20_);
-#line 11776 "EditingTools.c"
+#line 11814 "EditingTools.c"
 	}
-#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = *new_crop;
-#line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_paint_crop_tool (self, &_tmp23_);
-#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = *new_crop;
-#line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp24_, &_tmp25_);
-#line 11788 "EditingTools.c"
+#line 11826 "EditingTools.c"
 }
 
 
@@ -11798,45 +11836,45 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box*
 	Box _tmp6_ = {0};
 	EditingToolsPhotoCanvas* _tmp7_ = NULL;
 	Box _tmp8_ = {0};
-#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (new_crop != NULL);
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *new_crop;
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_);
-#line 1776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11814 "EditingTools.c"
+#line 11852 "EditingTools.c"
 	}
-#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->scaled_crop;
-#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_);
-#line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->scaled_crop;
-#line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_set_area_alpha (self, &_tmp4_, 0.5);
-#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *new_crop;
-#line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_set_area_alpha (self, &_tmp5_, 0.0);
-#line 1788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = *new_crop;
-#line 1788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_paint_crop_tool (self, &_tmp6_);
-#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *new_crop;
-#line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp7_, &_tmp8_);
-#line 11840 "EditingTools.c"
+#line 11878 "EditingTools.c"
 }
 
 
@@ -11854,49 +11892,49 @@ static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self,
 	EditingToolsPhotoCanvas* _tmp9_ = NULL;
 	cairo_surface_t* _tmp10_ = NULL;
 	Box _tmp11_ = {0};
-#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (area != NULL);
-#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->crop_surface;
-#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = cairo_create (_tmp0_);
-#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	ctx = _tmp1_;
-#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE);
-#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = alpha;
-#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, _tmp2_);
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = *area;
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.left;
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *area;
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.top;
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = box_get_width (area);
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = box_get_height (area);
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_rectangle (ctx, (gdouble) _tmp4_, (gdouble) _tmp6_, (gdouble) _tmp7_, (gdouble) _tmp8_);
-#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (ctx);
-#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->crop_surface;
-#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = *area;
-#line 1798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_surface_area (_tmp9_, _tmp10_, &_tmp11_, TRUE);
-#line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 11900 "EditingTools.c"
+#line 11938 "EditingTools.c"
 }
 
 
@@ -11911,15 +11949,15 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 	EditingToolsPhotoCanvas* _tmp71_ = NULL;
 	cairo_t* _tmp72_ = NULL;
 	Box _tmp73_ = {0};
-#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
-#line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (crop != NULL);
-#line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->in_manipulation;
-#line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 11923 "EditingTools.c"
+#line 11961 "EditingTools.c"
 		gint one_third_x = 0;
 		gint _tmp1_ = 0;
 		gint one_third_y = 0;
@@ -11990,193 +12028,193 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 		const gchar* _tmp62_ = NULL;
 		gint _tmp63_ = 0;
 		gint _tmp64_ = 0;
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = box_get_width (crop);
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		one_third_x = _tmp1_ / 3;
-#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = box_get_height (crop);
-#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		one_third_y = _tmp2_ / 3;
-#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->thin_white_ctx;
-#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = *crop;
-#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.left;
-#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = *crop;
-#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.top;
-#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = one_third_y;
-#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = box_get_width (crop);
-#line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_horizontal_line (_tmp3_, _tmp4_, _tmp6_, _tmp8_ + _tmp9_, _tmp10_, TRUE);
-#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->thin_white_ctx;
-#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = *crop;
-#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = _tmp13_.left;
-#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = *crop;
-#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _tmp15_.top;
-#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = one_third_y;
-#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = box_get_width (crop);
-#line 1808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_horizontal_line (_tmp11_, _tmp12_, _tmp14_, _tmp16_ + (_tmp17_ * 2), _tmp18_, TRUE);
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = self->priv->thin_white_ctx;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = *crop;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = _tmp21_.left;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp23_ = one_third_x;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = *crop;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = _tmp24_.top;
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = box_get_height (crop);
-#line 1810 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_vertical_line (_tmp19_, _tmp20_, _tmp22_ + _tmp23_, _tmp25_, _tmp26_, TRUE);
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = self->priv->thin_white_ctx;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp29_ = *crop;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp30_ = _tmp29_.left;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = one_third_x;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp32_ = *crop;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp33_ = _tmp32_.top;
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp34_ = box_get_height (crop);
-#line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_vertical_line (_tmp27_, _tmp28_, _tmp30_ + (_tmp31_ * 2), _tmp33_, _tmp34_, TRUE);
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp35_, &_tmp36_);
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dimensions_for_rectangle (&_tmp36_, &_tmp37_);
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp39_ = editing_tools_photo_canvas_get_photo (_tmp38_);
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp40_ = _tmp39_;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp41_);
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_get_scaled_similar (&self->priv->scaled_crop, &_tmp37_, &_tmp41_, &_tmp42_);
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp43_ = _tmp42_;
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp40_);
-#line 1815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		adj_crop = _tmp43_;
 #line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		adj_crop = _tmp43_;
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp44_ = box_get_width (&adj_crop);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp45_ = g_strdup_printf ("%i", _tmp44_);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = _tmp45_;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp47_ = g_strconcat (_tmp46_, "x", NULL);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = _tmp47_;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp49_ = box_get_height (&adj_crop);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp50_ = g_strdup_printf ("%i", _tmp49_);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp51_ = _tmp50_;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp52_ = g_strconcat (_tmp48_, _tmp51_, NULL);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp53_ = _tmp52_;
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp51_);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp48_);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp46_);
-#line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		text = _tmp53_;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp54_ = *crop;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp55_ = _tmp54_.left;
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp56_ = box_get_width (crop);
-#line 1819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = _tmp55_ + (_tmp56_ / 2);
-#line 1820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp57_ = *crop;
-#line 1820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp58_ = _tmp57_.top;
-#line 1820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp59_ = box_get_height (crop);
-#line 1820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp58_ + (_tmp59_ / 2);
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp60_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp61_ = self->priv->text_ctx;
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp62_ = text;
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp63_ = x;
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp64_ = y;
-#line 1821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_draw_text (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, TRUE);
-#line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (text);
-#line 12154 "EditingTools.c"
+#line 12192 "EditingTools.c"
 	}
-#line 1825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp66_ = self->priv->wide_black_ctx;
-#line 1825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = *crop;
-#line 1825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_box (_tmp65_, _tmp66_, &_tmp67_);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = self->priv->wide_white_ctx;
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_reduced (crop, 1, &_tmp70_);
-#line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_box (_tmp68_, _tmp69_, &_tmp70_);
-#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp72_ = self->priv->wide_white_ctx;
-#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	box_get_reduced (crop, 2, &_tmp73_);
-#line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_box (_tmp71_, _tmp72_, &_tmp73_);
-#line 12180 "EditingTools.c"
+#line 12218 "EditingTools.c"
 }
 
 
@@ -12188,62 +12226,62 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constr
 	gint _tmp3_ = 0;
 	gfloat _tmp4_ = 0.0F;
 	gboolean _tmp8_ = FALSE;
-#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (new_name != NULL, NULL);
-#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsCropToolConstraintDescription*) g_type_create_instance (object_type);
-#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = new_name;
-#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->name = _tmp1_;
-#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = new_basis_width;
-#line 617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->basis_width = _tmp2_;
-#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = new_basis_height;
-#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->basis_height = _tmp3_;
-#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = new_aspect_ratio;
-#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS) {
-#line 12216 "EditingTools.c"
+#line 12254 "EditingTools.c"
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->basis_width;
-#line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->basis_height;
-#line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->aspect_ratio = ((gfloat) _tmp5_) / ((gfloat) _tmp6_);
-#line 12225 "EditingTools.c"
+#line 12263 "EditingTools.c"
 	} else {
 		gfloat _tmp7_ = 0.0F;
-#line 622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = new_aspect_ratio;
-#line 622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->aspect_ratio = _tmp7_;
-#line 12232 "EditingTools.c"
+#line 12270 "EditingTools.c"
 	}
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = new_pivotable;
-#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->is_pivotable = _tmp8_;
-#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12240 "EditingTools.c"
+#line 12278 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) {
-#line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_constraint_description_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, new_name, new_basis_width, new_basis_height, new_pivotable, new_aspect_ratio);
-#line 12247 "EditingTools.c"
+#line 12285 "EditingTools.c"
 }
 
 
@@ -12251,237 +12289,237 @@ static gboolean editing_tools_crop_tool_constraint_description_is_separator (Edi
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_CROP_TOOL_IS_CONSTRAINT_DESCRIPTION (self), FALSE);
-#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->is_pivotable;
-#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp1_) {
-#line 12261 "EditingTools.c"
+#line 12299 "EditingTools.c"
 		gfloat _tmp2_ = 0.0F;
-#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->aspect_ratio;
-#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_SEPARATOR;
-#line 12267 "EditingTools.c"
+#line 12305 "EditingTools.c"
 	} else {
-#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 12271 "EditingTools.c"
+#line 12309 "EditingTools.c"
 	}
-#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12277 "EditingTools.c"
+#line 12315 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_constraint_description_init (GValue* value) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 12284 "EditingTools.c"
+#line 12322 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_constraint_description_free_value (GValue* value) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (value->data[0].v_pointer) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (value->data[0].v_pointer);
-#line 12293 "EditingTools.c"
+#line 12331 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_crop_tool_value_constraint_description_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (src_value->data[0].v_pointer) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (src_value->data[0].v_pointer);
-#line 12303 "EditingTools.c"
+#line 12341 "EditingTools.c"
 	} else {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 12307 "EditingTools.c"
+#line 12345 "EditingTools.c"
 	}
 }
 
 
 static gpointer editing_tools_crop_tool_value_constraint_description_peek_pointer (const GValue* value) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 12315 "EditingTools.c"
+#line 12353 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_crop_tool_value_constraint_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 12322 "EditingTools.c"
+#line 12360 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* object;
 		object = collect_values[0].v_pointer;
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12329 "EditingTools.c"
+#line 12367 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12333 "EditingTools.c"
+#line 12371 "EditingTools.c"
 		}
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (object);
-#line 12337 "EditingTools.c"
+#line 12375 "EditingTools.c"
 	} else {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12341 "EditingTools.c"
+#line 12379 "EditingTools.c"
 	}
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 12345 "EditingTools.c"
+#line 12383 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_crop_tool_value_constraint_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	EditingToolsCropToolConstraintDescription** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 12356 "EditingTools.c"
+#line 12394 "EditingTools.c"
 	}
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 12362 "EditingTools.c"
+#line 12400 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 12366 "EditingTools.c"
+#line 12404 "EditingTools.c"
 	} else {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12370 "EditingTools.c"
+#line 12408 "EditingTools.c"
 	}
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 12374 "EditingTools.c"
+#line 12412 "EditingTools.c"
 }
 
 
 static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	EditingToolsCropToolParamSpecConstraintDescription* spec;
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 12388 "EditingTools.c"
+#line 12426 "EditingTools.c"
 }
 
 
 static gpointer editing_tools_crop_tool_value_get_constraint_description (const GValue* value) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 12397 "EditingTools.c"
+#line 12435 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_set_constraint_description (GValue* value, gpointer v_object) {
 	EditingToolsCropToolConstraintDescription* old;
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12417 "EditingTools.c"
+#line 12455 "EditingTools.c"
 	} else {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12421 "EditingTools.c"
+#line 12459 "EditingTools.c"
 	}
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12427 "EditingTools.c"
+#line 12465 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_crop_tool_value_take_constraint_description (GValue* value, gpointer v_object) {
 	EditingToolsCropToolConstraintDescription* old;
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old = value->data[0].v_pointer;
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (v_object) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 12446 "EditingTools.c"
+#line 12484 "EditingTools.c"
 	} else {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12450 "EditingTools.c"
+#line 12488 "EditingTools.c"
 	}
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12456 "EditingTools.c"
+#line 12494 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_crop_tool_constraint_description_class_init (EditingToolsCropToolConstraintDescriptionClass * klass) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_description_parent_class = g_type_class_peek_parent (klass);
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsCropToolConstraintDescriptionClass *) klass)->finalize = editing_tools_crop_tool_constraint_description_finalize;
-#line 12466 "EditingTools.c"
+#line 12504 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_instance_init (EditingToolsCropToolConstraintDescription * self) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 12473 "EditingTools.c"
+#line 12511 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription* obj) {
 	EditingToolsCropToolConstraintDescription * self;
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, EditingToolsCropToolConstraintDescription);
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_destroy (self);
-#line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 12485 "EditingTools.c"
+#line 12523 "EditingTools.c"
 }
 
 
@@ -12502,24 +12540,24 @@ static GType editing_tools_crop_tool_constraint_description_get_type (void) {
 static gpointer editing_tools_crop_tool_constraint_description_ref (gpointer instance) {
 	EditingToolsCropToolConstraintDescription* self;
 	self = instance;
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 12510 "EditingTools.c"
+#line 12548 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_unref (gpointer instance) {
 	EditingToolsCropToolConstraintDescription* self;
 	self = instance;
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_GET_CLASS (self)->finalize (self);
-#line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 12523 "EditingTools.c"
+#line 12561 "EditingTools.c"
 	}
 }
 
@@ -12527,9 +12565,9 @@ static void editing_tools_crop_tool_constraint_description_unref (gpointer insta
 static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self) {
 	gboolean result;
 	result = editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (model, iter);
-#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12533 "EditingTools.c"
+#line 12571 "EditingTools.c"
 }
 
 
@@ -12549,185 +12587,185 @@ static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_win
 	GtkComboBox* _tmp10_ = NULL;
 	GtkComboBox* _tmp11_ = NULL;
 	GtkComboBox* _tmp12_ = NULL;
-	GtkButton* _tmp13_ = NULL;
-	GtkImage* _tmp14_ = NULL;
-	GtkImage* _tmp15_ = NULL;
-	GtkButton* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
+	GtkImage* image = NULL;
+	GtkImage* _tmp13_ = NULL;
+	GtkButton* _tmp14_ = NULL;
+	GtkButton* _tmp15_ = NULL;
+	const gchar* _tmp16_ = NULL;
+	GtkEntry* _tmp17_ = NULL;
 	GtkEntry* _tmp18_ = NULL;
 	GtkEntry* _tmp19_ = NULL;
 	GtkEntry* _tmp20_ = NULL;
-	GtkEntry* _tmp21_ = NULL;
+	GtkBox* _tmp21_ = NULL;
 	GtkBox* _tmp22_ = NULL;
 	GtkBox* _tmp23_ = NULL;
-	GtkBox* _tmp24_ = NULL;
-	GtkButton* _tmp25_ = NULL;
-	GtkBox* _tmp26_ = NULL;
-	GtkButton* _tmp27_ = NULL;
+	GtkButton* _tmp24_ = NULL;
+	GtkBox* _tmp25_ = NULL;
+	GtkButton* _tmp26_ = NULL;
+	GtkBox* _tmp27_ = NULL;
 	GtkBox* _tmp28_ = NULL;
-	GtkBox* _tmp29_ = NULL;
-	GtkComboBox* _tmp30_ = NULL;
-	GtkBox* _tmp31_ = NULL;
-	GtkButton* _tmp32_ = NULL;
+	GtkComboBox* _tmp29_ = NULL;
+	GtkBox* _tmp30_ = NULL;
+	GtkButton* _tmp31_ = NULL;
+	GtkBox* _tmp32_ = NULL;
 	GtkBox* _tmp33_ = NULL;
 	GtkBox* _tmp34_ = NULL;
-	GtkBox* _tmp35_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsCropToolCropToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->cancel_button;
-#line 665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _ ("Return to current photo dimensions");
-#line 665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp2_);
-#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->cancel_button;
-#line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image_position (_tmp3_, GTK_POS_LEFT);
-#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->ok_button;
-#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _ ("Set the crop for this photo");
-#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->ok_button;
-#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image_position (_tmp6_, GTK_POS_LEFT);
-#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = (GtkComboBox*) gtk_combo_box_new ();
-#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp7_);
-#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->constraint_combo);
-#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->constraint_combo = _tmp7_;
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp8_);
-#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	combo_text_renderer = _tmp8_;
-#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->constraint_combo;
-#line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->constraint_combo;
-#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
-#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->constraint_combo;
-#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_combo_box_set_row_separator_func (_tmp11_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
-#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->constraint_combo;
-#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_combo_box_set_active (_tmp12_, 0);
+#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp13_ = (GtkImage*) gtk_image_new_from_resource ("/org/gnome/Shotwell/crop-pivot-reticle.png");
+#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp13_);
+#line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	image = _tmp13_;
+#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp14_ = self->pivot_reticle_button;
+#line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_button_set_image (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget));
+#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp15_ = self->pivot_reticle_button;
+#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp16_ = _ ("Pivot the crop rectangle between portrait and landscape orientations");
+#line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), _tmp16_);
 #line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = self->pivot_reticle_button;
-#line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = (GtkImage*) gtk_image_new_from_stock (RESOURCES_CROP_PIVOT_RETICLE, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp14_);
-#line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = _tmp14_;
-#line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
+	_tmp17_ = self->custom_width_entry;
 #line 678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp15_);
-#line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = self->pivot_reticle_button;
+	gtk_entry_set_width_chars (_tmp17_, 4);
+#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp18_ = self->custom_width_entry;
+#line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_set (_tmp18_, "editable", TRUE, NULL);
 #line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = _ ("Pivot the crop rectangle between portrait and landscape orientations");
+	_tmp19_ = self->custom_height_entry;
 #line 680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), _tmp17_);
-#line 682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->custom_width_entry;
-#line 682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_entry_set_width_chars (_tmp18_, 4);
+	gtk_entry_set_width_chars (_tmp19_, 4);
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp20_ = self->custom_height_entry;
+#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_set (_tmp20_, "editable", TRUE, NULL);
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = self->custom_width_entry;
+	_tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_set (_tmp19_, "editable", TRUE, NULL);
+	g_object_ref_sink (_tmp21_);
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (self->response_layout);
+#line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->response_layout = _tmp21_;
 #line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = self->custom_height_entry;
+	_tmp22_ = self->response_layout;
 #line 684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_entry_set_width_chars (_tmp20_, 4);
+	gtk_box_set_homogeneous (_tmp22_, TRUE);
 #line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = self->custom_height_entry;
+	_tmp23_ = self->response_layout;
 #line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_set (_tmp21_, "editable", TRUE, NULL);
-#line 687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
-#line 687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp22_);
-#line 687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (self->response_layout);
-#line 687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->response_layout = _tmp22_;
+	_tmp24_ = self->cancel_button;
+#line 685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
+#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp25_ = self->response_layout;
+#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp26_ = self->ok_button;
+#line 686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
 #line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->response_layout;
+	_tmp27_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
+#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp27_);
+#line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (self->layout);
 #line 688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_set_homogeneous (_tmp23_, TRUE);
+	self->layout = _tmp27_;
 #line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->response_layout;
+	_tmp28_ = self->layout;
 #line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = self->cancel_button;
+	_tmp29_ = self->constraint_combo;
 #line 689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget));
 #line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = self->response_layout;
+	_tmp30_ = self->layout;
 #line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = self->ok_button;
+	_tmp31_ = self->pivot_reticle_button;
 #line 690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget));
-#line 692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
-#line 692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp28_);
-#line 692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (self->layout);
-#line 692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->layout = _tmp28_;
-#line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = self->layout;
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
+#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp32_ = self->layout;
+#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp33_ = self->response_layout;
+#line 691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
 #line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = self->constraint_combo;
+	_tmp34_ = self->layout;
 #line 693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
-#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = self->layout;
-#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = self->pivot_reticle_button;
-#line 694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
-#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = self->layout;
-#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = self->response_layout;
-#line 695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
-#line 697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp35_ = self->layout;
-#line 697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget));
-#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
+#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (image);
+#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (combo_text_renderer);
-#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12724 "EditingTools.c"
+#line 12762 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container) {
-#line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_crop_tool_window_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, container);
-#line 12731 "EditingTools.c"
+#line 12769 "EditingTools.c"
 }
 
 
@@ -12740,44 +12778,44 @@ static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separa
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
-#line 702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = model;
-#line 702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = *iter;
-#line 702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_tree_model_get_value (_tmp0_, &_tmp1_, 0, &_tmp2_);
-#line 702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	val = _tmp2_;
-#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = g_value_dup_string (&val);
-#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = g_strcmp0 (_tmp4_, "-") == 0;
-#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (_tmp4_);
-#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp5_;
-#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12772 "EditingTools.c"
+#line 12810 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_crop_tool_window_class_init (EditingToolsCropToolCropToolWindowClass * klass) {
-#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_crop_tool_window_parent_class = g_type_class_peek_parent (klass);
-#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_crop_tool_crop_tool_window_finalize;
-#line 12781 "EditingTools.c"
+#line 12819 "EditingTools.c"
 }
 
 
@@ -12788,83 +12826,83 @@ static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingTools
 	GtkEntry* _tmp3_ = NULL;
 	GtkEntry* _tmp4_ = NULL;
 	GtkLabel* _tmp5_ = NULL;
-#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = (GtkButton*) gtk_button_new_with_label (RESOURCES_CROP_LABEL);
-#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp0_);
-#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ok_button = _tmp0_;
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->cancel_button = _tmp1_;
-#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = (GtkButton*) gtk_button_new ();
-#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp2_);
-#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->pivot_reticle_button = _tmp2_;
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = (GtkEntry*) gtk_entry_new ();
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->custom_width_entry = _tmp3_;
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = (GtkEntry*) gtk_entry_new ();
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp4_);
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->custom_height_entry = _tmp4_;
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = (GtkLabel*) gtk_label_new_with_mnemonic ("x");
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp5_);
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->custom_mulsign_label = _tmp5_;
-#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->most_recently_edited = NULL;
-#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->response_layout = NULL;
-#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->layout = NULL;
-#line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->normal_width = -1;
-#line 660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->normal_height = -1;
-#line 12838 "EditingTools.c"
+#line 12876 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_crop_tool_window_finalize (GObject* obj) {
 	EditingToolsCropToolCropToolWindow * self;
-#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, EditingToolsCropToolCropToolWindow);
-#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->ok_button);
-#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->cancel_button);
-#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->constraint_combo);
-#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->pivot_reticle_button);
-#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->custom_width_entry);
-#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->custom_height_entry);
-#line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->custom_mulsign_label);
-#line 656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->most_recently_edited);
-#line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->response_layout);
-#line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->layout);
-#line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_crop_tool_crop_tool_window_parent_class)->finalize (obj);
-#line 12868 "EditingTools.c"
+#line 12906 "EditingTools.c"
 }
 
 
@@ -12881,31 +12919,31 @@ static GType editing_tools_crop_tool_crop_tool_window_get_type (void) {
 
 
 static void editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klass) {
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_parent_class = g_type_class_peek_parent (klass);
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_crop_tool_finalize;
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsCropToolPrivate));
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->activate = editing_tools_crop_tool_real_activate;
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_crop_tool_real_on_keypress;
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->deactivate = editing_tools_crop_tool_real_deactivate;
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_crop_tool_real_get_tool_window;
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = editing_tools_crop_tool_real_get_display_pixbuf;
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_click = editing_tools_crop_tool_real_on_left_click;
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_released = editing_tools_crop_tool_real_on_left_released;
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_motion = editing_tools_crop_tool_real_on_motion;
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = editing_tools_crop_tool_real_paint;
-#line 12909 "EditingTools.c"
+#line 12947 "EditingTools.c"
 }
 
 
@@ -12917,93 +12955,93 @@ static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self)
 	EditingToolsCropToolConstraintDescription** _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
 	GtkListStore* _tmp5_ = NULL;
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_CROP_TOOL_GET_PRIVATE (self);
-#line 708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_tool_window = NULL;
-#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_cursor_type = GDK_LEFT_PTR;
-#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
-#line 711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wide_black_ctx = NULL;
-#line 712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wide_white_ctx = NULL;
-#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->thin_white_ctx = NULL;
-#line 714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->text_ctx = NULL;
-#line 717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->crop_surface = NULL;
-#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_x = -1;
-#line 722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_y = -1;
-#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_crop_tool_create_constraints (&_tmp0_);
-#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraints = _tmp1_;
-#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraints_length1 = _tmp0_;
-#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_constraints_size_ = self->priv->constraints_length1;
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_crop_tool_create_constraints (&_tmp2_);
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4__length1 = _tmp2_;
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_crop_tool_create_constraint_list (_tmp4_, _tmp2_);
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_list = _tmp5_;
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = (_vala_array_free (_tmp4_, _tmp4__length1, (GDestroyNotify) editing_tools_crop_tool_constraint_description_unref), NULL);
-#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = FALSE;
-#line 729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_aspect_ratio = 1.0f;
-#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_width = -1;
-#line 731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_height = -1;
-#line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 728 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_init_width = -1;
-#line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->custom_init_height = -1;
-#line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO;
-#line 12981 "EditingTools.c"
+#line 13019 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_finalize (EditingToolsEditingTool* obj) {
 	EditingToolsCropTool * self;
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
-#line 708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->crop_tool_window);
-#line 711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_black_ctx);
-#line 712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_white_ctx);
-#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
-#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraints = (_vala_array_free (self->priv->constraints, self->priv->constraints_length1, (GDestroyNotify) editing_tools_crop_tool_constraint_description_unref), NULL);
-#line 725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->constraint_list);
-#line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->finalize (obj);
-#line 13007 "EditingTools.c"
+#line 13045 "EditingTools.c"
 }
 
 
@@ -13022,17 +13060,17 @@ GType editing_tools_crop_tool_get_type (void) {
 static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self) {
 	GdkPoint default_center = {0};
 	GdkPoint _tmp0_ = {0};
-#line 1840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (self, 0, sizeof (EditingToolsRedeyeInstance));
-#line 1841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (&default_center, 0, sizeof (GdkPoint));
-#line 1842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = default_center;
-#line 1842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*self).center = _tmp0_;
-#line 1843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*self).radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
-#line 13036 "EditingTools.c"
+#line 13074 "EditingTools.c"
 }
 
 
@@ -13052,51 +13090,51 @@ void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* i
 	gint _tmp11_ = 0;
 	GdkRectangle _tmp12_ = {0};
 	gint _tmp13_ = 0;
-#line 1846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (inst != NULL);
-#line 1847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memset (&_result_, 0, sizeof (GdkRectangle));
-#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *inst;
-#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_.center;
-#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_.x;
-#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = *inst;
-#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.radius;
-#line 1848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.x = _tmp2_ - _tmp4_;
-#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *inst;
-#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.center;
-#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *inst;
-#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.radius;
-#line 1849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.y = _tmp7_ - _tmp9_;
-#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = *inst;
-#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.radius;
-#line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.width = 2 * _tmp11_;
-#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _result_;
-#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.width;
-#line 1851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.height = _tmp13_;
-#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13100 "EditingTools.c"
+#line 13138 "EditingTools.c"
 }
 
 
@@ -13116,68 +13154,68 @@ void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, Editing
 	gint _tmp10_ = 0;
 	EditingToolsRedeyeInstance _tmp11_ = {0};
 	gint _tmp12_ = 0;
-#line 1856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (rect != NULL);
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *rect;
-#line 1857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	in_rect = _tmp0_;
-#line 1859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_init (&_result_);
-#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = in_rect;
-#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_.width;
-#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = in_rect;
-#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.height;
-#line 1860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.radius = (_tmp2_ + _tmp4_) / 4;
-#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = in_rect;
-#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.x;
-#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _result_;
-#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.radius;
-#line 1861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.center.x = _tmp6_ + _tmp8_;
-#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = in_rect;
-#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.y;
-#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _result_;
-#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.radius;
-#line 1862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.center.y = _tmp10_ + _tmp12_;
-#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13162 "EditingTools.c"
+#line 13200 "EditingTools.c"
 }
 
 
 EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self) {
 	EditingToolsRedeyeInstance* dup;
-#line 1832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dup = g_new0 (EditingToolsRedeyeInstance, 1);
-#line 1832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	memcpy (dup, self, sizeof (EditingToolsRedeyeInstance));
-#line 1832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return dup;
-#line 13174 "EditingTools.c"
+#line 13212 "EditingTools.c"
 }
 
 
 void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self) {
-#line 1832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_free (self);
-#line 13181 "EditingTools.c"
+#line 13219 "EditingTools.c"
 }
 
 
@@ -13194,31 +13232,31 @@ GType editing_tools_redeye_instance_get_type (void) {
 
 static EditingToolsRedeyeTool* editing_tools_redeye_tool_construct (GType object_type) {
 	EditingToolsRedeyeTool* self = NULL;
-#line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsRedeyeTool*) editing_tools_editing_tool_construct (object_type, "RedeyeTool");
-#line 1915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 13202 "EditingTools.c"
+#line 13240 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeTool* editing_tools_redeye_tool_new (void) {
-#line 1915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_construct (EDITING_TOOLS_TYPE_REDEYE_TOOL);
-#line 13209 "EditingTools.c"
+#line 13247 "EditingTools.c"
 }
 
 
 EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void) {
 	EditingToolsRedeyeTool* result = NULL;
 	EditingToolsRedeyeTool* _tmp0_ = NULL;
-#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_redeye_tool_new ();
-#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13222 "EditingTools.c"
+#line 13260 "EditingTools.c"
 }
 
 
@@ -13231,44 +13269,44 @@ gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling)
 	gboolean _tmp3_ = FALSE;
 	Dimensions _tmp4_ = {0};
 	gint _tmp5_ = 0;
-#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp1_);
-#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_);
-#line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dim = _tmp2_;
-#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = dim;
-#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_.width;
-#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2)) {
-#line 13253 "EditingTools.c"
+#line 13291 "EditingTools.c"
 		Dimensions _tmp6_ = {0};
 		gint _tmp7_ = 0;
-#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = dim;
-#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_.height;
-#line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2);
-#line 13262 "EditingTools.c"
+#line 13300 "EditingTools.c"
 	} else {
-#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 13266 "EditingTools.c"
+#line 13304 "EditingTools.c"
 	}
-#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp3_;
-#line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13272 "EditingTools.c"
+#line 13310 "EditingTools.c"
 }
 
 
@@ -13291,61 +13329,61 @@ static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRede
 	gint _tmp12_ = 0;
 	GdkPoint _tmp13_ = {0};
 	gint _tmp14_ = 0;
-#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_bounds = _tmp1_;
-#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_.x = 0;
-#line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_center = _tmp2_;
-#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = photo_bounds;
-#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.x;
-#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = photo_bounds;
-#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.width;
-#line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_center.x = _tmp4_ + (_tmp6_ / 2);
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = photo_bounds;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_.y;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = photo_bounds;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.height;
-#line 1934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_center.y = _tmp8_ + (_tmp10_ / 2);
-#line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_init (&_result_);
-#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = photo_center;
-#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _tmp11_.x;
-#line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.center.x = _tmp12_;
-#line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = photo_center;
-#line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.y;
-#line 1938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.center.y = _tmp14_;
-#line 1939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
-#line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13349 "EditingTools.c"
+#line 13387 "EditingTools.c"
 }
 
 
@@ -13360,49 +13398,49 @@ static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self,
 	cairo_t* _tmp7_ = NULL;
 	cairo_t* _tmp8_ = NULL;
 	cairo_t* _tmp9_ = NULL;
-#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 1944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (dim != NULL);
-#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = ctx;
-#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = cairo_get_target (_tmp0_);
-#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = cairo_create (_tmp1_);
-#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wider_gray_ctx);
-#line 1945 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wider_gray_ctx = _tmp2_;
-#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->wider_gray_ctx;
-#line 1946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp3_, "#111");
-#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->wider_gray_ctx;
-#line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp4_, (gdouble) 3);
-#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = ctx;
-#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = cairo_get_target (_tmp5_);
-#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = cairo_create (_tmp6_);
-#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 1949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->thin_white_ctx = _tmp7_;
-#line 1950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->thin_white_ctx;
-#line 1950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	set_source_color_from_string (_tmp8_, "#FFF");
-#line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->thin_white_ctx;
-#line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp9_, (gdouble) 1);
-#line 13406 "EditingTools.c"
+#line 13444 "EditingTools.c"
 }
 
 
@@ -13427,55 +13465,55 @@ static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTo
 	gint _tmp17_ = 0;
 	EditingToolsRedeyeInstance _tmp18_ = {0};
 	gint _tmp19_ = 0;
-#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (inst != NULL);
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->wider_gray_ctx;
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = *inst;
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.center;
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.x;
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = *inst;
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_.center;
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = *inst;
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.radius;
-#line 1955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_circle (_tmp0_, _tmp1_, _tmp4_, _tmp7_, _tmp9_);
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->thin_white_ctx;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = *inst;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.center;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.x;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = *inst;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.center;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_.y;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = *inst;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.radius;
-#line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_circle (_tmp10_, _tmp11_, _tmp14_, _tmp17_, _tmp19_);
-#line 13479 "EditingTools.c"
+#line 13517 "EditingTools.c"
 }
 
 
@@ -13485,25 +13523,25 @@ static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRed
 	GtkScale* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
 	EditingToolsPhotoCanvas* _tmp3_ = NULL;
-#line 1961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self), FALSE);
-#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->redeye_tool_window;
-#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->slider;
-#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 1962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->user_interaction_instance.radius = (gint) _tmp2_;
 #line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->user_interaction_instance.radius = (gint) _tmp2_;
+#line 1968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 1967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 1967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13507 "EditingTools.c"
+#line 13545 "EditingTools.c"
 }
 
 
@@ -13554,117 +13592,117 @@ static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) {
 	RedeyeCommand* _tmp35_ = NULL;
 	CommandManager* _tmp36_ = NULL;
 	CommandManager* _tmp37_ = NULL;
-#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 1971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->user_interaction_instance;
-#line 1971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_to_bounds_rect (&_tmp0_, &_tmp1_);
-#line 1971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	bounds_rect_user = _tmp1_;
 #line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	bounds_rect_user = _tmp1_;
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = bounds_rect_user;
-#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_user_to_active_rect (_tmp2_, &_tmp3_, &_tmp4_);
-#line 1974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect_active = _tmp4_;
-#line 1976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = bounds_rect_active;
-#line 1976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_active_to_unscaled_rect (_tmp5_, &_tmp6_, &_tmp7_);
-#line 1976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1979 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect_unscaled = _tmp7_;
-#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = bounds_rect_unscaled;
-#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_unscaled_to_raw_rect (_tmp8_, &_tmp9_, &_tmp10_);
-#line 1978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	bounds_rect_raw = _tmp10_;
 #line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	bounds_rect_raw = _tmp10_;
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = bounds_rect_raw;
-#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_from_bounds_rect (&_tmp11_, &_tmp12_);
-#line 1981 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	instance_raw = _tmp12_;
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = editing_tools_photo_canvas_get_photo (_tmp13_);
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_;
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp16_);
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_;
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp15_);
-#line 1986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	dimensions = _tmp17_;
 #line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	dimensions = _tmp17_;
+#line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	theta = 0.0;
-#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
-#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_;
-#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo_get_straighten (_tmp20_, &_tmp21_);
-#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	theta = _tmp21_;
-#line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp20_);
-#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = instance_raw;
-#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.center;
-#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = dimensions;
-#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_.width;
-#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = dimensions;
-#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_.height;
-#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = theta;
-#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	derotate_point_arb (&_tmp23_, _tmp25_, _tmp27_, _tmp28_, &_tmp29_);
-#line 1993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	instance_raw.center = _tmp29_;
 #line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	instance_raw.center = _tmp29_;
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = editing_tools_photo_canvas_get_photo (_tmp30_);
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _tmp31_;
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = instance_raw;
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = redeye_command_new (_tmp32_, &_tmp33_, RESOURCES_RED_EYE_LABEL, RESOURCES_RED_EYE_TOOLTIP);
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = _tmp34_;
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp32_);
-#line 1996 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1999 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp35_;
-#line 1998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = app_window_get_command_manager ();
-#line 1998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = _tmp36_;
-#line 1998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 1998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp37_);
-#line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 13668 "EditingTools.c"
+#line 13706 "EditingTools.c"
 }
 
 
@@ -13677,29 +13715,29 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 	gboolean _tmp5_ = FALSE;
 	EditingToolsPhotoCanvas* _tmp17_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2001 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = map;
-#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = !_tmp4_;
-#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2002 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 2003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13703 "EditingTools.c"
+#line 13741 "EditingTools.c"
 	}
 	{
 		GdkPixbuf* _tmp6_ = NULL;
@@ -13711,40 +13749,40 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		GdkPixbuf* _tmp12_ = NULL;
 		GdkPixbuf* _tmp13_ = NULL;
 		GdkPixbuf* _tmp14_ = NULL;
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_;
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaling (_tmp10_, &_tmp11_);
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp11_, &_inner_error_);
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = _tmp12_;
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp13_;
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13735 "EditingTools.c"
+#line 13773 "EditingTools.c"
 			goto __catch20_g_error;
 		}
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = _tmp6_;
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = NULL;
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->current_pixbuf);
-#line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->current_pixbuf = _tmp14_;
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp6_);
-#line 13748 "EditingTools.c"
+#line 13786 "EditingTools.c"
 	}
 	goto __finally20;
 	__catch20_g_error:
@@ -13752,40 +13790,40 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		err = _inner_error_;
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_inner_error_ = NULL;
 #line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_inner_error_ = NULL;
+#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = err;
-#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _tmp15_->message;
-#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		g_warning ("EditingTools.vala:2008: %s", _tmp16_);
-#line 2009 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "aborted");
 #line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		g_warning ("EditingTools.vala:2011: %s", _tmp16_);
+#line 2012 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "aborted");
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_error_free0 (err);
-#line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13772 "EditingTools.c"
+#line 13810 "EditingTools.c"
 	}
 	__finally20:
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_clear_error (&_inner_error_);
-#line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13783 "EditingTools.c"
+#line 13821 "EditingTools.c"
 	}
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp17_);
-#line 13789 "EditingTools.c"
+#line 13827 "EditingTools.c"
 }
 
 
@@ -13795,23 +13833,23 @@ static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) {
 	Photo* _tmp2_ = NULL;
 	Photo* _tmp3_ = NULL;
 	Dimensions _tmp4_ = {0};
-#line 2017 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->current_pixbuf;
-#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
-#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", NULL, _tmp0_, &_tmp4_, FALSE);
-#line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 13815 "EditingTools.c"
+#line 13853 "EditingTools.c"
 }
 
 
@@ -13843,88 +13881,88 @@ static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool*
 	GdkRectangle _tmp22_ = {0};
 	gint _tmp23_ = 0;
 	GdkRectangle _tmp24_ = {0};
-#line 2021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2024 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 2022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	scaled_pixbuf_position = _tmp1_;
 #line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	scaled_pixbuf_position = _tmp1_;
+#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->user_interaction_instance.center.x;
-#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->old_scaled_pixbuf_position;
-#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_.x;
-#line 2025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.x = _tmp2_ - _tmp4_;
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->user_interaction_instance.center.y;
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->old_scaled_pixbuf_position;
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_.y;
-#line 2026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.y = _tmp5_ - _tmp7_;
-#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = scaled_pixbuf_position;
-#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_.width;
-#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->old_scaled_pixbuf_position;
-#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_.width;
-#line 2028 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	scale_factor = ((gdouble) _tmp9_) / ((gdouble) _tmp11_);
 #line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	scale_factor = ((gdouble) _tmp9_) / ((gdouble) _tmp11_);
+#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->user_interaction_instance;
-#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_.center;
-#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.x;
-#line 2031 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->user_interaction_instance.center.x = (gint) ((((gdouble) _tmp14_) * scale_factor) + 0.5);
 #line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->user_interaction_instance.center.x = (gint) ((((gdouble) _tmp14_) * scale_factor) + 0.5);
+#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->user_interaction_instance;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_.center;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_.y;
-#line 2034 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.y = (gint) ((((gdouble) _tmp17_) * scale_factor) + 0.5);
-#line 2038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->user_interaction_instance.center.x;
-#line 2038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = scaled_pixbuf_position;
-#line 2038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _tmp19_.x;
-#line 2038 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.x = _tmp18_ + _tmp20_;
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->user_interaction_instance.center.y;
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = scaled_pixbuf_position;
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_.y;
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance.center.y = _tmp21_ + _tmp23_;
-#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = scaled_pixbuf_position;
-#line 2041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->old_scaled_pixbuf_position = _tmp24_;
-#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->current_pixbuf);
-#line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 13921 "EditingTools.c"
+#line 13959 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_photos_altered ((EditingToolsRedeyeTool*) self, items);
-#line 13928 "EditingTools.c"
+#line 13966 "EditingTools.c"
 }
 
 
@@ -13950,131 +13988,162 @@ static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* ba
 	GtkScale* _tmp17_ = NULL;
 	EditingToolsRedeyeInstance _tmp18_ = {0};
 	gint _tmp19_ = 0;
-	GdkCursor* _tmp20_ = NULL;
-	GdkCursor* _tmp21_ = NULL;
+	GdkDisplay* display = NULL;
+	EditingToolsPhotoCanvas* _tmp20_ = NULL;
+	GdkWindow* _tmp21_ = NULL;
+	GdkWindow* _tmp22_ = NULL;
+	GdkDisplay* _tmp23_ = NULL;
+	GdkDisplay* _tmp24_ = NULL;
+	GdkDisplay* _tmp25_ = NULL;
+	GdkDisplay* _tmp26_ = NULL;
+	GdkCursor* _tmp27_ = NULL;
+	GdkDisplay* _tmp28_ = NULL;
+	GdkCursor* _tmp29_ = NULL;
 	DataCollection* owner = NULL;
-	EditingToolsPhotoCanvas* _tmp22_ = NULL;
-	Photo* _tmp23_ = NULL;
-	Photo* _tmp24_ = NULL;
-	DataCollection* _tmp25_ = NULL;
-	DataCollection* _tmp26_ = NULL;
-	DataCollection* _tmp27_ = NULL;
-	EditingToolsPhotoCanvas* _tmp29_ = NULL;
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	EditingToolsPhotoCanvas* _tmp30_ = NULL;
+	Photo* _tmp31_ = NULL;
+	Photo* _tmp32_ = NULL;
+	DataCollection* _tmp33_ = NULL;
+	DataCollection* _tmp34_ = NULL;
+	DataCollection* _tmp35_ = NULL;
+	EditingToolsPhotoCanvas* _tmp37_ = NULL;
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_new_interaction_instance (self, _tmp0_, &_tmp1_);
-#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_interaction_instance = _tmp1_;
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = canvas;
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_photo_canvas_get_default_ctx (_tmp2_);
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = canvas;
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_surface_dim (_tmp5_, &_tmp6_);
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_prepare_ctx (self, _tmp4_, &_tmp6_);
-#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (_tmp4_);
-#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = canvas;
-#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_bind_canvas_handlers (self, _tmp7_);
-#line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = canvas;
-#line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_);
-#line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->old_scaled_pixbuf_position = _tmp9_;
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = canvas;
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp10_);
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->current_pixbuf);
-#line 2054 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = _tmp11_;
-#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = canvas;
-#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = editing_tools_photo_canvas_get_container (_tmp12_);
-#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_;
-#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = editing_tools_redeye_tool_redeye_tool_window_new (_tmp14_);
-#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp15_);
-#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->redeye_tool_window);
-#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->redeye_tool_window = _tmp15_;
-#line 2056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->redeye_tool_window;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_->slider;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->user_interaction_instance;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_.radius;
-#line 2057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), (gdouble) _tmp19_);
-#line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_redeye_tool_bind_window_handlers (self);
-#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = gdk_cursor_new (GDK_LEFT_PTR);
-#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (self->priv->cached_arrow_cursor);
-#line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->cached_arrow_cursor = _tmp20_;
-#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = gdk_cursor_new (GDK_FLEUR);
 #line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (self->priv->cached_grab_cursor);
-#line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->cached_grab_cursor = _tmp21_;
+	editing_tools_redeye_tool_bind_window_handlers (self);
 #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = canvas;
+	_tmp20_ = canvas;
 #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = editing_tools_photo_canvas_get_photo (_tmp22_);
+	_tmp21_ = editing_tools_photo_canvas_get_drawing_window (_tmp20_);
 #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = _tmp23_;
+	_tmp22_ = _tmp21_;
 #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_OBJECT, DataObject));
+	_tmp23_ = gdk_window_get_display (_tmp22_);
 #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = _tmp25_;
+	_tmp24_ = _g_object_ref0 (_tmp23_);
 #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp24_);
+	_tmp25_ = _tmp24_;
 #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	owner = _tmp26_;
+	_g_object_unref0 (_tmp22_);
+#line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	display = _tmp25_;
+#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp26_ = display;
 #line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = owner;
+	_tmp27_ = gdk_cursor_new_for_display (_tmp26_, GDK_LEFT_PTR);
 #line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp27_ != NULL) {
-#line 14064 "EditingTools.c"
-		DataCollection* _tmp28_ = NULL;
+	_g_object_unref0 (self->priv->cached_arrow_cursor);
+#line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->cached_arrow_cursor = _tmp27_;
 #line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp28_ = owner;
+	_tmp28_ = display;
 #line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		g_signal_connect (_tmp28_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14070 "EditingTools.c"
-	}
+	_tmp29_ = gdk_cursor_new_for_display (_tmp28_, GDK_FLEUR);
+#line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (self->priv->cached_grab_cursor);
+#line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->cached_grab_cursor = _tmp29_;
 #line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = canvas;
+	_tmp30_ = canvas;
 #line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp29_);
-#line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp31_ = editing_tools_photo_canvas_get_photo (_tmp30_);
+#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp32_ = _tmp31_;
+#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp33_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
+#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp34_ = _tmp33_;
+#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (_tmp32_);
+#line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	owner = _tmp34_;
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp35_ = owner;
+#line 2069 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if (_tmp35_ != NULL) {
+#line 14131 "EditingTools.c"
+		DataCollection* _tmp36_ = NULL;
+#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp36_ = owner;
+#line 2070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		g_signal_connect (_tmp36_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
+#line 14137 "EditingTools.c"
+	}
+#line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp37_ = canvas;
+#line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp37_);
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_data_collection_unref0 (owner);
-#line 14078 "EditingTools.c"
+#line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (display);
+#line 14147 "EditingTools.c"
 }
 
 
@@ -14082,13 +14151,13 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 	EditingToolsRedeyeTool * self;
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp10_ = NULL;
-#line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 14092 "EditingTools.c"
+#line 14161 "EditingTools.c"
 		DataCollection* owner = NULL;
 		EditingToolsPhotoCanvas* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
@@ -14097,102 +14166,102 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		DataCollection* _tmp5_ = NULL;
 		DataCollection* _tmp6_ = NULL;
 		EditingToolsPhotoCanvas* _tmp9_ = NULL;
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_;
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_;
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		owner = _tmp5_;
-#line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = owner;
-#line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 14119 "EditingTools.c"
+#line 14188 "EditingTools.c"
 			DataCollection* _tmp7_ = NULL;
 			guint _tmp8_ = 0U;
-#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = owner;
-#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
-#line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14128 "EditingTools.c"
+#line 14197 "EditingTools.c"
 		}
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_tool_unbind_canvas_handlers (self, _tmp9_);
-#line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2076 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 14136 "EditingTools.c"
+#line 14205 "EditingTools.c"
 	}
-#line 2080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->redeye_tool_window;
-#line 2080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 14142 "EditingTools.c"
+#line 14211 "EditingTools.c"
 		EditingToolsRedeyeToolRedeyeToolWindow* _tmp11_ = NULL;
 		EditingToolsRedeyeToolRedeyeToolWindow* _tmp12_ = NULL;
-#line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2085 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_tool_unbind_window_handlers (self);
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = self->priv->redeye_tool_window;
-#line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2086 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->redeye_tool_window;
-#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->redeye_tool_window);
-#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->redeye_tool_window = NULL;
-#line 14159 "EditingTools.c"
+#line 14228 "EditingTools.c"
 	}
-#line 2087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 14163 "EditingTools.c"
+#line 14232 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
-#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_prepare_ctx ((EditingToolsRedeyeTool*) self, ctx, dim);
-#line 14170 "EditingTools.c"
+#line 14239 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_canvas_resize ((EditingToolsRedeyeTool*) self);
-#line 14177 "EditingTools.c"
+#line 14246 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	EditingToolsPhotoCanvas* _tmp1_ = NULL;
-#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2094 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp0_, "new-surface", (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = canvas;
-#line 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14196 "EditingTools.c"
+#line 14265 "EditingTools.c"
 }
 
 
@@ -14201,46 +14270,46 @@ static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeye
 	guint _tmp1_ = 0U;
 	EditingToolsPhotoCanvas* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 2097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = canvas;
-#line 2097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
-#line 2097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14221 "EditingTools.c"
+#line 14290 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_apply ((EditingToolsRedeyeTool*) self);
-#line 14228 "EditingTools.c"
+#line 14297 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_close ((EditingToolsRedeyeTool*) self);
-#line 14235 "EditingTools.c"
+#line 14304 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value (GtkRange* _sender, GtkScrollType scroll, gdouble new_value, gpointer self) {
 	gboolean result;
 	result = editing_tools_redeye_tool_on_size_slider_adjust ((EditingToolsRedeyeTool*) self, scroll);
-#line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14244 "EditingTools.c"
+#line 14313 "EditingTools.c"
 }
 
 
@@ -14251,27 +14320,27 @@ static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTo
 	GtkButton* _tmp3_ = NULL;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp4_ = NULL;
 	GtkScale* _tmp5_ = NULL;
-#line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->redeye_tool_window;
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->apply_button;
-#line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "clicked", (GCallback) _editing_tools_redeye_tool_on_apply_gtk_button_clicked, self);
-#line 2102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->redeye_tool_window;
-#line 2102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->close_button;
-#line 2102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp3_, "clicked", (GCallback) _editing_tools_redeye_tool_on_close_gtk_button_clicked, self);
-#line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->redeye_tool_window;
-#line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_->slider;
-#line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), "change-value", (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14275 "EditingTools.c"
+#line 14344 "EditingTools.c"
 }
 
 
@@ -14285,33 +14354,33 @@ static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeye
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp6_ = NULL;
 	GtkScale* _tmp7_ = NULL;
 	guint _tmp8_ = 0U;
-#line 2106 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
-#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->redeye_tool_window;
-#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->apply_button;
-#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp2_, NULL, FALSE);
-#line 2107 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2111 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_apply_gtk_button_clicked, self);
-#line 2108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->redeye_tool_window;
-#line 2108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->close_button;
-#line 2108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp5_, NULL, FALSE);
-#line 2108 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_close_gtk_button_clicked, self);
-#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->redeye_tool_window;
-#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->slider;
-#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("change-value", gtk_range_get_type (), &_tmp8_, NULL, FALSE);
-#line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14315 "EditingTools.c"
+#line 14384 "EditingTools.c"
 }
 
 
@@ -14320,17 +14389,17 @@ static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_wi
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_ = NULL;
 	EditingToolsEditingToolWindow* _tmp1_ = NULL;
-#line 2112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->redeye_tool_window;
-#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14334 "EditingTools.c"
+#line 14403 "EditingTools.c"
 }
 
 
@@ -14346,64 +14415,64 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 	GdkPoint _tmp10_ = {0};
 	GdkPoint _tmp11_ = {0};
 	EditingToolsRedeyeInstance _tmp12_ = {0};
-#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->current_pixbuf;
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != NULL) {
-#line 14358 "EditingTools.c"
+#line 14427 "EditingTools.c"
 		GdkPixbuf* _tmp2_ = NULL;
 		GdkPixbuf* _tmp3_ = NULL;
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->current_pixbuf;
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp3_;
-#line 14369 "EditingTools.c"
+#line 14438 "EditingTools.c"
 	} else {
 		EditingToolsPhotoCanvas* _tmp4_ = NULL;
 		GdkPixbuf* _tmp5_ = NULL;
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp4_);
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp5_;
-#line 14381 "EditingTools.c"
+#line 14450 "EditingTools.c"
 	}
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_paint_pixbuf (_tmp6_, _tmp0_);
 #line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	editing_tools_photo_canvas_paint_pixbuf (_tmp6_, _tmp0_);
+#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->priv->user_interaction_instance;
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_inst = _tmp7_;
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->user_interaction_instance;
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.center;
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_user_to_active_point (_tmp8_, &_tmp10_, &_tmp11_);
-#line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	active_inst.center = _tmp11_;
-#line 2124 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = active_inst;
-#line 2124 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_draw_redeye_instance (self, &_tmp12_);
-#line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_);
-#line 14407 "EditingTools.c"
+#line 14476 "EditingTools.c"
 }
 
 
@@ -14416,70 +14485,70 @@ static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingToo
 	gint _tmp3_ = 0;
 	GdkRectangle _tmp4_ = {0};
 	gboolean _tmp5_ = FALSE;
-#line 2127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->user_interaction_instance;
-#line 2128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_to_bounds_rect (&_tmp0_, &_tmp1_);
-#line 2128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect = _tmp1_;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = x;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = y;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = bounds_rect;
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = coord_in_rectangle (_tmp2_, _tmp3_, &_tmp4_);
-#line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 14438 "EditingTools.c"
+#line 14507 "EditingTools.c"
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
 		EditingToolsRedeyeInstance _tmp8_ = {0};
 		GdkPoint _tmp9_ = {0};
-#line 2132 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2136 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->is_reticle_move_in_progress = TRUE;
-#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = x;
-#line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_move_mouse_start_point.x = _tmp6_;
-#line 2134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = y;
-#line 2134 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2138 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_move_mouse_start_point.y = _tmp7_;
-#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = self->priv->user_interaction_instance;
-#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_.center;
-#line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_move_anchor = _tmp9_;
-#line 14459 "EditingTools.c"
+#line 14528 "EditingTools.c"
 	}
 }
 
 
 static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) {
 	EditingToolsRedeyeTool * self;
-#line 2139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->is_reticle_move_in_progress = FALSE;
-#line 14470 "EditingTools.c"
+#line 14539 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) {
 	EditingToolsRedeyeTool * self;
 	gboolean _tmp0_ = FALSE;
-#line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->is_reticle_move_in_progress;
-#line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 14483 "EditingTools.c"
+#line 14552 "EditingTools.c"
 		GdkRectangle active_region_rect = {0};
 		EditingToolsPhotoCanvas* _tmp1_ = NULL;
 		GdkRectangle _tmp2_ = {0};
@@ -14534,125 +14603,125 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		gint _tmp45_ = 0;
 		gint _tmp46_ = 0;
 		EditingToolsPhotoCanvas* _tmp47_ = NULL;
-#line 2146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp1_, &_tmp2_);
-#line 2146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		active_region_rect = _tmp2_;
-#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = active_region_rect;
-#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_.x;
-#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->user_interaction_instance;
-#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_.radius;
-#line 2149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x_clamp_low = (_tmp4_ + _tmp6_) + 1;
-#line 2151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = active_region_rect;
-#line 2151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = _tmp7_.y;
-#line 2151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = self->priv->user_interaction_instance;
-#line 2151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = _tmp9_.radius;
-#line 2151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y_clamp_low = (_tmp8_ + _tmp10_) + 1;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = active_region_rect;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = _tmp11_.x;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = active_region_rect;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp15_ = self->priv->user_interaction_instance;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = _tmp15_.radius;
-#line 2153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2157 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x_clamp_high = ((_tmp12_ + _tmp14_) - _tmp16_) - 1;
-#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = active_region_rect;
-#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp18_ = _tmp17_.y;
-#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = active_region_rect;
-#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp20_ = _tmp19_.height;
-#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = self->priv->user_interaction_instance;
-#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = _tmp21_.radius;
-#line 2156 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		y_clamp_high = ((_tmp18_ + _tmp20_) - _tmp22_) - 1;
 #line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		y_clamp_high = ((_tmp18_ + _tmp20_) - _tmp22_) - 1;
+#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp23_ = x;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp24_ = self->priv->reticle_move_mouse_start_point;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp25_ = _tmp24_.x;
-#line 2160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		delta_x = _tmp23_ - _tmp25_;
-#line 2161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp26_ = y;
-#line 2161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp27_ = self->priv->reticle_move_mouse_start_point;
-#line 2161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = _tmp27_.y;
-#line 2161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		delta_y = _tmp26_ - _tmp28_;
-#line 2163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp29_ = self->priv->reticle_move_anchor;
-#line 2163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp30_ = _tmp29_.x;
-#line 2163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp31_ = delta_x;
-#line 2163 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->user_interaction_instance.center.x = _tmp30_ + _tmp31_;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp32_ = self->priv->reticle_move_anchor;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp33_ = _tmp32_.y;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp34_ = delta_y;
-#line 2165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->user_interaction_instance.center.y = _tmp33_ + _tmp34_;
-#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp35_ = self->priv->reticle_move_anchor;
-#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp36_ = _tmp35_.x;
-#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp37_ = delta_x;
-#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp38_ = x_clamp_low;
-#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp39_ = x_clamp_high;
-#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp40_ = CLAMP (_tmp36_ + _tmp37_, _tmp38_, _tmp39_);
-#line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2172 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->user_interaction_instance.center.x = _tmp40_;
-#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp41_ = self->priv->reticle_move_anchor;
-#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp42_ = _tmp41_.y;
-#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp43_ = delta_y;
-#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp44_ = y_clamp_low;
-#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp45_ = y_clamp_high;
-#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp46_ = CLAMP (_tmp42_ + _tmp43_, _tmp44_, _tmp45_);
-#line 2171 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->user_interaction_instance.center.y = _tmp46_;
 #line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		self->priv->user_interaction_instance.center.y = _tmp46_;
+#line 2179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2179 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_repaint (_tmp47_);
-#line 14656 "EditingTools.c"
+#line 14725 "EditingTools.c"
 	} else {
 		GdkRectangle bounds = {0};
 		EditingToolsRedeyeInstance _tmp48_ = {0};
@@ -14661,58 +14730,58 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		gint _tmp51_ = 0;
 		GdkRectangle _tmp52_ = {0};
 		gboolean _tmp53_ = FALSE;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp48_ = self->priv->user_interaction_instance;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_instance_to_bounds_rect (&_tmp48_, &_tmp49_);
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		bounds = _tmp49_;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp50_ = x;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp51_ = y;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp52_ = bounds;
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp53_ = coord_in_rectangle (_tmp50_, _tmp51_, &_tmp52_);
-#line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp53_) {
-#line 14681 "EditingTools.c"
+#line 14750 "EditingTools.c"
 			EditingToolsPhotoCanvas* _tmp54_ = NULL;
 			GdkWindow* _tmp55_ = NULL;
 			GdkWindow* _tmp56_ = NULL;
 			GdkCursor* _tmp57_ = NULL;
-#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp54_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp55_ = editing_tools_photo_canvas_get_drawing_window (_tmp54_);
-#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp56_ = _tmp55_;
-#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp57_ = self->priv->cached_grab_cursor;
-#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gdk_window_set_cursor (_tmp56_, _tmp57_);
-#line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp56_);
-#line 14698 "EditingTools.c"
+#line 14767 "EditingTools.c"
 		} else {
 			EditingToolsPhotoCanvas* _tmp58_ = NULL;
 			GdkWindow* _tmp59_ = NULL;
 			GdkWindow* _tmp60_ = NULL;
 			GdkCursor* _tmp61_ = NULL;
-#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp59_ = editing_tools_photo_canvas_get_drawing_window (_tmp58_);
-#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp60_ = _tmp59_;
-#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp61_ = self->priv->cached_arrow_cursor;
-#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gdk_window_set_cursor (_tmp60_, _tmp61_);
-#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp60_);
-#line 14716 "EditingTools.c"
+#line 14785 "EditingTools.c"
 		}
 	}
 }
@@ -14728,73 +14797,73 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 	const gchar* _tmp4_ = NULL;
 	GdkEventKey* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 2188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 2188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = event;
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 14746 "EditingTools.c"
+#line 14815 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		const gchar* _tmp7_ = NULL;
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_->keyval;
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2194 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 14759 "EditingTools.c"
+#line 14828 "EditingTools.c"
 	}
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 14765 "EditingTools.c"
+#line 14834 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
 		const gchar* _tmp10_ = NULL;
-#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->keyval;
-#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 14778 "EditingTools.c"
+#line 14847 "EditingTools.c"
 	}
-#line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 2192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_redeye_tool_on_close (self);
-#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 14788 "EditingTools.c"
+#line 14857 "EditingTools.c"
 	}
-#line 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
-#line 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp12_;
-#line 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14798 "EditingTools.c"
+#line 14867 "EditingTools.c"
 }
 
 
@@ -14815,87 +14884,87 @@ static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_
 	GtkScale* _tmp11_ = NULL;
 	GtkButton* _tmp12_ = NULL;
 	GtkButton* _tmp13_ = NULL;
-#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsRedeyeToolRedeyeToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->slider;
-#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), 80, -1);
-#line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->slider;
-#line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp2_, FALSE);
-#line 1887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->close_button;
-#line 1887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Close the red-eye tool");
-#line 1887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _tmp4_);
-#line 1888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->close_button;
-#line 1888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image_position (_tmp5_, GTK_POS_LEFT);
-#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->apply_button;
-#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _ ("Remove any red-eye effects in the selected region");
-#line 1890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_);
-#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->apply_button;
-#line 1891 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_button_set_image_position (_tmp8_, GTK_POS_LEFT);
-#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING);
-#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp9_);
-#line 1893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	layout = _tmp9_;
-#line 1894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->slider_label;
-#line 1894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->slider;
-#line 1895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->close_button;
-#line 1896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 1897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->apply_button;
-#line 1897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget));
-#line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget));
-#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (layout);
-#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 14881 "EditingTools.c"
+#line 14950 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container) {
-#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_redeye_tool_window_construct (EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, container);
-#line 14888 "EditingTools.c"
+#line 14957 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_redeye_tool_window_class_init (EditingToolsRedeyeToolRedeyeToolWindowClass * klass) {
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_redeye_tool_window_parent_class = g_type_class_peek_parent (klass);
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolRedeyeToolWindowPrivate));
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_redeye_tool_redeye_tool_window_finalize;
-#line 14899 "EditingTools.c"
+#line 14968 "EditingTools.c"
 }
 
 
@@ -14905,53 +14974,53 @@ static void editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingT
 	GtkButton* _tmp2_ = NULL;
 	GtkButton* _tmp3_ = NULL;
 	GtkScale* _tmp4_ = NULL;
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv = EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_GET_PRIVATE (self);
 #line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv = EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_GET_PRIVATE (self);
+#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = _ ("Size:");
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp0_);
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->slider_label = _tmp1_;
-#line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_APPLY_LABEL);
-#line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->apply_button = _tmp2_;
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->close_button = _tmp3_;
-#line 1878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MIN_RADIUS, (gdouble) EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS, 1.0);
-#line 1878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp4_);
-#line 1878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->slider = _tmp4_;
-#line 14937 "EditingTools.c"
+#line 15006 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject* obj) {
 	EditingToolsRedeyeToolRedeyeToolWindow * self;
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, EditingToolsRedeyeToolRedeyeToolWindow);
 #line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, EditingToolsRedeyeToolRedeyeToolWindow);
+#line 1875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->slider_label);
-#line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->apply_button);
-#line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->close_button);
-#line 1878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->slider);
-#line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_redeye_tool_redeye_tool_window_parent_class)->finalize (obj);
-#line 14955 "EditingTools.c"
+#line 15024 "EditingTools.c"
 }
 
 
@@ -14968,68 +15037,68 @@ static GType editing_tools_redeye_tool_redeye_tool_window_get_type (void) {
 
 
 static void editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass * klass) {
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_parent_class = g_type_class_peek_parent (klass);
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_redeye_tool_finalize;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolPrivate));
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->activate = editing_tools_redeye_tool_real_activate;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->deactivate = editing_tools_redeye_tool_real_deactivate;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_redeye_tool_real_get_tool_window;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = editing_tools_redeye_tool_real_paint;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_click = editing_tools_redeye_tool_real_on_left_click;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_left_released = editing_tools_redeye_tool_real_on_left_released;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_motion = editing_tools_redeye_tool_real_on_motion;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_redeye_tool_real_on_keypress;
-#line 14994 "EditingTools.c"
+#line 15063 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * self) {
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_REDEYE_TOOL_GET_PRIVATE (self);
-#line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->thin_white_ctx = NULL;
-#line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->wider_gray_ctx = NULL;
-#line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->redeye_tool_window = NULL;
-#line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->is_reticle_move_in_progress = FALSE;
-#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 15011 "EditingTools.c"
+#line 15080 "EditingTools.c"
 }
 
 
 static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool* obj) {
 	EditingToolsRedeyeTool * self;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
-#line 1903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
-#line 1904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wider_gray_ctx);
-#line 1905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->redeye_tool_window);
-#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->cached_arrow_cursor);
-#line 1911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->cached_grab_cursor);
-#line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->current_pixbuf);
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->finalize (obj);
-#line 15033 "EditingTools.c"
+#line 15102 "EditingTools.c"
 }
 
 
@@ -15047,52 +15116,52 @@ GType editing_tools_redeye_tool_get_type (void) {
 
 static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object_type) {
 	EditingToolsAdjustTool* self = NULL;
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustTool*) editing_tools_editing_tool_construct (object_type, "AdjustTool");
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 15055 "EditingTools.c"
+#line 15124 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void) {
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_construct (EDITING_TOOLS_TYPE_ADJUST_TOOL);
-#line 15062 "EditingTools.c"
+#line 15131 "EditingTools.c"
 }
 
 
 EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void) {
 	EditingToolsAdjustTool* result = NULL;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_adjust_tool_new ();
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15075 "EditingTools.c"
+#line 15144 "EditingTools.c"
 }
 
 
 gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling) {
 	gboolean result = FALSE;
-#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15089 "EditingTools.c"
+#line 15158 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_photos_altered ((EditingToolsAdjustTool*) self, items);
-#line 15096 "EditingTools.c"
+#line 15165 "EditingTools.c"
 }
 
 
@@ -15181,7 +15250,7 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	PixelTransformer* _tmp71_ = NULL;
 	ContrastTransformation* _tmp72_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp73_ = NULL;
-	GtkHScale* _tmp74_ = NULL;
+	GtkScale* _tmp74_ = NULL;
 	ContrastTransformation* _tmp75_ = NULL;
 	gfloat _tmp76_ = 0.0F;
 	EditingToolsPhotoCanvas* _tmp77_ = NULL;
@@ -15214,351 +15283,351 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	DataCollection* _tmp122_ = NULL;
 	DataCollection* _tmp123_ = NULL;
 	EditingToolsPhotoCanvas* _tmp125_ = NULL;
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_container (_tmp0_);
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_adjust_tool_adjust_tool_window_new (_tmp2_);
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->adjust_tool_window = _tmp3_;
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = canvas;
-#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_);
-#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo = _tmp5_;
-#line 2518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = photo;
-#line 2518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = photo_get_color_adjustments (_tmp6_);
-#line 2518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
-#line 2518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformations = _tmp7_;
-#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->transformations;
-#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = pixel_transformation_bundle_generate_transformer (_tmp8_);
-#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
-#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformer = _tmp9_;
-#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = pixel_transformer_new ();
-#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->histogram_transformer);
-#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->histogram_transformer = _tmp10_;
-#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->transformations;
-#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = pixel_transformation_bundle_get_transformation (_tmp11_, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->adjust_tool_window;
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->histogram_manipulator;
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = expansion_trans;
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = expansion_transformation_get_black_point (_tmp15_);
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rgb_histogram_manipulator_set_left_nub_position (_tmp14_, _tmp16_);
-#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->adjust_tool_window;
-#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->histogram_manipulator;
-#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = expansion_trans;
-#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = expansion_transformation_get_white_point (_tmp19_);
-#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rgb_histogram_manipulator_set_right_nub_position (_tmp18_, _tmp20_);
-#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->transformations;
-#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = pixel_transformation_bundle_get_transformation (_tmp21_, PIXEL_TRANSFORMATION_TYPE_SHADOWS);
-#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->histogram_transformer;
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = shadows_trans;
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->adjust_tool_window;
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_->shadows_slider;
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = shadows_trans;
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = shadow_detail_transformation_get_parameter (_tmp27_);
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->transformations;
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = pixel_transformation_bundle_get_transformation (_tmp29_, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS);
-#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	highlights_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->priv->histogram_transformer;
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = highlights_trans;
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->adjust_tool_window;
-#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->highlights_slider;
-#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = highlights_trans;
-#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = highlight_detail_transformation_get_parameter (_tmp35_);
-#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
-#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = self->priv->transformations;
-#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = pixel_transformation_bundle_get_transformation (_tmp37_, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE);
-#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation);
-#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->histogram_transformer;
-#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = temp_trans;
-#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = self->priv->adjust_tool_window;
-#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = _tmp41_->temperature_slider;
-#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = temp_trans;
-#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp44_ = temperature_transformation_get_parameter (_tmp43_);
-#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_range_get_type (), GtkRange), (gdouble) _tmp44_);
-#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->priv->transformations;
-#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = pixel_transformation_bundle_get_transformation (_tmp45_, PIXEL_TRANSFORMATION_TYPE_TINT);
-#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_TINT_TRANSFORMATION, TintTransformation);
-#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp47_ = self->priv->histogram_transformer;
-#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = tint_trans;
-#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49_ = self->priv->adjust_tool_window;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp50_ = _tmp49_->tint_slider;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51_ = tint_trans;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52_ = tint_transformation_get_parameter (_tmp51_);
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_range_get_type (), GtkRange), (gdouble) _tmp52_);
-#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp53_ = self->priv->transformations;
-#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp54_ = pixel_transformation_bundle_get_transformation (_tmp53_, PIXEL_TRANSFORMATION_TYPE_SATURATION);
-#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation);
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp55_ = self->priv->histogram_transformer;
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp56_ = sat_trans;
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp57_ = self->priv->adjust_tool_window;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp58_ = _tmp57_->saturation_slider;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp59_ = sat_trans;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp60_ = saturation_transformation_get_parameter (_tmp59_);
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_range_get_type (), GtkRange), (gdouble) _tmp60_);
-#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp61_ = self->priv->transformations;
-#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp62_ = pixel_transformation_bundle_get_transformation (_tmp61_, PIXEL_TRANSFORMATION_TYPE_EXPOSURE);
-#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation);
-#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = self->priv->histogram_transformer;
-#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp64_ = exposure_trans;
-#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = self->priv->adjust_tool_window;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp66_ = _tmp65_->exposure_slider;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67_ = exposure_trans;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = exposure_transformation_get_parameter (_tmp67_);
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_range_get_type (), GtkRange), (gdouble) _tmp68_);
-#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = self->priv->transformations;
-#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70_ = pixel_transformation_bundle_get_transformation (_tmp69_, PIXEL_TRANSFORMATION_TYPE_CONTRAST);
-#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation);
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp71_ = self->priv->histogram_transformer;
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp72_ = contrast_trans;
-#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp73_ = self->priv->adjust_tool_window;
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp74_ = _tmp73_->contrast_slider;
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp75_ = contrast_trans;
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp76_ = contrast_transformation_get_parameter (_tmp75_);
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_range_get_type (), GtkRange), (gdouble) _tmp76_);
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp77_ = canvas;
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2585 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_canvas_handlers (self, _tmp77_);
-#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (self);
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp78_ = canvas;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp79_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp78_);
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp80_ = _tmp79_;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp81_ = gdk_pixbuf_copy (_tmp80_);
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = _tmp81_;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp80_);
-#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp82_ = canvas;
-#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp83_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp82_);
-#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp84_ = _tmp83_;
-#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp84_);
-#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp84_);
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp86_ = self->priv->draw_to_pixbuf;
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp87_ = gdk_pixbuf_get_width (_tmp86_);
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp88_ = _tmp87_;
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp88_ == 1) {
-#line 15484 "EditingTools.c"
+#line 15553 "EditingTools.c"
 		GdkPixbuf* _tmp89_ = NULL;
 		gint _tmp90_ = 0;
 		gint _tmp91_ = 0;
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp89_ = self->priv->draw_to_pixbuf;
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp90_ = gdk_pixbuf_get_height (_tmp89_);
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp91_ = _tmp90_;
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp85_ = _tmp91_ == 1;
-#line 15496 "EditingTools.c"
+#line 15565 "EditingTools.c"
 	} else {
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp85_ = FALSE;
-#line 15500 "EditingTools.c"
+#line 15569 "EditingTools.c"
 	}
-#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp85_) {
-#line 2584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->disable_histogram_refresh = TRUE;
-#line 15506 "EditingTools.c"
+#line 15575 "EditingTools.c"
 	}
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp94_ = self->priv->draw_to_pixbuf;
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp95_ = gdk_pixbuf_get_width (_tmp94_);
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp96_ = _tmp95_;
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp97_ = self->priv->draw_to_pixbuf;
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp98_ = gdk_pixbuf_get_height (_tmp97_);
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp99_ = _tmp98_;
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((_tmp96_ * _tmp99_) > 8192) {
-#line 15522 "EditingTools.c"
+#line 15591 "EditingTools.c"
 		GdkPixbuf* _tmp100_ = NULL;
 		gint _tmp101_ = 0;
 		gint _tmp102_ = 0;
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp100_ = self->priv->draw_to_pixbuf;
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp101_ = gdk_pixbuf_get_width (_tmp100_);
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp102_ = _tmp101_;
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp93_ = _tmp102_ > 1;
-#line 15534 "EditingTools.c"
+#line 15603 "EditingTools.c"
 	} else {
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp93_ = FALSE;
-#line 15538 "EditingTools.c"
+#line 15607 "EditingTools.c"
 	}
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp93_) {
-#line 15542 "EditingTools.c"
+#line 15611 "EditingTools.c"
 		GdkPixbuf* _tmp103_ = NULL;
 		gint _tmp104_ = 0;
 		gint _tmp105_ = 0;
-#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp103_ = self->priv->draw_to_pixbuf;
-#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp104_ = gdk_pixbuf_get_height (_tmp103_);
-#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp105_ = _tmp104_;
-#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp92_ = _tmp105_ > 1;
-#line 15554 "EditingTools.c"
+#line 15623 "EditingTools.c"
 	} else {
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp92_ = FALSE;
-#line 15558 "EditingTools.c"
+#line 15627 "EditingTools.c"
 	}
-#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp92_) {
-#line 15562 "EditingTools.c"
+#line 15631 "EditingTools.c"
 		GdkPixbuf* _tmp106_ = NULL;
 		GdkPixbuf* _tmp107_ = NULL;
 		gint _tmp108_ = 0;
@@ -15567,99 +15636,99 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 		gint _tmp111_ = 0;
 		gint _tmp112_ = 0;
 		GdkPixbuf* _tmp113_ = NULL;
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp106_ = self->priv->draw_to_pixbuf;
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp107_ = self->priv->draw_to_pixbuf;
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp108_ = gdk_pixbuf_get_width (_tmp107_);
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp109_ = _tmp108_;
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp110_ = self->priv->draw_to_pixbuf;
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp111_ = gdk_pixbuf_get_height (_tmp110_);
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp112_ = _tmp111_;
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp113_ = gdk_pixbuf_scale_simple (_tmp106_, _tmp109_ / 2, _tmp112_ / 2, GDK_INTERP_HYPER);
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->histogram_pixbuf = _tmp113_;
-#line 15591 "EditingTools.c"
+#line 15660 "EditingTools.c"
 	} else {
 		GdkPixbuf* _tmp114_ = NULL;
 		GdkPixbuf* _tmp115_ = NULL;
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp114_ = self->priv->draw_to_pixbuf;
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp115_ = gdk_pixbuf_copy (_tmp114_);
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->histogram_pixbuf = _tmp115_;
-#line 15603 "EditingTools.c"
+#line 15672 "EditingTools.c"
 	}
-#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp116_ = self->priv->histogram_pixbuf;
-#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp117_ = gdk_pixbuf_copy (_tmp116_);
-#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->virgin_histogram_pixbuf);
-#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->virgin_histogram_pixbuf = _tmp117_;
-#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp118_ = canvas;
-#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp119_ = editing_tools_photo_canvas_get_photo (_tmp118_);
-#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp120_ = _tmp119_;
-#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp121_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_DATA_OBJECT, DataObject));
-#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp122_ = _tmp121_;
-#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp120_);
-#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	owner = _tmp122_;
-#line 2599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp123_ = owner;
-#line 2599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp123_ != NULL) {
-#line 15631 "EditingTools.c"
+#line 15700 "EditingTools.c"
 		DataCollection* _tmp124_ = NULL;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp124_ = owner;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (_tmp124_, "items-altered", (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15637 "EditingTools.c"
+#line 15706 "EditingTools.c"
 	}
-#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp125_ = canvas;
-#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp125_);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_data_collection_unref0 (owner);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (contrast_trans);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (exposure_trans);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (sat_trans);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (tint_trans);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (temp_trans);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (highlights_trans);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (shadows_trans);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (expansion_trans);
-#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (photo);
-#line 15663 "EditingTools.c"
+#line 15732 "EditingTools.c"
 }
 
 
@@ -15668,17 +15737,17 @@ static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_wi
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
 	EditingToolsEditingToolWindow* _tmp1_ = NULL;
-#line 2605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15682 "EditingTools.c"
+#line 15751 "EditingTools.c"
 }
 
 
@@ -15686,13 +15755,13 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 	EditingToolsAdjustTool * self;
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp10_ = NULL;
-#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 15696 "EditingTools.c"
+#line 15765 "EditingTools.c"
 		DataCollection* owner = NULL;
 		EditingToolsPhotoCanvas* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
@@ -15701,81 +15770,81 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		DataCollection* _tmp5_ = NULL;
 		DataCollection* _tmp6_ = NULL;
 		EditingToolsPhotoCanvas* _tmp9_ = NULL;
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_;
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_;
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		owner = _tmp5_;
-#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = owner;
-#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 15723 "EditingTools.c"
+#line 15792 "EditingTools.c"
 			DataCollection* _tmp7_ = NULL;
 			guint _tmp8_ = 0U;
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = owner;
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15732 "EditingTools.c"
+#line 15801 "EditingTools.c"
 		}
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_unbind_canvas_handlers (self, _tmp9_);
-#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 15740 "EditingTools.c"
+#line 15809 "EditingTools.c"
 	}
-#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->adjust_tool_window;
-#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 15746 "EditingTools.c"
+#line 15815 "EditingTools.c"
 		EditingToolsAdjustToolAdjustToolWindow* _tmp11_ = NULL;
 		EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
-#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_unbind_window_handlers (self);
-#line 2620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = self->priv->adjust_tool_window;
-#line 2620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 2621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->adjust_tool_window;
-#line 2621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->adjust_tool_window = NULL;
-#line 15763 "EditingTools.c"
+#line 15832 "EditingTools.c"
 	}
-#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = NULL;
-#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = NULL;
-#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache_length1 = 0;
-#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 15779 "EditingTools.c"
+#line 15848 "EditingTools.c"
 }
 
 
@@ -15784,61 +15853,61 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 	gboolean _tmp0_ = FALSE;
 	EditingToolsPhotoCanvas* _tmp10_ = NULL;
 	GdkPixbuf* _tmp11_ = NULL;
-#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->suppress_effect_redraw;
-#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp0_) {
-#line 15796 "EditingTools.c"
+#line 15865 "EditingTools.c"
 		PixelTransformer* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
 		PixelTransformer* _tmp3_ = NULL;
 		GdkPixbuf* _tmp4_ = NULL;
 		GdkPixbuf* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->priv->transformer;
-#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->draw_to_pixbuf;
-#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_transform_from_fp (_tmp1_, &self->priv->fp_pixel_cache, &self->priv->fp_pixel_cache_length1, _tmp2_);
-#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->histogram_transformer;
-#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->virgin_histogram_pixbuf;
-#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->histogram_pixbuf;
-#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_transform_to_other_pixbuf (_tmp3_, _tmp4_, _tmp5_, NULL);
-#line 2636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->disable_histogram_refresh;
-#line 2636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (!_tmp6_) {
-#line 15821 "EditingTools.c"
+#line 15890 "EditingTools.c"
 			EditingToolsAdjustToolAdjustToolWindow* _tmp7_ = NULL;
 			RGBHistogramManipulator* _tmp8_ = NULL;
 			GdkPixbuf* _tmp9_ = NULL;
-#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = self->priv->adjust_tool_window;
-#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = _tmp7_->histogram_manipulator;
-#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = self->priv->histogram_pixbuf;
-#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			rgb_histogram_manipulator_update_histogram (_tmp8_, _tmp9_);
-#line 15833 "EditingTools.c"
+#line 15902 "EditingTools.c"
 		}
 	}
-#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->draw_to_pixbuf;
-#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_pixbuf (_tmp10_, _tmp11_);
-#line 15842 "EditingTools.c"
+#line 15911 "EditingTools.c"
 }
 
 
@@ -15856,71 +15925,71 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 	GdkPixbuf* _tmp7_ = NULL;
 	GdkPixbuf* _tmp8_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = photo_has_color_adjustments (_tmp0_);
-#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp1_) {
-#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dimensions_init (&_vala_max_dim, 0, 0);
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = NULL;
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (max_dim) {
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			*max_dim = _vala_max_dim;
-#line 15880 "EditingTools.c"
+#line 15949 "EditingTools.c"
 		}
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 15884 "EditingTools.c"
+#line 15953 "EditingTools.c"
 	}
-#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = photo;
-#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
-#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_max_dim = _tmp3_;
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = photo;
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = *scaling;
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = photo_get_pixbuf_with_options (_tmp5_, &_tmp6_, PHOTO_EXCEPTION_ADJUST, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp7_;
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 15906 "EditingTools.c"
+#line 15975 "EditingTools.c"
 	}
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp4_;
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = NULL;
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp8_;
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (max_dim) {
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 15920 "EditingTools.c"
+#line 15989 "EditingTools.c"
 	}
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2665 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15924 "EditingTools.c"
+#line 15993 "EditingTools.c"
 }
 
 
@@ -15930,25 +15999,25 @@ static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) {
 	EditingToolsAdjustToolAdjustResetCommand* _tmp1_ = NULL;
 	CommandManager* _tmp2_ = NULL;
 	CommandManager* _tmp3_ = NULL;
-#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
-#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_adjust_tool_adjust_reset_command_new (self, _tmp0_);
-#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp1_;
-#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = app_window_get_command_manager ();
-#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp3_);
-#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 15952 "EditingTools.c"
+#line 16021 "EditingTools.c"
 }
 
 
@@ -15966,58 +16035,58 @@ static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) {
 	Photo* _tmp10_ = NULL;
 	Photo* _tmp11_ = NULL;
 	Dimensions _tmp12_ = {0};
-#line 2661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->suppress_effect_redraw = TRUE;
-#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_editing_tool_get_tool_window (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_);
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->transformations;
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = adjust_colors_single_command_new (_tmp4_, _tmp5_, RESOURCES_ADJUST_LABEL, RESOURCES_ADJUST_TOOLTIP);
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_;
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->draw_to_pixbuf;
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = editing_tools_photo_canvas_get_photo (_tmp9_);
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_;
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp12_);
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command), _tmp8_, &_tmp12_, FALSE);
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp11_);
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 16012 "EditingTools.c"
+#line 16081 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, PixelTransformationBundle* new_transformations) {
-#line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_transformations));
-#line 16021 "EditingTools.c"
+#line 16090 "EditingTools.c"
 	{
 		GeeIterator* _transformation_it = NULL;
 		PixelTransformationBundle* _tmp0_ = NULL;
@@ -16025,56 +16094,56 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
 		GeeIterable* _tmp2_ = NULL;
 		GeeIterator* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = new_transformations;
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = pixel_transformation_bundle_get_transformations (_tmp0_);
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = _tmp1_;
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = gee_iterable_iterator (_tmp2_);
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_;
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp2_);
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_transformation_it = _tmp4_;
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 16045 "EditingTools.c"
+#line 16114 "EditingTools.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			PixelTransformation* transformation = NULL;
 			GeeIterator* _tmp7_ = NULL;
 			gpointer _tmp8_ = NULL;
 			PixelTransformation* _tmp9_ = NULL;
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp5_ = _transformation_it;
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp6_) {
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 16060 "EditingTools.c"
+#line 16129 "EditingTools.c"
 			}
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = _transformation_it;
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			transformation = (PixelTransformation*) _tmp8_;
-#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = transformation;
-#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_adjust_tool_update_transformation (self, _tmp9_);
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 16074 "EditingTools.c"
+#line 16143 "EditingTools.c"
 		}
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_transformation_it);
-#line 16078 "EditingTools.c"
+#line 16147 "EditingTools.c"
 	}
 }
 
@@ -16092,57 +16161,57 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT
 	PixelTransformationType _tmp8_ = 0;
 	PixelTransformationBundle* _tmp12_ = NULL;
 	PixelTransformation* _tmp13_ = NULL;
-#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation));
-#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
-#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = new_transformation;
-#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_);
-#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old_transformation = _tmp3_;
-#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->transformer;
-#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = old_transformation;
-#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = new_transformation;
-#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_replace_transformation (_tmp4_, _tmp5_, _tmp6_);
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = new_transformation;
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp8_ != PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION) {
-#line 16124 "EditingTools.c"
+#line 16193 "EditingTools.c"
 		PixelTransformer* _tmp9_ = NULL;
 		PixelTransformation* _tmp10_ = NULL;
 		PixelTransformation* _tmp11_ = NULL;
-#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = self->priv->histogram_transformer;
-#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = old_transformation;
-#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = new_transformation;
-#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_replace_transformation (_tmp9_, _tmp10_, _tmp11_);
-#line 16136 "EditingTools.c"
+#line 16205 "EditingTools.c"
 	}
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->transformations;
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = new_transformation;
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformation_bundle_set (_tmp12_, _tmp13_);
-#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 16146 "EditingTools.c"
+#line 16215 "EditingTools.c"
 }
 
 
@@ -16158,77 +16227,77 @@ static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* se
 	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_ = NULL;
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
-#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation));
-#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (name != NULL);
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = new_transformation;
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_);
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old_transformation = _tmp3_;
-#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = new_transformation;
-#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = name;
-#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = editing_tools_adjust_tool_slider_adjustment_command_new (self, old_transformation, _tmp4_, _tmp5_);
-#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp6_;
-#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = app_window_get_command_manager ();
-#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_;
-#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 16198 "EditingTools.c"
+#line 16267 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self) {
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16205 "EditingTools.c"
+#line 16274 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->temperature_scheduler;
-#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16218 "EditingTools.c"
+#line 16287 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("temperature", _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback, self);
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->temperature_scheduler = _tmp1_;
-#line 16226 "EditingTools.c"
+#line 16295 "EditingTools.c"
 	}
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->temperature_scheduler;
-#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16232 "EditingTools.c"
+#line 16301 "EditingTools.c"
 }
 
 
@@ -16239,59 +16308,59 @@ static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (Editing
 	gdouble _tmp2_ = 0.0;
 	TemperatureTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->temperature_slider;
-#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = temperature_transformation_new ((gfloat) _tmp2_);
-#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_temp_trans = _tmp3_;
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Temperature");
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_temp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_temp_trans);
-#line 16261 "EditingTools.c"
+#line 16330 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self) {
-#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16268 "EditingTools.c"
+#line 16337 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->tint_scheduler;
-#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16281 "EditingTools.c"
+#line 16350 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("tint", _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback, self);
-#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
-#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tint_scheduler = _tmp1_;
-#line 16289 "EditingTools.c"
+#line 16358 "EditingTools.c"
 	}
-#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->tint_scheduler;
-#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16295 "EditingTools.c"
+#line 16364 "EditingTools.c"
 }
 
 
@@ -16302,122 +16371,122 @@ static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAd
 	gdouble _tmp2_ = 0.0;
 	TintTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->tint_slider;
-#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = tint_transformation_new ((gfloat) _tmp2_);
-#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_tint_trans = _tmp3_;
-#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Tint");
-#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_tint_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_tint_trans);
-#line 16324 "EditingTools.c"
+#line 16393 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self) {
-#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16331 "EditingTools.c"
+#line 16400 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->contrast_scheduler;
-#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16344 "EditingTools.c"
+#line 16413 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("contrast", _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback, self);
-#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
-#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->contrast_scheduler = _tmp1_;
-#line 16352 "EditingTools.c"
+#line 16421 "EditingTools.c"
 	}
-#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->contrast_scheduler;
-#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16358 "EditingTools.c"
+#line 16427 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToolsAdjustTool* self) {
 	ContrastTransformation* new_exp_trans = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
-	GtkHScale* _tmp1_ = NULL;
+	GtkScale* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
 	ContrastTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->contrast_slider;
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = contrast_transformation_new ((gfloat) _tmp2_);
-#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp3_;
-#line 2729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Contrast");
-#line 2729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16387 "EditingTools.c"
+#line 16456 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self) {
-#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16394 "EditingTools.c"
+#line 16463 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->saturation_scheduler;
-#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16407 "EditingTools.c"
+#line 16476 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("saturation", _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback, self);
-#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
-#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->saturation_scheduler = _tmp1_;
-#line 16415 "EditingTools.c"
+#line 16484 "EditingTools.c"
 	}
-#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->saturation_scheduler;
-#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16421 "EditingTools.c"
+#line 16490 "EditingTools.c"
 }
 
 
@@ -16428,59 +16497,59 @@ static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingT
 	gdouble _tmp2_ = 0.0;
 	SaturationTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->saturation_slider;
-#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = saturation_transformation_new ((gfloat) _tmp2_);
-#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_sat_trans = _tmp3_;
-#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Saturation");
-#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_sat_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_sat_trans);
-#line 16450 "EditingTools.c"
+#line 16519 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self) {
-#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16457 "EditingTools.c"
+#line 16526 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->exposure_scheduler;
-#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16470 "EditingTools.c"
+#line 16539 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("exposure", _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback, self);
-#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
-#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->exposure_scheduler = _tmp1_;
-#line 16478 "EditingTools.c"
+#line 16547 "EditingTools.c"
 	}
-#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->exposure_scheduler;
-#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16484 "EditingTools.c"
+#line 16553 "EditingTools.c"
 }
 
 
@@ -16491,59 +16560,59 @@ static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToo
 	gdouble _tmp2_ = 0.0;
 	ExposureTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->exposure_slider;
-#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = exposure_transformation_new ((gfloat) _tmp2_);
-#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp3_;
-#line 2756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Exposure");
-#line 2756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16513 "EditingTools.c"
+#line 16582 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self) {
-#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16520 "EditingTools.c"
+#line 16589 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->shadows_scheduler;
-#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16533 "EditingTools.c"
+#line 16602 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("shadows", _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback, self);
-#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
-#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->shadows_scheduler = _tmp1_;
-#line 16541 "EditingTools.c"
+#line 16610 "EditingTools.c"
 	}
-#line 2763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->shadows_scheduler;
-#line 2763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16547 "EditingTools.c"
+#line 16616 "EditingTools.c"
 }
 
 
@@ -16554,59 +16623,59 @@ static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingTool
 	gdouble _tmp2_ = 0.0;
 	ShadowDetailTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->shadows_slider;
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = shadow_detail_transformation_new ((gfloat) _tmp2_);
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_shadows_trans = _tmp3_;
-#line 2769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Shadows");
-#line 2769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_shadows_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_shadows_trans);
-#line 16576 "EditingTools.c"
+#line 16645 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self) {
-#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16583 "EditingTools.c"
+#line 16652 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->highlights_scheduler;
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16596 "EditingTools.c"
+#line 16665 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("highlights", _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback, self);
-#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
-#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->highlights_scheduler = _tmp1_;
-#line 16604 "EditingTools.c"
+#line 16673 "EditingTools.c"
 	}
-#line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->highlights_scheduler;
-#line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16610 "EditingTools.c"
+#line 16679 "EditingTools.c"
 }
 
 
@@ -16617,25 +16686,25 @@ static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingT
 	gdouble _tmp2_ = 0.0;
 	HighlightDetailTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->highlights_slider;
-#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = highlight_detail_transformation_new ((gfloat) _tmp2_);
-#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_highlights_trans = _tmp3_;
-#line 2782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Highlights");
-#line 2782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_highlights_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_highlights_trans);
-#line 16639 "EditingTools.c"
+#line 16708 "EditingTools.c"
 }
 
 
@@ -16651,35 +16720,35 @@ static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjus
 	ExpansionTransformation* new_exp_trans = NULL;
 	ExpansionTransformation* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
-#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->histogram_manipulator;
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = rgb_histogram_manipulator_get_left_nub_position (_tmp1_);
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	expansion_black_point = _tmp2_;
-#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->adjust_tool_window;
-#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->histogram_manipulator;
-#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = rgb_histogram_manipulator_get_right_nub_position (_tmp4_);
-#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	expansion_white_point = _tmp5_;
-#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = expansion_transformation_new_from_extrema (expansion_black_point, expansion_white_point);
-#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp6_;
-#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _ ("Contrast Expansion");
-#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp7_);
-#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16683 "EditingTools.c"
+#line 16752 "EditingTools.c"
 }
 
 
@@ -16691,33 +16760,33 @@ static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool*
 	EditingToolsPhotoCanvas* _tmp4_ = NULL;
 	GdkPixbuf* _tmp5_ = NULL;
 	GdkPixbuf* _tmp6_ = NULL;
-#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp0_);
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gdk_pixbuf_copy (_tmp2_);
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = _tmp3_;
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp4_);
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp6_);
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp6_);
-#line 16721 "EditingTools.c"
+#line 16790 "EditingTools.c"
 }
 
 
@@ -16730,199 +16799,199 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 	gboolean _tmp3_ = FALSE;
 	GdkEventButton* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
-#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
-#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = widget;
-#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_scale_get_type (), GtkScale));
-#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source = _tmp1_;
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = event;
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_->button;
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ == ((guint) 1)) {
-#line 16752 "EditingTools.c"
+#line 16821 "EditingTools.c"
 		GdkEventButton* _tmp6_ = NULL;
 		GdkEventType _tmp7_ = 0;
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = event;
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_->type;
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ == GDK_BUTTON_PRESS;
-#line 16761 "EditingTools.c"
+#line 16830 "EditingTools.c"
 	} else {
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 16765 "EditingTools.c"
+#line 16834 "EditingTools.c"
 	}
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 16769 "EditingTools.c"
+#line 16838 "EditingTools.c"
 		GdkEventButton* _tmp8_ = NULL;
 		GdkModifierType _tmp9_ = 0;
 		gboolean _tmp10_ = FALSE;
-#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->state;
-#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = has_only_key_modifier (_tmp9_, GDK_CONTROL_MASK);
-#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = _tmp10_;
-#line 16781 "EditingTools.c"
+#line 16850 "EditingTools.c"
 	} else {
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = FALSE;
-#line 16785 "EditingTools.c"
+#line 16854 "EditingTools.c"
 	}
-#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_) {
-#line 16789 "EditingTools.c"
+#line 16858 "EditingTools.c"
 		GtkScale* _tmp11_ = NULL;
-#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = source;
-#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), (gdouble) 0);
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (source);
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 16801 "EditingTools.c"
+#line 16870 "EditingTools.c"
 	}
-#line 2811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 2811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (source);
-#line 2811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16809 "EditingTools.c"
+#line 16878 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_canvas_resize ((EditingToolsAdjustTool*) self);
-#line 16816 "EditingTools.c"
+#line 16885 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16830 "EditingTools.c"
+#line 16899 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16847 "EditingTools.c"
+#line 16916 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_ok ((EditingToolsAdjustTool*) self);
-#line 16854 "EditingTools.c"
+#line 16923 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_reset ((EditingToolsAdjustTool*) self);
-#line 16861 "EditingTools.c"
+#line 16930 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16868 "EditingTools.c"
+#line 16937 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16875 "EditingTools.c"
+#line 16944 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16882 "EditingTools.c"
+#line 16951 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16889 "EditingTools.c"
+#line 16958 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16896 "EditingTools.c"
+#line 16965 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16903 "EditingTools.c"
+#line 16972 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16910 "EditingTools.c"
+#line 16979 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, gpointer self) {
-#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_histogram_constraint ((EditingToolsAdjustTool*) self);
-#line 16917 "EditingTools.c"
+#line 16986 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_adjust_tool_on_hscale_reset ((EditingToolsAdjustTool*) self, _sender, event);
-#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16926 "EditingTools.c"
+#line 16995 "EditingTools.c"
 }
 
 
@@ -16936,7 +17005,7 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo
 	EditingToolsAdjustToolAdjustToolWindow* _tmp6_ = NULL;
 	GtkScale* _tmp7_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp8_ = NULL;
-	GtkHScale* _tmp9_ = NULL;
+	GtkScale* _tmp9_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp10_ = NULL;
 	GtkScale* _tmp11_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
@@ -16954,7 +17023,7 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo
 	EditingToolsAdjustToolAdjustToolWindow* _tmp24_ = NULL;
 	GtkScale* _tmp25_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp26_ = NULL;
-	GtkHScale* _tmp27_ = NULL;
+	GtkScale* _tmp27_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp28_ = NULL;
 	GtkScale* _tmp29_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp30_ = NULL;
@@ -16963,117 +17032,117 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo
 	GtkScale* _tmp33_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp34_ = NULL;
 	GtkScale* _tmp35_ = NULL;
-#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->ok_button;
-#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "clicked", (GCallback) _editing_tools_adjust_tool_on_ok_gtk_button_clicked, self);
-#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->adjust_tool_window;
-#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->reset_button;
-#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp3_, "clicked", (GCallback) _editing_tools_adjust_tool_on_reset_gtk_button_clicked, self);
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->adjust_tool_window;
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_->cancel_button;
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp5_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->adjust_tool_window;
-#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->exposure_slider;
-#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed, self);
-#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->adjust_tool_window;
-#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _tmp8_->contrast_slider;
-#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed, self);
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->adjust_tool_window;
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_->saturation_slider;
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed, self);
-#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->adjust_tool_window;
-#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_->tint_slider;
-#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed, self);
-#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->adjust_tool_window;
-#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = _tmp14_->temperature_slider;
-#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed, self);
-#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->adjust_tool_window;
-#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = _tmp16_->shadows_slider;
-#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed, self);
-#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->adjust_tool_window;
-#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_->highlights_slider;
-#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed, self);
-#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->adjust_tool_window;
-#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_->histogram_manipulator;
-#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp21_, "nub-position-changed", (GCallback) _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed, self);
-#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->adjust_tool_window;
-#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = _tmp22_->saturation_slider;
-#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->adjust_tool_window;
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_->exposure_slider;
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->priv->adjust_tool_window;
-#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = _tmp26_->contrast_slider;
-#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = self->priv->adjust_tool_window;
-#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = _tmp28_->tint_slider;
-#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->priv->adjust_tool_window;
-#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = _tmp30_->temperature_slider;
-#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = self->priv->adjust_tool_window;
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = _tmp32_->shadows_slider;
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = self->priv->adjust_tool_window;
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = _tmp34_->highlights_slider;
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17077 "EditingTools.c"
+#line 17146 "EditingTools.c"
 }
 
 
@@ -17091,7 +17160,7 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
 	GtkScale* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
-	GtkHScale* _tmp13_ = NULL;
+	GtkScale* _tmp13_ = NULL;
 	guint _tmp14_ = 0U;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp15_ = NULL;
 	GtkScale* _tmp16_ = NULL;
@@ -17118,7 +17187,7 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
 	GtkScale* _tmp37_ = NULL;
 	guint _tmp38_ = 0U;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp39_ = NULL;
-	GtkHScale* _tmp40_ = NULL;
+	GtkScale* _tmp40_ = NULL;
 	guint _tmp41_ = 0U;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp42_ = NULL;
 	GtkScale* _tmp43_ = NULL;
@@ -17132,153 +17201,153 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
 	EditingToolsAdjustToolAdjustToolWindow* _tmp51_ = NULL;
 	GtkScale* _tmp52_ = NULL;
 	guint _tmp53_ = 0U;
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->ok_button;
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp2_, NULL, FALSE);
-#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_ok_gtk_button_clicked, self);
-#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->adjust_tool_window;
-#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->reset_button;
-#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp5_, NULL, FALSE);
-#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_reset_gtk_button_clicked, self);
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->adjust_tool_window;
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->cancel_button;
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp8_, NULL, FALSE);
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->adjust_tool_window;
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_->exposure_slider;
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp11_, NULL, FALSE);
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed, self);
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->adjust_tool_window;
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _tmp12_->contrast_slider;
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp14_, NULL, FALSE);
-#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed, self);
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->adjust_tool_window;
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->saturation_slider;
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp17_, NULL, FALSE);
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed, self);
-#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->adjust_tool_window;
-#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = _tmp18_->tint_slider;
-#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp20_, NULL, FALSE);
-#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed, self);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->adjust_tool_window;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = _tmp21_->temperature_slider;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp23_, NULL, FALSE);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed, self);
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->adjust_tool_window;
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = _tmp24_->shadows_slider;
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp26_, NULL, FALSE);
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2865 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed, self);
-#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->priv->adjust_tool_window;
-#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = _tmp27_->highlights_slider;
-#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp29_, NULL, FALSE);
-#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp29_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed, self);
-#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->priv->adjust_tool_window;
-#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = _tmp30_->histogram_manipulator;
-#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("nub-position-changed", TYPE_RGB_HISTOGRAM_MANIPULATOR, &_tmp32_, NULL, FALSE);
-#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed, self);
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->adjust_tool_window;
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->saturation_slider;
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp35_, NULL, FALSE);
-#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp35_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = self->priv->adjust_tool_window;
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = _tmp36_->exposure_slider;
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp38_, NULL, FALSE);
-#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp38_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->adjust_tool_window;
-#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = _tmp39_->contrast_slider;
-#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp41_, NULL, FALSE);
-#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp41_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = self->priv->adjust_tool_window;
-#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = _tmp42_->tint_slider;
-#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp44_, NULL, FALSE);
-#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->priv->adjust_tool_window;
-#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = _tmp45_->temperature_slider;
-#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp47_, NULL, FALSE);
-#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp47_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = self->priv->adjust_tool_window;
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49_ = _tmp48_->shadows_slider;
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp50_, NULL, FALSE);
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp50_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51_ = self->priv->adjust_tool_window;
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52_ = _tmp51_->highlights_slider;
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp53_, NULL, FALSE);
-#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp53_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17282 "EditingTools.c"
+#line 17351 "EditingTools.c"
 }
 
 
@@ -17292,37 +17361,37 @@ gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) {
 	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp4_ = NULL;
 	CommandManager* _tmp5_ = NULL;
 	CommandManager* _tmp6_ = NULL;
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_);
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_adjust_tool_adjust_enhance_command_new (self, _tmp2_);
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp4_;
-#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = app_window_get_command_manager ();
-#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp6_);
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 17326 "EditingTools.c"
+#line 17395 "EditingTools.c"
 }
 
 
@@ -17340,68 +17409,68 @@ static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool*
 	PixelTransformationBundle* _tmp9_ = NULL;
 	PixelTransformationBundle* _tmp10_ = NULL;
 	PixelTransformationBundle* _tmp11_ = NULL;
-#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = map;
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = !_tmp4_;
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 17366 "EditingTools.c"
+#line 17435 "EditingTools.c"
 	}
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = editing_tools_photo_canvas_get_photo (_tmp6_);
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_;
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = photo_get_color_adjustments (_tmp8_);
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_;
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp8_);
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	adjustments = _tmp10_;
-#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = adjustments;
-#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (self, _tmp11_);
-#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (adjustments);
-#line 17388 "EditingTools.c"
+#line 17457 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, PixelTransformationBundle* new_adjustments) {
 	PixelTransformationBundle* _tmp0_ = NULL;
 	EditingToolsPhotoCanvas* _tmp11_ = NULL;
-#line 2881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_adjustments));
-#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (self);
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = new_adjustments;
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformations (self, _tmp0_);
-#line 17405 "EditingTools.c"
+#line 17474 "EditingTools.c"
 	{
 		GeeIterator* _adjustment_it = NULL;
 		PixelTransformationBundle* _tmp1_ = NULL;
@@ -17409,106 +17478,106 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 		GeeIterable* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = new_adjustments;
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = pixel_transformation_bundle_get_transformations (_tmp1_);
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_;
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = gee_iterable_iterator (_tmp3_);
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_;
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_adjustment_it = _tmp5_;
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 17429 "EditingTools.c"
+#line 17498 "EditingTools.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			PixelTransformation* adjustment = NULL;
 			GeeIterator* _tmp8_ = NULL;
 			gpointer _tmp9_ = NULL;
 			PixelTransformation* _tmp10_ = NULL;
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = _adjustment_it;
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp7_) {
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 17444 "EditingTools.c"
+#line 17513 "EditingTools.c"
 			}
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = _adjustment_it;
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			adjustment = (PixelTransformation*) _tmp9_;
-#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = adjustment;
-#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_adjust_tool_update_slider (self, _tmp10_);
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (adjustment);
-#line 17458 "EditingTools.c"
+#line 17527 "EditingTools.c"
 		}
-#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_adjustment_it);
-#line 17462 "EditingTools.c"
+#line 17531 "EditingTools.c"
 	}
-#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (self);
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp11_);
-#line 17470 "EditingTools.c"
+#line 17539 "EditingTools.c"
 }
 
 
 static gpointer _pixel_transformation_ref0 (gpointer self) {
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? pixel_transformation_ref (self) : NULL;
-#line 17477 "EditingTools.c"
+#line 17546 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, PixelTransformation* transformation) {
 	PixelTransformation* _tmp0_ = NULL;
 	PixelTransformationType _tmp1_ = 0;
-#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (transformation));
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = transformation;
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = pixel_transformation_get_transformation_type (_tmp0_);
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	switch (_tmp1_) {
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION:
-#line 17496 "EditingTools.c"
+#line 17565 "EditingTools.c"
 		{
 			ExpansionTransformation* expansion = NULL;
 			PixelTransformation* _tmp2_ = NULL;
 			ExpansionTransformation* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = transformation;
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation));
-#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			expansion = _tmp3_;
-#line 2900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp4_ = self->priv->disable_histogram_refresh;
-#line 2900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp4_) {
-#line 17512 "EditingTools.c"
+#line 17581 "EditingTools.c"
 				EditingToolsAdjustToolAdjustToolWindow* _tmp5_ = NULL;
 				RGBHistogramManipulator* _tmp6_ = NULL;
 				ExpansionTransformation* _tmp7_ = NULL;
@@ -17517,199 +17586,199 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 				RGBHistogramManipulator* _tmp10_ = NULL;
 				ExpansionTransformation* _tmp11_ = NULL;
 				gint _tmp12_ = 0;
-#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp5_ = self->priv->adjust_tool_window;
-#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = _tmp5_->histogram_manipulator;
-#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp7_ = expansion;
-#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp8_ = expansion_transformation_get_black_point (_tmp7_);
-#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				rgb_histogram_manipulator_set_left_nub_position (_tmp6_, _tmp8_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp9_ = self->priv->adjust_tool_window;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp10_ = _tmp9_->histogram_manipulator;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp11_ = expansion;
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp12_ = expansion_transformation_get_white_point (_tmp11_);
-#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				rgb_histogram_manipulator_set_right_nub_position (_tmp10_, _tmp12_);
-#line 17541 "EditingTools.c"
+#line 17610 "EditingTools.c"
 			}
-#line 2906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (expansion);
-#line 2906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17547 "EditingTools.c"
+#line 17616 "EditingTools.c"
 		}
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SHADOWS:
-#line 17551 "EditingTools.c"
+#line 17620 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp13_ = NULL;
 			GtkScale* _tmp14_ = NULL;
 			PixelTransformation* _tmp15_ = NULL;
 			gfloat _tmp16_ = 0.0F;
-#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = self->priv->adjust_tool_window;
-#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = _tmp13_->shadows_slider;
-#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp15_ = transformation;
-#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = shadow_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation));
-#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_range_get_type (), GtkRange), (gdouble) _tmp16_);
-#line 2911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17569 "EditingTools.c"
+#line 17638 "EditingTools.c"
 		}
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_CONTRAST:
-#line 17573 "EditingTools.c"
+#line 17642 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp17_ = NULL;
-			GtkHScale* _tmp18_ = NULL;
+			GtkScale* _tmp18_ = NULL;
 			PixelTransformation* _tmp19_ = NULL;
 			gfloat _tmp20_ = 0.0F;
-#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp17_ = self->priv->adjust_tool_window;
-#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = _tmp17_->contrast_slider;
-#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp19_ = transformation;
-#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = contrast_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation));
-#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_range_get_type (), GtkRange), (gdouble) _tmp20_);
-#line 2916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17591 "EditingTools.c"
+#line 17660 "EditingTools.c"
 		}
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS:
-#line 17595 "EditingTools.c"
+#line 17664 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp21_ = NULL;
 			GtkScale* _tmp22_ = NULL;
 			PixelTransformation* _tmp23_ = NULL;
 			gfloat _tmp24_ = 0.0F;
-#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp21_ = self->priv->adjust_tool_window;
-#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp22_ = _tmp21_->highlights_slider;
-#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp23_ = transformation;
-#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp24_ = highlight_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation));
-#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), (gdouble) _tmp24_);
-#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17613 "EditingTools.c"
+#line 17682 "EditingTools.c"
 		}
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_EXPOSURE:
-#line 17617 "EditingTools.c"
+#line 17686 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp25_ = NULL;
 			GtkScale* _tmp26_ = NULL;
 			PixelTransformation* _tmp27_ = NULL;
 			gfloat _tmp28_ = 0.0F;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp25_ = self->priv->adjust_tool_window;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp26_ = _tmp25_->exposure_slider;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp27_ = transformation;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp28_ = exposure_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation));
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2938 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17635 "EditingTools.c"
+#line 17704 "EditingTools.c"
 		}
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SATURATION:
-#line 17639 "EditingTools.c"
+#line 17708 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp29_ = NULL;
 			GtkScale* _tmp30_ = NULL;
 			PixelTransformation* _tmp31_ = NULL;
 			gfloat _tmp32_ = 0.0F;
-#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp29_ = self->priv->adjust_tool_window;
-#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp30_ = _tmp29_->saturation_slider;
-#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp31_ = transformation;
-#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = saturation_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation));
-#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_range_get_type (), GtkRange), (gdouble) _tmp32_);
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17657 "EditingTools.c"
+#line 17726 "EditingTools.c"
 		}
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TINT:
-#line 17661 "EditingTools.c"
+#line 17730 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp33_ = NULL;
 			GtkScale* _tmp34_ = NULL;
 			PixelTransformation* _tmp35_ = NULL;
 			gfloat _tmp36_ = 0.0F;
-#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp33_ = self->priv->adjust_tool_window;
-#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp34_ = _tmp33_->tint_slider;
-#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp35_ = transformation;
-#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp36_ = tint_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_TINT_TRANSFORMATION, TintTransformation));
-#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17679 "EditingTools.c"
+#line 17748 "EditingTools.c"
 		}
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TEMPERATURE:
-#line 17683 "EditingTools.c"
+#line 17752 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp37_ = NULL;
 			GtkScale* _tmp38_ = NULL;
 			PixelTransformation* _tmp39_ = NULL;
 			gfloat _tmp40_ = 0.0F;
-#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp37_ = self->priv->adjust_tool_window;
-#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp38_ = _tmp37_->temperature_slider;
-#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp39_ = transformation;
-#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp40_ = temperature_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation));
-#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_range_get_type (), GtkRange), (gdouble) _tmp40_);
-#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17701 "EditingTools.c"
+#line 17770 "EditingTools.c"
 		}
 		default:
 		{
 			PixelTransformation* _tmp41_ = NULL;
 			PixelTransformationType _tmp42_ = 0;
-#line 2944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp41_ = transformation;
-#line 2944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp42_ = pixel_transformation_get_transformation_type (_tmp41_);
-#line 2944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			g_error ("EditingTools.vala:2944: Unknown adjustment: %d", (gint) _tmp42_);
-#line 17713 "EditingTools.c"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			g_error ("EditingTools.vala:2956: Unknown adjustment: %d", (gint) _tmp42_);
+#line 17782 "EditingTools.c"
 		}
 	}
 }
@@ -17738,75 +17807,75 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 	gfloat* _tmp12_ = NULL;
 	gint cache_pixel_index = 0;
 	gfloat INV_255 = 0.0F;
-#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (source));
-#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = source;
-#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = gdk_pixbuf_get_width (_tmp0_);
-#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_width = _tmp1_;
-#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = source;
-#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gdk_pixbuf_get_height (_tmp2_);
-#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_height = _tmp3_;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = source;
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_);
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_num_channels = _tmp5_;
-#line 2952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = source;
-#line 2952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = gdk_pixbuf_get_rowstride (_tmp6_);
-#line 2952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_rowstride = _tmp7_;
-#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = source;
-#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = gdk_pixbuf_get_pixels (_tmp8_);
-#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_pixels = _tmp9_;
-#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_pixels_length1 = -1;
-#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_source_pixels_size_ = source_pixels_length1;
-#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = source_width;
-#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = source_height;
-#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = g_new0 (gfloat, (3 * _tmp10_) * _tmp11_);
-#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = _tmp12_;
-#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache_length1 = (3 * _tmp10_) * _tmp11_;
-#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cache_pixel_index = 0;
-#line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	INV_255 = 1.0f / 255.0f;
-#line 17798 "EditingTools.c"
+#line 17867 "EditingTools.c"
 	{
 		gint j = 0;
-#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		j = 0;
-#line 17803 "EditingTools.c"
+#line 17872 "EditingTools.c"
 		{
 			gboolean _tmp13_ = FALSE;
-#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = TRUE;
-#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 17810 "EditingTools.c"
+#line 17879 "EditingTools.c"
 				gint _tmp15_ = 0;
 				gint _tmp16_ = 0;
 				gint row_start_index = 0;
@@ -17816,58 +17885,58 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 				gint _tmp19_ = 0;
 				gint _tmp20_ = 0;
 				gint _tmp21_ = 0;
-#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!_tmp13_) {
-#line 17822 "EditingTools.c"
+#line 17891 "EditingTools.c"
 					gint _tmp14_ = 0;
-#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp14_ = j;
-#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					j = _tmp14_ + 1;
-#line 17828 "EditingTools.c"
+#line 17897 "EditingTools.c"
 				}
-#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp13_ = FALSE;
-#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp15_ = j;
-#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp16_ = source_height;
-#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!(_tmp15_ < _tmp16_)) {
-#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 17840 "EditingTools.c"
+#line 17909 "EditingTools.c"
 				}
-#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp17_ = j;
-#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp18_ = source_rowstride;
-#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				row_start_index = _tmp17_ * _tmp18_;
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp19_ = row_start_index;
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp20_ = source_width;
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp21_ = source_num_channels;
-#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				row_end_index = _tmp19_ + (_tmp20_ * _tmp21_);
-#line 17856 "EditingTools.c"
+#line 17925 "EditingTools.c"
 				{
 					gint i = 0;
 					gint _tmp22_ = 0;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp22_ = row_start_index;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					i = _tmp22_;
-#line 17864 "EditingTools.c"
+#line 17933 "EditingTools.c"
 					{
 						gboolean _tmp23_ = FALSE;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp23_ = TRUE;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						while (TRUE) {
-#line 17871 "EditingTools.c"
+#line 17940 "EditingTools.c"
 							gint _tmp26_ = 0;
 							gint _tmp27_ = 0;
 							gfloat* _tmp28_ = NULL;
@@ -17897,98 +17966,98 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 							guchar _tmp46_ = '\0';
 							gfloat _tmp47_ = 0.0F;
 							gfloat _tmp48_ = 0.0F;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							if (!_tmp23_) {
-#line 17903 "EditingTools.c"
+#line 17972 "EditingTools.c"
 								gint _tmp24_ = 0;
 								gint _tmp25_ = 0;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								_tmp24_ = i;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								_tmp25_ = source_num_channels;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								i = _tmp24_ + _tmp25_;
-#line 17912 "EditingTools.c"
+#line 17981 "EditingTools.c"
 							}
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp23_ = FALSE;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp26_ = i;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp27_ = row_end_index;
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							if (!(_tmp26_ < _tmp27_)) {
-#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								break;
-#line 17924 "EditingTools.c"
+#line 17993 "EditingTools.c"
 							}
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28_ = self->priv->fp_pixel_cache;
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28__length1 = self->priv->fp_pixel_cache_length1;
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp29_ = cache_pixel_index;
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							cache_pixel_index = _tmp29_ + 1;
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp30_ = source_pixels;
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp30__length1 = source_pixels_length1;
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp31_ = i;
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp32_ = _tmp30_[_tmp31_];
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp33_ = INV_255;
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28_[_tmp29_] = ((gfloat) _tmp32_) * _tmp33_;
-#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp34_ = _tmp28_[_tmp29_];
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp35_ = self->priv->fp_pixel_cache;
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp35__length1 = self->priv->fp_pixel_cache_length1;
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp36_ = cache_pixel_index;
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							cache_pixel_index = _tmp36_ + 1;
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp37_ = source_pixels;
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp37__length1 = source_pixels_length1;
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp38_ = i;
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp39_ = _tmp37_[_tmp38_ + 1];
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp40_ = INV_255;
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp35_[_tmp36_] = ((gfloat) _tmp39_) * _tmp40_;
-#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2976 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp41_ = _tmp35_[_tmp36_];
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp42_ = self->priv->fp_pixel_cache;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp42__length1 = self->priv->fp_pixel_cache_length1;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp43_ = cache_pixel_index;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							cache_pixel_index = _tmp43_ + 1;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp44_ = source_pixels;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp44__length1 = source_pixels_length1;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp45_ = i;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp46_ = _tmp44_[_tmp45_ + 2];
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp47_ = INV_255;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp42_[_tmp43_] = ((gfloat) _tmp46_) * _tmp47_;
-#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2977 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp48_ = _tmp42_[_tmp43_];
-#line 17992 "EditingTools.c"
+#line 18061 "EditingTools.c"
 						}
 					}
 				}
@@ -18008,73 +18077,73 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 	const gchar* _tmp4_ = NULL;
 	GdkEventKey* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = event;
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 18026 "EditingTools.c"
+#line 18095 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		const gchar* _tmp7_ = NULL;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_->keyval;
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 18039 "EditingTools.c"
+#line 18108 "EditingTools.c"
 	}
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 18045 "EditingTools.c"
+#line 18114 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
 		const gchar* _tmp10_ = NULL;
-#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->keyval;
-#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2985 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 18058 "EditingTools.c"
+#line 18127 "EditingTools.c"
 	}
-#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2983 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_on_ok (self);
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18068 "EditingTools.c"
+#line 18137 "EditingTools.c"
 	}
-#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
-#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp12_;
-#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2990 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18078 "EditingTools.c"
+#line 18147 "EditingTools.c"
 }
 
 
@@ -18093,10 +18162,10 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 	GtkLabel* contrast_label = NULL;
 	const gchar* _tmp8_ = NULL;
 	GtkLabel* _tmp9_ = NULL;
-	GtkHScale* _tmp10_ = NULL;
-	GtkHScale* _tmp11_ = NULL;
-	GtkHScale* _tmp12_ = NULL;
-	GtkHScale* _tmp13_ = NULL;
+	GtkScale* _tmp10_ = NULL;
+	GtkScale* _tmp11_ = NULL;
+	GtkScale* _tmp12_ = NULL;
+	GtkScale* _tmp13_ = NULL;
 	GtkLabel* saturation_label = NULL;
 	const gchar* _tmp14_ = NULL;
 	GtkLabel* _tmp15_ = NULL;
@@ -18136,320 +18205,343 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 	GtkButton* _tmp44_ = NULL;
 	GtkButton* _tmp45_ = NULL;
 	GtkButton* _tmp46_ = NULL;
-	GtkAlignment* histogram_aligner = NULL;
-	GtkAlignment* _tmp47_ = NULL;
+	RGBHistogramManipulator* _tmp47_ = NULL;
 	RGBHistogramManipulator* _tmp48_ = NULL;
+	RGBHistogramManipulator* _tmp49_ = NULL;
+	RGBHistogramManipulator* _tmp50_ = NULL;
 	GtkBox* pane_layouter = NULL;
-	GtkBox* _tmp49_ = NULL;
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	GtkBox* _tmp51_ = NULL;
+	RGBHistogramManipulator* _tmp52_ = NULL;
+	RGBHistogramManipulator* _tmp53_ = NULL;
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkGrid*) gtk_grid_new ();
-#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	slider_organizer = _tmp1_;
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_column_homogeneous (slider_organizer, FALSE);
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_row_spacing (slider_organizer, (guint) 12);
-#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_column_spacing (slider_organizer, (guint) 12);
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_left (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
-#line 2241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
+#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
-#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _ ("Exposure:");
-#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp2_);
-#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	exposure_label = _tmp3_;
-#line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 2250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), 0, 0, 1, 1);
-#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->exposure_slider;
-#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1);
-#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->exposure_slider;
-#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->exposure_slider;
-#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp6_, FALSE);
-#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->exposure_slider;
-#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0);
+#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _ ("Contrast:");
-#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp8_);
-#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp9_);
-#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	contrast_label = _tmp9_;
-#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), 0, 1, 1, 1);
-#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->contrast_slider;
-#line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1);
-#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->contrast_slider;
-#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->contrast_slider;
-#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_scale_get_type (), GtkScale), FALSE);
-#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_scale_set_draw_value (_tmp12_, FALSE);
+#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->contrast_slider;
-#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 0);
+#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _ ("Saturation:");
-#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp14_);
-#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp15_);
-#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	saturation_label = _tmp15_;
-#line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), 0, 2, 1, 1);
-#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->saturation_slider;
-#line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1);
-#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->saturation_slider;
-#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->saturation_slider;
-#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp18_, FALSE);
-#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = self->saturation_slider;
-#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), 0);
+#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = _ ("Tint:");
-#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp20_);
-#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp21_);
-#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	tint_label = _tmp21_;
-#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), 0, 3, 1, 1);
-#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->tint_slider;
-#line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1);
-#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->tint_slider;
-#line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->tint_slider;
-#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp24_, FALSE);
-#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->tint_slider;
-#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), 0);
+#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _ ("Temperature:");
-#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp26_);
-#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp27_);
-#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	temperature_label = _tmp27_;
-#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), 0, 4, 1, 1);
-#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = self->temperature_slider;
-#line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1);
-#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->temperature_slider;
-#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->temperature_slider;
-#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp30_, FALSE);
-#line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->temperature_slider;
-#line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 0);
+#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = _ ("Shadows:");
-#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp32_);
-#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp33_);
-#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	shadows_label = _tmp33_;
-#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), 0, 5, 1, 1);
-#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = self->shadows_slider;
-#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1);
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = self->shadows_slider;
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = self->shadows_slider;
-#line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp36_, FALSE);
-#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = self->shadows_slider;
-#line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), 0);
+#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = _ ("Highlights:");
-#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp38_);
-#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp39_);
-#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	highlights_label = _tmp39_;
-#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
+#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), 0, 6, 1, 1);
-#line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = self->highlights_slider;
-#line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1);
-#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = self->highlights_slider;
-#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = self->highlights_slider;
-#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp42_, FALSE);
-#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp43_);
-#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	button_layouter = _tmp43_;
-#line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_set_homogeneous (button_layouter, TRUE);
-#line 2301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp44_ = self->cancel_button;
-#line 2301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->reset_button;
-#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = self->ok_button;
-#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp47_ = (GtkAlignment*) gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f);
-#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp47_);
-#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	histogram_aligner = _tmp47_;
-#line 2306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp47_ = self->histogram_manipulator;
+#line 2316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), 12);
+#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = self->histogram_manipulator;
-#line 2306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (histogram_aligner, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
-#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_alignment_set_padding (histogram_aligner, (guint) 12, (guint) 8, (guint) 12, (guint) 12);
-#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp49_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp49_);
-#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pane_layouter = _tmp49_;
-#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (histogram_aligner, gtk_widget_get_type (), GtkWidget));
-#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), 12);
+#line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp49_ = self->histogram_manipulator;
+#line 2318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), 12);
+#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp50_ = self->histogram_manipulator;
+#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), 8);
+#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp51_);
+#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	pane_layouter = _tmp51_;
+#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp52_ = self->histogram_manipulator;
+#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget));
+#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget));
-#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (button_layouter, gtk_widget_get_type (), GtkWidget));
-#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (histogram_aligner, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
-#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp53_ = self->histogram_manipulator;
+#line 2325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
+#line 2327 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_widget_get_type (), GtkWidget));
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (pane_layouter);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (histogram_aligner);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (button_layouter);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (highlights_label);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (shadows_label);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (temperature_label);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (tint_label);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (saturation_label);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (contrast_label);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (exposure_label);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (slider_organizer);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18431 "EditingTools.c"
+#line 18523 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container) {
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_tool_window_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, container);
-#line 18438 "EditingTools.c"
+#line 18530 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_window_class_init (EditingToolsAdjustToolAdjustToolWindowClass * klass) {
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_window_parent_class = g_type_class_peek_parent (klass);
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_window_finalize;
-#line 18447 "EditingTools.c"
+#line 18539 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingToolsAdjustToolAdjustToolWindow * self) {
 	GtkScale* _tmp0_ = NULL;
-	GtkHScale* _tmp1_ = NULL;
+	GtkScale* _tmp1_ = NULL;
 	GtkScale* _tmp2_ = NULL;
 	GtkScale* _tmp3_ = NULL;
 	GtkScale* _tmp4_ = NULL;
@@ -18460,107 +18552,107 @@ static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingT
 	GtkButton* _tmp9_ = NULL;
 	GtkButton* _tmp10_ = NULL;
 	RGBHistogramManipulator* _tmp11_ = NULL;
-#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EXPOSURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) EXPOSURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp0_);
-#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->exposure_slider = _tmp0_;
-#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = (GtkHScale*) gtk_hscale_new_with_range ((gdouble) CONTRAST_TRANSFORMATION_MIN_PARAMETER, (gdouble) CONTRAST_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp1_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) CONTRAST_TRANSFORMATION_MIN_PARAMETER, (gdouble) CONTRAST_TRANSFORMATION_MAX_PARAMETER, 1.0);
+#line 2212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->contrast_slider = _tmp1_;
-#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) SATURATION_TRANSFORMATION_MIN_PARAMETER, (gdouble) SATURATION_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->saturation_slider = _tmp2_;
-#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) TINT_TRANSFORMATION_MIN_PARAMETER, (gdouble) TINT_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->tint_slider = _tmp3_;
-#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) TEMPERATURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) TEMPERATURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp4_);
-#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->temperature_slider = _tmp4_;
 #line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->temperature_slider = _tmp4_;
+#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) SHADOW_DETAIL_TRANSFORMATION_MIN_PARAMETER, (gdouble) SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp5_);
-#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->shadows_slider = _tmp5_;
 #line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->shadows_slider = _tmp5_;
+#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER, (gdouble) HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp6_);
-#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->highlights_slider = _tmp6_;
 #line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->highlights_slider = _tmp6_;
+#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_OK_LABEL);
-#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp7_);
-#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ok_button = _tmp7_;
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _ ("_Reset");
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp8_);
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp9_);
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->reset_button = _tmp9_;
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp10_);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->cancel_button = _tmp10_;
-#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = rgb_histogram_manipulator_new ();
-#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp11_);
-#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->histogram_manipulator = _tmp11_;
-#line 18532 "EditingTools.c"
+#line 18624 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject* obj) {
 	EditingToolsAdjustToolAdjustToolWindow * self;
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, EditingToolsAdjustToolAdjustToolWindow);
-#line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->exposure_slider);
-#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->contrast_slider);
-#line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->saturation_slider);
-#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->tint_slider);
-#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (self->temperature_slider);
 #line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (self->shadows_slider);
+	_g_object_unref0 (self->temperature_slider);
 #line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (self->highlights_slider);
+	_g_object_unref0 (self->shadows_slider);
 #line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (self->highlights_slider);
+#line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->ok_button);
-#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->reset_button);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->cancel_button);
-#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->histogram_manipulator);
-#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_window_parent_class)->finalize (obj);
-#line 18564 "EditingTools.c"
+#line 18656 "EditingTools.c"
 }
 
 
@@ -18577,9 +18669,9 @@ static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) {
 
 
 static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
-#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated ((EditingToolsAdjustToolAdjustToolCommand*) self);
-#line 18583 "EditingTools.c"
+#line 18675 "EditingTools.c"
 }
 
 
@@ -18589,55 +18681,55 @@ static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust
 	const gchar* _tmp1_ = NULL;
 	EditingToolsAdjustTool* _tmp2_ = NULL;
 	EditingToolsAdjustTool* _tmp3_ = NULL;
-#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (explanation != NULL, NULL);
-#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = name;
-#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = explanation;
-#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustToolCommand*) command_construct (object_type, _tmp0_, _tmp1_);
-#line 2325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = owner;
-#line 2325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->owner = _tmp2_;
-#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = owner;
-#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "deactivated", (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self, 0);
-#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18615 "EditingTools.c"
+#line 18707 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self) {
 	CommandManager* _tmp0_ = NULL;
 	CommandManager* _tmp1_ = NULL;
-#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_ADJUST_TOOL_IS_ADJUST_TOOL_COMMAND (self));
-#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_reset (_tmp1_);
-#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 18632 "EditingTools.c"
+#line 18724 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_command_class_init (EditingToolsAdjustToolAdjustToolCommandClass * klass) {
-#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_command_parent_class = g_type_class_peek_parent (klass);
-#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_command_finalize;
-#line 18641 "EditingTools.c"
+#line 18733 "EditingTools.c"
 }
 
 
@@ -18648,26 +18740,26 @@ static void editing_tools_adjust_tool_adjust_tool_command_instance_init (Editing
 static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject* obj) {
 	EditingToolsAdjustToolAdjustToolCommand * self;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
-#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand);
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->owner;
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 18658 "EditingTools.c"
+#line 18750 "EditingTools.c"
 		EditingToolsAdjustTool* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
-#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->owner;
-#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp2_, NULL, FALSE);
-#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self);
-#line 18667 "EditingTools.c"
+#line 18759 "EditingTools.c"
 	}
-#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_command_parent_class)->finalize (obj);
-#line 18671 "EditingTools.c"
+#line 18763 "EditingTools.c"
 }
 
 
@@ -18692,46 +18784,46 @@ static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjus
 	PixelTransformationBundle* _tmp4_ = NULL;
 	PixelTransformationBundle* _tmp5_ = NULL;
 	PixelTransformationBundle* _tmp6_ = NULL;
-#line 2345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (current), NULL);
-#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
-#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _ ("Reset Colors");
-#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _ ("Reset all color adjustments to original");
-#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
-#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = current;
-#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = pixel_transformation_bundle_copy (_tmp3_);
-#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->original = _tmp4_;
-#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = pixel_transformation_bundle_new ();
-#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
-#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reset = _tmp5_;
-#line 2350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->reset;
-#line 2350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformation_bundle_set_to_identity (_tmp6_);
-#line 2345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18728 "EditingTools.c"
+#line 18820 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, PixelTransformationBundle* current) {
-#line 2345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_reset_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, owner, current);
-#line 18735 "EditingTools.c"
+#line 18827 "EditingTools.c"
 }
 
 
@@ -18739,15 +18831,15 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->reset;
-#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18751 "EditingTools.c"
+#line 18843 "EditingTools.c"
 }
 
 
@@ -18755,15 +18847,15 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* b
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
-#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->original;
-#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18767 "EditingTools.c"
+#line 18859 "EditingTools.c"
 }
 
 
@@ -18777,89 +18869,89 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 	EditingToolsAdjustToolAdjustResetCommand* _tmp3_ = NULL;
 	EditingToolsAdjustTool* _tmp4_ = NULL;
 	EditingToolsAdjustTool* _tmp5_ = NULL;
-#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = command;
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND) ? ((EditingToolsAdjustToolAdjustResetCommand*) _tmp0_) : NULL);
-#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	reset_command = _tmp1_;
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = reset_command;
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == NULL) {
-#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (reset_command);
-#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18801 "EditingTools.c"
+#line 18893 "EditingTools.c"
 	}
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = reset_command;
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (reset_command);
-#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18817 "EditingTools.c"
+#line 18909 "EditingTools.c"
 	}
-#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (reset_command);
-#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18825 "EditingTools.c"
+#line 18917 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_class_init (EditingToolsAdjustToolAdjustResetCommandClass * klass) {
-#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_reset_command_parent_class = g_type_class_peek_parent (klass);
-#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustResetCommandPrivate));
-#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->execute = editing_tools_adjust_tool_adjust_reset_command_real_execute;
-#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->undo = editing_tools_adjust_tool_adjust_reset_command_real_undo;
-#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->compress = editing_tools_adjust_tool_adjust_reset_command_real_compress;
-#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_reset_command_finalize;
-#line 18842 "EditingTools.c"
+#line 18934 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_instance_init (EditingToolsAdjustToolAdjustResetCommand * self) {
-#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE (self);
-#line 18849 "EditingTools.c"
+#line 18941 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject* obj) {
 	EditingToolsAdjustToolAdjustResetCommand * self;
-#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
-#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_reset_command_parent_class)->finalize (obj);
-#line 18863 "EditingTools.c"
+#line 18955 "EditingTools.c"
 }
 
 
@@ -18889,62 +18981,62 @@ static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_
 	PixelTransformation* _tmp9_ = NULL;
 	PixelTransformationType _tmp10_ = 0;
 	PixelTransformationType _tmp11_ = 0;
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (old_transformation), NULL);
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation), NULL);
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = name;
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = name;
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolSliderAdjustmentCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = old_transformation;
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _pixel_transformation_ref0 (_tmp3_);
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->old_transformation);
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->old_transformation = _tmp4_;
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = new_transformation;
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _pixel_transformation_ref0 (_tmp5_);
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->new_transformation = _tmp6_;
-#line 2385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = old_transformation;
-#line 2385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
-#line 2385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformation_type = _tmp8_;
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = new_transformation;
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = pixel_transformation_get_transformation_type (_tmp9_);
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->transformation_type;
-#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp10_ == _tmp11_, "new_transformation.get_transformation_type() == transformation_type");
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18941 "EditingTools.c"
+#line 19033 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) {
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_slider_adjustment_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, owner, old_transformation, new_transformation, name);
-#line 18948 "EditingTools.c"
+#line 19040 "EditingTools.c"
 }
 
 
@@ -18954,21 +19046,21 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Co
 	PixelTransformation* _tmp1_ = NULL;
 	EditingToolsAdjustTool* _tmp2_ = NULL;
 	EditingToolsPhotoCanvas* _tmp3_ = NULL;
-#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->new_transformation;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2403 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 18972 "EditingTools.c"
+#line 19064 "EditingTools.c"
 }
 
 
@@ -18982,35 +19074,35 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Comma
 	EditingToolsAdjustTool* _tmp5_ = NULL;
 	EditingToolsAdjustTool* _tmp6_ = NULL;
 	EditingToolsPhotoCanvas* _tmp7_ = NULL;
-#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->old_transformation;
-#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (_tmp2_);
-#line 2399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->old_transformation;
-#line 2399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_slider (_tmp3_, _tmp4_);
-#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (_tmp5_);
-#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 19014 "EditingTools.c"
+#line 19106 "EditingTools.c"
 }
 
 
@@ -19024,35 +19116,35 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Comma
 	EditingToolsAdjustTool* _tmp5_ = NULL;
 	EditingToolsAdjustTool* _tmp6_ = NULL;
 	EditingToolsPhotoCanvas* _tmp7_ = NULL;
-#line 2405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->new_transformation;
-#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (_tmp2_);
-#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->new_transformation;
-#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_slider (_tmp3_, _tmp4_);
-#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (_tmp5_);
-#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 19056 "EditingTools.c"
+#line 19148 "EditingTools.c"
 }
 
 
@@ -19073,121 +19165,121 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp10_ = NULL;
 	PixelTransformation* _tmp11_ = NULL;
 	PixelTransformation* _tmp12_ = NULL;
-#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = command;
-#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND) ? ((EditingToolsAdjustToolSliderAdjustmentCommand*) _tmp0_) : NULL);
-#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	slider_adjustment = _tmp1_;
-#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = slider_adjustment;
-#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == NULL) {
-#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
-#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19097 "EditingTools.c"
+#line 19189 "EditingTools.c"
 	}
-#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = slider_adjustment;
-#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
-#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19113 "EditingTools.c"
+#line 19205 "EditingTools.c"
 	}
-#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = slider_adjustment;
-#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->priv->transformation_type;
-#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->transformation_type;
-#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp7_ != _tmp8_) {
-#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
-#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19129 "EditingTools.c"
+#line 19221 "EditingTools.c"
 	}
-#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = slider_adjustment;
-#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = slider_adjustment;
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_->priv->new_transformation;
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _pixel_transformation_ref0 (_tmp11_);
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->new_transformation = _tmp12_;
-#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (slider_adjustment);
-#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 19151 "EditingTools.c"
+#line 19243 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_class_init (EditingToolsAdjustToolSliderAdjustmentCommandClass * klass) {
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_adjustment_command_parent_class = g_type_class_peek_parent (klass);
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolSliderAdjustmentCommandPrivate));
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->execute = editing_tools_adjust_tool_slider_adjustment_command_real_execute;
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->undo = editing_tools_adjust_tool_slider_adjustment_command_real_undo;
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->redo = editing_tools_adjust_tool_slider_adjustment_command_real_redo;
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->compress = editing_tools_adjust_tool_slider_adjustment_command_real_compress;
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_slider_adjustment_command_finalize;
-#line 19170 "EditingTools.c"
+#line 19262 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_instance_init (EditingToolsAdjustToolSliderAdjustmentCommand * self) {
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE (self);
-#line 19177 "EditingTools.c"
+#line 19269 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject* obj) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->old_transformation);
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_slider_adjustment_command_parent_class)->finalize (obj);
-#line 19191 "EditingTools.c"
+#line 19283 "EditingTools.c"
 }
 
 
@@ -19210,40 +19302,40 @@ static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adj
 	Photo* _tmp2_ = NULL;
 	Photo* _tmp3_ = NULL;
 	PixelTransformationBundle* _tmp4_ = NULL;
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
-#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustEnhanceCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
-#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = photo;
-#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
-#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->photo = _tmp2_;
-#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = photo;
-#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = photo_get_color_adjustments (_tmp3_);
-#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->original = _tmp4_;
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 19240 "EditingTools.c"
+#line 19332 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, Photo* photo) {
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2455 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_enhance_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, owner, photo);
-#line 19247 "EditingTools.c"
+#line 19339 "EditingTools.c"
 }
 
 
@@ -19252,32 +19344,32 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma
 	PixelTransformationBundle* _tmp0_ = NULL;
 	EditingToolsAdjustTool* _tmp3_ = NULL;
 	PixelTransformationBundle* _tmp4_ = NULL;
-#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->enhanced;
-#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 19262 "EditingTools.c"
+#line 19354 "EditingTools.c"
 		Photo* _tmp1_ = NULL;
 		PixelTransformationBundle* _tmp2_ = NULL;
-#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->priv->photo;
-#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = photo_get_enhance_transformations (_tmp1_);
-#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_pixel_transformation_bundle_unref0 (self->priv->enhanced);
-#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->enhanced = _tmp2_;
-#line 19273 "EditingTools.c"
+#line 19365 "EditingTools.c"
 	}
-#line 2454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->enhanced;
-#line 2454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp3_, _tmp4_);
-#line 19281 "EditingTools.c"
+#line 19373 "EditingTools.c"
 }
 
 
@@ -19285,15 +19377,15 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command*
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
-#line 2457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->original;
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 19297 "EditingTools.c"
+#line 19389 "EditingTools.c"
 }
 
 
@@ -19311,21 +19403,21 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp15_ = NULL;
 	EditingToolsAdjustTool* _tmp16_ = NULL;
 	EditingToolsAdjustTool* _tmp17_ = NULL;
-#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = command;
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ENHANCE_SINGLE_COMMAND) ? ((EnhanceSingleCommand*) _tmp0_) : NULL);
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	enhance_single = _tmp1_;
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = enhance_single;
-#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 19329 "EditingTools.c"
+#line 19421 "EditingTools.c"
 		Photo* photo = NULL;
 		EnhanceSingleCommand* _tmp3_ = NULL;
 		DataSource* _tmp4_ = NULL;
@@ -19336,127 +19428,127 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 		Photo* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
 		gboolean _tmp11_ = FALSE;
-#line 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = enhance_single;
-#line 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = single_data_source_command_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand));
-#line 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo);
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = photo;
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_;
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource));
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp10_;
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = _tmp11_;
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (photo);
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19370 "EditingTools.c"
+#line 19462 "EditingTools.c"
 	}
-#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = command;
-#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND) ? ((EditingToolsAdjustToolAdjustEnhanceCommand*) _tmp12_) : NULL);
-#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	enhance_command = _tmp13_;
-#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = enhance_command;
-#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp14_ == NULL) {
-#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_command);
-#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
-#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19390 "EditingTools.c"
+#line 19482 "EditingTools.c"
 	}
-#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = enhance_command;
-#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_ != _tmp17_) {
-#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_command);
-#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
-#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19408 "EditingTools.c"
+#line 19500 "EditingTools.c"
 	}
-#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (enhance_command);
-#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (enhance_single);
-#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 19418 "EditingTools.c"
+#line 19510 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_class_init (EditingToolsAdjustToolAdjustEnhanceCommandClass * klass) {
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_enhance_command_parent_class = g_type_class_peek_parent (klass);
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustEnhanceCommandPrivate));
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->execute = editing_tools_adjust_tool_adjust_enhance_command_real_execute;
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->undo = editing_tools_adjust_tool_adjust_enhance_command_real_undo;
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->compress = editing_tools_adjust_tool_adjust_enhance_command_real_compress;
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_enhance_command_finalize;
-#line 19435 "EditingTools.c"
+#line 19527 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_instance_init (EditingToolsAdjustToolAdjustEnhanceCommand * self) {
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE (self);
-#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->enhanced = NULL;
-#line 19444 "EditingTools.c"
+#line 19536 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject* obj) {
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
-#line 2440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->enhanced);
-#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_enhance_command_parent_class)->finalize (obj);
-#line 19460 "EditingTools.c"
+#line 19552 "EditingTools.c"
 }
 
 
@@ -19473,110 +19565,110 @@ static GType editing_tools_adjust_tool_adjust_enhance_command_get_type (void) {
 
 
 static void editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass * klass) {
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_parent_class = g_type_class_peek_parent (klass);
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->finalize = editing_tools_adjust_tool_finalize;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolPrivate));
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->activate = editing_tools_adjust_tool_real_activate;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_adjust_tool_real_get_tool_window;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->deactivate = editing_tools_adjust_tool_real_deactivate;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = editing_tools_adjust_tool_real_paint;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = editing_tools_adjust_tool_real_get_display_pixbuf;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_adjust_tool_real_on_keypress;
-#line 19495 "EditingTools.c"
+#line 19587 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * self) {
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_GET_PRIVATE (self);
-#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->adjust_tool_window = NULL;
-#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->suppress_effect_redraw = FALSE;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = NULL;
-#line 2487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->histogram_pixbuf = NULL;
-#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->virgin_histogram_pixbuf = NULL;
-#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformer = NULL;
-#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->histogram_transformer = NULL;
-#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformations = NULL;
-#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = NULL;
-#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache_length1 = 0;
-#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->disable_histogram_refresh = FALSE;
-#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->temperature_scheduler = NULL;
-#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->tint_scheduler = NULL;
-#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->contrast_scheduler = NULL;
-#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->saturation_scheduler = NULL;
-#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->exposure_scheduler = NULL;
-#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->shadows_scheduler = NULL;
-#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->highlights_scheduler = NULL;
-#line 19540 "EditingTools.c"
+#line 19632 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool* obj) {
 	EditingToolsAdjustTool * self;
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->virgin_histogram_pixbuf);
-#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
-#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->histogram_transformer);
-#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
-#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
-#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
-#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
-#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
-#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
-#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
-#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
-#line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->finalize (obj);
-#line 19580 "EditingTools.c"
+#line 19672 "EditingTools.c"
 }
 
 
diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala
index b2ba172..e0cf727 100644
--- a/src/editing_tools/EditingTools.vala
+++ b/src/editing_tools/EditingTools.vala
@@ -32,9 +32,6 @@ public abstract class EditingToolWindow : Gtk.Window {
     private bool user_moved = false;
 
     public EditingToolWindow(Gtk.Window container) {
-        // needed so that windows will appear properly in fullscreen mode
-        type_hint = Gdk.WindowTypeHint.UTILITY;
-
         set_decorated(false);
         set_transient_for(container);
 
@@ -52,7 +49,6 @@ public abstract class EditingToolWindow : Gtk.Window {
         focus_on_map = true;
         set_accept_focus(true);
         set_can_focus(true);
-        set_has_resize_grip(false);
 
         // Needed to prevent the (spurious) 'This event was synthesised outside of GDK'
         // warnings after a keypress.
@@ -90,7 +86,7 @@ public abstract class EditingToolWindow : Gtk.Window {
     }
 
     public override void realize() {
-        set_opacity(Resources.TRANSIENT_WINDOW_OPACITY);
+        (this as Gtk.Widget).set_opacity(Resources.TRANSIENT_WINDOW_OPACITY);
         
         base.realize();
     }
@@ -675,8 +671,8 @@ public class CropTool : EditingTool {
             constraint_combo.set_row_separator_func(constraint_combo_separator_func);
             constraint_combo.set_active(0);
 
-            pivot_reticle_button.set_image(new Gtk.Image.from_stock(Resources.CROP_PIVOT_RETICLE,
-                Gtk.IconSize.SMALL_TOOLBAR));
+            var image = new Gtk.Image.from_resource ("/org/gnome/Shotwell/crop-pivot-reticle.png");
+            pivot_reticle_button.set_image (image);
             pivot_reticle_button.set_tooltip_text(_("Pivot the crop rectangle between portrait and landscape orientations"));
 
             custom_width_entry.set_width_chars(4);
@@ -1240,8 +1236,13 @@ public class CropTool : EditingTool {
         }
 
         // make sure the cursor isn't set to a modify indicator
-        if (canvas != null)
-            canvas.get_drawing_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
+        if (canvas != null) {
+            var drawing_window = canvas.get_drawing_window ();
+            var display = drawing_window.get_display ();
+            var cursor = new Gdk.Cursor.for_display (display,
+                                                     Gdk.CursorType.LEFT_PTR);
+            drawing_window.set_cursor (cursor);
+        }
 
         crop_surface = null;
 
@@ -1435,8 +1436,10 @@ public class CropTool : EditingTool {
         }
 
         if (cursor_type != current_cursor_type) {
-            Gdk.Cursor cursor = new Gdk.Cursor(cursor_type);
-            canvas.get_drawing_window().set_cursor(cursor);
+            var drawing_window = canvas.get_drawing_window ();
+            var display = drawing_window.get_display ();
+            var cursor = new Gdk.Cursor.for_display (display, cursor_type);
+            drawing_window.set_cursor (cursor);
             current_cursor_type = cursor_type;
         }
     }
@@ -2058,8 +2061,9 @@ public class RedeyeTool : EditingTool {
 
         bind_window_handlers();
 
-        cached_arrow_cursor = new Gdk.Cursor(Gdk.CursorType.LEFT_PTR);
-        cached_grab_cursor = new Gdk.Cursor(Gdk.CursorType.FLEUR);
+        var display = canvas.get_drawing_window().get_display();
+        cached_arrow_cursor = new Gdk.Cursor.for_display(display, Gdk.CursorType.LEFT_PTR);
+        cached_grab_cursor = new Gdk.Cursor.for_display(display, Gdk.CursorType.FLEUR);
 
         DataCollection? owner = canvas.get_photo().get_membership();
         if (owner != null)
@@ -2205,7 +2209,7 @@ public class AdjustTool : EditingTool {
         public Gtk.Scale exposure_slider = new Gtk.Scale.with_range(Gtk.Orientation.HORIZONTAL,
             ExposureTransformation.MIN_PARAMETER, ExposureTransformation.MAX_PARAMETER,
             1.0);
-        public Gtk.HScale contrast_slider = new Gtk.HScale.with_range(
+        public Gtk.Scale contrast_slider = new Gtk.Scale.with_range(Gtk.Orientation.HORIZONTAL,
             ContrastTransformation.MIN_PARAMETER, ContrastTransformation.MAX_PARAMETER,
             1.0);
         public Gtk.Scale saturation_slider = new Gtk.Scale.with_range(Gtk.Orientation.HORIZONTAL,
@@ -2237,60 +2241,67 @@ public class AdjustTool : EditingTool {
             slider_organizer.set_column_homogeneous(false);
             slider_organizer.set_row_spacing(12);
             slider_organizer.set_column_spacing(12);
-            slider_organizer.set_margin_left(12);
+            slider_organizer.set_margin_start(12);
             slider_organizer.set_margin_bottom(12);
 
             Gtk.Label exposure_label = new Gtk.Label.with_mnemonic(_("Exposure:"));
-            exposure_label.set_alignment(0.0f, 0.5f);
+            exposure_label.halign = Gtk.Align.START;
+            exposure_label.valign = Gtk.Align.CENTER;
             slider_organizer.attach(exposure_label, 0, 0, 1, 1);
             slider_organizer.attach(exposure_slider, 1, 0, 1, 1);
             exposure_slider.set_size_request(SLIDER_WIDTH, -1);
             exposure_slider.set_draw_value(false);
-            exposure_slider.set_margin_right(0);
+            exposure_slider.set_margin_end(0);
 
             Gtk.Label contrast_label = new Gtk.Label.with_mnemonic(_("Contrast:"));
-            contrast_label.set_alignment(0.0f, 0.5f);
+            contrast_label.halign = Gtk.Align.START;
+            contrast_label.valign = Gtk.Align.CENTER;
             slider_organizer.attach(contrast_label, 0, 1, 1, 1);
             slider_organizer.attach(contrast_slider, 1, 1, 1, 1);
             contrast_slider.set_size_request(SLIDER_WIDTH, -1);
             contrast_slider.set_draw_value(false);
-            contrast_slider.set_margin_right(0);
+            contrast_slider.set_margin_end(0);
 
             Gtk.Label saturation_label = new Gtk.Label.with_mnemonic(_("Saturation:"));
-            saturation_label.set_alignment(0.0f, 0.5f);
+            saturation_label.halign = Gtk.Align.START;
+            saturation_label.valign = Gtk.Align.CENTER;
             slider_organizer.attach(saturation_label, 0, 2, 1, 1);
             slider_organizer.attach(saturation_slider, 1, 2, 1, 1);
             saturation_slider.set_size_request(SLIDER_WIDTH, -1);
             saturation_slider.set_draw_value(false);
-            saturation_slider.set_margin_right(0);
+            saturation_slider.set_margin_end(0);
 
             Gtk.Label tint_label = new Gtk.Label.with_mnemonic(_("Tint:"));
-            tint_label.set_alignment(0.0f, 0.5f);
+            tint_label.halign = Gtk.Align.START;
+            tint_label.valign = Gtk.Align.CENTER;
             slider_organizer.attach(tint_label, 0, 3, 1, 1);
             slider_organizer.attach(tint_slider, 1, 3, 1, 1);
             tint_slider.set_size_request(SLIDER_WIDTH, -1);
             tint_slider.set_draw_value(false);
-            tint_slider.set_margin_right(0);
+            tint_slider.set_margin_end(0);
 
             Gtk.Label temperature_label =
                 new Gtk.Label.with_mnemonic(_("Temperature:"));
-            temperature_label.set_alignment(0.0f, 0.5f);
+            temperature_label.halign = Gtk.Align.START;
+            temperature_label.valign = Gtk.Align.CENTER;
             slider_organizer.attach(temperature_label, 0, 4, 1, 1);
             slider_organizer.attach(temperature_slider, 1, 4, 1, 1);
             temperature_slider.set_size_request(SLIDER_WIDTH, -1);
             temperature_slider.set_draw_value(false);
-            temperature_slider.set_margin_right(0);
+            temperature_slider.set_margin_end(0);
 
             Gtk.Label shadows_label = new Gtk.Label.with_mnemonic(_("Shadows:"));
-            shadows_label.set_alignment(0.0f, 0.5f);
+            shadows_label.halign = Gtk.Align.START;
+            shadows_label.valign = Gtk.Align.CENTER;
             slider_organizer.attach(shadows_label, 0, 5, 1, 1);
             slider_organizer.attach(shadows_slider, 1, 5, 1, 1);
             shadows_slider.set_size_request(SLIDER_WIDTH, -1);
             shadows_slider.set_draw_value(false);
-            shadows_slider.set_margin_right(0);
+            shadows_slider.set_margin_end(0);
 
             Gtk.Label highlights_label = new Gtk.Label.with_mnemonic(_("Highlights:"));
-            highlights_label.set_alignment(0.0f, 0.5f);
+            highlights_label.halign = Gtk.Align.START;
+            highlights_label.valign = Gtk.Align.CENTER;
             slider_organizer.attach(highlights_label, 0, 6, 1, 1);
             slider_organizer.attach(highlights_slider, 1, 6, 1, 1);
             highlights_slider.set_size_request(SLIDER_WIDTH, -1);
@@ -2302,15 +2313,16 @@ public class AdjustTool : EditingTool {
             button_layouter.pack_start(reset_button, true, true, 1);
             button_layouter.pack_start(ok_button, true, true, 1);
 
-            Gtk.Alignment histogram_aligner = new Gtk.Alignment(0.0f, 0.0f, 0.0f, 0.0f);
-            histogram_aligner.add(histogram_manipulator);
-            histogram_aligner.set_padding(12, 8, 12, 12);
+            histogram_manipulator.set_margin_start (12);
+            histogram_manipulator.set_margin_end (12);
+            histogram_manipulator.set_margin_top (12);
+            histogram_manipulator.set_margin_bottom (8);
 
             Gtk.Box pane_layouter = new Gtk.Box(Gtk.Orientation.VERTICAL, 8);
-            pane_layouter.add(histogram_aligner);
+            pane_layouter.add(histogram_manipulator);
             pane_layouter.add(slider_organizer);
             pane_layouter.add(button_layouter);
-            pane_layouter.set_child_packing(histogram_aligner, true, true, 0, Gtk.PackType.START);
+            pane_layouter.set_child_packing(histogram_manipulator, true, true, 0, Gtk.PackType.START);
 
             add(pane_layouter);
         }
diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c
index bf13dcb..d795f0c 100644
--- a/src/editing_tools/StraightenTool.c
+++ b/src/editing_tools/StraightenTool.c
@@ -548,16 +548,16 @@ static const gdouble EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[2] = {(gdouble) 10
 
 static EditingToolsStraightenTool* editing_tools_straighten_tool_construct (GType object_type) {
 	EditingToolsStraightenTool* self = NULL;
-#line 183 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 190 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = (EditingToolsStraightenTool*) editing_tools_editing_tool_construct (object_type, "StraightenTool");
-#line 182 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self;
 #line 556 "StraightenTool.c"
 }
 
 
 static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void) {
-#line 182 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return editing_tools_straighten_tool_construct (EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL);
 #line 563 "StraightenTool.c"
 }
@@ -566,11 +566,11 @@ static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void) {
 EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) {
 	EditingToolsStraightenTool* result = NULL;
 	EditingToolsStraightenTool* _tmp0_ = NULL;
-#line 187 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = editing_tools_straighten_tool_new ();
-#line 187 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	result = _tmp0_;
-#line 187 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
 #line 576 "StraightenTool.c"
 }
@@ -578,13 +578,13 @@ EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) {
 
 gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scaling) {
 	gboolean result = FALSE;
-#line 190 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 197 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 190 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 197 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 191 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 198 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	result = TRUE;
-#line 191 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 198 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
 #line 590 "StraightenTool.c"
 }
@@ -626,71 +626,71 @@ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenT
 	StraightenCommand* _tmp21_ = NULL;
 	StraightenCommand* _tmp22_ = NULL;
 	Dimensions _tmp23_ = {0};
-#line 202 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 203 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 203 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_);
-#line 203 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = _tmp1_;
-#line 203 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_vala_assert (_tmp2_ != NULL, "canvas.get_photo() != null");
-#line 203 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp2_);
-#line 207 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = self->priv->window;
-#line 207 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = _tmp3_->angle_slider;
-#line 207 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange));
-#line 207 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	slider_val = _tmp5_;
-#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = self->priv->rotated_center;
-#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = self->priv->image_dims;
-#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = _tmp7_.width;
-#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = self->priv->image_dims;
-#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = _tmp9_.height;
-#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	rotate_point_arb (&_tmp6_, _tmp8_, _tmp10_, slider_val, FALSE, &_tmp11_);
-#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	new_crop_center = _tmp11_;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = editing_tools_photo_canvas_get_photo (_tmp12_);
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp14_ = _tmp13_;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp15_ = new_crop_center;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp16_ = self->priv->rotate_scale;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp17_ = self->priv->crop_width;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp18_ = self->priv->rotate_scale;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp19_ = self->priv->crop_height;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	box_from_center (&_tmp15_, (gint) (_tmp16_ * _tmp17_), (gint) (_tmp18_ * _tmp19_), &_tmp20_);
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp21_ = straighten_command_new (_tmp14_, slider_val, &_tmp20_, RESOURCES_STRAIGHTEN_LABEL, RESOURCES_STRAIGHTEN_TOOLTIP);
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp22_ = _tmp21_;
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp14_);
-#line 212 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	command = _tmp22_;
-#line 217 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 224 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp23_ = self->priv->image_dims;
-#line 217 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 224 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command), NULL, &_tmp23_, TRUE);
-#line 202 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (command);
 #line 696 "StraightenTool.c"
 }
@@ -698,24 +698,24 @@ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenT
 
 static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-#line 220 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 227 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 221 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 228 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->use_high_qual = TRUE;
-#line 222 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 229 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_update_rotated_surface (self);
-#line 223 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 230 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 223 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 230 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_repaint (_tmp0_);
 #line 712 "StraightenTool.c"
 }
 
 
 static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingToolsStraightenTool* self) {
-#line 226 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 233 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 227 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 234 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_high_qual_repaint (self);
 #line 721 "StraightenTool.c"
 }
@@ -727,17 +727,17 @@ static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditin
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
 	gdouble _tmp3_ = 0.0;
-#line 230 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 237 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->guide;
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = x;
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = y;
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = self->priv->photo_angle;
-#line 231 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_straighten_guide_reset (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
 #line 743 "StraightenTool.c"
 }
@@ -753,47 +753,47 @@ static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEdi
 	gdouble* _tmp4_ = NULL;
 	EditingToolsStraightenToolStraightenGuide* _tmp5_ = NULL;
 	gdouble* _tmp6_ = NULL;
-#line 234 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 235 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->guide;
-#line 235 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = x;
-#line 235 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = y;
-#line 235 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_straighten_guide_update (_tmp0_, _tmp1_, _tmp2_);
-#line 236 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = self->priv->guide;
-#line 236 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = editing_tools_straighten_tool_straighten_guide_get_angle (_tmp3_);
-#line 236 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	a = _tmp4_;
-#line 237 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 244 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = self->priv->guide;
-#line 237 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 244 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_straighten_guide_clear (_tmp5_);
-#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = a;
-#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp6_ != NULL) {
 #line 781 "StraightenTool.c"
 		EditingToolsStraightenToolStraightenToolWindow* _tmp7_ = NULL;
 		GtkScale* _tmp8_ = NULL;
 		gdouble* _tmp9_ = NULL;
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp7_ = self->priv->window;
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp8_ = _tmp7_->angle_slider;
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp9_ = a;
-#line 239 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_range_get_type (), GtkRange), *_tmp9_);
-#line 240 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 247 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_high_qual_repaint (self);
 #line 795 "StraightenTool.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_free0 (a);
 #line 799 "StraightenTool.c"
 }
@@ -805,23 +805,23 @@ static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingToo
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 244 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->guide;
-#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = x;
-#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = y;
-#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = editing_tools_straighten_tool_straighten_guide_update (_tmp0_, _tmp1_, _tmp2_);
-#line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp3_) {
 #line 821 "StraightenTool.c"
 		EditingToolsPhotoCanvas* _tmp4_ = NULL;
-#line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_photo_canvas_repaint (_tmp4_);
 #line 827 "StraightenTool.c"
 	}
@@ -841,124 +841,124 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
 	const gchar* _tmp13_ = NULL;
 	GdkEventKey* _tmp14_ = NULL;
 	gboolean _tmp15_ = FALSE;
-#line 249 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 256 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 249 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 256 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = event;
-#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp1_ = TRUE;
 #line 859 "StraightenTool.c"
 	} else {
 		GdkEventKey* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		const gchar* _tmp7_ = NULL;
-#line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp5_ = event;
-#line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp6_ = _tmp5_->keyval;
-#line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
 #line 872 "StraightenTool.c"
 	}
-#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp1_) {
-#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp0_ = TRUE;
 #line 878 "StraightenTool.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
 		const gchar* _tmp10_ = NULL;
-#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp8_ = event;
-#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp9_ = _tmp8_->keyval;
-#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
 #line 891 "StraightenTool.c"
 	}
-#line 250 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp0_) {
-#line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 260 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_on_ok_clicked (self);
-#line 254 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 261 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		result = TRUE;
-#line 254 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 261 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
 #line 901 "StraightenTool.c"
 	}
-#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp11_ = event;
-#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = _tmp11_->keyval;
-#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = gdk_keyval_name (_tmp12_);
-#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (g_strcmp0 (_tmp13_, "Escape") == 0) {
-#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 265 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_editing_tool_notify_cancel (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		result = TRUE;
-#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
 #line 917 "StraightenTool.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp14_ = event;
-#line 262 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp15_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp14_);
-#line 262 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	result = _tmp15_;
-#line 262 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
 #line 927 "StraightenTool.c"
 }
 
 
 static gboolean _dimensions_equal (const Dimensions* s1, const Dimensions* s2) {
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s1 == s2) {
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return TRUE;
 #line 936 "StraightenTool.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s1 == NULL) {
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return FALSE;
 #line 942 "StraightenTool.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s2 == NULL) {
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return FALSE;
 #line 948 "StraightenTool.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s1->width != s2->width) {
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return FALSE;
 #line 954 "StraightenTool.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s1->height != s2->height) {
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return FALSE;
 #line 960 "StraightenTool.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return TRUE;
 #line 964 "StraightenTool.c"
 }
@@ -1010,33 +1010,33 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 	cairo_surface_t* _tmp53_ = NULL;
 	cairo_t* _tmp54_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 265 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 273 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 273 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_get_surface_dim (_tmp0_, &_tmp1_);
-#line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 273 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	canvas_dims = _tmp1_;
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	dimensions_with_max (&canvas_dims, EDITING_TOOLS_STRAIGHTEN_TOOL_TEMP_PIXBUF_SIZE, EDITING_TOOLS_STRAIGHTEN_TOOL_TEMP_PIXBUF_SIZE, &_tmp2_);
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	viewport = _tmp2_;
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = viewport;
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = self->priv->last_viewport;
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_dimensions_equal (&_tmp3_, &_tmp4_) == TRUE) {
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return;
 #line 1034 "StraightenTool.c"
 	}
-#line 271 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 278 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = viewport;
-#line 271 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 278 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->last_viewport = _tmp5_;
-#line 273 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	low_res_tmp = NULL;
 #line 1042 "StraightenTool.c"
 	{
@@ -1049,38 +1049,38 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 		GdkPixbuf* _tmp12_ = NULL;
 		GdkPixbuf* _tmp13_ = NULL;
 		GdkPixbuf* _tmp14_ = NULL;
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp9_ = _tmp8_;
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp10_ = viewport;
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		scaling_for_viewport (&_tmp10_, FALSE, &_tmp11_);
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp12_ = photo_get_pixbuf_with_options (_tmp9_, &_tmp11_, PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp13_ = _tmp12_;
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (_tmp9_);
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp6_ = _tmp13_;
-#line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1073 "StraightenTool.c"
 			goto __catch21_g_error;
 		}
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp14_ = _tmp6_;
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp6_ = NULL;
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (low_res_tmp);
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		low_res_tmp = _tmp14_;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (_tmp6_);
 #line 1086 "StraightenTool.c"
 	}
@@ -1094,148 +1094,148 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
 		GdkPixbuf* _tmp20_ = NULL;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		e = _inner_error_;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_inner_error_ = NULL;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp16_ = editing_tools_photo_canvas_get_photo (_tmp15_);
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp17_ = _tmp16_;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_OBJECT, DataObject));
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp19_ = _tmp18_;
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		g_warning ("StraightenTool.vala:279: A pixbuf for %s couldn't be fetched.", _tmp19_);
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+		g_warning ("StraightenTool.vala:286: A pixbuf for %s couldn't be fetched.", _tmp19_);
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_free0 (_tmp19_);
-#line 279 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (_tmp17_);
-#line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp20_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 1, 1);
-#line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (low_res_tmp);
-#line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 287 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		low_res_tmp = _tmp20_;
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_error_free0 (e);
 #line 1126 "StraightenTool.c"
 	}
 	__finally21:
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (low_res_tmp);
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		g_clear_error (&_inner_error_);
-#line 274 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return;
 #line 1139 "StraightenTool.c"
 	}
-#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp21_ = low_res_tmp;
-#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp22_ = gdk_pixbuf_get_width (_tmp21_);
-#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp23_ = _tmp22_;
-#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp24_ = self->priv->image_dims;
-#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp25_ = _tmp24_.width;
-#line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->preview_scale = _tmp23_ / ((gdouble) _tmp25_);
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp26_ = low_res_tmp;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp27_ = gdk_pixbuf_get_width (_tmp26_);
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp28_ = _tmp27_;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp29_ = low_res_tmp;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp30_ = gdk_pixbuf_get_height (_tmp29_);
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp31_ = _tmp30_;
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp32_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp28_, _tmp31_);
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_surface_destroy0 (self->priv->photo_surf);
-#line 286 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 293 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->photo_surf = _tmp32_;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp33_ = self->priv->photo_surf;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp34_ = cairo_create (_tmp33_);
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 294 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	ctx = _tmp34_;
-#line 288 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp35_ = ctx;
-#line 288 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp36_ = low_res_tmp;
-#line 288 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gdk_cairo_set_source_pixbuf (_tmp35_, _tmp36_, (gdouble) 0, (gdouble) 0);
-#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp37_ = ctx;
-#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp38_ = low_res_tmp;
-#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp39_ = gdk_pixbuf_get_width (_tmp38_);
-#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp40_ = _tmp39_;
-#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp41_ = low_res_tmp;
-#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp42_ = gdk_pixbuf_get_height (_tmp41_);
-#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp43_ = _tmp42_;
-#line 289 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_rectangle (_tmp37_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp40_, (gdouble) _tmp43_);
-#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp44_ = ctx;
-#line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_fill (_tmp44_);
-#line 291 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp45_ = ctx;
-#line 291 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_paint (_tmp45_);
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp46_ = self->priv->crop_width;
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp47_ = self->priv->preview_scale;
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->view_width = (gint) (_tmp46_ * _tmp47_);
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp48_ = self->priv->crop_height;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp49_ = self->priv->preview_scale;
-#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->view_height = (gint) (_tmp48_ * _tmp49_);
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp50_ = self->priv->view_width;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp51_ = self->priv->view_height;
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp52_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp50_, _tmp51_);
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_surface_destroy0 (self->priv->rotate_surf);
-#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->rotate_surf = _tmp52_;
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp53_ = self->priv->rotate_surf;
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp54_ = cairo_create (_tmp53_);
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (self->priv->rotate_ctx);
-#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->rotate_ctx = _tmp54_;
-#line 265 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (ctx);
-#line 265 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (low_res_tmp);
 #line 1241 "StraightenTool.c"
 }
@@ -1271,73 +1271,73 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai
 	Dimensions _tmp22_ = {0};
 	gint _tmp23_ = 0;
 	gint _tmp24_ = 0;
-#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 309 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->crop_width;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = self->priv->crop_height;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = self->priv->photo_angle;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	compute_arb_rotated_size ((gdouble) _tmp0_, (gdouble) _tmp1_, _tmp2_, &_tmp3_, &_tmp4_);
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	width = _tmp3_;
-#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	height = _tmp4_;
-#line 307 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = self->priv->image_dims;
-#line 307 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = _tmp5_.width;
-#line 307 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = self->priv->image_dims;
-#line 307 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = _tmp7_.height;
-#line 307 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = MIN (_tmp6_ / width, _tmp8_ / height);
-#line 307 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->rotate_scale = _tmp9_;
-#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = self->priv->rotate_scale;
-#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp11_ = MIN (_tmp10_, 1.0);
-#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->rotate_scale = _tmp11_;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = self->priv->crop_center;
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->rotated_center = _tmp12_;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = self->priv->rotate_scale;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	radius_x = (gint) ((_tmp13_ * width) / 2);
-#line 313 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 320 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp14_ = self->priv->rotate_scale;
-#line 313 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 320 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	radius_y = (gint) ((_tmp14_ * height) / 2);
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp15_ = self->priv->rotated_center;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp16_ = _tmp15_.x;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp17_ = self->priv->image_dims;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp18_ = _tmp17_.width;
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp19_ = CLAMP (_tmp16_, radius_x, _tmp18_ - radius_x);
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->rotated_center.x = _tmp19_;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp20_ = self->priv->rotated_center;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp21_ = _tmp20_.y;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp22_ = self->priv->image_dims;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp23_ = _tmp22_.height;
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp24_ = CLAMP (_tmp21_, radius_y, _tmp23_ - radius_y);
-#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->rotated_center.y = _tmp24_;
 #line 1343 "StraightenTool.c"
 }
@@ -1351,12 +1351,19 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai
      * @param canvas The PhotoCanvas the tool's output should be painted to.
      */
 static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) {
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self ? editing_tools_photo_canvas_ref (self) : NULL;
 #line 1357 "StraightenTool.c"
 }
 
 
+static gpointer _g_object_ref0 (gpointer self) {
+#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 1364 "StraightenTool.c"
+}
+
+
 static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsStraightenTool * self;
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
@@ -1388,10 +1395,13 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool
 	GdkPoint _tmp28_ = {0};
 	gint _tmp29_ = 0;
 	gint _tmp30_ = 0;
+	GdkWindow* drawing_window = NULL;
 	EditingToolsPhotoCanvas* _tmp31_ = NULL;
 	GdkWindow* _tmp32_ = NULL;
-	GdkWindow* _tmp33_ = NULL;
-	GdkCursor* _tmp34_ = NULL;
+	GdkDisplay* display = NULL;
+	GdkDisplay* _tmp33_ = NULL;
+	GdkDisplay* _tmp34_ = NULL;
+	GdkCursor* cursor = NULL;
 	GdkCursor* _tmp35_ = NULL;
 	EditingToolsPhotoCanvas* _tmp36_ = NULL;
 	GtkWindow* _tmp37_ = NULL;
@@ -1407,186 +1417,194 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool
 	EditingToolsStraightenToolStraightenToolWindow* _tmp46_ = NULL;
 	GtkLabel* _tmp47_ = NULL;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp48_ = NULL;
-#line 325 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 325 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 326 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 333 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = canvas;
-#line 326 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 333 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp0_);
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = canvas;
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = _editing_tools_photo_canvas_ref0 (_tmp1_);
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_editing_tools_photo_canvas_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas);
-#line 327 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas = _tmp2_;
-#line 328 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 328 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 335 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_bind_canvas_handlers (self, _tmp3_);
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = canvas;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_);
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = _tmp5_;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp7_);
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->image_dims = _tmp7_;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp6_);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = canvas;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = editing_tools_photo_canvas_get_photo (_tmp8_);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = _tmp9_;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = photo_get_crop (_tmp10_, &_tmp11_, PHOTO_EXCEPTION_NONE);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	crop_region = _tmp11_;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = !_tmp12_;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp10_);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp13_) {
-#line 1459 "StraightenTool.c"
+#line 1469 "StraightenTool.c"
 		Dimensions _tmp14_ = {0};
 		gint _tmp15_ = 0;
 		Dimensions _tmp16_ = {0};
 		gint _tmp17_ = 0;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		crop_region.left = 0;
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp14_ = self->priv->image_dims;
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp15_ = _tmp14_.width;
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		crop_region.right = _tmp15_;
-#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		crop_region.top = 0;
-#line 339 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp16_ = self->priv->image_dims;
-#line 339 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp17_ = _tmp16_.height;
-#line 339 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		crop_region.bottom = _tmp17_;
-#line 1480 "StraightenTool.c"
+#line 1490 "StraightenTool.c"
 	}
-#line 344 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 351 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	incoming_angle = 0.0;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp18_ = canvas;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp20_ = _tmp19_;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	photo_get_straighten (_tmp20_, &_tmp21_);
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	incoming_angle = _tmp21_;
-#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp20_);
-#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	box_get_center (&crop_region, &_tmp22_);
-#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp23_ = self->priv->image_dims;
-#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp24_ = _tmp23_.width;
-#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp25_ = self->priv->image_dims;
-#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp26_ = _tmp25_.height;
-#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp27_ = incoming_angle;
-#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	derotate_point_arb (&_tmp22_, _tmp24_, _tmp26_, _tmp27_, &_tmp28_);
-#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->crop_center = _tmp28_;
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp29_ = box_get_width (&crop_region);
-#line 350 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->crop_width = _tmp29_;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp30_ = box_get_height (&crop_region);
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->crop_height = _tmp30_;
-#line 353 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_adjust_for_rotation (self);
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_prepare_image (self);
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp31_ = canvas;
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp32_ = editing_tools_photo_canvas_get_drawing_window (_tmp31_);
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp33_ = _tmp32_;
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp34_ = gdk_cursor_new (GDK_CROSSHAIR);
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp35_ = _tmp34_;
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gdk_window_set_cursor (_tmp33_, _tmp35_);
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_g_object_unref0 (_tmp35_);
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_g_object_unref0 (_tmp33_);
-#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	drawing_window = _tmp32_;
+#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp33_ = gdk_window_get_display (drawing_window);
+#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp34_ = _g_object_ref0 (_tmp33_);
+#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	display = _tmp34_;
+#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp35_ = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
+#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	cursor = _tmp35_;
+#line 369 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	gdk_window_set_cursor (drawing_window, cursor);
+#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp36_ = canvas;
-#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp37_ = editing_tools_photo_canvas_get_container (_tmp36_);
-#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp38_ = _tmp37_;
-#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp39_ = editing_tools_straighten_tool_straighten_tool_window_new (_tmp38_);
-#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_object_ref_sink (_tmp39_);
-#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (self->priv->window);
-#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->window = _tmp39_;
-#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp38_);
-#line 361 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_bind_window_handlers (self);
-#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp40_ = self->priv->window;
-#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp41_ = _tmp40_->angle_slider;
-#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp42_ = incoming_angle;
-#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_range_get_type (), GtkRange), _tmp42_);
-#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp43_ = incoming_angle;
-#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->photo_angle = _tmp43_;
-#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp44_ = incoming_angle;
-#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp45_ = g_strdup_printf ("%2.1f°", _tmp44_);
-#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	tmp = _tmp45_;
-#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp46_ = self->priv->window;
-#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp47_ = _tmp46_->angle_label;
-#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_label_set_text (_tmp47_, tmp);
-#line 370 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 381 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_high_qual_repaint (self);
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp48_ = self->priv->window;
-#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
-#line 325 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_free0 (tmp);
-#line 1590 "StraightenTool.c"
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_g_object_unref0 (cursor);
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_g_object_unref0 (display);
+#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_g_object_unref0 (drawing_window);
+#line 1608 "StraightenTool.c"
 }
 
 
@@ -1597,122 +1615,122 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo
 	EditingToolsStraightenTool * self;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL;
 	EditingToolsPhotoCanvas* _tmp2_ = NULL;
-#line 377 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->window;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp0_ != NULL) {
-#line 1607 "StraightenTool.c"
+#line 1625 "StraightenTool.c"
 		EditingToolsStraightenToolStraightenToolWindow* _tmp1_ = NULL;
-#line 380 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_unbind_window_handlers (self);
-#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 393 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp1_ = self->priv->window;
-#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 393 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 383 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (self->priv->window);
-#line 383 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		self->priv->window = NULL;
-#line 1619 "StraightenTool.c"
+#line 1637 "StraightenTool.c"
 	}
-#line 386 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 386 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 397 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp2_ != NULL) {
-#line 1625 "StraightenTool.c"
+#line 1643 "StraightenTool.c"
 		EditingToolsPhotoCanvas* _tmp3_ = NULL;
 		EditingToolsPhotoCanvas* _tmp4_ = NULL;
 		GdkWindow* _tmp5_ = NULL;
 		GdkWindow* _tmp6_ = NULL;
-#line 387 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 387 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_unbind_canvas_handlers (self, _tmp3_);
-#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp5_ = editing_tools_photo_canvas_get_drawing_window (_tmp4_);
-#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp6_ = _tmp5_;
-#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		gdk_window_set_cursor (_tmp6_, NULL);
-#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1644 "StraightenTool.c"
+#line 1662 "StraightenTool.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1648 "StraightenTool.c"
+#line 1666 "StraightenTool.c"
 }
 
 
 static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_on_resized_pixbuf ((EditingToolsStraightenTool*) self, old_dim, scaled, scaled_position);
-#line 1655 "StraightenTool.c"
+#line 1673 "StraightenTool.c"
 }
 
 
 static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = canvas;
-#line 395 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 1669 "StraightenTool.c"
+#line 1687 "StraightenTool.c"
 }
 
 
 static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = canvas;
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 1686 "StraightenTool.c"
+#line 1704 "StraightenTool.c"
 }
 
 
 static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event);
-#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 1695 "StraightenTool.c"
+#line 1713 "StraightenTool.c"
 }
 
 
 static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 404 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_on_ok_clicked ((EditingToolsStraightenTool*) self);
-#line 1702 "StraightenTool.c"
+#line 1720 "StraightenTool.c"
 }
 
 
 static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self);
-#line 1709 "StraightenTool.c"
+#line 1727 "StraightenTool.c"
 }
 
 
 static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_on_angle_changed ((EditingToolsStraightenTool*) self);
-#line 1716 "StraightenTool.c"
+#line 1734 "StraightenTool.c"
 }
 
 
@@ -1724,31 +1742,31 @@ static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStra
 	GtkButton* _tmp4_ = NULL;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp5_ = NULL;
 	GtkScale* _tmp6_ = NULL;
-#line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->window;
-#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 404 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = self->priv->window;
-#line 404 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = _tmp1_->ok_button;
-#line 404 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_connect (_tmp2_, "clicked", (GCallback) _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked, self);
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = self->priv->window;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = _tmp3_->cancel_button;
-#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_connect (_tmp4_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = self->priv->window;
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = _tmp5_->angle_slider;
-#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed, self);
-#line 1752 "StraightenTool.c"
+#line 1770 "StraightenTool.c"
 }
 
 
@@ -1764,46 +1782,46 @@ static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsSt
 	EditingToolsStraightenToolStraightenToolWindow* _tmp8_ = NULL;
 	GtkScale* _tmp9_ = NULL;
 	guint _tmp10_ = 0U;
-#line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->window;
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp1_, NULL, FALSE);
-#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = self->priv->window;
-#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = _tmp2_->ok_button;
-#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked, self);
-#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = self->priv->window;
-#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = _tmp5_->cancel_button;
-#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp7_, NULL, FALSE);
-#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = self->priv->window;
-#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = _tmp8_->angle_slider;
-#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp10_, NULL, FALSE);
-#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed, self);
-#line 1800 "StraightenTool.c"
+#line 1818 "StraightenTool.c"
 }
 
 
 static void _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self) {
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_on_slider_stopped_delayed ((EditingToolsStraightenTool*) self);
-#line 1807 "StraightenTool.c"
+#line 1825 "StraightenTool.c"
 }
 
 
@@ -1822,65 +1840,65 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight
 	OneShotScheduler* _tmp10_ = NULL;
 	OneShotScheduler* _tmp12_ = NULL;
 	EditingToolsPhotoCanvas* _tmp13_ = NULL;
-#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->window;
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = _tmp0_->angle_slider;
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->photo_angle = _tmp2_;
-#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = self->priv->window;
-#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = _tmp3_->angle_slider;
-#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange));
-#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = g_strdup_printf ("%2.1f°", _tmp5_);
-#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	tmp = _tmp6_;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = self->priv->window;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = _tmp7_->angle_label;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = tmp;
-#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_label_set_text (_tmp8_, _tmp9_);
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 432 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = self->priv->slider_sched;
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 432 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp10_ == NULL) {
-#line 1858 "StraightenTool.c"
+#line 1876 "StraightenTool.c"
 		OneShotScheduler* _tmp11_ = NULL;
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp11_ = one_shot_scheduler_new ("straighten", _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback, self);
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_one_shot_scheduler_unref0 (self->priv->slider_sched);
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		self->priv->slider_sched = _tmp11_;
-#line 1866 "StraightenTool.c"
+#line 1884 "StraightenTool.c"
 	}
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 434 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = self->priv->slider_sched;
-#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 434 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	one_shot_scheduler_after_timeout (_tmp12_, (guint) EDITING_TOOLS_STRAIGHTEN_TOOL_REPAINT_ON_STOP_DELAY_MSEC, TRUE);
-#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 436 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->use_high_qual = FALSE;
-#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 438 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_adjust_for_rotation (self);
-#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 439 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_update_rotated_surface (self);
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 440 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 440 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_repaint (_tmp13_);
-#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_free0 (tmp);
-#line 1884 "StraightenTool.c"
+#line 1902 "StraightenTool.c"
 }
 
 
@@ -1888,17 +1906,17 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight
      * @brief Called by the EditingHostPage when a resize event occurs.
      */
 static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) {
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (scaled));
-#line 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (scaled_position != NULL);
-#line 436 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 447 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_prepare_image (self);
-#line 1902 "StraightenTool.c"
+#line 1920 "StraightenTool.c"
 }
 
 
@@ -1906,29 +1924,22 @@ static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraigh
      * Returns a reference to the current StraightenTool instance's tool window;
      * the PhotoPage uses this to control the tool window's positioning, etc.
      */
-static gpointer _g_object_ref0 (gpointer self) {
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 1913 "StraightenTool.c"
-}
-
-
 static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base) {
 	EditingToolsStraightenTool * self;
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL;
 	EditingToolsEditingToolWindow* _tmp1_ = NULL;
-#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 454 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->window;
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	result = _tmp1_;
-#line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 1932 "StraightenTool.c"
+#line 1943 "StraightenTool.c"
 }
 
 
@@ -1945,33 +1956,33 @@ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsSt
 	cairo_t* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 450 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->photo_surf;
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = self->priv->rotate_ctx;
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = self->priv->view_width;
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = self->priv->view_height;
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = self->priv->photo_angle;
-#line 451 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_draw_rotated_source (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = self->priv->rotate_ctx;
-#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_line_width (_tmp5_, 1.0);
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = self->priv->rotate_ctx;
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = self->priv->view_width;
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = self->priv->view_height;
-#line 453 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_draw_superimposed_grid (self, _tmp6_, _tmp7_, _tmp8_);
-#line 1975 "StraightenTool.c"
+#line 1986 "StraightenTool.c"
 }
 
 
@@ -2035,161 +2046,161 @@ static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* b
 	EditingToolsPhotoCanvas* _tmp46_ = NULL;
 	cairo_t* _tmp47_ = NULL;
 	cairo_t* _tmp48_ = NULL;
-#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (ctx != NULL);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_drawing_window (_tmp0_);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = _tmp1_;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = gdk_window_get_width (_tmp2_);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = _tmp3_;
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp2_);
-#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	w = _tmp4_;
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_);
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = _tmp6_;
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = gdk_window_get_height (_tmp7_);
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = _tmp8_;
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp7_);
-#line 465 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	h = _tmp9_;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp11_ = editing_tools_photo_canvas_get_default_ctx (_tmp10_);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = _tmp11_;
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_identity_matrix (_tmp12_);
-#line 468 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp12_);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp14_ = editing_tools_photo_canvas_get_default_ctx (_tmp13_);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp15_ = _tmp14_;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_source_rgba (_tmp15_, 0.0, 0.0, 0.0, 1.0);
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp15_);
-#line 470 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 470 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp17_ = editing_tools_photo_canvas_get_default_ctx (_tmp16_);
-#line 470 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp18_ = _tmp17_;
-#line 470 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_rectangle (_tmp18_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h);
-#line 470 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp18_);
-#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp20_ = editing_tools_photo_canvas_get_default_ctx (_tmp19_);
-#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp21_ = _tmp20_;
-#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_fill (_tmp21_);
-#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp21_);
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp23_ = editing_tools_photo_canvas_get_default_ctx (_tmp22_);
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp24_ = _tmp23_;
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp25_ = self->priv->view_width;
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp26_ = self->priv->view_height;
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_translate (_tmp24_, (w - _tmp25_) / 2.0, (h - _tmp26_) / 2.0);
-#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp24_);
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp28_ = editing_tools_photo_canvas_get_default_ctx (_tmp27_);
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp29_ = _tmp28_;
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp30_ = self->priv->rotate_surf;
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_source_surface (_tmp29_, _tmp30_, (gdouble) 0, (gdouble) 0);
-#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp29_);
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp32_ = editing_tools_photo_canvas_get_default_ctx (_tmp31_);
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp33_ = _tmp32_;
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp34_ = self->priv->view_width;
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp35_ = self->priv->view_height;
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_rectangle (_tmp33_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp34_, (gdouble) _tmp35_);
-#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp33_);
-#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp37_ = editing_tools_photo_canvas_get_default_ctx (_tmp36_);
-#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp38_ = _tmp37_;
-#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_fill (_tmp38_);
-#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp38_);
-#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp40_ = editing_tools_photo_canvas_get_default_ctx (_tmp39_);
-#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp41_ = _tmp40_;
-#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_paint (_tmp41_);
-#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp41_);
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp43_ = editing_tools_photo_canvas_get_default_ctx (_tmp42_);
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp44_ = _tmp43_;
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_identity_matrix (_tmp44_);
-#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp44_);
-#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp45_ = self->priv->guide;
-#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp47_ = editing_tools_photo_canvas_get_default_ctx (_tmp46_);
-#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp48_ = _tmp47_;
-#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_straighten_guide_draw (_tmp45_, _tmp48_);
-#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (_tmp48_);
-#line 2193 "StraightenTool.c"
+#line 2204 "StraightenTool.c"
 }
 
 
@@ -2240,121 +2251,121 @@ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStrai
 	gint _tmp32_ = 0;
 	cairo_t* _tmp33_ = NULL;
 	cairo_t* _tmp34_ = NULL;
-#line 497 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 497 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (src_surf != NULL);
-#line 497 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (dest_ctx != NULL);
-#line 499 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = angle;
-#line 499 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = degrees_to_radians (_tmp0_);
-#line 499 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	angle_internal = _tmp1_;
-#line 503 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = dest_ctx;
-#line 503 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_identity_matrix (_tmp2_);
-#line 504 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = dest_ctx;
-#line 504 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_source_rgba (_tmp3_, 0.0, 0.0, 0.0, 1.0);
-#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = dest_ctx;
-#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = self->priv->view_width;
-#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = self->priv->view_height;
-#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_);
-#line 506 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 517 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = dest_ctx;
-#line 506 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 517 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_fill (_tmp7_);
-#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = dest_ctx;
-#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_identity_matrix (_tmp8_);
-#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = dest_ctx;
-#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = self->priv->view_width;
-#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp11_ = self->priv->view_height;
-#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_translate (_tmp9_, (gdouble) (_tmp10_ / 2), (gdouble) (_tmp11_ / 2));
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = dest_ctx;
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = self->priv->rotate_scale;
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp14_ = self->priv->rotate_scale;
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_scale (_tmp12_, 1.0 / _tmp13_, 1.0 / _tmp14_);
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp15_ = dest_ctx;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp16_ = angle_internal;
-#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_rotate (_tmp15_, _tmp16_);
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp17_ = dest_ctx;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp18_ = self->priv->rotated_center;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp19_ = _tmp18_.x;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp20_ = self->priv->preview_scale;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp21_ = self->priv->rotated_center;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp22_ = _tmp21_.y;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp23_ = self->priv->preview_scale;
-#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_translate (_tmp17_, (-_tmp19_) * _tmp20_, (-_tmp22_) * _tmp23_);
-#line 518 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp24_ = dest_ctx;
-#line 518 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp25_ = src_surf;
-#line 518 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_source_surface (_tmp24_, _tmp25_, (gdouble) 0, (gdouble) 0);
-#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp27_ = self->priv->use_high_qual;
-#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp27_) {
-#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp26_ = CAIRO_FILTER_BEST;
-#line 2330 "StraightenTool.c"
+#line 2341 "StraightenTool.c"
 	} else {
-#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp26_ = CAIRO_FILTER_NEAREST;
-#line 2334 "StraightenTool.c"
+#line 2345 "StraightenTool.c"
 	}
-#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp28_ = dest_ctx;
-#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp29_ = cairo_get_source (_tmp28_);
-#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_pattern_set_filter (_tmp29_, _tmp26_);
-#line 520 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp30_ = dest_ctx;
-#line 520 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp31_ = src_width;
-#line 520 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp32_ = src_height;
-#line 520 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_rectangle (_tmp30_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp31_, (gdouble) _tmp32_);
-#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp33_ = dest_ctx;
-#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_fill (_tmp33_);
-#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp34_ = dest_ctx;
-#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_paint (_tmp34_);
-#line 2358 "StraightenTool.c"
+#line 2369 "StraightenTool.c"
 }
 
 
@@ -2409,123 +2420,123 @@ static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsSt
 	EditingToolsPhotoCanvas* _tmp36_ = NULL;
 	cairo_t* _tmp37_ = NULL;
 	gint _tmp38_ = 0;
-#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
-#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (dest_ctx != NULL);
-#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = width;
-#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	half_width = _tmp0_ / 2;
-#line 534 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = width;
-#line 534 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	quarter_width = _tmp1_ / 4;
-#line 536 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = height;
-#line 536 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	half_height = _tmp2_ / 2;
-#line 537 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = height;
-#line 537 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	quarter_height = _tmp3_ / 4;
-#line 539 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = dest_ctx;
-#line 539 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_identity_matrix (_tmp4_);
-#line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = dest_ctx;
-#line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_source_rgba (_tmp5_, 1.0, 1.0, 1.0, 1.0);
-#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp7_ = dest_ctx;
-#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = width;
-#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_horizontal_line (_tmp6_, _tmp7_, 0, 0, _tmp8_, FALSE);
-#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp10_ = dest_ctx;
-#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp11_ = width;
-#line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_horizontal_line (_tmp9_, _tmp10_, 0, half_height, _tmp11_, FALSE);
-#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp13_ = dest_ctx;
-#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp14_ = self->priv->view_height;
-#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp15_ = width;
-#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_horizontal_line (_tmp12_, _tmp13_, 0, _tmp14_ - 1, _tmp15_, FALSE);
-#line 546 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 546 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp17_ = dest_ctx;
-#line 546 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp18_ = height;
-#line 546 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_vertical_line (_tmp16_, _tmp17_, 0, 0, _tmp18_ + 1, FALSE);
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp20_ = dest_ctx;
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp21_ = height;
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_vertical_line (_tmp19_, _tmp20_, half_width, 0, _tmp21_ + 1, FALSE);
-#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp23_ = dest_ctx;
-#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp24_ = width;
-#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp25_ = height;
-#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_vertical_line (_tmp22_, _tmp23_, _tmp24_ - 1, 0, _tmp25_ + 1, FALSE);
-#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp26_ = dest_ctx;
-#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	cairo_set_source_rgba (_tmp26_, 1.0, 1.0, 1.0, 0.33);
-#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp28_ = dest_ctx;
-#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp29_ = width;
-#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_horizontal_line (_tmp27_, _tmp28_, 0, quarter_height, _tmp29_, FALSE);
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp31_ = dest_ctx;
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp32_ = width;
-#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_horizontal_line (_tmp30_, _tmp31_, 0, half_height + quarter_height, _tmp32_, FALSE);
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp34_ = dest_ctx;
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp35_ = height;
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_vertical_line (_tmp33_, _tmp34_, quarter_width, 0, _tmp35_, FALSE);
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp37_ = dest_ctx;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp38_ = height;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_draw_vertical_line (_tmp36_, _tmp37_, half_width + quarter_width, 0, _tmp38_, FALSE);
-#line 2529 "StraightenTool.c"
+#line 2540 "StraightenTool.c"
 }
 
 
@@ -2565,7 +2576,7 @@ static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsSt
 	_tmp6_ = angle;
 #line 35 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->angle0 = _tmp6_;
-#line 2569 "StraightenTool.c"
+#line 2580 "StraightenTool.c"
 }
 
 
@@ -2578,7 +2589,7 @@ static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingTo
 	_tmp0_ = self->priv->is_active;
 #line 39 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp0_) {
-#line 2582 "StraightenTool.c"
+#line 2593 "StraightenTool.c"
 		gint _tmp1_ = 0;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
@@ -2599,13 +2610,13 @@ static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingTo
 		result = TRUE;
 #line 42 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 2603 "StraightenTool.c"
+#line 2614 "StraightenTool.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	result = FALSE;
 #line 45 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 2609 "StraightenTool.c"
+#line 2620 "StraightenTool.c"
 }
 
 
@@ -2614,7 +2625,7 @@ static void editing_tools_straighten_tool_straighten_guide_clear (EditingToolsSt
 	g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self));
 #line 49 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->is_active = FALSE;
-#line 2618 "StraightenTool.c"
+#line 2629 "StraightenTool.c"
 }
 
 
@@ -2626,14 +2637,14 @@ static gdouble* _double_dup (gdouble* self) {
 	memcpy (dup, self, sizeof (gdouble));
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return dup;
-#line 2630 "StraightenTool.c"
+#line 2641 "StraightenTool.c"
 }
 
 
 static gpointer __double_dup0 (gpointer self) {
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self ? _double_dup (self) : NULL;
-#line 2637 "StraightenTool.c"
+#line 2648 "StraightenTool.c"
 }
 
 
@@ -2681,7 +2692,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 		result = NULL;
 #line 58 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 2685 "StraightenTool.c"
+#line 2696 "StraightenTool.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = dy;
@@ -2693,7 +2704,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 	_tmp11_ = fabs (_tmp10_);
 #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp9_ > _tmp11_) {
-#line 2697 "StraightenTool.c"
+#line 2708 "StraightenTool.c"
 		gdouble _tmp12_ = 0.0;
 		gdouble _tmp13_ = 0.0;
 		gdouble _tmp14_ = 0.0;
@@ -2716,7 +2727,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 		result = _tmp17_;
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 2720 "StraightenTool.c"
+#line 2731 "StraightenTool.c"
 	} else {
 		gdouble _tmp18_ = 0.0;
 		gdouble _tmp19_ = 0.0;
@@ -2740,7 +2751,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 		result = _tmp23_;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 2744 "StraightenTool.c"
+#line 2755 "StraightenTool.c"
 	}
 }
 
@@ -2789,7 +2800,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 	if (!_tmp0_) {
 #line 69 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return;
-#line 2793 "StraightenTool.c"
+#line 2804 "StraightenTool.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = editing_tools_straighten_tool_straighten_guide_get_angle (self);
@@ -2797,7 +2808,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 	_tmp1_ = _tmp2_;
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp1_ == NULL) {
-#line 2801 "StraightenTool.c"
+#line 2812 "StraightenTool.c"
 		gdouble _tmp3_ = 0.0;
 		gdouble* _tmp4_ = NULL;
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2808,7 +2819,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 		_g_free0 (_tmp1_);
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp1_ = _tmp4_;
-#line 2812 "StraightenTool.c"
+#line 2823 "StraightenTool.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = _tmp1_;
@@ -2830,7 +2841,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 		_g_free0 (_tmp1_);
 #line 73 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return;
-#line 2834 "StraightenTool.c"
+#line 2845 "StraightenTool.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	alpha = 1.0;
@@ -2840,20 +2851,20 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 	if (_tmp10_ < EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_ANGLE) {
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp9_ = TRUE;
-#line 2844 "StraightenTool.c"
+#line 2855 "StraightenTool.c"
 	} else {
 		gdouble _tmp11_ = 0.0;
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp11_ = angle;
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp9_ = _tmp11_ > EDITING_TOOLS_STRAIGHTEN_TOOL_MAX_ANGLE;
-#line 2851 "StraightenTool.c"
+#line 2862 "StraightenTool.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp9_) {
 #line 77 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		alpha = 0.35;
-#line 2857 "StraightenTool.c"
+#line 2868 "StraightenTool.c"
 	}
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp12_ = ctx;
@@ -2921,7 +2932,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 	cairo_stroke (_tmp33_);
 #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_free0 (_tmp1_);
-#line 2925 "StraightenTool.c"
+#line 2936 "StraightenTool.c"
 }
 
 
@@ -2931,21 +2942,21 @@ static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_
 	self = (EditingToolsStraightenToolStraightenGuide*) g_type_create_instance (object_type);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self;
-#line 2935 "StraightenTool.c"
+#line 2946 "StraightenTool.c"
 }
 
 
 static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_new (void) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return editing_tools_straighten_tool_straighten_guide_construct (EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE);
-#line 2942 "StraightenTool.c"
+#line 2953 "StraightenTool.c"
 }
 
 
 static void editing_tools_straighten_tool_value_straighten_guide_init (GValue* value) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	value->data[0].v_pointer = NULL;
-#line 2949 "StraightenTool.c"
+#line 2960 "StraightenTool.c"
 }
 
 
@@ -2954,7 +2965,7 @@ static void editing_tools_straighten_tool_value_straighten_guide_free_value (GVa
 	if (value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_straighten_guide_unref (value->data[0].v_pointer);
-#line 2958 "StraightenTool.c"
+#line 2969 "StraightenTool.c"
 	}
 }
 
@@ -2964,11 +2975,11 @@ static void editing_tools_straighten_tool_value_straighten_guide_copy_value (con
 	if (src_value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		dest_value->data[0].v_pointer = editing_tools_straighten_tool_straighten_guide_ref (src_value->data[0].v_pointer);
-#line 2968 "StraightenTool.c"
+#line 2979 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2972 "StraightenTool.c"
+#line 2983 "StraightenTool.c"
 	}
 }
 
@@ -2976,37 +2987,37 @@ static void editing_tools_straighten_tool_value_straighten_guide_copy_value (con
 static gpointer editing_tools_straighten_tool_value_straighten_guide_peek_pointer (const GValue* value) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return value->data[0].v_pointer;
-#line 2980 "StraightenTool.c"
+#line 2991 "StraightenTool.c"
 }
 
 
 static gchar* editing_tools_straighten_tool_value_straighten_guide_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (collect_values[0].v_pointer) {
-#line 2987 "StraightenTool.c"
+#line 2998 "StraightenTool.c"
 		EditingToolsStraightenToolStraightenGuide* object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2994 "StraightenTool.c"
+#line 3005 "StraightenTool.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2998 "StraightenTool.c"
+#line 3009 "StraightenTool.c"
 		}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = editing_tools_straighten_tool_straighten_guide_ref (object);
-#line 3002 "StraightenTool.c"
+#line 3013 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = NULL;
-#line 3006 "StraightenTool.c"
+#line 3017 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return NULL;
-#line 3010 "StraightenTool.c"
+#line 3021 "StraightenTool.c"
 }
 
 
@@ -3017,25 +3028,25 @@ static gchar* editing_tools_straighten_tool_value_straighten_guide_lcopy_value (
 	if (!object_p) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3021 "StraightenTool.c"
+#line 3032 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (!value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		*object_p = NULL;
-#line 3027 "StraightenTool.c"
+#line 3038 "StraightenTool.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3031 "StraightenTool.c"
+#line 3042 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		*object_p = editing_tools_straighten_tool_straighten_guide_ref (value->data[0].v_pointer);
-#line 3035 "StraightenTool.c"
+#line 3046 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return NULL;
-#line 3039 "StraightenTool.c"
+#line 3050 "StraightenTool.c"
 }
 
 
@@ -3049,7 +3060,7 @@ static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return G_PARAM_SPEC (spec);
-#line 3053 "StraightenTool.c"
+#line 3064 "StraightenTool.c"
 }
 
 
@@ -3058,7 +3069,7 @@ static gpointer editing_tools_straighten_tool_value_get_straighten_guide (const
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE), NULL);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return value->data[0].v_pointer;
-#line 3062 "StraightenTool.c"
+#line 3073 "StraightenTool.c"
 }
 
 
@@ -3078,17 +3089,17 @@ static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* va
 		value->data[0].v_pointer = v_object;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_straighten_guide_ref (value->data[0].v_pointer);
-#line 3082 "StraightenTool.c"
+#line 3093 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = NULL;
-#line 3086 "StraightenTool.c"
+#line 3097 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_straighten_guide_unref (old);
-#line 3092 "StraightenTool.c"
+#line 3103 "StraightenTool.c"
 	}
 }
 
@@ -3107,17 +3118,17 @@ static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = v_object;
-#line 3111 "StraightenTool.c"
+#line 3122 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = NULL;
-#line 3115 "StraightenTool.c"
+#line 3126 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_straighten_guide_unref (old);
-#line 3121 "StraightenTool.c"
+#line 3132 "StraightenTool.c"
 	}
 }
 
@@ -3129,7 +3140,7 @@ static void editing_tools_straighten_tool_straighten_guide_class_init (EditingTo
 	((EditingToolsStraightenToolStraightenGuideClass *) klass)->finalize = editing_tools_straighten_tool_straighten_guide_finalize;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsStraightenToolStraightenGuidePrivate));
-#line 3133 "StraightenTool.c"
+#line 3144 "StraightenTool.c"
 }
 
 
@@ -3140,7 +3151,7 @@ static void editing_tools_straighten_tool_straighten_guide_instance_init (Editin
 	self->priv->is_active = FALSE;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->ref_count = 1;
-#line 3144 "StraightenTool.c"
+#line 3155 "StraightenTool.c"
 }
 
 
@@ -3150,7 +3161,7 @@ static void editing_tools_straighten_tool_straighten_guide_finalize (EditingTool
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE, EditingToolsStraightenToolStraightenGuide);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_destroy (self);
-#line 3154 "StraightenTool.c"
+#line 3165 "StraightenTool.c"
 }
 
 
@@ -3175,7 +3186,7 @@ static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer ins
 	g_atomic_int_inc (&self->ref_count);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return instance;
-#line 3179 "StraightenTool.c"
+#line 3190 "StraightenTool.c"
 }
 
 
@@ -3188,7 +3199,7 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta
 		EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_GET_CLASS (self)->finalize (self);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3192 "StraightenTool.c"
+#line 3203 "StraightenTool.c"
 	}
 }
 
@@ -3199,9 +3210,9 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta
          * @param container The application's main window.
          */
 static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 140 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked ((EditingToolsStraightenToolStraightenToolWindow*) self);
-#line 3205 "StraightenTool.c"
+#line 3216 "StraightenTool.c"
 }
 
 
@@ -3215,22 +3226,28 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_
 	GtkLabel* _tmp5_ = NULL;
 	GtkLabel* _tmp6_ = NULL;
 	GtkLabel* _tmp7_ = NULL;
+	GtkLabel* _tmp8_ = NULL;
+	GtkLabel* _tmp9_ = NULL;
+	GtkLabel* _tmp10_ = NULL;
+	GtkLabel* _tmp11_ = NULL;
+	GtkLabel* _tmp12_ = NULL;
+	GtkLabel* _tmp13_ = NULL;
 	GtkBox* slider_layout = NULL;
-	GtkBox* _tmp8_ = NULL;
-	GtkScale* _tmp9_ = NULL;
+	GtkBox* _tmp14_ = NULL;
+	GtkScale* _tmp15_ = NULL;
 	GtkBox* button_layout = NULL;
-	GtkBox* _tmp10_ = NULL;
-	GtkButton* _tmp11_ = NULL;
-	GtkButton* _tmp12_ = NULL;
-	GtkButton* _tmp13_ = NULL;
-	GtkButton* _tmp14_ = NULL;
-	GtkButton* _tmp15_ = NULL;
-	GtkButton* _tmp16_ = NULL;
-	GtkBox* main_layout = NULL;
-	GtkBox* _tmp17_ = NULL;
-	GtkLabel* _tmp18_ = NULL;
-	GtkLabel* _tmp19_ = NULL;
+	GtkBox* _tmp16_ = NULL;
+	GtkButton* _tmp17_ = NULL;
+	GtkButton* _tmp18_ = NULL;
+	GtkButton* _tmp19_ = NULL;
 	GtkButton* _tmp20_ = NULL;
+	GtkButton* _tmp21_ = NULL;
+	GtkButton* _tmp22_ = NULL;
+	GtkBox* main_layout = NULL;
+	GtkBox* _tmp23_ = NULL;
+	GtkLabel* _tmp24_ = NULL;
+	GtkLabel* _tmp25_ = NULL;
+	GtkButton* _tmp26_ = NULL;
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 110 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -3256,80 +3273,104 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_
 #line 117 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = self->description_label;
 #line 117 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_misc_set_padding (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_misc_get_type (), GtkMisc), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING, 0);
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp6_ = self->angle_label;
+	_tmp6_ = self->description_label;
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_misc_set_padding (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_misc_get_type (), GtkMisc), 0, 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
 #line 119 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp7_ = self->angle_label;
+	_tmp7_ = self->description_label;
 #line 119 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_LABEL_SIZE, -1);
-#line 121 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp8_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
-#line 121 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_object_ref_sink (_tmp8_);
-#line 121 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	slider_layout = _tmp8_;
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0);
+#line 120 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp8_ = self->description_label;
+#line 120 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 0);
 #line 122 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp9_ = self->angle_slider;
+	_tmp9_ = self->angle_label;
 #line 122 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (slider_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 124 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp10_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 0);
+#line 123 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp10_ = self->angle_label;
+#line 123 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 0);
 #line 124 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_object_ref_sink (_tmp10_);
+	_tmp11_ = self->angle_label;
 #line 124 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	button_layout = _tmp10_;
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0);
 #line 125 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp11_ = self->cancel_button;
+	_tmp12_ = self->angle_label;
 #line 125 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1);
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 0);
 #line 126 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp12_ = self->reset_button;
+	_tmp13_ = self->angle_label;
 #line 126 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1);
-#line 127 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp13_ = self->ok_button;
-#line 127 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_LABEL_SIZE, -1);
 #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp14_ = self->cancel_button;
+	_tmp14_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
 #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	g_object_ref_sink (_tmp14_);
+#line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	slider_layout = _tmp14_;
 #line 129 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp15_ = self->reset_button;
+	_tmp15_ = self->angle_slider;
 #line 129 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 130 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp16_ = self->ok_button;
-#line 130 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 132 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	gtk_box_pack_start (slider_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
+#line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	g_object_ref_sink (_tmp16_);
+#line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	button_layout = _tmp16_;
 #line 132 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_object_ref_sink (_tmp17_);
+	_tmp17_ = self->cancel_button;
 #line 132 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	main_layout = _tmp17_;
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1);
 #line 133 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp18_ = self->description_label;
+	_tmp18_ = self->reset_button;
 #line 133 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1);
 #line 134 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (slider_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	_tmp19_ = self->ok_button;
+#line 134 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1);
 #line 135 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp19_ = self->angle_label;
+	_tmp20_ = self->cancel_button;
 #line 135 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 136 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (button_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 138 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (main_layout, gtk_widget_get_type (), GtkWidget));
+	_tmp21_ = self->reset_button;
+#line 136 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 137 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp22_ = self->ok_button;
+#line 137 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+#line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	g_object_ref_sink (_tmp23_);
+#line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	main_layout = _tmp23_;
 #line 140 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp20_ = self->reset_button;
+	_tmp24_ = self->description_label;
 #line 140 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_signal_connect_object (_tmp20_, "clicked", (GCallback) _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked, self, 0);
+	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 141 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (slider_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 142 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp25_ = self->angle_label;
 #line 142 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 143 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (button_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 145 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (main_layout, gtk_widget_get_type (), GtkWidget));
+#line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	_tmp26_ = self->reset_button;
+#line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+	g_signal_connect_object (_tmp26_, "clicked", (GCallback) _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked, self, 0);
+#line 149 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GTK_WIN_POS_CENTER_ON_PARENT);
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (main_layout);
@@ -3339,26 +3380,26 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_
 	_g_object_unref0 (slider_layout);
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self;
-#line 3343 "StraightenTool.c"
+#line 3384 "StraightenTool.c"
 }
 
 
 static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_new (GtkWindow* container) {
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return editing_tools_straighten_tool_straighten_tool_window_construct (EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_TOOL_WINDOW, container);
-#line 3350 "StraightenTool.c"
+#line 3391 "StraightenTool.c"
 }
 
 
 static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked (EditingToolsStraightenToolStraightenToolWindow* self) {
 	GtkScale* _tmp0_ = NULL;
-#line 145 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 152 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_TOOL_WINDOW (self));
-#line 146 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->angle_slider;
-#line 146 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 153 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0);
-#line 3362 "StraightenTool.c"
+#line 3403 "StraightenTool.c"
 }
 
 
@@ -3367,7 +3408,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_class_init (Edi
 	editing_tools_straighten_tool_straighten_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_straighten_tool_straighten_tool_window_finalize;
-#line 3371 "StraightenTool.c"
+#line 3412 "StraightenTool.c"
 }
 
 
@@ -3423,7 +3464,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_instance_init (
 	g_object_ref_sink (_tmp8_);
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->reset_button = _tmp8_;
-#line 3427 "StraightenTool.c"
+#line 3468 "StraightenTool.c"
 }
 
 
@@ -3445,7 +3486,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObje
 	_g_object_unref0 (self->reset_button);
 #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	G_OBJECT_CLASS (editing_tools_straighten_tool_straighten_tool_window_parent_class)->finalize (obj);
-#line 3449 "StraightenTool.c"
+#line 3490 "StraightenTool.c"
 }
 
 
@@ -3484,7 +3525,7 @@ static void editing_tools_straighten_tool_class_init (EditingToolsStraightenTool
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = editing_tools_straighten_tool_real_get_tool_window;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = editing_tools_straighten_tool_real_paint;
-#line 3488 "StraightenTool.c"
+#line 3529 "StraightenTool.c"
 }
 
 
@@ -3492,17 +3533,17 @@ static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenT
 	EditingToolsStraightenToolStraightenGuide* _tmp0_ = NULL;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv = EDITING_TOOLS_STRAIGHTEN_TOOL_GET_PRIVATE (self);
-#line 163 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 170 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->photo_angle = 0.0;
-#line 167 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 174 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->use_high_qual = TRUE;
-#line 168 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->slider_sched = NULL;
-#line 174 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 181 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = editing_tools_straighten_tool_straighten_guide_new ();
-#line 174 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 181 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->guide = _tmp0_;
-#line 3506 "StraightenTool.c"
+#line 3547 "StraightenTool.c"
 }
 
 
@@ -3510,21 +3551,21 @@ static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool* obj
 	EditingToolsStraightenTool * self;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
-#line 150 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 157 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (self->priv->window);
-#line 153 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 160 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_surface_destroy0 (self->priv->photo_surf);
-#line 157 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 164 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_surface_destroy0 (self->priv->rotate_surf);
-#line 158 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 165 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_cairo_destroy0 (self->priv->rotate_ctx);
-#line 168 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 175 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_one_shot_scheduler_unref0 (self->priv->slider_sched);
-#line 174 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
+#line 181 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_editing_tools_straighten_tool_straighten_guide_unref0 (self->priv->guide);
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->finalize (obj);
-#line 3528 "StraightenTool.c"
+#line 3569 "StraightenTool.c"
 }
 
 
diff --git a/src/editing_tools/StraightenTool.vala b/src/editing_tools/StraightenTool.vala
index f869739..5c0eb98 100644
--- a/src/editing_tools/StraightenTool.vala
+++ b/src/editing_tools/StraightenTool.vala
@@ -114,8 +114,15 @@ public class StraightenTool : EditingTool {
             angle_slider.set_value(0.0);
             angle_slider.set_draw_value(false);
 
-            description_label.set_padding(CONTROL_SPACING, 0);
-            angle_label.set_padding(0, 0);
+            description_label.margin_start = CONTROL_SPACING;
+            description_label.margin_end = CONTROL_SPACING;
+            description_label.margin_top = 0;
+            description_label.margin_bottom = 0;
+
+            angle_label.margin_start = 0;
+            angle_label.margin_end = 0;
+            angle_label.margin_top = 0;
+            angle_label.margin_bottom = 0;
             angle_label.set_size_request(MIN_LABEL_SIZE,-1);
 
             Gtk.Box slider_layout = new Gtk.Box(Gtk.Orientation.HORIZONTAL, CONTROL_SPACING);
@@ -355,7 +362,11 @@ public class StraightenTool : EditingTool {
         prepare_image();
 
         // set crosshair cursor
-        canvas.get_drawing_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.CROSSHAIR));
+        var drawing_window = canvas.get_drawing_window ();
+        var display = drawing_window.get_display ();
+        var cursor = new Gdk.Cursor.for_display (display,
+                                                 Gdk.CursorType.CROSSHAIR);
+        drawing_window.set_cursor (cursor);
 
         window = new StraightenToolWindow(canvas.get_container());
         bind_window_handlers();
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index 207363d..4ee60a9 100644
--- a/src/events/EventDirectoryItem.c
+++ b/src/events/EventDirectoryItem.c
@@ -1155,7 +1155,7 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) {
 #line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1158 "EventDirectoryItem.c"
-			goto __catch50_g_error;
+			goto __catch49_g_error;
 		}
 #line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp1_);
@@ -1163,8 +1163,8 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) {
 		_g_object_unref0 (_tmp1_);
 #line 1165 "EventDirectoryItem.c"
 	}
-	goto __finally50;
-	__catch50_g_error:
+	goto __finally49;
+	__catch49_g_error:
 	{
 		GError* err = NULL;
 		Event* _tmp8_ = NULL;
@@ -1194,7 +1194,7 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) {
 		_g_error_free0 (err);
 #line 1196 "EventDirectoryItem.c"
 	}
-	__finally50:
+	__finally49:
 #line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1321,7 +1321,7 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 #line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1324 "EventDirectoryItem.c"
-				goto __catch51_g_error;
+				goto __catch50_g_error;
 			}
 #line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_);
@@ -1329,8 +1329,8 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 			_g_object_unref0 (_tmp5_);
 #line 1331 "EventDirectoryItem.c"
 		}
-		goto __finally51;
-		__catch51_g_error:
+		goto __finally50;
+		__catch50_g_error:
 		{
 			GError* err = NULL;
 			Event* _tmp9_ = NULL;
@@ -1360,7 +1360,7 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 			_g_error_free0 (err);
 #line 1362 "EventDirectoryItem.c"
 		}
-		__finally51:
+		__finally50:
 #line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
diff --git a/src/events/EventPage.c b/src/events/EventPage.c
index 857ec3c..e5a8d6a 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -14,6 +14,7 @@
 #include <string.h>
 #include <gee.h>
 #include <gdk/gdk.h>
+#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
 
@@ -304,6 +305,16 @@ typedef struct _ViewCollectionClass ViewCollectionClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
 
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
 #define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
 #define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
 #define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
@@ -406,16 +417,6 @@ typedef struct _CommandManagerClass CommandManagerClass;
 typedef struct _MediaSource MediaSource;
 typedef struct _MediaSourceClass MediaSourceClass;
 
-#define TYPE_APP_WINDOW (app_window_get_type ())
-#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
-#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
-#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
-#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
-#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
-
-typedef struct _AppWindow AppWindow;
-typedef struct _AppWindowClass AppWindowClass;
-
 #define TYPE_LIBRARY_WINDOW (library_window_get_type ())
 #define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow))
 #define LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
@@ -518,7 +519,7 @@ typedef struct _EventID EventID;
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -528,8 +529,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -537,10 +536,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -652,13 +649,13 @@ struct _MediaPageClass {
 	void (*on_move_to_trash) (MediaPage* self);
 	void (*on_edit_title) (MediaPage* self);
 	void (*on_edit_comment) (MediaPage* self);
-	void (*on_display_titles) (MediaPage* self, GtkAction* action);
-	void (*on_display_comments) (MediaPage* self, GtkAction* action);
-	void (*on_display_ratings) (MediaPage* self, GtkAction* action);
-	void (*on_display_tags) (MediaPage* self, GtkAction* action);
+	void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by);
 	void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by);
-	void (*on_sort_changed) (MediaPage* self);
+	void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*developer_changed) (MediaPage* self, RawDeveloper rd);
 	DataView* (*create_thumbnail) (MediaPage* self, DataSource* source);
 };
@@ -812,6 +809,12 @@ static void _event_page_on_events_altered_data_collection_items_altered (DataCol
 GType view_collection_get_type (void) G_GNUC_CONST;
 ViewCollection* page_get_view (Page* self);
 void view_collection_halt_mirroring (ViewCollection* self);
+static void event_page_on_make_primary (EventPage* self);
+static void _event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void event_page_on_rename (EventPage* self);
+static void _event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void media_page_on_edit_comment (MediaPage* self);
+static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 EventPage* event_page_new (Event* page_event);
 EventPage* event_page_construct (GType object_type, Event* page_event);
 gchar* data_object_get_name (DataObject* self);
@@ -826,22 +829,10 @@ gint view_collection_get_selected_count (ViewCollection* self);
 gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event);
 static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static GtkActionEntry* event_page_real_init_collect_action_entries (Page* base, int* result_length1);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-#define RESOURCES_MAKE_PRIMARY "shotwell-make-primary"
-#define TRANSLATABLE "translatable"
-static void event_page_on_make_primary (EventPage* self);
-static void _event_page_on_make_primary_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_MAKE_KEY_PHOTO_MENU _ ("Make _Key Photo for Event")
-static void _vala_array_add130 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void event_page_on_rename (EventPage* self);
-static void _event_page_on_rename_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_RENAME_EVENT_MENU _ ("Re_name Event…")
-static void _vala_array_add131 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_EDIT_EVENT_COMMENT_MENU _ ("Edit Event _Comment…")
-void media_page_on_edit_comment (MediaPage* self);
-static void _media_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add132 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void event_page_real_add_actions (Page* base);
+void page_add_actions (Page* self);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 static void event_page_real_init_actions (Page* base, gint selected_count, gint count);
 void page_init_actions (Page* self, gint selected_count, gint count);
 static void event_page_real_update_actions (Page* base, gint selected_count, gint count);
@@ -888,7 +879,6 @@ GType media_source_get_type (void) G_GNUC_CONST;
 gboolean event_set_primary_source (Event* self, MediaSource* source);
 DataView* view_collection_get_selected_at (ViewCollection* self, gint index);
 DataSource* data_view_get_source (DataView* self);
-GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
 void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event);
@@ -940,18 +930,40 @@ void media_source_get_event_id (MediaSource* self, EventID* result);
 gboolean view_manager_include_in_view (ViewManager* self, DataSource* source);
 static void no_event_page_finalize (GObject* obj);
 
+static const GActionEntry EVENT_PAGE_entries[3] = {{"MakePrimary", _event_page_on_make_primary_gsimple_action_activate_callback}, {"Rename", _event_page_on_rename_gsimple_action_activate_callback}, {"EditEventComment", _media_page_on_edit_comment_gsimple_action_activate_callback}};
 
 static void _event_page_on_events_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 40 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	event_page_on_events_altered ((EventPage*) self, items);
-#line 948 "EventPage.c"
+#line 939 "EventPage.c"
+}
+
+
+static void _event_page_on_make_primary_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	event_page_on_make_primary ((EventPage*) self);
+#line 946 "EventPage.c"
+}
+
+
+static void _event_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	event_page_on_rename ((EventPage*) self);
+#line 953 "EventPage.c"
+}
+
+
+static void _media_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	media_page_on_edit_comment ((MediaPage*) self);
+#line 960 "EventPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 13 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 955 "EventPage.c"
+#line 967 "EventPage.c"
 }
 
 
@@ -960,7 +972,7 @@ static DataView* _media_page_create_thumbnail_create_view (DataSource* source, g
 	result = media_page_create_thumbnail ((MediaPage*) self, source);
 #line 14 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 964 "EventPage.c"
+#line 976 "EventPage.c"
 }
 
 
@@ -1013,14 +1025,14 @@ EventPage* event_page_construct (GType object_type, Event* page_event) {
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _event_page_on_events_altered_data_collection_items_altered, self, 0);
 #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1017 "EventPage.c"
+#line 1029 "EventPage.c"
 }
 
 
 EventPage* event_page_new (Event* page_event) {
 #line 10 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return event_page_construct (TYPE_EVENT_PAGE, page_event);
-#line 1024 "EventPage.c"
+#line 1036 "EventPage.c"
 }
 
 
@@ -1038,7 +1050,7 @@ Event* event_page_get_event (EventPage* self) {
 	result = _tmp1_;
 #line 22 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1042 "EventPage.c"
+#line 1054 "EventPage.c"
 }
 
 
@@ -1062,7 +1074,7 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	_tmp2_ = gdk_keyval_name (_tmp1_);
 #line 30 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (g_strcmp0 (_tmp2_, "F2") == 0) {
-#line 1066 "EventPage.c"
+#line 1078 "EventPage.c"
 		ViewCollection* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
@@ -1083,7 +1095,7 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 			result = TRUE;
 #line 32 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			return result;
-#line 1087 "EventPage.c"
+#line 1099 "EventPage.c"
 		}
 	}
 #line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1094,7 +1106,7 @@ static gboolean event_page_real_on_app_key_pressed (Page* base, GdkEventKey* eve
 	result = _tmp8_;
 #line 36 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1098 "EventPage.c"
+#line 1110 "EventPage.c"
 }
 
 
@@ -1114,198 +1126,27 @@ static void event_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f
 	_tmp1_ = ui_filenames;
 #line 47 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "event.ui");
-#line 1118 "EventPage.c"
-}
-
-
-static void _event_page_on_make_primary_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 53 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	event_page_on_make_primary ((EventPage*) self);
-#line 1125 "EventPage.c"
+#line 1130 "EventPage.c"
 }
 
 
-static void _vala_array_add130 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	if ((*length) == (*size)) {
-#line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1136 "EventPage.c"
-	}
-#line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1140 "EventPage.c"
-}
-
-
-static void _event_page_on_rename_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 58 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	event_page_on_rename ((EventPage*) self);
-#line 1147 "EventPage.c"
-}
-
-
-static void _vala_array_add131 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 60 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	if ((*length) == (*size)) {
-#line 60 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 60 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1158 "EventPage.c"
-	}
-#line 60 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1162 "EventPage.c"
-}
-
-
-static void _media_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	media_page_on_edit_comment ((MediaPage*) self);
-#line 1169 "EventPage.c"
-}
-
-
-static void _vala_array_add132 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	if ((*length) == (*size)) {
-#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1180 "EventPage.c"
-	}
-#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1184 "EventPage.c"
-}
-
-
-static GtkActionEntry* event_page_real_init_collect_action_entries (Page* base, int* result_length1) {
+static void event_page_real_add_actions (Page* base) {
 	EventPage * self;
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* new_actions = NULL;
-	gint _tmp0_ = 0;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint new_actions_length1 = 0;
-	gint _new_actions_size_ = 0;
-	GtkActionEntry make_primary = {0};
-	GtkActionEntry _tmp2_ = {0};
-	GtkActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkActionEntry _tmp4_ = {0};
-	GtkActionEntry rename = {0};
-	GtkActionEntry _tmp5_ = {0};
-	GtkActionEntry* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	GtkActionEntry _tmp7_ = {0};
-	GtkActionEntry comment = {0};
-	GtkActionEntry _tmp8_ = {0};
-	GtkActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkActionEntry _tmp10_ = {0};
-	GtkActionEntry* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-#line 50 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 51 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp1_ = PAGE_CLASS (event_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), &_tmp0_);
-#line 51 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	new_actions = _tmp1_;
-#line 51 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	new_actions_length1 = _tmp0_;
-#line 51 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_new_actions_size_ = new_actions_length1;
-#line 53 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_.name = "MakePrimary";
-#line 53 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_.stock_id = RESOURCES_MAKE_PRIMARY;
-#line 53 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 53 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_.accelerator = NULL;
-#line 53 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_.tooltip = TRANSLATABLE;
-#line 53 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp2_.callback = (GCallback) _event_page_on_make_primary_gtk_action_callback;
-#line 53 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	make_primary = _tmp2_;
-#line 55 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	make_primary.label = RESOURCES_MAKE_KEY_PHOTO_MENU;
-#line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp3_ = new_actions;
-#line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp3__length1 = new_actions_length1;
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
 #line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp4_ = make_primary;
-#line 56 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_vala_array_add130 (&new_actions, &new_actions_length1, &_new_actions_size_, &_tmp4_);
-#line 58 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp5_.name = "Rename";
-#line 58 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp5_.stock_id = NULL;
-#line 58 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 58 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp5_.accelerator = NULL;
-#line 58 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp5_.tooltip = TRANSLATABLE;
-#line 58 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp5_.callback = (GCallback) _event_page_on_rename_gtk_action_callback;
-#line 58 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	rename = _tmp5_;
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
+#line 57 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	PAGE_CLASS (event_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page));
 #line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	rename.label = RESOURCES_RENAME_EVENT_MENU;
-#line 60 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp6_ = new_actions;
-#line 60 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp6__length1 = new_actions_length1;
-#line 60 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp7_ = rename;
-#line 60 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_vala_array_add131 (&new_actions, &new_actions_length1, &_new_actions_size_, &_tmp7_);
-#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp8_.name = "EditEventComment";
-#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp8_.stock_id = NULL;
-#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp8_.label = TRANSLATABLE;
-#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp8_.accelerator = NULL;
-#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp8_.tooltip = RESOURCES_EDIT_EVENT_COMMENT_MENU;
-#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp8_.callback = (GCallback) _media_page_on_edit_comment_gtk_action_callback;
-#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	comment = _tmp8_;
-#line 64 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	comment.label = RESOURCES_EDIT_EVENT_COMMENT_MENU;
-#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp9_ = new_actions;
-#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp9__length1 = new_actions_length1;
-#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp10_ = comment;
-#line 65 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_vala_array_add132 (&new_actions, &new_actions_length1, &_new_actions_size_, &_tmp10_);
-#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp11_ = new_actions;
-#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	_tmp11__length1 = new_actions_length1;
-#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	if (result_length1) {
-#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-		*result_length1 = _tmp11__length1;
-#line 1303 "EventPage.c"
-	}
-#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	result = _tmp11_;
-#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	return result;
-#line 1309 "EventPage.c"
+	_tmp0_ = app_window_get_instance ();
+#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	_tmp1_ = _tmp0_;
+#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), EVENT_PAGE_entries, G_N_ELEMENTS (EVENT_PAGE_entries), self);
+#line 59 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+	_g_object_unref0 (_tmp1_);
+#line 1150 "EventPage.c"
 }
 
 
@@ -1313,15 +1154,15 @@ static void event_page_real_init_actions (Page* base, gint selected_count, gint
 	EventPage * self;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 62 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 71 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = selected_count;
-#line 71 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = count;
-#line 71 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 63 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	PAGE_CLASS (event_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 1325 "EventPage.c"
+#line 1166 "EventPage.c"
 }
 
 
@@ -1330,23 +1171,23 @@ static void event_page_real_update_actions (Page* base, gint selected_count, gin
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 74 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 75 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = selected_count;
-#line 75 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 67 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MakePrimary", _tmp0_ == 1);
-#line 78 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 70 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToEvent", FALSE);
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = selected_count;
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = count;
-#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	PAGE_CLASS (event_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp1_, _tmp2_);
-#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditEventComment", TRUE);
-#line 1350 "EventPage.c"
+#line 1191 "EventPage.c"
 }
 
 
@@ -1358,31 +1199,31 @@ static void event_page_real_get_config_photos_sort (MediaPage* base, gboolean* s
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	configuration_facade_get_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp2_, &_tmp3_);
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_vala_sort_order = _tmp2_;
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_vala_sort_by = _tmp3_;
-#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_order) {
-#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1380 "EventPage.c"
+#line 1221 "EventPage.c"
 	}
-#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_by) {
-#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1386 "EventPage.c"
+#line 1227 "EventPage.c"
 	}
 }
 
@@ -1393,21 +1234,21 @@ static void event_page_real_set_config_photos_sort (MediaPage* base, gboolean so
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 91 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 83 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 92 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 92 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 92 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = sort_order;
-#line 92 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = sort_by;
-#line 92 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
-#line 92 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1411 "EventPage.c"
+#line 1252 "EventPage.c"
 }
 
 
@@ -1415,33 +1256,33 @@ static void event_page_on_events_altered (EventPage* self, GeeMap* map) {
 	GeeMap* _tmp0_ = NULL;
 	Event* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (IS_EVENT_PAGE (self));
-#line 95 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = map;
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = self->priv->page_event;
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp2_) {
-#line 1431 "EventPage.c"
+#line 1272 "EventPage.c"
 		Event* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp3_ = self->priv->page_event;
-#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp5_ = _tmp4_;
-#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_);
-#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_free0 (_tmp5_);
-#line 1445 "EventPage.c"
+#line 1286 "EventPage.c"
 	}
 }
 
@@ -1452,21 +1293,21 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENT_PAGE, EventPage);
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp3_) {
-#line 1470 "EventPage.c"
+#line 1311 "EventPage.c"
 		EditCommentDialog* edit_comment_dialog = NULL;
 		Event* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -1484,69 +1325,69 @@ static void event_page_real_on_edit_comment (MediaPage* base) {
 		CommandManager* _tmp15_ = NULL;
 		CommandManager* _tmp16_ = NULL;
 		EditEventCommentCommand* _tmp17_ = NULL;
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp4_ = self->priv->page_event;
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp5_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource));
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp6_ = _tmp5_;
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp7_ = edit_comment_dialog_new (_tmp6_, TRUE);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp8_ = _tmp7_;
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_free0 (_tmp6_);
-#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		edit_comment_dialog = _tmp8_;
-#line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp9_ = edit_comment_dialog;
-#line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp10_ = edit_comment_dialog_execute (_tmp9_);
-#line 104 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		new_comment = _tmp10_;
-#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp11_ = new_comment;
-#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 97 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		if (_tmp11_ == NULL) {
-#line 106 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			_g_free0 (new_comment);
-#line 106 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 106 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 			return;
-#line 1518 "EventPage.c"
+#line 1359 "EventPage.c"
 		}
-#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp12_ = self->priv->page_event;
-#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp13_ = new_comment;
-#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp14_ = edit_event_comment_command_new (_tmp12_, _tmp13_);
-#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		command = _tmp14_;
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp15_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp16_ = _tmp15_;
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp17_ = command;
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		command_manager_execute (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_COMMAND, Command));
-#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_command_manager_unref0 (_tmp16_);
-#line 110 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_object_unref0 (command);
-#line 110 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_g_free0 (new_comment);
-#line 110 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 110 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		return;
-#line 1546 "EventPage.c"
+#line 1387 "EventPage.c"
 	}
-#line 113 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	MEDIA_PAGE_CLASS (event_page_parent_class)->on_edit_comment (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_MEDIA_PAGE, MediaPage));
-#line 1550 "EventPage.c"
+#line 1391 "EventPage.c"
 }
 
 
@@ -1562,47 +1403,47 @@ static void event_page_on_make_primary (EventPage* self) {
 	DataView* _tmp8_ = NULL;
 	DataSource* _tmp9_ = NULL;
 	MediaSource* _tmp10_ = NULL;
-#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (IS_EVENT_PAGE (self));
-#line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 117 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp3_) {
-#line 118 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		return;
-#line 1582 "EventPage.c"
+#line 1423 "EventPage.c"
 	}
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp4_ = self->priv->page_event;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp6_ = _tmp5_;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp7_ = view_collection_get_selected_at (_tmp6_, 0);
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp8_ = _tmp7_;
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp9_ = data_view_get_source (_tmp8_);
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	event_set_primary_source (_tmp4_, _tmp10_);
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 112 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1606 "EventPage.c"
+#line 1447 "EventPage.c"
 }
 
 
@@ -1610,19 +1451,19 @@ static void event_page_on_rename (EventPage* self) {
 	LibraryWindow* _tmp0_ = NULL;
 	LibraryWindow* _tmp1_ = NULL;
 	Event* _tmp2_ = NULL;
-#line 123 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 115 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_if_fail (IS_EVENT_PAGE (self));
-#line 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = library_window_get_app ();
-#line 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = self->priv->page_event;
-#line 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	library_window_rename_event_in_sidebar (_tmp1_, _tmp2_);
-#line 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1626 "EventPage.c"
+#line 1467 "EventPage.c"
 }
 
 
@@ -1636,7 +1477,7 @@ static void event_page_class_init (EventPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = event_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
-	((PageClass *) klass)->init_collect_action_entries = event_page_real_init_collect_action_entries;
+	((PageClass *) klass)->add_actions = event_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((PageClass *) klass)->init_actions = event_page_real_init_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
@@ -1649,14 +1490,14 @@ static void event_page_class_init (EventPageClass * klass) {
 	((MediaPageClass *) klass)->on_edit_comment = event_page_real_on_edit_comment;
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = event_page_finalize;
-#line 1653 "EventPage.c"
+#line 1494 "EventPage.c"
 }
 
 
 static void event_page_instance_init (EventPage * self) {
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self->priv = EVENT_PAGE_GET_PRIVATE (self);
-#line 1660 "EventPage.c"
+#line 1501 "EventPage.c"
 }
 
 
@@ -1686,7 +1527,7 @@ static void event_page_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->page_event);
 #line 7 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (event_page_parent_class)->finalize (obj);
-#line 1690 "EventPage.c"
+#line 1531 "EventPage.c"
 }
 
 
@@ -1718,56 +1559,56 @@ NoEventPage* no_event_page_construct (GType object_type) {
 	Alteration* _tmp10_ = NULL;
 	ViewCollectionMonitor* _tmp11_ = NULL;
 	ViewCollectionMonitor* _tmp12_ = NULL;
-#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = (NoEventPage*) collection_page_construct (object_type, NO_EVENT_PAGE_NAME);
-#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = no_event_page_no_event_view_manager_new (self);
-#line 149 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	filter = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_MANAGER, ViewManager);
-#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = _tmp1_;
-#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = library_photo_global;
-#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp4_ = no_event_page_no_event_page_alteration;
-#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp5_ = view_collection_monitor_source_collection (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), filter, _tmp4_, NULL, NULL, NULL);
-#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp6_ = _tmp5_;
-#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_view_collection_monitor_unref0 (_tmp6_);
-#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp8_ = _tmp7_;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp9_ = video_global;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp10_ = no_event_page_no_event_page_alteration;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp11_ = view_collection_monitor_source_collection (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SOURCE_COLLECTION, SourceCollection), filter, _tmp10_, NULL, NULL, NULL);
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp12_ = _tmp11_;
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_view_collection_monitor_unref0 (_tmp12_);
-#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_view_manager_unref0 (filter);
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1764 "EventPage.c"
+#line 1605 "EventPage.c"
 }
 
 
 NoEventPage* no_event_page_new (void) {
-#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return no_event_page_construct (TYPE_NO_EVENT_PAGE);
-#line 1771 "EventPage.c"
+#line 1612 "EventPage.c"
 }
 
 
@@ -1779,31 +1620,31 @@ static void no_event_page_real_get_config_photos_sort (MediaPage* base, gboolean
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage);
-#line 155 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 155 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 155 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	configuration_facade_get_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), &_tmp2_, &_tmp3_);
-#line 155 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_vala_sort_order = _tmp2_;
-#line 155 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_vala_sort_by = _tmp3_;
-#line 155 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_order) {
-#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1801 "EventPage.c"
+#line 1642 "EventPage.c"
 	}
-#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (sort_by) {
-#line 154 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1807 "EventPage.c"
+#line 1648 "EventPage.c"
 	}
 }
 
@@ -1814,43 +1655,43 @@ static void no_event_page_real_set_config_photos_sort (MediaPage* base, gboolean
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gint _tmp3_ = 0;
-#line 158 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NO_EVENT_PAGE, NoEventPage);
-#line 159 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 159 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = _tmp0_;
-#line 159 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp2_ = sort_order;
-#line 159 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = sort_by;
-#line 159 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
-#line 159 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1832 "EventPage.c"
+#line 1673 "EventPage.c"
 }
 
 
 static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_construct (GType object_type, NoEventPage* page) {
 	NoEventPageNoEventViewManager* self = NULL;
 	NoEventPage* _tmp0_ = NULL;
-#line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 125 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (IS_NO_EVENT_PAGE (page), NULL);
-#line 134 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 126 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = page;
-#line 134 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 126 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = (NoEventPageNoEventViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
-#line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 125 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return self;
-#line 1847 "EventPage.c"
+#line 1688 "EventPage.c"
 }
 
 
 static NoEventPageNoEventViewManager* no_event_page_no_event_view_manager_new (NoEventPage* page) {
-#line 133 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 125 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return no_event_page_no_event_view_manager_construct (NO_EVENT_PAGE_TYPE_NO_EVENT_VIEW_MANAGER, page);
-#line 1854 "EventPage.c"
+#line 1695 "EventPage.c"
 }
 
 
@@ -1861,46 +1702,46 @@ static gboolean no_event_page_no_event_view_manager_real_include_in_view (ViewMa
 	DataSource* _tmp1_ = NULL;
 	EventID _tmp2_ = {0};
 	gint64 _tmp3_ = 0LL;
-#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 130 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, NO_EVENT_PAGE_TYPE_NO_EVENT_VIEW_MANAGER, NoEventPageNoEventViewManager);
-#line 138 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 130 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp1_ = source;
-#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	media_source_get_event_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp2_);
-#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp3_ = _tmp2_.id;
-#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	if (_tmp3_ != EVENT_ID_INVALID) {
-#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp0_ = FALSE;
-#line 1879 "EventPage.c"
+#line 1720 "EventPage.c"
 	} else {
 		DataSource* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 140 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp4_ = source;
-#line 140 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp5_ = VIEW_MANAGER_CLASS (no_event_page_no_event_view_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_VIEW_MANAGER, CollectionViewManager), TYPE_VIEW_MANAGER, ViewManager), _tmp4_);
-#line 140 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 		_tmp0_ = _tmp5_;
-#line 1889 "EventPage.c"
+#line 1730 "EventPage.c"
 	}
-#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	result = _tmp0_;
-#line 139 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 131 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	return result;
-#line 1895 "EventPage.c"
+#line 1736 "EventPage.c"
 }
 
 
 static void no_event_page_no_event_view_manager_class_init (NoEventPageNoEventViewManagerClass * klass) {
-#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_no_event_view_manager_parent_class = g_type_class_peek_parent (klass);
-#line 132 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 124 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = no_event_page_no_event_view_manager_real_include_in_view;
-#line 1904 "EventPage.c"
+#line 1745 "EventPage.c"
 }
 
 
@@ -1922,19 +1763,19 @@ static GType no_event_page_no_event_view_manager_get_type (void) {
 
 static void no_event_page_class_init (NoEventPageClass * klass) {
 	Alteration* _tmp0_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_parent_class = g_type_class_peek_parent (klass);
-#line 128 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((MediaPageClass *) klass)->get_config_photos_sort = no_event_page_real_get_config_photos_sort;
-#line 128 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	((MediaPageClass *) klass)->set_config_photos_sort = no_event_page_real_set_config_photos_sort;
-#line 128 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = no_event_page_finalize;
-#line 144 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	_tmp0_ = alteration_new ("metadata", "event");
-#line 144 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	no_event_page_no_event_page_alteration = _tmp0_;
-#line 1938 "EventPage.c"
+#line 1779 "EventPage.c"
 }
 
 
@@ -1944,11 +1785,11 @@ static void no_event_page_instance_init (NoEventPage * self) {
 
 static void no_event_page_finalize (GObject* obj) {
 	NoEventPage * self;
-#line 128 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NO_EVENT_PAGE, NoEventPage);
-#line 128 "/home/jens/Source/shotwell/src/events/EventPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/events/EventPage.vala"
 	G_OBJECT_CLASS (no_event_page_parent_class)->finalize (obj);
-#line 1952 "EventPage.c"
+#line 1793 "EventPage.c"
 }
 
 
diff --git a/src/events/EventPage.vala b/src/events/EventPage.vala
index fdaf80b..8b271d1 100644
--- a/src/events/EventPage.vala
+++ b/src/events/EventPage.vala
@@ -46,27 +46,19 @@ public class EventPage : CollectionPage {
         
         ui_filenames.add("event.ui");
     }
-    
-    protected override Gtk.ActionEntry[] init_collect_action_entries() {
-        Gtk.ActionEntry[] new_actions = base.init_collect_action_entries();
-        
-        Gtk.ActionEntry make_primary = { "MakePrimary", Resources.MAKE_PRIMARY,
-            TRANSLATABLE, null, TRANSLATABLE, on_make_primary };
-        make_primary.label = Resources.MAKE_KEY_PHOTO_MENU;
-        new_actions += make_primary;
 
-        Gtk.ActionEntry rename = { "Rename", null, TRANSLATABLE, null, TRANSLATABLE, on_rename };
-        rename.label = Resources.RENAME_EVENT_MENU;
-        new_actions += rename;
+    private const GLib.ActionEntry[] entries = {
+        { "MakePrimary", on_make_primary },
+        { "Rename", on_rename },
+        { "EditEventComment", on_edit_comment }
+    };
 
-        Gtk.ActionEntry comment = { "EditEventComment", null, TRANSLATABLE, null,
-            Resources.EDIT_EVENT_COMMENT_MENU, on_edit_comment};
-        comment.label = Resources.EDIT_EVENT_COMMENT_MENU;
-        new_actions += comment;
+    protected override void add_actions () {
+        base.add_actions ();
 
-        return new_actions;
+        AppWindow.get_instance ().add_action_entries (entries, this);
     }
-    
+
     protected override void init_actions(int selected_count, int count) {
         base.init_actions(selected_count, count);
     }
diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c
index 6dd1a90..ca566b4 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -14,12 +14,13 @@
 #include <string.h>
 #include <gee.h>
 #include <gdk/gdk.h>
+#include <gio/gio.h>
+#include <glib/gi18n-lib.h>
 #include <time.h>
 #include <cairo.h>
 #include <float.h>
 #include <math.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <glib/gi18n-lib.h>
 
 
 #define TYPE_PAGE (page_get_type ())
@@ -362,6 +363,7 @@ typedef struct _EventDirectoryItemPrivate EventDirectoryItemPrivate;
 
 typedef struct _AppWindow AppWindow;
 typedef struct _AppWindowClass AppWindowClass;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
 
 #define TYPE_LIBRARY_WINDOW (library_window_get_type ())
 #define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow))
@@ -564,7 +566,7 @@ typedef struct _SubEventsDirectoryPageSubEventDirectoryManagerPrivate SubEventsD
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -574,8 +576,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -583,10 +583,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -921,12 +919,22 @@ static GType events_directory_page_events_directory_search_view_filter_get_type
 enum  {
 	EVENTS_DIRECTORY_PAGE_DUMMY_PROPERTY
 };
-GtkAction* page_get_action (Page* self, const gchar* name);
-static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GtkAction* action, GtkAction* c);
-static void _events_directory_page_on_sort_changed_gtk_radio_action_changed (GtkRadioAction* _sender, GtkRadioAction* current, gpointer self);
+GAction* page_get_action (Page* self, const gchar* name);
+static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value);
+static void _events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self);
 static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void);
 static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_construct (GType object_type);
 #define EVENTS_DIRECTORY_PAGE_MIN_PHOTOS_FOR_PROGRESS_WINDOW 50
+static void events_directory_page_on_rename (EventsDirectoryPage* self);
+static void _events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void events_directory_page_on_merge (EventsDirectoryPage* self);
+static void _events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void events_directory_page_on_edit_comment (EventsDirectoryPage* self);
+static void _events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void page_on_action_toggle (Page* self, GAction* action, GVariant* value);
+static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value);
+static void _events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
 GType data_source_get_type (void) G_GNUC_CONST;
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
 GType event_source_get_type (void) G_GNUC_CONST;
@@ -974,7 +982,8 @@ void data_collection_set_property (DataCollection* self, const gchar* name, GVal
 gboolean configuration_facade_get_display_event_comments (ConfigurationFacade* self);
 void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path);
 GtkToolbar* page_get_toolbar (Page* self);
-#define RESOURCES_MERGE "shotwell-merge-events"
+#define RESOURCES_MERGE_LABEL _ ("Merge")
+#define RESOURCES_MERGE_TOOLTIP _ ("Combine events into a single event")
 static void events_directory_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
 gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail);
@@ -987,27 +996,11 @@ time_t event_source_get_start_time (EventSource* self);
 static gint64 events_directory_page_event_descending_comparator (void* a, void* b);
 static gint64 _events_directory_page_event_ascending_comparator_comparator (void* a, void* b, gpointer self);
 static gint64 _events_directory_page_event_descending_comparator_comparator (void* a, void* b, gpointer self);
-static GtkActionEntry* events_directory_page_real_init_collect_action_entries (Page* base, int* result_length1);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-#define TRANSLATABLE "translatable"
-static void events_directory_page_on_rename (EventsDirectoryPage* self);
-static void _events_directory_page_on_rename_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_RENAME_EVENT_MENU _ ("Re_name Event…")
-static void _vala_array_add126 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_MERGE_TOOLTIP _ ("Combine events into a single event")
-static void events_directory_page_on_merge (EventsDirectoryPage* self);
-static void _events_directory_page_on_merge_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_MERGE_MENU _ ("_Merge Events")
-static void _vala_array_add127 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment…")
-void events_directory_page_on_edit_comment (EventsDirectoryPage* self);
-static void _events_directory_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add128 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static GtkToggleActionEntry* events_directory_page_real_init_collect_toggle_action_entries (Page* base, int* result_length1);
-GtkToggleActionEntry* page_init_collect_toggle_action_entries (Page* self, int* result_length1);
-static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GtkAction* action);
-static void _events_directory_page_on_display_comments_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add129 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
+static void events_directory_page_real_add_actions (Page* base);
+void page_add_actions (Page* self);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
+static GVariant* _variant_new10 (gboolean value);
 static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count);
 void page_init_actions (Page* self, gint selected_count, gint count);
 static void events_directory_page_real_update_actions (Page* base, gint selected_count, gint count);
@@ -1017,11 +1010,10 @@ void page_update_actions (Page* self, gint selected_count, gint count);
 static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPage* base);
 static gchar* events_directory_page_real_get_filter_no_match_message (CheckerboardPage* base);
 static void events_directory_page_real_on_item_activated (CheckerboardPage* base, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers);
-GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
 void library_window_switch_to_event (LibraryWindow* self, Event* event);
-#define LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING 0
+#define LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING "ascending"
 gint view_collection_get_selected_count (ViewCollection* self);
 DataView* view_collection_get_selected_at (ViewCollection* self, gint index);
 gpointer text_entry_dialog_mediator_ref (gpointer instance);
@@ -1133,27 +1125,63 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 gboolean view_manager_include_in_view (ViewManager* self, DataSource* source);
 static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager* obj);
 
+static const GActionEntry EVENTS_DIRECTORY_PAGE_entries[4] = {{"Rename", _events_directory_page_on_rename_gsimple_action_activate_callback}, {"Merge", _events_directory_page_on_merge_gsimple_action_activate_callback}, {"EditComment", _events_directory_page_on_edit_comment_gsimple_action_activate_callback}, {"ViewComment", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _events_directory_page_on_display_comments_gsimple_action_change_state_callback}};
+
+static void _events_directory_page_on_sort_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) {
+#line 77 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	events_directory_page_on_sort_changed ((EventsDirectoryPage*) self, _sender, value);
+#line 1134 "EventsDirectoryPage.c"
+}
+
 
-static void _events_directory_page_on_sort_changed_gtk_radio_action_changed (GtkRadioAction* _sender, GtkRadioAction* current, gpointer self) {
-#line 74 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	events_directory_page_on_sort_changed ((EventsDirectoryPage*) self, _sender, current);
+static void _events_directory_page_on_rename_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	events_directory_page_on_rename ((EventsDirectoryPage*) self);
 #line 1141 "EventsDirectoryPage.c"
 }
 
 
+static void _events_directory_page_on_merge_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	events_directory_page_on_merge ((EventsDirectoryPage*) self);
+#line 1148 "EventsDirectoryPage.c"
+}
+
+
+static void _events_directory_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	events_directory_page_on_edit_comment ((EventsDirectoryPage*) self);
+#line 1155 "EventsDirectoryPage.c"
+}
+
+
+static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	page_on_action_toggle ((Page*) self, action, parameter);
+#line 1162 "EventsDirectoryPage.c"
+}
+
+
+static void _events_directory_page_on_display_comments_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	events_directory_page_on_display_comments ((EventsDirectoryPage*) self, action, value);
+#line 1169 "EventsDirectoryPage.c"
+}
+
+
 static gboolean _events_directory_page_event_comparator_predicate_comparator_predicate (DataObject* object, Alteration* alteration, gpointer self) {
 	gboolean result;
 	result = events_directory_page_event_comparator_predicate (object, alteration);
 #line 50 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1150 "EventsDirectoryPage.c"
+#line 1178 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _view_manager_ref0 (gpointer self) {
 #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? view_manager_ref (self) : NULL;
-#line 1157 "EventsDirectoryPage.c"
+#line 1185 "EventsDirectoryPage.c"
 }
 
 
@@ -1190,8 +1218,6 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g
 	GtkToolbar* _tmp25_ = NULL;
 	GtkToolButton* merge_button = NULL;
 	GtkToolButton* _tmp26_ = NULL;
-	GtkAction* _tmp27_ = NULL;
-	GtkAction* _tmp28_ = NULL;
 #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
 #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1275,7 +1301,7 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g
 #line 54 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp18_);
 #line 57 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/EventsDirectoryContextMenu");
+	checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "EventsDirectoryContextMenu");
 #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp23_ = view_manager;
 #line 59 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -1289,20 +1315,20 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g
 #line 62 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	toolbar = _tmp25_;
 #line 65 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp26_ = (GtkToolButton*) gtk_tool_button_new_from_stock (RESOURCES_MERGE);
+	_tmp26_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_MERGE_LABEL);
 #line 65 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_object_ref_sink (_tmp26_);
 #line 65 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	merge_button = _tmp26_;
 #line 66 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp27_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Merge");
-#line 66 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp28_ = _tmp27_;
-#line 66 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	gtk_activatable_set_related_action (G_TYPE_CHECK_INSTANCE_CAST (merge_button, GTK_TYPE_ACTIVATABLE, GtkActivatable), _tmp28_);
-#line 66 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_g_object_unref0 (_tmp28_);
+	gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (merge_button, GTK_TYPE_ACTIONABLE, GtkActionable), "win.Merge");
+#line 67 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (merge_button, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 68 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (merge_button, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_MERGE_TOOLTIP);
+#line 69 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	gtk_tool_button_set_icon_name (merge_button, "merge");
+#line 71 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (merge_button, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (merge_button);
@@ -1310,7 +1336,7 @@ EventsDirectoryPage* events_directory_page_construct (GType object_type, const g
 	_g_object_unref0 (toolbar);
 #line 45 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 1314 "EventsDirectoryPage.c"
+#line 1340 "EventsDirectoryPage.c"
 }
 
 
@@ -1318,19 +1344,19 @@ static void events_directory_page_real_init_collect_ui_filenames (Page* base, Ge
 	EventsDirectoryPage * self;
 	GeeList* _tmp0_ = NULL;
 	GeeList* _tmp1_ = NULL;
-#line 77 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 77 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 78 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = ui_filenames;
-#line 78 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "events_directory.ui");
-#line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 83 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = ui_filenames;
-#line 80 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 83 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	PAGE_CLASS (events_directory_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_);
-#line 1334 "EventsDirectoryPage.c"
+#line 1360 "EventsDirectoryPage.c"
 }
 
 
@@ -1338,19 +1364,19 @@ gboolean events_directory_page_event_comparator_predicate (DataObject* object, A
 	gboolean result = FALSE;
 	Alteration* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 83 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_DATA_OBJECT (object), FALSE);
-#line 83 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 84 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = alteration;
-#line 84 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = alteration_has_detail (_tmp0_, "metadata", "time");
-#line 84 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 84 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1354 "EventsDirectoryPage.c"
+#line 1380 "EventsDirectoryPage.c"
 }
 
 
@@ -1364,27 +1390,27 @@ static gint64 events_directory_page_event_ascending_comparator (void* a, void* b
 	void* _tmp3_ = NULL;
 	Event* _tmp4_ = NULL;
 	time_t _tmp5_ = 0;
-#line 88 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = a;
-#line 88 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) _tmp0_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event;
-#line 88 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_EVENT_SOURCE, EventSource));
-#line 88 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	start_a = _tmp2_;
-#line 89 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = b;
-#line 89 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST ((EventDirectoryItem*) _tmp3_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem)->event;
-#line 89 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = event_source_get_start_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_EVENT_SOURCE, EventSource));
-#line 89 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	start_b = _tmp5_;
-#line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = (gint64) (start_a - start_b);
-#line 91 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1388 "EventsDirectoryPage.c"
+#line 1414 "EventsDirectoryPage.c"
 }
 
 
@@ -1393,425 +1419,183 @@ static gint64 events_directory_page_event_descending_comparator (void* a, void*
 	void* _tmp0_ = NULL;
 	void* _tmp1_ = NULL;
 	gint64 _tmp2_ = 0LL;
-#line 95 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = b;
-#line 95 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = a;
-#line 95 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = events_directory_page_event_ascending_comparator (_tmp0_, _tmp1_);
-#line 95 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp2_;
-#line 95 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1407 "EventsDirectoryPage.c"
+#line 1433 "EventsDirectoryPage.c"
 }
 
 
 static gint64 _events_directory_page_event_ascending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = events_directory_page_event_ascending_comparator (a, b);
-#line 100 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1416 "EventsDirectoryPage.c"
+#line 1442 "EventsDirectoryPage.c"
 }
 
 
 static gint64 _events_directory_page_event_descending_comparator_comparator (void* a, void* b, gpointer self) {
 	gint64 result;
 	result = events_directory_page_event_descending_comparator (a, b);
-#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1425 "EventsDirectoryPage.c"
+#line 1451 "EventsDirectoryPage.c"
 }
 
 
 static Comparator events_directory_page_get_event_comparator (gboolean ascending, void** result_target, GDestroyNotify* result_target_destroy_notify) {
 	Comparator result = NULL;
 	gboolean _tmp0_ = FALSE;
-#line 99 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = ascending;
-#line 99 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_) {
-#line 1436 "EventsDirectoryPage.c"
+#line 1462 "EventsDirectoryPage.c"
 		Comparator _tmp1_ = NULL;
 		void* _tmp1__target = NULL;
 		GDestroyNotify _tmp1__target_destroy_notify = NULL;
-#line 100 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = _events_directory_page_event_ascending_comparator_comparator;
-#line 100 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1__target = NULL;
-#line 100 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1__target_destroy_notify = NULL;
-#line 100 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		*result_target = _tmp1__target;
-#line 100 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		*result_target_destroy_notify = _tmp1__target_destroy_notify;
-#line 100 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		result = _tmp1_;
-#line 100 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 103 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 1454 "EventsDirectoryPage.c"
+#line 1480 "EventsDirectoryPage.c"
 	} else {
 		Comparator _tmp2_ = NULL;
 		void* _tmp2__target = NULL;
 		GDestroyNotify _tmp2__target_destroy_notify = NULL;
-#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp2_ = _events_directory_page_event_descending_comparator_comparator;
-#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp2__target = NULL;
-#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp2__target_destroy_notify = NULL;
-#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		*result_target = _tmp2__target;
-#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		*result_target_destroy_notify = _tmp2__target_destroy_notify;
-#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		result = _tmp2_;
-#line 102 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 1473 "EventsDirectoryPage.c"
-	}
-}
-
-
-static void _events_directory_page_on_rename_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	events_directory_page_on_rename ((EventsDirectoryPage*) self);
-#line 1481 "EventsDirectoryPage.c"
-}
-
-
-static void _vala_array_add126 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 110 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	if ((*length) == (*size)) {
-#line 110 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 110 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1492 "EventsDirectoryPage.c"
+#line 1499 "EventsDirectoryPage.c"
 	}
-#line 110 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1496 "EventsDirectoryPage.c"
-}
-
-
-static void _events_directory_page_on_merge_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 112 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	events_directory_page_on_merge ((EventsDirectoryPage*) self);
-#line 1503 "EventsDirectoryPage.c"
-}
-
-
-static void _vala_array_add127 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 115 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	if ((*length) == (*size)) {
-#line 115 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 115 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1514 "EventsDirectoryPage.c"
-	}
-#line 115 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1518 "EventsDirectoryPage.c"
-}
-
-
-static void _events_directory_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	events_directory_page_on_edit_comment ((EventsDirectoryPage*) self);
-#line 1525 "EventsDirectoryPage.c"
 }
 
 
-static void _vala_array_add128 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 120 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	if ((*length) == (*size)) {
-#line 120 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 120 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1536 "EventsDirectoryPage.c"
-	}
-#line 120 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1540 "EventsDirectoryPage.c"
+static GVariant* _variant_new10 (gboolean value) {
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 1507 "EventsDirectoryPage.c"
 }
 
 
-static GtkActionEntry* events_directory_page_real_init_collect_action_entries (Page* base, int* result_length1) {
+static void events_directory_page_real_add_actions (Page* base) {
 	EventsDirectoryPage * self;
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	gint _tmp0_ = 0;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry rename = {0};
-	GtkActionEntry _tmp2_ = {0};
-	GtkActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkActionEntry _tmp4_ = {0};
-	GtkActionEntry merge = {0};
-	GtkActionEntry _tmp5_ = {0};
-	GtkActionEntry* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	GtkActionEntry _tmp7_ = {0};
-	GtkActionEntry comment = {0};
-	GtkActionEntry _tmp8_ = {0};
-	GtkActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkActionEntry _tmp10_ = {0};
-	GtkActionEntry* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-#line 105 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 106 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp1_ = PAGE_CLASS (events_directory_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), &_tmp0_);
-#line 106 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	actions = _tmp1_;
-#line 106 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	actions_length1 = _tmp0_;
-#line 106 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_actions_size_ = actions_length1;
-#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp2_.name = "Rename";
-#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp2_.stock_id = NULL;
-#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp2_.accelerator = "F2";
-#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp2_.tooltip = TRANSLATABLE;
-#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp2_.callback = (GCallback) _events_directory_page_on_rename_gtk_action_callback;
-#line 108 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	rename = _tmp2_;
-#line 109 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	rename.label = RESOURCES_RENAME_EVENT_MENU;
-#line 110 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp3_ = actions;
-#line 110 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp3__length1 = actions_length1;
-#line 110 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp4_ = rename;
-#line 110 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_vala_array_add126 (&actions, &actions_length1, &_actions_size_, &_tmp4_);
-#line 112 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.name = "Merge";
-#line 112 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.stock_id = RESOURCES_MERGE;
-#line 112 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 112 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.accelerator = NULL;
-#line 112 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.tooltip = RESOURCES_MERGE_TOOLTIP;
-#line 112 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.callback = (GCallback) _events_directory_page_on_merge_gtk_action_callback;
-#line 112 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	merge = _tmp5_;
-#line 114 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	merge.label = RESOURCES_MERGE_MENU;
-#line 115 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp6_ = actions;
-#line 115 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp6__length1 = actions_length1;
-#line 115 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp7_ = merge;
-#line 115 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_vala_array_add127 (&actions, &actions_length1, &_actions_size_, &_tmp7_);
-#line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp8_.name = "EditComment";
-#line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp8_.stock_id = NULL;
-#line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp8_.label = TRANSLATABLE;
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
+	GAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
+	GSimpleAction* _tmp4_ = NULL;
+	ConfigFacade* _tmp5_ = NULL;
+	ConfigFacade* _tmp6_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	GVariant* _tmp8_ = NULL;
 #line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp8_.accelerator = NULL;
-#line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp8_.tooltip = RESOURCES_EDIT_COMMENT_MENU;
-#line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp8_.callback = (GCallback) _events_directory_page_on_edit_comment_gtk_action_callback;
-#line 117 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	comment = _tmp8_;
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
+#line 118 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	PAGE_CLASS (events_directory_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
 #line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	comment.label = RESOURCES_EDIT_COMMENT_MENU;
-#line 120 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp9_ = actions;
-#line 120 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp9__length1 = actions_length1;
-#line 120 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp10_ = comment;
-#line 120 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_vala_array_add128 (&actions, &actions_length1, &_actions_size_, &_tmp10_);
-#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp11_ = actions;
-#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp11__length1 = actions_length1;
-#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	if (result_length1) {
-#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-		*result_length1 = _tmp11__length1;
-#line 1659 "EventsDirectoryPage.c"
-	}
-#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	result = _tmp11_;
-#line 122 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	return result;
-#line 1665 "EventsDirectoryPage.c"
-}
-
-
-static void _events_directory_page_on_display_comments_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	events_directory_page_on_display_comments ((EventsDirectoryPage*) self, action);
-#line 1672 "EventsDirectoryPage.c"
-}
-
-
-static void _vala_array_add129 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	if ((*length) == (*size)) {
-#line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 1683 "EventsDirectoryPage.c"
+	_tmp0_ = app_window_get_instance ();
+#line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp1_ = _tmp0_;
+#line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), EVENTS_DIRECTORY_PAGE_entries, G_N_ELEMENTS (EVENTS_DIRECTORY_PAGE_entries), self);
+#line 119 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_g_object_unref0 (_tmp1_);
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewComment");
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	if (_tmp3_ == NULL) {
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+		_g_object_unref0 (_tmp2_);
+#line 1542 "EventsDirectoryPage.c"
 	}
-#line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1687 "EventsDirectoryPage.c"
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp4_ = _tmp3_;
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp5_ = config_facade_get_instance ();
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp6_ = _tmp5_;
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp7_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp8_ = _variant_new10 (_tmp7_);
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_simple_action_set_state (_tmp4_, _tmp8_);
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_g_variant_unref0 (_tmp8_);
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_g_object_unref0 (_tmp6_);
+#line 121 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_g_object_unref0 (_tmp4_);
+#line 1562 "EventsDirectoryPage.c"
 }
 
 
-static GtkToggleActionEntry* events_directory_page_real_init_collect_toggle_action_entries (Page* base, int* result_length1) {
+static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count) {
 	EventsDirectoryPage * self;
-	GtkToggleActionEntry* result = NULL;
-	GtkToggleActionEntry* toggle_actions = NULL;
 	gint _tmp0_ = 0;
-	GtkToggleActionEntry* _tmp1_ = NULL;
-	gint toggle_actions_length1 = 0;
-	gint _toggle_actions_size_ = 0;
-	GtkToggleActionEntry comments = {0};
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	GtkToggleActionEntry _tmp5_ = {0};
-	GtkToggleActionEntry _tmp6_ = {0};
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkToggleActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkToggleActionEntry _tmp10_ = {0};
-	GtkToggleActionEntry* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
+	gint _tmp1_ = 0;
+	GSimpleAction* action = NULL;
+	GAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
 #line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
 #line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp1_ = PAGE_CLASS (events_directory_page_parent_class)->init_collect_toggle_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), &_tmp0_);
-#line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	toggle_actions = _tmp1_;
+	_tmp0_ = selected_count;
 #line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	toggle_actions_length1 = _tmp0_;
+	_tmp1_ = count;
 #line 126 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_toggle_actions_size_ = toggle_actions_length1;
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp2_ = config_facade_get_instance ();
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp3_ = _tmp2_;
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp4_ = configuration_facade_get_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.name = "ViewComment";
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.stock_id = NULL;
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.accelerator = "<Ctrl><Shift>C";
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.tooltip = TRANSLATABLE;
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.callback = (GCallback) _events_directory_page_on_display_comments_gtk_action_callback;
-#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_.is_active = _tmp4_;
+	PAGE_CLASS (events_directory_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
 #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSortEvents");
 #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_g_object_unref0 (_tmp3_);
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
 #line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	comments = _tmp6_;
-#line 130 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp7_ = _ ("_Comments");
-#line 130 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	comments.label = _tmp7_;
-#line 131 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp8_ = _ ("Display the comment of each event");
-#line 131 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	comments.tooltip = _tmp8_;
-#line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp9_ = toggle_actions;
-#line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp9__length1 = toggle_actions_length1;
-#line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp10_ = comments;
-#line 132 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_vala_array_add129 (&toggle_actions, &toggle_actions_length1, &_toggle_actions_size_, &_tmp10_);
-#line 134 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp11_ = toggle_actions;
-#line 134 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp11__length1 = toggle_actions_length1;
-#line 134 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	if (result_length1) {
-#line 134 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-		*result_length1 = _tmp11__length1;
-#line 1772 "EventsDirectoryPage.c"
-	}
-#line 134 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	result = _tmp11_;
-#line 134 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	return result;
-#line 1778 "EventsDirectoryPage.c"
-}
-
-
-static void events_directory_page_real_init_actions (Page* base, gint selected_count, gint count) {
-	EventsDirectoryPage * self;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	GtkRadioAction* action = NULL;
-	GtkAction* _tmp2_ = NULL;
-	GtkRadioAction* _tmp3_ = NULL;
-#line 137 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 138 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp0_ = selected_count;
-#line 138 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp1_ = count;
-#line 138 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	PAGE_CLASS (events_directory_page_parent_class)->init_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 140 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSortEventsAscending");
-#line 140 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_radio_action_get_type ()) ? ((GtkRadioAction*) _tmp2_) : NULL;
-#line 140 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp3_ == NULL) {
-#line 140 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1805 "EventsDirectoryPage.c"
+#line 1589 "EventsDirectoryPage.c"
 	}
-#line 140 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 128 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	action = _tmp3_;
-#line 141 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 129 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_vala_assert (action != NULL, "action != null");
-#line 142 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	g_signal_connect_object (action, "changed", (GCallback) _events_directory_page_on_sort_changed_gtk_radio_action_changed, self, 0);
-#line 137 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 130 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_signal_connect_object (action, "change-state", (GCallback) _events_directory_page_on_sort_changed_g_simple_action_change_state, self, 0);
+#line 125 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (action);
-#line 1815 "EventsDirectoryPage.c"
+#line 1599 "EventsDirectoryPage.c"
 }
 
 
@@ -1822,29 +1606,29 @@ static void events_directory_page_real_update_actions (Page* base, gint selected
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
-#line 145 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 134 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = selected_count;
-#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 134 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Merge", _tmp0_ > 1);
-#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Merge", TRUE);
-#line 148 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = selected_count;
-#line 148 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 136 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rename", _tmp1_ == 1);
-#line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = selected_count;
-#line 149 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditComment", _tmp2_ == 1);
-#line 151 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = selected_count;
-#line 151 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = count;
-#line 151 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 139 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	PAGE_CLASS (events_directory_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp3_, _tmp4_);
-#line 1848 "EventsDirectoryPage.c"
+#line 1632 "EventsDirectoryPage.c"
 }
 
 
@@ -1853,17 +1637,17 @@ static gchar* events_directory_page_real_get_view_empty_message (CheckerboardPag
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 154 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 142 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 155 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = _ ("No events");
-#line 155 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 155 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 155 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1867 "EventsDirectoryPage.c"
+#line 1651 "EventsDirectoryPage.c"
 }
 
 
@@ -1872,24 +1656,24 @@ static gchar* events_directory_page_real_get_filter_no_match_message (Checkerboa
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 158 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = _ ("No events found");
-#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 159 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 147 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 1886 "EventsDirectoryPage.c"
+#line 1670 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1893 "EventsDirectoryPage.c"
+#line 1677 "EventsDirectoryPage.c"
 }
 
 
@@ -1901,91 +1685,86 @@ static void events_directory_page_real_on_item_activated (CheckerboardPage* base
 	LibraryWindow* _tmp2_ = NULL;
 	LibraryWindow* _tmp3_ = NULL;
 	Event* _tmp4_ = NULL;
-#line 162 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 162 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 162 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = item;
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem));
-#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 152 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	event = _tmp1_;
-#line 165 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = library_window_get_app ();
-#line 165 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_;
-#line 165 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = event->event;
-#line 165 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	library_window_switch_to_event (_tmp3_, _tmp4_);
-#line 165 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 153 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 162 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 150 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (event);
-#line 1929 "EventsDirectoryPage.c"
+#line 1713 "EventsDirectoryPage.c"
 }
 
 
-static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GtkAction* action, GtkAction* c) {
-	GtkRadioAction* current = NULL;
-	GtkAction* _tmp0_ = NULL;
-	GtkRadioAction* _tmp1_ = NULL;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	void* _tmp6_ = NULL;
-	GDestroyNotify _tmp7_ = NULL;
-	Comparator _tmp8_ = NULL;
-	Comparator _tmp9_ = NULL;
-	void* _tmp9__target = NULL;
-	GDestroyNotify _tmp9__target_destroy_notify = NULL;
-#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+static void events_directory_page_on_sort_changed (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) {
+	ViewCollection* _tmp0_ = NULL;
+	ViewCollection* _tmp1_ = NULL;
+	GVariant* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	void* _tmp4_ = NULL;
+	GDestroyNotify _tmp5_ = NULL;
+	Comparator _tmp6_ = NULL;
+	Comparator _tmp7_ = NULL;
+	void* _tmp7__target = NULL;
+	GDestroyNotify _tmp7__target_destroy_notify = NULL;
+	GSimpleAction* _tmp8_ = NULL;
+	GVariant* _tmp9_ = NULL;
+#line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (c));
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp0_ = c;
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_radio_action_get_type (), GtkRadioAction));
-#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	current = _tmp1_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp3_ = _tmp2_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp4_ = gtk_radio_action_get_current_value (current);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp5_ = _tmp4_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp8_ = events_directory_page_get_event_comparator (_tmp5_ == LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING, &_tmp6_, &_tmp7_);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp9_ = _tmp8_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp9__target = _tmp6_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp9__target_destroy_notify = _tmp7_;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), _tmp9_, _tmp6_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	(_tmp9__target_destroy_notify == NULL) ? NULL : (_tmp9__target_destroy_notify (_tmp9__target), NULL);
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp9_ = NULL;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp9__target = NULL;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp9__target_destroy_notify = NULL;
-#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_data_collection_unref0 (_tmp3_);
-#line 168 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_g_object_unref0 (current);
-#line 1989 "EventsDirectoryPage.c"
+#line 156 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp1_ = _tmp0_;
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp2_ = value;
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp3_ = g_variant_get_string (_tmp2_, NULL);
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp6_ = events_directory_page_get_event_comparator (g_strcmp0 (_tmp3_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0, &_tmp4_, &_tmp5_);
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp7_ = _tmp6_;
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp7__target = _tmp4_;
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp7__target_destroy_notify = _tmp5_;
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	data_collection_set_comparator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection), _tmp7_, _tmp4_, _events_directory_page_event_comparator_predicate_comparator_predicate, NULL);
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	(_tmp7__target_destroy_notify == NULL) ? NULL : (_tmp7__target_destroy_notify (_tmp7__target), NULL);
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp7_ = NULL;
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp7__target = NULL;
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp7__target_destroy_notify = NULL;
+#line 157 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_data_collection_unref0 (_tmp1_);
+#line 161 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp8_ = action;
+#line 161 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp9_ = value;
+#line 161 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_simple_action_set_state (_tmp8_, _tmp9_);
+#line 1768 "EventsDirectoryPage.c"
 }
 
 
@@ -2018,101 +1797,101 @@ static void events_directory_page_on_rename (EventsDirectoryPage* self) {
 	CommandManager* _tmp21_ = NULL;
 	CommandManager* _tmp22_ = NULL;
 	RenameEventCommand* _tmp23_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 178 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 166 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp3_) {
-#line 179 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 167 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2038 "EventsDirectoryPage.c"
+#line 1817 "EventsDirectoryPage.c"
 	}
-#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = _tmp4_;
-#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 181 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	item = _tmp7_;
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = item;
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = _tmp8_->event;
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp10_ = event_get_raw_name (_tmp9_);
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp11_ = _tmp10_;
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = event_rename_dialog_new (_tmp11_);
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp13_ = _tmp12_;
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (_tmp11_);
-#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 171 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	rename_dialog = _tmp13_;
-#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp14_ = rename_dialog;
-#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp15_ = event_rename_dialog_execute (_tmp14_);
-#line 184 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	new_name = _tmp15_;
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp16_ = new_name;
-#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp16_ == NULL) {
-#line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (new_name);
-#line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_text_entry_dialog_mediator_unref0 (rename_dialog);
-#line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (item);
-#line 186 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 174 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2086 "EventsDirectoryPage.c"
+#line 1865 "EventsDirectoryPage.c"
 	}
-#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
-#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp18_ = _tmp17_->event;
-#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp19_ = new_name;
-#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp20_ = rename_event_command_new (_tmp18_, _tmp19_);
-#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command = _tmp20_;
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp22_ = _tmp21_;
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp23_ = command;
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 177 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_command_manager_unref0 (_tmp22_);
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (new_name);
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_text_entry_dialog_mediator_unref0 (rename_dialog);
-#line 176 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 164 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 2116 "EventsDirectoryPage.c"
+#line 1895 "EventsDirectoryPage.c"
 }
 
 
@@ -2145,101 +1924,101 @@ void events_directory_page_on_edit_comment (EventsDirectoryPage* self) {
 	CommandManager* _tmp21_ = NULL;
 	CommandManager* _tmp22_ = NULL;
 	EditEventCommentCommand* _tmp23_ = NULL;
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 194 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp3_) {
-#line 195 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 183 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2165 "EventsDirectoryPage.c"
+#line 1944 "EventsDirectoryPage.c"
 	}
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = _tmp4_;
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_EVENT_DIRECTORY_ITEM, EventDirectoryItem);
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	item = _tmp7_;
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = item;
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = _tmp8_->event;
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp10_ = event_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_EVENT_SOURCE, EventSource));
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp11_ = _tmp10_;
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = edit_comment_dialog_new (_tmp11_, FALSE);
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp13_ = _tmp12_;
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (_tmp11_);
-#line 199 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	edit_comment_dialog = _tmp13_;
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp14_ = edit_comment_dialog;
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp15_ = edit_comment_dialog_execute (_tmp14_);
-#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	new_comment = _tmp15_;
-#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp16_ = new_comment;
-#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp16_ == NULL) {
-#line 202 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (new_comment);
-#line 202 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 202 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (item);
-#line 202 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2213 "EventsDirectoryPage.c"
+#line 1992 "EventsDirectoryPage.c"
 	}
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp17_ = item;
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp18_ = _tmp17_->event;
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp19_ = new_comment;
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp20_ = edit_event_comment_command_new (_tmp18_, _tmp19_);
-#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command = _tmp20_;
-#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp22_ = _tmp21_;
-#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp23_ = command;
-#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_command_manager_unref0 (_tmp22_);
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (new_comment);
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 192 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (item);
-#line 2243 "EventsDirectoryPage.c"
+#line 2022 "EventsDirectoryPage.c"
 }
 
 
@@ -2258,92 +2037,100 @@ static void events_directory_page_on_merge (EventsDirectoryPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	MergeEventsCommand* _tmp12_ = NULL;
-#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_ <= 1;
-#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp3_) {
-#line 210 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return;
-#line 2278 "EventsDirectoryPage.c"
+#line 2057 "EventsDirectoryPage.c"
 	}
-#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = _tmp4_;
-#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = _tmp6_;
-#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = merge_events_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = _tmp8_;
-#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 212 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command = _tmp9_;
-#line 213 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 213 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp11_ = _tmp10_;
-#line 213 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = command;
-#line 213 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 213 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 208 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (command);
-#line 2310 "EventsDirectoryPage.c"
+#line 2089 "EventsDirectoryPage.c"
 }
 
 
-static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GtkAction* action) {
+static void events_directory_page_on_display_comments (EventsDirectoryPage* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GtkAction* _tmp0_ = NULL;
+	GVariant* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
-#line 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	GSimpleAction* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_if_fail (IS_EVENTS_DIRECTORY_PAGE (self));
-#line 216 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp0_ = action;
-#line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 217 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 204 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp0_ = value;
+#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp1_ = g_variant_get_boolean (_tmp0_);
+#line 205 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	display = _tmp1_;
-#line 219 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 207 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	checkerboard_page_set_display_comments (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), display);
-#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _tmp2_;
-#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	configuration_facade_set_display_event_comments (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
-#line 221 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 209 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2340 "EventsDirectoryPage.c"
+#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp4_ = action;
+#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp5_ = value;
+#line 211 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_simple_action_set_state (_tmp4_, _tmp5_);
+#line 2127 "EventsDirectoryPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 225 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 2347 "EventsDirectoryPage.c"
+#line 2134 "EventsDirectoryPage.c"
 }
 
 
@@ -2352,17 +2139,17 @@ static SearchViewFilter* events_directory_page_real_get_search_view_filter (Chec
 	SearchViewFilter* result = NULL;
 	EventsDirectoryPageEventsDirectorySearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 224 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 225 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 225 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 225 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 225 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2366 "EventsDirectoryPage.c"
+#line 2153 "EventsDirectoryPage.c"
 }
 
 
@@ -2383,7 +2170,7 @@ static DataView* events_directory_page_event_directory_manager_real_create_view
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
 #line 10 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2387 "EventsDirectoryPage.c"
+#line 2174 "EventsDirectoryPage.c"
 }
 
 
@@ -2393,14 +2180,14 @@ EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_
 	self = (EventsDirectoryPageEventDirectoryManager*) view_manager_construct (object_type);
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2397 "EventsDirectoryPage.c"
+#line 2184 "EventsDirectoryPage.c"
 }
 
 
 EventsDirectoryPageEventDirectoryManager* events_directory_page_event_directory_manager_new (void) {
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return events_directory_page_event_directory_manager_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER);
-#line 2404 "EventsDirectoryPage.c"
+#line 2191 "EventsDirectoryPage.c"
 }
 
 
@@ -2409,7 +2196,7 @@ static void events_directory_page_event_directory_manager_class_init (EventsDire
 	events_directory_page_event_directory_manager_parent_class = g_type_class_peek_parent (klass);
 #line 8 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((ViewManagerClass *) klass)->create_view = events_directory_page_event_directory_manager_real_create_view;
-#line 2413 "EventsDirectoryPage.c"
+#line 2200 "EventsDirectoryPage.c"
 }
 
 
@@ -2438,7 +2225,7 @@ static guint events_directory_page_events_directory_search_view_filter_real_get_
 	result = (guint) SEARCH_FILTER_CRITERIA_TEXT;
 #line 16 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2442 "EventsDirectoryPage.c"
+#line 2229 "EventsDirectoryPage.c"
 }
 
 
@@ -2458,7 +2245,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2462 "EventsDirectoryPage.c"
+#line 2249 "EventsDirectoryPage.c"
 }
 
 
@@ -2504,7 +2291,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 		result = TRUE;
 #line 22 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2508 "EventsDirectoryPage.c"
+#line 2295 "EventsDirectoryPage.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = view;
@@ -2530,11 +2317,11 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 		_g_object_unref0 (source);
 #line 27 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 2534 "EventsDirectoryPage.c"
+#line 2321 "EventsDirectoryPage.c"
 	}
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp12_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp11_);
-#line 2538 "EventsDirectoryPage.c"
+#line 2325 "EventsDirectoryPage.c"
 	{
 		gchar** word_collection = NULL;
 		gint word_collection_length1 = 0;
@@ -2546,11 +2333,11 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 		word_collection_length1 = _tmp11_;
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		for (word_it = 0; word_it < _tmp11_; word_it = word_it + 1) {
-#line 2550 "EventsDirectoryPage.c"
+#line 2337 "EventsDirectoryPage.c"
 			const gchar* word = NULL;
 #line 30 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			word = word_collection[word_it];
-#line 2554 "EventsDirectoryPage.c"
+#line 2341 "EventsDirectoryPage.c"
 			{
 				const gchar* _tmp13_ = NULL;
 				const gchar* _tmp14_ = NULL;
@@ -2569,7 +2356,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 					_g_object_unref0 (source);
 #line 32 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 					return result;
-#line 2573 "EventsDirectoryPage.c"
+#line 2360 "EventsDirectoryPage.c"
 				}
 			}
 		}
@@ -2580,7 +2367,7 @@ static gboolean events_directory_page_events_directory_search_view_filter_real_p
 	_g_object_unref0 (source);
 #line 35 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2584 "EventsDirectoryPage.c"
+#line 2371 "EventsDirectoryPage.c"
 }
 
 
@@ -2590,14 +2377,14 @@ static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page
 	self = (EventsDirectoryPageEventsDirectorySearchViewFilter*) search_view_filter_construct (object_type);
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2594 "EventsDirectoryPage.c"
+#line 2381 "EventsDirectoryPage.c"
 }
 
 
 static EventsDirectoryPageEventsDirectorySearchViewFilter* events_directory_page_events_directory_search_view_filter_new (void) {
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return events_directory_page_events_directory_search_view_filter_construct (EVENTS_DIRECTORY_PAGE_TYPE_EVENTS_DIRECTORY_SEARCH_VIEW_FILTER);
-#line 2601 "EventsDirectoryPage.c"
+#line 2388 "EventsDirectoryPage.c"
 }
 
 
@@ -2608,7 +2395,7 @@ static void events_directory_page_events_directory_search_view_filter_class_init
 	((SearchViewFilterClass *) klass)->get_criteria = events_directory_page_events_directory_search_view_filter_real_get_criteria;
 #line 14 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((ViewFilterClass *) klass)->predicate = events_directory_page_events_directory_search_view_filter_real_predicate;
-#line 2612 "EventsDirectoryPage.c"
+#line 2399 "EventsDirectoryPage.c"
 }
 
 
@@ -2636,9 +2423,7 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass)
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = events_directory_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->init_collect_action_entries = events_directory_page_real_init_collect_action_entries;
-#line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	((PageClass *) klass)->init_collect_toggle_action_entries = events_directory_page_real_init_collect_toggle_action_entries;
+	((PageClass *) klass)->add_actions = events_directory_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((PageClass *) klass)->init_actions = events_directory_page_real_init_actions;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2653,7 +2438,7 @@ static void events_directory_page_class_init (EventsDirectoryPageClass * klass)
 	((CheckerboardPageClass *) klass)->get_search_view_filter = events_directory_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = events_directory_page_finalize;
-#line 2657 "EventsDirectoryPage.c"
+#line 2442 "EventsDirectoryPage.c"
 }
 
 
@@ -2665,42 +2450,42 @@ static void events_directory_page_instance_init (EventsDirectoryPage * self) {
 	_tmp0_ = events_directory_page_events_directory_search_view_filter_new ();
 #line 43 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 2669 "EventsDirectoryPage.c"
+#line 2454 "EventsDirectoryPage.c"
 }
 
 
 static void events_directory_page_finalize (GObject* obj) {
 	EventsDirectoryPage * self;
-	GtkRadioAction* action = NULL;
-	GtkAction* _tmp0_ = NULL;
-	GtkRadioAction* _tmp1_ = NULL;
-	GtkRadioAction* _tmp2_ = NULL;
-	GtkRadioAction* _tmp3_ = NULL;
+	GSimpleAction* action = NULL;
+	GAction* _tmp0_ = NULL;
+	GSimpleAction* _tmp1_ = NULL;
+	GSimpleAction* _tmp2_ = NULL;
+	GSimpleAction* _tmp3_ = NULL;
 	guint _tmp4_ = 0U;
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage);
-#line 72 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSortEventsAscending");
-#line 72 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_radio_action_get_type ()) ? ((GtkRadioAction*) _tmp0_) : NULL;
-#line 72 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonSortEvents");
+#line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL;
+#line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp1_ == NULL) {
-#line 72 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2691 "EventsDirectoryPage.c"
+#line 2476 "EventsDirectoryPage.c"
 	}
-#line 72 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 75 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	action = _tmp1_;
-#line 73 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = action;
-#line 73 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_vala_assert (_tmp2_ != NULL, "action != null");
-#line 74 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 77 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = action;
-#line 74 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	g_signal_parse_name ("changed", gtk_radio_action_get_type (), &_tmp4_, NULL, FALSE);
-#line 74 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
-	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _events_directory_page_on_sort_changed_gtk_radio_action_changed, self);
+#line 77 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_signal_parse_name ("change-state", g_simple_action_get_type (), &_tmp4_, NULL, FALSE);
+#line 77 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _events_directory_page_on_sort_changed_g_simple_action_change_state, self);
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (action);
 #line 41 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
@@ -2709,7 +2494,7 @@ static void events_directory_page_finalize (GObject* obj) {
 	_view_filter_unref0 (self->priv->search_filter);
 #line 7 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	G_OBJECT_CLASS (events_directory_page_parent_class)->finalize (obj);
-#line 2713 "EventsDirectoryPage.c"
+#line 2498 "EventsDirectoryPage.c"
 }
 
 
@@ -2732,39 +2517,39 @@ MasterEventsDirectoryPage* master_events_directory_page_construct (GType object_
 	EventSourceCollection* _tmp2_ = NULL;
 	GeeCollection* _tmp3_ = NULL;
 	GeeCollection* _tmp4_ = NULL;
-#line 233 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = events_directory_page_event_directory_manager_new ();
-#line 233 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = _tmp0_;
-#line 233 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = event_global;
-#line 233 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection));
-#line 233 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 233 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = (MasterEventsDirectoryPage*) events_directory_page_construct (object_type, MASTER_EVENTS_DIRECTORY_PAGE_NAME, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VIEW_MANAGER, ViewManager), _tmp4_);
-#line 233 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 233 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_view_manager_unref0 (_tmp1_);
-#line 232 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2754 "EventsDirectoryPage.c"
+#line 2539 "EventsDirectoryPage.c"
 }
 
 
 MasterEventsDirectoryPage* master_events_directory_page_new (void) {
-#line 232 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 222 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return master_events_directory_page_construct (TYPE_MASTER_EVENTS_DIRECTORY_PAGE);
-#line 2761 "EventsDirectoryPage.c"
+#line 2546 "EventsDirectoryPage.c"
 }
 
 
 static void master_events_directory_page_class_init (MasterEventsDirectoryPageClass * klass) {
-#line 229 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 219 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	master_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 2768 "EventsDirectoryPage.c"
+#line 2553 "EventsDirectoryPage.c"
 }
 
 
@@ -2838,7 +2623,7 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	buffer = (g_free (buffer), NULL);
 #line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2842 "EventsDirectoryPage.c"
+#line 2627 "EventsDirectoryPage.c"
 }
 
 
@@ -2851,71 +2636,71 @@ SubEventsDirectoryPage* sub_events_directory_page_construct (GType object_type,
 	struct tm _tmp7_ = {0};
 	SubEventsDirectoryPageSubEventDirectoryManager* _tmp8_ = NULL;
 	SubEventsDirectoryPageSubEventDirectoryManager* _tmp9_ = NULL;
-#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (time != NULL, NULL);
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = type;
-#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_UNDATED) {
-#line 2861 "EventsDirectoryPage.c"
+#line 2646 "EventsDirectoryPage.c"
 		gchar* _tmp1_ = NULL;
-#line 293 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = g_strdup (SUB_EVENTS_DIRECTORY_PAGE_UNDATED_PAGE_NAME);
-#line 293 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (page_name);
-#line 293 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp1_;
-#line 2869 "EventsDirectoryPage.c"
+#line 2654 "EventsDirectoryPage.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
 		gchar* _tmp4_ = NULL;
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp3_ = type;
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		if (_tmp3_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_YEAR) {
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_YEAR_FORMAT;
-#line 2880 "EventsDirectoryPage.c"
+#line 2665 "EventsDirectoryPage.c"
 		} else {
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp2_ = SUB_EVENTS_DIRECTORY_PAGE_MONTH_FORMAT;
-#line 2884 "EventsDirectoryPage.c"
+#line 2669 "EventsDirectoryPage.c"
 		}
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp4_ = g_time_format (time, _tmp2_);
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_free0 (page_name);
-#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		page_name = _tmp4_;
-#line 2892 "EventsDirectoryPage.c"
+#line 2677 "EventsDirectoryPage.c"
 	}
-#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = page_name;
-#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp6_ = type;
-#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = *time;
-#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = sub_events_directory_page_sub_event_directory_manager_new (_tmp6_, &_tmp7_);
-#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = _tmp8_;
-#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = (SubEventsDirectoryPage*) events_directory_page_construct (object_type, _tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_MANAGER, ViewManager), NULL);
-#line 298 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_view_manager_unref0 (_tmp9_);
-#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_free0 (page_name);
-#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 2912 "EventsDirectoryPage.c"
+#line 2697 "EventsDirectoryPage.c"
 }
 
 
 SubEventsDirectoryPage* sub_events_directory_page_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
-#line 290 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 280 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return sub_events_directory_page_construct (TYPE_SUB_EVENTS_DIRECTORY_PAGE, type, time);
-#line 2919 "EventsDirectoryPage.c"
+#line 2704 "EventsDirectoryPage.c"
 }
 
 
@@ -2923,17 +2708,17 @@ gint sub_events_directory_page_get_month (SubEventsDirectoryPage* self) {
 	gint result = 0;
 	ViewManager* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 301 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 291 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
-#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager;
-#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_month (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager));
-#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 302 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2937 "EventsDirectoryPage.c"
+#line 2722 "EventsDirectoryPage.c"
 }
 
 
@@ -2941,17 +2726,17 @@ gint sub_events_directory_page_get_year (SubEventsDirectoryPage* self) {
 	gint result = 0;
 	ViewManager* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 305 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
-#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager;
-#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_year (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager));
-#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 306 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2955 "EventsDirectoryPage.c"
+#line 2740 "EventsDirectoryPage.c"
 }
 
 
@@ -2959,17 +2744,17 @@ SubEventsDirectoryPageDirectoryType sub_events_directory_page_get_event_director
 	SubEventsDirectoryPageDirectoryType result = 0;
 	ViewManager* _tmp0_ = NULL;
 	SubEventsDirectoryPageDirectoryType _tmp1_ = 0;
-#line 309 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_SUB_EVENTS_DIRECTORY_PAGE (self), 0);
-#line 310 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EVENTS_DIRECTORY_PAGE, EventsDirectoryPage)->view_manager;
-#line 310 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager));
-#line 310 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp1_;
-#line 310 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 300 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 2973 "EventsDirectoryPage.c"
+#line 2758 "EventsDirectoryPage.c"
 }
 
 
@@ -2979,45 +2764,45 @@ static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page
 	SubEventsDirectoryPageDirectoryType _tmp3_ = 0;
 	struct tm _tmp4_ = {0};
 	gint _tmp5_ = 0;
-#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (time != NULL, NULL);
-#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = (SubEventsDirectoryPageSubEventDirectoryManager*) events_directory_page_event_directory_manager_construct (object_type);
-#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = type;
-#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp0_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 2991 "EventsDirectoryPage.c"
+#line 2776 "EventsDirectoryPage.c"
 		struct tm _tmp1_ = {0};
 		gint _tmp2_ = 0;
-#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp1_ = *time;
-#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp2_ = _tmp1_.tm_mon;
-#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		self->priv->month = _tmp2_;
-#line 3000 "EventsDirectoryPage.c"
+#line 2785 "EventsDirectoryPage.c"
 	}
-#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = type;
-#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->type = _tmp3_;
-#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = *time;
-#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = _tmp4_.tm_year;
-#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->year = _tmp5_;
-#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return self;
-#line 3014 "EventsDirectoryPage.c"
+#line 2799 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageSubEventDirectoryManager* sub_events_directory_page_sub_event_directory_manager_new (SubEventsDirectoryPageDirectoryType type, struct tm* time) {
-#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return sub_events_directory_page_sub_event_directory_manager_construct (SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, type, time);
-#line 3021 "EventsDirectoryPage.c"
+#line 2806 "EventsDirectoryPage.c"
 }
 
 
@@ -3032,7 +2817,7 @@ static void g_time_local (time_t time, struct tm* result) {
 	*result = _result_;
 #line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
-#line 3036 "EventsDirectoryPage.c"
+#line 2821 "EventsDirectoryPage.c"
 }
 
 
@@ -3051,162 +2836,162 @@ static gboolean sub_events_directory_page_sub_event_directory_manager_real_inclu
 	struct tm _tmp7_ = {0};
 	gint _tmp8_ = 0;
 	gint _tmp9_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager);
-#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = source;
-#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp1_ = VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->include_in_view (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, EVENTS_DIRECTORY_PAGE_TYPE_EVENT_DIRECTORY_MANAGER, EventsDirectoryPageEventDirectoryManager), TYPE_VIEW_MANAGER, ViewManager), _tmp0_);
-#line 263 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (!_tmp1_) {
-#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		result = FALSE;
-#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 3069 "EventsDirectoryPage.c"
+#line 2854 "EventsDirectoryPage.c"
 	}
-#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp2_ = source;
-#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EVENT_SOURCE, EventSource));
-#line 266 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	event = _tmp3_;
-#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp4_ = event;
-#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp5_ = event_source_get_start_time (_tmp4_);
-#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_time_local (_tmp5_, &_tmp6_);
-#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	event_time = _tmp6_;
-#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp7_ = event_time;
-#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp8_ = _tmp7_.tm_year;
-#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp9_ = self->priv->year;
-#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	if (_tmp8_ == _tmp9_) {
-#line 3093 "EventsDirectoryPage.c"
+#line 2878 "EventsDirectoryPage.c"
 		SubEventsDirectoryPageDirectoryType _tmp10_ = 0;
-#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_tmp10_ = self->priv->type;
-#line 269 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		if (_tmp10_ == SUB_EVENTS_DIRECTORY_PAGE_DIRECTORY_TYPE_MONTH) {
-#line 3099 "EventsDirectoryPage.c"
+#line 2884 "EventsDirectoryPage.c"
 			struct tm _tmp11_ = {0};
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
-#line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp11_ = event_time;
-#line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp12_ = _tmp11_.tm_mon;
-#line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_tmp13_ = self->priv->month;
-#line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			result = _tmp12_ == _tmp13_;
-#line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			_g_object_unref0 (event);
-#line 270 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 			return result;
-#line 3115 "EventsDirectoryPage.c"
+#line 2900 "EventsDirectoryPage.c"
 		}
-#line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		result = TRUE;
-#line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		_g_object_unref0 (event);
-#line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 		return result;
-#line 3123 "EventsDirectoryPage.c"
+#line 2908 "EventsDirectoryPage.c"
 	}
-#line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = FALSE;
-#line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_g_object_unref0 (event);
-#line 274 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 3131 "EventsDirectoryPage.c"
+#line 2916 "EventsDirectoryPage.c"
 }
 
 
 static gint sub_events_directory_page_sub_event_directory_manager_get_month (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 277 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
-#line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = self->priv->month;
-#line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp0_;
-#line 278 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 3146 "EventsDirectoryPage.c"
+#line 2931 "EventsDirectoryPage.c"
 }
 
 
 static gint sub_events_directory_page_sub_event_directory_manager_get_year (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 281 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
-#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = self->priv->year;
-#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp0_;
-#line 282 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 272 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 3161 "EventsDirectoryPage.c"
+#line 2946 "EventsDirectoryPage.c"
 }
 
 
 static SubEventsDirectoryPageDirectoryType sub_events_directory_page_sub_event_directory_manager_get_event_directory_type (SubEventsDirectoryPageSubEventDirectoryManager* self) {
 	SubEventsDirectoryPageDirectoryType result = 0;
 	SubEventsDirectoryPageDirectoryType _tmp0_ = 0;
-#line 285 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_return_val_if_fail (SUB_EVENTS_DIRECTORY_PAGE_IS_SUB_EVENT_DIRECTORY_MANAGER (self), 0);
-#line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	_tmp0_ = self->priv->type;
-#line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	result = _tmp0_;
-#line 286 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	return result;
-#line 3176 "EventsDirectoryPage.c"
+#line 2961 "EventsDirectoryPage.c"
 }
 
 
 static void sub_events_directory_page_sub_event_directory_manager_class_init (SubEventsDirectoryPageSubEventDirectoryManagerClass * klass) {
-#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	sub_events_directory_page_sub_event_directory_manager_parent_class = g_type_class_peek_parent (klass);
-#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((ViewManagerClass *) klass)->finalize = sub_events_directory_page_sub_event_directory_manager_finalize;
-#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	g_type_class_add_private (klass, sizeof (SubEventsDirectoryPageSubEventDirectoryManagerPrivate));
-#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = sub_events_directory_page_sub_event_directory_manager_real_include_in_view;
-#line 3189 "EventsDirectoryPage.c"
+#line 2974 "EventsDirectoryPage.c"
 }
 
 
 static void sub_events_directory_page_sub_event_directory_manager_instance_init (SubEventsDirectoryPageSubEventDirectoryManager * self) {
-#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv = SUB_EVENTS_DIRECTORY_PAGE_SUB_EVENT_DIRECTORY_MANAGER_GET_PRIVATE (self);
-#line 249 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->month = 0;
-#line 250 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 240 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self->priv->year = 0;
-#line 3200 "EventsDirectoryPage.c"
+#line 2985 "EventsDirectoryPage.c"
 }
 
 
 static void sub_events_directory_page_sub_event_directory_manager_finalize (ViewManager* obj) {
 	SubEventsDirectoryPageSubEventDirectoryManager * self;
-#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SUB_EVENTS_DIRECTORY_PAGE_TYPE_SUB_EVENT_DIRECTORY_MANAGER, SubEventsDirectoryPageSubEventDirectoryManager);
-#line 248 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	VIEW_MANAGER_CLASS (sub_events_directory_page_sub_event_directory_manager_parent_class)->finalize (obj);
-#line 3210 "EventsDirectoryPage.c"
+#line 2995 "EventsDirectoryPage.c"
 }
 
 
@@ -3223,9 +3008,9 @@ static GType sub_events_directory_page_sub_event_directory_manager_get_type (voi
 
 
 static void sub_events_directory_page_class_init (SubEventsDirectoryPageClass * klass) {
-#line 237 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/events/EventsDirectoryPage.vala"
 	sub_events_directory_page_parent_class = g_type_class_peek_parent (klass);
-#line 3229 "EventsDirectoryPage.c"
+#line 3014 "EventsDirectoryPage.c"
 }
 
 
diff --git a/src/events/EventsDirectoryPage.vala b/src/events/EventsDirectoryPage.vala
index 75ac468..46fabe3 100644
--- a/src/events/EventsDirectoryPage.vala
+++ b/src/events/EventsDirectoryPage.vala
@@ -54,7 +54,7 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
         get_view().set_property(Event.PROP_SHOW_COMMENTS,
             Config.Facade.get_instance().get_display_event_comments());
         
-        init_item_context_menu("/EventsDirectoryContextMenu");
+        init_item_context_menu("EventsDirectoryContextMenu");
 
         this.view_manager = view_manager;
 
@@ -62,16 +62,19 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
         Gtk.Toolbar toolbar = get_toolbar();
         
         // merge tool
-        Gtk.ToolButton merge_button = new Gtk.ToolButton.from_stock(Resources.MERGE);
-        merge_button.set_related_action(get_action("Merge"));
+        Gtk.ToolButton merge_button = new Gtk.ToolButton (null, Resources.MERGE_LABEL);
+        merge_button.set_action_name("win.Merge");
+        merge_button.is_important = true;
+        merge_button.set_tooltip_text (Resources.MERGE_TOOLTIP);
+        merge_button.set_icon_name ("merge");
         
         toolbar.insert(merge_button, -1);
     }
     
     ~EventsDirectoryPage() {
-        Gtk.RadioAction? action = get_action("CommonSortEventsAscending") as Gtk.RadioAction;
+        var action = get_action("CommonSortEvents") as GLib.SimpleAction;
         assert(action != null);
-        action.changed.disconnect(on_sort_changed);
+        action.change_state.disconnect(on_sort_changed);
     }
     
     protected override void init_collect_ui_filenames(Gee.List<string> ui_filenames) {
@@ -101,45 +104,30 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
         else
             return event_descending_comparator;
     }
-    
-    protected override Gtk.ActionEntry[] init_collect_action_entries() {
-        Gtk.ActionEntry[] actions = base.init_collect_action_entries();
-        
-        Gtk.ActionEntry rename = { "Rename", null, TRANSLATABLE, "F2", TRANSLATABLE, on_rename };
-        rename.label = Resources.RENAME_EVENT_MENU;
-        actions += rename;
-       
-        Gtk.ActionEntry merge = { "Merge", Resources.MERGE, TRANSLATABLE, null, Resources.MERGE_TOOLTIP,
-            on_merge };
-        merge.label = Resources.MERGE_MENU;
-        actions += merge;
-        
-        Gtk.ActionEntry comment = { "EditComment", null, TRANSLATABLE, null, Resources.EDIT_COMMENT_MENU,
-            on_edit_comment };
-        comment.label = Resources.EDIT_COMMENT_MENU;
-        actions += comment;
-        
-        return actions;
-    }
-    
-    protected override Gtk.ToggleActionEntry[] init_collect_toggle_action_entries() {
-        Gtk.ToggleActionEntry[] toggle_actions = base.init_collect_toggle_action_entries();
-        
-        Gtk.ToggleActionEntry comments = { "ViewComment", null, TRANSLATABLE, "<Ctrl><Shift>C",
-            TRANSLATABLE, on_display_comments, Config.Facade.get_instance().get_display_event_comments() };
-        comments.label = _("_Comments");
-        comments.tooltip = _("Display the comment of each event");
-        toggle_actions += comments;
-        
-        return toggle_actions;
+
+    private const GLib.ActionEntry[] entries = {
+        { "Rename", on_rename },
+        { "Merge", on_merge },
+        { "EditComment", on_edit_comment },
+
+        // Toggle actions
+        { "ViewComment", on_action_toggle, null, "false", on_display_comments  }
+    };
+
+    protected override void add_actions () {
+        base.add_actions ();
+        AppWindow.get_instance ().add_action_entries (entries, this);
+
+        (get_action ("ViewComment") as GLib.SimpleAction).set_state
+            (Config.Facade.get_instance().get_display_event_comments());
     }
 
     protected override void init_actions(int selected_count, int count) {
         base.init_actions(selected_count, count);
         
-        Gtk.RadioAction? action = get_action("CommonSortEventsAscending") as Gtk.RadioAction;
+        var action = get_action("CommonSortEvents") as GLib.SimpleAction;
         assert(action != null);
-        action.changed.connect(on_sort_changed);
+        action.change_state.connect(on_sort_changed);
     }
     
     protected override void update_actions(int selected_count, int count) {
@@ -165,12 +153,12 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
         LibraryWindow.get_app().switch_to_event(event.event);
     }
     
-    private void on_sort_changed(Gtk.Action action, Gtk.Action c) {
-        Gtk.RadioAction current = (Gtk.RadioAction) c;
-        
+    private void on_sort_changed(GLib.SimpleAction action, Variant? value) {
         get_view().set_comparator(
-            get_event_comparator(current.current_value == LibraryWindow.SORT_EVENTS_ORDER_ASCENDING),
+            get_event_comparator(value.get_string() == LibraryWindow.SORT_EVENTS_ORDER_ASCENDING),
             event_comparator_predicate);
+
+        action.set_state (value);
     }
     
     private void on_rename() {
@@ -213,12 +201,14 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
         get_command_manager().execute(command);
     }
     
-    private void on_display_comments(Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active();
+    private void on_display_comments(GLib.SimpleAction action, Variant? value) {
+        bool display = value.get_boolean ();
         
         set_display_comments(display);
         
         Config.Facade.get_instance().set_display_event_comments(display);
+
+        action.set_state (value);
     }
     
     public override SearchViewFilter get_search_view_filter() {
diff --git a/src/folders/Page.c b/src/folders/Page.c
index 221e41e..f7d484f 100644
--- a/src/folders/Page.c
+++ b/src/folders/Page.c
@@ -363,7 +363,7 @@ typedef struct _MediaSourceClass MediaSourceClass;
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -373,8 +373,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -382,10 +380,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -497,13 +493,13 @@ struct _MediaPageClass {
 	void (*on_move_to_trash) (MediaPage* self);
 	void (*on_edit_title) (MediaPage* self);
 	void (*on_edit_comment) (MediaPage* self);
-	void (*on_display_titles) (MediaPage* self, GtkAction* action);
-	void (*on_display_comments) (MediaPage* self, GtkAction* action);
-	void (*on_display_ratings) (MediaPage* self, GtkAction* action);
-	void (*on_display_tags) (MediaPage* self, GtkAction* action);
+	void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by);
 	void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by);
-	void (*on_sort_changed) (MediaPage* self);
+	void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*developer_changed) (MediaPage* self, RawDeveloper rd);
 	DataView* (*create_thumbnail) (MediaPage* self, DataSource* source);
 };
@@ -709,7 +705,7 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
 	_view_manager_unref0 (self->priv->view_manager);
 #line 27 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	self->priv->view_manager = _tmp4_;
-#line 713 "Page.c"
+#line 709 "Page.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp5_ = NULL;
@@ -738,7 +734,7 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
 		_sources_it = _tmp10_;
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
 		while (TRUE) {
-#line 742 "Page.c"
+#line 738 "Page.c"
 			GeeIterator* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -758,7 +754,7 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
 			if (!_tmp12_) {
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
 				break;
-#line 762 "Page.c"
+#line 758 "Page.c"
 			}
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
 			_tmp13_ = _sources_it;
@@ -784,22 +780,22 @@ FoldersPage* folders_page_construct (GType object_type, GFile* dir) {
 			_data_collection_unref0 (_tmp16_);
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
 			_data_collection_unref0 (sources);
-#line 788 "Page.c"
+#line 784 "Page.c"
 		}
 #line 29 "/home/jens/Source/shotwell/src/folders/Page.vala"
 		_g_object_unref0 (_sources_it);
-#line 792 "Page.c"
+#line 788 "Page.c"
 	}
 #line 24 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	return self;
-#line 796 "Page.c"
+#line 792 "Page.c"
 }
 
 
 FoldersPage* folders_page_new (GFile* dir) {
 #line 24 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	return folders_page_construct (FOLDERS_TYPE_PAGE, dir);
-#line 803 "Page.c"
+#line 799 "Page.c"
 }
 
 
@@ -829,13 +825,13 @@ static void folders_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 	if (sort_order) {
 #line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
 		*sort_order = _vala_sort_order;
-#line 833 "Page.c"
+#line 829 "Page.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	if (sort_by) {
 #line 33 "/home/jens/Source/shotwell/src/folders/Page.vala"
 		*sort_by = _vala_sort_by;
-#line 839 "Page.c"
+#line 835 "Page.c"
 	}
 }
 
@@ -860,14 +856,14 @@ static void folders_page_real_set_config_photos_sort (MediaPage* base, gboolean
 	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 38 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 864 "Page.c"
+#line 860 "Page.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 14 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 871 "Page.c"
+#line 867 "Page.c"
 }
 
 
@@ -894,14 +890,14 @@ static FoldersPageFolderViewManager* folders_page_folder_view_manager_construct
 	self->dir = _tmp2_;
 #line 11 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	return self;
-#line 898 "Page.c"
+#line 894 "Page.c"
 }
 
 
 static FoldersPageFolderViewManager* folders_page_folder_view_manager_new (FoldersPage* owner, GFile* dir) {
 #line 11 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	return folders_page_folder_view_manager_construct (FOLDERS_PAGE_TYPE_FOLDER_VIEW_MANAGER, owner, dir);
-#line 905 "Page.c"
+#line 901 "Page.c"
 }
 
 
@@ -936,7 +932,7 @@ static gboolean folders_page_folder_view_manager_real_include_in_view (ViewManag
 	result = _tmp5_;
 #line 18 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	return result;
-#line 940 "Page.c"
+#line 936 "Page.c"
 }
 
 
@@ -947,7 +943,7 @@ static void folders_page_folder_view_manager_class_init (FoldersPageFolderViewMa
 	((ViewManagerClass *) klass)->finalize = folders_page_folder_view_manager_finalize;
 #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	((ViewManagerClass *) klass)->include_in_view = folders_page_folder_view_manager_real_include_in_view;
-#line 951 "Page.c"
+#line 947 "Page.c"
 }
 
 
@@ -963,7 +959,7 @@ static void folders_page_folder_view_manager_finalize (ViewManager* obj) {
 	_g_object_unref0 (self->dir);
 #line 8 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	VIEW_MANAGER_CLASS (folders_page_folder_view_manager_parent_class)->finalize (obj);
-#line 967 "Page.c"
+#line 963 "Page.c"
 }
 
 
@@ -990,14 +986,14 @@ static void folders_page_class_init (FoldersPageClass * klass) {
 	((MediaPageClass *) klass)->set_config_photos_sort = folders_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = folders_page_finalize;
-#line 994 "Page.c"
+#line 990 "Page.c"
 }
 
 
 static void folders_page_instance_init (FoldersPage * self) {
 #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	self->priv = FOLDERS_PAGE_GET_PRIVATE (self);
-#line 1001 "Page.c"
+#line 997 "Page.c"
 }
 
 
@@ -1009,7 +1005,7 @@ static void folders_page_finalize (GObject* obj) {
 	_view_manager_unref0 (self->priv->view_manager);
 #line 7 "/home/jens/Source/shotwell/src/folders/Page.vala"
 	G_OBJECT_CLASS (folders_page_parent_class)->finalize (obj);
-#line 1013 "Page.c"
+#line 1009 "Page.c"
 }
 
 
diff --git a/src/library/Branch.c b/src/library/Branch.c
index 2698af7..097a951 100644
--- a/src/library/Branch.c
+++ b/src/library/Branch.c
@@ -15,6 +15,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <gee.h>
+#include <gio/gio.h>
 
 
 #define SIDEBAR_TYPE_BRANCH (sidebar_branch_get_type ())
@@ -606,7 +607,7 @@ struct _LibraryHideablePageEntryPrivate {
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -616,8 +617,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -625,10 +624,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -740,13 +737,13 @@ struct _MediaPageClass {
 	void (*on_move_to_trash) (MediaPage* self);
 	void (*on_edit_title) (MediaPage* self);
 	void (*on_edit_comment) (MediaPage* self);
-	void (*on_display_titles) (MediaPage* self, GtkAction* action);
-	void (*on_display_comments) (MediaPage* self, GtkAction* action);
-	void (*on_display_ratings) (MediaPage* self, GtkAction* action);
-	void (*on_display_tags) (MediaPage* self, GtkAction* action);
+	void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by);
 	void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by);
-	void (*on_sort_changed) (MediaPage* self);
+	void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*developer_changed) (MediaPage* self, RawDeveloper rd);
 	DataView* (*create_thumbnail) (MediaPage* self, DataSource* source);
 };
@@ -993,35 +990,35 @@ static gint _library_branch_comparator_gcompare_func (gconstpointer a, gconstpoi
 	result = library_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 30 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 997 "Branch.c"
+#line 994 "Branch.c"
 }
 
 
 static void _library_branch_on_flagged_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
 #line 43 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_flagged_visibility_changed ((LibraryBranch*) self);
-#line 1004 "Branch.c"
+#line 1001 "Branch.c"
 }
 
 
 static void _library_branch_on_last_imported_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
 #line 46 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_last_imported_visibility_changed ((LibraryBranch*) self);
-#line 1011 "Branch.c"
+#line 1008 "Branch.c"
 }
 
 
 static void _library_branch_on_import_queue_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
 #line 49 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_import_queue_visibility_changed ((LibraryBranch*) self);
-#line 1018 "Branch.c"
+#line 1015 "Branch.c"
 }
 
 
 static void _library_branch_on_offline_visibility_changed_library_hideable_page_entry_visibility_changed (LibraryHideablePageEntry* _sender, gboolean visible, gpointer self) {
 #line 52 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_on_offline_visibility_changed ((LibraryBranch*) self);
-#line 1025 "Branch.c"
+#line 1022 "Branch.c"
 }
 
 
@@ -1140,14 +1137,14 @@ LibraryBranch* library_branch_construct (GType object_type) {
 	library_branch_on_offline_visibility_changed (self);
 #line 29 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 1144 "Branch.c"
+#line 1141 "Branch.c"
 }
 
 
 LibraryBranch* library_branch_new (void) {
 #line 29 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return library_branch_construct (LIBRARY_TYPE_BRANCH);
-#line 1151 "Branch.c"
+#line 1148 "Branch.c"
 }
 
 
@@ -1177,7 +1174,7 @@ static void library_branch_insert (LibraryBranch* self, SidebarEntry* entry, gin
 	sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp3_, _tmp4_, NULL);
 #line 58 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1181 "Branch.c"
+#line 1178 "Branch.c"
 }
 
 
@@ -1189,7 +1186,7 @@ static void library_branch_on_flagged_visibility_changed (LibraryBranch* self) {
 	_tmp0_ = self->priv->_flagged_entry;
 #line 62 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_FLAGGED);
-#line 1193 "Branch.c"
+#line 1190 "Branch.c"
 }
 
 
@@ -1201,7 +1198,7 @@ static void library_branch_on_last_imported_visibility_changed (LibraryBranch* s
 	_tmp0_ = self->priv->_last_imported_entry;
 #line 66 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_LAST_IMPORTED);
-#line 1205 "Branch.c"
+#line 1202 "Branch.c"
 }
 
 
@@ -1213,7 +1210,7 @@ static void library_branch_on_import_queue_visibility_changed (LibraryBranch* se
 	_tmp0_ = self->priv->_import_queue_entry;
 #line 70 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_IMPORT_QUEUE);
-#line 1217 "Branch.c"
+#line 1214 "Branch.c"
 }
 
 
@@ -1225,7 +1222,7 @@ static void library_branch_on_offline_visibility_changed (LibraryBranch* self) {
 	_tmp0_ = self->priv->_offline_entry;
 #line 74 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	library_branch_update_entry_visibility (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry), (gint) LIBRARY_BRANCH_ENTRY_POSITION_OFFLINE);
-#line 1229 "Branch.c"
+#line 1226 "Branch.c"
 }
 
 
@@ -1245,7 +1242,7 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library
 	_tmp2_ = _tmp1_;
 #line 78 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	if (_tmp2_) {
-#line 1249 "Branch.c"
+#line 1246 "Branch.c"
 		LibraryHideablePageEntry* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
 #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1254,7 +1251,7 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library
 		_tmp4_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 79 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		if (!_tmp4_) {
-#line 1258 "Branch.c"
+#line 1255 "Branch.c"
 			LibraryHideablePageEntry* _tmp5_ = NULL;
 			gint _tmp6_ = 0;
 #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
@@ -1263,7 +1260,7 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library
 			_tmp6_ = position;
 #line 80 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			library_branch_insert (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry), _tmp6_);
-#line 1267 "Branch.c"
+#line 1264 "Branch.c"
 		}
 	} else {
 		LibraryHideablePageEntry* _tmp7_ = NULL;
@@ -1274,13 +1271,13 @@ static void library_branch_update_entry_visibility (LibraryBranch* self, Library
 		_tmp8_ = sidebar_branch_has_entry (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 81 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		if (_tmp8_) {
-#line 1278 "Branch.c"
+#line 1275 "Branch.c"
 			LibraryHideablePageEntry* _tmp9_ = NULL;
 #line 82 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp9_ = entry;
 #line 82 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 1284 "Branch.c"
+#line 1281 "Branch.c"
 		}
 	}
 }
@@ -1308,7 +1305,7 @@ static gint library_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	result = ((gint) ((gintptr) _tmp1_)) - ((gint) ((gintptr) _tmp3_));
 #line 87 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1312 "Branch.c"
+#line 1309 "Branch.c"
 }
 
 
@@ -1323,14 +1320,14 @@ LibraryPhotosEntry* library_branch_get_photos_entry (LibraryBranch* self) {
 	result = _tmp0_;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1327 "Branch.c"
+#line 1324 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1334 "Branch.c"
+#line 1331 "Branch.c"
 }
 
 
@@ -1349,7 +1346,7 @@ static void library_branch_set_photos_entry (LibraryBranch* self, LibraryPhotosE
 	self->priv->_photos_entry = _tmp1_;
 #line 10 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_object_notify ((GObject *) self, "photos-entry");
-#line 1353 "Branch.c"
+#line 1350 "Branch.c"
 }
 
 
@@ -1364,7 +1361,7 @@ LibraryFlaggedSidebarEntry* library_branch_get_flagged_entry (LibraryBranch* sel
 	result = _tmp0_;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1368 "Branch.c"
+#line 1365 "Branch.c"
 }
 
 
@@ -1383,7 +1380,7 @@ static void library_branch_set_flagged_entry (LibraryBranch* self, LibraryFlagge
 	self->priv->_flagged_entry = _tmp1_;
 #line 11 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_object_notify ((GObject *) self, "flagged-entry");
-#line 1387 "Branch.c"
+#line 1384 "Branch.c"
 }
 
 
@@ -1398,7 +1395,7 @@ LibraryLastImportSidebarEntry* library_branch_get_last_imported_entry (LibraryBr
 	result = _tmp0_;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1402 "Branch.c"
+#line 1399 "Branch.c"
 }
 
 
@@ -1417,7 +1414,7 @@ static void library_branch_set_last_imported_entry (LibraryBranch* self, Library
 	self->priv->_last_imported_entry = _tmp1_;
 #line 12 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_object_notify ((GObject *) self, "last-imported-entry");
-#line 1421 "Branch.c"
+#line 1418 "Branch.c"
 }
 
 
@@ -1432,7 +1429,7 @@ LibraryImportQueueSidebarEntry* library_branch_get_import_queue_entry (LibraryBr
 	result = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1436 "Branch.c"
+#line 1433 "Branch.c"
 }
 
 
@@ -1451,7 +1448,7 @@ static void library_branch_set_import_queue_entry (LibraryBranch* self, LibraryI
 	self->priv->_import_queue_entry = _tmp1_;
 #line 13 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_object_notify ((GObject *) self, "import-queue-entry");
-#line 1455 "Branch.c"
+#line 1452 "Branch.c"
 }
 
 
@@ -1466,7 +1463,7 @@ LibraryOfflineSidebarEntry* library_branch_get_offline_entry (LibraryBranch* sel
 	result = _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1470 "Branch.c"
+#line 1467 "Branch.c"
 }
 
 
@@ -1485,7 +1482,7 @@ static void library_branch_set_offline_entry (LibraryBranch* self, LibraryOfflin
 	self->priv->_offline_entry = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_object_notify ((GObject *) self, "offline-entry");
-#line 1489 "Branch.c"
+#line 1486 "Branch.c"
 }
 
 
@@ -1500,7 +1497,7 @@ LibraryTrashSidebarEntry* library_branch_get_trash_entry (LibraryBranch* self) {
 	result = _tmp0_;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1504 "Branch.c"
+#line 1501 "Branch.c"
 }
 
 
@@ -1519,7 +1516,7 @@ static void library_branch_set_trash_entry (LibraryBranch* self, LibraryTrashSid
 	self->priv->_trash_entry = _tmp1_;
 #line 15 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_object_notify ((GObject *) self, "trash-entry");
-#line 1523 "Branch.c"
+#line 1520 "Branch.c"
 }
 
 
@@ -1546,14 +1543,14 @@ static void library_branch_class_init (LibraryBranchClass * klass) {
 	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_OFFLINE_ENTRY, g_param_spec_object ("offline-entry", "offline-entry", "offline-entry", LIBRARY_TYPE_OFFLINE_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_BRANCH_TRASH_ENTRY, g_param_spec_object ("trash-entry", "trash-entry", "trash-entry", LIBRARY_TYPE_TRASH_SIDEBAR_ENTRY, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 1550 "Branch.c"
+#line 1547 "Branch.c"
 }
 
 
 static void library_branch_instance_init (LibraryBranch * self) {
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self->priv = LIBRARY_BRANCH_GET_PRIVATE (self);
-#line 1557 "Branch.c"
+#line 1554 "Branch.c"
 }
 
 
@@ -1575,7 +1572,7 @@ static void library_branch_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->_trash_entry);
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	G_OBJECT_CLASS (library_branch_parent_class)->finalize (obj);
-#line 1579 "Branch.c"
+#line 1576 "Branch.c"
 }
 
 
@@ -1632,13 +1629,13 @@ static void _vala_library_branch_get_property (GObject * object, guint property_
 		g_value_set_object (value, library_branch_get_trash_entry (self));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1636 "Branch.c"
+#line 1633 "Branch.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1642 "Branch.c"
+#line 1639 "Branch.c"
 	}
 }
 
@@ -1684,13 +1681,13 @@ static void _vala_library_branch_set_property (GObject * object, guint property_
 		library_branch_set_trash_entry (self, g_value_get_object (value));
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1688 "Branch.c"
+#line 1685 "Branch.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1694 "Branch.c"
+#line 1691 "Branch.c"
 	}
 }
 
@@ -1701,14 +1698,14 @@ LibraryPhotosEntry* library_photos_entry_construct (GType object_type) {
 	self = (LibraryPhotosEntry*) sidebar_simple_page_entry_construct (object_type);
 #line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 1705 "Branch.c"
+#line 1702 "Branch.c"
 }
 
 
 LibraryPhotosEntry* library_photos_entry_new (void) {
 #line 93 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return library_photos_entry_construct (LIBRARY_TYPE_PHOTOS_ENTRY);
-#line 1712 "Branch.c"
+#line 1709 "Branch.c"
 }
 
 
@@ -1727,7 +1724,7 @@ static gchar* library_photos_entry_real_get_sidebar_name (SidebarSimplePageEntry
 	result = _tmp1_;
 #line 97 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1731 "Branch.c"
+#line 1728 "Branch.c"
 }
 
 
@@ -1743,7 +1740,7 @@ static gchar* library_photos_entry_real_get_sidebar_icon (SidebarSimplePageEntry
 	result = _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1747 "Branch.c"
+#line 1744 "Branch.c"
 }
 
 
@@ -1761,7 +1758,7 @@ static Page* library_photos_entry_real_create_page (SidebarSimplePageEntry* base
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page);
 #line 105 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1765 "Branch.c"
+#line 1762 "Branch.c"
 }
 
 
@@ -1774,7 +1771,7 @@ static void library_photos_entry_class_init (LibraryPhotosEntryClass * klass) {
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = library_photos_entry_real_get_sidebar_icon;
 #line 91 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = library_photos_entry_real_create_page;
-#line 1778 "Branch.c"
+#line 1775 "Branch.c"
 }
 
 
@@ -1800,7 +1797,7 @@ LibraryHideablePageEntry* library_hideable_page_entry_construct (GType object_ty
 	self = (LibraryHideablePageEntry*) sidebar_simple_page_entry_construct (object_type);
 #line 125 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 1804 "Branch.c"
+#line 1801 "Branch.c"
 }
 
 
@@ -1815,7 +1812,7 @@ gboolean library_hideable_page_entry_get_visible (LibraryHideablePageEntry* self
 	result = _tmp0_;
 #line 115 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return result;
-#line 1819 "Branch.c"
+#line 1816 "Branch.c"
 }
 
 
@@ -1834,7 +1831,7 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb
 	if (_tmp0_ == _tmp1_) {
 #line 118 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		return;
-#line 1838 "Branch.c"
+#line 1835 "Branch.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_tmp2_ = value;
@@ -1846,7 +1843,7 @@ void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gb
 	g_signal_emit_by_name (self, "visibility-changed", _tmp3_);
 #line 116 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_object_notify ((GObject *) self, "visible");
-#line 1850 "Branch.c"
+#line 1847 "Branch.c"
 }
 
 
@@ -1865,7 +1862,7 @@ static void library_hideable_page_entry_class_init (LibraryHideablePageEntryClas
 	g_object_class_install_property (G_OBJECT_CLASS (klass), LIBRARY_HIDEABLE_PAGE_ENTRY_VISIBLE, g_param_spec_boolean ("visible", "visible", "visible", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	g_signal_new ("visibility_changed", LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1869 "Branch.c"
+#line 1866 "Branch.c"
 }
 
 
@@ -1874,7 +1871,7 @@ static void library_hideable_page_entry_instance_init (LibraryHideablePageEntry
 	self->priv = LIBRARY_HIDEABLE_PAGE_ENTRY_GET_PRIVATE (self);
 #line 113 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self->priv->show_entry = FALSE;
-#line 1878 "Branch.c"
+#line 1875 "Branch.c"
 }
 
 
@@ -1884,7 +1881,7 @@ static void library_hideable_page_entry_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry);
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	G_OBJECT_CLASS (library_hideable_page_entry_parent_class)->finalize (obj);
-#line 1888 "Branch.c"
+#line 1885 "Branch.c"
 }
 
 
@@ -1911,13 +1908,13 @@ static void _vala_library_hideable_page_entry_get_property (GObject * object, gu
 		g_value_set_boolean (value, library_hideable_page_entry_get_visible (self));
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1915 "Branch.c"
+#line 1912 "Branch.c"
 		default:
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1921 "Branch.c"
+#line 1918 "Branch.c"
 	}
 }
 
@@ -1933,13 +1930,13 @@ static void _vala_library_hideable_page_entry_set_property (GObject * object, gu
 		library_hideable_page_entry_set_visible (self, g_value_get_boolean (value));
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1937 "Branch.c"
+#line 1934 "Branch.c"
 		default:
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 109 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		break;
-#line 1943 "Branch.c"
+#line 1940 "Branch.c"
 	}
 }
 
@@ -1948,7 +1945,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 	LibraryMainPage * self = NULL;
 #line 133 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	self = (LibraryMainPage*) collection_page_construct (object_type, LIBRARY_MAIN_PAGE_NAME);
-#line 1952 "Branch.c"
+#line 1949 "Branch.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp0_ = NULL;
@@ -1977,7 +1974,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 		_sources_it = _tmp5_;
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		while (TRUE) {
-#line 1981 "Branch.c"
+#line 1978 "Branch.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -2000,7 +1997,7 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 			if (!_tmp7_) {
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 				break;
-#line 2004 "Branch.c"
+#line 2001 "Branch.c"
 			}
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_tmp8_ = _sources_it;
@@ -2034,22 +2031,22 @@ LibraryMainPage* library_main_page_construct (GType object_type, ProgressMonitor
 			_data_collection_unref0 (_tmp11_);
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 			_data_collection_unref0 (sources);
-#line 2038 "Branch.c"
+#line 2035 "Branch.c"
 		}
 #line 135 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		_g_object_unref0 (_sources_it);
-#line 2042 "Branch.c"
+#line 2039 "Branch.c"
 	}
 #line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return self;
-#line 2046 "Branch.c"
+#line 2043 "Branch.c"
 }
 
 
 LibraryMainPage* library_main_page_new (ProgressMonitor monitor, void* monitor_target) {
 #line 132 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	return library_main_page_construct (LIBRARY_TYPE_MAIN_PAGE, monitor, monitor_target);
-#line 2053 "Branch.c"
+#line 2050 "Branch.c"
 }
 
 
@@ -2079,13 +2076,13 @@ static void library_main_page_real_get_config_photos_sort (MediaPage* base, gboo
 	if (sort_order) {
 #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		*sort_order = _vala_sort_order;
-#line 2083 "Branch.c"
+#line 2080 "Branch.c"
 	}
 #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	if (sort_by) {
 #line 139 "/home/jens/Source/shotwell/src/library/Branch.vala"
 		*sort_by = _vala_sort_by;
-#line 2089 "Branch.c"
+#line 2086 "Branch.c"
 	}
 }
 
@@ -2110,7 +2107,7 @@ static void library_main_page_real_set_config_photos_sort (MediaPage* base, gboo
 	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 144 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2114 "Branch.c"
+#line 2111 "Branch.c"
 }
 
 
@@ -2121,7 +2118,7 @@ static void library_main_page_class_init (LibraryMainPageClass * klass) {
 	((MediaPageClass *) klass)->get_config_photos_sort = library_main_page_real_get_config_photos_sort;
 #line 129 "/home/jens/Source/shotwell/src/library/Branch.vala"
 	((MediaPageClass *) klass)->set_config_photos_sort = library_main_page_real_set_config_photos_sort;
-#line 2125 "Branch.c"
+#line 2122 "Branch.c"
 }
 
 
diff --git a/src/library/FlaggedPage.c b/src/library/FlaggedPage.c
index 6ad004b..5cd3d40 100644
--- a/src/library/FlaggedPage.c
+++ b/src/library/FlaggedPage.c
@@ -14,6 +14,7 @@
 #include <string.h>
 #include <gee.h>
 #include <gdk/gdk.h>
+#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
 
@@ -409,7 +410,7 @@ typedef struct _FlaggedPageFlaggedSearchViewFilterPrivate FlaggedPageFlaggedSear
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -419,8 +420,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -428,10 +427,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -543,13 +540,13 @@ struct _MediaPageClass {
 	void (*on_move_to_trash) (MediaPage* self);
 	void (*on_edit_title) (MediaPage* self);
 	void (*on_edit_comment) (MediaPage* self);
-	void (*on_display_titles) (MediaPage* self, GtkAction* action);
-	void (*on_display_comments) (MediaPage* self, GtkAction* action);
-	void (*on_display_ratings) (MediaPage* self, GtkAction* action);
-	void (*on_display_tags) (MediaPage* self, GtkAction* action);
+	void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by);
 	void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by);
-	void (*on_sort_changed) (MediaPage* self);
+	void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*developer_changed) (MediaPage* self, RawDeveloper rd);
 	DataView* (*create_thumbnail) (MediaPage* self, DataSource* source);
 };
@@ -825,7 +822,7 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 	_view_manager_unref0 (self->priv->view_manager);
 #line 36 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self->priv->view_manager = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_MANAGER, ViewManager);
-#line 829 "FlaggedPage.c"
+#line 826 "FlaggedPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp1_ = NULL;
@@ -854,7 +851,7 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 		_sources_it = _tmp6_;
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		while (TRUE) {
-#line 858 "FlaggedPage.c"
+#line 855 "FlaggedPage.c"
 			GeeIterator* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -875,7 +872,7 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 			if (!_tmp8_) {
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 				break;
-#line 879 "FlaggedPage.c"
+#line 876 "FlaggedPage.c"
 			}
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 			_tmp9_ = _sources_it;
@@ -903,22 +900,22 @@ FlaggedPage* flagged_page_construct (GType object_type) {
 			_data_collection_unref0 (_tmp12_);
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 			_data_collection_unref0 (sources);
-#line 907 "FlaggedPage.c"
+#line 904 "FlaggedPage.c"
 		}
 #line 38 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_g_object_unref0 (_sources_it);
-#line 911 "FlaggedPage.c"
+#line 908 "FlaggedPage.c"
 	}
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 915 "FlaggedPage.c"
+#line 912 "FlaggedPage.c"
 }
 
 
 FlaggedPage* flagged_page_new (void) {
 #line 33 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return flagged_page_construct (TYPE_FLAGGED_PAGE);
-#line 922 "FlaggedPage.c"
+#line 919 "FlaggedPage.c"
 }
 
 
@@ -948,13 +945,13 @@ static void flagged_page_real_get_config_photos_sort (MediaPage* base, gboolean*
 	if (sort_order) {
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		*sort_order = _vala_sort_order;
-#line 952 "FlaggedPage.c"
+#line 949 "FlaggedPage.c"
 	}
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	if (sort_by) {
 #line 42 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		*sort_by = _vala_sort_by;
-#line 958 "FlaggedPage.c"
+#line 955 "FlaggedPage.c"
 	}
 }
 
@@ -979,14 +976,14 @@ static void flagged_page_real_set_config_photos_sort (MediaPage* base, gboolean
 	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 47 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 983 "FlaggedPage.c"
+#line 980 "FlaggedPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 990 "FlaggedPage.c"
+#line 987 "FlaggedPage.c"
 }
 
 
@@ -1005,7 +1002,7 @@ static SearchViewFilter* flagged_page_real_get_search_view_filter (CheckerboardP
 	result = _tmp1_;
 #line 51 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return result;
-#line 1009 "FlaggedPage.c"
+#line 1006 "FlaggedPage.c"
 }
 
 
@@ -1020,21 +1017,21 @@ static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_construc
 	self = (FlaggedPageFlaggedViewManager*) collection_view_manager_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_COLLECTION_PAGE, CollectionPage));
 #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 1024 "FlaggedPage.c"
+#line 1021 "FlaggedPage.c"
 }
 
 
 static FlaggedPageFlaggedViewManager* flagged_page_flagged_view_manager_new (FlaggedPage* owner) {
 #line 11 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return flagged_page_flagged_view_manager_construct (FLAGGED_PAGE_TYPE_FLAGGED_VIEW_MANAGER, owner);
-#line 1031 "FlaggedPage.c"
+#line 1028 "FlaggedPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 16 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1038 "FlaggedPage.c"
+#line 1035 "FlaggedPage.c"
 }
 
 
@@ -1060,7 +1057,7 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana
 	_tmp3_ = flaggable;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	if (_tmp3_ != NULL) {
-#line 1064 "FlaggedPage.c"
+#line 1061 "FlaggedPage.c"
 		Flaggable* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
@@ -1069,11 +1066,11 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana
 		_tmp5_ = flaggable_is_flagged (_tmp4_);
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_tmp2_ = _tmp5_;
-#line 1073 "FlaggedPage.c"
+#line 1070 "FlaggedPage.c"
 	} else {
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 		_tmp2_ = FALSE;
-#line 1077 "FlaggedPage.c"
+#line 1074 "FlaggedPage.c"
 	}
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	result = _tmp2_;
@@ -1081,7 +1078,7 @@ static gboolean flagged_page_flagged_view_manager_real_include_in_view (ViewMana
 	_g_object_unref0 (flaggable);
 #line 18 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return result;
-#line 1085 "FlaggedPage.c"
+#line 1082 "FlaggedPage.c"
 }
 
 
@@ -1090,7 +1087,7 @@ static void flagged_page_flagged_view_manager_class_init (FlaggedPageFlaggedView
 	flagged_page_flagged_view_manager_parent_class = g_type_class_peek_parent (klass);
 #line 10 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = flagged_page_flagged_view_manager_real_include_in_view;
-#line 1094 "FlaggedPage.c"
+#line 1091 "FlaggedPage.c"
 }
 
 
@@ -1119,7 +1116,7 @@ static guint flagged_page_flagged_search_view_filter_real_get_criteria (SearchVi
 	result = (guint) (((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 24 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return result;
-#line 1123 "FlaggedPage.c"
+#line 1120 "FlaggedPage.c"
 }
 
 
@@ -1129,14 +1126,14 @@ static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filt
 	self = (FlaggedPageFlaggedSearchViewFilter*) collection_page_collection_search_view_filter_construct (object_type);
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return self;
-#line 1133 "FlaggedPage.c"
+#line 1130 "FlaggedPage.c"
 }
 
 
 static FlaggedPageFlaggedSearchViewFilter* flagged_page_flagged_search_view_filter_new (void) {
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	return flagged_page_flagged_search_view_filter_construct (FLAGGED_PAGE_TYPE_FLAGGED_SEARCH_VIEW_FILTER);
-#line 1140 "FlaggedPage.c"
+#line 1137 "FlaggedPage.c"
 }
 
 
@@ -1145,7 +1142,7 @@ static void flagged_page_flagged_search_view_filter_class_init (FlaggedPageFlagg
 	flagged_page_flagged_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 22 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = flagged_page_flagged_search_view_filter_real_get_criteria;
-#line 1149 "FlaggedPage.c"
+#line 1146 "FlaggedPage.c"
 }
 
 
@@ -1178,7 +1175,7 @@ static void flagged_page_class_init (FlaggedPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = flagged_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = flagged_page_finalize;
-#line 1182 "FlaggedPage.c"
+#line 1179 "FlaggedPage.c"
 }
 
 
@@ -1195,7 +1192,7 @@ static void flagged_page_instance_init (FlaggedPage * self) {
 	_tmp1_ = flagged_page_flagged_search_view_filter_new ();
 #line 31 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	self->priv->search_filter = _tmp1_;
-#line 1199 "FlaggedPage.c"
+#line 1196 "FlaggedPage.c"
 }
 
 
@@ -1211,7 +1208,7 @@ static void flagged_page_finalize (GObject* obj) {
 	_view_filter_unref0 (self->priv->search_filter);
 #line 7 "/home/jens/Source/shotwell/src/library/FlaggedPage.vala"
 	G_OBJECT_CLASS (flagged_page_parent_class)->finalize (obj);
-#line 1215 "FlaggedPage.c"
+#line 1212 "FlaggedPage.c"
 }
 
 
diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c
index 916c8b2..261796a 100644
--- a/src/library/ImportQueuePage.c
+++ b/src/library/ImportQueuePage.c
@@ -17,6 +17,7 @@
 #include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gi18n-lib.h>
+#include <gio/gio.h>
 #include <float.h>
 #include <math.h>
 #include <pango/pango.h>
@@ -111,6 +112,16 @@ typedef struct _BatchImport BatchImport;
 typedef struct _BatchImportClass BatchImportClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
 #define TYPE_DATA_OBJECT (data_object_get_type ())
 #define DATA_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATA_OBJECT, DataObject))
 #define DATA_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_DATA_OBJECT, DataObjectClass))
@@ -173,16 +184,6 @@ typedef struct _BatchImportRollClass BatchImportRollClass;
 
 #define TYPE_IMPORT_RESULT (import_result_get_type ())
 
-#define TYPE_APP_WINDOW (app_window_get_type ())
-#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
-#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
-#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
-#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
-#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
-
-typedef struct _AppWindow AppWindow;
-typedef struct _AppWindowClass AppWindowClass;
-
 #define TYPE_DIRECTION (direction_get_type ())
 
 #define TYPE_DATA_COLLECTION (data_collection_get_type ())
@@ -304,7 +305,7 @@ typedef struct _VideoViewClass VideoViewClass;
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -314,8 +315,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -323,10 +322,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -463,20 +460,18 @@ enum  {
 	IMPORT_QUEUE_PAGE_DUMMY_PROPERTY
 };
 #define IMPORT_QUEUE_PAGE_NAME _ ("Importing…")
+static void import_queue_page_on_stop (ImportQueuePage* self);
+static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 ImportQueuePage* import_queue_page_new (void);
 ImportQueuePage* import_queue_page_construct (GType object_type);
 SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport);
 GtkToolbar* page_get_toolbar (Page* self);
-GtkAction* page_get_action (Page* self, const gchar* name);
 static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static GtkActionEntry* import_queue_page_real_init_collect_action_entries (Page* base, int* result_length1);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-#define RESOURCES_STOP_LABEL _ ("_Stop")
-#define TRANSLATABLE "translatable"
-static void import_queue_page_on_stop (ImportQueuePage* self);
-static void _import_queue_page_on_stop_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add87 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void import_queue_page_real_add_actions (Page* base);
+void page_add_actions (Page* self);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport* batch_import, gboolean allow_user_cancel);
 static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import);
 static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self);
@@ -513,8 +508,6 @@ void batch_import_schedule (BatchImport* self);
 static void import_queue_page_update_stop_action (ImportQueuePage* self);
 gint import_queue_page_get_batch_count (ImportQueuePage* self);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
-GType app_window_get_type (void) G_GNUC_CONST;
-AppWindow* app_window_get_instance (void);
 void page_window_set_busy_cursor (PageWindow* self);
 void batch_import_user_halt (BatchImport* self);
 gboolean page_is_in_view (Page* self);
@@ -551,6 +544,14 @@ void page_window_set_normal_cursor (PageWindow* self);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 static void import_queue_page_finalize (GObject* obj);
 
+static const GActionEntry IMPORT_QUEUE_PAGE_entries[1] = {{"Stop", _import_queue_page_on_stop_gsimple_action_activate_callback}};
+
+static void _import_queue_page_on_stop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 62 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+	import_queue_page_on_stop ((ImportQueuePage*) self);
+#line 553 "ImportQueuePage.c"
+}
+
 
 ImportQueuePage* import_queue_page_construct (GType object_type) {
 	ImportQueuePage * self = NULL;
@@ -558,14 +559,12 @@ ImportQueuePage* import_queue_page_construct (GType object_type) {
 	GtkToolbar* _tmp0_ = NULL;
 	GtkToolButton* stop_button = NULL;
 	GtkToolButton* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-	GtkAction* _tmp3_ = NULL;
 	GtkSeparatorToolItem* separator = NULL;
-	GtkSeparatorToolItem* _tmp4_ = NULL;
+	GtkSeparatorToolItem* _tmp2_ = NULL;
 	GtkToolItem* progress_item = NULL;
-	GtkToolItem* _tmp5_ = NULL;
-	GtkProgressBar* _tmp6_ = NULL;
-	GtkProgressBar* _tmp7_ = NULL;
+	GtkToolItem* _tmp3_ = NULL;
+	GtkProgressBar* _tmp4_ = NULL;
+	GtkProgressBar* _tmp5_ = NULL;
 #line 25 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = (ImportQueuePage*) single_photo_page_construct (object_type, IMPORT_QUEUE_PAGE_NAME, FALSE);
 #line 28 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -581,41 +580,35 @@ ImportQueuePage* import_queue_page_construct (GType object_type) {
 #line 32 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_tool_button_set_icon_name (stop_button, "stop");
 #line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop");
-#line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp3_ = _tmp2_;
-#line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_activatable_set_related_action (G_TYPE_CHECK_INSTANCE_CAST (stop_button, GTK_TYPE_ACTIVATABLE, GtkActivatable), _tmp3_);
-#line 33 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_g_object_unref0 (_tmp3_);
+	gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (stop_button, GTK_TYPE_ACTIONABLE, GtkActionable), "win.Stop");
 #line 35 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (stop_button, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 38 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp4_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	_tmp2_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 38 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_object_ref_sink (_tmp4_);
+	g_object_ref_sink (_tmp2_);
 #line 38 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	separator = _tmp4_;
+	separator = _tmp2_;
 #line 39 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_separator_tool_item_set_draw (separator, FALSE);
 #line 41 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 44 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp5_ = gtk_tool_item_new ();
+	_tmp3_ = gtk_tool_item_new ();
 #line 44 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	g_object_ref_sink (_tmp5_);
+	g_object_ref_sink (_tmp3_);
 #line 44 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	progress_item = _tmp5_;
+	progress_item = _tmp3_;
 #line 45 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_tool_item_set_expand (progress_item, TRUE);
 #line 46 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp6_ = self->priv->progress_bar;
+	_tmp4_ = self->priv->progress_bar;
 #line 46 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (progress_item, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (progress_item, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
 #line 47 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp7_ = self->priv->progress_bar;
+	_tmp5_ = self->priv->progress_bar;
 #line 47 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	gtk_progress_bar_set_show_text (_tmp7_, TRUE);
+	gtk_progress_bar_set_show_text (_tmp5_, TRUE);
 #line 49 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_toolbar_insert (toolbar, progress_item, -1);
 #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
@@ -628,14 +621,14 @@ ImportQueuePage* import_queue_page_construct (GType object_type) {
 	_g_object_unref0 (toolbar);
 #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return self;
-#line 632 "ImportQueuePage.c"
+#line 625 "ImportQueuePage.c"
 }
 
 
 ImportQueuePage* import_queue_page_new (void) {
 #line 24 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return import_queue_page_construct (TYPE_IMPORT_QUEUE_PAGE);
-#line 639 "ImportQueuePage.c"
+#line 632 "ImportQueuePage.c"
 }
 
 
@@ -655,146 +648,69 @@ static void import_queue_page_real_init_collect_ui_filenames (Page* base, GeeLis
 	_tmp1_ = ui_filenames;
 #line 59 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	PAGE_CLASS (import_queue_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_);
-#line 659 "ImportQueuePage.c"
+#line 652 "ImportQueuePage.c"
 }
 
 
-static void _import_queue_page_on_stop_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	import_queue_page_on_stop ((ImportQueuePage*) self);
-#line 666 "ImportQueuePage.c"
-}
-
-
-static void _vala_array_add87 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	if ((*length) == (*size)) {
-#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 677 "ImportQueuePage.c"
-	}
-#line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	(*array)[(*length)++] = *value;
-#line 681 "ImportQueuePage.c"
-}
-
-
-static GtkActionEntry* import_queue_page_real_init_collect_action_entries (Page* base, int* result_length1) {
+static void import_queue_page_real_add_actions (Page* base) {
 	ImportQueuePage * self;
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	gint _tmp0_ = 0;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry stop = {0};
-	GtkActionEntry _tmp2_ = {0};
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GtkActionEntry* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	GtkActionEntry _tmp6_ = {0};
-	GtkActionEntry* _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-#line 62 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
+#line 66 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_IMPORT_QUEUE_PAGE, ImportQueuePage);
-#line 63 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = PAGE_CLASS (import_queue_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_);
-#line 63 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	actions = _tmp1_;
-#line 63 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	actions_length1 = _tmp0_;
-#line 63 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_actions_size_ = actions_length1;
-#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp2_.name = "Stop";
-#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp2_.stock_id = RESOURCES_STOP_LABEL;
-#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp2_.accelerator = NULL;
-#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp2_.tooltip = TRANSLATABLE;
-#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp2_.callback = (GCallback) _import_queue_page_on_stop_gtk_action_callback;
-#line 65 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	stop = _tmp2_;
 #line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp3_ = _ ("_Stop Import");
-#line 67 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	stop.label = _tmp3_;
-#line 68 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp4_ = _ ("Stop importing photos");
-#line 68 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	stop.tooltip = _tmp4_;
+	PAGE_CLASS (import_queue_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
 #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp5_ = actions;
+	_tmp0_ = app_window_get_instance ();
 #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp5__length1 = actions_length1;
+	_tmp1_ = _tmp0_;
 #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp6_ = stop;
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), IMPORT_QUEUE_PAGE_entries, G_N_ELEMENTS (IMPORT_QUEUE_PAGE_entries), self);
 #line 69 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_vala_array_add87 (&actions, &actions_length1, &_actions_size_, &_tmp6_);
-#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp7_ = actions;
-#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp7__length1 = actions_length1;
-#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	if (result_length1) {
-#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-		*result_length1 = _tmp7__length1;
-#line 750 "ImportQueuePage.c"
-	}
-#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	result = _tmp7_;
-#line 71 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	return result;
-#line 756 "ImportQueuePage.c"
+	_g_object_unref0 (_tmp1_);
+#line 672 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_starting_batch_import_starting (BatchImport* _sender, gpointer self) {
-#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_starting ((ImportQueuePage*) self, _sender);
-#line 763 "ImportQueuePage.c"
+#line 679 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_preparing_batch_import_preparing (BatchImport* _sender, gpointer self) {
-#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_preparing ((ImportQueuePage*) self);
-#line 770 "ImportQueuePage.c"
+#line 686 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_progress_batch_import_progress (BatchImport* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) {
-#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_progress ((ImportQueuePage*) self, completed_bytes, total_bytes);
-#line 777 "ImportQueuePage.c"
+#line 693 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_imported_batch_import_imported (BatchImport* _sender, MediaSource* source, GdkPixbuf* pixbuf, gint to_follow, gpointer self) {
-#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_imported ((ImportQueuePage*) self, source, pixbuf, to_follow);
-#line 784 "ImportQueuePage.c"
+#line 700 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_import_complete_batch_import_import_complete (BatchImport* _sender, ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 81 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_import_complete ((ImportQueuePage*) self, _sender, manifest, import_roll);
-#line 791 "ImportQueuePage.c"
+#line 707 "ImportQueuePage.c"
 }
 
 
 static void _import_queue_page_on_fatal_error_batch_import_fatal_error (BatchImport* _sender, ImportResult _result_, const gchar* message, gpointer self) {
-#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_on_fatal_error ((ImportQueuePage*) self, _result_, message);
-#line 798 "ImportQueuePage.c"
+#line 714 "ImportQueuePage.c"
 }
 
 
@@ -815,86 +731,86 @@ void import_queue_page_enqueue_and_schedule (ImportQueuePage* self, BatchImport*
 	GeeArrayList* _tmp15_ = NULL;
 	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
-#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 74 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 72 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
-#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->queue;
-#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = batch_import;
-#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 73 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_vala_assert (!_tmp2_, "!queue.contains(batch_import)");
-#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = batch_import;
-#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 75 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_connect_object (_tmp3_, "starting", (GCallback) _import_queue_page_on_starting_batch_import_starting, self, 0);
-#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp4_ = batch_import;
-#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 76 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_connect_object (_tmp4_, "preparing", (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self, 0);
-#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp5_ = batch_import;
-#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_connect_object (_tmp5_, "progress", (GCallback) _import_queue_page_on_progress_batch_import_progress, self, 0);
-#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp6_ = batch_import;
-#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_connect_object (_tmp6_, "imported", (GCallback) _import_queue_page_on_imported_batch_import_imported, self, 0);
-#line 81 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp7_ = batch_import;
-#line 81 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_connect_object (_tmp7_, "import-complete", (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self, 0);
-#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp8_ = batch_import;
-#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_connect_object (_tmp8_, "fatal-error", (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self, 0);
-#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp9_ = allow_user_cancel;
-#line 84 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (!_tmp9_) {
-#line 859 "ImportQueuePage.c"
+#line 775 "ImportQueuePage.c"
 		GeeHashSet* _tmp10_ = NULL;
 		BatchImport* _tmp11_ = NULL;
-#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp10_ = self->priv->cancel_unallowed;
-#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp11_ = batch_import;
-#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
-#line 868 "ImportQueuePage.c"
+#line 784 "ImportQueuePage.c"
 	}
-#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp12_ = self->priv->queue;
-#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp13_ = batch_import;
-#line 87 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp14_ = batch_import;
-#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_emit_by_name (self, "batch-added", _tmp14_);
-#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp15_ = self->priv->queue;
-#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp17_ = _tmp16_;
-#line 90 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp17_ == 1) {
-#line 888 "ImportQueuePage.c"
+#line 804 "ImportQueuePage.c"
 		BatchImport* _tmp18_ = NULL;
-#line 91 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp18_ = batch_import;
-#line 91 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 89 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		batch_import_schedule (_tmp18_);
-#line 894 "ImportQueuePage.c"
+#line 810 "ImportQueuePage.c"
 	}
-#line 93 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
-#line 898 "ImportQueuePage.c"
+#line 814 "ImportQueuePage.c"
 }
 
 
@@ -903,19 +819,19 @@ gint import_queue_page_get_batch_count (ImportQueuePage* self) {
 	GeeArrayList* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 96 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_val_if_fail (IS_IMPORT_QUEUE_PAGE (self), 0);
-#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->queue;
-#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = _tmp1_;
-#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	result = _tmp2_;
-#line 97 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 95 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return result;
-#line 919 "ImportQueuePage.c"
+#line 835 "ImportQueuePage.c"
 }
 
 
@@ -924,44 +840,44 @@ static void import_queue_page_update_stop_action (ImportQueuePage* self) {
 	GeeHashSet* _tmp1_ = NULL;
 	BatchImport* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 100 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 98 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = self->priv->cancel_unallowed;
-#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = self->priv->current_batch;
-#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp2_);
-#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (!_tmp3_) {
-#line 938 "ImportQueuePage.c"
+#line 854 "ImportQueuePage.c"
 		GeeArrayList* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp4_ = self->priv->queue;
-#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp5_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp6_ = _tmp5_;
-#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = _tmp6_ > 0;
-#line 950 "ImportQueuePage.c"
+#line 866 "ImportQueuePage.c"
 	} else {
-#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = FALSE;
-#line 954 "ImportQueuePage.c"
+#line 870 "ImportQueuePage.c"
 	}
-#line 101 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Stop", _tmp0_);
-#line 958 "ImportQueuePage.c"
+#line 874 "ImportQueuePage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 965 "ImportQueuePage.c"
+#line 881 "ImportQueuePage.c"
 }
 
 
@@ -971,33 +887,33 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 	gint _tmp2_ = 0;
 	AppWindow* _tmp3_ = NULL;
 	AppWindow* _tmp4_ = NULL;
-#line 104 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
-#line 107 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->queue;
-#line 107 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 107 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = _tmp1_;
-#line 107 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp2_ == 0) {
-#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		return;
-#line 989 "ImportQueuePage.c"
+#line 905 "ImportQueuePage.c"
 	}
-#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = app_window_get_instance ();
-#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp4_ = _tmp3_;
-#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow));
-#line 110 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 108 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 111 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->stopped = TRUE;
-#line 1001 "ImportQueuePage.c"
+#line 917 "ImportQueuePage.c"
 	{
 		GeeArrayList* _batch_import_list = NULL;
 		GeeArrayList* _tmp5_ = NULL;
@@ -1007,25 +923,25 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
 		gint _batch_import_index = 0;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp5_ = self->priv->queue;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp6_ = _g_object_ref0 (_tmp5_);
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_batch_import_list = _tmp6_;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp7_ = _batch_import_list;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp9_ = _tmp8_;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_batch_import_size = _tmp9_;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_batch_import_index = -1;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		while (TRUE) {
-#line 1029 "ImportQueuePage.c"
+#line 945 "ImportQueuePage.c"
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
@@ -1034,39 +950,39 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 			gint _tmp14_ = 0;
 			gpointer _tmp15_ = NULL;
 			BatchImport* _tmp16_ = NULL;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp10_ = _batch_import_index;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_batch_import_index = _tmp10_ + 1;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp11_ = _batch_import_index;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp12_ = _batch_import_size;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			if (!(_tmp11_ < _tmp12_)) {
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 				break;
-#line 1050 "ImportQueuePage.c"
+#line 966 "ImportQueuePage.c"
 			}
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp13_ = _batch_import_list;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp14_ = _batch_import_index;
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_);
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			batch_import = (BatchImport*) _tmp15_;
-#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp16_ = batch_import;
-#line 115 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			batch_import_user_halt (_tmp16_);
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_g_object_unref0 (batch_import);
-#line 1066 "ImportQueuePage.c"
+#line 982 "ImportQueuePage.c"
 		}
-#line 114 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 112 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_g_object_unref0 (_batch_import_list);
-#line 1070 "ImportQueuePage.c"
+#line 986 "ImportQueuePage.c"
 	}
 }
 
@@ -1074,21 +990,21 @@ static void import_queue_page_on_stop (ImportQueuePage* self) {
 static void import_queue_page_on_starting (ImportQueuePage* self, BatchImport* batch_import) {
 	BatchImport* _tmp0_ = NULL;
 	BatchImport* _tmp1_ = NULL;
-#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 116 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
-#line 119 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
-#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = batch_import;
-#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_object_unref0 (self->priv->current_batch);
-#line 120 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->current_batch = _tmp1_;
-#line 1092 "ImportQueuePage.c"
+#line 1008 "ImportQueuePage.c"
 }
 
 
@@ -1096,19 +1012,19 @@ static void import_queue_page_on_preparing (ImportQueuePage* self) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GtkProgressBar* _tmp2_ = NULL;
-#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 121 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->progress_bar;
-#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = _ ("Preparing to import…");
-#line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 122 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = self->priv->progress_bar;
-#line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 123 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_pulse (_tmp2_);
-#line 1112 "ImportQueuePage.c"
+#line 1028 "ImportQueuePage.c"
 }
 
 
@@ -1118,36 +1034,36 @@ static void import_queue_page_on_progress (ImportQueuePage* self, guint64 comple
 	guint64 _tmp2_ = 0ULL;
 	gdouble pct = 0.0;
 	GtkProgressBar* _tmp5_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 126 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = completed_bytes;
-#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = total_bytes;
-#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp1_ <= _tmp2_) {
-#line 1130 "ImportQueuePage.c"
+#line 1046 "ImportQueuePage.c"
 		guint64 _tmp3_ = 0ULL;
 		guint64 _tmp4_ = 0ULL;
-#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp3_ = completed_bytes;
-#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp4_ = total_bytes;
-#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = ((gdouble) _tmp3_) / ((gdouble) _tmp4_);
-#line 1139 "ImportQueuePage.c"
+#line 1055 "ImportQueuePage.c"
 	} else {
-#line 130 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 128 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = 0.0;
-#line 1143 "ImportQueuePage.c"
+#line 1059 "ImportQueuePage.c"
 	}
-#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 127 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	pct = _tmp0_;
-#line 131 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp5_ = self->priv->progress_bar;
-#line 131 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_set_fraction (_tmp5_, pct);
-#line 1151 "ImportQueuePage.c"
+#line 1067 "ImportQueuePage.c"
 }
 
 
@@ -1169,79 +1085,79 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 	gchar* _tmp27_ = NULL;
 	gchar* _tmp28_ = NULL;
 	gchar* _tmp29_ = NULL;
-#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_THUMBNAIL_SOURCE (source));
-#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 136 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = to_follow;
-#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp1_ > 0) {
-#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = TRUE;
-#line 1185 "ImportQueuePage.c"
+#line 1101 "ImportQueuePage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp0_ = !_tmp2_;
-#line 1192 "ImportQueuePage.c"
+#line 1108 "ImportQueuePage.c"
 	}
-#line 140 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 138 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp0_) {
-#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		return;
-#line 1198 "ImportQueuePage.c"
+#line 1114 "ImportQueuePage.c"
 	}
-#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = pixbuf;
-#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp4_ = pixbuf;
-#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	dimensions_for_pixbuf (_tmp4_, &_tmp5_);
-#line 143 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 141 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp3_, &_tmp5_, NULL);
-#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp7_ = _tmp6_;
-#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 144 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp9_ = source;
-#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_LIBRARY_PHOTO)) {
-#line 1220 "ImportQueuePage.c"
+#line 1136 "ImportQueuePage.c"
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		ThumbnailSource* _tmp12_ = NULL;
 		PhotoView* _tmp13_ = NULL;
 		PhotoView* _tmp14_ = NULL;
 		gboolean _tmp15_ = FALSE;
-#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp11_ = _tmp10_;
-#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp12_ = source;
-#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp13_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp12_) : NULL, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp14_ = _tmp13_;
-#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp15_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_OBJECT, DataObject));
-#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp8_ = _tmp15_;
-#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 147 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 145 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1245 "ImportQueuePage.c"
+#line 1161 "ImportQueuePage.c"
 	} else {
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
@@ -1249,51 +1165,51 @@ static void import_queue_page_on_imported (ImportQueuePage* self, ThumbnailSourc
 		VideoView* _tmp19_ = NULL;
 		VideoView* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp17_ = _tmp16_;
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp18_ = source;
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp19_ = video_view_new (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_VIDEO) ? ((Video*) _tmp18_) : NULL, TYPE_VIDEO_SOURCE, VideoSource));
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp20_ = _tmp19_;
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp21_ = data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_OBJECT, DataObject));
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp8_ = _tmp21_;
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 146 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 1271 "ImportQueuePage.c"
+#line 1187 "ImportQueuePage.c"
 	}
-#line 150 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp22_ = self->priv->progress_bar;
-#line 150 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 148 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_set_ellipsize (_tmp22_, PANGO_ELLIPSIZE_MIDDLE);
-#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp23_ = self->priv->progress_bar;
-#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp24_ = _ ("Imported %s");
-#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp25_ = source;
-#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp26_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_OBJECT, DataObject));
-#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp27_ = _tmp26_;
-#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp28_ = g_strdup_printf (_tmp24_, _tmp27_);
-#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp29_ = _tmp28_;
-#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_set_text (_tmp23_, _tmp29_);
-#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_free0 (_tmp29_);
-#line 151 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_free0 (_tmp27_);
-#line 1297 "ImportQueuePage.c"
+#line 1213 "ImportQueuePage.c"
 }
 
 
@@ -1330,182 +1246,182 @@ static void import_queue_page_on_import_complete (ImportQueuePage* self, BatchIm
 	gint _tmp28_ = 0;
 	gint _tmp29_ = 0;
 	BatchImport* _tmp39_ = NULL;
-#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
-#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 152 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll));
-#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = batch_import;
-#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp1_ = self->priv->current_batch;
-#line 156 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_vala_assert (_tmp0_ == _tmp1_, "batch_import == current_batch");
-#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_object_unref0 (self->priv->current_batch);
-#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->current_batch = NULL;
-#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp2_ = self->priv->queue;
-#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp4_ = _tmp3_;
-#line 159 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 157 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_vala_assert (_tmp4_ > 0, "queue.size > 0");
-#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp5_ = self->priv->queue;
-#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp6_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp7_ = (BatchImport*) _tmp6_;
-#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp8_ = batch_import;
-#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_vala_assert (_tmp7_ == _tmp8_, "queue.get(0) == batch_import");
-#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 158 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp9_ = self->priv->queue;
-#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp10_ = batch_import;
-#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp11_ = gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
-#line 162 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 160 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	removed = _tmp11_;
-#line 163 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp12_ = removed;
-#line 163 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 161 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_vala_assert (_tmp12_, "removed");
-#line 166 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp13_ = self->priv->cancel_unallowed;
-#line 166 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp14_ = batch_import;
-#line 166 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_);
-#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp15_ = batch_import;
-#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_parse_name ("starting", TYPE_BATCH_IMPORT, &_tmp16_, NULL, FALSE);
-#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _import_queue_page_on_starting_batch_import_starting, self);
-#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp17_ = batch_import;
-#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_parse_name ("preparing", TYPE_BATCH_IMPORT, &_tmp18_, NULL, FALSE);
-#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _import_queue_page_on_preparing_batch_import_preparing, self);
-#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp19_ = batch_import;
-#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_parse_name ("progress", TYPE_BATCH_IMPORT, &_tmp20_, NULL, FALSE);
-#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 169 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _import_queue_page_on_progress_batch_import_progress, self);
-#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp21_ = batch_import;
-#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_parse_name ("imported", TYPE_BATCH_IMPORT, &_tmp22_, NULL, FALSE);
-#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 170 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_handlers_disconnect_matched (_tmp21_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _import_queue_page_on_imported_batch_import_imported, self);
-#line 173 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp23_ = batch_import;
-#line 173 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_parse_name ("import-complete", TYPE_BATCH_IMPORT, &_tmp24_, NULL, FALSE);
-#line 173 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_handlers_disconnect_matched (_tmp23_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _import_queue_page_on_import_complete_batch_import_import_complete, self);
-#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp25_ = batch_import;
-#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_parse_name ("fatal-error", TYPE_BATCH_IMPORT, &_tmp26_, NULL, FALSE);
-#line 174 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 172 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _import_queue_page_on_fatal_error_batch_import_fatal_error, self);
-#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp27_ = self->priv->queue;
-#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp29_ = _tmp28_;
-#line 177 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	if (_tmp29_ > 0) {
-#line 1434 "ImportQueuePage.c"
+#line 1350 "ImportQueuePage.c"
 		GeeArrayList* _tmp30_ = NULL;
 		gpointer _tmp31_ = NULL;
 		BatchImport* _tmp32_ = NULL;
-#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp30_ = self->priv->queue;
-#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp31_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp32_ = (BatchImport*) _tmp31_;
-#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		batch_import_schedule (_tmp32_);
-#line 178 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 176 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_g_object_unref0 (_tmp32_);
-#line 1448 "ImportQueuePage.c"
+#line 1364 "ImportQueuePage.c"
 	} else {
 		GtkProgressBar* _tmp33_ = NULL;
 		GtkProgressBar* _tmp34_ = NULL;
 		GtkProgressBar* _tmp35_ = NULL;
 		gboolean _tmp36_ = FALSE;
-#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp33_ = self->priv->progress_bar;
-#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 179 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		gtk_progress_bar_set_ellipsize (_tmp33_, PANGO_ELLIPSIZE_NONE);
-#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 180 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp34_ = self->priv->progress_bar;
-#line 182 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 180 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		gtk_progress_bar_set_text (_tmp34_, "");
-#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp35_ = self->priv->progress_bar;
-#line 183 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 181 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		gtk_progress_bar_set_fraction (_tmp35_, 0.0);
-#line 190 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 188 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		single_photo_page_blank_display (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 193 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 191 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		_tmp36_ = self->priv->stopped;
-#line 193 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 191 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		if (_tmp36_) {
-#line 1472 "ImportQueuePage.c"
+#line 1388 "ImportQueuePage.c"
 			AppWindow* _tmp37_ = NULL;
 			AppWindow* _tmp38_ = NULL;
-#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp37_ = app_window_get_instance ();
-#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_tmp38_ = _tmp37_;
-#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PAGE_WINDOW, PageWindow));
-#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 192 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 			_g_object_unref0 (_tmp38_);
-#line 1483 "ImportQueuePage.c"
+#line 1399 "ImportQueuePage.c"
 		}
-#line 196 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 194 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 		self->priv->stopped = FALSE;
-#line 1487 "ImportQueuePage.c"
+#line 1403 "ImportQueuePage.c"
 	}
-#line 199 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 197 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	import_queue_page_update_stop_action (self);
-#line 202 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 200 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp39_ = batch_import;
-#line 202 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 200 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_emit_by_name (self, "batch-removed", _tmp39_);
-#line 1495 "ImportQueuePage.c"
+#line 1411 "ImportQueuePage.c"
 }
 
 
 static void import_queue_page_on_fatal_error (ImportQueuePage* self, ImportResult _result_, const gchar* message) {
 	const gchar* _tmp0_ = NULL;
-#line 205 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 203 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (IS_IMPORT_QUEUE_PAGE (self));
-#line 205 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 203 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_return_if_fail (message != NULL);
-#line 206 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = message;
-#line 206 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
+#line 204 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	app_window_error_message (_tmp0_, NULL);
-#line 1509 "ImportQueuePage.c"
+#line 1425 "ImportQueuePage.c"
 }
 
 
@@ -1517,14 +1433,14 @@ static void import_queue_page_class_init (ImportQueuePageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = import_queue_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	((PageClass *) klass)->init_collect_action_entries = import_queue_page_real_init_collect_action_entries;
+	((PageClass *) klass)->add_actions = import_queue_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	G_OBJECT_CLASS (klass)->finalize = import_queue_page_finalize;
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_new ("batch_added", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT);
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	g_signal_new ("batch_removed", TYPE_IMPORT_QUEUE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_BATCH_IMPORT);
-#line 1528 "ImportQueuePage.c"
+#line 1444 "ImportQueuePage.c"
 }
 
 
@@ -1552,7 +1468,7 @@ static void import_queue_page_instance_init (ImportQueuePage * self) {
 	self->priv->progress_bar = _tmp2_;
 #line 14 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	self->priv->stopped = FALSE;
-#line 1556 "ImportQueuePage.c"
+#line 1472 "ImportQueuePage.c"
 }
 
 
@@ -1570,7 +1486,7 @@ static void import_queue_page_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->progress_bar);
 #line 7 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	G_OBJECT_CLASS (import_queue_page_parent_class)->finalize (obj);
-#line 1574 "ImportQueuePage.c"
+#line 1490 "ImportQueuePage.c"
 }
 
 
diff --git a/src/library/ImportQueuePage.vala b/src/library/ImportQueuePage.vala
index b5a5eb6..a2f2290 100644
--- a/src/library/ImportQueuePage.vala
+++ b/src/library/ImportQueuePage.vala
@@ -30,7 +30,7 @@ public class ImportQueuePage : SinglePhotoPage {
         // Stop button
         Gtk.ToolButton stop_button = new Gtk.ToolButton(null, null);
         stop_button.set_icon_name("stop");
-        stop_button.set_related_action(get_action("Stop"));
+        stop_button.set_action_name ("win.Stop");
         
         toolbar.insert(stop_button, -1);
 
@@ -58,17 +58,15 @@ public class ImportQueuePage : SinglePhotoPage {
         
         base.init_collect_ui_filenames(ui_filenames);
     }
-    
-    protected override Gtk.ActionEntry[] init_collect_action_entries() {
-        Gtk.ActionEntry[] actions = base.init_collect_action_entries();
-        
-        Gtk.ActionEntry stop = { "Stop", Resources.STOP_LABEL, TRANSLATABLE, null, TRANSLATABLE,
-            on_stop };
-        stop.label = _("_Stop Import");
-        stop.tooltip = _("Stop importing photos");
-        actions += stop;
 
-        return actions;
+    private const GLib.ActionEntry[] entries = {
+        {"Stop", on_stop }
+    };
+
+    protected override void add_actions () {
+        base.add_actions ();
+
+        AppWindow.get_instance ().add_action_entries (entries, this);
     }
     
     public void enqueue_and_schedule(BatchImport batch_import, bool allow_user_cancel) {
diff --git a/src/library/LastImportPage.c b/src/library/LastImportPage.c
index c9bd6df..38da28c 100644
--- a/src/library/LastImportPage.c
+++ b/src/library/LastImportPage.c
@@ -14,6 +14,7 @@
 #include <string.h>
 #include <gee.h>
 #include <gdk/gdk.h>
+#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
 
@@ -367,7 +368,7 @@ typedef struct _MediaSourceClass MediaSourceClass;
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -377,8 +378,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -386,10 +385,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -501,13 +498,13 @@ struct _MediaPageClass {
 	void (*on_move_to_trash) (MediaPage* self);
 	void (*on_edit_title) (MediaPage* self);
 	void (*on_edit_comment) (MediaPage* self);
-	void (*on_display_titles) (MediaPage* self, GtkAction* action);
-	void (*on_display_comments) (MediaPage* self, GtkAction* action);
-	void (*on_display_ratings) (MediaPage* self, GtkAction* action);
-	void (*on_display_tags) (MediaPage* self, GtkAction* action);
+	void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by);
 	void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by);
-	void (*on_sort_changed) (MediaPage* self);
+	void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*developer_changed) (MediaPage* self, RawDeveloper rd);
 	DataView* (*create_thumbnail) (MediaPage* self, DataSource* source);
 };
@@ -711,7 +708,7 @@ static void last_import_page_finalize (GObject* obj);
 static void _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered (MediaSourceCollection* _sender, gpointer self) {
 #line 41 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	last_import_page_on_import_rolls_altered ((LastImportPage*) self);
-#line 715 "LastImportPage.c"
+#line 712 "LastImportPage.c"
 }
 
 
@@ -719,7 +716,7 @@ LastImportPage* last_import_page_construct (GType object_type) {
 	LastImportPage * self = NULL;
 #line 28 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = (LastImportPage*) collection_page_construct (object_type, LAST_IMPORT_PAGE_NAME);
-#line 723 "LastImportPage.c"
+#line 720 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
 		MediaCollectionRegistry* _tmp0_ = NULL;
@@ -748,7 +745,7 @@ LastImportPage* last_import_page_construct (GType object_type) {
 		_col_it = _tmp5_;
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		while (TRUE) {
-#line 752 "LastImportPage.c"
+#line 749 "LastImportPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			MediaSourceCollection* col = NULL;
@@ -763,7 +760,7 @@ LastImportPage* last_import_page_construct (GType object_type) {
 			if (!_tmp7_) {
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 				break;
-#line 767 "LastImportPage.c"
+#line 764 "LastImportPage.c"
 			}
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp8_ = _col_it;
@@ -777,24 +774,24 @@ LastImportPage* last_import_page_construct (GType object_type) {
 			g_signal_connect_object (_tmp10_, "import-roll-altered", (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self, 0);
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_data_collection_unref0 (col);
-#line 781 "LastImportPage.c"
+#line 778 "LastImportPage.c"
 		}
 #line 31 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_g_object_unref0 (_col_it);
-#line 785 "LastImportPage.c"
+#line 782 "LastImportPage.c"
 	}
 #line 36 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	last_import_page_on_import_rolls_altered (self);
 #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return self;
-#line 791 "LastImportPage.c"
+#line 788 "LastImportPage.c"
 }
 
 
 LastImportPage* last_import_page_new (void) {
 #line 27 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return last_import_page_construct (TYPE_LAST_IMPORT_PAGE);
-#line 798 "LastImportPage.c"
+#line 795 "LastImportPage.c"
 }
 
 
@@ -832,7 +829,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 	_tmp4_ = current_last_import_id;
 #line 50 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	if (_tmp4_ == NULL) {
-#line 836 "LastImportPage.c"
+#line 833 "LastImportPage.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -857,7 +854,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 		_import_id_free0 (current_last_import_id);
 #line 54 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		return;
-#line 861 "LastImportPage.c"
+#line 858 "LastImportPage.c"
 	}
 #line 57 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_tmp9_ = current_last_import_id;
@@ -873,7 +870,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 		_import_id_free0 (current_last_import_id);
 #line 58 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		return;
-#line 877 "LastImportPage.c"
+#line 874 "LastImportPage.c"
 	}
 #line 60 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_tmp13_ = current_last_import_id;
@@ -895,7 +892,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection));
 #line 63 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_data_collection_unref0 (_tmp17_);
-#line 899 "LastImportPage.c"
+#line 896 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
 		MediaCollectionRegistry* _tmp18_ = NULL;
@@ -924,7 +921,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 		_col_it = _tmp23_;
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		while (TRUE) {
-#line 928 "LastImportPage.c"
+#line 925 "LastImportPage.c"
 			GeeIterator* _tmp24_ = NULL;
 			gboolean _tmp25_ = FALSE;
 			MediaSourceCollection* col = NULL;
@@ -947,7 +944,7 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 			if (!_tmp25_) {
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 				break;
-#line 951 "LastImportPage.c"
+#line 948 "LastImportPage.c"
 			}
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp26_ = _col_it;
@@ -981,15 +978,15 @@ static void last_import_page_on_import_rolls_altered (LastImportPage* self) {
 			_data_collection_unref0 (_tmp29_);
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_data_collection_unref0 (col);
-#line 985 "LastImportPage.c"
+#line 982 "LastImportPage.c"
 		}
 #line 65 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_g_object_unref0 (_col_it);
-#line 989 "LastImportPage.c"
+#line 986 "LastImportPage.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_import_id_free0 (current_last_import_id);
-#line 993 "LastImportPage.c"
+#line 990 "LastImportPage.c"
 }
 
 
@@ -1019,13 +1016,13 @@ static void last_import_page_real_get_config_photos_sort (MediaPage* base, gbool
 	if (sort_order) {
 #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1023 "LastImportPage.c"
+#line 1020 "LastImportPage.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	if (sort_by) {
 #line 71 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1029 "LastImportPage.c"
+#line 1026 "LastImportPage.c"
 	}
 }
 
@@ -1050,7 +1047,7 @@ static void last_import_page_real_set_config_photos_sort (MediaPage* base, gbool
 	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 76 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1054 "LastImportPage.c"
+#line 1051 "LastImportPage.c"
 }
 
 
@@ -1072,14 +1069,14 @@ static LastImportPageLastImportViewManager* last_import_page_last_import_view_ma
 	self->priv->import_id = _tmp1_;
 #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return self;
-#line 1076 "LastImportPage.c"
+#line 1073 "LastImportPage.c"
 }
 
 
 static LastImportPageLastImportViewManager* last_import_page_last_import_view_manager_new (LastImportPage* owner, ImportID* import_id) {
 #line 13 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return last_import_page_last_import_view_manager_construct (LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, owner, import_id);
-#line 1083 "LastImportPage.c"
+#line 1080 "LastImportPage.c"
 }
 
 
@@ -1109,7 +1106,7 @@ static gboolean last_import_page_last_import_view_manager_real_include_in_view (
 	result = _tmp2_ == _tmp4_;
 #line 20 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	return result;
-#line 1113 "LastImportPage.c"
+#line 1110 "LastImportPage.c"
 }
 
 
@@ -1122,14 +1119,14 @@ static void last_import_page_last_import_view_manager_class_init (LastImportPage
 	g_type_class_add_private (klass, sizeof (LastImportPageLastImportViewManagerPrivate));
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = last_import_page_last_import_view_manager_real_include_in_view;
-#line 1126 "LastImportPage.c"
+#line 1123 "LastImportPage.c"
 }
 
 
 static void last_import_page_last_import_view_manager_instance_init (LastImportPageLastImportViewManager * self) {
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self->priv = LAST_IMPORT_PAGE_LAST_IMPORT_VIEW_MANAGER_GET_PRIVATE (self);
-#line 1133 "LastImportPage.c"
+#line 1130 "LastImportPage.c"
 }
 
 
@@ -1139,7 +1136,7 @@ static void last_import_page_last_import_view_manager_finalize (ViewManager* obj
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, LAST_IMPORT_PAGE_TYPE_LAST_IMPORT_VIEW_MANAGER, LastImportPageLastImportViewManager);
 #line 10 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	VIEW_MANAGER_CLASS (last_import_page_last_import_view_manager_parent_class)->finalize (obj);
-#line 1143 "LastImportPage.c"
+#line 1140 "LastImportPage.c"
 }
 
 
@@ -1166,7 +1163,7 @@ static void last_import_page_class_init (LastImportPageClass * klass) {
 	((MediaPageClass *) klass)->set_config_photos_sort = last_import_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = last_import_page_finalize;
-#line 1170 "LastImportPage.c"
+#line 1167 "LastImportPage.c"
 }
 
 
@@ -1180,7 +1177,7 @@ static void last_import_page_instance_init (LastImportPage * self) {
 	_tmp0_ = alteration_new ("metadata", "import-id");
 #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self->priv->last_import_alteration = _tmp0_;
-#line 1184 "LastImportPage.c"
+#line 1181 "LastImportPage.c"
 }
 
 
@@ -1188,7 +1185,7 @@ static void last_import_page_finalize (GObject* obj) {
 	LastImportPage * self;
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LAST_IMPORT_PAGE, LastImportPage);
-#line 1192 "LastImportPage.c"
+#line 1189 "LastImportPage.c"
 	{
 		GeeIterator* _col_it = NULL;
 		MediaCollectionRegistry* _tmp0_ = NULL;
@@ -1217,7 +1214,7 @@ static void last_import_page_finalize (GObject* obj) {
 		_col_it = _tmp5_;
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		while (TRUE) {
-#line 1221 "LastImportPage.c"
+#line 1218 "LastImportPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			MediaSourceCollection* col = NULL;
@@ -1233,7 +1230,7 @@ static void last_import_page_finalize (GObject* obj) {
 			if (!_tmp7_) {
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 				break;
-#line 1237 "LastImportPage.c"
+#line 1234 "LastImportPage.c"
 			}
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_tmp8_ = _col_it;
@@ -1249,17 +1246,17 @@ static void last_import_page_finalize (GObject* obj) {
 			g_signal_handlers_disconnect_matched (_tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _last_import_page_on_import_rolls_altered_media_source_collection_import_roll_altered, self);
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 			_data_collection_unref0 (col);
-#line 1253 "LastImportPage.c"
+#line 1250 "LastImportPage.c"
 		}
 #line 40 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 		_g_object_unref0 (_col_it);
-#line 1257 "LastImportPage.c"
+#line 1254 "LastImportPage.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	_alteration_unref0 (self->priv->last_import_alteration);
 #line 7 "/home/jens/Source/shotwell/src/library/LastImportPage.vala"
 	G_OBJECT_CLASS (last_import_page_parent_class)->finalize (obj);
-#line 1263 "LastImportPage.c"
+#line 1260 "LastImportPage.c"
 }
 
 
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index d1dff0e..b300d1c 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -13,8 +13,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gee.h>
-#include <gdk/gdk.h>
 #include <gio/gio.h>
+#include <gdk/gdk.h>
 #include <glib/gi18n-lib.h>
 #include <gphoto2/gphoto2-camera.h>
 #include <gphoto.h>
@@ -435,7 +435,6 @@ typedef struct _DiscoveredCameraClass DiscoveredCameraClass;
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _one_shot_scheduler_unref0(var) ((var == NULL) ? NULL : (var = (one_shot_scheduler_unref (var), NULL)))
 #define _search_filter_actions_unref0(var) ((var == NULL) ? NULL : (var = (search_filter_actions_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY (sidebar_simple_page_entry_get_type ())
 #define SIDEBAR_SIMPLE_PAGE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry))
@@ -476,6 +475,7 @@ typedef struct _ViewCollectionClass ViewCollectionClass;
 
 typedef struct _ViewFilter ViewFilter;
 typedef struct _ViewFilterClass ViewFilterClass;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
 
 #define TYPE_CHECKERBOARD_PAGE (checkerboard_page_get_type ())
 #define CHECKERBOARD_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHECKERBOARD_PAGE, CheckerboardPage))
@@ -821,6 +821,7 @@ typedef struct _CameraSidebarEntryClass CameraSidebarEntryClass;
 typedef struct _ImportPage ImportPage;
 typedef struct _ImportPageClass ImportPageClass;
 typedef struct _DiscoveredCameraPrivate DiscoveredCameraPrivate;
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define SIDEBAR_TYPE_EXPANDABLE_ENTRY (sidebar_expandable_entry_get_type ())
 #define SIDEBAR_EXPANDABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_EXPANDABLE_ENTRY, SidebarExpandableEntry))
@@ -926,13 +927,12 @@ typedef struct _LibraryWindowFullscreenPhotoPagePrivate LibraryWindowFullscreenP
 #define _vala_warn_if_fail(expr, msg) if G_LIKELY (expr) ; else g_warn_message (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 
 struct _PageWindow {
-	GtkWindow parent_instance;
+	GtkApplicationWindow parent_instance;
 	PageWindowPrivate * priv;
-	GtkUIManager* ui;
 };
 
 struct _PageWindowClass {
-	GtkWindowClass parent_class;
+	GtkApplicationWindowClass parent_class;
 	void (*switched_pages) (PageWindow* self, Page* old_page, Page* new_page);
 	void (*set_current_page) (PageWindow* self, Page* page);
 	void (*clear_current_page) (PageWindow* self);
@@ -946,8 +946,6 @@ struct _Dimensions {
 struct _AppWindow {
 	PageWindow parent_instance;
 	AppWindowPrivate * priv;
-	GtkActionGroup** common_action_groups;
-	gint common_action_groups_length1;
 	gboolean maximized;
 	Dimensions dimensions;
 	gint pos_x;
@@ -959,8 +957,7 @@ struct _AppWindowClass {
 	void (*on_fullscreen) (AppWindow* self);
 	gchar* (*get_app_role) (AppWindow* self);
 	void (*on_quit) (AppWindow* self);
-	GtkActionGroup** (*create_common_action_groups) (AppWindow* self, int* result_length1);
-	void (*replace_common_placeholders) (AppWindow* self, GtkUIManager* ui);
+	void (*add_actions) (AppWindow* self);
 	void (*update_common_action_availability) (AppWindow* self, Page* old_page, Page* new_page);
 	void (*update_common_actions) (AppWindow* self, Page* page, gint selected_count, gint count);
 };
@@ -989,7 +986,6 @@ struct _LibraryWindowPrivate {
 	GtkPaned* sidebar_paned;
 	GtkPaned* client_paned;
 	GtkFrame* bottom_frame;
-	GtkActionGroup* common_action_group;
 	OneShotScheduler* properties_scheduler;
 	gboolean notify_library_is_home_dir;
 	SidebarTree* sidebar_tree;
@@ -1070,7 +1066,7 @@ struct _SidebarExpandableEntryIface {
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -1080,8 +1076,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -1089,10 +1083,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -1367,8 +1359,8 @@ SearchFilterActions* search_filter_actions_construct (GType object_type);
 BasicProperties* basic_properties_new (void);
 BasicProperties* basic_properties_construct (GType object_type);
 #define LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH 120
-#define LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING 0
-#define LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING 1
+#define LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING "ascending"
+#define LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING "descending"
 #define LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC 250
 #define LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES 20
 #define LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY 35
@@ -1377,6 +1369,36 @@ BasicProperties* basic_properties_construct (GType object_type);
 #define LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY 30
 #define LIBRARY_WINDOW_TAG_PATH_MIME_TYPE "shotwell/tag-path"
 #define LIBRARY_WINDOW_MEDIA_LIST_MIME_TYPE "shotwell/media-id-atom"
+static void library_window_on_file_import (LibraryWindow* self);
+static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void library_window_on_external_library_import (LibraryWindow* self);
+static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void library_window_on_preferences (LibraryWindow* self);
+static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void library_window_on_empty_trash (LibraryWindow* self);
+static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void library_window_on_jump_to_event (LibraryWindow* self);
+static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void library_window_on_find (LibraryWindow* self);
+static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void library_window_on_new_search (LibraryWindow* self);
+static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void library_window_on_action_toggle (LibraryWindow* self, GAction* action, GVariant* value);
+static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void library_window_on_display_basic_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value);
+static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+static void library_window_on_display_extended_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value);
+static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAction* action, GVariant* value);
+static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleAction* action, GVariant* variant);
+static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleAction* action, GVariant* variant);
+static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value);
+static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleAction* action, GVariant* value);
+static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
 LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target);
 LibraryWindow* library_window_construct (GType object_type, ProgressMonitor progress_monitor, void* progress_monitor_target);
 AppWindow* app_window_construct (GType object_type);
@@ -1393,7 +1415,6 @@ OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback cal
 OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target);
 SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions);
 SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchFilterActions* actions);
-GFile* resources_get_ui (const gchar* filename);
 static void library_window_create_layout (LibraryWindow* self, Page* start_page);
 GType sidebar_simple_page_entry_get_type (void) G_GNUC_CONST;
 GType library_photos_entry_get_type (void) G_GNUC_CONST;
@@ -1412,76 +1433,9 @@ static void library_window_on_library_monitor_auto_import_preparing (LibraryWind
 static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self);
 static void library_window_on_library_monitor_auto_import_progress (LibraryWindow* self, guint64 completed_bytes, guint64 total_bytes);
 static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self);
-static GtkActionEntry* library_window_create_common_actions (LibraryWindow* self, int* result_length1);
-#define RESOURCES_IMPORT "shotwell-import"
-#define TRANSLATABLE "translatable"
-static void library_window_on_file_import (LibraryWindow* self);
-static void _library_window_on_file_import_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add61 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void library_window_on_external_library_import (LibraryWindow* self);
-static void _library_window_on_external_library_import_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add62 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add63 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_PREFERENCES_LABEL _ ("_Preferences")
-static void library_window_on_preferences (LibraryWindow* self);
-static void _library_window_on_preferences_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PREFERENCES_MENU _ ("_Preferences")
-static void _vala_array_add64 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void library_window_on_empty_trash (LibraryWindow* self);
-static void _library_window_on_empty_trash_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add65 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void library_window_on_jump_to_event (LibraryWindow* self);
-static void _library_window_on_jump_to_event_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add66 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void library_window_on_find (LibraryWindow* self);
-static void _library_window_on_find_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add67 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_FILTER_PHOTOS_MENU _ ("_Filter Photos")
-static void _vala_array_add68 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void library_window_on_new_search (LibraryWindow* self);
-static void _library_window_on_new_search_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add69 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add70 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add71 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add72 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add73 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add74 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add75 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add76 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void _vala_array_add77 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static GtkToggleActionEntry* library_window_create_common_toggle_actions (LibraryWindow* self, int* result_length1);
-static void library_window_on_display_basic_properties (LibraryWindow* self, GtkAction* action);
-static void _library_window_on_display_basic_properties_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add78 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-static void library_window_on_display_extended_properties (LibraryWindow* self, GtkAction* action);
-static void _library_window_on_display_extended_properties_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add79 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-static void library_window_on_display_searchbar (LibraryWindow* self, GtkAction* action);
-static void _library_window_on_display_searchbar_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add80 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-static void library_window_on_display_sidebar (LibraryWindow* self, GtkAction* action);
-static void _library_window_on_display_sidebar_gtk_action_callback (GtkAction* action, gpointer self);
-static gboolean library_window_is_sidebar_visible (LibraryWindow* self);
-static void _vala_array_add81 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-static void library_window_on_display_toolbar (LibraryWindow* self, GtkAction* action);
-static void _library_window_on_display_toolbar_gtk_action_callback (GtkAction* action, gpointer self);
-static gboolean library_window_is_toolbar_visible (LibraryWindow* self);
-static void _vala_array_add82 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
-static void library_window_add_common_radio_actions (LibraryWindow* self, GtkActionGroup* group);
-#define RESOURCES_SORT_ASCENDING_LABEL _ ("Sort _Ascending")
-static void _vala_array_add83 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-#define RESOURCES_SORT_DESCENDING_LABEL _ ("Sort _Descending")
-static void _vala_array_add84 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value);
-static void library_window_on_events_sort_changed (LibraryWindow* self, GtkAction* action, GtkAction* c);
-static void _library_window_on_events_sort_changed_gtk_radio_action_callback (GtkAction* action, GtkAction* current, gpointer self);
-static GtkActionGroup** library_window_real_create_common_action_groups (AppWindow* base, int* result_length1);
-GtkActionGroup** app_window_create_common_action_groups (AppWindow* self, int* result_length1);
-#define RESOURCES_FIND_LABEL _ ("Find")
-static void _vala_array_add85 (GtkActionGroup*** array, int* length, int* size, GtkActionGroup* value);
-GtkActionGroup* search_filter_actions_get_action_group (SearchFilterActions* self);
-static void _vala_array_add86 (GtkActionGroup*** array, int* length, int* size, GtkActionGroup* value);
-static void library_window_real_replace_common_placeholders (AppWindow* base, GtkUIManager* ui);
-void app_window_replace_common_placeholders (AppWindow* self, GtkUIManager* ui);
+static void library_window_real_add_actions (AppWindow* base);
+void app_window_add_actions (AppWindow* self);
+GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int* result_length1);
 static void library_window_real_switched_pages (PageWindow* base, Page* old_page, Page* new_page);
 void page_window_switched_pages (PageWindow* self, Page* old_page, Page* new_page);
 GType view_collection_get_type (void) G_GNUC_CONST;
@@ -1501,14 +1455,15 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 static void library_window_on_view_filter_refreshed (LibraryWindow* self);
 static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self);
 gboolean view_collection_are_items_filtered_out (ViewCollection* self);
-GtkAction* app_window_get_common_action (AppWindow* self, const gchar* name);
+static GVariant* _variant_new1 (gboolean value);
 static void library_window_real_show_all (GtkWidget* base);
-GtkAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning);
+GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_warning);
 GType checkerboard_page_get_type (void) G_GNUC_CONST;
 static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPage* page);
 static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show, CheckerboardPage* page);
 static gboolean library_window_should_show_search_bar (LibraryWindow* self);
 static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean visible);
+static gboolean library_window_is_sidebar_visible (LibraryWindow* self);
 LibraryWindow* library_window_get_app (void);
 gboolean library_window_is_mount_uri_supported (const gchar* uri);
 static gchar* library_window_real_get_app_role (AppWindow* base);
@@ -1602,6 +1557,7 @@ void saved_search_dialog_show (SavedSearchDialog* self);
 DataSource* view_collection_get_selected_source_at (ViewCollection* self, gint index);
 Event* media_source_get_event (MediaSource* self);
 void library_window_switch_to_event (LibraryWindow* self, Event* event);
+static GVariant* _variant_new2 (gboolean value);
 void search_filter_toolbar_take_focus (SearchFilterToolbar* self);
 static void library_window_on_clear_search (LibraryWindow* self);
 void search_filter_actions_reset (SearchFilterActions* self);
@@ -1610,6 +1566,8 @@ void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self,
 void preferences_dialog_show (void);
 void properties_update_properties (Properties* self, Page* page);
 void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display);
+static gboolean _variant_get3 (GVariant* value);
+static GVariant* _variant_new4 (gboolean value);
 void extended_properties_window_update_properties (ExtendedPropertiesWindow* self, Page* page);
 void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gboolean display);
 void library_window_show_search_bar (LibraryWindow* self, gboolean display);
@@ -1618,8 +1576,10 @@ gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self);
 static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean visible);
 GtkToolbar* page_get_toolbar (Page* self);
 void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboolean display);
+static gboolean library_window_is_toolbar_visible (LibraryWindow* self);
 gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self);
 static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show);
+static GVariant* _variant_new5 (gboolean value);
 void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, gboolean display);
 GType batch_import_get_type (void) G_GNUC_CONST;
 void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batch_import, gboolean allow_user_cancel);
@@ -1688,9 +1648,13 @@ GType import_page_get_type (void) G_GNUC_CONST;
 gboolean import_page_unmount_camera (ImportPage* self, GMount* mount);
 static void library_window_remove_from_stack (LibraryWindow* self, Page* page);
 gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade* self);
+static GVariant* _variant_new6 (gboolean value);
 gboolean configuration_facade_get_display_extended_properties (ConfigurationFacade* self);
+static GVariant* _variant_new7 (gboolean value);
 gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self);
+static GVariant* _variant_new8 (gboolean value);
 gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self);
+static GVariant* _variant_new9 (const gchar* value);
 static void library_window_start_pulse_background_progress_bar (LibraryWindow* self, const gchar* label, gint priority);
 static void library_window_stop_pulse_background_progress_bar (LibraryWindow* self, gint priority, gboolean clear);
 static void library_window_show_background_progress_bar (LibraryWindow* self);
@@ -1703,6 +1667,7 @@ gint configuration_facade_get_sidebar_position (ConfigurationFacade* self);
 gint library_window_get_PAGE_MIN_WIDTH (void);
 static void library_window_real_set_current_page (PageWindow* base, Page* page);
 void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable);
+void application_set_menubar (GMenuModel* model);
 void page_switching_from (Page* self);
 void sidebar_tree_enable_editing (SidebarTree* self);
 void page_window_set_current_page (PageWindow* self, Page* page);
@@ -1714,6 +1679,7 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo
 static void library_window_on_update_properties (LibraryWindow* self);
 static void library_window_subscribe_for_basic_information (LibraryWindow* self, Page* page);
 void page_switched_to (Page* self);
+GMenuModel* page_get_menubar (Page* self);
 void page_ready (Page* self);
 GType search_view_filter_get_type (void) G_GNUC_CONST;
 void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchViewFilter* search_filter);
@@ -1767,88 +1733,89 @@ static gint _vala_array_length (gpointer array);
 
 static const gchar* LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES[3] = {"gphoto2:", "disk:", "file:"};
 const GtkTargetEntry LIBRARY_WINDOW_DND_TARGET_ENTRIES[3] = {{"text/uri-list", (guint) GTK_TARGET_OTHER_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_URI_LIST}, {LIBRARY_WINDOW_MEDIA_LIST_MIME_TYPE, (guint) GTK_TARGET_SAME_APP, (guint) LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST}, {LIBRARY_WINDOW_TAG_PATH_MIME_TYPE, (guint) GTK_TARGET_SAME_WIDGET, (guint) LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH}};
+static const GActionEntry LIBRARY_WINDOW_common_actions[13] = {{"CommonFileImport", _library_window_on_file_import_gsimple_action_activate_callback}, {"ExternalLibraryImport", _library_window_on_external_library_import_gsimple_action_activate_callback}, {"CommonPreferences", _library_window_on_preferences_gsimple_action_activate_callback}, {"CommonEmptyTrash", _library_window_on_empty_trash_gsimple_action_activate_callback}, {"CommonJumpToEvent", _library_window_on_jump_to_event_gsimple_action_activate_callback}, {"CommonFind", _library_window_on_find_gsimple_action_activate_callback}, {"CommonNewSearch", _library_window_on_new_search_gsimple_action_activate_callback}, {"CommonDisplayBasicProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_basic_properties_gsimple_action_change_state_callback}, {"CommonDisplayExtendedProperties", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_extended_properties_gsimple_action_change_state_callback}, {"CommonDisplaySearchbar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_window_on_display_searchbar_gsimple_action_change_state_callback}, {"CommonDisplaySidebar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_sidebar_gsimple_action_change_state_callback}, {"CommonDisplayToolbar", _library_window_on_action_toggle_gsimple_action_activate_callback, NULL, "true", _library_window_on_display_toolbar_gsimple_action_change_state_callback}, {"CommonSortEvents", _library_window_on_action_radio_gsimple_action_activate_callback, "s", "'ascending'", _library_window_on_events_sort_changed_gsimple_action_change_state_callback}};
 
 static void _library_window_on_page_created_sidebar_tree_page_created (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) {
-#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_page_created ((LibraryWindow*) self, entry, page);
-#line 1775 "LibraryWindow.c"
+#line 1742 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_destroying_page_sidebar_tree_destroying_page (SidebarTree* _sender, SidebarPageRepresentative* entry, Page* page, gpointer self) {
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_destroying_page ((LibraryWindow*) self, entry, page);
-#line 1782 "LibraryWindow.c"
+#line 1749 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected (SidebarTree* _sender, SidebarSelectableEntry* selectable, gpointer self) {
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_entry_selected ((LibraryWindow*) self, selectable);
-#line 1789 "LibraryWindow.c"
+#line 1756 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed (SidebarTree* _sender, SidebarSelectableEntry* removed, gpointer self) {
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_sidebar_selected_entry_removed ((LibraryWindow*) self, removed);
-#line 1796 "LibraryWindow.c"
+#line 1763 "LibraryWindow.c"
 }
 
 
 static void _library_window_hide_extended_properties_gtk_widget_hide (GtkWidget* _sender, gpointer self) {
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_extended_properties ((LibraryWindow*) self);
-#line 1803 "LibraryWindow.c"
+#line 1770 "LibraryWindow.c"
 }
 
 
 static void _library_window_show_extended_properties_gtk_widget_show (GtkWidget* _sender, gpointer self) {
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_extended_properties ((LibraryWindow*) self);
-#line 1810 "LibraryWindow.c"
+#line 1777 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
-#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_trashcan_contents_altered ((LibraryWindow*) self);
-#line 1817 "LibraryWindow.c"
+#line 1784 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_media_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_media_altered ((LibraryWindow*) self);
-#line 1824 "LibraryWindow.c"
+#line 1791 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_metadata_writer_progress_metadata_writer_progress (MetadataWriter* _sender, guint completed, guint total, gpointer self) {
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_metadata_writer_progress ((LibraryWindow*) self, completed, total);
-#line 1831 "LibraryWindow.c"
+#line 1798 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
-#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_installed ((LibraryWindow*) self, monitor);
-#line 1838 "LibraryWindow.c"
+#line 1805 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed (LibraryMonitorPool* _sender, LibraryMonitor* monitor, gpointer self) {
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_destroyed ((LibraryWindow*) self, monitor);
-#line 1845 "LibraryWindow.c"
+#line 1812 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_camera_added_camera_table_camera_added (CameraTable* _sender, DiscoveredCamera* camera, gpointer self) {
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_camera_added ((LibraryWindow*) self, camera);
-#line 1852 "LibraryWindow.c"
+#line 1819 "LibraryWindow.c"
 }
 
 
@@ -1876,24 +1843,122 @@ GType library_window_target_type_get_type (void) {
 }
 
 
+static void _library_window_on_file_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_file_import ((LibraryWindow*) self);
+#line 1850 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_external_library_import_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_external_library_import ((LibraryWindow*) self);
+#line 1857 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_preferences_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_preferences ((LibraryWindow*) self);
+#line 1864 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_empty_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_empty_trash ((LibraryWindow*) self);
+#line 1871 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_jump_to_event_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_jump_to_event ((LibraryWindow*) self);
+#line 1878 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_find_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_find ((LibraryWindow*) self);
+#line 1885 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_new_search ((LibraryWindow*) self);
+#line 1892 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_action_toggle ((LibraryWindow*) self, action, parameter);
+#line 1899 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_display_basic_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_display_basic_properties ((LibraryWindow*) self, action, value);
+#line 1906 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_display_extended_properties_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_display_extended_properties ((LibraryWindow*) self, action, value);
+#line 1913 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_display_searchbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_display_searchbar ((LibraryWindow*) self, action, value);
+#line 1920 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_display_sidebar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_display_sidebar ((LibraryWindow*) self, action, value);
+#line 1927 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_display_toolbar_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_display_toolbar ((LibraryWindow*) self, action, value);
+#line 1934 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_action_radio_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_action_radio ((LibraryWindow*) self, action, parameter);
+#line 1941 "LibraryWindow.c"
+}
+
+
+static void _library_window_on_events_sort_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_on_events_sort_changed ((LibraryWindow*) self, action, value);
+#line 1948 "LibraryWindow.c"
+}
+
+
 static void _library_window_external_drop_handler_sidebar_tree_external_drop_handler (GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time, gpointer self) {
-#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_external_drop_handler ((LibraryWindow*) self, context, entry, data, info, time);
-#line 1883 "LibraryWindow.c"
+#line 1955 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_now_one_shot_callback (gpointer self) {
-#line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties_now ((LibraryWindow*) self);
-#line 1890 "LibraryWindow.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 1897 "LibraryWindow.c"
+#line 1962 "LibraryWindow.c"
 }
 
 
@@ -1922,439 +1987,351 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 	OneShotScheduler* _tmp20_ = NULL;
 	SearchFilterActions* _tmp21_ = NULL;
 	SearchFilterToolbar* _tmp22_ = NULL;
-	GtkMenuBar* menubar = NULL;
-	GtkUIManager* _tmp28_ = NULL;
-	GtkWidget* _tmp29_ = NULL;
-	GtkMenuBar* _tmp30_ = NULL;
-	GtkBox* _tmp31_ = NULL;
-	GtkMenuBar* _tmp32_ = NULL;
-	GtkMenuBar* _tmp33_ = NULL;
-	LibraryBranch* _tmp34_ = NULL;
-	LibraryPhotosEntry* _tmp35_ = NULL;
-	LibraryPhotosEntry* _tmp36_ = NULL;
-	Page* _tmp37_ = NULL;
-	Page* _tmp38_ = NULL;
+	LibraryBranch* _tmp23_ = NULL;
+	LibraryPhotosEntry* _tmp24_ = NULL;
+	LibraryPhotosEntry* _tmp25_ = NULL;
+	Page* _tmp26_ = NULL;
+	Page* _tmp27_ = NULL;
 	GtkTargetEntry* main_window_dnd_targets = NULL;
-	GtkTargetEntry _tmp51_ = {0};
-	GtkTargetEntry _tmp52_ = {0};
-	GtkTargetEntry* _tmp53_ = NULL;
+	GtkTargetEntry _tmp40_ = {0};
+	GtkTargetEntry _tmp41_ = {0};
+	GtkTargetEntry* _tmp42_ = NULL;
 	gint main_window_dnd_targets_length1 = 0;
 	gint _main_window_dnd_targets_size_ = 0;
-	GtkTargetEntry* _tmp54_ = NULL;
-	gint _tmp54__length1 = 0;
-	MetadataWriter* _tmp55_ = NULL;
-	MetadataWriter* _tmp56_ = NULL;
+	GtkTargetEntry* _tmp43_ = NULL;
+	gint _tmp43__length1 = 0;
+	MetadataWriter* _tmp44_ = NULL;
+	MetadataWriter* _tmp45_ = NULL;
 	LibraryMonitor* monitor = NULL;
-	LibraryMonitorPool* _tmp57_ = NULL;
-	LibraryMonitorPool* _tmp58_ = NULL;
-	LibraryMonitor* _tmp59_ = NULL;
-	LibraryMonitor* _tmp60_ = NULL;
-	LibraryMonitor* _tmp61_ = NULL;
-	LibraryMonitorPool* _tmp63_ = NULL;
-	LibraryMonitorPool* _tmp64_ = NULL;
-	LibraryMonitorPool* _tmp65_ = NULL;
-	LibraryMonitorPool* _tmp66_ = NULL;
-	CameraTable* _tmp67_ = NULL;
-	CameraTable* _tmp68_ = NULL;
-	GtkProgressBar* _tmp69_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	LibraryMonitorPool* _tmp46_ = NULL;
+	LibraryMonitorPool* _tmp47_ = NULL;
+	LibraryMonitor* _tmp48_ = NULL;
+	LibraryMonitor* _tmp49_ = NULL;
+	LibraryMonitor* _tmp50_ = NULL;
+	LibraryMonitorPool* _tmp52_ = NULL;
+	LibraryMonitorPool* _tmp53_ = NULL;
+	LibraryMonitorPool* _tmp54_ = NULL;
+	LibraryMonitorPool* _tmp55_ = NULL;
+	CameraTable* _tmp56_ = NULL;
+	CameraTable* _tmp57_ = NULL;
+	GtkProgressBar* _tmp58_ = NULL;
+#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = (LibraryWindow*) app_window_construct (object_type);
-#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = sidebar_tree_new (LIBRARY_WINDOW_DND_TARGET_ENTRIES, G_N_ELEMENTS (LIBRARY_WINDOW_DND_TARGET_ENTRIES), GDK_ACTION_ASK, _library_window_external_drop_handler_sidebar_tree_external_drop_handler, self);
-#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->sidebar_tree);
-#line 153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->sidebar_tree = _tmp0_;
-#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->sidebar_tree;
-#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp1_, "page-created", (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self, 0);
-#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp2_, "destroying-page", (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self, 0);
-#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->sidebar_tree;
-#line 158 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp3_, "entry-selected", (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self, 0);
-#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->sidebar_tree;
-#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp4_, "selected-entry-removed", (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self, 0);
-#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->sidebar_tree;
-#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->library_branch;
-#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sidebar_tree_graft (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_LIBRARY);
-#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = self->priv->sidebar_tree;
-#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->tags_branch;
-#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sidebar_tree_graft (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_TAGS);
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->sidebar_tree;
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->folders_branch;
-#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sidebar_tree_graft (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_FOLDERS);
-#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = self->priv->sidebar_tree;
-#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->events_branch;
-#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 162 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sidebar_tree_graft (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_EVENTS);
-#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->sidebar_tree;
-#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = self->priv->camera_branch;
-#line 165 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sidebar_tree_graft (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_CAMERAS);
-#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->sidebar_tree;
-#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->saved_search_branch;
-#line 166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sidebar_tree_graft (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SIDEBAR_TYPE_BRANCH, SidebarBranch), (gint) LIBRARY_WINDOW_SIDEBAR_ROOT_POSITION_SAVED_SEARCH);
-#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = extended_properties_window_new (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp17_);
-#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->extended_properties);
-#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->extended_properties = _tmp17_;
-#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = self->priv->extended_properties;
-#line 170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), "hide", (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self, 0);
-#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = self->priv->extended_properties;
-#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 169 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), "show", (GCallback) _library_window_show_extended_properties_gtk_widget_show, self, 0);
-#line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = one_shot_scheduler_new ("LibraryWindow properties", _library_window_on_update_properties_now_one_shot_callback, self);
-#line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_one_shot_scheduler_unref0 (self->priv->properties_scheduler);
-#line 173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->properties_scheduler = _tmp20_;
-#line 177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = self->priv->search_actions;
-#line 177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = search_filter_toolbar_new (_tmp21_);
-#line 177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp22_);
-#line 177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->search_toolbar);
-#line 177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->search_toolbar = _tmp22_;
-#line 2056 "LibraryWindow.c"
-	{
-		GFile* ui_file = NULL;
-		GFile* _tmp23_ = NULL;
-		GtkUIManager* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
-#line 180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp23_ = resources_get_ui ("top.ui");
-#line 180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		ui_file = _tmp23_;
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
+#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp23_ = self->priv->library_branch;
+#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp24_ = library_branch_get_photos_entry (_tmp23_);
+#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp25_ = _tmp24_;
+#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp26_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
+#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp27_ = _tmp26_;
+#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_create_layout (self, _tmp27_);
+#line 178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp27_);
 #line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp25_ = g_file_get_path (ui_file);
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp26_ = _tmp25_;
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_ui_manager_add_ui_from_file (_tmp24_, _tmp26_, &_inner_error_);
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_free0 (_tmp26_);
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_g_object_unref0 (ui_file);
-#line 2081 "LibraryWindow.c"
-			goto __catch39_g_error;
-		}
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (ui_file);
-#line 2086 "LibraryWindow.c"
-	}
-	goto __finally39;
-	__catch39_g_error:
-	{
-		GError* e = NULL;
-		const gchar* _tmp27_ = NULL;
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		e = _inner_error_;
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_inner_error_ = NULL;
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp27_ = e->message;
-#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_error ("LibraryWindow.vala:183: %s", _tmp27_);
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_error_free0 (e);
-#line 2103 "LibraryWindow.c"
-	}
-	__finally39:
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_clear_error (&_inner_error_);
-#line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		return NULL;
-#line 2114 "LibraryWindow.c"
-	}
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow)->ui;
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp29_ = gtk_ui_manager_get_widget (_tmp28_, "/MenuBar");
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_menu_bar_get_type ()) ? ((GtkMenuBar*) _tmp29_) : NULL);
-#line 186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	menubar = _tmp30_;
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_ = self->priv->layout;
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp32_ = menubar;
-#line 187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
-#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp33_ = menubar;
-#line 191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_no_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_ = self->priv->library_branch;
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp35_ = library_branch_get_photos_entry (_tmp34_);
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp36_ = _tmp35_;
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp37_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp38_ = _tmp37_;
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_create_layout (self, _tmp38_);
-#line 194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp38_);
-#line 197 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_load_configuration (self);
-#line 2150 "LibraryWindow.c"
+#line 2129 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
-		MediaCollectionRegistry* _tmp39_ = NULL;
-		MediaCollectionRegistry* _tmp40_ = NULL;
-		GeeCollection* _tmp41_ = NULL;
-		GeeCollection* _tmp42_ = NULL;
-		GeeIterator* _tmp43_ = NULL;
-		GeeIterator* _tmp44_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp39_ = media_collection_registry_get_instance ();
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp40_ = _tmp39_;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp41_ = media_collection_registry_get_all (_tmp40_);
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp42_ = _tmp41_;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp43_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp44_ = _tmp43_;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp42_);
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_media_collection_registry_unref0 (_tmp40_);
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_media_sources_it = _tmp44_;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		MediaCollectionRegistry* _tmp28_ = NULL;
+		MediaCollectionRegistry* _tmp29_ = NULL;
+		GeeCollection* _tmp30_ = NULL;
+		GeeCollection* _tmp31_ = NULL;
+		GeeIterator* _tmp32_ = NULL;
+		GeeIterator* _tmp33_ = NULL;
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp28_ = media_collection_registry_get_instance ();
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp29_ = _tmp28_;
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp30_ = media_collection_registry_get_all (_tmp29_);
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp31_ = _tmp30_;
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp32_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp33_ = _tmp32_;
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_g_object_unref0 (_tmp31_);
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_media_collection_registry_unref0 (_tmp29_);
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_media_sources_it = _tmp33_;
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 2179 "LibraryWindow.c"
-			GeeIterator* _tmp45_ = NULL;
-			gboolean _tmp46_ = FALSE;
+#line 2158 "LibraryWindow.c"
+			GeeIterator* _tmp34_ = NULL;
+			gboolean _tmp35_ = FALSE;
 			MediaSourceCollection* media_sources = NULL;
-			GeeIterator* _tmp47_ = NULL;
-			gpointer _tmp48_ = NULL;
-			MediaSourceCollection* _tmp49_ = NULL;
-			MediaSourceCollection* _tmp50_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp45_ = _media_sources_it;
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp46_ = gee_iterator_next (_tmp45_);
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			if (!_tmp46_) {
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			GeeIterator* _tmp36_ = NULL;
+			gpointer _tmp37_ = NULL;
+			MediaSourceCollection* _tmp38_ = NULL;
+			MediaSourceCollection* _tmp39_ = NULL;
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp34_ = _media_sources_it;
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp35_ = gee_iterator_next (_tmp34_);
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			if (!_tmp35_) {
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 2195 "LibraryWindow.c"
+#line 2174 "LibraryWindow.c"
 			}
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp36_ = _media_sources_it;
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp37_ = gee_iterator_get (_tmp36_);
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			media_sources = (MediaSourceCollection*) _tmp37_;
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp38_ = media_sources;
+#line 184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			g_signal_connect_object (_tmp38_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
+#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp39_ = media_sources;
+#line 185 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0);
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_data_collection_unref0 (media_sources);
+#line 2192 "LibraryWindow.c"
+		}
+#line 183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_g_object_unref0 (_media_sources_it);
+#line 2196 "LibraryWindow.c"
+	}
+#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp40_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST];
+#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp41_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST];
+#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp42_ = g_new0 (GtkTargetEntry, 2);
+#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp42_[0] = _tmp40_;
+#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp42_[1] = _tmp41_;
+#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	main_window_dnd_targets = _tmp42_;
+#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	main_window_dnd_targets_length1 = 2;
+#line 190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_main_window_dnd_targets_size_ = main_window_dnd_targets_length1;
+#line 196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp43_ = main_window_dnd_targets;
+#line 196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp43__length1 = main_window_dnd_targets_length1;
+#line 196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp43_, _tmp43__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK);
 #line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp47_ = _media_sources_it;
+	_tmp44_ = metadata_writer_get_instance ();
 #line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp48_ = gee_iterator_get (_tmp47_);
+	_tmp45_ = _tmp44_;
 #line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			media_sources = (MediaSourceCollection*) _tmp48_;
-#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp49_ = media_sources;
-#line 200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_connect_object (_tmp49_, "trashcan-contents-altered", (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self, 0);
+	g_signal_connect_object (_tmp45_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0);
+#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp45_);
 #line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_tmp50_ = media_sources;
+	_tmp46_ = library_monitor_pool_get_instance ();
 #line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_media_altered_data_collection_items_altered, self, 0);
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-			_data_collection_unref0 (media_sources);
-#line 2213 "LibraryWindow.c"
-		}
-#line 199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_media_sources_it);
-#line 2217 "LibraryWindow.c"
-	}
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp51_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_URI_LIST];
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp52_ = LIBRARY_WINDOW_DND_TARGET_ENTRIES[LIBRARY_WINDOW_TARGET_TYPE_MEDIA_LIST];
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp53_ = g_new0 (GtkTargetEntry, 2);
-#line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp53_[0] = _tmp51_;
+	_tmp47_ = _tmp46_;
+#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp48_ = library_monitor_pool_get_monitor (_tmp47_);
+#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp49_ = _tmp48_;
+#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_library_monitor_pool_unref0 (_tmp47_);
+#line 201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	monitor = _tmp49_;
+#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp50_ = monitor;
+#line 202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp50_ != NULL) {
+#line 2244 "LibraryWindow.c"
+		LibraryMonitor* _tmp51_ = NULL;
+#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp51_ = monitor;
+#line 203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		library_window_on_library_monitor_installed (self, _tmp51_);
+#line 2250 "LibraryWindow.c"
+	}
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp52_ = library_monitor_pool_get_instance ();
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp53_ = _tmp52_;
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp53_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0);
+#line 205 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_library_monitor_pool_unref0 (_tmp53_);
 #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp53_[1] = _tmp52_;
+	_tmp54_ = library_monitor_pool_get_instance ();
 #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	main_window_dnd_targets = _tmp53_;
+	_tmp55_ = _tmp54_;
 #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	main_window_dnd_targets_length1 = 2;
+	g_signal_connect_object (_tmp55_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0);
 #line 206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_main_window_dnd_targets_size_ = main_window_dnd_targets_length1;
-#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp54_ = main_window_dnd_targets;
-#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp54__length1 = main_window_dnd_targets_length1;
-#line 212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_drag_dest_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), GTK_DEST_DEFAULT_ALL, _tmp54_, _tmp54__length1, (GDK_ACTION_COPY | GDK_ACTION_LINK) | GDK_ACTION_ASK);
-#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp55_ = metadata_writer_get_instance ();
-#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp56_ = _tmp55_;
-#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp56_, "progress", (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self, 0);
-#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp56_);
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp57_ = library_monitor_pool_get_instance ();
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp58_ = _tmp57_;
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp59_ = library_monitor_pool_get_monitor (_tmp58_);
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp60_ = _tmp59_;
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp58_);
-#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	monitor = _tmp60_;
-#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp61_ = monitor;
-#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp61_ != NULL) {
-#line 2265 "LibraryWindow.c"
-		LibraryMonitor* _tmp62_ = NULL;
-#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp62_ = monitor;
-#line 219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_on_library_monitor_installed (self, _tmp62_);
-#line 2271 "LibraryWindow.c"
-	}
-#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp63_ = library_monitor_pool_get_instance ();
-#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp64_ = _tmp63_;
-#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp64_, "monitor-installed", (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self, 0);
-#line 221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp64_);
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp65_ = library_monitor_pool_get_instance ();
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp66_ = _tmp65_;
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp66_, "monitor-destroyed", (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self, 0);
-#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_library_monitor_pool_unref0 (_tmp66_);
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp67_ = camera_table_get_instance ();
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp68_ = _tmp67_;
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_signal_connect_object (_tmp68_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0);
-#line 224 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_camera_table_unref0 (_tmp68_);
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp69_ = self->priv->background_progress_bar;
-#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_progress_bar_set_show_text (_tmp69_, TRUE);
-#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_library_monitor_pool_unref0 (_tmp55_);
+#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp56_ = camera_table_get_instance ();
+#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp57_ = _tmp56_;
+#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_signal_connect_object (_tmp57_, "camera-added", (GCallback) _library_window_on_camera_added_camera_table_camera_added, self, 0);
+#line 208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_camera_table_unref0 (_tmp57_);
+#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp58_ = self->priv->background_progress_bar;
+#line 210 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_progress_bar_set_show_text (_tmp58_, TRUE);
+#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (monitor);
-#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	main_window_dnd_targets = (g_free (main_window_dnd_targets), NULL);
-#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (menubar);
-#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
-#line 2309 "LibraryWindow.c"
+#line 2286 "LibraryWindow.c"
 }
 
 
 LibraryWindow* library_window_new (ProgressMonitor progress_monitor, void* progress_monitor_target) {
-#line 151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 149 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_construct (TYPE_LIBRARY_WINDOW, progress_monitor, progress_monitor_target);
-#line 2316 "LibraryWindow.c"
+#line 2293 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started (DirectoryMonitor* _sender, gpointer self) {
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_started ((LibraryWindow*) self);
-#line 2323 "LibraryWindow.c"
+#line 2300 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed (DirectoryMonitor* _sender, gpointer self) {
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2330 "LibraryWindow.c"
+#line 2307 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_discovery_completed_directory_monitor_closed (DirectoryMonitor* _sender, gpointer self) {
-#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_discovery_completed ((LibraryWindow*) self);
-#line 2337 "LibraryWindow.c"
+#line 2314 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress (LibraryMonitor* _sender, gint completed_files, gint total_files, gpointer self) {
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_update_progress ((LibraryWindow*) self, completed_files, total_files);
-#line 2344 "LibraryWindow.c"
+#line 2321 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing (LibraryMonitor* _sender, gpointer self) {
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_preparing ((LibraryWindow*) self);
-#line 2351 "LibraryWindow.c"
+#line 2328 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress (LibraryMonitor* _sender, guint64 completed_bytes, guint64 total_bytes, gpointer self) {
-#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_library_monitor_auto_import_progress ((LibraryWindow*) self, completed_bytes, total_bytes);
-#line 2358 "LibraryWindow.c"
+#line 2335 "LibraryWindow.c"
 }
 
 
@@ -2370,51 +2347,51 @@ static void library_window_on_library_monitor_installed (LibraryWindow* self, Li
 	LibraryMonitor* _tmp8_ = NULL;
 	LibraryMonitor* _tmp9_ = NULL;
 	LibraryMonitor* _tmp10_ = NULL;
-#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
-#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = monitor;
-#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:259: on_library_monitor_installed: %s", _tmp4_);
-#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:243: on_library_monitor_installed: %s", _tmp4_);
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = monitor;
-#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 245 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-started", (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self, 0);
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = monitor;
-#line 262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "discovery-completed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self, 0);
-#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = monitor;
-#line 263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), "closed", (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self, 0);
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = monitor;
-#line 264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp8_, "auto-update-progress", (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self, 0);
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = monitor;
-#line 265 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp9_, "auto-import-preparing", (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self, 0);
-#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = monitor;
-#line 266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp10_, "auto-import-progress", (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self, 0);
-#line 2418 "LibraryWindow.c"
+#line 2395 "LibraryWindow.c"
 }
 
 
@@ -2436,1651 +2413,101 @@ static void library_window_on_library_monitor_destroyed (LibraryWindow* self, Li
 	guint _tmp14_ = 0U;
 	LibraryMonitor* _tmp15_ = NULL;
 	guint _tmp16_ = 0U;
-#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_MONITOR (monitor));
-#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = monitor;
-#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = directory_monitor_get_root (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor));
-#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:270: on_library_monitor_destroyed: %s", _tmp4_);
-#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:254: on_library_monitor_destroyed: %s", _tmp4_);
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = monitor;
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("discovery-started", TYPE_DIRECTORY_MONITOR, &_tmp6_, NULL, FALSE);
-#line 272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_started_directory_monitor_discovery_started, self);
-#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = monitor;
-#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("discovery-completed", TYPE_DIRECTORY_MONITOR, &_tmp8_, NULL, FALSE);
-#line 273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_discovery_completed, self);
-#line 274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = monitor;
-#line 274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("closed", TYPE_DIRECTORY_MONITOR, &_tmp10_, NULL, FALSE);
-#line 274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DIRECTORY_MONITOR, DirectoryMonitor), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_library_monitor_discovery_completed_directory_monitor_closed, self);
-#line 275 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = monitor;
-#line 275 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-update-progress", TYPE_LIBRARY_MONITOR, &_tmp12_, NULL, FALSE);
-#line 275 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_update_progress_library_monitor_auto_update_progress, self);
-#line 276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = monitor;
-#line 276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-import-preparing", TYPE_LIBRARY_MONITOR, &_tmp14_, NULL, FALSE);
-#line 276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 260 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_preparing_library_monitor_auto_import_preparing, self);
-#line 277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = monitor;
-#line 277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("auto-import-progress", TYPE_LIBRARY_MONITOR, &_tmp16_, NULL, FALSE);
-#line 277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 261 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _library_window_on_library_monitor_auto_import_progress_library_monitor_auto_import_progress, self);
-#line 2496 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_file_import_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_file_import ((LibraryWindow*) self);
-#line 2503 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add61 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2514 "LibraryWindow.c"
-	}
-#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2518 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_external_library_import_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_external_library_import ((LibraryWindow*) self);
-#line 2525 "LibraryWindow.c"
+#line 2473 "LibraryWindow.c"
 }
 
 
-static void _vala_array_add62 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2536 "LibraryWindow.c"
-	}
-#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2540 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add63 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2551 "LibraryWindow.c"
-	}
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2555 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_preferences_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_preferences ((LibraryWindow*) self);
-#line 2562 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add64 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2573 "LibraryWindow.c"
-	}
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2577 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_empty_trash_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_empty_trash ((LibraryWindow*) self);
-#line 2584 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add65 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2595 "LibraryWindow.c"
-	}
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2599 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_jump_to_event_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_jump_to_event ((LibraryWindow*) self);
-#line 2606 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add66 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2617 "LibraryWindow.c"
-	}
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2621 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_find_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_find ((LibraryWindow*) self);
-#line 2628 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add67 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2639 "LibraryWindow.c"
-	}
-#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2643 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add68 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2654 "LibraryWindow.c"
-	}
-#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2658 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_new_search_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_new_search ((LibraryWindow*) self);
-#line 2665 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add69 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2676 "LibraryWindow.c"
-	}
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2680 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add70 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2691 "LibraryWindow.c"
-	}
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2695 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add71 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2706 "LibraryWindow.c"
-	}
-#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2710 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add72 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2721 "LibraryWindow.c"
-	}
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2725 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add73 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2736 "LibraryWindow.c"
-	}
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2740 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add74 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2751 "LibraryWindow.c"
-	}
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2755 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add75 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2766 "LibraryWindow.c"
-	}
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2770 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add76 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2781 "LibraryWindow.c"
-	}
-#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2785 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add77 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 2796 "LibraryWindow.c"
-	}
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 2800 "LibraryWindow.c"
-}
-
-
-static GtkActionEntry* library_window_create_common_actions (LibraryWindow* self, int* result_length1) {
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	GtkActionEntry* _tmp0_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry import = {0};
-	GtkActionEntry _tmp1_ = {0};
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GtkActionEntry* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GtkActionEntry _tmp5_ = {0};
-	GtkActionEntry import_from_external = {0};
-	GtkActionEntry _tmp6_ = {0};
-	const gchar* _tmp7_ = NULL;
-	GtkActionEntry* _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	GtkActionEntry _tmp9_ = {0};
-	GtkActionEntry sort = {0};
-	GtkActionEntry _tmp10_ = {0};
-	const gchar* _tmp11_ = NULL;
-	GtkActionEntry* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	GtkActionEntry _tmp13_ = {0};
-	GtkActionEntry preferences = {0};
-	GtkActionEntry _tmp14_ = {0};
-	GtkActionEntry* _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	GtkActionEntry _tmp16_ = {0};
-	GtkActionEntry empty = {0};
-	GtkActionEntry _tmp17_ = {0};
-	const gchar* _tmp18_ = NULL;
-	const gchar* _tmp19_ = NULL;
-	GtkActionEntry* _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	GtkActionEntry _tmp21_ = {0};
-	GtkActionEntry jump_to_event = {0};
-	GtkActionEntry _tmp22_ = {0};
-	const gchar* _tmp23_ = NULL;
-	GtkActionEntry* _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
-	GtkActionEntry _tmp25_ = {0};
-	GtkActionEntry find = {0};
-	GtkActionEntry _tmp26_ = {0};
-	const gchar* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
-	GtkActionEntry* _tmp29_ = NULL;
-	gint _tmp29__length1 = 0;
-	GtkActionEntry _tmp30_ = {0};
-	GtkActionEntry filter_photos = {0};
-	GtkActionEntry _tmp31_ = {0};
-	GtkActionEntry* _tmp32_ = NULL;
-	gint _tmp32__length1 = 0;
-	GtkActionEntry _tmp33_ = {0};
-	GtkActionEntry new_search = {0};
-	GtkActionEntry _tmp34_ = {0};
-	const gchar* _tmp35_ = NULL;
-	GtkActionEntry* _tmp36_ = NULL;
-	gint _tmp36__length1 = 0;
-	GtkActionEntry _tmp37_ = {0};
-	GtkActionEntry file = {0};
-	GtkActionEntry _tmp38_ = {0};
-	const gchar* _tmp39_ = NULL;
-	GtkActionEntry* _tmp40_ = NULL;
-	gint _tmp40__length1 = 0;
-	GtkActionEntry _tmp41_ = {0};
-	GtkActionEntry edit = {0};
-	GtkActionEntry _tmp42_ = {0};
-	const gchar* _tmp43_ = NULL;
-	GtkActionEntry* _tmp44_ = NULL;
-	gint _tmp44__length1 = 0;
-	GtkActionEntry _tmp45_ = {0};
-	GtkActionEntry view = {0};
-	GtkActionEntry _tmp46_ = {0};
-	const gchar* _tmp47_ = NULL;
-	GtkActionEntry* _tmp48_ = NULL;
-	gint _tmp48__length1 = 0;
-	GtkActionEntry _tmp49_ = {0};
-	GtkActionEntry photo = {0};
-	GtkActionEntry _tmp50_ = {0};
-	const gchar* _tmp51_ = NULL;
-	GtkActionEntry* _tmp52_ = NULL;
-	gint _tmp52__length1 = 0;
-	GtkActionEntry _tmp53_ = {0};
-	GtkActionEntry photos = {0};
-	GtkActionEntry _tmp54_ = {0};
-	const gchar* _tmp55_ = NULL;
-	GtkActionEntry* _tmp56_ = NULL;
-	gint _tmp56__length1 = 0;
-	GtkActionEntry _tmp57_ = {0};
-	GtkActionEntry event = {0};
-	GtkActionEntry _tmp58_ = {0};
-	const gchar* _tmp59_ = NULL;
-	GtkActionEntry* _tmp60_ = NULL;
-	gint _tmp60__length1 = 0;
-	GtkActionEntry _tmp61_ = {0};
-	GtkActionEntry tags = {0};
-	GtkActionEntry _tmp62_ = {0};
-	const gchar* _tmp63_ = NULL;
-	GtkActionEntry* _tmp64_ = NULL;
-	gint _tmp64__length1 = 0;
-	GtkActionEntry _tmp65_ = {0};
-	GtkActionEntry help = {0};
-	GtkActionEntry _tmp66_ = {0};
-	const gchar* _tmp67_ = NULL;
-	GtkActionEntry* _tmp68_ = NULL;
-	gint _tmp68__length1 = 0;
-	GtkActionEntry _tmp69_ = {0};
-	GtkActionEntry* _tmp70_ = NULL;
-	gint _tmp70__length1 = 0;
-#line 280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL);
-#line 281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = g_new0 (GtkActionEntry, 0);
-#line 281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	actions = _tmp0_;
-#line 281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	actions_length1 = 0;
-#line 281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_actions_size_ = actions_length1;
-#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.name = "CommonFileImport";
-#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.stock_id = RESOURCES_IMPORT;
-#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.label = TRANSLATABLE;
-#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.accelerator = "<Ctrl>I";
-#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.tooltip = TRANSLATABLE;
-#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.callback = (GCallback) _library_window_on_file_import_gtk_action_callback;
-#line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	import = _tmp1_;
-#line 285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = _ ("_Import From Folder…");
-#line 285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	import.label = _tmp2_;
-#line 286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _ ("Import photos from disk to library");
-#line 286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	import.tooltip = _tmp3_;
-#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = actions;
-#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4__length1 = actions_length1;
-#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = import;
-#line 287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add61 (&actions, &actions_length1, &_actions_size_, &_tmp5_);
-#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.name = "ExternalLibraryImport";
-#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.stock_id = RESOURCES_IMPORT;
-#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.label = TRANSLATABLE;
-#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.accelerator = NULL;
-#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.tooltip = TRANSLATABLE;
-#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.callback = (GCallback) _library_window_on_external_library_import_gtk_action_callback;
-#line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	import_from_external = _tmp6_;
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = _ ("Import From _Application…");
-#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	import_from_external.label = _tmp7_;
-#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = actions;
-#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8__length1 = actions_length1;
-#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = import_from_external;
-#line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add62 (&actions, &actions_length1, &_actions_size_, &_tmp9_);
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_.name = "CommonSortEvents";
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_.stock_id = NULL;
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_.label = TRANSLATABLE;
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_.accelerator = NULL;
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_.tooltip = NULL;
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_.callback = (GCallback) NULL;
-#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sort = _tmp10_;
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = _ ("Sort _Events");
-#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sort.label = _tmp11_;
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = actions;
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12__length1 = actions_length1;
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = sort;
-#line 298 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add63 (&actions, &actions_length1, &_actions_size_, &_tmp13_);
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_.name = "CommonPreferences";
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_.stock_id = RESOURCES_PREFERENCES_LABEL;
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_.label = TRANSLATABLE;
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_.accelerator = NULL;
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_.tooltip = TRANSLATABLE;
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_.callback = (GCallback) _library_window_on_preferences_gtk_action_callback;
-#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	preferences = _tmp14_;
-#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	preferences.label = RESOURCES_PREFERENCES_MENU;
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = actions;
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15__length1 = actions_length1;
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp16_ = preferences;
-#line 303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add64 (&actions, &actions_length1, &_actions_size_, &_tmp16_);
-#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_.name = "CommonEmptyTrash";
-#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_.stock_id = NULL;
-#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_.label = TRANSLATABLE;
-#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_.accelerator = NULL;
-#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_.tooltip = NULL;
-#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_.callback = (GCallback) _library_window_on_empty_trash_gtk_action_callback;
-#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	empty = _tmp17_;
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = _ ("Empty T_rash");
-#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	empty.label = _tmp18_;
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = _ ("Delete all photos in the trash");
-#line 308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	empty.tooltip = _tmp19_;
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp20_ = actions;
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp20__length1 = actions_length1;
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp21_ = empty;
-#line 309 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add65 (&actions, &actions_length1, &_actions_size_, &_tmp21_);
-#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_.name = "CommonJumpToEvent";
-#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_.stock_id = NULL;
-#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_.label = TRANSLATABLE;
-#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_.accelerator = NULL;
-#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_.tooltip = TRANSLATABLE;
-#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_.callback = (GCallback) _library_window_on_jump_to_event_gtk_action_callback;
-#line 311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	jump_to_event = _tmp22_;
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23_ = _ ("View Eve_nt for Photo");
-#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	jump_to_event.label = _tmp23_;
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_ = actions;
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24__length1 = actions_length1;
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp25_ = jump_to_event;
-#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add66 (&actions, &actions_length1, &_actions_size_, &_tmp25_);
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp26_.name = "CommonFind";
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp26_.stock_id = NULL;
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp26_.label = TRANSLATABLE;
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp26_.accelerator = NULL;
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp26_.tooltip = NULL;
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp26_.callback = (GCallback) _library_window_on_find_gtk_action_callback;
-#line 316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	find = _tmp26_;
-#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp27_ = _ ("_Find");
-#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	find.label = _tmp27_;
-#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp28_ = _ ("Find photos and videos by search criteria");
-#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	find.tooltip = _tmp28_;
-#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp29_ = actions;
-#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp29__length1 = actions_length1;
-#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp30_ = find;
-#line 319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add67 (&actions, &actions_length1, &_actions_size_, &_tmp30_);
-#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_.name = "CommonFilterPhotos";
-#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_.stock_id = NULL;
-#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_.label = TRANSLATABLE;
-#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_.accelerator = NULL;
-#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_.tooltip = NULL;
-#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_.callback = (GCallback) NULL;
-#line 323 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	filter_photos = _tmp31_;
-#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	filter_photos.label = RESOURCES_FILTER_PHOTOS_MENU;
-#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp32_ = actions;
-#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp32__length1 = actions_length1;
-#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp33_ = filter_photos;
-#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add68 (&actions, &actions_length1, &_actions_size_, &_tmp33_);
-#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_.name = "CommonNewSearch";
-#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_.stock_id = NULL;
-#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_.label = TRANSLATABLE;
-#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_.accelerator = "<Ctrl>S";
-#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_.tooltip = NULL;
-#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_.callback = (GCallback) _library_window_on_new_search_gtk_action_callback;
-#line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	new_search = _tmp34_;
-#line 329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp35_ = _ ("Ne_w Saved Search…");
-#line 329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	new_search.label = _tmp35_;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp36_ = actions;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp36__length1 = actions_length1;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp37_ = new_search;
-#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add69 (&actions, &actions_length1, &_actions_size_, &_tmp37_);
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp38_.name = "FileMenu";
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp38_.stock_id = NULL;
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp38_.label = TRANSLATABLE;
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp38_.accelerator = NULL;
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp38_.tooltip = NULL;
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp38_.callback = (GCallback) NULL;
-#line 334 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	file = _tmp38_;
-#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp39_ = _ ("_File");
-#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	file.label = _tmp39_;
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp40_ = actions;
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp40__length1 = actions_length1;
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp41_ = file;
-#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add70 (&actions, &actions_length1, &_actions_size_, &_tmp41_);
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp42_.name = "EditMenu";
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp42_.stock_id = NULL;
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp42_.label = TRANSLATABLE;
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp42_.accelerator = NULL;
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp42_.tooltip = NULL;
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp42_.callback = (GCallback) NULL;
-#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	edit = _tmp42_;
-#line 339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp43_ = _ ("_Edit");
-#line 339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	edit.label = _tmp43_;
-#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp44_ = actions;
-#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp44__length1 = actions_length1;
-#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp45_ = edit;
-#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add71 (&actions, &actions_length1, &_actions_size_, &_tmp45_);
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp46_.name = "ViewMenu";
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp46_.stock_id = NULL;
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp46_.label = TRANSLATABLE;
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp46_.accelerator = NULL;
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp46_.tooltip = NULL;
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp46_.callback = (GCallback) NULL;
-#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	view = _tmp46_;
-#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp47_ = _ ("_View");
-#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	view.label = _tmp47_;
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp48_ = actions;
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp48__length1 = actions_length1;
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp49_ = view;
-#line 344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add72 (&actions, &actions_length1, &_actions_size_, &_tmp49_);
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp50_.name = "PhotoMenu";
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp50_.stock_id = NULL;
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp50_.label = TRANSLATABLE;
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp50_.accelerator = NULL;
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp50_.tooltip = NULL;
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp50_.callback = (GCallback) NULL;
-#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	photo = _tmp50_;
-#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp51_ = _ ("_Photo");
-#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	photo.label = _tmp51_;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp52_ = actions;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp52__length1 = actions_length1;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp53_ = photo;
-#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add73 (&actions, &actions_length1, &_actions_size_, &_tmp53_);
-#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp54_.name = "PhotosMenu";
-#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp54_.stock_id = NULL;
-#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp54_.label = TRANSLATABLE;
-#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp54_.accelerator = NULL;
-#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp54_.tooltip = NULL;
-#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp54_.callback = (GCallback) NULL;
-#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	photos = _tmp54_;
-#line 351 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp55_ = _ ("_Photos");
-#line 351 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	photos.label = _tmp55_;
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp56_ = actions;
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp56__length1 = actions_length1;
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp57_ = photos;
-#line 352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add74 (&actions, &actions_length1, &_actions_size_, &_tmp57_);
-#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp58_.name = "EventsMenu";
-#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp58_.stock_id = NULL;
-#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp58_.label = TRANSLATABLE;
-#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp58_.accelerator = NULL;
-#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp58_.tooltip = NULL;
-#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp58_.callback = (GCallback) NULL;
-#line 354 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	event = _tmp58_;
-#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp59_ = _ ("Even_ts");
-#line 355 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	event.label = _tmp59_;
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp60_ = actions;
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp60__length1 = actions_length1;
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp61_ = event;
-#line 356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add75 (&actions, &actions_length1, &_actions_size_, &_tmp61_);
-#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp62_.name = "TagsMenu";
-#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp62_.stock_id = NULL;
-#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp62_.label = TRANSLATABLE;
-#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp62_.accelerator = NULL;
-#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp62_.tooltip = NULL;
-#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp62_.callback = (GCallback) NULL;
-#line 358 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	tags = _tmp62_;
-#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp63_ = _ ("Ta_gs");
-#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	tags.label = _tmp63_;
-#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp64_ = actions;
-#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp64__length1 = actions_length1;
-#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp65_ = tags;
-#line 360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add76 (&actions, &actions_length1, &_actions_size_, &_tmp65_);
-#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp66_.name = "HelpMenu";
-#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp66_.stock_id = NULL;
-#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp66_.label = TRANSLATABLE;
-#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp66_.accelerator = NULL;
-#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp66_.tooltip = NULL;
-#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp66_.callback = (GCallback) NULL;
-#line 362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	help = _tmp66_;
-#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp67_ = _ ("_Help");
-#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	help.label = _tmp67_;
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp68_ = actions;
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp68__length1 = actions_length1;
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp69_ = help;
-#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add77 (&actions, &actions_length1, &_actions_size_, &_tmp69_);
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp70_ = actions;
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp70__length1 = actions_length1;
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (result_length1) {
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*result_length1 = _tmp70__length1;
-#line 3383 "LibraryWindow.c"
-	}
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	result = _tmp70_;
-#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	return result;
-#line 3389 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_display_basic_properties_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_display_basic_properties ((LibraryWindow*) self, action);
-#line 3396 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add78 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 3407 "LibraryWindow.c"
-	}
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 3411 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_display_extended_properties_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_display_extended_properties ((LibraryWindow*) self, action);
-#line 3418 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add79 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 3429 "LibraryWindow.c"
-	}
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 3433 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_display_searchbar_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_display_searchbar ((LibraryWindow*) self, action);
-#line 3440 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add80 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 3451 "LibraryWindow.c"
-	}
-#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 3455 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_display_sidebar_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_display_sidebar ((LibraryWindow*) self, action);
-#line 3462 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add81 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 3473 "LibraryWindow.c"
-	}
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 3477 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_display_toolbar_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_display_toolbar ((LibraryWindow*) self, action);
-#line 3484 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add82 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value) {
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkToggleActionEntry, *array, *size);
-#line 3495 "LibraryWindow.c"
-	}
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 3499 "LibraryWindow.c"
-}
-
-
-static GtkToggleActionEntry* library_window_create_common_toggle_actions (LibraryWindow* self, int* result_length1) {
-	GtkToggleActionEntry* result = NULL;
-	GtkToggleActionEntry* actions = NULL;
-	GtkToggleActionEntry* _tmp0_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkToggleActionEntry basic_props = {0};
-	GtkToggleActionEntry _tmp1_ = {0};
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GtkToggleActionEntry* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GtkToggleActionEntry _tmp5_ = {0};
-	GtkToggleActionEntry extended_props = {0};
-	GtkToggleActionEntry _tmp6_ = {0};
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkToggleActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkToggleActionEntry _tmp10_ = {0};
-	GtkToggleActionEntry searchbar = {0};
-	gboolean _tmp11_ = FALSE;
-	GtkToggleActionEntry _tmp12_ = {0};
-	const gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	GtkToggleActionEntry* _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	GtkToggleActionEntry _tmp16_ = {0};
-	GtkToggleActionEntry sidebar = {0};
-	gboolean _tmp17_ = FALSE;
-	GtkToggleActionEntry _tmp18_ = {0};
-	const gchar* _tmp19_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	GtkToggleActionEntry* _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
-	GtkToggleActionEntry _tmp22_ = {0};
-	GtkToggleActionEntry toolbar = {0};
-	gboolean _tmp23_ = FALSE;
-	GtkToggleActionEntry _tmp24_ = {0};
-	const gchar* _tmp25_ = NULL;
-	const gchar* _tmp26_ = NULL;
-	GtkToggleActionEntry* _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-	GtkToggleActionEntry _tmp28_ = {0};
-	GtkToggleActionEntry* _tmp29_ = NULL;
-	gint _tmp29__length1 = 0;
-#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL);
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = g_new0 (GtkToggleActionEntry, 0);
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	actions = _tmp0_;
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	actions_length1 = 0;
-#line 370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_actions_size_ = actions_length1;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.name = "CommonDisplayBasicProperties";
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.stock_id = NULL;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.label = TRANSLATABLE;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.accelerator = "<Ctrl><Shift>I";
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.tooltip = TRANSLATABLE;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.callback = (GCallback) _library_window_on_display_basic_properties_gtk_action_callback;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.is_active = FALSE;
-#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	basic_props = _tmp1_;
-#line 374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = _ ("_Basic Information");
-#line 374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	basic_props.label = _tmp2_;
-#line 375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _ ("Display basic information for the selection");
-#line 375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	basic_props.tooltip = _tmp3_;
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = actions;
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4__length1 = actions_length1;
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = basic_props;
-#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add78 (&actions, &actions_length1, &_actions_size_, &_tmp5_);
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.name = "CommonDisplayExtendedProperties";
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.stock_id = NULL;
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.label = TRANSLATABLE;
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.accelerator = "<Ctrl><Shift>X";
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.tooltip = TRANSLATABLE;
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.callback = (GCallback) _library_window_on_display_extended_properties_gtk_action_callback;
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.is_active = FALSE;
-#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	extended_props = _tmp6_;
-#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = _ ("E_xtended Information");
-#line 380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	extended_props.label = _tmp7_;
-#line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = _ ("Display extended information for the selection");
-#line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	extended_props.tooltip = _tmp8_;
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = actions;
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9__length1 = actions_length1;
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = extended_props;
-#line 382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add79 (&actions, &actions_length1, &_actions_size_, &_tmp10_);
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = self->priv->is_search_toolbar_visible;
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_.name = "CommonDisplaySearchbar";
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_.stock_id = "edit-find";
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_.label = TRANSLATABLE;
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_.accelerator = "F8";
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_.tooltip = TRANSLATABLE;
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_.callback = (GCallback) _library_window_on_display_searchbar_gtk_action_callback;
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_.is_active = _tmp11_;
-#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	searchbar = _tmp12_;
-#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = _ ("_Search Bar");
-#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	searchbar.label = _tmp13_;
-#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = _ ("Display the search bar");
-#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	searchbar.tooltip = _tmp14_;
-#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = actions;
-#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15__length1 = actions_length1;
-#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp16_ = searchbar;
-#line 388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add80 (&actions, &actions_length1, &_actions_size_, &_tmp16_);
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_ = library_window_is_sidebar_visible (self);
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_.name = "CommonDisplaySidebar";
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_.stock_id = NULL;
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_.label = TRANSLATABLE;
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_.accelerator = "F9";
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_.tooltip = TRANSLATABLE;
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_.callback = (GCallback) _library_window_on_display_sidebar_gtk_action_callback;
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_.is_active = _tmp17_;
-#line 390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar = _tmp18_;
-#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = _ ("S_idebar");
-#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar.label = _tmp19_;
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp20_ = _ ("Display the sidebar");
-#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sidebar.tooltip = _tmp20_;
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp21_ = actions;
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp21__length1 = actions_length1;
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_ = sidebar;
-#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add81 (&actions, &actions_length1, &_actions_size_, &_tmp22_);
-#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23_ = library_window_is_toolbar_visible (self);
-#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_.name = "CommonDisplayToolbar";
-#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_.stock_id = NULL;
-#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_.label = TRANSLATABLE;
-#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_.accelerator = "<Ctrl>F9";
-#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_.tooltip = TRANSLATABLE;
-#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_.callback = (GCallback) _library_window_on_display_toolbar_gtk_action_callback;
-#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_.is_active = _tmp23_;
-#line 396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	toolbar = _tmp24_;
-#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp25_ = _ ("T_oolbar");
-#line 398 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	toolbar.label = _tmp25_;
-#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp26_ = _ ("Display the tool bar");
-#line 399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	toolbar.tooltip = _tmp26_;
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp27_ = actions;
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp27__length1 = actions_length1;
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp28_ = toolbar;
-#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add82 (&actions, &actions_length1, &_actions_size_, &_tmp28_);
-#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp29_ = actions;
-#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp29__length1 = actions_length1;
-#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (result_length1) {
-#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*result_length1 = _tmp29__length1;
-#line 3733 "LibraryWindow.c"
-	}
-#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	result = _tmp29_;
-#line 402 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	return result;
-#line 3739 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add83 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 3750 "LibraryWindow.c"
-	}
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 3754 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add84 (GtkRadioActionEntry** array, int* length, int* size, const GtkRadioActionEntry* value) {
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkRadioActionEntry, *array, *size);
-#line 3765 "LibraryWindow.c"
-	}
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = *value;
-#line 3769 "LibraryWindow.c"
-}
-
-
-static void _library_window_on_events_sort_changed_gtk_radio_action_callback (GtkAction* action, GtkAction* current, gpointer self) {
-#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_on_events_sort_changed ((LibraryWindow*) self, action, current);
-#line 3776 "LibraryWindow.c"
-}
-
-
-static void library_window_add_common_radio_actions (LibraryWindow* self, GtkActionGroup* group) {
-	GtkRadioActionEntry* actions = NULL;
-	GtkRadioActionEntry* _tmp0_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkRadioActionEntry ascending = {0};
-	GtkRadioActionEntry _tmp1_ = {0};
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	GtkRadioActionEntry* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GtkRadioActionEntry _tmp5_ = {0};
-	GtkRadioActionEntry descending = {0};
-	GtkRadioActionEntry _tmp6_ = {0};
-	const gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	GtkRadioActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkRadioActionEntry _tmp10_ = {0};
-	GtkActionGroup* _tmp11_ = NULL;
-	GtkRadioActionEntry* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-#line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (GTK_IS_ACTION_GROUP (group));
-#line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = g_new0 (GtkRadioActionEntry, 0);
-#line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	actions = _tmp0_;
-#line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	actions_length1 = 0;
-#line 406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_actions_size_ = actions_length1;
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.name = "CommonSortEventsAscending";
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.stock_id = RESOURCES_SORT_ASCENDING_LABEL;
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.label = TRANSLATABLE;
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.accelerator = NULL;
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.tooltip = TRANSLATABLE;
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_.value = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
-#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	ascending = _tmp1_;
-#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = _ ("_Ascending");
-#line 411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	ascending.label = _tmp2_;
-#line 412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _ ("Sort photos in an ascending order");
-#line 412 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	ascending.tooltip = _tmp3_;
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = actions;
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4__length1 = actions_length1;
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = ascending;
-#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add83 (&actions, &actions_length1, &_actions_size_, &_tmp5_);
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.name = "CommonSortEventsDescending";
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.stock_id = RESOURCES_SORT_DESCENDING_LABEL;
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.label = TRANSLATABLE;
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.accelerator = NULL;
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.tooltip = TRANSLATABLE;
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_.value = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
-#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	descending = _tmp6_;
-#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = _ ("D_escending");
-#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	descending.label = _tmp7_;
-#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = _ ("Sort photos in a descending order");
-#line 419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	descending.tooltip = _tmp8_;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = actions;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9__length1 = actions_length1;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = descending;
-#line 420 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add84 (&actions, &actions_length1, &_actions_size_, &_tmp10_);
-#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = group;
-#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = actions;
-#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12__length1 = actions_length1;
-#line 422 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_action_group_add_radio_actions (_tmp11_, _tmp12_, _tmp12__length1, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING, (GCallback) _library_window_on_events_sort_changed_gtk_radio_action_callback, self);
-#line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	actions = (g_free (actions), NULL);
-#line 3884 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add85 (GtkActionGroup*** array, int* length, int* size, GtkActionGroup* value) {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionGroup*, *array, (*size) + 1);
-#line 3895 "LibraryWindow.c"
-	}
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = value;
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[*length] = NULL;
-#line 3901 "LibraryWindow.c"
-}
-
-
-static void _vala_array_add86 (GtkActionGroup*** array, int* length, int* size, GtkActionGroup* value) {
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if ((*length) == (*size)) {
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*array = g_renew (GtkActionGroup*, *array, (*size) + 1);
-#line 3912 "LibraryWindow.c"
-	}
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[(*length)++] = value;
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	(*array)[*length] = NULL;
-#line 3918 "LibraryWindow.c"
-}
-
-
-static GtkActionGroup** library_window_real_create_common_action_groups (AppWindow* base, int* result_length1) {
+static void library_window_real_add_actions (AppWindow* base) {
 	LibraryWindow * self;
-	GtkActionGroup** result = NULL;
-	GtkActionGroup** groups = NULL;
-	gint _tmp0_ = 0;
-	GtkActionGroup** _tmp1_ = NULL;
-	gint groups_length1 = 0;
-	gint _groups_size_ = 0;
-	GtkActionGroup* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	GtkActionEntry* _tmp4_ = NULL;
-	GtkActionEntry* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	GtkActionGroup* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	GtkToggleActionEntry* _tmp8_ = NULL;
-	GtkToggleActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkActionGroup* _tmp10_ = NULL;
-	GtkAction* action = NULL;
-	GtkActionGroup* _tmp11_ = NULL;
-	GtkAction* _tmp12_ = NULL;
-	GtkAction* _tmp13_ = NULL;
-	GtkAction* _tmp14_ = NULL;
-	GtkActionGroup** _tmp17_ = NULL;
-	gint _tmp17__length1 = 0;
-	GtkActionGroup* _tmp18_ = NULL;
-	GtkActionGroup* _tmp19_ = NULL;
-	GtkActionGroup** _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-	SearchFilterActions* _tmp21_ = NULL;
-	GtkActionGroup* _tmp22_ = NULL;
-	GtkActionGroup** _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = APP_WINDOW_CLASS (library_window_parent_class)->create_common_action_groups (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), &_tmp0_);
-#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	groups = _tmp1_;
-#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	groups_length1 = _tmp0_;
-#line 426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_groups_size_ = groups_length1;
-#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = self->priv->common_action_group;
-#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = library_window_create_common_actions (self, &_tmp3_);
-#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = _tmp4_;
-#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5__length1 = _tmp3_;
-#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_action_group_add_actions (_tmp2_, _tmp5_, _tmp3_, self);
-#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = (g_free (_tmp5_), NULL);
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = self->priv->common_action_group;
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = library_window_create_common_toggle_actions (self, &_tmp7_);
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = _tmp8_;
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9__length1 = _tmp7_;
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_action_group_add_toggle_actions (_tmp6_, _tmp9_, _tmp7_, self);
-#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = (g_free (_tmp9_), NULL);
-#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = self->priv->common_action_group;
-#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_add_common_radio_actions (self, _tmp10_);
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = self->priv->common_action_group;
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = gtk_action_group_get_action (_tmp11_, "CommonDisplaySearchbar");
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	action = _tmp13_;
-#line 433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = action;
-#line 433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp14_ != NULL) {
-#line 4006 "LibraryWindow.c"
-		GtkAction* _tmp15_ = NULL;
-		GtkAction* _tmp16_ = NULL;
-#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp15_ = action;
-#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_action_set_short_label (_tmp15_, RESOURCES_FIND_LABEL);
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp16_ = action;
-#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_action_set_is_important (_tmp16_, TRUE);
-#line 4017 "LibraryWindow.c"
-	}
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_ = groups;
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17__length1 = groups_length1;
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = self->priv->common_action_group;
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 438 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add85 (&groups, &groups_length1, &_groups_size_, _tmp19_);
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp20_ = groups;
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp20__length1 = groups_length1;
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp21_ = self->priv->search_actions;
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_ = search_filter_actions_get_action_group (_tmp21_);
-#line 439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_array_add86 (&groups, &groups_length1, &_groups_size_, _tmp22_);
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23_ = groups;
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23__length1 = groups_length1;
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (result_length1) {
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		*result_length1 = _tmp23__length1;
-#line 4047 "LibraryWindow.c"
-	}
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	result = _tmp23_;
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (action);
-#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	return result;
-#line 4055 "LibraryWindow.c"
-}
-
-
-static void library_window_real_replace_common_placeholders (AppWindow* base, GtkUIManager* ui) {
-	LibraryWindow * self;
-	GtkUIManager* _tmp0_ = NULL;
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	SearchFilterActions* _tmp0_ = NULL;
+	gint _tmp1_ = 0;
+	GActionEntry* _tmp2_ = NULL;
+	SearchFilterActions* _tmp3_ = NULL;
+#line 290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (GTK_IS_UI_MANAGER (ui));
-#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = ui;
-#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	APP_WINDOW_CLASS (library_window_parent_class)->replace_common_placeholders (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp0_);
-#line 4070 "LibraryWindow.c"
+#line 291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	APP_WINDOW_CLASS (library_window_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
+#line 292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), LIBRARY_WINDOW_common_actions, G_N_ELEMENTS (LIBRARY_WINDOW_common_actions), self);
+#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = self->priv->search_actions;
+#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp2_ = search_filter_actions_get_actions (_tmp0_, &_tmp1_);
+#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp3_ = self->priv->search_actions;
+#line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), _tmp2_, _tmp1_, _tmp3_);
+#line 2497 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_installed_view_collection_view_filter_installed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_installed ((LibraryWindow*) self, filer);
-#line 4077 "LibraryWindow.c"
+#line 2504 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_removed_view_collection_view_filter_removed (ViewCollection* _sender, ViewFilter* filer, gpointer self) {
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_removed ((LibraryWindow*) self, filer);
-#line 4084 "LibraryWindow.c"
+#line 2511 "LibraryWindow.c"
 }
 
 
@@ -4093,23 +2520,23 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 	SearchFilterActions* _tmp18_ = NULL;
 	Page* _tmp19_ = NULL;
 	Page* _tmp20_ = NULL;
-#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 448 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = old_page;
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = new_page;
-#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_WINDOW_CLASS (library_window_parent_class)->switched_pages (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp0_, _tmp1_);
-#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = old_page;
-#line 452 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 4113 "LibraryWindow.c"
+#line 2540 "LibraryWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -4118,112 +2545,126 @@ static void library_window_real_switched_pages (PageWindow* base, Page* old_page
 		ViewCollection* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = old_page;
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_parse_name ("view-filter-installed", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self);
-#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = old_page;
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_parse_name ("view-filter-removed", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE);
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self);
-#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 4146 "LibraryWindow.c"
+#line 2573 "LibraryWindow.c"
 	}
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = new_page;
-#line 457 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_ != NULL) {
-#line 4152 "LibraryWindow.c"
+#line 2579 "LibraryWindow.c"
 		Page* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		ViewCollection* _tmp14_ = NULL;
 		Page* _tmp15_ = NULL;
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = new_page;
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = page_get_view (_tmp12_);
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = _tmp13_;
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_connect_object (_tmp14_, "view-filter-installed", (GCallback) _library_window_on_view_filter_installed_view_collection_view_filter_installed, self, 0);
-#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = new_page;
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = page_get_view (_tmp15_);
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_connect_object (_tmp17_, "view-filter-removed", (GCallback) _library_window_on_view_filter_removed_view_collection_view_filter_removed, self, 0);
-#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp17_);
-#line 4179 "LibraryWindow.c"
+#line 2606 "LibraryWindow.c"
 	}
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = self->priv->search_actions;
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = old_page;
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = new_page;
-#line 462 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_actions_monitor_page_contents (_tmp18_, _tmp19_, _tmp20_);
-#line 4189 "LibraryWindow.c"
+#line 2616 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_view_filter_refreshed_view_filter_refresh (ViewFilter* _sender, gpointer self) {
-#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_view_filter_refreshed ((LibraryWindow*) self);
-#line 4196 "LibraryWindow.c"
+#line 2623 "LibraryWindow.c"
 }
 
 
 static void library_window_on_view_filter_installed (LibraryWindow* self, ViewFilter* filter) {
 	ViewFilter* _tmp0_ = NULL;
-#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_VIEW_FILTER (filter));
-#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = filter;
-#line 466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (_tmp0_, "refresh", (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self, 0);
-#line 4210 "LibraryWindow.c"
+#line 2637 "LibraryWindow.c"
 }
 
 
 static void library_window_on_view_filter_removed (LibraryWindow* self, ViewFilter* filter) {
 	ViewFilter* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_VIEW_FILTER (filter));
-#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = filter;
-#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp1_, NULL, FALSE);
-#line 470 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_view_filter_refreshed_view_filter_refresh, self);
-#line 4227 "LibraryWindow.c"
+#line 2654 "LibraryWindow.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 2661 "LibraryWindow.c"
+}
+
+
+static GVariant* _variant_new1 (gboolean value) {
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 2668 "LibraryWindow.c"
 }
 
 
@@ -4234,196 +2675,164 @@ static void library_window_on_view_filter_refreshed (LibraryWindow* self) {
 	ViewCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-	GtkToggleAction* display_searchbar = NULL;
-	GtkAction* _tmp6_ = NULL;
-	GtkToggleAction* _tmp7_ = NULL;
-	GtkToggleAction* _tmp8_ = NULL;
-#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GAction* action = NULL;
+	GAction* _tmp6_ = NULL;
+	GAction* _tmp7_ = NULL;
+	GAction* _tmp8_ = NULL;
+#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view_collection_are_items_filtered_out (_tmp3_);
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = !_tmp4_;
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_) {
-#line 477 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 4264 "LibraryWindow.c"
-	}
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar");
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp6_) : NULL;
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp7_ == NULL) {
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp6_);
-#line 4274 "LibraryWindow.c"
-	}
-#line 480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	display_searchbar = _tmp7_;
-#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = display_searchbar;
-#line 482 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 2705 "LibraryWindow.c"
+	}
+#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp6_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
+#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp7_ = _g_object_ref0 (_tmp6_);
+#line 328 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	action = _tmp7_;
+#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp8_ = action;
+#line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 4282 "LibraryWindow.c"
-		GtkToggleAction* _tmp9_ = NULL;
-#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = display_searchbar;
-#line 483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_toggle_action_set_active (_tmp9_, TRUE);
-#line 4288 "LibraryWindow.c"
-	}
-#line 473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (display_searchbar);
-#line 4292 "LibraryWindow.c"
+#line 2717 "LibraryWindow.c"
+		GAction* _tmp9_ = NULL;
+		GVariant* _tmp10_ = NULL;
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp9_ = action;
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp10_ = _variant_new1 (TRUE);
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_action_change_state (_tmp9_, _tmp10_);
+#line 331 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_g_variant_unref0 (_tmp10_);
+#line 2728 "LibraryWindow.c"
+	}
+#line 321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (action);
+#line 2732 "LibraryWindow.c"
 }
 
 
 static void library_window_real_show_all (GtkWidget* base) {
 	LibraryWindow * self;
-	GtkToggleAction* basic_properties_action = NULL;
+	GAction* basic_properties_action = NULL;
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-	GtkToggleAction* _tmp3_ = NULL;
-	GtkToggleAction* _tmp4_ = NULL;
-	GtkToggleAction* _tmp5_ = NULL;
-	GtkToggleAction* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	GtkToggleAction* searchbar_action = NULL;
-	Page* _tmp9_ = NULL;
-	Page* _tmp10_ = NULL;
-	GtkAction* _tmp11_ = NULL;
-	GtkToggleAction* _tmp12_ = NULL;
-	GtkToggleAction* _tmp13_ = NULL;
-	GtkToggleAction* _tmp14_ = NULL;
+	GAction* _tmp2_ = NULL;
+	GAction* _tmp3_ = NULL;
+	GAction* _tmp4_ = NULL;
+	GAction* _tmp5_ = NULL;
+	GVariant* _tmp6_ = NULL;
+	GVariant* _tmp7_ = NULL;
+	gboolean _tmp8_ = FALSE;
+	gboolean _tmp9_ = FALSE;
 	CheckerboardPage* current_page = NULL;
-	Page* _tmp15_ = NULL;
+	Page* _tmp11_ = NULL;
+	CheckerboardPage* _tmp12_ = NULL;
+	CheckerboardPage* _tmp13_ = NULL;
+	gboolean _tmp15_ = FALSE;
 	CheckerboardPage* _tmp16_ = NULL;
-	CheckerboardPage* _tmp17_ = NULL;
-	gboolean _tmp19_ = FALSE;
-	CheckerboardPage* _tmp20_ = NULL;
-	gboolean _tmp21_ = FALSE;
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gboolean _tmp17_ = FALSE;
+#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 488 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	GTK_WIDGET_CLASS (library_window_parent_class)->show_all (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget));
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_common_action (_tmp1_, "CommonDisplayBasicProperties", TRUE);
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp2_) : NULL;
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp3_ == NULL) {
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp2_);
-#line 4337 "LibraryWindow.c"
-	}
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = _tmp3_;
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp3_ = _tmp2_;
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	basic_properties_action = _tmp4_;
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 338 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	basic_properties_action = _tmp3_;
+#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp4_ = basic_properties_action;
+#line 340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_assert (_tmp4_ != NULL, "basic_properties_action != null");
+#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = basic_properties_action;
-#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (_tmp5_ != NULL, "basic_properties_action != null");
-#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = basic_properties_action;
-#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = gtk_toggle_action_get_active (_tmp6_);
-#line 494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (!_tmp7_) {
-#line 4355 "LibraryWindow.c"
-		GtkFrame* _tmp8_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = self->priv->bottom_frame;
-#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 4361 "LibraryWindow.c"
+#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp6_ = g_action_get_state (_tmp5_);
+#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp7_ = _tmp6_;
+#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp8_ = g_variant_get_boolean (_tmp7_);
+#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp9_ = !_tmp8_;
+#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp7_);
+#line 342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp9_) {
+#line 2790 "LibraryWindow.c"
+		GtkFrame* _tmp10_ = NULL;
+#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp10_ = self->priv->bottom_frame;
+#line 343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
+#line 2796 "LibraryWindow.c"
 	}
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = _tmp9_;
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = page_get_common_action (_tmp10_, "CommonDisplaySearchbar", TRUE);
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp11_) : NULL;
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp11_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
+#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp11_) : NULL;
+#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ == NULL) {
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 4375 "LibraryWindow.c"
-	}
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = _tmp12_;
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp10_);
-#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	searchbar_action = _tmp13_;
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = searchbar_action;
-#line 499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (_tmp14_ != NULL, "searchbar_action != null");
-#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp15_) : NULL;
-#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp16_ == NULL) {
-#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp15_);
-#line 4395 "LibraryWindow.c"
+#line 2806 "LibraryWindow.c"
 	}
-#line 502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	current_page = _tmp16_;
-#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_ = current_page;
-#line 503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp17_ != NULL) {
-#line 4403 "LibraryWindow.c"
-		CheckerboardPage* _tmp18_ = NULL;
-#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp18_ = current_page;
-#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		library_window_init_view_filter (self, _tmp18_);
-#line 4409 "LibraryWindow.c"
+#line 346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	current_page = _tmp12_;
+#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp13_ = current_page;
+#line 347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp13_ != NULL) {
+#line 2814 "LibraryWindow.c"
+		CheckerboardPage* _tmp14_ = NULL;
+#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp14_ = current_page;
+#line 348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		library_window_init_view_filter (self, _tmp14_);
+#line 2820 "LibraryWindow.c"
 	}
-#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = library_window_should_show_search_bar (self);
-#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp20_ = current_page;
-#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_toggle_search_bar (self, _tmp19_, _tmp20_);
-#line 509 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp21_ = library_window_is_sidebar_visible (self);
-#line 509 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_set_sidebar_visible (self, _tmp21_);
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp15_ = library_window_should_show_search_bar (self);
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp16_ = current_page;
+#line 350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_toggle_search_bar (self, _tmp15_, _tmp16_);
+#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp17_ = library_window_is_sidebar_visible (self);
+#line 353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_set_sidebar_visible (self, _tmp17_);
+#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (searchbar_action);
-#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_properties_action);
-#line 4427 "LibraryWindow.c"
+#line 2836 "LibraryWindow.c"
 }
 
 
@@ -4432,77 +2841,77 @@ LibraryWindow* library_window_get_app (void) {
 	AppWindow* _tmp0_ = NULL;
 	AppWindow* _tmp1_ = NULL;
 	LibraryWindow* _tmp2_ = NULL;
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = app_window_instance;
-#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_WINDOW), "instance is LibraryWindow");
-#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = app_window_instance;
-#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_WINDOW, LibraryWindow));
-#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
-#line 515 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4448 "LibraryWindow.c"
+#line 2857 "LibraryWindow.c"
 }
 
 
 gboolean library_window_is_mount_uri_supported (const gchar* uri) {
 	gboolean result = FALSE;
-#line 519 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (uri != NULL, FALSE);
-#line 4456 "LibraryWindow.c"
+#line 2865 "LibraryWindow.c"
 	{
 		const gchar** scheme_collection = NULL;
 		gint scheme_collection_length1 = 0;
 		gint _scheme_collection_size_ = 0;
 		gint scheme_it = 0;
-#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		scheme_collection = LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES;
-#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		scheme_collection_length1 = G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES);
-#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (scheme_it = 0; scheme_it < G_N_ELEMENTS (LIBRARY_WINDOW_SUPPORTED_MOUNT_SCHEMES); scheme_it = scheme_it + 1) {
-#line 4468 "LibraryWindow.c"
+#line 2877 "LibraryWindow.c"
 			gchar* _tmp0_ = NULL;
 			gchar* scheme = NULL;
-#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp0_ = g_strdup (scheme_collection[scheme_it]);
-#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			scheme = _tmp0_;
-#line 4475 "LibraryWindow.c"
+#line 2884 "LibraryWindow.c"
 			{
 				const gchar* _tmp1_ = NULL;
 				const gchar* _tmp2_ = NULL;
 				gboolean _tmp3_ = FALSE;
-#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp1_ = uri;
-#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp2_ = scheme;
-#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp3_ = g_str_has_prefix (_tmp1_, _tmp2_);
-#line 521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				if (_tmp3_) {
-#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					result = TRUE;
-#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (scheme);
-#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					return result;
-#line 4494 "LibraryWindow.c"
+#line 2903 "LibraryWindow.c"
 				}
-#line 520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 364 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (scheme);
-#line 4498 "LibraryWindow.c"
+#line 2907 "LibraryWindow.c"
 			}
 		}
 	}
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4506 "LibraryWindow.c"
+#line 2915 "LibraryWindow.c"
 }
 
 
@@ -4510,15 +2919,15 @@ static gchar* library_window_real_get_app_role (AppWindow* base) {
 	LibraryWindow * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 372 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = g_strdup (RESOURCES_APP_LIBRARY_ROLE);
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4522 "LibraryWindow.c"
+#line 2931 "LibraryWindow.c"
 }
 
 
@@ -4528,40 +2937,40 @@ void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag) {
 	Tag* _tmp1_ = NULL;
 	TagsSidebarEntry* _tmp2_ = NULL;
 	TagsSidebarEntry* _tmp3_ = NULL;
-#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_TAG (tag));
-#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
-#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = tag;
-#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
-#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4548 "LibraryWindow.c"
+#line 2957 "LibraryWindow.c"
 		SidebarTree* _tmp4_ = NULL;
 		TagsSidebarEntry* _tmp5_ = NULL;
-#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
-#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = entry;
-#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 4557 "LibraryWindow.c"
+#line 2966 "LibraryWindow.c"
 	} else {
-#line 537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:537: No tag entry found for rename");
-#line 4561 "LibraryWindow.c"
+#line 381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:381: No tag entry found for rename");
+#line 2970 "LibraryWindow.c"
 	}
-#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 376 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 4565 "LibraryWindow.c"
+#line 2974 "LibraryWindow.c"
 }
 
 
@@ -4571,40 +2980,40 @@ void library_window_rename_event_in_sidebar (LibraryWindow* self, Event* event)
 	Event* _tmp1_ = NULL;
 	EventsEventEntry* _tmp2_ = NULL;
 	EventsEventEntry* _tmp3_ = NULL;
-#line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
-#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = event;
-#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
-#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 542 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 542 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4591 "LibraryWindow.c"
+#line 3000 "LibraryWindow.c"
 		SidebarTree* _tmp4_ = NULL;
 		EventsEventEntry* _tmp5_ = NULL;
-#line 543 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
-#line 543 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = entry;
-#line 543 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 4600 "LibraryWindow.c"
+#line 3009 "LibraryWindow.c"
 	} else {
-#line 545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:545: No event entry found for rename");
-#line 4604 "LibraryWindow.c"
+#line 389 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:389: No event entry found for rename");
+#line 3013 "LibraryWindow.c"
 	}
-#line 540 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 4608 "LibraryWindow.c"
+#line 3017 "LibraryWindow.c"
 }
 
 
@@ -4614,40 +3023,40 @@ void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch*
 	SavedSearch* _tmp1_ = NULL;
 	SearchesSidebarEntry* _tmp2_ = NULL;
 	SearchesSidebarEntry* _tmp3_ = NULL;
-#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
-#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = search;
-#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
-#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4634 "LibraryWindow.c"
+#line 3043 "LibraryWindow.c"
 		SidebarTree* _tmp4_ = NULL;
 		SearchesSidebarEntry* _tmp5_ = NULL;
-#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->sidebar_tree;
-#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = entry;
-#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 395 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_rename_entry_in_place (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 4643 "LibraryWindow.c"
+#line 3052 "LibraryWindow.c"
 	} else {
-#line 553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:553: No search entry found for rename");
-#line 4647 "LibraryWindow.c"
+#line 397 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:397: No search entry found for rename");
+#line 3056 "LibraryWindow.c"
 	}
-#line 548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 392 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 4651 "LibraryWindow.c"
+#line 3060 "LibraryWindow.c"
 }
 
 
@@ -4662,37 +3071,37 @@ static void library_window_real_on_quit (AppWindow* base) {
 	GtkPaned* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 556 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->maximized;
-#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow)->dimensions;
-#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_library_window_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, &_tmp3_);
-#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->client_paned;
-#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = gtk_paned_get_position (_tmp6_);
-#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp8_);
-#line 559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 561 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	APP_WINDOW_CLASS (library_window_parent_class)->on_quit (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow));
-#line 4696 "LibraryWindow.c"
+#line 3105 "LibraryWindow.c"
 }
 
 
@@ -4709,105 +3118,105 @@ static Photo* library_window_get_start_fullscreen_photo (LibraryWindow* self, Co
 	Photo* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
 	GeeList* _tmp12_ = NULL;
-#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), NULL);
-#line 564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 408 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (page), NULL);
-#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 569 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = view;
-#line 569 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 569 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_ > 0) {
-#line 4729 "LibraryWindow.c"
+#line 3138 "LibraryWindow.c"
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
-#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = view;
-#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = view_collection_get_selected_sources_of_type (_tmp5_, TYPE_LIBRARY_PHOTO);
-#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp6_;
-#line 4740 "LibraryWindow.c"
+#line 3149 "LibraryWindow.c"
 	} else {
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
-#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = view;
-#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = view_collection_get_sources_of_type (_tmp7_, TYPE_LIBRARY_PHOTO);
-#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _tmp8_;
-#line 4752 "LibraryWindow.c"
+#line 3161 "LibraryWindow.c"
 	}
-#line 569 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _g_object_ref0 (_tmp2_);
-#line 569 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	sources = _tmp9_;
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = sources;
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_ != NULL) {
-#line 4762 "LibraryWindow.c"
+#line 3171 "LibraryWindow.c"
 		GeeList* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = sources;
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = _tmp14_;
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp15_ != 0;
-#line 4774 "LibraryWindow.c"
+#line 3183 "LibraryWindow.c"
 	} else {
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = FALSE;
-#line 4778 "LibraryWindow.c"
+#line 3187 "LibraryWindow.c"
 	}
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp11_) {
-#line 4782 "LibraryWindow.c"
+#line 3191 "LibraryWindow.c"
 		GeeList* _tmp16_ = NULL;
 		gpointer _tmp17_ = NULL;
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = sources;
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = gee_list_get (_tmp16_, 0);
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp17_, TYPE_PHOTO, Photo);
-#line 4793 "LibraryWindow.c"
+#line 3202 "LibraryWindow.c"
 	} else {
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 574 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = NULL;
-#line 4799 "LibraryWindow.c"
+#line 3208 "LibraryWindow.c"
 	}
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp10_;
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (sources);
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 573 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 417 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 4811 "LibraryWindow.c"
+#line 3220 "LibraryWindow.c"
 }
 
 
@@ -4819,27 +3228,27 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 	Page* _tmp0_ = NULL;
 	Page* _tmp8_ = NULL;
 	Page* _tmp30_ = NULL;
-#line 577 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 577 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 421 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_PAGE (page), FALSE);
-#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_vala_collection);
-#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_collection = NULL;
-#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_vala_start);
-#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_start = NULL;
-#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_vala_view_collection);
-#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_view_collection = NULL;
-#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_COLLECTION_PAGE)) {
-#line 4843 "LibraryWindow.c"
+#line 3252 "LibraryWindow.c"
 		Page* _tmp1_ = NULL;
 		CollectionPage* _tmp2_ = NULL;
 		Photo* photo = NULL;
@@ -4848,117 +3257,117 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		Photo* _tmp5_ = NULL;
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = page;
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_COLLECTION_PAGE, CollectionPage));
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_collection = _tmp2_;
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _vala_collection;
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = library_window_get_start_fullscreen_photo (self, _tmp3_);
-#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		photo = _tmp4_;
-#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = photo;
-#line 587 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp5_ == NULL) {
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo);
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 4878 "LibraryWindow.c"
+#line 3287 "LibraryWindow.c"
 			} else {
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 4882 "LibraryWindow.c"
+#line 3291 "LibraryWindow.c"
 			}
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 4888 "LibraryWindow.c"
+#line 3297 "LibraryWindow.c"
 			} else {
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 4892 "LibraryWindow.c"
+#line 3301 "LibraryWindow.c"
 			}
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 4898 "LibraryWindow.c"
+#line 3307 "LibraryWindow.c"
 			} else {
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 4902 "LibraryWindow.c"
+#line 3311 "LibraryWindow.c"
 			}
-#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 4906 "LibraryWindow.c"
+#line 3315 "LibraryWindow.c"
 		}
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = photo;
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_start = _tmp7_;
-#line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 591 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = NULL;
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo);
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 4928 "LibraryWindow.c"
+#line 3337 "LibraryWindow.c"
 		} else {
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 4932 "LibraryWindow.c"
+#line 3341 "LibraryWindow.c"
 		}
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 4938 "LibraryWindow.c"
+#line 3347 "LibraryWindow.c"
 		} else {
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 4942 "LibraryWindow.c"
+#line 3351 "LibraryWindow.c"
 		}
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 4948 "LibraryWindow.c"
+#line 3357 "LibraryWindow.c"
 		} else {
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 4952 "LibraryWindow.c"
+#line 3361 "LibraryWindow.c"
 		}
-#line 593 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 4956 "LibraryWindow.c"
+#line 3365 "LibraryWindow.c"
 	}
-#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = page;
-#line 596 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 440 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENTS_DIRECTORY_PAGE)) {
-#line 4962 "LibraryWindow.c"
+#line 3371 "LibraryWindow.c"
 		ViewCollection* view = NULL;
 		Page* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
@@ -4984,291 +3393,291 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		Photo* _tmp27_ = NULL;
 		Photo* _tmp28_ = NULL;
 		Photo* _tmp29_ = NULL;
-#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = page;
-#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = page_get_view (_tmp9_);
-#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 441 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		view = _tmp10_;
-#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = view;
-#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
-#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp12_ == 0) {
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 5008 "LibraryWindow.c"
+#line 3417 "LibraryWindow.c"
 			} else {
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 5012 "LibraryWindow.c"
+#line 3421 "LibraryWindow.c"
 			}
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 5018 "LibraryWindow.c"
+#line 3427 "LibraryWindow.c"
 			} else {
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 5022 "LibraryWindow.c"
+#line 3431 "LibraryWindow.c"
 			}
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 5028 "LibraryWindow.c"
+#line 3437 "LibraryWindow.c"
 			} else {
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 5032 "LibraryWindow.c"
+#line 3441 "LibraryWindow.c"
 			}
-#line 599 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 443 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 5036 "LibraryWindow.c"
+#line 3445 "LibraryWindow.c"
 		}
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = view;
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = data_collection_get_at (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection), 0);
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_VIEW, DataView);
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = data_view_get_source (_tmp15_);
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_EVENT, Event);
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp15_);
-#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		event = _tmp17_;
-#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = event;
-#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 446 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp18_ == NULL) {
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 5066 "LibraryWindow.c"
+#line 3475 "LibraryWindow.c"
 			} else {
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 5070 "LibraryWindow.c"
+#line 3479 "LibraryWindow.c"
 			}
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 5076 "LibraryWindow.c"
+#line 3485 "LibraryWindow.c"
 			} else {
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 5080 "LibraryWindow.c"
+#line 3489 "LibraryWindow.c"
 			}
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 5086 "LibraryWindow.c"
+#line 3495 "LibraryWindow.c"
 			} else {
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 5090 "LibraryWindow.c"
+#line 3499 "LibraryWindow.c"
 			}
-#line 603 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 5094 "LibraryWindow.c"
+#line 3503 "LibraryWindow.c"
 		}
-#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = self->priv->events_branch;
-#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = event;
-#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = events_branch_get_entry_for_event (_tmp19_, _tmp20_);
-#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		entry = _tmp21_;
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp22_ = entry;
-#line 606 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp22_ == NULL) {
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (entry);
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 5120 "LibraryWindow.c"
+#line 3529 "LibraryWindow.c"
 			} else {
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 5124 "LibraryWindow.c"
+#line 3533 "LibraryWindow.c"
 			}
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 5130 "LibraryWindow.c"
+#line 3539 "LibraryWindow.c"
 			} else {
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 5134 "LibraryWindow.c"
+#line 3543 "LibraryWindow.c"
 			}
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 5140 "LibraryWindow.c"
+#line 3549 "LibraryWindow.c"
 			} else {
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 5144 "LibraryWindow.c"
+#line 3553 "LibraryWindow.c"
 			}
-#line 607 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 451 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 5148 "LibraryWindow.c"
+#line 3557 "LibraryWindow.c"
 		}
-#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = entry;
-#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_collection = G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_EVENT_PAGE, EventPage), TYPE_COLLECTION_PAGE, CollectionPage);
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp25_ = _vala_collection;
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp26_ = library_window_get_start_fullscreen_photo (self, _tmp25_);
-#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		photo = _tmp26_;
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = photo;
-#line 611 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp27_ == NULL) {
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo);
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (entry);
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (event);
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 5182 "LibraryWindow.c"
+#line 3591 "LibraryWindow.c"
 			} else {
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 5186 "LibraryWindow.c"
+#line 3595 "LibraryWindow.c"
 			}
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 5192 "LibraryWindow.c"
+#line 3601 "LibraryWindow.c"
 			} else {
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 5196 "LibraryWindow.c"
+#line 3605 "LibraryWindow.c"
 			}
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 5202 "LibraryWindow.c"
+#line 3611 "LibraryWindow.c"
 			} else {
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 5206 "LibraryWindow.c"
+#line 3615 "LibraryWindow.c"
 			}
-#line 612 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 5210 "LibraryWindow.c"
+#line 3619 "LibraryWindow.c"
 		}
-#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = photo;
-#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _g_object_ref0 (_tmp28_);
-#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 614 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 458 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_start = _tmp29_;
-#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 615 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = NULL;
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo);
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (event);
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 5238 "LibraryWindow.c"
+#line 3647 "LibraryWindow.c"
 		} else {
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 5242 "LibraryWindow.c"
+#line 3651 "LibraryWindow.c"
 		}
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 5248 "LibraryWindow.c"
+#line 3657 "LibraryWindow.c"
 		} else {
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 5252 "LibraryWindow.c"
+#line 3661 "LibraryWindow.c"
 		}
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 5258 "LibraryWindow.c"
+#line 3667 "LibraryWindow.c"
 		} else {
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 5262 "LibraryWindow.c"
+#line 3671 "LibraryWindow.c"
 		}
-#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 461 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5266 "LibraryWindow.c"
+#line 3675 "LibraryWindow.c"
 	}
-#line 620 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = page;
-#line 620 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 464 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 5272 "LibraryWindow.c"
+#line 3681 "LibraryWindow.c"
 		LibraryPhotoPage* photo_page = NULL;
 		Page* _tmp31_ = NULL;
 		LibraryPhotoPage* _tmp32_ = NULL;
@@ -5284,207 +3693,207 @@ static gboolean library_window_get_fullscreen_photo (LibraryWindow* self, Page*
 		Photo* _tmp41_ = NULL;
 		LibraryPhotoPage* _tmp42_ = NULL;
 		ViewCollection* _tmp43_ = NULL;
-#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp31_ = page;
-#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage));
-#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 465 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		photo_page = _tmp32_;
-#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp33_ = photo_page;
-#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp34_ = library_photo_page_get_controller_page (_tmp33_);
-#line 623 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		controller = _tmp34_;
-#line 624 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp35_ = controller;
-#line 624 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 468 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp35_ == NULL) {
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (controller);
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo_page);
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 5314 "LibraryWindow.c"
+#line 3723 "LibraryWindow.c"
 			} else {
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 5318 "LibraryWindow.c"
+#line 3727 "LibraryWindow.c"
 			}
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 5324 "LibraryWindow.c"
+#line 3733 "LibraryWindow.c"
 			} else {
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 5328 "LibraryWindow.c"
+#line 3737 "LibraryWindow.c"
 			}
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 5334 "LibraryWindow.c"
+#line 3743 "LibraryWindow.c"
 			} else {
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 5338 "LibraryWindow.c"
+#line 3747 "LibraryWindow.c"
 			}
-#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 5342 "LibraryWindow.c"
+#line 3751 "LibraryWindow.c"
 		}
-#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = photo_page;
-#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp37_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 627 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 471 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp37_) {
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = FALSE;
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (controller);
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (photo_page);
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (collection) {
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*collection = _vala_collection;
-#line 5360 "LibraryWindow.c"
+#line 3769 "LibraryWindow.c"
 			} else {
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_collection);
-#line 5364 "LibraryWindow.c"
+#line 3773 "LibraryWindow.c"
 			}
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (start) {
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*start = _vala_start;
-#line 5370 "LibraryWindow.c"
+#line 3779 "LibraryWindow.c"
 			} else {
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_vala_start);
-#line 5374 "LibraryWindow.c"
+#line 3783 "LibraryWindow.c"
 			}
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (view_collection) {
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				*view_collection = _vala_view_collection;
-#line 5380 "LibraryWindow.c"
+#line 3789 "LibraryWindow.c"
 			} else {
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (_vala_view_collection);
-#line 5384 "LibraryWindow.c"
+#line 3793 "LibraryWindow.c"
 			}
-#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 472 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 5388 "LibraryWindow.c"
+#line 3797 "LibraryWindow.c"
 		}
-#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = controller;
-#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp39_ = _g_object_ref0 (_tmp38_);
-#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_collection = _tmp39_;
-#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp40_ = photo_page;
-#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp41_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 631 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 475 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_start = _tmp41_;
-#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp42_ = photo_page;
-#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp43_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE, Page));
-#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 632 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_view_collection = _tmp43_;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (controller);
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (photo_page);
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (collection) {
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*collection = _vala_collection;
-#line 5424 "LibraryWindow.c"
+#line 3833 "LibraryWindow.c"
 		} else {
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_collection);
-#line 5428 "LibraryWindow.c"
+#line 3837 "LibraryWindow.c"
 		}
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (start) {
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*start = _vala_start;
-#line 5434 "LibraryWindow.c"
+#line 3843 "LibraryWindow.c"
 		} else {
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (_vala_start);
-#line 5438 "LibraryWindow.c"
+#line 3847 "LibraryWindow.c"
 		}
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (view_collection) {
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			*view_collection = _vala_view_collection;
-#line 5444 "LibraryWindow.c"
+#line 3853 "LibraryWindow.c"
 		} else {
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_vala_view_collection);
-#line 5448 "LibraryWindow.c"
+#line 3857 "LibraryWindow.c"
 		}
-#line 634 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 478 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 5452 "LibraryWindow.c"
+#line 3861 "LibraryWindow.c"
 	}
-#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (collection) {
-#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*collection = _vala_collection;
-#line 5460 "LibraryWindow.c"
+#line 3869 "LibraryWindow.c"
 	} else {
-#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_collection);
-#line 5464 "LibraryWindow.c"
+#line 3873 "LibraryWindow.c"
 	}
-#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (start) {
-#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*start = _vala_start;
-#line 5470 "LibraryWindow.c"
+#line 3879 "LibraryWindow.c"
 	} else {
-#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_vala_start);
-#line 5474 "LibraryWindow.c"
+#line 3883 "LibraryWindow.c"
 	}
-#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (view_collection) {
-#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		*view_collection = _vala_view_collection;
-#line 5480 "LibraryWindow.c"
+#line 3889 "LibraryWindow.c"
 	} else {
-#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_vala_view_collection);
-#line 5484 "LibraryWindow.c"
+#line 3893 "LibraryWindow.c"
 	}
-#line 637 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5488 "LibraryWindow.c"
+#line 3897 "LibraryWindow.c"
 }
 
 
@@ -5507,97 +3916,97 @@ static void library_window_real_on_fullscreen (AppWindow* base) {
 	ViewCollection* _tmp9_ = NULL;
 	LibraryWindowFullscreenPhotoPage* _tmp10_ = NULL;
 	LibraryWindowFullscreenPhotoPage* _tmp11_ = NULL;
-#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	current_page = _tmp0_;
-#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = current_page;
-#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 486 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 643 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (current_page);
-#line 643 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5525 "LibraryWindow.c"
+#line 3934 "LibraryWindow.c"
 	}
-#line 647 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = NULL;
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = current_page;
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = library_window_get_fullscreen_photo (self, _tmp2_, &_tmp3_, &_tmp4_, &_tmp5_);
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	collection = _tmp3_;
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	start = _tmp4_;
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp5_;
-#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 492 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp6_) {
-#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (start);
-#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (collection);
-#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (current_page);
-#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 5557 "LibraryWindow.c"
+#line 3966 "LibraryWindow.c"
 	}
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = collection;
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = start;
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = view;
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = library_window_fullscreen_photo_page_new (_tmp7_, _tmp8_, _tmp9_);
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp10_);
-#line 651 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	fs_photo = _tmp10_;
-#line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = fs_photo;
-#line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 497 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_go_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE, Page));
-#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (fs_photo);
-#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 640 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 484 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 5585 "LibraryWindow.c"
+#line 3994 "LibraryWindow.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	var = (g_free (var), NULL);
-#line 5592 "LibraryWindow.c"
+#line 4001 "LibraryWindow.c"
 }
 
 
 static void _g_slist_free__g_free0_ (GSList* self) {
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_slist_foreach (self, (GFunc) _g_free0_, NULL);
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_slist_free (self);
-#line 5601 "LibraryWindow.c"
+#line 4010 "LibraryWindow.c"
 }
 
 
@@ -5616,41 +4025,41 @@ static void library_window_on_file_import (LibraryWindow* self) {
 	GtkFileChooserDialog* _tmp23_ = NULL;
 	gchar* _tmp24_ = NULL;
 	GtkFileChooserDialog* _tmp25_ = NULL;
-#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 657 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _ ("Import From Folder");
-#line 657 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp0_, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 657 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp1_);
-#line 657 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 501 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_dialog = _tmp1_;
-#line 660 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = import_dialog;
-#line 660 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
-#line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = import_dialog;
-#line 661 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
-#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = import_dialog;
-#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->import_dir;
-#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 506 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp5_);
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = import_dialog;
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_dialog_get_type (), GtkDialog));
-#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	response = _tmp7_;
-#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = response;
-#line 666 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 510 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ == ((gint) GTK_RESPONSE_OK)) {
-#line 5654 "LibraryWindow.c"
+#line 4063 "LibraryWindow.c"
 		GtkResponseType _tmp9_ = 0;
 		GtkFileChooserDialog* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
@@ -5661,95 +4070,95 @@ static void library_window_on_file_import (LibraryWindow* self) {
 		gboolean _tmp16_ = FALSE;
 		GtkResponseType copy_files_response = 0;
 		GtkResponseType _tmp18_ = 0;
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = import_dialog;
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp11_;
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = g_file_new_for_uri (_tmp12_);
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = _tmp13_;
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = app_dirs_is_in_import_dir (_tmp14_);
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp14_);
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp12_);
-#line 669 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp16_) {
-#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = GTK_RESPONSE_REJECT;
-#line 5687 "LibraryWindow.c"
+#line 4096 "LibraryWindow.c"
 		} else {
 			GtkResponseType _tmp17_ = 0;
-#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = copy_files_dialog ();
-#line 670 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = _tmp17_;
-#line 5694 "LibraryWindow.c"
+#line 4103 "LibraryWindow.c"
 		}
-#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		copy_files_response = _tmp9_;
-#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = copy_files_response;
-#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp18_ != GTK_RESPONSE_CANCEL) {
-#line 5702 "LibraryWindow.c"
+#line 4111 "LibraryWindow.c"
 			GtkFileChooserDialog* _tmp19_ = NULL;
 			GSList* _tmp20_ = NULL;
 			GSList* _tmp21_ = NULL;
 			GtkResponseType _tmp22_ = 0;
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp19_ = import_dialog;
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = gtk_file_chooser_get_uris (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = _tmp20_;
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = copy_files_response;
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			library_window_dispatch_import_jobs (self, _tmp21_, "folders", _tmp22_ == GTK_RESPONSE_ACCEPT);
-#line 673 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			__g_slist_free__g_free0_0 (_tmp21_);
-#line 5719 "LibraryWindow.c"
+#line 4128 "LibraryWindow.c"
 		}
 	}
-#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = import_dialog;
-#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (self->priv->import_dir);
-#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->import_dir = _tmp24_;
-#line 679 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = import_dialog;
-#line 679 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 523 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget));
-#line 656 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 5736 "LibraryWindow.c"
+#line 4145 "LibraryWindow.c"
 }
 
 
 static void library_window_on_external_library_import (LibraryWindow* self) {
 	GtkDialog* import_dialog = NULL;
 	DataImportsUIDataImportsDialog* _tmp0_ = NULL;
-#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 683 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = data_imports_ui_data_imports_dialog_get_or_create_instance ();
-#line 683 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_dialog = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_dialog_get_type (), GtkDialog);
-#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 529 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_dialog_run (import_dialog);
-#line 682 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 526 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (import_dialog);
-#line 5753 "LibraryWindow.c"
+#line 4162 "LibraryWindow.c"
 }
 
 
@@ -5759,27 +4168,27 @@ static void library_window_real_update_common_action_availability (AppWindow* ba
 	Page* _tmp1_ = NULL;
 	gboolean is_checkerboard = FALSE;
 	Page* _tmp2_ = NULL;
-#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 532 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
-#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = old_page;
-#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = new_page;
-#line 689 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	APP_WINDOW_CLASS (library_window_parent_class)->update_common_action_availability (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp0_, _tmp1_);
-#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = new_page;
-#line 691 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE);
-#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar", is_checkerboard);
-#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 538 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFind", is_checkerboard);
-#line 5783 "LibraryWindow.c"
+#line 4192 "LibraryWindow.c"
 }
 
 
@@ -5797,61 +4206,61 @@ static void library_window_real_update_common_actions (AppWindow* base, Page* pa
 	Page* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = library_window_get_fullscreen_photo (self, _tmp0_, &_tmp1_, &_tmp2_, NULL);
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	collection = _tmp1_;
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	start = _tmp2_;
-#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 547 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	can_fullscreen = _tmp3_;
-#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = library_window_can_empty_trash (self);
-#line 705 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp4_);
-#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", TRUE);
-#line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = library_window_can_jump_to_event (self);
-#line 707 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp5_);
-#line 708 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonFullscreen", can_fullscreen);
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = page;
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = selected_count;
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = count;
-#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 554 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	APP_WINDOW_CLASS (library_window_parent_class)->update_common_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), _tmp6_, _tmp7_, _tmp8_);
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (start);
-#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (collection);
-#line 5843 "LibraryWindow.c"
+#line 4252 "LibraryWindow.c"
 }
 
 
 static void library_window_on_trashcan_contents_altered (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 713 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = library_window_can_empty_trash (self);
-#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonEmptyTrash", _tmp0_);
-#line 5855 "LibraryWindow.c"
+#line 4264 "LibraryWindow.c"
 }
 
 
@@ -5860,33 +4269,33 @@ static gboolean library_window_can_empty_trash (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
 	LibraryPhotoSourceCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 717 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 561 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_photo_global;
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ > 0) {
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = TRUE;
-#line 5874 "LibraryWindow.c"
+#line 4283 "LibraryWindow.c"
 	} else {
 		VideoSourceCollection* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = video_global;
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = media_source_collection_get_trashcan_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 5884 "LibraryWindow.c"
+#line 4293 "LibraryWindow.c"
 	}
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 5890 "LibraryWindow.c"
+#line 4299 "LibraryWindow.c"
 }
 
 
@@ -5903,66 +4312,66 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
 	const gchar* _tmp8_ = NULL;
 	CommandManager* _tmp9_ = NULL;
 	CommandManager* _tmp10_ = NULL;
-#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 722 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	to_remove = _tmp0_;
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_photo_global;
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = media_source_collection_get_trashcan_contents (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_array_list_add_all (to_remove, _tmp3_);
-#line 723 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = video_global;
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = media_source_collection_get_trashcan_contents (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_array_list_add_all (to_remove, _tmp6_);
-#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp6_);
-#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _ ("Empty Trash");
-#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _ ("Emptying Trash…");
-#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 570 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (to_remove, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_, _tmp8_);
-#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = app_window_get_command_manager ();
-#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	command_manager_reset (_tmp10_);
-#line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 572 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_command_manager_unref0 (_tmp10_);
-#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (to_remove);
-#line 5949 "LibraryWindow.c"
+#line 4358 "LibraryWindow.c"
 }
 
 
 static void library_window_on_new_search (LibraryWindow* self) {
 	SavedSearchDialog* _tmp0_ = NULL;
 	SavedSearchDialog* _tmp1_ = NULL;
-#line 731 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = saved_search_dialog_new ();
-#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	saved_search_dialog_show (_tmp1_);
-#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 576 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_saved_search_dialog_unref0 (_tmp1_);
-#line 5966 "LibraryWindow.c"
+#line 4375 "LibraryWindow.c"
 }
 
 
@@ -5975,115 +4384,115 @@ static gboolean library_window_can_jump_to_event (LibraryWindow* self) {
 	ViewCollection* _tmp3_ = NULL;
 	ViewCollection* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
-#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 580 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp3_;
-#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view;
-#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ == 1) {
-#line 5999 "LibraryWindow.c"
+#line 4408 "LibraryWindow.c"
 		DataSource* selected_source = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		DataSource* _tmp7_ = NULL;
 		DataSource* _tmp8_ = NULL;
-#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = view;
-#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
-#line 738 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 582 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		selected_source = _tmp7_;
-#line 739 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 583 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = selected_source;
-#line 739 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 583 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_EVENT)) {
-#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = TRUE;
-#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (selected_source);
-#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (view);
-#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 584 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 6022 "LibraryWindow.c"
+#line 4431 "LibraryWindow.c"
 		} else {
 			DataSource* _tmp9_ = NULL;
-#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = selected_source;
-#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_MEDIA_SOURCE)) {
-#line 6029 "LibraryWindow.c"
+#line 4438 "LibraryWindow.c"
 				ViewCollection* _tmp10_ = NULL;
 				DataSource* _tmp11_ = NULL;
 				MediaSource* _tmp12_ = NULL;
 				Event* _tmp13_ = NULL;
 				Event* _tmp14_ = NULL;
 				gboolean _tmp15_ = FALSE;
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp10_ = view;
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp11_ = view_collection_get_selected_source_at (_tmp10_, 0);
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp13_ = media_source_get_event (_tmp12_);
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp14_ = _tmp13_;
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp15_ = _tmp14_ != NULL;
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_tmp14_);
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (_tmp12_);
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = _tmp15_;
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (selected_source);
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (view);
-#line 742 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 586 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 6060 "LibraryWindow.c"
+#line 4469 "LibraryWindow.c"
 			} else {
-#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = FALSE;
-#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (selected_source);
-#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_data_collection_unref0 (view);
-#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 588 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 6070 "LibraryWindow.c"
+#line 4479 "LibraryWindow.c"
 			}
 		}
-#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 581 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (selected_source);
-#line 6075 "LibraryWindow.c"
+#line 4484 "LibraryWindow.c"
 	} else {
-#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = FALSE;
-#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 6083 "LibraryWindow.c"
+#line 4492 "LibraryWindow.c"
 	}
-#line 735 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 6087 "LibraryWindow.c"
+#line 4496 "LibraryWindow.c"
 }
 
 
@@ -6104,409 +4513,519 @@ static void library_window_on_jump_to_event (LibraryWindow* self) {
 	Event* _tmp11_ = NULL;
 	Event* _tmp12_ = NULL;
 	gboolean _tmp13_ = FALSE;
-#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 751 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 751 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 751 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 751 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 751 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 751 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 595 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp3_;
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view;
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 597 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ != 1) {
-#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 754 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 598 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6132 "LibraryWindow.c"
+#line 4541 "LibraryWindow.c"
 	}
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = view;
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = view_collection_get_selected_source_at (_tmp6_, 0);
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp7_) : NULL;
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_ == NULL) {
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 6144 "LibraryWindow.c"
+#line 4553 "LibraryWindow.c"
 	}
-#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 600 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	media = _tmp8_;
-#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = media;
-#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 601 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_ == NULL) {
-#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (media);
-#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (view);
-#line 758 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 602 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6158 "LibraryWindow.c"
+#line 4567 "LibraryWindow.c"
 	}
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = media;
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = media_source_get_event (_tmp10_);
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = _tmp11_;
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = _tmp12_ != NULL;
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp12_);
-#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 604 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 6172 "LibraryWindow.c"
+#line 4581 "LibraryWindow.c"
 		MediaSource* _tmp14_ = NULL;
 		Event* _tmp15_ = NULL;
 		Event* _tmp16_ = NULL;
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media;
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = media_source_get_event (_tmp14_);
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_event (self, _tmp16_);
-#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 605 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp16_);
-#line 6186 "LibraryWindow.c"
+#line 4595 "LibraryWindow.c"
 	}
-#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (media);
-#line 750 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 594 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 6192 "LibraryWindow.c"
+#line 4601 "LibraryWindow.c"
+}
+
+
+static GVariant* _variant_new2 (gboolean value) {
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 4608 "LibraryWindow.c"
 }
 
 
 static void library_window_on_find (LibraryWindow* self) {
-	GtkToggleAction* action = NULL;
-	Page* _tmp0_ = NULL;
-	Page* _tmp1_ = NULL;
-	GtkAction* _tmp2_ = NULL;
-	GtkToggleAction* _tmp3_ = NULL;
-	SearchFilterToolbar* _tmp4_ = NULL;
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GAction* action = NULL;
+	GAction* _tmp0_ = NULL;
+	GAction* _tmp1_ = NULL;
+	GVariant* _tmp2_ = NULL;
+	SearchFilterToolbar* _tmp3_ = NULL;
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = _tmp0_;
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = page_get_common_action (_tmp1_, "CommonDisplaySearchbar", TRUE);
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_action_get_type (), GtkToggleAction);
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp1_);
-#line 765 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	action = _tmp3_;
-#line 767 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_toggle_action_set_active (action, TRUE);
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = self->priv->search_toolbar;
-#line 770 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	search_filter_toolbar_take_focus (_tmp4_);
-#line 764 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
+#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 609 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	action = _tmp1_;
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp2_ = _variant_new2 (TRUE);
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_change_state (action, _tmp2_);
+#line 610 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp2_);
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp3_ = self->priv->search_toolbar;
+#line 613 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	search_filter_toolbar_take_focus (_tmp3_);
+#line 608 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 6225 "LibraryWindow.c"
+#line 4638 "LibraryWindow.c"
 }
 
 
 static void library_window_on_media_altered (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 773 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 616 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = library_window_can_jump_to_event (self);
-#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	app_window_set_common_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonJumpToEvent", _tmp0_);
-#line 6237 "LibraryWindow.c"
+#line 4650 "LibraryWindow.c"
 }
 
 
 static void library_window_on_clear_search (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 620 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->is_search_toolbar_visible;
-#line 778 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 6249 "LibraryWindow.c"
+#line 4662 "LibraryWindow.c"
 		SearchFilterActions* _tmp1_ = NULL;
-#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->search_actions;
-#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 622 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp1_);
-#line 6255 "LibraryWindow.c"
+#line 4668 "LibraryWindow.c"
 	}
 }
 
 
 gint library_window_get_events_sort (LibraryWindow* self) {
 	gint result = 0;
-	GtkRadioAction* action = NULL;
-	GtkAction* _tmp0_ = NULL;
-	GtkRadioAction* _tmp1_ = NULL;
+	GSimpleAction* action = NULL;
+	GAction* _tmp0_ = NULL;
+	GSimpleAction* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-	GtkRadioAction* _tmp3_ = NULL;
-#line 782 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GSimpleAction* _tmp3_ = NULL;
+#line 625 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
-#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonSortEventsAscending");
-#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_radio_action_get_type ()) ? ((GtkRadioAction*) _tmp0_) : NULL;
-#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp1_ == NULL) {
-#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp0_);
-#line 6277 "LibraryWindow.c"
-	}
-#line 783 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents");
+#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL);
+#line 626 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	action = _tmp1_;
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = action;
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 6285 "LibraryWindow.c"
-		GtkRadioAction* _tmp4_ = NULL;
-		gint _tmp5_ = 0;
-		gint _tmp6_ = 0;
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = action;
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = gtk_radio_action_get_current_value (_tmp4_);
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp6_ = _tmp5_;
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp2_ = _tmp6_;
-#line 6297 "LibraryWindow.c"
+#line 4692 "LibraryWindow.c"
+		gint _tmp4_ = 0;
+		GSimpleAction* _tmp5_ = NULL;
+		GVariant* _tmp6_ = NULL;
+		GVariant* _tmp7_ = NULL;
+		GVariant* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
+		gboolean _tmp10_ = FALSE;
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp5_ = action;
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp6_ = g_action_get_state (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_action_get_type (), GAction));
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp7_ = _tmp6_;
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp8_ = _tmp7_;
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp9_ = g_variant_get_string (_tmp8_, NULL);
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp10_ = g_strcmp0 (_tmp9_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0;
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_g_variant_unref0 (_tmp8_);
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		if (_tmp10_) {
+#line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp4_ = 0;
+#line 4718 "LibraryWindow.c"
+		} else {
+#line 629 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+			_tmp4_ = 1;
+#line 4722 "LibraryWindow.c"
+		}
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp2_ = _tmp4_;
+#line 4726 "LibraryWindow.c"
 	} else {
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp2_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
-#line 6301 "LibraryWindow.c"
+#line 630 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp2_ = 1;
+#line 4730 "LibraryWindow.c"
 	}
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp2_;
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (action);
-#line 785 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 628 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 6309 "LibraryWindow.c"
+#line 4738 "LibraryWindow.c"
 }
 
 
-static void library_window_on_events_sort_changed (LibraryWindow* self, GtkAction* action, GtkAction* c) {
-	GtkRadioAction* current = NULL;
-	GtkAction* _tmp0_ = NULL;
-	GtkRadioAction* _tmp1_ = NULL;
-	ConfigFacade* _tmp2_ = NULL;
-	ConfigFacade* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+static void library_window_on_events_sort_changed (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
+	ConfigFacade* _tmp0_ = NULL;
+	ConfigFacade* _tmp1_ = NULL;
+	GVariant* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	GSimpleAction* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+#line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (GTK_IS_ACTION (c));
-#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = c;
-#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_radio_action_get_type (), GtkRadioAction));
-#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	current = _tmp1_;
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = config_facade_get_instance ();
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = _tmp2_;
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = gtk_radio_action_get_current_value (current);
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = _tmp4_;
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp5_ == LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING);
-#line 791 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp3_);
-#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (current);
-#line 6347 "LibraryWindow.c"
+#line 633 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = config_facade_get_instance ();
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp1_ = _tmp0_;
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp2_ = value;
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp3_ = g_variant_get_string (_tmp2_, NULL);
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	configuration_facade_set_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), g_strcmp0 (_tmp3_, LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING) == 0);
+#line 635 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp1_);
+#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp4_ = action;
+#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp5_ = value;
+#line 638 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_simple_action_set_state (_tmp4_, _tmp5_);
+#line 4771 "LibraryWindow.c"
 }
 
 
 static void library_window_on_preferences (LibraryWindow* self) {
-#line 795 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 796 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 642 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	preferences_dialog_show ();
-#line 6356 "LibraryWindow.c"
+#line 4780 "LibraryWindow.c"
 }
 
 
-static void library_window_on_display_basic_properties (LibraryWindow* self, GtkAction* action) {
+static void library_window_on_display_basic_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GtkAction* _tmp0_ = NULL;
+	GVariant* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	ConfigFacade* _tmp10_ = NULL;
 	ConfigFacade* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 799 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GSimpleAction* _tmp13_ = NULL;
+	GVariant* _tmp14_ = NULL;
+#line 645 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 799 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = action;
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 645 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = value;
+#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp1_ = g_variant_get_boolean (_tmp0_);
+#line 646 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	display = _tmp1_;
-#line 802 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = display;
-#line 802 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 648 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 6382 "LibraryWindow.c"
+#line 4808 "LibraryWindow.c"
 		BasicProperties* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		GtkFrame* _tmp6_ = NULL;
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->basic_properties;
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
-#line 803 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 650 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = self->priv->bottom_frame;
-#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 650 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 6401 "LibraryWindow.c"
+#line 4827 "LibraryWindow.c"
 	} else {
 		GtkPaned* _tmp7_ = NULL;
 		GtkWidget* _tmp8_ = NULL;
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->sidebar_paned;
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = gtk_paned_get_child2 (_tmp7_);
-#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 652 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp8_ != NULL) {
-#line 6411 "LibraryWindow.c"
+#line 4837 "LibraryWindow.c"
 			GtkFrame* _tmp9_ = NULL;
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp9_ = self->priv->bottom_frame;
-#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 653 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 6417 "LibraryWindow.c"
+#line 4843 "LibraryWindow.c"
 		}
 	}
-#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = config_facade_get_instance ();
-#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = display;
-#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
-#line 812 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 658 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 6430 "LibraryWindow.c"
+#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp13_ = action;
+#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp14_ = value;
+#line 659 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_simple_action_set_state (_tmp13_, _tmp14_);
+#line 4862 "LibraryWindow.c"
+}
+
+
+static gboolean _variant_get3 (GVariant* value) {
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_get_boolean (value);
+#line 4869 "LibraryWindow.c"
+}
+
+
+static GVariant* _variant_new4 (gboolean value) {
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 4876 "LibraryWindow.c"
+}
+
+
+static void library_window_on_action_toggle (LibraryWindow* self, GAction* action, GVariant* value) {
+	GVariant* new_state = NULL;
+	GAction* _tmp0_ = NULL;
+	GVariant* _tmp1_ = NULL;
+	GVariant* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	GVariant* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+	GAction* _tmp6_ = NULL;
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_ACTION (action));
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = action;
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp1_ = g_action_get_state (_tmp0_);
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp2_ = _tmp1_;
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp3_ = _variant_get3 (_tmp2_);
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp4_ = _variant_new4 (!_tmp3_);
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp5_ = _tmp4_;
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp2_);
+#line 663 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	new_state = _tmp5_;
+#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp6_ = action;
+#line 664 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_change_state (_tmp6_, new_state);
+#line 662 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (new_state);
+#line 4915 "LibraryWindow.c"
+}
+
+
+static void library_window_on_action_radio (LibraryWindow* self, GAction* action, GVariant* value) {
+	GAction* _tmp0_ = NULL;
+	GVariant* _tmp1_ = NULL;
+#line 667 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (IS_LIBRARY_WINDOW (self));
+#line 667 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_ACTION (action));
+#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = action;
+#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp1_ = value;
+#line 668 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_change_state (_tmp0_, _tmp1_);
+#line 4932 "LibraryWindow.c"
 }
 
 
-static void library_window_on_display_extended_properties (LibraryWindow* self, GtkAction* action) {
+static void library_window_on_display_extended_properties (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
 	gboolean display = FALSE;
-	GtkAction* _tmp0_ = NULL;
+	GVariant* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GSimpleAction* _tmp8_ = NULL;
+	GVariant* _tmp9_ = NULL;
+#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = action;
-#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = value;
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp1_ = g_variant_get_boolean (_tmp0_);
+#line 672 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	display = _tmp1_;
-#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = display;
-#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 674 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 6453 "LibraryWindow.c"
+#line 4957 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		ExtendedPropertiesWindow* _tmp6_ = NULL;
-#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->extended_properties;
-#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		extended_properties_window_update_properties (_tmp3_, _tmp5_);
-#line 819 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = self->priv->extended_properties;
-#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 676 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 6472 "LibraryWindow.c"
+#line 4976 "LibraryWindow.c"
 	} else {
 		ExtendedPropertiesWindow* _tmp7_ = NULL;
-#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->extended_properties;
-#line 822 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 678 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 6479 "LibraryWindow.c"
+#line 4983 "LibraryWindow.c"
 	}
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp8_ = action;
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp9_ = value;
+#line 681 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_simple_action_set_state (_tmp8_, _tmp9_);
+#line 4991 "LibraryWindow.c"
 }
 
 
-static void library_window_on_display_searchbar (LibraryWindow* self, GtkAction* action) {
+static void library_window_on_display_searchbar (LibraryWindow* self, GSimpleAction* action, GVariant* value) {
 	gboolean is_shown = FALSE;
-	GtkAction* _tmp0_ = NULL;
+	GVariant* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GSimpleAction* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 826 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = action;
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 684 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = value;
+#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp1_ = g_variant_get_boolean (_tmp0_);
+#line 685 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	is_shown = _tmp1_;
-#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), is_shown);
-#line 828 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 829 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 688 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_search_bar (self, is_shown);
-#line 6510 "LibraryWindow.c"
+#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp4_ = action;
+#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp5_ = value;
+#line 690 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_simple_action_set_state (_tmp4_, _tmp5_);
+#line 5029 "LibraryWindow.c"
 }
 
 
@@ -6520,73 +5039,81 @@ void library_window_show_search_bar (LibraryWindow* self, gboolean display) {
 	CheckerboardPage* _tmp6_ = NULL;
 	CheckerboardPage* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 832 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_CHECKERBOARD_PAGE);
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 694 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 6538 "LibraryWindow.c"
+#line 5057 "LibraryWindow.c"
 	}
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = display;
-#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 697 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->is_search_toolbar_visible = _tmp3_;
-#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = library_window_should_show_search_bar (self);
-#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp5_) : NULL;
-#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ == NULL) {
-#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 6554 "LibraryWindow.c"
+#line 5073 "LibraryWindow.c"
 	}
-#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, _tmp4_, _tmp7_);
-#line 837 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 698 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 838 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = display;
-#line 838 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 699 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp8_) {
-#line 6566 "LibraryWindow.c"
+#line 5085 "LibraryWindow.c"
 		SearchFilterActions* _tmp9_ = NULL;
-#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->search_actions;
-#line 839 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 700 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_actions_reset (_tmp9_);
-#line 6572 "LibraryWindow.c"
+#line 5091 "LibraryWindow.c"
 	}
 }
 
 
-static void library_window_on_display_sidebar (LibraryWindow* self, GtkAction* action) {
-	GtkAction* _tmp0_ = NULL;
+static void library_window_on_display_sidebar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) {
+	GVariant* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GSimpleAction* _tmp2_ = NULL;
+	GVariant* _tmp3_ = NULL;
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 842 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = action;
-#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_action_get_type (), GtkToggleAction));
-#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = variant;
+#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp1_ = g_variant_get_boolean (_tmp0_);
+#line 704 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_sidebar_visible (self, _tmp1_);
-#line 6590 "LibraryWindow.c"
+#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp2_ = action;
+#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp3_ = variant;
+#line 706 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_simple_action_set_state (_tmp2_, _tmp3_);
+#line 5117 "LibraryWindow.c"
 }
 
 
@@ -6596,25 +5123,25 @@ static void library_window_set_sidebar_visible (LibraryWindow* self, gboolean vi
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 847 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 709 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_paned;
-#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = visible;
-#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = visible;
-#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
-#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 711 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 6618 "LibraryWindow.c"
+#line 5145 "LibraryWindow.c"
 }
 
 
@@ -6624,40 +5151,48 @@ static gboolean library_window_is_sidebar_visible (LibraryWindow* self) {
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 852 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = configuration_facade_get_display_sidebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp3_;
-#line 853 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 715 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 6644 "LibraryWindow.c"
+#line 5171 "LibraryWindow.c"
 }
 
 
-static void library_window_on_display_toolbar (LibraryWindow* self, GtkAction* action) {
-	GtkAction* _tmp0_ = NULL;
+static void library_window_on_display_toolbar (LibraryWindow* self, GSimpleAction* action, GVariant* variant) {
+	GVariant* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GSimpleAction* _tmp2_ = NULL;
+	GVariant* _tmp3_ = NULL;
+#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_return_if_fail (GTK_IS_ACTION (action));
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = action;
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = gtk_toggle_action_get_active (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp0_) : NULL);
-#line 857 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
+#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = variant;
+#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp1_ = g_variant_get_boolean (_tmp0_);
+#line 719 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_set_toolbar_visible (self, _tmp1_);
-#line 6661 "LibraryWindow.c"
+#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp2_ = action;
+#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp3_ = variant;
+#line 721 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_simple_action_set_state (_tmp2_, _tmp3_);
+#line 5196 "LibraryWindow.c"
 }
 
 
@@ -6671,48 +5206,48 @@ static void library_window_set_toolbar_visible (LibraryWindow* self, gboolean vi
 	ConfigFacade* _tmp7_ = NULL;
 	ConfigFacade* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
-#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_get_toolbar (_tmp1_);
-#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 861 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 725 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	toolbar = _tmp3_;
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = toolbar;
-#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_ != NULL) {
-#line 6693 "LibraryWindow.c"
+#line 5228 "LibraryWindow.c"
 		GtkToolbar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = toolbar;
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = visible;
-#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _tmp6_);
-#line 6702 "LibraryWindow.c"
+#line 5237 "LibraryWindow.c"
 	}
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = config_facade_get_instance ();
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = visible;
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	configuration_facade_set_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp9_);
-#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp8_);
-#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 6716 "LibraryWindow.c"
+#line 5251 "LibraryWindow.c"
 }
 
 
@@ -6722,85 +5257,89 @@ static gboolean library_window_is_toolbar_visible (LibraryWindow* self) {
 	ConfigFacade* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 732 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = configuration_facade_get_display_toolbar (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp3_;
-#line 869 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 6742 "LibraryWindow.c"
+#line 5277 "LibraryWindow.c"
 }
 
 
 static void library_window_show_extended_properties (LibraryWindow* self) {
-#line 872 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 873 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 737 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, TRUE);
-#line 6751 "LibraryWindow.c"
+#line 5286 "LibraryWindow.c"
 }
 
 
 static void library_window_hide_extended_properties (LibraryWindow* self) {
-#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 741 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_sync_extended_properties (self, FALSE);
-#line 6760 "LibraryWindow.c"
+#line 5295 "LibraryWindow.c"
+}
+
+
+static GVariant* _variant_new5 (gboolean value) {
+#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 5302 "LibraryWindow.c"
 }
 
 
 static void library_window_sync_extended_properties (LibraryWindow* self, gboolean show) {
-	GtkToggleAction* extended_display_action = NULL;
-	GtkAction* _tmp0_ = NULL;
-	GtkToggleAction* _tmp1_ = NULL;
+	GAction* action = NULL;
+	GAction* _tmp0_ = NULL;
+	GAction* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-	ConfigFacade* _tmp3_ = NULL;
+	GVariant* _tmp3_ = NULL;
 	ConfigFacade* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	ConfigFacade* _tmp5_ = NULL;
+	gboolean _tmp6_ = FALSE;
+#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplayExtendedProperties");
-#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp0_) : NULL;
-#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp1_ == NULL) {
-#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp0_);
-#line 6782 "LibraryWindow.c"
-	}
-#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	extended_display_action = _tmp1_;
-#line 883 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (extended_display_action != NULL, "extended_display_action != null");
-#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties");
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 745 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	action = _tmp1_;
+#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = show;
-#line 884 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_toggle_action_set_active (extended_display_action, _tmp2_);
-#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp3_ = config_facade_get_instance ();
-#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp4_ = _tmp3_;
-#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = show;
-#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp5_);
-#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp4_);
-#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (extended_display_action);
-#line 6804 "LibraryWindow.c"
+#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp3_ = _variant_new5 (_tmp2_);
+#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_change_state (action, _tmp3_);
+#line 746 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp3_);
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp4_ = config_facade_get_instance ();
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp5_ = _tmp4_;
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp6_ = show;
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	configuration_facade_set_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_);
+#line 749 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp5_);
+#line 744 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (action);
+#line 5343 "LibraryWindow.c"
 }
 
 
@@ -6810,44 +5349,44 @@ void library_window_enqueue_batch_import (LibraryWindow* self, BatchImport* batc
 	LibraryImportQueueSidebarEntry* _tmp2_ = NULL;
 	BatchImport* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 890 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 752 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_BATCH_IMPORT (batch_import));
-#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_import_queue_entry (_tmp0_);
-#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = batch_import;
-#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = allow_user_cancel;
-#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_import_queue_sidebar_entry_enqueue_and_schedule (_tmp2_, _tmp3_, _tmp4_);
-#line 6830 "LibraryWindow.c"
+#line 5369 "LibraryWindow.c"
 }
 
 
 static void library_window_import_reporter (LibraryWindow* self, ImportManifest* manifest) {
 	ImportManifest* _tmp0_ = NULL;
-#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 894 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 756 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 895 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = manifest;
-#line 895 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_ui_report_manifest (_tmp0_, TRUE, NULL);
-#line 6844 "LibraryWindow.c"
+#line 5383 "LibraryWindow.c"
 }
 
 
 static void _library_window_import_reporter_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_import_reporter ((LibraryWindow*) self, manifest);
-#line 6851 "LibraryWindow.c"
+#line 5390 "LibraryWindow.c"
 }
 
 
@@ -6865,43 +5404,43 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 	GeeArrayList* _tmp33_ = NULL;
 	gint _tmp34_ = 0;
 	gint _tmp35_ = 0;
-#line 898 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 898 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (job_name != NULL);
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = app_dirs_get_import_dir ();
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = g_get_home_dir ();
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = g_strcmp0 (_tmp4_, _tmp5_) == 0;
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp4_);
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_) {
-#line 6891 "LibraryWindow.c"
+#line 5430 "LibraryWindow.c"
 		gboolean _tmp7_ = FALSE;
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = self->priv->notify_library_is_home_dir;
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp7_;
-#line 6897 "LibraryWindow.c"
+#line 5436 "LibraryWindow.c"
 	} else {
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 6901 "LibraryWindow.c"
+#line 5440 "LibraryWindow.c"
 	}
-#line 899 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 761 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 6905 "LibraryWindow.c"
+#line 5444 "LibraryWindow.c"
 		GtkResponseType response = 0;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -6913,65 +5452,65 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 		GtkResponseType _tmp15_ = 0;
 		GtkResponseType _tmp16_ = 0;
 		GtkResponseType _tmp17_ = 0;
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _ ("Shotwell is configured to import photos to your home directory.\n" "We recommend changing this in <span weight=\"bold\">Edit %s Preference" \
 "s</span>.\n" "Do you want to continue importing photos?");
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = g_strdup_printf (_tmp8_, "▸");
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _ ("_Import");
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _ ("Library Location");
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = app_window_get_instance ();
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = _tmp13_;
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = app_window_affirm_cancel_question (_tmp10_, _tmp11_, _tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp14_);
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp10_);
-#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 762 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		response = _tmp16_;
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = response;
-#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 768 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp17_ == GTK_RESPONSE_CANCEL) {
-#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 769 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return;
-#line 6947 "LibraryWindow.c"
+#line 5486 "LibraryWindow.c"
 		}
-#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 771 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->notify_library_is_home_dir = FALSE;
-#line 6951 "LibraryWindow.c"
+#line 5490 "LibraryWindow.c"
 	}
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL);
-#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	jobs = _tmp18_;
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = uris;
-#line 6959 "LibraryWindow.c"
+#line 5498 "LibraryWindow.c"
 	{
 		GSList* uri_collection = NULL;
 		GSList* uri_it = NULL;
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection = _tmp19_;
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 6967 "LibraryWindow.c"
+#line 5506 "LibraryWindow.c"
 			gchar* _tmp20_ = NULL;
 			gchar* uri = NULL;
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = g_strdup ((const gchar*) uri_it->data);
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp20_;
-#line 6974 "LibraryWindow.c"
+#line 5513 "LibraryWindow.c"
 			{
 				GFile* file_or_dir = NULL;
 				const gchar* _tmp21_ = NULL;
@@ -6985,95 +5524,95 @@ static void library_window_dispatch_import_jobs (LibraryWindow* self, GSList* ur
 				gboolean _tmp30_ = FALSE;
 				FileImportJob* _tmp31_ = NULL;
 				FileImportJob* _tmp32_ = NULL;
-#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = uri;
-#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = g_file_new_for_uri (_tmp21_);
-#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				file_or_dir = _tmp22_;
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp23_ = file_or_dir;
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp24_ = g_file_get_path (_tmp23_);
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp25_ = _tmp24_;
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp26_ = _tmp25_ == NULL;
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (_tmp25_);
-#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 777 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				if (_tmp26_) {
-#line 7006 "LibraryWindow.c"
+#line 5545 "LibraryWindow.c"
 					const gchar* _tmp27_ = NULL;
-#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp27_ = _ ("Photos cannot be imported from this directory.");
-#line 917 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 779 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					app_window_error_message (_tmp27_, NULL);
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 781 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (file_or_dir);
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 781 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 781 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					continue;
-#line 7018 "LibraryWindow.c"
+#line 5557 "LibraryWindow.c"
 				}
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp28_ = jobs;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp29_ = file_or_dir;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp30_ = copy_to_library;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp31_ = file_import_job_new (_tmp29_, _tmp30_);
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp32_ = _tmp31_;
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp32_);
-#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_batch_import_job_unref0 (_tmp32_);
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_object_unref0 (file_or_dir);
-#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 7038 "LibraryWindow.c"
+#line 5577 "LibraryWindow.c"
 			}
 		}
 	}
-#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = jobs;
-#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = _tmp34_;
-#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp35_ > 0) {
-#line 7050 "LibraryWindow.c"
+#line 5589 "LibraryWindow.c"
 		BatchImport* batch_import = NULL;
 		GeeArrayList* _tmp36_ = NULL;
 		const gchar* _tmp37_ = NULL;
 		BatchImport* _tmp38_ = NULL;
 		BatchImport* _tmp39_ = NULL;
-#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = jobs;
-#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp37_ = job_name;
-#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = batch_import_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ITERABLE, GeeIterable), _tmp37_, _library_window_import_reporter_batch_import_import_reporter, self, NULL, NULL, NULL, NULL, NULL);
-#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		batch_import = _tmp38_;
-#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp39_ = batch_import;
-#line 927 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 789 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_enqueue_batch_import (self, _tmp39_, TRUE);
-#line 928 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_import_queue_page (self);
-#line 925 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 787 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (batch_import);
-#line 7072 "LibraryWindow.c"
+#line 5611 "LibraryWindow.c"
 	}
-#line 898 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 760 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (jobs);
-#line 7076 "LibraryWindow.c"
+#line 5615 "LibraryWindow.c"
 }
 
 
@@ -7094,157 +5633,157 @@ static GdkDragAction library_window_get_drag_action (LibraryWindow* self) {
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
-#line 932 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 794 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), 0);
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gdk_display_get_default ();
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = gdk_display_get_device_manager (_tmp1_);
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = gdk_device_manager_get_client_pointer (_tmp2_);
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gdk_window_get_device_position (_tmp0_, _tmp3_, NULL, NULL, &_tmp4_);
-#line 935 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mask = _tmp4_;
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = mask;
-#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	ctrl = (_tmp5_ & GDK_CONTROL_MASK) != 0;
-#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = mask;
-#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 801 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	alt = (_tmp6_ & GDK_MOD1_MASK) != 0;
-#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 802 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = mask;
-#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 802 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	shift = (_tmp7_ & GDK_SHIFT_MASK) != 0;
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = ctrl;
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp10_) {
-#line 7127 "LibraryWindow.c"
+#line 5666 "LibraryWindow.c"
 		gboolean _tmp11_ = FALSE;
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = alt;
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = !_tmp11_;
-#line 7133 "LibraryWindow.c"
+#line 5672 "LibraryWindow.c"
 	} else {
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = FALSE;
-#line 7137 "LibraryWindow.c"
+#line 5676 "LibraryWindow.c"
 	}
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_) {
-#line 7141 "LibraryWindow.c"
+#line 5680 "LibraryWindow.c"
 		gboolean _tmp12_ = FALSE;
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = shift;
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = !_tmp12_;
-#line 7147 "LibraryWindow.c"
+#line 5686 "LibraryWindow.c"
 	} else {
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = FALSE;
-#line 7151 "LibraryWindow.c"
+#line 5690 "LibraryWindow.c"
 	}
-#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = GDK_ACTION_COPY;
-#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 7159 "LibraryWindow.c"
+#line 5698 "LibraryWindow.c"
 	} else {
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_ = FALSE;
-#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = ctrl;
-#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp15_) {
-#line 7168 "LibraryWindow.c"
+#line 5707 "LibraryWindow.c"
 			gboolean _tmp16_ = FALSE;
-#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = alt;
-#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = _tmp16_;
-#line 7174 "LibraryWindow.c"
+#line 5713 "LibraryWindow.c"
 		} else {
-#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = FALSE;
-#line 7178 "LibraryWindow.c"
+#line 5717 "LibraryWindow.c"
 		}
-#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_) {
-#line 7182 "LibraryWindow.c"
+#line 5721 "LibraryWindow.c"
 			gboolean _tmp17_ = FALSE;
-#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = shift;
-#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = !_tmp17_;
-#line 7188 "LibraryWindow.c"
+#line 5727 "LibraryWindow.c"
 		} else {
-#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp13_ = FALSE;
-#line 7192 "LibraryWindow.c"
+#line 5731 "LibraryWindow.c"
 		}
-#line 944 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 806 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp13_) {
-#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			result = GDK_ACTION_ASK;
-#line 945 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			return result;
-#line 7200 "LibraryWindow.c"
+#line 5739 "LibraryWindow.c"
 		} else {
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
 			gboolean _tmp20_ = FALSE;
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = ctrl;
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp20_) {
-#line 7209 "LibraryWindow.c"
+#line 5748 "LibraryWindow.c"
 				gboolean _tmp21_ = FALSE;
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp21_ = alt;
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = !_tmp21_;
-#line 7215 "LibraryWindow.c"
+#line 5754 "LibraryWindow.c"
 			} else {
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = FALSE;
-#line 7219 "LibraryWindow.c"
+#line 5758 "LibraryWindow.c"
 			}
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp19_) {
-#line 7223 "LibraryWindow.c"
+#line 5762 "LibraryWindow.c"
 				gboolean _tmp22_ = FALSE;
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp22_ = shift;
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = _tmp22_;
-#line 7229 "LibraryWindow.c"
+#line 5768 "LibraryWindow.c"
 			} else {
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp18_ = FALSE;
-#line 7233 "LibraryWindow.c"
+#line 5772 "LibraryWindow.c"
 			}
-#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (_tmp18_) {
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_LINK;
-#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 809 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 7241 "LibraryWindow.c"
+#line 5780 "LibraryWindow.c"
 			} else {
-#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				result = GDK_ACTION_DEFAULT;
-#line 949 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return result;
-#line 7247 "LibraryWindow.c"
+#line 5786 "LibraryWindow.c"
 			}
 		}
 	}
@@ -7259,93 +5798,96 @@ static gboolean library_window_real_drag_motion (GtkWidget* base, GdkDragContext
 	GtkTargetList* _tmp1_ = NULL;
 	GdkAtom _tmp2_ = 0U;
 	GdkAtom _tmp3_ = 0U;
-	GdkDragContext* _tmp6_ = NULL;
-	GtkWidget* _tmp7_ = NULL;
+	GdkAtom _tmp4_ = 0U;
+	GdkDragContext* _tmp7_ = NULL;
+	GtkWidget* _tmp8_ = NULL;
 	GdkDragAction drag_action = 0;
-	GdkDragAction _tmp10_ = 0;
 	GdkDragAction _tmp11_ = 0;
-	GdkDragContext* _tmp12_ = NULL;
-	GdkDragAction _tmp13_ = 0;
-	guint _tmp14_ = 0U;
-#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GdkDragAction _tmp12_ = 0;
+	GdkDragContext* _tmp13_ = NULL;
+	GdkDragAction _tmp14_ = 0;
+	guint _tmp15_ = 0U;
+#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 952 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = context;
-#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_drag_dest_get_target_list (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = gtk_drag_dest_find_target (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_);
-#line 953 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	target = _tmp2_;
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = target;
-#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (((gint) _tmp3_) == 0) {
-#line 7286 "LibraryWindow.c"
-		GdkDragContext* _tmp4_ = NULL;
-		guint _tmp5_ = 0U;
-#line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:957: drag target is GDK_NONE");
-#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp4_ = context;
-#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp5_ = time;
-#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gdk_drag_status (_tmp4_, 0, (guint32) _tmp5_);
-#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp4_ = GDK_NONE;
+#line 816 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp3_ == _tmp4_) {
+#line 5828 "LibraryWindow.c"
+		GdkDragContext* _tmp5_ = NULL;
+		guint _tmp6_ = 0U;
+#line 817 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:817: drag target is GDK_NONE");
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp5_ = context;
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp6_ = time;
+#line 818 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gdk_drag_status (_tmp5_, 0, (guint32) _tmp6_);
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 7301 "LibraryWindow.c"
+#line 5843 "LibraryWindow.c"
 	}
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = context;
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = gtk_drag_get_source_widget (_tmp6_);
-#line 964 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp7_ != NULL) {
-#line 7309 "LibraryWindow.c"
-		GdkDragContext* _tmp8_ = NULL;
-		guint _tmp9_ = 0U;
-#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp8_ = context;
-#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp9_ = time;
-#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gdk_drag_status (_tmp8_, GDK_ACTION_PRIVATE, (guint32) _tmp9_);
-#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp7_ = context;
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp8_ = gtk_drag_get_source_widget (_tmp7_);
+#line 824 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp8_ != NULL) {
+#line 5851 "LibraryWindow.c"
+		GdkDragContext* _tmp9_ = NULL;
+		guint _tmp10_ = 0U;
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp9_ = context;
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp10_ = time;
+#line 825 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gdk_drag_status (_tmp9_, GDK_ACTION_PRIVATE, (guint32) _tmp10_);
+#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 827 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 7322 "LibraryWindow.c"
+#line 5864 "LibraryWindow.c"
 	}
-#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = library_window_get_drag_action (self);
-#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	drag_action = _tmp10_;
-#line 973 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = drag_action;
-#line 973 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp11_ == GDK_ACTION_DEFAULT) {
-#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp11_ = library_window_get_drag_action (self);
+#line 831 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	drag_action = _tmp11_;
+#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp12_ = drag_action;
+#line 833 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp12_ == GDK_ACTION_DEFAULT) {
+#line 834 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		drag_action = GDK_ACTION_ASK;
-#line 7334 "LibraryWindow.c"
+#line 5876 "LibraryWindow.c"
 	}
-#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = context;
-#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = drag_action;
-#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = time;
-#line 976 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gdk_drag_status (_tmp12_, _tmp13_, (guint32) _tmp14_);
-#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp13_ = context;
+#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp14_ = drag_action;
+#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp15_ = time;
+#line 836 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gdk_drag_status (_tmp13_, _tmp14_, (guint32) _tmp15_);
+#line 838 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
-#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 838 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 7348 "LibraryWindow.c"
+#line 5890 "LibraryWindow.c"
 }
 
 
@@ -7355,54 +5897,54 @@ static void library_window_real_drag_data_received (GtkWidget* base, GdkDragCont
 	guchar* _tmp1_ = NULL;
 	GdkDragContext* _tmp2_ = NULL;
 	GtkWidget* _tmp3_ = NULL;
-#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 981 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 841 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = selection_data;
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_selection_data_get_data (_tmp0_);
-#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 843 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (-1 < 0) {
-#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:984: failed to retrieve SelectionData");
-#line 7372 "LibraryWindow.c"
+#line 844 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:844: failed to retrieve SelectionData");
+#line 5914 "LibraryWindow.c"
 	}
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = context;
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = gtk_drag_get_source_widget (_tmp2_);
-#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 848 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 7380 "LibraryWindow.c"
+#line 5922 "LibraryWindow.c"
 		GdkDragContext* _tmp4_ = NULL;
 		GtkSelectionData* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		guint _tmp7_ = 0U;
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = context;
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = selection_data;
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = info;
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = time;
-#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_external_drop_handler (self, _tmp4_, NULL, _tmp5_, _tmp6_, _tmp7_);
-#line 7395 "LibraryWindow.c"
+#line 5937 "LibraryWindow.c"
 	} else {
 		GdkDragContext* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = context;
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = time;
-#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_drag_finish (_tmp8_, FALSE, FALSE, (guint32) _tmp9_);
-#line 7405 "LibraryWindow.c"
+#line 5947 "LibraryWindow.c"
 	}
 }
 
@@ -7425,198 +5967,198 @@ static void library_window_external_drop_handler (LibraryWindow* self, GdkDragCo
 	GdkDragAction _tmp22_ = 0;
 	GdkDragContext* _tmp23_ = NULL;
 	guint _tmp24_ = 0U;
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((entry == NULL) || SIDEBAR_IS_ENTRY (entry));
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (data != NULL);
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = data;
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_ = gtk_selection_data_get_uris (_tmp0_);
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = _tmp2_;
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array_length1 = _vala_array_length (_tmp1_);
-#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_uris_array_size_ = uris_array_length1;
-#line 998 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris = NULL;
-#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = uris_array;
-#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3__length1 = uris_array_length1;
-#line 7452 "LibraryWindow.c"
+#line 5994 "LibraryWindow.c"
 	{
 		gchar** uri_collection = NULL;
 		gint uri_collection_length1 = 0;
 		gint _uri_collection_size_ = 0;
 		gint uri_it = 0;
-#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection = _tmp3_;
-#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		uri_collection_length1 = _tmp3__length1;
-#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		for (uri_it = 0; uri_it < _tmp3__length1; uri_it = uri_it + 1) {
-#line 7464 "LibraryWindow.c"
+#line 6006 "LibraryWindow.c"
 			gchar* _tmp4_ = NULL;
 			gchar* uri = NULL;
-#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp4_ = g_strdup (uri_collection[uri_it]);
-#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri = _tmp4_;
-#line 7471 "LibraryWindow.c"
+#line 6013 "LibraryWindow.c"
 			{
 				const gchar* _tmp5_ = NULL;
 				gchar* _tmp6_ = NULL;
-#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp5_ = uri;
-#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp6_ = g_strdup (_tmp5_);
-#line 1000 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 860 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris = g_slist_append (uris, _tmp6_);
-#line 999 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 859 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_g_free0 (uri);
-#line 7483 "LibraryWindow.c"
+#line 6025 "LibraryWindow.c"
 			}
 		}
 	}
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = context;
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = gdk_drag_context_get_selected_action (_tmp7_);
-#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	selected_action = _tmp8_;
-#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = selected_action;
-#line 1003 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 863 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp9_ == GDK_ACTION_ASK) {
-#line 7497 "LibraryWindow.c"
+#line 6039 "LibraryWindow.c"
 		GtkResponseType _result_ = 0;
 		GSList* _tmp10_ = NULL;
 		GtkResponseType _tmp18_ = 0;
-#line 1005 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 865 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_result_ = GTK_RESPONSE_REJECT;
-#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = uris;
-#line 7505 "LibraryWindow.c"
+#line 6047 "LibraryWindow.c"
 		{
 			GSList* uri_collection = NULL;
 			GSList* uri_it = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			uri_collection = _tmp10_;
-#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			for (uri_it = uri_collection; uri_it != NULL; uri_it = uri_it->next) {
-#line 7513 "LibraryWindow.c"
+#line 6055 "LibraryWindow.c"
 				gchar* _tmp11_ = NULL;
 				gchar* uri = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp11_ = g_strdup ((const gchar*) uri_it->data);
-#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uri = _tmp11_;
-#line 7520 "LibraryWindow.c"
+#line 6062 "LibraryWindow.c"
 				{
 					const gchar* _tmp12_ = NULL;
 					GFile* _tmp13_ = NULL;
 					GFile* _tmp14_ = NULL;
 					gboolean _tmp15_ = FALSE;
 					gboolean _tmp16_ = FALSE;
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp12_ = uri;
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp13_ = g_file_new_for_uri (_tmp12_);
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp14_ = _tmp13_;
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp15_ = app_dirs_is_in_import_dir (_tmp14_);
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_tmp16_ = !_tmp15_;
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_object_unref0 (_tmp14_);
-#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					if (_tmp16_) {
-#line 7541 "LibraryWindow.c"
+#line 6083 "LibraryWindow.c"
 						GtkResponseType _tmp17_ = 0;
-#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_tmp17_ = copy_files_dialog ();
-#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 868 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_result_ = _tmp17_;
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						_g_free0 (uri);
-#line 1010 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 870 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 						break;
-#line 7551 "LibraryWindow.c"
+#line 6093 "LibraryWindow.c"
 					}
-#line 1006 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 866 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 					_g_free0 (uri);
-#line 7555 "LibraryWindow.c"
+#line 6097 "LibraryWindow.c"
 				}
 			}
 		}
-#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = _result_;
-#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		switch (_tmp18_) {
-#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_ACCEPT:
-#line 7565 "LibraryWindow.c"
+#line 6107 "LibraryWindow.c"
 			{
-#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_COPY;
-#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 877 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 7571 "LibraryWindow.c"
+#line 6113 "LibraryWindow.c"
 			}
-#line 1014 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 874 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			case GTK_RESPONSE_REJECT:
-#line 7575 "LibraryWindow.c"
+#line 6117 "LibraryWindow.c"
 			{
-#line 1020 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				selected_action = GDK_ACTION_LINK;
-#line 1021 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 7581 "LibraryWindow.c"
+#line 6123 "LibraryWindow.c"
 			}
 			default:
 			{
 				GdkDragContext* _tmp19_ = NULL;
 				guint _tmp20_ = 0U;
-#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp19_ = context;
-#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				_tmp20_ = time;
-#line 1025 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 885 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				gtk_drag_finish (_tmp19_, FALSE, FALSE, (guint32) _tmp20_);
-#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				__g_slist_free__g_free0_0 (uris);
-#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 1027 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				return;
-#line 7599 "LibraryWindow.c"
+#line 6141 "LibraryWindow.c"
 			}
 		}
 	}
-#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = uris;
-#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = selected_action;
-#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 891 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_dispatch_import_jobs (self, _tmp21_, "drag-and-drop", _tmp22_ == GDK_ACTION_COPY);
-#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = context;
-#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = time;
-#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 893 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_drag_finish (_tmp23_, TRUE, FALSE, (guint32) _tmp24_);
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	__g_slist_free__g_free0_0 (uris);
-#line 994 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 854 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uris_array = (_vala_array_free (uris_array, uris_array_length1, (GDestroyNotify) g_free), NULL);
-#line 7619 "LibraryWindow.c"
+#line 6161 "LibraryWindow.c"
 }
 
 
@@ -7626,23 +6168,23 @@ void library_window_switch_to_library_page (LibraryWindow* self) {
 	LibraryPhotosEntry* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 1036 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 896 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_photos_entry (_tmp0_);
-#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp4_);
-#line 1037 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 7645 "LibraryWindow.c"
+#line 6187 "LibraryWindow.c"
 }
 
 
@@ -7652,41 +6194,41 @@ void library_window_switch_to_event (LibraryWindow* self, Event* event) {
 	Event* _tmp1_ = NULL;
 	EventsEventEntry* _tmp2_ = NULL;
 	EventsEventEntry* _tmp3_ = NULL;
-#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_EVENT (event));
-#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->events_branch;
-#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = event;
-#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = events_branch_get_entry_for_event (_tmp0_, _tmp1_);
-#line 1041 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 901 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 902 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 7671 "LibraryWindow.c"
+#line 6213 "LibraryWindow.c"
 		EventsEventEntry* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_ = NULL;
-#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 1043 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 903 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 7685 "LibraryWindow.c"
+#line 6227 "LibraryWindow.c"
 	}
-#line 1040 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 900 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 7689 "LibraryWindow.c"
+#line 6231 "LibraryWindow.c"
 }
 
 
@@ -7696,41 +6238,41 @@ void library_window_switch_to_tag (LibraryWindow* self, Tag* tag) {
 	Tag* _tmp1_ = NULL;
 	TagsSidebarEntry* _tmp2_ = NULL;
 	TagsSidebarEntry* _tmp3_ = NULL;
-#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_TAG (tag));
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->tags_branch;
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = tag;
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = tags_branch_get_entry_for_tag (_tmp0_, _tmp1_);
-#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 907 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 908 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 1048 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 908 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 7715 "LibraryWindow.c"
+#line 6257 "LibraryWindow.c"
 		TagsSidebarEntry* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_ = NULL;
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 909 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 7729 "LibraryWindow.c"
+#line 6271 "LibraryWindow.c"
 	}
-#line 1046 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 906 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 7733 "LibraryWindow.c"
+#line 6275 "LibraryWindow.c"
 }
 
 
@@ -7740,41 +6282,41 @@ void library_window_switch_to_saved_search (LibraryWindow* self, SavedSearch* se
 	SavedSearch* _tmp1_ = NULL;
 	SearchesSidebarEntry* _tmp2_ = NULL;
 	SearchesSidebarEntry* _tmp3_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_SAVED_SEARCH (search));
-#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->saved_search_branch;
-#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = search;
-#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = searches_branch_get_entry_for_saved_search (_tmp0_, _tmp1_);
-#line 1053 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 913 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 1054 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 914 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 7759 "LibraryWindow.c"
+#line 6301 "LibraryWindow.c"
 		SearchesSidebarEntry* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_ = NULL;
-#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = entry;
-#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp6_);
-#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 915 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 7773 "LibraryWindow.c"
+#line 6315 "LibraryWindow.c"
 	}
-#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 912 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 7777 "LibraryWindow.c"
+#line 6319 "LibraryWindow.c"
 }
 
 
@@ -7790,66 +6332,66 @@ void library_window_switch_to_photo_page (LibraryWindow* self, CollectionPage* c
 	CollectionPage* _tmp10_ = NULL;
 	Photo* _tmp11_ = NULL;
 	LibraryPhotoPage* _tmp12_ = NULL;
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (controller));
-#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 918 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PHOTO (current));
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = controller;
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = current;
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = view_collection_get_view_for_source (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource));
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp5_ != NULL, "controller.get_view().get_view_for_source(current) != null");
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 919 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->photo_page;
-#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 920 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ == NULL) {
-#line 7821 "LibraryWindow.c"
+#line 6363 "LibraryWindow.c"
 		LibraryPhotoPage* _tmp7_ = NULL;
 		LibraryPhotoPage* _tmp8_ = NULL;
-#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = library_photo_page_new ();
-#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_object_ref_sink (_tmp7_);
-#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (self->priv->photo_page);
-#line 1061 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 921 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->photo_page = _tmp7_;
-#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->photo_page;
-#line 1062 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 922 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_add_to_stack (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
-#line 1066 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 926 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		spin_event_loop ();
-#line 7838 "LibraryWindow.c"
+#line 6380 "LibraryWindow.c"
 	}
-#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = self->priv->photo_page;
-#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = controller;
-#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = current;
-#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 929 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_photo_page_display_for_collection (_tmp9_, _tmp10_, _tmp11_, NULL);
-#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->photo_page;
-#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 930 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE, Page));
-#line 7852 "LibraryWindow.c"
+#line 6394 "LibraryWindow.c"
 }
 
 
@@ -7859,23 +6401,23 @@ void library_window_switch_to_import_queue_page (LibraryWindow* self) {
 	LibraryImportQueueSidebarEntry* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 933 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_import_queue_entry (_tmp0_);
-#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp4_);
-#line 1074 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 934 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 7878 "LibraryWindow.c"
+#line 6420 "LibraryWindow.c"
 }
 
 
@@ -7896,169 +6438,169 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 	gboolean _tmp13_ = FALSE;
 	GMount* _tmp14_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_DISCOVERED_CAMERA (camera));
-#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->camera_branch;
-#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = camera;
-#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = camera_branch_get_entry_for_camera (_tmp0_, _tmp1_);
-#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 938 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = _tmp2_;
-#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = entry;
-#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 939 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 1080 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 940 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7919 "LibraryWindow.c"
+#line 6461 "LibraryWindow.c"
 	}
-#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = entry;
-#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1082 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 942 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_IMPORT_PAGE, ImportPage);
-#line 1083 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = camera;
-#line 1083 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _tmp6_->uri;
-#line 1083 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = g_file_new_for_uri (_tmp7_);
-#line 1083 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 943 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uri_file = _tmp8_;
-#line 1086 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 946 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 7937 "LibraryWindow.c"
+#line 6479 "LibraryWindow.c"
 	{
 		GMount* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
 		GMount* _tmp11_ = NULL;
 		GMount* _tmp12_ = NULL;
-#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = uri_file;
-#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = g_file_find_enclosing_mount (_tmp10_, NULL, &_inner_error_);
-#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp11_;
-#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7951 "LibraryWindow.c"
-			goto __catch40_g_error;
+#line 6493 "LibraryWindow.c"
+			goto __catch39_g_error;
 		}
-#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp9_;
-#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = NULL;
-#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 948 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		mount = _tmp12_;
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp9_);
-#line 7964 "LibraryWindow.c"
+#line 6506 "LibraryWindow.c"
 	}
-	goto __finally40;
-	__catch40_g_error:
+	goto __finally39;
+	__catch39_g_error:
 	{
 		GError* err = NULL;
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 7976 "LibraryWindow.c"
+#line 6518 "LibraryWindow.c"
 	}
-	__finally40:
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	__finally39:
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (page);
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (entry);
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 947 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 7995 "LibraryWindow.c"
+#line 6537 "LibraryWindow.c"
 	}
-#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = mount;
-#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp14_ != NULL) {
-#line 8001 "LibraryWindow.c"
+#line 6543 "LibraryWindow.c"
 		DiscoveredCamera* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
-#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = camera;
-#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_->uri;
-#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = g_str_has_prefix (_tmp16_, "file://");
-#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = !_tmp17_;
-#line 8013 "LibraryWindow.c"
+#line 6555 "LibraryWindow.c"
 	} else {
-#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = FALSE;
-#line 8017 "LibraryWindow.c"
+#line 6559 "LibraryWindow.c"
 	}
-#line 1094 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 954 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 8021 "LibraryWindow.c"
+#line 6563 "LibraryWindow.c"
 		ImportPage* _tmp18_ = NULL;
 		GMount* _tmp19_ = NULL;
 		gboolean _tmp20_ = FALSE;
-#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = page;
-#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = mount;
-#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = import_page_unmount_camera (_tmp18_, _tmp19_);
-#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 955 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp20_) {
-#line 8033 "LibraryWindow.c"
+#line 6575 "LibraryWindow.c"
 			ImportPage* _tmp21_ = NULL;
-#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = page;
-#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_PAGE, Page));
-#line 8039 "LibraryWindow.c"
+#line 6581 "LibraryWindow.c"
 		} else {
-#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 958 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			app_window_error_message ("Unable to unmount the camera at this time.", NULL);
-#line 8043 "LibraryWindow.c"
+#line 6585 "LibraryWindow.c"
 		}
 	} else {
 		ImportPage* _tmp22_ = NULL;
-#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp22_ = page;
-#line 1100 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 960 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE, Page));
-#line 8051 "LibraryWindow.c"
+#line 6593 "LibraryWindow.c"
 	}
-#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
-#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page);
-#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 937 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 8061 "LibraryWindow.c"
+#line 6603 "LibraryWindow.c"
 }
 
 
@@ -8067,25 +6609,25 @@ void library_window_add_to_stack (LibraryWindow* self, Page* page) {
 	GtkStack* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
 	GtkStack* _tmp3_ = NULL;
-#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 965 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 967 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->stack;
-#line 1109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page;
-#line 1109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 969 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->stack;
-#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 971 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 8088 "LibraryWindow.c"
+#line 6630 "LibraryWindow.c"
 }
 
 
@@ -8093,206 +6635,235 @@ static void library_window_remove_from_stack (LibraryWindow* self, Page* page) {
 	GtkStack* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
 	GtkStack* _tmp2_ = NULL;
-#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 974 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->stack;
-#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1115 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 975 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 1118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->stack;
-#line 1118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 978 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 8110 "LibraryWindow.c"
+#line 6652 "LibraryWindow.c"
+}
+
+
+static GVariant* _variant_new6 (gboolean value) {
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 6659 "LibraryWindow.c"
+}
+
+
+static GVariant* _variant_new7 (gboolean value) {
+#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 6666 "LibraryWindow.c"
+}
+
+
+static GVariant* _variant_new8 (gboolean value) {
+#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_ref_sink (g_variant_new_boolean (value));
+#line 6673 "LibraryWindow.c"
+}
+
+
+static GVariant* _variant_new9 (const gchar* value) {
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	return g_variant_ref_sink (g_variant_new_string (value));
+#line 6680 "LibraryWindow.c"
 }
 
 
 static void library_window_load_configuration (LibraryWindow* self) {
-	GtkToggleAction* basic_display_action = NULL;
-	GtkAction* _tmp0_ = NULL;
-	GtkToggleAction* _tmp1_ = NULL;
-	GtkToggleAction* _tmp2_ = NULL;
-	GtkToggleAction* _tmp3_ = NULL;
+	GAction* basic_display_action = NULL;
+	GAction* _tmp0_ = NULL;
+	GAction* _tmp1_ = NULL;
+	GAction* _tmp2_ = NULL;
+	GAction* _tmp3_ = NULL;
 	ConfigFacade* _tmp4_ = NULL;
 	ConfigFacade* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-	GtkToggleAction* extended_display_action = NULL;
-	GtkAction* _tmp7_ = NULL;
-	GtkToggleAction* _tmp8_ = NULL;
-	GtkToggleAction* _tmp9_ = NULL;
-	GtkToggleAction* _tmp10_ = NULL;
-	ConfigFacade* _tmp11_ = NULL;
+	GVariant* _tmp7_ = NULL;
+	GAction* extended_display_action = NULL;
+	GAction* _tmp8_ = NULL;
+	GAction* _tmp9_ = NULL;
+	GAction* _tmp10_ = NULL;
+	GAction* _tmp11_ = NULL;
 	ConfigFacade* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	GtkToggleAction* search_bar_display_action = NULL;
-	GtkAction* _tmp14_ = NULL;
-	GtkToggleAction* _tmp15_ = NULL;
-	GtkToggleAction* _tmp16_ = NULL;
-	GtkToggleAction* _tmp17_ = NULL;
-	ConfigFacade* _tmp18_ = NULL;
-	ConfigFacade* _tmp19_ = NULL;
-	gboolean _tmp20_ = FALSE;
-	GtkRadioAction* sort_events_action = NULL;
-	GtkAction* _tmp21_ = NULL;
-	GtkRadioAction* _tmp22_ = NULL;
-	GtkRadioAction* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	ConfigFacade* _tmp25_ = NULL;
-	ConfigFacade* _tmp26_ = NULL;
-	gboolean _tmp27_ = FALSE;
-	gboolean _tmp28_ = FALSE;
-	gint event_sort_val = 0;
-	GtkRadioAction* _tmp29_ = NULL;
-#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	ConfigFacade* _tmp13_ = NULL;
+	gboolean _tmp14_ = FALSE;
+	GVariant* _tmp15_ = NULL;
+	GAction* search_bar_display_action = NULL;
+	GAction* _tmp16_ = NULL;
+	GAction* _tmp17_ = NULL;
+	GAction* _tmp18_ = NULL;
+	GAction* _tmp19_ = NULL;
+	ConfigFacade* _tmp20_ = NULL;
+	ConfigFacade* _tmp21_ = NULL;
+	gboolean _tmp22_ = FALSE;
+	GVariant* _tmp23_ = NULL;
+	GAction* sort_events_action = NULL;
+	GAction* _tmp24_ = NULL;
+	GAction* _tmp25_ = NULL;
+	GAction* _tmp26_ = NULL;
+	const gchar* _tmp27_ = NULL;
+	ConfigFacade* _tmp28_ = NULL;
+	ConfigFacade* _tmp29_ = NULL;
+	gboolean _tmp30_ = FALSE;
+	gboolean _tmp31_ = FALSE;
+	gchar* event_sort_val = NULL;
+	gchar* _tmp32_ = NULL;
+	GAction* _tmp33_ = NULL;
+	GVariant* _tmp34_ = NULL;
+#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplayBasicProperties");
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp0_) : NULL;
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp1_ == NULL) {
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp0_);
-#line 8160 "LibraryWindow.c"
-	}
-#line 1123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp0_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayBasicProperties");
+#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 983 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	basic_display_action = _tmp1_;
-#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = basic_display_action;
-#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 984 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (_tmp2_ != NULL, "basic_display_action != null");
-#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = basic_display_action;
-#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = _tmp4_;
-#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = configuration_facade_get_display_basic_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_toggle_action_set_active (_tmp3_, _tmp6_);
-#line 1126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp7_ = _variant_new6 (_tmp6_);
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_change_state (_tmp3_, _tmp7_);
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp7_);
+#line 985 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplayExtendedProperties");
-#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp7_) : NULL;
-#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp8_ == NULL) {
-#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp7_);
-#line 8188 "LibraryWindow.c"
-	}
-#line 1128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	extended_display_action = _tmp8_;
-#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = extended_display_action;
-#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (_tmp9_ != NULL, "extended_display_action != null");
-#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp8_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplayExtendedProperties");
+#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp9_ = _g_object_ref0 (_tmp8_);
+#line 987 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	extended_display_action = _tmp9_;
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = extended_display_action;
-#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = config_facade_get_instance ();
-#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = _tmp11_;
-#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_toggle_action_set_active (_tmp10_, _tmp13_);
-#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp12_);
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonDisplaySearchbar");
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_toggle_action_get_type ()) ? ((GtkToggleAction*) _tmp14_) : NULL;
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp15_ == NULL) {
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp14_);
-#line 8216 "LibraryWindow.c"
-	}
-#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	search_bar_display_action = _tmp15_;
-#line 1135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp16_ = search_bar_display_action;
-#line 1135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (_tmp16_ != NULL, "search_bar_display_action != null");
-#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_ = search_bar_display_action;
-#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = config_facade_get_instance ();
-#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = _tmp18_;
-#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp20_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_toggle_action_set_active (_tmp17_, _tmp20_);
-#line 1136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp19_);
-#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp21_ = app_window_get_common_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), "CommonSortEventsAscending");
-#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_radio_action_get_type ()) ? ((GtkRadioAction*) _tmp21_) : NULL;
-#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp22_ == NULL) {
-#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_g_object_unref0 (_tmp21_);
-#line 8244 "LibraryWindow.c"
-	}
-#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	sort_events_action = _tmp22_;
-#line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23_ = sort_events_action;
-#line 1140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_vala_assert (_tmp23_ != NULL, "sort_events_action != null");
-#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp25_ = config_facade_get_instance ();
-#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp26_ = _tmp25_;
-#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp27_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp28_ = _tmp27_;
-#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp26_);
-#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp28_) {
-#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp24_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
-#line 8266 "LibraryWindow.c"
+#line 988 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_assert (_tmp10_ != NULL, "extended_display_action != null");
+#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp11_ = extended_display_action;
+#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp12_ = config_facade_get_instance ();
+#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp13_ = _tmp12_;
+#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp14_ = configuration_facade_get_display_extended_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp15_ = _variant_new7 (_tmp14_);
+#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_change_state (_tmp11_, _tmp15_);
+#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp15_);
+#line 989 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp13_);
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp16_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonDisplaySearchbar");
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp17_ = _g_object_ref0 (_tmp16_);
+#line 991 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	search_bar_display_action = _tmp17_;
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp18_ = search_bar_display_action;
+#line 992 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_assert (_tmp18_ != NULL, "search_bar_display_action != null");
+#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp19_ = search_bar_display_action;
+#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp20_ = config_facade_get_instance ();
+#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp21_ = _tmp20_;
+#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp22_ = configuration_facade_get_display_search_bar (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp23_ = _variant_new8 (_tmp22_);
+#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_change_state (_tmp19_, _tmp23_);
+#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp23_);
+#line 993 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp21_);
+#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp24_ = g_action_map_lookup_action (G_TYPE_CHECK_INSTANCE_CAST (self, g_action_map_get_type (), GActionMap), "CommonSortEvents");
+#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp25_ = _g_object_ref0 (_tmp24_);
+#line 995 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	sort_events_action = _tmp25_;
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp26_ = sort_events_action;
+#line 996 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_vala_assert (_tmp26_ != NULL, "sort_events_action != null");
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp28_ = config_facade_get_instance ();
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp29_ = _tmp28_;
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp30_ = configuration_facade_get_events_sort_ascending (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp31_ = _tmp30_;
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp29_);
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp31_) {
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_ASCENDING;
+#line 6829 "LibraryWindow.c"
 	} else {
-#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp24_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
-#line 8270 "LibraryWindow.c"
-	}
-#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	event_sort_val = _tmp24_;
-#line 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp29_ = sort_events_action;
-#line 1148 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_radio_action_set_current_value (_tmp29_, event_sort_val);
-#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1002 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp27_ = LIBRARY_WINDOW_SORT_EVENTS_ORDER_DESCENDING;
+#line 6833 "LibraryWindow.c"
+	}
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp32_ = g_strdup (_tmp27_);
+#line 1001 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	event_sort_val = _tmp32_;
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp33_ = sort_events_action;
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp34_ = _variant_new9 (event_sort_val);
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_action_change_state (_tmp33_, _tmp34_);
+#line 1004 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_variant_unref0 (_tmp34_);
+#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_free0 (event_sort_val);
+#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (sort_events_action);
-#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (search_bar_display_action);
-#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (extended_display_action);
-#line 1122 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 982 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (basic_display_action);
-#line 8286 "LibraryWindow.c"
+#line 6857 "LibraryWindow.c"
 }
 
 
 static gboolean _library_window_on_pulse_background_progress_bar_gsource_func (gpointer self) {
 	gboolean result;
 	result = library_window_on_pulse_background_progress_bar ((LibraryWindow*) self);
-#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 8295 "LibraryWindow.c"
+#line 6866 "LibraryWindow.c"
 }
 
 
@@ -8305,62 +6876,62 @@ static void library_window_start_pulse_background_progress_bar (LibraryWindow* s
 	const gchar* _tmp5_ = NULL;
 	GtkProgressBar* _tmp6_ = NULL;
 	guint _tmp7_ = 0U;
-#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1007 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
-#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1008 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1009 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8320 "LibraryWindow.c"
+#line 6891 "LibraryWindow.c"
 	}
-#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1011 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = priority;
-#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1013 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = _tmp3_;
-#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1015 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1015 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = label;
-#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1015 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp4_, _tmp5_);
-#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->background_progress_bar;
-#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1016 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_pulse (_tmp6_);
-#line 1161 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1017 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) LIBRARY_WINDOW_BACKGROUND_PROGRESS_PULSE_MSEC, _library_window_on_pulse_background_progress_bar_gsource_func, g_object_ref (self), g_object_unref);
-#line 1163 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1019 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = _tmp7_;
-#line 8346 "LibraryWindow.c"
+#line 6917 "LibraryWindow.c"
 }
 
 
 static gboolean library_window_on_pulse_background_progress_bar (LibraryWindow* self) {
 	gboolean result = FALSE;
 	GtkProgressBar* _tmp0_ = NULL;
-#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1023 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_bar;
-#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1024 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_pulse (_tmp0_);
-#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = TRUE;
-#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1026 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 8363 "LibraryWindow.c"
+#line 6934 "LibraryWindow.c"
 }
 
 
@@ -8369,43 +6940,43 @@ static void library_window_stop_pulse_background_progress_bar (LibraryWindow* se
 	gint _tmp1_ = 0;
 	guint _tmp2_ = 0U;
 	gboolean _tmp4_ = FALSE;
-#line 1173 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1029 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1030 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1031 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8382 "LibraryWindow.c"
+#line 6953 "LibraryWindow.c"
 	}
-#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_pulse_id;
-#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1033 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != ((guint) 0)) {
-#line 8388 "LibraryWindow.c"
+#line 6959 "LibraryWindow.c"
 		guint _tmp3_ = 0U;
-#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->background_progress_pulse_id;
-#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1034 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_source_remove (_tmp3_);
-#line 1179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1035 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_pulse_id = (guint) 0;
-#line 8396 "LibraryWindow.c"
+#line 6967 "LibraryWindow.c"
 	}
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = clear;
-#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1038 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 8402 "LibraryWindow.c"
+#line 6973 "LibraryWindow.c"
 		gint _tmp5_ = 0;
-#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = priority;
-#line 1183 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1039 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, _tmp5_);
-#line 8408 "LibraryWindow.c"
+#line 6979 "LibraryWindow.c"
 	}
 }
 
@@ -8429,102 +7000,102 @@ static void library_window_update_background_progress_bar (LibraryWindow* self,
 	gdouble _tmp18_ = 0.0;
 	gchar* _tmp19_ = NULL;
 	gchar* _tmp20_ = NULL;
-#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1042 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (label != NULL);
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1188 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1044 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1189 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1045 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8444 "LibraryWindow.c"
+#line 7015 "LibraryWindow.c"
 	}
-#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1191 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1047 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = count;
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp5_ <= 0.0) {
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = TRUE;
-#line 8456 "LibraryWindow.c"
+#line 7027 "LibraryWindow.c"
 	} else {
 		gdouble _tmp6_ = 0.0;
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = total;
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp6_ <= 0.0;
-#line 8463 "LibraryWindow.c"
+#line 7034 "LibraryWindow.c"
 	}
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = TRUE;
-#line 8469 "LibraryWindow.c"
+#line 7040 "LibraryWindow.c"
 	} else {
 		gdouble _tmp7_ = 0.0;
 		gdouble _tmp8_ = 0.0;
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = count;
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = total;
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = _tmp7_ >= _tmp8_;
-#line 8479 "LibraryWindow.c"
+#line 7050 "LibraryWindow.c"
 	}
-#line 1193 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1049 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 8483 "LibraryWindow.c"
+#line 7054 "LibraryWindow.c"
 		gint _tmp9_ = 0;
-#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = priority;
-#line 1194 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1050 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, _tmp9_);
-#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1052 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8491 "LibraryWindow.c"
+#line 7062 "LibraryWindow.c"
 	}
-#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = priority;
-#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1055 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = _tmp10_;
-#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1057 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = count;
-#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1057 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = total;
-#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1057 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	fraction = _tmp11_ / _tmp12_;
-#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = self->priv->background_progress_bar;
-#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = fraction;
-#line 1202 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1058 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_fraction (_tmp13_, _tmp14_);
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = self->priv->background_progress_bar;
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = _ ("%s (%d%%)");
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = label;
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = fraction;
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = g_strdup_printf (_tmp16_, _tmp17_, (gint) (_tmp18_ * 100.0));
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp20_ = _tmp19_;
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp15_, _tmp20_);
-#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1059 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (_tmp20_);
-#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1060 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_show_background_progress_bar (self);
-#line 8527 "LibraryWindow.c"
+#line 7098 "LibraryWindow.c"
 }
 
 
@@ -8534,149 +7105,149 @@ static void library_window_clear_background_progress_bar (LibraryWindow* self, g
 	gint _tmp2_ = 0;
 	GtkProgressBar* _tmp3_ = NULL;
 	GtkProgressBar* _tmp4_ = NULL;
-#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1069 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = priority;
-#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->current_progress_priority;
-#line 1214 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1070 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < _tmp1_) {
-#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1071 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 8547 "LibraryWindow.c"
+#line 7118 "LibraryWindow.c"
 	}
-#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = priority;
-#line 1217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1073 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, _tmp2_, FALSE);
-#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1075 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = 0;
-#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->background_progress_bar;
-#line 1221 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1077 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_fraction (_tmp3_, 0.0);
-#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1078 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_progress_bar_set_text (_tmp4_, "");
-#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1079 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_hide_background_progress_bar (self);
-#line 8565 "LibraryWindow.c"
+#line 7136 "LibraryWindow.c"
 }
 
 
 static void library_window_show_background_progress_bar (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 1231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
-#line 1232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
-#line 8577 "LibraryWindow.c"
+#line 7148 "LibraryWindow.c"
 		GtkBox* _tmp1_ = NULL;
 		GtkFrame* _tmp2_ = NULL;
 		GtkFrame* _tmp3_ = NULL;
-#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
-#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_frame;
-#line 1233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1089 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_box_pack_end (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->background_progress_frame;
-#line 1234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1090 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1235 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1091 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = TRUE;
-#line 8593 "LibraryWindow.c"
+#line 7164 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_hide_background_progress_bar (LibraryWindow* self) {
 	gboolean _tmp0_ = FALSE;
-#line 1239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1095 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->background_progress_displayed;
-#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1096 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 8606 "LibraryWindow.c"
+#line 7177 "LibraryWindow.c"
 		GtkBox* _tmp1_ = NULL;
 		GtkFrame* _tmp2_ = NULL;
-#line 1241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = self->priv->top_section;
-#line 1241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = self->priv->background_progress_frame;
-#line 1241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1097 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1098 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		self->priv->background_progress_displayed = FALSE;
-#line 8617 "LibraryWindow.c"
+#line 7188 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_library_monitor_discovery_started (LibraryWindow* self) {
 	const gchar* _tmp0_ = NULL;
-#line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _ ("Updating library…");
-#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY);
-#line 8630 "LibraryWindow.c"
+#line 7201 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_discovery_completed (LibraryWindow* self) {
-#line 1250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_stop_pulse_background_progress_bar (self, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY, TRUE);
-#line 8639 "LibraryWindow.c"
+#line 7210 "LibraryWindow.c"
 }
 
 
 static void library_window_on_library_monitor_auto_update_progress (LibraryWindow* self, gint completed_files, gint total_files) {
 	gint _tmp0_ = 0;
-#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = total_files;
-#line 1255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES) {
-#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY);
-#line 8653 "LibraryWindow.c"
+#line 7224 "LibraryWindow.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _ ("Updating library…");
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = completed_files;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = total_files;
-#line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_update_background_progress_bar (self, _tmp1_, LIBRARY_WINDOW_REALTIME_UPDATE_PROGRESS_PRIORITY, (gdouble) _tmp2_, (gdouble) _tmp3_);
-#line 8666 "LibraryWindow.c"
+#line 7237 "LibraryWindow.c"
 	}
 }
 
 
 static void library_window_on_library_monitor_auto_import_preparing (LibraryWindow* self) {
 	const gchar* _tmp0_ = NULL;
-#line 1263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _ ("Preparing to auto-import photos…");
-#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1120 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY);
-#line 8679 "LibraryWindow.c"
+#line 7250 "LibraryWindow.c"
 }
 
 
@@ -8684,44 +7255,44 @@ static void library_window_on_library_monitor_auto_import_progress (LibraryWindo
 	const gchar* _tmp0_ = NULL;
 	guint64 _tmp1_ = 0ULL;
 	guint64 _tmp2_ = 0ULL;
-#line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1124 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = _ ("Auto-importing photos…");
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = completed_bytes;
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = total_bytes;
-#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1125 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_update_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 8697 "LibraryWindow.c"
+#line 7268 "LibraryWindow.c"
 }
 
 
 static void library_window_on_metadata_writer_progress (LibraryWindow* self, guint completed, guint total) {
 	guint _tmp0_ = 0U;
-#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = total;
-#line 1274 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_ < ((guint) LIBRARY_WINDOW_MIN_PROGRESS_BAR_FILES)) {
-#line 1275 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_clear_background_progress_bar (self, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY);
-#line 8711 "LibraryWindow.c"
+#line 7282 "LibraryWindow.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		guint _tmp3_ = 0U;
-#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _ ("Writing metadata to files…");
-#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = completed;
-#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = total;
-#line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_update_background_progress_bar (self, _tmp1_, LIBRARY_WINDOW_METADATA_WRITER_PROGRESS_PRIORITY, (gdouble) _tmp2_, (gdouble) _tmp3_);
-#line 8724 "LibraryWindow.c"
+#line 7295 "LibraryWindow.c"
 	}
 }
 
@@ -8735,229 +7306,255 @@ static void library_window_create_layout (LibraryWindow* self, Page* start_page)
 	GtkProgressBar* _tmp4_ = NULL;
 	GtkFrame* _tmp5_ = NULL;
 	GtkStyleContext* _tmp6_ = NULL;
-	GtkAlignment* bottom_alignment = NULL;
-	GtkAlignment* _tmp7_ = NULL;
+	BasicProperties* _tmp7_ = NULL;
 	BasicProperties* _tmp8_ = NULL;
-	GtkFrame* _tmp9_ = NULL;
-	GtkFrame* _tmp10_ = NULL;
-	GtkStyleContext* _tmp11_ = NULL;
-	GtkBox* _tmp12_ = NULL;
-	GtkPaned* _tmp13_ = NULL;
-	GtkBox* _tmp14_ = NULL;
-	GtkPaned* _tmp15_ = NULL;
-	GtkFrame* _tmp16_ = NULL;
-	GtkPaned* _tmp17_ = NULL;
-	GtkBox* _tmp18_ = NULL;
+	BasicProperties* _tmp9_ = NULL;
+	BasicProperties* _tmp10_ = NULL;
+	BasicProperties* _tmp11_ = NULL;
+	BasicProperties* _tmp12_ = NULL;
+	BasicProperties* _tmp13_ = NULL;
+	BasicProperties* _tmp14_ = NULL;
+	GtkFrame* _tmp15_ = NULL;
+	BasicProperties* _tmp16_ = NULL;
+	GtkFrame* _tmp17_ = NULL;
+	GtkStyleContext* _tmp18_ = NULL;
 	GtkBox* _tmp19_ = NULL;
-	SearchFilterToolbar* _tmp20_ = NULL;
+	GtkPaned* _tmp20_ = NULL;
 	GtkBox* _tmp21_ = NULL;
-	GtkStack* _tmp22_ = NULL;
-	GtkPaned* _tmp23_ = NULL;
+	GtkPaned* _tmp22_ = NULL;
+	GtkFrame* _tmp23_ = NULL;
 	GtkPaned* _tmp24_ = NULL;
-	GtkPaned* _tmp25_ = NULL;
-	SidebarTree* _tmp26_ = NULL;
-	GtkPaned* _tmp27_ = NULL;
+	GtkBox* _tmp25_ = NULL;
+	GtkBox* _tmp26_ = NULL;
+	SearchFilterToolbar* _tmp27_ = NULL;
 	GtkBox* _tmp28_ = NULL;
-	GtkPaned* _tmp29_ = NULL;
-	ConfigFacade* _tmp30_ = NULL;
-	ConfigFacade* _tmp31_ = NULL;
-	gint _tmp32_ = 0;
-	GtkStack* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
-	GtkBox* _tmp36_ = NULL;
-	GtkPaned* _tmp37_ = NULL;
-	GtkBox* _tmp38_ = NULL;
-	Page* _tmp39_ = NULL;
-	Page* _tmp40_ = NULL;
-#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GtkStack* _tmp29_ = NULL;
+	GtkPaned* _tmp30_ = NULL;
+	GtkPaned* _tmp31_ = NULL;
+	GtkPaned* _tmp32_ = NULL;
+	SidebarTree* _tmp33_ = NULL;
+	GtkPaned* _tmp34_ = NULL;
+	GtkBox* _tmp35_ = NULL;
+	GtkPaned* _tmp36_ = NULL;
+	ConfigFacade* _tmp37_ = NULL;
+	ConfigFacade* _tmp38_ = NULL;
+	gint _tmp39_ = 0;
+	GtkStack* _tmp40_ = NULL;
+	gint _tmp41_ = 0;
+	gint _tmp42_ = 0;
+	GtkBox* _tmp43_ = NULL;
+	GtkPaned* _tmp44_ = NULL;
+	GtkBox* _tmp45_ = NULL;
+	Page* _tmp46_ = NULL;
+	Page* _tmp47_ = NULL;
+#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (start_page));
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	scrolled_sidebar = _tmp0_;
-#line 1286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_scrolled_window_set_policy (scrolled_sidebar, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = self->priv->sidebar_tree;
-#line 1287 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->background_progress_frame;
-#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1145 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), (guint) 2);
-#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->background_progress_frame;
-#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->background_progress_bar;
-#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1146 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = self->priv->background_progress_frame;
-#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1147 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_style_context_remove_class (_tmp6_, "frame");
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = (GtkAlignment*) gtk_alignment_new ((gfloat) 0, 0.5f, (gfloat) 1, (gfloat) 0);
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_object_ref_sink (_tmp7_);
-#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	bottom_alignment = _tmp7_;
-#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_alignment_set_padding (bottom_alignment, (guint) 10, (guint) 10, (guint) 6, (guint) 0);
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp7_ = self->priv->basic_properties;
+#line 1150 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = self->priv->basic_properties;
-#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (bottom_alignment, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = self->priv->bottom_frame;
-#line 1299 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (bottom_alignment, gtk_widget_get_type (), GtkWidget));
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = self->priv->bottom_frame;
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 1300 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_style_context_remove_class (_tmp11_, "frame");
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = self->priv->top_section;
-#line 1304 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_box_pack_start (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = self->priv->sidebar_paned;
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = self->priv->top_section;
-#line 1306 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_pack1 (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = self->priv->sidebar_paned;
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp16_ = self->priv->bottom_frame;
-#line 1307 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_pack2 (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
-#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_ = self->priv->sidebar_paned;
-#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_set_position (_tmp17_, 1000);
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_object_ref_sink (_tmp18_);
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1151 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp9_ = self->priv->basic_properties;
+#line 1152 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp10_ = self->priv->basic_properties;
+#line 1153 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp11_ = self->priv->basic_properties;
+#line 1154 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 10);
+#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp12_ = self->priv->basic_properties;
+#line 1155 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 10);
+#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp13_ = self->priv->basic_properties;
+#line 1156 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 6);
+#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp14_ = self->priv->basic_properties;
+#line 1157 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), 0);
+#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp15_ = self->priv->bottom_frame;
+#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp16_ = self->priv->basic_properties;
+#line 1159 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
+#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp17_ = self->priv->bottom_frame;
+#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp18_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
+#line 1160 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_style_context_remove_class (_tmp18_, "frame");
+#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp19_ = self->priv->top_section;
+#line 1164 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (scrolled_sidebar, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp20_ = self->priv->sidebar_paned;
+#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp21_ = self->priv->top_section;
+#line 1166 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_paned_pack1 (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
+#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp22_ = self->priv->sidebar_paned;
+#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp23_ = self->priv->bottom_frame;
+#line 1167 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_paned_pack2 (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
+#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp24_ = self->priv->sidebar_paned;
+#line 1168 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_paned_set_position (_tmp24_, 1000);
+#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp25_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_object_ref_sink (_tmp25_);
+#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->right_vbox);
-#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->right_vbox = _tmp18_;
-#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = self->priv->right_vbox;
-#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp20_ = self->priv->search_toolbar;
-#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp21_ = self->priv->right_vbox;
-#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp22_ = self->priv->stack;
-#line 1312 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp23_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_object_ref_sink (_tmp23_);
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->client_paned);
-#line 1314 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->client_paned = _tmp23_;
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp24_ = self->priv->client_paned;
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp25_ = self->priv->sidebar_paned;
-#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_pack1 (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp26_ = self->priv->sidebar_tree;
-#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1);
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp27_ = self->priv->client_paned;
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1170 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->right_vbox = _tmp25_;
+#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp26_ = self->priv->right_vbox;
+#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp27_ = self->priv->search_toolbar;
+#line 1171 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = self->priv->right_vbox;
-#line 1317 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_pack2 (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp29_ = self->priv->client_paned;
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp30_ = config_facade_get_instance ();
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp31_ = _tmp30_;
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp32_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_paned_set_position (_tmp29_, _tmp32_);
-#line 1318 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (_tmp31_);
-#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp33_ = self->priv->stack;
-#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp34_ = library_window_get_PAGE_MIN_WIDTH ();
-#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp35_ = _tmp34_;
-#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), _tmp35_, -1);
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp36_ = self->priv->layout;
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp37_ = self->priv->client_paned;
-#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_box_pack_end (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp38_ = self->priv->layout;
-#line 1324 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
-#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp39_ = start_page;
-#line 1326 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	library_window_switch_to_page (self, _tmp39_);
-#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp40_ = start_page;
-#line 1327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget));
-#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (bottom_alignment);
-#line 1282 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp29_ = self->priv->stack;
+#line 1172 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp30_ = (GtkPaned*) gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
+#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_object_ref_sink (_tmp30_);
+#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (self->priv->client_paned);
+#line 1174 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->client_paned = _tmp30_;
+#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp31_ = self->priv->client_paned;
+#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp32_ = self->priv->sidebar_paned;
+#line 1175 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_paned_pack1 (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE);
+#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp33_ = self->priv->sidebar_tree;
+#line 1176 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), LIBRARY_WINDOW_SIDEBAR_MIN_WIDTH, -1);
+#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp34_ = self->priv->client_paned;
+#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp35_ = self->priv->right_vbox;
+#line 1177 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_paned_pack2 (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE);
+#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp36_ = self->priv->client_paned;
+#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp37_ = config_facade_get_instance ();
+#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp38_ = _tmp37_;
+#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp39_ = configuration_facade_get_sidebar_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_paned_set_position (_tmp36_, _tmp39_);
+#line 1178 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp38_);
+#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp40_ = self->priv->stack;
+#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp41_ = library_window_get_PAGE_MIN_WIDTH ();
+#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp42_ = _tmp41_;
+#line 1180 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), _tmp42_, -1);
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp43_ = self->priv->layout;
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp44_ = self->priv->client_paned;
+#line 1182 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_box_pack_end (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp45_ = self->priv->layout;
+#line 1184 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp46_ = start_page;
+#line 1186 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	library_window_switch_to_page (self, _tmp46_);
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp47_ = start_page;
+#line 1187 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget));
+#line 1138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (scrolled_sidebar);
-#line 8933 "LibraryWindow.c"
+#line 7530 "LibraryWindow.c"
 }
 
 
 static void library_window_real_set_current_page (PageWindow* base, Page* page) {
 	LibraryWindow * self;
 	Page* _tmp0_ = NULL;
-#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 1330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1190 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1192 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp0_);
-#line 8948 "LibraryWindow.c"
+#line 7545 "LibraryWindow.c"
 }
 
 
 void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable) {
 	gboolean _tmp0_ = FALSE;
-#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1195 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = should_enable;
-#line 1336 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1196 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = _tmp0_;
-#line 8960 "LibraryWindow.c"
+#line 7557 "LibraryWindow.c"
 }
 
 
@@ -8986,48 +7583,51 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 	Page* _tmp40_ = NULL;
 	Page* _tmp41_ = NULL;
 	Page* _tmp42_ = NULL;
-	GtkToolbar* toolbar = NULL;
 	Page* _tmp43_ = NULL;
-	GtkToolbar* _tmp44_ = NULL;
-	GtkToolbar* _tmp45_ = NULL;
-	Page* _tmp51_ = NULL;
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	GMenuModel* _tmp44_ = NULL;
+	GMenuModel* _tmp45_ = NULL;
+	GtkToolbar* toolbar = NULL;
+	Page* _tmp46_ = NULL;
+	GtkToolbar* _tmp47_ = NULL;
+	GtkToolbar* _tmp48_ = NULL;
+	Page* _tmp54_ = NULL;
+#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_switching_enabled;
-#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1200 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp0_) {
-#line 1341 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1201 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 9004 "LibraryWindow.c"
+#line 7604 "LibraryWindow.c"
 	}
-#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp1_ == _tmp3_;
-#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1343 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1203 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 1344 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1204 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 9020 "LibraryWindow.c"
+#line 7620 "LibraryWindow.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1206 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	current_page = _tmp5_;
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = current_page;
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 9030 "LibraryWindow.c"
+#line 7630 "LibraryWindow.c"
 		GtkToolbar* toolbar = NULL;
 		Page* _tmp7_ = NULL;
 		GtkToolbar* _tmp8_ = NULL;
@@ -9035,92 +7635,96 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		Page* _tmp12_ = NULL;
 		Page* _tmp13_ = NULL;
 		Page* _tmp15_ = NULL;
-#line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1208 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), FALSE);
+#line 1209 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		application_set_menubar (NULL);
+#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = current_page;
-#line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page_get_toolbar (_tmp7_);
-#line 1348 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1211 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		toolbar = _tmp8_;
-#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = toolbar;
-#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1212 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp9_ != NULL) {
-#line 9048 "LibraryWindow.c"
+#line 7652 "LibraryWindow.c"
 			GtkBox* _tmp10_ = NULL;
 			GtkToolbar* _tmp11_ = NULL;
-#line 1350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp10_ = self->priv->right_vbox;
-#line 1350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp11_ = toolbar;
-#line 1350 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1213 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 9057 "LibraryWindow.c"
+#line 7661 "LibraryWindow.c"
 		}
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = current_page;
-#line 1352 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		page_switching_from (_tmp12_);
-#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = current_page;
-#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1219 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 9067 "LibraryWindow.c"
+#line 7671 "LibraryWindow.c"
 			SidebarTree* _tmp14_ = NULL;
-#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp14_ = self->priv->sidebar_tree;
-#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_enable_editing (_tmp14_);
-#line 9073 "LibraryWindow.c"
+#line 7677 "LibraryWindow.c"
 		}
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = current_page;
-#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_unsubscribe_from_basic_information (self, _tmp15_);
-#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1207 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (toolbar);
-#line 9081 "LibraryWindow.c"
+#line 7685 "LibraryWindow.c"
 	}
-#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp16_ = self->priv->stack;
-#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp17_ = page;
-#line 1363 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_stack_set_visible_child (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget));
-#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = page;
-#line 1367 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_WINDOW_CLASS (library_window_parent_class)->set_current_page (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), TYPE_PAGE_WINDOW, PageWindow), _tmp18_);
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp19_ = page;
-#line 1373 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_LIBRARY_PHOTO_PAGE)) {
-#line 9097 "LibraryWindow.c"
+#line 7701 "LibraryWindow.c"
 		SidebarTree* _tmp20_ = NULL;
-#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = self->priv->sidebar_tree;
-#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_disable_editing (_tmp20_);
-#line 9103 "LibraryWindow.c"
+#line 7707 "LibraryWindow.c"
 	}
-#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp21_ = library_window_should_show_search_bar (self);
-#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = page;
-#line 1377 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1240 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_toggle_search_bar (self, _tmp21_, G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp22_) : NULL);
-#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp23_ = self->priv->page_map;
-#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp24_ = page;
-#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp25_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_);
-#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	entry = (SidebarEntry*) _tmp25_;
-#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp26_ = entry;
-#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp26_ != NULL) {
-#line 9123 "LibraryWindow.c"
+#line 7727 "LibraryWindow.c"
 		SidebarExpandableEntry* expandable_entry = NULL;
 		SidebarEntry* _tmp27_ = NULL;
 		SidebarExpandableEntry* _tmp28_ = NULL;
@@ -9128,129 +7732,141 @@ void library_window_switch_to_page (LibraryWindow* self, Page* page) {
 		SidebarExpandableEntry* _tmp30_ = NULL;
 		SidebarTree* _tmp35_ = NULL;
 		SidebarEntry* _tmp36_ = NULL;
-#line 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = entry;
-#line 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_EXPANDABLE_ENTRY) ? ((SidebarExpandableEntry*) _tmp27_) : NULL);
-#line 1384 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		expandable_entry = _tmp28_;
-#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp30_ = expandable_entry;
-#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp30_ != NULL) {
-#line 9141 "LibraryWindow.c"
+#line 7745 "LibraryWindow.c"
 			SidebarExpandableEntry* _tmp31_ = NULL;
 			gboolean _tmp32_ = FALSE;
-#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp31_ = expandable_entry;
-#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp32_ = sidebar_expandable_entry_expand_on_select (_tmp31_);
-#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp29_ = _tmp32_;
-#line 9150 "LibraryWindow.c"
+#line 7754 "LibraryWindow.c"
 		} else {
-#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp29_ = FALSE;
-#line 9154 "LibraryWindow.c"
+#line 7758 "LibraryWindow.c"
 		}
-#line 1385 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp29_) {
-#line 9158 "LibraryWindow.c"
+#line 7762 "LibraryWindow.c"
 			SidebarTree* _tmp33_ = NULL;
 			SidebarEntry* _tmp34_ = NULL;
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp33_ = self->priv->sidebar_tree;
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp34_ = entry;
-#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			sidebar_tree_expand_to_entry (_tmp33_, _tmp34_);
-#line 9167 "LibraryWindow.c"
+#line 7771 "LibraryWindow.c"
 		}
-#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp35_ = self->priv->sidebar_tree;
-#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = entry;
-#line 1388 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1251 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		sidebar_tree_place_cursor (_tmp35_, _tmp36_, TRUE);
-#line 1381 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1244 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (expandable_entry);
-#line 9177 "LibraryWindow.c"
+#line 7781 "LibraryWindow.c"
 	}
-#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1254 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties (self);
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = page;
-#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1256 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, TYPE_CHECKERBOARD_PAGE)) {
-#line 9185 "LibraryWindow.c"
+#line 7789 "LibraryWindow.c"
 		Page* _tmp38_ = NULL;
-#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp38_ = page;
-#line 1394 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1257 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_init_view_filter (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_CHECKERBOARD_PAGE, CheckerboardPage));
-#line 9191 "LibraryWindow.c"
+#line 7795 "LibraryWindow.c"
 	}
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp39_ = page;
-#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1259 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = _tmp40_;
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_subscribe_for_basic_information (self, _tmp41_);
-#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1262 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp41_);
-#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp42_ = page;
-#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_switched_to (_tmp42_);
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = page;
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp44_ = page_get_toolbar (_tmp43_);
-#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	toolbar = _tmp44_;
-#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp45_ = toolbar;
-#line 1404 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	if (_tmp45_ != NULL) {
-#line 9219 "LibraryWindow.c"
-		GtkBox* _tmp46_ = NULL;
-		GtkToolbar* _tmp47_ = NULL;
-		GtkToolbar* _tmp48_ = NULL;
-		GtkToolbar* _tmp49_ = NULL;
-		gboolean _tmp50_ = FALSE;
-#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp46_ = self->priv->right_vbox;
-#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp47_ = toolbar;
-#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget));
-#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp48_ = toolbar;
-#line 1406 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp49_ = toolbar;
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp50_ = library_window_is_toolbar_visible (self);
-#line 1407 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), _tmp50_);
-#line 9241 "LibraryWindow.c"
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp44_ = page_get_menubar (_tmp43_);
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp45_ = _tmp44_;
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	application_set_menubar (_tmp45_);
+#line 1266 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_g_object_unref0 (_tmp45_);
+#line 1267 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	gtk_application_window_set_show_menubar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_application_window_get_type (), GtkApplicationWindow), TRUE);
+#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp46_ = page;
+#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp47_ = page_get_toolbar (_tmp46_);
+#line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	toolbar = _tmp47_;
+#line 1270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp48_ = toolbar;
+#line 1270 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	if (_tmp48_ != NULL) {
+#line 7835 "LibraryWindow.c"
+		GtkBox* _tmp49_ = NULL;
+		GtkToolbar* _tmp50_ = NULL;
+		GtkToolbar* _tmp51_ = NULL;
+		GtkToolbar* _tmp52_ = NULL;
+		gboolean _tmp53_ = FALSE;
+#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp49_ = self->priv->right_vbox;
+#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp50_ = toolbar;
+#line 1271 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget));
+#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp51_ = toolbar;
+#line 1272 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget));
+#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp52_ = toolbar;
+#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		_tmp53_ = library_window_is_toolbar_visible (self);
+#line 1273 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), _tmp53_);
+#line 7857 "LibraryWindow.c"
 	}
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp51_ = page;
-#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	page_ready (_tmp51_);
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp54_ = page;
+#line 1276 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	page_ready (_tmp54_);
+#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (toolbar);
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (entry);
-#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1199 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (current_page);
-#line 9253 "LibraryWindow.c"
+#line 7869 "LibraryWindow.c"
 }
 
 
@@ -9265,41 +7881,41 @@ static void library_window_init_view_filter (LibraryWindow* self, CheckerboardPa
 	CheckerboardPage* _tmp7_ = NULL;
 	SearchViewFilter* _tmp8_ = NULL;
 	SearchViewFilter* _tmp9_ = NULL;
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1279 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (page));
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = checkerboard_page_get_search_view_filter (_tmp1_);
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	search_filter_toolbar_set_view_filter (_tmp0_, _tmp3_);
-#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1280 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_view_filter_unref0 (_tmp3_);
-#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = page;
-#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE, Page));
-#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = _tmp5_;
-#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = page;
-#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = checkerboard_page_get_search_view_filter (_tmp7_);
-#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view_collection_install_view_filter (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_view_filter_unref0 (_tmp9_);
-#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1281 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 9302 "LibraryWindow.c"
+#line 7918 "LibraryWindow.c"
 }
 
 
@@ -9309,35 +7925,35 @@ static gboolean library_window_should_show_search_bar (LibraryWindow* self) {
 	Page* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1284 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (IS_LIBRARY_WINDOW (self), FALSE);
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_CHECKERBOARD_PAGE);
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 9324 "LibraryWindow.c"
+#line 7940 "LibraryWindow.c"
 		gboolean _tmp4_ = FALSE;
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->is_search_toolbar_visible;
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp4_;
-#line 9330 "LibraryWindow.c"
+#line 7946 "LibraryWindow.c"
 	} else {
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 9334 "LibraryWindow.c"
+#line 7950 "LibraryWindow.c"
 	}
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = _tmp0_;
-#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 9340 "LibraryWindow.c"
+#line 7956 "LibraryWindow.c"
 }
 
 
@@ -9345,21 +7961,21 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 	SearchFilterToolbar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail ((page == NULL) || IS_CHECKERBOARD_PAGE (page));
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->search_toolbar;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = show;
-#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1290 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gtk_revealer_set_reveal_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_revealer_get_type (), GtkRevealer), _tmp1_);
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = show;
-#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1291 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 9362 "LibraryWindow.c"
+#line 7978 "LibraryWindow.c"
 		CheckerboardPage* _tmp3_ = NULL;
 		SearchFilterToolbar* _tmp4_ = NULL;
 		CheckerboardPage* _tmp5_ = NULL;
@@ -9371,70 +7987,70 @@ static void library_window_toggle_search_bar (LibraryWindow* self, gboolean show
 		CheckerboardPage* _tmp11_ = NULL;
 		SearchViewFilter* _tmp12_ = NULL;
 		SearchViewFilter* _tmp13_ = NULL;
-#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page;
-#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1292 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_vala_assert (NULL != _tmp3_, "null != page");
-#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->search_toolbar;
-#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = page;
-#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = checkerboard_page_get_search_view_filter (_tmp5_);
-#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		search_filter_toolbar_set_view_filter (_tmp4_, _tmp7_);
-#line 1427 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_view_filter_unref0 (_tmp7_);
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = page;
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE, Page));
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = page;
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = checkerboard_page_get_search_view_filter (_tmp11_);
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		view_collection_install_view_filter (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_view_filter_unref0 (_tmp13_);
-#line 1428 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 9408 "LibraryWindow.c"
+#line 8024 "LibraryWindow.c"
 	} else {
 		CheckerboardPage* _tmp14_ = NULL;
-#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = page;
-#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1296 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (_tmp14_ != NULL) {
-#line 9415 "LibraryWindow.c"
+#line 8031 "LibraryWindow.c"
 			CheckerboardPage* _tmp15_ = NULL;
 			ViewCollection* _tmp16_ = NULL;
 			ViewCollection* _tmp17_ = NULL;
 			DisabledViewFilter* _tmp18_ = NULL;
 			DisabledViewFilter* _tmp19_ = NULL;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp15_ = page;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE, Page));
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp17_ = _tmp16_;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp18_ = disabled_view_filter_new ();
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp19_ = _tmp18_;
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			view_collection_install_view_filter (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIEW_FILTER, ViewFilter));
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_view_filter_unref0 (_tmp19_);
-#line 1431 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1297 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (_tmp17_);
-#line 9437 "LibraryWindow.c"
+#line 8053 "LibraryWindow.c"
 		}
 	}
 }
@@ -9448,33 +8064,33 @@ static void library_window_on_page_created (LibraryWindow* self, SidebarPageRepr
 	Page* _tmp4_ = NULL;
 	SidebarPageRepresentative* _tmp5_ = NULL;
 	Page* _tmp6_ = NULL;
-#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 1435 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1301 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->page_map;
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page;
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 1436 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1302 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (!_tmp2_, "!page_map.has_key(page)");
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = self->priv->page_map;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = page;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = entry;
-#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1303 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = page;
-#line 1439 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1305 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_add_to_stack (self, _tmp6_);
-#line 9477 "LibraryWindow.c"
+#line 8093 "LibraryWindow.c"
 }
 
 
@@ -9488,61 +8104,61 @@ static void library_window_on_destroying_page (LibraryWindow* self, SidebarPageR
 	GeeHashMap* _tmp10_ = NULL;
 	Page* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 1442 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1308 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _tmp0_ == _tmp2_;
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1444 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1310 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp3_) {
-#line 9509 "LibraryWindow.c"
+#line 8125 "LibraryWindow.c"
 		LibraryBranch* _tmp4_ = NULL;
 		LibraryPhotosEntry* _tmp5_ = NULL;
 		LibraryPhotosEntry* _tmp6_ = NULL;
 		Page* _tmp7_ = NULL;
 		Page* _tmp8_ = NULL;
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = self->priv->library_branch;
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = library_branch_get_photos_entry (_tmp4_);
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp8_);
-#line 1445 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1311 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp8_);
-#line 9529 "LibraryWindow.c"
+#line 8145 "LibraryWindow.c"
 	}
-#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = page;
-#line 1447 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1313 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_remove_from_stack (self, _tmp9_);
-#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->page_map;
-#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = page;
-#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_, NULL);
-#line 1449 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1315 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	removed = _tmp12_;
-#line 1450 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1316 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_vala_assert (removed, "removed");
-#line 9545 "LibraryWindow.c"
+#line 8161 "LibraryWindow.c"
 }
 
 
@@ -9551,39 +8167,39 @@ static void library_window_on_sidebar_entry_selected (LibraryWindow* self, Sideb
 	SidebarSelectableEntry* _tmp0_ = NULL;
 	SidebarPageRepresentative* _tmp1_ = NULL;
 	SidebarPageRepresentative* _tmp2_ = NULL;
-#line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
-#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = selectable;
-#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp0_) : NULL);
-#line 1454 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1320 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	page_rep = _tmp1_;
-#line 1455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = page_rep;
-#line 1455 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1321 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 9568 "LibraryWindow.c"
+#line 8184 "LibraryWindow.c"
 		SidebarPageRepresentative* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
-#line 1456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = page_rep;
-#line 1456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = sidebar_page_representative_get_page (_tmp3_);
-#line 1456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp5_);
-#line 1456 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1322 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 9582 "LibraryWindow.c"
+#line 8198 "LibraryWindow.c"
 	}
-#line 1453 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1319 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (page_rep);
-#line 9586 "LibraryWindow.c"
+#line 8202 "LibraryWindow.c"
 }
 
 
@@ -9604,207 +8220,207 @@ static void library_window_on_sidebar_selected_entry_removed (LibraryWindow* sel
 	LibraryPhotosEntry* _tmp32_ = NULL;
 	Page* _tmp33_ = NULL;
 	Page* _tmp34_ = NULL;
-#line 1459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (SIDEBAR_IS_SELECTABLE_ENTRY (selectable));
-#line 1463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->library_branch;
-#line 1463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = library_branch_get_last_imported_entry (_tmp0_);
-#line 1463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1463 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	last_import_entry = _tmp3_;
-#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = selectable;
-#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, LIBRARY_TYPE_IMPORT_QUEUE_SIDEBAR_ENTRY)) {
-#line 9625 "LibraryWindow.c"
+#line 8241 "LibraryWindow.c"
 		LibraryLastImportSidebarEntry* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
-#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = last_import_entry;
-#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = library_hideable_page_entry_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, LIBRARY_TYPE_HIDEABLE_PAGE_ENTRY, LibraryHideablePageEntry));
-#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = _tmp7_;
-#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = _tmp8_;
-#line 9637 "LibraryWindow.c"
+#line 8253 "LibraryWindow.c"
 	} else {
-#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = FALSE;
-#line 9641 "LibraryWindow.c"
+#line 8257 "LibraryWindow.c"
 	}
-#line 1466 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1332 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 9645 "LibraryWindow.c"
+#line 8261 "LibraryWindow.c"
 		LibraryLastImportSidebarEntry* _tmp9_ = NULL;
 		Page* _tmp10_ = NULL;
 		Page* _tmp11_ = NULL;
-#line 1467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = last_import_entry;
-#line 1467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 1467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp11_);
-#line 1467 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1333 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 1469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1469 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1335 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 9663 "LibraryWindow.c"
+#line 8279 "LibraryWindow.c"
 	}
-#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = selectable;
-#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, EVENTS_TYPE_EVENT_ENTRY)) {
-#line 9669 "LibraryWindow.c"
+#line 8285 "LibraryWindow.c"
 		EventsBranch* _tmp14_ = NULL;
 		gboolean _tmp15_ = FALSE;
-#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = self->priv->events_branch;
-#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp15_;
-#line 9678 "LibraryWindow.c"
+#line 8294 "LibraryWindow.c"
 	} else {
-#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = FALSE;
-#line 9682 "LibraryWindow.c"
+#line 8298 "LibraryWindow.c"
 	}
-#line 1473 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1339 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_) {
-#line 9686 "LibraryWindow.c"
+#line 8302 "LibraryWindow.c"
 		EventsBranch* _tmp16_ = NULL;
 		EventsMasterDirectoryEntry* _tmp17_ = NULL;
 		EventsMasterDirectoryEntry* _tmp18_ = NULL;
 		Page* _tmp19_ = NULL;
 		Page* _tmp20_ = NULL;
-#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = self->priv->events_branch;
-#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = events_branch_get_master_entry (_tmp16_);
-#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = _tmp17_;
-#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = _tmp19_;
-#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp20_);
-#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp20_);
-#line 1474 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1340 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1476 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1342 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 9712 "LibraryWindow.c"
+#line 8328 "LibraryWindow.c"
 	}
-#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp22_ = selectable;
-#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, EVENTS_TYPE_DIRECTORY_ENTRY)) {
-#line 9718 "LibraryWindow.c"
+#line 8334 "LibraryWindow.c"
 		EventsBranch* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
-#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = self->priv->events_branch;
-#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = sidebar_branch_get_show_branch (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = _tmp24_;
-#line 9727 "LibraryWindow.c"
+#line 8343 "LibraryWindow.c"
 	} else {
-#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp21_ = FALSE;
-#line 9731 "LibraryWindow.c"
+#line 8347 "LibraryWindow.c"
 	}
-#line 1480 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1346 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp21_) {
-#line 9735 "LibraryWindow.c"
+#line 8351 "LibraryWindow.c"
 		EventsBranch* _tmp25_ = NULL;
 		EventsMasterDirectoryEntry* _tmp26_ = NULL;
 		EventsMasterDirectoryEntry* _tmp27_ = NULL;
 		Page* _tmp28_ = NULL;
 		Page* _tmp29_ = NULL;
-#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp25_ = self->priv->events_branch;
-#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp26_ = events_branch_get_master_entry (_tmp25_);
-#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp27_ = _tmp26_;
-#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp28_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp29_ = _tmp28_;
-#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_switch_to_page (self, _tmp29_);
-#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp29_);
-#line 1481 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1347 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp27_);
-#line 1483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (last_import_entry);
-#line 1483 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1349 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 9761 "LibraryWindow.c"
+#line 8377 "LibraryWindow.c"
 	}
-#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp30_ = self->priv->library_branch;
-#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = library_branch_get_photos_entry (_tmp30_);
-#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = _tmp31_;
-#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = sidebar_page_representative_get_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, SidebarPageRepresentative));
-#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _tmp33_;
-#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_switch_to_page (self, _tmp34_);
-#line 1487 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1353 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp34_);
-#line 1459 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1325 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (last_import_entry);
-#line 9779 "LibraryWindow.c"
+#line 8395 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 1493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 9786 "LibraryWindow.c"
+#line 8402 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 1494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 9793 "LibraryWindow.c"
+#line 8409 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 1495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 9800 "LibraryWindow.c"
+#line 8416 "LibraryWindow.c"
 }
 
 
 static void _library_window_on_update_properties_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 1496 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_on_update_properties ((LibraryWindow*) self);
-#line 9807 "LibraryWindow.c"
+#line 8423 "LibraryWindow.c"
 }
 
 
@@ -9812,27 +8428,27 @@ static void library_window_subscribe_for_basic_information (LibraryWindow* self,
 	ViewCollection* view = NULL;
 	Page* _tmp0_ = NULL;
 	ViewCollection* _tmp1_ = NULL;
-#line 1490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (_tmp0_);
-#line 1491 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1357 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 1493 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1359 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (view, "items-state-changed", (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self, 0);
-#line 1494 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1360 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_window_on_update_properties_data_collection_items_altered, self, 0);
-#line 1495 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1361 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self, 0);
-#line 1496 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1362 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_connect_object (view, "items-visibility-changed", (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self, 0);
-#line 1490 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1356 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 9835 "LibraryWindow.c"
+#line 8451 "LibraryWindow.c"
 }
 
 
@@ -9844,47 +8460,47 @@ static void library_window_unsubscribe_from_basic_information (LibraryWindow* se
 	guint _tmp3_ = 0U;
 	guint _tmp4_ = 0U;
 	guint _tmp5_ = 0U;
-#line 1499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = page;
-#line 1500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = page_get_view (_tmp0_);
-#line 1500 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1366 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	view = _tmp1_;
-#line 1502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp2_, NULL, FALSE);
-#line 1502 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1368 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_state_changed, self);
-#line 1503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 1503 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1369 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_items_altered, self);
-#line 1504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
-#line 1504 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1370 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (view, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _library_window_on_update_properties_data_collection_contents_altered, self);
-#line 1505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE);
-#line 1505 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1371 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (view, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_update_properties_view_collection_items_visibility_changed, self);
-#line 1499 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1365 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_data_collection_unref0 (view);
-#line 9875 "LibraryWindow.c"
+#line 8491 "LibraryWindow.c"
 }
 
 
 static void library_window_on_update_properties (LibraryWindow* self) {
 	OneShotScheduler* _tmp0_ = NULL;
-#line 1508 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1374 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1509 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->properties_scheduler;
-#line 1509 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1375 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	one_shot_scheduler_at_idle (_tmp0_);
-#line 9887 "LibraryWindow.c"
+#line 8503 "LibraryWindow.c"
 }
 
 
@@ -9895,55 +8511,55 @@ static void library_window_on_update_properties_now (LibraryWindow* self) {
 	ExtendedPropertiesWindow* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-#line 1512 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1378 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->bottom_frame;
-#line 1513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = _tmp1_;
-#line 1513 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1379 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp2_) {
-#line 9908 "LibraryWindow.c"
+#line 8524 "LibraryWindow.c"
 		BasicProperties* _tmp3_ = NULL;
 		Page* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
-#line 1514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = self->priv->basic_properties;
-#line 1514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp4_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 1514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		properties_update_properties (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PROPERTIES, Properties), _tmp5_);
-#line 1514 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1380 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp5_);
-#line 9922 "LibraryWindow.c"
+#line 8538 "LibraryWindow.c"
 	}
-#line 1516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->extended_properties;
-#line 1516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 1516 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1382 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp8_) {
-#line 9932 "LibraryWindow.c"
+#line 8548 "LibraryWindow.c"
 		ExtendedPropertiesWindow* _tmp9_ = NULL;
 		Page* _tmp10_ = NULL;
 		Page* _tmp11_ = NULL;
-#line 1517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = self->priv->extended_properties;
-#line 1517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 1517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_;
-#line 1517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		extended_properties_window_update_properties (_tmp9_, _tmp11_);
-#line 1517 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1383 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp11_);
-#line 9946 "LibraryWindow.c"
+#line 8562 "LibraryWindow.c"
 	}
 }
 
@@ -9957,7 +8573,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 9960 "LibraryWindow.c"
+#line 8576 "LibraryWindow.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -9988,8 +8604,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 9991 "LibraryWindow.c"
-				goto __catch42_g_regex_error;
+#line 8607 "LibraryWindow.c"
+				goto __catch41_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9997,7 +8613,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 10000 "LibraryWindow.c"
+#line 8616 "LibraryWindow.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -10013,8 +8629,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 10016 "LibraryWindow.c"
-				goto __catch42_g_regex_error;
+#line 8632 "LibraryWindow.c"
+				goto __catch41_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -10024,7 +8640,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 10027 "LibraryWindow.c"
+#line 8643 "LibraryWindow.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -10038,10 +8654,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 10041 "LibraryWindow.c"
+#line 8657 "LibraryWindow.c"
 	}
-	goto __finally42;
-	__catch42_g_regex_error:
+	goto __finally41;
+	__catch41_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -10052,9 +8668,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 10055 "LibraryWindow.c"
+#line 8671 "LibraryWindow.c"
 	}
-	__finally42:
+	__finally41:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -10063,7 +8679,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 10066 "LibraryWindow.c"
+#line 8682 "LibraryWindow.c"
 	}
 }
 
@@ -10081,188 +8697,188 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 	gboolean _tmp13_ = FALSE;
 	gboolean _tmp18_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
-#line 1520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (uri != NULL);
-#line 1521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = uri;
-#line 1521 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_debug ("LibraryWindow.vala:1521: mount point reported: %s", _tmp0_);
-#line 1524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1387 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_debug ("LibraryWindow.vala:1387: mount point reported: %s", _tmp0_);
+#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = uri;
-#line 1524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = library_window_is_mount_uri_supported (_tmp1_);
-#line 1524 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1390 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (!_tmp2_) {
-#line 10098 "LibraryWindow.c"
+#line 8714 "LibraryWindow.c"
 		const gchar* _tmp3_ = NULL;
-#line 1525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp3_ = uri;
-#line 1525 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:1525: Unsupported mount scheme: %s", _tmp3_);
-#line 1527 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1391 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:1391: Unsupported mount scheme: %s", _tmp3_);
+#line 1393 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 10106 "LibraryWindow.c"
+#line 8722 "LibraryWindow.c"
 	}
-#line 1530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = uri;
-#line 1530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp5_ = g_file_new_for_uri (_tmp4_);
-#line 1530 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1396 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	uri_file = _tmp5_;
-#line 1533 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1399 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	mount = NULL;
-#line 10116 "LibraryWindow.c"
+#line 8732 "LibraryWindow.c"
 	{
 		GMount* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
 		GMount* _tmp8_ = NULL;
 		GMount* _tmp9_ = NULL;
-#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = uri_file;
-#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = g_file_find_enclosing_mount (_tmp7_, NULL, &_inner_error_);
-#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = _tmp8_;
-#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10130 "LibraryWindow.c"
-			goto __catch41_g_error;
+#line 8746 "LibraryWindow.c"
+			goto __catch40_g_error;
 		}
-#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp6_;
-#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = NULL;
-#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1401 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		mount = _tmp9_;
-#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp6_);
-#line 10143 "LibraryWindow.c"
+#line 8759 "LibraryWindow.c"
 	}
-	goto __finally41;
-	__catch41_g_error:
+	goto __finally40;
+	__catch40_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
-#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		err = _inner_error_;
-#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_inner_error_ = NULL;
-#line 1537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp10_ = err;
-#line 1537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp11_ = _tmp10_->message;
-#line 1537 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		g_debug ("LibraryWindow.vala:1537: %s", _tmp11_);
-#line 1539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1403 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+		g_debug ("LibraryWindow.vala:1403: %s", _tmp11_);
+#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_error_free0 (err);
-#line 1539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1539 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1405 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 10169 "LibraryWindow.c"
+#line 8785 "LibraryWindow.c"
 	}
-	__finally41:
-#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	__finally40:
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (mount);
-#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (uri_file);
-#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1400 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return;
-#line 10184 "LibraryWindow.c"
+#line 8800 "LibraryWindow.c"
 	}
-#line 1543 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1409 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	alt_uri = NULL;
-#line 1544 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = uri;
-#line 1544 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = g_str_has_prefix (_tmp12_, "file://");
-#line 1544 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1410 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp13_) {
-#line 10194 "LibraryWindow.c"
+#line 8810 "LibraryWindow.c"
 		const gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
-#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = uri;
-#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = string_replace (_tmp14_, "file://", "disk:");
-#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = _tmp15_;
-#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = camera_table_get_port_uri (_tmp16_);
-#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (alt_uri);
-#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		alt_uri = _tmp17_;
-#line 1545 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1411 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_free0 (_tmp16_);
-#line 10213 "LibraryWindow.c"
+#line 8829 "LibraryWindow.c"
 	}
-#line 1548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp18_ = at_startup;
-#line 1548 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp18_) {
-#line 10219 "LibraryWindow.c"
+#line 8835 "LibraryWindow.c"
 		const gchar* _tmp19_ = NULL;
 		gboolean _tmp20_ = FALSE;
 		const gchar* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
-#line 1549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = uri;
-#line 1549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp20_ = is_string_empty (_tmp19_);
-#line 1549 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1415 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp20_) {
-#line 10230 "LibraryWindow.c"
+#line 8846 "LibraryWindow.c"
 			GeeHashSet* _tmp21_ = NULL;
 			const gchar* _tmp22_ = NULL;
-#line 1550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = library_window_initial_camera_uris;
-#line 1550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = uri;
-#line 1550 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1416 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 10239 "LibraryWindow.c"
+#line 8855 "LibraryWindow.c"
 		}
-#line 1552 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp23_ = alt_uri;
-#line 1552 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp24_ = is_string_empty (_tmp23_);
-#line 1552 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1418 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (!_tmp24_) {
-#line 10247 "LibraryWindow.c"
+#line 8863 "LibraryWindow.c"
 			GeeHashSet* _tmp25_ = NULL;
 			const gchar* _tmp26_ = NULL;
-#line 1553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp25_ = library_window_initial_camera_uris;
-#line 1553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = alt_uri;
-#line 1553 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1419 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp26_);
-#line 10256 "LibraryWindow.c"
+#line 8872 "LibraryWindow.c"
 		}
 	}
-#line 1520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_free0 (alt_uri);
-#line 1520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (mount);
-#line 1520 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1386 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (uri_file);
-#line 10265 "LibraryWindow.c"
+#line 8881 "LibraryWindow.c"
 }
 
 
@@ -10279,97 +8895,97 @@ static gboolean library_window_real_key_press_event (GtkWidget* base, GdkEventKe
 	GdkEventKey* _tmp13_ = NULL;
 	guint _tmp14_ = 0U;
 	const gchar* _tmp15_ = NULL;
-#line 1557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 1557 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1423 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "has-focus", &_tmp3_, NULL);
-#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp4_) {
-#line 10294 "LibraryWindow.c"
+#line 8910 "LibraryWindow.c"
 		SidebarTree* _tmp5_ = NULL;
 		GdkEventKey* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
-#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp5_ = self->priv->sidebar_tree;
-#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp6_ = event;
-#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp7_ = sidebar_tree_is_keypress_interpreted (_tmp5_, _tmp6_);
-#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = _tmp7_;
-#line 10306 "LibraryWindow.c"
+#line 8922 "LibraryWindow.c"
 	} else {
-#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp1_ = FALSE;
-#line 10310 "LibraryWindow.c"
+#line 8926 "LibraryWindow.c"
 	}
-#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp1_) {
-#line 10314 "LibraryWindow.c"
+#line 8930 "LibraryWindow.c"
 		SidebarTree* _tmp8_ = NULL;
 		GdkEventKey* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
-#line 1559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp8_ = self->priv->sidebar_tree;
-#line 1559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = event;
-#line 1559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp9_, &_tmp10_);
-#line 1559 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1425 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = _tmp10_;
-#line 10326 "LibraryWindow.c"
+#line 8942 "LibraryWindow.c"
 	} else {
-#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp0_ = FALSE;
-#line 10330 "LibraryWindow.c"
+#line 8946 "LibraryWindow.c"
 	}
-#line 1558 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1424 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp0_) {
-#line 1560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1560 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1426 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 10338 "LibraryWindow.c"
+#line 8954 "LibraryWindow.c"
 	}
-#line 1563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp11_ = event;
-#line 1563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = GTK_WIDGET_CLASS (library_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_APP_WINDOW, AppWindow), gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 1563 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1429 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp12_) {
-#line 1564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1564 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1430 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 10350 "LibraryWindow.c"
+#line 8966 "LibraryWindow.c"
 	}
-#line 1566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp13_ = event;
-#line 1566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp14_ = _tmp13_->keyval;
-#line 1566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp15_ = gdk_keyval_name (_tmp14_);
-#line 1566 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1432 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (g_strcmp0 (_tmp15_, "Escape") == 0) {
-#line 1567 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1433 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_clear_search (self);
-#line 1568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		result = TRUE;
-#line 1568 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1434 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		return result;
-#line 10366 "LibraryWindow.c"
+#line 8982 "LibraryWindow.c"
 	}
-#line 1571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	result = FALSE;
-#line 1571 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 1437 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 10372 "LibraryWindow.c"
+#line 8988 "LibraryWindow.c"
 }
 
 
@@ -10385,14 +9001,14 @@ gint library_window_get_PAGE_MIN_WIDTH (void) {
 	result = _tmp1_ + (CHECKERBOARD_LAYOUT_COLUMN_GUTTER_PADDING * 2);
 #line 12 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return result;
-#line 10388 "LibraryWindow.c"
+#line 9004 "LibraryWindow.c"
 }
 
 
 static gpointer _data_collection_ref0 (gpointer self) {
 #line 78 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 10395 "LibraryWindow.c"
+#line 9011 "LibraryWindow.c"
 }
 
 
@@ -10438,14 +9054,14 @@ static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_co
 	self->priv->view = _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return self;
-#line 10441 "LibraryWindow.c"
+#line 9057 "LibraryWindow.c"
 }
 
 
 static LibraryWindowFullscreenPhotoPage* library_window_fullscreen_photo_page_new (CollectionPage* collection, Photo* start, ViewCollection* view) {
 #line 75 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	return library_window_fullscreen_photo_page_construct (LIBRARY_WINDOW_TYPE_FULLSCREEN_PHOTO_PAGE, collection, start, view);
-#line 10448 "LibraryWindow.c"
+#line 9064 "LibraryWindow.c"
 }
 
 
@@ -10466,7 +9082,7 @@ static void library_window_fullscreen_photo_page_real_switched_to (Page* base) {
 	library_photo_page_display_for_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), _tmp0_, _tmp1_, _tmp2_);
 #line 84 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	PAGE_CLASS (library_window_fullscreen_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage), TYPE_PAGE, Page));
-#line 10469 "LibraryWindow.c"
+#line 9085 "LibraryWindow.c"
 }
 
 
@@ -10481,7 +9097,7 @@ static void library_window_fullscreen_photo_page_real_init_collect_ui_filenames
 	_tmp0_ = ui_filenames;
 #line 90 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
-#line 10484 "LibraryWindow.c"
+#line 9100 "LibraryWindow.c"
 }
 
 
@@ -10496,14 +9112,14 @@ static void library_window_fullscreen_photo_page_class_init (LibraryWindowFullsc
 	((PageClass *) klass)->init_collect_ui_filenames = library_window_fullscreen_photo_page_real_init_collect_ui_filenames;
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_fullscreen_photo_page_finalize;
-#line 10499 "LibraryWindow.c"
+#line 9115 "LibraryWindow.c"
 }
 
 
 static void library_window_fullscreen_photo_page_instance_init (LibraryWindowFullscreenPhotoPage * self) {
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv = LIBRARY_WINDOW_FULLSCREEN_PHOTO_PAGE_GET_PRIVATE (self);
-#line 10506 "LibraryWindow.c"
+#line 9122 "LibraryWindow.c"
 }
 
 
@@ -10519,7 +9135,7 @@ static void library_window_fullscreen_photo_page_finalize (GObject* obj) {
 	_data_collection_unref0 (self->priv->view);
 #line 70 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_fullscreen_photo_page_parent_class)->finalize (obj);
-#line 10522 "LibraryWindow.c"
+#line 9138 "LibraryWindow.c"
 }
 
 
@@ -10542,9 +9158,7 @@ static void library_window_class_init (LibraryWindowClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_type_class_add_private (klass, sizeof (LibraryWindowPrivate));
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->create_common_action_groups = library_window_real_create_common_action_groups;
-#line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	((AppWindowClass *) klass)->replace_common_placeholders = library_window_real_replace_common_placeholders;
+	((AppWindowClass *) klass)->add_actions = library_window_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	((PageWindowClass *) klass)->switched_pages = library_window_real_switched_pages;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -10571,11 +9185,11 @@ static void library_window_class_init (LibraryWindowClass * klass) {
 	G_OBJECT_CLASS (klass)->get_property = _vala_library_window_get_property;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_window_finalize;
-#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 119 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_initial_camera_uris = _tmp0_;
-#line 10578 "LibraryWindow.c"
+#line 9192 "LibraryWindow.c"
 }
 
 
@@ -10585,21 +9199,20 @@ static void library_window_instance_init (LibraryWindow * self) {
 	GtkPaned* _tmp2_ = NULL;
 	GtkPaned* _tmp3_ = NULL;
 	GtkFrame* _tmp4_ = NULL;
-	GtkActionGroup* _tmp5_ = NULL;
-	LibraryBranch* _tmp6_ = NULL;
-	TagsBranch* _tmp7_ = NULL;
-	FoldersBranch* _tmp8_ = NULL;
-	EventsBranch* _tmp9_ = NULL;
-	CameraBranch* _tmp10_ = NULL;
-	SearchesBranch* _tmp11_ = NULL;
-	GeeHashMap* _tmp12_ = NULL;
-	SearchFilterActions* _tmp13_ = NULL;
-	GtkBox* _tmp14_ = NULL;
-	GtkFrame* _tmp15_ = NULL;
-	GtkProgressBar* _tmp16_ = NULL;
-	BasicProperties* _tmp17_ = NULL;
-	GtkStack* _tmp18_ = NULL;
-	GtkBox* _tmp19_ = NULL;
+	LibraryBranch* _tmp5_ = NULL;
+	TagsBranch* _tmp6_ = NULL;
+	FoldersBranch* _tmp7_ = NULL;
+	EventsBranch* _tmp8_ = NULL;
+	CameraBranch* _tmp9_ = NULL;
+	SearchesBranch* _tmp10_ = NULL;
+	GeeHashMap* _tmp11_ = NULL;
+	SearchFilterActions* _tmp12_ = NULL;
+	GtkBox* _tmp13_ = NULL;
+	GtkFrame* _tmp14_ = NULL;
+	GtkProgressBar* _tmp15_ = NULL;
+	BasicProperties* _tmp16_ = NULL;
+	GtkStack* _tmp17_ = NULL;
+	GtkBox* _tmp18_ = NULL;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv = LIBRARY_WINDOW_GET_PRIVATE (self);
 #line 95 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -10627,94 +9240,90 @@ static void library_window_instance_init (LibraryWindow * self) {
 #line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->bottom_frame = _tmp4_;
 #line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp5_ = gtk_action_group_new ("LibraryWindowGlobalActionGroup");
-#line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->common_action_group = _tmp5_;
-#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->properties_scheduler = NULL;
-#line 104 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->notify_library_is_home_dir = TRUE;
+#line 106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp5_ = library_branch_new ();
+#line 106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->library_branch = _tmp5_;
+#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp6_ = tags_branch_new ();
+#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->tags_branch = _tmp6_;
 #line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp6_ = library_branch_new ();
+	_tmp7_ = folders_branch_new ();
 #line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->library_branch = _tmp6_;
+	self->priv->folders_branch = _tmp7_;
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = tags_branch_new ();
+	_tmp8_ = events_branch_new ();
 #line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->tags_branch = _tmp7_;
+	self->priv->events_branch = _tmp8_;
 #line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = folders_branch_new ();
+	_tmp9_ = camera_branch_new ();
 #line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->folders_branch = _tmp8_;
+	self->priv->camera_branch = _tmp9_;
 #line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp9_ = events_branch_new ();
+	_tmp10_ = searches_branch_new ();
 #line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->events_branch = _tmp9_;
-#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp10_ = camera_branch_new ();
+	self->priv->saved_search_branch = _tmp10_;
 #line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->camera_branch = _tmp10_;
-#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp11_ = searches_branch_new ();
-#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->saved_search_branch = _tmp11_;
-#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->page_switching_enabled = TRUE;
+#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp11_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->page_map = _tmp11_;
 #line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp12_ = gee_hash_map_new (TYPE_PAGE, (GBoxedCopyFunc) g_object_ref, g_object_unref, SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->page_map = _tmp12_;
-#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->photo_page = NULL;
-#line 123 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 121 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->is_search_toolbar_visible = FALSE;
-#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp13_ = search_filter_actions_new ();
-#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->search_actions = _tmp13_;
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp14_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp12_ = search_filter_actions_new ();
+#line 126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->search_actions = _tmp12_;
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	g_object_ref_sink (_tmp13_);
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->top_section = _tmp13_;
+#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp14_ = (GtkFrame*) gtk_frame_new (NULL);
+#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp14_);
+#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->background_progress_frame = _tmp14_;
+#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp15_ = (GtkProgressBar*) gtk_progress_bar_new ();
 #line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->top_section = _tmp14_;
-#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp15_ = (GtkFrame*) gtk_frame_new (NULL);
-#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp15_);
+#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->background_progress_bar = _tmp15_;
 #line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->background_progress_frame = _tmp15_;
-#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp16_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->background_progress_displayed = FALSE;
+#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp16_ = basic_properties_new ();
+#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp16_);
-#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->background_progress_bar = _tmp16_;
 #line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->background_progress_displayed = FALSE;
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp17_ = basic_properties_new ();
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->basic_properties = _tmp16_;
+#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp17_ = (GtkStack*) gtk_stack_new ();
+#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp17_);
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->basic_properties = _tmp17_;
-#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp18_ = (GtkStack*) gtk_stack_new ();
-#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->stack = _tmp17_;
+#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_object_ref_sink (_tmp18_);
-#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->stack = _tmp18_;
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp19_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	g_object_ref_sink (_tmp19_);
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	self->priv->layout = _tmp19_;
-#line 143 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+	self->priv->layout = _tmp18_;
+#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->current_progress_priority = 0;
-#line 144 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 142 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self->priv->background_progress_pulse_id = (guint) 0;
-#line 10717 "LibraryWindow.c"
+#line 9326 "LibraryWindow.c"
 }
 
 
@@ -10754,51 +9363,51 @@ static void library_window_finalize (GObject* obj) {
 	guint _tmp45_ = 0U;
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp0_ = self->priv->sidebar_tree;
-#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("page-created", SIDEBAR_TYPE_TREE, &_tmp1_, NULL, FALSE);
-#line 231 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 215 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_window_on_page_created_sidebar_tree_page_created, self);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp2_ = self->priv->sidebar_tree;
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_TREE, &_tmp3_, NULL, FALSE);
-#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 216 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_window_on_destroying_page_sidebar_tree_destroying_page, self);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp4_ = self->priv->sidebar_tree;
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("entry-selected", SIDEBAR_TYPE_TREE, &_tmp5_, NULL, FALSE);
-#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 217 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _library_window_on_sidebar_entry_selected_sidebar_tree_entry_selected, self);
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp6_ = self->priv->sidebar_tree;
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("selected-entry-removed", SIDEBAR_TYPE_TREE, &_tmp7_, NULL, FALSE);
-#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 218 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _library_window_on_sidebar_selected_entry_removed_sidebar_tree_selected_entry_removed, self);
-#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp8_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_unsubscribe_from_basic_information (self, _tmp9_);
-#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 220 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp9_);
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp10_ = self->priv->extended_properties;
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("hide", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 238 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 222 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _library_window_hide_extended_properties_gtk_widget_hide, self);
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp12_ = self->priv->extended_properties;
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("show", gtk_widget_get_type (), &_tmp13_, NULL, FALSE);
-#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 223 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _library_window_show_extended_properties_gtk_widget_show, self);
-#line 10801 "LibraryWindow.c"
+#line 9410 "LibraryWindow.c"
 	{
 		GeeIterator* _media_sources_it = NULL;
 		MediaCollectionRegistry* _tmp14_ = NULL;
@@ -10807,27 +9416,27 @@ static void library_window_finalize (GObject* obj) {
 		GeeCollection* _tmp17_ = NULL;
 		GeeIterator* _tmp18_ = NULL;
 		GeeIterator* _tmp19_ = NULL;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp14_ = media_collection_registry_get_instance ();
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp15_ = _tmp14_;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp16_ = media_collection_registry_get_all (_tmp15_);
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp19_ = _tmp18_;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_collection_registry_unref0 (_tmp15_);
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_media_sources_it = _tmp19_;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		while (TRUE) {
-#line 10830 "LibraryWindow.c"
+#line 9439 "LibraryWindow.c"
 			GeeIterator* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			MediaSourceCollection* media_sources = NULL;
@@ -10837,105 +9446,105 @@ static void library_window_finalize (GObject* obj) {
 			guint _tmp25_ = 0U;
 			MediaSourceCollection* _tmp26_ = NULL;
 			guint _tmp27_ = 0U;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp20_ = _media_sources_it;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			if (!_tmp21_) {
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 				break;
-#line 10848 "LibraryWindow.c"
+#line 9457 "LibraryWindow.c"
 			}
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp22_ = _media_sources_it;
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			media_sources = (MediaSourceCollection*) _tmp23_;
-#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp24_ = media_sources;
-#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_parse_name ("trashcan-contents-altered", TYPE_MEDIA_SOURCE_COLLECTION, &_tmp25_, NULL, FALSE);
-#line 242 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 226 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _library_window_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered, self);
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_tmp26_ = media_sources;
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp27_, NULL, FALSE);
-#line 243 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 227 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp27_, 0, NULL, (GCallback) _library_window_on_media_altered_data_collection_items_altered, self);
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_data_collection_unref0 (media_sources);
-#line 10870 "LibraryWindow.c"
+#line 9479 "LibraryWindow.c"
 		}
-#line 241 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 225 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (_media_sources_it);
-#line 10874 "LibraryWindow.c"
+#line 9483 "LibraryWindow.c"
 	}
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp28_ = metadata_writer_get_instance ();
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp29_ = _tmp28_;
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("progress", TYPE_METADATA_WRITER, &_tmp30_, NULL, FALSE);
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _library_window_on_metadata_writer_progress_metadata_writer_progress, self);
-#line 246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 230 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (_tmp29_);
-#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp31_ = library_monitor_pool_get_instance ();
-#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp32_ = _tmp31_;
-#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp33_ = library_monitor_pool_get_monitor (_tmp32_);
-#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp34_ = _tmp33_;
-#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp32_);
-#line 248 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 232 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	monitor = _tmp34_;
-#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp35_ = monitor;
-#line 249 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 233 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (_tmp35_ != NULL) {
-#line 10902 "LibraryWindow.c"
+#line 9511 "LibraryWindow.c"
 		LibraryMonitor* _tmp36_ = NULL;
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp36_ = monitor;
-#line 250 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 234 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		library_window_on_library_monitor_destroyed (self, _tmp36_);
-#line 10908 "LibraryWindow.c"
+#line 9517 "LibraryWindow.c"
 	}
-#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp37_ = library_monitor_pool_get_instance ();
-#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp38_ = _tmp37_;
-#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("monitor-installed", TYPE_LIBRARY_MONITOR_POOL, &_tmp39_, NULL, FALSE);
-#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _library_window_on_library_monitor_installed_library_monitor_pool_monitor_installed, self);
-#line 252 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 236 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp38_);
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp40_ = library_monitor_pool_get_instance ();
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp41_ = _tmp40_;
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("monitor-destroyed", TYPE_LIBRARY_MONITOR_POOL, &_tmp42_, NULL, FALSE);
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp41_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp42_, 0, NULL, (GCallback) _library_window_on_library_monitor_destroyed_library_monitor_pool_monitor_destroyed, self);
-#line 253 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 237 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_library_monitor_pool_unref0 (_tmp41_);
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp43_ = camera_table_get_instance ();
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp44_ = _tmp43_;
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_parse_name ("camera-added", TYPE_CAMERA_TABLE, &_tmp45_, NULL, FALSE);
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_signal_handlers_disconnect_matched (_tmp44_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp45_, 0, NULL, (GCallback) _library_window_on_camera_added_camera_table_camera_added, self);
-#line 255 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 239 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_camera_table_unref0 (_tmp44_);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (monitor);
@@ -10948,50 +9557,48 @@ static void library_window_finalize (GObject* obj) {
 #line 99 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->bottom_frame);
 #line 101 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_g_object_unref0 (self->priv->common_action_group);
-#line 103 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_one_shot_scheduler_unref0 (self->priv->properties_scheduler);
-#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->sidebar_tree);
-#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->library_branch);
-#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 107 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->tags_branch);
-#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 108 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->folders_branch);
-#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->events_branch);
-#line 112 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->camera_branch);
-#line 113 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->saved_search_branch);
-#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 114 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->page_map);
-#line 118 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 116 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->photo_page);
-#line 128 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 126 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_search_filter_actions_unref0 (self->priv->search_actions);
-#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 127 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->search_toolbar);
-#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 129 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->top_section);
-#line 132 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 130 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->background_progress_frame);
-#line 133 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 131 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->background_progress_bar);
-#line 136 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 134 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->basic_properties);
-#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 135 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->extended_properties);
-#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 137 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->stack);
-#line 140 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 138 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 141 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
+#line 139 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_g_object_unref0 (self->priv->right_vbox);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	G_OBJECT_CLASS (library_window_parent_class)->finalize (obj);
-#line 10994 "LibraryWindow.c"
+#line 9601 "LibraryWindow.c"
 }
 
 
@@ -11012,13 +9619,13 @@ static void _vala_library_window_get_property (GObject * object, guint property_
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_LIBRARY_WINDOW, LibraryWindow);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	switch (property_id) {
-#line 11015 "LibraryWindow.c"
+#line 9622 "LibraryWindow.c"
 		default:
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 7 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		break;
-#line 11021 "LibraryWindow.c"
+#line 9628 "LibraryWindow.c"
 	}
 }
 
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index b464f11..2a34462 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -13,8 +13,8 @@ public class LibraryWindow : AppWindow {
         }
     }
     
-    public const int SORT_EVENTS_ORDER_ASCENDING = 0;
-    public const int SORT_EVENTS_ORDER_DESCENDING = 1;
+    public const string SORT_EVENTS_ORDER_ASCENDING = "ascending";
+    public const string SORT_EVENTS_ORDER_DESCENDING = "descending";
     
     private const string[] SUPPORTED_MOUNT_SCHEMES = {
         "gphoto2:",
@@ -98,8 +98,6 @@ public class LibraryWindow : AppWindow {
     private Gtk.Paned client_paned = new Gtk.Paned(Gtk.Orientation.HORIZONTAL);
     private Gtk.Frame bottom_frame = new Gtk.Frame(null);
     
-    private Gtk.ActionGroup common_action_group = new Gtk.ActionGroup("LibraryWindowGlobalActionGroup");
-    
     private OneShotScheduler properties_scheduler = null;
     private bool notify_library_is_home_dir = true;
     
@@ -175,21 +173,7 @@ public class LibraryWindow : AppWindow {
         
         // setup search bar and add its accelerators to the window
         search_toolbar = new SearchFilterToolbar(search_actions);
-        
-        try {
-            File ui_file = Resources.get_ui("top.ui");
-            ui.add_ui_from_file(ui_file.get_path());
-        } catch (Error e) {
-            error(e.message);
-        }
-        
-        Gtk.MenuBar? menubar = ui.get_widget("/MenuBar") as Gtk.MenuBar;
-        layout.add(menubar);
-        
-        // We never want to invoke show_all() on the menubar since that will show empty menus,
-        // which should be hidden.
-        menubar.no_show_all = true;
-        
+
         // create the main layout & start at the Library page
         create_layout(library_branch.photos_entry.get_page());
         
@@ -276,227 +260,87 @@ public class LibraryWindow : AppWindow {
         monitor.auto_import_preparing.disconnect(on_library_monitor_auto_import_preparing);
         monitor.auto_import_progress.disconnect(on_library_monitor_auto_import_progress);
     }
-    
-    private Gtk.ActionEntry[] create_common_actions() {
-        Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
-        
-        Gtk.ActionEntry import = { "CommonFileImport", Resources.IMPORT,
-            TRANSLATABLE, "<Ctrl>I", TRANSLATABLE, on_file_import };
-        import.label = _("_Import From Folder…");
-        import.tooltip = _("Import photos from disk to library");
-        actions += import;
-        
-        Gtk.ActionEntry import_from_external = {
-            "ExternalLibraryImport", Resources.IMPORT, TRANSLATABLE,
-            null, TRANSLATABLE, on_external_library_import
-        };
-        import_from_external.label = _("Import From _Application…");
-        actions += import_from_external;
-
-        Gtk.ActionEntry sort = { "CommonSortEvents", null, TRANSLATABLE, null, null, null };
-        sort.label = _("Sort _Events");
-        actions += sort;
-
-        Gtk.ActionEntry preferences = { "CommonPreferences", Resources.PREFERENCES_LABEL, TRANSLATABLE,
-            null, TRANSLATABLE, on_preferences };
-        preferences.label = Resources.PREFERENCES_MENU;
-        actions += preferences;
-        
-        Gtk.ActionEntry empty = { "CommonEmptyTrash", null, TRANSLATABLE, null, null,
-            on_empty_trash };
-        empty.label = _("Empty T_rash");
-        empty.tooltip = _("Delete all photos in the trash");
-        actions += empty;
-        
-        Gtk.ActionEntry jump_to_event = { "CommonJumpToEvent", null, TRANSLATABLE, null,
-            TRANSLATABLE, on_jump_to_event };
-        jump_to_event.label = _("View Eve_nt for Photo");
-        actions += jump_to_event;
-        
-        Gtk.ActionEntry find = { "CommonFind", null, TRANSLATABLE, null, null, on_find };
-        find.label = _("_Find");
-        find.tooltip = _("Find photos and videos by search criteria");
-        actions += find;
-        
-        // add the common action for the FilterPhotos submenu (the submenu contains items from
-        // SearchFilterActions)
-        Gtk.ActionEntry filter_photos = { "CommonFilterPhotos", null, TRANSLATABLE, null, null, null };
-        filter_photos.label = Resources.FILTER_PHOTOS_MENU;
-        actions += filter_photos;
-        
-        Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, "<Ctrl>S", null, 
-            on_new_search };
-        new_search.label =  _("Ne_w Saved Search…");
-        actions += new_search;
 
-        // top-level menus
-        
-        Gtk.ActionEntry file = { "FileMenu", null, TRANSLATABLE, null, null, null };
-        file.label = _("_File");
-        actions += file;
-
-        Gtk.ActionEntry edit = { "EditMenu", null, TRANSLATABLE, null, null, null };
-        edit.label = _("_Edit");
-        actions += edit;
-
-        Gtk.ActionEntry view = { "ViewMenu", null, TRANSLATABLE, null, null, null };
-        view.label = _("_View");
-        actions += view;
-
-        Gtk.ActionEntry photo = { "PhotoMenu", null, TRANSLATABLE, null, null, null };
-        photo.label = _("_Photo");
-        actions += photo;
-
-        Gtk.ActionEntry photos = { "PhotosMenu", null, TRANSLATABLE, null, null, null };
-        photos.label = _("_Photos");
-        actions += photos;
-
-        Gtk.ActionEntry event = { "EventsMenu", null, TRANSLATABLE, null, null, null };
-        event.label = _("Even_ts");
-        actions += event;
-
-        Gtk.ActionEntry tags = { "TagsMenu", null, TRANSLATABLE, null, null, null };
-        tags.label = _("Ta_gs");
-        actions += tags;
-
-        Gtk.ActionEntry help = { "HelpMenu", null, TRANSLATABLE, null, null, null };
-        help.label = _("_Help");
-        actions += help;
-
-        return actions;
-    }
-    
-    private Gtk.ToggleActionEntry[] create_common_toggle_actions() {
-        Gtk.ToggleActionEntry[] actions = new Gtk.ToggleActionEntry[0];
-        
-        Gtk.ToggleActionEntry basic_props = { "CommonDisplayBasicProperties", null,
-            TRANSLATABLE, "<Ctrl><Shift>I", TRANSLATABLE, on_display_basic_properties, false };
-        basic_props.label = _("_Basic Information");
-        basic_props.tooltip = _("Display basic information for the selection");
-        actions += basic_props;
-
-        Gtk.ToggleActionEntry extended_props = { "CommonDisplayExtendedProperties", null,
-            TRANSLATABLE, "<Ctrl><Shift>X", TRANSLATABLE, on_display_extended_properties, false };
-        extended_props.label = _("E_xtended Information");
-        extended_props.tooltip = _("Display extended information for the selection");
-        actions += extended_props;
-        
-        Gtk.ToggleActionEntry searchbar = { "CommonDisplaySearchbar", "edit-find", TRANSLATABLE,
-            "F8", TRANSLATABLE, on_display_searchbar, is_search_toolbar_visible };
-        searchbar.label = _("_Search Bar");
-        searchbar.tooltip = _("Display the search bar");
-        actions += searchbar;
-        
-        Gtk.ToggleActionEntry sidebar = { "CommonDisplaySidebar", null, TRANSLATABLE,
-            "F9", TRANSLATABLE, on_display_sidebar, is_sidebar_visible() };
-        sidebar.label = _("S_idebar");
-        sidebar.tooltip = _("Display the sidebar");
-        actions += sidebar;
-
-        Gtk.ToggleActionEntry toolbar = { "CommonDisplayToolbar", null, TRANSLATABLE,
-            "<Ctrl>F9", TRANSLATABLE, on_display_toolbar, is_toolbar_visible() };
-        toolbar.label = _("T_oolbar");
-        toolbar.tooltip = _("Display the tool bar");
-        actions += toolbar;
-
-        return actions;
-    }
-    
-    private void add_common_radio_actions(Gtk.ActionGroup group) {
-        Gtk.RadioActionEntry[] actions = new Gtk.RadioActionEntry[0];
-        
-        Gtk.RadioActionEntry ascending = { "CommonSortEventsAscending",
-            Resources.SORT_ASCENDING_LABEL, TRANSLATABLE, null, TRANSLATABLE,
-            SORT_EVENTS_ORDER_ASCENDING };
-        ascending.label = _("_Ascending");
-        ascending.tooltip = _("Sort photos in an ascending order");
-        actions += ascending;
+    private const GLib.ActionEntry[] common_actions = {
+        // Normal actions
+        { "CommonFileImport", on_file_import },
+        { "ExternalLibraryImport", on_external_library_import },
+        { "CommonPreferences", on_preferences },
+        { "CommonEmptyTrash", on_empty_trash },
+        { "CommonJumpToEvent", on_jump_to_event },
+        { "CommonFind", on_find },
+        { "CommonNewSearch", on_new_search },
 
-        Gtk.RadioActionEntry descending = { "CommonSortEventsDescending",
-            Resources.SORT_DESCENDING_LABEL, TRANSLATABLE, null, TRANSLATABLE,
-            SORT_EVENTS_ORDER_DESCENDING };
-        descending.label = _("D_escending");
-        descending.tooltip = _("Sort photos in a descending order");
-        actions += descending;
-        
-        group.add_radio_actions(actions, SORT_EVENTS_ORDER_ASCENDING, on_events_sort_changed);
-    }
-    
-    protected override Gtk.ActionGroup[] create_common_action_groups() {
-        Gtk.ActionGroup[] groups = base.create_common_action_groups();
-        
-        common_action_group.add_actions(create_common_actions(), this);
-        common_action_group.add_toggle_actions(create_common_toggle_actions(), this);
-        add_common_radio_actions(common_action_group);
-        
-        Gtk.Action? action = common_action_group.get_action("CommonDisplaySearchbar");
-        if (action != null) {
-            action.short_label = Resources.FIND_LABEL;
-            action.is_important = true;
-        }
-        
-        groups += common_action_group;
-        groups += search_actions.get_action_group();
-        
-        return groups;
-    }
-    
-    public override void replace_common_placeholders(Gtk.UIManager ui) {
-        base.replace_common_placeholders(ui);
+        // Toogle actions
+        { "CommonDisplayBasicProperties", on_action_toggle, null, "false", on_display_basic_properties },
+        { "CommonDisplayExtendedProperties", on_action_toggle, null, "false", on_display_extended_properties },
+
+#if 0
+        { "CommonDisplaySearchbar", on_display_searchbar, null, is_search_toolbar_visible.to_string () },
+        { "CommonDisplaySidebar", on_display_sidebar, null, is_sidebar_visible ().to_string () },
+        { "CommonDisplayToolbar", on_display_toolbar, null, is_toolbar_visible ().to_string () }
+#endif
+        { "CommonDisplaySearchbar", on_action_toggle, null, "false", on_display_searchbar },
+        { "CommonDisplaySidebar", on_action_toggle, null, "true", on_display_sidebar },
+        { "CommonDisplayToolbar", on_action_toggle, null, "true", on_display_toolbar },
+
+        { "CommonSortEvents", on_action_radio, "s", "'ascending'", on_events_sort_changed }
+    };
+
+    protected override void add_actions () {
+        base.add_actions ();
+        this.add_action_entries (common_actions, this);
+        this.add_action_entries (search_actions.get_actions (), search_actions);
     }
-    
+
     protected override void switched_pages(Page? old_page, Page? new_page) {
         base.switched_pages(old_page, new_page);
-        
+
         // monitor when the ViewFilter is changed in any page
         if (old_page != null) {
             old_page.get_view().view_filter_installed.disconnect(on_view_filter_installed);
             old_page.get_view().view_filter_removed.disconnect(on_view_filter_removed);
         }
-        
+
         if (new_page != null) {
             new_page.get_view().view_filter_installed.connect(on_view_filter_installed);
             new_page.get_view().view_filter_removed.connect(on_view_filter_removed);
         }
-        
+
         search_actions.monitor_page_contents(old_page, new_page);
     }
-    
+
     private void on_view_filter_installed(ViewFilter filter) {
         filter.refresh.connect(on_view_filter_refreshed);
     }
-    
+
     private void on_view_filter_removed(ViewFilter filter) {
         filter.refresh.disconnect(on_view_filter_refreshed);
     }
-    
+
     private void on_view_filter_refreshed() {
         // if view filter is reset to show all items, do nothing (leave searchbar in current
         // state)
         if (!get_current_page().get_view().are_items_filtered_out())
             return;
-        
+
         // always show the searchbar when items are filtered
-        Gtk.ToggleAction? display_searchbar = get_common_action("CommonDisplaySearchbar")
-            as Gtk.ToggleAction;
-        if (display_searchbar != null)
-            display_searchbar.active = true;
+        var action = this.lookup_action ("CommonDisplaySearchbar");
+
+        if (action != null)
+            action.change_state (true);
     }
-    
+
     // show_all() may make visible certain items we wish to keep programmatically hidden
     public override void show_all() {
         base.show_all();
-        
-        Gtk.ToggleAction? basic_properties_action = get_current_page().get_common_action(
-            "CommonDisplayBasicProperties") as Gtk.ToggleAction;
+
+        var basic_properties_action = get_current_page ().get_common_action
+            ("CommonDisplayBasicProperties");
         assert(basic_properties_action != null);
-        
-        if (!basic_properties_action.get_active())
+
+        if (!basic_properties_action.get_state().get_boolean())
             bottom_frame.hide();
-        
-        Gtk.ToggleAction? searchbar_action = get_current_page().get_common_action(
-            "CommonDisplaySearchbar") as Gtk.ToggleAction;
-        assert(searchbar_action != null);
 
         // Make sure rejected pictures are not being displayed on startup
         CheckerboardPage? current_page = get_current_page() as CheckerboardPage;
@@ -504,27 +348,27 @@ public class LibraryWindow : AppWindow {
             init_view_filter(current_page);
 
         toggle_search_bar(should_show_search_bar(), current_page);
-        
+
         // Sidebar
         set_sidebar_visible(is_sidebar_visible());
     }
-    
+
     public static LibraryWindow get_app() {
         assert(instance is LibraryWindow);
-        
+
         return (LibraryWindow) instance;
     }
-    
+
     // This may be called before Debug.init(), so no error logging may be made
     public static bool is_mount_uri_supported(string uri) {
         foreach (string scheme in SUPPORTED_MOUNT_SCHEMES) {
             if (uri.has_prefix(scheme))
                 return true;
         }
-        
+
         return false;
     }
-    
+
     public override string get_app_role() {
         return Resources.APP_LIBRARY_ROLE;
     }
@@ -536,7 +380,7 @@ public class LibraryWindow : AppWindow {
         else
             debug("No tag entry found for rename");
     }
-    
+
     public void rename_event_in_sidebar(Event event) {
         Events.EventEntry? entry = events_branch.get_entry_for_event(event);
         if (entry != null)
@@ -544,7 +388,7 @@ public class LibraryWindow : AppWindow {
         else
             debug("No event entry found for rename");
     }
-    
+
     public void rename_search_in_sidebar(SavedSearch search) {
         Searches.SidebarEntry? entry = saved_search_branch.get_entry_for_saved_search(search);
         if (entry != null)
@@ -552,28 +396,28 @@ public class LibraryWindow : AppWindow {
         else
             debug("No search entry found for rename");
     }
-    
+
     protected override void on_quit() {
         Config.Facade.get_instance().set_library_window_state(maximized, dimensions);
 
         Config.Facade.get_instance().set_sidebar_position(client_paned.position);
-        
+
         base.on_quit();
     }
-    
+
     private Photo? get_start_fullscreen_photo(CollectionPage page) {
         ViewCollection view = page.get_view();
-        
+
         // if a selection is present, use the first selected LibraryPhoto, otherwise do
         // nothing; if no selection present, use the first LibraryPhoto
         Gee.List<DataSource>? sources = (view.get_selected_count() > 0)
             ? view.get_selected_sources_of_type(typeof(LibraryPhoto))
             : view.get_sources_of_type(typeof(LibraryPhoto));
-        
+
         return (sources != null && sources.size != 0)
             ? (Photo) sources[0] : null;
     }
-    
+
     private bool get_fullscreen_photo(Page page, out CollectionPage collection, out Photo start,
         out ViewCollection? view_collection = null) {
         collection = null;
@@ -586,7 +430,7 @@ public class LibraryWindow : AppWindow {
             Photo? photo = get_start_fullscreen_photo(collection);
             if (photo == null)
                 return false;
-            
+
             start = photo;
             view_collection = null;
             
@@ -601,11 +445,11 @@ public class LibraryWindow : AppWindow {
             Event? event = (Event?) ((DataView) view.get_at(0)).get_source();
             if (event == null)
                 return false;
-            
+
             Events.EventEntry? entry = events_branch.get_entry_for_event(event);
             if (entry == null)
                 return false;
-            
+
             collection = (EventPage) entry.get_page();
             Photo? photo = get_start_fullscreen_photo(collection);
             if (photo == null)
@@ -616,7 +460,7 @@ public class LibraryWindow : AppWindow {
             
             return true;
         }
-        
+
         if (page is LibraryPhotoPage) {
             LibraryPhotoPage photo_page = (LibraryPhotoPage) page;
             
@@ -626,11 +470,11 @@ public class LibraryWindow : AppWindow {
             
             if (!photo_page.has_photo())
                 return false;
-            
+
             collection = controller;
             start = photo_page.get_photo();
             view_collection = photo_page.get_view();
-            
+
             return true;
         }
         
@@ -652,7 +496,7 @@ public class LibraryWindow : AppWindow {
 
         go_fullscreen(fs_photo);
     }
-    
+
     private void on_file_import() {
         Gtk.FileChooserDialog import_dialog = new Gtk.FileChooserDialog(_("Import From Folder"), null,
             Gtk.FileChooserAction.SELECT_FOLDER, Resources.CANCEL_LABEL, Gtk.ResponseType.CANCEL, 
@@ -670,7 +514,7 @@ public class LibraryWindow : AppWindow {
                     ? Gtk.ResponseType.REJECT : copy_files_dialog();
             
             if (copy_files_response != Gtk.ResponseType.CANCEL) {
-                dispatch_import_jobs(import_dialog.get_uris(), "folders", 
+                dispatch_import_jobs(import_dialog.get_uris(), "folders",
                     copy_files_response == Gtk.ResponseType.ACCEPT);
             }
         }
@@ -689,7 +533,7 @@ public class LibraryWindow : AppWindow {
         base.update_common_action_availability(old_page, new_page);
         
         bool is_checkerboard = new_page is CheckerboardPage;
-        
+
         set_common_action_sensitive("CommonDisplaySearchbar", is_checkerboard);
         set_common_action_sensitive("CommonFind", is_checkerboard);
     }
@@ -717,7 +561,7 @@ public class LibraryWindow : AppWindow {
     private bool can_empty_trash() {
         return (LibraryPhoto.global.get_trashcan_count() > 0) || (Video.global.get_trashcan_count() > 0);
     }
-    
+
     private void on_empty_trash() {
         Gee.ArrayList<MediaSource> to_remove = new Gee.ArrayList<MediaSource>();
         to_remove.add_all(LibraryPhoto.global.get_trashcan_contents());
@@ -762,10 +606,9 @@ public class LibraryWindow : AppWindow {
     }
     
     private void on_find() {
-        Gtk.ToggleAction action = (Gtk.ToggleAction) get_current_page().get_common_action(
-            "CommonDisplaySearchbar");
-        action.active = true;
-        
+        var action = this.lookup_action ("CommonDisplaySearchbar");
+        action.change_state (true);
+
         // give it focus (which should move cursor to the text entry control)
         search_toolbar.take_focus();
     }
@@ -780,24 +623,27 @@ public class LibraryWindow : AppWindow {
     }
     
     public int get_events_sort() {
-        Gtk.RadioAction? action = get_common_action("CommonSortEventsAscending") as Gtk.RadioAction;
+        var action = this.lookup_action ("CommonSortEvents") as GLib.SimpleAction;
         
-        return (action != null) ? action.current_value : SORT_EVENTS_ORDER_DESCENDING;
+        return (action != null) ? (action.state.get_string () == SORT_EVENTS_ORDER_ASCENDING)
+            ? 0 : 1
+            : 1;
     }
 
-    private void on_events_sort_changed(Gtk.Action action, Gtk.Action c) {
-        Gtk.RadioAction current = (Gtk.RadioAction) c;
+    private void on_events_sort_changed(GLib.SimpleAction action, Variant? value) {
         
         Config.Facade.get_instance().set_events_sort_ascending(
-            current.current_value == SORT_EVENTS_ORDER_ASCENDING);
+            value.get_string () == SORT_EVENTS_ORDER_ASCENDING);
+
+        action.set_state (value);
     }
     
     private void on_preferences() {
         PreferencesDialog.show();
     }
     
-    private void on_display_basic_properties(Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active();
+    private void on_display_basic_properties(GLib.SimpleAction action, Variant? value) {
+        bool display = value.get_boolean ();
 
         if (display) {
             basic_properties.update_properties(get_current_page());
@@ -810,10 +656,20 @@ public class LibraryWindow : AppWindow {
 
         // sync the setting so it will persist
         Config.Facade.get_instance().set_display_basic_properties(display);
+        action.set_state (value);
     }
 
-    private void on_display_extended_properties(Gtk.Action action) {
-        bool display = ((Gtk.ToggleAction) action).get_active();
+    private void on_action_toggle (GLib.Action action, Variant? value) {
+        Variant new_state = ! (bool) action.get_state ();
+        action.change_state (new_state);
+    }
+
+    private void on_action_radio (GLib.Action action, Variant? value) {
+        action.change_state (value);
+    }
+
+    private void on_display_extended_properties(GLib.SimpleAction action, Variant? value) {
+        bool display = value.get_boolean ();
 
         if (display) {
             extended_properties.update_properties(get_current_page());
@@ -821,12 +677,17 @@ public class LibraryWindow : AppWindow {
         } else {
             extended_properties.hide();
         }
+
+        action.set_state (value);
     }
     
-    private void on_display_searchbar(Gtk.Action action) {
-        bool is_shown = ((Gtk.ToggleAction) action).get_active();
+    private void on_display_searchbar(GLib.SimpleAction action, Variant? value) {
+        bool is_shown = value.get_boolean ();
+
         Config.Facade.get_instance().set_display_search_bar(is_shown);
         show_search_bar(is_shown);
+
+        action.set_state (value);
     }
     
     public void show_search_bar(bool display) {
@@ -839,9 +700,10 @@ public class LibraryWindow : AppWindow {
             search_actions.reset();
     }
     
-    private void on_display_sidebar(Gtk.Action action) {
-        set_sidebar_visible(((Gtk.ToggleAction) action).get_active());
-        
+    private void on_display_sidebar(GLib.SimpleAction action, Variant? variant) {
+        set_sidebar_visible(variant.get_boolean ());
+
+        action.set_state (variant);
     }
 
     private void set_sidebar_visible(bool visible) {
@@ -853,8 +715,10 @@ public class LibraryWindow : AppWindow {
         return Config.Facade.get_instance().get_display_sidebar();
     }
     
-    private void on_display_toolbar (Gtk.Action action) {
-        set_toolbar_visible ((action as Gtk.ToggleAction).get_active ());
+    private void on_display_toolbar (GLib.SimpleAction action, Variant? variant) {
+        set_toolbar_visible (variant.get_boolean ());
+
+        action.set_state (variant);
     }
 
     private void set_toolbar_visible (bool visible) {
@@ -878,10 +742,8 @@ public class LibraryWindow : AppWindow {
     }
 
     private void sync_extended_properties(bool show) {
-        Gtk.ToggleAction? extended_display_action = get_common_action("CommonDisplayExtendedProperties")
-            as Gtk.ToggleAction;
-        assert(extended_display_action != null);
-        extended_display_action.set_active(show);
+        var action = this.lookup_action ("CommonDisplayExtendedProperties");
+        action.change_state (show);
 
         // sync the setting so it will persist
         Config.Facade.get_instance().set_display_extended_properties(show);
@@ -951,9 +813,7 @@ public class LibraryWindow : AppWindow {
     
     public override bool drag_motion(Gdk.DragContext context, int x, int y, uint time) {
         Gdk.Atom target = Gtk.drag_dest_find_target(this, context, Gtk.drag_dest_get_target_list(this));
-        // Want to use GDK_NONE (or, properly bound, Gdk.Atom.NONE) but GTK3 doesn't have it bound
-        // See: https://bugzilla.gnome.org/show_bug.cgi?id=655094
-        if (((int) target) == 0) {
+        if (target == Gdk.Atom.NONE) {
             debug("drag target is GDK_NONE");
             Gdk.drag_status(context, 0, time);
             
@@ -966,7 +826,7 @@ public class LibraryWindow : AppWindow {
             
             return true;
         }
-        
+
         // since we cannot set a default action, we must set it when we spy a drag motion
         Gdk.DragAction drag_action = get_drag_action();
         
@@ -1120,32 +980,28 @@ public class LibraryWindow : AppWindow {
     
     // check for settings that should persist between instances
     private void load_configuration() {
-        Gtk.ToggleAction? basic_display_action = get_common_action("CommonDisplayBasicProperties")
-            as Gtk.ToggleAction;
+        var basic_display_action = lookup_action("CommonDisplayBasicProperties");
         assert(basic_display_action != null);
-        basic_display_action.set_active(Config.Facade.get_instance().get_display_basic_properties());
+        basic_display_action.change_state (Config.Facade.get_instance().get_display_basic_properties());
 
-        Gtk.ToggleAction? extended_display_action = get_common_action("CommonDisplayExtendedProperties")
-            as Gtk.ToggleAction;
+        var extended_display_action = lookup_action("CommonDisplayExtendedProperties");
         assert(extended_display_action != null);
-        extended_display_action.set_active(Config.Facade.get_instance().get_display_extended_properties());
+        extended_display_action.change_state(Config.Facade.get_instance().get_display_extended_properties());
         
-        Gtk.ToggleAction? search_bar_display_action = get_common_action("CommonDisplaySearchbar")
-            as Gtk.ToggleAction;
+        var search_bar_display_action = lookup_action("CommonDisplaySearchbar");
         assert(search_bar_display_action != null);
-        search_bar_display_action.set_active(Config.Facade.get_instance().get_display_search_bar());
+        search_bar_display_action.change_state(Config.Facade.get_instance().get_display_search_bar());
 
-        Gtk.RadioAction? sort_events_action = get_common_action("CommonSortEventsAscending")
-            as Gtk.RadioAction;
+        var sort_events_action = lookup_action("CommonSortEvents");
         assert(sort_events_action != null);
         
         // Ticket #3321 - Event sorting order wasn't saving on exit.
         // Instead of calling set_active against one of the toggles, call
         // set_current_value against the entire radio group...
-        int event_sort_val = Config.Facade.get_instance().get_events_sort_ascending() ? SORT_EVENTS_ORDER_ASCENDING :
+        string event_sort_val = Config.Facade.get_instance().get_events_sort_ascending() ? SORT_EVENTS_ORDER_ASCENDING :
             SORT_EVENTS_ORDER_DESCENDING;
         
-        sort_events_action.set_current_value(event_sort_val);
+        sort_events_action.change_state (event_sort_val);
     }
     
     private void start_pulse_background_progress_bar(string label, int priority) {
@@ -1291,12 +1147,16 @@ public class LibraryWindow : AppWindow {
         background_progress_frame.get_style_context().remove_class("frame");
 
         // pad the bottom frame (properties)
-        Gtk.Alignment bottom_alignment = new Gtk.Alignment(0, 0.5f, 1, 0);
-        
-        bottom_alignment.set_padding(10, 10, 6, 0);
-        bottom_alignment.add(basic_properties);
+        basic_properties.halign = Gtk.Align.FILL;
+        basic_properties.valign = Gtk.Align.CENTER;
+        basic_properties.hexpand = true;
+        basic_properties.vexpand = false;
+        basic_properties.margin_top = 10;
+        basic_properties.margin_bottom = 10;
+        basic_properties.margin_start = 6;
+        basic_properties.margin_end = 0;
 
-        bottom_frame.add(bottom_alignment);
+        bottom_frame.add(basic_properties);
         bottom_frame.get_style_context().remove_class("frame");
         
         // "attach" the progress bar to the sidebar tree, so the movable ridge is to resize the
@@ -1345,6 +1205,9 @@ public class LibraryWindow : AppWindow {
         
         Page current_page = get_current_page();
         if (current_page != null) {
+            set_show_menubar (false);
+            Application.set_menubar (null);
+
             Gtk.Toolbar toolbar = current_page.get_toolbar();
             if (toolbar != null)
                 right_vbox.remove(toolbar);
@@ -1399,6 +1262,9 @@ public class LibraryWindow : AppWindow {
         subscribe_for_basic_information(get_current_page());
         
         page.switched_to();
+
+        Application.set_menubar (page.get_menubar ());
+        set_show_menubar (true);
         
         Gtk.Toolbar toolbar = page.get_toolbar();
         if (toolbar != null) {
diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c
index 739d6b1..03b9c80 100644
--- a/src/library/OfflinePage.c
+++ b/src/library/OfflinePage.c
@@ -304,6 +304,16 @@ typedef struct _ViewCollectionClass ViewCollectionClass;
 #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
 #define TYPE_MEDIA_SOURCE_ITEM (media_source_item_get_type ())
 #define MEDIA_SOURCE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem))
 #define MEDIA_SOURCE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItemClass))
@@ -342,16 +352,6 @@ typedef struct _OfflinePageOfflineViewClass OfflinePageOfflineViewClass;
 typedef struct _Marker Marker;
 typedef struct _MarkerIface MarkerIface;
 
-#define TYPE_APP_WINDOW (app_window_get_type ())
-#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
-#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
-#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
-#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
-#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
-
-typedef struct _AppWindow AppWindow;
-typedef struct _AppWindowClass AppWindowClass;
-
 #define TYPE_PROGRESS_DIALOG (progress_dialog_get_type ())
 #define PROGRESS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PROGRESS_DIALOG, ProgressDialog))
 #define PROGRESS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PROGRESS_DIALOG, ProgressDialogClass))
@@ -445,7 +445,7 @@ typedef struct _OfflinePageOfflineSearchViewFilterPrivate OfflinePageOfflineSear
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -455,8 +455,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -464,10 +462,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -784,6 +780,8 @@ GType video_source_collection_get_type (void) G_GNUC_CONST;
 static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_new (void);
 static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_construct (GType object_type);
 #define OFFLINE_PAGE_NAME _ ("Missing Files")
+static void offline_page_on_remove_from_library (OfflinePage* self);
+static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 OfflinePage* offline_page_new (void);
 OfflinePage* offline_page_construct (GType object_type);
 CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name);
@@ -796,19 +794,13 @@ MediaViewTracker* media_view_tracker_construct (GType object_type, ViewCollectio
 GeeCollection* media_source_collection_get_offline_bin_contents (MediaSourceCollection* self);
 static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static GtkActionEntry* offline_page_real_init_collect_action_entries (Page* base, int* result_length1);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-#define RESOURCES_REMOVE_LABEL _ ("_Remove")
-#define TRANSLATABLE "translatable"
-static void offline_page_on_remove_from_library (OfflinePage* self);
-static void _offline_page_on_remove_from_library_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_REMOVE_FROM_LIBRARY_MENU _ ("R_emove From Library")
-#define RESOURCES_DELETE_FROM_LIBRARY_TOOLTIP _ ("Remove the selected photos from the library")
-static void _vala_array_add88 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void offline_page_real_add_actions (Page* base);
+void page_add_actions (Page* self);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* base);
 static void offline_page_real_update_actions (Page* base, gint selected_count, gint count);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
-void page_set_action_important (Page* self, const gchar* name, gboolean important);
 void page_update_actions (Page* self, gint selected_count, gint count);
 gboolean data_collection_add (DataCollection* self, DataObject* object);
 static OfflinePageOfflineView* offline_page_offline_view_new (MediaSource* source);
@@ -823,8 +815,6 @@ DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource*
 void data_collection_remove_marked (DataCollection* self, Marker* m);
 GeeList* view_collection_get_selected_sources (ViewCollection* self);
 gboolean remove_offline_dialog (GtkWindow* owner, gint count);
-GType app_window_get_type (void) G_GNUC_CONST;
-AppWindow* app_window_get_instance (void);
 void page_window_set_busy_cursor (PageWindow* self);
 GType progress_dialog_get_type (void) G_GNUC_CONST;
 ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable);
@@ -866,11 +856,19 @@ GType search_filter_criteria_get_type (void) G_GNUC_CONST;
 DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type);
 static void offline_page_finalize (GObject* obj);
 
+static const GActionEntry OFFLINE_PAGE_entries[1] = {{"RemoveFromLibrary", _offline_page_on_remove_from_library_gsimple_action_activate_callback}};
 
 static void _offline_page_on_offline_contents_altered_media_source_collection_offline_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
 #line 45 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_on_offline_contents_altered ((OfflinePage*) self, added, removed);
-#line 874 "OfflinePage.c"
+#line 865 "OfflinePage.c"
+}
+
+
+static void _offline_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 55 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+	offline_page_on_remove_from_library ((OfflinePage*) self);
+#line 872 "OfflinePage.c"
 }
 
 
@@ -890,9 +888,9 @@ OfflinePage* offline_page_construct (GType object_type) {
 #line 29 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = (OfflinePage*) checkerboard_page_construct (object_type, OFFLINE_PAGE_NAME);
 #line 31 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/OfflineContextMenu");
+	checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "OfflineContextMenu");
 #line 32 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	page_init_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "/OfflineToolbar");
+	page_init_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "OfflineToolbar");
 #line 34 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 34 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -935,14 +933,14 @@ OfflinePage* offline_page_construct (GType object_type) {
 	_g_object_unref0 (_tmp10_);
 #line 28 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 939 "OfflinePage.c"
+#line 937 "OfflinePage.c"
 }
 
 
 OfflinePage* offline_page_new (void) {
 #line 28 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return offline_page_construct (TYPE_OFFLINE_PAGE);
-#line 946 "OfflinePage.c"
+#line 944 "OfflinePage.c"
 }
 
 
@@ -962,105 +960,34 @@ static void offline_page_real_init_collect_ui_filenames (Page* base, GeeList* ui
 	_tmp1_ = ui_filenames;
 #line 52 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "offline.ui");
-#line 966 "OfflinePage.c"
-}
-
-
-static void _offline_page_on_remove_from_library_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	offline_page_on_remove_from_library ((OfflinePage*) self);
-#line 973 "OfflinePage.c"
-}
-
-
-static void _vala_array_add88 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if ((*length) == (*size)) {
-#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 984 "OfflinePage.c"
-	}
-#line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	(*array)[(*length)++] = *value;
-#line 988 "OfflinePage.c"
+#line 964 "OfflinePage.c"
 }
 
 
-static GtkActionEntry* offline_page_real_init_collect_action_entries (Page* base, int* result_length1) {
+static void offline_page_real_add_actions (Page* base) {
 	OfflinePage * self;
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	gint _tmp0_ = 0;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry remove = {0};
-	GtkActionEntry _tmp2_ = {0};
-	GtkActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkActionEntry _tmp4_ = {0};
-	GtkActionEntry* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-#line 55 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
+#line 59 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
-#line 56 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp1_ = PAGE_CLASS (offline_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), &_tmp0_);
-#line 56 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	actions = _tmp1_;
-#line 56 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	actions_length1 = _tmp0_;
-#line 56 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_actions_size_ = actions_length1;
-#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp2_.name = "RemoveFromLibrary";
-#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp2_.stock_id = RESOURCES_REMOVE_LABEL;
-#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp2_.accelerator = "Delete";
-#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp2_.tooltip = TRANSLATABLE;
-#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp2_.callback = (GCallback) _offline_page_on_remove_from_library_gtk_action_callback;
-#line 58 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	remove = _tmp2_;
 #line 60 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	remove.label = RESOURCES_REMOVE_FROM_LIBRARY_MENU;
-#line 61 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	remove.tooltip = RESOURCES_DELETE_FROM_LIBRARY_TOOLTIP;
+	PAGE_CLASS (offline_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
 #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp3_ = actions;
+	_tmp0_ = app_window_get_instance ();
 #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp3__length1 = actions_length1;
+	_tmp1_ = _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp4_ = remove;
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), OFFLINE_PAGE_entries, G_N_ELEMENTS (OFFLINE_PAGE_entries), self);
 #line 62 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_vala_array_add88 (&actions, &actions_length1, &_actions_size_, &_tmp4_);
-#line 64 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp5_ = actions;
-#line 64 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	_tmp5__length1 = actions_length1;
-#line 64 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	if (result_length1) {
-#line 64 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		*result_length1 = _tmp5__length1;
-#line 1051 "OfflinePage.c"
-	}
-#line 64 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	result = _tmp5_;
-#line 64 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	return result;
-#line 1057 "OfflinePage.c"
+	_g_object_unref0 (_tmp1_);
+#line 984 "OfflinePage.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
-#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 1064 "OfflinePage.c"
+#line 991 "OfflinePage.c"
 }
 
 
@@ -1069,17 +996,17 @@ static CoreViewTracker* offline_page_real_get_view_tracker (CheckerboardPage* ba
 	CoreViewTracker* result = NULL;
 	MediaViewTracker* _tmp0_ = NULL;
 	CoreViewTracker* _tmp1_ = NULL;
-#line 67 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 65 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
-#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = self->priv->tracker;
-#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker));
-#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	result = _tmp1_;
-#line 68 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 66 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1083 "OfflinePage.c"
+#line 1010 "OfflinePage.c"
 }
 
 
@@ -1088,51 +1015,49 @@ static void offline_page_real_update_actions (Page* base, gint selected_count, g
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 71 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 69 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
-#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 70 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = selected_count;
-#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 70 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", _tmp0_ > 0);
-#line 73 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveFromLibrary", TRUE);
-#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp1_ = selected_count;
-#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp2_ = count;
-#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 72 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	PAGE_CLASS (offline_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_);
-#line 1106 "OfflinePage.c"
+#line 1031 "OfflinePage.c"
 }
 
 
 static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp12_ = NULL;
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (IS_OFFLINE_PAGE (self));
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 75 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 80 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = added;
-#line 80 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp0_ != NULL) {
-#line 1123 "OfflinePage.c"
+#line 1048 "OfflinePage.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_tmp1_ = added;
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_source_it = _tmp2_;
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			while (TRUE) {
-#line 1136 "OfflinePage.c"
+#line 1061 "OfflinePage.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				MediaSource* source = NULL;
@@ -1143,52 +1068,52 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 				MediaSource* _tmp9_ = NULL;
 				OfflinePageOfflineView* _tmp10_ = NULL;
 				OfflinePageOfflineView* _tmp11_ = NULL;
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp3_ = _source_it;
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				if (!_tmp4_) {
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 					break;
-#line 1155 "OfflinePage.c"
+#line 1080 "OfflinePage.c"
 				}
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp5_ = _source_it;
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				source = (MediaSource*) _tmp6_;
-#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp8_ = _tmp7_;
-#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp9_ = source;
-#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp10_ = offline_page_offline_view_new (_tmp9_);
-#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp11_ = _tmp10_;
-#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject));
-#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_data_collection_unref0 (_tmp8_);
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_g_object_unref0 (source);
-#line 1181 "OfflinePage.c"
+#line 1106 "OfflinePage.c"
 			}
-#line 81 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 78 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_g_object_unref0 (_source_it);
-#line 1185 "OfflinePage.c"
+#line 1110 "OfflinePage.c"
 		}
 	}
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp12_ = removed;
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp12_ != NULL) {
-#line 1192 "OfflinePage.c"
+#line 1117 "OfflinePage.c"
 		Marker* marker = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		ViewCollection* _tmp14_ = NULL;
@@ -1197,32 +1122,32 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 		ViewCollection* _tmp29_ = NULL;
 		ViewCollection* _tmp30_ = NULL;
 		Marker* _tmp31_ = NULL;
-#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp14_ = _tmp13_;
-#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp16_ = _tmp15_;
-#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 83 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		marker = _tmp16_;
-#line 1213 "OfflinePage.c"
+#line 1138 "OfflinePage.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp17_ = NULL;
 			GeeIterator* _tmp18_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_tmp17_ = removed;
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_source_it = _tmp18_;
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			while (TRUE) {
-#line 1226 "OfflinePage.c"
+#line 1151 "OfflinePage.c"
 				GeeIterator* _tmp19_ = NULL;
 				gboolean _tmp20_ = FALSE;
 				MediaSource* source = NULL;
@@ -1234,61 +1159,61 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 				MediaSource* _tmp26_ = NULL;
 				DataView* _tmp27_ = NULL;
 				DataView* _tmp28_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp19_ = _source_it;
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp20_ = gee_iterator_next (_tmp19_);
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				if (!_tmp20_) {
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 					break;
-#line 1246 "OfflinePage.c"
+#line 1171 "OfflinePage.c"
 				}
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp21_ = _source_it;
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp22_ = gee_iterator_get (_tmp21_);
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				source = (MediaSource*) _tmp22_;
-#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp23_ = marker;
-#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp25_ = _tmp24_;
-#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp26_ = source;
-#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource));
-#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_tmp28_ = _tmp27_;
-#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
-#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_g_object_unref0 (_tmp28_);
-#line 88 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_data_collection_unref0 (_tmp25_);
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 				_g_object_unref0 (source);
-#line 1274 "OfflinePage.c"
+#line 1199 "OfflinePage.c"
 			}
-#line 87 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 			_g_object_unref0 (_source_it);
-#line 1278 "OfflinePage.c"
+#line 1203 "OfflinePage.c"
 		}
-#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp30_ = _tmp29_;
-#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp31_ = marker;
-#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_);
-#line 89 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_data_collection_unref0 (_tmp30_);
-#line 85 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 82 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (marker);
-#line 1292 "OfflinePage.c"
+#line 1217 "OfflinePage.c"
 	}
 }
 
@@ -1296,9 +1221,9 @@ static void offline_page_on_offline_contents_altered (OfflinePage* self, GeeColl
 static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
 	gboolean result;
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
-#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1302 "OfflinePage.c"
+#line 1227 "OfflinePage.c"
 }
 
 
@@ -1335,198 +1260,198 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 	ProgressDialog* _tmp39_ = NULL;
 	AppWindow* _tmp41_ = NULL;
 	AppWindow* _tmp42_ = NULL;
-#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	g_return_if_fail (IS_OFFLINE_PAGE (self));
-#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp1_ = _tmp0_;
-#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 91 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	sources = _tmp3_;
-#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp4_ = sources;
-#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp5_ = gee_collection_get_size (_tmp4_);
-#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp6_ = _tmp5_;
-#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp6_ == 0) {
-#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (sources);
-#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		return;
-#line 1365 "OfflinePage.c"
+#line 1290 "OfflinePage.c"
 	}
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp7_ = app_window_get_instance ();
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp8_ = _tmp7_;
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp9_ = sources;
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp10_ = gee_collection_get_size (_tmp9_);
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp11_ = _tmp10_;
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp12_ = remove_offline_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp11_);
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp13_ = !_tmp12_;
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp13_) {
-#line 100 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (sources);
-#line 100 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 97 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		return;
-#line 1389 "OfflinePage.c"
+#line 1314 "OfflinePage.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp14_ = app_window_get_instance ();
-#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp15_ = _tmp14_;
-#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow));
-#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 99 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (_tmp15_);
-#line 104 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	progress = NULL;
-#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp16_ = sources;
-#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp17_ = gee_collection_get_size (_tmp16_);
-#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp18_ = _tmp17_;
-#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 102 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp18_ >= 20) {
-#line 1409 "OfflinePage.c"
+#line 1334 "OfflinePage.c"
 		AppWindow* _tmp19_ = NULL;
 		AppWindow* _tmp20_ = NULL;
 		const gchar* _tmp21_ = NULL;
 		ProgressDialog* _tmp22_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp19_ = app_window_get_instance ();
-#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp20_ = _tmp19_;
-#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp21_ = _ ("Deleting…");
-#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp22_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _tmp21_, NULL);
-#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		g_object_ref_sink (_tmp22_);
-#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (progress);
-#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		progress = _tmp22_;
-#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 103 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 1430 "OfflinePage.c"
+#line 1355 "OfflinePage.c"
 	}
-#line 108 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp23_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 108 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	photos = _tmp23_;
-#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp24_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	videos = _tmp24_;
-#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp25_ = sources;
-#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp26_ = photos;
-#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp27_ = videos;
-#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 107 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	media_source_collection_filter_media (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp28_ = progress;
-#line 112 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp28_ != NULL) {
-#line 1452 "OfflinePage.c"
+#line 1377 "OfflinePage.c"
 		LibraryPhotoSourceCollection* _tmp29_ = NULL;
 		GeeArrayList* _tmp30_ = NULL;
 		ProgressDialog* _tmp31_ = NULL;
 		VideoSourceCollection* _tmp32_ = NULL;
 		GeeArrayList* _tmp33_ = NULL;
 		ProgressDialog* _tmp34_ = NULL;
-#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp29_ = library_photo_global;
-#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp30_ = photos;
-#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp31_ = progress;
-#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp31_, NULL);
-#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp32_ = video_global;
-#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp33_ = videos;
-#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp34_ = progress;
-#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 111 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, _progress_dialog_monitor_progress_monitor, _tmp34_, NULL);
-#line 1475 "OfflinePage.c"
+#line 1400 "OfflinePage.c"
 	} else {
 		LibraryPhotoSourceCollection* _tmp35_ = NULL;
 		GeeArrayList* _tmp36_ = NULL;
 		VideoSourceCollection* _tmp37_ = NULL;
 		GeeArrayList* _tmp38_ = NULL;
-#line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp35_ = library_photo_global;
-#line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp36_ = photos;
-#line 116 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 113 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
-#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp37_ = video_global;
-#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp38_ = videos;
-#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 114 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_COLLECTION, GeeCollection), FALSE, NULL, NULL, NULL);
-#line 1493 "OfflinePage.c"
+#line 1418 "OfflinePage.c"
 	}
-#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp39_ = progress;
-#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 117 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	if (_tmp39_ != NULL) {
-#line 1499 "OfflinePage.c"
+#line 1424 "OfflinePage.c"
 		ProgressDialog* _tmp40_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp40_ = progress;
-#line 121 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 118 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		progress_dialog_close (_tmp40_);
-#line 1505 "OfflinePage.c"
+#line 1430 "OfflinePage.c"
 	}
-#line 123 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp41_ = app_window_get_instance ();
-#line 123 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp42_ = _tmp41_;
-#line 123 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PAGE_WINDOW, PageWindow));
-#line 123 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 120 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (_tmp42_);
-#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (videos);
-#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (photos);
-#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (progress);
-#line 93 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 90 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_g_object_unref0 (sources);
-#line 1523 "OfflinePage.c"
+#line 1448 "OfflinePage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 1530 "OfflinePage.c"
+#line 1455 "OfflinePage.c"
 }
 
 
@@ -1535,17 +1460,17 @@ static SearchViewFilter* offline_page_real_get_search_view_filter (CheckerboardP
 	SearchViewFilter* result = NULL;
 	OfflinePageOfflineSearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 126 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 123 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_OFFLINE_PAGE, OfflinePage);
-#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	result = _tmp1_;
-#line 127 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
+#line 124 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1549 "OfflinePage.c"
+#line 1474 "OfflinePage.c"
 }
 
 
@@ -1574,21 +1499,21 @@ static OfflinePageOfflineView* offline_page_offline_view_construct (GType object
 	_vala_assert (_tmp4_, "source.is_offline()");
 #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 1578 "OfflinePage.c"
+#line 1503 "OfflinePage.c"
 }
 
 
 static OfflinePageOfflineView* offline_page_offline_view_new (MediaSource* source) {
 #line 11 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return offline_page_offline_view_construct (OFFLINE_PAGE_TYPE_OFFLINE_VIEW, source);
-#line 1585 "OfflinePage.c"
+#line 1510 "OfflinePage.c"
 }
 
 
 static void offline_page_offline_view_class_init (OfflinePageOfflineViewClass * klass) {
 #line 10 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	offline_page_offline_view_parent_class = g_type_class_peek_parent (klass);
-#line 1592 "OfflinePage.c"
+#line 1517 "OfflinePage.c"
 }
 
 
@@ -1617,7 +1542,7 @@ static guint offline_page_offline_search_view_filter_real_get_criteria (SearchVi
 	result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 20 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return result;
-#line 1621 "OfflinePage.c"
+#line 1546 "OfflinePage.c"
 }
 
 
@@ -1627,14 +1552,14 @@ static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filt
 	self = (OfflinePageOfflineSearchViewFilter*) default_search_view_filter_construct (object_type);
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return self;
-#line 1631 "OfflinePage.c"
+#line 1556 "OfflinePage.c"
 }
 
 
 static OfflinePageOfflineSearchViewFilter* offline_page_offline_search_view_filter_new (void) {
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	return offline_page_offline_search_view_filter_construct (OFFLINE_PAGE_TYPE_OFFLINE_SEARCH_VIEW_FILTER);
-#line 1638 "OfflinePage.c"
+#line 1563 "OfflinePage.c"
 }
 
 
@@ -1643,7 +1568,7 @@ static void offline_page_offline_search_view_filter_class_init (OfflinePageOffli
 	offline_page_offline_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 18 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = offline_page_offline_search_view_filter_real_get_criteria;
-#line 1647 "OfflinePage.c"
+#line 1572 "OfflinePage.c"
 }
 
 
@@ -1671,7 +1596,7 @@ static void offline_page_class_init (OfflinePageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = offline_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-	((PageClass *) klass)->init_collect_action_entries = offline_page_real_init_collect_action_entries;
+	((PageClass *) klass)->add_actions = offline_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	((CheckerboardPageClass *) klass)->get_view_tracker = offline_page_real_get_view_tracker;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
@@ -1680,7 +1605,7 @@ static void offline_page_class_init (OfflinePageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = offline_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	G_OBJECT_CLASS (klass)->finalize = offline_page_finalize;
-#line 1684 "OfflinePage.c"
+#line 1609 "OfflinePage.c"
 }
 
 
@@ -1692,7 +1617,7 @@ static void offline_page_instance_init (OfflinePage * self) {
 	_tmp0_ = offline_page_offline_search_view_filter_new ();
 #line 25 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 1696 "OfflinePage.c"
+#line 1621 "OfflinePage.c"
 }
 
 
@@ -1722,7 +1647,7 @@ static void offline_page_finalize (GObject* obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 7 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 	G_OBJECT_CLASS (offline_page_parent_class)->finalize (obj);
-#line 1726 "OfflinePage.c"
+#line 1651 "OfflinePage.c"
 }
 
 
diff --git a/src/library/OfflinePage.vala b/src/library/OfflinePage.vala
index 899dc53..bd916d0 100644
--- a/src/library/OfflinePage.vala
+++ b/src/library/OfflinePage.vala
@@ -28,8 +28,8 @@ public class OfflinePage : CheckerboardPage {
     public OfflinePage() {
         base (NAME);
         
-        init_item_context_menu("/OfflineContextMenu");
-        init_toolbar("/OfflineToolbar");
+        init_item_context_menu("OfflineContextMenu");
+        init_toolbar("OfflineToolbar");
         
         tracker = new MediaViewTracker(get_view());
         
@@ -51,27 +51,24 @@ public class OfflinePage : CheckerboardPage {
         
         ui_filenames.add("offline.ui");
     }
-    
-    protected override Gtk.ActionEntry[] init_collect_action_entries() {
-        Gtk.ActionEntry[] actions = base.init_collect_action_entries();
-        
-        Gtk.ActionEntry remove = { "RemoveFromLibrary", Resources.REMOVE_LABEL, TRANSLATABLE, "Delete",
-            TRANSLATABLE, on_remove_from_library };
-        remove.label = Resources.REMOVE_FROM_LIBRARY_MENU;
-        remove.tooltip = Resources.DELETE_FROM_LIBRARY_TOOLTIP;
-        actions += remove;
-        
-        return actions;
+
+    private const GLib.ActionEntry[] entries = {
+        { "RemoveFromLibrary", on_remove_from_library }
+    };
+
+    protected override void add_actions () {
+        base.add_actions ();
+
+        AppWindow.get_instance ().add_action_entries (entries, this);
     }
-    
+
     public override Core.ViewTracker? get_view_tracker() {
         return tracker;
     }
     
     protected override void update_actions(int selected_count, int count) {
         set_action_sensitive("RemoveFromLibrary", selected_count > 0);
-        set_action_important("RemoveFromLibrary", true);
-        
+
         base.update_actions(selected_count, count);
     }
     
diff --git a/src/library/TrashPage.c b/src/library/TrashPage.c
index 78ec0e1..2186ff1 100644
--- a/src/library/TrashPage.c
+++ b/src/library/TrashPage.c
@@ -15,6 +15,7 @@
 #include <gee.h>
 #include <gdk/gdk.h>
 #include <glib/gi18n-lib.h>
+#include <gio/gio.h>
 #include <cairo.h>
 #include <float.h>
 #include <math.h>
@@ -303,6 +304,16 @@ typedef struct _VideoSourceCollection VideoSourceCollection;
 typedef struct _VideoSourceCollectionClass VideoSourceCollectionClass;
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
 #define TYPE_MEDIA_SOURCE_ITEM (media_source_item_get_type ())
 #define MEDIA_SOURCE_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItem))
 #define MEDIA_SOURCE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEDIA_SOURCE_ITEM, MediaSourceItemClass))
@@ -445,7 +456,7 @@ typedef struct _TrashPageTrashSearchViewFilterPrivate TrashPageTrashSearchViewFi
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -455,8 +466,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -464,10 +473,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -766,6 +773,10 @@ enum  {
 static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void);
 static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_construct (GType object_type);
 #define TRASH_PAGE_NAME _ ("Trash")
+static void trash_page_on_delete (TrashPage* self);
+static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void trash_page_on_restore (TrashPage* self);
+static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 TrashPage* trash_page_new (void);
 TrashPage* trash_page_construct (GType object_type);
 CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name);
@@ -796,21 +807,10 @@ GType video_source_collection_get_type (void) G_GNUC_CONST;
 GeeCollection* media_source_collection_get_trashcan_contents (MediaSourceCollection* self);
 static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static GtkActionEntry* trash_page_real_init_collect_action_entries (Page* base, int* result_length1);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-#define RESOURCES_DELETE_LABEL _ ("_Delete")
-#define TRANSLATABLE "translatable"
-static void trash_page_on_delete (TrashPage* self);
-static void _trash_page_on_delete_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_DELETE_PHOTOS_MENU _ ("_Delete")
-#define RESOURCES_DELETE_FROM_TRASH_TOOLTIP _ ("Remove the selected photos from the trash")
-static void _vala_array_add89 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_UNDELETE_LABEL _ ("_Undelete")
-static void trash_page_on_restore (TrashPage* self);
-static void _trash_page_on_restore_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_RESTORE_PHOTOS_MENU _ ("_Restore")
-#define RESOURCES_RESTORE_PHOTOS_TOOLTIP _ ("Move the selected photos back into the library")
-static void _vala_array_add90 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void trash_page_real_add_actions (Page* base);
+void page_add_actions (Page* self);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base);
 static void trash_page_real_update_actions (Page* base, gint selected_count, gint count);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
@@ -875,11 +875,26 @@ GType search_filter_criteria_get_type (void) G_GNUC_CONST;
 DefaultSearchViewFilter* default_search_view_filter_construct (GType object_type);
 static void trash_page_finalize (GObject* obj);
 
+static const GActionEntry TRASH_PAGE_entries[2] = {{"Delete", _trash_page_on_delete_gsimple_action_activate_callback}, {"Restore", _trash_page_on_restore_gsimple_action_activate_callback}};
+
+static void _trash_page_on_delete_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	trash_page_on_delete ((TrashPage*) self);
+#line 884 "TrashPage.c"
+}
+
+
+static void _trash_page_on_restore_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	trash_page_on_restore ((TrashPage*) self);
+#line 891 "TrashPage.c"
+}
+
 
 static void _trash_page_on_trashcan_contents_altered_media_source_collection_trashcan_contents_altered (MediaSourceCollection* _sender, GeeCollection* added, GeeCollection* removed, gpointer self) {
 #line 38 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_on_trashcan_contents_altered ((TrashPage*) self, added, removed);
-#line 883 "TrashPage.c"
+#line 898 "TrashPage.c"
 }
 
 
@@ -899,11 +914,11 @@ TrashPage* trash_page_construct (GType object_type) {
 #line 29 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = (TrashPage*) checkerboard_page_construct (object_type, TRASH_PAGE_NAME);
 #line 31 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/TrashContextMenu");
+	checkerboard_page_init_item_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "TrashContextMenu");
 #line 32 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/TrashPageMenu");
+	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "TrashPageMenu");
 #line 33 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	page_init_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "/TrashToolbar");
+	page_init_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "TrashToolbar");
 #line 35 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 35 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -946,14 +961,14 @@ TrashPage* trash_page_construct (GType object_type) {
 	_g_object_unref0 (_tmp10_);
 #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self;
-#line 950 "TrashPage.c"
+#line 965 "TrashPage.c"
 }
 
 
 TrashPage* trash_page_new (void) {
 #line 28 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return trash_page_construct (TYPE_TRASH_PAGE);
-#line 957 "TrashPage.c"
+#line 972 "TrashPage.c"
 }
 
 
@@ -973,158 +988,34 @@ static void trash_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_f
 	_tmp1_ = ui_filenames;
 #line 47 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "trash.ui");
-#line 977 "TrashPage.c"
-}
-
-
-static void _trash_page_on_delete_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	trash_page_on_delete ((TrashPage*) self);
-#line 984 "TrashPage.c"
-}
-
-
-static void _vala_array_add89 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	if ((*length) == (*size)) {
-#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 995 "TrashPage.c"
-	}
-#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	(*array)[(*length)++] = *value;
-#line 999 "TrashPage.c"
+#line 992 "TrashPage.c"
 }
 
 
-static void _trash_page_on_restore_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	trash_page_on_restore ((TrashPage*) self);
-#line 1006 "TrashPage.c"
-}
-
-
-static void _vala_array_add90 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	if ((*length) == (*size)) {
-#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1017 "TrashPage.c"
-	}
-#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1021 "TrashPage.c"
-}
-
-
-static GtkActionEntry* trash_page_real_init_collect_action_entries (Page* base, int* result_length1) {
+static void trash_page_real_add_actions (Page* base) {
 	TrashPage * self;
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	gint _tmp0_ = 0;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry delete_action = {0};
-	GtkActionEntry _tmp2_ = {0};
-	GtkActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkActionEntry _tmp4_ = {0};
-	GtkActionEntry restore = {0};
-	GtkActionEntry _tmp5_ = {0};
-	GtkActionEntry* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	GtkActionEntry _tmp7_ = {0};
-	GtkActionEntry* _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-#line 50 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 51 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp1_ = PAGE_CLASS (trash_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), &_tmp0_);
-#line 51 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	actions = _tmp1_;
-#line 51 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	actions_length1 = _tmp0_;
-#line 51 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_actions_size_ = actions_length1;
-#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp2_.name = "Delete";
-#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp2_.stock_id = RESOURCES_DELETE_LABEL;
-#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp2_.accelerator = "Delete";
-#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp2_.tooltip = TRANSLATABLE;
-#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp2_.callback = (GCallback) _trash_page_on_delete_gtk_action_callback;
-#line 53 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	delete_action = _tmp2_;
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
 #line 55 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	delete_action.label = RESOURCES_DELETE_PHOTOS_MENU;
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
 #line 56 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	delete_action.tooltip = RESOURCES_DELETE_FROM_TRASH_TOOLTIP;
-#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp3_ = actions;
-#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp3__length1 = actions_length1;
-#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp4_ = delete_action;
-#line 57 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_vala_array_add89 (&actions, &actions_length1, &_actions_size_, &_tmp4_);
-#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp5_.name = "Restore";
-#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp5_.stock_id = RESOURCES_UNDELETE_LABEL;
-#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp5_.accelerator = NULL;
-#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp5_.tooltip = TRANSLATABLE;
-#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp5_.callback = (GCallback) _trash_page_on_restore_gtk_action_callback;
-#line 59 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	restore = _tmp5_;
-#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	restore.label = RESOURCES_RESTORE_PHOTOS_MENU;
-#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	restore.tooltip = RESOURCES_RESTORE_PHOTOS_TOOLTIP;
-#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp6_ = actions;
-#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp6__length1 = actions_length1;
-#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp7_ = restore;
-#line 63 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_vala_array_add90 (&actions, &actions_length1, &_actions_size_, &_tmp7_);
-#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp8_ = actions;
-#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	_tmp8__length1 = actions_length1;
-#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	if (result_length1) {
-#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-		*result_length1 = _tmp8__length1;
-#line 1115 "TrashPage.c"
-	}
-#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	result = _tmp8_;
-#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	return result;
-#line 1121 "TrashPage.c"
+	PAGE_CLASS (trash_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page));
+#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	_tmp0_ = app_window_get_instance ();
+#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	_tmp1_ = _tmp0_;
+#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), TRASH_PAGE_entries, G_N_ELEMENTS (TRASH_PAGE_entries), self);
+#line 58 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+	_g_object_unref0 (_tmp1_);
+#line 1012 "TrashPage.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
-#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 1128 "TrashPage.c"
+#line 1019 "TrashPage.c"
 }
 
 
@@ -1133,17 +1024,17 @@ static CoreViewTracker* trash_page_real_get_view_tracker (CheckerboardPage* base
 	CoreViewTracker* result = NULL;
 	MediaViewTracker* _tmp0_ = NULL;
 	CoreViewTracker* _tmp1_ = NULL;
-#line 68 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 61 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = self->priv->tracker;
-#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = _core_tracker_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, CORE_TYPE_VIEW_TRACKER, CoreViewTracker));
-#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	result = _tmp1_;
-#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 62 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1147 "TrashPage.c"
+#line 1038 "TrashPage.c"
 }
 
 
@@ -1153,59 +1044,59 @@ static void trash_page_real_update_actions (Page* base, gint selected_count, gin
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 65 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = selected_count;
-#line 73 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 66 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	has_selected = _tmp0_ > 0;
-#line 75 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 68 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", has_selected);
-#line 76 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 69 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Delete", TRUE);
-#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 70 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Restore", has_selected);
-#line 78 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 71 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Restore", TRUE);
-#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	page_set_common_action_important (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonEmptyTrash", TRUE);
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = selected_count;
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = count;
-#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	PAGE_CLASS (trash_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), TYPE_PAGE, Page), _tmp1_, _tmp2_);
-#line 1179 "TrashPage.c"
+#line 1070 "TrashPage.c"
 }
 
 
 static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp12_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 77 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = added;
-#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp0_ != NULL) {
-#line 1196 "TrashPage.c"
+#line 1087 "TrashPage.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp1_ = added;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_source_it = _tmp2_;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			while (TRUE) {
-#line 1209 "TrashPage.c"
+#line 1100 "TrashPage.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				MediaSource* source = NULL;
@@ -1216,52 +1107,52 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 				MediaSource* _tmp9_ = NULL;
 				TrashPageTrashView* _tmp10_ = NULL;
 				TrashPageTrashView* _tmp11_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp3_ = _source_it;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				if (!_tmp4_) {
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 					break;
-#line 1228 "TrashPage.c"
+#line 1119 "TrashPage.c"
 				}
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp5_ = _source_it;
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				source = (MediaSource*) _tmp6_;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp8_ = _tmp7_;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp9_ = source;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp10_ = trash_page_trash_view_new (_tmp9_);
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp11_ = _tmp10_;
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_OBJECT, DataObject));
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_data_collection_unref0 (_tmp8_);
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (source);
-#line 1254 "TrashPage.c"
+#line 1145 "TrashPage.c"
 			}
-#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_g_object_unref0 (_source_it);
-#line 1258 "TrashPage.c"
+#line 1149 "TrashPage.c"
 		}
 	}
-#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp12_ = removed;
-#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp12_ != NULL) {
-#line 1265 "TrashPage.c"
+#line 1156 "TrashPage.c"
 		Marker* marker = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		ViewCollection* _tmp14_ = NULL;
@@ -1270,32 +1161,32 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 		ViewCollection* _tmp29_ = NULL;
 		ViewCollection* _tmp30_ = NULL;
 		Marker* _tmp31_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp14_ = _tmp13_;
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp15_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp16_ = _tmp15_;
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 85 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		marker = _tmp16_;
-#line 1286 "TrashPage.c"
+#line 1177 "TrashPage.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp17_ = NULL;
 			GeeIterator* _tmp18_ = NULL;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp17_ = removed;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_source_it = _tmp18_;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			while (TRUE) {
-#line 1299 "TrashPage.c"
+#line 1190 "TrashPage.c"
 				GeeIterator* _tmp19_ = NULL;
 				gboolean _tmp20_ = FALSE;
 				MediaSource* source = NULL;
@@ -1307,61 +1198,61 @@ static void trash_page_on_trashcan_contents_altered (TrashPage* self, GeeCollect
 				MediaSource* _tmp26_ = NULL;
 				DataView* _tmp27_ = NULL;
 				DataView* _tmp28_ = NULL;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp19_ = _source_it;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp20_ = gee_iterator_next (_tmp19_);
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				if (!_tmp20_) {
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 					break;
-#line 1319 "TrashPage.c"
+#line 1210 "TrashPage.c"
 				}
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp21_ = _source_it;
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp22_ = gee_iterator_get (_tmp21_);
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				source = (MediaSource*) _tmp22_;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp23_ = marker;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp25_ = _tmp24_;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp26_ = source;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp27_ = view_collection_get_view_for_source (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource));
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_tmp28_ = _tmp27_;
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				marker_mark (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_OBJECT, DataObject));
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (_tmp28_);
-#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 87 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_data_collection_unref0 (_tmp25_);
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 				_g_object_unref0 (source);
-#line 1347 "TrashPage.c"
+#line 1238 "TrashPage.c"
 			}
-#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 			_g_object_unref0 (_source_it);
-#line 1351 "TrashPage.c"
+#line 1242 "TrashPage.c"
 		}
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp30_ = _tmp29_;
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp31_ = marker;
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_DATA_COLLECTION, DataCollection), _tmp31_);
-#line 95 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 88 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_data_collection_unref0 (_tmp30_);
-#line 91 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_g_object_unref0 (marker);
-#line 1365 "TrashPage.c"
+#line 1256 "TrashPage.c"
 	}
 }
 
@@ -1379,51 +1270,51 @@ static void trash_page_on_restore (TrashPage* self) {
 	GeeCollection* _tmp9_ = NULL;
 	TrashUntrashPhotosCommand* _tmp10_ = NULL;
 	TrashUntrashPhotosCommand* _tmp11_ = NULL;
-#line 99 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = _tmp0_;
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp3_) {
-#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		return;
-#line 1399 "TrashPage.c"
+#line 1290 "TrashPage.c"
 	}
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp5_ = _tmp4_;
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp7_ = _tmp6_;
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp8_ = view_collection_get_selected_sources (_tmp7_);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp10_ = trash_untrash_photos_command_new (_tmp9_, FALSE);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp11_ = _tmp10_;
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_g_object_unref0 (_tmp11_);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 103 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 96 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_command_manager_unref0 (_tmp5_);
-#line 1427 "TrashPage.c"
+#line 1318 "TrashPage.c"
 }
 
 
@@ -1432,17 +1323,17 @@ static gchar* trash_page_real_get_view_empty_message (CheckerboardPage* base) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 107 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = _ ("Trash is empty");
-#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	result = _tmp1_;
-#line 108 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1446 "TrashPage.c"
+#line 1337 "TrashPage.c"
 }
 
 
@@ -1457,55 +1348,55 @@ static void trash_page_on_delete (TrashPage* self) {
 	GeeList* _tmp8_ = NULL;
 	GeeCollection* _tmp9_ = NULL;
 	const gchar* _tmp10_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	g_return_if_fail (IS_TRASH_PAGE (self));
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp2_ = _tmp1_;
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp4_ = _tmp3_ == 1;
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	if (_tmp4_) {
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp0_ = "Deleting a Photo";
-#line 1477 "TrashPage.c"
+#line 1368 "TrashPage.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp5_ = _ ("Deleting Photos");
-#line 113 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 		_tmp0_ = _tmp5_;
-#line 1484 "TrashPage.c"
+#line 1375 "TrashPage.c"
 	}
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp7_ = _tmp6_;
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp8_ = view_collection_get_selected_sources (_tmp7_);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp10_ = _ ("Delete");
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	remove_from_app (_tmp9_, _tmp10_, _tmp0_);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 112 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 1502 "TrashPage.c"
+#line 1393 "TrashPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 1509 "TrashPage.c"
+#line 1400 "TrashPage.c"
 }
 
 
@@ -1514,17 +1405,17 @@ static SearchViewFilter* trash_page_real_get_search_view_filter (CheckerboardPag
 	SearchViewFilter* result = NULL;
 	TrashPageTrashSearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 116 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TRASH_PAGE, TrashPage);
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	result = _tmp1_;
-#line 117 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1528 "TrashPage.c"
+#line 1419 "TrashPage.c"
 }
 
 
@@ -1553,21 +1444,21 @@ static TrashPageTrashView* trash_page_trash_view_construct (GType object_type, M
 	_vala_assert (_tmp4_, "source.is_trashed()");
 #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self;
-#line 1557 "TrashPage.c"
+#line 1448 "TrashPage.c"
 }
 
 
 static TrashPageTrashView* trash_page_trash_view_new (MediaSource* source) {
 #line 11 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return trash_page_trash_view_construct (TRASH_PAGE_TYPE_TRASH_VIEW, source);
-#line 1564 "TrashPage.c"
+#line 1455 "TrashPage.c"
 }
 
 
 static void trash_page_trash_view_class_init (TrashPageTrashViewClass * klass) {
 #line 10 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	trash_page_trash_view_parent_class = g_type_class_peek_parent (klass);
-#line 1571 "TrashPage.c"
+#line 1462 "TrashPage.c"
 }
 
 
@@ -1596,7 +1487,7 @@ static guint trash_page_trash_search_view_filter_real_get_criteria (SearchViewFi
 	result = (guint) ((((SEARCH_FILTER_CRITERIA_TEXT | SEARCH_FILTER_CRITERIA_FLAG) | SEARCH_FILTER_CRITERIA_MEDIA) | SEARCH_FILTER_CRITERIA_RATING) | SEARCH_FILTER_CRITERIA_SAVEDSEARCH);
 #line 20 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return result;
-#line 1600 "TrashPage.c"
+#line 1491 "TrashPage.c"
 }
 
 
@@ -1606,14 +1497,14 @@ static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_const
 	self = (TrashPageTrashSearchViewFilter*) default_search_view_filter_construct (object_type);
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return self;
-#line 1610 "TrashPage.c"
+#line 1501 "TrashPage.c"
 }
 
 
 static TrashPageTrashSearchViewFilter* trash_page_trash_search_view_filter_new (void) {
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	return trash_page_trash_search_view_filter_construct (TRASH_PAGE_TYPE_TRASH_SEARCH_VIEW_FILTER);
-#line 1617 "TrashPage.c"
+#line 1508 "TrashPage.c"
 }
 
 
@@ -1622,7 +1513,7 @@ static void trash_page_trash_search_view_filter_class_init (TrashPageTrashSearch
 	trash_page_trash_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 18 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = trash_page_trash_search_view_filter_real_get_criteria;
-#line 1626 "TrashPage.c"
+#line 1517 "TrashPage.c"
 }
 
 
@@ -1650,7 +1541,7 @@ static void trash_page_class_init (TrashPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = trash_page_real_init_collect_ui_filenames;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
-	((PageClass *) klass)->init_collect_action_entries = trash_page_real_init_collect_action_entries;
+	((PageClass *) klass)->add_actions = trash_page_real_add_actions;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	((CheckerboardPageClass *) klass)->get_view_tracker = trash_page_real_get_view_tracker;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
@@ -1661,7 +1552,7 @@ static void trash_page_class_init (TrashPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = trash_page_real_get_search_view_filter;
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = trash_page_finalize;
-#line 1665 "TrashPage.c"
+#line 1556 "TrashPage.c"
 }
 
 
@@ -1673,7 +1564,7 @@ static void trash_page_instance_init (TrashPage * self) {
 	_tmp0_ = trash_page_trash_search_view_filter_new ();
 #line 25 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	self->priv->search_filter = _tmp0_;
-#line 1677 "TrashPage.c"
+#line 1568 "TrashPage.c"
 }
 
 
@@ -1687,7 +1578,7 @@ static void trash_page_finalize (GObject* obj) {
 	_core_tracker_unref0 (self->priv->tracker);
 #line 7 "/home/jens/Source/shotwell/src/library/TrashPage.vala"
 	G_OBJECT_CLASS (trash_page_parent_class)->finalize (obj);
-#line 1691 "TrashPage.c"
+#line 1582 "TrashPage.c"
 }
 
 
diff --git a/src/library/TrashPage.vala b/src/library/TrashPage.vala
index 0a38ac0..943c5e1 100644
--- a/src/library/TrashPage.vala
+++ b/src/library/TrashPage.vala
@@ -28,9 +28,9 @@ public class TrashPage : CheckerboardPage {
     public TrashPage() {
         base (NAME);
         
-        init_item_context_menu("/TrashContextMenu");
-        init_page_context_menu("/TrashPageMenu");
-        init_toolbar("/TrashToolbar");
+        init_item_context_menu("TrashContextMenu");
+        init_page_context_menu("TrashPageMenu");
+        init_toolbar("TrashToolbar");
         
         tracker = new MediaViewTracker(get_view());
         
@@ -46,25 +46,18 @@ public class TrashPage : CheckerboardPage {
         
         ui_filenames.add("trash.ui");
     }
-    
-    protected override Gtk.ActionEntry[] init_collect_action_entries() {
-        Gtk.ActionEntry[] actions = base.init_collect_action_entries();
-        
-        Gtk.ActionEntry delete_action = { "Delete", Resources.DELETE_LABEL, TRANSLATABLE, "Delete",
-            TRANSLATABLE, on_delete };
-        delete_action.label = Resources.DELETE_PHOTOS_MENU;
-        delete_action.tooltip = Resources.DELETE_FROM_TRASH_TOOLTIP;
-        actions += delete_action;
-        
-        Gtk.ActionEntry restore = { "Restore", Resources.UNDELETE_LABEL, TRANSLATABLE, null, TRANSLATABLE,
-            on_restore };
-        restore.label = Resources.RESTORE_PHOTOS_MENU;
-        restore.tooltip = Resources.RESTORE_PHOTOS_TOOLTIP;
-        actions += restore;
-        
-        return actions;
+
+    private const GLib.ActionEntry[] entries = {
+        { "Delete", on_delete },
+        { "Restore", on_restore }
+    };
+
+    protected override void add_actions () {
+        base.add_actions ();
+
+        AppWindow.get_instance ().add_action_entries (entries, this);
     }
-    
+
     public override Core.ViewTracker? get_view_tracker() {
         return tracker;
     }
diff --git a/src/main.c b/src/main.c
index 8387fbc..39b4026 100644
--- a/src/main.c
+++ b/src/main.c
@@ -646,11 +646,11 @@ DirectWindow* direct_window_construct (GType object_type, GFile* file);
 void direct_app_terminate (void);
 GOptionEntry* commandline_options_get_options (int* result_length1);
 static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length);
-static void _vala_array_add152 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
-static void _vala_array_add153 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
-static void _vala_array_add154 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
-static void _vala_array_add155 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
-static void _vala_array_add156 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add70 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add71 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add72 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add73 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
+static void _vala_array_add74 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value);
 static GOptionEntry* _vala_array_dup27 (GOptionEntry* self, int length);
 void _vala_main (gchar** args, int args_length1);
 void app_dirs_init (const gchar* arg0);
@@ -660,7 +660,7 @@ GFile* app_dirs_get_exec_dir (void);
 void app_dirs_terminate (void);
 #define RESOURCES_GIT_VERSION _GIT_VERSION
 gboolean library_window_is_mount_uri_supported (const gchar* uri);
-static void _vala_array_add157 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add75 (gchar*** array, int* length, int* size, gchar* value);
 gboolean is_string_empty (const gchar* s);
 #define DEBUG_LIBRARY_PREFIX "L"
 #define DEBUG_VIEWER_PREFIX "V"
@@ -835,11 +835,11 @@ void library_exec (gchar** mounts, int mounts_length1) {
 #line 35 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 838 "main.c"
-			goto __catch219_g_error;
+			goto __catch218_g_error;
 		}
 	}
-	goto __finally219;
-	__catch219_g_error:
+	goto __finally218;
+	__catch218_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -860,7 +860,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		return;
 #line 862 "main.c"
 	}
-	__finally219:
+	__finally218:
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
@@ -1218,7 +1218,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 #line 109 "/home/jens/Source/shotwell/src/main.vala"
 					_g_free0 (icon_path);
 #line 1214 "main.c"
-					goto __catch220_g_error;
+					goto __catch219_g_error;
 				}
 #line 109 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp72_ = progress_dialog;
@@ -1230,8 +1230,8 @@ void library_exec (gchar** mounts, int mounts_length1) {
 				_g_free0 (icon_path);
 #line 1225 "main.c"
 			}
-			goto __finally220;
-			__catch220_g_error:
+			goto __finally219;
+			__catch219_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp73_ = NULL;
@@ -1251,7 +1251,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 				_g_error_free0 (err);
 #line 1245 "main.c"
 			}
-			__finally220:
+			__finally219:
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
@@ -1927,11 +1927,11 @@ void editing_exec (const gchar* filename) {
 #line 253 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1922 "main.c"
-			goto __catch221_g_error;
+			goto __catch220_g_error;
 		}
 	}
-	goto __finally221;
-	__catch221_g_error:
+	goto __finally220;
+	__catch220_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -1954,7 +1954,7 @@ void editing_exec (const gchar* filename) {
 		return;
 #line 1948 "main.c"
 	}
-	__finally221:
+	__finally220:
 #line 252 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 252 "/home/jens/Source/shotwell/src/main.vala"
@@ -2014,7 +2014,7 @@ static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length) {
 }
 
 
-static void _vala_array_add152 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
+static void _vala_array_add70 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
 #line 295 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
 #line 295 "/home/jens/Source/shotwell/src/main.vala"
@@ -2029,7 +2029,7 @@ static void _vala_array_add152 (GOptionEntry** array, int* length, int* size, co
 }
 
 
-static void _vala_array_add153 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
+static void _vala_array_add71 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
 #line 299 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
 #line 299 "/home/jens/Source/shotwell/src/main.vala"
@@ -2044,7 +2044,7 @@ static void _vala_array_add153 (GOptionEntry** array, int* length, int* size, co
 }
 
 
-static void _vala_array_add154 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
+static void _vala_array_add72 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
 #line 303 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
 #line 303 "/home/jens/Source/shotwell/src/main.vala"
@@ -2059,7 +2059,7 @@ static void _vala_array_add154 (GOptionEntry** array, int* length, int* size, co
 }
 
 
-static void _vala_array_add155 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
+static void _vala_array_add73 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
 #line 307 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
 #line 307 "/home/jens/Source/shotwell/src/main.vala"
@@ -2074,7 +2074,7 @@ static void _vala_array_add155 (GOptionEntry** array, int* length, int* size, co
 }
 
 
-static void _vala_array_add156 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
+static void _vala_array_add74 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
 #line 310 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
 #line 310 "/home/jens/Source/shotwell/src/main.vala"
@@ -2200,7 +2200,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 #line 295 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp8_ = datadir;
 #line 295 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add152 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp8_);
+	_vala_array_add70 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp8_);
 #line 297 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp9_ = _ ("Do not monitor library directory at runtime for changes");
 #line 297 "/home/jens/Source/shotwell/src/main.vala"
@@ -2226,7 +2226,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 #line 299 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp12_ = no_monitoring;
 #line 299 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add153 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_);
+	_vala_array_add71 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_);
 #line 301 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_ = _ ("Don’t display startup progress meter");
 #line 301 "/home/jens/Source/shotwell/src/main.vala"
@@ -2252,7 +2252,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 #line 303 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp16_ = no_startup;
 #line 303 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add154 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp16_);
+	_vala_array_add72 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp16_);
 #line 305 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp17_ = _ ("Show the application’s version");
 #line 305 "/home/jens/Source/shotwell/src/main.vala"
@@ -2278,7 +2278,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 #line 307 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp20_ = version;
 #line 307 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add155 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp20_);
+	_vala_array_add73 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp20_);
 #line 309 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.long_name = NULL;
 #line 309 "/home/jens/Source/shotwell/src/main.vala"
@@ -2302,7 +2302,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 #line 310 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp23_ = terminator;
 #line 310 "/home/jens/Source/shotwell/src/main.vala"
-	_vala_array_add156 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp23_);
+	_vala_array_add74 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp23_);
 #line 312 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp24_ = commandline_options_entries;
 #line 312 "/home/jens/Source/shotwell/src/main.vala"
@@ -2329,7 +2329,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 }
 
 
-static void _vala_array_add157 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add75 (gchar*** array, int* length, int* size, gchar* value) {
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
@@ -2468,11 +2468,11 @@ void _vala_main (gchar** args, int args_length1) {
 #line 338 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2463 "main.c"
-			goto __catch222_g_error;
+			goto __catch221_g_error;
 		}
 	}
-	goto __finally222;
-	__catch222_g_error:
+	goto __finally221;
+	__catch221_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_ = NULL;
@@ -2517,7 +2517,7 @@ void _vala_main (gchar** args, int args_length1) {
 		return;
 #line 2511 "main.c"
 	}
-	__finally222:
+	__finally221:
 #line 337 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 337 "/home/jens/Source/shotwell/src/main.vala"
@@ -2638,7 +2638,7 @@ void _vala_main (gchar** args, int args_length1) {
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp36_ = g_strdup (_tmp35_);
 #line 372 "/home/jens/Source/shotwell/src/main.vala"
-					_vala_array_add157 (&mounts, &mounts_length1, &_mounts_size_, _tmp36_);
+					_vala_array_add75 (&mounts, &mounts_length1, &_mounts_size_, _tmp36_);
 #line 2635 "main.c"
 				} else {
 					gboolean _tmp37_ = FALSE;
@@ -2926,7 +2926,7 @@ void _vala_main (gchar** args, int args_length1) {
 #line 442 "/home/jens/Source/shotwell/src/main.vala"
 				_g_object_unref0 (src);
 #line 2921 "main.c"
-				goto __catch223_g_error;
+				goto __catch222_g_error;
 			}
 #line 439 "/home/jens/Source/shotwell/src/main.vala"
 			_g_object_unref0 (dest);
@@ -2934,8 +2934,8 @@ void _vala_main (gchar** args, int args_length1) {
 			_g_object_unref0 (src);
 #line 2928 "main.c"
 		}
-		goto __finally223;
-		__catch223_g_error:
+		goto __finally222;
+		__catch222_g_error:
 		{
 			GError* _error_ = NULL;
 			GError* _tmp85_ = NULL;
@@ -2954,7 +2954,7 @@ void _vala_main (gchar** args, int args_length1) {
 			_g_error_free0 (_error_);
 #line 2948 "main.c"
 		}
-		__finally223:
+		__finally222:
 #line 439 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 439 "/home/jens/Source/shotwell/src/main.vala"
diff --git a/src/org.gnome.Shotwell.gresource.xml b/src/org.gnome.Shotwell.gresource.xml
new file mode 100644
index 0000000..abf7eb2
--- /dev/null
+++ b/src/org.gnome.Shotwell.gresource.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Shotwell">
+      <file>crop-pivot-reticle.png</file>
+      <file>search_sidebar_context.ui</file>
+      <file>tag_sidebar_context.ui</file>
+      <file>sidebar_default_context.ui</file>
+      <file>search_bar.ui</file>
+  </gresource>
+</gresources>
diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c
index 9362909..6a9f109 100644
--- a/src/plugins/ManifestWidget.c
+++ b/src/plugins/ManifestWidget.c
@@ -212,7 +212,7 @@ PluginsManifestWidgetMediator* plugins_manifest_widget_mediator_construct (GType
 #line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp2_ = self->priv->list;
 #line 32 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	gtk_scrolled_window_add_with_viewport (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 34 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp3_ = plugins_manifest_widget_mediator_get_about_button (self);
 #line 34 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
@@ -1130,7 +1130,7 @@ static GType plugins_manifest_list_view_column_get_type (void) {
 static gint _plugins_compare_extension_point_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = plugins_compare_extension_point_names (a, b);
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return result;
 #line 1136 "ManifestWidget.c"
 }
@@ -1139,7 +1139,7 @@ static gint _plugins_compare_extension_point_names_gcompare_data_func (gconstpoi
 static gint _plugins_compare_pluggable_names_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
 	gint result;
 	result = plugins_compare_pluggable_names (a, b);
-#line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 189 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return result;
 #line 1145 "ManifestWidget.c"
 }
@@ -1286,45 +1286,43 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 158 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_set_enable_search (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
 #line 159 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-	gtk_tree_view_set_rules_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), TRUE);
-#line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_set_show_expanders (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), TRUE);
-#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 160 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_set_reorderable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 162 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 161 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_set_enable_tree_lines (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 163 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 162 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_set_grid_lines (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GTK_TREE_VIEW_GRID_LINES_NONE);
-#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 163 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp26_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 164 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 163 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_selection_set_mode (_tmp26_, GTK_SELECTION_BROWSE);
-#line 166 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp27_ = resources_get_icon_theme_engine ();
-#line 166 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 165 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	icon_theme = _tmp27_;
-#line 1307 "ManifestWidget.c"
+#line 1305 "ManifestWidget.c"
 	{
 		GeeIterator* _extension_point_it = NULL;
 		GeeCollection* _tmp28_ = NULL;
 		GeeCollection* _tmp29_ = NULL;
 		GeeIterator* _tmp30_ = NULL;
 		GeeIterator* _tmp31_ = NULL;
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp28_ = plugins_get_extension_points (_plugins_compare_extension_point_names_gcompare_data_func, NULL, NULL);
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp29_ = _tmp28_;
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp30_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp31_ = _tmp30_;
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (_tmp29_);
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_extension_point_it = _tmp31_;
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		while (TRUE) {
-#line 1328 "ManifestWidget.c"
+#line 1326 "ManifestWidget.c"
 			GeeIterator* _tmp32_ = NULL;
 			gboolean _tmp33_ = FALSE;
 			PluginsExtensionPoint* extension_point = NULL;
@@ -1348,39 +1346,39 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 			GType _tmp66_ = 0UL;
 			GType _tmp67_ = 0UL;
 			GeeCollection* _tmp68_ = NULL;
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp32_ = _extension_point_it;
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp33_ = gee_iterator_next (_tmp32_);
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			if (!_tmp33_) {
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				break;
-#line 1360 "ManifestWidget.c"
+#line 1358 "ManifestWidget.c"
 			}
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp34_ = _extension_point_it;
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp35_ = gee_iterator_get (_tmp34_);
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			extension_point = (PluginsExtensionPoint*) _tmp35_;
-#line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 171 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp36_ = self->priv->store;
-#line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 171 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			gtk_tree_store_append (_tmp36_, &_tmp37_, NULL);
-#line 172 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 171 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			category_iter = _tmp37_;
-#line 174 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 173 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			icon = NULL;
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 174 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp38_ = extension_point;
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 174 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp39_ = plugins_extension_point_get_icon_name (_tmp38_);
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 174 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp40_ = _tmp39_;
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 174 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			if (_tmp40_ != NULL) {
-#line 1384 "ManifestWidget.c"
+#line 1382 "ManifestWidget.c"
 				GtkIconInfo* icon_info = NULL;
 				GtkIconTheme* _tmp41_ = NULL;
 				PluginsExtensionPoint* _tmp42_ = NULL;
@@ -1391,58 +1389,58 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 				GtkIconInfo* _tmp47_ = NULL;
 				GtkIconInfo* _tmp48_ = NULL;
 				GtkIconInfo* _tmp49_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp41_ = icon_theme;
-#line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp42_ = extension_point;
-#line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp43_ = plugins_extension_point_get_icon_name (_tmp42_);
-#line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp44_ = _tmp43_;
-#line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp45_ = (GThemedIcon*) g_themed_icon_new (_tmp44_);
-#line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp46_ = _tmp45_;
-#line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp47_ = gtk_icon_theme_lookup_by_gicon (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_icon_get_type (), GIcon), PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE, 0);
-#line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp48_ = _tmp47_;
-#line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_g_object_unref0 (_tmp46_);
-#line 176 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				icon_info = _tmp48_;
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp49_ = icon_info;
-#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 177 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				if (_tmp49_ != NULL) {
-#line 1419 "ManifestWidget.c"
+#line 1417 "ManifestWidget.c"
 					{
 						GdkPixbuf* _tmp50_ = NULL;
 						GtkIconInfo* _tmp51_ = NULL;
 						GdkPixbuf* _tmp52_ = NULL;
 						GdkPixbuf* _tmp53_ = NULL;
-#line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp51_ = icon_info;
-#line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp52_ = gtk_icon_info_load_icon (_tmp51_, &_inner_error_);
-#line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp50_ = _tmp52_;
-#line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1433 "ManifestWidget.c"
+#line 1431 "ManifestWidget.c"
 							goto __catch34_g_error;
 						}
-#line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp53_ = _tmp50_;
-#line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp50_ = NULL;
-#line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (icon);
-#line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-						icon = _tmp53_;
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+						icon = _tmp53_;
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (_tmp50_);
-#line 1446 "ManifestWidget.c"
+#line 1444 "ManifestWidget.c"
 					}
 					goto __finally34;
 					__catch34_g_error:
@@ -1453,98 +1451,98 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 						const gchar* _tmp56_ = NULL;
 						GError* _tmp57_ = NULL;
 						const gchar* _tmp58_ = NULL;
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						err = _inner_error_;
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_inner_error_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 181 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp54_ = extension_point;
-#line 182 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 181 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp55_ = plugins_extension_point_get_icon_name (_tmp54_);
-#line 182 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 181 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp56_ = _tmp55_;
-#line 182 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 181 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp57_ = err;
-#line 182 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 181 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp58_ = _tmp57_->message;
-#line 182 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
-						g_warning ("ManifestWidget.vala:182: Unable to load icon %s: %s", _tmp56_, _tmp58_);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 181 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+						g_warning ("ManifestWidget.vala:181: Unable to load icon %s: %s", _tmp56_, _tmp58_);
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_error_free0 (err);
-#line 1475 "ManifestWidget.c"
+#line 1473 "ManifestWidget.c"
 					}
 					__finally34:
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_gtk_icon_info_free0 (icon_info);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (icon);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_plugins_extension_point_unref0 (extension_point);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (_extension_point_it);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (icon_theme);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (column);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (text_renderer);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (icon_renderer);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (checkbox_renderer);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						g_clear_error (&_inner_error_);
-#line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						return NULL;
-#line 1504 "ManifestWidget.c"
+#line 1502 "ManifestWidget.c"
 					}
 				}
-#line 175 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 174 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_gtk_icon_info_free0 (icon_info);
-#line 1509 "ManifestWidget.c"
+#line 1507 "ManifestWidget.c"
 			}
-#line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp59_ = self->priv->store;
-#line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp60_ = category_iter;
-#line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp61_ = extension_point;
-#line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp62_ = plugins_extension_point_get_name (_tmp61_);
-#line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp63_ = _tmp62_;
-#line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp64_ = icon;
-#line 187 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 186 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			gtk_tree_store_set (_tmp59_, &_tmp60_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME, _tmp63_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE, FALSE, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON, _tmp64_, -1);
-#line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 189 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp65_ = extension_point;
-#line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 189 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp66_ = plugins_extension_point_get_pluggable_type (_tmp65_);
-#line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 189 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp67_ = _tmp66_;
-#line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 189 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp68_ = plugins_get_pluggables_for_type (_tmp67_, _plugins_compare_pluggable_names_gcompare_data_func, NULL, NULL, TRUE);
-#line 190 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 189 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			pluggables = _tmp68_;
-#line 1535 "ManifestWidget.c"
+#line 1533 "ManifestWidget.c"
 			{
 				GeeIterator* _pluggable_it = NULL;
 				GeeCollection* _tmp69_ = NULL;
 				GeeIterator* _tmp70_ = NULL;
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp69_ = pluggables;
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp70_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_pluggable_it = _tmp70_;
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				while (TRUE) {
-#line 1548 "ManifestWidget.c"
+#line 1546 "ManifestWidget.c"
 					GeeIterator* _tmp71_ = NULL;
 					gboolean _tmp72_ = FALSE;
 					SpitPluggable* pluggable = NULL;
@@ -1575,160 +1573,160 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 					SpitPluggable* _tmp100_ = NULL;
 					const gchar* _tmp101_ = NULL;
 					GdkPixbuf* _tmp102_ = NULL;
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp71_ = _pluggable_it;
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp72_ = gee_iterator_next (_tmp71_);
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (!_tmp72_) {
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						break;
-#line 1587 "ManifestWidget.c"
+#line 1585 "ManifestWidget.c"
 					}
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp73_ = _pluggable_it;
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp74_ = gee_iterator_get (_tmp73_);
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					pluggable = (SpitPluggable*) _tmp74_;
-#line 194 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 193 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp75_ = pluggable;
-#line 194 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 193 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp76_ = spit_pluggable_get_id (_tmp75_);
-#line 194 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 193 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp78_ = plugins_get_pluggable_enabled (_tmp76_, &_tmp77_);
-#line 194 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 193 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					enabled = _tmp77_;
-#line 194 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 193 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (!_tmp78_) {
-#line 195 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 194 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (pluggable);
-#line 195 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 194 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						continue;
-#line 1609 "ManifestWidget.c"
+#line 1607 "ManifestWidget.c"
 					}
-#line 197 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 196 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					memset (&info, 0, sizeof (SpitPluggableInfo));
-#line 198 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 197 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp79_ = pluggable;
-#line 198 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 197 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					spit_pluggable_get_info (_tmp79_, &info);
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp82_ = info;
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp83_ = _tmp82_.icons;
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp83__length1 = _tmp82_.icons_length1;
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (_tmp83_ != NULL) {
-#line 1625 "ManifestWidget.c"
+#line 1623 "ManifestWidget.c"
 						SpitPluggableInfo _tmp84_ = {0};
 						GdkPixbuf** _tmp85_ = NULL;
 						gint _tmp85__length1 = 0;
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp84_ = info;
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp85_ = _tmp84_.icons;
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp85__length1 = _tmp84_.icons_length1;
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp81_ = _tmp85__length1 > 0;
-#line 1637 "ManifestWidget.c"
+#line 1635 "ManifestWidget.c"
 					} else {
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp81_ = FALSE;
-#line 1641 "ManifestWidget.c"
+#line 1639 "ManifestWidget.c"
 					}
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (_tmp81_) {
-#line 1645 "ManifestWidget.c"
+#line 1643 "ManifestWidget.c"
 						SpitPluggableInfo _tmp86_ = {0};
 						GdkPixbuf** _tmp87_ = NULL;
 						gint _tmp87__length1 = 0;
 						GdkPixbuf* _tmp88_ = NULL;
 						GdkPixbuf* _tmp89_ = NULL;
-#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp86_ = info;
-#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp87_ = _tmp86_.icons;
-#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp87__length1 = _tmp86_.icons_length1;
-#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp88_ = _tmp87_[0];
-#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp89_ = _g_object_ref0 (_tmp88_);
-#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (_tmp80_);
-#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp80_ = _tmp89_;
-#line 1665 "ManifestWidget.c"
+#line 1663 "ManifestWidget.c"
 					} else {
 						GdkPixbuf* _tmp90_ = NULL;
-#line 202 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp90_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE);
-#line 202 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_g_object_unref0 (_tmp80_);
-#line 202 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 201 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp80_ = _tmp90_;
-#line 1674 "ManifestWidget.c"
+#line 1672 "ManifestWidget.c"
 					}
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp91_ = _g_object_ref0 (_tmp80_);
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_g_object_unref0 (icon);
-#line 200 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 199 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					icon = _tmp91_;
-#line 205 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp92_ = self->priv->store;
-#line 205 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp93_ = category_iter;
-#line 205 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					gtk_tree_store_append (_tmp92_, &_tmp94_, &_tmp93_);
-#line 205 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 204 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					plugin_iter = _tmp94_;
-#line 207 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp95_ = self->priv->store;
-#line 207 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp96_ = plugin_iter;
-#line 207 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp97_ = enabled;
-#line 207 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp98_ = pluggable;
-#line 207 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp99_ = spit_pluggable_get_pluggable_name (_tmp98_);
-#line 207 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp100_ = pluggable;
-#line 207 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp101_ = spit_pluggable_get_id (_tmp100_);
-#line 207 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp102_ = icon;
-#line 207 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 206 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					gtk_tree_store_set (_tmp95_, &_tmp96_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED, _tmp97_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_NAME, _tmp99_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ID, _tmp101_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_CAN_ENABLE, TRUE, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ICON, _tmp102_, -1);
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_g_object_unref0 (_tmp80_);
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					spit_pluggable_info_destroy (&info);
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_g_object_unref0 (pluggable);
-#line 1714 "ManifestWidget.c"
+#line 1712 "ManifestWidget.c"
 				}
-#line 192 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 191 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_g_object_unref0 (_pluggable_it);
-#line 1718 "ManifestWidget.c"
+#line 1716 "ManifestWidget.c"
 			}
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_g_object_unref0 (pluggables);
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_g_object_unref0 (icon);
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_plugins_extension_point_unref0 (extension_point);
-#line 1726 "ManifestWidget.c"
+#line 1724 "ManifestWidget.c"
 		}
-#line 170 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 169 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (_extension_point_it);
-#line 1730 "ManifestWidget.c"
+#line 1728 "ManifestWidget.c"
 	}
-#line 212 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 211 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_view_expand_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
 #line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (icon_theme);
@@ -1742,54 +1740,54 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 	_g_object_unref0 (checkbox_renderer);
 #line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return self;
-#line 1746 "ManifestWidget.c"
+#line 1744 "ManifestWidget.c"
 }
 
 
 PluginsManifestListView* plugins_manifest_list_view_new (void) {
 #line 130 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return plugins_manifest_list_view_construct (PLUGINS_TYPE_MANIFEST_LIST_VIEW);
-#line 1753 "ManifestWidget.c"
+#line 1751 "ManifestWidget.c"
 }
 
 
 static gpointer _gtk_tree_path_copy0 (gpointer self) {
-#line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return self ? gtk_tree_path_copy (self) : NULL;
-#line 1760 "ManifestWidget.c"
+#line 1758 "ManifestWidget.c"
 }
 
 
 static void _vala_array_add50 (gchar*** array, int* length, int* size, gchar* value) {
-#line 223 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if ((*length) == (*size)) {
-#line 223 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 223 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 1771 "ManifestWidget.c"
+#line 1769 "ManifestWidget.c"
 	}
-#line 223 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	(*array)[(*length)++] = value;
-#line 223 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	(*array)[*length] = NULL;
-#line 1777 "ManifestWidget.c"
+#line 1775 "ManifestWidget.c"
 }
 
 
 static void _gtk_tree_path_free0_ (gpointer var) {
-#line 226 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	(var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL));
-#line 1784 "ManifestWidget.c"
+#line 1782 "ManifestWidget.c"
 }
 
 
 static void _g_list_free__gtk_tree_path_free0_ (GList* self) {
-#line 226 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL);
-#line 226 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_list_free (self);
-#line 1793 "ManifestWidget.c"
+#line 1791 "ManifestWidget.c"
 }
 
 
@@ -1805,40 +1803,40 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se
 	GList* _tmp3_ = NULL;
 	gchar** _tmp12_ = NULL;
 	gint _tmp12__length1 = 0;
-#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 214 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_LIST_VIEW (self), NULL);
-#line 216 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
-#line 216 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	ids = _tmp0_;
-#line 216 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	ids_length1 = 0;
-#line 216 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 215 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_ids_size_ = ids_length1;
-#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 217 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp1_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 217 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp2_ = gtk_tree_selection_get_selected_rows (_tmp1_, NULL);
-#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 217 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	selected = _tmp2_;
-#line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp3_ = selected;
-#line 1827 "ManifestWidget.c"
+#line 1825 "ManifestWidget.c"
 	{
 		GList* path_collection = NULL;
 		GList* path_it = NULL;
-#line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		path_collection = _tmp3_;
-#line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		for (path_it = path_collection; path_it != NULL; path_it = path_it->next) {
-#line 1835 "ManifestWidget.c"
+#line 1833 "ManifestWidget.c"
 			GtkTreePath* _tmp4_ = NULL;
 			GtkTreePath* path = NULL;
-#line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			_tmp4_ = _gtk_tree_path_copy0 ((GtkTreePath*) path_it->data);
-#line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			path = _tmp4_;
-#line 1842 "ManifestWidget.c"
+#line 1840 "ManifestWidget.c"
 			{
 				GtkTreeIter iter = {0};
 				gchar* id = NULL;
@@ -1846,60 +1844,60 @@ gchar** plugins_manifest_list_view_get_selected_ids (PluginsManifestListView* se
 				GtkTreeIter _tmp6_ = {0};
 				gchar* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
-#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp5_ = path;
-#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp7_ = plugins_manifest_list_view_get_id_at_path (self, _tmp5_, &_tmp6_);
-#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				iter = _tmp6_;
-#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 220 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				id = _tmp7_;
-#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_tmp8_ = id;
-#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 221 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				if (_tmp8_ != NULL) {
-#line 1862 "ManifestWidget.c"
+#line 1860 "ManifestWidget.c"
 					gchar** _tmp9_ = NULL;
 					gint _tmp9__length1 = 0;
 					const gchar* _tmp10_ = NULL;
 					gchar* _tmp11_ = NULL;
-#line 223 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp9_ = ids;
-#line 223 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp9__length1 = ids_length1;
-#line 223 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp10_ = id;
-#line 223 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_tmp11_ = g_strdup (_tmp10_);
-#line 223 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 222 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					_vala_array_add50 (&ids, &ids_length1, &_ids_size_, _tmp11_);
-#line 1877 "ManifestWidget.c"
+#line 1875 "ManifestWidget.c"
 				}
-#line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_g_free0 (id);
-#line 219 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 218 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 				_gtk_tree_path_free0 (path);
-#line 1883 "ManifestWidget.c"
+#line 1881 "ManifestWidget.c"
 			}
 		}
 	}
-#line 226 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp12_ = ids;
-#line 226 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp12__length1 = ids_length1;
-#line 226 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (result_length1) {
-#line 226 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		*result_length1 = _tmp12__length1;
-#line 1895 "ManifestWidget.c"
+#line 1893 "ManifestWidget.c"
 	}
-#line 226 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	result = _tmp12_;
-#line 226 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	__g_list_free__gtk_tree_path_free0_0 (selected);
-#line 226 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 225 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return result;
-#line 1903 "ManifestWidget.c"
+#line 1901 "ManifestWidget.c"
 }
 
 
@@ -1915,53 +1913,53 @@ static gchar* plugins_manifest_list_view_get_id_at_path (PluginsManifestListView
 	GtkTreeIter _tmp5_ = {0};
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 229 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 228 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (PLUGINS_IS_MANIFEST_LIST_VIEW (self), NULL);
-#line 229 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 228 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (path != NULL, NULL);
-#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 229 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp0_ = self->priv->store;
-#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 229 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp1_ = path;
-#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 229 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp3_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp2_, _tmp1_);
-#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 229 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_vala_iter = _tmp2_;
-#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 229 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp3_) {
-#line 231 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		result = NULL;
-#line 231 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		if (iter) {
-#line 231 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 			*iter = _vala_iter;
-#line 1939 "ManifestWidget.c"
+#line 1937 "ManifestWidget.c"
 		}
-#line 231 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 230 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		return result;
-#line 1943 "ManifestWidget.c"
+#line 1941 "ManifestWidget.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 233 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp4_ = self->priv->store;
-#line 234 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 233 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp5_ = _vala_iter;
-#line 234 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 233 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_model_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp5_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ID, &id, -1);
-#line 236 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 235 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp6_ = id;
-#line 236 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 235 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 236 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 235 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	result = _tmp7_;
-#line 236 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 235 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (iter) {
-#line 236 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 235 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		*iter = _vala_iter;
-#line 1961 "ManifestWidget.c"
+#line 1959 "ManifestWidget.c"
 	}
-#line 236 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 235 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return result;
-#line 1965 "ManifestWidget.c"
+#line 1963 "ManifestWidget.c"
 }
 
 
@@ -2000,174 +1998,174 @@ static gboolean plugins_manifest_list_view_real_button_press_event (GtkWidget* b
 	GtkTreeStore* _tmp31_ = NULL;
 	GtkTreeIter _tmp32_ = {0};
 	gboolean _tmp33_ = FALSE;
-#line 247 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 246 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PLUGINS_TYPE_MANIFEST_LIST_VIEW, PluginsManifestListView);
-#line 247 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 246 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp0_ = event;
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp1_ = _tmp0_->x;
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp2_ = event;
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp3_ = _tmp2_->y;
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp8_ = gtk_tree_view_get_path_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), (gint) _tmp1_, (gint) _tmp3_, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_);
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_gtk_tree_path_free0 (path);
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	path = _tmp4_;
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (col);
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp9_ = _g_object_ref0 (_tmp5_);
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	col = _tmp9_;
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	cellx = _tmp6_;
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	celly = _tmp7_;
-#line 252 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 251 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp8_) {
-#line 2034 "ManifestWidget.c"
+#line 2032 "ManifestWidget.c"
 		GdkEventButton* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp10_ = event;
-#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp11_ = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp10_);
-#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		result = _tmp11_;
-#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (col);
-#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_gtk_tree_path_free0 (path);
-#line 254 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 253 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		return result;
-#line 2049 "ManifestWidget.c"
+#line 2047 "ManifestWidget.c"
 	}
-#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp13_ = cellx;
-#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp13_ < (PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE + PLUGINS_MANIFEST_LIST_VIEW_ICON_X_PADDING)) {
-#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp12_ = TRUE;
-#line 2057 "ManifestWidget.c"
+#line 2055 "ManifestWidget.c"
 	} else {
 		gint _tmp14_ = 0;
-#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp14_ = cellx;
-#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp12_ = _tmp14_ > (2 * (PLUGINS_MANIFEST_LIST_VIEW_ICON_X_PADDING + PLUGINS_MANIFEST_LIST_VIEW_ICON_SIZE));
-#line 2064 "ManifestWidget.c"
+#line 2062 "ManifestWidget.c"
 	}
-#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 258 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp12_) {
-#line 2068 "ManifestWidget.c"
+#line 2066 "ManifestWidget.c"
 		GdkEventButton* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp15_ = event;
-#line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp16_ = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp15_);
-#line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		result = _tmp16_;
-#line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (col);
-#line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_gtk_tree_path_free0 (path);
-#line 260 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 259 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		return result;
-#line 2083 "ManifestWidget.c"
+#line 2081 "ManifestWidget.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp17_ = path;
-#line 263 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp19_ = plugins_manifest_list_view_get_id_at_path (self, _tmp17_, &_tmp18_);
-#line 263 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	iter = _tmp18_;
-#line 263 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 262 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	id = _tmp19_;
-#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 263 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp20_ = id;
-#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 263 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (_tmp20_ == NULL) {
-#line 2097 "ManifestWidget.c"
+#line 2095 "ManifestWidget.c"
 		GdkEventButton* _tmp21_ = NULL;
 		gboolean _tmp22_ = FALSE;
-#line 265 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp21_ = event;
-#line 265 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp22_ = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp21_);
-#line 265 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		result = _tmp22_;
-#line 265 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_free0 (id);
-#line 265 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (col);
-#line 265 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_gtk_tree_path_free0 (path);
-#line 265 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 264 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		return result;
-#line 2114 "ManifestWidget.c"
+#line 2112 "ManifestWidget.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 267 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp23_ = id;
-#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 267 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp25_ = plugins_get_pluggable_enabled (_tmp23_, &_tmp24_);
-#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 267 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	enabled = _tmp24_;
-#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 267 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	if (!_tmp25_) {
-#line 2124 "ManifestWidget.c"
+#line 2122 "ManifestWidget.c"
 		GdkEventButton* _tmp26_ = NULL;
 		gboolean _tmp27_ = FALSE;
-#line 269 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp26_ = event;
-#line 269 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_tmp27_ = GTK_WIDGET_CLASS (plugins_manifest_list_view_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp26_);
-#line 269 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		result = _tmp27_;
-#line 269 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_free0 (id);
-#line 269 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_g_object_unref0 (col);
-#line 269 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		_gtk_tree_path_free0 (path);
-#line 269 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 268 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 		return result;
-#line 2141 "ManifestWidget.c"
+#line 2139 "ManifestWidget.c"
 	}
-#line 272 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 271 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp28_ = enabled;
-#line 272 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 271 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	enabled = !_tmp28_;
-#line 273 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 272 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp29_ = id;
-#line 273 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 272 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp30_ = enabled;
-#line 273 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 272 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	plugins_set_pluggable_enabled (_tmp29_, _tmp30_);
-#line 275 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 274 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp31_ = self->priv->store;
-#line 275 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 274 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp32_ = iter;
-#line 275 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 274 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_tmp33_ = enabled;
-#line 275 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 274 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	gtk_tree_store_set (_tmp31_, &_tmp32_, PLUGINS_MANIFEST_LIST_VIEW_COLUMN_ENABLED, _tmp33_, -1);
-#line 277 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 276 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	result = TRUE;
-#line 277 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 276 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_free0 (id);
-#line 277 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 276 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_g_object_unref0 (col);
-#line 277 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 276 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	_gtk_tree_path_free0 (path);
-#line 277 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
+#line 276 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	return result;
-#line 2171 "ManifestWidget.c"
+#line 2169 "ManifestWidget.c"
 }
 
 
@@ -2180,7 +2178,7 @@ static void plugins_manifest_list_view_class_init (PluginsManifestListViewClass
 	((GtkWidgetClass *) klass)->button_press_event = plugins_manifest_list_view_real_button_press_event;
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	G_OBJECT_CLASS (klass)->finalize = plugins_manifest_list_view_finalize;
-#line 2184 "ManifestWidget.c"
+#line 2182 "ManifestWidget.c"
 }
 
 
@@ -2192,7 +2190,7 @@ static void plugins_manifest_list_view_instance_init (PluginsManifestListView *
 	_tmp0_ = gtk_tree_store_new ((gint) PLUGINS_MANIFEST_LIST_VIEW_COLUMN_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, gdk_pixbuf_get_type (), G_TYPE_STRING, G_TYPE_STRING);
 #line 122 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	self->priv->store = _tmp0_;
-#line 2196 "ManifestWidget.c"
+#line 2194 "ManifestWidget.c"
 }
 
 
@@ -2204,7 +2202,7 @@ static void plugins_manifest_list_view_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->store);
 #line 108 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 	G_OBJECT_CLASS (plugins_manifest_list_view_parent_class)->finalize (obj);
-#line 2208 "ManifestWidget.c"
+#line 2206 "ManifestWidget.c"
 }
 
 
diff --git a/src/plugins/ManifestWidget.vala b/src/plugins/ManifestWidget.vala
index cad24fc..b6897ba 100644
--- a/src/plugins/ManifestWidget.vala
+++ b/src/plugins/ManifestWidget.vala
@@ -29,7 +29,7 @@ public class ManifestWidgetMediator {
     private ManifestListView list = new ManifestListView();
     
     public ManifestWidgetMediator() {
-        list_bin.add_with_viewport(list);
+        list_bin.add(list);
         
         about_button.clicked.connect(on_about);
         list.get_selection().changed.connect(on_selection_changed);
@@ -156,7 +156,6 @@ private class ManifestListView : Gtk.TreeView {
         
         set_headers_visible(false);
         set_enable_search(false);
-        set_rules_hint(true);
         set_show_expanders(true);
         set_reorderable(false);
         set_enable_tree_lines(false);
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index ad6c097..fbe90d8 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1077,119 +1077,98 @@ GType publishing_ui_progress_pane_get_type (void) {
 PublishingUISuccessPane* publishing_ui_success_pane_construct (GType object_type, SpitPublishingPublisherMediaType published_media, gint num_uploaded) {
 	PublishingUISuccessPane * self = NULL;
 	gchar* message_string = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp14_ = NULL;
+	SpitPublishingPublisherMediaType _tmp0_ = 0;
+	const gchar* _tmp11_ = NULL;
 #line 99 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	message_string = NULL;
 #line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp0_ = num_uploaded;
+	_tmp0_ = published_media;
 #line 103 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	if (_tmp0_ > 1) {
+	if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
 #line 1089 "PublishingUI.c"
-		SpitPublishingPublisherMediaType _tmp1_ = 0;
+		gint _tmp1_ = 0;
+		const gchar* _tmp2_ = NULL;
+		gchar* _tmp3_ = NULL;
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp1_ = published_media;
+		_tmp1_ = num_uploaded;
 #line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		if (_tmp1_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 1095 "PublishingUI.c"
-			const gchar* _tmp2_ = NULL;
-			gchar* _tmp3_ = NULL;
-#line 105 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp2_ = _ ("The selected photos/videos were successfully published.");
-#line 105 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp3_ = g_strdup (_tmp2_);
-#line 105 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_g_free0 (message_string);
-#line 105 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			message_string = _tmp3_;
-#line 1106 "PublishingUI.c"
-		} else {
-			SpitPublishingPublisherMediaType _tmp4_ = 0;
-#line 106 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp4_ = published_media;
-#line 106 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			if (_tmp4_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1113 "PublishingUI.c"
-				const gchar* _tmp5_ = NULL;
-				gchar* _tmp6_ = NULL;
-#line 107 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp5_ = _ ("The selected videos were successfully published.");
-#line 107 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp6_ = g_strdup (_tmp5_);
-#line 107 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_g_free0 (message_string);
-#line 107 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				message_string = _tmp6_;
-#line 1124 "PublishingUI.c"
-			} else {
-				const gchar* _tmp7_ = NULL;
-				gchar* _tmp8_ = NULL;
+		_tmp2_ = ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) _tmp1_);
+#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp3_ = g_strdup (_tmp2_);
+#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_g_free0 (message_string);
+#line 104 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		message_string = _tmp3_;
+#line 1103 "PublishingUI.c"
+	} else {
+		SpitPublishingPublisherMediaType _tmp4_ = 0;
+#line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp4_ = published_media;
+#line 108 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		if (_tmp4_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
+#line 1110 "PublishingUI.c"
+			gint _tmp5_ = 0;
+			const gchar* _tmp6_ = NULL;
+			gchar* _tmp7_ = NULL;
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp7_ = _ ("The selected photos were successfully published.");
+			_tmp5_ = num_uploaded;
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_tmp8_ = g_strdup (_tmp7_);
+			_tmp6_ = ngettext ("The selected video was successfully published.", "The selected videos were successfully published.", (gulong) _tmp5_);
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				_g_free0 (message_string);
+			_tmp7_ = g_strdup (_tmp6_);
 #line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				message_string = _tmp8_;
-#line 1136 "PublishingUI.c"
-			}
-		}
-	} else {
-		SpitPublishingPublisherMediaType _tmp9_ = 0;
-#line 111 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp9_ = published_media;
-#line 111 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		if (_tmp9_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1145 "PublishingUI.c"
-			const gchar* _tmp10_ = NULL;
-			gchar* _tmp11_ = NULL;
-#line 112 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp10_ = _ ("The selected video was successfully published.");
-#line 112 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp11_ = g_strdup (_tmp10_);
-#line 112 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (message_string);
-#line 112 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			message_string = _tmp11_;
-#line 1156 "PublishingUI.c"
+#line 109 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			message_string = _tmp7_;
+#line 1124 "PublishingUI.c"
 		} else {
-			const gchar* _tmp12_ = NULL;
-			gchar* _tmp13_ = NULL;
-#line 114 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp12_ = _ ("The selected photo was successfully published.");
-#line 114 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_tmp13_ = g_strdup (_tmp12_);
-#line 114 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			_g_free0 (message_string);
-#line 114 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			message_string = _tmp13_;
-#line 1168 "PublishingUI.c"
+			SpitPublishingPublisherMediaType _tmp8_ = 0;
+#line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			_tmp8_ = published_media;
+#line 113 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			if (_tmp8_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
+#line 1131 "PublishingUI.c"
+				const gchar* _tmp9_ = NULL;
+				gchar* _tmp10_ = NULL;
+#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				_tmp9_ = _ ("The selected photos/videos were successfully published.");
+#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				_tmp10_ = g_strdup (_tmp9_);
+#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				_g_free0 (message_string);
+#line 115 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				message_string = _tmp10_;
+#line 1142 "PublishingUI.c"
+			} else {
+#line 118 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				g_assert_not_reached ();
+#line 1146 "PublishingUI.c"
+			}
 		}
 	}
-#line 116 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp14_ = message_string;
-#line 116 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self = (PublishingUISuccessPane*) publishing_ui_static_message_pane_construct (object_type, _tmp14_, FALSE);
+#line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_tmp11_ = message_string;
+#line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	self = (PublishingUISuccessPane*) publishing_ui_static_message_pane_construct (object_type, _tmp11_, FALSE);
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_free0 (message_string);
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1179 "PublishingUI.c"
+#line 1158 "PublishingUI.c"
 }
 
 
 PublishingUISuccessPane* publishing_ui_success_pane_new (SpitPublishingPublisherMediaType published_media, gint num_uploaded) {
 #line 98 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_success_pane_construct (PUBLISHING_UI_TYPE_SUCCESS_PANE, published_media, num_uploaded);
-#line 1186 "PublishingUI.c"
+#line 1165 "PublishingUI.c"
 }
 
 
 static void publishing_ui_success_pane_class_init (PublishingUISuccessPaneClass * klass) {
 #line 97 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_success_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1193 "PublishingUI.c"
+#line 1172 "PublishingUI.c"
 }
 
 
@@ -1212,27 +1191,27 @@ GType publishing_ui_success_pane_get_type (void) {
 PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construct (GType object_type) {
 	PublishingUIAccountFetchWaitPane * self = NULL;
 	const gchar* _tmp0_ = NULL;
-#line 122 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = _ ("Fetching account information…");
-#line 122 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
-#line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1222 "PublishingUI.c"
+#line 1201 "PublishingUI.c"
 }
 
 
 PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_new (void) {
-#line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_account_fetch_wait_pane_construct (PUBLISHING_UI_TYPE_ACCOUNT_FETCH_WAIT_PANE);
-#line 1229 "PublishingUI.c"
+#line 1208 "PublishingUI.c"
 }
 
 
 static void publishing_ui_account_fetch_wait_pane_class_init (PublishingUIAccountFetchWaitPaneClass * klass) {
-#line 120 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 125 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_account_fetch_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1236 "PublishingUI.c"
+#line 1215 "PublishingUI.c"
 }
 
 
@@ -1255,27 +1234,27 @@ GType publishing_ui_account_fetch_wait_pane_get_type (void) {
 PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object_type) {
 	PublishingUILoginWaitPane * self = NULL;
 	const gchar* _tmp0_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 133 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = _ ("Logging in…");
-#line 128 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 133 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
-#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 1265 "PublishingUI.c"
+#line 1244 "PublishingUI.c"
 }
 
 
 PublishingUILoginWaitPane* publishing_ui_login_wait_pane_new (void) {
-#line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_login_wait_pane_construct (PUBLISHING_UI_TYPE_LOGIN_WAIT_PANE);
-#line 1272 "PublishingUI.c"
+#line 1251 "PublishingUI.c"
 }
 
 
 static void publishing_ui_login_wait_pane_class_init (PublishingUILoginWaitPaneClass * klass) {
-#line 126 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 131 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_login_wait_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1279 "PublishingUI.c"
+#line 1258 "PublishingUI.c"
 }
 
 
@@ -1298,40 +1277,40 @@ GType publishing_ui_login_wait_pane_get_type (void) {
 static gboolean _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = publishing_ui_publishing_dialog_on_window_close ((PublishingUIPublishingDialog*) self, event);
-#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 1304 "PublishingUI.c"
+#line 1283 "PublishingUI.c"
 }
 
 
 static void _vala_array_add55 (SpitPublishingPublishable*** array, int* length, int* size, SpitPublishingPublishable* value) {
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingPublishable*, *array, (*size) + 1);
-#line 1315 "PublishingUI.c"
+#line 1294 "PublishingUI.c"
 	}
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 1321 "PublishingUI.c"
+#line 1300 "PublishingUI.c"
 }
 
 
 static void _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_on_service_changed ((PublishingUIPublishingDialog*) self);
-#line 1328 "PublishingUI.c"
+#line 1307 "PublishingUI.c"
 }
 
 
 static void _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_on_close_cancel_clicked ((PublishingUIPublishingDialog*) self);
-#line 1335 "PublishingUI.c"
+#line 1314 "PublishingUI.c"
 }
 
 
@@ -1386,85 +1365,85 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 	gint _tmp65__length1 = 0;
 	GtkComboBox* _tmp103_ = NULL;
 	gboolean _tmp104_ = FALSE;
-	GtkBox* _tmp130_ = NULL;
-	GtkBox* _tmp131_ = NULL;
-	GtkBox* _tmp132_ = NULL;
-	GtkButton* _tmp133_ = NULL;
-	GtkButton* _tmp134_ = NULL;
-	GtkButton* _tmp135_ = NULL;
-	gboolean _tmp136_ = FALSE;
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	GtkBox* _tmp134_ = NULL;
+	GtkBox* _tmp135_ = NULL;
+	GtkBox* _tmp136_ = NULL;
+	gboolean _tmp137_ = FALSE;
+	GtkButton* _tmp147_ = NULL;
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (to_publish), NULL);
-#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = to_publish;
-#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp2_ = _tmp1_;
-#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_vala_assert (_tmp2_ > 0, "to_publish.size > 0");
-#line 160 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 164 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	use_header = FALSE;
+#line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = gtk_settings_get_default ();
-#line 160 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp5_ = use_header;
-#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp5_) {
-#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = 1;
-#line 1417 "PublishingUI.c"
+#line 1396 "PublishingUI.c"
 	} else {
-#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = 0;
-#line 1421 "PublishingUI.c"
+#line 1400 "PublishingUI.c"
 	}
-#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = (PublishingUIPublishingDialog*) g_object_new (object_type, "use-header-bar", _tmp4_, NULL);
-#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6_ = use_header;
-#line 162 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 167 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp6_) {
-#line 1429 "PublishingUI.c"
+#line 1408 "PublishingUI.c"
 		GtkWidget* _tmp7_ = NULL;
-#line 163 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp7_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 163 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_header_bar_set_show_close_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_header_bar_get_type (), GtkHeaderBar), FALSE);
-#line 1435 "PublishingUI.c"
+#line 1414 "PublishingUI.c"
 	}
-#line 165 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 170 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 166 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _publishing_ui_publishing_dialog_on_window_close_gtk_widget_delete_event, self, 0);
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp8_ = g_new0 (SpitPublishingPublishable*, 0 + 1);
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->publishables = _tmp8_;
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->publishables_length1 = 0;
-#line 168 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 173 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 169 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	has_photos = FALSE;
-#line 170 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	has_videos = FALSE;
-#line 1455 "PublishingUI.c"
+#line 1434 "PublishingUI.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp9_ = NULL;
 		GeeIterator* _tmp10_ = NULL;
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp9_ = to_publish;
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_media_it = _tmp10_;
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		while (TRUE) {
-#line 1468 "PublishingUI.c"
+#line 1447 "PublishingUI.c"
 			GeeIterator* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			MediaSource* media = NULL;
@@ -1479,294 +1458,294 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 			gint _tmp21__length1 = 0;
 			SpitPublishingPublishable* _tmp22_ = NULL;
 			SpitPublishingPublishable* _tmp23_ = NULL;
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp11_ = _media_it;
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp12_ = gee_iterator_next (_tmp11_);
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (!_tmp12_) {
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				break;
-#line 1491 "PublishingUI.c"
+#line 1470 "PublishingUI.c"
 			}
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp13_ = _media_it;
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp14_ = gee_iterator_get (_tmp13_);
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			media = (MediaSource*) _tmp14_;
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp15_ = media;
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp16_ = publishing_glue_media_source_publishable_wrapper_new (_tmp15_);
-#line 172 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			publishable = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_PUBLISHABLE, SpitPublishingPublishable);
-#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp17_ = publishable;
-#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp18_ = spit_publishing_publishable_get_media_type (_tmp17_);
-#line 174 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (_tmp18_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 175 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 180 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				has_photos = TRUE;
-#line 1513 "PublishingUI.c"
+#line 1492 "PublishingUI.c"
 			} else {
 				SpitPublishingPublishable* _tmp19_ = NULL;
 				SpitPublishingPublisherMediaType _tmp20_ = 0;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp19_ = publishable;
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp20_ = spit_publishing_publishable_get_media_type (_tmp19_);
-#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp20_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 177 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 182 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					has_videos = TRUE;
-#line 1525 "PublishingUI.c"
+#line 1504 "PublishingUI.c"
 				} else {
-#line 179 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					g_assert_not_reached ();
-#line 1529 "PublishingUI.c"
+#line 1508 "PublishingUI.c"
 				}
 			}
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp21_ = self->priv->publishables;
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp21__length1 = self->priv->publishables_length1;
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp22_ = publishable;
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 181 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 186 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_vala_array_add55 (&self->priv->publishables, &self->priv->publishables_length1, &self->priv->_publishables_size_, _tmp23_);
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (publishable);
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (media);
-#line 1546 "PublishingUI.c"
+#line 1525 "PublishingUI.c"
 		}
-#line 171 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 176 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_media_it);
-#line 1550 "PublishingUI.c"
+#line 1529 "PublishingUI.c"
 	}
-#line 184 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	title = NULL;
-#line 185 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	label = NULL;
-#line 187 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp25_ = has_photos;
-#line 187 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp25_) {
-#line 1560 "PublishingUI.c"
+#line 1539 "PublishingUI.c"
 		gboolean _tmp26_ = FALSE;
-#line 187 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp26_ = has_videos;
-#line 187 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp24_ = !_tmp26_;
-#line 1566 "PublishingUI.c"
+#line 1545 "PublishingUI.c"
 	} else {
-#line 187 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp24_ = FALSE;
-#line 1570 "PublishingUI.c"
+#line 1549 "PublishingUI.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp24_) {
-#line 1574 "PublishingUI.c"
+#line 1553 "PublishingUI.c"
 		const gchar* _tmp27_ = NULL;
 		gchar* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp27_ = _ ("Publish Photos");
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp28_ = g_strdup (_tmp27_);
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (title);
-#line 188 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 193 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		title = _tmp28_;
-#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp29_ = _ ("Publish photos _to:");
-#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp30_ = g_strdup (_tmp29_);
-#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (label);
-#line 189 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		label = _tmp30_;
-#line 1595 "PublishingUI.c"
+#line 1574 "PublishingUI.c"
 	} else {
 		gboolean _tmp31_ = FALSE;
 		gboolean _tmp32_ = FALSE;
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp32_ = has_photos;
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (!_tmp32_) {
-#line 1603 "PublishingUI.c"
+#line 1582 "PublishingUI.c"
 			gboolean _tmp33_ = FALSE;
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp33_ = has_videos;
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp31_ = _tmp33_;
-#line 1609 "PublishingUI.c"
+#line 1588 "PublishingUI.c"
 		} else {
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp31_ = FALSE;
-#line 1613 "PublishingUI.c"
+#line 1592 "PublishingUI.c"
 		}
-#line 190 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp31_) {
-#line 1617 "PublishingUI.c"
+#line 1596 "PublishingUI.c"
 			const gchar* _tmp34_ = NULL;
 			gchar* _tmp35_ = NULL;
 			const gchar* _tmp36_ = NULL;
 			gchar* _tmp37_ = NULL;
-#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp34_ = _ ("Publish Videos");
-#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp35_ = g_strdup (_tmp34_);
-#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (title);
-#line 191 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 196 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			title = _tmp35_;
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp36_ = _ ("Publish videos _to");
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp37_ = g_strdup (_tmp36_);
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (label);
-#line 192 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			label = _tmp37_;
-#line 1638 "PublishingUI.c"
+#line 1617 "PublishingUI.c"
 		} else {
 			const gchar* _tmp38_ = NULL;
 			gchar* _tmp39_ = NULL;
 			const gchar* _tmp40_ = NULL;
 			gchar* _tmp41_ = NULL;
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp38_ = _ ("Publish Photos and Videos");
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp39_ = g_strdup (_tmp38_);
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (title);
-#line 194 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			title = _tmp39_;
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp40_ = _ ("Publish photos and videos _to");
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp41_ = g_strdup (_tmp40_);
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_free0 (label);
-#line 195 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			label = _tmp41_;
-#line 1660 "PublishingUI.c"
+#line 1639 "PublishingUI.c"
 		}
 	}
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp42_ = title;
-#line 197 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp42_);
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp43_ = gtk_list_store_new (2, gdk_pixbuf_get_type (), G_TYPE_STRING, -1);
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box_model);
-#line 199 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->service_selector_box_model = _tmp43_;
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp44_ = self->priv->service_selector_box_model;
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp45_ = (GtkComboBox*) gtk_combo_box_new_with_model (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp45_);
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box);
-#line 200 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 205 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->service_selector_box = _tmp45_;
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp46_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp46_);
-#line 202 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	renderer_pix = _tmp46_;
-#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp47_ = self->priv->service_selector_box;
-#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp48_ = renderer_pix;
-#line 203 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp49_ = self->priv->service_selector_box;
-#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp50_ = renderer_pix;
-#line 204 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 209 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
-#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp51_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp51_);
-#line 206 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 211 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	renderer_text = _tmp51_;
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp52_ = self->priv->service_selector_box;
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp53_ = renderer_text;
-#line 207 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 212 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp54_ = self->priv->service_selector_box;
-#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp55_ = renderer_text;
-#line 208 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp56_ = self->priv->service_selector_box;
-#line 210 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_combo_box_set_active (_tmp56_, 0);
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp57_ = config_facade_get_instance ();
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp58_ = _tmp57_;
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp59_ = configuration_facade_get_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp60_ = _tmp59_;
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (_tmp58_);
-#line 213 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 218 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	last_used_service = _tmp60_;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp61_ = has_photos;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp62_ = has_videos;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp64_ = publishing_ui_publishing_dialog_load_services (_tmp61_, _tmp62_, &_tmp63_);
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services = _tmp64_;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services_length1 = _tmp63_;
-#line 215 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_loaded_services_size_ = loaded_services_length1;
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp65_ = loaded_services;
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp65__length1 = loaded_services_length1;
-#line 1751 "PublishingUI.c"
+#line 1730 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
 		gint _service_collection_size_ = 0;
 		gint service_it = 0;
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection = _tmp65_;
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection_length1 = _tmp65__length1;
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp65__length1; service_it = service_it + 1) {
-#line 1763 "PublishingUI.c"
+#line 1742 "PublishingUI.c"
 			SpitPublishingService* _tmp66_ = NULL;
 			SpitPublishingService* service = NULL;
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp66_ = _g_object_ref0 (service_collection[service_it]);
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp66_;
-#line 1770 "PublishingUI.c"
+#line 1749 "PublishingUI.c"
 			{
 				GtkListStore* _tmp67_ = NULL;
 				GtkTreeIter _tmp68_ = {0};
@@ -1780,53 +1759,53 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 				GdkPixbuf** _tmp75_ = NULL;
 				gint _tmp75__length1 = 0;
 				const gchar* _tmp93_ = NULL;
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 225 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp67_ = self->priv->service_selector_box_model;
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 225 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				gtk_list_store_append (_tmp67_, &_tmp68_);
-#line 220 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 225 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				iter = _tmp68_;
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp69_ = service;
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp70_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp71_ = g_strdup (_tmp70_);
-#line 222 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 227 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				curr_service_id = _tmp71_;
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp72_ = service;
-#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 229 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				spit_pluggable_get_info (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, SPIT_TYPE_PLUGGABLE, SpitPluggable), &self->priv->info);
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp74_ = self->priv->info;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp75_ = _tmp74_.icons;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp75__length1 = _tmp74_.icons_length1;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (NULL != _tmp75_) {
-#line 1810 "PublishingUI.c"
+#line 1789 "PublishingUI.c"
 					SpitPluggableInfo _tmp76_ = {0};
 					GdkPixbuf** _tmp77_ = NULL;
 					gint _tmp77__length1 = 0;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp76_ = self->priv->info;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp77_ = _tmp76_.icons;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp77__length1 = _tmp76_.icons_length1;
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp73_ = 0 < _tmp77__length1;
-#line 1822 "PublishingUI.c"
+#line 1801 "PublishingUI.c"
 				} else {
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp73_ = FALSE;
-#line 1826 "PublishingUI.c"
+#line 1805 "PublishingUI.c"
 				}
-#line 226 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 231 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp73_) {
-#line 1830 "PublishingUI.c"
+#line 1809 "PublishingUI.c"
 					GtkListStore* _tmp78_ = NULL;
 					GtkTreeIter _tmp79_ = {0};
 					SpitPluggableInfo _tmp80_ = {0};
@@ -1837,33 +1816,33 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 					const gchar* _tmp84_ = NULL;
 					GdkPixbuf* _tmp85_ = NULL;
 					GdkPixbuf* _tmp86_ = NULL;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp78_ = self->priv->service_selector_box_model;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp79_ = iter;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp80_ = self->priv->info;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp81_ = _tmp80_.icons;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp81__length1 = _tmp80_.icons_length1;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp82_ = _tmp81_[0];
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp83_ = service;
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp84_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 228 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 233 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					gtk_list_store_set (_tmp78_, &_tmp79_, 0, _tmp82_, 1, _tmp84_, -1);
-#line 232 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp85_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 232 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (self->priv->info.icons[0]);
-#line 232 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					self->priv->info.icons[0] = _tmp85_;
-#line 232 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 237 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp86_ = self->priv->info.icons[0];
-#line 1867 "PublishingUI.c"
+#line 1846 "PublishingUI.c"
 				} else {
 					GtkListStore* _tmp87_ = NULL;
 					GtkTreeIter _tmp88_ = {0};
@@ -1871,331 +1850,354 @@ PublishingUIPublishingDialog* publishing_ui_publishing_dialog_construct (GType o
 					GdkPixbuf* _tmp90_ = NULL;
 					SpitPublishingService* _tmp91_ = NULL;
 					const gchar* _tmp92_ = NULL;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp87_ = self->priv->service_selector_box_model;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp88_ = iter;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp89_ = resources_get_icon (RESOURCES_ICON_GENERIC_PLUGIN, RESOURCES_DEFAULT_ICON_SCALE);
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp90_ = _tmp89_;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp91_ = service;
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp92_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					gtk_list_store_set (_tmp87_, &_tmp88_, 0, _tmp90_, 1, _tmp92_, -1);
-#line 235 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (_tmp90_);
-#line 1891 "PublishingUI.c"
+#line 1870 "PublishingUI.c"
 				}
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp93_ = last_used_service;
-#line 239 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 244 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp93_ == NULL) {
-#line 1897 "PublishingUI.c"
+#line 1876 "PublishingUI.c"
 					GtkComboBox* _tmp94_ = NULL;
 					GtkTreeIter _tmp95_ = {0};
 					SpitPublishingService* _tmp96_ = NULL;
 					const gchar* _tmp97_ = NULL;
 					gchar* _tmp98_ = NULL;
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 245 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp94_ = self->priv->service_selector_box;
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 245 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp95_ = iter;
-#line 240 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 245 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					gtk_combo_box_set_active_iter (_tmp94_, &_tmp95_);
-#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp96_ = service;
-#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp97_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp98_ = g_strdup (_tmp97_);
-#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_free0 (last_used_service);
-#line 241 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 246 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					last_used_service = _tmp98_;
-#line 1919 "PublishingUI.c"
+#line 1898 "PublishingUI.c"
 				} else {
 					const gchar* _tmp99_ = NULL;
 					const gchar* _tmp100_ = NULL;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp99_ = last_used_service;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp100_ = curr_service_id;
-#line 242 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (g_strcmp0 (_tmp99_, _tmp100_) == 0) {
-#line 1929 "PublishingUI.c"
+#line 1908 "PublishingUI.c"
 						GtkComboBox* _tmp101_ = NULL;
 						GtkTreeIter _tmp102_ = {0};
-#line 243 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp101_ = self->priv->service_selector_box;
-#line 243 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp102_ = iter;
-#line 243 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 248 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						gtk_combo_box_set_active_iter (_tmp101_, &_tmp102_);
-#line 1938 "PublishingUI.c"
+#line 1917 "PublishingUI.c"
 					}
 				}
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_free0 (curr_service_id);
-#line 219 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 224 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 1945 "PublishingUI.c"
+#line 1924 "PublishingUI.c"
 			}
 		}
 	}
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp103_ = self->priv->service_selector_box;
-#line 247 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_signal_connect_object (_tmp103_, "changed", (GCallback) _publishing_ui_publishing_dialog_on_service_changed_gtk_combo_box_changed, self, 0);
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp104_ = use_header;
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (!_tmp104_) {
-#line 1957 "PublishingUI.c"
+#line 1936 "PublishingUI.c"
 		GtkLabel* service_selector_box_label = NULL;
 		const gchar* _tmp105_ = NULL;
 		GtkLabel* _tmp106_ = NULL;
 		GtkLabel* _tmp107_ = NULL;
 		GtkComboBox* _tmp108_ = NULL;
 		GtkLabel* _tmp109_ = NULL;
-		GtkAlignment* service_selector_box_wrapper = NULL;
-		GtkAlignment* _tmp110_ = NULL;
-		GtkAlignment* _tmp111_ = NULL;
+		GtkLabel* _tmp110_ = NULL;
+		GtkComboBox* _tmp111_ = NULL;
 		GtkComboBox* _tmp112_ = NULL;
+		GtkComboBox* _tmp113_ = NULL;
+		GtkComboBox* _tmp114_ = NULL;
 		GtkBox* service_selector_layouter = NULL;
-		GtkBox* _tmp113_ = NULL;
-		GtkBox* _tmp114_ = NULL;
 		GtkBox* _tmp115_ = NULL;
-		GtkLabel* _tmp116_ = NULL;
+		GtkBox* _tmp116_ = NULL;
 		GtkBox* _tmp117_ = NULL;
-		GtkAlignment* _tmp118_ = NULL;
-		GtkBox* service_area_layouter = NULL;
-		GtkBox* _tmp119_ = NULL;
+		GtkBox* _tmp118_ = NULL;
+		GtkLabel* _tmp119_ = NULL;
 		GtkBox* _tmp120_ = NULL;
-		GtkBox* _tmp121_ = NULL;
+		GtkComboBox* _tmp121_ = NULL;
+		GtkBox* service_area_layouter = NULL;
 		GtkBox* _tmp122_ = NULL;
-		GtkSeparator* _tmp123_ = NULL;
-		GtkSeparator* _tmp124_ = NULL;
-		GtkAlignment* service_area_wrapper = NULL;
-		GtkAlignment* _tmp125_ = NULL;
-		GtkAlignment* _tmp126_ = NULL;
-		GtkBox* _tmp127_ = NULL;
+		GtkBox* _tmp123_ = NULL;
+		GtkBox* _tmp124_ = NULL;
+		GtkBox* _tmp125_ = NULL;
+		GtkSeparator* _tmp126_ = NULL;
+		GtkSeparator* _tmp127_ = NULL;
 		GtkBox* _tmp128_ = NULL;
-		GtkAlignment* _tmp129_ = NULL;
-#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		GtkBox* _tmp129_ = NULL;
+		GtkBox* _tmp130_ = NULL;
+		GtkBox* _tmp131_ = NULL;
+		GtkBox* _tmp132_ = NULL;
+		GtkBox* _tmp133_ = NULL;
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp105_ = label;
-#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp106_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp105_);
-#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_object_ref_sink (_tmp106_);
-#line 251 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 256 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_selector_box_label = _tmp106_;
-#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 257 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp107_ = service_selector_box_label;
-#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 257 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp108_ = self->priv->service_selector_box;
-#line 252 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 257 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_label_set_mnemonic_widget (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget));
-#line 253 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp109_ = service_selector_box_label;
-#line 253 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp110_ = (GtkAlignment*) gtk_alignment_new (1.0f, 0.5f, 0.0f, 0.0f);
+#line 258 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp110_);
+		_tmp110_ = service_selector_box_label;
 #line 259 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_selector_box_wrapper = _tmp110_;
-#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp111_ = service_selector_box_wrapper;
-#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp112_ = self->priv->service_selector_box;
-#line 260 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget));
-#line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp113_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp113_);
-#line 262 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_selector_layouter = _tmp113_;
-#line 263 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp114_ = service_selector_layouter;
-#line 263 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_container_get_type (), GtkContainer), (guint) 12);
-#line 264 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp115_ = service_selector_layouter;
-#line 264 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp116_ = service_selector_box_label;
-#line 264 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_widget_get_type (), GtkWidget));
-#line 265 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp117_ = service_selector_layouter;
+		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
 #line 265 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp118_ = service_selector_box_wrapper;
+		_tmp111_ = self->priv->service_selector_box;
 #line 265 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_box_pack_start (_tmp117_, G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp119_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp119_);
-#line 269 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_area_layouter = _tmp119_;
+		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+#line 266 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp112_ = self->priv->service_selector_box;
+#line 266 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp113_ = self->priv->service_selector_box;
+#line 267 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp113_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp114_ = self->priv->service_selector_box;
+#line 268 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp120_ = service_area_layouter;
+		_tmp115_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 #line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp121_ = service_selector_layouter;
+		g_object_ref_sink (_tmp115_);
 #line 270 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget));
-#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp122_ = service_area_layouter;
-#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp123_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+		service_selector_layouter = _tmp115_;
 #line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp123_);
+		_tmp116_ = service_selector_layouter;
 #line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp124_ = _tmp123_;
-#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp122_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget));
-#line 271 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_g_object_unref0 (_tmp124_);
+		gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, gtk_container_get_type (), GtkContainer), (guint) 12);
+#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp117_ = service_selector_layouter;
+#line 272 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp125_ = (GtkAlignment*) gtk_alignment_new (0.0f, 0.0f, 1.0f, 0.0f);
+		_tmp118_ = service_selector_layouter;
 #line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_object_ref_sink (_tmp125_);
+		_tmp119_ = service_selector_box_label;
 #line 273 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		service_area_wrapper = _tmp125_;
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, gtk_widget_get_type (), GtkWidget));
 #line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp126_ = service_area_wrapper;
+		_tmp120_ = service_selector_layouter;
 #line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp127_ = service_area_layouter;
+		_tmp121_ = self->priv->service_selector_box;
 #line 274 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget));
-#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp128_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp129_ = service_area_wrapper;
-#line 276 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_box_pack_start (_tmp128_, G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_g_object_unref0 (service_area_wrapper);
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_g_object_unref0 (service_area_layouter);
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_g_object_unref0 (service_selector_layouter);
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_g_object_unref0 (service_selector_box_wrapper);
-#line 249 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_g_object_unref0 (service_selector_box_label);
-#line 2092 "PublishingUI.c"
-	}
-#line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp130_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+		gtk_box_pack_start (_tmp120_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp122_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		g_object_ref_sink (_tmp122_);
+#line 278 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		service_area_layouter = _tmp122_;
 #line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_ref_sink (_tmp130_);
+		_tmp123_ = service_area_layouter;
 #line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_g_object_unref0 (self->priv->central_area_layouter);
+		_tmp124_ = service_selector_layouter;
 #line 279 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self->priv->central_area_layouter = _tmp130_;
-#line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp131_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget));
+#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp125_ = service_area_layouter;
+#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp126_ = (GtkSeparator*) gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		g_object_ref_sink (_tmp126_);
+#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp127_ = _tmp126_;
+#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, gtk_widget_get_type (), GtkWidget));
+#line 280 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_g_object_unref0 (_tmp127_);
 #line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp132_ = self->priv->central_area_layouter;
+		_tmp128_ = service_area_layouter;
 #line 281 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_box_pack_start (_tmp131_, G_TYPE_CHECK_INSTANCE_CAST (_tmp132_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp133_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+		gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_FILL);
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp129_ = service_area_layouter;
+#line 282 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp129_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_object_ref_sink (_tmp133_);
+		_tmp130_ = service_area_layouter;
 #line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_g_object_unref0 (self->priv->close_cancel_button);
-#line 283 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	self->priv->close_cancel_button = _tmp133_;
+		gtk_widget_set_hexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp134_ = self->priv->close_cancel_button;
+		_tmp131_ = service_area_layouter;
 #line 284 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp135_ = self->priv->close_cancel_button;
-#line 285 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_signal_connect_object (_tmp135_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+		gtk_widget_set_vexpand (G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), FALSE);
 #line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp136_ = use_header;
+		_tmp132_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	if (_tmp136_) {
-#line 2128 "PublishingUI.c"
-		GtkWidget* _tmp137_ = NULL;
-		GtkButton* _tmp138_ = NULL;
-		GtkWidget* _tmp139_ = NULL;
-		GtkComboBox* _tmp140_ = NULL;
-#line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp137_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp138_ = self->priv->close_cancel_button;
-#line 287 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, gtk_widget_get_type (), GtkWidget));
-#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp139_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp140_ = self->priv->service_selector_box;
-#line 288 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp140_, gtk_widget_get_type (), GtkWidget));
-#line 2145 "PublishingUI.c"
-	} else {
-		GtkWidget* _tmp141_ = NULL;
-		GtkButton* _tmp142_ = NULL;
+		_tmp133_ = service_area_layouter;
+#line 286 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_box_pack_start (_tmp132_, G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_g_object_unref0 (service_area_layouter);
+#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_g_object_unref0 (service_selector_layouter);
+#line 254 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_g_object_unref0 (service_selector_box_label);
+#line 2085 "PublishingUI.c"
+	}
+#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_tmp134_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_object_ref_sink (_tmp134_);
+#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_g_object_unref0 (self->priv->central_area_layouter);
+#line 289 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	self->priv->central_area_layouter = _tmp134_;
 #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp141_ = gtk_dialog_get_action_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp135_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		_tmp142_ = self->priv->close_cancel_button;
+	_tmp136_ = self->priv->central_area_layouter;
 #line 291 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_widget_get_type (), GtkWidget));
-#line 2155 "PublishingUI.c"
-	}
+	gtk_box_pack_start (_tmp135_, G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	publishing_ui_publishing_dialog_set_standard_window_mode (self);
+	_tmp137_ = use_header;
+#line 293 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	if (_tmp137_) {
+#line 2105 "PublishingUI.c"
+		GtkButton* _tmp138_ = NULL;
+		GtkButton* _tmp139_ = NULL;
+		GtkWidget* _tmp140_ = NULL;
+		GtkButton* _tmp141_ = NULL;
+		GtkWidget* _tmp142_ = NULL;
+		GtkComboBox* _tmp143_ = NULL;
+#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp138_ = (GtkButton*) gtk_button_new_with_mnemonic ("_Cancel");
+#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		g_object_ref_sink (_tmp138_);
+#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_g_object_unref0 (self->priv->close_cancel_button);
+#line 294 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		self->priv->close_cancel_button = _tmp138_;
 #line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp139_ = self->priv->close_cancel_button;
+#line 295 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_widget_set_can_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp140_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp141_ = self->priv->close_cancel_button;
+#line 297 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_header_bar_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp140_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_widget_get_type (), GtkWidget));
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp142_ = gtk_dialog_get_header_bar (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp143_ = self->priv->service_selector_box;
+#line 298 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_header_bar_pack_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_header_bar_get_type (), GtkHeaderBar), G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_widget_get_type (), GtkWidget));
+#line 2136 "PublishingUI.c"
+	} else {
+		const gchar* _tmp144_ = NULL;
+		GtkWidget* _tmp145_ = NULL;
+		GtkButton* _tmp146_ = NULL;
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp144_ = _ ("_Cancel");
+#line 301 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), _tmp144_, (gint) GTK_RESPONSE_CANCEL);
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp145_ = gtk_dialog_get_widget_for_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_CANCEL);
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_tmp146_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp145_, gtk_button_get_type ()) ? ((GtkButton*) _tmp145_) : NULL);
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		_g_object_unref0 (self->priv->close_cancel_button);
+#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		self->priv->close_cancel_button = _tmp146_;
+#line 2153 "PublishingUI.c"
+	}
+#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	_tmp147_ = self->priv->close_cancel_button;
+#line 304 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_signal_connect_object (_tmp147_, "clicked", (GCallback) _publishing_ui_publishing_dialog_on_close_cancel_clicked_gtk_button_clicked, self, 0);
+#line 306 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	publishing_ui_publishing_dialog_set_standard_window_mode (self);
+#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services = (_vala_array_free (loaded_services, loaded_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_free0 (last_used_service);
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (renderer_text);
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (renderer_pix);
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_free0 (label);
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_free0 (title);
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return self;
-#line 2175 "PublishingUI.c"
+#line 2177 "PublishingUI.c"
 }
 
 
 PublishingUIPublishingDialog* publishing_ui_publishing_dialog_new (GeeCollection* to_publish) {
-#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 161 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return publishing_ui_publishing_dialog_construct (PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, to_publish);
-#line 2182 "PublishingUI.c"
+#line 2184 "PublishingUI.c"
 }
 
 
 static void _vala_array_add56 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2193 "PublishingUI.c"
+#line 2195 "PublishingUI.c"
 	}
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2199 "PublishingUI.c"
+#line 2201 "PublishingUI.c"
 }
 
 
@@ -2206,30 +2208,30 @@ static gint __lambda15_ (void* a, void* b) {
 	void* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	gint _tmp4_ = 0;
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = a;
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp0_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp2_ = b;
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (*((SpitPublishingService**) _tmp2_), SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp4_ = utf8_cs_compare (_tmp1_, _tmp3_);
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp4_;
-#line 328 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2224 "PublishingUI.c"
+#line 2226 "PublishingUI.c"
 }
 
 
 static gint ___lambda15____compar_fn_t (void* key1, void* key2) {
 	gint result;
 	result = __lambda15_ (key1, key2);
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2233 "PublishingUI.c"
+#line 2235 "PublishingUI.c"
 }
 
 
@@ -2250,41 +2252,41 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 	gint _tmp26__length1 = 0;
 	SpitPublishingService** _tmp27_ = NULL;
 	gint _tmp27__length1 = 0;
-#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = g_new0 (SpitPublishingService*, 0 + 1);
-#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services = _tmp0_;
-#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	loaded_services_length1 = 0;
-#line 299 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 312 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_loaded_services_size_ = loaded_services_length1;
-#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 315 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = plugins_get_pluggables_for_type (SPIT_PUBLISHING_TYPE_SERVICE, NULL, NULL, NULL, FALSE);
-#line 302 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 315 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	pluggables = _tmp1_;
-#line 305 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp2_ = pluggables;
-#line 305 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = gee_collection_get_size (_tmp2_);
-#line 305 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp4_ = _tmp3_;
-#line 305 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_debug ("PublishingUI.vala:305: PublisingDialog: discovered %d pluggable publis" \
+#line 318 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_debug ("PublishingUI.vala:318: PublisingDialog: discovered %d pluggable publis" \
 "hing services.", _tmp4_);
-#line 2274 "PublishingUI.c"
+#line 2276 "PublishingUI.c"
 	{
 		GeeIterator* _pluggable_it = NULL;
 		GeeCollection* _tmp5_ = NULL;
 		GeeIterator* _tmp6_ = NULL;
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = pluggables;
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_pluggable_it = _tmp6_;
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		while (TRUE) {
-#line 2287 "PublishingUI.c"
+#line 2289 "PublishingUI.c"
 			GeeIterator* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			SpitPluggable* pluggable = NULL;
@@ -2303,167 +2305,167 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_all_services
 			gint _tmp22__length1 = 0;
 			SpitPublishingService* _tmp23_ = NULL;
 			SpitPublishingService* _tmp24_ = NULL;
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _pluggable_it;
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp8_ = gee_iterator_next (_tmp7_);
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (!_tmp8_) {
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				break;
-#line 2314 "PublishingUI.c"
+#line 2316 "PublishingUI.c"
 			}
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp9_ = _pluggable_it;
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp10_ = gee_iterator_get (_tmp9_);
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			pluggable = (SpitPluggable*) _tmp10_;
-#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 321 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp11_ = pluggable;
-#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 321 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp12_ = spit_pluggable_get_pluggable_interface (_tmp11_, SPIT_PUBLISHING_CURRENT_INTERFACE, SPIT_PUBLISHING_CURRENT_INTERFACE);
-#line 308 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 321 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			pluggable_interface = _tmp12_;
-#line 310 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp13_ = pluggable_interface;
-#line 310 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			if (_tmp13_ != SPIT_PUBLISHING_CURRENT_INTERFACE) {
-#line 2332 "PublishingUI.c"
+#line 2334 "PublishingUI.c"
 				SpitPluggable* _tmp14_ = NULL;
 				gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
 				gint _tmp17_ = 0;
-#line 311 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp14_ = pluggable;
-#line 311 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp15_ = plugins_get_pluggable_module_id (_tmp14_);
-#line 311 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp16_ = _tmp15_;
-#line 311 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp17_ = pluggable_interface;
-#line 311 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-				g_warning ("PublishingUI.vala:311: Unable to load publisher %s: reported interface" \
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+				g_warning ("PublishingUI.vala:324: Unable to load publisher %s: reported interface" \
 " %d.", _tmp16_, _tmp17_);
-#line 311 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 324 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_free0 (_tmp16_);
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (pluggable);
-#line 314 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				continue;
-#line 2353 "PublishingUI.c"
+#line 2355 "PublishingUI.c"
 			}
-#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 330 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp18_ = pluggable;
-#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 330 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_SERVICE, SpitPublishingService));
-#line 317 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 330 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp19_;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 333 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp20_ = service;
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 333 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp21_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-			g_debug ("PublishingUI.vala:320: PublishingDialog: discovered pluggable publishi" \
+#line 333 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+			g_debug ("PublishingUI.vala:333: PublishingDialog: discovered pluggable publishi" \
 "ng service '%s'.", _tmp21_);
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp22_ = loaded_services;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp22__length1 = loaded_services_length1;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp23_ = service;
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 323 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_vala_array_add56 (&loaded_services, &loaded_services_length1, &_loaded_services_size_, _tmp24_);
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (service);
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_g_object_unref0 (pluggable);
-#line 2381 "PublishingUI.c"
+#line 2383 "PublishingUI.c"
 		}
-#line 307 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 320 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_pluggable_it);
-#line 2385 "PublishingUI.c"
+#line 2387 "PublishingUI.c"
 	}
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp25_ = loaded_services;
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp25__length1 = loaded_services_length1;
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26_ = loaded_services;
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26__length1 = loaded_services_length1;
-#line 327 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 340 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	qsort (_tmp25_, (gsize) _tmp26__length1, (gsize) sizeof (SpitPublishingService*), ___lambda15____compar_fn_t);
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27_ = loaded_services;
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27__length1 = loaded_services_length1;
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (result_length1) {
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*result_length1 = _tmp27__length1;
-#line 2405 "PublishingUI.c"
+#line 2407 "PublishingUI.c"
 	}
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp27_;
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (pluggables);
-#line 332 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2413 "PublishingUI.c"
+#line 2415 "PublishingUI.c"
 }
 
 
 static void _vala_array_add57 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2424 "PublishingUI.c"
+#line 2426 "PublishingUI.c"
 	}
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2430 "PublishingUI.c"
+#line 2432 "PublishingUI.c"
 }
 
 
 static void _vala_array_add58 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2441 "PublishingUI.c"
+#line 2443 "PublishingUI.c"
 	}
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2447 "PublishingUI.c"
+#line 2449 "PublishingUI.c"
 }
 
 
 static void _vala_array_add59 (SpitPublishingService*** array, int* length, int* size, SpitPublishingService* value) {
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((*length) == (*size)) {
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*array = g_renew (SpitPublishingService*, *array, (*size) + 1);
-#line 2458 "PublishingUI.c"
+#line 2460 "PublishingUI.c"
 	}
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[(*length)++] = value;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	(*array)[*length] = NULL;
-#line 2464 "PublishingUI.c"
+#line 2466 "PublishingUI.c"
 }
 
 
@@ -2484,226 +2486,226 @@ static SpitPublishingService** publishing_ui_publishing_dialog_load_services (gb
 	gint _tmp6__length1 = 0;
 	SpitPublishingService** _tmp32_ = NULL;
 	gint _tmp32__length1 = 0;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = has_photos;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp1_) {
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp0_ = TRUE;
-#line 2491 "PublishingUI.c"
+#line 2493 "PublishingUI.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = has_videos;
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp0_ = _tmp2_;
-#line 2498 "PublishingUI.c"
+#line 2500 "PublishingUI.c"
 	}
-#line 336 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 349 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_vala_assert (_tmp0_, "has_photos || has_videos");
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = g_new0 (SpitPublishingService*, 0 + 1);
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	filtered_services = _tmp3_;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	filtered_services_length1 = 0;
-#line 338 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_filtered_services_size_ = filtered_services_length1;
-#line 339 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp5_ = publishing_ui_publishing_dialog_load_all_services (&_tmp4_);
-#line 339 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	all_services = _tmp5_;
-#line 339 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	all_services_length1 = _tmp4_;
-#line 339 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_all_services_size_ = all_services_length1;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6_ = all_services;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6__length1 = all_services_length1;
-#line 2522 "PublishingUI.c"
+#line 2524 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
 		gint _service_collection_size_ = 0;
 		gint service_it = 0;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection = _tmp6_;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection_length1 = _tmp6__length1;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp6__length1; service_it = service_it + 1) {
-#line 2534 "PublishingUI.c"
+#line 2536 "PublishingUI.c"
 			SpitPublishingService* _tmp7_ = NULL;
 			SpitPublishingService* service = NULL;
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _g_object_ref0 (service_collection[service_it]);
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp7_;
-#line 2541 "PublishingUI.c"
+#line 2543 "PublishingUI.c"
 			{
 				gboolean _tmp8_ = FALSE;
 				gboolean _tmp9_ = FALSE;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp9_ = has_photos;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp9_) {
-#line 2549 "PublishingUI.c"
+#line 2551 "PublishingUI.c"
 					gboolean _tmp10_ = FALSE;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp10_ = has_videos;
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp8_ = !_tmp10_;
-#line 2555 "PublishingUI.c"
+#line 2557 "PublishingUI.c"
 				} else {
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp8_ = FALSE;
-#line 2559 "PublishingUI.c"
+#line 2561 "PublishingUI.c"
 				}
-#line 343 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (_tmp8_) {
-#line 2563 "PublishingUI.c"
+#line 2565 "PublishingUI.c"
 					SpitPublishingService* _tmp11_ = NULL;
 					SpitPublishingPublisherMediaType _tmp12_ = 0;
-#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp11_ = service;
-#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp12_ = spit_publishing_service_get_supported_media (_tmp11_);
-#line 344 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 357 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if ((_tmp12_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2572 "PublishingUI.c"
+#line 2574 "PublishingUI.c"
 						SpitPublishingService** _tmp13_ = NULL;
 						gint _tmp13__length1 = 0;
 						SpitPublishingService* _tmp14_ = NULL;
 						SpitPublishingService* _tmp15_ = NULL;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp13_ = filtered_services;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp13__length1 = filtered_services_length1;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp14_ = service;
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 345 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 358 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_vala_array_add57 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp15_);
-#line 2587 "PublishingUI.c"
+#line 2589 "PublishingUI.c"
 					}
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gboolean _tmp17_ = FALSE;
-#line 346 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp17_ = has_photos;
-#line 346 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (!_tmp17_) {
-#line 2596 "PublishingUI.c"
+#line 2598 "PublishingUI.c"
 						gboolean _tmp18_ = FALSE;
-#line 346 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp18_ = has_videos;
-#line 346 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp16_ = _tmp18_;
-#line 2602 "PublishingUI.c"
+#line 2604 "PublishingUI.c"
 					} else {
-#line 346 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp16_ = FALSE;
-#line 2606 "PublishingUI.c"
+#line 2608 "PublishingUI.c"
 					}
-#line 346 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 359 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					if (_tmp16_) {
-#line 2610 "PublishingUI.c"
+#line 2612 "PublishingUI.c"
 						SpitPublishingService* _tmp19_ = NULL;
 						SpitPublishingPublisherMediaType _tmp20_ = 0;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp19_ = service;
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp20_ = spit_publishing_service_get_supported_media (_tmp19_);
-#line 347 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 360 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if ((_tmp20_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0) {
-#line 2619 "PublishingUI.c"
+#line 2621 "PublishingUI.c"
 							SpitPublishingService** _tmp21_ = NULL;
 							gint _tmp21__length1 = 0;
 							SpitPublishingService* _tmp22_ = NULL;
 							SpitPublishingService* _tmp23_ = NULL;
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp21_ = filtered_services;
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp21__length1 = filtered_services_length1;
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp22_ = service;
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 348 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 361 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_vala_array_add58 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp23_);
-#line 2634 "PublishingUI.c"
+#line 2636 "PublishingUI.c"
 						}
 					} else {
 						gboolean _tmp24_ = FALSE;
 						SpitPublishingService* _tmp25_ = NULL;
 						SpitPublishingPublisherMediaType _tmp26_ = 0;
-#line 350 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp25_ = service;
-#line 350 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						_tmp26_ = spit_publishing_service_get_supported_media (_tmp25_);
-#line 350 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if ((_tmp26_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 2646 "PublishingUI.c"
+#line 2648 "PublishingUI.c"
 							SpitPublishingService* _tmp27_ = NULL;
 							SpitPublishingPublisherMediaType _tmp28_ = 0;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp27_ = service;
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp28_ = spit_publishing_service_get_supported_media (_tmp27_);
-#line 351 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 364 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp24_ = (_tmp28_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 2655 "PublishingUI.c"
+#line 2657 "PublishingUI.c"
 						} else {
-#line 350 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp24_ = FALSE;
-#line 2659 "PublishingUI.c"
+#line 2661 "PublishingUI.c"
 						}
-#line 350 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 363 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 						if (_tmp24_) {
-#line 2663 "PublishingUI.c"
+#line 2665 "PublishingUI.c"
 							SpitPublishingService** _tmp29_ = NULL;
 							gint _tmp29__length1 = 0;
 							SpitPublishingService* _tmp30_ = NULL;
 							SpitPublishingService* _tmp31_ = NULL;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp29_ = filtered_services;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp29__length1 = filtered_services_length1;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp30_ = service;
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_tmp31_ = _g_object_ref0 (_tmp30_);
-#line 352 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 365 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 							_vala_array_add59 (&filtered_services, &filtered_services_length1, &_filtered_services_size_, _tmp31_);
-#line 2678 "PublishingUI.c"
+#line 2680 "PublishingUI.c"
 						}
 					}
 				}
-#line 341 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 354 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 2684 "PublishingUI.c"
+#line 2686 "PublishingUI.c"
 			}
 		}
 	}
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp32_ = filtered_services;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp32__length1 = filtered_services_length1;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (result_length1) {
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		*result_length1 = _tmp32__length1;
-#line 2696 "PublishingUI.c"
+#line 2698 "PublishingUI.c"
 	}
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp32_;
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	all_services = (_vala_array_free (all_services, all_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 356 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 369 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2704 "PublishingUI.c"
+#line 2706 "PublishingUI.c"
 }
 
 
@@ -2734,208 +2736,208 @@ void publishing_ui_publishing_dialog_go (GeeCollection* to_publish) {
 	PublishingUIPublishingDialog* _tmp29_ = NULL;
 	PublishingUIPublishingDialog* _tmp30_ = NULL;
 	GTimer* _tmp31_ = NULL;
-#line 370 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (to_publish));
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 384 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = publishing_ui_publishing_dialog_active_instance;
-#line 371 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 384 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp0_ != NULL) {
-#line 372 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 385 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		return;
-#line 2743 "PublishingUI.c"
+#line 2745 "PublishingUI.c"
 	}
-#line 374 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = publishing_ui_publishing_dialog_since_last_start;
-#line 374 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp1_ == NULL) {
-#line 2749 "PublishingUI.c"
+#line 2751 "PublishingUI.c"
 		GTimer* _tmp2_ = NULL;
 		GTimer* _tmp3_ = NULL;
 		GTimer* _tmp4_ = NULL;
-#line 377 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 390 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = g_timer_new ();
-#line 377 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 390 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_timer_destroy0 (publishing_ui_publishing_dialog_since_last_start);
-#line 377 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 390 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_since_last_start = _tmp2_;
-#line 378 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp3_ = publishing_ui_publishing_dialog_since_last_start;
-#line 378 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_timer_stop (_tmp3_);
-#line 379 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = publishing_ui_publishing_dialog_since_last_start;
-#line 379 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 392 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		g_timer_reset (_tmp4_);
-#line 380 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 393 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_elapsed_is_valid = FALSE;
-#line 2769 "PublishingUI.c"
+#line 2771 "PublishingUI.c"
 	} else {
 		gdouble elapsed = 0.0;
 		GTimer* _tmp5_ = NULL;
 		gdouble _tmp6_ = 0.0;
 		gboolean _tmp7_ = FALSE;
 		gdouble _tmp8_ = 0.0;
-#line 382 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = publishing_ui_publishing_dialog_since_last_start;
-#line 382 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp6_ = g_timer_elapsed (_tmp5_, NULL);
-#line 382 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 395 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		elapsed = _tmp6_;
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp8_ = elapsed;
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp8_ < 0.05) {
-#line 2786 "PublishingUI.c"
+#line 2788 "PublishingUI.c"
 			gboolean _tmp9_ = FALSE;
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp9_ = publishing_ui_publishing_dialog_elapsed_is_valid;
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = _tmp9_;
-#line 2792 "PublishingUI.c"
+#line 2794 "PublishingUI.c"
 		} else {
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp7_ = FALSE;
-#line 2796 "PublishingUI.c"
+#line 2798 "PublishingUI.c"
 		}
-#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 396 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if (_tmp7_) {
-#line 384 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			return;
-#line 2802 "PublishingUI.c"
+#line 2804 "PublishingUI.c"
 		}
 	}
-#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp10_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 387 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 400 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	photos = _tmp10_;
-#line 388 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp11_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 388 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	videos = _tmp11_;
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp12_ = to_publish;
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp13_ = photos;
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14_ = videos;
-#line 389 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 402 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	media_source_collection_filter_media (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp15_ = photos;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp16_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp17_ = _tmp16_;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp18_ = videos;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp19_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp20_ = _tmp19_;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp22_ = publishing_ui_publishing_dialog_load_services (_tmp17_ > 0, _tmp20_ > 0, &_tmp21_);
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	avail_services = _tmp22_;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	avail_services_length1 = _tmp21_;
-#line 391 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 404 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_avail_services_size_ = avail_services_length1;
-#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp23_ = avail_services;
-#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp23__length1 = avail_services_length1;
-#line 394 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp23__length1 == 0) {
-#line 2847 "PublishingUI.c"
+#line 2849 "PublishingUI.c"
 		const gchar* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
 		gchar* _tmp27_ = NULL;
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp24_ = _ ("Unable to publish");
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp25_ = _ ("Shotwell cannot publish the selected items because you do not have a c" \
 "ompatible publishing plugin enabled. To correct this, choose <b>Edit %" \
 "s Preferences</b> and enable one or more of the publishing plugins on " \
 "the <b>Plugins</b> tab.");
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp26_ = g_strdup_printf (_tmp25_, "▸");
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp27_ = _tmp26_;
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		app_window_error_message_with_title (_tmp24_, _tmp27_, NULL, FALSE);
-#line 397 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 410 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_free0 (_tmp27_);
-#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (videos);
-#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (photos);
-#line 401 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 414 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		return;
-#line 2872 "PublishingUI.c"
+#line 2874 "PublishingUI.c"
 	}
-#line 407 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_debug ("PublishingUI.vala:407: PublishingDialog.go( )");
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 420 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_debug ("PublishingUI.vala:420: PublishingDialog.go( )");
+#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp28_ = to_publish;
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp29_ = publishing_ui_publishing_dialog_new (_tmp28_);
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_object_ref_sink (_tmp29_);
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
-#line 409 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_active_instance = _tmp29_;
-#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp30_ = publishing_ui_publishing_dialog_active_instance;
-#line 411 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_run (_tmp30_);
-#line 413 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (publishing_ui_publishing_dialog_active_instance);
-#line 413 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_active_instance = NULL;
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp31_ = publishing_ui_publishing_dialog_since_last_start;
-#line 416 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_timer_start (_tmp31_);
-#line 417 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 430 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_elapsed_is_valid = TRUE;
-#line 370 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	avail_services = (_vala_array_free (avail_services, avail_services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 370 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (videos);
-#line 370 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 383 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (photos);
-#line 2906 "PublishingUI.c"
+#line 2908 "PublishingUI.c"
 }
 
 
 static gboolean publishing_ui_publishing_dialog_on_window_close (PublishingUIPublishingDialog* self, GdkEventAny* evt) {
 	gboolean result = FALSE;
 	SpitPublishingConcretePublishingHost* _tmp0_ = NULL;
-#line 420 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), FALSE);
-#line 420 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 433 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (evt != NULL, FALSE);
-#line 421 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 434 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->host;
-#line 421 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 434 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
-#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 422 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->host = NULL;
-#line 423 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 436 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 424 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = TRUE;
-#line 426 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 439 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 2933 "PublishingUI.c"
+#line 2935 "PublishingUI.c"
 }
 
 
@@ -2971,253 +2973,253 @@ static void publishing_ui_publishing_dialog_on_service_changed (PublishingUIPubl
 	gint _tmp27__length1 = 0;
 	SpitPublishingConcretePublishingHost* _tmp28_ = NULL;
 	SpitPublishingConcretePublishingHost* _tmp29_ = NULL;
-#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 431 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	have_active_iter = FALSE;
-#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	iter = _tmp1_;
-#line 432 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 445 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	have_active_iter = _tmp2_;
-#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp3_ = have_active_iter;
-#line 435 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (!_tmp3_) {
-#line 2985 "PublishingUI.c"
+#line 2987 "PublishingUI.c"
 		GtkComboBox* _tmp4_ = NULL;
 		GtkComboBox* _tmp5_ = NULL;
 		GtkTreeIter _tmp6_ = {0};
-#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = self->priv->service_selector_box;
-#line 437 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_combo_box_set_active (_tmp4_, 0);
-#line 440 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = self->priv->service_selector_box;
-#line 440 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_combo_box_get_active_iter (_tmp5_, &_tmp6_);
-#line 440 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		iter = _tmp6_;
-#line 2999 "PublishingUI.c"
+#line 3001 "PublishingUI.c"
 	}
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp7_ = self->priv->service_selector_box_model;
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp8_ = iter;
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp8_, 1, &_tmp9_);
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 444 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 457 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	service_name_val = _tmp9_;
-#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp10_ = service_name_val;
-#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp11_ = g_strdup (g_value_get_string (&_tmp10_));
-#line 446 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 459 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	service_name = _tmp11_;
-#line 448 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	selected_service = NULL;
-#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp13_ = publishing_ui_publishing_dialog_load_all_services (&_tmp12_);
-#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	services = _tmp13_;
-#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	services_length1 = _tmp12_;
-#line 449 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 462 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_services_size_ = services_length1;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14_ = services;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14__length1 = services_length1;
-#line 3031 "PublishingUI.c"
+#line 3033 "PublishingUI.c"
 	{
 		SpitPublishingService** service_collection = NULL;
 		gint service_collection_length1 = 0;
 		gint _service_collection_size_ = 0;
 		gint service_it = 0;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection = _tmp14_;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		service_collection_length1 = _tmp14__length1;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		for (service_it = 0; service_it < _tmp14__length1; service_it = service_it + 1) {
-#line 3043 "PublishingUI.c"
+#line 3045 "PublishingUI.c"
 			SpitPublishingService* _tmp15_ = NULL;
 			SpitPublishingService* service = NULL;
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			_tmp15_ = _g_object_ref0 (service_collection[service_it]);
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			service = _tmp15_;
-#line 3050 "PublishingUI.c"
+#line 3052 "PublishingUI.c"
 			{
 				SpitPublishingService* _tmp16_ = NULL;
 				const gchar* _tmp17_ = NULL;
 				const gchar* _tmp18_ = NULL;
-#line 451 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp16_ = service;
-#line 451 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp17_ = spit_pluggable_get_pluggable_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 451 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_tmp18_ = service_name;
-#line 451 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 3063 "PublishingUI.c"
+#line 3065 "PublishingUI.c"
 					SpitPublishingService* _tmp19_ = NULL;
 					SpitPublishingService* _tmp20_ = NULL;
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp19_ = service;
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (selected_service);
-#line 452 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					selected_service = _tmp20_;
-#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					_g_object_unref0 (service);
-#line 453 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 466 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 					break;
-#line 3078 "PublishingUI.c"
+#line 3080 "PublishingUI.c"
 				}
-#line 450 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 463 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 				_g_object_unref0 (service);
-#line 3082 "PublishingUI.c"
+#line 3084 "PublishingUI.c"
 			}
 		}
 	}
-#line 456 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp21_ = selected_service;
-#line 456 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_vala_assert (_tmp21_ != NULL, "selected_service != null");
-#line 458 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp22_ = config_facade_get_instance ();
-#line 458 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp23_ = _tmp22_;
-#line 458 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp24_ = selected_service;
-#line 458 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp25_ = spit_pluggable_get_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 458 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	configuration_facade_set_last_used_service (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp25_);
-#line 458 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 471 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (_tmp23_);
-#line 460 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp26_ = selected_service;
-#line 460 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27_ = self->priv->publishables;
-#line 460 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp27__length1 = self->priv->publishables_length1;
-#line 460 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp28_ = spit_publishing_concrete_publishing_host_new (_tmp26_, self, _tmp27_, _tmp27__length1);
-#line 460 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 460 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->host = _tmp28_;
-#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 474 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp29_ = self->priv->host;
-#line 461 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 474 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_concrete_publishing_host_start_publishing (_tmp29_);
-#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	services = (_vala_array_free (services, services_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (selected_service);
-#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_free0 (service_name);
-#line 429 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 442 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_IS_VALUE (&service_name_val) ? (g_value_unset (&service_name_val), NULL) : NULL;
-#line 3126 "PublishingUI.c"
+#line 3128 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_on_close_cancel_clicked (PublishingUIPublishingDialog* self) {
 	SpitPublishingConcretePublishingHost* _tmp0_ = NULL;
-#line 464 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 465 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_debug ("PublishingUI.vala:465: PublishingDialog: on_close_cancel_clicked( ): i" \
+#line 478 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_debug ("PublishingUI.vala:478: PublishingDialog: on_close_cancel_clicked( ): i" \
 "nvoked.");
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->host;
-#line 467 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_plugin_host_stop_publishing (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_PUBLISHING_TYPE_PLUGIN_HOST, SpitPublishingPluginHost));
-#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 468 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->host = NULL;
-#line 469 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 470 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 483 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 3148 "PublishingUI.c"
+#line 3150 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_large_window_mode (PublishingUIPublishingDialog* self) {
 	GtkBox* _tmp0_ = NULL;
-#line 473 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 486 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 474 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 487 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT);
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 475 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_LARGE_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
-#line 477 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 490 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3164 "PublishingUI.c"
+#line 3166 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_colossal_window_mode (PublishingUIPublishingDialog* self) {
 	GtkBox* _tmp0_ = NULL;
-#line 480 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 493 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 481 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 494 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT);
-#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 482 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_COLOSSAL_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
-#line 484 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 497 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3180 "PublishingUI.c"
+#line 3182 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_standard_window_mode (PublishingUIPublishingDialog* self) {
 	GtkBox* _tmp0_ = NULL;
-#line 487 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 500 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 488 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 501 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT);
-#line 489 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->central_area_layouter;
-#line 489 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_WIDTH - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_WIDTH, PUBLISHING_UI_PUBLISHING_DIALOG_STANDARD_WINDOW_HEIGHT - PUBLISHING_UI_PUBLISHING_DIALOG_BORDER_REGION_HEIGHT);
-#line 491 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 504 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3196 "PublishingUI.c"
+#line 3198 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_set_free_sizable_window_mode (PublishingUIPublishingDialog* self) {
-#line 494 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 507 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 495 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 508 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 3205 "PublishingUI.c"
+#line 3207 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_clear_free_sizable_window_mode (PublishingUIPublishingDialog* self) {
-#line 498 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 511 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 499 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 3214 "PublishingUI.c"
+#line 3216 "PublishingUI.c"
 }
 
 
@@ -3225,17 +3227,17 @@ SpitPublishingDialogPane* publishing_ui_publishing_dialog_get_active_pane (Publi
 	SpitPublishingDialogPane* result = NULL;
 	SpitPublishingDialogPane* _tmp0_ = NULL;
 	SpitPublishingDialogPane* _tmp1_ = NULL;
-#line 502 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 515 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), NULL);
-#line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->active_pane;
-#line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _tmp1_;
-#line 503 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 3232 "PublishingUI.c"
+#line 3234 "PublishingUI.c"
 }
 
 
@@ -3243,58 +3245,58 @@ void publishing_ui_publishing_dialog_set_close_button_mode (PublishingUIPublishi
 	GtkButton* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GtkButton* _tmp2_ = NULL;
-#line 506 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 519 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 507 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
-#line 507 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = _ ("_Close");
-#line 507 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_button_set_label (_tmp0_, _tmp1_);
-#line 508 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp2_ = self->priv->close_cancel_button;
-#line 508 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 521 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 3252 "PublishingUI.c"
+#line 3254 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_set_cancel_button_mode (PublishingUIPublishingDialog* self) {
 	GtkButton* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 511 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 524 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->close_cancel_button;
-#line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp1_ = _ ("_Cancel");
-#line 512 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 525 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_button_set_label (_tmp0_, _tmp1_);
-#line 3267 "PublishingUI.c"
+#line 3269 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_lock_service (PublishingUIPublishingDialog* self) {
 	GtkComboBox* _tmp0_ = NULL;
-#line 515 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 528 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 516 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3279 "PublishingUI.c"
+#line 3281 "PublishingUI.c"
 }
 
 
 void publishing_ui_publishing_dialog_unlock_service (PublishingUIPublishingDialog* self) {
 	GtkComboBox* _tmp0_ = NULL;
-#line 519 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 532 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->service_selector_box;
-#line 520 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3291 "PublishingUI.c"
+#line 3293 "PublishingUI.c"
 }
 
 
@@ -3312,110 +3314,110 @@ void publishing_ui_publishing_dialog_install_pane (PublishingUIPublishingDialog*
 	SpitPublishingDialogPane* _tmp15_ = NULL;
 	SpitPublishingDialogPane* _tmp16_ = NULL;
 	SpitPublishingDialogPane* _tmp17_ = NULL;
-#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self));
-#line 523 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (pane));
-#line 524 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	g_debug ("PublishingUI.vala:524: PublishingDialog: install_pane( ): invoked.");
-#line 526 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 537 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+	g_debug ("PublishingUI.vala:537: PublishingDialog: install_pane( ): invoked.");
+#line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = self->priv->active_pane;
-#line 526 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if (_tmp0_ != NULL) {
-#line 3319 "PublishingUI.c"
+#line 3321 "PublishingUI.c"
 		SpitPublishingDialogPane* _tmp1_ = NULL;
 		GtkBox* _tmp2_ = NULL;
 		SpitPublishingDialogPane* _tmp3_ = NULL;
 		GtkWidget* _tmp4_ = NULL;
 		GtkWidget* _tmp5_ = NULL;
-#line 527 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-		g_debug ("PublishingUI.vala:527: PublishingDialog: install_pane( ): a pane is al" \
+#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+		g_debug ("PublishingUI.vala:540: PublishingDialog: install_pane( ): a pane is al" \
 "ready installed; removing it.");
-#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 542 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp1_ = self->priv->active_pane;
-#line 529 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 542 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		spit_publishing_dialog_pane_on_pane_uninstalled (_tmp1_);
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp2_ = self->priv->central_area_layouter;
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp3_ = self->priv->active_pane;
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp4_ = spit_publishing_dialog_pane_get_widget (_tmp3_);
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp5_ = _tmp4_;
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), _tmp5_);
-#line 530 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_g_object_unref0 (_tmp5_);
-#line 3343 "PublishingUI.c"
+#line 3345 "PublishingUI.c"
 	}
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp6_ = self->priv->central_area_layouter;
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp7_ = pane;
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp8_ = spit_publishing_dialog_pane_get_widget (_tmp7_);
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp9_ = _tmp8_;
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_box_pack_start (_tmp6_, _tmp9_, TRUE, TRUE, (guint) 0);
-#line 533 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (_tmp9_);
-#line 534 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 547 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp10_ = pane;
-#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp11_ = spit_publishing_dialog_pane_get_preferred_geometry (_tmp10_);
-#line 536 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 549 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	geometry_options = _tmp11_;
-#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp12_ = geometry_options;
-#line 538 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((_tmp12_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_EXTENDED_SIZE) != 0) {
-#line 539 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 552 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_set_large_window_mode (self);
-#line 3371 "PublishingUI.c"
+#line 3373 "PublishingUI.c"
 	} else {
 		SpitPublishingDialogPaneGeometryOptions _tmp13_ = 0;
-#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		_tmp13_ = geometry_options;
-#line 540 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 553 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		if ((_tmp13_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_COLOSSAL_SIZE) != 0) {
-#line 541 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			publishing_ui_publishing_dialog_set_colossal_window_mode (self);
-#line 3380 "PublishingUI.c"
+#line 3382 "PublishingUI.c"
 		} else {
-#line 543 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 556 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 			publishing_ui_publishing_dialog_set_standard_window_mode (self);
-#line 3384 "PublishingUI.c"
+#line 3386 "PublishingUI.c"
 		}
 	}
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp14_ = geometry_options;
-#line 545 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 558 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	if ((_tmp14_ & SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE) != 0) {
-#line 546 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 559 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_set_free_sizable_window_mode (self);
-#line 3393 "PublishingUI.c"
+#line 3395 "PublishingUI.c"
 	} else {
-#line 548 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 		publishing_ui_publishing_dialog_clear_free_sizable_window_mode (self);
-#line 3397 "PublishingUI.c"
+#line 3399 "PublishingUI.c"
 	}
-#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp15_ = pane;
-#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->active_pane);
-#line 550 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 563 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->active_pane = _tmp16_;
-#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 564 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp17_ = pane;
-#line 551 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 564 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_publishing_dialog_pane_on_pane_installed (_tmp17_);
-#line 3411 "PublishingUI.c"
+#line 3413 "PublishingUI.c"
 }
 
 
@@ -3423,67 +3425,67 @@ gint publishing_ui_publishing_dialog_run (PublishingUIPublishingDialog* self) {
 	gint result = 0;
 	gint _result_ = 0;
 	gint _tmp0_ = 0;
-#line 554 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 567 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_return_val_if_fail (PUBLISHING_UI_IS_PUBLISHING_DIALOG (self), 0);
-#line 555 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 568 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_on_service_changed (self);
-#line 557 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 570 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 557 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 570 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_result_ = _tmp0_;
-#line 559 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 559 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 572 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->host = NULL;
-#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	result = _result_;
-#line 561 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 574 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	return result;
-#line 3435 "PublishingUI.c"
+#line 3437 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_class_init (PublishingUIPublishingDialogClass * klass) {
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	publishing_ui_publishing_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	g_type_class_add_private (klass, sizeof (PublishingUIPublishingDialogPrivate));
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_ui_publishing_dialog_finalize;
-#line 3446 "PublishingUI.c"
+#line 3448 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_instance_init (PublishingUIPublishingDialog * self) {
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv = PUBLISHING_UI_PUBLISHING_DIALOG_GET_PRIVATE (self);
-#line 3453 "PublishingUI.c"
+#line 3455 "PublishingUI.c"
 }
 
 
 static void publishing_ui_publishing_dialog_finalize (GObject* obj) {
 	PublishingUIPublishingDialog * self;
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_UI_TYPE_PUBLISHING_DIALOG, PublishingUIPublishingDialog);
-#line 147 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 152 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box_model);
-#line 148 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 153 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->service_selector_box);
-#line 149 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 154 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->central_area_layouter);
-#line 150 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 155 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->close_cancel_button);
-#line 151 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 156 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->active_pane);
-#line 152 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 157 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 153 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 158 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	_g_object_unref0 (self->priv->host);
-#line 154 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 159 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	spit_pluggable_info_destroy (&self->priv->info);
-#line 132 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
+#line 137 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	G_OBJECT_CLASS (publishing_ui_publishing_dialog_parent_class)->finalize (obj);
-#line 3479 "PublishingUI.c"
+#line 3481 "PublishingUI.c"
 }
 
 
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index c0c3a34..8303f40 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -100,19 +100,24 @@ public class SuccessPane : StaticMessagePane {
 
         // Here, we check whether more than one item is being uploaded, and if so, display
         // an alternate message.
-        if(num_uploaded > 1) {
-            if (published_media == (Spit.Publishing.Publisher.MediaType.PHOTO | Spit.Publishing.Publisher.MediaType.VIDEO))
-                message_string = _("The selected photos/videos were successfully published.");
-            else if (published_media == Spit.Publishing.Publisher.MediaType.VIDEO)
-                message_string = _("The selected videos were successfully published.");
-            else
-                message_string = _("The selected photos were successfully published.");
-        } else {
-            if (published_media == Spit.Publishing.Publisher.MediaType.VIDEO)
-                message_string = _("The selected video was successfully published.");
-            else
-                message_string = _("The selected photo was successfully published.");
+        if (published_media == Spit.Publishing.Publisher.MediaType.VIDEO) {
+            message_string = ngettext ("The selected video was successfully published.",
+                                       "The selected videos were successfully published.",
+                                       num_uploaded);
+        }
+        else if (published_media == Spit.Publishing.Publisher.MediaType.PHOTO) {
+            message_string = ngettext ("The selected video was successfully published.",
+                                       "The selected videos were successfully published.",
+                                       num_uploaded);
+        }
+        else if (published_media == (Spit.Publishing.Publisher.MediaType.PHOTO
+                                     | Spit.Publishing.Publisher.MediaType.VIDEO)) {
+            message_string = _("The selected photos/videos were successfully published.");
         }
+        else {
+            assert_not_reached ();
+        }
+
         base(message_string);
     }
 }
@@ -156,15 +161,15 @@ public class PublishingDialog : Gtk.Dialog {
     protected PublishingDialog(Gee.Collection<MediaSource> to_publish) {
         assert(to_publish.size > 0);
 
-        bool use_header;
+        bool use_header = false;
         Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header);
         Object(use_header_bar: use_header ? 1 : 0);
         if (use_header)
             ((Gtk.HeaderBar) get_header_bar()).set_show_close_button(false);
-        
+
         resizable = false;
         delete_event.connect(on_window_close);
-        
+
         publishables = new Spit.Publishing.Publishable[0];
         bool has_photos = false;
         bool has_videos = false;
@@ -250,45 +255,53 @@ public class PublishingDialog : Gtk.Dialog {
         {
             var service_selector_box_label = new Gtk.Label.with_mnemonic(label);
             service_selector_box_label.set_mnemonic_widget(service_selector_box);
-            service_selector_box_label.set_alignment(0.0f, 0.5f);
+            service_selector_box_label.halign = Gtk.Align.START;
+            service_selector_box_label.valign = Gtk.Align.CENTER;
 
             /* the wrapper is not an extraneous widget -- it's necessary to prevent the service
                selection box from growing and shrinking whenever its parent's size changes.
                When wrapped inside a Gtk.Alignment, the Alignment grows and shrinks instead of
                the service selection box. */
-            Gtk.Alignment service_selector_box_wrapper = new Gtk.Alignment(1.0f, 0.5f, 0.0f, 0.0f);
-            service_selector_box_wrapper.add(service_selector_box);
+            service_selector_box.halign = Gtk.Align.END;
+            service_selector_box.valign = Gtk.Align.CENTER;
+            service_selector_box.hexpand = false;
+            service_selector_box.vexpand = false;
 
             Gtk.Box service_selector_layouter = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 8);
             service_selector_layouter.set_border_width(12);
+            service_selector_layouter.hexpand = true;
             service_selector_layouter.add(service_selector_box_label);
-            service_selector_layouter.pack_start(service_selector_box_wrapper, true, true, 0);
+            service_selector_layouter.pack_start(service_selector_box, true, true, 0);
 
             /* 'service area' is the selector assembly plus the horizontal rule dividing it from the
                rest of the dialog */
             Gtk.Box service_area_layouter = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
             service_area_layouter.add(service_selector_layouter);
             service_area_layouter.add(new Gtk.Separator(Gtk.Orientation.HORIZONTAL));
+            service_area_layouter.halign = Gtk.Align.FILL;
+            service_area_layouter.valign = Gtk.Align.START;
+            service_area_layouter.hexpand = true;
+            service_area_layouter.vexpand = false;
 
-            Gtk.Alignment service_area_wrapper = new Gtk.Alignment(0.0f, 0.0f, 1.0f, 0.0f);
-            service_area_wrapper.add(service_area_layouter);
-
-            get_content_area().pack_start(service_area_wrapper, false, false, 0);
+            get_content_area().pack_start(service_area_layouter, false, false, 0);
         }
 
         central_area_layouter = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
 
         get_content_area().pack_start(central_area_layouter, true, true, 0);
         
-        close_cancel_button = new Gtk.Button.with_mnemonic("_Cancel");
-        close_cancel_button.set_can_default(true);
-        close_cancel_button.clicked.connect(on_close_cancel_clicked);
         if (use_header) {
+            close_cancel_button = new Gtk.Button.with_mnemonic("_Cancel");
+            close_cancel_button.set_can_default(true);
+
             ((Gtk.HeaderBar) get_header_bar()).pack_start(close_cancel_button);
             ((Gtk.HeaderBar) get_header_bar()).pack_end(service_selector_box);
         }
-        else
-            ((Gtk.Container) get_action_area()).add(close_cancel_button);
+        else {
+            add_button (_("_Cancel"), Gtk.ResponseType.CANCEL);
+            close_cancel_button = get_widget_for_response (Gtk.ResponseType.CANCEL) as Gtk.Button;
+        }
+        close_cancel_button.clicked.connect(on_close_cancel_clicked);
 
         set_standard_window_mode();
         
diff --git a/src/searches/Branch.c b/src/searches/Branch.c
index 409c89d..c582a55 100644
--- a/src/searches/Branch.c
+++ b/src/searches/Branch.c
@@ -200,17 +200,6 @@ typedef struct _ApplicationClass ApplicationClass;
 #define _application_unref0(var) ((var == NULL) ? NULL : (var = (application_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
-#define TYPE_SAVED_SEARCH_DIALOG (saved_search_dialog_get_type ())
-#define SAVED_SEARCH_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialog))
-#define SAVED_SEARCH_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialogClass))
-#define IS_SAVED_SEARCH_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SAVED_SEARCH_DIALOG))
-#define IS_SAVED_SEARCH_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SAVED_SEARCH_DIALOG))
-#define SAVED_SEARCH_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialogClass))
-
-typedef struct _SavedSearchDialog SavedSearchDialog;
-typedef struct _SavedSearchDialogClass SavedSearchDialogClass;
-#define _saved_search_dialog_unref0(var) ((var == NULL) ? NULL : (var = (saved_search_dialog_unref (var), NULL)))
-
 #define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ())
 #define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry))
 #define SIDEBAR_IS_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY))
@@ -441,7 +430,7 @@ struct _SearchesHeaderClass {
 };
 
 struct _SearchesHeaderPrivate {
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkMenu* context_menu;
 };
 
@@ -555,11 +544,6 @@ enum  {
 SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
 SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
 static void searches_header_setup_context_menu (SearchesHeader* self);
-#define TRANSLATABLE "translatable"
-static void searches_header_on_new_search (SearchesHeader* self);
-static void _searches_header_on_new_search_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add146 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-GFile* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
@@ -571,16 +555,6 @@ GType application_get_type (void) G_GNUC_CONST;
 Application* application_get_instance (void);
 void application_panic (Application* self);
 static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event);
-SavedSearchDialog* saved_search_dialog_new (void);
-SavedSearchDialog* saved_search_dialog_construct (GType object_type);
-gpointer saved_search_dialog_ref (gpointer instance);
-void saved_search_dialog_unref (gpointer instance);
-GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_saved_search_dialog (GValue* value, gpointer v_object);
-void value_take_saved_search_dialog (GValue* value, gpointer v_object);
-gpointer value_get_saved_search_dialog (const GValue* value);
-GType saved_search_dialog_get_type (void) G_GNUC_CONST;
-void saved_search_dialog_show (SavedSearchDialog* self);
 static void searches_header_finalize (GObject* obj);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 GType page_get_type (void) G_GNUC_CONST;
@@ -633,14 +607,14 @@ static void searches_sidebar_entry_finalize (GObject* obj);
 static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
 #line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_branch_on_saved_search_added ((SearchesBranch*) self, search);
-#line 637 "Branch.c"
+#line 611 "Branch.c"
 }
 
 
 static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
 #line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_branch_on_saved_search_removed ((SearchesBranch*) self, search);
-#line 644 "Branch.c"
+#line 618 "Branch.c"
 }
 
 
@@ -649,7 +623,7 @@ static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpo
 	result = searches_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 653 "Branch.c"
+#line 627 "Branch.c"
 }
 
 
@@ -669,7 +643,7 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 	self = (SearchesBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) | SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _searches_branch_comparator_gcompare_func, NULL);
 #line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 673 "Branch.c"
+#line 647 "Branch.c"
 	{
 		GeeIterator* _search_it = NULL;
 		SavedSearchTable* _tmp2_ = NULL;
@@ -698,7 +672,7 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 		_search_it = _tmp7_;
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		while (TRUE) {
-#line 702 "Branch.c"
+#line 676 "Branch.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			SavedSearch* search = NULL;
@@ -713,7 +687,7 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 			if (!_tmp9_) {
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 				break;
-#line 717 "Branch.c"
+#line 691 "Branch.c"
 			}
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp10_ = _search_it;
@@ -727,11 +701,11 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 			searches_branch_on_saved_search_added (self, _tmp12_);
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_g_object_unref0 (search);
-#line 731 "Branch.c"
+#line 705 "Branch.c"
 		}
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (_search_it);
-#line 735 "Branch.c"
+#line 709 "Branch.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp13_ = saved_search_table_get_instance ();
@@ -751,14 +725,14 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 	_saved_search_table_unref0 (_tmp16_);
 #line 11 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 755 "Branch.c"
+#line 729 "Branch.c"
 }
 
 
 SearchesBranch* searches_branch_new (void) {
 #line 11 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_branch_construct (SEARCHES_TYPE_BRANCH);
-#line 762 "Branch.c"
+#line 736 "Branch.c"
 }
 
 
@@ -781,7 +755,7 @@ SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch
 	result = (SearchesSidebarEntry*) _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 785 "Branch.c"
+#line 759 "Branch.c"
 }
 
 
@@ -808,7 +782,7 @@ static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 		result = 0;
 #line 38 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		return result;
-#line 812 "Branch.c"
+#line 786 "Branch.c"
 	}
 #line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp2_ = a;
@@ -824,7 +798,7 @@ static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	result = _tmp6_;
 #line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 828 "Branch.c"
+#line 802 "Branch.c"
 }
 
 
@@ -864,7 +838,7 @@ static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSe
 	_g_object_unref0 (_tmp5_);
 #line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (entry);
-#line 868 "Branch.c"
+#line 842 "Branch.c"
 }
 
 
@@ -907,7 +881,7 @@ static void searches_branch_on_saved_search_removed (SearchesBranch* self, Saved
 	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (entry);
-#line 911 "Branch.c"
+#line 885 "Branch.c"
 }
 
 
@@ -918,7 +892,7 @@ static void searches_branch_class_init (SearchesBranchClass * klass) {
 	g_type_class_add_private (klass, sizeof (SearchesBranchPrivate));
 #line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_branch_finalize;
-#line 922 "Branch.c"
+#line 896 "Branch.c"
 }
 
 
@@ -930,7 +904,7 @@ static void searches_branch_instance_init (SearchesBranch * self) {
 	_tmp0_ = gee_hash_map_new (TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, g_object_unref, SEARCHES_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->entry_map = _tmp0_;
-#line 934 "Branch.c"
+#line 908 "Branch.c"
 }
 
 
@@ -968,7 +942,7 @@ static void searches_branch_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->entry_map);
 #line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_branch_parent_class)->finalize (obj);
-#line 972 "Branch.c"
+#line 946 "Branch.c"
 }
 
 
@@ -995,228 +969,124 @@ SearchesHeader* searches_header_construct (GType object_type) {
 	searches_header_setup_context_menu (self);
 #line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 999 "Branch.c"
+#line 973 "Branch.c"
 }
 
 
 SearchesHeader* searches_header_new (void) {
 #line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_header_construct (SEARCHES_TYPE_HEADER);
-#line 1006 "Branch.c"
-}
-
-
-static void _searches_header_on_new_search_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	searches_header_on_new_search ((SearchesHeader*) self);
-#line 1013 "Branch.c"
-}
-
-
-static void _vala_array_add146 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	if ((*length) == (*size)) {
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1024 "Branch.c"
-	}
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	(*array)[(*length)++] = *value;
-#line 1028 "Branch.c"
+#line 980 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1035 "Branch.c"
+#line 987 "Branch.c"
 }
 
 
 static void searches_header_setup_context_menu (SearchesHeader* self) {
-	GtkActionGroup* group = NULL;
-	GtkActionGroup* _tmp0_ = NULL;
-	GtkActionEntry* actions = NULL;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry new_search = {0};
-	GtkActionEntry _tmp2_ = {0};
-	const gchar* _tmp3_ = NULL;
-	GtkActionEntry* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GtkActionEntry _tmp5_ = {0};
-	GtkActionEntry* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	GtkUIManager* _tmp7_ = NULL;
-	GFile* ui_file = NULL;
-	GFile* _tmp8_ = NULL;
-	GtkUIManager* _tmp20_ = NULL;
-	GtkWidget* _tmp21_ = NULL;
-	GtkMenu* _tmp22_ = NULL;
-	GtkUIManager* _tmp23_ = NULL;
+	GtkBuilder* _tmp0_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 72 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_if_fail (SEARCHES_IS_HEADER (self));
 #line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = gtk_action_group_new ("SidebarDefault");
+	_tmp0_ = gtk_builder_new ();
 #line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	group = _tmp0_;
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = g_new0 (GtkActionEntry, 0);
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	actions = _tmp1_;
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	actions_length1 = 0;
-#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_actions_size_ = actions_length1;
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp2_.name = "CommonNewSearch";
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp2_.stock_id = NULL;
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp2_.accelerator = NULL;
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp2_.tooltip = NULL;
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp2_.callback = (GCallback) _searches_header_on_new_search_gtk_action_callback;
-#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	new_search = _tmp2_;
+	_g_object_unref0 (self->priv->builder);
+#line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+	self->priv->builder = _tmp0_;
+#line 1002 "Branch.c"
+	{
+		GtkBuilder* _tmp1_ = NULL;
+		GMenuModel* model = NULL;
+		GtkBuilder* _tmp2_ = NULL;
+		GObject* _tmp3_ = NULL;
+		GMenuModel* _tmp4_ = NULL;
+		GMenuModel* _tmp5_ = NULL;
+		GtkMenu* _tmp6_ = NULL;
+#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp1_ = self->priv->builder;
+#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		gtk_builder_add_from_resource (_tmp1_, "/org/gnome/Shotwell/search_sidebar_context.ui", &_inner_error_);
+#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1017 "Branch.c"
+			goto __catch73_g_error;
+		}
+#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp2_ = self->priv->builder;
+#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp3_ = gtk_builder_get_object (_tmp2_, "popup-menu");
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp3_ = _ ("Ne_w Saved Search…");
+		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	new_search.label = _tmp3_;
+		model = _tmp4_;
 #line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp4_ = actions;
+		_tmp5_ = model;
 #line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp4__length1 = actions_length1;
+		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
 #line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp5_ = new_search;
+		g_object_ref_sink (_tmp6_);
 #line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_vala_array_add146 (&actions, &actions_length1, &_actions_size_, &_tmp5_);
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp6_ = actions;
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp6__length1 = actions_length1;
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	gtk_action_group_add_actions (group, _tmp6_, _tmp6__length1, self);
-#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp7_ = self->priv->ui;
-#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	gtk_ui_manager_insert_action_group (_tmp7_, group, 0);
-#line 83 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp8_ = resources_get_ui ("search_sidebar_context.ui");
-#line 83 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	ui_file = _tmp8_;
-#line 1116 "Branch.c"
-	{
-		GtkUIManager* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-#line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp9_ = self->priv->ui;
-#line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp10_ = g_file_get_path (ui_file);
-#line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp11_ = _tmp10_;
-#line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		gtk_ui_manager_add_ui_from_file (_tmp9_, _tmp11_, &_inner_error_);
-#line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_free0 (_tmp11_);
-#line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1133 "Branch.c"
-			goto __catch74_g_error;
-		}
+		_g_object_unref0 (self->priv->context_menu);
+#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		self->priv->context_menu = _tmp6_;
+#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_g_object_unref0 (model);
+#line 1040 "Branch.c"
 	}
-	goto __finally74;
-	__catch74_g_error:
+	goto __finally73;
+	__catch73_g_error:
 	{
-		GError* err = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		Application* _tmp18_ = NULL;
-		Application* _tmp19_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		err = _inner_error_;
-#line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		GError* _error_ = NULL;
+		GError* _tmp7_ = NULL;
+		const gchar* _tmp8_ = NULL;
+		gchar* _tmp9_ = NULL;
+		gchar* _tmp10_ = NULL;
+		Application* _tmp11_ = NULL;
+		Application* _tmp12_ = NULL;
+#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_error_ = _inner_error_;
+#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_inner_error_ = NULL;
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp12_ = g_file_get_path (ui_file);
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp13_ = _tmp12_;
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp14_ = err;
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp15_ = _tmp14_->message;
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp16_ = g_strdup_printf ("Error loading UI file %s: %s", _tmp13_, _tmp15_);
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp17_ = _tmp16_;
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		app_window_error_message (_tmp17_, NULL);
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_free0 (_tmp17_);
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_free0 (_tmp13_);
-#line 89 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp18_ = application_get_instance ();
-#line 89 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp19_ = _tmp18_;
-#line 89 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		application_panic (_tmp19_);
-#line 89 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_application_unref0 (_tmp19_);
-#line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_error_free0 (err);
-#line 1181 "Branch.c"
+#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp7_ = _error_;
+#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp8_ = _tmp7_->message;
+#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp9_ = g_strdup_printf ("Error loading UI resource: %s", _tmp8_);
+#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp10_ = _tmp9_;
+#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		app_window_error_message (_tmp10_, NULL);
+#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_g_free0 (_tmp10_);
+#line 82 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp11_ = application_get_instance ();
+#line 82 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp12_ = _tmp11_;
+#line 82 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		application_panic (_tmp12_);
+#line 82 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_application_unref0 (_tmp12_);
+#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_g_error_free0 (_error_);
+#line 1078 "Branch.c"
 	}
-	__finally74:
-#line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+	__finally73:
+#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_object_unref0 (ui_file);
-#line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		actions = (g_free (actions), NULL);
-#line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_object_unref0 (group);
-#line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		g_clear_error (&_inner_error_);
-#line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		return;
-#line 1198 "Branch.c"
+#line 1089 "Branch.c"
 	}
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp20_ = self->priv->ui;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp21_ = gtk_ui_manager_get_widget (_tmp20_, "/SidebarSearchContextMenu");
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_menu_get_type (), GtkMenu));
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (self->priv->context_menu);
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self->priv->context_menu = _tmp22_;
-#line 93 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp23_ = self->priv->ui;
-#line 93 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	gtk_ui_manager_ensure_update (_tmp23_);
-#line 72 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (ui_file);
-#line 72 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	actions = (g_free (actions), NULL);
-#line 72 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (group);
-#line 1220 "Branch.c"
 }
 
 
@@ -1225,34 +1095,17 @@ static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextabl
 	GtkMenu* result = NULL;
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
-#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_HEADER, SearchesHeader);
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->context_menu;
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = _tmp1_;
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1239 "Branch.c"
-}
-
-
-static void searches_header_on_new_search (SearchesHeader* self) {
-	SavedSearchDialog* _tmp0_ = NULL;
-	SavedSearchDialog* _tmp1_ = NULL;
-#line 100 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	g_return_if_fail (SEARCHES_IS_HEADER (self));
-#line 101 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = saved_search_dialog_new ();
-#line 101 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp1_ = _tmp0_;
-#line 101 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	saved_search_dialog_show (_tmp1_);
-#line 101 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_saved_search_dialog_unref0 (_tmp1_);
-#line 1256 "Branch.c"
+#line 1109 "Branch.c"
 }
 
 
@@ -1263,7 +1116,7 @@ static void searches_header_class_init (SearchesHeaderClass * klass) {
 	g_type_class_add_private (klass, sizeof (SearchesHeaderPrivate));
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_header_finalize;
-#line 1267 "Branch.c"
+#line 1120 "Branch.c"
 }
 
 
@@ -1272,21 +1125,16 @@ static void searches_header_sidebar_contextable_interface_init (SidebarContextab
 	searches_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) searches_header_real_get_sidebar_context_menu;
-#line 1276 "Branch.c"
+#line 1129 "Branch.c"
 }
 
 
 static void searches_header_instance_init (SearchesHeader * self) {
-	GtkUIManager* _tmp0_ = NULL;
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv = SEARCHES_HEADER_GET_PRIVATE (self);
-#line 64 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp0_ = gtk_ui_manager_new ();
-#line 64 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self->priv->ui = _tmp0_;
 #line 65 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->context_menu = NULL;
-#line 1290 "Branch.c"
+#line 1138 "Branch.c"
 }
 
 
@@ -1295,12 +1143,12 @@ static void searches_header_finalize (GObject* obj) {
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_HEADER, SearchesHeader);
 #line 64 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_g_object_unref0 (self->priv->ui);
+	_g_object_unref0 (self->priv->builder);
 #line 65 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (self->priv->context_menu);
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_header_parent_class)->finalize (obj);
-#line 1304 "Branch.c"
+#line 1152 "Branch.c"
 }
 
 
@@ -1322,28 +1170,28 @@ SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, Saved
 	SearchesSidebarEntry * self = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearch* _tmp1_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = (SearchesSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = search;
-#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (self->priv->search);
-#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->search = _tmp1_;
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 1340 "Branch.c"
+#line 1188 "Branch.c"
 }
 
 
 SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search) {
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_sidebar_entry_construct (SEARCHES_TYPE_SIDEBAR_ENTRY, search);
-#line 1347 "Branch.c"
+#line 1195 "Branch.c"
 }
 
 
@@ -1359,17 +1207,17 @@ SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self
 	SavedSearch* result = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearch* _tmp1_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (SEARCHES_IS_SIDEBAR_ENTRY (self), NULL);
-#line 122 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 108 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->search;
-#line 122 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 108 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 122 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 108 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = _tmp1_;
-#line 122 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 108 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1373 "Branch.c"
+#line 1221 "Branch.c"
 }
 
 
@@ -1378,17 +1226,17 @@ static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEnt
 	gchar* result = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 125 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->search;
-#line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject));
-#line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = _tmp1_;
-#line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1392 "Branch.c"
+#line 1240 "Branch.c"
 }
 
 
@@ -1397,17 +1245,17 @@ static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEnt
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = searches_sidebar_entry_single_search_icon;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = _tmp1_;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 116 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1411 "Branch.c"
+#line 1259 "Branch.c"
 }
 
 
@@ -1416,32 +1264,32 @@ static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* ba
 	Page* result = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearchPage* _tmp1_ = NULL;
-#line 133 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->search;
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = saved_search_page_new (_tmp0_);
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1432 "Branch.c"
+#line 1280 "Branch.c"
 }
 
 
 static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
 	SearchesSidebarEntry * self;
 	gboolean result = FALSE;
-#line 137 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 138 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 124 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = TRUE;
-#line 138 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 124 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1445 "Branch.c"
+#line 1293 "Branch.c"
 }
 
 
@@ -1452,85 +1300,85 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 141 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 141 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_if_fail (new_name != NULL);
-#line 142 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = saved_search_table_get_instance ();
-#line 142 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = _tmp0_;
-#line 142 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp2_ = new_name;
-#line 142 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp3_ = saved_search_table_exists (_tmp1_, _tmp2_);
-#line 142 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp4_ = !_tmp3_;
-#line 142 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_saved_search_table_unref0 (_tmp1_);
-#line 142 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (_tmp4_) {
-#line 1474 "Branch.c"
+#line 1322 "Branch.c"
 		CommandManager* _tmp5_ = NULL;
 		CommandManager* _tmp6_ = NULL;
 		SavedSearch* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		RenameSavedSearchCommand* _tmp9_ = NULL;
 		RenameSavedSearchCommand* _tmp10_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp5_ = app_window_get_command_manager ();
-#line 143 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp6_ = _tmp5_;
-#line 143 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp7_ = self->priv->search;
-#line 143 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp8_ = new_name;
-#line 143 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp9_ = rename_saved_search_command_new (_tmp7_, _tmp8_);
-#line 143 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp10_ = _tmp9_;
-#line 143 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
-#line 143 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (_tmp10_);
-#line 143 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 1499 "Branch.c"
+#line 1347 "Branch.c"
 	} else {
 		const gchar* _tmp11_ = NULL;
 		SavedSearch* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gboolean _tmp15_ = FALSE;
-#line 144 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp11_ = new_name;
-#line 144 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp12_ = self->priv->search;
-#line 144 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 144 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp14_ = _tmp13_;
-#line 144 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp15_ = g_strcmp0 (_tmp11_, _tmp14_) != 0;
-#line 144 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_free0 (_tmp14_);
-#line 144 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		if (_tmp15_) {
-#line 1520 "Branch.c"
+#line 1368 "Branch.c"
 			const gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 145 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp16_ = new_name;
-#line 145 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp17_ = resources_rename_search_exists_message (_tmp16_);
-#line 145 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp18_ = _tmp17_;
-#line 145 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			app_window_error_message (_tmp18_, NULL);
-#line 145 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_g_free0 (_tmp18_);
-#line 1534 "Branch.c"
+#line 1382 "Branch.c"
 		}
 	}
 }
@@ -1540,99 +1388,99 @@ static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry*
 	SearchesSidebarEntry * self;
 	SavedSearch* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 148 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 149 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->search;
-#line 149 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
-#line 149 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (_tmp1_) {
-#line 1552 "Branch.c"
+#line 1400 "Branch.c"
 		CommandManager* _tmp2_ = NULL;
 		CommandManager* _tmp3_ = NULL;
 		SavedSearch* _tmp4_ = NULL;
 		DeleteSavedSearchCommand* _tmp5_ = NULL;
 		DeleteSavedSearchCommand* _tmp6_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp2_ = app_window_get_command_manager ();
-#line 150 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp3_ = _tmp2_;
-#line 150 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp4_ = self->priv->search;
-#line 150 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp5_ = delete_saved_search_command_new (_tmp4_);
-#line 150 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp6_ = _tmp5_;
-#line 150 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 150 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (_tmp6_);
-#line 150 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 1574 "Branch.c"
+#line 1422 "Branch.c"
 	}
 }
 
 
 static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass) {
 	gchar* _tmp0_ = NULL;
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_type_class_add_private (klass, sizeof (SearchesSidebarEntryPrivate));
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = searches_sidebar_entry_real_get_sidebar_name;
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = searches_sidebar_entry_real_get_sidebar_icon;
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = searches_sidebar_entry_real_create_page;
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_sidebar_entry_finalize;
-#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = g_strdup ("find");
-#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_single_search_icon = _tmp0_;
-#line 1597 "Branch.c"
+#line 1445 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) searches_sidebar_entry_real_is_user_renameable;
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) searches_sidebar_entry_real_rename;
-#line 1608 "Branch.c"
+#line 1456 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) {
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	iface->destroy_source = (void (*)(SidebarDestroyableEntry*)) searches_sidebar_entry_real_destroy_source;
-#line 1617 "Branch.c"
+#line 1465 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_instance_init (SearchesSidebarEntry * self) {
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv = SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1624 "Branch.c"
+#line 1472 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_finalize (GObject* obj) {
 	SearchesSidebarEntry * self;
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 109 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 95 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (self->priv->search);
-#line 105 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_sidebar_entry_parent_class)->finalize (obj);
-#line 1636 "Branch.c"
+#line 1484 "Branch.c"
 }
 
 
diff --git a/src/searches/Branch.vala b/src/searches/Branch.vala
index 0c86733..f557baa 100644
--- a/src/searches/Branch.vala
+++ b/src/searches/Branch.vala
@@ -61,45 +61,31 @@ public class Searches.Branch : Sidebar.Branch {
 }
 
 public class Searches.Header : Sidebar.Header, Sidebar.Contextable {
-    private Gtk.UIManager ui = new Gtk.UIManager();
+    private Gtk.Builder builder;
     private Gtk.Menu? context_menu = null;
     
     public Header() {
         base (_("Saved Searches"));
         setup_context_menu();
     }
-    
+
     private void setup_context_menu() {
-        Gtk.ActionGroup group = new Gtk.ActionGroup("SidebarDefault");
-        Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
-        
-        Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, null, null, on_new_search };
-        new_search.label = _("Ne_w Saved Search…");
-        actions += new_search;
-        
-        group.add_actions(actions, this);
-        ui.insert_action_group(group, 0);
-        
-        File ui_file = Resources.get_ui("search_sidebar_context.ui");
+        this.builder = new Gtk.Builder ();
         try {
-            ui.add_ui_from_file(ui_file.get_path());
-        } catch (Error err) {
-            AppWindow.error_message("Error loading UI file %s: %s".printf(
-                ui_file.get_path(), err.message));
+            this.builder.add_from_resource
+                            ("/org/gnome/Shotwell/search_sidebar_context.ui");
+            var model = builder.get_object ("popup-menu") as GLib.MenuModel;
+            this.context_menu = new Gtk.Menu.from_model (model);
+        } catch (Error error) {
+            AppWindow.error_message("Error loading UI resource: %s".printf(
+                error.message));
             Application.get_instance().panic();
         }
-        context_menu = (Gtk.Menu) ui.get_widget("/SidebarSearchContextMenu");
-        
-        ui.ensure_update();
     }
-    
+
     public Gtk.Menu? get_sidebar_context_menu(Gdk.EventButton? event) {
         return context_menu;
     }
-    
-    private void on_new_search() {
-        (new SavedSearchDialog()).show();
-    }
 }
 
 public class Searches.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntry,
diff --git a/src/searches/SavedSearchDialog.c b/src/searches/SavedSearchDialog.c
index 10c261e..6fa32e2 100644
--- a/src/searches/SavedSearchDialog.c
+++ b/src/searches/SavedSearchDialog.c
@@ -16,8 +16,6 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 #include <gdk/gdk.h>
-#include <float.h>
-#include <math.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -345,7 +343,6 @@ typedef enum  {
 struct _SavedSearchDialogSearchRowContainerPrivate {
 	GtkComboBoxText* type_combo;
 	GtkBox* box;
-	GtkAlignment* align;
 	GtkButton* remove_button;
 	SearchConditionSearchType* search_types;
 	gint search_types_length1;
@@ -824,9 +821,9 @@ static void saved_search_dialog_finalize (SavedSearchDialog* obj);
 
 
 static void _saved_search_dialog_on_title_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_title_changed ((SavedSearchDialog*) self);
-#line 830 "SavedSearchDialog.c"
+#line 827 "SavedSearchDialog.c"
 }
 
 
@@ -842,65 +839,65 @@ SavedSearchDialog* saved_search_dialog_construct (GType object_type) {
 	gpointer _tmp7_ = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp8_ = NULL;
 	GtkDialog* _tmp9_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialog*) g_type_create_instance (object_type);
-#line 655 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 649 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_setup_dialog (self);
-#line 658 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->search_title;
-#line 658 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_table_get_instance ();
-#line 658 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 658 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = saved_search_table_generate_unique_name (_tmp2_);
-#line 658 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 658 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_text (_tmp0_, _tmp4_);
-#line 658 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp4_);
-#line 658 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_table_unref0 (_tmp2_);
-#line 659 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->search_title;
-#line 659 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 653 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_editable_select_region (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_EDITABLE, GtkEditable), 0, -1);
-#line 662 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 656 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_add_text_search (self);
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->row_list;
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = (SavedSearchDialogSearchRowContainer*) _tmp7_;
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_allow_removal (_tmp8_, FALSE);
-#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 657 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (_tmp8_);
-#line 665 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 659 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->dialog;
-#line 665 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 659 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 666 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 660 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, FALSE);
-#line 654 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 890 "SavedSearchDialog.c"
+#line 887 "SavedSearchDialog.c"
 }
 
 
 SavedSearchDialog* saved_search_dialog_new (void) {
-#line 654 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_construct (TYPE_SAVED_SEARCH_DIALOG);
-#line 897 "SavedSearchDialog.c"
+#line 894 "SavedSearchDialog.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 670 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 904 "SavedSearchDialog.c"
+#line 901 "SavedSearchDialog.c"
 }
 
 
@@ -919,47 +916,47 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 	GeeArrayList* _tmp24_ = NULL;
 	gint _tmp25_ = 0;
 	gint _tmp26_ = 0;
-#line 669 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (saved_search), NULL);
-#line 669 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialog*) g_type_create_instance (object_type);
-#line 670 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = saved_search;
-#line 670 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 670 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->previous_search);
-#line 670 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 664 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->previous_search = _tmp1_;
-#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 665 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->edit_mode = TRUE;
-#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 666 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_setup_dialog (self);
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 668 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->dialog;
-#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 668 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->operator;
-#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = saved_search;
-#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = saved_search_get_operator (_tmp4_);
-#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 671 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((SearchOperator) _tmp5_));
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->search_title;
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = saved_search;
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_OBJECT, DataObject));
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = _tmp8_;
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_text (_tmp6_, _tmp9_);
-#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 672 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp9_);
-#line 963 "SavedSearchDialog.c"
+#line 960 "SavedSearchDialog.c"
 	{
 		GeeList* _sc_list = NULL;
 		SavedSearch* _tmp10_ = NULL;
@@ -969,25 +966,25 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
 		gint _sc_index = 0;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp10_ = saved_search;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp11_ = saved_search_get_conditions (_tmp10_);
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_sc_list = _tmp11_;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp12_ = _sc_list;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp13_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp14_ = _tmp13_;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_sc_size = _tmp14_;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_sc_index = -1;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		while (TRUE) {
-#line 991 "SavedSearchDialog.c"
+#line 988 "SavedSearchDialog.c"
 			gint _tmp15_ = 0;
 			gint _tmp16_ = 0;
 			gint _tmp17_ = 0;
@@ -998,98 +995,98 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 			SearchCondition* _tmp21_ = NULL;
 			SavedSearchDialogSearchRowContainer* _tmp22_ = NULL;
 			SavedSearchDialogSearchRowContainer* _tmp23_ = NULL;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp15_ = _sc_index;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_sc_index = _tmp15_ + 1;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp16_ = _sc_index;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp17_ = _sc_size;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			if (!(_tmp16_ < _tmp17_)) {
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				break;
-#line 1014 "SavedSearchDialog.c"
+#line 1011 "SavedSearchDialog.c"
 			}
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp18_ = _sc_list;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp19_ = _sc_index;
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp20_ = gee_list_get (_tmp18_, _tmp19_);
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			sc = (SearchCondition*) _tmp20_;
-#line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp21_ = sc;
-#line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp22_ = saved_search_dialog_search_row_container_new_edit_existing (_tmp21_);
-#line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp23_ = _tmp22_;
-#line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			saved_search_dialog_add_row (self, _tmp23_);
-#line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 674 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_container_unref0 (_tmp23_);
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_search_condition_unref0 (sc);
-#line 1036 "SavedSearchDialog.c"
+#line 1033 "SavedSearchDialog.c"
 		}
-#line 679 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 673 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_sc_list);
-#line 1040 "SavedSearchDialog.c"
+#line 1037 "SavedSearchDialog.c"
 	}
-#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->row_list;
-#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp25_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp26_ = _tmp25_;
-#line 683 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 677 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp26_ == 1) {
-#line 1050 "SavedSearchDialog.c"
+#line 1047 "SavedSearchDialog.c"
 		GeeArrayList* _tmp27_ = NULL;
 		gpointer _tmp28_ = NULL;
 		SavedSearchDialogSearchRowContainer* _tmp29_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp27_ = self->priv->row_list;
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp28_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp29_ = (SavedSearchDialogSearchRowContainer*) _tmp28_;
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_allow_removal (_tmp29_, FALSE);
-#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 678 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_container_unref0 (_tmp29_);
-#line 1064 "SavedSearchDialog.c"
+#line 1061 "SavedSearchDialog.c"
 	}
-#line 686 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 680 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, TRUE);
-#line 669 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 1070 "SavedSearchDialog.c"
+#line 1067 "SavedSearchDialog.c"
 }
 
 
 SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_search) {
-#line 669 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 663 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_construct_edit_existing (TYPE_SAVED_SEARCH_DIALOG, saved_search);
-#line 1077 "SavedSearchDialog.c"
+#line 1074 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_on_response_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 708 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_response ((SavedSearchDialog*) self, response_id);
-#line 1084 "SavedSearchDialog.c"
+#line 1081 "SavedSearchDialog.c"
 }
 
 
 static gboolean _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = saved_search_dialog_on_add_criteria ((SavedSearchDialog*) self, event);
-#line 712 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 1093 "SavedSearchDialog.c"
+#line 1090 "SavedSearchDialog.c"
 }
 
 
@@ -1112,229 +1109,234 @@ static void saved_search_dialog_setup_dialog (SavedSearchDialog* self) {
 	GtkBox* _tmp15_ = NULL;
 	GtkBuilder* _tmp16_ = NULL;
 	GObject* _tmp17_ = NULL;
-	GtkBuilder* _tmp18_ = NULL;
-	GObject* _tmp19_ = NULL;
-	GtkButton* _tmp20_ = NULL;
+	GtkDialog* _tmp18_ = NULL;
+	GtkBuilder* _tmp19_ = NULL;
+	GObject* _tmp20_ = NULL;
 	GtkButton* _tmp21_ = NULL;
-	GtkBuilder* _tmp22_ = NULL;
-	GObject* _tmp23_ = NULL;
-	GtkEntry* _tmp24_ = NULL;
+	GtkButton* _tmp22_ = NULL;
+	GtkBuilder* _tmp23_ = NULL;
+	GObject* _tmp24_ = NULL;
 	GtkEntry* _tmp25_ = NULL;
 	GtkEntry* _tmp26_ = NULL;
-	GtkBuilder* _tmp27_ = NULL;
-	GObject* _tmp28_ = NULL;
-	GtkBox* _tmp29_ = NULL;
-	GtkBuilder* _tmp30_ = NULL;
-	GObject* _tmp31_ = NULL;
-	GtkComboBoxText* _tmp32_ = NULL;
+	GtkEntry* _tmp27_ = NULL;
+	GtkBuilder* _tmp28_ = NULL;
+	GObject* _tmp29_ = NULL;
+	GtkBox* _tmp30_ = NULL;
+	GtkBuilder* _tmp31_ = NULL;
+	GObject* _tmp32_ = NULL;
 	GtkComboBoxText* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	GtkComboBoxText* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
-	GtkComboBoxText* _tmp37_ = NULL;
-	const gchar* _tmp38_ = NULL;
-	GtkComboBoxText* _tmp39_ = NULL;
-#line 694 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	GtkComboBoxText* _tmp34_ = NULL;
+	const gchar* _tmp35_ = NULL;
+	GtkComboBoxText* _tmp36_ = NULL;
+	const gchar* _tmp37_ = NULL;
+	GtkComboBoxText* _tmp38_ = NULL;
+	const gchar* _tmp39_ = NULL;
+	GtkComboBoxText* _tmp40_ = NULL;
+#line 688 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 695 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 695 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 695 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 689 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->builder = _tmp0_;
-#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _ ("Search");
-#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = _tmp2_;
-#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _ ("Cancel");
-#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = _ ("OK");
-#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = (GtkDialog*) gtk_dialog_new_with_buttons (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT) | GTK_DIALOG_USE_HEADER_BAR, _tmp5_, GTK_RESPONSE_CANCEL, _tmp6_, GTK_RESPONSE_OK, NULL, NULL);
-#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp7_);
-#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->dialog = _tmp7_;
-#line 697 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 691 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp3_);
-#line 705 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->dialog;
-#line 705 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 699 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), FALSE);
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->dialog;
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = app_window_get_instance ();
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = _tmp10_;
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow));
-#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 700 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp11_);
-#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = self->priv->dialog;
-#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 701 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_dialog_set_default_response (_tmp12_, (gint) GTK_RESPONSE_OK);
-#line 708 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->dialog;
-#line 708 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 702 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (_tmp13_, "response", (GCallback) _saved_search_dialog_on_response_gtk_dialog_response, self);
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = self->priv->dialog;
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = (GtkBox*) gtk_dialog_get_content_area (_tmp14_);
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = self->priv->builder;
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = gtk_builder_get_object (_tmp16_, "criteria");
-#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 703 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_widget_get_type ()) ? ((GtkWidget*) _tmp17_) : NULL);
-#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp18_ = self->priv->builder;
-#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp19_ = gtk_builder_get_object (_tmp18_, "Add search button");
-#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_button_get_type ()) ? ((GtkButton*) _tmp19_) : NULL);
-#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp18_ = self->priv->dialog;
+#line 704 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_dialog_set_default_response (_tmp18_, (gint) GTK_RESPONSE_OK);
+#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp19_ = self->priv->builder;
+#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp20_ = gtk_builder_get_object (_tmp19_, "Add search button");
+#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_button_get_type ()) ? ((GtkButton*) _tmp20_) : NULL);
+#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->add_criteria);
-#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->add_criteria = _tmp20_;
-#line 712 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = self->priv->add_criteria;
-#line 712 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event, self);
-#line 714 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = self->priv->builder;
-#line 714 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = gtk_builder_get_object (_tmp22_, "Search title");
-#line 714 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp23_) : NULL);
-#line 714 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 706 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->add_criteria = _tmp21_;
+#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp22_ = self->priv->add_criteria;
+#line 707 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_on_add_criteria_gtk_widget_button_press_event, self);
+#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp23_ = self->priv->builder;
+#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp24_ = gtk_builder_get_object (_tmp23_, "Search title");
+#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp24_) : NULL);
+#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->search_title);
-#line 714 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->search_title = _tmp24_;
+#line 709 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->search_title = _tmp25_;
+#line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp26_ = self->priv->search_title;
+#line 710 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_entry_set_activates_default (_tmp26_, TRUE);
+#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp27_ = self->priv->search_title;
+#line 711 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self);
+#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp28_ = self->priv->builder;
+#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp29_ = gtk_builder_get_object (_tmp28_, "row_box");
+#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, gtk_box_get_type ()) ? ((GtkBox*) _tmp29_) : NULL);
+#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_g_object_unref0 (self->priv->row_box);
+#line 713 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->row_box = _tmp30_;
+#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp31_ = self->priv->builder;
+#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp32_ = gtk_builder_get_object (_tmp31_, "Type of search criteria");
 #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = self->priv->search_title;
+	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp32_) : NULL);
 #line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_entry_set_activates_default (_tmp25_, TRUE);
+	_g_object_unref0 (self->priv->operator);
+#line 715 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->operator = _tmp33_;
 #line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = self->priv->search_title;
+	_tmp34_ = self->priv->operator;
 #line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self);
-#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp27_ = self->priv->builder;
-#line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp28_ = gtk_builder_get_object (_tmp27_, "row_box");
+	_tmp35_ = _ ("any");
+#line 716 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_combo_box_text_append_text (_tmp34_, _tmp35_);
+#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp36_ = self->priv->operator;
+#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp37_ = _ ("all");
+#line 717 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_combo_box_text_append_text (_tmp36_, _tmp37_);
 #line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_box_get_type ()) ? ((GtkBox*) _tmp28_) : NULL);
+	_tmp38_ = self->priv->operator;
 #line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->row_box);
+	_tmp39_ = _ ("none");
 #line 718 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->row_box = _tmp29_;
-#line 720 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp30_ = self->priv->builder;
-#line 720 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp31_ = gtk_builder_get_object (_tmp30_, "Type of search criteria");
-#line 720 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp31_) : NULL);
-#line 720 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->operator);
-#line 720 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->operator = _tmp32_;
-#line 721 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp33_ = self->priv->operator;
-#line 721 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp34_ = _ ("any");
-#line 721 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp33_, _tmp34_);
-#line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp35_ = self->priv->operator;
-#line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp36_ = _ ("all");
-#line 722 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp35_, _tmp36_);
-#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp37_ = self->priv->operator;
-#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp38_ = _ ("none");
-#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_text_append_text (_tmp37_, _tmp38_);
-#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp39_ = self->priv->operator;
-#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1274 "SavedSearchDialog.c"
+	gtk_combo_box_text_append_text (_tmp38_, _tmp39_);
+#line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp40_ = self->priv->operator;
+#line 719 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 1276 "SavedSearchDialog.c"
 }
 
 
 void saved_search_dialog_show (SavedSearchDialog* self) {
 	GtkDialog* _tmp0_ = NULL;
 	GtkDialog* _tmp1_ = NULL;
-#line 728 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 723 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->dialog;
-#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 724 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_dialog_run (_tmp0_);
-#line 730 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->dialog;
-#line 730 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 725 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 1291 "SavedSearchDialog.c"
+#line 1293 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_on_add_criteria (SavedSearchDialog* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DIALOG (self), FALSE);
-#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 729 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 730 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_add_text_search (self);
-#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 731 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = FALSE;
-#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 731 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 1307 "SavedSearchDialog.c"
+#line 1309 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_add_text_search (SavedSearchDialog* self) {
 	SavedSearchDialogSearchRowContainer* text = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
-#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = saved_search_dialog_search_row_container_new ();
-#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 735 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	text = _tmp0_;
-#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 736 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_add_row (self, text);
-#line 739 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 734 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (text);
-#line 1324 "SavedSearchDialog.c"
+#line 1326 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) {
-#line 750 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_remove_row ((SavedSearchDialog*) self, this_row);
-#line 1331 "SavedSearchDialog.c"
+#line 1333 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed (SavedSearchDialogSearchRowContainer* _sender, SavedSearchDialogSearchRowContainer* this_row, gpointer self) {
-#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_on_row_changed ((SavedSearchDialog*) self, this_row);
-#line 1338 "SavedSearchDialog.c"
+#line 1340 "SavedSearchDialog.c"
 }
 
 
@@ -1352,67 +1354,67 @@ static void saved_search_dialog_add_row (SavedSearchDialog* self, SavedSearchDia
 	SavedSearchDialogSearchRowContainer* _tmp13_ = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp14_ = NULL;
 	gboolean _tmp15_ = FALSE;
-#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 740 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row));
-#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->row_list;
-#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 741 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_ == 1) {
-#line 1368 "SavedSearchDialog.c"
+#line 1370 "SavedSearchDialog.c"
 		GeeArrayList* _tmp3_ = NULL;
 		gpointer _tmp4_ = NULL;
 		SavedSearchDialogSearchRowContainer* _tmp5_ = NULL;
-#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->row_list;
-#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp5_ = (SavedSearchDialogSearchRowContainer*) _tmp4_;
-#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_allow_removal (_tmp5_, TRUE);
-#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 742 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_container_unref0 (_tmp5_);
-#line 1382 "SavedSearchDialog.c"
+#line 1384 "SavedSearchDialog.c"
 	}
-#line 748 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->row_box;
-#line 748 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = row;
-#line 748 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = saved_search_dialog_search_row_container_get_widget (_tmp7_);
-#line 748 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = _tmp8_;
-#line 748 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), _tmp9_);
-#line 748 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 743 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp9_);
-#line 749 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->row_list;
-#line 749 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = row;
-#line 749 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 744 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
-#line 750 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = row;
-#line 750 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 745 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (_tmp12_, "remove", (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self);
-#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = row;
-#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 746 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (_tmp13_, "changed", (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self);
-#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = row;
-#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = saved_search_dialog_search_row_container_is_complete (_tmp14_);
-#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 747 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, _tmp15_);
-#line 1416 "SavedSearchDialog.c"
+#line 1418 "SavedSearchDialog.c"
 }
 
 
@@ -1430,79 +1432,79 @@ static void saved_search_dialog_on_remove_row (SavedSearchDialog* self, SavedSea
 	GeeArrayList* _tmp10_ = NULL;
 	gint _tmp11_ = 0;
 	gint _tmp12_ = 0;
-#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 751 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row));
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = row;
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp1_, NULL, FALSE);
-#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 752 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_on_remove_row_saved_search_dialog_search_row_container_remove, self);
-#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = row;
-#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, &_tmp3_, NULL, FALSE);
-#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 753 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_on_row_changed_saved_search_dialog_search_row_container_changed, self);
-#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->row_box;
-#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = row;
-#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = saved_search_dialog_search_row_container_get_widget (_tmp5_);
-#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_container_get_type (), GtkContainer), _tmp7_);
-#line 759 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 754 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp7_);
-#line 760 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 755 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->row_list;
-#line 760 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 755 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = row;
-#line 760 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 755 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp9_);
-#line 761 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->row_list;
-#line 761 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 761 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = _tmp11_;
-#line 761 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 756 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp12_ == 1) {
-#line 1476 "SavedSearchDialog.c"
+#line 1478 "SavedSearchDialog.c"
 		GeeArrayList* _tmp13_ = NULL;
 		gpointer _tmp14_ = NULL;
 		SavedSearchDialogSearchRowContainer* _tmp15_ = NULL;
-#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp13_ = self->priv->row_list;
-#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp14_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp15_ = (SavedSearchDialogSearchRowContainer*) _tmp14_;
-#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_allow_removal (_tmp15_, FALSE);
-#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 757 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_container_unref0 (_tmp15_);
-#line 1490 "SavedSearchDialog.c"
+#line 1492 "SavedSearchDialog.c"
 	}
-#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 758 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, TRUE);
-#line 1494 "SavedSearchDialog.c"
+#line 1496 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_on_response (SavedSearchDialog* self, gint response_id) {
 	gint _tmp0_ = 0;
-#line 766 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 761 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 767 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = response_id;
-#line 767 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 1506 "SavedSearchDialog.c"
+#line 1508 "SavedSearchDialog.c"
 		gboolean _tmp1_ = FALSE;
 		SavedSearchTable* _tmp2_ = NULL;
 		SavedSearchTable* _tmp3_ = NULL;
@@ -1524,111 +1526,111 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 		GeeArrayList* _tmp46_ = NULL;
 		SavedSearch* _tmp47_ = NULL;
 		SavedSearch* _tmp48_ = NULL;
-#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = saved_search_table_get_instance ();
-#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = _tmp2_;
-#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->search_title;
-#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp5_ = gtk_entry_get_text (_tmp4_);
-#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp6_ = saved_search_table_exists (_tmp3_, _tmp5_);
-#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp7_ = _tmp6_;
-#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_table_unref0 (_tmp3_);
-#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp7_) {
-#line 1544 "SavedSearchDialog.c"
+#line 1546 "SavedSearchDialog.c"
 			gboolean _tmp8_ = FALSE;
 			gboolean _tmp9_ = FALSE;
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp9_ = self->priv->edit_mode;
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			if (_tmp9_) {
-#line 1551 "SavedSearchDialog.c"
+#line 1553 "SavedSearchDialog.c"
 				SavedSearch* _tmp10_ = NULL;
 				gchar* _tmp11_ = NULL;
 				gchar* _tmp12_ = NULL;
 				GtkEntry* _tmp13_ = NULL;
 				const gchar* _tmp14_ = NULL;
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp10_ = self->priv->previous_search;
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp11_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp12_ = _tmp11_;
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp13_ = self->priv->search_title;
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp14_ = gtk_entry_get_text (_tmp13_);
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8_ = g_strcmp0 (_tmp12_, _tmp14_) == 0;
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_g_free0 (_tmp12_);
-#line 1571 "SavedSearchDialog.c"
+#line 1573 "SavedSearchDialog.c"
 			} else {
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8_ = FALSE;
-#line 1575 "SavedSearchDialog.c"
+#line 1577 "SavedSearchDialog.c"
 			}
-#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 764 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp1_ = !_tmp8_;
-#line 1579 "SavedSearchDialog.c"
+#line 1581 "SavedSearchDialog.c"
 		} else {
-#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp1_ = FALSE;
-#line 1583 "SavedSearchDialog.c"
+#line 1585 "SavedSearchDialog.c"
 		}
-#line 768 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 763 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp1_) {
-#line 1587 "SavedSearchDialog.c"
+#line 1589 "SavedSearchDialog.c"
 			GtkEntry* _tmp15_ = NULL;
 			const gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 770 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp15_ = self->priv->search_title;
-#line 770 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp16_ = gtk_entry_get_text (_tmp15_);
-#line 770 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp17_ = resources_rename_search_exists_message (_tmp16_);
-#line 770 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp18_ = _tmp17_;
-#line 770 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			app_window_error_message (_tmp18_, NULL);
-#line 770 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 765 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_g_free0 (_tmp18_);
-#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 766 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return;
-#line 1606 "SavedSearchDialog.c"
+#line 1608 "SavedSearchDialog.c"
 		}
-#line 774 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp19_ = self->priv->edit_mode;
-#line 774 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 769 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp19_) {
-#line 1612 "SavedSearchDialog.c"
+#line 1614 "SavedSearchDialog.c"
 			SavedSearchTable* _tmp20_ = NULL;
 			SavedSearchTable* _tmp21_ = NULL;
 			SavedSearch* _tmp22_ = NULL;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp20_ = saved_search_table_get_instance ();
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp21_ = _tmp20_;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp22_ = self->priv->previous_search;
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			saved_search_table_remove (_tmp21_, _tmp22_);
-#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 771 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_table_unref0 (_tmp21_);
-#line 1626 "SavedSearchDialog.c"
+#line 1628 "SavedSearchDialog.c"
 		}
-#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp23_ = gee_array_list_new (TYPE_SEARCH_CONDITION, (GBoxedCopyFunc) search_condition_ref, search_condition_unref, NULL, NULL, NULL);
-#line 780 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 775 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		conditions = _tmp23_;
-#line 1632 "SavedSearchDialog.c"
+#line 1634 "SavedSearchDialog.c"
 		{
 			GeeArrayList* _c_list = NULL;
 			GeeArrayList* _tmp24_ = NULL;
@@ -1638,25 +1640,25 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 			gint _tmp27_ = 0;
 			gint _tmp28_ = 0;
 			gint _c_index = 0;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp24_ = self->priv->row_list;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp25_ = _g_object_ref0 (_tmp24_);
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_c_list = _tmp25_;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp26_ = _c_list;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp27_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp28_ = _tmp27_;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_c_size = _tmp28_;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_c_index = -1;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			while (TRUE) {
-#line 1660 "SavedSearchDialog.c"
+#line 1662 "SavedSearchDialog.c"
 				gint _tmp29_ = 0;
 				gint _tmp30_ = 0;
 				gint _tmp31_ = 0;
@@ -1668,77 +1670,77 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 				SavedSearchDialogSearchRowContainer* _tmp36_ = NULL;
 				SearchCondition* _tmp37_ = NULL;
 				SearchCondition* _tmp38_ = NULL;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp29_ = _c_index;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_c_index = _tmp29_ + 1;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp30_ = _c_index;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp31_ = _c_size;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				if (!(_tmp30_ < _tmp31_)) {
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					break;
-#line 1684 "SavedSearchDialog.c"
+#line 1686 "SavedSearchDialog.c"
 				}
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp32_ = _c_list;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp33_ = _c_index;
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp34_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp33_);
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				c = (SavedSearchDialogSearchRowContainer*) _tmp34_;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp35_ = conditions;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp36_ = c;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp37_ = saved_search_dialog_search_row_container_get_search_condition (_tmp36_);
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp38_ = _tmp37_;
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp38_);
-#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 777 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_search_condition_unref0 (_tmp38_);
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_saved_search_dialog_search_row_container_unref0 (c);
-#line 1708 "SavedSearchDialog.c"
+#line 1710 "SavedSearchDialog.c"
 			}
-#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 776 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_g_object_unref0 (_c_list);
-#line 1712 "SavedSearchDialog.c"
+#line 1714 "SavedSearchDialog.c"
 		}
-#line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp39_ = self->priv->operator;
-#line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp40_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_combo_box_get_type (), GtkComboBox));
-#line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 781 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		search_operator = (SearchOperator) _tmp40_;
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp41_ = saved_search_table_get_instance ();
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp42_ = _tmp41_;
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp43_ = self->priv->search_title;
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp44_ = gtk_entry_get_text (_tmp43_);
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp45_ = search_operator;
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp46_ = conditions;
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp47_ = saved_search_table_create (_tmp42_, _tmp44_, _tmp45_, _tmp46_);
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp48_ = _tmp47_;
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_tmp48_);
-#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 782 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_table_unref0 (_tmp42_);
-#line 767 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 762 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (conditions);
-#line 1742 "SavedSearchDialog.c"
+#line 1744 "SavedSearchDialog.c"
 	}
 }
 
@@ -1746,29 +1748,29 @@ static void saved_search_dialog_on_response (SavedSearchDialog* self, gint respo
 static void saved_search_dialog_on_row_changed (SavedSearchDialog* self, SavedSearchDialogSearchRowContainer* row) {
 	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 786 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (row));
-#line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = row;
-#line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_is_complete (_tmp0_);
-#line 792 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 787 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, _tmp1_);
-#line 1760 "SavedSearchDialog.c"
+#line 1762 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_on_title_changed (SavedSearchDialog* self) {
 	gboolean _tmp0_ = FALSE;
-#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 790 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = saved_search_dialog_is_title_valid (self);
-#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 791 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_set_valid (self, _tmp0_);
-#line 1772 "SavedSearchDialog.c"
+#line 1774 "SavedSearchDialog.c"
 }
 
 
@@ -1791,7 +1793,7 @@ static gchar* string_chomp (const gchar* self) {
 	result = _result_;
 #line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 1795 "SavedSearchDialog.c"
+#line 1797 "SavedSearchDialog.c"
 }
 
 
@@ -1811,107 +1813,107 @@ static gboolean saved_search_dialog_is_title_valid (SavedSearchDialog* self) {
 	const gchar* _tmp17_ = NULL;
 	gboolean _tmp18_ = FALSE;
 	gboolean _tmp19_ = FALSE;
-#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 794 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH_DIALOG (self), FALSE);
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->edit_mode;
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_) {
-#line 1821 "SavedSearchDialog.c"
+#line 1823 "SavedSearchDialog.c"
 		SavedSearch* _tmp3_ = NULL;
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->previous_search;
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 1827 "SavedSearchDialog.c"
+#line 1829 "SavedSearchDialog.c"
 	} else {
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = FALSE;
-#line 1831 "SavedSearchDialog.c"
+#line 1833 "SavedSearchDialog.c"
 	}
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_) {
-#line 1835 "SavedSearchDialog.c"
+#line 1837 "SavedSearchDialog.c"
 		SavedSearch* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		GtkEntry* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->previous_search;
-#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp5_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
-#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp6_ = _tmp5_;
-#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp7_ = self->priv->search_title;
-#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp8_ = gtk_entry_get_text (_tmp7_);
-#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = g_strcmp0 (_tmp6_, _tmp8_) == 0;
-#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 796 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_free0 (_tmp6_);
-#line 1855 "SavedSearchDialog.c"
+#line 1857 "SavedSearchDialog.c"
 	} else {
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = FALSE;
-#line 1859 "SavedSearchDialog.c"
+#line 1861 "SavedSearchDialog.c"
 	}
-#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 795 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_) {
-#line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		result = TRUE;
-#line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 797 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1867 "SavedSearchDialog.c"
+#line 1869 "SavedSearchDialog.c"
 	}
-#line 803 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->search_title;
-#line 803 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 803 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = string_chomp (_tmp10_);
-#line 803 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = _tmp11_;
-#line 803 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = g_strcmp0 (_tmp12_, "") == 0;
-#line 803 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp12_);
-#line 803 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 798 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp13_) {
-#line 804 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		result = FALSE;
-#line 804 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 799 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1887 "SavedSearchDialog.c"
+#line 1889 "SavedSearchDialog.c"
 	}
-#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = saved_search_table_get_instance ();
-#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = _tmp14_;
-#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = self->priv->search_title;
-#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = gtk_entry_get_text (_tmp16_);
-#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = saved_search_table_exists (_tmp15_, _tmp17_);
-#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = _tmp18_;
-#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_table_unref0 (_tmp15_);
-#line 805 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 800 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp19_) {
-#line 806 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		result = FALSE;
-#line 806 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 801 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return result;
-#line 1909 "SavedSearchDialog.c"
+#line 1911 "SavedSearchDialog.c"
 	}
-#line 807 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 807 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 802 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 1915 "SavedSearchDialog.c"
+#line 1917 "SavedSearchDialog.c"
 }
 
 
@@ -1919,39 +1921,39 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 	gboolean _tmp0_ = FALSE;
 	GtkDialog* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
-#line 811 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 806 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_DIALOG (self));
-#line 812 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 807 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = v;
-#line 812 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 807 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!_tmp0_) {
-#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 808 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		self->priv->valid = FALSE;
-#line 1931 "SavedSearchDialog.c"
+#line 1933 "SavedSearchDialog.c"
 	} else {
 		gboolean _tmp1_ = FALSE;
 		gboolean _tmp2_ = FALSE;
-#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = v;
-#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = self->priv->valid;
-#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 809 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp1_ != _tmp2_) {
-#line 1941 "SavedSearchDialog.c"
+#line 1943 "SavedSearchDialog.c"
 			gboolean _tmp3_ = FALSE;
-#line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 810 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp3_ = saved_search_dialog_is_title_valid (self);
-#line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 810 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			if (_tmp3_) {
-#line 1947 "SavedSearchDialog.c"
+#line 1949 "SavedSearchDialog.c"
 				gint valid_rows = 0;
 				gint _tmp18_ = 0;
 				GeeArrayList* _tmp19_ = NULL;
 				gint _tmp20_ = 0;
 				gint _tmp21_ = 0;
-#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 812 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				valid_rows = 0;
-#line 1955 "SavedSearchDialog.c"
+#line 1957 "SavedSearchDialog.c"
 				{
 					GeeArrayList* _c_list = NULL;
 					GeeArrayList* _tmp4_ = NULL;
@@ -1961,25 +1963,25 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 					gint _tmp7_ = 0;
 					gint _tmp8_ = 0;
 					gint _c_index = 0;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp4_ = self->priv->row_list;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_c_list = _tmp5_;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp6_ = _c_list;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp8_ = _tmp7_;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_c_size = _tmp8_;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_c_index = -1;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					while (TRUE) {
-#line 1983 "SavedSearchDialog.c"
+#line 1985 "SavedSearchDialog.c"
 						gint _tmp9_ = 0;
 						gint _tmp10_ = 0;
 						gint _tmp11_ = 0;
@@ -1989,96 +1991,96 @@ static void saved_search_dialog_set_valid (SavedSearchDialog* self, gboolean v)
 						gpointer _tmp14_ = NULL;
 						SavedSearchDialogSearchRowContainer* _tmp15_ = NULL;
 						gboolean _tmp16_ = FALSE;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp9_ = _c_index;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_c_index = _tmp9_ + 1;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp10_ = _c_index;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp11_ = _c_size;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						if (!(_tmp10_ < _tmp11_)) {
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							break;
-#line 2005 "SavedSearchDialog.c"
+#line 2007 "SavedSearchDialog.c"
 						}
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp12_ = _c_list;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp13_ = _c_index;
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp14_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_);
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						c = (SavedSearchDialogSearchRowContainer*) _tmp14_;
-#line 819 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp15_ = c;
-#line 819 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_tmp16_ = saved_search_dialog_search_row_container_is_complete (_tmp15_);
-#line 819 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 814 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						if (_tmp16_) {
-#line 2021 "SavedSearchDialog.c"
+#line 2023 "SavedSearchDialog.c"
 							gint _tmp17_ = 0;
-#line 820 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							_tmp17_ = valid_rows;
-#line 820 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 815 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 							valid_rows = _tmp17_ + 1;
-#line 2027 "SavedSearchDialog.c"
+#line 2029 "SavedSearchDialog.c"
 						}
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 						_saved_search_dialog_search_row_container_unref0 (c);
-#line 2031 "SavedSearchDialog.c"
+#line 2033 "SavedSearchDialog.c"
 					}
-#line 818 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 813 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_g_object_unref0 (_c_list);
-#line 2035 "SavedSearchDialog.c"
+#line 2037 "SavedSearchDialog.c"
 				}
-#line 822 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp18_ = valid_rows;
-#line 822 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp19_ = self->priv->row_list;
-#line 822 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 822 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp21_ = _tmp20_;
-#line 822 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 817 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				self->priv->valid = _tmp18_ == _tmp21_;
-#line 2047 "SavedSearchDialog.c"
+#line 2049 "SavedSearchDialog.c"
 			} else {
-#line 824 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 819 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				self->priv->valid = FALSE;
-#line 2051 "SavedSearchDialog.c"
+#line 2053 "SavedSearchDialog.c"
 			}
 		}
 	}
-#line 828 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = self->priv->dialog;
-#line 828 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = self->priv->valid;
-#line 828 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 823 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_dialog_set_response_sensitive (_tmp22_, (gint) GTK_RESPONSE_OK, _tmp23_);
-#line 2061 "SavedSearchDialog.c"
+#line 2063 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_construct (GType object_type) {
 	SavedSearchDialogSearchRowContainer* self = NULL;
-#line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type);
-#line 25 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_setup_gui (self);
-#line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 25 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_set_type (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT);
-#line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 2075 "SavedSearchDialog.c"
+#line 2077 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new (void) {
-#line 24 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 23 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_container_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
-#line 2082 "SavedSearchDialog.c"
+#line 2084 "SavedSearchDialog.c"
 }
 
 
@@ -2092,60 +2094,60 @@ static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_conta
 	SearchConditionSearchType _tmp5_ = 0;
 	SavedSearchDialogSearchRow* _tmp6_ = NULL;
 	SearchCondition* _tmp7_ = NULL;
-#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (IS_SEARCH_CONDITION (sc), NULL);
-#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowContainer*) g_type_create_instance (object_type);
-#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_setup_gui (self);
-#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = search_condition_get_search_type (_tmp0_);
-#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 30 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_set_type (self, _tmp2_);
-#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = sc;
-#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = search_condition_get_search_type (_tmp3_);
-#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_set_type_combo_box (self, _tmp5_);
-#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->my_row;
-#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = sc;
-#line 33 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 32 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_populate (_tmp6_, _tmp7_);
-#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 2126 "SavedSearchDialog.c"
+#line 2128 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowContainer* saved_search_dialog_search_row_container_new_edit_existing (SearchCondition* sc) {
-#line 29 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_container_construct_edit_existing (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, sc);
-#line 2133 "SavedSearchDialog.c"
+#line 2135 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_on_type_changed ((SavedSearchDialogSearchRowContainer*) self);
-#line 2140 "SavedSearchDialog.c"
+#line 2142 "SavedSearchDialog.c"
 }
 
 
 static gboolean _saved_search_dialog_search_row_container_on_removed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = saved_search_dialog_search_row_container_on_removed ((SavedSearchDialogSearchRowContainer*) self, event);
-#line 52 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2149 "SavedSearchDialog.c"
+#line 2151 "SavedSearchDialog.c"
 }
 
 
@@ -2157,59 +2159,53 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 	GtkComboBoxText* _tmp18_ = NULL;
 	GtkButton* _tmp19_ = NULL;
 	GtkButton* _tmp20_ = NULL;
-	GtkAlignment* _tmp21_ = NULL;
+	GtkBox* _tmp21_ = NULL;
 	GtkBox* _tmp22_ = NULL;
-	GtkBox* _tmp23_ = NULL;
-	GtkComboBoxText* _tmp24_ = NULL;
-	GtkBox* _tmp25_ = NULL;
-	GtkAlignment* _tmp26_ = NULL;
-	GtkBox* _tmp27_ = NULL;
-	GtkAlignment* _tmp28_ = NULL;
-	GtkAlignment* _tmp29_ = NULL;
-	GtkBox* _tmp30_ = NULL;
-	GtkButton* _tmp31_ = NULL;
-	GtkBox* _tmp32_ = NULL;
-#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	GtkComboBoxText* _tmp23_ = NULL;
+	GtkBox* _tmp24_ = NULL;
+	GtkButton* _tmp25_ = NULL;
+	GtkBox* _tmp26_ = NULL;
+#line 36 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = search_condition_search_type_as_array (&_tmp0_);
-#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->search_types = (g_free (self->priv->search_types), NULL);
-#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->search_types = _tmp1_;
-#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->search_types_length1 = _tmp0_;
-#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->_search_types_size_ = self->priv->search_types_length1;
-#line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = gee_hash_map_new (SEARCH_CONDITION_TYPE_SEARCH_TYPE, NULL, NULL, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->search_types_index);
-#line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 38 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->search_types_index = _tmp2_;
-#line 40 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 39 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_condition_search_type_sort_array (&self->priv->search_types, &self->priv->search_types_length1);
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp3_);
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->type_combo);
-#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 41 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->type_combo = _tmp3_;
-#line 2201 "SavedSearchDialog.c"
+#line 2197 "SavedSearchDialog.c"
 	{
 		gint i = 0;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		i = 0;
-#line 2206 "SavedSearchDialog.c"
+#line 2202 "SavedSearchDialog.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp4_ = TRUE;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			while (TRUE) {
-#line 2213 "SavedSearchDialog.c"
+#line 2209 "SavedSearchDialog.c"
 				gint _tmp6_ = 0;
 				SearchConditionSearchType* _tmp7_ = NULL;
 				gint _tmp7__length1 = 0;
@@ -2225,147 +2221,121 @@ static void saved_search_dialog_search_row_container_setup_gui (SavedSearchDialo
 				SearchConditionSearchType _tmp15_ = 0;
 				gchar* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				if (!_tmp4_) {
-#line 2231 "SavedSearchDialog.c"
+#line 2227 "SavedSearchDialog.c"
 					gint _tmp5_ = 0;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					_tmp5_ = i;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					i = _tmp5_ + 1;
-#line 2237 "SavedSearchDialog.c"
+#line 2233 "SavedSearchDialog.c"
 				}
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp4_ = FALSE;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp6_ = i;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp7_ = self->priv->search_types;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp7__length1 = self->priv->search_types_length1;
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				if (!(_tmp6_ < _tmp7__length1)) {
-#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 					break;
-#line 2251 "SavedSearchDialog.c"
+#line 2247 "SavedSearchDialog.c"
 				}
-#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8_ = self->priv->search_types;
-#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp8__length1 = self->priv->search_types_length1;
-#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp9_ = i;
-#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp10_ = _tmp8_[_tmp9_];
-#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 43 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				st = _tmp10_;
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp11_ = self->priv->search_types_index;
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp12_ = st;
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp13_ = i;
-#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 44 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp12_), (gpointer) ((gintptr) _tmp13_));
-#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp14_ = self->priv->type_combo;
-#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp15_ = st;
-#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp16_ = search_condition_search_type_display_text (_tmp15_);
-#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_tmp17_ = _tmp16_;
-#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				gtk_combo_box_text_append_text (_tmp14_, _tmp17_);
-#line 46 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 45 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 				_g_free0 (_tmp17_);
-#line 2283 "SavedSearchDialog.c"
+#line 2279 "SavedSearchDialog.c"
 			}
 		}
 	}
-#line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 47 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_set_type_combo_box (self, SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT);
-#line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->type_combo;
-#line 49 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 48 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_container_on_type_changed_gtk_combo_box_changed, self);
-#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = (GtkButton*) gtk_button_new_from_icon_name ("list-remove-symbolic", GTK_ICON_SIZE_BUTTON);
-#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp19_);
-#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->remove_button);
-#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->remove_button = _tmp19_;
-#line 52 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->remove_button;
-#line 52 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _saved_search_dialog_search_row_container_on_removed_gtk_widget_button_press_event, self);
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp21_ = (GtkAlignment*) gtk_alignment_new ((gfloat) 0, (gfloat) 0, (gfloat) 0, (gfloat) 0);
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp21_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp21_);
+#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_g_object_unref0 (self->priv->box);
+#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	self->priv->box = _tmp21_;
 #line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->align);
+	_tmp22_ = self->priv->box;
 #line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->align = _tmp21_;
-#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp22_);
+	_tmp23_ = self->priv->type_combo;
+#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp24_ = self->priv->box;
+#line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp25_ = self->priv->remove_button;
+#line 55 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_box_pack_end (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->box);
+	_tmp26_ = self->priv->box;
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	self->priv->box = _tmp22_;
-#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp23_ = self->priv->box;
-#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp24_ = self->priv->type_combo;
-#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 58 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp25_ = self->priv->box;
-#line 58 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp26_ = self->priv->align;
-#line 58 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp27_ = self->priv->box;
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp28_ = (GtkAlignment*) gtk_alignment_new ((gfloat) 0, (gfloat) 0, (gfloat) 0, (gfloat) 0);
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	g_object_ref_sink (_tmp28_);
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp29_ = _tmp28_;
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (_tmp29_);
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp30_ = self->priv->box;
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp31_ = self->priv->remove_button;
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_box_pack_start (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp32_ = self->priv->box;
-#line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
-#line 2355 "SavedSearchDialog.c"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
+#line 2325 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_on_type_changed (SavedSearchDialogSearchRowContainer* self) {
 	SearchConditionSearchType _tmp0_ = 0;
-#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = saved_search_dialog_search_row_container_get_search_type (self);
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_container_set_type (self, _tmp0_);
-#line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 61 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (self, "changed", self);
-#line 2369 "SavedSearchDialog.c"
+#line 2339 "SavedSearchDialog.c"
 }
 
 
@@ -2374,180 +2344,178 @@ static void saved_search_dialog_search_row_container_set_type_combo_box (SavedSe
 	GeeHashMap* _tmp1_ = NULL;
 	SearchConditionSearchType _tmp2_ = 0;
 	gpointer _tmp3_ = NULL;
-#line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->type_combo;
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->search_types_index;
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = st;
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp2_));
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), (gint) ((gintptr) _tmp3_));
-#line 2390 "SavedSearchDialog.c"
+#line 2360 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_set_type (SavedSearchDialogSearchRowContainer* self, SearchConditionSearchType type) {
 	SavedSearchDialogSearchRow* _tmp0_ = NULL;
 	SearchConditionSearchType _tmp5_ = 0;
-	GtkAlignment* _tmp12_ = NULL;
+	GtkBox* _tmp12_ = NULL;
 	SavedSearchDialogSearchRow* _tmp13_ = NULL;
 	GtkWidget* _tmp14_ = NULL;
 	GtkWidget* _tmp15_ = NULL;
-#line 73 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 74 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->my_row;
-#line 74 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 69 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_ != NULL) {
-#line 2407 "SavedSearchDialog.c"
-		GtkAlignment* _tmp1_ = NULL;
+#line 2377 "SavedSearchDialog.c"
+		GtkBox* _tmp1_ = NULL;
 		SavedSearchDialogSearchRow* _tmp2_ = NULL;
 		GtkWidget* _tmp3_ = NULL;
 		GtkWidget* _tmp4_ = NULL;
-#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-		_tmp1_ = self->priv->align;
-#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+		_tmp1_ = self->priv->box;
+#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = self->priv->my_row;
-#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = saved_search_dialog_search_row_get_widget (_tmp2_);
-#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = _tmp3_;
-#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_container_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), _tmp4_);
-#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2424 "SavedSearchDialog.c"
+#line 2394 "SavedSearchDialog.c"
 	}
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = type;
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	switch (_tmp5_) {
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_ANY_TEXT:
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_EVENT_NAME:
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FILE_NAME:
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TAG:
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_COMMENT:
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_TITLE:
-#line 2442 "SavedSearchDialog.c"
+#line 2412 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowText* _tmp6_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp6_ = saved_search_dialog_search_row_text_new (self);
-#line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 85 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2453 "SavedSearchDialog.c"
+#line 2423 "SavedSearchDialog.c"
 		}
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MEDIA_TYPE:
-#line 2457 "SavedSearchDialog.c"
+#line 2427 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowMediaType* _tmp7_ = NULL;
-#line 88 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp7_ = saved_search_dialog_search_row_media_type_new (self);
-#line 88 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 88 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 84 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2468 "SavedSearchDialog.c"
+#line 2438 "SavedSearchDialog.c"
 		}
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_FLAG_STATE:
-#line 2472 "SavedSearchDialog.c"
+#line 2442 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowFlagged* _tmp8_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp8_ = saved_search_dialog_search_row_flagged_new (self);
-#line 92 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 92 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 87 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 93 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 88 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2483 "SavedSearchDialog.c"
+#line 2453 "SavedSearchDialog.c"
 		}
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_MODIFIED_STATE:
-#line 2487 "SavedSearchDialog.c"
+#line 2457 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowModified* _tmp9_ = NULL;
-#line 96 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp9_ = saved_search_dialog_search_row_modified_new (self);
-#line 96 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 96 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 91 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 97 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 92 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2498 "SavedSearchDialog.c"
+#line 2468 "SavedSearchDialog.c"
 		}
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_RATING:
-#line 2502 "SavedSearchDialog.c"
+#line 2472 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowRating* _tmp10_ = NULL;
-#line 100 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp10_ = saved_search_dialog_search_row_rating_new (self);
-#line 100 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 100 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 95 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 101 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 96 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2513 "SavedSearchDialog.c"
+#line 2483 "SavedSearchDialog.c"
 		}
-#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		case SEARCH_CONDITION_SEARCH_TYPE_DATE:
-#line 2517 "SavedSearchDialog.c"
+#line 2487 "SavedSearchDialog.c"
 		{
 			SavedSearchDialogSearchRowDate* _tmp11_ = NULL;
-#line 104 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp11_ = saved_search_dialog_search_row_date_new (self);
-#line 104 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 104 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 99 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			self->priv->my_row = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 105 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 100 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			break;
-#line 2528 "SavedSearchDialog.c"
+#line 2498 "SavedSearchDialog.c"
 		}
 		default:
 		{
-#line 108 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			_vala_assert (FALSE, "false");
-#line 109 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-			break;
-#line 2536 "SavedSearchDialog.c"
+#line 103 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+			g_assert_not_reached ();
+#line 2504 "SavedSearchDialog.c"
 		}
 	}
-#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_tmp12_ = self->priv->align;
-#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	_tmp12_ = self->priv->box;
+#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->my_row;
-#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = saved_search_dialog_search_row_get_widget (_tmp13_);
-#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = _tmp14_;
-#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_container_get_type (), GtkContainer), _tmp15_);
-#line 112 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	gtk_box_pack_start (_tmp12_, _tmp15_, TRUE, TRUE, (guint) 0);
+#line 106 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp15_);
-#line 2551 "SavedSearchDialog.c"
+#line 2519 "SavedSearchDialog.c"
 }
 
 
@@ -2558,54 +2526,54 @@ static SearchConditionSearchType saved_search_dialog_search_row_container_get_se
 	GtkComboBoxText* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	SearchConditionSearchType _tmp3_ = 0;
-#line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 109 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), 0);
-#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->search_types;
-#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0__length1 = self->priv->search_types_length1;
-#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->type_combo;
-#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = _tmp0_[_tmp2_];
-#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp3_;
-#line 116 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 110 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2578 "SavedSearchDialog.c"
+#line 2546 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_container_on_removed (SavedSearchDialogSearchRowContainer* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 113 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), FALSE);
-#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 113 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 120 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 114 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (self, "remove", self);
-#line 121 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = FALSE;
-#line 121 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2594 "SavedSearchDialog.c"
+#line 2562 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_allow_removal (SavedSearchDialogSearchRowContainer* self, gboolean allow) {
 	GtkButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 124 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 118 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self));
-#line 125 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->remove_button;
-#line 125 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = allow;
-#line 125 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 2609 "SavedSearchDialog.c"
+#line 2577 "SavedSearchDialog.c"
 }
 
 
@@ -2613,17 +2581,17 @@ static GtkWidget* saved_search_dialog_search_row_container_get_widget (SavedSear
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 122 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), NULL);
-#line 129 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 129 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 129 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 129 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2627 "SavedSearchDialog.c"
+#line 2595 "SavedSearchDialog.c"
 }
 
 
@@ -2631,17 +2599,17 @@ static SearchCondition* saved_search_dialog_search_row_container_get_search_cond
 	SearchCondition* result = NULL;
 	SavedSearchDialogSearchRow* _tmp0_ = NULL;
 	SearchCondition* _tmp1_ = NULL;
-#line 132 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 126 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), NULL);
-#line 133 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->my_row;
-#line 133 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_get_search_condition (_tmp0_);
-#line 133 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 133 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2645 "SavedSearchDialog.c"
+#line 2613 "SavedSearchDialog.c"
 }
 
 
@@ -2649,17 +2617,17 @@ static gboolean saved_search_dialog_search_row_container_is_complete (SavedSearc
 	gboolean result = FALSE;
 	SavedSearchDialogSearchRow* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (self), FALSE);
-#line 137 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->my_row;
-#line 137 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_is_complete (_tmp0_);
-#line 137 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 137 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 131 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 2663 "SavedSearchDialog.c"
+#line 2631 "SavedSearchDialog.c"
 }
 
 
@@ -2678,26 +2646,26 @@ static void g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAIN
 		data1 = closure->data;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 2682 "SavedSearchDialog.c"
+#line 2650 "SavedSearchDialog.c"
 	} else {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		data2 = closure->data;
-#line 2688 "SavedSearchDialog.c"
+#line 2656 "SavedSearchDialog.c"
 	}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	callback = (GMarshalFunc_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER) (marshal_data ? marshal_data : cc->callback);
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	callback (data1, saved_search_dialog_value_get_search_row_container (param_values + 1), data2);
-#line 2694 "SavedSearchDialog.c"
+#line 2662 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_container_init (GValue* value) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 2701 "SavedSearchDialog.c"
+#line 2669 "SavedSearchDialog.c"
 }
 
 
@@ -2706,7 +2674,7 @@ static void saved_search_dialog_value_search_row_container_free_value (GValue* v
 	if (value->data[0].v_pointer) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (value->data[0].v_pointer);
-#line 2710 "SavedSearchDialog.c"
+#line 2678 "SavedSearchDialog.c"
 	}
 }
 
@@ -2716,11 +2684,11 @@ static void saved_search_dialog_value_search_row_container_copy_value (const GVa
 	if (src_value->data[0].v_pointer) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (src_value->data[0].v_pointer);
-#line 2720 "SavedSearchDialog.c"
+#line 2688 "SavedSearchDialog.c"
 	} else {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2724 "SavedSearchDialog.c"
+#line 2692 "SavedSearchDialog.c"
 	}
 }
 
@@ -2728,37 +2696,37 @@ static void saved_search_dialog_value_search_row_container_copy_value (const GVa
 static gpointer saved_search_dialog_value_search_row_container_peek_pointer (const GValue* value) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 2732 "SavedSearchDialog.c"
+#line 2700 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_container_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 2739 "SavedSearchDialog.c"
+#line 2707 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRowContainer* object;
 		object = collect_values[0].v_pointer;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2746 "SavedSearchDialog.c"
+#line 2714 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2750 "SavedSearchDialog.c"
+#line 2718 "SavedSearchDialog.c"
 		}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_search_row_container_ref (object);
-#line 2754 "SavedSearchDialog.c"
+#line 2722 "SavedSearchDialog.c"
 	} else {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2758 "SavedSearchDialog.c"
+#line 2726 "SavedSearchDialog.c"
 	}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2762 "SavedSearchDialog.c"
+#line 2730 "SavedSearchDialog.c"
 }
 
 
@@ -2769,25 +2737,25 @@ static gchar* saved_search_dialog_value_search_row_container_lcopy_value (const
 	if (!object_p) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2773 "SavedSearchDialog.c"
+#line 2741 "SavedSearchDialog.c"
 	}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 2779 "SavedSearchDialog.c"
+#line 2747 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2783 "SavedSearchDialog.c"
+#line 2751 "SavedSearchDialog.c"
 	} else {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_search_row_container_ref (value->data[0].v_pointer);
-#line 2787 "SavedSearchDialog.c"
+#line 2755 "SavedSearchDialog.c"
 	}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2791 "SavedSearchDialog.c"
+#line 2759 "SavedSearchDialog.c"
 }
 
 
@@ -2801,7 +2769,7 @@ static GParamSpec* saved_search_dialog_param_spec_search_row_container (const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 2805 "SavedSearchDialog.c"
+#line 2773 "SavedSearchDialog.c"
 }
 
 
@@ -2810,7 +2778,7 @@ static gpointer saved_search_dialog_value_get_search_row_container (const GValue
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER), NULL);
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 2814 "SavedSearchDialog.c"
+#line 2782 "SavedSearchDialog.c"
 }
 
 
@@ -2830,17 +2798,17 @@ static void saved_search_dialog_value_set_search_row_container (GValue* value, g
 		value->data[0].v_pointer = v_object;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_ref (value->data[0].v_pointer);
-#line 2834 "SavedSearchDialog.c"
+#line 2802 "SavedSearchDialog.c"
 	} else {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2838 "SavedSearchDialog.c"
+#line 2806 "SavedSearchDialog.c"
 	}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (old);
-#line 2844 "SavedSearchDialog.c"
+#line 2812 "SavedSearchDialog.c"
 	}
 }
 
@@ -2859,17 +2827,17 @@ static void saved_search_dialog_value_take_search_row_container (GValue* value,
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 2863 "SavedSearchDialog.c"
+#line 2831 "SavedSearchDialog.c"
 	} else {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 2867 "SavedSearchDialog.c"
+#line 2835 "SavedSearchDialog.c"
 	}
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_container_unref (old);
-#line 2873 "SavedSearchDialog.c"
+#line 2841 "SavedSearchDialog.c"
 	}
 }
 
@@ -2885,18 +2853,18 @@ static void saved_search_dialog_search_row_container_class_init (SavedSearchDial
 	g_signal_new ("remove", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_new ("changed", SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER, G_TYPE_NONE, 1, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER);
-#line 2889 "SavedSearchDialog.c"
+#line 2857 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_container_instance_init (SavedSearchDialogSearchRowContainer * self) {
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_PRIVATE (self);
-#line 22 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->my_row = NULL;
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 2900 "SavedSearchDialog.c"
+#line 2868 "SavedSearchDialog.c"
 }
 
 
@@ -2911,16 +2879,14 @@ static void saved_search_dialog_search_row_container_finalize (SavedSearchDialog
 #line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
 #line 17 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	_g_object_unref0 (self->priv->align);
-#line 18 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->remove_button);
-#line 19 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 18 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->search_types = (g_free (self->priv->search_types), NULL);
-#line 20 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 19 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->search_types_index);
-#line 22 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_unref0 (self->priv->my_row);
-#line 2924 "SavedSearchDialog.c"
+#line 2890 "SavedSearchDialog.c"
 }
 
 
@@ -2945,7 +2911,7 @@ static gpointer saved_search_dialog_search_row_container_ref (gpointer instance)
 	g_atomic_int_inc (&self->ref_count);
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 2949 "SavedSearchDialog.c"
+#line 2915 "SavedSearchDialog.c"
 }
 
 
@@ -2958,304 +2924,304 @@ static void saved_search_dialog_search_row_container_unref (gpointer instance) {
 		SAVED_SEARCH_DIALOG_SEARCH_ROW_CONTAINER_GET_CLASS (self)->finalize (self);
 #line 11 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2962 "SavedSearchDialog.c"
+#line 2928 "SavedSearchDialog.c"
 	}
 }
 
 
 static GtkWidget* saved_search_dialog_search_row_real_get_widget (SavedSearchDialogSearchRow* self) {
-#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_widget'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2972 "SavedSearchDialog.c"
+#line 2938 "SavedSearchDialog.c"
 }
 
 
 GtkWidget* saved_search_dialog_search_row_get_widget (SavedSearchDialogSearchRow* self) {
-#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL);
-#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 138 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_widget (self);
-#line 2981 "SavedSearchDialog.c"
+#line 2947 "SavedSearchDialog.c"
 }
 
 
 static SearchCondition* saved_search_dialog_search_row_real_get_search_condition (SavedSearchDialogSearchRow* self) {
-#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_get_search_condition'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 2990 "SavedSearchDialog.c"
+#line 2956 "SavedSearchDialog.c"
 }
 
 
 SearchCondition* saved_search_dialog_search_row_get_search_condition (SavedSearchDialogSearchRow* self) {
-#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), NULL);
-#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 141 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->get_search_condition (self);
-#line 2999 "SavedSearchDialog.c"
+#line 2965 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_real_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc) {
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_populate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return;
-#line 3008 "SavedSearchDialog.c"
+#line 2974 "SavedSearchDialog.c"
 }
 
 
 void saved_search_dialog_search_row_populate (SavedSearchDialogSearchRow* self, SearchCondition* sc) {
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self));
-#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 144 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->populate (self, sc);
-#line 3017 "SavedSearchDialog.c"
+#line 2983 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_real_is_complete (SavedSearchDialogSearchRow* self) {
-#line 153 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_critical ("Type `%s' does not implement abstract method `saved_search_dialog_search_row_is_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 153 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return FALSE;
-#line 3026 "SavedSearchDialog.c"
+#line 2992 "SavedSearchDialog.c"
 }
 
 
 gboolean saved_search_dialog_search_row_is_complete (SavedSearchDialogSearchRow* self) {
-#line 153 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW (self), FALSE);
-#line 153 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 147 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->is_complete (self);
-#line 3035 "SavedSearchDialog.c"
+#line 3001 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRow* saved_search_dialog_search_row_construct (GType object_type) {
 	SavedSearchDialogSearchRow* self = NULL;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRow*) g_type_create_instance (object_type);
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3045 "SavedSearchDialog.c"
+#line 3011 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_init (GValue* value) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 3052 "SavedSearchDialog.c"
+#line 3018 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_search_row_free_value (GValue* value) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (value->data[0].v_pointer) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (value->data[0].v_pointer);
-#line 3061 "SavedSearchDialog.c"
+#line 3027 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_value_search_row_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (src_value->data[0].v_pointer) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_search_row_ref (src_value->data[0].v_pointer);
-#line 3071 "SavedSearchDialog.c"
+#line 3037 "SavedSearchDialog.c"
 	} else {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3075 "SavedSearchDialog.c"
+#line 3041 "SavedSearchDialog.c"
 	}
 }
 
 
 static gpointer saved_search_dialog_value_search_row_peek_pointer (const GValue* value) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 3083 "SavedSearchDialog.c"
+#line 3049 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 3090 "SavedSearchDialog.c"
+#line 3056 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRow* object;
 		object = collect_values[0].v_pointer;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3097 "SavedSearchDialog.c"
+#line 3063 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3101 "SavedSearchDialog.c"
+#line 3067 "SavedSearchDialog.c"
 		}
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_search_row_ref (object);
-#line 3105 "SavedSearchDialog.c"
+#line 3071 "SavedSearchDialog.c"
 	} else {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3109 "SavedSearchDialog.c"
+#line 3075 "SavedSearchDialog.c"
 	}
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 3113 "SavedSearchDialog.c"
+#line 3079 "SavedSearchDialog.c"
 }
 
 
 static gchar* saved_search_dialog_value_search_row_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	SavedSearchDialogSearchRow** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!object_p) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3124 "SavedSearchDialog.c"
+#line 3090 "SavedSearchDialog.c"
 	}
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 3130 "SavedSearchDialog.c"
+#line 3096 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3134 "SavedSearchDialog.c"
+#line 3100 "SavedSearchDialog.c"
 	} else {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_search_row_ref (value->data[0].v_pointer);
-#line 3138 "SavedSearchDialog.c"
+#line 3104 "SavedSearchDialog.c"
 	}
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 3142 "SavedSearchDialog.c"
+#line 3108 "SavedSearchDialog.c"
 }
 
 
 static GParamSpec* saved_search_dialog_param_spec_search_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	SavedSearchDialogParamSpecSearchRow* spec;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL);
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 3156 "SavedSearchDialog.c"
+#line 3122 "SavedSearchDialog.c"
 }
 
 
 static gpointer saved_search_dialog_value_get_search_row (const GValue* value) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW), NULL);
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 3165 "SavedSearchDialog.c"
+#line 3131 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_value_set_search_row (GValue* value, gpointer v_object) {
 	SavedSearchDialogSearchRow* old;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	old = value->data[0].v_pointer;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (v_object) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_ref (value->data[0].v_pointer);
-#line 3185 "SavedSearchDialog.c"
+#line 3151 "SavedSearchDialog.c"
 	} else {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3189 "SavedSearchDialog.c"
+#line 3155 "SavedSearchDialog.c"
 	}
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (old);
-#line 3195 "SavedSearchDialog.c"
+#line 3161 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_value_take_search_row (GValue* value, gpointer v_object) {
 	SavedSearchDialogSearchRow* old;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	old = value->data[0].v_pointer;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (v_object) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW));
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 3214 "SavedSearchDialog.c"
+#line 3180 "SavedSearchDialog.c"
 	} else {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 3218 "SavedSearchDialog.c"
+#line 3184 "SavedSearchDialog.c"
 	}
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_search_row_unref (old);
-#line 3224 "SavedSearchDialog.c"
+#line 3190 "SavedSearchDialog.c"
 	}
 }
 
 
 static void saved_search_dialog_search_row_class_init (SavedSearchDialogSearchRowClass * klass) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_parent_class = g_type_class_peek_parent (klass);
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_finalize;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_real_get_widget;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_real_get_search_condition;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_real_populate;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_real_is_complete;
-#line 3242 "SavedSearchDialog.c"
+#line 3208 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_instance_init (SavedSearchDialogSearchRow * self) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 3249 "SavedSearchDialog.c"
+#line 3215 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_finalize (SavedSearchDialogSearchRow* obj) {
 	SavedSearchDialogSearchRow * self;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW, SavedSearchDialogSearchRow);
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_destroy (self);
-#line 3259 "SavedSearchDialog.c"
+#line 3225 "SavedSearchDialog.c"
 }
 
 
@@ -3276,46 +3242,46 @@ static GType saved_search_dialog_search_row_get_type (void) {
 static gpointer saved_search_dialog_search_row_ref (gpointer instance) {
 	SavedSearchDialogSearchRow* self;
 	self = instance;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 3284 "SavedSearchDialog.c"
+#line 3250 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_unref (gpointer instance) {
 	SavedSearchDialogSearchRow* self;
 	self = instance;
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		SAVED_SEARCH_DIALOG_SEARCH_ROW_GET_CLASS (self)->finalize (self);
-#line 142 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 136 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3297 "SavedSearchDialog.c"
+#line 3263 "SavedSearchDialog.c"
 	}
 }
 
 
 static void _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self);
-#line 3305 "SavedSearchDialog.c"
+#line 3271 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 191 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed ((SavedSearchDialogSearchRowText*) self);
-#line 3312 "SavedSearchDialog.c"
+#line 3278 "SavedSearchDialog.c"
 }
 
 
 static gpointer _saved_search_dialog_search_row_container_ref0 (gpointer self) {
-#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? saved_search_dialog_search_row_container_ref (self) : NULL;
-#line 3319 "SavedSearchDialog.c"
+#line 3285 "SavedSearchDialog.c"
 }
 
 
@@ -3350,130 +3316,130 @@ static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_const
 	GtkBox* _tmp26_ = NULL;
 	GtkEntry* _tmp27_ = NULL;
 	GtkBox* _tmp28_ = NULL;
-#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowText*) saved_search_dialog_search_row_construct (object_type);
-#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->text_context);
-#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->text_context = _tmp2_;
-#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->text_context;
-#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _ ("contains");
-#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 162 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
-#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->text_context;
-#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = _ ("is exactly");
-#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
-#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = self->priv->text_context;
-#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _ ("starts with");
-#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 164 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp7_, _tmp8_);
-#line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->text_context;
-#line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = _ ("ends with");
-#line 171 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 165 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp9_, _tmp10_);
-#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->text_context;
-#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = _ ("does not contain");
-#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 166 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp11_, _tmp12_);
-#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->text_context;
-#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = _ ("is not set");
-#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 167 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp13_, _tmp14_);
-#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->text_context;
-#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = _ ("is set");
-#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 168 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp15_, _tmp16_);
-#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = self->priv->text_context;
-#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 169 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 176 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->text_context;
-#line 176 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 170 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self);
-#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = (GtkEntry*) gtk_entry_new ();
-#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp19_);
-#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 172 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->entry = _tmp19_;
-#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->entry;
-#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 173 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_width_chars (_tmp20_, 25);
-#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = self->priv->entry;
-#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 174 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_activates_default (_tmp21_, TRUE);
-#line 181 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = self->priv->entry;
-#line 181 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 175 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self);
-#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp23_);
-#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 183 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 177 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp23_;
-#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->box;
-#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp25_ = self->priv->text_context;
-#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 178 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp26_ = self->priv->box;
-#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp27_ = self->priv->entry;
-#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 179 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 186 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp28_ = self->priv->box;
-#line 186 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 180 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
-#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3470 "SavedSearchDialog.c"
+#line 3436 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowText* saved_search_dialog_search_row_text_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 163 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_text_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, parent);
-#line 3477 "SavedSearchDialog.c"
+#line 3443 "SavedSearchDialog.c"
 }
 
 
@@ -3482,17 +3448,17 @@ static GtkWidget* saved_search_dialog_search_row_text_real_get_widget (SavedSear
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 188 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 195 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 195 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 195 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 195 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 189 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3496 "SavedSearchDialog.c"
+#line 3462 "SavedSearchDialog.c"
 }
 
 
@@ -3510,44 +3476,44 @@ static SearchCondition* saved_search_dialog_search_row_text_real_get_search_cond
 	SearchConditionTextContext _tmp5_ = 0;
 	SearchConditionText* c = NULL;
 	SearchConditionText* _tmp6_ = NULL;
-#line 198 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 192 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 199 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 193 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	type = _tmp1_;
-#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->entry;
-#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_entry_get_text (_tmp2_);
-#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 194 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	text = _tmp4_;
-#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 195 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 195 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	context = _tmp5_;
-#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 196 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_text_new (type, text, context);
-#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 196 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp6_;
-#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (text);
-#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 197 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3544 "SavedSearchDialog.c"
+#line 3510 "SavedSearchDialog.c"
 }
 
 
 static gpointer _search_condition_ref0 (gpointer self) {
-#line 207 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self ? search_condition_ref (self) : NULL;
-#line 3551 "SavedSearchDialog.c"
+#line 3517 "SavedSearchDialog.c"
 }
 
 
@@ -3562,39 +3528,39 @@ static void saved_search_dialog_search_row_text_real_populate (SavedSearchDialog
 	GtkEntry* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
-#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 207 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 207 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_TEXT) ? ((SearchConditionText*) _tmp0_) : NULL);
-#line 207 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 201 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	text = _tmp1_;
-#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 202 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (text != NULL, "text != null");
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->text_context;
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_text_get_context (text);
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 203 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->entry;
-#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_text_get_text (text);
-#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 204 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_entry_set_text (_tmp5_, _tmp7_);
-#line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 205 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_on_changed (self);
-#line 206 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 200 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (text);
-#line 3598 "SavedSearchDialog.c"
+#line 3564 "SavedSearchDialog.c"
 }
 
 
@@ -3609,53 +3575,53 @@ static gboolean saved_search_dialog_search_row_text_real_is_complete (SavedSearc
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 208 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->entry;
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_entry_get_text (_tmp2_);
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = string_chomp (_tmp4_);
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = _tmp5_;
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = g_strcmp0 (_tmp6_, "") != 0;
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp6_);
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp7_) {
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = TRUE;
-#line 3633 "SavedSearchDialog.c"
+#line 3599 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp8_ = 0;
-#line 216 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp8_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 216 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 210 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp1_ = _tmp8_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET;
-#line 3640 "SavedSearchDialog.c"
+#line 3606 "SavedSearchDialog.c"
 	}
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_) {
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = TRUE;
-#line 3646 "SavedSearchDialog.c"
+#line 3612 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp9_ = 0;
-#line 217 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp9_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 217 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 211 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = _tmp9_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
-#line 3653 "SavedSearchDialog.c"
+#line 3619 "SavedSearchDialog.c"
 	}
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp0_;
-#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 209 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3659 "SavedSearchDialog.c"
+#line 3625 "SavedSearchDialog.c"
 }
 
 
@@ -3663,17 +3629,17 @@ static SearchConditionTextContext saved_search_dialog_search_row_text_get_text_c
 	SearchConditionTextContext result = 0;
 	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 214 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self), 0);
-#line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->text_context;
-#line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = (SearchConditionTextContext) _tmp1_;
-#line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 215 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3677 "SavedSearchDialog.c"
+#line 3643 "SavedSearchDialog.c"
 }
 
 
@@ -3682,73 +3648,73 @@ static void saved_search_dialog_search_row_text_on_changed (SavedSearchDialogSea
 	SearchConditionTextContext _tmp1_ = 0;
 	SavedSearchDialogSearchRowContainer* _tmp5_ = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp6_ = NULL;
-#line 224 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 218 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_TEXT (self));
-#line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp1_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_NOT_SET) {
-#line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = TRUE;
-#line 3694 "SavedSearchDialog.c"
+#line 3660 "SavedSearchDialog.c"
 	} else {
 		SearchConditionTextContext _tmp2_ = 0;
-#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp2_ = saved_search_dialog_search_row_text_get_text_context (self);
-#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 220 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp0_ = _tmp2_ == SEARCH_CONDITION_TEXT_CONTEXT_IS_SET;
-#line 3701 "SavedSearchDialog.c"
+#line 3667 "SavedSearchDialog.c"
 	}
-#line 225 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 219 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp0_) {
-#line 3705 "SavedSearchDialog.c"
+#line 3671 "SavedSearchDialog.c"
 		GtkEntry* _tmp3_ = NULL;
-#line 227 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->entry;
-#line 227 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 221 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 3711 "SavedSearchDialog.c"
+#line 3677 "SavedSearchDialog.c"
 	} else {
 		GtkEntry* _tmp4_ = NULL;
-#line 229 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->entry;
-#line 229 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 223 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 3718 "SavedSearchDialog.c"
+#line 3684 "SavedSearchDialog.c"
 	}
-#line 232 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->parent;
-#line 232 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->parent;
-#line 232 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 226 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp5_, "changed", _tmp6_);
-#line 3726 "SavedSearchDialog.c"
+#line 3692 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_text_class_init (SavedSearchDialogSearchRowTextClass * klass) {
-#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_text_parent_class = g_type_class_peek_parent (klass);
-#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_text_finalize;
-#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowTextPrivate));
-#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_text_real_get_widget;
-#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_text_real_get_search_condition;
-#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_text_real_populate;
-#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_text_real_is_complete;
-#line 3745 "SavedSearchDialog.c"
+#line 3711 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_text_instance_init (SavedSearchDialogSearchRowText * self) {
-#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_TEXT_GET_PRIVATE (self);
-#line 3752 "SavedSearchDialog.c"
+#line 3718 "SavedSearchDialog.c"
 }
 
 
@@ -3758,31 +3724,31 @@ static void saved_search_dialog_search_row_text_finalize (SavedSearchDialogSearc
 	guint _tmp1_ = 0U;
 	GtkEntry* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_TEXT, SavedSearchDialogSearchRowText);
-#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->text_context;
-#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 190 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 184 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_combo_box_changed, self);
-#line 191 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->entry;
-#line 191 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE);
-#line 191 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 185 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_text_on_changed_gtk_editable_changed, self);
-#line 157 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 151 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 158 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 152 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->text_context);
-#line 159 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 153 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 161 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 155 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 156 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 150 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_text_parent_class)->finalize (obj);
-#line 3786 "SavedSearchDialog.c"
+#line 3752 "SavedSearchDialog.c"
 }
 
 
@@ -3799,9 +3765,9 @@ static GType saved_search_dialog_search_row_text_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_media_type_on_changed ((SavedSearchDialogSearchRowMediaType*) self);
-#line 3805 "SavedSearchDialog.c"
+#line 3771 "SavedSearchDialog.c"
 }
 
 
@@ -3831,114 +3797,114 @@ static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media
 	GtkBox* _tmp21_ = NULL;
 	GtkComboBoxText* _tmp22_ = NULL;
 	GtkBox* _tmp23_ = NULL;
-#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowMediaType*) saved_search_dialog_search_row_construct (object_type);
-#line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_context);
-#line 247 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->media_context = _tmp2_;
-#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->media_context;
-#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _ ("is");
-#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 242 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
-#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->media_context;
-#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = _ ("is not");
-#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
-#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = self->priv->media_context;
-#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 244 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->media_context;
-#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 245 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
-#line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp9_);
-#line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_type);
-#line 254 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 248 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->media_type = _tmp9_;
-#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->media_type;
-#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = _ ("any photo");
-#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 249 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp10_, _tmp11_);
-#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = self->priv->media_type;
-#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = _ ("a raw photo");
-#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 250 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp12_, _tmp13_);
-#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = self->priv->media_type;
-#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = _ ("a video");
-#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 251 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp14_, _tmp15_);
-#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = self->priv->media_type;
-#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 252 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 259 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = self->priv->media_type;
-#line 259 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 253 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
-#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp18_);
-#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 261 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 255 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp18_;
-#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = self->priv->box;
-#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->media_context;
-#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 256 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = self->priv->box;
-#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = self->priv->media_type;
-#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 257 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 264 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = self->priv->box;
-#line 264 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 258 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
-#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 3935 "SavedSearchDialog.c"
+#line 3901 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowMediaType* saved_search_dialog_search_row_media_type_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 243 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_media_type_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, parent);
-#line 3942 "SavedSearchDialog.c"
+#line 3908 "SavedSearchDialog.c"
 }
 
 
@@ -3947,17 +3913,17 @@ static GtkWidget* saved_search_dialog_search_row_media_type_real_get_widget (Sav
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 266 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 267 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 3961 "SavedSearchDialog.c"
+#line 3927 "SavedSearchDialog.c"
 }
 
 
@@ -3975,35 +3941,35 @@ static SearchCondition* saved_search_dialog_search_row_media_type_real_get_searc
 	gint _tmp5_ = 0;
 	SearchConditionMediaType* c = NULL;
 	SearchConditionMediaType* _tmp6_ = NULL;
-#line 276 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 270 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 277 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 271 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->media_context;
-#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 272 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	context = (SearchConditionMediaTypeContext) _tmp3_;
-#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->media_type;
-#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
-#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 273 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	type = (SearchConditionMediaTypeMediaType) _tmp5_;
-#line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 274 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_media_type_new (search_type, context, type);
-#line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 274 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp6_;
-#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 275 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4007 "SavedSearchDialog.c"
+#line 3973 "SavedSearchDialog.c"
 }
 
 
@@ -4018,91 +3984,91 @@ static void saved_search_dialog_search_row_media_type_real_populate (SavedSearch
 	GtkComboBoxText* _tmp5_ = NULL;
 	SearchConditionMediaTypeMediaType _tmp6_ = 0;
 	SearchConditionMediaTypeMediaType _tmp7_ = 0;
-#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 285 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 285 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_MEDIA_TYPE) ? ((SearchConditionMediaType*) _tmp0_) : NULL);
-#line 285 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 279 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	media = _tmp1_;
-#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 280 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (media != NULL, "media != null");
-#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->media_context;
-#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_media_type_get_context (media);
-#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 287 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 281 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 288 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->media_type;
-#line 288 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_media_type_get_media_type (media);
-#line 288 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 288 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 282 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_);
-#line 284 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 278 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (media);
-#line 4052 "SavedSearchDialog.c"
+#line 4018 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_media_type_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowMediaType * self;
 	gboolean result = FALSE;
-#line 291 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 285 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 292 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 292 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 286 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4065 "SavedSearchDialog.c"
+#line 4031 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_on_changed (SavedSearchDialogSearchRowMediaType* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
-#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 289 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_MEDIA_TYPE (self));
-#line 296 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 296 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 296 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 290 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 4080 "SavedSearchDialog.c"
+#line 4046 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_class_init (SavedSearchDialogSearchRowMediaTypeClass * klass) {
-#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_media_type_parent_class = g_type_class_peek_parent (klass);
-#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_media_type_finalize;
-#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowMediaTypePrivate));
-#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_media_type_real_get_widget;
-#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_media_type_real_get_search_condition;
-#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_media_type_real_populate;
-#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_media_type_real_is_complete;
-#line 4099 "SavedSearchDialog.c"
+#line 4065 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_media_type_instance_init (SavedSearchDialogSearchRowMediaType * self) {
-#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MEDIA_TYPE_GET_PRIVATE (self);
-#line 4106 "SavedSearchDialog.c"
+#line 4072 "SavedSearchDialog.c"
 }
 
 
@@ -4112,31 +4078,31 @@ static void saved_search_dialog_search_row_media_type_finalize (SavedSearchDialo
 	guint _tmp1_ = 0U;
 	GtkComboBoxText* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MEDIA_TYPE, SavedSearchDialogSearchRowMediaType);
-#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->media_context;
-#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 268 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 262 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
-#line 269 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->media_type;
-#line 269 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp3_, NULL, FALSE);
-#line 269 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 263 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_media_type_on_changed_gtk_combo_box_changed, self);
-#line 237 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 231 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 238 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 232 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_context);
-#line 239 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 233 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->media_type);
-#line 241 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 235 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 236 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 230 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_media_type_parent_class)->finalize (obj);
-#line 4140 "SavedSearchDialog.c"
+#line 4106 "SavedSearchDialog.c"
 }
 
 
@@ -4153,9 +4119,9 @@ static GType saved_search_dialog_search_row_media_type_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_modified_on_changed ((SavedSearchDialogSearchRowModified*) self);
-#line 4159 "SavedSearchDialog.c"
+#line 4125 "SavedSearchDialog.c"
 }
 
 
@@ -4185,114 +4151,114 @@ static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modifi
 	GtkBox* _tmp21_ = NULL;
 	GtkComboBoxText* _tmp22_ = NULL;
 	GtkBox* _tmp23_ = NULL;
-#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowModified*) saved_search_dialog_search_row_construct (object_type);
-#line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_context);
-#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 304 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->modified_context = _tmp2_;
-#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->modified_context;
-#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _ ("has");
-#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
-#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->modified_context;
-#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = _ ("has no");
-#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 306 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
-#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = self->priv->modified_context;
-#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->modified_context;
-#line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 308 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
-#line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp9_);
-#line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_state);
-#line 316 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 310 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->modified_state = _tmp9_;
-#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->modified_state;
-#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = _ ("modifications");
-#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 311 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp10_, _tmp11_);
-#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = self->priv->modified_state;
-#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = _ ("internal modifications");
-#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 312 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp12_, _tmp13_);
-#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = self->priv->modified_state;
-#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = _ ("external modifications");
-#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 313 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp14_, _tmp15_);
-#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = self->priv->modified_state;
-#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 314 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 321 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = self->priv->modified_state;
-#line 321 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 315 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
-#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp18_);
-#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 323 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 317 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp18_;
-#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = self->priv->box;
-#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->modified_context;
-#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 318 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = self->priv->box;
-#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = self->priv->modified_state;
-#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 319 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 326 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = self->priv->box;
-#line 326 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 320 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
-#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4289 "SavedSearchDialog.c"
+#line 4255 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowModified* saved_search_dialog_search_row_modified_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 307 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_modified_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, parent);
-#line 4296 "SavedSearchDialog.c"
+#line 4262 "SavedSearchDialog.c"
 }
 
 
@@ -4301,17 +4267,17 @@ static GtkWidget* saved_search_dialog_search_row_modified_real_get_widget (Saved
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 328 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 329 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4315 "SavedSearchDialog.c"
+#line 4281 "SavedSearchDialog.c"
 }
 
 
@@ -4329,35 +4295,35 @@ static SearchCondition* saved_search_dialog_search_row_modified_real_get_search_
 	gint _tmp5_ = 0;
 	SearchConditionModified* c = NULL;
 	SearchConditionModified* _tmp6_ = NULL;
-#line 338 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 332 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 339 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 333 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->modified_context;
-#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 334 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	context = (SearchConditionModifiedContext) _tmp3_;
-#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->modified_state;
-#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
-#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 335 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	state = (SearchConditionModifiedState) _tmp5_;
-#line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 336 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_modified_new (search_type, context, state);
-#line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 336 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp6_;
-#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 337 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4361 "SavedSearchDialog.c"
+#line 4327 "SavedSearchDialog.c"
 }
 
 
@@ -4372,91 +4338,91 @@ static void saved_search_dialog_search_row_modified_real_populate (SavedSearchDi
 	GtkComboBoxText* _tmp5_ = NULL;
 	SearchConditionModifiedContext _tmp6_ = 0;
 	SearchConditionModifiedContext _tmp7_ = 0;
-#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 347 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 347 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_MODIFIED) ? ((SearchConditionModified*) _tmp0_) : NULL);
-#line 347 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 341 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	scm = _tmp1_;
-#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 342 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (scm != NULL, "scm != null");
-#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->modified_state;
-#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_modified_get_state (scm);
-#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 349 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 343 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 350 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->modified_context;
-#line 350 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_modified_get_context (scm);
-#line 350 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 350 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 344 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp7_);
-#line 346 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 340 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (scm);
-#line 4406 "SavedSearchDialog.c"
+#line 4372 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_modified_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowModified * self;
 	gboolean result = FALSE;
-#line 353 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 347 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 354 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 354 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 348 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4419 "SavedSearchDialog.c"
+#line 4385 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_on_changed (SavedSearchDialogSearchRowModified* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
-#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 351 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_MODIFIED (self));
-#line 358 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 358 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 358 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 352 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 4434 "SavedSearchDialog.c"
+#line 4400 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_class_init (SavedSearchDialogSearchRowModifiedClass * klass) {
-#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_modified_parent_class = g_type_class_peek_parent (klass);
-#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_modified_finalize;
-#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowModifiedPrivate));
-#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_modified_real_get_widget;
-#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_modified_real_get_search_condition;
-#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_modified_real_populate;
-#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_modified_real_is_complete;
-#line 4453 "SavedSearchDialog.c"
+#line 4419 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_modified_instance_init (SavedSearchDialogSearchRowModified * self) {
-#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_MODIFIED_GET_PRIVATE (self);
-#line 4460 "SavedSearchDialog.c"
+#line 4426 "SavedSearchDialog.c"
 }
 
 
@@ -4466,31 +4432,31 @@ static void saved_search_dialog_search_row_modified_finalize (SavedSearchDialogS
 	guint _tmp1_ = 0U;
 	GtkComboBoxText* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_MODIFIED, SavedSearchDialogSearchRowModified);
-#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->modified_state;
-#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 330 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 324 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
-#line 331 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->modified_context;
-#line 331 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp3_, NULL, FALSE);
-#line 331 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 325 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_modified_on_changed_gtk_combo_box_changed, self);
-#line 301 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 295 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 302 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 296 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_context);
-#line 303 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 297 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->modified_state);
-#line 305 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 299 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 300 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 294 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_modified_parent_class)->finalize (obj);
-#line 4494 "SavedSearchDialog.c"
+#line 4460 "SavedSearchDialog.c"
 }
 
 
@@ -4507,9 +4473,9 @@ static GType saved_search_dialog_search_row_modified_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 385 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_flagged_on_changed ((SavedSearchDialogSearchRowFlagged*) self);
-#line 4513 "SavedSearchDialog.c"
+#line 4479 "SavedSearchDialog.c"
 }
 
 
@@ -4532,88 +4498,88 @@ static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged
 	GtkBox* _tmp14_ = NULL;
 	GtkComboBoxText* _tmp15_ = NULL;
 	GtkBox* _tmp16_ = NULL;
-#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowFlagged*) saved_search_dialog_search_row_construct (object_type);
-#line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->flagged_state);
-#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->flagged_state = _tmp2_;
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->flagged_state;
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _ ("flagged");
-#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 367 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
-#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->flagged_state;
-#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = _ ("not flagged");
-#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
-#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = self->priv->flagged_state;
-#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 369 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 376 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = self->priv->flagged_state;
-#line 376 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 370 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self);
-#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp9_);
-#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 378 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 372 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp9_;
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = self->priv->box;
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = _ ("is");
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = (GtkLabel*) gtk_label_new (_tmp11_);
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp12_);
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = _tmp12_;
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 373 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp13_);
-#line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = self->priv->box;
-#line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->flagged_state;
-#line 380 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 374 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 381 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = self->priv->box;
-#line 381 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 375 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget));
-#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4610 "SavedSearchDialog.c"
+#line 4576 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowFlagged* saved_search_dialog_search_row_flagged_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 368 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_flagged_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, parent);
-#line 4617 "SavedSearchDialog.c"
+#line 4583 "SavedSearchDialog.c"
 }
 
 
@@ -4622,17 +4588,17 @@ static GtkWidget* saved_search_dialog_search_row_flagged_real_get_widget (SavedS
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 382 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 389 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 389 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 389 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 389 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 383 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4636 "SavedSearchDialog.c"
+#line 4602 "SavedSearchDialog.c"
 }
 
 
@@ -4647,29 +4613,29 @@ static SearchCondition* saved_search_dialog_search_row_flagged_real_get_search_c
 	gint _tmp3_ = 0;
 	SearchConditionFlagged* c = NULL;
 	SearchConditionFlagged* _tmp4_ = NULL;
-#line 392 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 386 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 387 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->flagged_state;
-#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 388 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	state = (SearchConditionFlaggedState) _tmp3_;
-#line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 389 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = search_condition_flagged_new (search_type, state);
-#line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 389 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp4_;
-#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 390 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 390 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4673 "SavedSearchDialog.c"
+#line 4639 "SavedSearchDialog.c"
 }
 
 
@@ -4681,83 +4647,83 @@ static void saved_search_dialog_search_row_flagged_real_populate (SavedSearchDia
 	GtkComboBoxText* _tmp2_ = NULL;
 	SearchConditionFlaggedState _tmp3_ = 0;
 	SearchConditionFlaggedState _tmp4_ = 0;
-#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_FLAGGED) ? ((SearchConditionFlagged*) _tmp0_) : NULL);
-#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 394 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	f = _tmp1_;
-#line 401 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 395 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (f != NULL, "f != null");
-#line 402 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->flagged_state;
-#line 402 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_flagged_get_state (f);
-#line 402 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 402 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 396 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 393 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (f);
-#line 4707 "SavedSearchDialog.c"
+#line 4673 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_flagged_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowFlagged * self;
 	gboolean result = FALSE;
-#line 405 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 399 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 406 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 406 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 400 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 4720 "SavedSearchDialog.c"
+#line 4686 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_on_changed (SavedSearchDialogSearchRowFlagged* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
-#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 403 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_FLAGGED (self));
-#line 410 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 410 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 410 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 404 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 4735 "SavedSearchDialog.c"
+#line 4701 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_class_init (SavedSearchDialogSearchRowFlaggedClass * klass) {
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_flagged_parent_class = g_type_class_peek_parent (klass);
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_flagged_finalize;
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowFlaggedPrivate));
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_flagged_real_get_widget;
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_flagged_real_get_search_condition;
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_flagged_real_populate;
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_flagged_real_is_complete;
-#line 4754 "SavedSearchDialog.c"
+#line 4720 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_flagged_instance_init (SavedSearchDialogSearchRowFlagged * self) {
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_FLAGGED_GET_PRIVATE (self);
-#line 4761 "SavedSearchDialog.c"
+#line 4727 "SavedSearchDialog.c"
 }
 
 
@@ -4765,23 +4731,23 @@ static void saved_search_dialog_search_row_flagged_finalize (SavedSearchDialogSe
 	SavedSearchDialogSearchRowFlagged * self;
 	GtkComboBoxText* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_FLAGGED, SavedSearchDialogSearchRowFlagged);
-#line 385 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->flagged_state;
-#line 385 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 385 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 379 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_flagged_on_changed_gtk_combo_box_changed, self);
-#line 363 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 357 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 364 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 358 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->flagged_state);
-#line 366 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 360 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 362 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 356 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_flagged_parent_class)->finalize (obj);
-#line 4785 "SavedSearchDialog.c"
+#line 4751 "SavedSearchDialog.c"
 }
 
 
@@ -4798,9 +4764,9 @@ static GType saved_search_dialog_search_row_flagged_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_rating_on_changed ((SavedSearchDialogSearchRowRating*) self);
-#line 4804 "SavedSearchDialog.c"
+#line 4770 "SavedSearchDialog.c"
 }
 
 
@@ -4844,158 +4810,158 @@ static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_c
 	GtkBox* _tmp35_ = NULL;
 	GtkComboBoxText* _tmp36_ = NULL;
 	GtkBox* _tmp37_ = NULL;
-#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowRating*) saved_search_dialog_search_row_construct (object_type);
-#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->rating);
-#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->rating = _tmp2_;
-#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->rating;
-#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = resources_rating_combo_box (RATING_REJECTED);
-#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 420 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
-#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->rating;
-#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = resources_rating_combo_box (RATING_UNRATED);
-#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
-#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = self->priv->rating;
-#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = resources_rating_combo_box (RATING_ONE);
-#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 422 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp7_, _tmp8_);
-#line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 423 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->rating;
-#line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 423 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = resources_rating_combo_box (RATING_TWO);
-#line 429 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 423 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp9_, _tmp10_);
-#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->rating;
-#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = resources_rating_combo_box (RATING_THREE);
-#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 424 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp11_, _tmp12_);
-#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->rating;
-#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = resources_rating_combo_box (RATING_FOUR);
-#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 425 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp13_, _tmp14_);
-#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = self->priv->rating;
-#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = resources_rating_combo_box (RATING_FIVE);
-#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 426 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp15_, _tmp16_);
-#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = self->priv->rating;
-#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 427 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->rating;
-#line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 428 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
-#line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp19_);
-#line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
-#line 436 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 430 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->context = _tmp19_;
-#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->context;
-#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = _ ("and higher");
-#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 431 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp20_, _tmp21_);
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = self->priv->context;
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = _ ("only");
-#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 432 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp22_, _tmp23_);
-#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->context;
-#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp25_ = _ ("and lower");
-#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 433 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp24_, _tmp25_);
-#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp26_ = self->priv->context;
-#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 434 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp27_ = self->priv->context;
-#line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 435 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
-#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp28_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp28_);
-#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 443 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 437 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp28_;
-#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp29_ = self->priv->box;
-#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp30_ = _ ("is");
-#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp31_ = (GtkLabel*) gtk_label_new (_tmp30_);
-#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp31_);
-#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp32_ = _tmp31_;
-#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 444 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 438 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (_tmp32_);
-#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp33_ = self->priv->box;
-#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp34_ = self->priv->rating;
-#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 439 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp35_ = self->priv->box;
-#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp36_ = self->priv->context;
-#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 440 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 447 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp37_ = self->priv->box;
-#line 447 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 441 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget));
-#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 4992 "SavedSearchDialog.c"
+#line 4958 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowRating* saved_search_dialog_search_row_rating_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 421 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_rating_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, parent);
-#line 4999 "SavedSearchDialog.c"
+#line 4965 "SavedSearchDialog.c"
 }
 
 
@@ -5004,17 +4970,17 @@ static GtkWidget* saved_search_dialog_search_row_rating_real_get_widget (SavedSe
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 449 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 450 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5018 "SavedSearchDialog.c"
+#line 4984 "SavedSearchDialog.c"
 }
 
 
@@ -5032,35 +4998,35 @@ static SearchCondition* saved_search_dialog_search_row_rating_real_get_search_co
 	gint _tmp5_ = 0;
 	SearchConditionRating* c = NULL;
 	SearchConditionRating* _tmp6_ = NULL;
-#line 459 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 453 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 460 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 454 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->rating;
-#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 455 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_rating = ((Rating) _tmp3_) + RATING_REJECTED;
-#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = self->priv->context;
-#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_combo_box_get_type (), GtkComboBox));
-#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 456 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_context = (SearchConditionRatingContext) _tmp5_;
-#line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 457 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_rating_new (search_type, search_rating, search_context);
-#line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 457 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp6_;
-#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 458 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5064 "SavedSearchDialog.c"
+#line 5030 "SavedSearchDialog.c"
 }
 
 
@@ -5075,91 +5041,91 @@ static void saved_search_dialog_search_row_rating_real_populate (SavedSearchDial
 	GtkComboBoxText* _tmp5_ = NULL;
 	Rating _tmp6_ = 0;
 	Rating _tmp7_ = 0;
-#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 468 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 468 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_RATING) ? ((SearchConditionRating*) _tmp0_) : NULL);
-#line 468 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 462 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	r = _tmp1_;
-#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 463 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (r != NULL, "r != null");
-#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->context;
-#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_rating_get_context (r);
-#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 470 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 464 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 471 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->rating;
-#line 471 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = search_condition_rating_get_rating (r);
-#line 471 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 471 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 465 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox), (gint) (_tmp7_ - RATING_REJECTED));
-#line 467 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 461 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (r);
-#line 5109 "SavedSearchDialog.c"
+#line 5075 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_rating_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowRating * self;
 	gboolean result = FALSE;
-#line 474 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 468 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 475 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 475 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 469 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5122 "SavedSearchDialog.c"
+#line 5088 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_on_changed (SavedSearchDialogSearchRowRating* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
-#line 478 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 472 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_RATING (self));
-#line 479 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 479 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 479 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 473 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 5137 "SavedSearchDialog.c"
+#line 5103 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_class_init (SavedSearchDialogSearchRowRatingClass * klass) {
-#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_rating_parent_class = g_type_class_peek_parent (klass);
-#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_rating_finalize;
-#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowRatingPrivate));
-#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_rating_real_get_widget;
-#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_rating_real_get_search_condition;
-#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_rating_real_populate;
-#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_rating_real_is_complete;
-#line 5156 "SavedSearchDialog.c"
+#line 5122 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_rating_instance_init (SavedSearchDialogSearchRowRating * self) {
-#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_RATING_GET_PRIVATE (self);
-#line 5163 "SavedSearchDialog.c"
+#line 5129 "SavedSearchDialog.c"
 }
 
 
@@ -5169,31 +5135,31 @@ static void saved_search_dialog_search_row_rating_finalize (SavedSearchDialogSea
 	guint _tmp1_ = 0U;
 	GtkComboBoxText* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_RATING, SavedSearchDialogSearchRowRating);
-#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->rating;
-#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 451 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 445 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
-#line 452 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->context;
-#line 452 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp3_, NULL, FALSE);
-#line 452 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 446 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _saved_search_dialog_search_row_rating_on_changed_gtk_combo_box_changed, self);
-#line 415 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 409 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 416 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 410 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->rating);
-#line 417 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 411 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
-#line 419 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 413 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 414 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 408 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_rating_parent_class)->finalize (obj);
-#line 5197 "SavedSearchDialog.c"
+#line 5163 "SavedSearchDialog.c"
 }
 
 
@@ -5210,23 +5176,23 @@ static GType saved_search_dialog_search_row_rating_get_type (void) {
 
 
 static void _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 529 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_changed ((SavedSearchDialogSearchRowDate*) self);
-#line 5216 "SavedSearchDialog.c"
+#line 5182 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_one_clicked ((SavedSearchDialogSearchRowDate*) self);
-#line 5223 "SavedSearchDialog.c"
+#line 5189 "SavedSearchDialog.c"
 }
 
 
 static void _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_on_two_clicked ((SavedSearchDialogSearchRowDate*) self);
-#line 5230 "SavedSearchDialog.c"
+#line 5196 "SavedSearchDialog.c"
 }
 
 
@@ -5265,162 +5231,162 @@ static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_const
 	GtkBox* _tmp30_ = NULL;
 	GtkButton* _tmp31_ = NULL;
 	GtkBox* _tmp32_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_CONTAINER (parent), NULL);
-#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = (SavedSearchDialogSearchRowDate*) saved_search_dialog_search_row_construct (object_type);
-#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = parent;
-#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _saved_search_dialog_search_row_container_ref0 (_tmp0_);
-#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->parent = _tmp1_;
-#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp2_);
-#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
-#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->context = _tmp2_;
-#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->context;
-#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _ ("is exactly");
-#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 494 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp3_, _tmp4_);
-#line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = self->priv->context;
-#line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = _ ("is after");
-#line 501 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp5_, _tmp6_);
-#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = self->priv->context;
-#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _ ("is before");
-#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 496 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp7_, _tmp8_);
-#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = self->priv->context;
-#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = _ ("is between");
-#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 497 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp9_, _tmp10_);
-#line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = self->priv->context;
-#line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = _ ("is not set");
-#line 504 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 498 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_text_append_text (_tmp11_, _tmp12_);
-#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->context;
-#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 499 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = self->priv->context;
-#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 500 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self);
-#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = (GtkCalendar*) gtk_calendar_new ();
-#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp15_);
-#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_one);
-#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 502 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->cal_one = _tmp15_;
-#line 509 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = (GtkCalendar*) gtk_calendar_new ();
-#line 509 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp16_);
-#line 509 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_two);
-#line 509 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 503 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->cal_two = _tmp16_;
-#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = (GtkButton*) gtk_button_new ();
-#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp17_);
-#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_one);
-#line 511 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 505 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->label_one = _tmp17_;
-#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->label_one;
-#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 506 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (_tmp18_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_one_clicked_gtk_button_clicked, self);
-#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = (GtkButton*) gtk_button_new ();
-#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp19_);
-#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_two);
-#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 507 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->label_two = _tmp19_;
-#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = self->priv->label_two;
-#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 508 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_connect (_tmp20_, "clicked", (GCallback) _saved_search_dialog_search_row_date_on_two_clicked_gtk_button_clicked, self);
-#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = _ ("and");
-#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = (GtkLabel*) gtk_label_new (_tmp21_);
-#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp22_);
-#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->and);
-#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 510 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->and = _tmp22_;
-#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp23_);
-#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 512 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->box = _tmp23_;
-#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp24_ = self->priv->box;
-#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp25_ = self->priv->context;
-#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 513 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp26_ = self->priv->box;
-#line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp27_ = self->priv->label_one;
-#line 520 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 514 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp28_ = self->priv->box;
-#line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp29_ = self->priv->and;
-#line 521 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 515 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp28_, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 522 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp30_ = self->priv->box;
-#line 522 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp31_ = self->priv->label_two;
-#line 522 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 516 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_box_pack_start (_tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 524 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp32_ = self->priv->box;
-#line 524 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 518 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
-#line 525 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 519 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return self;
-#line 5417 "SavedSearchDialog.c"
+#line 5383 "SavedSearchDialog.c"
 }
 
 
 static SavedSearchDialogSearchRowDate* saved_search_dialog_search_row_date_new (SavedSearchDialogSearchRowContainer* parent) {
-#line 495 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return saved_search_dialog_search_row_date_construct (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, parent);
-#line 5424 "SavedSearchDialog.c"
+#line 5390 "SavedSearchDialog.c"
 }
 
 
@@ -5439,110 +5405,110 @@ static void saved_search_dialog_search_row_date_update_date_labels (SavedSearchD
 	GDateTime* _tmp20_ = NULL;
 	gchar* _tmp21_ = NULL;
 	gchar* _tmp22_ = NULL;
-#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 526 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->context;
-#line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 527 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = (SearchConditionDateContext) _tmp1_;
-#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 530 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = c;
-#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 530 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp2_ == SEARCH_CONDITION_DATE_CONTEXT_BETWEEN) {
-#line 5455 "SavedSearchDialog.c"
+#line 5421 "SavedSearchDialog.c"
 		GtkButton* _tmp3_ = NULL;
 		GtkLabel* _tmp4_ = NULL;
 		GtkButton* _tmp5_ = NULL;
-#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp3_ = self->priv->label_one;
-#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 531 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 538 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp4_ = self->priv->and;
-#line 538 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 532 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp5_ = self->priv->label_two;
-#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 533 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 5471 "SavedSearchDialog.c"
+#line 5437 "SavedSearchDialog.c"
 	} else {
 		SearchConditionDateContext _tmp6_ = 0;
-#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp6_ = c;
-#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 534 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (_tmp6_ == SEARCH_CONDITION_DATE_CONTEXT_IS_NOT_SET) {
-#line 5478 "SavedSearchDialog.c"
+#line 5444 "SavedSearchDialog.c"
 			GtkButton* _tmp7_ = NULL;
 			GtkLabel* _tmp8_ = NULL;
 			GtkButton* _tmp9_ = NULL;
-#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp7_ = self->priv->label_one;
-#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 535 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 542 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp8_ = self->priv->and;
-#line 542 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 536 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
-#line 543 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp9_ = self->priv->label_two;
-#line 543 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 537 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 5494 "SavedSearchDialog.c"
+#line 5460 "SavedSearchDialog.c"
 		} else {
 			GtkButton* _tmp10_ = NULL;
 			GtkLabel* _tmp11_ = NULL;
 			GtkButton* _tmp12_ = NULL;
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp10_ = self->priv->label_one;
-#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 539 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp11_ = self->priv->and;
-#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 540 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 547 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			_tmp12_ = self->priv->label_two;
-#line 547 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 541 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 5511 "SavedSearchDialog.c"
+#line 5477 "SavedSearchDialog.c"
 		}
 	}
-#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = self->priv->label_one;
-#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = saved_search_dialog_search_row_date_get_date_one (self);
-#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = _tmp14_;
-#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = g_date_time_format (_tmp15_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT);
-#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = _tmp16_;
-#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_button_set_label (_tmp13_, _tmp17_);
-#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp17_);
-#line 551 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 545 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp15_);
-#line 552 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = self->priv->label_two;
-#line 552 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = saved_search_dialog_search_row_date_get_date_two (self);
-#line 552 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = _tmp19_;
-#line 552 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = g_date_time_format (_tmp20_, SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_DATE_FORMAT);
-#line 552 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = _tmp21_;
-#line 552 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_button_set_label (_tmp18_, _tmp22_);
-#line 552 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_free0 (_tmp22_);
-#line 552 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 546 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp20_);
-#line 5546 "SavedSearchDialog.c"
+#line 5512 "SavedSearchDialog.c"
 }
 
 
@@ -5551,17 +5517,17 @@ static GtkWidget* saved_search_dialog_search_row_date_real_get_widget (SavedSear
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 555 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 549 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 556 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->box;
-#line 556 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 556 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp1_;
-#line 556 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 550 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5565 "SavedSearchDialog.c"
+#line 5531 "SavedSearchDialog.c"
 }
 
 
@@ -5577,33 +5543,33 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_one (SavedSearchD
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
 	GDateTime* _tmp9_ = NULL;
-#line 559 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 553 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self), NULL);
-#line 560 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_one;
-#line 560 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp0_, "year", &_tmp1_, NULL);
-#line 560 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 560 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->cal_one;
-#line 560 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp3_, "month", &_tmp4_, NULL);
-#line 560 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 560 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->cal_one;
-#line 560 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp6_, "day", &_tmp7_, NULL);
-#line 560 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _tmp7_;
-#line 560 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = g_date_time_new_local (_tmp2_, _tmp5_ + 1, _tmp8_, 0, 0, 0.0);
-#line 560 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp9_;
-#line 560 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 554 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5607 "SavedSearchDialog.c"
+#line 5573 "SavedSearchDialog.c"
 }
 
 
@@ -5619,33 +5585,33 @@ static GDateTime* saved_search_dialog_search_row_date_get_date_two (SavedSearchD
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
 	GDateTime* _tmp9_ = NULL;
-#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 557 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_val_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self), NULL);
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_two;
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp0_, "year", &_tmp1_, NULL);
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->cal_two;
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp3_, "month", &_tmp4_, NULL);
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->cal_two;
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp6_, "day", &_tmp7_, NULL);
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _tmp7_;
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = g_date_time_new_local (_tmp2_, _tmp5_ + 1, _tmp8_, 0, 0, 0.0);
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = _tmp9_;
-#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 558 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5649 "SavedSearchDialog.c"
+#line 5615 "SavedSearchDialog.c"
 }
 
 
@@ -5659,35 +5625,35 @@ static void saved_search_dialog_search_row_date_set_date_one (SavedSearchDialogS
 	GtkCalendar* _tmp6_ = NULL;
 	GDateTime* _tmp7_ = NULL;
 	gint _tmp8_ = 0;
-#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 561 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 561 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (date != NULL);
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_one;
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = date;
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = g_date_time_get_day_of_month (_tmp1_);
-#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 562 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp0_, "day", _tmp2_, NULL);
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->cal_one;
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = date;
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = g_date_time_get_month (_tmp4_);
-#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 563 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp3_, "month", _tmp5_ - 1, NULL);
-#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->cal_one;
-#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = date;
-#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = g_date_time_get_year (_tmp7_);
-#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 564 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp6_, "year", _tmp8_, NULL);
-#line 5691 "SavedSearchDialog.c"
+#line 5657 "SavedSearchDialog.c"
 }
 
 
@@ -5701,35 +5667,35 @@ static void saved_search_dialog_search_row_date_set_date_two (SavedSearchDialogS
 	GtkCalendar* _tmp6_ = NULL;
 	GDateTime* _tmp7_ = NULL;
 	gint _tmp8_ = 0;
-#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 567 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (date != NULL);
-#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_two;
-#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = date;
-#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = g_date_time_get_day_of_month (_tmp1_);
-#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 568 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp0_, "day", _tmp2_, NULL);
-#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = self->priv->cal_two;
-#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = date;
-#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = g_date_time_get_month (_tmp4_);
-#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 569 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp3_, "month", _tmp5_ - 1, NULL);
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = self->priv->cal_two;
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = date;
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = g_date_time_get_year (_tmp7_);
-#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 570 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_set (_tmp6_, "year", _tmp8_, NULL);
-#line 5733 "SavedSearchDialog.c"
+#line 5699 "SavedSearchDialog.c"
 }
 
 
@@ -5749,43 +5715,43 @@ static SearchCondition* saved_search_dialog_search_row_date_real_get_search_cond
 	GDateTime* _tmp7_ = NULL;
 	SearchConditionDate* _tmp8_ = NULL;
 	SearchConditionDate* _tmp9_ = NULL;
-#line 579 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 573 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = saved_search_dialog_search_row_container_get_search_type (_tmp0_);
-#line 580 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 574 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_type = _tmp1_;
-#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->context;
-#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 575 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	search_context = (SearchConditionDateContext) _tmp3_;
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = saved_search_dialog_search_row_date_get_date_one (self);
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = saved_search_dialog_search_row_date_get_date_two (self);
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = _tmp6_;
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = search_condition_date_new (search_type, search_context, _tmp5_, _tmp7_);
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = _tmp8_;
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp7_);
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_date_time_unref0 (_tmp5_);
-#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 576 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	c = _tmp9_;
-#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (c, TYPE_SEARCH_CONDITION, SearchCondition);
-#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 578 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5789 "SavedSearchDialog.c"
+#line 5755 "SavedSearchDialog.c"
 }
 
 
@@ -5801,136 +5767,136 @@ static void saved_search_dialog_search_row_date_real_populate (SavedSearchDialog
 	GDateTime* _tmp6_ = NULL;
 	GDateTime* _tmp7_ = NULL;
 	GDateTime* _tmp8_ = NULL;
-#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (IS_SEARCH_CONDITION (sc));
-#line 588 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = sc;
-#line 588 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = _search_condition_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_SEARCH_CONDITION_DATE) ? ((SearchConditionDate*) _tmp0_) : NULL);
-#line 588 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 582 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	cond = _tmp1_;
-#line 589 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 583 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_vala_assert (cond != NULL, "cond != null");
-#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = self->priv->context;
-#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = search_condition_date_get_context (cond);
-#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp4_ = _tmp3_;
-#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 584 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp4_);
-#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 585 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = search_condition_date_get_date_one (cond);
-#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 585 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = _tmp5_;
-#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 585 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_set_date_one (self, _tmp6_);
-#line 592 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp7_ = search_condition_date_get_date_two (cond);
-#line 592 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _tmp7_;
-#line 592 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 586 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_set_date_two (self, _tmp8_);
-#line 593 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
-	saved_search_dialog_search_row_date_update_date_labels (self);
 #line 587 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+	saved_search_dialog_search_row_date_update_date_labels (self);
+#line 581 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_search_condition_unref0 (cond);
-#line 5841 "SavedSearchDialog.c"
+#line 5807 "SavedSearchDialog.c"
 }
 
 
 static gboolean saved_search_dialog_search_row_date_real_is_complete (SavedSearchDialogSearchRow* base) {
 	SavedSearchDialogSearchRowDate * self;
 	gboolean result = FALSE;
-#line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 590 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 597 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	result = TRUE;
-#line 597 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 591 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return result;
-#line 5854 "SavedSearchDialog.c"
+#line 5820 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_on_changed (SavedSearchDialogSearchRowDate* self) {
 	SavedSearchDialogSearchRowContainer* _tmp0_ = NULL;
 	SavedSearchDialogSearchRowContainer* _tmp1_ = NULL;
-#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 594 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->parent;
-#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp1_ = self->priv->parent;
-#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 595 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_emit_by_name (_tmp0_, "changed", _tmp1_);
-#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 596 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5871 "SavedSearchDialog.c"
+#line 5837 "SavedSearchDialog.c"
 }
 
 
 static Block9Data* block9_data_ref (Block9Data* _data9_) {
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_atomic_int_inc (&_data9_->_ref_count_);
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return _data9_;
-#line 5880 "SavedSearchDialog.c"
+#line 5846 "SavedSearchDialog.c"
 }
 
 
 static void block9_data_unref (void * _userdata_) {
 	Block9Data* _data9_;
 	_data9_ = (Block9Data*) _userdata_;
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) {
-#line 5889 "SavedSearchDialog.c"
+#line 5855 "SavedSearchDialog.c"
 		SavedSearchDialogSearchRowDate* self;
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		self = _data9_->self;
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_g_object_unref0 (_data9_->d);
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_saved_search_dialog_search_row_unref0 (self);
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_slice_free (Block9Data, _data9_);
-#line 5899 "SavedSearchDialog.c"
+#line 5865 "SavedSearchDialog.c"
 	}
 }
 
 
 static void __lambda12_ (SavedSearchDialogSearchRowDate* self) {
-#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 5907 "SavedSearchDialog.c"
+#line 5873 "SavedSearchDialog.c"
 }
 
 
 static void ___lambda12__gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
-#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	__lambda12_ ((SavedSearchDialogSearchRowDate*) self);
-#line 5914 "SavedSearchDialog.c"
+#line 5880 "SavedSearchDialog.c"
 }
 
 
 static void __lambda13_ (Block9Data* _data9_) {
 	SavedSearchDialogSearchRowDate* self;
 	GtkDialog* _tmp0_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = _data9_->self;
-#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = _data9_->d;
-#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_dialog_response (_tmp0_, (gint) GTK_RESPONSE_ACCEPT);
-#line 5927 "SavedSearchDialog.c"
+#line 5893 "SavedSearchDialog.c"
 }
 
 
 static void ___lambda13__gtk_calendar_day_selected_double_click (GtkCalendar* _sender, gpointer self) {
-#line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	__lambda13_ (self);
-#line 5934 "SavedSearchDialog.c"
+#line 5900 "SavedSearchDialog.c"
 }
 
 
@@ -5971,192 +5937,192 @@ static void saved_search_dialog_search_row_date_popup_calendar (SavedSearchDialo
 	GtkCalendar* _tmp32_ = NULL;
 	gulong _tmp33_ = 0UL;
 	GtkDialog* _tmp34_ = NULL;
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (GTK_IS_CALENDAR (cal));
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data9_ = g_slice_new0 (Block9Data);
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data9_->_ref_count_ = 1;
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data9_->self = saved_search_dialog_search_row_ref (self);
-#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = cal;
-#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp0_, "day", &_tmp1_, NULL);
-#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp2_ = _tmp1_;
-#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 600 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	orig_day = _tmp2_;
-#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp3_ = cal;
-#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp3_, "month", &_tmp4_, NULL);
-#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp5_ = _tmp4_;
-#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 601 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	orig_month = _tmp5_;
-#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp6_ = cal;
-#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_get (_tmp6_, "year", &_tmp7_, NULL);
-#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp8_ = _tmp7_;
-#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 602 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	orig_year = _tmp8_;
-#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp9_ = (GtkDialog*) gtk_dialog_new_with_buttons (NULL, NULL, GTK_DIALOG_MODAL, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_REJECT, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL);
-#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_object_ref_sink (_tmp9_);
-#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 603 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data9_->d = _tmp9_;
-#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp10_ = _data9_->d;
-#line 612 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 606 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), TRUE);
-#line 613 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp11_ = _data9_->d;
-#line 613 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 607 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_window_get_type (), GtkWindow), FALSE);
-#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp12_ = _data9_->d;
-#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 608 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), FALSE);
-#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp13_ = _data9_->d;
-#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp14_ = (GtkBox*) gtk_dialog_get_content_area (_tmp13_);
-#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp15_ = cal;
-#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 609 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
-#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp16_ = cal;
-#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp17_ = g_signal_connect (_tmp16_, "day-selected", (GCallback) ___lambda12__gtk_calendar_day_selected, self);
-#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 610 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	id_1 = _tmp17_;
-#line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp18_ = cal;
-#line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp19_ = g_signal_connect_data (_tmp18_, "day-selected-double-click", (GCallback) ___lambda13__gtk_calendar_day_selected_double_click, block9_data_ref (_data9_), (GClosureNotify) block9_data_unref, 0);
-#line 617 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 611 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	id_2 = _tmp19_;
-#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp20_ = _data9_->d;
-#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 614 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp21_ = _data9_->d;
-#line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp22_ = gtk_dialog_run (_tmp21_);
-#line 621 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 615 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	res = _tmp22_;
-#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp23_ = res;
-#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 616 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (_tmp23_ != ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 6061 "SavedSearchDialog.c"
+#line 6027 "SavedSearchDialog.c"
 		GtkCalendar* _tmp24_ = NULL;
 		gint _tmp25_ = 0;
 		GtkCalendar* _tmp26_ = NULL;
 		gint _tmp27_ = 0;
 		GtkCalendar* _tmp28_ = NULL;
 		gint _tmp29_ = 0;
-#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp24_ = cal;
-#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp25_ = orig_day;
-#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 618 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_object_set (_tmp24_, "day", _tmp25_, NULL);
-#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp26_ = cal;
-#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp27_ = orig_month;
-#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 619 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_object_set (_tmp26_, "month", _tmp27_, NULL);
-#line 626 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp28_ = cal;
-#line 626 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		_tmp29_ = orig_year;
-#line 626 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 620 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_object_set (_tmp28_, "year", _tmp29_, NULL);
-#line 6086 "SavedSearchDialog.c"
+#line 6052 "SavedSearchDialog.c"
 	}
-#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp30_ = cal;
-#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp31_ = id_1;
-#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 622 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, G_TYPE_OBJECT, GObject), _tmp31_);
-#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp32_ = cal;
-#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp33_ = id_2;
-#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 623 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handler_disconnect (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, G_TYPE_OBJECT, GObject), _tmp33_);
-#line 630 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp34_ = _data9_->d;
-#line 630 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 624 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
-#line 631 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 625 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_update_date_labels (self);
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	block9_data_unref (_data9_);
-#line 605 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 599 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_data9_ = NULL;
-#line 6110 "SavedSearchDialog.c"
+#line 6076 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_on_one_clicked (SavedSearchDialogSearchRowDate* self) {
 	GtkCalendar* _tmp0_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 628 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 635 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_one;
-#line 635 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 629 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_);
-#line 6122 "SavedSearchDialog.c"
+#line 6088 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_on_two_clicked (SavedSearchDialogSearchRowDate* self) {
 	GtkCalendar* _tmp0_ = NULL;
-#line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 632 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_return_if_fail (SAVED_SEARCH_DIALOG_IS_SEARCH_ROW_DATE (self));
-#line 639 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->cal_two;
-#line 639 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 633 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_popup_calendar (self, _tmp0_);
-#line 6134 "SavedSearchDialog.c"
+#line 6100 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_class_init (SavedSearchDialogSearchRowDateClass * klass) {
-#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	saved_search_dialog_search_row_date_parent_class = g_type_class_peek_parent (klass);
-#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->finalize = saved_search_dialog_search_row_date_finalize;
-#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogSearchRowDatePrivate));
-#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_widget = saved_search_dialog_search_row_date_real_get_widget;
-#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->get_search_condition = saved_search_dialog_search_row_date_real_get_search_condition;
-#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->populate = saved_search_dialog_search_row_date_real_populate;
-#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	((SavedSearchDialogSearchRowClass *) klass)->is_complete = saved_search_dialog_search_row_date_real_is_complete;
-#line 6153 "SavedSearchDialog.c"
+#line 6119 "SavedSearchDialog.c"
 }
 
 
 static void saved_search_dialog_search_row_date_instance_init (SavedSearchDialogSearchRowDate * self) {
-#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_SEARCH_ROW_DATE_GET_PRIVATE (self);
-#line 6160 "SavedSearchDialog.c"
+#line 6126 "SavedSearchDialog.c"
 }
 
 
@@ -6164,33 +6130,33 @@ static void saved_search_dialog_search_row_date_finalize (SavedSearchDialogSearc
 	SavedSearchDialogSearchRowDate * self;
 	GtkComboBoxText* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_DATE, SavedSearchDialogSearchRowDate);
-#line 529 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->context;
-#line 529 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", gtk_combo_box_get_type (), &_tmp1_, NULL, FALSE);
-#line 529 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 523 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_search_row_date_on_changed_gtk_combo_box_changed, self);
-#line 485 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 479 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->box);
-#line 486 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 480 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->context);
-#line 487 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 481 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_one);
-#line 488 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 482 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->label_two);
-#line 489 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_one);
-#line 490 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 484 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->cal_two);
-#line 491 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 485 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->and);
-#line 493 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 487 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_saved_search_dialog_search_row_container_unref0 (self->priv->parent);
-#line 483 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 477 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	SAVED_SEARCH_DIALOG_SEARCH_ROW_CLASS (saved_search_dialog_search_row_date_parent_class)->finalize (obj);
-#line 6194 "SavedSearchDialog.c"
+#line 6160 "SavedSearchDialog.c"
 }
 
 
@@ -6209,7 +6175,7 @@ static GType saved_search_dialog_search_row_date_get_type (void) {
 static void value_saved_search_dialog_init (GValue* value) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	value->data[0].v_pointer = NULL;
-#line 6213 "SavedSearchDialog.c"
+#line 6179 "SavedSearchDialog.c"
 }
 
 
@@ -6218,7 +6184,7 @@ static void value_saved_search_dialog_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_unref (value->data[0].v_pointer);
-#line 6222 "SavedSearchDialog.c"
+#line 6188 "SavedSearchDialog.c"
 	}
 }
 
@@ -6228,11 +6194,11 @@ static void value_saved_search_dialog_copy_value (const GValue* src_value, GValu
 	if (src_value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = saved_search_dialog_ref (src_value->data[0].v_pointer);
-#line 6232 "SavedSearchDialog.c"
+#line 6198 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6236 "SavedSearchDialog.c"
+#line 6202 "SavedSearchDialog.c"
 	}
 }
 
@@ -6240,37 +6206,37 @@ static void value_saved_search_dialog_copy_value (const GValue* src_value, GValu
 static gpointer value_saved_search_dialog_peek_pointer (const GValue* value) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 6244 "SavedSearchDialog.c"
+#line 6210 "SavedSearchDialog.c"
 }
 
 
 static gchar* value_saved_search_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (collect_values[0].v_pointer) {
-#line 6251 "SavedSearchDialog.c"
+#line 6217 "SavedSearchDialog.c"
 		SavedSearchDialog* object;
 		object = collect_values[0].v_pointer;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6258 "SavedSearchDialog.c"
+#line 6224 "SavedSearchDialog.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6262 "SavedSearchDialog.c"
+#line 6228 "SavedSearchDialog.c"
 		}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = saved_search_dialog_ref (object);
-#line 6266 "SavedSearchDialog.c"
+#line 6232 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 6270 "SavedSearchDialog.c"
+#line 6236 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 6274 "SavedSearchDialog.c"
+#line 6240 "SavedSearchDialog.c"
 }
 
 
@@ -6281,25 +6247,25 @@ static gchar* value_saved_search_dialog_lcopy_value (const GValue* value, guint
 	if (!object_p) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6285 "SavedSearchDialog.c"
+#line 6251 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (!value->data[0].v_pointer) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = NULL;
-#line 6291 "SavedSearchDialog.c"
+#line 6257 "SavedSearchDialog.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6295 "SavedSearchDialog.c"
+#line 6261 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		*object_p = saved_search_dialog_ref (value->data[0].v_pointer);
-#line 6299 "SavedSearchDialog.c"
+#line 6265 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return NULL;
-#line 6303 "SavedSearchDialog.c"
+#line 6269 "SavedSearchDialog.c"
 }
 
 
@@ -6313,7 +6279,7 @@ GParamSpec* param_spec_saved_search_dialog (const gchar* name, const gchar* nick
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return G_PARAM_SPEC (spec);
-#line 6317 "SavedSearchDialog.c"
+#line 6283 "SavedSearchDialog.c"
 }
 
 
@@ -6322,7 +6288,7 @@ gpointer value_get_saved_search_dialog (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SAVED_SEARCH_DIALOG), NULL);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return value->data[0].v_pointer;
-#line 6326 "SavedSearchDialog.c"
+#line 6292 "SavedSearchDialog.c"
 }
 
 
@@ -6342,17 +6308,17 @@ void value_set_saved_search_dialog (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_ref (value->data[0].v_pointer);
-#line 6346 "SavedSearchDialog.c"
+#line 6312 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 6350 "SavedSearchDialog.c"
+#line 6316 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_unref (old);
-#line 6356 "SavedSearchDialog.c"
+#line 6322 "SavedSearchDialog.c"
 	}
 }
 
@@ -6371,17 +6337,17 @@ void value_take_saved_search_dialog (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = v_object;
-#line 6375 "SavedSearchDialog.c"
+#line 6341 "SavedSearchDialog.c"
 	} else {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		value->data[0].v_pointer = NULL;
-#line 6379 "SavedSearchDialog.c"
+#line 6345 "SavedSearchDialog.c"
 	}
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	if (old) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		saved_search_dialog_unref (old);
-#line 6385 "SavedSearchDialog.c"
+#line 6351 "SavedSearchDialog.c"
 	}
 }
 
@@ -6393,7 +6359,7 @@ static void saved_search_dialog_class_init (SavedSearchDialogClass * klass) {
 	((SavedSearchDialogClass *) klass)->finalize = saved_search_dialog_finalize;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_type_class_add_private (klass, sizeof (SavedSearchDialogPrivate));
-#line 6397 "SavedSearchDialog.c"
+#line 6363 "SavedSearchDialog.c"
 }
 
 
@@ -6401,19 +6367,19 @@ static void saved_search_dialog_instance_init (SavedSearchDialog * self) {
 	GeeArrayList* _tmp0_ = NULL;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv = SAVED_SEARCH_DIALOG_GET_PRIVATE (self);
-#line 649 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = gee_array_list_new (SAVED_SEARCH_DIALOG_TYPE_SEARCH_ROW_CONTAINER, (GBoxedCopyFunc) saved_search_dialog_search_row_container_ref, saved_search_dialog_search_row_container_unref, NULL, NULL, NULL);
-#line 649 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->row_list = _tmp0_;
-#line 650 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 644 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->edit_mode = FALSE;
-#line 651 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->previous_search = NULL;
-#line 652 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 646 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->priv->valid = FALSE;
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	self->ref_count = 1;
-#line 6417 "SavedSearchDialog.c"
+#line 6383 "SavedSearchDialog.c"
 }
 
 
@@ -6425,29 +6391,29 @@ static void saved_search_dialog_finalize (SavedSearchDialog* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SAVED_SEARCH_DIALOG, SavedSearchDialog);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_destroy (self);
-#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_tmp0_ = self->priv->search_title;
-#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp1_, NULL, FALSE);
-#line 690 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 684 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _saved_search_dialog_on_title_changed_gtk_editable_changed, self);
-#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 637 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 644 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 638 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 639 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->add_criteria);
-#line 646 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 640 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->operator);
-#line 647 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 641 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->row_box);
-#line 648 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 642 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->search_title);
-#line 649 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 643 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->row_list);
-#line 651 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
+#line 645 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	_g_object_unref0 (self->priv->previous_search);
-#line 6451 "SavedSearchDialog.c"
+#line 6417 "SavedSearchDialog.c"
 }
 
 
@@ -6472,7 +6438,7 @@ gpointer saved_search_dialog_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 	return instance;
-#line 6476 "SavedSearchDialog.c"
+#line 6442 "SavedSearchDialog.c"
 }
 
 
@@ -6485,7 +6451,7 @@ void saved_search_dialog_unref (gpointer instance) {
 		SAVED_SEARCH_DIALOG_GET_CLASS (self)->finalize (self);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchDialog.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6489 "SavedSearchDialog.c"
+#line 6455 "SavedSearchDialog.c"
 	}
 }
 
diff --git a/src/searches/SavedSearchDialog.vala b/src/searches/SavedSearchDialog.vala
index 1716a26..5365cde 100644
--- a/src/searches/SavedSearchDialog.vala
+++ b/src/searches/SavedSearchDialog.vala
@@ -14,7 +14,6 @@ public class SavedSearchDialog {
         
         private Gtk.ComboBoxText type_combo;
         private Gtk.Box box;
-        private Gtk.Alignment align;
         private Gtk.Button remove_button;
         private SearchCondition.SearchType[] search_types;
         private Gee.HashMap<SearchCondition.SearchType, int> search_types_index;
@@ -51,13 +50,9 @@ public class SavedSearchDialog {
             remove_button = new Gtk.Button.from_icon_name("list-remove-symbolic", Gtk.IconSize.BUTTON);
             remove_button.button_press_event.connect(on_removed);
             
-            align = new Gtk.Alignment(0,0,0,0);
-        
             box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 3);
             box.pack_start(type_combo, false, false, 0);
-            box.pack_start(align, false, false, 0);
-            box.pack_start(new Gtk.Alignment(0,0,0,0), true, true, 0); // Fill space.
-            box.pack_start(remove_button, false, false, 0);
+            box.pack_end(remove_button, false, false, 0);
             box.show_all();
         }
         
@@ -72,7 +67,7 @@ public class SavedSearchDialog {
         
         private void set_type(SearchCondition.SearchType type) {
             if (my_row != null)
-                align.remove(my_row.get_widget());
+                box.remove(my_row.get_widget());
             
             switch (type) {
                 case SearchCondition.SearchType.ANY_TEXT:
@@ -105,11 +100,10 @@ public class SavedSearchDialog {
                     break;
                 
                 default:
-                    assert(false);
-                    break;
+                    assert_not_reached ();
             }
             
-            align.add(my_row.get_widget());
+            box.pack_start (my_row.get_widget());
         }
         
         public SearchCondition.SearchType get_search_type() {
@@ -707,6 +701,7 @@ public class SavedSearchDialog {
         dialog.set_default_response(Gtk.ResponseType.OK);
         dialog.response.connect(on_response);
         dialog.get_content_area().add(builder.get_object("criteria") as Gtk.Widget);
+        dialog.set_default_response (Gtk.ResponseType.OK);
 
         add_criteria = builder.get_object("Add search button") as Gtk.Button;
         add_criteria.button_press_event.connect(on_add_criteria);
diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c
index 90e4575..699003c 100644
--- a/src/searches/SavedSearchPage.c
+++ b/src/searches/SavedSearchPage.c
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <gee.h>
 #include <gdk/gdk.h>
-#include <glib/gi18n-lib.h>
+#include <gio/gio.h>
 
 
 #define TYPE_VIEW_MANAGER (view_manager_get_type ())
@@ -371,6 +371,16 @@ typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
 typedef struct _ConfigFacade ConfigFacade;
 typedef struct _ConfigFacadeClass ConfigFacadeClass;
 
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
 #define TYPE_COMMAND_MANAGER (command_manager_get_type ())
 #define COMMAND_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND_MANAGER, CommandManager))
 #define COMMAND_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMMAND_MANAGER, CommandManagerClass))
@@ -422,16 +432,6 @@ typedef struct _DeleteSavedSearchCommand DeleteSavedSearchCommand;
 typedef struct _DeleteSavedSearchCommandClass DeleteSavedSearchCommandClass;
 #define _command_manager_unref0(var) ((var == NULL) ? NULL : (var = (command_manager_unref (var), NULL)))
 
-#define TYPE_APP_WINDOW (app_window_get_type ())
-#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
-#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
-#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
-#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
-#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
-
-typedef struct _AppWindow AppWindow;
-typedef struct _AppWindowClass AppWindowClass;
-
 #define TYPE_LIBRARY_WINDOW (library_window_get_type ())
 #define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow))
 #define LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
@@ -491,7 +491,7 @@ struct _SavedSearchManagerPrivate {
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -501,8 +501,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -510,10 +508,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -625,13 +621,13 @@ struct _MediaPageClass {
 	void (*on_move_to_trash) (MediaPage* self);
 	void (*on_edit_title) (MediaPage* self);
 	void (*on_edit_comment) (MediaPage* self);
-	void (*on_display_titles) (MediaPage* self, GtkAction* action);
-	void (*on_display_comments) (MediaPage* self, GtkAction* action);
-	void (*on_display_ratings) (MediaPage* self, GtkAction* action);
-	void (*on_display_tags) (MediaPage* self, GtkAction* action);
+	void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by);
 	void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by);
-	void (*on_sort_changed) (MediaPage* self);
+	void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*developer_changed) (MediaPage* self, RawDeveloper rd);
 	DataView* (*create_thumbnail) (MediaPage* self, DataSource* source);
 };
@@ -731,6 +727,12 @@ GType raw_developer_get_type (void) G_GNUC_CONST;
 enum  {
 	SAVED_SEARCH_PAGE_DUMMY_PROPERTY
 };
+static void saved_search_page_on_rename_search (SavedSearchPage* self);
+static void _saved_search_page_on_rename_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void saved_search_page_on_edit_search (SavedSearchPage* self);
+static void _saved_search_page_on_edit_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void saved_search_page_on_delete_search (SavedSearchPage* self);
+static void _saved_search_page_on_delete_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 SavedSearchPage* saved_search_page_new (SavedSearch* search);
 SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* search);
 gchar* data_object_get_name (DataObject* self);
@@ -781,18 +783,10 @@ static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboo
 void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by);
 static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static GtkActionEntry* saved_search_page_real_init_collect_action_entries (Page* base, int* result_length1);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-#define TRANSLATABLE "translatable"
-static void saved_search_page_on_rename_search (SavedSearchPage* self);
-static void _saved_search_page_on_rename_search_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add147 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void saved_search_page_on_edit_search (SavedSearchPage* self);
-static void _saved_search_page_on_edit_search_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add148 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void saved_search_page_on_delete_search (SavedSearchPage* self);
-static void _saved_search_page_on_delete_search_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add149 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void saved_search_page_real_add_actions (Page* base);
+void page_add_actions (Page* self);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 gboolean dialogs_confirm_delete_saved_search (SavedSearch* search);
 gpointer command_manager_ref (gpointer instance);
 void command_manager_unref (gpointer instance);
@@ -809,7 +803,6 @@ DeleteSavedSearchCommand* delete_saved_search_command_construct (GType object_ty
 GType page_command_get_type (void) G_GNUC_CONST;
 GType single_data_source_command_get_type (void) G_GNUC_CONST;
 GType delete_saved_search_command_get_type (void) G_GNUC_CONST;
-GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
 void library_window_rename_search_in_sidebar (LibraryWindow* self, SavedSearch* search);
@@ -824,18 +817,16 @@ SavedSearchDialog* saved_search_dialog_new_edit_existing (SavedSearch* saved_sea
 SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_type, SavedSearch* saved_search);
 void saved_search_dialog_show (SavedSearchDialog* self);
 static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count);
-void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive);
-#define RESOURCES_RENAME_SEARCH_MENU _ ("Re_name…")
-#define RESOURCES_EDIT_SEARCH_MENU _ ("_Edit…")
-#define RESOURCES_DELETE_SEARCH_MENU _ ("_Delete")
+void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 void page_update_actions (Page* self, gint selected_count, gint count);
 static void saved_search_page_finalize (GObject* obj);
 
+static const GActionEntry SAVED_SEARCH_PAGE_entries[3] = {{"RenameSearch", _saved_search_page_on_rename_search_gsimple_action_activate_callback}, {"EditSearch", _saved_search_page_on_edit_search_gsimple_action_activate_callback}, {"DeleteSearch", _saved_search_page_on_delete_search_gsimple_action_activate_callback}};
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 12 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 839 "SavedSearchPage.c"
+#line 830 "SavedSearchPage.c"
 }
 
 
@@ -862,14 +853,14 @@ SavedSearchManager* saved_search_manager_construct (GType object_type, SavedSear
 	self->priv->search = _tmp2_;
 #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return self;
-#line 866 "SavedSearchPage.c"
+#line 857 "SavedSearchPage.c"
 }
 
 
 SavedSearchManager* saved_search_manager_new (SavedSearchPage* owner, SavedSearch* search) {
 #line 10 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return saved_search_manager_construct (TYPE_SAVED_SEARCH_MANAGER, owner, search);
-#line 873 "SavedSearchPage.c"
+#line 864 "SavedSearchPage.c"
 }
 
 
@@ -893,7 +884,7 @@ static gboolean saved_search_manager_real_include_in_view (ViewManager* base, Da
 	result = _tmp2_;
 #line 16 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return result;
-#line 897 "SavedSearchPage.c"
+#line 888 "SavedSearchPage.c"
 }
 
 
@@ -906,14 +897,14 @@ static void saved_search_manager_class_init (SavedSearchManagerClass * klass) {
 	g_type_class_add_private (klass, sizeof (SavedSearchManagerPrivate));
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	((ViewManagerClass *) klass)->include_in_view = saved_search_manager_real_include_in_view;
-#line 910 "SavedSearchPage.c"
+#line 901 "SavedSearchPage.c"
 }
 
 
 static void saved_search_manager_instance_init (SavedSearchManager * self) {
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self->priv = SAVED_SEARCH_MANAGER_GET_PRIVATE (self);
-#line 917 "SavedSearchPage.c"
+#line 908 "SavedSearchPage.c"
 }
 
 
@@ -925,7 +916,7 @@ static void saved_search_manager_finalize (ViewManager* obj) {
 	_g_object_unref0 (self->priv->search);
 #line 8 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	VIEW_MANAGER_CLASS (saved_search_manager_parent_class)->finalize (obj);
-#line 929 "SavedSearchPage.c"
+#line 920 "SavedSearchPage.c"
 }
 
 
@@ -941,6 +932,27 @@ GType saved_search_manager_get_type (void) {
 }
 
 
+static void _saved_search_page_on_rename_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	saved_search_page_on_rename_search ((SavedSearchPage*) self);
+#line 939 "SavedSearchPage.c"
+}
+
+
+static void _saved_search_page_on_edit_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	saved_search_page_on_edit_search ((SavedSearchPage*) self);
+#line 946 "SavedSearchPage.c"
+}
+
+
+static void _saved_search_page_on_delete_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	saved_search_page_on_delete_search ((SavedSearchPage*) self);
+#line 953 "SavedSearchPage.c"
+}
+
+
 SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* search) {
 	SavedSearchPage * self = NULL;
 	SavedSearch* _tmp0_ = NULL;
@@ -968,7 +980,7 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se
 	_g_object_unref0 (self->priv->search);
 #line 28 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self->priv->search = _tmp4_;
-#line 972 "SavedSearchPage.c"
+#line 984 "SavedSearchPage.c"
 	{
 		GeeIterator* _sources_it = NULL;
 		MediaCollectionRegistry* _tmp5_ = NULL;
@@ -997,7 +1009,7 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se
 		_sources_it = _tmp10_;
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		while (TRUE) {
-#line 1001 "SavedSearchPage.c"
+#line 1013 "SavedSearchPage.c"
 			GeeIterator* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			MediaSourceCollection* sources = NULL;
@@ -1019,7 +1031,7 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se
 			if (!_tmp12_) {
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 				break;
-#line 1023 "SavedSearchPage.c"
+#line 1035 "SavedSearchPage.c"
 			}
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 			_tmp13_ = _sources_it;
@@ -1051,24 +1063,24 @@ SavedSearchPage* saved_search_page_construct (GType object_type, SavedSearch* se
 			_data_collection_unref0 (_tmp16_);
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 			_data_collection_unref0 (sources);
-#line 1055 "SavedSearchPage.c"
+#line 1067 "SavedSearchPage.c"
 		}
 #line 31 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_g_object_unref0 (_sources_it);
-#line 1059 "SavedSearchPage.c"
+#line 1071 "SavedSearchPage.c"
 	}
 #line 34 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/SearchContextMenu");
+	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "SearchContextMenu");
 #line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return self;
-#line 1065 "SavedSearchPage.c"
+#line 1077 "SavedSearchPage.c"
 }
 
 
 SavedSearchPage* saved_search_page_new (SavedSearch* search) {
 #line 26 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	return saved_search_page_construct (TYPE_SAVED_SEARCH_PAGE, search);
-#line 1072 "SavedSearchPage.c"
+#line 1084 "SavedSearchPage.c"
 }
 
 
@@ -1098,13 +1110,13 @@ static void saved_search_page_real_get_config_photos_sort (MediaPage* base, gboo
 	if (sort_order) {
 #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		*sort_order = _vala_sort_order;
-#line 1102 "SavedSearchPage.c"
+#line 1114 "SavedSearchPage.c"
 	}
 #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	if (sort_by) {
 #line 37 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		*sort_by = _vala_sort_by;
-#line 1108 "SavedSearchPage.c"
+#line 1120 "SavedSearchPage.c"
 	}
 }
 
@@ -1129,7 +1141,7 @@ static void saved_search_page_real_set_config_photos_sort (MediaPage* base, gboo
 	configuration_facade_set_library_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 42 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1133 "SavedSearchPage.c"
+#line 1145 "SavedSearchPage.c"
 }
 
 
@@ -1149,229 +1161,64 @@ static void saved_search_page_real_init_collect_ui_filenames (Page* base, GeeLis
 	_tmp1_ = ui_filenames;
 #line 47 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "savedsearch.ui");
-#line 1153 "SavedSearchPage.c"
-}
-
-
-static void _saved_search_page_on_rename_search_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	saved_search_page_on_rename_search ((SavedSearchPage*) self);
-#line 1160 "SavedSearchPage.c"
-}
-
-
-static void _vala_array_add147 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	if ((*length) == (*size)) {
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1171 "SavedSearchPage.c"
-	}
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1175 "SavedSearchPage.c"
-}
-
-
-static void _saved_search_page_on_edit_search_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	saved_search_page_on_edit_search ((SavedSearchPage*) self);
-#line 1182 "SavedSearchPage.c"
-}
-
-
-static void _vala_array_add148 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	if ((*length) == (*size)) {
-#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1193 "SavedSearchPage.c"
-	}
-#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1197 "SavedSearchPage.c"
+#line 1165 "SavedSearchPage.c"
 }
 
 
-static void _saved_search_page_on_delete_search_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	saved_search_page_on_delete_search ((SavedSearchPage*) self);
-#line 1204 "SavedSearchPage.c"
-}
-
-
-static void _vala_array_add149 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	if ((*length) == (*size)) {
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1215 "SavedSearchPage.c"
-	}
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1219 "SavedSearchPage.c"
-}
-
-
-static GtkActionEntry* saved_search_page_real_init_collect_action_entries (Page* base, int* result_length1) {
+static void saved_search_page_real_add_actions (Page* base) {
 	SavedSearchPage * self;
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	gint _tmp0_ = 0;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry rename_search = {0};
-	GtkActionEntry _tmp2_ = {0};
-	GtkActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkActionEntry _tmp4_ = {0};
-	GtkActionEntry edit_search = {0};
-	GtkActionEntry _tmp5_ = {0};
-	GtkActionEntry* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	GtkActionEntry _tmp7_ = {0};
-	GtkActionEntry delete_search = {0};
-	GtkActionEntry _tmp8_ = {0};
-	GtkActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkActionEntry _tmp10_ = {0};
-	GtkActionEntry* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-#line 50 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
-#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp1_ = PAGE_CLASS (saved_search_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), &_tmp0_);
-#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	actions = _tmp1_;
-#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	actions_length1 = _tmp0_;
-#line 51 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_actions_size_ = actions_length1;
-#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp2_.name = "RenameSearch";
-#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp2_.stock_id = NULL;
-#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp2_.accelerator = NULL;
-#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp2_.tooltip = NULL;
-#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp2_.callback = (GCallback) _saved_search_page_on_rename_search_gtk_action_callback;
-#line 53 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	rename_search = _tmp2_;
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp3_ = actions;
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp3__length1 = actions_length1;
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp4_ = rename_search;
-#line 54 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_vala_array_add147 (&actions, &actions_length1, &_actions_size_, &_tmp4_);
-#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp5_.name = "EditSearch";
-#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp5_.stock_id = NULL;
-#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp5_.label = TRANSLATABLE;
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
 #line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp5_.accelerator = NULL;
-#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp5_.tooltip = NULL;
-#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp5_.callback = (GCallback) _saved_search_page_on_edit_search_gtk_action_callback;
-#line 56 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	edit_search = _tmp5_;
-#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp6_ = actions;
-#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp6__length1 = actions_length1;
-#line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp7_ = edit_search;
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
 #line 57 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_vala_array_add148 (&actions, &actions_length1, &_actions_size_, &_tmp7_);
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp8_.name = "DeleteSearch";
+	PAGE_CLASS (saved_search_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page));
 #line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp8_.stock_id = NULL;
+	_tmp0_ = app_window_get_instance ();
 #line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp8_.label = TRANSLATABLE;
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp8_.accelerator = NULL;
-#line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp8_.tooltip = NULL;
+	_tmp1_ = _tmp0_;
 #line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp8_.callback = (GCallback) _saved_search_page_on_delete_search_gtk_action_callback;
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), SAVED_SEARCH_PAGE_entries, G_N_ELEMENTS (SAVED_SEARCH_PAGE_entries), self);
 #line 59 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	delete_search = _tmp8_;
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp9_ = actions;
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp9__length1 = actions_length1;
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp10_ = delete_search;
-#line 60 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_vala_array_add149 (&actions, &actions_length1, &_actions_size_, &_tmp10_);
-#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp11_ = actions;
-#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	_tmp11__length1 = actions_length1;
-#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	if (result_length1) {
-#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-		*result_length1 = _tmp11__length1;
-#line 1332 "SavedSearchPage.c"
-	}
-#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	result = _tmp11_;
-#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	return result;
-#line 1338 "SavedSearchPage.c"
+	_g_object_unref0 (_tmp1_);
+#line 1185 "SavedSearchPage.c"
 }
 
 
 static void saved_search_page_on_delete_search (SavedSearchPage* self) {
 	SavedSearch* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 65 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 62 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
-#line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 63 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp0_ = self->priv->search;
-#line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 63 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
-#line 66 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 63 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	if (_tmp1_) {
-#line 1353 "SavedSearchPage.c"
+#line 1200 "SavedSearchPage.c"
 		CommandManager* _tmp2_ = NULL;
 		CommandManager* _tmp3_ = NULL;
 		SavedSearch* _tmp4_ = NULL;
 		DeleteSavedSearchCommand* _tmp5_ = NULL;
 		DeleteSavedSearchCommand* _tmp6_ = NULL;
-#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp2_ = app_window_get_command_manager ();
-#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp3_ = _tmp2_;
-#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp4_ = self->priv->search;
-#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp5_ = delete_saved_search_command_new (_tmp4_);
-#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_tmp6_ = _tmp5_;
-#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 64 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 1375 "SavedSearchPage.c"
+#line 1222 "SavedSearchPage.c"
 	}
 }
 
@@ -1380,19 +1227,19 @@ static void saved_search_page_on_rename_search (SavedSearchPage* self) {
 	LibraryWindow* _tmp0_ = NULL;
 	LibraryWindow* _tmp1_ = NULL;
 	SavedSearch* _tmp2_ = NULL;
-#line 70 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 67 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
-#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp0_ = library_window_get_app ();
-#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp1_ = _tmp0_;
-#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp2_ = self->priv->search;
-#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	library_window_rename_search_in_sidebar (_tmp1_, _tmp2_);
-#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 68 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1396 "SavedSearchPage.c"
+#line 1243 "SavedSearchPage.c"
 }
 
 
@@ -1400,19 +1247,19 @@ static void saved_search_page_on_edit_search (SavedSearchPage* self) {
 	SavedSearchDialog* ssd = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearchDialog* _tmp1_ = NULL;
-#line 74 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	g_return_if_fail (IS_SAVED_SEARCH_PAGE (self));
-#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp0_ = self->priv->search;
-#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp1_ = saved_search_dialog_new_edit_existing (_tmp0_);
-#line 75 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 72 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	ssd = _tmp1_;
-#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 73 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	saved_search_dialog_show (ssd);
-#line 74 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 71 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_saved_search_dialog_unref0 (ssd);
-#line 1416 "SavedSearchPage.c"
+#line 1263 "SavedSearchPage.c"
 }
 
 
@@ -1420,21 +1267,21 @@ static void saved_search_page_real_update_actions (Page* base, gint selected_cou
 	SavedSearchPage * self;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SAVED_SEARCH_PAGE, SavedSearchPage);
-#line 80 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RenameSearch", RESOURCES_RENAME_SEARCH_MENU, NULL, TRUE);
-#line 83 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditSearch", RESOURCES_EDIT_SEARCH_MENU, NULL, TRUE);
-#line 86 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DeleteSearch", RESOURCES_DELETE_SEARCH_MENU, NULL, TRUE);
-#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 77 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RenameSearch", TRUE);
+#line 78 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditSearch", TRUE);
+#line 79 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DeleteSearch", TRUE);
+#line 81 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp0_ = selected_count;
-#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	_tmp1_ = count;
-#line 89 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	PAGE_CLASS (saved_search_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp0_, _tmp1_);
-#line 1438 "SavedSearchPage.c"
+#line 1285 "SavedSearchPage.c"
 }
 
 
@@ -1450,19 +1297,19 @@ static void saved_search_page_class_init (SavedSearchPageClass * klass) {
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = saved_search_page_real_init_collect_ui_filenames;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
-	((PageClass *) klass)->init_collect_action_entries = saved_search_page_real_init_collect_action_entries;
+	((PageClass *) klass)->add_actions = saved_search_page_real_add_actions;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	((PageClass *) klass)->update_actions = saved_search_page_real_update_actions;
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = saved_search_page_finalize;
-#line 1459 "SavedSearchPage.c"
+#line 1306 "SavedSearchPage.c"
 }
 
 
 static void saved_search_page_instance_init (SavedSearchPage * self) {
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	self->priv = SAVED_SEARCH_PAGE_GET_PRIVATE (self);
-#line 1466 "SavedSearchPage.c"
+#line 1313 "SavedSearchPage.c"
 }
 
 
@@ -1474,7 +1321,7 @@ static void saved_search_page_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->search);
 #line 21 "/home/jens/Source/shotwell/src/searches/SavedSearchPage.vala"
 	G_OBJECT_CLASS (saved_search_page_parent_class)->finalize (obj);
-#line 1478 "SavedSearchPage.c"
+#line 1325 "SavedSearchPage.c"
 }
 
 
diff --git a/src/searches/SavedSearchPage.vala b/src/searches/SavedSearchPage.vala
index 1693ca3..c57ec7d 100644
--- a/src/searches/SavedSearchPage.vala
+++ b/src/searches/SavedSearchPage.vala
@@ -31,7 +31,7 @@ public class SavedSearchPage : CollectionPage {
         foreach (MediaSourceCollection sources in MediaCollectionRegistry.get_instance().get_all())
             get_view().monitor_source_collection(sources, new SavedSearchManager(this, search), null);
         
-        init_page_context_menu("/SearchContextMenu");
+        init_page_context_menu("SearchContextMenu");
     }
     
     protected override void get_config_photos_sort(out bool sort_order, out int sort_by) {
@@ -46,20 +46,17 @@ public class SavedSearchPage : CollectionPage {
         base.init_collect_ui_filenames(ui_filenames);
         ui_filenames.add("savedsearch.ui");
     }
-    
-    protected override Gtk.ActionEntry[] init_collect_action_entries() {
-        Gtk.ActionEntry[] actions = base.init_collect_action_entries();
-        
-        Gtk.ActionEntry rename_search = { "RenameSearch", null, TRANSLATABLE, null, null, on_rename_search };
-        actions += rename_search;
-        
-        Gtk.ActionEntry edit_search = { "EditSearch", null, TRANSLATABLE, null, null, on_edit_search };
-        actions += edit_search;
-        
-        Gtk.ActionEntry delete_search = { "DeleteSearch", null, TRANSLATABLE, null, null, on_delete_search };
-        actions += delete_search;
-        
-        return actions;
+
+    private const GLib.ActionEntry[] entries = {
+        { "RenameSearch", on_rename_search },
+        { "EditSearch", on_edit_search },
+        { "DeleteSearch", on_delete_search }
+    };
+
+    protected override void add_actions () {
+        base.add_actions ();
+
+        AppWindow.get_instance ().add_action_entries (entries, this);
     }
     
     private void on_delete_search() {
@@ -77,15 +74,10 @@ public class SavedSearchPage : CollectionPage {
     }
     
     protected override void update_actions(int selected_count, int count) {
-        set_action_details("RenameSearch",
-            Resources.RENAME_SEARCH_MENU,
-            null, true);
-        set_action_details("EditSearch",
-            Resources.EDIT_SEARCH_MENU,
-            null, true);
-        set_action_details("DeleteSearch",
-            Resources.DELETE_SEARCH_MENU,
-            null, true);
+        set_action_sensitive ("RenameSearch", true);
+        set_action_sensitive ("EditSearch", true);
+        set_action_sensitive ("DeleteSearch", true);
+
         base.update_actions(selected_count, count);
     }
 }
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index 45d29d8..3710948 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -742,10 +742,10 @@ enum  {
 };
 SearchConditionSearchType* search_condition_search_type_as_array (int* result_length1);
 void search_condition_search_type_sort_array (SearchConditionSearchType** array, int* array_length1);
-static gint __lambda10_ (void* a, void* b);
+static gint __lambda11_ (void* a, void* b);
 gint utf8_cs_compare (void* a, void* b);
 gchar* search_condition_search_type_display_text (SearchConditionSearchType self);
-static gint ___lambda10____compar_fn_t (void* key1, void* key2);
+static gint ___lambda11____compar_fn_t (void* key1, void* key2);
 gchar* search_condition_search_type_to_string (SearchConditionSearchType self);
 SearchConditionSearchType search_condition_search_type_from_string (const gchar* str);
 gboolean search_condition_predicate (SearchCondition* self, MediaSource* source);
@@ -1156,7 +1156,7 @@ SearchConditionSearchType* search_condition_search_type_as_array (int* result_le
 }
 
 
-static gint __lambda10_ (void* a, void* b) {
+static gint __lambda11_ (void* a, void* b) {
 	gint result = 0;
 	void* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
@@ -1181,9 +1181,9 @@ static gint __lambda10_ (void* a, void* b) {
 }
 
 
-static gint ___lambda10____compar_fn_t (void* key1, void* key2) {
+static gint ___lambda11____compar_fn_t (void* key1, void* key2) {
 	gint result;
-	result = __lambda10_ (key1, key2);
+	result = __lambda11_ (key1, key2);
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	return result;
 #line 1190 "SearchBoolean.c"
@@ -1204,7 +1204,7 @@ void search_condition_search_type_sort_array (SearchConditionSearchType** array,
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	_tmp1__length1 = *array_length1;
 #line 70 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
-	qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda10____compar_fn_t);
+	qsort (_tmp0_, (gsize) _tmp1__length1, (gsize) sizeof (SearchConditionSearchType), ___lambda11____compar_fn_t);
 #line 1209 "SearchBoolean.c"
 }
 
@@ -5691,7 +5691,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5684 "SearchBoolean.c"
-				goto __catch75_database_error;
+				goto __catch74_database_error;
 			}
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5707,8 +5707,8 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_tmp6_->search_id = _tmp0_;
 #line 5699 "SearchBoolean.c"
 	}
-	goto __finally75;
-	__catch75_database_error:
+	goto __finally74;
+	__catch74_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -5724,7 +5724,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_g_error_free0 (err);
 #line 5716 "SearchBoolean.c"
 	}
-	__finally75:
+	__finally74:
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5835,7 +5835,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5828 "SearchBoolean.c"
-				goto __catch76_database_error;
+				goto __catch75_database_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5846,8 +5846,8 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 5837 "SearchBoolean.c"
 		}
 	}
-	goto __finally76;
-	__catch76_database_error:
+	goto __finally75;
+	__catch75_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp12_ = NULL;
@@ -5867,7 +5867,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 		return result;
 #line 5859 "SearchBoolean.c"
 	}
-	__finally76:
+	__finally75:
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6041,7 +6041,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6034 "SearchBoolean.c"
-				goto __catch77_database_error;
+				goto __catch76_database_error;
 			}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6132,8 +6132,8 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_object_unref0 (_tmp0_);
 #line 6124 "SearchBoolean.c"
 	}
-	goto __finally77;
-	__catch77_database_error:
+	goto __finally76;
+	__catch76_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
@@ -6149,7 +6149,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_error_free0 (err);
 #line 6141 "SearchBoolean.c"
 	}
-	__finally77:
+	__finally76:
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6282,7 +6282,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6275 "SearchBoolean.c"
-				goto __catch78_database_error;
+				goto __catch77_database_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_object_unref0 (search);
@@ -6304,8 +6304,8 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_saved_search_row_unref0 (_tmp0_);
 #line 6296 "SearchBoolean.c"
 	}
-	goto __finally78;
-	__catch78_database_error:
+	goto __finally77;
+	__catch77_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -6321,7 +6321,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_g_error_free0 (err);
 #line 6313 "SearchBoolean.c"
 	}
-	__finally78:
+	__finally77:
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6386,7 +6386,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6379 "SearchBoolean.c"
-				goto __catch79_database_error;
+				goto __catch78_database_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6397,8 +6397,8 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 #line 6388 "SearchBoolean.c"
 		}
 	}
-	goto __finally79;
-	__catch79_database_error:
+	goto __finally78;
+	__catch78_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -6414,7 +6414,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 		_g_error_free0 (err);
 #line 6406 "SearchBoolean.c"
 	}
-	__finally79:
+	__finally78:
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c
index ff26956..8cef7f3 100644
--- a/src/sidebar/Tree.c
+++ b/src/sidebar/Tree.c
@@ -14,9 +14,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gee.h>
-#include <pango/pango.h>
-#include <glib/gi18n-lib.h>
 #include <gio/gio.h>
+#include <pango/pango.h>
 #include <float.h>
 #include <math.h>
 
@@ -354,7 +353,7 @@ struct _SidebarEntryIface {
 typedef void (*SidebarTreeExternalDropHandler) (GdkDragContext* context, SidebarEntry* entry, GtkSelectionData* data, guint info, guint time, void* user_data);
 struct _SidebarTreePrivate {
 	GtkTreeStore* store;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkCellRendererText* text_renderer;
 	SidebarTreeExternalDropHandler drop_handler;
 	gpointer drop_handler_target;
@@ -473,6 +472,10 @@ static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable*
 static void _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self);
 static GType sidebar_tree_columns_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define SIDEBAR_TREE_ICON_SIZE 16
+static void sidebar_tree_on_new_tag (SidebarTree* self);
+static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void sidebar_tree_on_new_search (SidebarTree* self);
+static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target);
 SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target);
 void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layout, GtkCellRenderer* renderer, GtkTreeModel* model, GtkTreeIter* iter);
@@ -483,7 +486,7 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self);
 static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self);
 GType library_window_target_type_get_type (void) G_GNUC_CONST;
-static void _vala_array_add123 (GtkTargetEntry** array, int* length, int* size, const GtkTargetEntry* value);
+static void _vala_array_add64 (GtkTargetEntry** array, int* length, int* size, const GtkTargetEntry* value);
 static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self);
 static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self);
 static void sidebar_tree_setup_default_context_menu (SidebarTree* self);
@@ -497,14 +500,6 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 GType sidebar_grouping_get_type (void) G_GNUC_CONST;
 GType sidebar_header_get_type (void) G_GNUC_CONST;
 static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* self, GtkTreePath* path);
-#define TRANSLATABLE "translatable"
-static void sidebar_tree_on_new_search (SidebarTree* self);
-static void _sidebar_tree_on_new_search_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add124 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void sidebar_tree_on_new_tag (SidebarTree* self);
-static void _sidebar_tree_on_new_tag_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add125 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-GFile* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
@@ -679,18 +674,19 @@ enum  {
 static void sidebar_tree_root_wrapper_finalize (GObject* obj);
 static void sidebar_tree_finalize (GObject* obj);
 
+static const GActionEntry SIDEBAR_TREE_entries[2] = {{"tag.new", _sidebar_tree_on_new_tag_gsimple_action_activate_callback}, {"search.new", _sidebar_tree_on_new_search_gsimple_action_activate_callback}};
 
 static void _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled (GtkCellRenderer* _sender, gpointer self) {
-#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_canceled ((SidebarTree*) self);
-#line 687 "Tree.c"
+#line 683 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started (GtkCellRenderer* _sender, GtkCellEditable* editable, const gchar* path, gpointer self) {
-#line 158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_started ((SidebarTree*) self, editable, path);
-#line 694 "Tree.c"
+#line 690 "Tree.c"
 }
 
 
@@ -706,91 +702,105 @@ static GType sidebar_tree_columns_get_type (void) {
 }
 
 
+static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	sidebar_tree_on_new_tag ((SidebarTree*) self);
+#line 709 "Tree.c"
+}
+
+
+static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	sidebar_tree_on_new_search ((SidebarTree*) self);
+#line 716 "Tree.c"
+}
+
+
 static void _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) {
 #line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_icon_renderer_function ((SidebarTree*) self, cell_layout, cell, tree_model, iter);
-#line 713 "Tree.c"
+#line 723 "Tree.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 720 "Tree.c"
+#line 730 "Tree.c"
 }
 
 
 static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelection* selection, GtkTreeModel* model, GtkTreePath* path, gboolean path_currently_selected, gpointer self) {
 	gboolean result;
 	result = sidebar_tree_on_selection ((SidebarTree*) self, selection, model, path, path_currently_selected);
-#line 130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 729 "Tree.c"
+#line 739 "Tree.c"
 }
 
 
 static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self) {
 	gboolean result;
 	result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
-#line 132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 738 "Tree.c"
+#line 748 "Tree.c"
 }
 
 
 static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (GtkTreeView* _sender, GtkTreeIter* iter, GtkTreePath* path, gpointer self) {
 	gboolean result;
 	result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
-#line 133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 747 "Tree.c"
+#line 757 "Tree.c"
 }
 
 
-static void _vala_array_add123 (GtkTargetEntry** array, int* length, int* size, const GtkTargetEntry* value) {
-#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+static void _vala_array_add64 (GtkTargetEntry** array, int* length, int* size, const GtkTargetEntry* value) {
+#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if ((*length) == (*size)) {
-#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		*array = g_renew (GtkTargetEntry, *array, *size);
-#line 758 "Tree.c"
+#line 768 "Tree.c"
 	}
-#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	(*array)[(*length)++] = *value;
-#line 762 "Tree.c"
+#line 772 "Tree.c"
 }
 
 
 static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (GtkWidget* _sender, gpointer self) {
 	gboolean result;
 	result = sidebar_tree_on_context_menu_keypress ((SidebarTree*) self);
-#line 147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 771 "Tree.c"
+#line 781 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_drag_begin ((SidebarTree*) self, context);
-#line 778 "Tree.c"
+#line 788 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_drag_end ((SidebarTree*) self, context);
-#line 785 "Tree.c"
+#line 795 "Tree.c"
 }
 
 
 static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget* _sender, GdkDragContext* context, gint x, gint y, guint time_, gpointer self) {
 	gboolean result;
 	result = sidebar_tree_on_drag_motion ((SidebarTree*) self, context, x, y, time_);
-#line 153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 794 "Tree.c"
+#line 804 "Tree.c"
 }
 
 
@@ -916,82 +926,80 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e
 #line 120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_enable_search (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
 #line 121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_tree_view_set_rules_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_show_expanders (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), TRUE);
-#line 123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_reorderable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_enable_tree_lines (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), FALSE);
-#line 125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_grid_lines (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GTK_TREE_VIEW_GRID_LINES_NONE);
-#line 126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_tooltip_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), (gint) SIDEBAR_TREE_COLUMNS_TOOLTIP);
-#line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selection = _tmp13_;
-#line 129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
-#line 130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_selection_set_select_function (selection, _sidebar_tree_on_selection_gtk_tree_selection_func, g_object_ref (self), g_object_unref);
-#line 132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), "test-expand-row", (GCallback) _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row, self, 0);
-#line 133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), "test-collapse-row", (GCallback) _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row, self, 0);
-#line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = target_entries;
-#line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14__length1 = target_entries_length1;
-#line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = actions;
-#line 138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_enable_model_drag_dest (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp14_, _tmp14__length1, _tmp15_);
-#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = g_new0 (GtkTargetEntry, 0);
-#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	source_entries = _tmp16_;
-#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	source_entries_length1 = 0;
-#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_source_entries_size_ = source_entries_length1;
-#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = source_entries;
-#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17__length1 = source_entries_length1;
-#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = target_entries;
-#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18__length1 = target_entries_length1;
-#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = _tmp18_[LIBRARY_WINDOW_TARGET_TYPE_TAG_PATH];
+#line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_vala_array_add64 (&source_entries, &source_entries_length1, &_source_entries_size_, &_tmp19_);
 #line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_array_add123 (&source_entries, &source_entries_length1, &_source_entries_size_, &_tmp19_);
-#line 142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = source_entries;
-#line 142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20__length1 = source_entries_length1;
-#line 142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_enable_model_drag_source (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), GDK_BUTTON1_MASK, _tmp20_, _tmp20__length1, GDK_ACTION_COPY);
-#line 145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = drop_handler;
-#line 145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21__target = drop_handler_target;
-#line 145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->drop_handler = _tmp21_;
-#line 145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->drop_handler_target = _tmp21__target;
-#line 147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "popup-menu", (GCallback) _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu, self, 0);
-#line 149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_setup_default_context_menu (self);
-#line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-begin", (GCallback) _sidebar_tree_on_drag_begin_gtk_widget_drag_begin, self, 0);
-#line 152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-end", (GCallback) _sidebar_tree_on_drag_end_gtk_widget_drag_end, self, 0);
-#line 153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "drag-motion", (GCallback) _sidebar_tree_on_drag_motion_gtk_widget_drag_motion, self, 0);
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	source_entries = (g_free (source_entries), NULL);
@@ -1007,14 +1015,14 @@ SidebarTree* sidebar_tree_construct (GType object_type, GtkTargetEntry* target_e
 	_g_object_unref0 (text_column);
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 1011 "Tree.c"
+#line 1019 "Tree.c"
 }
 
 
 SidebarTree* sidebar_tree_new (GtkTargetEntry* target_entries, int target_entries_length1, GdkDragAction actions, SidebarTreeExternalDropHandler drop_handler, void* drop_handler_target) {
 #line 93 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_construct (SIDEBAR_TYPE_TREE, target_entries, target_entries_length1, actions, drop_handler, drop_handler_target);
-#line 1018 "Tree.c"
+#line 1026 "Tree.c"
 }
 
 
@@ -1026,69 +1034,69 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo
 	GtkCellRenderer* _tmp3_ = NULL;
 	SidebarTreeEntryWrapper* _tmp4_ = NULL;
 	SidebarEntry* _tmp5_ = NULL;
-#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GTK_IS_CELL_LAYOUT (layout));
-#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GTK_IS_CELL_RENDERER (renderer));
-#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GTK_IS_TREE_MODEL (model));
-#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (iter != NULL);
-#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_);
-#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1054 "Tree.c"
+#line 1062 "Tree.c"
 	}
-#line 166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = renderer;
-#line 166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = wrapper;
-#line 166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_->entry;
-#line 166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_cell_renderer_set_visible (_tmp3_, !G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_HEADER));
-#line 161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1066 "Tree.c"
+#line 1074 "Tree.c"
 }
 
 
 static void sidebar_tree_on_drag_begin (SidebarTree* self, GdkDragContext* ctx) {
-#line 169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (ctx));
-#line 170 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->is_internal_drag_in_progress = TRUE;
-#line 1077 "Tree.c"
+#line 1085 "Tree.c"
 }
 
 
 static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx) {
-#line 173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (ctx));
-#line 174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->is_internal_drag_in_progress = FALSE;
-#line 175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (self->priv->internal_drag_source_entry);
-#line 175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->internal_drag_source_entry = NULL;
-#line 1092 "Tree.c"
+#line 1100 "Tree.c"
 }
 
 
@@ -1096,29 +1104,29 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->is_internal_drag_in_progress;
-#line 179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 1108 "Tree.c"
+#line 1116 "Tree.c"
 		SidebarEntry* _tmp2_ = NULL;
-#line 179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = self->priv->internal_drag_source_entry;
-#line 179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1114 "Tree.c"
+#line 1122 "Tree.c"
 	} else {
-#line 179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = FALSE;
-#line 1118 "Tree.c"
+#line 1126 "Tree.c"
 	}
-#line 179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_) {
-#line 1122 "Tree.c"
+#line 1130 "Tree.c"
 		GtkTreePath* path = NULL;
 		GtkTreeViewDropPosition position = 0;
 		gint _tmp3_ = 0;
@@ -1126,327 +1134,185 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 		GtkTreePath* _tmp5_ = NULL;
 		GtkTreeViewDropPosition _tmp6_ = 0;
 		GtkTreePath* _tmp7_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = x;
-#line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = y;
-#line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp3_, _tmp4_, &_tmp5_, &_tmp6_);
-#line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		path = _tmp5_;
-#line 182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		position = _tmp6_;
-#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = path;
-#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp7_ != NULL) {
-#line 1146 "Tree.c"
+#line 1154 "Tree.c"
 			SidebarTreeEntryWrapper* wrapper = NULL;
 			GtkTreePath* _tmp8_ = NULL;
 			SidebarTreeEntryWrapper* _tmp9_ = NULL;
 			SidebarTreeEntryWrapper* _tmp10_ = NULL;
-#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp8_ = path;
-#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = sidebar_tree_get_wrapper_at_path (self, _tmp8_);
-#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			wrapper = _tmp9_;
-#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = wrapper;
-#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp10_ != NULL) {
-#line 1161 "Tree.c"
+#line 1169 "Tree.c"
 				SidebarTreeEntryWrapper* _tmp11_ = NULL;
 				SidebarEntry* _tmp12_ = NULL;
 				SidebarEntry* _tmp13_ = NULL;
-#line 187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp11_ = wrapper;
-#line 187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp12_ = _tmp11_->entry;
-#line 187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (self->priv->internal_drag_source_entry);
-#line 187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->internal_drag_source_entry = _tmp13_;
-#line 1175 "Tree.c"
+#line 1183 "Tree.c"
 			}
-#line 184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1179 "Tree.c"
+#line 1187 "Tree.c"
 		}
-#line 179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1183 "Tree.c"
+#line 1191 "Tree.c"
 	}
-#line 191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
-#line 191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1189 "Tree.c"
-}
-
-
-static void _sidebar_tree_on_new_search_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_on_new_search ((SidebarTree*) self);
-#line 1196 "Tree.c"
-}
-
-
-static void _vala_array_add124 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if ((*length) == (*size)) {
-#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1207 "Tree.c"
-	}
-#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	(*array)[(*length)++] = *value;
-#line 1211 "Tree.c"
-}
-
-
-static void _sidebar_tree_on_new_tag_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	sidebar_tree_on_new_tag ((SidebarTree*) self);
-#line 1218 "Tree.c"
-}
-
-
-static void _vala_array_add125 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if ((*length) == (*size)) {
-#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1229 "Tree.c"
-	}
-#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	(*array)[(*length)++] = *value;
-#line 1233 "Tree.c"
+#line 1197 "Tree.c"
 }
 
 
 static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
-	GtkActionGroup* group = NULL;
-	GtkActionGroup* _tmp0_ = NULL;
-	GtkActionEntry* actions = NULL;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry new_search = {0};
-	GtkActionEntry _tmp2_ = {0};
-	const gchar* _tmp3_ = NULL;
-	GtkActionEntry* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	GtkActionEntry _tmp5_ = {0};
-	GtkActionEntry new_tag = {0};
-	GtkActionEntry _tmp6_ = {0};
-	const gchar* _tmp7_ = NULL;
-	GtkActionEntry* _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	GtkActionEntry _tmp9_ = {0};
-	GtkActionEntry* _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	GtkUIManager* _tmp11_ = NULL;
-	GFile* ui_file = NULL;
-	GFile* _tmp12_ = NULL;
-	GtkUIManager* _tmp24_ = NULL;
-	GtkWidget* _tmp25_ = NULL;
-	GtkMenu* _tmp26_ = NULL;
-	GtkUIManager* _tmp27_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 195 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp0_ = gtk_action_group_new ("SidebarDefault");
-#line 195 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	group = _tmp0_;
-#line 196 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = g_new0 (GtkActionEntry, 0);
-#line 196 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	actions = _tmp1_;
-#line 196 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	actions_length1 = 0;
-#line 196 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_actions_size_ = actions_length1;
-#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_.name = "CommonNewSearch";
-#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_.stock_id = NULL;
-#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_.label = TRANSLATABLE;
 #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_.accelerator = NULL;
-#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_.tooltip = NULL;
-#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp2_.callback = (GCallback) _sidebar_tree_on_new_search_gtk_action_callback;
-#line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	new_search = _tmp2_;
-#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = _ ("Ne_w Saved Search…");
-#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	new_search.label = _tmp3_;
-#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4_ = actions;
+	g_return_if_fail (SIDEBAR_IS_TREE (self));
+#line 1205 "Tree.c"
+	{
+		GtkBuilder* _tmp0_ = NULL;
+		GMenuModel* model = NULL;
+		GtkBuilder* _tmp1_ = NULL;
+		GObject* _tmp2_ = NULL;
+		GMenuModel* _tmp3_ = NULL;
+		GMenuModel* _tmp4_ = NULL;
+		GtkMenu* _tmp5_ = NULL;
+		GSimpleActionGroup* group = NULL;
+		GSimpleActionGroup* _tmp6_ = NULL;
+		GSimpleActionGroup* _tmp7_ = NULL;
+		GSimpleActionGroup* _tmp8_ = NULL;
+		GtkMenu* _tmp9_ = NULL;
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp4__length1 = actions_length1;
+		_tmp0_ = self->priv->builder;
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp5_ = new_search;
+		gtk_builder_add_from_resource (_tmp0_, "/org/gnome/Shotwell/sidebar_default_context.ui", &_inner_error_);
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_array_add124 (&actions, &actions_length1, &_actions_size_, &_tmp5_);
-#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_.name = "CommonNewTag";
-#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_.stock_id = NULL;
-#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_.label = TRANSLATABLE;
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1225 "Tree.c"
+			goto __catch48_g_error;
+		}
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_.accelerator = NULL;
+		_tmp1_ = self->priv->builder;
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_.tooltip = NULL;
+		_tmp2_ = gtk_builder_get_object (_tmp1_, "popup-menu");
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp6_.callback = (GCallback) _sidebar_tree_on_new_tag_gtk_action_callback;
+		_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp2_) : NULL);
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	new_tag = _tmp6_;
+		model = _tmp3_;
 #line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = _ ("New _Tag…");
+		_tmp4_ = model;
 #line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	new_tag.label = _tmp7_;
-#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8_ = actions;
-#line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp8__length1 = actions_length1;
+		_tmp5_ = (GtkMenu*) gtk_menu_new_from_model (_tmp4_);
+#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_object_ref_sink (_tmp5_);
+#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_object_unref0 (self->priv->default_context_menu);
+#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		self->priv->default_context_menu = _tmp5_;
 #line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp9_ = new_tag;
+		_tmp6_ = g_simple_action_group_new ();
 #line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_vala_array_add125 (&actions, &actions_length1, &_actions_size_, &_tmp9_);
+		group = _tmp6_;
+#line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp7_ = group;
+#line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, g_action_map_get_type (), GActionMap), SIDEBAR_TREE_entries, G_N_ELEMENTS (SIDEBAR_TREE_entries), self);
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10_ = actions;
+		_tmp8_ = group;
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp10__length1 = actions_length1;
-#line 206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_action_group_add_actions (group, _tmp10_, _tmp10__length1, self);
+		gtk_widget_insert_action_group (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "sidebar", G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, g_action_group_get_type (), GActionGroup));
 #line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp11_ = self->priv->ui;
+		_tmp9_ = self->priv->default_context_menu;
 #line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_ui_manager_insert_action_group (_tmp11_, group, 0);
+		gtk_menu_attach_to_widget (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_object_unref0 (group);
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_object_unref0 (model);
+#line 1266 "Tree.c"
+	}
+	goto __finally48;
+	__catch48_g_error:
+	{
+		GError* _error_ = NULL;
+		GError* _tmp10_ = NULL;
+		const gchar* _tmp11_ = NULL;
+		gchar* _tmp12_ = NULL;
+		gchar* _tmp13_ = NULL;
+		Application* _tmp14_ = NULL;
+		Application* _tmp15_ = NULL;
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_error_ = _inner_error_;
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_inner_error_ = NULL;
 #line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp12_ = resources_get_ui ("sidebar_default_context.ui");
+		_tmp10_ = _error_;
 #line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	ui_file = _tmp12_;
-#line 1346 "Tree.c"
-	{
-		GtkUIManager* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-#line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp13_ = self->priv->ui;
+		_tmp11_ = _tmp10_->message;
+#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp12_ = g_strdup_printf ("Error loading UI resource: %s", _tmp11_);
+#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp13_ = _tmp12_;
+#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		app_window_error_message (_tmp13_, NULL);
+#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_free0 (_tmp13_);
 #line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp14_ = g_file_get_path (ui_file);
+		_tmp14_ = application_get_instance ();
 #line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = _tmp14_;
 #line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_ui_manager_add_ui_from_file (_tmp13_, _tmp15_, &_inner_error_);
-#line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_g_free0 (_tmp15_);
+		application_panic (_tmp15_);
 #line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1363 "Tree.c"
-			goto __catch49_g_error;
-		}
-	}
-	goto __finally49;
-	__catch49_g_error:
-	{
-		GError* err = NULL;
-		gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
-		GError* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		Application* _tmp22_ = NULL;
-		Application* _tmp23_ = NULL;
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		err = _inner_error_;
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_inner_error_ = NULL;
-#line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp16_ = g_file_get_path (ui_file);
-#line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp17_ = _tmp16_;
-#line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp18_ = err;
-#line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp19_ = _tmp18_->message;
-#line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp20_ = g_strdup_printf ("Error loading UI file %s: %s", _tmp17_, _tmp19_);
-#line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp21_ = _tmp20_;
-#line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		app_window_error_message (_tmp21_, NULL);
-#line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_g_free0 (_tmp21_);
-#line 213 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_g_free0 (_tmp17_);
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp22_ = application_get_instance ();
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp23_ = _tmp22_;
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		application_panic (_tmp23_);
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_application_unref0 (_tmp23_);
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_g_error_free0 (err);
-#line 1411 "Tree.c"
+		_application_unref0 (_tmp15_);
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_error_free0 (_error_);
+#line 1304 "Tree.c"
 	}
-	__finally49:
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	__finally48:
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_g_object_unref0 (ui_file);
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		actions = (g_free (actions), NULL);
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_g_object_unref0 (group);
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_clear_error (&_inner_error_);
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1428 "Tree.c"
+#line 1315 "Tree.c"
 	}
-#line 217 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp24_ = self->priv->ui;
-#line 217 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp25_ = gtk_ui_manager_get_widget (_tmp24_, "/SidebarDefaultContextMenu");
-#line 217 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_menu_get_type (), GtkMenu));
-#line 217 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_object_unref0 (self->priv->default_context_menu);
-#line 217 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	self->priv->default_context_menu = _tmp26_;
-#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp27_ = self->priv->ui;
-#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	gtk_ui_manager_ensure_update (_tmp27_);
-#line 194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_object_unref0 (ui_file);
-#line 194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	actions = (g_free (actions), NULL);
-#line 194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_object_unref0 (group);
-#line 1450 "Tree.c"
 }
 
 
@@ -1455,21 +1321,21 @@ static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry
 	GeeHashMap* _tmp0_ = NULL;
 	SidebarEntry* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp2_;
-#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1473 "Tree.c"
+#line 1339 "Tree.c"
 }
 
 
@@ -1480,43 +1346,43 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, Sid
 	SidebarEntry* _tmp1_ = NULL;
 	gpointer _tmp2_ = NULL;
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-#line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
-#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = (SidebarTreeEntryWrapper*) _tmp2_;
-#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 1500 "Tree.c"
+#line 1366 "Tree.c"
 		SidebarEntry* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = entry;
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = sidebar_entry_to_string (_tmp4_);
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp5_;
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_warning ("Tree.vala:229: Entry %s not found in sidebar", _tmp6_);
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_warning ("Tree.vala:222: Entry %s not found in sidebar", _tmp6_);
+#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp6_);
-#line 1514 "Tree.c"
+#line 1380 "Tree.c"
 	}
-#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 224 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = wrapper;
-#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 224 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1520 "Tree.c"
+#line 1386 "Tree.c"
 }
 
 
@@ -1530,64 +1396,64 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 	GValue _tmp3_ = {0};
 	SidebarTreeEntryWrapper* _tmp4_ = NULL;
 	SidebarTreeEntryWrapper* _tmp5_ = NULL;
-#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (iter != NULL, NULL);
-#line 236 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->store;
-#line 236 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = *iter;
-#line 236 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_model_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp1_, (gint) SIDEBAR_TREE_COLUMNS_WRAPPER, &_tmp2_);
-#line 236 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 236 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	val = _tmp2_;
-#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = val;
-#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _g_object_ref0 (g_value_get_object (&_tmp3_));
-#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp4_;
-#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ == NULL) {
-#line 1558 "Tree.c"
+#line 1424 "Tree.c"
 		GtkTreeStore* _tmp6_ = NULL;
 		GtkTreeIter _tmp7_ = {0};
 		GtkTreePath* _tmp8_ = NULL;
 		GtkTreePath* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->store;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = *iter;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_);
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = _tmp8_;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = gtk_tree_path_to_string (_tmp9_);
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = _tmp10_;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_message ("Tree.vala:240: No entry found in sidebar at %s", _tmp11_);
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_message ("Tree.vala:233: No entry found in sidebar at %s", _tmp11_);
+#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp11_);
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (_tmp9_);
-#line 1583 "Tree.c"
+#line 1449 "Tree.c"
 	}
-#line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 235 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = wrapper;
-#line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 235 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 235 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1591 "Tree.c"
+#line 1457 "Tree.c"
 }
 
 
@@ -1600,49 +1466,49 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s
 	gboolean _tmp3_ = FALSE;
 	GtkTreeIter _tmp7_ = {0};
 	SidebarTreeEntryWrapper* _tmp8_ = NULL;
-#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, NULL);
-#line 247 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->store;
-#line 247 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 247 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp2_, _tmp1_);
-#line 247 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp2_;
-#line 247 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp3_) {
-#line 1618 "Tree.c"
+#line 1484 "Tree.c"
 		GtkTreePath* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 248 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = path;
-#line 248 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = gtk_tree_path_to_string (_tmp4_);
-#line 248 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp5_;
-#line 248 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_message ("Tree.vala:248: No entry found in sidebar at %s", _tmp6_);
-#line 248 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		g_message ("Tree.vala:241: No entry found in sidebar at %s", _tmp6_);
+#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (_tmp6_);
-#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 243 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = NULL;
-#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 243 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1636 "Tree.c"
+#line 1502 "Tree.c"
 	}
-#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 246 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = iter;
-#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 246 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_);
-#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 246 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp8_;
-#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 246 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1646 "Tree.c"
+#line 1512 "Tree.c"
 }
 
 
@@ -1664,79 +1530,79 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo
 	GtkTreePath* _tmp12_ = NULL;
 	SidebarEntry* _tmp13_ = NULL;
 	gboolean _tmp14_ = FALSE;
-#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_);
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp1_) {
-#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1682 "Tree.c"
+#line 1548 "Tree.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_);
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp3_;
-#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = wrapper;
-#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ == NULL) {
-#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1700 "Tree.c"
+#line 1566 "Tree.c"
 	}
-#line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
-#line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_);
-#line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_;
-#line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_selection_select_path (_tmp5_, _tmp8_);
-#line 266 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp8_);
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = mask_signal;
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->mask_entry_selected_signal = _tmp9_;
-#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = wrapper;
-#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = sidebar_tree_entry_wrapper_get_path (_tmp10_);
-#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = _tmp11_;
-#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp12_, NULL, FALSE);
-#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp12_);
-#line 270 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->mask_entry_selected_signal = FALSE;
-#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = entry;
-#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = sidebar_tree_scroll_to_entry (self, _tmp13_);
-#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp14_;
-#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1740 "Tree.c"
+#line 1606 "Tree.c"
 }
 
 
@@ -1751,75 +1617,75 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
 	GtkTreeSelection* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
 	SidebarTreeEntryWrapper* _tmp6_ = NULL;
-#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selection = _tmp3_;
-#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = selection;
-#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ == NULL) {
-#line 282 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 282 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selection);
-#line 282 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 282 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1783 "Tree.c"
+#line 1649 "Tree.c"
 	}
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ != NULL) {
-#line 1789 "Tree.c"
+#line 1655 "Tree.c"
 		GtkTreeSelection* _tmp7_ = NULL;
 		SidebarTreeEntryWrapper* _tmp8_ = NULL;
 		GtkTreePath* _tmp9_ = NULL;
 		GtkTreePath* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = selection;
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = wrapper;
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = sidebar_tree_entry_wrapper_get_path (_tmp8_);
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = _tmp9_;
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = gtk_tree_selection_path_is_selected (_tmp7_, _tmp10_);
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp11_;
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (_tmp10_);
-#line 1809 "Tree.c"
+#line 1675 "Tree.c"
 	} else {
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = FALSE;
-#line 1813 "Tree.c"
+#line 1679 "Tree.c"
 	}
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp5_;
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selection);
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1823 "Tree.c"
+#line 1689 "Tree.c"
 }
 
 
@@ -1827,40 +1693,40 @@ gboolean sidebar_tree_is_any_selected (SidebarTree* self) {
 	gboolean result = FALSE;
 	GtkTreeSelection* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = gtk_tree_selection_count_selected_rows (_tmp0_);
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp1_ != 0;
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1841 "Tree.c"
+#line 1707 "Tree.c"
 }
 
 
 static gpointer _gtk_tree_path_copy0 (gpointer self) {
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? gtk_tree_path_copy (self) : NULL;
-#line 1848 "Tree.c"
+#line 1714 "Tree.c"
 }
 
 
 static void _gtk_tree_path_free0_ (gpointer var) {
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	(var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL));
-#line 1855 "Tree.c"
+#line 1721 "Tree.c"
 }
 
 
 static void _g_list_free__gtk_tree_path_free0_ (GList* self) {
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL);
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_list_free (self);
-#line 1864 "Tree.c"
+#line 1730 "Tree.c"
 }
 
 
@@ -1883,96 +1749,96 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
 	GList* _tmp13_ = NULL;
 	guint _tmp14_ = 0U;
 	GtkTreePath* _tmp17_ = NULL;
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selection = _tmp1_;
-#line 294 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = selection;
-#line 294 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = NULL;
-#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selection);
-#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (model);
-#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1907 "Tree.c"
+#line 1773 "Tree.c"
 	}
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = selection;
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_selection_get_selected_rows (_tmp3_, &_tmp4_);
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _g_object_ref0 (_tmp4_);
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	model = _tmp6_;
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	rows = _tmp5_;
-#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = rows;
-#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = g_list_length (_tmp8_);
-#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp9_ == ((guint) 0)) {
-#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = TRUE;
-#line 1929 "Tree.c"
+#line 1795 "Tree.c"
 	} else {
 		GList* _tmp10_ = NULL;
 		guint _tmp11_ = 0U;
-#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = rows;
-#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = g_list_length (_tmp10_);
-#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp11_ == ((guint) 1);
-#line 1939 "Tree.c"
+#line 1805 "Tree.c"
 	}
-#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp7_, "rows.length() == 0 || rows.length() == 1");
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = rows;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = g_list_length (_tmp13_);
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp14_ != ((guint) 0)) {
-#line 1949 "Tree.c"
+#line 1815 "Tree.c"
 		GList* _tmp15_ = NULL;
 		gconstpointer _tmp16_ = NULL;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = rows;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = g_list_nth_data (_tmp15_, (guint) 0);
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = (GtkTreePath*) _tmp16_;
-#line 1958 "Tree.c"
+#line 1824 "Tree.c"
 	} else {
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = NULL;
-#line 1962 "Tree.c"
+#line 1828 "Tree.c"
 	}
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = _gtk_tree_path_copy0 (_tmp12_);
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp17_;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selection);
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1976 "Tree.c"
+#line 1842 "Tree.c"
 }
 
 
@@ -1989,90 +1855,90 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry*
 	SidebarEmphasizableEntry* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	SidebarEmphasizableEntry* _tmp8_ = NULL;
-#line 303 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 303 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
-#line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_entry_get_sidebar_name (_tmp0_);
-#line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = guarded_markup_escape_text (_tmp2_);
-#line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp2_);
-#line 304 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	name = _tmp4_;
-#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = entry;
-#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp5_) : NULL);
-#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	emphasizable_entry = _tmp6_;
-#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = emphasizable_entry;
-#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_ != NULL) {
-#line 2021 "Tree.c"
+#line 1887 "Tree.c"
 		SidebarEmphasizableEntry* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
-#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = emphasizable_entry;
-#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = sidebar_emphasizable_entry_is_emphasized (_tmp9_);
-#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp10_;
-#line 2030 "Tree.c"
+#line 1896 "Tree.c"
 	} else {
-#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = FALSE;
-#line 2034 "Tree.c"
+#line 1900 "Tree.c"
 	}
-#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 2038 "Tree.c"
+#line 1904 "Tree.c"
 		const gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = name;
-#line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = g_strdup_printf ("<b>%s</b>", _tmp11_);
-#line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (name);
-#line 308 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		name = _tmp12_;
-#line 2049 "Tree.c"
+#line 1915 "Tree.c"
 	}
-#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 303 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = name;
-#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 303 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable_entry);
-#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 303 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 2057 "Tree.c"
+#line 1923 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_real_accept_cursor_changed (SidebarTree* self) {
 	gboolean result = FALSE;
-#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 2067 "Tree.c"
+#line 1933 "Tree.c"
 }
 
 
 gboolean sidebar_tree_accept_cursor_changed (SidebarTree* self) {
-#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return SIDEBAR_TREE_GET_CLASS (self)->accept_cursor_changed (self);
-#line 2076 "Tree.c"
+#line 1942 "Tree.c"
 }
 
 
@@ -2086,41 +1952,41 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	SidebarTreeEntryWrapper* _tmp4_ = NULL;
 	SidebarTreeEntryWrapper* _tmp5_ = NULL;
-#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = sidebar_tree_get_selected_path (self);
-#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp0_;
-#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_ == NULL) {
-#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
-#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 2104 "Tree.c"
+#line 1970 "Tree.c"
 		}
-#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 315 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 315 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 2110 "Tree.c"
+#line 1976 "Tree.c"
 	}
-#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = path;
-#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper_at_path (self, _tmp2_);
-#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp3_;
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = self->priv->selected_wrapper;
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 2124 "Tree.c"
+#line 1990 "Tree.c"
 		SidebarTreeEntryWrapper* old_wrapper = NULL;
 		SidebarTreeEntryWrapper* _tmp6_ = NULL;
 		SidebarTreeEntryWrapper* _tmp7_ = NULL;
@@ -2130,168 +1996,168 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 		gint _tmp11_ = 0;
 		gboolean _tmp19_ = FALSE;
 		SidebarTreeEntryWrapper* _tmp20_ = NULL;
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->selected_wrapper;
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		old_wrapper = _tmp7_;
-#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = wrapper;
-#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->selected_wrapper = _tmp8_;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = self->priv->editing_disabled;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ == 0) {
-#line 2148 "Tree.c"
+#line 2014 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp12_ = NULL;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = wrapper;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _tmp12_ != NULL;
-#line 2154 "Tree.c"
+#line 2020 "Tree.c"
 		} else {
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = FALSE;
-#line 2158 "Tree.c"
+#line 2024 "Tree.c"
 		}
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp10_) {
-#line 2162 "Tree.c"
+#line 2028 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp13_ = NULL;
 			SidebarEntry* _tmp14_ = NULL;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = wrapper;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = _tmp13_->entry;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2171 "Tree.c"
+#line 2037 "Tree.c"
 		} else {
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = FALSE;
-#line 2175 "Tree.c"
+#line 2041 "Tree.c"
 		}
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_) {
-#line 2179 "Tree.c"
+#line 2045 "Tree.c"
 			GtkCellRendererText* _tmp15_ = NULL;
 			SidebarTreeEntryWrapper* _tmp16_ = NULL;
 			SidebarEntry* _tmp17_ = NULL;
 			gboolean _tmp18_ = FALSE;
-#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = self->priv->text_renderer;
-#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = wrapper;
-#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = _tmp16_->entry;
-#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
-#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			g_object_set (_tmp15_, "editable", _tmp18_, NULL);
-#line 2194 "Tree.c"
+#line 2060 "Tree.c"
 		}
-#line 334 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = wrapper;
-#line 334 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp20_ != NULL) {
-#line 2200 "Tree.c"
+#line 2066 "Tree.c"
 			gboolean _tmp21_ = FALSE;
-#line 334 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = self->priv->mask_entry_selected_signal;
-#line 334 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = !_tmp21_;
-#line 2206 "Tree.c"
+#line 2072 "Tree.c"
 		} else {
-#line 334 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = FALSE;
-#line 2210 "Tree.c"
+#line 2076 "Tree.c"
 		}
-#line 334 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp19_) {
-#line 2214 "Tree.c"
+#line 2080 "Tree.c"
 			SidebarSelectableEntry* selectable = NULL;
 			SidebarTreeEntryWrapper* _tmp22_ = NULL;
 			SidebarEntry* _tmp23_ = NULL;
 			SidebarSelectableEntry* _tmp24_ = NULL;
 			SidebarSelectableEntry* _tmp25_ = NULL;
-#line 335 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = wrapper;
-#line 335 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = _tmp22_->entry;
-#line 335 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp23_) : NULL);
-#line 335 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			selectable = _tmp24_;
-#line 336 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = selectable;
-#line 336 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp25_ != NULL) {
-#line 2232 "Tree.c"
+#line 2098 "Tree.c"
 				gboolean _tmp26_ = FALSE;
-#line 337 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp26_ = sidebar_tree_accept_cursor_changed (self);
-#line 337 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp26_) {
-#line 2238 "Tree.c"
+#line 2104 "Tree.c"
 					SidebarSelectableEntry* _tmp27_ = NULL;
-#line 338 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp27_ = selectable;
-#line 338 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					g_signal_emit_by_name (self, "entry-selected", _tmp27_);
-#line 2244 "Tree.c"
+#line 2110 "Tree.c"
 				} else {
 					SidebarTreeEntryWrapper* _tmp28_ = NULL;
 					SidebarEntry* _tmp29_ = NULL;
-#line 340 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 333 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp28_ = old_wrapper;
-#line 340 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 333 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp29_ = _tmp28_->entry;
-#line 340 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 333 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					sidebar_tree_place_cursor (self, _tmp29_, TRUE);
-#line 2254 "Tree.c"
+#line 2120 "Tree.c"
 				}
 			}
-#line 334 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (selectable);
-#line 2259 "Tree.c"
+#line 2125 "Tree.c"
 		}
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (old_wrapper);
-#line 2263 "Tree.c"
+#line 2129 "Tree.c"
 	}
-#line 346 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 339 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
-#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 340 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 2269 "Tree.c"
+#line 2135 "Tree.c"
 	}
-#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 2275 "Tree.c"
+#line 2141 "Tree.c"
 }
 
 
 void sidebar_tree_disable_editing (SidebarTree* self) {
 	gint _tmp0_ = 0;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->editing_disabled;
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->editing_disabled = _tmp0_ + 1;
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ == 0) {
-#line 2289 "Tree.c"
+#line 2155 "Tree.c"
 		GtkCellRendererText* _tmp1_ = NULL;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 345 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->text_renderer;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 345 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_set (_tmp1_, "editable", FALSE, NULL);
-#line 2295 "Tree.c"
+#line 2161 "Tree.c"
 	}
 }
 
@@ -2302,141 +2168,141 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	GtkTreePath* _tmp3_ = NULL;
-#line 355 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 356 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = sidebar_tree_get_selected_path (self);
-#line 356 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp0_;
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = path;
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ != NULL) {
-#line 2316 "Tree.c"
+#line 2182 "Tree.c"
 		gint _tmp4_ = 0;
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = self->priv->editing_disabled;
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp4_ > 0;
-#line 2322 "Tree.c"
+#line 2188 "Tree.c"
 	} else {
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 2326 "Tree.c"
+#line 2192 "Tree.c"
 	}
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_) {
-#line 2330 "Tree.c"
+#line 2196 "Tree.c"
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->editing_disabled;
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->editing_disabled = _tmp5_ - 1;
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->editing_disabled;
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = _tmp6_ == 0;
-#line 2341 "Tree.c"
+#line 2207 "Tree.c"
 	} else {
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = FALSE;
-#line 2345 "Tree.c"
+#line 2211 "Tree.c"
 	}
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 2349 "Tree.c"
+#line 2215 "Tree.c"
 		SidebarTreeEntryWrapper* wrapper = NULL;
 		GtkTreePath* _tmp7_ = NULL;
 		SidebarTreeEntryWrapper* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		SidebarTreeEntryWrapper* _tmp10_ = NULL;
-#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = path;
-#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = sidebar_tree_get_wrapper_at_path (self, _tmp7_);
-#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		wrapper = _tmp8_;
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = wrapper;
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp10_ != NULL) {
-#line 2365 "Tree.c"
+#line 2231 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp11_ = NULL;
 			SidebarEntry* _tmp12_ = NULL;
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = wrapper;
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _tmp11_->entry;
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2374 "Tree.c"
+#line 2240 "Tree.c"
 		} else {
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = FALSE;
-#line 2378 "Tree.c"
+#line 2244 "Tree.c"
 		}
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_) {
-#line 2382 "Tree.c"
+#line 2248 "Tree.c"
 			GtkCellRendererText* _tmp13_ = NULL;
 			SidebarTreeEntryWrapper* _tmp14_ = NULL;
 			SidebarEntry* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
-#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = self->priv->text_renderer;
-#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = wrapper;
-#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = _tmp14_->entry;
-#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
-#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			g_object_set (_tmp13_, "editable", _tmp16_, NULL);
-#line 2397 "Tree.c"
+#line 2263 "Tree.c"
 		}
-#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 2401 "Tree.c"
+#line 2267 "Tree.c"
 	}
-#line 355 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 2405 "Tree.c"
+#line 2271 "Tree.c"
 }
 
 
 void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path, gboolean expand_all) {
 	GtkTreePath* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (path != NULL);
-#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
-#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp0_);
-#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 2424 "Tree.c"
+#line 2290 "Tree.c"
 		GtkTreePath* _tmp2_ = NULL;
-#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = path;
-#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_collapse_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp2_);
-#line 2430 "Tree.c"
+#line 2296 "Tree.c"
 	} else {
 		GtkTreePath* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 363 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = path;
-#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 363 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = expand_all;
-#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 363 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_expand_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp3_, _tmp4_);
-#line 2440 "Tree.c"
+#line 2306 "Tree.c"
 	}
 }
 
@@ -2450,47 +2316,47 @@ gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	GtkTreePath* _tmp4_ = NULL;
 	GtkTreePath* _tmp5_ = NULL;
-#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 374 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
-#line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 375 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 2476 "Tree.c"
+#line 2342 "Tree.c"
 	}
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_);
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp5_);
-#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 374 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 374 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 374 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 2494 "Tree.c"
+#line 2360 "Tree.c"
 }
 
 
@@ -2504,37 +2370,37 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 	GtkTreePath* _tmp4_ = NULL;
 	GtkTreeIter iter = {0};
 	GtkTreePath* _tmp13_ = NULL;
-#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 2528 "Tree.c"
+#line 2394 "Tree.c"
 	}
-#line 390 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 383 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 390 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 383 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 390 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 383 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp4_;
-#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 2538 "Tree.c"
+#line 2404 "Tree.c"
 		GtkTreeStore* _tmp5_ = NULL;
 		GtkTreePath* _tmp6_ = NULL;
 		GtkTreeIter _tmp7_ = {0};
@@ -2543,89 +2409,89 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 		GtkTreeIter _tmp10_ = {0};
 		gboolean _tmp11_ = FALSE;
 		GtkTreePath* _tmp12_ = NULL;
-#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->store;
-#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = path;
-#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = gtk_tree_model_get_iter (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_, _tmp6_);
-#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		iter = _tmp7_;
-#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp8_) {
-#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2559 "Tree.c"
+#line 2425 "Tree.c"
 		}
-#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = self->priv->store;
-#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = iter;
-#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp10_);
-#line 394 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp11_) {
-#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2571 "Tree.c"
+#line 2437 "Tree.c"
 		}
-#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 390 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = path;
-#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 390 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_path_down (_tmp12_);
-#line 2577 "Tree.c"
+#line 2443 "Tree.c"
 	}
-#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = path;
-#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_expand_to_path (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp13_);
-#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 384 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 2587 "Tree.c"
+#line 2453 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
-#line 418 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_added ((SidebarTree*) self, _sender, entry);
-#line 2594 "Tree.c"
+#line 2460 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
-#line 419 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_removed ((SidebarTree*) self, _sender, entry);
-#line 2601 "Tree.c"
+#line 2467 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
-#line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_moved ((SidebarTree*) self, _sender, entry);
-#line 2608 "Tree.c"
+#line 2474 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender, SidebarEntry* entry, SidebarEntry* old_parent, gpointer self) {
-#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_entry_reparented ((SidebarTree*) self, _sender, entry, old_parent);
-#line 2615 "Tree.c"
+#line 2481 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender, SidebarEntry* entry, gpointer self) {
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_branch_children_reordered ((SidebarTree*) self, _sender, entry);
-#line 2622 "Tree.c"
+#line 2488 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender, gboolean show, gpointer self) {
-#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_show_branch ((SidebarTree*) self, _sender, show);
-#line 2629 "Tree.c"
+#line 2495 "Tree.c"
 }
 
 
@@ -2646,139 +2512,139 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
 	SidebarBranch* _tmp24_ = NULL;
 	SidebarBranch* _tmp25_ = NULL;
 	SidebarBranch* _tmp26_ = NULL;
-#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = position;
-#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_return_if_fail (_tmp0_ >= 0, "position >= 0");
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->branches;
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = branch;
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp2_);
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!_tmp3_, "!branches.has_key(branch)");
-#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = self->priv->branches;
-#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = branch;
-#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = position;
-#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_, (gpointer) ((gintptr) _tmp6_));
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = branch;
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = sidebar_branch_get_show_branch (_tmp7_);
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_) {
-#line 2680 "Tree.c"
+#line 2546 "Tree.c"
 		SidebarBranch* _tmp9_ = NULL;
 		SidebarBranch* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		SidebarBranch* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = branch;
-#line 409 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_associate_branch (self, _tmp9_);
-#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = branch;
-#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = sidebar_branch_is_startup_expand_to_first_child (_tmp10_);
-#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_) {
-#line 2696 "Tree.c"
+#line 2562 "Tree.c"
 			SidebarBranch* _tmp12_ = NULL;
 			SidebarEntry* _tmp13_ = NULL;
 			SidebarEntry* _tmp14_ = NULL;
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = branch;
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = sidebar_branch_get_root (_tmp12_);
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = _tmp13_;
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_expand_to_first_child (self, _tmp14_);
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp14_);
-#line 2710 "Tree.c"
+#line 2576 "Tree.c"
 		}
-#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = branch;
-#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = sidebar_branch_is_startup_open_grouping (_tmp15_);
-#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp16_) {
-#line 2718 "Tree.c"
+#line 2584 "Tree.c"
 			SidebarBranch* _tmp17_ = NULL;
 			SidebarEntry* _tmp18_ = NULL;
 			SidebarEntry* _tmp19_ = NULL;
-#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = branch;
-#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = sidebar_branch_get_root (_tmp17_);
-#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _tmp18_;
-#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_expand_to_entry (self, _tmp19_);
-#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp19_);
-#line 2732 "Tree.c"
+#line 2598 "Tree.c"
 		}
 	}
-#line 418 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = branch;
-#line 418 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp20_, "entry-added", (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self, 0);
-#line 419 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = branch;
-#line 419 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp21_, "entry-removed", (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self, 0);
-#line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = branch;
-#line 420 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp22_, "entry-moved", (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self, 0);
-#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = branch;
-#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp23_, "entry-reparented", (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self, 0);
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = branch;
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp24_, "children-reordered", (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self, 0);
-#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = branch;
-#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp25_, "show-branch", (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self, 0);
-#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 418 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = branch;
-#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 418 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "branch-added", _tmp26_);
-#line 2763 "Tree.c"
+#line 2629 "Tree.c"
 }
 
 
 static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self) {
 	GtkTreeIter* dup;
-#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	dup = g_new0 (GtkTreeIter, 1);
-#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	memcpy (dup, self, sizeof (GtkTreeIter));
-#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return dup;
-#line 2775 "Tree.c"
+#line 2641 "Tree.c"
 }
 
 
 static gpointer __gtk_tree_iter_dup0 (gpointer self) {
-#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? _gtk_tree_iter_dup (self) : NULL;
-#line 2782 "Tree.c"
+#line 2648 "Tree.c"
 }
 
 
@@ -2817,39 +2683,39 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 	SidebarEntry* _tmp46_ = NULL;
 	GtkTreeIter* _tmp47_ = NULL;
 	GtkTreeIter _tmp48_ = {0};
-#line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->branches;
-#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = branch;
-#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_, "branches.has_key(branch)");
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->branches;
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = branch;
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	position = (gint) ((gintptr) _tmp5_);
-#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 427 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	insertion_iter = NULL;
-#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->store;
-#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = gtk_tree_model_get_iter_first (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_);
-#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp7_;
-#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	found = _tmp8_;
-#line 439 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 2853 "Tree.c"
+#line 2719 "Tree.c"
 		gboolean _tmp9_ = FALSE;
 		SidebarTreeRootWrapper* root_wrapper = NULL;
 		GtkTreeIter _tmp10_ = {0};
@@ -2861,154 +2727,154 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 		gint _tmp16_ = 0;
 		GtkTreeStore* _tmp22_ = NULL;
 		gboolean _tmp23_ = FALSE;
-#line 439 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = found;
-#line 439 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp9_) {
-#line 439 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2871 "Tree.c"
+#line 2737 "Tree.c"
 		}
-#line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = iter;
-#line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp10_);
-#line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp11_) : NULL;
-#line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp12_ == NULL) {
-#line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp11_);
-#line 2883 "Tree.c"
+#line 2749 "Tree.c"
 		}
-#line 440 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		root_wrapper = _tmp12_;
-#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = root_wrapper;
-#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp13_ != NULL, "root_wrapper != null");
-#line 443 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = position;
-#line 443 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = root_wrapper;
-#line 443 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = _tmp15_->root_position;
-#line 443 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp14_ < _tmp16_) {
-#line 2899 "Tree.c"
+#line 2765 "Tree.c"
 			GtkTreeStore* _tmp17_ = NULL;
 			GtkTreeIter _tmp18_ = {0};
 			GtkTreeIter _tmp19_ = {0};
 			GtkTreeIter _tmp20_ = {0};
 			GtkTreeIter* _tmp21_ = NULL;
-#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = self->priv->store;
-#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = iter;
-#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_store_insert_before (_tmp17_, &_tmp19_, NULL, &_tmp18_);
-#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_free0 (insertion_iter);
-#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = _tmp19_;
-#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = __gtk_tree_iter_dup0 (&_tmp20_);
-#line 444 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			insertion_iter = _tmp21_;
-#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 439 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (root_wrapper);
-#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 439 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2923 "Tree.c"
+#line 2789 "Tree.c"
 		}
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 442 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = self->priv->store;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 442 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp23_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &iter);
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 442 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		found = _tmp23_;
-#line 439 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (root_wrapper);
-#line 2933 "Tree.c"
+#line 2799 "Tree.c"
 	}
-#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = insertion_iter;
-#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp24_ == NULL) {
-#line 2939 "Tree.c"
+#line 2805 "Tree.c"
 		GtkTreeStore* _tmp25_ = NULL;
 		GtkTreeIter _tmp26_ = {0};
 		GtkTreeIter _tmp27_ = {0};
 		GtkTreeIter* _tmp28_ = NULL;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = self->priv->store;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_store_append (_tmp25_, &_tmp26_, NULL);
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (insertion_iter);
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp27_ = _tmp26_;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = __gtk_tree_iter_dup0 (&_tmp27_);
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp28_;
-#line 2956 "Tree.c"
+#line 2822 "Tree.c"
 	}
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = insertion_iter;
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = self->priv->store;
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = branch;
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = sidebar_branch_get_root (_tmp31_);
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = _tmp32_;
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = self->priv->store;
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp35_ = insertion_iter;
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = *_tmp35_;
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp36_);
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = _tmp37_;
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = position;
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = sidebar_tree_root_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp33_, _tmp38_, _tmp39_);
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp41_ = _tmp40_;
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp42_ = *_tmp29_;
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_wrapper (self, &_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper));
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp41_);
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp38_);
-#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp33_);
-#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp43_ = branch;
-#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp44_ = branch;
-#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp45_ = sidebar_branch_get_root (_tmp44_);
-#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp46_ = _tmp45_;
-#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp47_ = insertion_iter;
-#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp48_ = *_tmp47_;
-#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_children (self, _tmp43_, _tmp46_, &_tmp48_);
-#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp46_);
-#line 429 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (insertion_iter);
-#line 3012 "Tree.c"
+#line 2878 "Tree.c"
 }
 
 
@@ -3018,31 +2884,31 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 	SidebarEntry* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
 	GeeList* _tmp3_ = NULL;
-#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (parent));
-#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (parent_iter != NULL);
-#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = parent;
-#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_);
-#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp2_;
-#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = children;
-#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
-#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 3046 "Tree.c"
+#line 2912 "Tree.c"
 	}
 	{
 		GeeList* _child_list = NULL;
@@ -3053,25 +2919,25 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 		gint _tmp7_ = 0;
 		gint _tmp8_ = 0;
 		gint _child_index = 0;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = children;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_list = _tmp5_;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _child_list;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp7_;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_size = _tmp8_;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_index = -1;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 3075 "Tree.c"
+#line 2941 "Tree.c"
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
@@ -3088,61 +2954,61 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 			SidebarBranch* _tmp20_ = NULL;
 			SidebarEntry* _tmp21_ = NULL;
 			GtkTreeIter _tmp22_ = {0};
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = _child_index;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_child_index = _tmp9_ + 1;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _child_index;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = _child_size;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (!(_tmp10_ < _tmp11_)) {
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 3104 "Tree.c"
+#line 2970 "Tree.c"
 			}
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _child_list;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = _child_index;
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child = (SidebarEntry*) _tmp14_;
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = self->priv->store;
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = *parent_iter;
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_store_append (_tmp15_, &_tmp17_, &_tmp16_);
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			append_iter = _tmp17_;
-#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = append_iter;
-#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = child;
-#line 474 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_associate_entry (self, &_tmp18_, _tmp19_);
-#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = branch;
-#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = child;
-#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = append_iter;
-#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_associate_children (self, _tmp20_, _tmp21_, &_tmp22_);
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child);
-#line 3138 "Tree.c"
+#line 3004 "Tree.c"
 		}
-#line 470 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_list);
-#line 3142 "Tree.c"
+#line 3008 "Tree.c"
 	}
-#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 3146 "Tree.c"
+#line 3012 "Tree.c"
 }
 
 
@@ -3156,79 +3022,79 @@ static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_
 	GtkTreePath* _tmp6_ = NULL;
 	SidebarTreeEntryWrapper* _tmp7_ = NULL;
 	SidebarTreeEntryWrapper* _tmp8_ = NULL;
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (assoc_iter != NULL);
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *assoc_iter;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->store;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = *assoc_iter;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp4_);
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp2_, _tmp6_);
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_wrapper (self, &_tmp0_, _tmp8_);
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp8_);
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp6_);
-#line 3190 "Tree.c"
+#line 3056 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, const gchar* tooltip, gpointer self) {
-#line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_tooltip_changed ((SidebarTree*) self, _sender, tooltip);
-#line 3197 "Tree.c"
+#line 3063 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, const gchar* icon, gpointer self) {
-#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_icon_changed ((SidebarTree*) self, _sender, icon);
-#line 3204 "Tree.c"
+#line 3070 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
-#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_page_created ((SidebarTree*) self, _sender, page);
-#line 3211 "Tree.c"
+#line 3077 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
-#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 493 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_destroying_page ((SidebarTree*) self, _sender, page);
-#line 3218 "Tree.c"
+#line 3084 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender, gboolean emphasized, gpointer self) {
-#line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_is_emphasized_changed ((SidebarTree*) self, _sender, emphasized);
-#line 3225 "Tree.c"
+#line 3091 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender, const gchar* name, gpointer self) {
-#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_name_changed ((SidebarTree*) self, _sender, name);
-#line 3232 "Tree.c"
+#line 3098 "Tree.c"
 }
 
 
@@ -3274,162 +3140,162 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
 	SidebarRenameableEntry* _tmp37_ = NULL;
 	SidebarRenameableEntry* _tmp38_ = NULL;
 	SidebarEntry* _tmp40_ = NULL;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (assoc_iter != NULL);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = wrapper;
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->entry;
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry = _tmp2_;
-#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->entry_map;
-#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = entry;
-#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!_tmp5_, "!entry_map.has_key(entry)");
-#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->entry_map;
-#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = entry;
-#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = wrapper;
-#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_, _tmp8_);
-#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = self->priv->store;
-#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = *assoc_iter;
-#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = entry;
-#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = sidebar_tree_get_name_for_entry (self, _tmp11_);
-#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = _tmp12_;
-#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp9_, &_tmp10_, SIDEBAR_TREE_COLUMNS_NAME, _tmp13_, -1);
-#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp13_);
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = self->priv->store;
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = *assoc_iter;
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = entry;
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = sidebar_entry_get_sidebar_tooltip (_tmp16_);
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = _tmp17_;
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = guarded_markup_escape_text (_tmp18_);
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = _tmp19_;
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp14_, &_tmp15_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp20_, -1);
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp20_);
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp18_);
-#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = self->priv->store;
-#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = *assoc_iter;
-#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = wrapper;
-#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp21_, &_tmp22_, SIDEBAR_TREE_COLUMNS_WRAPPER, _tmp23_, -1);
-#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = *assoc_iter;
-#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_load_entry_icons (self, &_tmp24_);
-#line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = entry;
-#line 494 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp25_, "sidebar-tooltip-changed", (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self, 0);
-#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = entry;
-#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_connect_object (_tmp26_, "sidebar-icon-changed", (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self, 0);
-#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = entry;
-#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp27_) : NULL);
-#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pageable = _tmp28_;
-#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = pageable;
-#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp29_ != NULL) {
-#line 3372 "Tree.c"
+#line 3238 "Tree.c"
 		SidebarPageRepresentative* _tmp30_ = NULL;
 		SidebarPageRepresentative* _tmp31_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = pageable;
-#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp30_, "page-created", (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self, 0);
-#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 493 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp31_ = pageable;
-#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 493 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp31_, "destroying-page", (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self, 0);
-#line 3383 "Tree.c"
+#line 3249 "Tree.c"
 	}
-#line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = entry;
-#line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp32_) : NULL);
-#line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	emphasizable = _tmp33_;
-#line 504 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = emphasizable;
-#line 504 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp34_ != NULL) {
-#line 3395 "Tree.c"
+#line 3261 "Tree.c"
 		SidebarEmphasizableEntry* _tmp35_ = NULL;
-#line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp35_ = emphasizable;
-#line 505 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp35_, "is-emphasized-changed", (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self, 0);
-#line 3401 "Tree.c"
+#line 3267 "Tree.c"
 	}
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = entry;
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp36_) : NULL);
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp37_;
-#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = renameable;
-#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp38_ != NULL) {
-#line 3413 "Tree.c"
+#line 3279 "Tree.c"
 		SidebarRenameableEntry* _tmp39_ = NULL;
-#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp39_ = renameable;
-#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (_tmp39_, "sidebar-name-changed", (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self, 0);
-#line 3419 "Tree.c"
+#line 3285 "Tree.c"
 	}
-#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 504 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = entry;
-#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 504 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_entry_grafted (_tmp40_, self);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (pageable);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 3433 "Tree.c"
+#line 3299 "Tree.c"
 }
 
 
@@ -3464,97 +3330,97 @@ static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self
 	GtkTreeStore* _tmp23_ = NULL;
 	GtkTreeIter _tmp24_ = {0};
 	GtkTreeIter _tmp25_ = {0};
-#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (new_iter != NULL, NULL);
-#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (current_wrapper), NULL);
-#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = current_wrapper;
-#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->entry;
-#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry = _tmp2_;
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->entry_map;
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, NULL);
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	removed = _tmp4_;
-#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (removed, "removed");
-#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = self->priv->store;
-#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->store;
-#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = *new_iter;
-#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = gtk_tree_model_get_path (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp7_);
-#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = _tmp8_;
-#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = sidebar_tree_entry_wrapper_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_TREE_MODEL, GtkTreeModel), entry, _tmp9_);
-#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = _tmp10_;
-#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp9_);
-#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_wrapper = _tmp11_;
-#line 521 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = self->priv->entry_map;
-#line 521 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, new_wrapper);
-#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->store;
-#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = *new_iter;
-#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = sidebar_tree_get_name_for_entry (self, entry);
-#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = _tmp15_;
-#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp13_, &_tmp14_, SIDEBAR_TREE_COLUMNS_NAME, _tmp16_, -1);
-#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp16_);
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = self->priv->store;
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = *new_iter;
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = sidebar_entry_get_sidebar_tooltip (entry);
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = _tmp19_;
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = guarded_markup_escape_text (_tmp20_);
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = _tmp21_;
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp17_, &_tmp18_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp22_, -1);
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp22_);
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp20_);
-#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = self->priv->store;
-#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = *new_iter;
-#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp23_, &_tmp24_, SIDEBAR_TREE_COLUMNS_WRAPPER, new_wrapper, -1);
-#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = *new_iter;
-#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_load_entry_icons (self, &_tmp25_);
-#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 521 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = new_wrapper;
-#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 521 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 521 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 3558 "Tree.c"
+#line 3424 "Tree.c"
 }
 
 
@@ -3584,91 +3450,91 @@ void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) {
 	SidebarBranch* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
 	SidebarBranch* _tmp24_ = NULL;
-#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->branches;
-#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = branch;
-#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_, "branches.has_key(branch)");
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = branch;
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_branch_get_root (_tmp3_);
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = sidebar_tree_has_wrapper (self, _tmp5_);
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = _tmp6_;
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp5_);
-#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 3614 "Tree.c"
+#line 3480 "Tree.c"
 		SidebarBranch* _tmp8_ = NULL;
-#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = branch;
-#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_disassociate_branch (self, _tmp8_);
-#line 3620 "Tree.c"
+#line 3486 "Tree.c"
 	}
-#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = branch;
-#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("entry-added", SIDEBAR_TYPE_BRANCH, &_tmp10_, NULL, FALSE);
-#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self);
-#line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = branch;
-#line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("entry-removed", SIDEBAR_TYPE_BRANCH, &_tmp12_, NULL, FALSE);
-#line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self);
-#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = branch;
-#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("entry-moved", SIDEBAR_TYPE_BRANCH, &_tmp14_, NULL, FALSE);
-#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self);
-#line 540 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = branch;
-#line 540 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("entry-reparented", SIDEBAR_TYPE_BRANCH, &_tmp16_, NULL, FALSE);
-#line 540 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self);
-#line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = branch;
-#line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("children-reordered", SIDEBAR_TYPE_BRANCH, &_tmp18_, NULL, FALSE);
-#line 541 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self);
-#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = branch;
-#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("show-branch", SIDEBAR_TYPE_BRANCH, &_tmp20_, NULL, FALSE);
-#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _sidebar_tree_on_show_branch_sidebar_branch_show_branch, self);
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = self->priv->branches;
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = branch;
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, NULL);
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	removed = _tmp23_;
-#line 545 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (removed, "removed");
-#line 547 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 540 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = branch;
-#line 547 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 540 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "branch-removed", _tmp24_);
-#line 3672 "Tree.c"
+#line 3538 "Tree.c"
 }
 
 
@@ -3680,39 +3546,39 @@ static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch*
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	SidebarTreeRootWrapper* _tmp4_ = NULL;
 	SidebarTreeRootWrapper* _tmp5_ = NULL;
-#line 550 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 550 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_branch_get_root (_tmp0_);
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_);
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp3_) : NULL;
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ == NULL) {
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_tmp3_);
-#line 3702 "Tree.c"
+#line 3568 "Tree.c"
 	}
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp2_);
-#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	root_wrapper = _tmp5_;
-#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 545 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (root_wrapper != NULL, "root_wrapper != null");
-#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 547 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_disassociate_wrapper_and_signal (self, G_TYPE_CHECK_INSTANCE_CAST (root_wrapper, SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, SidebarTreeEntryWrapper), FALSE);
-#line 550 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (root_wrapper);
-#line 3716 "Tree.c"
+#line 3582 "Tree.c"
 }
 
 
@@ -3724,54 +3590,54 @@ static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, Sid
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
-#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = wrapper;
-#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->entry;
-#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_tree_is_selected (self, _tmp1_);
-#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selected = _tmp2_;
-#line 562 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 562 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = only_children;
-#line 562 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_disassociate_wrapper (self, _tmp3_, _tmp4_);
-#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = selected;
-#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_) {
-#line 3750 "Tree.c"
+#line 3616 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
 		SidebarTreeEntryWrapper* _tmp6_ = NULL;
 		SidebarEntry* _tmp7_ = NULL;
 		SidebarSelectableEntry* _tmp8_ = NULL;
 		SidebarSelectableEntry* _tmp9_ = NULL;
 		SidebarSelectableEntry* _tmp10_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = wrapper;
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp6_->entry;
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp7_) : NULL);
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selectable = _tmp8_;
-#line 566 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = selectable;
-#line 566 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp9_ != NULL, "selectable != null");
-#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 561 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = selectable;
-#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 561 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_emit_by_name (self, "selected-entry-removed", _tmp10_);
-#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 3775 "Tree.c"
+#line 3641 "Tree.c"
 	}
 }
 
@@ -3819,29 +3685,29 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 	SidebarEntry* _tmp58_ = NULL;
 	gboolean _tmp59_ = FALSE;
 	gboolean _tmp60_ = FALSE;
-#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
-#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 566 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gee_array_list_new (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 566 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp0_;
-#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
-#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp2_, &_tmp3_);
-#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp4_, &_tmp3_);
-#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	child_iter = _tmp4_;
-#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	found = _tmp5_;
-#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 3845 "Tree.c"
+#line 3711 "Tree.c"
 		gboolean _tmp6_ = FALSE;
 		SidebarTreeEntryWrapper* child_wrapper = NULL;
 		GtkTreeIter _tmp7_ = {0};
@@ -3851,39 +3717,39 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 		SidebarTreeEntryWrapper* _tmp11_ = NULL;
 		GtkTreeStore* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
-#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = found;
-#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp6_) {
-#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 3861 "Tree.c"
+#line 3727 "Tree.c"
 		}
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = child_iter;
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_);
-#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		child_wrapper = _tmp8_;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = child_wrapper;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp9_ != NULL, "child_wrapper != null");
-#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = children;
-#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = child_wrapper;
-#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp11_);
-#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = self->priv->store;
-#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &child_iter);
-#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		found = _tmp13_;
-#line 577 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (child_wrapper);
-#line 3887 "Tree.c"
+#line 3753 "Tree.c"
 	}
 	{
 		GeeArrayList* _child_wrapper_list = NULL;
@@ -3894,25 +3760,25 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 		gint _tmp17_ = 0;
 		gint _tmp18_ = 0;
 		gint _child_wrapper_index = 0;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = children;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_list = _tmp15_;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = _child_wrapper_list;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp18_ = _tmp17_;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_size = _tmp18_;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_index = -1;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 3916 "Tree.c"
+#line 3782 "Tree.c"
 			gint _tmp19_ = 0;
 			gint _tmp20_ = 0;
 			gint _tmp21_ = 0;
@@ -3921,188 +3787,188 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 			gint _tmp23_ = 0;
 			gpointer _tmp24_ = NULL;
 			SidebarTreeEntryWrapper* _tmp25_ = NULL;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _child_wrapper_index;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_child_wrapper_index = _tmp19_ + 1;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = _child_wrapper_index;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = _child_wrapper_size;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (!(_tmp20_ < _tmp21_)) {
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 3937 "Tree.c"
+#line 3803 "Tree.c"
 			}
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = _child_wrapper_list;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = _child_wrapper_index;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp24_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp23_);
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child_wrapper = (SidebarTreeEntryWrapper*) _tmp24_;
-#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = child_wrapper;
-#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_disassociate_wrapper (self, _tmp25_, FALSE);
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child_wrapper);
-#line 3953 "Tree.c"
+#line 3819 "Tree.c"
 		}
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_wrapper_list);
-#line 3957 "Tree.c"
+#line 3823 "Tree.c"
 	}
-#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = only_children;
-#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp26_) {
-#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
-#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 3967 "Tree.c"
+#line 3833 "Tree.c"
 	}
-#line 592 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = wrapper;
-#line 592 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp27_, &_tmp28_);
-#line 592 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp28_;
-#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = self->priv->store;
-#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_remove (_tmp29_, &iter);
-#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = self->priv->selected_wrapper;
-#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = wrapper;
-#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp30_ == _tmp31_) {
-#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->selected_wrapper = NULL;
-#line 3987 "Tree.c"
+#line 3853 "Tree.c"
 	}
-#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = wrapper;
-#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = _tmp32_->entry;
-#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry = _tmp34_;
-#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp35_ = entry;
-#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_entry_pruned (_tmp35_, self);
-#line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = entry;
-#line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("sidebar-tooltip-changed", SIDEBAR_TYPE_ENTRY, &_tmp37_, NULL, FALSE);
-#line 602 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp36_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp37_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self);
-#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = entry;
-#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("sidebar-icon-changed", SIDEBAR_TYPE_ENTRY, &_tmp39_, NULL, FALSE);
-#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (_tmp38_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp39_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed, self);
-#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = entry;
-#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, SIDEBAR_TYPE_PAGE_REPRESENTATIVE) ? ((SidebarPageRepresentative*) _tmp40_) : NULL);
-#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pageable = _tmp41_;
-#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp42_ = pageable;
-#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp42_ != NULL) {
-#line 4023 "Tree.c"
+#line 3889 "Tree.c"
 		SidebarPageRepresentative* _tmp43_ = NULL;
 		guint _tmp44_ = 0U;
 		SidebarPageRepresentative* _tmp45_ = NULL;
 		guint _tmp46_ = 0U;
-#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = pageable;
-#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp44_, NULL, FALSE);
-#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp43_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self);
-#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 601 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp45_ = pageable;
-#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 601 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp46_, NULL, FALSE);
-#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 601 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp45_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp46_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page, self);
-#line 4040 "Tree.c"
+#line 3906 "Tree.c"
 	}
-#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp47_ = entry;
-#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp47_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp47_) : NULL);
-#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp48_;
-#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp49_ = renameable;
-#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp49_ != NULL) {
-#line 4052 "Tree.c"
+#line 3918 "Tree.c"
 		SidebarRenameableEntry* _tmp50_ = NULL;
 		guint _tmp51_ = 0U;
-#line 613 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp50_ = renameable;
-#line 613 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, &_tmp51_, NULL, FALSE);
-#line 613 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp50_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp51_, 0, NULL, (GCallback) _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed, self);
-#line 4061 "Tree.c"
+#line 3927 "Tree.c"
 	}
-#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp52_ = entry;
-#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp52_, SIDEBAR_TYPE_EMPHASIZABLE_ENTRY) ? ((SidebarEmphasizableEntry*) _tmp52_) : NULL);
-#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	emphasizable = _tmp53_;
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp54_ = emphasizable;
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp54_ != NULL) {
-#line 4073 "Tree.c"
+#line 3939 "Tree.c"
 		SidebarEmphasizableEntry* _tmp55_ = NULL;
 		guint _tmp56_ = 0U;
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp55_ = emphasizable;
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, &_tmp56_, NULL, FALSE);
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_handlers_disconnect_matched (_tmp55_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp56_, 0, NULL, (GCallback) _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed, self);
-#line 4082 "Tree.c"
+#line 3948 "Tree.c"
 	}
-#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp57_ = self->priv->entry_map;
-#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = entry;
-#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp59_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp58_, NULL);
-#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	removed = _tmp59_;
-#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 613 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp60_ = removed;
-#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 613 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp60_, "removed");
-#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable);
-#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (pageable);
-#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 4106 "Tree.c"
+#line 3972 "Tree.c"
 }
 
 
@@ -4129,47 +3995,47 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 	GtkTreeIter _tmp27_ = {0};
 	SidebarBranch* _tmp28_ = NULL;
 	gboolean _tmp29_ = FALSE;
-#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_branch_get_parent (_tmp0_, _tmp1_);
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent = _tmp2_;
-#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = parent;
-#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp3_ != NULL, "parent != null");
-#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = parent;
-#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = sidebar_tree_get_wrapper (self, _tmp4_);
-#line 627 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent_wrapper = _tmp5_;
-#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 621 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = parent_wrapper;
-#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 621 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp6_ != NULL, "parent_wrapper != null");
-#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = branch;
-#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = entry;
-#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = sidebar_branch_get_next_sibling (_tmp7_, _tmp8_);
-#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	next = _tmp9_;
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = next;
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp10_ != NULL) {
-#line 4173 "Tree.c"
+#line 4039 "Tree.c"
 		SidebarTreeEntryWrapper* next_wrapper = NULL;
 		SidebarEntry* _tmp11_ = NULL;
 		SidebarTreeEntryWrapper* _tmp12_ = NULL;
@@ -4179,81 +4045,81 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 		SidebarTreeEntryWrapper* _tmp16_ = NULL;
 		GtkTreeIter _tmp17_ = {0};
 		GtkTreeIter _tmp18_ = {0};
-#line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 626 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = next;
-#line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 626 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = sidebar_tree_get_wrapper (self, _tmp11_);
-#line 633 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 626 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		next_wrapper = _tmp12_;
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = self->priv->store;
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = parent_wrapper;
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_);
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = next_wrapper;
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp16_, &_tmp17_);
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_store_insert_before (_tmp13_, &_tmp18_, &_tmp15_, &_tmp17_);
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp18_;
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (next_wrapper);
-#line 4205 "Tree.c"
+#line 4071 "Tree.c"
 	} else {
 		GtkTreeStore* _tmp19_ = NULL;
 		SidebarTreeEntryWrapper* _tmp20_ = NULL;
 		GtkTreeIter _tmp21_ = {0};
 		GtkTreeIter _tmp22_ = {0};
-#line 639 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp19_ = self->priv->store;
-#line 639 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = parent_wrapper;
-#line 639 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp20_, &_tmp21_);
-#line 639 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_store_append (_tmp19_, &_tmp22_, &_tmp21_);
-#line 639 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp22_;
-#line 4221 "Tree.c"
+#line 4087 "Tree.c"
 	}
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = insertion_iter;
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = entry;
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_entry (self, &_tmp23_, _tmp24_);
-#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = branch;
-#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = entry;
-#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = insertion_iter;
-#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_children (self, _tmp25_, _tmp26_, &_tmp27_);
-#line 645 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp28_ = branch;
-#line 645 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = sidebar_branch_is_auto_open_on_new_child (_tmp28_);
-#line 645 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp29_) {
-#line 4243 "Tree.c"
+#line 4109 "Tree.c"
 		SidebarEntry* _tmp30_ = NULL;
-#line 646 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 639 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = entry;
-#line 646 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 639 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_expand_to_entry (self, _tmp30_);
-#line 4249 "Tree.c"
+#line 4115 "Tree.c"
 	}
-#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (next);
-#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent_wrapper);
-#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent);
-#line 4257 "Tree.c"
+#line 4123 "Tree.c"
 }
 
 
@@ -4261,27 +4127,27 @@ static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBran
 	SidebarTreeEntryWrapper* wrapper = NULL;
 	SidebarEntry* _tmp0_ = NULL;
 	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 644 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 645 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (wrapper, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
-#line 654 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 647 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_disassociate_wrapper_and_signal (self, wrapper, FALSE);
-#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4285 "Tree.c"
+#line 4151 "Tree.c"
 }
 
 
@@ -4302,41 +4168,41 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
 	GtkTreeIter _tmp15_ = {0};
 	GtkTreeStore* _tmp16_ = NULL;
 	GtkTreeIter* _tmp17_ = NULL;
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_ != NULL, "wrapper != null");
-#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 653 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 653 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
-#line 663 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev_iter = NULL;
-#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = branch;
-#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = entry;
-#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = sidebar_branch_get_previous_sibling (_tmp4_, _tmp5_);
-#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev = _tmp6_;
-#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = prev;
-#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_ != NULL) {
-#line 4340 "Tree.c"
+#line 4206 "Tree.c"
 		SidebarTreeEntryWrapper* prev_wrapper = NULL;
 		SidebarEntry* _tmp8_ = NULL;
 		SidebarTreeEntryWrapper* _tmp9_ = NULL;
@@ -4344,49 +4210,49 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
 		SidebarTreeEntryWrapper* _tmp11_ = NULL;
 		GtkTreeIter _tmp12_ = {0};
 		GtkTreeIter* _tmp13_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = prev;
-#line 666 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = sidebar_tree_get_wrapper (self, _tmp8_);
-#line 666 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_wrapper = _tmp9_;
-#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = prev_wrapper;
-#line 667 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp10_ != NULL, "prev_wrapper != null");
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = prev_wrapper;
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = __gtk_tree_iter_dup0 (&_tmp12_);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (prev_iter);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_iter = _tmp13_;
-#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (prev_wrapper);
-#line 4370 "Tree.c"
+#line 4236 "Tree.c"
 	}
-#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = wrapper;
-#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_);
-#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry_iter = _tmp15_;
-#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 666 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = self->priv->store;
-#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 666 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = prev_iter;
-#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 666 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_move_after (_tmp16_, &entry_iter, _tmp17_);
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (prev);
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (prev_iter);
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4390 "Tree.c"
+#line 4256 "Tree.c"
 }
 
 
@@ -4434,95 +4300,95 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 	SidebarTreeEntryWrapper* _tmp37_ = NULL;
 	SidebarTreeEntryWrapper* _tmp38_ = NULL;
 	gboolean _tmp39_ = FALSE;
-#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (old_parent));
-#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_ != NULL, "wrapper != null");
-#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER), "!(wrapper is RootWrapper)");
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_get_current_path (self);
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_);
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_;
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = gtk_tree_path_compare (_tmp5_, _tmp8_);
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = _tmp9_ == 0;
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp8_);
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp5_);
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selected = _tmp10_;
-#line 685 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = wrapper;
-#line 685 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_);
-#line 685 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp12_;
-#line 686 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->store;
-#line 686 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_remove (_tmp13_, &iter);
-#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = branch;
-#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = entry;
-#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = sidebar_branch_get_parent (_tmp14_, _tmp15_);
-#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent = _tmp16_;
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = parent;
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp17_ != NULL, "parent != null");
-#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = parent;
-#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = sidebar_tree_get_wrapper (self, _tmp18_);
-#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent_wrapper = _tmp19_;
-#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 685 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = parent_wrapper;
-#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 685 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp20_ != NULL, "parent_wrapper != null");
-#line 695 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev_iter = NULL;
-#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = branch;
-#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = entry;
-#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = sidebar_branch_get_previous_sibling (_tmp21_, _tmp22_);
-#line 696 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev = _tmp23_;
-#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = prev;
-#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp24_ != NULL) {
-#line 4526 "Tree.c"
+#line 4392 "Tree.c"
 		SidebarTreeEntryWrapper* prev_wrapper = NULL;
 		SidebarEntry* _tmp25_ = NULL;
 		SidebarTreeEntryWrapper* _tmp26_ = NULL;
@@ -4530,86 +4396,86 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 		SidebarTreeEntryWrapper* _tmp28_ = NULL;
 		GtkTreeIter _tmp29_ = {0};
 		GtkTreeIter* _tmp30_ = NULL;
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = prev;
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = sidebar_tree_get_wrapper (self, _tmp25_);
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_wrapper = _tmp26_;
-#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp27_ = prev_wrapper;
-#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp27_ != NULL, "prev_wrapper != null");
-#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = prev_wrapper;
-#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp28_, &_tmp29_);
-#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = __gtk_tree_iter_dup0 (&_tmp29_);
-#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (prev_iter);
-#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_iter = _tmp30_;
-#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (prev_wrapper);
-#line 4556 "Tree.c"
+#line 4422 "Tree.c"
 	}
-#line 705 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = self->priv->store;
-#line 705 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = parent_wrapper;
-#line 705 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp32_, &_tmp33_);
-#line 705 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = prev_iter;
-#line 705 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_insert_after (_tmp31_, &_tmp35_, &_tmp33_, _tmp34_);
-#line 705 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_iter = _tmp35_;
-#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = new_iter;
-#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = wrapper;
-#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = sidebar_tree_reparent_wrapper (self, &_tmp36_, _tmp37_);
-#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_wrapper = _tmp38_;
-#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = selected;
-#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp39_) {
-#line 4582 "Tree.c"
+#line 4448 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp40_ = NULL;
 		SidebarEntry* _tmp41_ = NULL;
 		SidebarTreeEntryWrapper* _tmp42_ = NULL;
 		SidebarEntry* _tmp43_ = NULL;
-#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp40_ = new_wrapper;
-#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp41_ = _tmp40_->entry;
-#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_expand_to_entry (self, _tmp41_);
-#line 711 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 704 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp42_ = new_wrapper;
-#line 711 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 704 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = _tmp42_->entry;
-#line 711 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 704 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_place_cursor (self, _tmp43_, FALSE);
-#line 4599 "Tree.c"
+#line 4465 "Tree.c"
 	}
-#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (new_wrapper);
-#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (prev);
-#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (prev_iter);
-#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent_wrapper);
-#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent);
-#line 676 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4613 "Tree.c"
+#line 4479 "Tree.c"
 }
 
 
@@ -4619,29 +4485,29 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 	SidebarEntry* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
 	GeeList* _tmp3_ = NULL;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_);
-#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp2_;
-#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = children;
-#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 711 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
-#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 711 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4645 "Tree.c"
+#line 4511 "Tree.c"
 	}
 	{
 		GeeList* _child_list = NULL;
@@ -4652,25 +4518,25 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 		gint _tmp7_ = 0;
 		gint _tmp8_ = 0;
 		gint _child_index = 0;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = children;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_list = _tmp5_;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _child_list;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp7_;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_size = _tmp8_;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_index = -1;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 4674 "Tree.c"
+#line 4540 "Tree.c"
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
@@ -4686,61 +4552,61 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 			SidebarTreeEntryWrapper* _tmp18_ = NULL;
 			GtkTreeIter _tmp19_ = {0};
 			GtkTreeStore* _tmp20_ = NULL;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = _child_index;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_child_index = _tmp9_ + 1;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _child_index;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = _child_size;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (!(_tmp10_ < _tmp11_)) {
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 4702 "Tree.c"
+#line 4568 "Tree.c"
 			}
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _child_list;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = _child_index;
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child = (SidebarEntry*) _tmp14_;
-#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = child;
-#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = sidebar_tree_get_wrapper (self, _tmp15_);
-#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child_wrapper = _tmp16_;
-#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = child_wrapper;
-#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_vala_assert (_tmp17_ != NULL, "child_wrapper != null");
-#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = child_wrapper;
-#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_entry_wrapper_get_iter (_tmp18_, &_tmp19_);
-#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child_iter = _tmp19_;
-#line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 720 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = self->priv->store;
-#line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 720 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_store_move_before (_tmp20_, &child_iter, NULL);
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child_wrapper);
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child);
-#line 4736 "Tree.c"
+#line 4602 "Tree.c"
 		}
-#line 722 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_list);
-#line 4740 "Tree.c"
+#line 4606 "Tree.c"
 	}
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 4744 "Tree.c"
+#line 4610 "Tree.c"
 }
 
 
@@ -4748,36 +4614,36 @@ static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branc
 	gboolean _tmp0_ = FALSE;
 	SidebarBranch* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 731 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = shown;
-#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_) {
-#line 4760 "Tree.c"
+#line 4626 "Tree.c"
 		SidebarBranch* _tmp1_ = NULL;
-#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = branch;
-#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_associate_branch (self, _tmp1_);
-#line 4766 "Tree.c"
+#line 4632 "Tree.c"
 	} else {
 		SidebarBranch* _tmp2_ = NULL;
-#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = branch;
-#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_disassociate_branch (self, _tmp2_);
-#line 4773 "Tree.c"
+#line 4639 "Tree.c"
 	}
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 730 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = branch;
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 730 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = shown;
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 730 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "branch-shown", _tmp3_, _tmp4_);
-#line 4781 "Tree.c"
+#line 4647 "Tree.c"
 }
 
 
@@ -4790,35 +4656,35 @@ static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarE
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 742 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->store;
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = tooltip;
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = guarded_markup_escape_text (_tmp4_);
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp6_, -1);
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp6_);
-#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4822 "Tree.c"
+#line 4688 "Tree.c"
 }
 
 
@@ -4829,29 +4695,29 @@ static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntr
 	GtkTreeStore* _tmp2_ = NULL;
 	GtkTreeIter _tmp3_ = {0};
 	const gchar* _tmp4_ = NULL;
-#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 742 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->store;
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = icon;
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_ICON, _tmp4_, -1);
-#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4855 "Tree.c"
+#line 4721 "Tree.c"
 }
 
 
@@ -4864,103 +4730,103 @@ static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarEntry* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 755 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 755 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 755 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 756 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->store;
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = entry;
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = sidebar_tree_get_name_for_entry (self, _tmp4_);
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_NAME, _tmp6_, -1);
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp6_);
-#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4896 "Tree.c"
+#line 4762 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntry* entry, const gchar* name) {
 	SidebarEntry* _tmp0_ = NULL;
-#line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (name != NULL);
-#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 755 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 755 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_rename_entry (self, _tmp0_);
-#line 4912 "Tree.c"
+#line 4778 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
 	SidebarPageRepresentative* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = page;
-#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "page-created", _tmp0_, _tmp1_);
-#line 4931 "Tree.c"
+#line 4797 "Tree.c"
 }
 
 
 static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmphasizableEntry* entry, gboolean is_emphasized) {
 	SidebarEmphasizableEntry* _tmp0_ = NULL;
-#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_EMPHASIZABLE_ENTRY (entry));
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_rename_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 4945 "Tree.c"
+#line 4811 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
 	SidebarPageRepresentative* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = page;
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "destroying-page", _tmp0_, _tmp1_);
-#line 4964 "Tree.c"
+#line 4830 "Tree.c"
 }
 
 
@@ -4976,47 +4842,47 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 	GtkTreeStore* _tmp6_ = NULL;
 	GtkTreeIter _tmp7_ = {0};
 	const gchar* _tmp8_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (iter != NULL);
-#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_);
-#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 780 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 780 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4998 "Tree.c"
+#line 4864 "Tree.c"
 	}
-#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->entry;
-#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = sidebar_entry_get_sidebar_icon (_tmp4_);
-#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	icon = _tmp5_;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->store;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = *iter;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = icon;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp6_, &_tmp7_, SIDEBAR_TREE_COLUMNS_ICON, _tmp8_, -1);
-#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (icon);
-#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 5020 "Tree.c"
+#line 4886 "Tree.c"
 }
 
 
@@ -5027,56 +4893,56 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
 	GtkTreeIter _tmp2_ = {0};
 	GtkTreeIter _tmp3_ = {0};
 	gboolean _tmp4_ = FALSE;
-#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (iter != NULL);
-#line 786 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 786 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_load_entry_icons (self, &_tmp0_);
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = *iter;
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = gtk_tree_model_iter_children (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp3_, &_tmp2_);
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	child_iter = _tmp3_;
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 5049 "Tree.c"
+#line 4915 "Tree.c"
 		{
 			gboolean _tmp5_ = FALSE;
-#line 790 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp5_ = TRUE;
-#line 790 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			while (TRUE) {
-#line 5056 "Tree.c"
+#line 4922 "Tree.c"
 				GtkTreeIter _tmp8_ = {0};
-#line 790 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (!_tmp5_) {
-#line 5060 "Tree.c"
+#line 4926 "Tree.c"
 					GtkTreeStore* _tmp6_ = NULL;
 					gboolean _tmp7_ = FALSE;
-#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp6_ = self->priv->store;
-#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp7_ = gtk_tree_model_iter_next (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &child_iter);
-#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					if (!_tmp7_) {
-#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 						break;
-#line 5071 "Tree.c"
+#line 4937 "Tree.c"
 					}
 				}
-#line 790 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp5_ = FALSE;
-#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp8_ = child_iter;
-#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				sidebar_tree_load_branch_icons (self, &_tmp8_);
-#line 5080 "Tree.c"
+#line 4946 "Tree.c"
 			}
 		}
 	}
@@ -5090,46 +4956,46 @@ static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection*
 	SidebarTreeEntryWrapper* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), FALSE);
-#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 801 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 801 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ != NULL) {
-#line 5112 "Tree.c"
+#line 4978 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp4_ = NULL;
 		SidebarEntry* _tmp5_ = NULL;
-#line 801 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = wrapper;
-#line 801 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp4_->entry;
-#line 801 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 5121 "Tree.c"
+#line 4987 "Tree.c"
 	} else {
-#line 801 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 5125 "Tree.c"
+#line 4991 "Tree.c"
 	}
-#line 801 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp2_;
-#line 801 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 801 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5133 "Tree.c"
+#line 4999 "Tree.c"
 }
 
 
@@ -5157,65 +5023,65 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven
 	gint _tmp13_ = 0;
 	gboolean _tmp14_ = FALSE;
 	GtkTreePath* _tmp16_ = NULL;
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, NULL);
-#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->window;
-#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_display_get_default ();
-#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = gdk_display_get_device_manager (_tmp2_);
-#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = gdk_device_manager_get_client_pointer (_tmp3_);
-#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gdk_window_get_device_position (_tmp1_, _tmp4_, &_tmp5_, &_tmp6_, &_tmp7_);
-#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	x = _tmp5_;
-#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	y = _tmp6_;
-#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	mask = _tmp7_;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = x;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = y;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = gtk_tree_view_get_path_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp9_, _tmp10_, &_tmp11_, NULL, &_tmp12_, &_tmp13_);
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp11_;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cell_x = _tmp12_;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cell_y = _tmp13_;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp14_) {
-#line 5199 "Tree.c"
+#line 5065 "Tree.c"
 		GtkTreePath* _tmp15_ = NULL;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = path;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp15_;
-#line 5205 "Tree.c"
+#line 5071 "Tree.c"
 	} else {
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = NULL;
-#line 5209 "Tree.c"
+#line 5075 "Tree.c"
 	}
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = _gtk_tree_path_copy0 (_tmp8_);
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp16_;
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5219 "Tree.c"
+#line 5085 "Tree.c"
 }
 
 
@@ -5234,74 +5100,74 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
 	GList* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
 	GtkTreePath* _tmp14_ = NULL;
-#line 815 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gtk_tree_selection_get_selected_rows (_tmp0_, &_tmp1_);
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _g_object_ref0 (_tmp1_);
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	model = _tmp3_;
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	rows = _tmp2_;
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = rows;
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = g_list_length (_tmp5_);
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == ((guint) 0)) {
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = TRUE;
-#line 5260 "Tree.c"
+#line 5126 "Tree.c"
 	} else {
 		GList* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = rows;
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = g_list_length (_tmp7_);
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = _tmp8_ == ((guint) 1);
-#line 5270 "Tree.c"
+#line 5136 "Tree.c"
 	}
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp4_, "rows.length() == 0 || rows.length() == 1");
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = rows;
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = g_list_length (_tmp10_);
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp11_ != ((guint) 0)) {
-#line 5280 "Tree.c"
+#line 5146 "Tree.c"
 		GList* _tmp12_ = NULL;
 		gconstpointer _tmp13_ = NULL;
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = rows;
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = g_list_nth_data (_tmp12_, (guint) 0);
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = (GtkTreePath*) _tmp13_;
-#line 5289 "Tree.c"
+#line 5155 "Tree.c"
 	} else {
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = NULL;
-#line 5293 "Tree.c"
+#line 5159 "Tree.c"
 	}
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = _gtk_tree_path_copy0 (_tmp9_);
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp14_;
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5305 "Tree.c"
+#line 5171 "Tree.c"
 }
 
 
@@ -5319,65 +5185,65 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
 	GtkTreePath* _tmp7_ = NULL;
 	GtkTreePath* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
-#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = gtk_tree_selection_get_selected_rows (_tmp0_, NULL);
-#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	rows = _tmp1_;
-#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = rows;
-#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5341 "Tree.c"
+#line 5207 "Tree.c"
 	}
-#line 828 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = rows;
-#line 828 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->data;
-#line 828 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _gtk_tree_path_copy0 ((GtkTreePath*) _tmp4_);
-#line 828 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp5_;
-#line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = path;
-#line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5363 "Tree.c"
+#line 5229 "Tree.c"
 	}
-#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = path;
-#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_scroll_to_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp7_, NULL, FALSE, (gfloat) 0, (gfloat) 0);
-#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = path;
-#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = sidebar_tree_popup_context_menu (self, _tmp8_, NULL);
-#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp9_;
-#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5381 "Tree.c"
+#line 5247 "Tree.c"
 }
 
 
@@ -5402,144 +5268,149 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 	GdkEventButton* _tmp13_ = NULL;
 	GtkMenu* _tmp14_ = NULL;
 	GtkMenu* _tmp15_ = NULL;
-	GdkEventButton* _tmp16_ = NULL;
-#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	GtkMenu* _tmp16_ = NULL;
+	GdkEventButton* _tmp17_ = NULL;
+#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 838 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 838 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 838 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5427 "Tree.c"
+#line 5294 "Tree.c"
 	}
-#line 842 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 842 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->entry;
-#line 842 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_CONTEXTABLE) ? ((SidebarContextable*) _tmp4_) : NULL);
-#line 842 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	contextable = _tmp5_;
-#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = contextable;
-#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (contextable);
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5449 "Tree.c"
+#line 5316 "Tree.c"
 	}
-#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = wrapper;
-#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_->entry;
-#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp8_) : NULL);
-#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selectable = _tmp9_;
-#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = selectable;
-#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp10_ != NULL) {
-#line 5463 "Tree.c"
+#line 5330 "Tree.c"
 		SidebarSelectableEntry* _tmp11_ = NULL;
-#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 842 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = selectable;
-#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 842 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_emit_by_name (self, "entry-selected", _tmp11_);
-#line 5469 "Tree.c"
+#line 5336 "Tree.c"
 	}
-#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = contextable;
-#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = event;
-#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = sidebar_contextable_get_sidebar_context_menu (_tmp12_, _tmp13_);
-#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	context_menu = _tmp14_;
-#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = context_menu;
-#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp15_ == NULL) {
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (context_menu);
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (contextable);
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5495 "Tree.c"
+#line 5362 "Tree.c"
 	}
-#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp16_ = event;
-#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	if (_tmp16_ != NULL) {
-#line 5501 "Tree.c"
-		GtkMenu* _tmp17_ = NULL;
-		GdkEventButton* _tmp18_ = NULL;
-		guint _tmp19_ = 0U;
-		GdkEventButton* _tmp20_ = NULL;
-		guint32 _tmp21_ = 0U;
-#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp17_ = context_menu;
-#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp18_ = event;
-#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp19_ = _tmp18_->button;
-#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp20_ = event;
-#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp21_ = _tmp20_->time;
-#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_menu_popup (_tmp17_, NULL, NULL, NULL, NULL, _tmp19_, _tmp21_);
-#line 5519 "Tree.c"
+#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp16_ = context_menu;
+#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	gtk_menu_attach_to_widget (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
+#line 850 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	_tmp17_ = event;
+#line 850 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	if (_tmp17_ != NULL) {
+#line 5372 "Tree.c"
+		GtkMenu* _tmp18_ = NULL;
+		GdkEventButton* _tmp19_ = NULL;
+		guint _tmp20_ = 0U;
+		GdkEventButton* _tmp21_ = NULL;
+		guint32 _tmp22_ = 0U;
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp18_ = context_menu;
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp19_ = event;
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp20_ = _tmp19_->button;
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp21_ = event;
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp22_ = _tmp21_->time;
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		gtk_menu_popup (_tmp18_, NULL, NULL, NULL, NULL, _tmp20_, _tmp22_);
+#line 5390 "Tree.c"
 	} else {
-		GtkMenu* _tmp22_ = NULL;
-		guint32 _tmp23_ = 0U;
-#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp22_ = context_menu;
-#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp23_ = gtk_get_current_event_time ();
-#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_menu_popup (_tmp22_, NULL, NULL, NULL, NULL, (guint) 0, _tmp23_);
-#line 5529 "Tree.c"
+		GtkMenu* _tmp23_ = NULL;
+		guint32 _tmp24_ = 0U;
+#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp23_ = context_menu;
+#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp24_ = gtk_get_current_event_time ();
+#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		gtk_menu_popup (_tmp23_, NULL, NULL, NULL, NULL, (guint) 0, _tmp24_);
+#line 5400 "Tree.c"
 	}
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (context_menu);
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selectable);
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (contextable);
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5543 "Tree.c"
+#line 5414 "Tree.c"
 }
 
 
@@ -5550,27 +5421,27 @@ static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkE
 	guint _tmp2_ = 0U;
 	GdkEventButton* _tmp3_ = NULL;
 	guint32 _tmp4_ = 0U;
-#line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 858 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->default_context_menu;
-#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = event;
-#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_->button;
-#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = event;
-#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->time;
-#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, _tmp2_, _tmp4_);
-#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5574 "Tree.c"
+#line 5445 "Tree.c"
 }
 
 
@@ -5587,129 +5458,129 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 	GtkTreePath* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
-#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 863 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 870 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 870 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_);
-#line 870 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5613 "Tree.c"
+#line 5484 "Tree.c"
 	}
-#line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->expander_called_manually;
-#line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 871 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	should_allow_toggle = _tmp3_;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 874 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = FALSE;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = path;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = gtk_tree_view_row_expanded (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp6_);
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 5627 "Tree.c"
+#line 5498 "Tree.c"
 		GtkTreeStore* _tmp8_ = NULL;
 		GtkTreeIter _tmp9_ = {0};
 		gboolean _tmp10_ = FALSE;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = self->priv->store;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = *iter;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = gtk_tree_model_iter_has_child (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_TREE_MODEL, GtkTreeModel), &_tmp9_);
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp10_;
-#line 5639 "Tree.c"
+#line 5510 "Tree.c"
 	} else {
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = FALSE;
-#line 5643 "Tree.c"
+#line 5514 "Tree.c"
 	}
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_) {
-#line 5647 "Tree.c"
+#line 5518 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp11_ = NULL;
 		SidebarEntry* _tmp12_ = NULL;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = wrapper;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = _tmp11_->entry;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 5656 "Tree.c"
+#line 5527 "Tree.c"
 	} else {
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = FALSE;
-#line 5660 "Tree.c"
+#line 5531 "Tree.c"
 	}
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 877 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 5664 "Tree.c"
+#line 5535 "Tree.c"
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
-#line 884 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = self->priv->expander_special_count;
-#line 884 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->expander_special_count = _tmp13_ + 1;
-#line 885 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = self->priv->expander_special_count;
-#line 885 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp14_ == 1) {
-#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			result = TRUE;
-#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return result;
-#line 5681 "Tree.c"
+#line 5552 "Tree.c"
 		} else {
 			gboolean _tmp15_ = FALSE;
-#line 890 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 885 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = should_allow_toggle;
-#line 890 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 885 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			should_allow_toggle = !_tmp15_;
-#line 5688 "Tree.c"
+#line 5559 "Tree.c"
 		}
 	} else {
-#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 889 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->expander_special_count = 0;
-#line 5693 "Tree.c"
+#line 5564 "Tree.c"
 	}
-#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 892 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = should_allow_toggle;
-#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 892 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp16_) {
-#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5705 "Tree.c"
+#line 5576 "Tree.c"
 	}
-#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 896 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5713 "Tree.c"
+#line 5584 "Tree.c"
 }
 
 
@@ -5726,120 +5597,120 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 	guint _tmp8_ = 0U;
 	GdkEventButton* _tmp58_ = NULL;
 	gboolean _tmp59_ = FALSE;
-#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 899 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 899 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_path_from_event (self, _tmp0_);
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp1_;
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = path;
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 5744 "Tree.c"
+#line 5615 "Tree.c"
 		GdkEventButton* _tmp4_ = NULL;
 		guint _tmp5_ = 0U;
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = event;
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp4_->button;
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp5_ != ((guint) 3);
-#line 5753 "Tree.c"
+#line 5624 "Tree.c"
 	} else {
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 5757 "Tree.c"
+#line 5628 "Tree.c"
 	}
-#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 903 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_) {
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = TRUE;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5767 "Tree.c"
+#line 5638 "Tree.c"
 	}
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = event;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_->button;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_ == ((guint) 3)) {
-#line 5775 "Tree.c"
+#line 5646 "Tree.c"
 		GdkEventButton* _tmp9_ = NULL;
 		GdkEventType _tmp10_ = 0;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = event;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = _tmp9_->type;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp10_ == GDK_BUTTON_PRESS;
-#line 5784 "Tree.c"
+#line 5655 "Tree.c"
 	} else {
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = FALSE;
-#line 5788 "Tree.c"
+#line 5659 "Tree.c"
 	}
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 907 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_) {
-#line 5792 "Tree.c"
+#line 5663 "Tree.c"
 		GtkTreePath* _tmp11_ = NULL;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = path;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ != NULL) {
-#line 5798 "Tree.c"
+#line 5669 "Tree.c"
 			GtkTreePath* _tmp12_ = NULL;
 			GdkEventButton* _tmp13_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = path;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = event;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_popup_context_menu (self, _tmp12_, _tmp13_);
-#line 5807 "Tree.c"
+#line 5678 "Tree.c"
 		} else {
 			GdkEventButton* _tmp14_ = NULL;
-#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = event;
-#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_popup_default_context_menu (self, _tmp14_);
-#line 5814 "Tree.c"
+#line 5685 "Tree.c"
 		}
 	} else {
 		gboolean _tmp15_ = FALSE;
 		GdkEventButton* _tmp16_ = NULL;
 		guint _tmp17_ = 0U;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = event;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp17_ = _tmp16_->button;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp17_ == ((guint) 1)) {
-#line 5826 "Tree.c"
+#line 5697 "Tree.c"
 			GdkEventButton* _tmp18_ = NULL;
 			GdkEventType _tmp19_ = 0;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = event;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _tmp18_->type;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = _tmp19_ == GDK_BUTTON_PRESS;
-#line 5835 "Tree.c"
+#line 5706 "Tree.c"
 		} else {
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = FALSE;
-#line 5839 "Tree.c"
+#line 5710 "Tree.c"
 		}
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp15_) {
-#line 5843 "Tree.c"
+#line 5714 "Tree.c"
 			GtkTreePath* _tmp20_ = NULL;
 			SidebarTreeEntryWrapper* wrapper = NULL;
 			GtkTreePath* _tmp23_ = NULL;
@@ -5857,226 +5728,226 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 			GtkTreeStore* _tmp55_ = NULL;
 			GtkTreePath* _tmp56_ = NULL;
 			GtkTreeRowReference* _tmp57_ = NULL;
-#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = path;
-#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp20_ == NULL) {
-#line 5865 "Tree.c"
+#line 5736 "Tree.c"
 				GdkEventButton* _tmp21_ = NULL;
 				gboolean _tmp22_ = FALSE;
-#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->old_path_ref = NULL;
-#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp21_ = event;
-#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp22_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp21_);
-#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp22_;
-#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5882 "Tree.c"
+#line 5753 "Tree.c"
 			}
-#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = path;
-#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp24_ = sidebar_tree_get_wrapper_at_path (self, _tmp23_);
-#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 919 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			wrapper = _tmp24_;
-#line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = wrapper;
-#line 926 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp25_ == NULL) {
-#line 5894 "Tree.c"
+#line 5765 "Tree.c"
 				GdkEventButton* _tmp26_ = NULL;
 				gboolean _tmp27_ = FALSE;
-#line 927 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 927 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->old_path_ref = NULL;
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp26_ = event;
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp27_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp26_);
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp27_;
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (wrapper);
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5913 "Tree.c"
+#line 5784 "Tree.c"
 			}
-#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 927 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp29_ = wrapper;
-#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 927 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp30_ = _tmp29_->entry;
-#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 927 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, SIDEBAR_TYPE_EXPANDABLE_ENTRY)) {
-#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 927 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp28_ = TRUE;
-#line 5923 "Tree.c"
+#line 5794 "Tree.c"
 			} else {
 				SidebarTreeEntryWrapper* _tmp31_ = NULL;
 				SidebarEntry* _tmp32_ = NULL;
-#line 933 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp31_ = wrapper;
-#line 933 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp32_ = _tmp31_->entry;
-#line 933 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY);
-#line 5933 "Tree.c"
+#line 5804 "Tree.c"
 			}
-#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 927 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp28_) {
-#line 5937 "Tree.c"
+#line 5808 "Tree.c"
 				GtkTreePath* _tmp33_ = NULL;
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp33_ = path;
-#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				sidebar_tree_toggle_branch_expansion (self, _tmp33_, FALSE);
-#line 5943 "Tree.c"
+#line 5814 "Tree.c"
 			}
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp36_ = self->priv->old_path_ref;
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp36_ != NULL) {
-#line 5949 "Tree.c"
+#line 5820 "Tree.c"
 				const GtkTreeRowReference* _tmp37_ = NULL;
 				GtkTreePath* _tmp38_ = NULL;
 				GtkTreePath* _tmp39_ = NULL;
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp37_ = self->priv->old_path_ref;
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp38_ = gtk_tree_row_reference_get_path (_tmp37_);
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp39_ = _tmp38_;
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp35_ = _tmp39_ != NULL;
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (_tmp39_);
-#line 5963 "Tree.c"
+#line 5834 "Tree.c"
 			} else {
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp35_ = FALSE;
-#line 5967 "Tree.c"
+#line 5838 "Tree.c"
 			}
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp35_) {
-#line 5971 "Tree.c"
+#line 5842 "Tree.c"
 				const GtkTreeRowReference* _tmp40_ = NULL;
 				GtkTreePath* _tmp41_ = NULL;
 				GtkTreePath* _tmp42_ = NULL;
 				GtkTreePath* _tmp43_ = NULL;
 				gint _tmp44_ = 0;
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp40_ = self->priv->old_path_ref;
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp41_ = gtk_tree_row_reference_get_path (_tmp40_);
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp42_ = _tmp41_;
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp43_ = path;
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp44_ = gtk_tree_path_compare (_tmp42_, _tmp43_);
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp34_ = _tmp44_ == 0;
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (_tmp42_);
-#line 5991 "Tree.c"
+#line 5862 "Tree.c"
 			} else {
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp34_ = FALSE;
-#line 5995 "Tree.c"
+#line 5866 "Tree.c"
 			}
-#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 934 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp34_) {
-#line 5999 "Tree.c"
+#line 5870 "Tree.c"
 				GtkCellRendererText* _tmp45_ = NULL;
 				GdkEventButton* _tmp46_ = NULL;
 				gboolean _tmp47_ = FALSE;
-#line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 938 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp45_ = self->priv->text_renderer;
-#line 943 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 938 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				g_object_set (_tmp45_, "editable", FALSE, NULL);
-#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp46_ = event;
-#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp47_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp46_);
-#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp47_;
-#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (wrapper);
-#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6019 "Tree.c"
+#line 5890 "Tree.c"
 			}
-#line 949 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = wrapper;
-#line 949 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp50_ = _tmp49_->entry;
-#line 949 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, SIDEBAR_TYPE_RENAMEABLE_ENTRY)) {
-#line 6027 "Tree.c"
+#line 5898 "Tree.c"
 				SidebarTreeEntryWrapper* _tmp51_ = NULL;
 				SidebarEntry* _tmp52_ = NULL;
 				gboolean _tmp53_ = FALSE;
-#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp51_ = wrapper;
-#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp52_ = _tmp51_->entry;
-#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp53_ = sidebar_renameable_entry_is_user_renameable (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, SIDEBAR_TYPE_RENAMEABLE_ENTRY, SidebarRenameableEntry));
-#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp48_ = _tmp53_;
-#line 6039 "Tree.c"
+#line 5910 "Tree.c"
 			} else {
-#line 949 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp48_ = FALSE;
-#line 6043 "Tree.c"
+#line 5914 "Tree.c"
 			}
-#line 949 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 944 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp48_) {
-#line 6047 "Tree.c"
+#line 5918 "Tree.c"
 				GtkCellRendererText* _tmp54_ = NULL;
-#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp54_ = self->priv->text_renderer;
-#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				g_object_set (_tmp54_, "editable", TRUE, NULL);
-#line 6053 "Tree.c"
+#line 5924 "Tree.c"
 			}
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp55_ = self->priv->store;
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp56_ = path;
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp57_ = gtk_tree_row_reference_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_TREE_MODEL, GtkTreeModel), _tmp56_);
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 950 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			self->priv->old_path_ref = _tmp57_;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 6067 "Tree.c"
+#line 5938 "Tree.c"
 		}
 	}
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 953 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = event;
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 953 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp59_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp58_);
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 953 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp59_;
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 953 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 953 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6080 "Tree.c"
+#line 5951 "Tree.c"
 }
 
 
@@ -6087,53 +5958,53 @@ gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* e
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 956 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 961 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 956 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _tmp2_;
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if ((((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("F2")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("Delete"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("Return"))))) || (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("KP_Enter"))))) {
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6117 "Tree.c"
+#line 5988 "Tree.c"
 			default:
 			{
-#line 967 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
-#line 967 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6124 "Tree.c"
+#line 5995 "Tree.c"
 			}
 		}
 	} else {
-#line 962 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6130 "Tree.c"
+#line 6001 "Tree.c"
 			default:
 			{
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 965 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = FALSE;
-#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 965 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6137 "Tree.c"
+#line 6008 "Tree.c"
 			}
 		}
 	}
@@ -6148,134 +6019,134 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 6160 "Tree.c"
+#line 6031 "Tree.c"
 	GdkEventKey* _tmp15_ = NULL;
 	gboolean _tmp16_ = FALSE;
-#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 969 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _tmp2_;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if ((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Return")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("KP_Enter"))))) {
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6181 "Tree.c"
+#line 6052 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
 				GtkTreePath* _tmp6_ = NULL;
 				GtkTreePath* _tmp7_ = NULL;
-#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp6_ = sidebar_tree_get_current_path (self);
-#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 973 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				path = _tmp6_;
-#line 979 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp7_ = path;
-#line 979 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp7_ != NULL) {
-#line 6195 "Tree.c"
+#line 6066 "Tree.c"
 					GtkTreePath* _tmp8_ = NULL;
-#line 980 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp8_ = path;
-#line 980 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					sidebar_tree_toggle_branch_expansion (self, _tmp8_, FALSE);
-#line 6201 "Tree.c"
+#line 6072 "Tree.c"
 				}
-#line 982 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 977 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
-#line 982 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 977 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 982 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 977 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6209 "Tree.c"
+#line 6080 "Tree.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("F2")))) {
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6215 "Tree.c"
+#line 6086 "Tree.c"
 			default:
 			{
 				gboolean _tmp9_ = FALSE;
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 980 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp9_ = sidebar_tree_rename_in_place (self);
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 980 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp9_;
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 980 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6225 "Tree.c"
+#line 6096 "Tree.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("Delete")))) {
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6231 "Tree.c"
+#line 6102 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
 				GtkTreePath* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
 				GtkTreePath* _tmp12_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 983 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp10_ = sidebar_tree_get_current_path (self);
-#line 988 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 983 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				path = _tmp10_;
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp12_ = path;
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp12_ != NULL) {
-#line 6246 "Tree.c"
+#line 6117 "Tree.c"
 					GtkTreePath* _tmp13_ = NULL;
 					gboolean _tmp14_ = FALSE;
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp13_ = path;
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp14_ = sidebar_tree_destroy_path (self, _tmp13_);
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp11_ = _tmp14_;
-#line 6255 "Tree.c"
+#line 6126 "Tree.c"
 				} else {
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp11_ = FALSE;
-#line 6259 "Tree.c"
+#line 6130 "Tree.c"
 				}
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp11_;
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6267 "Tree.c"
+#line 6138 "Tree.c"
 			}
 		}
 	}
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 988 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = event;
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 988 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = GTK_WIDGET_CLASS (sidebar_tree_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp15_);
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 988 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp16_;
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 988 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6279 "Tree.c"
+#line 6150 "Tree.c"
 }
 
 
@@ -6286,41 +6157,41 @@ gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* en
 	SidebarEntry* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 991 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 991 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_);
-#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp1_) {
-#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6304 "Tree.c"
+#line 6175 "Tree.c"
 	}
-#line 1000 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 995 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 1000 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 995 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_place_cursor (self, _tmp2_, FALSE);
-#line 1000 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 995 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp3_) {
-#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6316 "Tree.c"
+#line 6187 "Tree.c"
 	}
-#line 1003 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_rename_in_place (self);
-#line 1003 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp4_;
-#line 1003 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6324 "Tree.c"
+#line 6195 "Tree.c"
 }
 
 
@@ -6333,57 +6204,57 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
 	GtkTreeViewColumn* _tmp2_ = NULL;
 	GtkTreePath* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1001 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_get_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), &_tmp0_, &_tmp1_);
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (cursor_path);
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cursor_path = _tmp0_;
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (cursor_column);
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1004 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cursor_column = _tmp2_;
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = cursor_path;
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_can_rename_path (self, _tmp3_);
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 6357 "Tree.c"
+#line 6228 "Tree.c"
 		GtkTreePath* _tmp5_ = NULL;
 		GtkTreeViewColumn* _tmp6_ = NULL;
 		GtkCellRendererText* _tmp7_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = cursor_path;
-#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = cursor_column;
-#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = self->priv->text_renderer;
-#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_set_cursor_on_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_, _tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = TRUE;
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (cursor_column);
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (cursor_path);
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6377 "Tree.c"
+#line 6248 "Tree.c"
 	}
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (cursor_column);
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (cursor_path);
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1012 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6387 "Tree.c"
+#line 6258 "Tree.c"
 }
 
 
@@ -6396,45 +6267,45 @@ gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	GtkTreePath* _tmp4_ = NULL;
 	GtkTreePath* _tmp5_ = NULL;
-#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1015 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1015 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6420 "Tree.c"
+#line 6291 "Tree.c"
 	}
-#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_view_scroll_to_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_, NULL, FALSE, (gfloat) 0, (gfloat) 0);
-#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp5_);
-#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6438 "Tree.c"
+#line 6309 "Tree.c"
 }
 
 
@@ -6445,55 +6316,55 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 	SidebarInternalDragSourceEntry* _tmp6_ = NULL;
 	SidebarInternalDragSourceEntry* _tmp16_ = NULL;
 	GtkSelectionData* _tmp17_ = NULL;
-#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	drag_source = NULL;
-#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1029 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->internal_drag_source_entry;
-#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1029 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ != NULL) {
-#line 6461 "Tree.c"
+#line 6332 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
 		SidebarEntry* _tmp1_ = NULL;
 		SidebarSelectableEntry* _tmp2_ = NULL;
 		SidebarSelectableEntry* _tmp3_ = NULL;
-#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->internal_drag_source_entry;
-#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, SIDEBAR_TYPE_SELECTABLE_ENTRY) ? ((SidebarSelectableEntry*) _tmp1_) : NULL);
-#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selectable = _tmp2_;
-#line 1037 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = selectable;
-#line 1037 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp3_ == NULL) {
-#line 6476 "Tree.c"
+#line 6347 "Tree.c"
 			SidebarEntry* _tmp4_ = NULL;
 			SidebarInternalDragSourceEntry* _tmp5_ = NULL;
-#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp4_ = self->priv->internal_drag_source_entry;
-#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_INTERNAL_DRAG_SOURCE_ENTRY) ? ((SidebarInternalDragSourceEntry*) _tmp4_) : NULL);
-#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			drag_source = _tmp5_;
-#line 6487 "Tree.c"
+#line 6358 "Tree.c"
 		}
-#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1029 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 6491 "Tree.c"
+#line 6362 "Tree.c"
 	}
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1037 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = drag_source;
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1037 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 6497 "Tree.c"
+#line 6368 "Tree.c"
 		GtkTreePath* selected_path = NULL;
 		GtkTreePath* _tmp7_ = NULL;
 		GtkTreePath* _tmp8_ = NULL;
@@ -6505,81 +6376,81 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 		SidebarEntry* _tmp13_ = NULL;
 		SidebarInternalDragSourceEntry* _tmp14_ = NULL;
 		SidebarInternalDragSourceEntry* _tmp15_ = NULL;
-#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = sidebar_tree_get_selected_path (self);
-#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selected_path = _tmp7_;
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = selected_path;
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp8_ == NULL) {
-#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6523 "Tree.c"
+#line 6394 "Tree.c"
 		}
-#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = selected_path;
-#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = sidebar_tree_get_wrapper_at_path (self, _tmp9_);
-#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		wrapper = _tmp10_;
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = wrapper;
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ == NULL) {
-#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6543 "Tree.c"
+#line 6414 "Tree.c"
 		}
-#line 1051 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = wrapper;
-#line 1051 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = _tmp12_->entry;
-#line 1051 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, SIDEBAR_TYPE_INTERNAL_DRAG_SOURCE_ENTRY) ? ((SidebarInternalDragSourceEntry*) _tmp13_) : NULL);
-#line 1051 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (drag_source);
-#line 1051 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		drag_source = _tmp14_;
-#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = drag_source;
-#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp15_ == NULL) {
-#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6567 "Tree.c"
+#line 6438 "Tree.c"
 		}
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1037 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1037 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (selected_path);
-#line 6573 "Tree.c"
+#line 6444 "Tree.c"
 	}
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1051 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = drag_source;
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1051 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = selection_data;
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1051 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_internal_drag_source_entry_prepare_selection_data (_tmp16_, _tmp17_);
-#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1025 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (drag_source);
-#line 6583 "Tree.c"
+#line 6454 "Tree.c"
 }
 
 
@@ -6612,87 +6483,87 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 	GdkDragContext* _tmp57_ = NULL;
 	gboolean _tmp58_ = FALSE;
 	guint _tmp59_ = 0U;
-#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = x;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = y;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp2_;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pos = _tmp3_;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp4_) {
-#line 6636 "Tree.c"
+#line 6507 "Tree.c"
 		GdkDragContext* _tmp5_ = NULL;
 		GtkWidget* _tmp6_ = NULL;
-#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = context;
-#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = gtk_drag_get_source_widget (_tmp5_);
-#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp6_ == NULL) {
-#line 6645 "Tree.c"
+#line 6516 "Tree.c"
 			SidebarTreeExternalDropHandler _tmp7_ = NULL;
 			void* _tmp7__target = NULL;
 			GdkDragContext* _tmp8_ = NULL;
 			GtkSelectionData* _tmp9_ = NULL;
 			guint _tmp10_ = 0U;
 			guint _tmp11_ = 0U;
-#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7_ = self->priv->drop_handler;
-#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7__target = self->priv->drop_handler_target;
-#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp8_ = context;
-#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = selection_data;
-#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = info;
-#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = time;
-#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7_ (_tmp8_, NULL, _tmp9_, _tmp10_, _tmp11_, _tmp7__target);
-#line 6666 "Tree.c"
+#line 6537 "Tree.c"
 		} else {
 			GdkDragContext* _tmp12_ = NULL;
 			guint _tmp13_ = 0U;
-#line 1069 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = context;
-#line 1069 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = time;
-#line 1069 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_drag_finish (_tmp12_, FALSE, FALSE, (guint32) _tmp13_);
-#line 6676 "Tree.c"
+#line 6547 "Tree.c"
 		}
-#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6682 "Tree.c"
+#line 6553 "Tree.c"
 	}
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = path;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = sidebar_tree_get_wrapper_at_path (self, _tmp14_);
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1070 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp15_;
-#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1073 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context;
-#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1073 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gtk_drag_get_source_widget (_tmp16_);
-#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1073 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp17_ == NULL) {
-#line 6696 "Tree.c"
+#line 6567 "Tree.c"
 		SidebarEntry* _tmp18_ = NULL;
 		SidebarTreeEntryWrapper* _tmp19_ = NULL;
 		SidebarTreeExternalDropHandler _tmp22_ = NULL;
@@ -6701,128 +6572,128 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		GtkSelectionData* _tmp24_ = NULL;
 		guint _tmp25_ = 0U;
 		guint _tmp26_ = 0U;
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp19_ = wrapper;
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp19_ != NULL) {
-#line 6709 "Tree.c"
+#line 6580 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp20_ = NULL;
 			SidebarEntry* _tmp21_ = NULL;
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = wrapper;
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = _tmp20_->entry;
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = _tmp21_;
-#line 6718 "Tree.c"
+#line 6589 "Tree.c"
 		} else {
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = NULL;
-#line 6722 "Tree.c"
+#line 6593 "Tree.c"
 		}
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = self->priv->drop_handler;
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22__target = self->priv->drop_handler_target;
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp23_ = context;
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp24_ = selection_data;
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = info;
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = time;
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ (_tmp23_, _tmp18_, _tmp24_, _tmp25_, _tmp26_, _tmp22__target);
-#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1077 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6744 "Tree.c"
+#line 6615 "Tree.c"
 	}
-#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1081 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = wrapper;
-#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1081 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp27_ == NULL) {
-#line 6750 "Tree.c"
+#line 6621 "Tree.c"
 		GdkDragContext* _tmp28_ = NULL;
 		guint _tmp29_ = 0U;
-#line 1087 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = context;
-#line 1087 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp29_ = time;
-#line 1087 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_drag_finish (_tmp28_, FALSE, FALSE, (guint32) _tmp29_);
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6765 "Tree.c"
+#line 6636 "Tree.c"
 	}
-#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1087 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = wrapper;
-#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1087 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = _tmp30_->entry;
-#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1087 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp31_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY) ? ((SidebarInternalDropTargetEntry*) _tmp31_) : NULL);
-#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1087 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	targetable = _tmp32_;
-#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = targetable;
-#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp33_ == NULL) {
-#line 6779 "Tree.c"
+#line 6650 "Tree.c"
 		GdkDragContext* _tmp34_ = NULL;
 		guint _tmp35_ = 0U;
-#line 1094 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp34_ = context;
-#line 1094 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp35_ = time;
-#line 1094 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_drag_finish (_tmp34_, FALSE, FALSE, (guint32) _tmp35_);
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (targetable);
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6796 "Tree.c"
+#line 6667 "Tree.c"
 	}
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1094 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	success = FALSE;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = selection_data;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = gtk_selection_data_get_data_type (_tmp36_);
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = gdk_atom_name (_tmp37_);
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = _tmp38_;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = g_strcmp0 (_tmp39_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp39_);
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp40_) {
-#line 6814 "Tree.c"
+#line 6685 "Tree.c"
 		SidebarInternalDropTargetEntry* _tmp41_ = NULL;
 		GtkSelectionData* _tmp42_ = NULL;
 		gboolean _tmp43_ = FALSE;
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp41_ = targetable;
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp42_ = selection_data;
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (_tmp41_, _tmp42_);
-#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		success = _tmp43_;
-#line 6826 "Tree.c"
+#line 6697 "Tree.c"
 	} else {
 		GeeList* media = NULL;
 		GtkSelectionData* _tmp44_ = NULL;
@@ -6832,75 +6703,75 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		GeeList* _tmp48_ = NULL;
 		gboolean _tmp49_ = FALSE;
 		GeeList* _tmp50_ = NULL;
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp44_ = selection_data;
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp45_ = gtk_selection_data_get_data (_tmp44_);
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp46_ = selection_data;
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp47_ = gtk_selection_data_get_length (_tmp46_);
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp48_ = unserialize_media_sources (_tmp45_, _tmp47_);
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		media = _tmp48_;
-#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp50_ = media;
-#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp50_ != NULL) {
-#line 6852 "Tree.c"
+#line 6723 "Tree.c"
 			GeeList* _tmp51_ = NULL;
 			gint _tmp52_ = 0;
 			gint _tmp53_ = 0;
-#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp51_ = media;
-#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp52_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp53_ = _tmp52_;
-#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = _tmp53_ > 0;
-#line 6864 "Tree.c"
+#line 6735 "Tree.c"
 		} else {
-#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = FALSE;
-#line 6868 "Tree.c"
+#line 6739 "Tree.c"
 		}
-#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp49_) {
-#line 6872 "Tree.c"
+#line 6743 "Tree.c"
 			SidebarInternalDropTargetEntry* _tmp54_ = NULL;
 			GeeList* _tmp55_ = NULL;
 			gboolean _tmp56_ = FALSE;
-#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp54_ = targetable;
-#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp55_ = media;
-#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp56_ = sidebar_internal_drop_target_entry_internal_drop_received (_tmp54_, _tmp55_);
-#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			success = _tmp56_;
-#line 6884 "Tree.c"
+#line 6755 "Tree.c"
 		}
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (media);
-#line 6888 "Tree.c"
+#line 6759 "Tree.c"
 	}
-#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp57_ = context;
-#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = success;
-#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp59_ = time;
-#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1105 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_drag_finish (_tmp57_, _tmp58_, FALSE, (guint32) _tmp59_);
-#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (targetable);
-#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1059 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1054 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 6904 "Tree.c"
+#line 6775 "Tree.c"
 }
 
 
@@ -6925,90 +6796,90 @@ static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext*
 	GdkDragContext* _tmp16_ = NULL;
 	GdkDragAction _tmp17_ = 0;
 	guint _tmp18_ = 0U;
-#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1108 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1113 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1108 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = context;
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = x;
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = y;
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = time;
-#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	GTK_WIDGET_CLASS (sidebar_tree_parent_class)->drag_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), gtk_widget_get_type (), GtkWidget), _tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = x;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = y;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = gtk_tree_view_get_dest_row_at_pos (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp4_, _tmp5_, &_tmp6_, &_tmp7_);
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp6_;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pos = _tmp7_;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1114 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	has_dest = _tmp8_;
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = has_dest;
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp10_) {
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = TRUE;
-#line 6963 "Tree.c"
+#line 6834 "Tree.c"
 	} else {
 		GtkTreeViewDropPosition _tmp11_ = 0;
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = pos;
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = _tmp11_ == GTK_TREE_VIEW_DROP_BEFORE;
-#line 6970 "Tree.c"
+#line 6841 "Tree.c"
 	}
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1117 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp9_) {
-#line 6974 "Tree.c"
+#line 6845 "Tree.c"
 		GtkTreePath* _tmp12_ = NULL;
-#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = path;
-#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp12_, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE);
-#line 6980 "Tree.c"
+#line 6851 "Tree.c"
 	} else {
 		GtkTreeViewDropPosition _tmp13_ = 0;
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = pos;
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp13_ == GTK_TREE_VIEW_DROP_AFTER) {
-#line 6987 "Tree.c"
+#line 6858 "Tree.c"
 			GtkTreePath* _tmp14_ = NULL;
-#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = path;
-#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_view_set_drag_dest_row (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp14_, GTK_TREE_VIEW_DROP_INTO_OR_AFTER);
-#line 6993 "Tree.c"
+#line 6864 "Tree.c"
 		}
 	}
-#line 1127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = context;
-#line 1127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context;
-#line 1127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gdk_drag_context_get_suggested_action (_tmp16_);
-#line 1127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = time;
-#line 1127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gdk_drag_status (_tmp15_, _tmp17_, (guint32) _tmp18_);
-#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = has_dest;
-#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7012 "Tree.c"
+#line 6883 "Tree.c"
 }
 
 
@@ -7028,91 +6899,91 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 	SidebarEntry* _tmp9_ = NULL;
 	GtkTreeSelection* _tmp10_ = NULL;
 	GtkTreePath* _tmp11_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1128 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->editing_disabled;
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ > 0) {
-#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7044 "Tree.c"
+#line 6915 "Tree.c"
 	}
-#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_tree_get_wrapper_at_path (self, _tmp1_);
-#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp2_;
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7062 "Tree.c"
+#line 6933 "Tree.c"
 	}
-#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = wrapper;
-#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_->entry;
-#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp5_) : NULL);
-#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp6_;
-#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = renameable;
-#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_ == NULL) {
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7084 "Tree.c"
+#line 6955 "Tree.c"
 	}
-#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = wrapper;
-#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = _tmp8_->entry;
-#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, SIDEBAR_TYPE_HEADER)) {
-#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7100 "Tree.c"
+#line 6971 "Tree.c"
 	}
-#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = path;
-#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_selection_select_path (_tmp10_, _tmp11_);
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7116 "Tree.c"
+#line 6987 "Tree.c"
 }
 
 
@@ -7128,121 +6999,121 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
 	SidebarDestroyableEntry* _tmp5_ = NULL;
 	SidebarDestroyableEntry* _tmp6_ = NULL;
 	SidebarDestroyableEntry* _tmp7_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1148 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7152 "Tree.c"
+#line 7023 "Tree.c"
 	}
-#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->entry;
-#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, SIDEBAR_TYPE_DESTROYABLE_ENTRY) ? ((SidebarDestroyableEntry*) _tmp4_) : NULL);
-#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	destroyable = _tmp5_;
-#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = destroyable;
-#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (destroyable);
-#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7174 "Tree.c"
+#line 7045 "Tree.c"
 	}
-#line 1162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = destroyable;
-#line 1162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_destroyable_entry_destroy_source (_tmp7_);
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (destroyable);
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7188 "Tree.c"
+#line 7059 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, gpointer self) {
-#line 1170 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_done ((SidebarTree*) self);
-#line 7195 "Tree.c"
+#line 7066 "Tree.c"
 }
 
 
 static gboolean _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = sidebar_tree_on_editing_focus_out ((SidebarTree*) self, event);
-#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7204 "Tree.c"
+#line 7075 "Tree.c"
 }
 
 
 static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* editable, const gchar* path) {
 	GtkCellEditable* _tmp0_ = NULL;
-#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GTK_IS_CELL_EDITABLE (editable));
-#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1162 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (path != NULL);
-#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = editable;
-#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_entry_get_type ())) {
-#line 7220 "Tree.c"
+#line 7091 "Tree.c"
 		GtkCellEditable* _tmp1_ = NULL;
 		GtkEntry* _tmp2_ = NULL;
 		GtkEntry* _tmp3_ = NULL;
 		GtkEntry* _tmp4_ = NULL;
 		GtkEntry* _tmp5_ = NULL;
-#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = editable;
-#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_entry_get_type (), GtkEntry));
-#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (self->priv->text_entry);
-#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->text_entry = _tmp2_;
-#line 1170 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = self->priv->text_entry;
-#line 1170 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), "editing-done", (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self, 0);
-#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = self->priv->text_entry;
-#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self, 0);
-#line 1172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->text_entry;
-#line 1172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_set (_tmp5_, "editable", TRUE, NULL);
-#line 7246 "Tree.c"
+#line 7117 "Tree.c"
 	}
 }
 
@@ -7253,25 +7124,25 @@ static void sidebar_tree_on_editing_canceled (SidebarTree* self) {
 	guint _tmp2_ = 0U;
 	GtkEntry* _tmp3_ = NULL;
 	guint _tmp4_ = 0U;
-#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1171 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->text_entry;
-#line 1177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_object_set (_tmp0_, "editable", FALSE, NULL);
-#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->text_entry;
-#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp2_, NULL, FALSE);
-#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self);
-#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->text_entry;
-#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self);
-#line 7275 "Tree.c"
+#line 7146 "Tree.c"
 }
 
 
@@ -7287,110 +7158,110 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 	guint _tmp14_ = 0U;
 	GtkEntry* _tmp15_ = NULL;
 	guint _tmp16_ = 0U;
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->text_entry;
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_object_set (_tmp0_, "editable", FALSE, NULL);
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_current_path (self);
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper_at_path (self, _tmp2_);
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp2_);
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp4_;
-#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ != NULL) {
-#line 7313 "Tree.c"
+#line 7184 "Tree.c"
 		SidebarRenameableEntry* renameable = NULL;
 		SidebarTreeEntryWrapper* _tmp6_ = NULL;
 		SidebarEntry* _tmp7_ = NULL;
 		SidebarRenameableEntry* _tmp8_ = NULL;
 		SidebarRenameableEntry* _tmp9_ = NULL;
-#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = wrapper;
-#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp6_->entry;
-#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, SIDEBAR_TYPE_RENAMEABLE_ENTRY) ? ((SidebarRenameableEntry*) _tmp7_) : NULL);
-#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		renameable = _tmp8_;
-#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = renameable;
-#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_ != NULL) {
-#line 7331 "Tree.c"
+#line 7202 "Tree.c"
 			SidebarRenameableEntry* _tmp10_ = NULL;
 			GtkEntry* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
-#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = renameable;
-#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = self->priv->text_entry;
-#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = gtk_entry_get_text (_tmp11_);
-#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_renameable_entry_rename (_tmp10_, _tmp12_);
-#line 7343 "Tree.c"
+#line 7214 "Tree.c"
 		}
-#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 7347 "Tree.c"
+#line 7218 "Tree.c"
 	}
-#line 1193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->text_entry;
-#line 1193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp14_, NULL, FALSE);
-#line 1193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1188 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self);
-#line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = self->priv->text_entry;
-#line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp16_, NULL, FALSE);
-#line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self);
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 7363 "Tree.c"
+#line 7234 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1192 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1192 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1196 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
-#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1196 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7377 "Tree.c"
+#line 7248 "Tree.c"
 }
 
 
 static void sidebar_tree_on_new_search (SidebarTree* self) {
 	SavedSearchDialog* _tmp0_ = NULL;
 	SavedSearchDialog* _tmp1_ = NULL;
-#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = saved_search_dialog_new ();
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_;
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	saved_search_dialog_show (_tmp1_);
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_saved_search_dialog_unref0 (_tmp1_);
-#line 7394 "Tree.c"
+#line 7265 "Tree.c"
 }
 
 
@@ -7403,37 +7274,37 @@ static void sidebar_tree_on_new_tag (SidebarTree* self) {
 	LibraryWindow* _tmp4_ = NULL;
 	Tag* _tmp5_ = NULL;
 	Tag* _tmp6_ = NULL;
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = new_root_tag_command_new ();
-#line 1209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	creation_command = _tmp0_;
-#line 1210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = app_window_get_command_manager ();
-#line 1210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 1210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (creation_command, TYPE_COMMAND, Command));
-#line 1210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_command_manager_unref0 (_tmp2_);
-#line 1211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = library_window_get_app ();
-#line 1211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 1211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = new_root_tag_command_get_created_tag (creation_command);
-#line 1211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 1211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	library_window_rename_tag_in_sidebar (_tmp4_, _tmp6_);
-#line 1211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (creation_command);
-#line 7437 "Tree.c"
+#line 7308 "Tree.c"
 }
 
 
@@ -7452,19 +7323,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_BOOLEAN (GClosure * closure, GV
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7456 "Tree.c"
+#line 7327 "Tree.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = closure->data;
-#line 7462 "Tree.c"
+#line 7333 "Tree.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_boolean (param_values + 2), data2);
-#line 7468 "Tree.c"
+#line 7339 "Tree.c"
 }
 
 
@@ -7483,19 +7354,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7487 "Tree.c"
+#line 7358 "Tree.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		data2 = closure->data;
-#line 7493 "Tree.c"
+#line 7364 "Tree.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 7499 "Tree.c"
+#line 7370 "Tree.c"
 }
 
 
@@ -7534,14 +7405,14 @@ static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_construct (GType obje
 	self->row = _tmp4_;
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 7538 "Tree.c"
+#line 7409 "Tree.c"
 }
 
 
 static SidebarTreeEntryWrapper* sidebar_tree_entry_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path) {
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_entry_wrapper_construct (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, model, entry, path);
-#line 7545 "Tree.c"
+#line 7416 "Tree.c"
 }
 
 
@@ -7559,7 +7430,7 @@ static GtkTreePath* sidebar_tree_entry_wrapper_get_path (SidebarTreeEntryWrapper
 	result = _tmp1_;
 #line 25 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7563 "Tree.c"
+#line 7434 "Tree.c"
 }
 
 
@@ -7599,7 +7470,7 @@ static void sidebar_tree_entry_wrapper_get_iter (SidebarTreeEntryWrapper* self,
 	*result = iter;
 #line 33 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return;
-#line 7603 "Tree.c"
+#line 7474 "Tree.c"
 }
 
 
@@ -7608,7 +7479,7 @@ static void sidebar_tree_entry_wrapper_class_init (SidebarTreeEntryWrapperClass
 	sidebar_tree_entry_wrapper_parent_class = g_type_class_peek_parent (klass);
 #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_tree_entry_wrapper_finalize;
-#line 7612 "Tree.c"
+#line 7483 "Tree.c"
 }
 
 
@@ -7626,7 +7497,7 @@ static void sidebar_tree_entry_wrapper_finalize (GObject* obj) {
 	_gtk_tree_row_reference_free0 (self->row);
 #line 15 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (sidebar_tree_entry_wrapper_parent_class)->finalize (obj);
-#line 7630 "Tree.c"
+#line 7501 "Tree.c"
 }
 
 
@@ -7668,14 +7539,14 @@ static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_construct (GType object
 	self->root_position = _tmp3_;
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self;
-#line 7672 "Tree.c"
+#line 7543 "Tree.c"
 }
 
 
 static SidebarTreeRootWrapper* sidebar_tree_root_wrapper_new (GtkTreeModel* model, SidebarEntry* entry, GtkTreePath* path, gint root_position) {
 #line 40 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return sidebar_tree_root_wrapper_construct (SIDEBAR_TREE_TYPE_ROOT_WRAPPER, model, entry, path, root_position);
-#line 7679 "Tree.c"
+#line 7550 "Tree.c"
 }
 
 
@@ -7684,7 +7555,7 @@ static void sidebar_tree_root_wrapper_class_init (SidebarTreeRootWrapperClass *
 	sidebar_tree_root_wrapper_parent_class = g_type_class_peek_parent (klass);
 #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (klass)->finalize = sidebar_tree_root_wrapper_finalize;
-#line 7688 "Tree.c"
+#line 7559 "Tree.c"
 }
 
 
@@ -7698,7 +7569,7 @@ static void sidebar_tree_root_wrapper_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TREE_TYPE_ROOT_WRAPPER, SidebarTreeRootWrapper);
 #line 37 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (sidebar_tree_root_wrapper_parent_class)->finalize (obj);
-#line 7702 "Tree.c"
+#line 7573 "Tree.c"
 }
 
 
@@ -7749,13 +7620,13 @@ static void sidebar_tree_class_init (SidebarTreeClass * klass) {
 	g_signal_new ("page_created", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_new ("destroying_page", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
-#line 7753 "Tree.c"
+#line 7624 "Tree.c"
 }
 
 
 static void sidebar_tree_instance_init (SidebarTree * self) {
 	GtkTreeStore* _tmp0_ = NULL;
-	GtkUIManager* _tmp1_ = NULL;
+	GtkBuilder* _tmp1_ = NULL;
 	GeeHashMap* _tmp2_ = NULL;
 	GeeHashMap* _tmp3_ = NULL;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7765,9 +7636,9 @@ static void sidebar_tree_instance_init (SidebarTree * self) {
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->store = _tmp0_;
 #line 62 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp1_ = gtk_ui_manager_new ();
+	_tmp1_ = gtk_builder_new ();
 #line 62 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	self->priv->ui = _tmp1_;
+	self->priv->builder = _tmp1_;
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->text_entry = NULL;
 #line 66 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7796,7 +7667,7 @@ static void sidebar_tree_instance_init (SidebarTree * self) {
 	self->priv->internal_drag_source_entry = NULL;
 #line 77 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->old_path_ref = NULL;
-#line 7800 "Tree.c"
+#line 7671 "Tree.c"
 }
 
 
@@ -7808,22 +7679,22 @@ static void sidebar_tree_finalize (GObject* obj) {
 	guint _tmp3_ = 0U;
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->text_renderer;
-#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-canceled", gtk_cell_renderer_get_type (), &_tmp1_, NULL, FALSE);
-#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_cell_renderer_get_type (), GtkCellRenderer), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _sidebar_tree_on_editing_canceled_gtk_cell_renderer_editing_canceled, self);
-#line 158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->text_renderer;
-#line 158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-started", gtk_cell_renderer_get_type (), &_tmp3_, NULL, FALSE);
-#line 158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_cell_renderer_get_type (), GtkCellRenderer), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _sidebar_tree_on_editing_started_gtk_cell_renderer_editing_started, self);
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (self->priv->store);
 #line 62 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_g_object_unref0 (self->priv->ui);
+	_g_object_unref0 (self->priv->builder);
 #line 63 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (self->priv->text_renderer);
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -7840,7 +7711,7 @@ static void sidebar_tree_finalize (GObject* obj) {
 	_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_OBJECT_CLASS (sidebar_tree_parent_class)->finalize (obj);
-#line 7844 "Tree.c"
+#line 7715 "Tree.c"
 }
 
 
diff --git a/src/sidebar/Tree.vala b/src/sidebar/Tree.vala
index 0fd9144..5ba28fa 100644
--- a/src/sidebar/Tree.vala
+++ b/src/sidebar/Tree.vala
@@ -59,7 +59,7 @@ public class Sidebar.Tree : Gtk.TreeView {
         typeof (string?)            // ICON
     );
     
-    private Gtk.UIManager ui = new Gtk.UIManager();
+    private Gtk.Builder builder = new Gtk.Builder ();
     private Gtk.CellRendererText text_renderer;
     private unowned ExternalDropHandler drop_handler;
     private Gtk.Entry? text_entry = null;
@@ -118,7 +118,6 @@ public class Sidebar.Tree : Gtk.TreeView {
         
         set_headers_visible(false);
         set_enable_search(false);
-        set_rules_hint(false);
         set_show_expanders(true);
         set_reorderable(false);
         set_enable_tree_lines(false);
@@ -190,33 +189,27 @@ public class Sidebar.Tree : Gtk.TreeView {
         
         return false;
     }
-    
-    private void setup_default_context_menu() {
-        Gtk.ActionGroup group = new Gtk.ActionGroup("SidebarDefault");
-        Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
-        
-        Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, null, null, on_new_search };
-        new_search.label = _("Ne_w Saved Search…");
-        actions += new_search;
 
-        Gtk.ActionEntry new_tag = { "CommonNewTag", null, TRANSLATABLE, null, null, on_new_tag };
-        new_tag.label = _("New _Tag…");
-        actions += new_tag;
-        
-        group.add_actions(actions, this);
-        ui.insert_action_group(group, 0);
-        
-        File ui_file = Resources.get_ui("sidebar_default_context.ui");
+    private const GLib.ActionEntry[] entries = {
+        { "tag.new", on_new_tag },
+        { "search.new", on_new_search }
+    };
+
+    private void setup_default_context_menu() {
         try {
-            ui.add_ui_from_file(ui_file.get_path());
-        } catch (Error err) {
-            AppWindow.error_message("Error loading UI file %s: %s".printf(
-                ui_file.get_path(), err.message));
+            this.builder.add_from_resource
+                            ("/org/gnome/Shotwell/sidebar_default_context.ui");
+            var model = builder.get_object ("popup-menu") as GLib.MenuModel;
+            this.default_context_menu = new Gtk.Menu.from_model (model);
+            var group = new GLib.SimpleActionGroup ();
+            group.add_action_entries (entries, this);
+            this.insert_action_group ("sidebar", group);
+            this.default_context_menu.attach_to_widget (this, null);
+        } catch (Error error) {
+            AppWindow.error_message("Error loading UI resource: %s".printf(
+                error.message));
             Application.get_instance().panic();
         }
-        default_context_menu = (Gtk.Menu) ui.get_widget("/SidebarDefaultContextMenu");
-        
-        ui.ensure_update();
     }
     
     private bool has_wrapper(Sidebar.Entry entry) {
@@ -852,6 +845,8 @@ public class Sidebar.Tree : Gtk.TreeView {
         if (context_menu == null)
             return false;
 
+        context_menu.attach_to_widget (this, null);
+
         if (event != null)
             context_menu.popup(null, null, null, event.button, event.time);
         else
diff --git a/src/tags/Branch.c b/src/tags/Branch.c
index 9a48e6a..f80040a 100644
--- a/src/tags/Branch.c
+++ b/src/tags/Branch.c
@@ -368,46 +368,6 @@ typedef struct _AddTagsCommandClass AddTagsCommandClass;
 typedef struct _ReparentTagCommand ReparentTagCommand;
 typedef struct _ReparentTagCommandClass ReparentTagCommandClass;
 
-#define TYPE_NEW_ROOT_TAG_COMMAND (new_root_tag_command_get_type ())
-#define NEW_ROOT_TAG_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommand))
-#define NEW_ROOT_TAG_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommandClass))
-#define IS_NEW_ROOT_TAG_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NEW_ROOT_TAG_COMMAND))
-#define IS_NEW_ROOT_TAG_COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NEW_ROOT_TAG_COMMAND))
-#define NEW_ROOT_TAG_COMMAND_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NEW_ROOT_TAG_COMMAND, NewRootTagCommandClass))
-
-typedef struct _NewRootTagCommand NewRootTagCommand;
-typedef struct _NewRootTagCommandClass NewRootTagCommandClass;
-
-#define TYPE_PAGE_WINDOW (page_window_get_type ())
-#define PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_WINDOW, PageWindow))
-#define PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_WINDOW, PageWindowClass))
-#define IS_PAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_WINDOW))
-#define IS_PAGE_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_WINDOW))
-#define PAGE_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_WINDOW, PageWindowClass))
-
-typedef struct _PageWindow PageWindow;
-typedef struct _PageWindowClass PageWindowClass;
-
-#define TYPE_APP_WINDOW (app_window_get_type ())
-#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
-#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
-#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
-#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
-#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
-
-typedef struct _AppWindow AppWindow;
-typedef struct _AppWindowClass AppWindowClass;
-
-#define TYPE_LIBRARY_WINDOW (library_window_get_type ())
-#define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow))
-#define LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
-#define IS_LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_LIBRARY_WINDOW))
-#define IS_LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_LIBRARY_WINDOW))
-#define LIBRARY_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
-
-typedef struct _LibraryWindow LibraryWindow;
-typedef struct _LibraryWindowClass LibraryWindowClass;
-
 #define SIDEBAR_TYPE_SELECTABLE_ENTRY (sidebar_selectable_entry_get_type ())
 #define SIDEBAR_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY, SidebarSelectableEntry))
 #define SIDEBAR_IS_SELECTABLE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SIDEBAR_TYPE_SELECTABLE_ENTRY))
@@ -629,7 +589,7 @@ struct _TagsHeaderClass {
 };
 
 struct _TagsHeaderPrivate {
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkMenu* context_menu;
 };
 
@@ -768,12 +728,6 @@ enum  {
 SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
 SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
 static void tags_header_setup_context_menu (TagsHeader* self);
-#define TRANSLATABLE "translatable"
-static void tags_header_on_new_tag (TagsHeader* self);
-static void _tags_header_on_new_tag_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_NEW_CHILD_TAG_SIDEBAR_MENU _ ("_New")
-static void _vala_array_add133 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-GFile* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
@@ -821,15 +775,6 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 GType reparent_tag_command_get_type (void) G_GNUC_CONST;
 static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data);
 static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* base, GdkEventButton* event);
-GType new_root_tag_command_get_type (void) G_GNUC_CONST;
-NewRootTagCommand* new_root_tag_command_new (void);
-NewRootTagCommand* new_root_tag_command_construct (GType object_type);
-GType page_window_get_type (void) G_GNUC_CONST;
-GType app_window_get_type (void) G_GNUC_CONST;
-GType library_window_get_type (void) G_GNUC_CONST;
-LibraryWindow* library_window_get_app (void);
-void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag);
-Tag* new_root_tag_command_get_created_tag (NewRootTagCommand* self);
 static void tags_header_finalize (GObject* obj);
 GType sidebar_selectable_entry_get_type (void) G_GNUC_CONST;
 GType page_get_type (void) G_GNUC_CONST;
@@ -881,14 +826,14 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 static void _tags_branch_on_tags_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_branch_on_tags_added_removed ((TagsBranch*) self, added, removed);
-#line 885 "Branch.c"
+#line 830 "Branch.c"
 }
 
 
 static void _tags_branch_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 27 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_branch_on_tags_altered ((TagsBranch*) self, items);
-#line 892 "Branch.c"
+#line 837 "Branch.c"
 }
 
 
@@ -897,7 +842,7 @@ static gint _tags_branch_comparator_gcompare_func (gconstpointer a, gconstpointe
 	result = tags_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 901 "Branch.c"
+#line 846 "Branch.c"
 }
 
 
@@ -938,14 +883,14 @@ TagsBranch* tags_branch_construct (GType object_type) {
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _tags_branch_on_tags_altered_data_collection_items_altered, self, 0);
 #line 10 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self;
-#line 942 "Branch.c"
+#line 887 "Branch.c"
 }
 
 
 TagsBranch* tags_branch_new (void) {
 #line 10 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return tags_branch_construct (TAGS_TYPE_BRANCH);
-#line 949 "Branch.c"
+#line 894 "Branch.c"
 }
 
 
@@ -968,7 +913,7 @@ TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag) {
 	result = (TagsSidebarEntry*) _tmp2_;
 #line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 972 "Branch.c"
+#line 917 "Branch.c"
 }
 
 
@@ -980,7 +925,7 @@ gboolean tags_branch_is_user_renameable (TagsBranch* self) {
 	result = TRUE;
 #line 35 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 984 "Branch.c"
+#line 929 "Branch.c"
 }
 
 
@@ -1010,7 +955,7 @@ static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 		result = 0;
 #line 40 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 1014 "Branch.c"
+#line 959 "Branch.c"
 	}
 #line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = a;
@@ -1036,7 +981,7 @@ static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	result = _tmp9_;
 #line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 1040 "Branch.c"
+#line 985 "Branch.c"
 }
 
 
@@ -1045,14 +990,14 @@ static gint _tag_compare_names_gcompare_data_func (gconstpointer a, gconstpointe
 	result = tag_compare_names ((Tag*) a, (Tag*) b);
 #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 1049 "Branch.c"
+#line 994 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 59 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1056 "Branch.c"
+#line 1001 "Branch.c"
 }
 
 
@@ -1072,14 +1017,14 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 	_tmp0_ = added_raw;
 #line 53 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp0_ != NULL) {
-#line 1076 "Branch.c"
+#line 1021 "Branch.c"
 		GeeSortedSet* added = NULL;
 		GeeTreeSet* _tmp1_ = NULL;
 #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp1_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL);
 #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		added = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 1083 "Branch.c"
+#line 1028 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp2_ = NULL;
@@ -1092,7 +1037,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 			_object_it = _tmp3_;
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 1096 "Branch.c"
+#line 1041 "Branch.c"
 				GeeIterator* _tmp4_ = NULL;
 				gboolean _tmp5_ = FALSE;
 				DataObject* object = NULL;
@@ -1111,7 +1056,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				if (!_tmp5_) {
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 1115 "Branch.c"
+#line 1060 "Branch.c"
 				}
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp6_ = _object_it;
@@ -1135,11 +1080,11 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				_g_object_unref0 (tag);
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_object_unref0 (object);
-#line 1139 "Branch.c"
+#line 1084 "Branch.c"
 			}
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_object_it);
-#line 1143 "Branch.c"
+#line 1088 "Branch.c"
 		}
 		{
 			GeeIterator* _tag_it = NULL;
@@ -1153,7 +1098,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 			_tag_it = _tmp13_;
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 1157 "Branch.c"
+#line 1102 "Branch.c"
 				GeeIterator* _tmp14_ = NULL;
 				gboolean _tmp15_ = FALSE;
 				Tag* tag = NULL;
@@ -1181,7 +1126,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				if (!_tmp15_) {
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 1185 "Branch.c"
+#line 1130 "Branch.c"
 				}
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp16_ = _tag_it;
@@ -1197,7 +1142,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				parent_tag = _tmp19_;
 #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				while (TRUE) {
-#line 1201 "Branch.c"
+#line 1146 "Branch.c"
 					Tag* _tmp20_ = NULL;
 					GeeHashMap* _tmp21_ = NULL;
 					Tag* _tmp22_ = NULL;
@@ -1210,7 +1155,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					if (!(_tmp20_ != NULL)) {
 #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 						break;
-#line 1214 "Branch.c"
+#line 1159 "Branch.c"
 					}
 #line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_tmp21_ = self->priv->entry_map;
@@ -1220,7 +1165,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					_tmp23_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_);
 #line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					if (!_tmp23_) {
-#line 1224 "Branch.c"
+#line 1169 "Branch.c"
 						TagsSidebarEntry* parent_entry = NULL;
 						Tag* _tmp24_ = NULL;
 						TagsSidebarEntry* _tmp25_ = NULL;
@@ -1243,7 +1188,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 						gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, _tmp28_);
 #line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 						_g_object_unref0 (parent_entry);
-#line 1247 "Branch.c"
+#line 1192 "Branch.c"
 					}
 #line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_tmp29_ = parent_tag;
@@ -1253,7 +1198,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					_g_object_unref0 (parent_tag);
 #line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					parent_tag = _tmp30_;
-#line 1257 "Branch.c"
+#line 1202 "Branch.c"
 				}
 #line 77 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp31_ = tag;
@@ -1281,7 +1226,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				_tmp38_ = parent_tag;
 #line 81 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				if (_tmp38_ != NULL) {
-#line 1285 "Branch.c"
+#line 1230 "Branch.c"
 					TagsSidebarEntry* parent_entry = NULL;
 					GeeHashMap* _tmp39_ = NULL;
 					Tag* _tmp40_ = NULL;
@@ -1304,7 +1249,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, SIDEBAR_TYPE_ENTRY, SidebarEntry), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
 #line 81 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_object_unref0 (parent_entry);
-#line 1308 "Branch.c"
+#line 1253 "Branch.c"
 				} else {
 					SidebarEntry* _tmp44_ = NULL;
 					SidebarEntry* _tmp45_ = NULL;
@@ -1319,7 +1264,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
 #line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_object_unref0 (_tmp45_);
-#line 1323 "Branch.c"
+#line 1268 "Branch.c"
 				}
 #line 90 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp47_ = tag;
@@ -1335,21 +1280,21 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				_g_object_unref0 (parent_tag);
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_object_unref0 (tag);
-#line 1339 "Branch.c"
+#line 1284 "Branch.c"
 			}
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_tag_it);
-#line 1343 "Branch.c"
+#line 1288 "Branch.c"
 		}
 #line 53 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (added);
-#line 1347 "Branch.c"
+#line 1292 "Branch.c"
 	}
 #line 94 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp49_ = removed;
 #line 94 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp49_ != NULL) {
-#line 1353 "Branch.c"
+#line 1298 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp50_ = NULL;
@@ -1362,7 +1307,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 			_object_it = _tmp51_;
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 1366 "Branch.c"
+#line 1311 "Branch.c"
 				GeeIterator* _tmp52_ = NULL;
 				gboolean _tmp53_ = FALSE;
 				DataObject* object = NULL;
@@ -1390,7 +1335,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				if (!_tmp53_) {
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 1394 "Branch.c"
+#line 1339 "Branch.c"
 				}
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp54_ = _object_it;
@@ -1438,16 +1383,16 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				_g_object_unref0 (tag);
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_object_unref0 (object);
-#line 1442 "Branch.c"
+#line 1387 "Branch.c"
 			}
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_object_it);
-#line 1446 "Branch.c"
+#line 1391 "Branch.c"
 		}
 	}
 #line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (restore_point);
-#line 1451 "Branch.c"
+#line 1396 "Branch.c"
 }
 
 
@@ -1456,7 +1401,7 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 	g_return_if_fail (TAGS_IS_BRANCH (self));
 #line 109 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 1460 "Branch.c"
+#line 1405 "Branch.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -1483,7 +1428,7 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 		_object_it = _tmp5_;
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		while (TRUE) {
-#line 1487 "Branch.c"
+#line 1432 "Branch.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -1520,7 +1465,7 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 			if (!_tmp7_) {
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				break;
-#line 1524 "Branch.c"
+#line 1469 "Branch.c"
 			}
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp8_ = _object_it;
@@ -1548,7 +1493,7 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 				_g_object_unref0 (object);
 #line 112 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				continue;
-#line 1552 "Branch.c"
+#line 1497 "Branch.c"
 			}
 #line 114 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp16_ = object;
@@ -1602,11 +1547,11 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 			_g_object_unref0 (tag);
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (object);
-#line 1606 "Branch.c"
+#line 1551 "Branch.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_object_it);
-#line 1610 "Branch.c"
+#line 1555 "Branch.c"
 	}
 }
 
@@ -1618,7 +1563,7 @@ static void tags_branch_class_init (TagsBranchClass * klass) {
 	g_type_class_add_private (klass, sizeof (TagsBranchPrivate));
 #line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_branch_finalize;
-#line 1622 "Branch.c"
+#line 1567 "Branch.c"
 }
 
 
@@ -1630,7 +1575,7 @@ static void tags_branch_instance_init (TagsBranch * self) {
 	_tmp0_ = gee_hash_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, TAGS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->entry_map = _tmp0_;
-#line 1634 "Branch.c"
+#line 1579 "Branch.c"
 }
 
 
@@ -1658,7 +1603,7 @@ static void tags_branch_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->entry_map);
 #line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (tags_branch_parent_class)->finalize (obj);
-#line 1662 "Branch.c"
+#line 1607 "Branch.c"
 }
 
 
@@ -1685,218 +1630,117 @@ TagsHeader* tags_header_construct (GType object_type) {
 	tags_header_setup_context_menu (self);
 #line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self;
-#line 1689 "Branch.c"
+#line 1634 "Branch.c"
 }
 
 
 TagsHeader* tags_header_new (void) {
 #line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return tags_header_construct (TAGS_TYPE_HEADER);
-#line 1696 "Branch.c"
-}
-
-
-static void _tags_header_on_new_tag_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	tags_header_on_new_tag ((TagsHeader*) self);
-#line 1703 "Branch.c"
-}
-
-
-static void _vala_array_add133 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	if ((*length) == (*size)) {
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1714 "Branch.c"
-	}
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	(*array)[(*length)++] = *value;
-#line 1718 "Branch.c"
+#line 1641 "Branch.c"
 }
 
 
 static void tags_header_setup_context_menu (TagsHeader* self) {
-	GtkActionGroup* group = NULL;
-	GtkActionGroup* _tmp0_ = NULL;
-	GtkActionEntry* actions = NULL;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry new_tag = {0};
-	GtkActionEntry _tmp2_ = {0};
-	GtkActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkActionEntry _tmp4_ = {0};
-	GtkActionEntry* _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
-	GtkUIManager* _tmp6_ = NULL;
-	GFile* ui_file = NULL;
-	GFile* _tmp7_ = NULL;
-	GtkUIManager* _tmp19_ = NULL;
-	GtkWidget* _tmp20_ = NULL;
-	GtkMenu* _tmp21_ = NULL;
-	GtkUIManager* _tmp22_ = NULL;
+	GtkBuilder* _tmp0_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 135 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (TAGS_IS_HEADER (self));
 #line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp0_ = gtk_action_group_new ("SidebarDefault");
+	_tmp0_ = gtk_builder_new ();
 #line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	group = _tmp0_;
-#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp1_ = g_new0 (GtkActionEntry, 0);
-#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	actions = _tmp1_;
-#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	actions_length1 = 0;
-#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_actions_size_ = actions_length1;
-#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp2_.name = "CommonNewTag";
-#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp2_.stock_id = NULL;
-#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp2_.accelerator = NULL;
-#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp2_.tooltip = NULL;
-#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp2_.callback = (GCallback) _tags_header_on_new_tag_gtk_action_callback;
-#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	new_tag = _tmp2_;
+	_g_object_unref0 (self->priv->builder);
+#line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+	self->priv->builder = _tmp0_;
+#line 1656 "Branch.c"
+	{
+		GtkBuilder* _tmp1_ = NULL;
+		GMenuModel* model = NULL;
+		GtkBuilder* _tmp2_ = NULL;
+		GObject* _tmp3_ = NULL;
+		GMenuModel* _tmp4_ = NULL;
+		GMenuModel* _tmp5_ = NULL;
+		GtkMenu* _tmp6_ = NULL;
+#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp1_ = self->priv->builder;
+#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		gtk_builder_add_from_resource (_tmp1_, "/org/gnome/Shotwell/tag_sidebar_context.ui", &_inner_error_);
+#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1671 "Branch.c"
+			goto __catch51_g_error;
+		}
 #line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	new_tag.label = RESOURCES_NEW_CHILD_TAG_SIDEBAR_MENU;
+		_tmp2_ = self->priv->builder;
+#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp3_ = gtk_builder_get_object (_tmp2_, "popup-menu");
+#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
+#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		model = _tmp4_;
 #line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp3_ = actions;
+		_tmp5_ = model;
 #line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp3__length1 = actions_length1;
+		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
 #line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp4_ = new_tag;
+		g_object_ref_sink (_tmp6_);
 #line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_vala_array_add133 (&actions, &actions_length1, &_actions_size_, &_tmp4_);
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp5_ = actions;
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp5__length1 = actions_length1;
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	gtk_action_group_add_actions (group, _tmp5_, _tmp5__length1, self);
-#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp6_ = self->priv->ui;
-#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	gtk_ui_manager_insert_action_group (_tmp6_, group, 0);
-#line 146 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp7_ = resources_get_ui ("tag_sidebar_context.ui");
-#line 146 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	ui_file = _tmp7_;
-#line 1796 "Branch.c"
+		_g_object_unref0 (self->priv->context_menu);
+#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		self->priv->context_menu = _tmp6_;
+#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_g_object_unref0 (model);
+#line 1694 "Branch.c"
+	}
+	goto __finally51;
+	__catch51_g_error:
 	{
-		GtkUIManager* _tmp8_ = NULL;
+		GError* _error_ = NULL;
+		GError* _tmp7_ = NULL;
+		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp8_ = self->priv->ui;
-#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp9_ = g_file_get_path (ui_file);
-#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		Application* _tmp11_ = NULL;
+		Application* _tmp12_ = NULL;
+#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_error_ = _inner_error_;
+#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_inner_error_ = NULL;
+#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp7_ = _error_;
+#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp8_ = _tmp7_->message;
+#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp9_ = g_strdup_printf ("Error loading UI resource: %s", _tmp8_);
+#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp10_ = _tmp9_;
-#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		gtk_ui_manager_add_ui_from_file (_tmp8_, _tmp10_, &_inner_error_);
-#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		app_window_error_message (_tmp10_, NULL);
+#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (_tmp10_);
-#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1813 "Branch.c"
-			goto __catch52_g_error;
-		}
-	}
-	goto __finally52;
-	__catch52_g_error:
-	{
-		GError* err = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		GError* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		Application* _tmp17_ = NULL;
-		Application* _tmp18_ = NULL;
-#line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		err = _inner_error_;
-#line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_inner_error_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp11_ = g_file_get_path (ui_file);
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 145 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp11_ = application_get_instance ();
+#line 145 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp12_ = _tmp11_;
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp13_ = err;
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp14_ = _tmp13_->message;
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp15_ = g_strdup_printf ("Error loading UI file %s: %s", _tmp12_, _tmp14_);
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp16_ = _tmp15_;
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		app_window_error_message (_tmp16_, NULL);
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_g_free0 (_tmp16_);
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_g_free0 (_tmp12_);
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp17_ = application_get_instance ();
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp18_ = _tmp17_;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		application_panic (_tmp18_);
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_application_unref0 (_tmp18_);
-#line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_g_error_free0 (err);
-#line 1861 "Branch.c"
+#line 145 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		application_panic (_tmp12_);
+#line 145 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_application_unref0 (_tmp12_);
+#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_g_error_free0 (_error_);
+#line 1732 "Branch.c"
 	}
-	__finally52:
-#line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+	__finally51:
+#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_g_object_unref0 (ui_file);
-#line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		actions = (g_free (actions), NULL);
-#line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_g_object_unref0 (group);
-#line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		g_clear_error (&_inner_error_);
-#line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 1878 "Branch.c"
+#line 1743 "Branch.c"
 	}
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp19_ = self->priv->ui;
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp20_ = gtk_ui_manager_get_widget (_tmp19_, "/SidebarTagContextMenu");
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_menu_get_type (), GtkMenu));
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_g_object_unref0 (self->priv->context_menu);
-#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	self->priv->context_menu = _tmp21_;
-#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp22_ = self->priv->ui;
-#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	gtk_ui_manager_ensure_update (_tmp22_);
-#line 135 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_g_object_unref0 (ui_file);
-#line 135 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	actions = (g_free (actions), NULL);
-#line 135 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_g_object_unref0 (group);
-#line 1900 "Branch.c"
 }
 
 
@@ -1921,85 +1765,85 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg
 	GeeList* _tmp10_ = NULL;
 	AddTagsCommand* _tmp11_ = NULL;
 	AddTagsCommand* _tmp12_ = NULL;
-#line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (GEE_IS_LIST (media), FALSE);
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = add_tags_dialog_new ();
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	dialog = _tmp0_;
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = dialog;
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = add_tags_dialog_execute (_tmp1_, &_tmp2_);
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	names = _tmp3_;
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	names_length1 = _tmp2_;
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_names_size_ = names_length1;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5_ = names;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5__length1 = names_length1;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp5_ == NULL) {
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp4_ = TRUE;
-#line 1951 "Branch.c"
+#line 1795 "Branch.c"
 	} else {
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = names;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6__length1 = names_length1;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp4_ = _tmp6__length1 == 0;
-#line 1961 "Branch.c"
+#line 1805 "Branch.c"
 	}
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp4_) {
-#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 153 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		result = FALSE;
-#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 153 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 153 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_text_entry_dialog_mediator_unref0 (dialog);
-#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 153 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 1973 "Branch.c"
+#line 1817 "Branch.c"
 	}
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp7_ = app_window_get_command_manager ();
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp8_ = _tmp7_;
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp9_ = names;
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp9__length1 = names_length1;
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp10_ = media;
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp11_ = add_tags_command_new (_tmp9_, _tmp9__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp12_ = _tmp11_;
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (_tmp12_);
-#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 157 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = TRUE;
-#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 157 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 157 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 157 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2003 "Branch.c"
+#line 1847 "Branch.c"
 }
 
 
@@ -2011,25 +1855,25 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 170 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 170 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (data != NULL, FALSE);
-#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = data;
-#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = gtk_selection_data_get_data_type (_tmp0_);
-#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = gdk_atom_name (_tmp1_);
-#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = _tmp2_;
-#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp3_);
-#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp4_) {
-#line 2033 "Branch.c"
+#line 1877 "Branch.c"
 		gchar* old_tag_path = NULL;
 		GtkSelectionData* _tmp5_ = NULL;
 		guchar* _tmp6_ = NULL;
@@ -2050,91 +1894,91 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern
 		Tag* _tmp21_ = NULL;
 		ReparentTagCommand* _tmp22_ = NULL;
 		ReparentTagCommand* _tmp23_ = NULL;
-#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp5_ = data;
-#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = gtk_selection_data_get_data (_tmp5_);
-#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp7_ = g_strdup ((const gchar*) _tmp6_);
-#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		old_tag_path = _tmp7_;
-#line 173 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp8_ = tag_global;
-#line 173 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp9_ = old_tag_path;
-#line 173 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp10_ = tag_source_collection_exists (_tmp8_, _tmp9_, FALSE);
-#line 173 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_vala_assert (_tmp10_, "Tag.global.exists(old_tag_path)");
-#line 176 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp11_ = old_tag_path;
-#line 176 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_);
-#line 176 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp13_ = _tmp12_;
-#line 176 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 176 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp15_ = _tmp14_;
-#line 176 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp16_ = _tmp15_ < 2;
-#line 176 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp13_);
-#line 176 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp16_) {
-#line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			result = TRUE;
-#line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (old_tag_path);
-#line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			return result;
-#line 2092 "Branch.c"
+#line 1936 "Branch.c"
 		}
-#line 179 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp17_ = app_window_get_command_manager ();
-#line 179 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp18_ = _tmp17_;
-#line 179 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp19_ = old_tag_path;
-#line 179 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp20_ = tag_for_path (_tmp19_);
-#line 179 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp21_ = _tmp20_;
-#line 179 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp22_ = reparent_tag_command_new (_tmp21_, "/");
-#line 179 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp23_ = _tmp22_;
-#line 179 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 179 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp23_);
-#line 179 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp21_);
-#line 179 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_command_manager_unref0 (_tmp18_);
-#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		result = TRUE;
-#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (old_tag_path);
-#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 2122 "Branch.c"
+#line 1966 "Branch.c"
 	}
-#line 185 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = FALSE;
-#line 185 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2128 "Branch.c"
+#line 1972 "Branch.c"
 }
 
 
 static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data) {
 	TagsHeader * self;
-#line 188 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 178 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 188 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 178 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (data != NULL);
-#line 2138 "Branch.c"
+#line 1982 "Branch.c"
 }
 
 
@@ -2143,60 +1987,17 @@ static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* b
 	GtkMenu* result = NULL;
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
-#line 192 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->context_menu;
-#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = _tmp1_;
-#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2157 "Branch.c"
-}
-
-
-static void tags_header_on_new_tag (TagsHeader* self) {
-	NewRootTagCommand* creation_command = NULL;
-	NewRootTagCommand* _tmp0_ = NULL;
-	CommandManager* _tmp1_ = NULL;
-	CommandManager* _tmp2_ = NULL;
-	LibraryWindow* _tmp3_ = NULL;
-	LibraryWindow* _tmp4_ = NULL;
-	Tag* _tmp5_ = NULL;
-	Tag* _tmp6_ = NULL;
-#line 196 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	g_return_if_fail (TAGS_IS_HEADER (self));
-#line 197 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp0_ = new_root_tag_command_new ();
-#line 197 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	creation_command = _tmp0_;
-#line 198 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp1_ = app_window_get_command_manager ();
-#line 198 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp2_ = _tmp1_;
-#line 198 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (creation_command, TYPE_COMMAND, Command));
-#line 198 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_command_manager_unref0 (_tmp2_);
-#line 199 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp3_ = library_window_get_app ();
-#line 199 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp4_ = _tmp3_;
-#line 199 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp5_ = new_root_tag_command_get_created_tag (creation_command);
-#line 199 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp6_ = _tmp5_;
-#line 199 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	library_window_rename_tag_in_sidebar (_tmp4_, _tmp6_);
-#line 199 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_g_object_unref0 (_tmp6_);
-#line 199 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_g_object_unref0 (_tmp4_);
-#line 196 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_g_object_unref0 (creation_command);
-#line 2200 "Branch.c"
+#line 2001 "Branch.c"
 }
 
 
@@ -2207,7 +2008,7 @@ static void tags_header_class_init (TagsHeaderClass * klass) {
 	g_type_class_add_private (klass, sizeof (TagsHeaderPrivate));
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_header_finalize;
-#line 2211 "Branch.c"
+#line 2012 "Branch.c"
 }
 
 
@@ -2218,7 +2019,7 @@ static void tags_header_sidebar_internal_drop_target_entry_interface_init (Sideb
 	iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) tags_header_real_internal_drop_received;
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) tags_header_real_internal_drop_received_arbitrary;
-#line 2222 "Branch.c"
+#line 2023 "Branch.c"
 }
 
 
@@ -2227,7 +2028,7 @@ static void tags_header_sidebar_internal_drag_source_entry_interface_init (Sideb
 	tags_header_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->prepare_selection_data = (void (*)(SidebarInternalDragSourceEntry*, GtkSelectionData*)) tags_header_real_prepare_selection_data;
-#line 2231 "Branch.c"
+#line 2032 "Branch.c"
 }
 
 
@@ -2236,21 +2037,16 @@ static void tags_header_sidebar_contextable_interface_init (SidebarContextableIf
 	tags_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) tags_header_real_get_sidebar_context_menu;
-#line 2240 "Branch.c"
+#line 2041 "Branch.c"
 }
 
 
 static void tags_header_instance_init (TagsHeader * self) {
-	GtkUIManager* _tmp0_ = NULL;
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv = TAGS_HEADER_GET_PRIVATE (self);
-#line 127 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_tmp0_ = gtk_ui_manager_new ();
-#line 127 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	self->priv->ui = _tmp0_;
 #line 128 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->context_menu = NULL;
-#line 2254 "Branch.c"
+#line 2050 "Branch.c"
 }
 
 
@@ -2259,12 +2055,12 @@ static void tags_header_finalize (GObject* obj) {
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_HEADER, TagsHeader);
 #line 127 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	_g_object_unref0 (self->priv->ui);
+	_g_object_unref0 (self->priv->builder);
 #line 128 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (self->priv->context_menu);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (tags_header_parent_class)->finalize (obj);
-#line 2268 "Branch.c"
+#line 2064 "Branch.c"
 }
 
 
@@ -2290,28 +2086,28 @@ TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag) {
 	TagsSidebarEntry * self = NULL;
 	Tag* _tmp0_ = NULL;
 	Tag* _tmp1_ = NULL;
-#line 210 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
-#line 210 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = (TagsSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 211 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = tag;
-#line 211 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 211 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (self->priv->tag);
-#line 211 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 195 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->tag = _tmp1_;
-#line 210 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self;
-#line 2308 "Branch.c"
+#line 2104 "Branch.c"
 }
 
 
 TagsSidebarEntry* tags_sidebar_entry_new (Tag* tag) {
-#line 210 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return tags_sidebar_entry_construct (TAGS_TYPE_SIDEBAR_ENTRY, tag);
-#line 2315 "Branch.c"
+#line 2111 "Branch.c"
 }
 
 
@@ -2327,17 +2123,17 @@ Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) {
 	Tag* result = NULL;
 	Tag* _tmp0_ = NULL;
 	Tag* _tmp1_ = NULL;
-#line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (TAGS_IS_SIDEBAR_ENTRY (self), NULL);
-#line 221 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 205 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->tag;
-#line 221 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 205 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 221 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 205 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = _tmp1_;
-#line 221 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 205 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2341 "Branch.c"
+#line 2137 "Branch.c"
 }
 
 
@@ -2346,17 +2142,17 @@ static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry*
 	gchar* result = NULL;
 	Tag* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 209 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->tag;
-#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 209 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = tag_get_user_visible_name (_tmp0_);
-#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 209 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = _tmp1_;
-#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 209 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2360 "Branch.c"
+#line 2156 "Branch.c"
 }
 
 
@@ -2365,17 +2161,17 @@ static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry*
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 213 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->single_tag_icon;
-#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 213 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 213 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = _tmp1_;
-#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 213 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2379 "Branch.c"
+#line 2175 "Branch.c"
 }
 
 
@@ -2384,32 +2180,32 @@ static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
 	Page* result = NULL;
 	Tag* _tmp0_ = NULL;
 	TagPage* _tmp1_ = NULL;
-#line 232 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->tag;
-#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = tag_page_new (_tmp0_);
-#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2400 "Branch.c"
+#line 2196 "Branch.c"
 }
 
 
 static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
 	TagsSidebarEntry * self;
 	gboolean result = FALSE;
-#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 221 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = TRUE;
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 221 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2413 "Branch.c"
+#line 2209 "Branch.c"
 }
 
 
@@ -2422,7 +2218,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 2426 "Branch.c"
+#line 2222 "Branch.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -2453,8 +2249,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2457 "Branch.c"
-				goto __catch53_g_regex_error;
+#line 2253 "Branch.c"
+				goto __catch52_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2462,7 +2258,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2466 "Branch.c"
+#line 2262 "Branch.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -2478,8 +2274,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2482 "Branch.c"
-				goto __catch53_g_regex_error;
+#line 2278 "Branch.c"
+				goto __catch52_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -2489,7 +2285,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2493 "Branch.c"
+#line 2289 "Branch.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -2503,10 +2299,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2507 "Branch.c"
+#line 2303 "Branch.c"
 	}
-	goto __finally53;
-	__catch53_g_regex_error:
+	goto __finally52;
+	__catch52_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2517,9 +2313,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 2521 "Branch.c"
+#line 2317 "Branch.c"
 	}
-	__finally53:
+	__finally52:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2528,7 +2324,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 2532 "Branch.c"
+#line 2328 "Branch.c"
 	}
 }
 
@@ -2553,85 +2349,85 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const
 	const gchar* _tmp14_ = NULL;
 	RenameTagCommand* _tmp15_ = NULL;
 	RenameTagCommand* _tmp16_ = NULL;
-#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (new_name != NULL);
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = new_name;
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = tag_prep_tag_name (_tmp0_);
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	prepped = _tmp1_;
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = prepped;
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp2_ == NULL) {
-#line 243 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 227 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (prepped);
-#line 243 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 227 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 2575 "Branch.c"
+#line 2371 "Branch.c"
 	}
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = prepped;
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = string_replace (_tmp3_, "/", "");
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (prepped);
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	prepped = _tmp4_;
-#line 247 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5_ = prepped;
-#line 247 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp6_ = self->priv->tag;
-#line 247 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp7_ = tag_get_user_visible_name (_tmp6_);
-#line 247 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp8_ = _tmp7_;
-#line 247 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp9_ = g_strcmp0 (_tmp5_, _tmp8_) == 0;
-#line 247 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp8_);
-#line 247 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp9_) {
-#line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 232 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (prepped);
-#line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 232 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 2603 "Branch.c"
+#line 2399 "Branch.c"
 	}
-#line 250 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp10_ = prepped;
-#line 250 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (g_strcmp0 (_tmp10_, "") == 0) {
-#line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 235 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (prepped);
-#line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 235 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 2613 "Branch.c"
+#line 2409 "Branch.c"
 	}
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp11_ = app_window_get_command_manager ();
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp12_ = _tmp11_;
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp13_ = self->priv->tag;
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp14_ = prepped;
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp15_ = rename_tag_command_new (_tmp13_, _tmp14_);
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp16_ = _tmp15_;
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (_tmp16_);
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (prepped);
-#line 2635 "Branch.c"
+#line 2431 "Branch.c"
 }
 
 
@@ -2639,37 +2435,37 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas
 	TagsSidebarEntry * self;
 	Tag* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->tag;
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = dialogs_confirm_delete_tag (_tmp0_);
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp1_) {
-#line 2651 "Branch.c"
+#line 2447 "Branch.c"
 		CommandManager* _tmp2_ = NULL;
 		CommandManager* _tmp3_ = NULL;
 		Tag* _tmp4_ = NULL;
 		DeleteTagCommand* _tmp5_ = NULL;
 		DeleteTagCommand* _tmp6_ = NULL;
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp2_ = app_window_get_command_manager ();
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp3_ = _tmp2_;
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp4_ = self->priv->tag;
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp5_ = delete_tag_command_new (_tmp4_);
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = _tmp5_;
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp6_);
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 2673 "Branch.c"
+#line 2469 "Branch.c"
 	}
 }
 
@@ -2686,39 +2482,39 @@ static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalD
 	gint _tmp6_ = 0;
 	TagUntagPhotosCommand* _tmp7_ = NULL;
 	TagUntagPhotosCommand* _tmp8_ = NULL;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (GEE_IS_LIST (media), FALSE);
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = _tmp0_;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = self->priv->tag;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = media;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = media;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp6_ = _tmp5_;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp7_ = tag_untag_photos_command_new (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_, TRUE);
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp8_ = _tmp7_;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command));
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (_tmp8_);
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 249 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = TRUE;
-#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 249 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2722 "Branch.c"
+#line 2518 "Branch.c"
 }
 
 
@@ -2730,25 +2526,25 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (data != NULL, FALSE);
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = data;
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = gtk_selection_data_get_data_type (_tmp0_);
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = gdk_atom_name (_tmp1_);
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = _tmp2_;
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp3_);
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp4_) {
-#line 2752 "Branch.c"
+#line 2548 "Branch.c"
 		gchar* old_tag_path = NULL;
 		GtkSelectionData* _tmp5_ = NULL;
 		guchar* _tmp6_ = NULL;
@@ -2777,35 +2573,35 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 		gchar* _tmp49_ = NULL;
 		ReparentTagCommand* _tmp50_ = NULL;
 		ReparentTagCommand* _tmp51_ = NULL;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 254 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp5_ = data;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 254 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = gtk_selection_data_get_data (_tmp5_);
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 254 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp7_ = g_strdup ((const gchar*) _tmp6_);
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 254 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		old_tag_path = _tmp7_;
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp8_ = old_tag_path;
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp9_ = self->priv->tag;
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp10_ = tag_get_path (_tmp9_);
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp11_ = _tmp10_;
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp12_ = g_strcmp0 (_tmp8_, _tmp11_) == 0;
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (_tmp11_);
-#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp12_) {
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			result = TRUE;
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (old_tag_path);
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			return result;
-#line 2809 "Branch.c"
+#line 2605 "Branch.c"
 		}
 		{
 			GeeList* _parent_path_list = NULL;
@@ -2819,33 +2615,33 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 			gint _tmp19_ = 0;
 			gint _tmp20_ = 0;
 			gint _parent_path_index = 0;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp13_ = self->priv->tag;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp14_ = tag_get_path (_tmp13_);
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp15_ = _tmp14_;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp16_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp15_);
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp17_ = _tmp16_;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (_tmp15_);
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_parent_path_list = _tmp17_;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp18_ = _parent_path_list;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp20_ = _tmp19_;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_parent_path_size = _tmp20_;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_parent_path_index = -1;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 2849 "Branch.c"
+#line 2645 "Branch.c"
 				gint _tmp21_ = 0;
 				gint _tmp22_ = 0;
 				gint _tmp23_ = 0;
@@ -2855,177 +2651,177 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 				gpointer _tmp26_ = NULL;
 				const gchar* _tmp27_ = NULL;
 				const gchar* _tmp28_ = NULL;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp21_ = _parent_path_index;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_parent_path_index = _tmp21_ + 1;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp22_ = _parent_path_index;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp23_ = _parent_path_size;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				if (!(_tmp22_ < _tmp23_)) {
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 2871 "Branch.c"
+#line 2667 "Branch.c"
 				}
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp24_ = _parent_path_list;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp25_ = _parent_path_index;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp26_ = gee_list_get (_tmp24_, _tmp25_);
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				parent_path = (gchar*) _tmp26_;
-#line 278 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp27_ = parent_path;
-#line 278 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp28_ = old_tag_path;
-#line 278 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				if (g_strcmp0 (_tmp27_, _tmp28_) == 0) {
-#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					result = TRUE;
-#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_free0 (parent_path);
-#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_object_unref0 (_parent_path_list);
-#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_free0 (old_tag_path);
-#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					return result;
-#line 2897 "Branch.c"
+#line 2693 "Branch.c"
 				}
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_free0 (parent_path);
-#line 2901 "Branch.c"
+#line 2697 "Branch.c"
 			}
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_parent_path_list);
-#line 2905 "Branch.c"
+#line 2701 "Branch.c"
 		}
-#line 282 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 266 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp29_ = tag_global;
-#line 282 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 266 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp30_ = old_tag_path;
-#line 282 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 266 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp31_ = tag_source_collection_exists (_tmp29_, _tmp30_, FALSE);
-#line 282 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 266 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_vala_assert (_tmp31_, "Tag.global.exists(old_tag_path)");
-#line 285 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp32_ = old_tag_path;
-#line 285 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp33_ = tag_for_path (_tmp32_);
-#line 285 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		old_tag = _tmp33_;
-#line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp34_ = old_tag;
-#line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp35_ = tag_get_hierarchical_parent (_tmp34_);
-#line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		old_tag_parent = _tmp35_;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp37_ = old_tag_parent;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp37_ != NULL) {
-#line 2931 "Branch.c"
+#line 2727 "Branch.c"
 			Tag* _tmp38_ = NULL;
 			gchar* _tmp39_ = NULL;
 			gchar* _tmp40_ = NULL;
 			Tag* _tmp41_ = NULL;
 			gchar* _tmp42_ = NULL;
 			gchar* _tmp43_ = NULL;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp38_ = old_tag_parent;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp39_ = tag_get_path (_tmp38_);
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp40_ = _tmp39_;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp41_ = self->priv->tag;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp42_ = tag_get_path (_tmp41_);
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp43_ = _tmp42_;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp36_ = g_strcmp0 (_tmp40_, _tmp43_) == 0;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (_tmp43_);
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (_tmp40_);
-#line 2956 "Branch.c"
+#line 2752 "Branch.c"
 		} else {
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp36_ = FALSE;
-#line 2960 "Branch.c"
+#line 2756 "Branch.c"
 		}
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp36_) {
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			result = TRUE;
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (old_tag_parent);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (old_tag);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (old_tag_path);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			return result;
-#line 2974 "Branch.c"
+#line 2770 "Branch.c"
 		}
-#line 290 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp44_ = app_window_get_command_manager ();
-#line 290 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp45_ = _tmp44_;
-#line 290 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp46_ = old_tag;
-#line 290 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp47_ = self->priv->tag;
-#line 290 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp48_ = tag_get_path (_tmp47_);
-#line 290 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp49_ = _tmp48_;
-#line 290 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp50_ = reparent_tag_command_new (_tmp46_, _tmp49_);
-#line 290 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp51_ = _tmp50_;
-#line 290 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		command_manager_execute (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command));
-#line 290 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp51_);
-#line 290 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (_tmp49_);
-#line 290 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_command_manager_unref0 (_tmp45_);
-#line 293 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		result = TRUE;
-#line 293 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (old_tag_parent);
-#line 293 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (old_tag);
-#line 293 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (old_tag_path);
-#line 293 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 3010 "Branch.c"
+#line 2806 "Branch.c"
 	}
-#line 296 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 280 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = FALSE;
-#line 296 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 280 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 3016 "Branch.c"
+#line 2812 "Branch.c"
 }
 
 
 static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) {
 	TagsSidebarEntry * self;
 	gboolean result = FALSE;
-#line 299 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 300 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 284 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = FALSE;
-#line 300 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 284 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 3029 "Branch.c"
+#line 2825 "Branch.c"
 }
 
 
@@ -3069,13 +2865,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 3073 "Branch.c"
+#line 2869 "Branch.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3079 "Branch.c"
+#line 2875 "Branch.c"
 }
 
 
@@ -3090,123 +2886,123 @@ static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragS
 	gint _tmp5__length1 = 0;
 	guint8* _tmp6_ = NULL;
 	gint _tmp6__length1 = 0;
-#line 303 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 303 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (data != NULL);
-#line 304 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = data;
-#line 304 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = gdk_atom_intern_static_string (LIBRARY_WINDOW_TAG_PATH_MIME_TYPE);
-#line 304 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = self->priv->tag;
-#line 304 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = tag_get_path (_tmp2_);
-#line 304 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = _tmp3_;
-#line 304 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5_ = string_get_data (_tmp4_, &_tmp5__length1);
-#line 304 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp6_ = _tmp5_;
-#line 304 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp6__length1 = _tmp5__length1;
-#line 304 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	gtk_selection_data_set (_tmp0_, _tmp1_, 0, _tmp6_, _tmp6__length1);
-#line 304 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp4_);
-#line 3118 "Branch.c"
+#line 2914 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) {
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_type_class_add_private (klass, sizeof (TagsSidebarEntryPrivate));
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = tags_sidebar_entry_real_get_sidebar_name;
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = tags_sidebar_entry_real_get_sidebar_icon;
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = tags_sidebar_entry_real_create_page;
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_sidebar_entry_finalize;
-#line 3135 "Branch.c"
+#line 2931 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) tags_sidebar_entry_real_is_user_renameable;
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) tags_sidebar_entry_real_rename;
-#line 3146 "Branch.c"
+#line 2942 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) {
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->destroy_source = (void (*)(SidebarDestroyableEntry*)) tags_sidebar_entry_real_destroy_source;
-#line 3155 "Branch.c"
+#line 2951 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) {
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) tags_sidebar_entry_real_internal_drop_received;
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) tags_sidebar_entry_real_internal_drop_received_arbitrary;
-#line 3166 "Branch.c"
+#line 2962 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) {
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) tags_sidebar_entry_real_expand_on_select;
-#line 3175 "Branch.c"
+#line 2971 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) {
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->prepare_selection_data = (void (*)(SidebarInternalDragSourceEntry*, GtkSelectionData*)) tags_sidebar_entry_real_prepare_selection_data;
-#line 3184 "Branch.c"
+#line 2980 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_instance_init (TagsSidebarEntry * self) {
 	gchar* _tmp0_ = NULL;
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv = TAGS_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 206 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 190 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = g_strdup (RESOURCES_ICON_ONE_TAG);
-#line 206 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 190 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->single_tag_icon = _tmp0_;
-#line 3196 "Branch.c"
+#line 2992 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_finalize (GObject* obj) {
 	TagsSidebarEntry * self;
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 206 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 190 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (self->priv->single_tag_icon);
-#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 192 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (self->priv->tag);
-#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (tags_sidebar_entry_parent_class)->finalize (obj);
-#line 3210 "Branch.c"
+#line 3006 "Branch.c"
 }
 
 
diff --git a/src/tags/Branch.vala b/src/tags/Branch.vala
index 0663fe4..41c6feb 100644
--- a/src/tags/Branch.vala
+++ b/src/tags/Branch.vala
@@ -124,38 +124,28 @@ public class Tags.Branch : Sidebar.Branch {
 
 public class Tags.Header : Sidebar.Header, Sidebar.InternalDropTargetEntry, 
     Sidebar.InternalDragSourceEntry, Sidebar.Contextable {
-    private Gtk.UIManager ui = new Gtk.UIManager();
+    private Gtk.Builder builder;
     private Gtk.Menu? context_menu = null;
     
     public Header() {
         base (_("Tags"));
         setup_context_menu();
     }
-    
+
     private void setup_context_menu() {
-        Gtk.ActionGroup group = new Gtk.ActionGroup("SidebarDefault");
-        Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
-        
-        Gtk.ActionEntry new_tag = { "CommonNewTag", null, TRANSLATABLE, null, null, on_new_tag };
-        new_tag.label = Resources.NEW_CHILD_TAG_SIDEBAR_MENU;
-        actions += new_tag;
-        
-        group.add_actions(actions, this);
-        ui.insert_action_group(group, 0);
-        
-        File ui_file = Resources.get_ui("tag_sidebar_context.ui");
+        this.builder = new Gtk.Builder ();
         try {
-            ui.add_ui_from_file(ui_file.get_path());
-        } catch (Error err) {
-            AppWindow.error_message("Error loading UI file %s: %s".printf(
-                ui_file.get_path(), err.message));
+            this.builder.add_from_resource
+                            ("/org/gnome/Shotwell/tag_sidebar_context.ui");
+            var model = builder.get_object ("popup-menu") as GLib.MenuModel;
+            this.context_menu = new Gtk.Menu.from_model (model);
+        } catch (Error error) {
+            AppWindow.error_message("Error loading UI resource: %s".printf(
+                error.message));
             Application.get_instance().panic();
         }
-        context_menu = (Gtk.Menu) ui.get_widget("/SidebarTagContextMenu");
-        
-        ui.ensure_update();
     }
-    
+
     public bool internal_drop_received(Gee.List<MediaSource> media) {
         AddTagsDialog dialog = new AddTagsDialog();
         string[]? names = dialog.execute();
@@ -192,12 +182,6 @@ public class Tags.Header : Sidebar.Header, Sidebar.InternalDropTargetEntry,
     public Gtk.Menu? get_sidebar_context_menu(Gdk.EventButton? event) {
         return context_menu;
     }
-    
-    private void on_new_tag() {
-        NewRootTagCommand creation_command = new NewRootTagCommand();
-        AppWindow.get_command_manager().execute(creation_command);
-        LibraryWindow.get_app().rename_tag_in_sidebar(creation_command.get_created_tag());
-    }
 }
 
 public class Tags.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.RenameableEntry,
diff --git a/src/tags/HierarchicalTagIndex.c b/src/tags/HierarchicalTagIndex.c
index 2451f2c..39c417b 100644
--- a/src/tags/HierarchicalTagIndex.c
+++ b/src/tags/HierarchicalTagIndex.c
@@ -140,7 +140,7 @@ GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self);
 gboolean hierarchical_tag_index_is_path_known (HierarchicalTagIndex* self, const gchar* path);
 gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, const gchar* name);
 gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1);
-static void _vala_array_add140 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add65 (gchar*** array, int* length, int* size, gchar* value);
 static void hierarchical_tag_index_finalize (HierarchicalTagIndex* obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
@@ -665,7 +665,7 @@ gchar* hierarchical_tag_index_get_path_for_name (HierarchicalTagIndex* self, con
 }
 
 
-static void _vala_array_add140 (gchar*** array, int* length, int* size, gchar* value) {
+static void _vala_array_add65 (gchar*** array, int* length, int* size, gchar* value) {
 #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 	if ((*length) == (*size)) {
 #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
@@ -740,7 +740,7 @@ gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex*
 #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 				_tmp5_ = hierarchical_tag_index_get_path_for_name (self, _tmp4_);
 #line 84 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
-				_vala_array_add140 (&_result_, &_result__length1, &__result__size_, _tmp5_);
+				_vala_array_add65 (&_result_, &_result__length1, &__result__size_, _tmp5_);
 #line 83 "/home/jens/Source/shotwell/src/tags/HierarchicalTagIndex.vala"
 				_g_free0 (name);
 #line 747 "HierarchicalTagIndex.c"
diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index 88be1fa..f4993c0 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -1311,7 +1311,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1314 "HierarchicalTagUtilities.c"
-				goto __catch54_g_regex_error;
+				goto __catch53_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1336,7 +1336,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1339 "HierarchicalTagUtilities.c"
-				goto __catch54_g_regex_error;
+				goto __catch53_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -1362,8 +1362,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 1364 "HierarchicalTagUtilities.c"
 	}
-	goto __finally54;
-	__catch54_g_regex_error:
+	goto __finally53;
+	__catch53_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1376,7 +1376,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 1378 "HierarchicalTagUtilities.c"
 	}
-	__finally54:
+	__finally53:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c
index fb8b7a2..5829bfc 100644
--- a/src/tags/TagPage.c
+++ b/src/tags/TagPage.c
@@ -14,7 +14,7 @@
 #include <string.h>
 #include <gee.h>
 #include <gdk/gdk.h>
-#include <glib/gi18n-lib.h>
+#include <gio/gio.h>
 
 
 #define TYPE_PAGE (page_get_type ())
@@ -304,6 +304,16 @@ typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
 typedef struct _ConfigFacade ConfigFacade;
 typedef struct _ConfigFacadeClass ConfigFacadeClass;
 
+#define TYPE_APP_WINDOW (app_window_get_type ())
+#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
+#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
+#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
+#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
+#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
+
+typedef struct _AppWindow AppWindow;
+typedef struct _AppWindowClass AppWindowClass;
+
 #define TYPE_COMMAND (command_get_type ())
 #define COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND, Command))
 #define COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMMAND, CommandClass))
@@ -355,16 +365,6 @@ typedef struct _CommandManager CommandManager;
 typedef struct _CommandManagerClass CommandManagerClass;
 #define _command_manager_unref0(var) ((var == NULL) ? NULL : (var = (command_manager_unref (var), NULL)))
 
-#define TYPE_APP_WINDOW (app_window_get_type ())
-#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow))
-#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass))
-#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW))
-#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW))
-#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass))
-
-typedef struct _AppWindow AppWindow;
-typedef struct _AppWindowClass AppWindowClass;
-
 #define TYPE_LIBRARY_WINDOW (library_window_get_type ())
 #define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow))
 #define LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_WINDOW, LibraryWindowClass))
@@ -418,7 +418,7 @@ typedef struct _TagUntagPhotosCommandClass TagUntagPhotosCommandClass;
 struct _Page {
 	GtkScrolledWindow parent_instance;
 	PagePrivate * priv;
-	GtkUIManager* ui;
+	GtkBuilder* builder;
 	GtkToolbar* toolbar;
 	gboolean in_view;
 };
@@ -428,8 +428,6 @@ struct _PageClass {
 	void (*set_page_name) (Page* self, const gchar* page_name);
 	void (*set_container) (Page* self, GtkWindow* container);
 	void (*clear_container) (Page* self);
-	GtkMenuBar* (*get_menubar) (Page* self);
-	GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path);
 	GtkToolbar* (*get_toolbar) (Page* self);
 	GtkMenu* (*get_page_context_menu) (Page* self);
 	void (*switching_from) (Page* self);
@@ -437,10 +435,8 @@ struct _PageClass {
 	void (*ready) (Page* self);
 	void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw);
 	void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw);
+	void (*add_actions) (Page* self);
 	void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames);
-	GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1);
-	GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1);
-	void (*register_radio_actions) (Page* self, GtkActionGroup* action_group);
 	InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1);
 	void (*init_actions) (Page* self, gint selected_count, gint count);
 	void (*update_actions) (Page* self, gint selected_count, gint count);
@@ -552,13 +548,13 @@ struct _MediaPageClass {
 	void (*on_move_to_trash) (MediaPage* self);
 	void (*on_edit_title) (MediaPage* self);
 	void (*on_edit_comment) (MediaPage* self);
-	void (*on_display_titles) (MediaPage* self, GtkAction* action);
-	void (*on_display_comments) (MediaPage* self, GtkAction* action);
-	void (*on_display_ratings) (MediaPage* self, GtkAction* action);
-	void (*on_display_tags) (MediaPage* self, GtkAction* action);
+	void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value);
+	void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by);
 	void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by);
-	void (*on_sort_changed) (MediaPage* self);
+	void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value);
 	void (*developer_changed) (MediaPage* self, RawDeveloper rd);
 	DataView* (*create_thumbnail) (MediaPage* self, DataSource* source);
 };
@@ -659,6 +655,14 @@ gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
 static void tag_page_on_tags_altered (TagPage* self, GeeMap* map);
 static void _tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void tag_page_on_delete_tag (TagPage* self);
+static void _tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void tag_page_on_rename_tag (TagPage* self);
+static void _tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void tag_page_on_remove_tag_from_photos (TagPage* self);
+static void _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void tag_page_on_new_child_tag_sidebar (TagPage* self);
+static void _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 TagPage* tag_page_new (Tag* tag);
 TagPage* tag_page_construct (GType object_type, Tag* tag);
 gchar* data_object_get_name (DataObject* self);
@@ -677,36 +681,23 @@ ConfigFacade* config_facade_get_instance (void);
 void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by);
 static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by);
 void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by);
-static GtkActionEntry* tag_page_real_init_collect_action_entries (Page* base, int* result_length1);
-GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1);
-#define TRANSLATABLE "translatable"
-static void tag_page_on_delete_tag (TagPage* self);
-static void _tag_page_on_delete_tag_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add134 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void tag_page_on_rename_tag (TagPage* self);
-static void _tag_page_on_rename_tag_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add135 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-static void tag_page_on_remove_tag_from_photos (TagPage* self);
-static void _tag_page_on_remove_tag_from_photos_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add136 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_DELETE_TAG_SIDEBAR_MENU _ ("_Delete")
-static void _vala_array_add137 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_RENAME_TAG_SIDEBAR_MENU _ ("_Rename…")
-static void _vala_array_add138 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_NEW_CHILD_TAG_SIDEBAR_MENU _ ("_New")
-static void tag_page_on_new_child_tag_sidebar (TagPage* self);
-static void _tag_page_on_new_child_tag_sidebar_gtk_action_callback (GtkAction* action, gpointer self);
-static void _vala_array_add139 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
+static void tag_page_real_add_actions (Page* base);
+void page_add_actions (Page* self);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 void page_set_page_name (Page* self, const gchar* page_name);
 void page_update_actions (Page* self, gint selected_count, gint count);
 gint view_collection_get_selected_count (ViewCollection* self);
 gint data_collection_get_count (DataCollection* self);
-static void tag_page_real_update_actions (Page* base, gint selected_count, gint count);
-void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive);
+static void tag_page_real_switched_to (Page* base);
+void page_switched_to (Page* self);
+void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label);
 gchar* resources_delete_tag_menu (const gchar* name);
 gchar* tag_get_user_visible_name (Tag* self);
 gchar* resources_rename_tag_menu (const gchar* name);
 gchar* resources_untag_photos_menu (const gchar* name, gint count);
+static void tag_page_real_update_actions (Page* base, gint selected_count, gint count);
+void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive);
 GType command_get_type (void) G_GNUC_CONST;
 GType page_command_get_type (void) G_GNUC_CONST;
 GType simple_proxyable_command_get_type (void) G_GNUC_CONST;
@@ -722,7 +713,6 @@ gpointer value_get_command_manager (const GValue* value);
 GType command_manager_get_type (void) G_GNUC_CONST;
 CommandManager* app_window_get_command_manager (void);
 void command_manager_execute (CommandManager* self, Command* command);
-GType app_window_get_type (void) G_GNUC_CONST;
 GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
 void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag);
@@ -740,18 +730,47 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta
 GType tag_untag_photos_command_get_type (void) G_GNUC_CONST;
 static void tag_page_finalize (GObject* obj);
 
+static const GActionEntry TAG_PAGE_entries[4] = {{"DeleteTag", _tag_page_on_delete_tag_gsimple_action_activate_callback}, {"RenameTag", _tag_page_on_rename_tag_gsimple_action_activate_callback}, {"RemoveTagFromPhotos", _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback}, {"NewChildTagSidebar", _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback}};
 
 static void _tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 23 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	tag_page_on_tags_altered ((TagPage*) self, items);
-#line 748 "TagPage.c"
+#line 739 "TagPage.c"
+}
+
+
+static void _tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	tag_page_on_delete_tag ((TagPage*) self);
+#line 746 "TagPage.c"
+}
+
+
+static void _tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	tag_page_on_rename_tag ((TagPage*) self);
+#line 753 "TagPage.c"
+}
+
+
+static void _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	tag_page_on_remove_tag_from_photos ((TagPage*) self);
+#line 760 "TagPage.c"
+}
+
+
+static void _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	tag_page_on_new_child_tag_sidebar ((TagPage*) self);
+#line 767 "TagPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 755 "TagPage.c"
+#line 774 "TagPage.c"
 }
 
 
@@ -760,7 +779,7 @@ static DataView* _media_page_create_thumbnail_create_view (DataSource* source, g
 	result = media_page_create_thumbnail ((MediaPage*) self, source);
 #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	return result;
-#line 764 "TagPage.c"
+#line 783 "TagPage.c"
 }
 
 
@@ -810,17 +829,17 @@ TagPage* tag_page_construct (GType object_type, Tag* tag) {
 #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_data_collection_unref0 (_tmp8_);
 #line 18 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/TagsContextMenu");
+	checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "TagsContextMenu");
 #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	return self;
-#line 817 "TagPage.c"
+#line 836 "TagPage.c"
 }
 
 
 TagPage* tag_page_new (Tag* tag) {
 #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	return tag_page_construct (TYPE_TAG_PAGE, tag);
-#line 824 "TagPage.c"
+#line 843 "TagPage.c"
 }
 
 
@@ -840,7 +859,7 @@ static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_fil
 	_tmp1_ = ui_filenames;
 #line 28 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "tags.ui");
-#line 844 "TagPage.c"
+#line 863 "TagPage.c"
 }
 
 
@@ -858,7 +877,7 @@ Tag* tag_page_get_tag (TagPage* self) {
 	result = _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	return result;
-#line 862 "TagPage.c"
+#line 881 "TagPage.c"
 }
 
 
@@ -888,13 +907,13 @@ static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sor
 	if (sort_order) {
 #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		*sort_order = _vala_sort_order;
-#line 892 "TagPage.c"
+#line 911 "TagPage.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	if (sort_by) {
 #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		*sort_by = _vala_sort_by;
-#line 898 "TagPage.c"
+#line 917 "TagPage.c"
 	}
 }
 
@@ -919,325 +938,27 @@ static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort
 	configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_);
 #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 923 "TagPage.c"
-}
-
-
-static void _tag_page_on_delete_tag_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	tag_page_on_delete_tag ((TagPage*) self);
-#line 930 "TagPage.c"
-}
-
-
-static void _vala_array_add134 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	if ((*length) == (*size)) {
-#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 941 "TagPage.c"
-	}
-#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	(*array)[(*length)++] = *value;
-#line 945 "TagPage.c"
-}
-
-
-static void _tag_page_on_rename_tag_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	tag_page_on_rename_tag ((TagPage*) self);
-#line 952 "TagPage.c"
+#line 942 "TagPage.c"
 }
 
 
-static void _vala_array_add135 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	if ((*length) == (*size)) {
-#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 963 "TagPage.c"
-	}
-#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	(*array)[(*length)++] = *value;
-#line 967 "TagPage.c"
-}
-
-
-static void _tag_page_on_remove_tag_from_photos_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	tag_page_on_remove_tag_from_photos ((TagPage*) self);
-#line 974 "TagPage.c"
-}
-
-
-static void _vala_array_add136 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	if ((*length) == (*size)) {
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 985 "TagPage.c"
-	}
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	(*array)[(*length)++] = *value;
-#line 989 "TagPage.c"
-}
-
-
-static void _vala_array_add137 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	if ((*length) == (*size)) {
-#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1000 "TagPage.c"
-	}
-#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1004 "TagPage.c"
-}
-
-
-static void _vala_array_add138 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	if ((*length) == (*size)) {
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1015 "TagPage.c"
-	}
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1019 "TagPage.c"
-}
-
-
-static void _tag_page_on_new_child_tag_sidebar_gtk_action_callback (GtkAction* action, gpointer self) {
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	tag_page_on_new_child_tag_sidebar ((TagPage*) self);
-#line 1026 "TagPage.c"
-}
-
-
-static void _vala_array_add139 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) {
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	if ((*length) == (*size)) {
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*size = (*size) ? (2 * (*size)) : 4;
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*array = g_renew (GtkActionEntry, *array, *size);
-#line 1037 "TagPage.c"
-	}
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	(*array)[(*length)++] = *value;
-#line 1041 "TagPage.c"
-}
-
-
-static GtkActionEntry* tag_page_real_init_collect_action_entries (Page* base, int* result_length1) {
+static void tag_page_real_add_actions (Page* base) {
 	TagPage * self;
-	GtkActionEntry* result = NULL;
-	GtkActionEntry* actions = NULL;
-	gint _tmp0_ = 0;
-	GtkActionEntry* _tmp1_ = NULL;
-	gint actions_length1 = 0;
-	gint _actions_size_ = 0;
-	GtkActionEntry delete_tag = {0};
-	GtkActionEntry _tmp2_ = {0};
-	GtkActionEntry* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	GtkActionEntry _tmp4_ = {0};
-	GtkActionEntry rename_tag = {0};
-	GtkActionEntry _tmp5_ = {0};
-	GtkActionEntry* _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	GtkActionEntry _tmp7_ = {0};
-	GtkActionEntry remove_tag = {0};
-	GtkActionEntry _tmp8_ = {0};
-	GtkActionEntry* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-	GtkActionEntry _tmp10_ = {0};
-	GtkActionEntry delete_tag_sidebar = {0};
-	GtkActionEntry _tmp11_ = {0};
-	GtkActionEntry* _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	GtkActionEntry _tmp13_ = {0};
-	GtkActionEntry rename_tag_sidebar = {0};
-	GtkActionEntry _tmp14_ = {0};
-	GtkActionEntry* _tmp15_ = NULL;
-	gint _tmp15__length1 = 0;
-	GtkActionEntry _tmp16_ = {0};
-	GtkActionEntry new_child_tag_sidebar = {0};
-	GtkActionEntry _tmp17_ = {0};
-	GtkActionEntry* _tmp18_ = NULL;
-	gint _tmp18__length1 = 0;
-	GtkActionEntry _tmp19_ = {0};
-	GtkActionEntry* _tmp20_ = NULL;
-	gint _tmp20__length1 = 0;
-#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
-#line 44 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp1_ = PAGE_CLASS (tag_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), &_tmp0_);
-#line 44 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	actions = _tmp1_;
-#line 44 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	actions_length1 = _tmp0_;
-#line 44 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_actions_size_ = actions_length1;
-#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp2_.name = "DeleteTag";
-#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp2_.stock_id = NULL;
-#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp2_.label = TRANSLATABLE;
-#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp2_.accelerator = NULL;
-#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp2_.tooltip = NULL;
-#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp2_.callback = (GCallback) _tag_page_on_delete_tag_gtk_action_callback;
-#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	delete_tag = _tmp2_;
-#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp3_ = actions;
-#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp3__length1 = actions_length1;
-#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp4_ = delete_tag;
-#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_vala_array_add134 (&actions, &actions_length1, &_actions_size_, &_tmp4_);
-#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp5_.name = "RenameTag";
-#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp5_.stock_id = NULL;
-#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp5_.label = TRANSLATABLE;
-#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp5_.accelerator = NULL;
+	AppWindow* _tmp0_ = NULL;
+	AppWindow* _tmp1_ = NULL;
 #line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp5_.tooltip = NULL;
-#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp5_.callback = (GCallback) _tag_page_on_rename_tag_gtk_action_callback;
-#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	rename_tag = _tmp5_;
-#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp6_ = actions;
-#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp6__length1 = actions_length1;
-#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp7_ = rename_tag;
-#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_vala_array_add135 (&actions, &actions_length1, &_actions_size_, &_tmp7_);
-#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp8_.name = "RemoveTagFromPhotos";
-#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp8_.stock_id = NULL;
-#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp8_.label = TRANSLATABLE;
-#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp8_.accelerator = NULL;
-#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp8_.tooltip = NULL;
-#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp8_.callback = (GCallback) _tag_page_on_remove_tag_from_photos_gtk_action_callback;
-#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	remove_tag = _tmp8_;
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp9_ = actions;
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp9__length1 = actions_length1;
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp10_ = remove_tag;
-#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_vala_array_add136 (&actions, &actions_length1, &_actions_size_, &_tmp10_);
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp11_.name = "DeleteTagSidebar";
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp11_.stock_id = NULL;
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp11_.label = RESOURCES_DELETE_TAG_SIDEBAR_MENU;
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp11_.accelerator = NULL;
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp11_.tooltip = NULL;
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp11_.callback = (GCallback) _tag_page_on_delete_tag_gtk_action_callback;
-#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	delete_tag_sidebar = _tmp11_;
-#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp12_ = actions;
-#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp12__length1 = actions_length1;
-#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp13_ = delete_tag_sidebar;
-#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_vala_array_add137 (&actions, &actions_length1, &_actions_size_, &_tmp13_);
-#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp14_.name = "RenameTagSidebar";
-#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp14_.stock_id = NULL;
-#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp14_.label = RESOURCES_RENAME_TAG_SIDEBAR_MENU;
-#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp14_.accelerator = NULL;
-#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp14_.tooltip = NULL;
-#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp14_.callback = (GCallback) _tag_page_on_rename_tag_gtk_action_callback;
-#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	rename_tag_sidebar = _tmp14_;
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp15_ = actions;
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp15__length1 = actions_length1;
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp16_ = rename_tag_sidebar;
-#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_vala_array_add138 (&actions, &actions_length1, &_actions_size_, &_tmp16_);
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp17_.name = "NewChildTagSidebar";
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp17_.stock_id = NULL;
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp17_.label = RESOURCES_NEW_CHILD_TAG_SIDEBAR_MENU;
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp17_.accelerator = NULL;
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp17_.tooltip = NULL;
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp17_.callback = (GCallback) _tag_page_on_new_child_tag_sidebar_gtk_action_callback;
-#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	new_child_tag_sidebar = _tmp17_;
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp18_ = actions;
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp18__length1 = actions_length1;
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp19_ = new_child_tag_sidebar;
-#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_vala_array_add139 (&actions, &actions_length1, &_actions_size_, &_tmp19_);
-#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp20_ = actions;
-#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	_tmp20__length1 = actions_length1;
-#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	if (result_length1) {
-#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-		*result_length1 = _tmp20__length1;
-#line 1235 "TagPage.c"
-	}
-#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	result = _tmp20_;
-#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	return result;
-#line 1241 "TagPage.c"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
+#line 51 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	PAGE_CLASS (tag_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page));
+#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp0_ = app_window_get_instance ();
+#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp1_ = _tmp0_;
+#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), TAG_PAGE_entries, G_N_ELEMENTS (TAG_PAGE_entries), self);
+#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_g_object_unref0 (_tmp1_);
+#line 962 "TagPage.c"
 }
 
 
@@ -1245,19 +966,19 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) {
 	GeeMap* _tmp0_ = NULL;
 	Tag* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
-#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 75 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = map;
-#line 75 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp1_ = self->priv->tag;
-#line 75 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
-#line 75 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	if (_tmp2_) {
-#line 1261 "TagPage.c"
+#line 982 "TagPage.c"
 		Tag* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -1267,39 +988,112 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) {
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
-#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp3_ = self->priv->tag;
-#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp5_ = _tmp4_;
-#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_);
-#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_g_free0 (_tmp5_);
-#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp7_ = _tmp6_;
-#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp10_ = _tmp9_;
-#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp11_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
-#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp8_, _tmp11_);
-#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 1299 "TagPage.c"
+#line 1020 "TagPage.c"
 	}
 }
 
 
+static void tag_page_real_switched_to (Page* base) {
+	TagPage * self;
+	Tag* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	Tag* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+	Tag* _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+	gchar* _tmp12_ = NULL;
+	gchar* _tmp13_ = NULL;
+	gchar* _tmp14_ = NULL;
+#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
+#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	PAGE_CLASS (tag_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page));
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp0_ = self->priv->tag;
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp1_ = tag_get_user_visible_name (_tmp0_);
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp2_ = _tmp1_;
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp3_ = resources_delete_tag_menu (_tmp2_);
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp4_ = _tmp3_;
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DeleteTag", _tmp4_);
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_g_free0 (_tmp4_);
+#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_g_free0 (_tmp2_);
+#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp5_ = self->priv->tag;
+#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp6_ = tag_get_user_visible_name (_tmp5_);
+#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp7_ = _tmp6_;
+#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp8_ = resources_rename_tag_menu (_tmp7_);
+#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp9_ = _tmp8_;
+#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RenameTag", _tmp9_);
+#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_g_free0 (_tmp9_);
+#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_g_free0 (_tmp7_);
+#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp10_ = self->priv->tag;
+#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp11_ = tag_get_user_visible_name (_tmp10_);
+#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp12_ = _tmp11_;
+#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp13_ = resources_untag_photos_menu (_tmp12_, 0);
+#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_tmp14_ = _tmp13_;
+#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveTagFromPhotos", _tmp14_);
+#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_g_free0 (_tmp14_);
+#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	_g_free0 (_tmp12_);
+#line 1094 "TagPage.c"
+}
+
+
 static void tag_page_real_update_actions (Page* base, gint selected_count, gint count) {
 	TagPage * self;
 	Tag* _tmp0_ = NULL;
@@ -1321,67 +1115,67 @@ static void tag_page_real_update_actions (Page* base, gint selected_count, gint
 	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
 	gint _tmp18_ = 0;
-#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 73 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage);
-#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = self->priv->tag;
-#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp1_ = tag_get_user_visible_name (_tmp0_);
-#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp2_ = _tmp1_;
-#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp3_ = resources_delete_tag_menu (_tmp2_);
-#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp4_ = _tmp3_;
-#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DeleteTag", _tmp4_, NULL, TRUE);
-#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp4_);
-#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp2_);
-#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp5_ = self->priv->tag;
-#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp6_ = tag_get_user_visible_name (_tmp5_);
-#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp7_ = _tmp6_;
-#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp8_ = resources_rename_tag_menu (_tmp7_);
-#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp9_ = _tmp8_;
-#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RenameTag", _tmp9_, NULL, TRUE);
-#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp9_);
-#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp7_);
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp10_ = self->priv->tag;
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp11_ = tag_get_user_visible_name (_tmp10_);
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp12_ = _tmp11_;
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp13_ = selected_count;
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp14_ = resources_untag_photos_menu (_tmp12_, _tmp13_);
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp15_ = _tmp14_;
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp16_ = selected_count;
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveTagFromPhotos", _tmp15_, NULL, _tmp16_ > 0);
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp15_);
-#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_free0 (_tmp12_);
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp17_ = selected_count;
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp18_ = count;
-#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	PAGE_CLASS (tag_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp17_, _tmp18_);
-#line 1385 "TagPage.c"
+#line 1179 "TagPage.c"
 }
 
 
@@ -1395,39 +1189,39 @@ static void tag_page_on_new_child_tag_sidebar (TagPage* self) {
 	LibraryWindow* _tmp5_ = NULL;
 	Tag* _tmp6_ = NULL;
 	Tag* _tmp7_ = NULL;
-#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
-#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = self->priv->tag;
-#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp1_ = new_child_tag_command_new (_tmp0_);
-#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	creation_command = _tmp1_;
-#line 103 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp2_ = app_window_get_command_manager ();
-#line 103 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp3_ = _tmp2_;
-#line 103 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (creation_command, TYPE_COMMAND, Command));
-#line 103 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_command_manager_unref0 (_tmp3_);
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp4_ = library_window_get_app ();
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp5_ = _tmp4_;
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp6_ = new_child_tag_command_get_created_child (creation_command);
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp7_ = _tmp6_;
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	library_window_rename_tag_in_sidebar (_tmp5_, _tmp7_);
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_object_unref0 (creation_command);
-#line 1431 "TagPage.c"
+#line 1225 "TagPage.c"
 }
 
 
@@ -1435,56 +1229,56 @@ static void tag_page_on_rename_tag (TagPage* self) {
 	LibraryWindow* _tmp0_ = NULL;
 	LibraryWindow* _tmp1_ = NULL;
 	Tag* _tmp2_ = NULL;
-#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
-#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = library_window_get_app ();
-#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp1_ = _tmp0_;
-#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp2_ = self->priv->tag;
-#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	library_window_rename_tag_in_sidebar (_tmp1_, _tmp2_);
-#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1451 "TagPage.c"
+#line 1245 "TagPage.c"
 }
 
 
 static void tag_page_on_delete_tag (TagPage* self) {
 	Tag* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
-#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = self->priv->tag;
-#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp1_ = dialogs_confirm_delete_tag (_tmp0_);
-#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	if (_tmp1_) {
-#line 1466 "TagPage.c"
+#line 1260 "TagPage.c"
 		CommandManager* _tmp2_ = NULL;
 		CommandManager* _tmp3_ = NULL;
 		Tag* _tmp4_ = NULL;
 		DeleteTagCommand* _tmp5_ = NULL;
 		DeleteTagCommand* _tmp6_ = NULL;
-#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp2_ = app_window_get_command_manager ();
-#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp3_ = _tmp2_;
-#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp4_ = self->priv->tag;
-#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp5_ = delete_tag_command_new (_tmp4_);
-#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp6_ = _tmp5_;
-#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 1488 "TagPage.c"
+#line 1282 "TagPage.c"
 	}
 }
 
@@ -1494,21 +1288,21 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	g_return_if_fail (IS_TAG_PAGE (self));
-#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp1_ = _tmp0_;
-#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	if (_tmp3_) {
-#line 1512 "TagPage.c"
+#line 1306 "TagPage.c"
 		CommandManager* _tmp4_ = NULL;
 		CommandManager* _tmp5_ = NULL;
 		Tag* _tmp6_ = NULL;
@@ -1521,43 +1315,43 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) {
 		gint _tmp13_ = 0;
 		TagUntagPhotosCommand* _tmp14_ = NULL;
 		TagUntagPhotosCommand* _tmp15_ = NULL;
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp5_ = _tmp4_;
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp6_ = self->priv->tag;
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp8_ = _tmp7_;
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp9_ = view_collection_get_selected_sources (_tmp8_);
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp12_ = _tmp11_;
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp13_ = view_collection_get_selected_count (_tmp12_);
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp14_ = tag_untag_photos_command_new (_tmp6_, _tmp10_, _tmp13_, FALSE);
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_tmp15_ = _tmp14_;
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_COMMAND, Command));
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 1561 "TagPage.c"
+#line 1355 "TagPage.c"
 	}
 }
 
@@ -1574,19 +1368,21 @@ static void tag_page_class_init (TagPageClass * klass) {
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	((MediaPageClass *) klass)->set_config_photos_sort = tag_page_real_set_config_photos_sort;
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
-	((PageClass *) klass)->init_collect_action_entries = tag_page_real_init_collect_action_entries;
+	((PageClass *) klass)->add_actions = tag_page_real_add_actions;
+#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
+	((PageClass *) klass)->switched_to = tag_page_real_switched_to;
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	((PageClass *) klass)->update_actions = tag_page_real_update_actions;
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = tag_page_finalize;
-#line 1583 "TagPage.c"
+#line 1379 "TagPage.c"
 }
 
 
 static void tag_page_instance_init (TagPage * self) {
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	self->priv = TAG_PAGE_GET_PRIVATE (self);
-#line 1590 "TagPage.c"
+#line 1386 "TagPage.c"
 }
 
 
@@ -1616,7 +1412,7 @@ static void tag_page_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->tag);
 #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala"
 	G_OBJECT_CLASS (tag_page_parent_class)->finalize (obj);
-#line 1620 "TagPage.c"
+#line 1416 "TagPage.c"
 }
 
 
diff --git a/src/tags/TagPage.vala b/src/tags/TagPage.vala
index 7e937ad..04696c5 100644
--- a/src/tags/TagPage.vala
+++ b/src/tags/TagPage.vala
@@ -15,7 +15,7 @@ public class TagPage : CollectionPage {
         Tag.global.items_altered.connect(on_tags_altered);
         tag.mirror_sources(get_view(), create_thumbnail);
         
-        init_page_context_menu("/TagsContextMenu");
+        init_page_context_menu("TagsContextMenu");
     }
     
     ~TagPage() {
@@ -39,44 +39,36 @@ public class TagPage : CollectionPage {
     protected override void set_config_photos_sort(bool sort_order, int sort_by) {
         Config.Facade.get_instance().set_event_photos_sort(sort_order, sort_by);
     }
-    
-    protected override Gtk.ActionEntry[] init_collect_action_entries() {
-        Gtk.ActionEntry[] actions = base.init_collect_action_entries();
-        
-        Gtk.ActionEntry delete_tag = { "DeleteTag", null, TRANSLATABLE, null, null, on_delete_tag };
-        // label and tooltip are assigned when the menu is displayed
-        actions += delete_tag;
-        
-        Gtk.ActionEntry rename_tag = { "RenameTag", null, TRANSLATABLE, null, null, on_rename_tag };
-        // label and tooltip are assigned when the menu is displayed
-        actions += rename_tag;
-        
-        Gtk.ActionEntry remove_tag = { "RemoveTagFromPhotos", null, TRANSLATABLE, null, null, 
-            on_remove_tag_from_photos };
-        // label and tooltip are assigned when the menu is displayed
-        actions += remove_tag;
-        
-        Gtk.ActionEntry delete_tag_sidebar = { "DeleteTagSidebar", null, Resources.DELETE_TAG_SIDEBAR_MENU, 
-            null, null, on_delete_tag };
-        actions += delete_tag_sidebar;
-        
-        Gtk.ActionEntry rename_tag_sidebar = { "RenameTagSidebar", null, Resources.RENAME_TAG_SIDEBAR_MENU, 
-            null, null, on_rename_tag };
-        actions += rename_tag_sidebar;
 
-        Gtk.ActionEntry new_child_tag_sidebar = { "NewChildTagSidebar", null, Resources.NEW_CHILD_TAG_SIDEBAR_MENU,
-            null, null, on_new_child_tag_sidebar };
-        actions += new_child_tag_sidebar;
+    private const GLib.ActionEntry entries[] = {
+        { "DeleteTag", on_delete_tag },
+        { "RenameTag", on_rename_tag },
+        { "RemoveTagFromPhotos", on_remove_tag_from_photos },
+        { "NewChildTagSidebar", on_new_child_tag_sidebar }
+    };
+
+    protected override void add_actions () {
+        base.add_actions ();
 
-        return actions;
+        AppWindow.get_instance ().add_action_entries (entries, this);
     }
-    
+
     private void on_tags_altered(Gee.Map<DataObject, Alteration> map) {
         if (map.has_key(tag)) {
             set_page_name(tag.get_name());
             update_actions(get_view().get_selected_count(), get_view().get_count());
         }
     }
+
+    public override void switched_to () {
+        base.switched_to ();
+        this.update_menu_item_label ("DeleteTag",
+            Resources.delete_tag_menu(tag.get_user_visible_name()));
+        this.update_menu_item_label ("RenameTag",
+            Resources.rename_tag_menu(tag.get_user_visible_name()));
+        this.update_menu_item_label ("RemoveTagFromPhotos",
+            Resources.untag_photos_menu(tag.get_user_visible_name(), 0));
+     }
     
     protected override void update_actions(int selected_count, int count) {
         set_action_details("DeleteTag",
diff --git a/src/threads/BackgroundJob.c b/src/threads/BackgroundJob.c
index 02c8db6..caeab3b 100644
--- a/src/threads/BackgroundJob.c
+++ b/src/threads/BackgroundJob.c
@@ -237,7 +237,7 @@ enum  {
 	BACKGROUND_JOB_DUMMY_PROPERTY
 };
 gint background_job_job_priority_compare (BackgroundJobJobPriority self, BackgroundJobJobPriority other);
-gint background_job_job_priority_compare_func (void* a, void* b);
+gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, BackgroundJobJobPriority b);
 static gpointer background_job_notification_job_ref (gpointer instance);
 static void background_job_notification_job_unref (gpointer instance);
 static GParamSpec* background_job_param_spec_notification_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
@@ -622,10 +622,10 @@ gint background_job_job_priority_compare (BackgroundJobJobPriority self, Backgro
 }
 
 
-gint background_job_job_priority_compare_func (void* a, void* b) {
+gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, BackgroundJobJobPriority b) {
 	gint result = 0;
-	void* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
+	BackgroundJobJobPriority _tmp0_ = 0;
+	BackgroundJobJobPriority _tmp1_ = 0;
 #line 79 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
 	_tmp0_ = b;
 #line 79 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala"
diff --git a/src/threads/BackgroundJob.vala b/src/threads/BackgroundJob.vala
index 2188425..5d259e7 100644
--- a/src/threads/BackgroundJob.vala
+++ b/src/threads/BackgroundJob.vala
@@ -75,7 +75,7 @@ public abstract class BackgroundJob {
             return (int) other - (int) this;
         }
         
-        public static int compare_func(void *a, void *b) {
+        public static int compare_func(JobPriority a, JobPriority b) {
             return (int) b - (int) a;
         }
     }
diff --git a/src/util/ui.c b/src/util/ui.c
index be0f739..56a355a 100644
--- a/src/util/ui.c
+++ b/src/util/ui.c
@@ -21,9 +21,6 @@
 #define TYPE_COMPASS_POINT (compass_point_get_type ())
 
 #define TYPE_DIRECTION (direction_get_type ())
-#define _g_free0(var) (var = (g_free (var), NULL))
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL)))
 
 typedef enum  {
 	ADJUSTMENT_RELATION_BELOW,
@@ -54,7 +51,6 @@ void spin_event_loop (void);
 AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint value);
 void get_adjustment_page (GtkAdjustment* hadj, GtkAdjustment* vadj, GdkRectangle* result);
 gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask);
-gchar* build_dummy_ui_string (GtkActionGroup** groups, int groups_length1);
 
 
 GType adjustment_relation_get_type (void) {
@@ -87,23 +83,23 @@ SpitTransitionsDirection direction_to_transition_direction (Direction self) {
 	switch (self) {
 #line 25 "/home/jens/Source/shotwell/src/util/ui.vala"
 		case DIRECTION_FORWARD:
-#line 91 "ui.c"
+#line 87 "ui.c"
 		{
 #line 27 "/home/jens/Source/shotwell/src/util/ui.vala"
 			result = SPIT_TRANSITIONS_DIRECTION_FORWARD;
 #line 27 "/home/jens/Source/shotwell/src/util/ui.vala"
 			return result;
-#line 97 "ui.c"
+#line 93 "ui.c"
 		}
 #line 25 "/home/jens/Source/shotwell/src/util/ui.vala"
 		case DIRECTION_BACKWARD:
-#line 101 "ui.c"
+#line 97 "ui.c"
 		{
 #line 30 "/home/jens/Source/shotwell/src/util/ui.vala"
 			result = SPIT_TRANSITIONS_DIRECTION_BACKWARD;
 #line 30 "/home/jens/Source/shotwell/src/util/ui.vala"
 			return result;
-#line 107 "ui.c"
+#line 103 "ui.c"
 		}
 		default:
 		{
@@ -112,7 +108,7 @@ SpitTransitionsDirection direction_to_transition_direction (Direction self) {
 			_tmp0_ = g_enum_get_value (g_type_class_ref (TYPE_DIRECTION), self);
 #line 33 "/home/jens/Source/shotwell/src/util/ui.vala"
 			g_error ("ui.vala:33: Unknown Direction %s", (_tmp0_ != NULL) ? _tmp0_->value_name : NULL);
-#line 116 "ui.c"
+#line 112 "ui.c"
 		}
 	}
 }
@@ -133,7 +129,7 @@ GType direction_get_type (void) {
 void spin_event_loop (void) {
 #line 39 "/home/jens/Source/shotwell/src/util/ui.vala"
 	while (TRUE) {
-#line 137 "ui.c"
+#line 133 "ui.c"
 		gboolean _tmp0_ = FALSE;
 #line 39 "/home/jens/Source/shotwell/src/util/ui.vala"
 		_tmp0_ = gtk_events_pending ();
@@ -141,11 +137,11 @@ void spin_event_loop (void) {
 		if (!_tmp0_) {
 #line 39 "/home/jens/Source/shotwell/src/util/ui.vala"
 			break;
-#line 145 "ui.c"
+#line 141 "ui.c"
 		}
 #line 40 "/home/jens/Source/shotwell/src/util/ui.vala"
 		gtk_main_iteration ();
-#line 149 "ui.c"
+#line 145 "ui.c"
 	}
 }
 
@@ -169,7 +165,7 @@ AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint valu
 		result = ADJUSTMENT_RELATION_BELOW;
 #line 45 "/home/jens/Source/shotwell/src/util/ui.vala"
 		return result;
-#line 173 "ui.c"
+#line 169 "ui.c"
 	} else {
 		gint _tmp3_ = 0;
 		GtkAdjustment* _tmp4_ = NULL;
@@ -192,13 +188,13 @@ AdjustmentRelation get_adjustment_relation (GtkAdjustment* adjustment, gint valu
 			result = ADJUSTMENT_RELATION_ABOVE;
 #line 47 "/home/jens/Source/shotwell/src/util/ui.vala"
 			return result;
-#line 196 "ui.c"
+#line 192 "ui.c"
 		} else {
 #line 49 "/home/jens/Source/shotwell/src/util/ui.vala"
 			result = ADJUSTMENT_RELATION_IN_RANGE;
 #line 49 "/home/jens/Source/shotwell/src/util/ui.vala"
 			return result;
-#line 202 "ui.c"
+#line 198 "ui.c"
 		}
 	}
 }
@@ -248,7 +244,7 @@ void get_adjustment_page (GtkAdjustment* hadj, GtkAdjustment* vadj, GdkRectangle
 	*result = rect;
 #line 59 "/home/jens/Source/shotwell/src/util/ui.vala"
 	return;
-#line 252 "ui.c"
+#line 248 "ui.c"
 }
 
 
@@ -264,141 +260,7 @@ gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask) {
 	result = (_tmp0_ & ((((((((GDK_SHIFT_MASK | GDK_CONTROL_MASK) | GDK_MOD1_MASK) | GDK_MOD3_MASK) | GDK_MOD4_MASK) | GDK_MOD5_MASK) | GDK_SUPER_MASK) | GDK_HYPER_MASK) | GDK_META_MASK)) == _tmp1_;
 #line 77 "/home/jens/Source/shotwell/src/util/ui.vala"
 	return result;
-#line 268 "ui.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 91 "/home/jens/Source/shotwell/src/util/ui.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 275 "ui.c"
-}
-
-
-gchar* build_dummy_ui_string (GtkActionGroup** groups, int groups_length1) {
-	gchar* result = NULL;
-	gchar* ui_string = NULL;
-	gchar* _tmp0_ = NULL;
-	GtkActionGroup** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-#line 90 "/home/jens/Source/shotwell/src/util/ui.vala"
-	_tmp0_ = g_strdup ("<ui>");
-#line 90 "/home/jens/Source/shotwell/src/util/ui.vala"
-	ui_string = _tmp0_;
-#line 91 "/home/jens/Source/shotwell/src/util/ui.vala"
-	_tmp1_ = groups;
-#line 91 "/home/jens/Source/shotwell/src/util/ui.vala"
-	_tmp1__length1 = groups_length1;
-#line 295 "ui.c"
-	{
-		GtkActionGroup** group_collection = NULL;
-		gint group_collection_length1 = 0;
-		gint _group_collection_size_ = 0;
-		gint group_it = 0;
-#line 91 "/home/jens/Source/shotwell/src/util/ui.vala"
-		group_collection = _tmp1_;
-#line 91 "/home/jens/Source/shotwell/src/util/ui.vala"
-		group_collection_length1 = _tmp1__length1;
-#line 91 "/home/jens/Source/shotwell/src/util/ui.vala"
-		for (group_it = 0; group_it < _tmp1__length1; group_it = group_it + 1) {
-#line 307 "ui.c"
-			GtkActionGroup* _tmp2_ = NULL;
-			GtkActionGroup* group = NULL;
-#line 91 "/home/jens/Source/shotwell/src/util/ui.vala"
-			_tmp2_ = _g_object_ref0 (group_collection[group_it]);
-#line 91 "/home/jens/Source/shotwell/src/util/ui.vala"
-			group = _tmp2_;
-#line 314 "ui.c"
-			{
-				GtkActionGroup* _tmp3_ = NULL;
-				GList* _tmp4_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/util/ui.vala"
-				_tmp3_ = group;
-#line 92 "/home/jens/Source/shotwell/src/util/ui.vala"
-				_tmp4_ = gtk_action_group_list_actions (_tmp3_);
-#line 322 "ui.c"
-				{
-					GList* action_collection = NULL;
-					GList* action_it = NULL;
-#line 92 "/home/jens/Source/shotwell/src/util/ui.vala"
-					action_collection = _tmp4_;
-#line 92 "/home/jens/Source/shotwell/src/util/ui.vala"
-					for (action_it = action_collection; action_it != NULL; action_it = action_it->next) {
-#line 330 "ui.c"
-						GtkAction* _tmp5_ = NULL;
-						GtkAction* action = NULL;
-#line 92 "/home/jens/Source/shotwell/src/util/ui.vala"
-						_tmp5_ = _g_object_ref0 ((GtkAction*) action_it->data);
-#line 92 "/home/jens/Source/shotwell/src/util/ui.vala"
-						action = _tmp5_;
-#line 337 "ui.c"
-						{
-							const gchar* _tmp6_ = NULL;
-							GtkAction* _tmp7_ = NULL;
-							const gchar* _tmp8_ = NULL;
-							const gchar* _tmp9_ = NULL;
-							GtkAction* _tmp10_ = NULL;
-							const gchar* _tmp11_ = NULL;
-							const gchar* _tmp12_ = NULL;
-							gchar* _tmp13_ = NULL;
-							gchar* _tmp14_ = NULL;
-							gchar* _tmp15_ = NULL;
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_tmp6_ = ui_string;
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_tmp7_ = action;
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_tmp8_ = gtk_action_get_name (_tmp7_);
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_tmp9_ = _tmp8_;
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_tmp10_ = action;
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_tmp11_ = gtk_action_get_name (_tmp10_);
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_tmp12_ = _tmp11_;
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_tmp13_ = g_strdup_printf ("<accelerator name=\"%s\" action=\"%s\" />", _tmp9_, _tmp12_);
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_tmp14_ = _tmp13_;
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_tmp15_ = g_strconcat (_tmp6_, _tmp14_, NULL);
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_g_free0 (ui_string);
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							ui_string = _tmp15_;
-#line 93 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_g_free0 (_tmp14_);
-#line 92 "/home/jens/Source/shotwell/src/util/ui.vala"
-							_g_object_unref0 (action);
-#line 377 "ui.c"
-						}
-					}
-#line 92 "/home/jens/Source/shotwell/src/util/ui.vala"
-					_g_list_free0 (action_collection);
-#line 382 "ui.c"
-				}
-#line 91 "/home/jens/Source/shotwell/src/util/ui.vala"
-				_g_object_unref0 (group);
-#line 386 "ui.c"
-			}
-		}
-	}
-#line 95 "/home/jens/Source/shotwell/src/util/ui.vala"
-	_tmp16_ = ui_string;
-#line 95 "/home/jens/Source/shotwell/src/util/ui.vala"
-	_tmp17_ = g_strconcat (_tmp16_, "</ui>", NULL);
-#line 95 "/home/jens/Source/shotwell/src/util/ui.vala"
-	_g_free0 (ui_string);
-#line 95 "/home/jens/Source/shotwell/src/util/ui.vala"
-	ui_string = _tmp17_;
-#line 97 "/home/jens/Source/shotwell/src/util/ui.vala"
-	result = ui_string;
-#line 97 "/home/jens/Source/shotwell/src/util/ui.vala"
-	return result;
-#line 402 "ui.c"
+#line 264 "ui.c"
 }
 
 
diff --git a/src/util/ui.vala b/src/util/ui.vala
index a161ebd..e1c22f1 100644
--- a/src/util/ui.vala
+++ b/src/util/ui.vala
@@ -86,13 +86,3 @@ public bool has_only_key_modifier(Gdk.ModifierType field, Gdk.ModifierType mask)
         | Gdk.ModifierType.META_MASK)) == mask;
 }
 
-public string build_dummy_ui_string(Gtk.ActionGroup[] groups) {
-    string ui_string = "<ui>";
-    foreach (Gtk.ActionGroup group in groups) {
-        foreach (Gtk.Action action in group.list_actions())
-            ui_string += "<accelerator name=\"%s\" action=\"%s\" />".printf(action.name, action.name);
-    }
-    ui_string += "</ui>";
-    
-    return ui_string;
-}
diff --git a/ui/collection.ui b/ui/collection.ui
index d832ea6..162aea2 100644
--- a/ui/collection.ui
+++ b/ui/collection.ui
@@ -1,51 +1,225 @@
-<ui>
-    <popup name="CollectionContextMenu">
-        <menuitem name="ContextEnhance" action="Enhance" />
-        <menuitem name="ContextRevert" action="Revert" />
-        <separator />
-        <menuitem name="ContextAddTags" action="AddTagsContextMenu" />
-        <menuitem name="ContextModifyTags" action="ModifyTags" />
-        <placeholder name="ContextTagsPlaceholder" />
-        <separator />
-        <placeholder name="ContextFacesPlaceholder" />
-        <separator />
-        <menuitem name="ContextFlag" action="Flag" />
-        <menu name="Rate" action="Rate">
-            <menuitem name="RateFive" action="RateFive" />
-            <menuitem name="RateFour" action="RateFour" />
-            <menuitem name="RateThree" action="RateThree" />
-            <menuitem name="RateTwo" action="RateTwo" />
-            <menuitem name="RateOne" action="RateOne" />
-            <menuitem name="RateUnrated" action="RateUnrated" />
-            <menuitem name="RateRejected" action="RateRejected" />
-            <separator />
-            <menuitem name="IncreaseRating" action="IncreaseRating" />
-            <menuitem name="DecreaseRating" action="DecreaseRating" />
-        </menu>
-        <menu name="RawDeveloper" action="RawDeveloper">
-            <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
-            <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
-        </menu>
-        <separator />
-        <menuitem name="ContextEditTitle" action="EditTitle" />
-        <menuitem name="ContextEditComment" action="EditComment" />
-        <menuitem name="ContextExternalEdit" action="ExternalEdit" />
-        <menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />
-        <separator />
-        <menuitem name="ContextJumpToEvent" action="CommonJumpToEvent" />
-        <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
-        <menuitem name="ContextSendTo" action="SendToContextMenu" />
-        <separator />
-        <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
-    </popup>
-    
-    <toolbar name="CollectionToolbar">
-        <toolitem name="ToolRotate" action="RotateClockwise" />
-        <toolitem name="ToolEnhance" action="Enhance" />
-        <separator />
-        <toolitem name="ToolPublish" action="Publish" />
-        <separator />
-        <toolitem name="ToolFind" action="CommonDisplaySearchbar" />
-    </toolbar>
-</ui>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
+  <menu id="CollectionContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Enhance</attribute>
+        <attribute name="accel">&lt;Primary&gt;e</attribute>
+        <attribute name="action">win.Enhance</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Re_vert to Original</attribute>
+        <attribute name="action">win.Revert</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Add _Tags…</attribute>
+        <attribute name="accel">&lt;Primary&gt;t</attribute>
+        <attribute name="action">win.AddTags</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
+        <attribute name="accel">&lt;Primary&gt;m</attribute>
+        <attribute name="action">win.ModifyTags</attribute>
+      </item>
+      <attribute name="id">ContextTagsPlaceholder</attribute>
+    </section>
+    <section>
+      <attribute name="id">ContextFacesPlaceholder</attribute>
+      <item>
+        <attribute name="label" translatable="yes">Toggle _Flag</attribute>
+        <attribute name="accel">&lt;Primary&gt;g</attribute>
+        <attribute name="action">win.Flag</attribute>
+      </item>
+    </section>
+    <submenu>
+      <attribute name="label" translatable="yes">_Set Rating</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="no">★★★★★</attribute>
+          <attribute name="action">win.RateFive</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="no">★★★★</attribute>
+          <attribute name="action">win.RateFour</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="no">★★★</attribute>
+          <attribute name="action">win.RateThree</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="no">★★</attribute>
+          <attribute name="action">win.RateTwo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="no">★</attribute>
+          <attribute name="action">win.RateOne</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Unrated</attribute>
+          <attribute name="action">win.RateUnrated</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Rejected</attribute>
+          <attribute name="action">win.RateRejected</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Increase</attribute>
+          <attribute name="action">win.IncreaseRating</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Decrease</attribute>
+          <attribute name="action">win.DecreaseRating</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Developer</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Shotwell</attribute>
+          <attribute name="action">win.RawDeveloper</attribute>
+          <attribute name="target">Shotwell</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Camera</attribute>
+          <attribute name="action">win.RawDeveloper</attribute>
+          <attribute name="target">Camera</attribute>
+        </item>
+      </section>
+    </submenu>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Edit _Title…</attribute>
+        <attribute name="action">win.EditTitle</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Edit _Comment…</attribute>
+        <attribute name="action">win.EditComment</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
+        <attribute name="accel">&lt;Primary&gt;Return</attribute>
+        <attribute name="action">win.ExternalEdit</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Open With RA_W Editor</attribute>
+        <attribute name="action">win.ExternalEditRAW</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">View Eve_nt for Photo</attribute>
+        <attribute name="action">win.CommonJumpToEvent</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+        <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
+        <attribute name="action">win.CommonJumpToFile</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Send _To…</attribute>
+        <attribute name="action">win.SendTo</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Move to Trash</attribute>
+        <attribute name="accel">Delete</attribute>
+        <attribute name="action">win.MoveToTrash</attribute>
+      </item>
+    </section>
+  </menu>
+  <object class="GtkToolbar" id="CollectionToolbar">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="toolbar_style">both-horiz</property>
+    <child>
+      <object class="GtkToolButton" id="ToolRotate">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Rotate the photos right (press Ctrl to rotate left)</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.RotateClockwise</property>
+        <property name="label" translatable="yes">Rotate</property>
+        <property name="use_underline">True</property>
+        <property name="icon_name">object-rotate-right</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToolButton" id="ToolEnhance">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Automatically improve the photo’s appearance</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.Enhance</property>
+        <property name="label" translatable="yes">Enhance</property>
+        <property name="use_underline">True</property>
+        <property name="icon_name">shotwell-auto-enhance</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkSeparatorToolItem">
+        <property name="can_focus">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">False</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToolButton" id="ToolPublish">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Publish to various websites</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.Publish</property>
+        <property name="label" translatable="yes">Publish</property>
+        <property name="use_underline">True</property>
+        <property name="icon_name">applications-internet</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkSeparatorToolItem">
+        <property name="can_focus">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">False</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToggleToolButton" id="ToolFind">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Find an image by typing text that appears in its name or tags</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.CommonDisplaySearchbar</property>
+        <property name="label" translatable="yes">Find</property>
+        <property name="use_underline">True</property>
+        <property name="icon_name">edit-find</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+  </object>
+</interface>
diff --git a/ui/direct.ui b/ui/direct.ui
index e3d4e34..75acb0f 100644
--- a/ui/direct.ui
+++ b/ui/direct.ui
@@ -1,70 +1,197 @@
-<ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Save" action="Save" />
-            <menuitem name="SaveAs" action="SaveAs" />
-            <separator />
-            <placeholder name="PrintPlaceholder"/>
-            <separator />
-            <menuitem name="SendTo" action="SendTo" />
-            <placeholder name="SetBackgroundPlaceholder" />
-            <separator />
-            <menuitem name="JumpToFile" action="CommonJumpToFile" />
-            <separator />
-            <menuitem name="Quit" action="CommonQuit" />
-        </menu>
-        
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-        </menu>
-        
-        <menu name="ViewMenu" action="ViewMenu">
-            <menuitem name="Fullscreen" action="CommonFullscreen" />
-            <separator />
-            <menuitem name="IncreaseSize" action="IncreaseSize" />
-            <menuitem name="DecreaseSize" action="DecreaseSize" />
-            <separator />
-            <menuitem name="ZoomFit" action="ZoomFit" />
-            <menuitem name="Zoom100" action="Zoom100" />
-            <menuitem name="Zoom200" action="Zoom200" />
-        </menu>
-
-        <menu name="PhotoMenu" action="PhotoMenu">
-            <menuitem name="PrevPhoto" action="PrevPhoto" />
-            <menuitem name="NextPhoto" action="NextPhoto" />
-            <separator />
-            <menuitem name="RotateClockwise" action="RotateClockwise" />
-            <menuitem name="RotateCounterclockwise" action="RotateCounterclockwise" />
-            <menuitem name="FlipHorizontally" action="FlipHorizontally" />
-            <menuitem name="FlipVertically" action="FlipVertically" />
-            <separator />
-            <menu name="Tools" action="Tools">
-                <menuitem name="Enhance" action="Enhance" />
-                <menuitem name="Crop" action="Crop" />
-                <menuitem name="Straighten" action="Straighten" />
-                <menuitem name="RedEye" action="RedEye" />
-                <menuitem name="Adjust" action="Adjust" />
-            </menu>
-            <menuitem name="Revert" action="Revert" />
-            <separator />
-            <menuitem name="AdjustDateTime" action="AdjustDateTime" />
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="Contents" action="CommonHelpContents" />
-            <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
-            <menuitem name="Report a Problem…" action="CommonHelpReportProblem" />
-            <separator />
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-
-    <popup name="DirectContextMenu">
-        <placeholder name="ContextJumpPlaceholder">
-            <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
-        </placeholder>
-    </popup>
-    
-</ui>
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Save</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
+          <attribute name="action">win.Save</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Save _As…</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;s</attribute>
+          <attribute name="action">win.SaveAs</attribute>
+        </item>
+      </section>
+      <section>
+      <attribute name="id">PrintPlaceholder</attribute>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Send _To…</attribute>
+          <attribute name="action">win.SendTo</attribute>
+        </item>
+      <attribute name="id">SetBackgroundPlaceholder</attribute>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;q</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Edit</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
+          <attribute name="action">win.CommonUndo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
+          <attribute name="action">win.CommonRedo</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Fulls_creen</attribute>
+          <attribute name="accel">F11</attribute>
+          <attribute name="action">win.CommonFullscreen</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _In</attribute>
+          <attribute name="accel">&lt;Primary&gt;plus</attribute>
+          <attribute name="action">win.IncreaseSize</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _Out</attribute>
+          <attribute name="accel">&lt;Primary&gt;minus</attribute>
+          <attribute name="action">win.DecreaseSize</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Fit to _Page</attribute>
+          <attribute name="accel">&lt;Primary&gt;0</attribute>
+          <attribute name="action">win.ZoomFit</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _100%</attribute>
+          <attribute name="accel">&lt;Primary&gt;1</attribute>
+          <attribute name="action">win.Zoom100</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _200%</attribute>
+          <attribute name="accel">&lt;Primary&gt;2</attribute>
+          <attribute name="action">win.Zoom200</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Photo</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Previous Photo</attribute>
+          <attribute name="action">win.PrevPhoto</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Next Photo</attribute>
+          <attribute name="action">win.NextPhoto</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Rotate _Right</attribute>
+          <attribute name="accel">&lt;Primary&gt;r</attribute>
+          <attribute name="action">win.RotateClockwise</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Rotate _Left</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;r</attribute>
+          <attribute name="action">win.RotateCounterclockwise</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Flip Hori_zontally</attribute>
+          <attribute name="action">win.FlipHorizontally</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Flip Verti_cally</attribute>
+          <attribute name="action">win.FlipVertically</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">T_ools</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Enhance</attribute>
+              <attribute name="accel">&lt;Primary&gt;e</attribute>
+              <attribute name="action">win.Enhance</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Crop</attribute>
+              <attribute name="accel">&lt;Primary&gt;o</attribute>
+              <attribute name="action">win.Crop</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Straighten</attribute>
+              <attribute name="accel">&lt;Primary&gt;a</attribute>
+              <attribute name="action">win.Straighten</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Red-eye</attribute>
+              <attribute name="accel">&lt;Primary&gt;y</attribute>
+              <attribute name="action">win.RedEye</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Adjust</attribute>
+              <attribute name="accel">&lt;Primary&gt;d</attribute>
+              <attribute name="action">win.Adjust</attribute>
+            </item>
+          </section>
+        </submenu>
+        <item>
+          <attribute name="label" translatable="yes">Re_vert to Original</attribute>
+          <attribute name="action">win.Revert</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Adjust Date and Time…</attribute>
+          <attribute name="action">win.AdjustDateTime</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+</interface>
diff --git a/ui/direct_context.ui b/ui/direct_context.ui
index 7b0d564..3349835 100644
--- a/ui/direct_context.ui
+++ b/ui/direct_context.ui
@@ -1,10 +1,31 @@
-<ui>
-    <popup name="DirectContextMenu">
-        <menuitem name="ContextEnhance" action="Enhance" />
-        <menuitem name="ContextRevert" action="Revert" />
-        <separator />
-        <placeholder name="ContextJumpPlaceholder" />
-        <menuitem name="ContextSendTo" action="SendTo" />
-    </popup>
-</ui>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
+  <menu id="DirectContextMenu">
+    <submenu>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Enhance</attribute>
+          <attribute name="accel">&lt;Primary&gt;e</attribute>
+          <attribute name="action">win.Enhance</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Re_vert to Original</attribute>
+          <attribute name="action">win.Revert</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Send _To…</attribute>
+          <attribute name="action">win.SendTo</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+</interface>
diff --git a/ui/event.ui b/ui/event.ui
index dcb1d95..11d9b74 100644
--- a/ui/event.ui
+++ b/ui/event.ui
@@ -1,25 +1,593 @@
-<ui>
-
-    <menubar name="MenuBar">
-        <menu name="PhotosMenu" action="PhotosMenu">
-            <separator />
-            <menuitem name="MakePrimary" action="MakePrimary" />
-        </menu>
-        <menu name="EventsMenu" action="EventsMenu">
-            <menuitem name="EventRename" action="Rename" />
-            <menuitem name="EditComment" action="EditComment" />
-        </menu>
-    </menubar>
-
-    <popup name="CollectionContextMenu">
-        <separator />
-        <menuitem name="ContextMakePrimary" action="MakePrimary" />
-    </popup>
-
-    <popup name="EventContextMenu">
-        <menuitem name="ContextRename" action="Rename" />
-        <menuitem name="EditEventComment" action="EditEventComment" />
-    </popup>
-    
-</ui>
-
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Save _As…</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;e</attribute>
+          <attribute name="action">win.Export</attribute>
+        </item>
+      </section>
+      <section>
+        <attribute name="id">FileExtrasPlaceholder</attribute>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Edit</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
+          <attribute name="action">win.CommonUndo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
+          <attribute name="action">win.CommonRedo</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Find</attribute>
+          <attribute name="action">win.CommonFind</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
+        </item>
+      </section>
+      <section>
+        <attribute name="id">EditExtrasPlaceholder</attribute>
+        <item>
+          <attribute name="label" translatable="yes">R_emove from Library</attribute>
+          <attribute name="accel">&lt;Shift&gt;Delete</attribute>
+          <attribute name="action">win.RemoveFromLibrary</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Move to Trash</attribute>
+          <attribute name="accel">Delete</attribute>
+          <attribute name="action">win.MoveToTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Select _All</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
+          <attribute name="action">win.CommonSelectAll</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Search Bar</attribute>
+          <attribute name="accel">F8</attribute>
+          <attribute name="action">win.CommonDisplaySearchbar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">S_idebar</attribute>
+          <attribute name="accel">F9</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">T_oolbar</attribute>
+          <attribute name="accel">&lt;Primary&gt;F9</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Titles</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;t</attribute>
+          <attribute name="action">win.ViewTitle</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Comments</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
+          <attribute name="action">win.ViewComment</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Ta_gs</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;g</attribute>
+          <attribute name="action">win.ViewTags</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Ratings</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;n</attribute>
+          <attribute name="action">win.ViewRatings</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">_Filter Photos</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">7</attribute>
+              <attribute name="accel">&lt;Primary&gt;5</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">6</attribute>
+              <attribute name="accel">&lt;Primary&gt;4</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">5</attribute>
+              <attribute name="accel">&lt;Primary&gt;3</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">4</attribute>
+              <attribute name="accel">&lt;Primary&gt;2</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">3</attribute>
+              <attribute name="accel">&lt;Primary&gt;1</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_All Photos</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">2</attribute>
+              <attribute name="accel">&lt;Primary&gt;0</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">All + _Rejected</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">1</attribute>
+              <attribute name="accel">&lt;Primary&gt;9</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Rejected _Only</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">8</attribute>
+              <attribute name="accel">&lt;Primary&gt;8</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Photos</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">By _Title</attribute>
+              <attribute name="action">win.SortBy</attribute>
+              <attribute name="target">1</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">By _Filename</attribute>
+              <attribute name="action">win.SortBy</attribute>
+              <attribute name="target">4</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">By Exposure _Date</attribute>
+              <attribute name="action">win.SortBy</attribute>
+              <attribute name="target">2</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">By _Rating</attribute>
+              <attribute name="action">win.SortBy</attribute>
+              <attribute name="target">3</attribute>
+            </item>
+          </section>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.Sort</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">D_escending</attribute>
+              <attribute name="action">win.Sort</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Descending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _In</attribute>
+          <attribute name="accel">&lt;Primary&gt;plus</attribute>
+          <attribute name="action">win.IncreaseSize</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _Out</attribute>
+          <attribute name="accel">&lt;Primary&gt;minus</attribute>
+          <attribute name="action">win.DecreaseSize</attribute>
+        </item>
+      </section>
+      <section>
+      <attribute name="id">ViewExtrasFullscreenSlideshowPlaceholder</attribute>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Photos</attribute>
+      <section>
+      <attribute name="id">PhotosExtrasEditsPlaceholder</attribute>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Toggle _Flag</attribute>
+          <attribute name="accel">&lt;Primary&gt;g</attribute>
+          <attribute name="action">win.Flag</attribute>
+        </item>
+        <submenu>
+          <attribute name="label" translatable="yes">_Set Rating</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="accel">5</attribute>
+              <attribute name="action">win.RateFive</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="accel">4</attribute>
+              <attribute name="action">win.RateFour</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="accel">3</attribute>
+              <attribute name="action">win.RateThree</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="accel">2</attribute>
+              <attribute name="action">win.RateTwo</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="accel">1</attribute>
+              <attribute name="action">win.RateOne</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Unrated</attribute>
+              <attribute name="accel">0</attribute>
+              <attribute name="action">win.RateUnrated</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Rejected</attribute>
+              <attribute name="accel">9</attribute>
+              <attribute name="action">win.RateRejected</attribute>
+            </item>
+          </section>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Increase</attribute>
+              <attribute name="accel">greater</attribute>
+              <attribute name="action">win.IncreaseRating</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Decrease</attribute>
+              <attribute name="accel">less</attribute>
+              <attribute name="action">win.DecreaseRating</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Edit _Title…</attribute>
+          <attribute name="action">win.EditTitle</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Edit _Comment…</attribute>
+          <attribute name="action">win.EditComment</attribute>
+        </item>
+      <attribute name="id">PhotosExtrasDateTimePlaceholder</attribute>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">_Developer</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">Shotwell</attribute>
+              <attribute name="action">win.RawDeveloper</attribute>
+              <attribute name="target">Shotwell</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Camera</attribute>
+              <attribute name="action">win.RawDeveloper</attribute>
+              <attribute name="target">Camera</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+      <attribute name="id">PhotosExtrasExternalsPlaceholder</attribute>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Make _Key Photo for Event</attribute>
+          <attribute name="action">win.MakePrimary</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Even_ts</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_New Event</attribute>
+          <attribute name="accel">&lt;Primary&gt;n</attribute>
+          <attribute name="action">win.NewEvent</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">View Eve_nt for Photo</attribute>
+          <attribute name="action">win.CommonJumpToEvent</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Re_name Event…</attribute>
+          <attribute name="accel">F2</attribute>
+          <attribute name="action">win.Rename</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Edit _Comment…</attribute>
+          <attribute name="action">win.EditComment</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Ta_gs</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Add _Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;t</attribute>
+          <attribute name="action">win.AddTags</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;m</attribute>
+          <attribute name="action">win.ModifyTags</attribute>
+        </item>
+      </section>
+    </submenu>
+    <!-- Faces menu goes here FacesMenuPlaceholder -->
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+  <menu id="CollectionContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Enhance</attribute>
+        <attribute name="accel">&lt;Primary&gt;e</attribute>
+        <attribute name="action">win.Enhance</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Re_vert to Original</attribute>
+        <attribute name="action">win.Revert</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Add _Tags…</attribute>
+        <attribute name="accel">&lt;Primary&gt;t</attribute>
+        <attribute name="action">win.AddTags</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
+        <attribute name="accel">&lt;Primary&gt;m</attribute>
+        <attribute name="action">win.ModifyTags</attribute>
+      </item>
+      <attribute name="id">ContextTagsPlaceholder</attribute>
+    </section>
+    <section>
+      <attribute name="id">ContextFacesPlaceholder</attribute>
+      <item>
+        <attribute name="label" translatable="yes">Toggle _Flag</attribute>
+        <attribute name="accel">&lt;Primary&gt;g</attribute>
+        <attribute name="action">win.Flag</attribute>
+      </item>
+    </section>
+    <submenu>
+      <attribute name="label" translatable="yes">_Set Rating</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="no">★★★★★</attribute>
+          <attribute name="action">win.RateFive</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="no">★★★★</attribute>
+          <attribute name="action">win.RateFour</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="no">★★★</attribute>
+          <attribute name="action">win.RateThree</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="no">★★</attribute>
+          <attribute name="action">win.RateTwo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="no">★</attribute>
+          <attribute name="action">win.RateOne</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Unrated</attribute>
+          <attribute name="action">win.RateUnrated</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Rejected</attribute>
+          <attribute name="action">win.RateRejected</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Increase</attribute>
+          <attribute name="action">win.IncreaseRating</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Decrease</attribute>
+          <attribute name="action">win.DecreaseRating</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Developer</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Shotwell</attribute>
+          <attribute name="action">win.RawDeveloper</attribute>
+          <attribute name="target">Shotwell</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Camera</attribute>
+          <attribute name="action">win.RawDeveloper</attribute>
+          <attribute name="target">Camera</attribute>
+        </item>
+      </section>
+    </submenu>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Edit _Title…</attribute>
+        <attribute name="action">win.EditTitle</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Edit _Comment…</attribute>
+        <attribute name="action">win.EditComment</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
+        <attribute name="accel">&lt;Primary&gt;Return</attribute>
+        <attribute name="action">win.ExternalEdit</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Open With RA_W Editor</attribute>
+        <attribute name="action">win.ExternalEditRAW</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">View Eve_nt for Photo</attribute>
+        <attribute name="action">win.CommonJumpToEvent</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+        <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
+        <attribute name="action">win.CommonJumpToFile</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Send _To…</attribute>
+        <attribute name="action">win.SendTo</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Move to Trash</attribute>
+        <attribute name="accel">Delete</attribute>
+        <attribute name="action">win.MoveToTrash</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Make _Key Photo for Event</attribute>
+        <attribute name="action">win.MakePrimary</attribute>
+      </item>
+    </section>
+  </menu>
+  <menu id="EventContextMenu">
+    <section>
+        <item>
+          <attribute name="label" translatable="yes">Re_name Event…</attribute>
+          <attribute name="action">win.Rename</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Edit Event _Comment…</attribute>
+          <attribute name="action">win.EditEventComment</attribute>
+        </item>
+    </section>
+  </menu>
+</interface>
diff --git a/ui/events_directory.ui b/ui/events_directory.ui
index 33ab5d7..380da0a 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -1,64 +1,191 @@
-<ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-            <separator />
-            <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
-            <separator />
-            <menuitem name="Quit" action="CommonQuit" />
-        </menu>
-
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-            <separator />
-            <menuitem name="Find" action="CommonFind" />
-            <menuitem name="NewSearch" action="CommonNewSearch" />
-            <separator />
-            <menuitem name="SelectAll" action="CommonSelectAll" />
-            <separator />
-            <menuitem name="Preferences" action="CommonPreferences" />
-        </menu>
-        
-        <menu name="ViewMenu" action="ViewMenu">
-            <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
-            <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
-            <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
-            <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
-            <menuitem name="DisplayToolbar" action="CommonDisplayToolbar" />
-            <separator />
-            <menuitem name="ViewComment" action="ViewComment" />
-            <separator />
-            <menu name="SortEvents" action="CommonSortEvents">
-                <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
-                <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
-            </menu>
-            <separator />
-            <menuitem name="Fullscreen" action="CommonFullscreen" />
-        </menu>
-
-        <menu name="EventsMenu" action="EventsMenu">
-            <menuitem name="EventMerge" action="Merge" />
-            <menuitem name="EventRename" action="Rename" />
-            <menuitem name="EditComment" action="EditComment" />
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="Contents" action="CommonHelpContents" />
-            <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
-            <menuitem name="Report a Problem…" action="CommonHelpReportProblem" />
-            <separator />
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-
-    <popup name="EventsDirectoryContextMenu">
-        <menuitem name="ContextMerge" action="Merge" />
-        <menuitem name="ContextRename" action="Rename" />
-        <menuitem name="ContextEditComment" action="EditComment" />
-    </popup>
-
-</ui>
-
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Edit</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
+          <attribute name="action">win.CommonUndo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
+          <attribute name="action">win.CommonRedo</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Find</attribute>
+          <attribute name="action">win.CommonFind</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Select _All</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
+          <attribute name="action">win.CommonSelectAll</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Search Bar</attribute>
+          <attribute name="accel">F8</attribute>
+          <attribute name="action">win.CommonDisplaySearchbar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">S_idebar</attribute>
+          <attribute name="accel">F9</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">T_oolbar</attribute>
+          <attribute name="accel">&lt;Primary&gt;F9</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Comments</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
+          <attribute name="action">win.ViewComment</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">D_escending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Fulls_creen</attribute>
+          <attribute name="accel">F11</attribute>
+          <attribute name="action">win.CommonFullscreen</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Even_ts</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Merge Events</attribute>
+          <attribute name="action">win.Merge</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Re_name Event…</attribute>
+          <attribute name="accel">F2</attribute>
+          <attribute name="action">win.Rename</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Edit _Comment…</attribute>
+          <attribute name="action">win.EditComment</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+  <menu id="EventsDirectoryContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Merge Events</attribute>
+        <attribute name="action">win.Merge</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Re_name Event…</attribute>
+        <attribute name="accel">F2</attribute>
+        <attribute name="action">win.Rename</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Edit _Comment…</attribute>
+        <attribute name="action">win.EditComment</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/ui/import.ui b/ui/import.ui
index 3c3cac3..522ca7b 100644
--- a/ui/import.ui
+++ b/ui/import.ui
@@ -1,66 +1,219 @@
-<ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportSelected" action="ImportSelected" />
-            <menuitem name="ImportAll" action="ImportAll" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-            <separator />
-            <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
-            <separator />
-            <menuitem name="Quit" action="CommonQuit" />
-        </menu>
-        
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-            <separator />
-            <menuitem name="Find" action="CommonFind" />
-            <separator />
-            <menuitem name="SelectAll" action="CommonSelectAll" />
-            <separator />
-            <menuitem name="Preferences" action="CommonPreferences" />
-        </menu>
-        
-        <menu name="ViewMenu" action="ViewMenu">
-            <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
-            <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
-            <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
-            <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
-            <menuitem name="DisplayToolbar" action="CommonDisplayToolbar" />
-            <separator />
-            <menuitem name="ViewTitle" action="ViewTitle" />
-            <separator />
-            <menu name="FilterPhotos" action="CommonFilterPhotos">
-                <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
-                <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
-                <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
-                <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
-                <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
-                <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
-                <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
-                <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
-            </menu>
-            <separator />
-            <menu name="SortEvents" action="CommonSortEvents">
-                <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
-                <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
-            </menu>
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="Contents" action="CommonHelpContents" />
-            <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
-            <menuitem name="Report a Problem…" action="CommonHelpReportProblem" />
-            <separator />
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-
-    <popup name="ImportContextMenu">
-            <menuitem name="ContextImportSelected" action="ImportSelected" />
-            <menuitem name="ContextImportAll" action="ImportAll" />
-    </popup>
-    
-</ui>
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Import _Selected</attribute>
+          <attribute name="action">win.ImportSelected</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Import _All</attribute>
+          <attribute name="action">win.ImportAll</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Edit</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
+          <attribute name="action">win.CommonUndo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
+          <attribute name="action">win.CommonRedo</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Find</attribute>
+          <attribute name="action">win.CommonFind</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Select _All</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
+          <attribute name="action">win.CommonSelectAll</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Search Bar</attribute>
+          <attribute name="accel">F8</attribute>
+          <attribute name="action">win.CommonDisplaySearchbar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">S_idebar</attribute>
+          <attribute name="accel">F9</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">T_oolbar</attribute>
+          <attribute name="accel">&lt;Primary&gt;F9</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Titles</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;t</attribute>
+          <attribute name="action">win.ViewTitle</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">_Filter Photos</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">7</attribute>
+              <attribute name="accel">&lt;Primary&gt;5</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">6</attribute>
+              <attribute name="accel">&lt;Primary&gt;4</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">5</attribute>
+              <attribute name="accel">&lt;Primary&gt;3</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">4</attribute>
+              <attribute name="accel">&lt;Primary&gt;2</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">3</attribute>
+              <attribute name="accel">&lt;Primary&gt;1</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_All Photos</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">2</attribute>
+              <attribute name="accel">&lt;Primary&gt;0</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">All + _Rejected</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">1</attribute>
+              <attribute name="accel">&lt;Primary&gt;9</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Rejected _Only</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">8</attribute>
+              <attribute name="accel">&lt;Primary&gt;8</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Descending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+  <menu id="ImportContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Import _Selected</attribute>
+        <attribute name="action">win.ImportSelected</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Import _All</attribute>
+        <attribute name="action">win.ImportAll</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/ui/import_queue.ui b/ui/import_queue.ui
index 88078b8..9b07d9c 100644
--- a/ui/import_queue.ui
+++ b/ui/import_queue.ui
@@ -1,34 +1,89 @@
-<ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Stop" action="Stop" />
-            <separator />
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-            <separator />
-            <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
-            <separator />
-            <menuitem name="Quit" action="CommonQuit" />
-        </menu>
-        
-        <menu name="ViewMenu" action="ViewMenu">
-            <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
-            <separator />
-            <menu name="SortEvents" action="CommonSortEvents">
-                <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
-                <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
-            </menu>
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="Contents" action="CommonHelpContents" />
-            <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
-            <menuitem name="Report a Problem…" action="CommonHelpReportProblem" />
-            <separator />
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-
-</ui>
-
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Stop Import</attribute>
+          <attribute name="action">win.Stop</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">D_escending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+</interface>
diff --git a/ui/media.ui b/ui/media.ui
index f42c189..e3d8ba1 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -1,127 +1,425 @@
-<ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-            <menuitem name="Export" action="Export" />
-            <separator />
-            <placeholder name="FileExtrasPlaceholder" />
-            <separator />
-            <menuitem name="JumpToFile" action="CommonJumpToFile" />
-            <separator />
-            <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
-            <separator />
-            <menuitem name="Quit" action="CommonQuit" />
-        </menu>
-        
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-            <separator />
-            <menuitem name="Find" action="CommonFind" />
-            <menuitem name="NewSearch" action="CommonNewSearch" />
-            <separator />
-            <placeholder name="EditExtrasPlaceholder" />
-            <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
-            <menuitem name="MoveToTrash" action="MoveToTrash" />
-            <separator />
-            <menuitem name="SelectAll" action="CommonSelectAll" />
-            <separator />
-            <menuitem name="Preferences" action="CommonPreferences" />
-        </menu>
-
-        <menu name="ViewMenu" action="ViewMenu">
-            <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
-            <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
-            <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
-            <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
-            <menuitem name="DisplayToolbar" action="CommonDisplayToolbar" />
-            <separator />
-            <menuitem name="ViewTitle" action="ViewTitle" />
-            <menuitem name="ViewComment" action="ViewComment" />
-            <menuitem name="ViewTags" action="ViewTags" />
-            <menuitem name="ViewRatings" action="ViewRatings" />
-            <separator />
-            <menu name="FilterPhotos" action="CommonFilterPhotos">
-                <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
-                <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
-                <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
-                <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
-                <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
-                <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
-                <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
-                <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
-            </menu>
-            <separator />
-            <menu name="SortPhotos" action="SortPhotos">
-                <menuitem name="SortByTitle" action="SortByTitle" />
-                <menuitem name="SortByFilename" action="SortByFilename" />
-                <menuitem name="SortByExposureDate" action="SortByExposureDate" />
-                <menuitem name="SortByRating" action="SortByRating" />
-                <separator />
-                <menuitem name="SortAscending" action="SortAscending" />
-                <menuitem name="SortDescending" action="SortDescending" />
-            </menu>
-            <menu name="SortEvents" action="CommonSortEvents">
-                <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
-                <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
-            </menu>
-            <separator />
-            <menuitem name="IncreaseSize" action="IncreaseSize" />
-            <menuitem name="DecreaseSize" action="DecreaseSize" />
-            <separator />
-            <placeholder name="ViewExtrasFullscreenSlideshowPlaceholder" />
-        </menu>
-                
-        <menu name="PhotosMenu" action="PhotosMenu">
-            <placeholder name="PhotosExtrasEditsPlaceholder" />
-            <separator />
-            <menuitem name="Flag" action="Flag" />
-            <menu name="Rate" action="Rate">
-                <menuitem name="RateFive" action="RateFive" />
-                <menuitem name="RateFour" action="RateFour" />
-                <menuitem name="RateThree" action="RateThree" />
-                <menuitem name="RateTwo" action="RateTwo" />
-                <menuitem name="RateOne" action="RateOne" />
-                <menuitem name="RateUnrated" action="RateUnrated" />
-                <menuitem name="RateRejected" action="RateRejected" />
-                <separator />
-                <menuitem name="IncreaseRating" action="IncreaseRating" />
-                <menuitem name="DecreaseRating" action="DecreaseRating" />
-            </menu>
-            <separator />
-            <menuitem name="EditTitle" action="EditTitle" />
-            <menuitem name="EditComment" action="EditComment" />
-            <placeholder name="PhotosExtrasDateTimePlaceholder" />
-            <separator />
-            <menu name="RawDeveloper" action="RawDeveloper">
-                <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
-                <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
-            </menu>
-            <separator />
-            <placeholder name="PhotosExtrasExternalsPlaceholder" />
-        </menu>
-
-        <menu name="EventsMenu" action="EventsMenu">
-            <menuitem name="NewEvent" action="NewEvent" />
-            <menuitem name="CommonJumpToEvent" action="CommonJumpToEvent" />
-        </menu>
-
-        <menu name="TagsMenu" action="TagsMenu">
-            <menuitem name="AddTags" action="AddTags" />
-            <menuitem name="ModifyTags" action="ModifyTags" />
-        </menu>
-        
-        <placeholder name="FacesMenuPlaceholder" />
-
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="Contents" action="CommonHelpContents" />
-            <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
-            <menuitem name="Report a Problem…" action="CommonHelpReportProblem" />
-            <separator />
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-</ui>
-
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Save _As…</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;e</attribute>
+          <attribute name="action">win.Export</attribute>
+        </item>
+      </section>
+      <section>
+        <attribute name="id">FileExtrasPlaceholder</attribute>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Edit</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
+          <attribute name="action">win.CommonUndo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
+          <attribute name="action">win.CommonRedo</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Find</attribute>
+          <attribute name="action">win.CommonFind</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
+        </item>
+      </section>
+      <section>
+        <attribute name="id">EditExtrasPlaceholder</attribute>
+        <item>
+          <attribute name="label" translatable="yes">R_emove from Library</attribute>
+          <attribute name="accel">&lt;Shift&gt;Delete</attribute>
+          <attribute name="action">win.RemoveFromLibrary</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Move to Trash</attribute>
+          <attribute name="accel">Delete</attribute>
+          <attribute name="action">win.MoveToTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Select _All</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
+          <attribute name="action">win.CommonSelectAll</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Search Bar</attribute>
+          <attribute name="accel">F8</attribute>
+          <attribute name="action">win.CommonDisplaySearchbar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">S_idebar</attribute>
+          <attribute name="accel">F9</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">T_oolbar</attribute>
+          <attribute name="accel">&lt;Primary&gt;F9</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Titles</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;t</attribute>
+          <attribute name="action">win.ViewTitle</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Comments</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
+          <attribute name="action">win.ViewComment</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Ta_gs</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;g</attribute>
+          <attribute name="action">win.ViewTags</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Ratings</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;n</attribute>
+          <attribute name="action">win.ViewRatings</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">_Filter Photos</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">7</attribute>
+              <attribute name="accel">&lt;Primary&gt;5</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">6</attribute>
+              <attribute name="accel">&lt;Primary&gt;4</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">5</attribute>
+              <attribute name="accel">&lt;Primary&gt;3</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">4</attribute>
+              <attribute name="accel">&lt;Primary&gt;2</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">3</attribute>
+              <attribute name="accel">&lt;Primary&gt;1</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_All Photos</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">2</attribute>
+              <attribute name="accel">&lt;Primary&gt;0</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">All + _Rejected</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">1</attribute>
+              <attribute name="accel">&lt;Primary&gt;9</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Rejected _Only</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">8</attribute>
+              <attribute name="accel">&lt;Primary&gt;8</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Photos</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">By _Title</attribute>
+              <attribute name="action">win.SortBy</attribute>
+              <attribute name="target">1</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">By _Filename</attribute>
+              <attribute name="action">win.SortBy</attribute>
+              <attribute name="target">4</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">By Exposure _Date</attribute>
+              <attribute name="action">win.SortBy</attribute>
+              <attribute name="target">2</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">By _Rating</attribute>
+              <attribute name="action">win.SortBy</attribute>
+              <attribute name="target">3</attribute>
+            </item>
+          </section>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.Sort</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">D_escending</attribute>
+              <attribute name="action">win.Sort</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Descending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _In</attribute>
+          <attribute name="accel">&lt;Primary&gt;plus</attribute>
+          <attribute name="action">win.IncreaseSize</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _Out</attribute>
+          <attribute name="accel">&lt;Primary&gt;minus</attribute>
+          <attribute name="action">win.DecreaseSize</attribute>
+        </item>
+      </section>
+      <section>
+      <attribute name="id">ViewExtrasFullscreenSlideshowPlaceholder</attribute>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Photos</attribute>
+      <section>
+      <attribute name="id">PhotosExtrasEditsPlaceholder</attribute>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Toggle _Flag</attribute>
+          <attribute name="accel">&lt;Primary&gt;g</attribute>
+          <attribute name="action">win.Flag</attribute>
+        </item>
+        <submenu>
+          <attribute name="label" translatable="yes">_Set Rating</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="accel">5</attribute>
+              <attribute name="action">win.RateFive</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="accel">4</attribute>
+              <attribute name="action">win.RateFour</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="accel">3</attribute>
+              <attribute name="action">win.RateThree</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="accel">2</attribute>
+              <attribute name="action">win.RateTwo</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="accel">1</attribute>
+              <attribute name="action">win.RateOne</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Unrated</attribute>
+              <attribute name="accel">0</attribute>
+              <attribute name="action">win.RateUnrated</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Rejected</attribute>
+              <attribute name="accel">9</attribute>
+              <attribute name="action">win.RateRejected</attribute>
+            </item>
+          </section>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Increase</attribute>
+              <attribute name="accel">greater</attribute>
+              <attribute name="action">win.IncreaseRating</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Decrease</attribute>
+              <attribute name="accel">less</attribute>
+              <attribute name="action">win.DecreaseRating</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Edit _Title…</attribute>
+          <attribute name="action">win.EditTitle</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Edit _Comment…</attribute>
+          <attribute name="action">win.EditComment</attribute>
+        </item>
+      <attribute name="id">PhotosExtrasDateTimePlaceholder</attribute>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">_Developer</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">Shotwell</attribute>
+              <attribute name="action">win.RawDeveloper</attribute>
+              <attribute name="target">Shotwell</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Camera</attribute>
+              <attribute name="action">win.RawDeveloper</attribute>
+              <attribute name="target">Camera</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+      <attribute name="id">PhotosExtrasExternalsPlaceholder</attribute>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Even_ts</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_New Event</attribute>
+          <attribute name="accel">&lt;Primary&gt;n</attribute>
+          <attribute name="action">win.NewEvent</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">View Eve_nt for Photo</attribute>
+          <attribute name="action">win.CommonJumpToEvent</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Ta_gs</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Add _Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;t</attribute>
+          <attribute name="action">win.AddTags</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;m</attribute>
+          <attribute name="action">win.ModifyTags</attribute>
+        </item>
+      </section>
+    </submenu>
+    <!-- Faces menu goes here FacesMenuPlaceholder -->
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+</interface>
diff --git a/ui/offline.ui b/ui/offline.ui
index ff56ae9..f886526 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -1,70 +1,249 @@
-<ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-            <separator />
-            <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
-            <separator />
-            <menuitem name="Quit" action="CommonQuit" />
-        </menu>
-        
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-            <separator />
-            <menuitem name="Find" action="CommonFind" />
-            <menuitem name="NewSearch" action="CommonNewSearch" />
-            <separator />
-            <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
-            <separator />
-            <menuitem name="SelectAll" action="CommonSelectAll" />
-            <separator />
-            <menuitem name="Preferences" action="CommonPreferences" />
-        </menu>
-        
-        <menu name="ViewMenu" action="ViewMenu">
-            <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
-            <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
-            <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
-            <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
-            <menuitem name="DisplayToolbar" action="CommonDisplayToolbar" />
-            <separator />
-            <menu name="FilterPhotos" action="CommonFilterPhotos">
-                <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
-                <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
-                <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
-                <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
-                <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
-                <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
-                <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
-                <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
-            </menu>
-            <separator />
-            <menu name="SortEvents" action="CommonSortEvents">
-                <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
-                <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
-            </menu>
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="Contents" action="CommonHelpContents" />
-            <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
-            <menuitem name="Report a Problem…" action="CommonHelpReportProblem" />
-            <separator />
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-    
-    <popup name="OfflineContextMenu">
-        <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
-    </popup>
-    
-    <toolbar name="OfflineToolbar">
-        <toolitem name="ToolRemoveFromLibrary" action="RemoveFromLibrary" />
-        <separator />
-        <toolitem name="ToolFind" action="CommonDisplaySearchbar" />
-    </toolbar>
-    
-</ui>
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Edit</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
+          <attribute name="action">win.CommonUndo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
+          <attribute name="action">win.CommonRedo</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Find</attribute>
+          <attribute name="action">win.CommonFind</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">R_emove from Library</attribute>
+          <attribute name="accel">Delete</attribute>
+          <attribute name="action">win.RemoveFromLibrary</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Select _All</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
+          <attribute name="action">win.CommonSelectAll</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Search Bar</attribute>
+          <attribute name="accel">F8</attribute>
+          <attribute name="action">win.CommonDisplaySearchbar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">S_idebar</attribute>
+          <attribute name="accel">F9</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">T_oolbar</attribute>
+          <attribute name="accel">&lt;Primary&gt;F9</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">_Filter Photos</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">7</attribute>
+              <attribute name="accel">&lt;Primary&gt;5</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">6</attribute>
+              <attribute name="accel">&lt;Primary&gt;4</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">5</attribute>
+              <attribute name="accel">&lt;Primary&gt;3</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">4</attribute>
+              <attribute name="accel">&lt;Primary&gt;2</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">3</attribute>
+              <attribute name="accel">&lt;Primary&gt;1</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_All Photos</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">2</attribute>
+              <attribute name="accel">&lt;Primary&gt;0</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">All + _Rejected</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">1</attribute>
+              <attribute name="accel">&lt;Primary&gt;9</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Rejected _Only</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">8</attribute>
+              <attribute name="accel">&lt;Primary&gt;8</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">D_escending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+  <menu id="OfflineContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">R_emove from Library</attribute>
+        <attribute name="accel">Delete</attribute>
+        <attribute name="action">win.RemoveFromLibrary</attribute>
+      </item>
+    </section>
+  </menu>
+  <object class="GtkToolbar" id="OfflineToolbar">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="toolbar_style">both-horiz</property>
+    <child>
+      <object class="GtkToolButton" id="ToolRemoveFromLibrary">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Remove the selected photos from the library</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.RemoveFromLibrary</property>
+        <property name="label" translatable="yes">R_emove From Library</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToolButton" id="ToolFind">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Find an image by typing text that appears in its name or tags</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.CommonDisplaySearchbar</property>
+        <property name="label" translatable="yes">Find</property>
+        <property name="use_underline">True</property>
+        <property name="icon_name">edit-find</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+  </object>
+</interface>
diff --git a/ui/photo.ui b/ui/photo.ui
index a4c587e..6b662a5 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -1,129 +1,408 @@
-<ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-            <menuitem name="Export" action="Export" />
-            <separator />
-            <placeholder name="PrintPlaceholder" />
-            <separator />
-            <placeholder name="PublishPlaceholder" />
-            <menuitem name="SendTo" action="SendTo" />
-            <placeholder name="SetBackgroundPlaceholder" />
-            <separator />
-            <menuitem name="JumpToFile" action="CommonJumpToFile" />
-            <separator />
-            <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
-            <separator />
-            <menuitem name="Quit" action="CommonQuit" />
-        </menu>
-        
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-            <separator />
-            <menuitem name="NewSearch" action="CommonNewSearch" />
-            <separator />
-            <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
-            <menuitem name="MoveToTrash" action="MoveToTrash" />
-            <separator />
-            <menuitem name="Preferences" action="CommonPreferences" />
-        </menu>
-        
-        <menu name="ViewMenu" action="ViewMenu">
-            <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
-            <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
-            <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
-            <menuitem name="DisplayToolbar" action="CommonDisplayToolbar" />
-            <separator />
-            <menuitem name="ViewRatings" action="ViewRatings" />
-            <separator />
-            <menu name="SortEvents" action="CommonSortEvents">
-                <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
-                <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
-            </menu>
-            <separator />
-            <menuitem name="IncreaseSize" action="IncreaseSize" />
-            <menuitem name="DecreaseSize" action="DecreaseSize" />
-            <separator />
-            <menuitem name="ZoomFit" action="ZoomFit" />
-            <menuitem name="Zoom100" action="Zoom100" />
-            <menuitem name="Zoom200" action="Zoom200" />
-            <separator />
-            <menuitem name="Fullscreen" action="CommonFullscreen" />
-            <separator />
-            <menuitem name="Slideshow" action="Slideshow" />
-        </menu>
-        
-        <menu name="PhotoMenu" action="PhotoMenu">
-            <menuitem name="PrevPhoto" action="PrevPhoto" />
-            <menuitem name="NextPhoto" action="NextPhoto" />
-            <separator />
-            <menuitem name="RotateClockwise" action="RotateClockwise" />
-            <menuitem name="RotateCounterclockwise" action="RotateCounterclockwise" />
-            <menuitem name="FlipHorizontally" action="FlipHorizontally" />
-            <menuitem name="FlipVertically" action="FlipVertically" />
-            <separator />
-            <menu name="Tools" action="Tools">
-                <menuitem name="Enhance" action="Enhance" />
-                <menuitem name="Crop" action="Crop" />
-                <menuitem name="Straighten" action="Straighten" />
-                <menuitem name="RedEye" action="RedEye" />
-                <menuitem name="Adjust" action="Adjust" />
-            </menu>
-            <menuitem name="Revert" action="Revert" />
-            <separator />
-            <menuitem name="CopyColorAdjustments" action="CopyColorAdjustments" />
-            <menuitem name="PasteColorAdjustments" action="PasteColorAdjustments" />
-            <separator/>
-            <menuitem name="Flag" action="Flag" />
-            <menu name="Rate" action="Rate">
-                <menuitem name="RateFive" action="RateFive" />
-                <menuitem name="RateFour" action="RateFour" />
-                <menuitem name="RateThree" action="RateThree" />
-                <menuitem name="RateTwo" action="RateTwo" />
-                <menuitem name="RateOne" action="RateOne" />
-                <menuitem name="RateUnrated" action="RateUnrated" />
-                <menuitem name="RateRejected" action="RateRejected" />
-                <separator />
-                <menuitem name="IncreaseRating" action="IncreaseRating" />
-                <menuitem name="DecreaseRating" action="DecreaseRating" />
-            </menu>
-            <separator />
-            <menuitem name="EditTitle" action="EditTitle" />
-            <menuitem name="EditComment" action="EditComment" />
-            <menuitem name="AdjustDateTime" action="AdjustDateTime" />
-            <separator />
-            <menu name="RawDeveloper" action="RawDeveloper">
-                <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
-                <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
-            </menu>
-            <separator />
-            <menuitem name="ExternalEdit" action="ExternalEdit" />
-            <menuitem name="ExternalEditRAW" action="ExternalEditRAW" />
-        </menu>
-
-        <menu name="TagsMenu" action="TagsMenu">
-            <menuitem name="AddTags" action="AddTags" />
-            <menuitem name="ModifyTags" action="ModifyTags" />
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="Contents" action="CommonHelpContents" />
-            <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
-            <menuitem name="Report a Problem…" action="CommonHelpReportProblem" />
-            <separator />
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-
-    <popup name="PhotoContextMenu">
-        <placeholder name="ContextJumpPlaceholder">
-            <menuitem name="ContextJumpToEvent" action="CommonJumpToEvent" />
-            <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
-        </placeholder>
-    </popup>
-    
-</ui>
-
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Save _As…</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;e</attribute>
+          <attribute name="action">win.Export</attribute>
+        </item>
+      </section>
+      <section>
+      <attribute name="id">PrintPlaceholder</attribute>
+      </section>
+      <section>
+      <attribute name="id">PublishPlaceholder</attribute>
+        <item>
+          <attribute name="label" translatable="yes">Send _To…</attribute>
+          <attribute name="action">win.SendTo</attribute>
+        </item>
+      <attribute name="id">SetBackgroundPlaceholder</attribute>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Edit</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
+          <attribute name="action">win.CommonUndo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
+          <attribute name="action">win.CommonRedo</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">R_emove from Library</attribute>
+          <attribute name="accel">&lt;Shift&gt;Delete</attribute>
+          <attribute name="action">win.RemoveFromLibrary</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Move to Trash</attribute>
+          <attribute name="accel">Delete</attribute>
+          <attribute name="action">win.MoveToTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">S_idebar</attribute>
+          <attribute name="accel">F9</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">T_oolbar</attribute>
+          <attribute name="accel">&lt;Primary&gt;F9</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Ratings</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;n</attribute>
+          <attribute name="action">win.ViewRatings</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Descending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _In</attribute>
+          <attribute name="accel">&lt;Primary&gt;plus</attribute>
+          <attribute name="action">win.IncreaseSize</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _Out</attribute>
+          <attribute name="accel">&lt;Primary&gt;minus</attribute>
+          <attribute name="action">win.DecreaseSize</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Fit to _Page</attribute>
+          <attribute name="accel">&lt;Primary&gt;0</attribute>
+          <attribute name="action">win.ZoomFit</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _100%</attribute>
+          <attribute name="accel">&lt;Primary&gt;1</attribute>
+          <attribute name="action">win.Zoom100</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _200%</attribute>
+          <attribute name="accel">&lt;Primary&gt;2</attribute>
+          <attribute name="action">win.Zoom200</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Fulls_creen</attribute>
+          <attribute name="accel">F11</attribute>
+          <attribute name="action">win.CommonFullscreen</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">S_lideshow</attribute>
+          <attribute name="accel">F5</attribute>
+          <attribute name="action">win.Slideshow</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Photo</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Previous Photo</attribute>
+          <attribute name="action">win.PrevPhoto</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Next Photo</attribute>
+          <attribute name="action">win.NextPhoto</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Rotate _Right</attribute>
+          <attribute name="accel">&lt;Primary&gt;r</attribute>
+          <attribute name="action">win.RotateClockwise</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Rotate _Left</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;r</attribute>
+          <attribute name="action">win.RotateCounterclockwise</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Flip Hori_zontally</attribute>
+          <attribute name="action">win.FlipHorizontally</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Flip Verti_cally</attribute>
+          <attribute name="action">win.FlipVertically</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">T_ools</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Enhance</attribute>
+              <attribute name="accel">&lt;Primary&gt;e</attribute>
+              <attribute name="action">win.Enhance</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Crop</attribute>
+              <attribute name="accel">&lt;Primary&gt;o</attribute>
+              <attribute name="action">win.Crop</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Straighten</attribute>
+              <attribute name="accel">&lt;Primary&gt;a</attribute>
+              <attribute name="action">win.Straighten</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Red-eye</attribute>
+              <attribute name="accel">&lt;Primary&gt;y</attribute>
+              <attribute name="action">win.RedEye</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Adjust</attribute>
+              <attribute name="accel">&lt;Primary&gt;d</attribute>
+              <attribute name="action">win.Adjust</attribute>
+            </item>
+          </section>
+        </submenu>
+        <item>
+          <attribute name="label" translatable="yes">Re_vert to Original</attribute>
+          <attribute name="action">win.Revert</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Copy Color Adjustments</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
+          <attribute name="action">win.CopyColorAdjustments</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Paste Color Adjustments</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;v</attribute>
+          <attribute name="action">win.PasteColorAdjustments</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Toggle _Flag</attribute>
+          <attribute name="accel">&lt;Primary&gt;g</attribute>
+          <attribute name="action">win.Flag</attribute>
+        </item>
+        <submenu>
+          <attribute name="label" translatable="yes">_Set Rating</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="accel">5</attribute>
+              <attribute name="action">win.RateFive</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="accel">4</attribute>
+              <attribute name="action">win.RateFour</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="accel">3</attribute>
+              <attribute name="action">win.RateThree</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="accel">2</attribute>
+              <attribute name="action">win.RateTwo</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="accel">1</attribute>
+              <attribute name="action">win.RateOne</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Unrated</attribute>
+              <attribute name="accel">0</attribute>
+              <attribute name="action">win.RateUnrated</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Rejected</attribute>
+              <attribute name="accel">9</attribute>
+              <attribute name="action">win.RateRejected</attribute>
+            </item>
+          </section>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Increase</attribute>
+              <attribute name="accel">greater</attribute>
+              <attribute name="action">win.IncreaseRating</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Decrease</attribute>
+              <attribute name="accel">less</attribute>
+              <attribute name="action">win.DecreaseRating</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Edit _Title…</attribute>
+          <attribute name="action">win.EditTitle</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Edit _Comment…</attribute>
+          <attribute name="action">win.EditComment</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Adjust Date and Time…</attribute>
+          <attribute name="action">win.AdjustDateTime</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">_Developer</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">Shotwell</attribute>
+              <attribute name="action">win.RawDeveloper</attribute>
+              <attribute name="target">Shotwell</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Camera</attribute>
+              <attribute name="action">win.RawDeveloper</attribute>
+              <attribute name="target">Camera</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
+          <attribute name="accel">&lt;Primary&gt;Return</attribute>
+          <attribute name="action">win.ExternalEdit</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Open With RA_W Editor</attribute>
+          <attribute name="action">win.ExternalEditRAW</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Ta_gs</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Add _Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;t</attribute>
+          <attribute name="action">win.AddTags</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;m</attribute>
+          <attribute name="action">win.ModifyTags</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+</interface>
diff --git a/ui/photo_context.ui b/ui/photo_context.ui
index f897022..10dcd3d 100644
--- a/ui/photo_context.ui
+++ b/ui/photo_context.ui
@@ -1,39 +1,145 @@
-<ui>
-    <popup name="PhotoContextMenu">
-        <menuitem name="ContextEnhance" action="Enhance" />
-        <menuitem name="ContextRevert" action="Revert" />
-        <separator />
-        <menuitem name="ContextAddTags" action="AddTagsContextMenu" />
-        <menuitem name="ContextModifyTags" action="ModifyTags" />
-        <placeholder name="ContextTagsPlaceholder" />
-        <separator />
-        <menuitem name="ContextFlag" action="Flag" />
-        <menu name="Rate" action="Rate">
-            <menuitem name="RateFive" action="RateFive" />
-            <menuitem name="RateFour" action="RateFour" />
-            <menuitem name="RateThree" action="RateThree" />
-            <menuitem name="RateTwo" action="RateTwo" />
-            <menuitem name="RateOne" action="RateOne" />
-            <menuitem name="RateUnrated" action="RateUnrated" />
-            <menuitem name="RateRejected" action="RateRejected" />
-            <separator />
-            <menuitem name="IncreaseRating" action="IncreaseRating" />
-            <menuitem name="DecreaseRating" action="DecreaseRating" />
-        </menu>
-        <menu name="RawDeveloper" action="RawDeveloper">
-            <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
-            <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
-        </menu>
-        <separator />
-        <menuitem name="ContextEditTitle" action="EditTitle" />
-        <menuitem name="ContextEditComment" action="EditComment" />
-        <menuitem name="ContextExternalEdit" action="ExternalEdit" />
-        <menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />
-        <separator />
-        <placeholder name="ContextJumpPlaceholder" />
-        <menuitem name="ContextSendTo" action="SendToContextMenu" />
-        <separator />
-        <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
-    </popup>
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="PhotoContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Enhance</attribute>
+        <attribute name="accel">&lt;Primary&gt;e</attribute>
+        <attribute name="action">win.Enhance</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Re_vert to Original</attribute>
+        <attribute name="action">win.Revert</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Add Tags…</attribute>
+        <attribute name="accel">&lt;Primary&gt;a</attribute>
+        <attribute name="action">win.AddTags</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
+        <attribute name="accel">&lt;Primary&gt;m</attribute>
+        <attribute name="action">win.ModifyTags</attribute>
+      </item>
+      <attribute name="id">ContextTagsPlaceholder</attribute>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Toggle _Flag</attribute>
+        <attribute name="accel">&lt;Primary&gt;g</attribute>
+        <attribute name="action">win.Flag</attribute>
+      </item>
+      <submenu>
+        <attribute name="label" translatable="yes">_Set Rating</attribute>
+        <section>
+          <item>
+            <attribute name="label" translatable="no">★★★★★</attribute>
+            <attribute name="accel">5</attribute>
+            <attribute name="action">win.RateFive</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="no">★★★★</attribute>
+            <attribute name="accel">4</attribute>
+            <attribute name="action">win.RateFour</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="no">★★★</attribute>
+            <attribute name="accel">3</attribute>
+            <attribute name="action">win.RateThree</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="no">★★</attribute>
+            <attribute name="accel">2</attribute>
+            <attribute name="action">win.RateTwo</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="no">★</attribute>
+            <attribute name="accel">1</attribute>
+            <attribute name="action">win.RateOne</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">_Unrated</attribute>
+            <attribute name="accel">0</attribute>
+            <attribute name="action">win.RateUnrated</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">_Rejected</attribute>
+            <attribute name="accel">9</attribute>
+            <attribute name="action">win.RateRejected</attribute>
+          </item>
+        </section>
+        <section>
+          <item>
+            <attribute name="label" translatable="yes">_Increase</attribute>
+            <attribute name="accel">greater</attribute>
+            <attribute name="action">win.IncreaseRating</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">_Decrease</attribute>
+            <attribute name="accel">less</attribute>
+            <attribute name="action">win.DecreaseRating</attribute>
+          </item>
+        </section>
+      </submenu>
 
-</ui>
+      <submenu>
+        <attribute name="label" translatable="yes">_Developer</attribute>
+        <section>
+          <item>
+            <attribute name="label" translatable="yes">Shotwell</attribute>
+            <attribute name="action">win.RawDeveloper</attribute>
+            <attribute name="target">Shotwell</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">Camera</attribute>
+            <attribute name="action">win.RawDeveloper</attribute>
+            <attribute name="target">Camera</attribute>
+          </item>
+        </section>
+      </submenu>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Edit _Title…</attribute>
+        <attribute name="action">win.EditTitle</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Edit _Comment…</attribute>
+        <attribute name="action">win.EditComment</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
+        <attribute name="accel">&lt;Primary&gt;Return</attribute>
+        <attribute name="action">win.ExternalEdit</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Open With RA_W Editor</attribute>
+        <attribute name="action">win.ExternalEditRAW</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">View Eve_nt for Photo</attribute>
+        <attribute name="action">win.CommonJumpToEvent</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+        <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
+        <attribute name="action">win.CommonJumpToFile</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Send T_o…</attribute>
+        <attribute name="action">win.SendTo</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Move to Trash</attribute>
+        <attribute name="accel">Delete</attribute>
+        <attribute name="action">win.MoveToTrash</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/ui/savedsearch.ui b/ui/savedsearch.ui
index 4217cbc..32a643d 100644
--- a/ui/savedsearch.ui
+++ b/ui/savedsearch.ui
@@ -1,8 +1,21 @@
-<ui>
-    <popup name="SearchContextMenu">
-        <menuitem name="ContextRenameSearch" action="RenameSearch" />
-        <menuitem name="ContextEditSearch" action="EditSearch" />
-        <menuitem name="ContextDeleteSearch" action="DeleteSearch" />
-    </popup>
-
-</ui>
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="SearchContextMenu">
+    <submenu>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Re_name…</attribute>
+          <attribute name="action">win.RenameSearch</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Edit…</attribute>
+          <attribute name="action">win.EditSearch</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Delete</attribute>
+          <attribute name="action">win.DeleteSearch</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+</interface>
diff --git a/ui/search_bar.ui b/ui/search_bar.ui
index 957c8b3..9d56962 100644
--- a/ui/search_bar.ui
+++ b/ui/search_bar.ui
@@ -1,12 +1,55 @@
-<ui>
-    <popup name="FilterPopupMenu" action="CommonFilterPhotos">
-        <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
-        <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
-        <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
-        <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
-        <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
-        <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
-        <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
-        <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
-    </popup>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="shotwell">
+  <menu id='popup-menu'>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Rejected _Only</attribute>
+        <attribute name="action">win.display.rating</attribute>
+        <attribute name="target">8</attribute>
+        <attribute name="accel">&lt;Primary&gt;8</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">All + _Rejected</attribute>
+        <attribute name="action">win.display.rating</attribute>
+        <attribute name="target">1</attribute>
+        <attribute name="accel">&lt;Primary&gt;9</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_All Photos</attribute>
+        <attribute name="action">win.display.rating</attribute>
+        <attribute name="target">2</attribute>
+        <attribute name="accel">&lt;Primary&gt;0</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="no">★</attribute>
+        <attribute name="action">win.display.rating</attribute>
+        <attribute name="target">3</attribute>
+        <attribute name="accel">&lt;Primary&gt;1</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="no">★★</attribute>
+        <attribute name="action">win.display.rating</attribute>
+        <attribute name="target">4</attribute>
+        <attribute name="accel">&lt;Primary&gt;2</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="no">★★★</attribute>
+        <attribute name="action">win.display.rating</attribute>
+        <attribute name="target">5</attribute>
+        <attribute name="accel">&lt;Primary&gt;3</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="no">★★★★</attribute>
+        <attribute name="action">win.display.rating</attribute>
+        <attribute name="target">6</attribute>
+        <attribute name="accel">&lt;Primary&gt;4</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="no">★★★★★</attribute>
+        <attribute name="action">win.display.rating</attribute>
+        <attribute name="target">7</attribute>
+        <attribute name="accel">&lt;Primary&gt;5</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/ui/search_sidebar_context.ui b/ui/search_sidebar_context.ui
index 9db976e..a925800 100644
--- a/ui/search_sidebar_context.ui
+++ b/ui/search_sidebar_context.ui
@@ -1,6 +1,12 @@
-<ui>
-    <popup name="SidebarSearchContextMenu">
-        <menuitem name="NewSearch" action="CommonNewSearch" />
-    </popup>
-</ui>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="shotwell">
+  <menu id='popup-menu'>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+        <attribute name="action">win.CommonNewSearch</attribute>
+        <attribute name="accel">&lt;Primary&gt;s</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/ui/set_background_dialog.ui b/ui/set_background_dialog.ui
index f857693..ee7106f 100644
--- a/ui/set_background_dialog.ui
+++ b/ui/set_background_dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.2 -->
-<interface>
-  <requires lib="gtk+" version="3.0"/>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="upper">100</property>
     <property name="step_increment">10</property>
@@ -78,8 +78,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0.5899999737739563</property>
+                <property name="halign">start</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
@@ -94,7 +93,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="xalign">0</property>
+                <property name="halign">start</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
diff --git a/ui/shotwell.ui b/ui/shotwell.ui
index 01c4274..573c736 100644
--- a/ui/shotwell.ui
+++ b/ui/shotwell.ui
@@ -1,187 +1,575 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.12 -->
-  <object class="GtkBox" id="criteria">
-    <property name="visible">True</property>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
+  <object class="GtkAdjustment" id="bg_color_adjustment">
+    <property name="upper">65535</property>
+    <property name="step_increment">1000</property>
+    <property name="page_increment">1000</property>
+    <property name="page_size">1000</property>
+  </object>
+  <object class="GtkDialog" id="preferences_dialog">
     <property name="can_focus">False</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">5</property>
-    <property name="border_width">3</property>
-    <child>
-      <object class="GtkAlignment" id="title_aln">
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
-          <object class="GtkBox" id="hbox3">
+          <object class="GtkNotebook" id="preferences-notebook">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">3</property>
+            <property name="can_focus">True</property>
+            <property name="show_border">False</property>
             <child>
-              <object class="GtkLabel" id="Name of search:">
+              <object class="GtkGrid" id="table1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Name of search:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">Search title</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="border_width">6</property>
+                <property name="row_spacing">4</property>
+                <property name="column_spacing">8</property>
+                <child>
+                  <object class="GtkFileChooserButton" id="library_dir_button">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="action">select-folder</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="slider container">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">white</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScale" id="bg_color_slider">
+                        <property name="width_request">150</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="adjustment">bg_color_adjustment</property>
+                        <property name="draw_value">False</property>
+                        <property name="value_pos">left</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">black</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="default_raw_developer">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">13</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label5">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_bottom">3</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Display</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="library location">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_top">14</property>
+                    <property name="margin_bottom">3</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Library Location</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="bg_color_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">_Background:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">bg_color_slider</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="label" translatable="yes">_Import photos to:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">library_dir_button</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="autoimport">
+                    <property name="label" translatable="yes">_Watch library directory for new files</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">4</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="importing">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_top">14</property>
+                    <property name="margin_bottom">3</property>
+                    <property name="hexpand">True</property>
+                    <property name="label" translatable="yes">Importing</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">5</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="dir_structure_label">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="label" translatable="yes">_Directory structure:</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="example">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">34</property>
+                    <property name="label" translatable="yes">Example:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">8</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="lowercase">
+                    <property name="label" translatable="yes">R_ename imported files to lowercase</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">9</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label10">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_top">14</property>
+                    <property name="margin_bottom">3</property>
+                    <property name="label" translatable="yes">Metadata</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">10</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="write_metadata">
+                    <property name="label" translatable="yes">Write tags, titles, and other _metadata to photo files</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="use_underline">True</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">11</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_top">14</property>
+                    <property name="margin_bottom">3</property>
+                    <property name="label" translatable="yes">RAW Developer</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">12</property>
+                    <property name="width">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label6">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">10</property>
+                    <property name="label" translatable="yes">De_fault:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">default_raw_developer</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">13</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBoxText" id="dir choser">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="dir_pattern_entry">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">•</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="secondary_icon_activatable">False</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">7</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="dynamic example">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="hexpand">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">8</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkLabel" id="patern">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="margin_left">34</property>
+                        <property name="label" translatable="yes">_Pattern:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="pattern_help">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <attributes>
+                          <attribute name="underline" value="True"/>
+                        </attributes>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">7</property>
+                  </packing>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="library-tab">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Library</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="GtkEntry" id="Search title">
+              <object class="GtkBox" id="hbox4">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">•</property>
-                <property name="width_chars">20</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="secondary_icon_activatable">False</property>
+                <property name="can_focus">False</property>
+                <property name="valign">start</property>
+                <property name="border_width">6</property>
+                <child>
+                  <object class="GtkBox" id="vbox2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="margin_left">6</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="margin_left">4</property>
+                        <property name="margin_right">4</property>
+                        <property name="hexpand">True</property>
+                        <property name="label" translatable="yes">E_xternal photo editor:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">external_photo_editor_combo</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">start</property>
+                        <property name="margin_left">4</property>
+                        <property name="margin_right">4</property>
+                        <property name="label" translatable="yes">External _RAW editor:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">external_raw_editor_combo</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="vbox3">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkComboBox" id="external_photo_editor_combo">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkComboBox" id="external_raw_editor_combo">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkHSeparator" id="hseparator1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment9">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkBox" id="hbox2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">3</property>
-            <child>
-              <object class="GtkLabel" id="Match">
+            <child type="tab">
+              <object class="GtkLabel" id="external-editors-tab">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">_Match</property>
-                <property name="use_underline">True</property>
-                <property name="justify">right</property>
-                <property name="mnemonic_widget">Type of search criteria</property>
+                <property name="label" translatable="yes">External Editors</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="GtkComboBoxText" id="Type of search criteria">
+              <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="border_width">12</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="padding">1</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkLabel" id="of the following:">
+            <child type="tab">
+              <object class="GtkLabel" id="plugins-tab">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">of the following:</property>
+                <property name="label" translatable="yes">Plugins</property>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
                 <property name="position">2</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
               <placeholder/>
             </child>
-            <child>
-              <object class="GtkButton" id="Add search button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <style>
-                  <class name="image-button"/>
-                </style>
-                <child>
-                  <object class="GtkImage">
-                    <property name="visible">True</property>
-                    <property name="icon-name">list-add-symbolic</property>
-                    <property name="icon-size">1</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="pack_type">end</property>
-                <property name="position">4</property>
-              </packing>
+            <child type="tab">
+              <placeholder/>
             </child>
           </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
     </child>
-    <child>
-      <object class="GtkHSeparator" id="hseparator2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkBox" id="row_box">
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="headerbar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">3</property>
-        <child>
-          <placeholder/>
-        </child>
+        <property name="title">Shotwell Preferences</property>
+        <property name="show_close_button">True</property>
       </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">5</property>
-      </packing>
     </child>
   </object>
-  <object class="GtkAdjustment" id="bg_color_adjustment">
-    <property name="upper">65535</property>
-    <property name="step_increment">1000</property>
-    <property name="page_increment">1000</property>
-    <property name="page_size">1000</property>
-  </object>
   <object class="GtkBox" id="box_ImgSettingsPane">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -190,8 +578,8 @@
       <object class="GtkLabel" id="lbl_PrintedImageSize">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">start</property>
         <property name="margin_top">4</property>
-        <property name="xalign">0</property>
         <property name="label" translatable="yes">&lt;b&gt;Printed Image Size&lt;/b&gt;</property>
         <property name="use_markup">True</property>
       </object>
@@ -213,8 +601,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
+            <property name="halign">start</property>
             <property name="use_underline">True</property>
-            <property name="xalign">0</property>
             <property name="active">True</property>
             <property name="draw_indicator">True</property>
             <property name="group">radio_UseCustomSize</property>
@@ -256,8 +644,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
+            <property name="halign">start</property>
             <property name="use_underline">True</property>
-            <property name="xalign">0</property>
             <property name="active">True</property>
             <property name="draw_indicator">True</property>
           </object>
@@ -279,7 +667,6 @@
                 <property name="margin_right">3</property>
                 <property name="invisible_char">●</property>
                 <property name="width_chars">10</property>
-                <property name="invisible_char_set">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -306,7 +693,6 @@
                 <property name="margin_left">3</property>
                 <property name="invisible_char">●</property>
                 <property name="width_chars">10</property>
-                <property name="invisible_char_set">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -346,9 +732,9 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">False</property>
+        <property name="halign">start</property>
         <property name="margin_left">210</property>
         <property name="use_underline">True</property>
-        <property name="xalign">0</property>
         <property name="draw_indicator">True</property>
       </object>
       <packing>
@@ -370,8 +756,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
+            <property name="halign">start</property>
             <property name="use_underline">True</property>
-            <property name="xalign">0</property>
             <property name="active">True</property>
             <property name="draw_indicator">True</property>
             <property name="group">radio_UseCustomSize</property>
@@ -405,7 +791,7 @@
       <object class="GtkLabel" id="lbl_Titles">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">start</property>
         <property name="label" translatable="yes">&lt;b&gt;Titles&lt;/b&gt;</property>
         <property name="use_markup">True</property>
       </object>
@@ -427,8 +813,8 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
+            <property name="halign">start</property>
             <property name="use_underline">True</property>
-            <property name="xalign">0</property>
             <property name="draw_indicator">True</property>
           </object>
           <packing>
@@ -443,10 +829,9 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
             <property name="margin_left">49</property>
-            <property name="font">Sans Bold 12</property>
+            <property name="font">Sans 12</property>
             <property name="preview_text"/>
             <property name="show_preview_entry">False</property>
-            <property name="font_name">Sans Bold 12</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -465,8 +850,8 @@
       <object class="GtkLabel" id="lbl_PixelResolution">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">start</property>
         <property name="margin_top">12</property>
-        <property name="xalign">0</property>
         <property name="label" translatable="yes">&lt;b&gt;Pixel Resolution&lt;/b&gt;</property>
         <property name="use_markup">True</property>
       </object>
@@ -486,7 +871,7 @@
           <object class="GtkLabel" id="lbl_OutputPhotoAt">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="xalign">0</property>
+            <property name="halign">start</property>
             <property name="label" translatable="yes">_Output photo at:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">entry_PixelsPerInch</property>
@@ -510,7 +895,6 @@
                 <property name="margin_right">8</property>
                 <property name="invisible_char">●</property>
                 <property name="width_chars">13</property>
-                <property name="invisible_char_set">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -545,17 +929,185 @@
       </packing>
     </child>
   </object>
-  <object class="GtkBox" id="dialog-vbox2">
+  <object class="GtkBox" id="criteria">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="border_width">3</property>
     <property name="orientation">vertical</property>
+    <property name="spacing">5</property>
+    <child>
+      <object class="GtkBox" id="hbox3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="spacing">3</property>
+        <child>
+          <object class="GtkLabel" id="Name of search:">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">_Name of search:</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">Search title</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="Search title">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="invisible_char">•</property>
+            <property name="width_chars">20</property>
+            <property name="primary_icon_activatable">False</property>
+            <property name="secondary_icon_activatable">False</property>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkSeparator" id="hseparator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="hbox2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="spacing">3</property>
+        <child>
+          <object class="GtkLabel" id="Match">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">_Match</property>
+            <property name="use_underline">True</property>
+            <property name="justify">right</property>
+            <property name="mnemonic_widget">Type of search criteria</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBoxText" id="Type of search criteria">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="padding">1</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="of the following:">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">of the following:</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <object class="GtkButton" id="Add search button">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="icon_name">list-add-symbolic</property>
+                <property name="icon_size">1</property>
+              </object>
+            </child>
+            <style>
+              <class name="image-button"/>
+            </style>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkSeparator" id="hseparator2">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">4</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="row_box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">3</property>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">5</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkBox" id="dialog-vbox2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="border_width">3</property>
+    <property name="orientation">vertical</property>
     <property name="spacing">3</property>
     <child>
       <object class="GtkLabel" id="label">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
+        <property name="halign">start</property>
         <property name="label" translatable="yes">label</property>
       </object>
       <packing>
@@ -586,8 +1138,8 @@
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
-    <property name="orientation">vertical</property>
     <property name="border_width">3</property>
+    <property name="orientation">vertical</property>
     <child>
       <object class="GtkScrolledWindow" id="scrolledwindow1">
         <property name="visible">True</property>
@@ -620,29 +1172,25 @@
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
     <child>
-      <object class="GtkAlignment" id="plugin-list-alignment">
+      <object class="GtkScrolledWindow" id="plugin-list-scrolled-window">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can_focus">True</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="hscrollbar_policy">never</property>
+        <property name="shadow_type">etched-in</property>
         <child>
-          <object class="GtkScrolledWindow" id="plugin-list-scrolled-window">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">etched-in</property>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
+          <placeholder/>
         </child>
       </object>
       <packing>
-        <property name="expand">True</property>
+        <property name="expand">False</property>
         <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
     </child>
     <child>
-      <object class="GtkHButtonBox" id="hbuttonbox1">
+      <object class="GtkButtonBox" id="hbuttonbox1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="layout_style">end</property>
@@ -668,692 +1216,6 @@
       </packing>
     </child>
   </object>
-  <object class="GtkDialog" id="preferences_dialog">
-    <property name="can_focus">False</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="headerbar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="show-close-button">True</property>
-        <property name="title" translatable="yes">Shotwell Preferences</property>
-      </object>
-    </child>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox3">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="border_width">0</property>
-        <child>
-          <object class="GtkNotebook" id="notebook1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="show_border">False</property>
-            <child>
-              <object class="GtkAlignment" id="alignment1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">6</property>
-                <child>
-                  <object class="GtkTable" id="table1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="n_rows">14</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">8</property>
-                    <property name="row_spacing">4</property>
-                    <child>
-                      <object class="GtkFileChooserButton" id="library_dir_button">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="action">select-folder</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="slider container">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="label1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">white</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkHScale" id="bg_color_slider">
-                            <property name="width_request">150</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">bg_color_adjustment</property>
-                            <property name="draw_value">False</property>
-                            <property name="value_pos">left</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">black</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="top_padding">14</property>
-                        <property name="bottom_padding">3</property>
-                        <child>
-                          <object class="GtkLabel" id="library location">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Library Location</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="top_padding">2</property>
-                        <property name="left_padding">10</property>
-                        <child>
-                          <object class="GtkCheckButton" id="autoimport">
-                            <property name="label" translatable="yes">_Watch library directory for new files</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"/>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="label: metadata">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="top_padding">14</property>
-                        <property name="bottom_padding">3</property>
-                        <child>
-                          <object class="GtkLabel" id="label10">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Metadata</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">10</property>
-                        <property name="bottom_attach">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="label: metadate write">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">10</property>
-                        <child>
-                          <object class="GtkCheckButton" id="write_metadata">
-                            <property name="label" translatable="yes">Write tags, titles, and other _metadata to photo files</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">11</property>
-                        <property name="bottom_attach">12</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="label: display">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="bottom_padding">3</property>
-                        <child>
-                          <object class="GtkLabel" id="label5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Display</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="label: import to">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">10</property>
-                        <child>
-                          <object class="GtkLabel" id="label4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Import photos to:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">library_dir_button</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="label: background">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkLabel" id="bg_color_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">10</property>
-                            <property name="label" translatable="yes">_Background:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">bg_color_slider</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="label: importing">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="top_padding">14</property>
-                        <property name="bottom_padding">3</property>
-                        <child>
-                          <object class="GtkLabel" id="importing">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Importing</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">5</property>
-                        <property name="bottom_attach">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="label: directory structure">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">10</property>
-                        <child>
-                          <object class="GtkLabel" id="dir_structure_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">_Directory structure:</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="top_attach">6</property>
-                        <property name="bottom_attach">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="dir choser">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">6</property>
-                        <property name="bottom_attach">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="label: patern">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">34</property>
-                        <child>
-                          <object class="GtkBox" id="hbox1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <child>
-                              <object class="GtkLabel" id="patern">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">_Pattern:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">dir_pattern_entry</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="pattern_help">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <attributes>
-                                  <attribute name="underline" value="True"/>
-                                </attributes>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="top_attach">7</property>
-                        <property name="bottom_attach">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="entry: pattern">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkEntry" id="dir_pattern_entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">•</property>
-                            <property name="primary_icon_activatable">False</property>
-                            <property name="secondary_icon_activatable">False</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">7</property>
-                        <property name="bottom_attach">8</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="label: dynamic example">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkLabel" id="dynamic example">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">8</property>
-                        <property name="bottom_attach">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="label: example">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">34</property>
-                        <child>
-                          <object class="GtkLabel" id="example">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Example:</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="top_attach">8</property>
-                        <property name="bottom_attach">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="checkbox: lowercase">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="top_padding">2</property>
-                        <property name="left_padding">10</property>
-                        <child>
-                          <object class="GtkCheckButton" id="lowercase">
-                            <property name="label" translatable="yes">R_ename imported files to lowercase</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">9</property>
-                        <property name="bottom_attach">10</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"/>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="label: developer">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="top_padding">14</property>
-                        <property name="bottom_padding">3</property>
-                        <child>
-                          <object class="GtkLabel" id="label3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">RAW Developer</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">12</property>
-                        <property name="bottom_attach">13</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="default_raw_developer">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">13</property>
-                        <property name="bottom_attach">14</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkAlignment" id="alignment2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">10</property>
-                        <child>
-                          <object class="GtkLabel" id="label6">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">De_fault:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">default_raw_developer</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="top_attach">13</property>
-                        <property name="bottom_attach">14</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="library-tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Library</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkAlignment" id="alignment5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">6</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="yscale">0</property>
-                <child>
-                  <object class="GtkBox" id="hbox4">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <child>
-                      <object class="GtkAlignment" id="labels: external editors">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">6</property>
-                        <child>
-                          <object class="GtkBox" id="vbox2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="xpad">4</property>
-                                <property name="label" translatable="yes">E_xternal photo editor:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">external_photo_editor_combo</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label8">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="xpad">4</property>
-                                <property name="label" translatable="yes">External _RAW editor:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">external_raw_editor_combo</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="vbox3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkComboBox" id="external_photo_editor_combo">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBox" id="external_raw_editor_combo">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="external-editors-tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">External Editors</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkAlignment" id="plugin-manifest-bin">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">12</property>
-                <property name="bottom_padding">12</property>
-                <property name="left_padding">12</property>
-                <property name="right_padding">12</property>
-                <child>
-                  <placeholder/>
-                </child>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="plugins-tab">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Plugins</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child type="tab">
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
   <object class="GtkBox" id="progress_pane_widget">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -1396,7 +1258,7 @@
               <object class="GtkLabel" id="delay_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="halign">end</property>
                 <property name="label" translatable="yes">_Delay:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">delay_hscale</property>
@@ -1404,15 +1266,13 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="transition_effect_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">0.95999997854232788</property>
+                <property name="halign">end</property>
                 <property name="label" translatable="yes">_Transition effect:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">transition_effect_selector</property>
@@ -1420,23 +1280,19 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="transition_delay_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="xalign">1</property>
+                <property name="halign">end</property>
                 <property name="label" translatable="yes">Transition d_elay:</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -1445,29 +1301,24 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
+                <property name="halign">start</property>
                 <property name="use_underline">True</property>
-                <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">3</property>
                 <property name="width">4</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="transition_effect_selector">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="entry_text_column">0</property>
-                <property name="id_column">1</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -1481,8 +1332,6 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -1494,8 +1343,6 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -1503,13 +1350,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">●</property>
-                <property name="invisible_char_set">True</property>
               </object>
               <packing>
                 <property name="left_attach">2</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -1517,14 +1361,11 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="invisible_char">●</property>
-                <property name="invisible_char_set">True</property>
                 <property name="digits">1</property>
               </object>
               <packing>
                 <property name="left_attach">2</property>
                 <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -1536,8 +1377,6 @@
               <packing>
                 <property name="left_attach">3</property>
                 <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -1549,8 +1388,6 @@
               <packing>
                 <property name="left_attach">3</property>
                 <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
               </packing>
             </child>
             <child>
diff --git a/ui/sidebar_default_context.ui b/ui/sidebar_default_context.ui
index 2e5ed87..644d8c7 100644
--- a/ui/sidebar_default_context.ui
+++ b/ui/sidebar_default_context.ui
@@ -1,7 +1,17 @@
-<ui>
-    <popup name="SidebarDefaultContextMenu">
-        <menuitem name="NewSearch" action="CommonNewSearch" />
-        <menuitem name="NewTag" action="CommonNewTag" />
-    </popup>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="shotwell">
+  <menu id='popup-menu'>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+        <attribute name="action">win.CommonNewSearch</attribute>
+        <attribute name="accel">&lt;Primary&gt;s</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">New _Tag…</attribute>
+        <attribute name="action">win.CommonNewTag</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
 
diff --git a/ui/tag_sidebar_context.ui b/ui/tag_sidebar_context.ui
index 4a3d049..96b0f1e 100644
--- a/ui/tag_sidebar_context.ui
+++ b/ui/tag_sidebar_context.ui
@@ -1,6 +1,11 @@
-<ui>
-    <popup name="SidebarTagContextMenu">
-        <menuitem name="NewTag" action="CommonNewTag" />
-    </popup>
-</ui>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="shotwell">
+  <menu id='popup-menu'>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">New _Tag…</attribute>
+        <attribute name="action">win.CommonNewTag</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/ui/tags.ui b/ui/tags.ui
index d0373d6..c693e7f 100644
--- a/ui/tags.ui
+++ b/ui/tags.ui
@@ -1,25 +1,447 @@
-<ui>
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Save _As…</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;e</attribute>
+          <attribute name="action">win.Export</attribute>
+        </item>
+      </section>
+      <section>
+        <attribute name="id">FileExtrasPlaceholder</attribute>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Edit</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
+          <attribute name="action">win.CommonUndo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
+          <attribute name="action">win.CommonRedo</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Find</attribute>
+          <attribute name="action">win.CommonFind</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
+        </item>
+      </section>
+      <section>
+        <attribute name="id">EditExtrasPlaceholder</attribute>
+        <item>
+          <attribute name="label" translatable="yes">R_emove from Library</attribute>
+          <attribute name="accel">&lt;Shift&gt;Delete</attribute>
+          <attribute name="action">win.RemoveFromLibrary</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Move to Trash</attribute>
+          <attribute name="accel">Delete</attribute>
+          <attribute name="action">win.MoveToTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Select _All</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
+          <attribute name="action">win.CommonSelectAll</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Search Bar</attribute>
+          <attribute name="accel">F8</attribute>
+          <attribute name="action">win.CommonDisplaySearchbar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">S_idebar</attribute>
+          <attribute name="accel">F9</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">T_oolbar</attribute>
+          <attribute name="accel">&lt;Primary&gt;F9</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Titles</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;t</attribute>
+          <attribute name="action">win.ViewTitle</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Comments</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
+          <attribute name="action">win.ViewComment</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Ta_gs</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;g</attribute>
+          <attribute name="action">win.ViewTags</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Ratings</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;n</attribute>
+          <attribute name="action">win.ViewRatings</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">_Filter Photos</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">7</attribute>
+              <attribute name="accel">&lt;Primary&gt;5</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">6</attribute>
+              <attribute name="accel">&lt;Primary&gt;4</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">5</attribute>
+              <attribute name="accel">&lt;Primary&gt;3</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">4</attribute>
+              <attribute name="accel">&lt;Primary&gt;2</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">3</attribute>
+              <attribute name="accel">&lt;Primary&gt;1</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_All Photos</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">2</attribute>
+              <attribute name="accel">&lt;Primary&gt;0</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">All + _Rejected</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">1</attribute>
+              <attribute name="accel">&lt;Primary&gt;9</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Rejected _Only</attribute>
+              <attribute name="action">win.display.rating</attribute>
+              <attribute name="target">8</attribute>
+              <attribute name="accel">&lt;Primary&gt;8</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Photos</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">By _Title</attribute>
+              <attribute name="action">win.SortBy</attribute>
+              <attribute name="target">1</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">By _Filename</attribute>
+              <attribute name="action">win.SortBy</attribute>
+              <attribute name="target">4</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">By Exposure _Date</attribute>
+              <attribute name="action">win.SortBy</attribute>
+              <attribute name="target">2</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">By _Rating</attribute>
+              <attribute name="action">win.SortBy</attribute>
+              <attribute name="target">3</attribute>
+            </item>
+          </section>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.Sort</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">D_escending</attribute>
+              <attribute name="action">win.Sort</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Descending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _In</attribute>
+          <attribute name="accel">&lt;Primary&gt;plus</attribute>
+          <attribute name="action">win.IncreaseSize</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _Out</attribute>
+          <attribute name="accel">&lt;Primary&gt;minus</attribute>
+          <attribute name="action">win.DecreaseSize</attribute>
+        </item>
+      </section>
+      <section>
+      <attribute name="id">ViewExtrasFullscreenSlideshowPlaceholder</attribute>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Photos</attribute>
+      <section>
+      <attribute name="id">PhotosExtrasEditsPlaceholder</attribute>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Toggle _Flag</attribute>
+          <attribute name="accel">&lt;Primary&gt;g</attribute>
+          <attribute name="action">win.Flag</attribute>
+        </item>
+        <submenu>
+          <attribute name="label" translatable="yes">_Set Rating</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="accel">5</attribute>
+              <attribute name="action">win.RateFive</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="accel">4</attribute>
+              <attribute name="action">win.RateFour</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="accel">3</attribute>
+              <attribute name="action">win.RateThree</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="accel">2</attribute>
+              <attribute name="action">win.RateTwo</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="accel">1</attribute>
+              <attribute name="action">win.RateOne</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Unrated</attribute>
+              <attribute name="accel">0</attribute>
+              <attribute name="action">win.RateUnrated</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Rejected</attribute>
+              <attribute name="accel">9</attribute>
+              <attribute name="action">win.RateRejected</attribute>
+            </item>
+          </section>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Increase</attribute>
+              <attribute name="accel">greater</attribute>
+              <attribute name="action">win.IncreaseRating</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Decrease</attribute>
+              <attribute name="accel">less</attribute>
+              <attribute name="action">win.DecreaseRating</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Edit _Title…</attribute>
+          <attribute name="action">win.EditTitle</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Edit _Comment…</attribute>
+          <attribute name="action">win.EditComment</attribute>
+        </item>
+      <attribute name="id">PhotosExtrasDateTimePlaceholder</attribute>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">_Developer</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">Shotwell</attribute>
+              <attribute name="action">win.RawDeveloper</attribute>
+              <attribute name="target">Shotwell</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Camera</attribute>
+              <attribute name="action">win.RawDeveloper</attribute>
+              <attribute name="action">Camera</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+      <attribute name="id">PhotosExtrasExternalsPlaceholder</attribute>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Even_ts</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_New Event</attribute>
+          <attribute name="accel">&lt;Primary&gt;n</attribute>
+          <attribute name="action">win.NewEvent</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">View Eve_nt for Photo</attribute>
+          <attribute name="action">win.CommonJumpToEvent</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Ta_gs</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Add _Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;t</attribute>
+          <attribute name="action">win.AddTags</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
+          <attribute name="accel">&lt;Primary&gt;m</attribute>
+          <attribute name="action">win.ModifyTags</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="id">RemoveTagFromPhotos</attribute>
+          <attribute name="label" translatable="yes"></attribute>
+          <attribute name="action">win.RemoveTagFromPhotos</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="id">RenameTag</attribute>
+          <attribute name="label" translatable="yes"></attribute>
+          <attribute name="action">win.RenameTag</attribute>
+        </item>
+        <item>
+          <attribute name="id">DeleteTag</attribute>
+          <attribute name="label" translatable="yes"></attribute>
+          <attribute name="action">win.DeleteTag</attribute>
+        </item>
+      </section>
+    </submenu>
+    <!-- Faces menu goes here FacesMenuPlaceholder -->
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
 
-    <menubar name="MenuBar">
-        <menu name="TagsMenu" action="TagsMenu">
-            <menuitem name="RemoveTagFromPhotos" action="RemoveTagFromPhotos" />
-            <separator />
-            <menuitem name="RenameTag" action="RenameTag" />
-            <menuitem name="DeleteTag" action="DeleteTag" />
-        </menu>
-    </menubar>
-    
-    <popup name="CollectionContextMenu">
-        <placeholder name="ContextTagsPlaceholder">
-            <menuitem name="ContextRemoveTagFromPhotos" action="RemoveTagFromPhotos" />
-        </placeholder>
-    </popup>
-    
-    <popup name="TagsContextMenu">
-        <menuitem name="ContextNewChildTag" action="NewChildTagSidebar" />
-        <separator />
-        <menuitem name="ContextDeleteTag" action="RenameTagSidebar" />
-        <menuitem name="ContextRenameTag" action="DeleteTagSidebar" />
-    </popup>
-
-</ui>
+  <menu id="TagsContextMenu">
+  </menu>
+</interface>
diff --git a/ui/top.ui b/ui/top.ui
index 81d1006..683a2fa 100644
--- a/ui/top.ui
+++ b/ui/top.ui
@@ -1,12 +1,45 @@
-<ui>
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu" />
-        <menu name="EditMenu" action="EditMenu" />  
-        <menu name="ViewMenu" action="ViewMenu" />
-        <menu name="PhotoMenu" action="PhotoMenu" />
-        <menu name="PhotosMenu" action="PhotosMenu" />
-        <menu name="EventsMenu" action="EventsMenu" />
-        <menu name="TagsMenu" action="TagsMenu" />
-        <menu name="HelpMenu" action="HelpMenu" />
-    </menubar>
-</ui>
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Edit</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Photo</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Photos</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Even_ts</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Ta_gs</attribute>
+      <section>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+      </section>
+    </submenu>
+  </menu>
+</interface>
diff --git a/ui/trash.ui b/ui/trash.ui
index 9a464bb..2e68df8 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -1,83 +1,322 @@
-<ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-            <separator />
-            <menuitem name="JumpToFile" action="CommonJumpToFile" />
-            <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
-            <separator />
-            <menuitem name="Quit" action="CommonQuit" />
-        </menu>
-        
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-            <separator />
-            <menuitem name="Find" action="CommonFind" />
-            <menuitem name="NewSearch" action="CommonNewSearch" />
-            <separator />
-            <menuitem name="Delete" action="Delete" />
-            <menuitem name="Restore" action="Restore" />
-            <separator />
-            <menuitem name="SelectAll" action="CommonSelectAll" />
-            <separator />
-            <menuitem name="Preferences" action="CommonPreferences" />
-        </menu>
-        
-        <menu name="ViewMenu" action="ViewMenu">
-            <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
-            <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
-            <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
-            <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
-            <menuitem name="DisplayToolbar" action="CommonDisplayToolbar" />
-            <separator />
-            <menu name="FilterPhotos" action="CommonFilterPhotos">
-                <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
-                <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
-                <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
-                <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
-                <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
-                <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
-                <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
-                <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
-            </menu>
-            <separator />
-            <menu name="SortEvents" action="CommonSortEvents">
-                <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
-                <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
-            </menu>
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="Contents" action="CommonHelpContents" />
-            <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
-            <menuitem name="Report a Problem…" action="CommonHelpReportProblem" />
-            <separator />
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-    
-    <popup name="TrashContextMenu">
-        <menuitem name="ContextDelete" action="Delete" />
-        <menuitem name="ContextRestore" action="Restore" />
-        <separator />
-        <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
-        <separator />
-        <menuitem name="ContextEmptyTrash" action="CommonEmptyTrash" />
-    </popup>
-    
-    <popup name="TrashPageMenu">
-        <menuitem name="ContextEmptyTrash" action="CommonEmptyTrash" />
-    </popup>
-    
-    <toolbar name="TrashToolbar">
-        <toolitem name="ToolDelete" action="Delete" />
-        <toolitem name="ToolRestore" action="Restore" />
-        <toolitem name="ToolEmptyTrash" action="CommonEmptyTrash" />
-        <separator />
-        <toolitem name="ToolFind" action="CommonDisplaySearchbar" />
-    </toolbar>
-    
-</ui>
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Edit</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
+          <attribute name="action">win.CommonUndo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
+          <attribute name="action">win.CommonRedo</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Find</attribute>
+          <attribute name="action">win.CommonFind</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Delete</attribute>
+          <attribute name="accel">Delete</attribute>
+          <attribute name="action">win.Delete</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Restore</attribute>
+          <attribute name="action">win.Restore</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Select _All</attribute>
+          <attribute name="accel">&lt;Primary&gt;a</attribute>
+          <attribute name="action">win.CommonSelectAll</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Search Bar</attribute>
+          <attribute name="accel">F8</attribute>
+          <attribute name="action">win.CommonDisplaySearchbar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">S_idebar</attribute>
+          <attribute name="accel">F9</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">T_oolbar</attribute>
+          <attribute name="accel">&lt;Primary&gt;F9</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">_Filter Photos</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">7</attribute>
+              <attribute name="accel">&lt;Primary&gt;5</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">6</attribute>
+              <attribute name="accel">&lt;Primary&gt;4</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">5</attribute>
+              <attribute name="accel">&lt;Primary&gt;3</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">4</attribute>
+              <attribute name="accel">&lt;Primary&gt;2</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">3</attribute>
+              <attribute name="accel">&lt;Primary&gt;1</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_All Photos</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">2</attribute>
+              <attribute name="accel">&lt;Primary&gt;0</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">All + _Rejected</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">1</attribute>
+              <attribute name="accel">&lt;Primary&gt;9</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Rejected _Only</attribute>
+              <attribute name="action">filterbar.display.rating</attribute>
+              <attribute name="target">8</attribute>
+              <attribute name="accel">&lt;Primary&gt;8</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">D_escending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+  <menu id="TrashContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Delete</attribute>
+        <attribute name="accel">Delete</attribute>
+        <attribute name="action">win.Delete</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Restore</attribute>
+        <attribute name="action">win.Restore</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+        <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
+        <attribute name="action">win.CommonJumpToFile</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Empty T_rash</attribute>
+        <attribute name="action">win.CommonEmptyTrash</attribute>
+      </item>
+    </section>
+  </menu>
+  <menu id="TrashPageMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Empty T_rash</attribute>
+        <attribute name="action">win.CommonEmptyTrash</attribute>
+      </item>
+    </section>
+  </menu>
+  <object class="GtkToolbar" id="TrashToolbar">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="toolbar_style">both-horiz</property>
+    <child>
+      <object class="GtkToolButton" id="ToolDelete">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Remove the selected photos from the trash</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.Delete</property>
+        <property name="label" translatable="yes">_Delete</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToolButton" id="ToolRestore">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Move the selected photos back into the library</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.Restore</property>
+        <property name="label" translatable="yes">_Restore</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToolButton" id="ToolEmptyTrash">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Delete all photos in the trash</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.CommonEmptyTrash</property>
+        <property name="label" translatable="yes">Empty Trash</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkSeparatorToolItem">
+        <property name="can_focus">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">False</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToolButton" id="ToolFind">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Find an image by typing text that appears in its name or tags</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.CommonDisplaySearchbar</property>
+        <property name="label" translatable="yes">Find</property>
+        <property name="use_underline">True</property>
+        <property name="icon_name">edit-find</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+  </object>
+</interface>